uncrustify-trinity: updated based on upstream version 0.75.0

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

4559 files changed, 17778 insertions, 10616 deletions

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/CODEOWNERS b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/CODEOWNERS
deleted file mode 100644
index b8b9012f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/CODEOWNERS
+++ /dev/null
@@ -1,11 +0,0 @@
-*               @CDanU @gmaurel @mwoehlke-kitware
-
-.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.74.0/src/chunk_list.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/chunk_list.cpp
deleted file mode 100644
index 1132161e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/chunk_list.cpp
+++ /dev/null
@@ -1,1144 +0,0 @@
-/**
- * @file chunk_list.cpp
- * Manages and navigates the list of chunks.
- *
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#include "chunk_list.h"
-
-#include "ListManager.h"
-#include "prototypes.h"
-#include "space.h"
-
-typedef ListManager<chunk_t> ChunkList_t;
-
-
-/**
- * use this enum to define in what direction or location an
- * operation shall be performed.
- */
-enum class direction_e : unsigned int
-{
-   FORWARD,
-   BACKWARD
-};
-
-
-/**
- * @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_t *pc)
- */
-typedef bool (*check_t)(chunk_t *pc);
-
-
-/**
- * @brief prototype for a function that searches through a chunk list
- *
- * @note this typedef defines the function type "search_t"
- * for a function pointer of type
- * chunk_t *function(chunk_t *cur, nav_t scope)
- */
-typedef chunk_t * (*search_t)(chunk_t *cur, scope_e scope);
-
-
-/**
- * @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.
- *
- * Whenever a chunk list traversal is to be performed this function
- * shall be used. This keeps the code clear and easy to understand.
- *
- * If there are performance issues this function might be worth to
- * be optimized as it is heavily used.
- *
- * @param  cur        chunk to start search at
- * @param  check_fct  compare function
- * @param  scope      code parts to consider for search
- * @param  dir        search direction
- * @param  cond       success condition
- *
- * @retval nullptr  no requested chunk was found or invalid parameters provided
- * @retval chunk_t  pointer to the found chunk
- */
-static chunk_t *chunk_search(chunk_t *cur, const check_t check_fct, const scope_e scope = scope_e::ALL, const direction_e dir = direction_e::FORWARD, const bool cond = true);
-
-
-/**
- * @brief search for a chunk that satisfies a condition in a chunk list.
- *
- * This function is similar to chunk_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  cur        chunk to start search at
- * @param  check_fct  compare function
- * @param  scope      code parts to consider for search
- * @param  cond       success condition
- *
- * @retval nullptr  no requested chunk was found or invalid parameters provided
- * @retval chunk_t  pointer to the found chunk or pointer to the chunk at the
- *                  end of the preprocessor directive
- */
-static chunk_t *chunk_ppa_search(chunk_t *cur, const check_t check_fct, const bool cond = true);
-
-
-static void chunk_log(chunk_t *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_t  pointer to the found chunk
- */
-static chunk_t *chunk_search_type(chunk_t *cur, const c_token_t type, const scope_e scope = scope_e::ALL, const direction_e dir = direction_e::FORWARD);
-
-
-/**
- * @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 cur    chunk to start search at
- * @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 -1 / ANY_LEVEL
- *
- * @retval nullptr  no chunk found or invalid parameters provided
- * @retval chunk_t  pointer to the found chunk
- */
-static chunk_t *chunk_search_typelevel(chunk_t *cur, c_token_t type, scope_e scope = scope_e::ALL, direction_e dir = direction_e::FORWARD, int level = -1);
-
-
-/**
- * @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  cur    chunk to start search at
- * @param  str    string that searched chunk needs to have
- * @param  len    length of the string
- * @param  scope  code parts to consider for search
- * @param  dir    search direction
- * @param  level  nesting level of the searched chunk, ignored when negative
- *
- * @retval NULL     no chunk found or invalid parameters provided
- * @retval chunk_t  pointer to the found chunk
- */
-static chunk_t *chunk_search_str(chunk_t *cur, const char *str, size_t len, scope_e scope, direction_e dir, int level);
-
-
-/**
- * @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_t  pointer to the added chunk
- */
-static chunk_t *chunk_add(const chunk_t *pc_in, chunk_t *ref, const direction_e pos = direction_e::FORWARD);
-
-
-/**
- * @brief Determines which chunk search function to use
- *
- * Depending on the required search direction return a pointer
- * to the corresponding chunk search function.
- *
- * @param dir  search direction
- *
- * @return pointer to chunk search function
- */
-static search_t select_search_fct(const direction_e dir = direction_e::FORWARD);
-
-
-ChunkList_t g_cl; //! global chunk list
-
-
-chunk_t *chunk_get_head(void)
-{
-   return(g_cl.GetHead());
-}
-
-
-chunk_t *chunk_get_tail(void)
-{
-   return(g_cl.GetTail());
-}
-
-
-static search_t select_search_fct(const direction_e dir)
-{
-   return((dir == direction_e::FORWARD) ? chunk_get_next : chunk_get_prev);
-}
-
-
-chunk_t *chunk_search_prev_cat(chunk_t *pc, const c_token_t cat)
-{
-   return(chunk_search_type(pc, cat, scope_e::ALL, direction_e::BACKWARD));
-}
-
-
-chunk_t *chunk_search_next_cat(chunk_t *pc, const c_token_t cat)
-{
-   return(chunk_search_type(pc, cat, scope_e::ALL, direction_e::FORWARD));
-}
-
-
-bool are_chunks_in_same_line(chunk_t *start, chunk_t *end)
-{
-   chunk_t *tmp;
-
-   if (start != nullptr)
-   {
-      tmp = chunk_get_next(start);
-   }
-   else
-   {
-      return(false);
-   }
-
-   while (  tmp != nullptr
-         && tmp != end)
-   {
-      if (chunk_is_token(tmp, CT_NEWLINE))
-      {
-         return(false);
-      }
-      tmp = chunk_get_next(tmp);
-   }
-   return(true);
-}
-
-
-static chunk_t *chunk_search_type(chunk_t *cur, const c_token_t type,
-                                  const scope_e scope, const direction_e dir)
-{
-   /*
-    * Depending on the parameter dir the search function searches
-    * in forward or backward direction
-    */
-   search_t search_function = select_search_fct(dir);
-   chunk_t  *pc             = cur;
-
-   do                                  // loop over the chunk list
-   {
-      pc = search_function(pc, scope); // in either direction while
-   } while (  pc != nullptr            // the end of the list was not reached yet
-           && pc->type != type);       // and the demanded chunk was not found either
-
-   return(pc);                         // the latest chunk is the searched one
-}
-
-
-static chunk_t *chunk_search_typelevel(chunk_t *cur, c_token_t type, scope_e scope, direction_e dir, int level)
-{
-   /*
-    * Depending on the parameter dir the search function searches
-    * in forward or backward direction
-    */
-   search_t search_function = select_search_fct(dir);
-   chunk_t  *pc             = cur;
-
-   do                                  // loop over the chunk list
-   {
-      pc = search_function(pc, scope); // in either direction while
-   } while (  pc != nullptr            // the end of the list was not reached yet
-           && (!is_expected_type_and_level(pc, type, level)));
-
-   return(pc);                         // the latest chunk is the searched one
-}
-
-
-static chunk_t *chunk_search_str(chunk_t *cur, const char *str, size_t len, scope_e scope, direction_e dir, int level)
-{
-   /*
-    * Depending on the parameter dir the search function searches
-    * in forward or backward direction */
-   search_t search_function = select_search_fct(dir);
-   chunk_t  *pc             = cur;
-
-   do                                  // loop over the chunk list
-   {
-      pc = search_function(pc, scope); // in either direction while
-   } while (  pc != nullptr            // the end of the list was not reached yet
-           && (!is_expected_string_and_level(pc, str, level, len)));
-
-   return(pc);                         // the latest chunk is the searched one
-}
-
-
-static chunk_t *chunk_search(chunk_t *cur, const check_t check_fct, const scope_e scope,
-                             const direction_e dir, const bool cond)
-{
-   /*
-    * Depending on the parameter dir the search function searches
-    * in forward or backward direction */
-   search_t search_function = select_search_fct(dir);
-   chunk_t  *pc             = cur;
-
-   do                                   // loop over the chunk list
-   {
-      pc = search_function(pc, scope);  // in either direction while
-   } while (  pc != nullptr             // the end of the list was not reached yet
-           && (check_fct(pc) != cond)); // and the demanded chunk was not found either
-
-   return(pc);                          // the latest chunk is the searched one
-}
-
-
-static chunk_t *chunk_ppa_search(chunk_t *cur, const check_t check_fct, const bool cond)
-{
-   if (  cur != nullptr
-      && !cur->flags.test(PCF_IN_PREPROC))
-   {
-      // if not in preprocessor, do a regular search
-      return(chunk_search(cur, check_fct, scope_e::ALL,
-                          direction_e::FORWARD, cond));
-   }
-   chunk_t *pc = cur;
-
-   while (  pc != nullptr
-         && (pc = pc->next) != nullptr)
-   {
-      if (!pc->flags.test(PCF_IN_PREPROC))
-      {
-         // Bail if we run off the end of the preprocessor directive, but
-         // return the next token, NOT nullptr, 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
-         continue;
-      }
-
-      if (check_fct(pc) == cond)
-      {
-         // Requested token was found
-         return(pc);
-      }
-   }
-   // Ran out of tokens
-   return(nullptr);
-}
-
-
-/* @todo maybe it is better to combine chunk_get_next and chunk_get_prev
- * into a common function However this should be done with the preprocessor
- * to avoid addition check conditions that would be evaluated in the
- * while loop of the calling function */
-chunk_t *chunk_get_next(chunk_t *cur, scope_e scope)
-{
-   if (cur == nullptr)
-   {
-      return(nullptr);
-   }
-   chunk_t *pc = g_cl.GetNext(cur);
-
-   if (  pc == nullptr
-      || scope == scope_e::ALL)
-   {
-      return(pc);
-   }
-
-   if (cur->flags.test(PCF_IN_PREPROC))
-   {
-      // If in a preproc, return nullptr if trying to leave
-      if (!pc->flags.test(PCF_IN_PREPROC))
-      {
-         return(nullptr);
-      }
-      return(pc);
-   }
-
-   // Not in a preproc, skip any preproc
-   while (  pc != nullptr
-         && pc->flags.test(PCF_IN_PREPROC))
-   {
-      pc = g_cl.GetNext(pc);
-   }
-   return(pc);
-}
-
-
-chunk_t *chunk_get_prev(chunk_t *cur, scope_e scope)
-{
-   if (cur == nullptr)
-   {
-      return(nullptr);
-   }
-   chunk_t *pc = g_cl.GetPrev(cur);
-
-   if (  pc == nullptr
-      || scope == scope_e::ALL)
-   {
-      return(pc);
-   }
-
-   if (cur->flags.test(PCF_IN_PREPROC))
-   {
-      // If in a preproc, return NULL if trying to leave
-      if (!pc->flags.test(PCF_IN_PREPROC))
-      {
-         return(nullptr);
-      }
-      return(pc);
-   }
-
-   // Not in a preproc, skip any preproc
-   while (  pc != nullptr
-         && pc->flags.test(PCF_IN_PREPROC))
-   {
-      pc = g_cl.GetPrev(pc);
-   }
-   return(pc);
-}
-
-
-chunk_t *chunk_dup(const chunk_t *pc_in)
-{
-   chunk_t *pc = new chunk_t; // Allocate a new chunk
-
-   if (pc == nullptr)
-   {
-      // @todo clean up properly before crashing
-      LOG_FMT(LERR, "Failed to allocate memory\n");
-      log_func_stack_inline(LSETFLG);
-      log_flush(true);
-      exit(EXIT_FAILURE);
-   }
-   // Copy all fields and then init the entry
-   *pc = *pc_in; // TODO: what happens if pc_in == nullptr?
-   g_cl.InitEntry(pc);
-
-   return(pc);
-}
-
-
-static void chunk_log_msg(chunk_t *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_t *pc, const char *text)
-{
-   if (  pc != nullptr
-      && (cpd.unc_stage != unc_stage_e::TOKENIZE)
-      && (cpd.unc_stage != unc_stage_e::CLEANUP))
-   {
-      const log_sev_t log   = LCHUNK;
-      chunk_t         *prev = chunk_get_prev(pc);
-      chunk_t         *next = chunk_get_next(pc);
-
-      chunk_log_msg(pc, log, text);
-
-      if (  prev != nullptr
-         && next != nullptr)
-      {
-         chunk_log_msg(prev, log, "   @ between");
-         chunk_log_msg(next, log, "   and");
-      }
-      else if (next != nullptr)
-      {
-         chunk_log_msg(next, log, "   @ before");
-      }
-      else if (prev != nullptr)
-      {
-         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_t *chunk_add_after(const chunk_t *pc_in, chunk_t *ref)
-{
-   return(chunk_add(pc_in, ref, direction_e::FORWARD));
-}
-
-
-chunk_t *chunk_add_before(const chunk_t *pc_in, chunk_t *ref)
-{
-   return(chunk_add(pc_in, ref, direction_e::BACKWARD));
-}
-
-
-void chunk_del(chunk_t * &pc)
-{
-   g_cl.Pop(pc);
-   delete pc;
-   pc = nullptr;
-}
-
-
-void chunk_move_after(chunk_t *pc_in, chunk_t *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_t *chunk_get_next_nl(chunk_t *cur, scope_e scope)
-{
-   return(chunk_search(cur, chunk_is_newline, scope, direction_e::FORWARD, true));
-}
-
-
-chunk_t *chunk_get_prev_nl(chunk_t *cur, scope_e scope)
-{
-   return(chunk_search(cur, chunk_is_newline, scope, direction_e::BACKWARD, true));
-}
-
-
-chunk_t *chunk_get_next_nnl(chunk_t *cur, scope_e scope)
-{
-   return(chunk_search(cur, chunk_is_newline, scope, direction_e::FORWARD, false));
-}
-
-
-chunk_t *chunk_get_prev_nnl(chunk_t *cur, scope_e scope)
-{
-   return(chunk_search(cur, chunk_is_newline, scope, direction_e::BACKWARD, false));
-}
-
-
-chunk_t *chunk_get_next_ncnnl(chunk_t *cur, scope_e scope)
-{
-   return(chunk_search(cur, chunk_is_comment_or_newline, scope, direction_e::FORWARD, false));
-}
-
-
-chunk_t *chunk_get_prev_ncnnl(chunk_t *cur, scope_e scope)
-{
-   return(chunk_search(cur, chunk_is_comment_or_newline, scope, direction_e::BACKWARD, false));
-}
-
-
-chunk_t *chunk_get_next_ncnnlnp(chunk_t *cur, scope_e scope)
-{
-   return(chunk_search(cur, chunk_is_comment_newline_or_preproc, scope, direction_e::FORWARD, false));
-}
-
-
-chunk_t *chunk_get_prev_ncnnlnp(chunk_t *cur, scope_e scope)
-{
-   return(chunk_search(cur, chunk_is_comment_newline_or_preproc, scope, direction_e::BACKWARD, false));
-}
-
-
-chunk_t *chunk_get_next_ncnnl_in_pp(chunk_t *cur, scope_e scope)
-{
-   return(chunk_search(cur, chunk_is_comment_or_newline_in_preproc, scope, direction_e::FORWARD, false));
-}
-
-
-chunk_t *chunk_get_prev_ncnnl_in_pp(chunk_t *cur, scope_e scope)
-{
-   return(chunk_search(cur, chunk_is_comment_or_newline_in_preproc, scope, direction_e::BACKWARD, false));
-}
-
-
-chunk_t *chunk_ppa_get_next_ncnnl(chunk_t *cur)
-{
-   return(chunk_ppa_search(cur, chunk_is_comment_or_newline, false));
-}
-
-
-chunk_t *chunk_get_next_nblank(chunk_t *cur, scope_e scope)
-{
-   return(chunk_search(cur, chunk_is_comment_newline_or_blank, scope, direction_e::FORWARD, false));
-}
-
-
-chunk_t *chunk_get_prev_nblank(chunk_t *cur, scope_e scope)
-{
-   return(chunk_search(cur, chunk_is_comment_newline_or_blank, scope, direction_e::BACKWARD, false));
-}
-
-
-chunk_t *chunk_get_next_nc(chunk_t *cur, scope_e scope)
-{
-   return(chunk_search(cur, chunk_is_comment, scope, direction_e::FORWARD, false));
-}
-
-
-chunk_t *chunk_get_prev_nc(chunk_t *cur, scope_e scope)
-{
-   return(chunk_search(cur, chunk_is_comment, scope, direction_e::BACKWARD, false));
-}
-
-
-chunk_t *chunk_get_next_nisq(chunk_t *cur, scope_e scope)
-{
-   return(chunk_search(cur, chunk_is_balanced_square, scope, direction_e::FORWARD, false));
-}
-
-
-chunk_t *chunk_get_prev_ncnnlni(chunk_t *cur, scope_e scope)
-{
-   return(chunk_search(cur, chunk_is_comment_or_newline_or_ignored, scope, direction_e::BACKWARD, false));
-}
-
-
-chunk_t *chunk_get_next_type(chunk_t *cur, c_token_t type, int level, scope_e scope)
-{
-   return(chunk_search_typelevel(cur, type, scope, direction_e::FORWARD, level));
-}
-
-
-chunk_t *chunk_get_prev_type(chunk_t *cur, c_token_t type, int level, scope_e scope)
-{
-   return(chunk_search_typelevel(cur, type, scope, direction_e::BACKWARD, level));
-}
-
-
-chunk_t *chunk_get_next_str(chunk_t *cur, const char *str, size_t len, int level, scope_e scope)
-{
-   return(chunk_search_str(cur, str, len, scope, direction_e::FORWARD, level));
-}
-
-
-chunk_t *chunk_get_prev_str(chunk_t *cur, const char *str, size_t len, int level, scope_e scope)
-{
-   return(chunk_search_str(cur, str, len, scope, direction_e::BACKWARD, level));
-}
-
-
-bool chunk_is_newline_between(chunk_t *start, chunk_t *end)
-{
-   for (chunk_t *pc = start; pc != end; pc = chunk_get_next(pc))
-   {
-      if (chunk_is_newline(pc))
-      {
-         return(true);
-      }
-   }
-
-   return(false);
-}
-
-
-void chunk_swap(chunk_t *pc1, chunk_t *pc2)
-{
-   g_cl.Swap(pc1, pc2);
-}
-
-
-// TODO: the following function shall be made similar to the search functions
-chunk_t *chunk_first_on_line(chunk_t *pc)
-{
-   chunk_t *first = pc;
-
-   while (  (pc = chunk_get_prev(pc)) != nullptr
-         && !chunk_is_newline(pc))
-   {
-      first = pc;
-   }
-   return(first);
-}
-
-
-bool chunk_is_last_on_line(chunk_t &pc)  //TODO: pc should be const here
-{
-   // check if pc is the very last chunk of the file
-   const auto *end = chunk_get_tail();
-
-   if (&pc == end)
-   {
-      return(true);
-   }
-   // if the next chunk is a newline then pc is the last chunk on its line
-   const auto *next = chunk_get_next(&pc);
-
-   if (chunk_is_token(next, CT_NEWLINE))
-   {
-      return(true);
-   }
-   return(false);
-}
-
-
-// TODO: this function needs some cleanup
-void chunk_swap_lines(chunk_t *pc1, chunk_t *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 == nullptr
-      || pc2 == nullptr
-      || pc1 == pc2)
-   {
-      return;
-   }
-   /*
-    * Example start:
-    * ? - start1 - a1 - b1 - nl1 - ? - ref2 - start2 - a2 - b2 - nl2 - ?
-    *      ^- pc1                              ^- pc2
-    */
-   chunk_t *ref2 = chunk_get_prev(pc2);
-
-   // Move the line started at pc2 before pc1
-   while (  pc2 != nullptr
-         && !chunk_is_newline(pc2))
-   {
-      chunk_t *tmp = chunk_get_next(pc2);
-      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 != nullptr
-         && !chunk_is_newline(pc1))
-   {
-      chunk_t *tmp = chunk_get_next(pc1);
-      g_cl.Pop(pc1);
-
-      if (ref2 != nullptr)
-      {
-         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 != nullptr
-      && pc2 != nullptr)
-   {
-      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_t *chunk_get_next_nvb(chunk_t *cur, const scope_e scope)
-{
-   return(chunk_search(cur, chunk_is_vbrace, scope, direction_e::FORWARD, false));
-}
-
-
-chunk_t *chunk_get_prev_nvb(chunk_t *cur, const scope_e scope)
-{
-   return(chunk_search(cur, chunk_is_vbrace, scope, direction_e::BACKWARD, false));
-}
-
-
-void chunk_flags_set_real(chunk_t *pc, pcf_flags_t clr_bits, pcf_flags_t set_bits)
-{
-   if (pc != nullptr)
-   {
-      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_t *pc, c_token_t token, const char *func, int line)
-{
-   LOG_FUNC_ENTRY();
-
-   if (  pc == nullptr
-      || 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_t *pc, c_token_t token, const char *func, int line)
-{
-   LOG_FUNC_ENTRY();
-
-   if (  pc == nullptr
-      || 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->elided_text(copy));
-   }
-   LOG_FMT(LSETPAR, "   pc->type is %s, pc->parent_type is %s => *type is %s, *parent_type is %s\n",
-           get_token_name(pc->type), get_token_name(get_chunk_parent_type(pc)),
-           get_token_name(token), get_token_name(get_chunk_parent_type(pc)));
-   pc->parent_type = token;
-} // set_chunk_parent_real
-
-
-c_token_t get_chunk_parent_type(chunk_t *pc)
-{
-   LOG_FUNC_ENTRY();
-
-   if (pc == nullptr)
-   {
-      return(CT_NONE);
-   }
-   return(pc->parent_type);
-} // get_chunk_parent_type
-
-
-static chunk_t *chunk_add(const chunk_t *pc_in, chunk_t *ref, const direction_e pos)
-{
-#ifdef DEBUG
-   // test if the pc_in chunk is properly set
-   if (pc_in->pp_level == 999)
-   {
-      fprintf(stderr, "%s(%d): pp_level is not set\n", __func__, __LINE__);
-      log_func_stack_inline(LSETFLG);
-      log_flush(true);
-      exit(EX_SOFTWARE);
-   }
-
-   if (pc_in->orig_line == 0)
-   {
-      fprintf(stderr, "%s(%d): no line number\n", __func__, __LINE__);
-      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_t *pc = chunk_dup(pc_in);
-
-   if (pc != nullptr)
-   {
-      if (ref != nullptr) // ref is a valid chunk
-      {
-         (pos == direction_e::FORWARD) ? g_cl.AddAfter(pc, ref) : g_cl.AddBefore(pc, ref);
-      }
-      else // ref == NULL
-      {
-         (pos == direction_e::FORWARD) ? g_cl.AddHead(pc) : g_cl.AddTail(pc);
-      }
-      chunk_log(pc, "chunk_add(A):");
-   }
-   return(pc);
-} // chunk_add
-
-
-chunk_t *chunk_get_next_ssq(chunk_t *cur)
-{
-   while (  chunk_is_token(cur, CT_TSQUARE)
-         || chunk_is_token(cur, CT_SQUARE_OPEN))
-   {
-      if (chunk_is_token(cur, CT_SQUARE_OPEN))
-      {
-         cur = chunk_skip_to_match(cur);
-      }
-      cur = chunk_get_next_ncnnl(cur);
-   }
-   return(cur);
-}
-
-
-chunk_t *chunk_get_prev_ssq(chunk_t *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 = chunk_get_prev_ncnnl(cur);
-   }
-   return(cur);
-}
-
-
-chunk_t *chunk_get_pp_start(chunk_t *cur)
-{
-   if (!chunk_is_preproc(cur))
-   {
-      return(nullptr);
-   }
-
-   while (!chunk_is_token(cur, CT_PREPROC))
-   {
-      cur = chunk_get_prev(cur, scope_e::PREPROC);
-   }
-   return(cur);
-}
-
-
-//! skip to the final word/type in a :: chain
-static chunk_t *chunk_skip_dc_member(chunk_t *start, scope_e scope, direction_e dir)
-{
-   LOG_FUNC_ENTRY();
-
-   if (start == nullptr)
-   {
-      return(nullptr);
-   }
-   const auto step_fcn = (dir == direction_e::FORWARD)
-                         ? chunk_get_next_ncnnl : chunk_get_prev_ncnnl;
-
-   chunk_t *pc   = start;
-   chunk_t *next = chunk_is_token(pc, CT_DC_MEMBER) ? pc : step_fcn(pc, scope);
-
-   while (chunk_is_token(next, CT_DC_MEMBER))
-   {
-      pc = step_fcn(next, scope);
-
-      if (pc == nullptr)
-      {
-         return(nullptr);
-      }
-      next = step_fcn(pc, scope);
-   }
-   return(pc);
-}
-
-
-chunk_t *chunk_skip_dc_member(chunk_t *start, scope_e scope)
-{
-   return(chunk_skip_dc_member(start, scope, direction_e::FORWARD));
-}
-
-
-chunk_t *chunk_skip_dc_member_rev(chunk_t *start, scope_e scope)
-{
-   return(chunk_skip_dc_member(start, scope, direction_e::BACKWARD));
-}
-
-
-// set parent member
-void chunk_set_parent(chunk_t *pc, chunk_t *parent)
-{
-   if (pc == nullptr)
-   {
-      return;
-   }
-
-   if (parent == nullptr)
-   {
-      return;
-   }
-
-   if (pc == parent)
-   {
-      return;
-   }
-   pc->parent = parent;
-}
-
-
-c_token_t get_type_of_the_parent(chunk_t *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_t *pc)
-{
-   return(  language_is_set(LANG_CPP)
-         && (  chunk_is_token(pc, CT_ATTRIBUTE)
-            || chunk_is_token(pc, CT_DECLSPEC)));
-}
-
-
-bool chunk_is_class_enum_struct_union(chunk_t *pc)
-{
-   return(  chunk_is_class_or_struct(pc)
-         || chunk_is_enum(pc)
-         || chunk_is_token(pc, CT_UNION));
-}
-
-
-bool chunk_is_class_or_struct(chunk_t *pc)
-{
-   return(  chunk_is_token(pc, CT_CLASS)
-         || chunk_is_token(pc, CT_STRUCT));
-}
-
-
-bool chunk_is_class_struct_union(chunk_t *pc)
-{
-   return(  chunk_is_class_or_struct(pc)
-         || chunk_is_token(pc, CT_UNION));
-}
-
-
-bool chunk_is_enum(chunk_t *pc)
-{
-   return(  chunk_is_token(pc, CT_ENUM)
-         || chunk_is_token(pc, CT_ENUM_CLASS));
-}
-
-
-int chunk_compare_position(const chunk_t *A_token, const chunk_t *B_token)
-{
-   if (A_token == nullptr)
-   {
-      assert(A_token);
-   }
-
-   if (B_token == nullptr)
-   {
-      assert(B_token);
-   }
-
-   if (A_token->orig_line < B_token->orig_line)
-   {
-      return(-1);
-   }
-   else if (A_token->orig_line == B_token->orig_line)
-   {
-      if (A_token->orig_col < B_token->orig_col)
-      {
-         return(-1);
-      }
-      else if (A_token->orig_col == B_token->orig_col)
-      {
-         return(0);
-      }
-   }
-   return(1);
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/chunk_list.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/chunk_list.h
deleted file mode 100644
index 1368c5d2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/chunk_list.h
+++ /dev/null
@@ -1,1032 +0,0 @@
-/**
- * @file chunk_list.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 scope_e : unsigned int
-{
-   ALL,      //! search in all kind of chunks
-   PREPROC,  //! search only in preprocessor chunks
-};
-
-
-/**
- * duplicate a chunk in a chunk list
- *
- * @param pc_in  chunk to duplicate
- */
-chunk_t *chunk_dup(const chunk_t *pc_in);
-
-
-/**
- * @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_t *chunk_add_after(const chunk_t *pc_in, chunk_t *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_t *chunk_add_before(const chunk_t *pc_in, chunk_t *ref);
-
-
-/**
- * delete a chunk from a chunk list
- *
- * @param pc  chunk to delete
- */
-void chunk_del(chunk_t * &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_t *pc_in, chunk_t *ref);
-
-
-/**
- * @brief returns the head of a chunk list
- *
- * @return pointer to the first chunk
- */
-chunk_t *chunk_get_head(void);
-
-
-//! get the last chunk in a chunk list
-chunk_t *chunk_get_tail(void);
-
-
-/**
- * @brief returns the next chunk in a list of chunks
- *
- * @param cur    chunk to use as start point
- * @param scope  code region to search in
- *
- * @return pointer to next chunk or nullptr if no chunk was found
- */
-chunk_t *chunk_get_next(chunk_t *cur, scope_e scope = scope_e::ALL);
-
-
-/**
- * @brief returns the previous chunk in a list of chunks
- *
- * @param cur    chunk to use as start point
- * @param scope  code region to search in
- *
- * @return pointer to previous chunk or nullptr if no chunk was found
- */
-chunk_t *chunk_get_prev(chunk_t *cur, scope_e scope = scope_e::ALL);
-
-
-/**
- * Swaps two chunks
- *
- * @param pc1  The first chunk
- * @param pc2  The second chunk
- */
-void chunk_swap(chunk_t *pc1, chunk_t *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_t *pc1, chunk_t *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_t *chunk_first_on_line(chunk_t *pc);
-
-
-//! check if a given chunk is the last on its line
-bool chunk_is_last_on_line(chunk_t &pc);
-
-
-/**
- * Gets the next NEWLINE chunk
- *
- * @param cur    chunk to use as start point
- * @param scope  code region to search in
- */
-chunk_t *chunk_get_next_nl(chunk_t *cur, scope_e scope = scope_e::ALL);
-
-
-/**
- * Gets the next non-comment chunk
- *
- * @param cur    chunk to use as start point
- * @param scope  code region to search in
- */
-chunk_t *chunk_get_next_nc(chunk_t *cur, scope_e scope = scope_e::ALL);
-
-
-/**
- * Gets the next non-NEWLINE
- *
- * @param cur    chunk to use as start point
- * @param scope  code region to search in
- */
-chunk_t *chunk_get_next_nnl(chunk_t *cur, scope_e scope = scope_e::ALL);
-
-
-/**
- * Gets the next non-NEWLINE and non-comment chunk
- *
- * @param cur    chunk to use as start point
- * @param scope  code region to search in
- */
-chunk_t *chunk_get_next_ncnnl(chunk_t *cur, scope_e scope = scope_e::ALL);
-
-
-/**
- * Gets the next non-NEWLINE and non-comment chunk, non-preprocessor chunk
- *
- * @param cur    chunk to use as start point
- * @param scope  code region to search in
- */
-chunk_t *chunk_get_next_ncnnlnp(chunk_t *cur, scope_e scope = scope_e::ALL);
-
-
-/**
- * Gets the next non-NEWLINE and non-comment chunk inside a preprocessor block
- *
- * @param cur    chunk to use as start point
- * @param scope  code region to search in
- */
-chunk_t *chunk_get_next_ncnnl_in_pp(chunk_t *cur, scope_e scope = scope_e::ALL);
-
-
-/**
- * Gets the next non-NEWLINE and non-comment chunk (preprocessor aware).
- * Unlike chunk_get_next_ncnnl, this will also ignore a line continuation if
- * the starting chunk is in a preprocessor directive, and may return a newline
- * if the search reaches the end of a preprocessor directive.
- *
- * @param cur    chunk to use as start point
- * @param scope  code region to search in
- */
-chunk_t *chunk_ppa_get_next_ncnnl(chunk_t *cur);
-
-
-/**
- * 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
- * @param  scope  code region to search in
- *
- * @return nullptr or the next chunk not in or part of square brackets
- */
-chunk_t *chunk_get_next_nisq(chunk_t *cur, scope_e scope = scope_e::ALL);
-
-
-/**
- * Gets the next non-blank chunk
- *
- * @param cur    chunk to use as start point
- * @param scope  code region to search in
- */
-chunk_t *chunk_get_next_nblank(chunk_t *cur, scope_e scope = scope_e::ALL);
-
-
-/**
- * Gets the prev non-blank chunk
- *
- * @param cur    chunk to use as start point
- * @param scope  code region to search in
- */
-chunk_t *chunk_get_prev_nblank(chunk_t *cur, scope_e scope = scope_e::ALL);
-
-
-/**
- * Gets the prev NEWLINE chunk
- *
- * @param cur    chunk to use as start point
- * @param scope  code region to search in
- */
-chunk_t *chunk_get_prev_nl(chunk_t *cur, scope_e scope = scope_e::ALL);
-
-
-/**
- * Gets the prev non-comment chunk
- *
- * @param cur    chunk to use as start point
- * @param scope  code region to search in
- */
-chunk_t *chunk_get_prev_nc(chunk_t *cur, scope_e scope = scope_e::ALL);
-
-
-/**
- * Gets the prev non-NEWLINE chunk
- *
- * @param cur    chunk to use as start point
- * @param scope  code region to search in
- */
-chunk_t *chunk_get_prev_nnl(chunk_t *cur, scope_e scope = scope_e::ALL);
-
-
-/**
- * Gets the prev non-NEWLINE and non-comment chunk
- *
- * @param cur    chunk to use as start point
- * @param scope  code region to search in
- */
-chunk_t *chunk_get_prev_ncnnl(chunk_t *cur, scope_e scope = scope_e::ALL);
-
-
-/**
- * Gets the prev non-NEWLINE and non-comment chunk inside a preprocessor block
- *
- * @param cur    chunk to use as start point
- * @param scope  code region to search in
- */
-chunk_t *chunk_get_prev_ncnnl_in_pp(chunk_t *cur, scope_e scope = scope_e::ALL);
-
-
-/**
- * Gets the prev non-NEWLINE and non-comment and non-ignored chunk
- *
- * @param cur    chunk to use as start point
- * @param scope  code region to search in
- */
-chunk_t *chunk_get_prev_ncnnlni(chunk_t *cur, scope_e scope = scope_e::ALL);
-
-
-/**
- * Gets the prev non-NEWLINE and non-comment chunk, non-preprocessor chunk
- *
- * @param cur    chunk to use as start point
- * @param scope  code region to search in
- */
-chunk_t *chunk_get_prev_ncnnlnp(chunk_t *cur, scope_e scope = scope_e::ALL);
-
-
-/**
- * Grabs the next chunk of the given type at the level.
- *
- * @param cur    chunk to use as start point
- * @param type   the type to look for
- * @param level  -1 or ANY_LEVEL (any level) or the level to match
- * @param scope  code region to search in
- *
- * @return nullptr or the match
- */
-chunk_t *chunk_get_next_type(chunk_t *cur, c_token_t type, int level, scope_e scope = scope_e::ALL);
-
-
-/**
- * Grabs the prev chunk of the given type at the level.
- *
- * @param cur    chunk to use as start point
- * @param type   The type to look for
- * @param level  -1 or ANY_LEVEL (any level) or the level to match
- * @param scope  code region to search in
- *
- * @return nullptr or the match
- */
-chunk_t *chunk_get_prev_type(chunk_t *cur, c_token_t type, int level, scope_e scope = scope_e::ALL);
-
-
-/**
- * @brief find a chunk that holds a given string
- *
- * Traverses a chunk list in forward direction until a chunk of a given category is found.
- *
- * @param cur    chunk to use as start point
- * @param str    string to search for
- * @param len    length of string
- * @param level  the level to match or -1 or ANY_LEVEL
- * @param scope  code region to search in
- *
- * @retval nullptr  no chunk found or invalid parameters provided
- * @retval chunk_t  pointer to the found chunk
- */
-chunk_t *chunk_get_next_str(chunk_t *cur, const char *str, size_t len, int level, scope_e scope = scope_e::ALL);
-
-
-/**
- * @brief find a chunk that holds a given string
- *
- * Traverses a chunk list in backward direction until a chunk of a given category is found.
- *
- * @param cur    chunk to use as start point
- * @param str    string to search for
- * @param len    length of string
- * @param level  the level to match or -1 or ANY_LEVEL
- * @param scope  code region to search in
- *
- * @retval nullptr  no chunk found or invalid parameters provided
- * @retval chunk_t  pointer to the found chunk
- */
-chunk_t *chunk_get_prev_str(chunk_t *cur, const char *str, size_t len, int level, scope_e scope = scope_e::ALL);
-
-
-/**
- * @brief Gets the next non-vbrace chunk
- *
- * @param  cur    chunk to start search
- * @param  scope  chunk section to consider
- *
- * @return pointer to found chunk or nullptr if no chunk was found
- */
-chunk_t *chunk_get_next_nvb(chunk_t *cur, const scope_e scope = scope_e::ALL);
-
-
-/**
- * @brief Gets the previous non-vbrace chunk
- *
- * @param  cur    chunk to start search
- * @param  scope  chunk section to consider
- *
- * @return pointer to found chunk or nullptr if no chunk was found
- */
-chunk_t *chunk_get_prev_nvb(chunk_t *cur, const scope_e scope = scope_e::ALL);
-
-
-/**
- * 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_t *chunk_get_next_ssq(chunk_t *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_t *chunk_get_prev_ssq(chunk_t *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_t *chunk_get_pp_start(chunk_t *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_t  pointer to the found object
- */
-chunk_t *chunk_search_prev_cat(chunk_t *pc, const c_token_t 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_t  pointer to the found object
- */
-chunk_t *chunk_search_next_cat(chunk_t *pc, const c_token_t 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_t *start, chunk_t *end);
-
-/*
- * TODO: better move the function implementations to the source file.
- * No need to make the implementation public.
- */
-
-
-/*
- * TODO: I doubt that inline is required for the functions below.
- * The compiler should know how to optimize the code itself.
- * To clarify do a profiling run with and without inline
- */
-static inline bool is_expected_type_and_level(chunk_t *pc, c_token_t type, int level)
-{
-   // we don't care if the pointer is invalid or about the level (if it is negative),
-   // or it is as expected and the type is as expected
-   return(  pc == nullptr
-         || (  (  level < 0
-               || pc->level == static_cast<size_t>(level))
-            && pc->type == type));
-}
-
-
-static inline bool is_expected_string_and_level(chunk_t *pc, const char *str, int level, size_t len)
-{
-   // we don't care if the pointer is invalid or about the level (if it is negative) or it is as expected
-   return(  pc == nullptr
-         || (  (  level < 0
-               || pc->level == static_cast<size_t>(level))
-            && pc->len() == len                        // and the length is as expected
-            && memcmp(str, pc->text(), len) == 0));    // and the strings are equal
-}
-
-
-static inline bool chunk_is_token(const chunk_t *pc, c_token_t c_token)
-{
-   return(  pc != nullptr
-         && pc->type == c_token);
-}
-
-
-static inline bool chunk_is_not_token(const chunk_t *pc, c_token_t c_token)
-{
-   return(  pc != nullptr
-         && pc->type != c_token);
-}
-
-
-/**
- * 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_t *chunk_skip_to_match(chunk_t *cur, scope_e scope = scope_e::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(chunk_get_next_type(cur, (c_token_t)(cur->type + 1), cur->level, scope));
-   }
-   return(cur);
-}
-
-
-static inline chunk_t *chunk_skip_to_match_rev(chunk_t *cur, scope_e scope = scope_e::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(chunk_get_prev_type(cur, (c_token_t)(cur->type - 1), cur->level, scope));
-   }
-   return(cur);
-}
-
-
-//! skip to the final word/type in a :: chain
-chunk_t *chunk_skip_dc_member(chunk_t *start, scope_e scope = scope_e::ALL);
-chunk_t *chunk_skip_dc_member_rev(chunk_t *start, scope_e scope = scope_e::ALL);
-
-
-/**
- * checks if a chunk is valid and is a comment
- *
- * comment means any kind of
- * - single line comment
- * - multiline comment
- * - C comment
- * - C++ comment
- */
-static inline bool chunk_is_comment(chunk_t *pc)
-{
-   return(  chunk_is_token(pc, CT_COMMENT)
-         || chunk_is_token(pc, CT_COMMENT_MULTI)
-         || chunk_is_token(pc, CT_COMMENT_CPP));
-}
-
-
-/**
- * Returns true if the chunk under test is an inheritance access specifier
- */
-static inline bool chunk_is_cpp_inheritance_access_specifier(chunk_t *pc)
-{
-   return(  language_is_set(LANG_CPP)
-         && pc != nullptr
-         && (  chunk_is_token(pc, CT_ACCESS)
-            || chunk_is_token(pc, CT_QUALIFIER))
-         && (  std::strncmp(pc->str.c_str(), "private", 7) == 0
-            || std::strncmp(pc->str.c_str(), "protected", 9) == 0
-            || std::strncmp(pc->str.c_str(), "public", 6) == 0));
-} // chunk_is_cpp_inheritance_access_specifier
-
-
-static inline bool chunk_is_colon(chunk_t *pc)
-{
-   return(  chunk_is_token(pc, CT_ACCESS_COLON)
-         || chunk_is_token(pc, CT_ASM_COLON)
-         || chunk_is_token(pc, CT_BIT_COLON)
-         || chunk_is_token(pc, CT_CASE_COLON)
-         || chunk_is_token(pc, CT_CLASS_COLON)
-         || chunk_is_token(pc, CT_COLON)
-         || chunk_is_token(pc, CT_COND_COLON)
-         || chunk_is_token(pc, CT_CONSTR_COLON)
-         || chunk_is_token(pc, CT_CS_SQ_COLON)
-         || chunk_is_token(pc, CT_D_ARRAY_COLON)
-         || chunk_is_token(pc, CT_FOR_COLON)
-         || chunk_is_token(pc, CT_LABEL_COLON)
-         || chunk_is_token(pc, CT_OC_COLON)
-         || chunk_is_token(pc, CT_OC_DICT_COLON)
-         || chunk_is_token(pc, CT_TAG_COLON)
-         || chunk_is_token(pc, CT_WHERE_COLON));
-}
-
-
-static inline bool chunk_is_single_line_comment(chunk_t *pc)
-{
-   return(  chunk_is_token(pc, CT_COMMENT)
-         || chunk_is_token(pc, CT_COMMENT_CPP));
-}
-
-
-static inline bool chunk_is_newline(chunk_t *pc)
-{
-   return(  chunk_is_token(pc, CT_NEWLINE)
-         || chunk_is_token(pc, CT_NL_CONT));
-}
-
-
-static inline bool chunk_is_semicolon(chunk_t *pc)
-{
-   return(  chunk_is_token(pc, CT_SEMICOLON)
-         || chunk_is_token(pc, CT_VSEMICOLON));
-}
-
-
-/**
- * checks if a chunk is valid and is a blank character
- *
- * @note check compares if len == 0
- *
- * @todo rename function: blank is a space not an empty string
- */
-static inline bool chunk_is_blank(chunk_t *pc)
-{
-   return(  pc != nullptr
-         && (pc->len() == 0));
-}
-
-
-//! checks if a chunk is valid and either a comment or newline
-static inline bool chunk_is_comment_or_newline(chunk_t *pc)
-{
-   return(  chunk_is_comment(pc)
-         || chunk_is_newline(pc));
-}
-
-
-//! checks if a chunk is valid and either a comment or newline or ignored
-static inline bool chunk_is_comment_or_newline_or_ignored(chunk_t *pc)
-{
-   return(  chunk_is_comment(pc)
-         || chunk_is_newline(pc)
-         || chunk_is_token(pc, CT_IGNORED));
-}
-
-
-static inline bool chunk_is_balanced_square(chunk_t *pc)
-{
-   return(  chunk_is_token(pc, CT_SQUARE_OPEN)
-         || chunk_is_token(pc, CT_TSQUARE)
-         || chunk_is_token(pc, CT_SQUARE_CLOSE));
-}
-
-
-static inline bool chunk_is_preproc(chunk_t *pc)
-{
-   return(  pc != nullptr
-         && pc->flags.test(PCF_IN_PREPROC));
-}
-
-
-static inline bool chunk_is_comment_or_newline_in_preproc(chunk_t *pc)
-{
-   return(  pc != nullptr
-         && chunk_is_preproc(pc)
-         && (  chunk_is_comment(pc)
-            || chunk_is_newline(pc)));
-}
-
-
-static inline bool chunk_is_comment_newline_or_preproc(chunk_t *pc)
-{
-   return(  chunk_is_comment(pc)
-         || chunk_is_newline(pc)
-         || chunk_is_preproc(pc));
-}
-
-
-static inline bool chunk_is_comment_newline_or_blank(chunk_t *pc)
-{
-   return(  chunk_is_comment_or_newline(pc)
-         || chunk_is_blank(pc));
-}
-
-
-static inline bool chunk_is_Doxygen_comment(chunk_t *pc)
-{
-   if (  pc == nullptr
-      || !chunk_is_comment(pc))
-   {
-      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_t *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_t *pc, const char *str, size_t len)
-{
-   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_t *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_t *pc)
-{
-   return(  pc != nullptr
-         && (pc->len() >= 1)
-         && CharTable::IsKw1(pc->str[0]));
-}
-
-
-static inline bool chunk_is_star(chunk_t *pc)
-{
-   return(  pc != nullptr
-         && (pc->len() == 1)
-         && (pc->str[0] == '*')
-         && pc->type != CT_OPERATOR_VAL);
-}
-
-
-static inline bool chunk_is_nullable(chunk_t *pc)
-{
-   return(  language_is_set(LANG_CS)
-         && (pc != nullptr)
-         && (pc->len() == 1)
-         && (pc->str[0] == '?'));
-}
-
-
-static inline bool chunk_is_addr(chunk_t *pc)
-{
-   if (  pc != nullptr
-      && (  chunk_is_token(pc, CT_BYREF)
-         || (  (pc->len() == 1)
-            && (pc->str[0] == '&')
-            && pc->type != CT_OPERATOR_VAL)))
-   {
-      chunk_t *prev = chunk_get_prev(pc);
-
-      if (  pc->flags.test(PCF_IN_TEMPLATE)
-         && (  chunk_is_token(prev, CT_COMMA)
-            || chunk_is_token(prev, CT_ANGLE_OPEN)))
-      {
-         return(false);
-      }
-      return(true);
-   }
-   return(false);
-}
-
-
-static inline bool chunk_is_msref(chunk_t *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_t *pc)
-{
-   return(  (  chunk_is_star(pc)
-            || chunk_is_addr(pc)
-            || chunk_is_msref(pc))
-         || chunk_is_nullable(pc));
-}
-
-
-static inline bool chunk_is_pointer_or_reference(chunk_t *pc)
-{
-   return(  chunk_is_ptr_operator(pc)
-         || chunk_is_token(pc, CT_BYREF));
-}
-
-
-//! Check to see if there is a newline between the two chunks
-bool chunk_is_newline_between(chunk_t *start, chunk_t *end);
-
-
-static inline bool chunk_is_closing_brace(chunk_t *pc)
-{
-   return(  chunk_is_token(pc, CT_BRACE_CLOSE)
-         || chunk_is_token(pc, CT_VBRACE_CLOSE));
-}
-
-
-static inline bool chunk_is_opening_brace(chunk_t *pc)
-{
-   return(  chunk_is_token(pc, CT_BRACE_OPEN)
-         || chunk_is_token(pc, CT_VBRACE_OPEN));
-}
-
-
-static inline bool chunk_is_vbrace(chunk_t *pc)
-{
-   return(  chunk_is_token(pc, CT_VBRACE_CLOSE)
-         || chunk_is_token(pc, CT_VBRACE_OPEN));
-}
-
-
-static inline bool chunk_is_paren_open(chunk_t *pc)
-{
-   return(  chunk_is_token(pc, CT_PAREN_OPEN)
-         || chunk_is_token(pc, CT_SPAREN_OPEN)
-         || chunk_is_token(pc, CT_TPAREN_OPEN)
-         || chunk_is_token(pc, CT_FPAREN_OPEN)
-         || chunk_is_token(pc, CT_LPAREN_OPEN));
-}
-
-
-static inline bool chunk_is_paren_close(chunk_t *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_t *pc1, chunk_t *pc2)
-{
-   return(  pc1 == nullptr
-         || pc2 == nullptr
-         || ((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_t *nl)
-{
-   chunk_t *tmp = chunk_get_prev(nl);
-
-   if (chunk_is_token(tmp, CT_COMMENT_CPP))
-   {
-      return(false);
-   }
-   return(chunk_same_preproc(chunk_get_prev(nl), chunk_get_next(nl)));
-}
-
-
-/**
- * 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_t *pc)
-{
-   if (  language_is_set(LANG_OC)
-      && chunk_is_token(pc, CT_SPAREN_OPEN))
-   {
-      chunk_t *prev = chunk_get_prev_ncnnl(pc);
-
-      if (chunk_is_token(prev, CT_FOR))
-      {
-         chunk_t *next = pc;
-
-         while (  next != nullptr
-               && next->type != CT_SPAREN_CLOSE
-               && next->type != CT_IN)
-         {
-            next = chunk_get_next_ncnnl(next);
-         }
-
-         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_t *pc);
-
-
-/**
- * Returns true if pc is one of CT_CLASS, CT_ENUM, CT_ENUM_CLASS, CT_STRUCT or CT_UNION
- */
-bool chunk_is_class_enum_struct_union(chunk_t *pc);
-
-
-/**
- * Returns true if pc is a CT_CLASS or CT_STRUCT
- */
-bool chunk_is_class_or_struct(chunk_t *pc);
-
-
-/**
- * Returns true if pc is one of CT_CLASS, CT_STRUCT or CT_UNION
- */
-bool chunk_is_class_struct_union(chunk_t *pc);
-
-
-/**
- * Returns true if pc is a CT_ENUM or CT_ENUM_CLASS
- */
-bool chunk_is_enum(chunk_t *pc);
-
-
-void set_chunk_type_real(chunk_t *pc, c_token_t tt, const char *func, int line);
-
-
-void set_chunk_parent_real(chunk_t *pc, c_token_t tt, const char *func, int line);
-
-
-#define set_chunk_type(pc, tt)      set_chunk_type_real((pc), (tt), __unqualified_func__, __LINE__)
-
-
-#define set_chunk_parent(pc, tt)    set_chunk_parent_real((pc), (tt), __unqualified_func__, __LINE__)
-
-
-c_token_t get_chunk_parent_type(chunk_t *pc);
-
-
-void chunk_flags_set_real(chunk_t *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_t *pc, chunk_t *parent);
-
-
-c_token_t get_type_of_the_parent(chunk_t *pc);
-
-
-/**
- * @brief compare the positions of two tokens in a file.
- *
- * The function compares the two positions of two tokens.
- *
- * @param A_token
- * @param B_token
- *
- * @return returns an integer less than, equal to, or greater than zero
- *         if A_token is found, respectively, to be less/before than, to
- *         match, or be greater/after than B_token.
- */
-int chunk_compare_position(const chunk_t *A_token, const chunk_t *B_token);
-
-
-#endif /* CHUNK_LIST_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/enum_cleanup.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/enum_cleanup.cpp
deleted file mode 100644
index 7c04fbb0..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/enum_cleanup.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-/**
- * @file enum_cleanup.cpp
- * works on the last comma withing enum
- *
- * @author  Guy Maurel Juli 2018
- * @license GPL v2+
- */
-
-#include "enum_cleanup.h"
-
-#include "log_rules.h"
-
-constexpr static auto LCURRENT = LTOK;
-
-using namespace uncrustify;
-
-
-void enum_cleanup(void)
-{
-   LOG_FUNC_ENTRY();
-
-   log_rule_B("mod_enum_last_comma");
-
-   if (options::mod_enum_last_comma() == IARF_IGNORE)
-   {
-      // nothing to do
-      return;
-   }
-   chunk_t *pc = chunk_get_head();  // Issue #858
-
-   while (pc != nullptr)
-   {
-      if (  get_chunk_parent_type(pc) == CT_ENUM
-         && chunk_is_token(pc, 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));
-         chunk_t *prev = chunk_get_prev_ncnnlnp(pc);
-
-         // test of (prev == nullptr) is not necessary
-         if (chunk_is_token(prev, CT_COMMA))
-         {
-            log_rule_B("mod_enum_last_comma");
-
-            if (options::mod_enum_last_comma() == IARF_REMOVE)
-            {
-               chunk_del(prev);
-            }
-         }
-         else
-         {
-            if (chunk_is_token(prev, CT_BRACE_OPEN))                // Issue #2902
-            {
-               // nothing betwen CT_BRACE_OPEN and CT_BRACE_CLOSE
-            }
-            else
-            {
-               log_rule_B("mod_enum_last_comma");
-
-               if (  options::mod_enum_last_comma() == IARF_ADD
-                  || options::mod_enum_last_comma() == IARF_FORCE)
-               {
-                  // create a comma
-                  chunk_t 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       = ",";
-                  chunk_add_after(&comma, prev);
-               }
-            }
-         }
-      }
-      pc = chunk_get_next(pc);
-   }
-} // enum_cleanup
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/flag_decltype.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/flag_decltype.cpp
deleted file mode 100644
index c5cc0134..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/flag_decltype.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * @file flag_decltype.cpp
- *
- * @license GPL v2+
- */
-
-#include "chunk_list.h"
-
-
-bool flag_cpp_decltype(chunk_t *pc)
-{
-   LOG_FUNC_ENTRY();
-
-   if (chunk_is_token(pc, CT_DECLTYPE))
-   {
-      auto paren_open = chunk_get_next_ncnnl(pc);
-
-      if (chunk_is_token(paren_open, CT_PAREN_OPEN))
-      {
-         auto close_paren = chunk_skip_to_match(paren_open);
-
-         if (close_paren != nullptr)
-         {
-            pc = paren_open;
-
-            do
-            {
-               chunk_flags_set(pc, PCF_IN_DECLTYPE);
-               pc = pc->next;
-            } while (pc != close_paren);
-
-            return(true);
-         }
-      }
-   }
-   return(false);
-} // mark_cpp_decltype
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/parens.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/parens.cpp
deleted file mode 100644
index 51ee4710..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/parens.cpp
+++ /dev/null
@@ -1,205 +0,0 @@
-/**
- * @file parens.cpp
- * Adds or removes parens.
- *
- * @author  Ben Gardner
- * @license GPL v2+
- */
-
-#include "parens.h"
-
-#include "log_rules.h"
-
-using namespace uncrustify;
-
-
-//! Add an open parenthesis after first and add a close parenthesis before the last
-static void add_parens_between(chunk_t *first, chunk_t *last);
-
-
-/**
- * Scans between two parens and adds additional parens if needed.
- * This function is recursive. If it hits another open paren, it'll call itself
- * with the new bounds.
- *
- * Adds optional parens in an IF or SWITCH conditional statement.
- *
- * This basically just checks for a CT_COMPARE that isn't surrounded by parens.
- * The edges for the compare are the open, close and any CT_BOOL tokens.
- *
- * This only handles VERY simple patterns:
- *   (!a && b)         => (!a && b)          -- no change
- *   (a && b == 1)     => (a && (b == 1))
- *   (a == 1 || b > 2) => ((a == 1) || (b > 2))
- *
- * FIXME: we really should bail if we transition between a preprocessor and
- *        a non-preprocessor
- */
-static void check_bool_parens(chunk_t *popen, chunk_t *pclose, int nest);
-
-
-void do_parens(void)
-{
-   constexpr static auto LCURRENT = LPARADD;
-
-   LOG_FUNC_ENTRY();
-
-   log_rule_B("mod_full_paren_if_bool");
-
-   if (options::mod_full_paren_if_bool())
-   {
-      chunk_t *pc = chunk_get_head();
-
-      while ((pc = chunk_get_next_ncnnl(pc)) != nullptr)
-      {
-         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))
-         {
-            continue;
-         }
-         // Grab the close sparen
-         chunk_t *pclose = chunk_get_next_type(pc, CT_SPAREN_CLOSE, pc->level, scope_e::PREPROC);
-
-         if (pclose != nullptr)
-         {
-            check_bool_parens(pc, pclose, 0);
-            pc = pclose;
-         }
-      }
-   }
-}
-
-
-static void add_parens_between(chunk_t *first, chunk_t *last)
-{
-   LOG_FUNC_ENTRY();
-
-   LOG_FMT(LPARADD, "%s: line %zu between %s [lvl=%zu] and %s [lvl=%zu]\n",
-           __func__, first->orig_line,
-           first->text(), first->level,
-           last->text(), last->level);
-
-   // Don't do anything if we have a bad sequence, ie "&& )"
-   chunk_t *first_n = chunk_get_next_ncnnl(first);
-
-   if (first_n == last)
-   {
-      return;
-   }
-   chunk_t 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;
-
-   chunk_add_before(&pc, first_n);
-
-   chunk_t *last_p = chunk_get_prev_ncnnl(last, scope_e::PREPROC);
-
-   set_chunk_type(&pc, CT_PAREN_CLOSE);
-   pc.orig_line   = last_p->orig_line;
-   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;
-
-   chunk_add_after(&pc, last_p);
-
-   for (chunk_t *tmp = first_n;
-        tmp != last_p;
-        tmp = chunk_get_next_ncnnl(tmp))
-   {
-      tmp->level++;
-   }
-
-   last_p->level++;
-} // add_parens_between
-
-
-static void check_bool_parens(chunk_t *popen, chunk_t *pclose, int nest)
-{
-   LOG_FUNC_ENTRY();
-
-   chunk_t *ref        = popen;
-   bool    hit_compare = false;
-
-   LOG_FMT(LPARADD, "%s(%d): popen on %zu, col %zu, pclose on %zu, col %zu, level=%zu\n",
-           __func__, nest,
-           popen->orig_line, popen->orig_col,
-           pclose->orig_line, pclose->orig_col,
-           popen->level);
-
-   chunk_t *pc = popen;
-
-   while (  (pc = chunk_get_next_ncnnl(pc)) != nullptr
-         && pc != pclose)
-   {
-      if (pc->flags.test(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);
-         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))
-      {
-         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);
-
-         if (hit_compare)
-         {
-            hit_compare = false;
-
-            if (!language_is_set(LANG_CS))
-            {
-               add_parens_between(ref, pc);
-            }
-         }
-         ref = pc;
-      }
-      else if (chunk_is_token(pc, CT_COMPARE))
-      {
-         LOG_FMT(LPARADD2, " -- compare [%s] at line %zu col %zu, level %zu\n",
-                 pc->text(), pc->orig_line, pc->orig_col, pc->level);
-         hit_compare = true;
-      }
-      else if (chunk_is_paren_open(pc))
-      {
-         chunk_t *next = chunk_skip_to_match(pc);
-
-         if (next != nullptr)
-         {
-            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))
-      {
-         // Skip [], {}, and <>
-         pc = chunk_skip_to_match(pc);
-      }
-   }
-
-   if (  hit_compare
-      && ref != popen
-      && !language_is_set(LANG_CS))
-   {
-      add_parens_between(ref, pclose);
-   }
-} // check_bool_parens
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/uncrustify_limits.h b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/uncrustify_limits.h
deleted file mode 100644
index a03591e7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/uncrustify_limits.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#pragma once
-
-namespace uncrustify
-{
-
-namespace limits
-{
-
-static constexpr int MAX_OPTION_NAME_LEN = 32;
-static constexpr int AL_SIZE             = 8000;
-
-} // namespace limits
-
-} // namespace uncrustify
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/output/36.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/output/36.txt
deleted file mode 100644
index 892f5af5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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.74.0/tests/cli/output/class_enum_struct_union.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/output/class_enum_struct_union.txt
deleted file mode 100644
index 4cf1a681..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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][  2001c0001][0-0] #
-#  23>          PP_DEFINE|               NONE|     PARENT_NOT_SET[  2/  2/  8/  0][1/1/0][      20001][0-0]  define
-#  23>         MACRO_FUNC|               NONE|     PARENT_NOT_SET[  9/  9/ 16/  1][1/1/0][      80001][0-0]         ALIGNAS
-#  23>        FPAREN_OPEN|         MACRO_FUNC|     PARENT_NOT_SET[ 16/ 16/ 17/  0][1/1/0][  200000001][0-0]                (
-#  23>               WORD|               NONE|     PARENT_NOT_SET[ 17/ 17/ 31/  0][1/2/0][      80011][0-0]                 byte_alignment
-#  23>       FPAREN_CLOSE|         MACRO_FUNC|     PARENT_NOT_SET[ 31/ 31/ 32/  0][1/1/0][  200000011][0-0]                               )
-#  23>          ATTRIBUTE|               NONE|     PARENT_NOT_SET[ 33/ 33/ 46/  1][1/1/0][          1][0-0]                                 __attribute__
-#  23>        FPAREN_OPEN|          ATTRIBUTE|     PARENT_NOT_SET[ 46/ 46/ 47/  0][1/1/0][  200000001][0-0]                                              (
-#  23>         PAREN_OPEN|               NONE|     PARENT_NOT_SET[ 47/ 47/ 48/  0][1/2/0][  200080001][0-0]                                               (
-#  23>          FUNC_CALL|               NONE|     PARENT_NOT_SET[ 48/ 48/ 55/  0][1/3/0][      80001][0-0]                                                aligned
-#  23>        FPAREN_OPEN|          FUNC_CALL|     PARENT_NOT_SET[ 55/ 55/ 56/  0][1/3/0][  200000001][0-0]                                                       (
-#  23>               WORD|               NONE|     PARENT_NOT_SET[ 56/ 56/ 70/  0][1/4/0][      80011][0-0]                                                        byte_alignment
-#  23>       FPAREN_CLOSE|          FUNC_CALL|     PARENT_NOT_SET[ 70/ 70/ 71/  0][1/3/0][  200000011][0-0]                                                                      )
-#  23>        PAREN_CLOSE|               NONE|     PARENT_NOT_SET[ 71/ 71/ 72/  0][1/2/0][  200000001][0-0]                                                                       )
-#  23>       FPAREN_CLOSE|          ATTRIBUTE|     PARENT_NOT_SET[ 72/ 72/ 73/  0][1/1/0][  200000001][0-0]                                                                        )
-#  23>            NEWLINE|               NONE|     PARENT_NOT_SET[ 73/ 73/  1/  0][0/0/0][          0][2-0]
-#  25>            PREPROC|              PP_IF|     PARENT_NOT_SET[  1/  1/  2/  0][0/0/0][  200100001][0-0] #
-#  25>              PP_IF|               NONE|     PARENT_NOT_SET[  2/  2/  4/  0][0/0/1][      20001][0-0]  if
-#  25>         PP_DEFINED|               NONE|     PARENT_NOT_SET[  5/  5/ 12/  1][0/0/1][      80001][0-0]     defined
-#  25>         PAREN_OPEN|               NONE|     PARENT_NOT_SET[ 13/ 13/ 14/  1][0/0/1][  200000001][0-0]             (
-#  25>               WORD|               NONE|     PARENT_NOT_SET[ 14/ 14/ 22/  0][0/0/1][      80001][0-0]              __unix__
-#  25>        PAREN_CLOSE|               NONE|     PARENT_NOT_SET[ 22/ 22/ 23/  0][0/0/1][  200000001][0-0]                      )
-#  25>               BOOL|               NONE|     PARENT_NOT_SET[ 24/ 24/ 26/  1][0/0/1][  200000001][0-0]                        ||
-#  25>         PAREN_OPEN|               NONE|     PARENT_NOT_SET[ 27/ 27/ 28/  1][0/0/1][  200000001][0-0]                           (
-#  25>         PP_DEFINED|               NONE|     PARENT_NOT_SET[ 28/ 28/ 35/  0][0/0/1][      80001][0-0]                            defined
-#  25>         PAREN_OPEN|               NONE|     PARENT_NOT_SET[ 36/ 36/ 37/  1][0/0/1][  200000001][0-0]                                    (
-#  25>               WORD|               NONE|     PARENT_NOT_SET[ 37/ 37/ 46/  0][0/0/1][      80001][0-0]                                     __APPLE__
-#  25>        PAREN_CLOSE|               NONE|     PARENT_NOT_SET[ 46/ 46/ 47/  0][0/0/1][  200000001][0-0]                                              )
-#  25>               BOOL|               NONE|     PARENT_NOT_SET[ 48/ 48/ 50/  1][0/0/1][  200000001][0-0]                                                &&
-#  25>         PP_DEFINED|               NONE|     PARENT_NOT_SET[ 51/ 51/ 58/  1][0/0/1][          1][0-0]                                                   defined
-#  25>         PAREN_OPEN|               NONE|     PARENT_NOT_SET[ 59/ 59/ 60/  1][0/0/1][  200000001][0-0]                                                           (
-#  25>               WORD|               NONE|     PARENT_NOT_SET[ 60/ 60/ 68/  0][0/0/1][      80001][0-0]                                                            __MACH__
-#  25>        PAREN_CLOSE|               NONE|     PARENT_NOT_SET[ 68/ 68/ 69/  0][0/0/1][  200000001][0-0]                                                                    )
-#  25>        PAREN_CLOSE|               NONE|     PARENT_NOT_SET[ 69/ 69/ 70/  0][0/0/1][  200000001][0-0]                                                                     )
-#  25>            NEWLINE|               NONE|     PARENT_NOT_SET[ 70/ 70/  1/  0][0/0/1][          0][1-0]
-#  26>            PREPROC|          PP_DEFINE|     PARENT_NOT_SET[  1/  1/  2/  0][1/1/1][  2001c0001][0-0] #
-#  26>          PP_DEFINE|               NONE|     PARENT_NOT_SET[  2/  2/  8/  0][1/1/1][      20001][0-0]  define
-#  26>              MACRO|               NONE|     PARENT_NOT_SET[  9/  9/ 19/  1][1/1/1][      20001][0-0]         API_EXPORT
-#  26>          ATTRIBUTE|               NONE|     PARENT_NOT_SET[ 20/ 20/ 33/  1][1/1/1][      80001][0-0]                    __attribute__
-#  26>        FPAREN_OPEN|          ATTRIBUTE|     PARENT_NOT_SET[ 34/ 34/ 35/  1][1/1/1][  2000c0001][0-0]                                  (
-#  26>         PAREN_OPEN|               NONE|     PARENT_NOT_SET[ 35/ 35/ 36/  0][1/2/1][  200080001][0-0]                                   (
-#  26>          FUNC_CALL|               NONE|     PARENT_NOT_SET[ 36/ 36/ 46/  0][1/3/1][      80001][0-0]                                    visibility
-#  26>        FPAREN_OPEN|          FUNC_CALL|     PARENT_NOT_SET[ 46/ 46/ 47/  0][1/3/1][  200000001][0-0]                                              (
-#  26>             STRING|         PP_INCLUDE|     PARENT_NOT_SET[ 47/ 47/ 56/  0][1/4/1][      80011][0-0]                                               "default"
-#  26>       FPAREN_CLOSE|          FUNC_CALL|     PARENT_NOT_SET[ 56/ 56/ 57/  0][1/3/1][  200000011][0-0]                                                        )
-#  26>        PAREN_CLOSE|               NONE|     PARENT_NOT_SET[ 57/ 57/ 58/  0][1/2/1][  200000001][0-0]                                                         )
-#  26>       FPAREN_CLOSE|          ATTRIBUTE|     PARENT_NOT_SET[ 58/ 58/ 59/  0][1/1/1][  200000001][0-0]                                                          )
-#  26>            NEWLINE|               NONE|     PARENT_NOT_SET[ 59/ 59/  1/  0][0/0/1][          0][1-0]
-#  27>            PREPROC|            PP_ELSE|     PARENT_NOT_SET[  1/  1/  2/  0][0/0/0][  200100001][0-0] #
-#  27>            PP_ELSE|               NONE|              PP_IF[  2/  2/  6/  0][0/0/1][      20001][0-0]  elif
-#  27>         PP_DEFINED|               NONE|     PARENT_NOT_SET[  7/  7/ 14/  1][0/0/1][      a0001][0-0]       defined
-#  27>               WORD|               NONE|     PARENT_NOT_SET[ 15/ 15/ 21/  1][0/0/1][          1][0-0]               _WIN32
-#  27>            NEWLINE|               NONE|     PARENT_NOT_SET[ 21/ 21/  1/  0][0/0/1][          0][1-0]
-#  28>            PREPROC|          PP_DEFINE|     PARENT_NOT_SET[  1/  1/  2/  0][1/1/1][  2001c0001][0-0] #
-#  28>          PP_DEFINE|               NONE|     PARENT_NOT_SET[  2/  2/  8/  0][1/1/1][      20001][0-0]  define
-#  28>              MACRO|               NONE|     PARENT_NOT_SET[  9/  9/ 19/  1][1/1/1][      20001][0-0]         API_EXPORT
-#  28>           DECLSPEC|               NONE|     PARENT_NOT_SET[ 20/ 20/ 30/  1][1/1/1][      c0001][0-0]                    __declspec
-#  28>         PAREN_OPEN|           DECLSPEC|     PARENT_NOT_SET[ 30/ 30/ 31/  0][1/1/1][  200000001][0-0]                              (
-#  28>               WORD|               NONE|     PARENT_NOT_SET[ 31/ 31/ 40/  0][1/2/1][      80001][0-0]                               dllexport
-#  28>        PAREN_CLOSE|           DECLSPEC|     PARENT_NOT_SET[ 40/ 40/ 41/  0][1/1/1][  200000001][0-0]                                        )
-#  28>            NEWLINE|               NONE|     PARENT_NOT_SET[ 41/ 41/  1/  0][0/0/1][          0][1-0]
-#  29>            PREPROC|            PP_ELSE|     PARENT_NOT_SET[  1/  1/  2/  0][0/0/0][  200100001][0-0] #
-#  29>            PP_ELSE|               NONE|              PP_IF[  2/  2/  6/  0][0/0/1][          1][0-0]  else
-#  29>            NEWLINE|               NONE|     PARENT_NOT_SET[  6/  6/  1/  0][0/0/1][          0][1-0]
-#  30>            PREPROC|          PP_DEFINE|     PARENT_NOT_SET[  1/  1/  2/  0][1/1/1][  2001c0001][0-0] #
-#  30>          PP_DEFINE|               NONE|     PARENT_NOT_SET[  2/  2/  8/  0][1/1/1][      20001][0-0]  define
-#  30>              MACRO|               NONE|     PARENT_NOT_SET[  9/  9/ 19/  1][1/1/1][          1][0-0]         API_EXPORT
-#  30>            NEWLINE|               NONE|     PARENT_NOT_SET[ 19/ 19/  1/  0][0/0/1][          0][1-0]
-#  31>            PREPROC|           PP_ENDIF|     PARENT_NOT_SET[  1/  1/  2/  0][0/0/0][  200100001][0-0] #
-#  31>           PP_ENDIF|               NONE|              PP_IF[  2/  2/  7/  0][0/0/0][          1][0-0]  endif
-#  31>            NEWLINE|               NONE|     PARENT_NOT_SET[  7/  7/  1/  0][0/0/0][          0][2-0]
-#  33>          NAMESPACE|               NONE|     PARENT_NOT_SET[  1/  1/ 10/  0][0/0/0][      e0000][0-0] namespace
-#  33>               WORD|          NAMESPACE|     PARENT_NOT_SET[ 11/ 11/ 26/  1][0/0/0][          0][0-0]           outer_namespace
-#  33>            NEWLINE|               NONE|     PARENT_NOT_SET[ 26/ 26/  1/  0][0/0/0][          0][1-0]
-#  34>         BRACE_OPEN|          NAMESPACE|     PARENT_NOT_SET[  1/  1/  2/  0][0/0/0][  200000000][0-0] {
-#  34>            NEWLINE|               NONE|     PARENT_NOT_SET[  2/  2/  1/  0][1/1/0][       1000][2-0]
-#  36>          NAMESPACE|               NONE|     PARENT_NOT_SET[  1/  1/ 10/  0][1/1/0][      e1000][0-0] namespace
-#  36>               WORD|          NAMESPACE|     PARENT_NOT_SET[ 11/ 11/ 26/  1][1/1/0][       1000][0-0]           inner_namespace
-#  36>            NEWLINE|               NONE|     PARENT_NOT_SET[ 26/ 26/  1/  0][1/1/0][       1000][1-0]
-#  37>         BRACE_OPEN|          NAMESPACE|     PARENT_NOT_SET[  1/  1/  2/  0][1/1/0][  200001000][0-0] {
-#  37>            NEWLINE|               NONE|     PARENT_NOT_SET[  2/  2/  1/  0][2/2/0][       1000][2-0]
-#  39>              CLASS|               NONE|     PARENT_NOT_SET[  1/  1/  6/  0][2/2/0][      e1000][0-0] class
-#  39>               TYPE|              CLASS|     PARENT_NOT_SET[  7/  7/ 12/  1][2/2/0][       1000][0-0]       Base1
-#  39>         BRACE_OPEN|              CLASS|     PARENT_NOT_SET[ 13/ 13/ 14/  1][2/2/0][  2c0001400][0-0]             {
-#  39>        BRACE_CLOSE|              CLASS|     PARENT_NOT_SET[ 15/ 15/ 16/  1][2/2/0][  2c0001400][0-0]               }
-#  39>          SEMICOLON|              CLASS|     PARENT_NOT_SET[ 16/ 16/ 17/  0][2/2/0][  200000000][0-0]                ;
-#  39>            NEWLINE|               NONE|     PARENT_NOT_SET[ 17/ 17/  1/  0][2/2/0][          0][2-0]
-#  41>           TEMPLATE|               NONE|     PARENT_NOT_SET[  1/  1/  9/  0][2/2/0][      c0000][0-0] template
-#  41>         ANGLE_OPEN|           TEMPLATE|     PARENT_NOT_SET[  9/  9/ 10/  0][2/2/0][  200000040][0-0]         <
-#  41>           TYPENAME|               NONE|     PARENT_NOT_SET[ 10/ 10/ 18/  0][2/3/0][      80040][0-0]          typename
-#  41>        ANGLE_CLOSE|           TEMPLATE|     PARENT_NOT_SET[ 18/ 18/ 19/  0][2/2/0][  200000040][0-0]                  >
-#  41>              CLASS|           TEMPLATE|     PARENT_NOT_SET[ 20/ 20/ 25/  1][2/2/0][      a0000][0-0]                    class
-#  41>               TYPE|              CLASS|     PARENT_NOT_SET[ 26/ 26/ 31/  1][2/2/0][          0][0-0]                          Base2
-#  41>         BRACE_OPEN|              CLASS|     PARENT_NOT_SET[ 32/ 32/ 33/  1][2/2/0][  2c0000400][0-0]                                {
-#  41>        BRACE_CLOSE|              CLASS|     PARENT_NOT_SET[ 34/ 34/ 35/  1][2/2/0][  2c0000400][0-0]                                  }
-#  41>          SEMICOLON|              CLASS|     PARENT_NOT_SET[ 35/ 35/ 36/  0][2/2/0][  200000000][0-0]                                   ;
-#  41>            NEWLINE|               NONE|     PARENT_NOT_SET[ 36/ 36/  1/  0][2/2/0][          0][2-0]
-#  43>        BRACE_CLOSE|          NAMESPACE|     PARENT_NOT_SET[  1/  1/  2/  0][1/1/0][  200000000][0-0] }
-#  43>            NEWLINE|               NONE|     PARENT_NOT_SET[  2/  2/  1/  0][1/1/0][          0][2-0]
-#  45>        BRACE_CLOSE|          NAMESPACE|     PARENT_NOT_SET[  1/  1/  2/  0][0/0/0][  200000000][0-0] }
-#  45>            NEWLINE|               NONE|     PARENT_NOT_SET[  2/  2/  1/  0][0/0/0][          0][2-0]
-#  47>        COMMENT_CPP|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  1/ 82/  0][0/0/0][          0][0-0] // template<...> class/struct[<...>] [macros/attributes ...] type : bases ... { }
-#  47>            NEWLINE|               NONE|     PARENT_NOT_SET[ 82/ 82/  1/  0][0/0/0][          0][1-0]
-#  48>           TEMPLATE|               NONE|     PARENT_NOT_SET[  1/  1/  9/  0][0/0/0][      c0000][0-0] template
-#  48>         ANGLE_OPEN|           TEMPLATE|     PARENT_NOT_SET[  9/  9/ 10/  0][0/0/0][  200000040][0-0]         <
-#  48>           TYPENAME|               NONE|     PARENT_NOT_SET[ 10/ 10/ 18/  0][0/1/0][      80040][0-0]          typename
-#  48>              COMMA|               NONE|     PARENT_NOT_SET[ 18/ 18/ 19/  0][0/1/0][  200000040][0-0]                  ,
-#  48>           TYPENAME|               NONE|     PARENT_NOT_SET[ 20/ 20/ 28/  1][0/1/0][      80040][0-0]                    typename
-#  48>           ELLIPSIS|               NONE|     PARENT_NOT_SET[ 29/ 29/ 32/  1][0/1/0][  200000040][0-0]                             ...
-#  48>        ANGLE_CLOSE|           TEMPLATE|     PARENT_NOT_SET[ 32/ 32/ 33/  0][0/0/0][  200000040][0-0]                                >
-#  48>            NEWLINE|               NONE|     PARENT_NOT_SET[ 33/ 33/  1/  0][0/0/0][          0][1-0]
-#  49>              CLASS|           TEMPLATE|     PARENT_NOT_SET[  1/  1/  6/  0][0/0/0][      a0000][0-0] class
-#  49>               WORD|               NONE|     PARENT_NOT_SET[  7/  7/ 17/  1][0/0/0][      20000][0-0]       API_EXPORT
-#  49>          ATTRIBUTE|               NONE|     PARENT_NOT_SET[ 18/ 18/ 31/  1][0/0/0][          0][0-0]                  __attribute__
-#  49>        FPAREN_OPEN|          ATTRIBUTE|     PARENT_NOT_SET[ 31/ 31/ 32/  0][0/0/0][  200000000][0-0]                               (
-#  49>         PAREN_OPEN|               NONE|     PARENT_NOT_SET[ 32/ 32/ 33/  0][0/1/0][  200080000][0-0]                                (
-#  49>               WORD|               NONE|     PARENT_NOT_SET[ 33/ 33/ 47/  0][0/2/0][      80000][0-0]                                 __deprecated__
-#  49>        PAREN_CLOSE|               NONE|     PARENT_NOT_SET[ 47/ 47/ 48/  0][0/1/0][  200000000][0-0]                                               )
-#  49>       FPAREN_CLOSE|          ATTRIBUTE|     PARENT_NOT_SET[ 48/ 48/ 49/  0][0/0/0][  200000000][0-0]                                                )
-#  49>    MACRO_FUNC_CALL|               NONE|     PARENT_NOT_SET[ 50/ 50/ 57/  1][0/0/0][          0][0-0]                                                  ALIGNAS
-#  49>        FPAREN_OPEN|    MACRO_FUNC_CALL|     PARENT_NOT_SET[ 57/ 57/ 58/  0][0/0/0][  200000000][0-0]                                                         (
-#  49>             NUMBER|               NONE|     PARENT_NOT_SET[ 58/ 58/ 59/  0][0/1/0][      80000][0-0]                                                          4
-#  49>       FPAREN_CLOSE|    MACRO_FUNC_CALL|     PARENT_NOT_SET[ 59/ 59/ 60/  0][0/0/0][  200000000][0-0]                                                           )
-#  49>               TYPE|              CLASS|     PARENT_NOT_SET[ 61/ 61/ 63/  1][0/0/0][          0][0-0]                                                             c1
-#  49>            NEWLINE|               NONE|     PARENT_NOT_SET[ 63/ 63/  1/  0][0/0/0][          0][1-0]
-#  50>        CLASS_COLON|              CLASS|     PARENT_NOT_SET[  9/  1/  2/  0][0/0/0][  200000800][0-0]         :
-#  50>          QUALIFIER|               NONE|     PARENT_NOT_SET[ 11/  3/  9/  1][0/0/0][      e0800][0-0]           public
-#  50>               TYPE|               NONE|     PARENT_NOT_SET[ 18/ 10/ 25/  1][0/0/0][        800][0-0]                  outer_namespace
-#  50>          DC_MEMBER|               NONE|     PARENT_NOT_SET[ 33/ 25/ 27/  0][0/0/0][  200000800][0-0]                                 ::
-#  50>               TYPE|               NONE|     PARENT_NOT_SET[ 35/ 27/ 42/  0][0/0/0][        800][0-0]                                   inner_namespace
-#  50>          DC_MEMBER|               NONE|     PARENT_NOT_SET[ 50/ 42/ 44/  0][0/0/0][  200000800][0-0]                                                  ::
-#  50>               TYPE|               NONE|     PARENT_NOT_SET[ 52/ 44/ 49/  0][0/0/0][        800][0-0]                                                    Base1
-#  50>              COMMA|               NONE|     PARENT_NOT_SET[ 57/ 49/ 50/  0][0/0/0][  200000800][0-0]                                                         ,
-#  50>            NEWLINE|               NONE|     PARENT_NOT_SET[ 58/ 50/  3/  0][0/0/0][          0][1-0]
-#  51>          QUALIFIER|               NONE|     PARENT_NOT_SET[  9/  3/  9/  0][0/0/0][      a0800][0-0]         public
-#  51>               TYPE|               NONE|     PARENT_NOT_SET[ 16/ 10/ 25/  1][0/0/0][        800][0-0]                outer_namespace
-#  51>          DC_MEMBER|               NONE|     PARENT_NOT_SET[ 31/ 25/ 27/  0][0/0/0][  200000800][0-0]                               ::
-#  51>               TYPE|               NONE|     PARENT_NOT_SET[ 33/ 27/ 42/  0][0/0/0][        800][0-0]                                 inner_namespace
-#  51>          DC_MEMBER|               NONE|     PARENT_NOT_SET[ 48/ 42/ 44/  0][0/0/0][  200000800][0-0]                                                ::
-#  51>               TYPE|               NONE|     PARENT_NOT_SET[ 50/ 44/ 49/  0][0/0/0][        800][0-0]                                                  Base2
-#  51>         ANGLE_OPEN|           TEMPLATE|     PARENT_NOT_SET[ 55/ 49/ 50/  0][0/0/0][  200000840][0-0]                                                       <
-#  51>               TYPE|               NONE|     PARENT_NOT_SET[ 56/ 50/ 65/  0][0/1/0][      80840][0-0]                                                        outer_namespace
-#  51>          DC_MEMBER|               NONE|     PARENT_NOT_SET[ 71/ 65/ 67/  0][0/1/0][  200000840][0-0]                                                                       ::
-#  51>               TYPE|               NONE|     PARENT_NOT_SET[ 73/ 67/ 82/  0][0/1/0][        840][0-0]                                                                         inner_namespace
-#  51>          DC_MEMBER|               NONE|     PARENT_NOT_SET[ 88/ 82/ 84/  0][0/1/0][  200000840][0-0]                                                                                        ::
-#  51>               TYPE|               NONE|     PARENT_NOT_SET[ 90/ 84/ 89/  0][0/1/0][        840][0-0]                                                                                          Base1
-#  51>        ANGLE_CLOSE|           TEMPLATE|     PARENT_NOT_SET[ 95/ 89/ 90/  0][0/0/0][  200000840][0-0]                                                                                               >
-#  51>            NEWLINE|               NONE|     PARENT_NOT_SET[ 96/ 90/  1/  0][0/0/0][          0][1-0]
-#  52>         BRACE_OPEN|              CLASS|     PARENT_NOT_SET[  1/  1/  2/  0][0/0/0][  280080400][0-0] {
-#  52>            NEWLINE|               NONE|     PARENT_NOT_SET[  2/  2/  1/  0][1/1/0][        400][2-0]
-#  54>        BRACE_CLOSE|              CLASS|     PARENT_NOT_SET[  1/  1/  2/  0][0/0/0][  280000400][0-0] }
-#  54>          SEMICOLON|              CLASS|     PARENT_NOT_SET[  2/  2/  3/  0][0/0/0][  200000000][0-0]  ;
-#  54>            NEWLINE|               NONE|     PARENT_NOT_SET[  3/  3/  1/  0][0/0/0][          0][2-0]
-#  56>        COMMENT_CPP|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  1/ 70/  0][0/0/0][          0][0-0] // template<...> class/struct[<...>] [macros/attributes ...] type { }
-#  56>            NEWLINE|               NONE|     PARENT_NOT_SET[ 70/ 70/  1/  0][0/0/0][          0][1-0]
-#  57>           TEMPLATE|               NONE|     PARENT_NOT_SET[  1/  1/  9/  0][0/0/0][      c0000][0-0] template
-#  57>         ANGLE_OPEN|           TEMPLATE|     PARENT_NOT_SET[  9/  9/ 10/  0][0/0/0][  200000040][0-0]         <
-#  57>           TYPENAME|               NONE|     PARENT_NOT_SET[ 10/ 10/ 18/  0][0/1/0][      80040][0-0]          typename
-#  57>              COMMA|               NONE|     PARENT_NOT_SET[ 18/ 18/ 19/  0][0/1/0][  200000040][0-0]                  ,
-#  57>           TYPENAME|               NONE|     PARENT_NOT_SET[ 20/ 20/ 28/  1][0/1/0][      80040][0-0]                    typename
-#  57>           ELLIPSIS|               NONE|     PARENT_NOT_SET[ 29/ 29/ 32/  1][0/1/0][  200000040][0-0]                             ...
-#  57>        ANGLE_CLOSE|           TEMPLATE|     PARENT_NOT_SET[ 32/ 32/ 33/  0][0/0/0][  200000040][0-0]                                >
-#  57>            NEWLINE|               NONE|     PARENT_NOT_SET[ 33/ 33/  1/  0][0/0/0][          0][1-0]
-#  58>              CLASS|           TEMPLATE|     PARENT_NOT_SET[  1/  1/  6/  0][0/0/0][      a0000][0-0] class
-#  58>               WORD|               NONE|     PARENT_NOT_SET[  7/  7/ 17/  1][0/0/0][      20000][0-0]       API_EXPORT
-#  58>               TYPE|              CLASS|     PARENT_NOT_SET[ 18/ 18/ 20/  1][0/0/0][          0][0-0]                  c2
-#  58>            NEWLINE|               NONE|     PARENT_NOT_SET[ 20/ 20/  1/  0][0/0/0][          0][1-0]
-#  59>         BRACE_OPEN|              CLASS|     PARENT_NOT_SET[  1/  1/  2/  0][0/0/0][  200000400][0-0] {
-#  59>            NEWLINE|               NONE|     PARENT_NOT_SET[  2/  2/  1/  0][1/1/0][        400][1-0]
-#  60>             ACCESS|               NONE|     PARENT_NOT_SET[  1/  1/  7/  0][1/1/0][      c0400][0-0] public
-#  60>       ACCESS_COLON|               NONE|     PARENT_NOT_SET[  7/  7/  8/  0][1/1/0][  200000400][0-0]       :
-#  60>            NEWLINE|               NONE|     PARENT_NOT_SET[  8/  8/  4/  0][1/1/0][        400][2-0]
-#  62>           TEMPLATE|               NONE|     PARENT_NOT_SET[  1/  4/ 12/  0][1/1/0][      c0400][0-0] template
-#  62>         ANGLE_OPEN|           TEMPLATE|     PARENT_NOT_SET[  9/ 12/ 13/  0][1/1/0][  200000440][0-0]         <
-#  62>           TYPENAME|               NONE|     PARENT_NOT_SET[ 10/ 13/ 21/  0][1/2/0][      a0440][0-0]          typename
-#  62>               TYPE|               NONE|     PARENT_NOT_SET[ 19/ 22/ 23/  1][1/2/0][        440][0-0]                   T
-#  62>        ANGLE_CLOSE|           TEMPLATE|     PARENT_NOT_SET[ 20/ 23/ 24/  0][1/1/0][  200000440][0-0]                    >
-#  62>            NEWLINE|               NONE|     PARENT_NOT_SET[ 21/ 24/  4/  0][1/1/0][        400][1-0]
-#  63>             STRUCT|           TEMPLATE|     PARENT_NOT_SET[  1/  4/ 10/  0][1/1/0][      a0400][0-0] struct
-#  63>               TYPE|             STRUCT|     PARENT_NOT_SET[  8/ 11/ 22/  1][1/1/0][        400][0-0]        inner_class
-#  63>            NEWLINE|               NONE|     PARENT_NOT_SET[ 19/ 22/  4/  0][1/1/0][        400][1-0]
-#  64>         BRACE_OPEN|             STRUCT|     PARENT_NOT_SET[  1/  4/  5/  0][1/1/0][  200000400][0-0] {
-#  64>            NEWLINE|               NONE|     PARENT_NOT_SET[  2/  5/  7/  0][2/2/0][        402][1-0]
-#  65>          QUALIFIER|               NONE|     PARENT_NOT_SET[  9/  7/ 13/  0][2/2/0][     8e0402][0-0]         static
-#  65>               TYPE|               NONE|     PARENT_NOT_SET[ 16/ 14/ 25/  1][2/2/0][     800402][0-0]                inner_class
-#  65>         ANGLE_OPEN|           TEMPLATE|     PARENT_NOT_SET[ 27/ 25/ 26/  0][2/2/0][  200000442][0-0]                           <
-#  65>               TYPE|               NONE|     PARENT_NOT_SET[ 28/ 26/ 27/  0][2/3/0][      80442][0-0]                            T
-#  65>        ANGLE_CLOSE|           TEMPLATE|     PARENT_NOT_SET[ 29/ 27/ 28/  0][2/2/0][  200000442][0-0]                             >
-#  65>           PTR_TYPE|               NONE|     PARENT_NOT_SET[ 31/ 29/ 30/  1][2/2/0][  200880402][0-0]                               *
-#  65>               WORD|               NONE|     PARENT_NOT_SET[ 32/ 30/ 43/  0][2/2/0][    3080402][0-0]                                m_inner_class
-#  65>          SEMICOLON|               NONE|     PARENT_NOT_SET[ 45/ 43/ 44/  0][2/2/0][  200000402][0-0]                                             ;
-#  65>            NEWLINE|               NONE|     PARENT_NOT_SET[ 46/ 44/  4/  0][2/2/0][        402][1-0]
-#  66>        BRACE_CLOSE|             STRUCT|     PARENT_NOT_SET[  1/  4/  5/  0][1/1/0][  200000402][0-0] }
-#  66>          SEMICOLON|             STRUCT|     PARENT_NOT_SET[  2/  5/  6/  0][1/1/0][  200000400][0-0]  ;
-#  66>            NEWLINE|               NONE|     PARENT_NOT_SET[  3/  6/  1/  0][1/1/0][        400][1-0]
-#  67>        BRACE_CLOSE|              CLASS|     PARENT_NOT_SET[  1/  1/  2/  0][0/0/0][  200000400][0-0] }
-#  67>          SEMICOLON|              CLASS|     PARENT_NOT_SET[  2/  2/  3/  0][0/0/0][  200000000][0-0]  ;
-#  67>            NEWLINE|               NONE|     PARENT_NOT_SET[  3/  3/  1/  0][0/0/0][          0][2-0]
-#  69>           TEMPLATE|               NONE|     PARENT_NOT_SET[  1/  1/  9/  0][0/0/0][      c0000][0-0] template
-#  69>         ANGLE_OPEN|           TEMPLATE|     PARENT_NOT_SET[  9/  9/ 10/  0][0/0/0][  200000040][0-0]         <
-#  69>        ANGLE_CLOSE|           TEMPLATE|     PARENT_NOT_SET[ 10/ 10/ 11/  0][0/0/0][  200080040][0-0]          >
-#  69>           TEMPLATE|               NONE|     PARENT_NOT_SET[ 12/ 12/ 20/  1][0/0/0][      80000][0-0]            template
-#  69>         ANGLE_OPEN|           TEMPLATE|     PARENT_NOT_SET[ 20/ 20/ 21/  0][0/0/0][  200000040][0-0]                    <
-#  69>        ANGLE_CLOSE|           TEMPLATE|     PARENT_NOT_SET[ 21/ 21/ 22/  0][0/0/0][  200080040][0-0]                     >
-#  69>             STRUCT|           TEMPLATE|     PARENT_NOT_SET[ 23/ 23/ 29/  1][0/0/0][      a0000][0-0]                       struct
-#  69>               WORD|               NONE|     PARENT_NOT_SET[ 30/ 30/ 40/  1][0/0/0][      20000][0-0]                              API_EXPORT
-#  69>               TYPE|               NONE|     PARENT_NOT_SET[ 41/ 41/ 43/  1][0/0/0][          0][0-0]                                         c2
-#  69>         ANGLE_OPEN|           TEMPLATE|     PARENT_NOT_SET[ 43/ 43/ 44/  0][0/0/0][  200000040][0-0]                                           <
-#  69>               TYPE|               NONE|     PARENT_NOT_SET[ 44/ 44/ 47/  0][0/1/0][      80040][0-0]                                            int
-#  69>        ANGLE_CLOSE|           TEMPLATE|     PARENT_NOT_SET[ 47/ 47/ 48/  0][0/0/0][  200000040][0-0]                                               >
-#  69>          DC_MEMBER|               NONE|     PARENT_NOT_SET[ 48/ 48/ 50/  0][0/0/0][  200080000][0-0]                                                ::
-#  69>               TYPE|             STRUCT|     PARENT_NOT_SET[ 50/ 50/ 61/  0][0/0/0][     800000][0-0]                                                  inner_class
-#  69>         ANGLE_OPEN|           TEMPLATE|     PARENT_NOT_SET[ 61/ 61/ 62/  0][0/0/0][  200000040][0-0]                                                             <
-#  69>               TYPE|               NONE|     PARENT_NOT_SET[ 62/ 62/ 65/  0][0/1/0][      80040][0-0]                                                              int
-#  69>        ANGLE_CLOSE|           TEMPLATE|     PARENT_NOT_SET[ 65/ 65/ 66/  0][0/0/0][  200000040][0-0]                                                                 >
-#  69>           PTR_TYPE|               NONE|     PARENT_NOT_SET[ 67/ 67/ 68/  1][0/0/0][  200080000][0-0]                                                                   *
-#  69>               TYPE|               NONE|     PARENT_NOT_SET[ 68/ 68/ 70/  0][0/0/0][      80000][0-0]                                                                    c2
-#  69>         ANGLE_OPEN|           TEMPLATE|     PARENT_NOT_SET[ 70/ 70/ 71/  0][0/0/0][  200000040][0-0]                                                                      <
-#  69>               TYPE|               NONE|     PARENT_NOT_SET[ 71/ 71/ 74/  0][0/1/0][      80040][0-0]                                                                       int
-#  69>        ANGLE_CLOSE|           TEMPLATE|     PARENT_NOT_SET[ 74/ 74/ 75/  0][0/0/0][  200000040][0-0]                                                                          >
-#  69>          DC_MEMBER|               NONE|     PARENT_NOT_SET[ 75/ 75/ 77/  0][0/0/0][  200080000][0-0]                                                                           ::
-#  69>               TYPE|               NONE|     PARENT_NOT_SET[ 77/ 77/ 88/  0][0/0/0][          0][0-0]                                                                             inner_class
-#  69>         ANGLE_OPEN|           TEMPLATE|     PARENT_NOT_SET[ 88/ 88/ 89/  0][0/0/0][  200000040][0-0]                                                                                        <
-#  69>               TYPE|               NONE|     PARENT_NOT_SET[ 89/ 89/ 92/  0][0/1/0][      80040][0-0]                                                                                         int
-#  69>        ANGLE_CLOSE|           TEMPLATE|     PARENT_NOT_SET[ 92/ 92/ 93/  0][0/0/0][  200000040][0-0]                                                                                            >
-#  69>          DC_MEMBER|               NONE|     PARENT_NOT_SET[ 93/ 93/ 95/  0][0/0/0][  200080000][0-0]                                                                                             ::
-#  69>               WORD|               NONE|     PARENT_NOT_SET[ 95/ 95/108/  0][0/0/0][   23000000][0-0]                                                                                               m_inner_class
-#  69>             ASSIGN|               NONE|     PARENT_NOT_SET[109/109/110/  1][0/0/0][  200000000][0-0]                                                                                                             =
-#  69>               WORD|               NONE|     PARENT_NOT_SET[111/111/118/  1][0/0/0][      80000][0-0]                                                                                                               nullptr
-#  69>          SEMICOLON|             STRUCT|     PARENT_NOT_SET[118/118/119/  0][0/0/0][  200000000][0-0]                                                                                                                      ;
-#  69>            NEWLINE|               NONE|     PARENT_NOT_SET[119/119/  1/  0][0/0/0][          0][2-0]
-#  71>        COMMENT_CPP|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  1/ 66/  0][0/0/0][          0][0-0] // template<...> class/struct[<...>] [macros/attributes ...] type
-#  71>            NEWLINE|               NONE|     PARENT_NOT_SET[ 66/ 66/  1/  0][0/0/0][          0][1-0]
-#  72>           TEMPLATE|               NONE|     PARENT_NOT_SET[  1/  1/  9/  0][0/0/0][      c0000][0-0] template
-#  72>         ANGLE_OPEN|           TEMPLATE|     PARENT_NOT_SET[  9/  9/ 10/  0][0/0/0][  200000040][0-0]         <
-#  72>           TYPENAME|               NONE|     PARENT_NOT_SET[ 10/ 10/ 18/  0][0/1/0][      80040][0-0]          typename
-#  72>              COMMA|               NONE|     PARENT_NOT_SET[ 18/ 18/ 19/  0][0/1/0][  200000040][0-0]                  ,
-#  72>           TYPENAME|               NONE|     PARENT_NOT_SET[ 20/ 20/ 28/  1][0/1/0][      80040][0-0]                    typename
-#  72>           ELLIPSIS|               NONE|     PARENT_NOT_SET[ 29/ 29/ 32/  1][0/1/0][  200000040][0-0]                             ...
-#  72>        ANGLE_CLOSE|           TEMPLATE|     PARENT_NOT_SET[ 32/ 32/ 33/  0][0/0/0][  200000040][0-0]                                >
-#  72>            NEWLINE|               NONE|     PARENT_NOT_SET[ 33/ 33/  1/  0][0/0/0][          0][1-0]
-#  73>              CLASS|           TEMPLATE|     PARENT_NOT_SET[  1/  1/  6/  0][0/0/0][1000000a0000][0-0] class
-#  73>               WORD|               NONE|     PARENT_NOT_SET[  7/  7/ 17/  1][0/0/0][100000020000][0-0]       API_EXPORT
-#  73>               TYPE|              CLASS|     PARENT_NOT_SET[ 18/ 18/ 20/  1][0/0/0][100000000000][0-0]                  c2
-#  73>          SEMICOLON|              CLASS|     PARENT_NOT_SET[ 20/ 20/ 21/  0][0/0/0][  200000000][0-0]                    ;
-#  73>            NEWLINE|               NONE|     PARENT_NOT_SET[ 21/ 21/  1/  0][0/0/0][          0][2-0]
-#  75>        COMMENT_CPP|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  1/ 68/  0][0/0/0][          0][0-0] // class/struct [macros/attributes ...] type : bases ... { } x, ...
-#  75>            NEWLINE|               NONE|     PARENT_NOT_SET[ 68/ 68/  1/  0][0/0/0][          0][1-0]
-#  76>              CLASS|               NONE|     PARENT_NOT_SET[  1/  1/  6/  0][0/0/0][      e0000][0-0] class
-#  76>               WORD|               NONE|     PARENT_NOT_SET[  7/  7/ 17/  1][0/0/0][      20000][0-0]       API_EXPORT
-#  76>          ATTRIBUTE|               NONE|     PARENT_NOT_SET[ 18/ 18/ 31/  1][0/0/0][          0][0-0]                  __attribute__
-#  76>        FPAREN_OPEN|          ATTRIBUTE|     PARENT_NOT_SET[ 31/ 31/ 32/  0][0/0/0][  200000000][0-0]                               (
-#  76>         PAREN_OPEN|               NONE|     PARENT_NOT_SET[ 32/ 32/ 33/  0][0/1/0][  200080000][0-0]                                (
-#  76>               WORD|               NONE|     PARENT_NOT_SET[ 33/ 33/ 47/  0][0/2/0][      80000][0-0]                                 __deprecated__
-#  76>        PAREN_CLOSE|               NONE|     PARENT_NOT_SET[ 47/ 47/ 48/  0][0/1/0][  200000000][0-0]                                               )
-#  76>       FPAREN_CLOSE|          ATTRIBUTE|     PARENT_NOT_SET[ 48/ 48/ 49/  0][0/0/0][  200000000][0-0]                                                )
-#  76>    MACRO_FUNC_CALL|               NONE|     PARENT_NOT_SET[ 50/ 50/ 57/  1][0/0/0][          0][0-0]                                                  ALIGNAS
-#  76>        FPAREN_OPEN|    MACRO_FUNC_CALL|     PARENT_NOT_SET[ 57/ 57/ 58/  0][0/0/0][  200000000][0-0]                                                         (
-#  76>             NUMBER|               NONE|     PARENT_NOT_SET[ 58/ 58/ 59/  0][0/1/0][      80000][0-0]                                                          4
-#  76>       FPAREN_CLOSE|    MACRO_FUNC_CALL|     PARENT_NOT_SET[ 59/ 59/ 60/  0][0/0/0][  200000000][0-0]                                                           )
-#  76>               TYPE|              CLASS|     PARENT_NOT_SET[ 61/ 61/ 63/  1][0/0/0][     800000][0-0]                                                             c3
-#  76>            NEWLINE|               NONE|     PARENT_NOT_SET[ 63/ 63/  1/  0][0/0/0][          0][1-0]
-#  77>        CLASS_COLON|              CLASS|     PARENT_NOT_SET[  9/  1/  2/  0][0/0/0][  200000800][0-0]         :
-#  77>          QUALIFIER|               NONE|     PARENT_NOT_SET[ 11/  3/  9/  1][0/0/0][      e0800][0-0]           public
-#  77>               TYPE|               NONE|     PARENT_NOT_SET[ 18/ 10/ 25/  1][0/0/0][        800][0-0]                  outer_namespace
-#  77>          DC_MEMBER|               NONE|     PARENT_NOT_SET[ 33/ 25/ 27/  0][0/0/0][  200000800][0-0]                                 ::
-#  77>               TYPE|               NONE|     PARENT_NOT_SET[ 35/ 27/ 42/  0][0/0/0][        800][0-0]                                   inner_namespace
-#  77>          DC_MEMBER|               NONE|     PARENT_NOT_SET[ 50/ 42/ 44/  0][0/0/0][  200000800][0-0]                                                  ::
-#  77>               TYPE|               NONE|     PARENT_NOT_SET[ 52/ 44/ 49/  0][0/0/0][        800][0-0]                                                    Base2
-#  77>         ANGLE_OPEN|           TEMPLATE|     PARENT_NOT_SET[ 57/ 49/ 50/  0][0/0/0][  200000840][0-0]                                                         <
-#  77>               TYPE|               NONE|     PARENT_NOT_SET[ 58/ 50/ 53/  0][0/1/0][      80840][0-0]                                                          int
-#  77>        ANGLE_CLOSE|           TEMPLATE|     PARENT_NOT_SET[ 61/ 53/ 54/  0][0/0/0][  200000840][0-0]                                                             >
-#  77>              COMMA|               NONE|     PARENT_NOT_SET[ 62/ 54/ 55/  0][0/0/0][  200080800][0-0]                                                              ,
-#  77>            NEWLINE|               NONE|     PARENT_NOT_SET[ 63/ 55/  3/  0][0/0/0][          0][1-0]
-#  78>          QUALIFIER|               NONE|     PARENT_NOT_SET[  9/  3/  9/  0][0/0/0][      a0800][0-0]         public
-#  78>               TYPE|               NONE|     PARENT_NOT_SET[ 16/ 10/ 12/  1][0/0/0][        800][0-0]                c2
-#  78>         ANGLE_OPEN|           TEMPLATE|     PARENT_NOT_SET[ 18/ 12/ 13/  0][0/0/0][  200000840][0-0]                  <
-#  78>               TYPE|               NONE|     PARENT_NOT_SET[ 19/ 13/ 16/  0][0/1/0][      80840][0-0]                   int
-#  78>        ANGLE_CLOSE|           TEMPLATE|     PARENT_NOT_SET[ 22/ 16/ 17/  0][0/0/0][  200000840][0-0]                      >
-#  78>          DC_MEMBER|               NONE|     PARENT_NOT_SET[ 23/ 17/ 19/  0][0/0/0][  200080800][0-0]                       ::
-#  78>               TYPE|               NONE|     PARENT_NOT_SET[ 25/ 19/ 30/  0][0/0/0][        800][0-0]                         inner_class
-#  78>         ANGLE_OPEN|           TEMPLATE|     PARENT_NOT_SET[ 36/ 30/ 31/  0][0/0/0][  200000840][0-0]                                    <
-#  78>               TYPE|               NONE|     PARENT_NOT_SET[ 37/ 31/ 34/  0][0/1/0][      80840][0-0]                                     int
-#  78>        ANGLE_CLOSE|           TEMPLATE|     PARENT_NOT_SET[ 40/ 34/ 35/  0][0/0/0][  200000840][0-0]                                        >
-#  78>            NEWLINE|               NONE|     PARENT_NOT_SET[ 41/ 35/  1/  0][0/0/0][          0][1-0]
-#  79>         BRACE_OPEN|              CLASS|     PARENT_NOT_SET[  1/  1/  2/  0][0/0/0][  200080400][0-0] {
-#  79>            NEWLINE|               NONE|     PARENT_NOT_SET[  2/  2/  1/  0][1/1/0][        400][1-0]
-#  80>             ACCESS|               NONE|     PARENT_NOT_SET[  1/  1/  7/  0][1/1/0][      c0400][0-0] public
-#  80>       ACCESS_COLON|               NONE|     PARENT_NOT_SET[  7/  7/  8/  0][1/1/0][  200000400][0-0]       :
-#  80>            NEWLINE|               NONE|     PARENT_NOT_SET[  8/  8/  4/  0][1/1/0][        400][1-0]
-#  81>     FUNC_CLASS_DEF|               NONE|     PARENT_NOT_SET[  1/  4/  6/  0][1/1/0][      c0400][0-0] c3
-#  81>        FPAREN_OPEN|     FUNC_CLASS_DEF|     PARENT_NOT_SET[  3/  6/  7/  0][1/1/0][  200000500][0-0]   (
-#  81>               TYPE|               NONE|     PARENT_NOT_SET[  4/  7/ 10/  0][1/2/0][   208a0510][0-0]    int
-#  81>               WORD|               NONE|     PARENT_NOT_SET[  8/ 11/ 12/  1][1/2/0][   21000510][0-0]        x
-#  81> ASSIGN_DEFAULT_ARG|         FUNC_PROTO|     PARENT_NOT_SET[ 10/ 13/ 14/  1][1/2/0][  200000510][0-0]          =
-#  81>             NUMBER|               NONE|     PARENT_NOT_SET[ 12/ 15/ 16/  1][1/2/0][      80510][0-0]            0
-#  81>              COMMA|               NONE|     PARENT_NOT_SET[ 13/ 16/ 17/  0][1/2/0][  200000510][0-0]             ,
-#  81>               TYPE|               NONE|     PARENT_NOT_SET[ 15/ 18/ 21/  1][1/2/0][   208a0510][0-0]               int
-#  81>               WORD|               NONE|     PARENT_NOT_SET[ 19/ 22/ 23/  1][1/2/0][   21000510][0-0]                   y
-#  81> ASSIGN_DEFAULT_ARG|         FUNC_PROTO|     PARENT_NOT_SET[ 21/ 24/ 25/  1][1/2/0][  200000510][0-0]                     =
-#  81>             NUMBER|               NONE|     PARENT_NOT_SET[ 23/ 26/ 27/  1][1/2/0][      80510][0-0]                       0
-#  81>              COMMA|               NONE|     PARENT_NOT_SET[ 24/ 27/ 28/  0][1/2/0][  200000510][0-0]                        ,
-#  81>               TYPE|               NONE|     PARENT_NOT_SET[ 26/ 29/ 32/  1][1/2/0][   208a0510][0-0]                          int
-#  81>               WORD|               NONE|     PARENT_NOT_SET[ 30/ 33/ 34/  1][1/2/0][   21000510][0-0]                              z
-#  81> ASSIGN_DEFAULT_ARG|         FUNC_PROTO|     PARENT_NOT_SET[ 32/ 35/ 36/  1][1/2/0][  200000510][0-0]                                =
-#  81>             NUMBER|               NONE|     PARENT_NOT_SET[ 34/ 37/ 38/  1][1/2/0][      80510][0-0]                                  0
-#  81>       FPAREN_CLOSE|     FUNC_CLASS_DEF|     PARENT_NOT_SET[ 35/ 38/ 39/  0][1/1/0][  200000510][0-0]                                   )
-#  81>       CONSTR_COLON|               NONE|     PARENT_NOT_SET[ 37/ 40/ 41/  1][1/1/0][  200000500][0-0]                                     :
-#  81>      FUNC_CTOR_VAR|               NONE|     PARENT_NOT_SET[ 39/ 42/ 45/  1][1/1/0][      c0500][0-0]                                       m_x
-#  81>        FPAREN_OPEN|      FUNC_CTOR_VAR|     PARENT_NOT_SET[ 42/ 45/ 46/  0][1/1/0][  200000500][0-0]                                          (
-#  81>               WORD|               NONE|     PARENT_NOT_SET[ 43/ 46/ 47/  0][1/2/0][      80510][0-0]                                           x
-#  81>       FPAREN_CLOSE|      FUNC_CTOR_VAR|     PARENT_NOT_SET[ 44/ 47/ 48/  0][1/1/0][  200000510][0-0]                                            )
-#  81>              COMMA|               NONE|     PARENT_NOT_SET[ 45/ 48/ 49/  0][1/1/0][  200000500][0-0]                                             ,
-#  81>      FUNC_CTOR_VAR|               NONE|     PARENT_NOT_SET[ 47/ 50/ 53/  1][1/1/0][      80500][0-0]                                               m_y
-#  81>        FPAREN_OPEN|      FUNC_CTOR_VAR|     PARENT_NOT_SET[ 50/ 53/ 54/  0][1/1/0][  200000500][0-0]                                                  (
-#  81>               WORD|               NONE|     PARENT_NOT_SET[ 51/ 54/ 55/  0][1/2/0][      80510][0-0]                                                   y
-#  81>       FPAREN_CLOSE|      FUNC_CTOR_VAR|     PARENT_NOT_SET[ 52/ 55/ 56/  0][1/1/0][  200000510][0-0]                                                    )
-#  81>              COMMA|               NONE|     PARENT_NOT_SET[ 53/ 56/ 57/  0][1/1/0][  200000500][0-0]                                                     ,
-#  81>      FUNC_CTOR_VAR|               NONE|     PARENT_NOT_SET[ 55/ 58/ 61/  1][1/1/0][      80500][0-0]                                                       m_z
-#  81>        FPAREN_OPEN|      FUNC_CTOR_VAR|     PARENT_NOT_SET[ 58/ 61/ 62/  0][1/1/0][  200000500][0-0]                                                          (
-#  81>               WORD|               NONE|     PARENT_NOT_SET[ 59/ 62/ 63/  0][1/2/0][      80510][0-0]                                                           z
-#  81>       FPAREN_CLOSE|      FUNC_CTOR_VAR|     PARENT_NOT_SET[ 60/ 63/ 64/  0][1/1/0][  200000510][0-0]                                                            )
-#  81>         BRACE_OPEN|     FUNC_CLASS_DEF|     PARENT_NOT_SET[ 62/ 65/ 66/  1][1/1/0][  280000400][0-0]                                                              {
-#  81>            NEWLINE|               NONE|     PARENT_NOT_SET[ 63/ 67/  0/  0][1/1/0][        400][1-0]
-#  81>        BRACE_CLOSE|     FUNC_CLASS_DEF|     PARENT_NOT_SET[  1/ 67/ 68/  1][1/1/0][  280000400][0-0] }
-#  81>            NEWLINE|               NONE|     PARENT_NOT_SET[  2/ 68/  4/  0][1/1/0][        400][2-0]
-#  83>               TYPE|               NONE|     PARENT_NOT_SET[  1/  4/  7/  0][1/1/0][     8e0400][0-0] int
-#  83>               WORD|               NONE|     PARENT_NOT_SET[  5/  8/ 11/  1][1/1/0][    3000400][0-0]     m_x
-#  83>          SEMICOLON|               NONE|     PARENT_NOT_SET[  8/ 11/ 12/  0][1/1/0][  200000400][0-0]        ;
-#  83>            NEWLINE|               NONE|     PARENT_NOT_SET[  9/ 12/  4/  0][1/1/0][        400][1-0]
-#  84>               TYPE|               NONE|     PARENT_NOT_SET[  1/  4/  7/  0][1/1/0][     8e0400][0-0] int
-#  84>               WORD|               NONE|     PARENT_NOT_SET[  5/  8/ 11/  1][1/1/0][    3000400][0-0]     m_y
-#  84>          SEMICOLON|               NONE|     PARENT_NOT_SET[  8/ 11/ 12/  0][1/1/0][  200000400][0-0]        ;
-#  84>            NEWLINE|               NONE|     PARENT_NOT_SET[  9/ 12/  4/  0][1/1/0][        400][1-0]
-#  85>               TYPE|               NONE|     PARENT_NOT_SET[  1/  4/  7/  0][1/1/0][     8e0400][0-0] int
-#  85>               WORD|               NONE|     PARENT_NOT_SET[  5/  8/ 11/  1][1/1/0][    3000400][0-0]     m_z
-#  85>          SEMICOLON|               NONE|     PARENT_NOT_SET[  8/ 11/ 12/  0][1/1/0][  200000400][0-0]        ;
-#  85>            NEWLINE|               NONE|     PARENT_NOT_SET[  9/ 12/  1/  0][1/1/0][        400][1-0]
-#  86>        BRACE_CLOSE|              CLASS|     PARENT_NOT_SET[  1/  1/  2/  0][0/0/0][  200000400][0-0] }
-#  86>               WORD|               NONE|     PARENT_NOT_SET[  3/  3/  6/  1][0/0/0][    70c0000][0-0]   c31
-#  86>              COMMA|               NONE|     PARENT_NOT_SET[  6/  6/  7/  0][0/0/0][  200000000][0-0]      ,
-#  86>           PTR_TYPE|              CLASS|     PARENT_NOT_SET[  8/  8/  9/  1][0/0/0][  200080000][0-0]        *
-#  86>               WORD|               NONE|     PARENT_NOT_SET[  9/  9/ 12/  0][0/0/0][   25080000][0-0]         c32
-#  86>             ASSIGN|               NONE|     PARENT_NOT_SET[ 13/ 13/ 14/  1][0/0/0][  200000000][0-0]             =
-#  86>               WORD|               NONE|     PARENT_NOT_SET[ 15/ 15/ 22/  1][0/0/0][      80000][0-0]               nullptr
-#  86>              COMMA|               NONE|     PARENT_NOT_SET[ 22/ 22/ 23/  0][0/0/0][  200000000][0-0]                      ,
-#  86>           PTR_TYPE|              CLASS|     PARENT_NOT_SET[ 24/ 24/ 25/  1][0/0/0][  200080000][0-0]                        *
-#  86>               WORD|               NONE|     PARENT_NOT_SET[ 25/ 25/ 28/  0][0/0/0][    5080000][0-0]                         c33
-#  86>            TSQUARE|               NONE|     PARENT_NOT_SET[ 28/ 28/ 30/  0][0/0/0][  200000000][0-0]                            []
-#  86>             ASSIGN|               NONE|     PARENT_NOT_SET[ 31/ 31/ 32/  1][0/0/0][  200000000][0-0]                               =
-#  86>         BRACE_OPEN|   BRACED_INIT_LIST|     PARENT_NOT_SET[ 33/ 33/ 34/  1][0/0/0][  240080000][0-0]                                 {
-#  86>               WORD|               NONE|     PARENT_NOT_SET[ 35/ 35/ 42/  1][1/1/0][   40080000][0-0]                                   nullptr
-#  86>              COMMA|               NONE|     PARENT_NOT_SET[ 42/ 42/ 43/  0][1/1/0][  240000000][0-0]                                          ,
-#  86>               WORD|               NONE|     PARENT_NOT_SET[ 44/ 44/ 51/  1][1/1/0][   40080000][0-0]                                            nullptr
-#  86>        BRACE_CLOSE|   BRACED_INIT_LIST|     PARENT_NOT_SET[ 52/ 52/ 53/  1][0/0/0][  240000000][0-0]                                                    }
-#  86>              COMMA|               NONE|     PARENT_NOT_SET[ 53/ 53/ 54/  0][0/0/0][  200000000][0-0]                                                     ,
-#  86>               WORD|               NONE|     PARENT_NOT_SET[ 55/ 55/ 58/  1][0/0/0][   25080000][0-0]                                                       c34
-#  86>         BRACE_OPEN|   BRACED_INIT_LIST|     PARENT_NOT_SET[ 58/ 58/ 59/  0][0/0/0][  240000000][0-0]                                                          {
-#  86>             NUMBER|               NONE|     PARENT_NOT_SET[ 60/ 60/ 61/  1][1/1/0][   400c0000][0-0]                                                            0
-#  86>              COMMA|               NONE|     PARENT_NOT_SET[ 61/ 61/ 62/  0][1/1/0][  240000000][0-0]                                                             ,
-#  86>             NUMBER|               NONE|     PARENT_NOT_SET[ 63/ 63/ 64/  1][1/1/0][   40080000][0-0]                                                               1
-#  86>              COMMA|               NONE|     PARENT_NOT_SET[ 64/ 64/ 65/  0][1/1/0][  240000000][0-0]                                                                ,
-#  86>             NUMBER|               NONE|     PARENT_NOT_SET[ 66/ 66/ 67/  1][1/1/0][   40080000][0-0]                                                                  2
-#  86>        BRACE_CLOSE|   BRACED_INIT_LIST|     PARENT_NOT_SET[ 67/ 67/ 68/  0][0/0/0][  240000000][0-0]                                                                   }
-#  86>              COMMA|               NONE|     PARENT_NOT_SET[ 68/ 68/ 69/  0][0/0/0][  200000000][0-0]                                                                    ,
-#  86>           PTR_TYPE|              CLASS|     PARENT_NOT_SET[ 70/ 70/ 71/  1][0/0/0][  200080000][0-0]                                                                      *
-#  86>          QUALIFIER|               NONE|     PARENT_NOT_SET[ 72/ 72/ 77/  1][0/0/0][      a0000][0-0]                                                                        const
-#  86>          FUNC_CALL|               NONE|     PARENT_NOT_SET[ 78/ 78/ 81/  1][0/0/0][    5000000][0-0]                                                                              c35
-#  86>        FPAREN_OPEN|          FUNC_CALL|     PARENT_NOT_SET[ 81/ 81/ 82/  0][0/0/0][  200000000][0-0]                                                                                 (
-#  86>               WORD|               NONE|     PARENT_NOT_SET[ 82/ 82/ 89/  0][0/1/0][      80010][0-0]                                                                                  nullptr
-#  86>       FPAREN_CLOSE|          FUNC_CALL|     PARENT_NOT_SET[ 89/ 89/ 90/  0][0/0/0][  200000010][0-0]                                                                                         )
-#  86>              COMMA|               NONE|     PARENT_NOT_SET[ 90/ 90/ 91/  0][0/0/0][  200000000][0-0]                                                                                          ,
-#  86>          FUNC_CALL|               NONE|     PARENT_NOT_SET[ 92/ 92/ 95/  1][0/0/0][    5080000][0-0]                                                                                            c16
-#  86>        FPAREN_OPEN|          FUNC_CALL|     PARENT_NOT_SET[ 95/ 95/ 96/  0][0/0/0][  200000000][0-0]                                                                                               (
-#  86>             NUMBER|               NONE|     PARENT_NOT_SET[ 96/ 96/ 97/  0][0/1/0][      80010][0-0]                                                                                                0
-#  86>              COMMA|               NONE|     PARENT_NOT_SET[ 97/ 97/ 98/  0][0/1/0][  200000010][0-0]                                                                                                 ,
-#  86>             NUMBER|               NONE|     PARENT_NOT_SET[ 99/ 99/100/  1][0/1/0][      80010][0-0]                                                                                                   1
-#  86>              COMMA|               NONE|     PARENT_NOT_SET[100/100/101/  0][0/1/0][  200000010][0-0]                                                                                                    ,
-#  86>             NUMBER|               NONE|     PARENT_NOT_SET[102/102/103/  1][0/1/0][      80010][0-0]                                                                                                      2
-#  86>       FPAREN_CLOSE|          FUNC_CALL|     PARENT_NOT_SET[103/103/104/  0][0/0/0][  200000010][0-0]                                                                                                       )
-#  86>          SEMICOLON|              CLASS|     PARENT_NOT_SET[104/104/105/  0][0/0/0][  200000000][0-0]                                                                                                        ;
-#  86>            NEWLINE|               NONE|     PARENT_NOT_SET[105/105/  1/  0][0/0/0][          0][2-0]
-#  88>        COMMENT_CPP|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  1/ 52/  0][0/0/0][          0][0-0] // class/struct [macros/attributes ...] type x, ...
-#  88>            NEWLINE|               NONE|     PARENT_NOT_SET[ 52/ 52/  1/  0][0/0/0][          0][1-0]
-#  89>              CLASS|               NONE|     PARENT_NOT_SET[  1/  1/  6/  0][0/0/0][      e0000][0-0] class
-#  89>          ATTRIBUTE|               NONE|     PARENT_NOT_SET[  7/  7/ 20/  1][0/0/0][          0][0-0]       __attribute__
-#  89>        FPAREN_OPEN|          ATTRIBUTE|     PARENT_NOT_SET[ 20/ 20/ 21/  0][0/0/0][  200000000][0-0]                    (
-#  89>         PAREN_OPEN|               NONE|     PARENT_NOT_SET[ 21/ 21/ 22/  0][0/1/0][  200080000][0-0]                     (
-#  89>               WORD|               NONE|     PARENT_NOT_SET[ 22/ 22/ 36/  0][0/2/0][      80000][0-0]                      __deprecated__
-#  89>        PAREN_CLOSE|               NONE|     PARENT_NOT_SET[ 36/ 36/ 37/  0][0/1/0][  200000000][0-0]                                    )
-#  89>       FPAREN_CLOSE|          ATTRIBUTE|     PARENT_NOT_SET[ 37/ 37/ 38/  0][0/0/0][  200000000][0-0]                                     )
-#  89>               WORD|               NONE|     PARENT_NOT_SET[ 39/ 39/ 49/  1][0/0/0][      e0000][0-0]                                       API_EXPORT
-#  89>    MACRO_FUNC_CALL|               NONE|     PARENT_NOT_SET[ 50/ 50/ 57/  1][0/0/0][          0][0-0]                                                  ALIGNAS
-#  89>        FPAREN_OPEN|    MACRO_FUNC_CALL|     PARENT_NOT_SET[ 57/ 57/ 58/  0][0/0/0][  200000000][0-0]                                                         (
-#  89>             NUMBER|               NONE|     PARENT_NOT_SET[ 58/ 58/ 59/  0][0/1/0][      80000][0-0]                                                          4
-#  89>       FPAREN_CLOSE|    MACRO_FUNC_CALL|     PARENT_NOT_SET[ 59/ 59/ 60/  0][0/0/0][  200000000][0-0]                                                           )
-#  89>               TYPE|              CLASS|     PARENT_NOT_SET[ 61/ 61/ 63/  1][0/0/0][     820000][0-0]                                                             c3
-#  89>               WORD|               NONE|     PARENT_NOT_SET[ 64/ 64/ 67/  1][0/0/0][    3000000][0-0]                                                                c41
-#  89>              COMMA|               NONE|     PARENT_NOT_SET[ 67/ 67/ 68/  0][0/0/0][  200000000][0-0]                                                                   ,
-#  89>           PTR_TYPE|              CLASS|     PARENT_NOT_SET[ 69/ 69/ 70/  1][0/0/0][  200080000][0-0]                                                                     *
-#  89>               WORD|               NONE|     PARENT_NOT_SET[ 70/ 70/ 73/  0][0/0/0][   21080000][0-0]                                                                      c42
-#  89>             ASSIGN|               NONE|     PARENT_NOT_SET[ 74/ 74/ 75/  1][0/0/0][  200000000][0-0]                                                                          =
-#  89>               WORD|               NONE|     PARENT_NOT_SET[ 76/ 76/ 79/  1][0/0/0][      80000][0-0]                                                                            c32
-#  89>           QUESTION|               NONE|     PARENT_NOT_SET[ 80/ 80/ 81/  1][0/0/0][  200000000][0-0]                                                                                ?
-#  89>               WORD|               NONE|     PARENT_NOT_SET[ 82/ 82/ 85/  1][0/0/0][      80000][0-0]                                                                                  c32
-#  89>         COND_COLON|               NONE|     PARENT_NOT_SET[ 86/ 86/ 87/  1][0/0/0][  200000000][0-0]                                                                                      :
-#  89>               WORD|               NONE|     PARENT_NOT_SET[ 88/ 88/ 95/  1][0/0/0][      c0000][0-0]                                                                                        nullptr
-#  89>              COMMA|               NONE|     PARENT_NOT_SET[ 95/ 95/ 96/  0][0/0/0][  200000000][0-0]                                                                                               ,
-#  89>           PTR_TYPE|              CLASS|     PARENT_NOT_SET[ 97/ 97/ 98/  1][0/0/0][  200080000][0-0]                                                                                                 *
-#  89>               WORD|               NONE|     PARENT_NOT_SET[ 98/ 98/101/  0][0/0/0][    1080000][0-0]                                                                                                  c43
-#  89>            TSQUARE|               NONE|     PARENT_NOT_SET[101/101/103/  0][0/0/0][  200000000][0-0]                                                                                                     []
-#  89>             ASSIGN|               NONE|     PARENT_NOT_SET[104/104/105/  1][0/0/0][  200000000][0-0]                                                                                                        =
-#  89>         BRACE_OPEN|   BRACED_INIT_LIST|     PARENT_NOT_SET[106/106/107/  1][0/0/0][  240080000][0-0]                                                                                                          {
-#  89>               WORD|               NONE|     PARENT_NOT_SET[108/108/115/  1][1/1/0][   40080000][0-0]                                                                                                            nullptr
-#  89>              COMMA|               NONE|     PARENT_NOT_SET[115/115/116/  0][1/1/0][  240000000][0-0]                                                                                                                   ,
-#  89>               WORD|               NONE|     PARENT_NOT_SET[117/117/124/  1][1/1/0][   40080000][0-0]                                                                                                                     nullptr
-#  89>        BRACE_CLOSE|   BRACED_INIT_LIST|     PARENT_NOT_SET[125/125/126/  1][0/0/0][  240000000][0-0]                                                                                                                             }
-#  89>              COMMA|               NONE|     PARENT_NOT_SET[126/126/127/  0][0/0/0][  200000000][0-0]                                                                                                                              ,
-#  89>               WORD|               NONE|     PARENT_NOT_SET[128/128/131/  1][0/0/0][   21080000][0-0]                                                                                                                                c44
-#  89>         BRACE_OPEN|   BRACED_INIT_LIST|     PARENT_NOT_SET[131/131/132/  0][0/0/0][  240000000][0-0]                                                                                                                                   {
-#  89>             NUMBER|               NONE|     PARENT_NOT_SET[133/133/134/  1][1/1/0][   400c0000][0-0]                                                                                                                                     0
-#  89>              COMMA|               NONE|     PARENT_NOT_SET[134/134/135/  0][1/1/0][  240000000][0-0]                                                                                                                                      ,
-#  89>             NUMBER|               NONE|     PARENT_NOT_SET[136/136/137/  1][1/1/0][   40080000][0-0]                                                                                                                                        1
-#  89>              COMMA|               NONE|     PARENT_NOT_SET[137/137/138/  0][1/1/0][  240000000][0-0]                                                                                                                                         ,
-#  89>             NUMBER|               NONE|     PARENT_NOT_SET[139/139/140/  1][1/1/0][   40080000][0-0]                                                                                                                                           2
-#  89>        BRACE_CLOSE|   BRACED_INIT_LIST|     PARENT_NOT_SET[140/140/141/  0][0/0/0][  240000000][0-0]                                                                                                                                            }
-#  89>              COMMA|               NONE|     PARENT_NOT_SET[141/141/142/  0][0/0/0][  200000000][0-0]                                                                                                                                             ,
-#  89>           PTR_TYPE|              CLASS|     PARENT_NOT_SET[143/143/144/  1][0/0/0][  200080000][0-0]                                                                                                                                               *
-#  89>          QUALIFIER|               NONE|     PARENT_NOT_SET[145/145/150/  1][0/0/0][      a0000][0-0]                                                                                                                                                 const
-#  89>          FUNC_CALL|               NONE|     PARENT_NOT_SET[151/151/154/  1][0/0/0][    1000000][0-0]                                                                                                                                                       c45
-#  89>        FPAREN_OPEN|          FUNC_CALL|     PARENT_NOT_SET[154/154/155/  0][0/0/0][  200000000][0-0]                                                                                                                                                          (
-#  89>               WORD|               NONE|     PARENT_NOT_SET[155/155/162/  0][0/1/0][      80010][0-0]                                                                                                                                                           nullptr
-#  89>       FPAREN_CLOSE|          FUNC_CALL|     PARENT_NOT_SET[162/162/163/  0][0/0/0][  200000010][0-0]                                                                                                                                                                  )
-#  89>              COMMA|               NONE|     PARENT_NOT_SET[163/163/164/  0][0/0/0][  200000000][0-0]                                                                                                                                                                   ,
-#  89>          FUNC_CALL|               NONE|     PARENT_NOT_SET[165/165/168/  1][0/0/0][    1080000][0-0]                                                                                                                                                                     c46
-#  89>        FPAREN_OPEN|          FUNC_CALL|     PARENT_NOT_SET[168/168/169/  0][0/0/0][  200000000][0-0]                                                                                                                                                                        (
-#  89>             NUMBER|               NONE|     PARENT_NOT_SET[169/169/170/  0][0/1/0][      80010][0-0]                                                                                                                                                                         0
-#  89>              COMMA|               NONE|     PARENT_NOT_SET[170/170/171/  0][0/1/0][  200000010][0-0]                                                                                                                                                                          ,
-#  89>             NUMBER|               NONE|     PARENT_NOT_SET[172/172/173/  1][0/1/0][      80010][0-0]                                                                                                                                                                            1
-#  89>              COMMA|               NONE|     PARENT_NOT_SET[173/173/174/  0][0/1/0][  200000010][0-0]                                                                                                                                                                             ,
-#  89>             NUMBER|               NONE|     PARENT_NOT_SET[175/175/176/  1][0/1/0][      80010][0-0]                                                                                                                                                                               2
-#  89>       FPAREN_CLOSE|          FUNC_CALL|     PARENT_NOT_SET[176/176/177/  0][0/0/0][  200000010][0-0]                                                                                                                                                                                )
-#  89>          SEMICOLON|              CLASS|     PARENT_NOT_SET[177/177/178/  0][0/0/0][  200000000][0-0]                                                                                                                                                                                 ;
-#  89>            NEWLINE|               NONE|     PARENT_NOT_SET[178/178/  1/  0][0/0/0][          0][2-0]
-#  91>        COMMENT_CPP|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  1/ 68/  0][0/0/0][          0][0-0] // class/struct [macros/attributes ...] type : bases ... { } x, ...
-#  91>            NEWLINE|               NONE|     PARENT_NOT_SET[ 68/ 68/  1/  0][0/0/0][          0][1-0]
-#  92>              CLASS|               NONE|     PARENT_NOT_SET[  1/  1/  6/  0][0/0/0][      e0000][0-0] class
-#  92>          FUNC_CALL|               NONE|     PARENT_NOT_SET[  7/  7/ 14/  1][0/0/0][          0][0-0]       ALIGNAS
-#  92>        FPAREN_OPEN|          FUNC_CALL|     PARENT_NOT_SET[ 14/ 14/ 15/  0][0/0/0][  200000000][0-0]              (
-#  92>             NUMBER|               NONE|     PARENT_NOT_SET[ 15/ 15/ 16/  0][0/1/0][      80010][0-0]               4
-#  92>       FPAREN_CLOSE|          FUNC_CALL|     PARENT_NOT_SET[ 16/ 16/ 17/  0][0/0/0][  200000010][0-0]                )
-#  92>               WORD|               NONE|     PARENT_NOT_SET[ 18/ 18/ 28/  1][0/0/0][      20000][0-0]                  API_EXPORT
-#  92>          ATTRIBUTE|               NONE|     PARENT_NOT_SET[ 29/ 29/ 42/  1][0/0/0][          0][0-0]                             __attribute__
-#  92>        FPAREN_OPEN|          ATTRIBUTE|     PARENT_NOT_SET[ 42/ 42/ 43/  0][0/0/0][  200000000][0-0]                                          (
-#  92>         PAREN_OPEN|               NONE|     PARENT_NOT_SET[ 43/ 43/ 44/  0][0/1/0][  200080000][0-0]                                           (
-#  92>               WORD|               NONE|     PARENT_NOT_SET[ 44/ 44/ 58/  0][0/2/0][      80000][0-0]                                            __deprecated__
-#  92>        PAREN_CLOSE|               NONE|     PARENT_NOT_SET[ 58/ 58/ 59/  0][0/1/0][  200000000][0-0]                                                          )
-#  92>       FPAREN_CLOSE|          ATTRIBUTE|     PARENT_NOT_SET[ 59/ 59/ 60/  0][0/0/0][  200000000][0-0]                                                           )
-#  92>            NEWLINE|               NONE|     PARENT_NOT_SET[ 60/ 60/  1/  0][0/0/0][          0][1-0]
-#  93>        CLASS_COLON|              CLASS|     PARENT_NOT_SET[  9/  1/  2/  0][0/0/0][  200000800][0-0]         :
-#  93>          QUALIFIER|               NONE|     PARENT_NOT_SET[ 11/  3/  9/  1][0/0/0][      e0800][0-0]           public
-#  93>               TYPE|               NONE|     PARENT_NOT_SET[ 18/ 10/ 25/  1][0/0/0][        800][0-0]                  outer_namespace
-#  93>          DC_MEMBER|               NONE|     PARENT_NOT_SET[ 33/ 25/ 27/  0][0/0/0][  200000800][0-0]                                 ::
-#  93>               TYPE|               NONE|     PARENT_NOT_SET[ 35/ 27/ 42/  0][0/0/0][        800][0-0]                                   inner_namespace
-#  93>          DC_MEMBER|               NONE|     PARENT_NOT_SET[ 50/ 42/ 44/  0][0/0/0][  200000800][0-0]                                                  ::
-#  93>               TYPE|               NONE|     PARENT_NOT_SET[ 52/ 44/ 49/  0][0/0/0][        800][0-0]                                                    Base1
-#  93>            NEWLINE|               NONE|     PARENT_NOT_SET[ 57/ 49/  1/  0][0/0/0][          0][1-0]
-#  94>         BRACE_OPEN|              CLASS|     PARENT_NOT_SET[  1/  1/  2/  0][0/0/0][  200000000][0-0] {
-#  94>            NEWLINE|               NONE|     PARENT_NOT_SET[  2/  2/  1/  0][1/1/0][        400][1-0]
-#  95>             ACCESS|               NONE|     PARENT_NOT_SET[  1/  1/  7/  0][1/1/0][      c0400][0-0] public
-#  95>       ACCESS_COLON|               NONE|     PARENT_NOT_SET[  7/  7/  8/  0][1/1/0][  200000400][0-0]       :
-#  95>            NEWLINE|               NONE|     PARENT_NOT_SET[  8/  8/  4/  0][1/1/0][        400][1-0]
-#  96>               TYPE|               NONE|     PARENT_NOT_SET[  1/  4/  7/  0][1/1/0][     8e0400][0-0] int
-#  96>               WORD|               NONE|     PARENT_NOT_SET[  5/  8/ 11/  1][1/1/0][    3000400][0-0]     m_x
-#  96>          SEMICOLON|               NONE|     PARENT_NOT_SET[  8/ 11/ 12/  0][1/1/0][  200000400][0-0]        ;
-#  96>            NEWLINE|               NONE|     PARENT_NOT_SET[  9/ 12/  4/  0][1/1/0][        400][1-0]
-#  97>               TYPE|               NONE|     PARENT_NOT_SET[  1/  4/  7/  0][1/1/0][     8e0400][0-0] int
-#  97>               WORD|               NONE|     PARENT_NOT_SET[  5/  8/ 11/  1][1/1/0][    3000400][0-0]     m_y
-#  97>          SEMICOLON|               NONE|     PARENT_NOT_SET[  8/ 11/ 12/  0][1/1/0][  200000400][0-0]        ;
-#  97>            NEWLINE|               NONE|     PARENT_NOT_SET[  9/ 12/  4/  0][1/1/0][        400][1-0]
-#  98>               TYPE|               NONE|     PARENT_NOT_SET[  1/  4/  7/  0][1/1/0][     8e0400][0-0] int
-#  98>               WORD|               NONE|     PARENT_NOT_SET[  5/  8/ 11/  1][1/1/0][    3000400][0-0]     m_z
-#  98>          SEMICOLON|               NONE|     PARENT_NOT_SET[  8/ 11/ 12/  0][1/1/0][  200000400][0-0]        ;
-#  98>            NEWLINE|               NONE|     PARENT_NOT_SET[  9/ 12/  1/  0][1/1/0][        400][1-0]
-#  99>        BRACE_CLOSE|              CLASS|     PARENT_NOT_SET[  1/  1/  2/  0][0/0/0][  200000400][0-0] }
-#  99>               WORD|               NONE|     PARENT_NOT_SET[  3/  3/  6/  1][0/0/0][    70c0000][0-0]   c51
-#  99>              COMMA|               NONE|     PARENT_NOT_SET[  6/  6/  7/  0][0/0/0][  200000000][0-0]      ,
-#  99>           PTR_TYPE|              CLASS|     PARENT_NOT_SET[  8/  8/  9/  1][0/0/0][  200080000][0-0]        *
-#  99>               WORD|               NONE|     PARENT_NOT_SET[  9/  9/ 12/  0][0/0/0][   25080000][0-0]         c52
-#  99>             ASSIGN|               NONE|     PARENT_NOT_SET[ 13/ 13/ 14/  1][0/0/0][  200000000][0-0]             =
-#  99>               WORD|               NONE|     PARENT_NOT_SET[ 15/ 15/ 22/  1][0/0/0][      80000][0-0]               nullptr
-#  99>              COMMA|               NONE|     PARENT_NOT_SET[ 22/ 22/ 23/  0][0/0/0][  200000000][0-0]                      ,
-#  99>           PTR_TYPE|              CLASS|     PARENT_NOT_SET[ 24/ 24/ 25/  1][0/0/0][  200080000][0-0]                        *
-#  99>               WORD|               NONE|     PARENT_NOT_SET[ 25/ 25/ 28/  0][0/0/0][    5080000][0-0]                         c53
-#  99>            TSQUARE|               NONE|     PARENT_NOT_SET[ 28/ 28/ 30/  0][0/0/0][  200000000][0-0]                            []
-#  99>             ASSIGN|               NONE|     PARENT_NOT_SET[ 31/ 31/ 32/  1][0/0/0][  200000000][0-0]                               =
-#  99>         BRACE_OPEN|   BRACED_INIT_LIST|     PARENT_NOT_SET[ 33/ 33/ 34/  1][0/0/0][  240080000][0-0]                                 {
-#  99>               WORD|               NONE|     PARENT_NOT_SET[ 35/ 35/ 42/  1][1/1/0][   40080000][0-0]                                   nullptr
-#  99>              COMMA|               NONE|     PARENT_NOT_SET[ 42/ 42/ 43/  0][1/1/0][  240000000][0-0]                                          ,
-#  99>               WORD|               NONE|     PARENT_NOT_SET[ 44/ 44/ 51/  1][1/1/0][   40080000][0-0]                                            nullptr
-#  99>        BRACE_CLOSE|   BRACED_INIT_LIST|     PARENT_NOT_SET[ 52/ 52/ 53/  1][0/0/0][  240000000][0-0]                                                    }
-#  99>          SEMICOLON|              CLASS|     PARENT_NOT_SET[ 53/ 53/ 54/  0][0/0/0][  200000000][0-0]                                                     ;
-#  99>            NEWLINE|               NONE|     PARENT_NOT_SET[ 54/ 54/  1/  0][0/0/0][          0][3-0]
-# 102>        COMMENT_CPP|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  1/ 44/  0][0/0/0][          0][0-0] // enum type : integral_type { ... } x, ...
-# 102>            NEWLINE|               NONE|     PARENT_NOT_SET[ 44/ 44/  1/  0][0/0/0][          0][1-0]
-# 103>               ENUM|               NONE|     PARENT_NOT_SET[  1/  1/  5/  0][0/0/0][      e0000][0-0] enum
-# 103>               TYPE|               ENUM|     PARENT_NOT_SET[  6/  6/  8/  1][0/0/0][     800000][0-0]      e1
-# 103>          BIT_COLON|               ENUM|     PARENT_NOT_SET[  9/  9/ 10/  1][0/0/0][  200000000][0-0]         :
-# 103>               TYPE|          BIT_COLON|     PARENT_NOT_SET[ 11/ 11/ 15/  1][0/0/0][      e0000][0-0]           long
-# 103>               TYPE|          BIT_COLON|     PARENT_NOT_SET[ 16/ 16/ 20/  1][0/0/0][          0][0-0]                long
-# 103>         BRACE_OPEN|               ENUM|     PARENT_NOT_SET[ 21/ 21/ 22/  1][0/0/0][  240000000][0-0]                     {
-# 103>               WORD|               NONE|     PARENT_NOT_SET[ 23/ 23/ 25/  1][1/1/0][   400c0004][0-0]                       a1
-# 103>              COMMA|               NONE|     PARENT_NOT_SET[ 25/ 25/ 26/  0][1/1/0][  240000004][0-0]                         ,
-# 103>               WORD|               NONE|     PARENT_NOT_SET[ 27/ 27/ 29/  1][1/1/0][   40080004][0-0]                           b1
-# 103>              COMMA|               NONE|     PARENT_NOT_SET[ 29/ 29/ 30/  0][1/1/0][  240000004][0-0]                             ,
-# 103>               WORD|               NONE|     PARENT_NOT_SET[ 31/ 31/ 33/  1][1/1/0][   40080004][0-0]                               d1
-# 103>        BRACE_CLOSE|               ENUM|     PARENT_NOT_SET[ 34/ 34/ 35/  1][0/0/0][  240000004][0-0]                                  }
-# 103>               WORD|               NONE|     PARENT_NOT_SET[ 36/ 36/ 39/  1][0/0/0][    70c0000][0-0]                                    e11
-# 103>              COMMA|               NONE|     PARENT_NOT_SET[ 39/ 39/ 40/  0][0/0/0][  200000000][0-0]                                       ,
-# 103>               WORD|               NONE|     PARENT_NOT_SET[ 41/ 41/ 44/  1][0/0/0][    5080000][0-0]                                         e12
-# 103>              COMMA|               NONE|     PARENT_NOT_SET[ 44/ 44/ 45/  0][0/0/0][  200000000][0-0]                                            ,
-# 103>               WORD|               NONE|     PARENT_NOT_SET[ 46/ 46/ 49/  1][0/0/0][    5080000][0-0]                                              e13
-# 103>          SEMICOLON|               ENUM|     PARENT_NOT_SET[ 49/ 49/ 50/  0][0/0/0][  200000000][0-0]                                                 ;
-# 103>            NEWLINE|               NONE|     PARENT_NOT_SET[ 50/ 50/  1/  0][0/0/0][          0][2-0]
-# 105>        COMMENT_CPP|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  1/ 37/  0][0/0/0][          0][0-0] // enum type : integral_type { ... }
-# 105>            NEWLINE|               NONE|     PARENT_NOT_SET[ 37/ 37/  1/  0][0/0/0][          0][1-0]
-# 106>               ENUM|               NONE|     PARENT_NOT_SET[  1/  1/  5/  0][0/0/0][      e0000][0-0] enum
-# 106>               TYPE|               ENUM|     PARENT_NOT_SET[  6/  6/  8/  1][0/0/0][          0][0-0]      e2
-# 106>          BIT_COLON|               ENUM|     PARENT_NOT_SET[  9/  9/ 10/  1][0/0/0][  200000000][0-0]         :
-# 106>               TYPE|          BIT_COLON|     PARENT_NOT_SET[ 11/ 11/ 19/  1][0/0/0][      e0000][0-0]           unsigned
-# 106>               TYPE|          BIT_COLON|     PARENT_NOT_SET[ 20/ 20/ 23/  1][0/0/0][          0][0-0]                    int
-# 106>         BRACE_OPEN|               ENUM|     PARENT_NOT_SET[ 24/ 24/ 25/  1][0/0/0][  240000000][0-0]                        {
-# 106>               WORD|               NONE|     PARENT_NOT_SET[ 26/ 26/ 28/  1][1/1/0][   400c0004][0-0]                          a2
-# 106>              COMMA|               NONE|     PARENT_NOT_SET[ 28/ 28/ 29/  0][1/1/0][  240000004][0-0]                            ,
-# 106>               WORD|               NONE|     PARENT_NOT_SET[ 30/ 30/ 32/  1][1/1/0][   40080004][0-0]                              b2
-# 106>              COMMA|               NONE|     PARENT_NOT_SET[ 32/ 32/ 33/  0][1/1/0][  240000004][0-0]                                ,
-# 106>               WORD|               NONE|     PARENT_NOT_SET[ 34/ 34/ 36/  1][1/1/0][   40080004][0-0]                                  d2
-# 106>        BRACE_CLOSE|               ENUM|     PARENT_NOT_SET[ 37/ 37/ 38/  1][0/0/0][  240000004][0-0]                                     }
-# 106>          SEMICOLON|               ENUM|     PARENT_NOT_SET[ 38/ 38/ 39/  0][0/0/0][  200000000][0-0]                                      ;
-# 106>            NEWLINE|               NONE|     PARENT_NOT_SET[ 39/ 39/  1/  0][0/0/0][          0][2-0]
-# 108>        COMMENT_CPP|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  1/ 29/  0][0/0/0][          0][0-0] // enum type : integral_type
-# 108>            NEWLINE|               NONE|     PARENT_NOT_SET[ 29/ 29/  1/  0][0/0/0][          0][1-0]
-# 109>               ENUM|               NONE|     PARENT_NOT_SET[  1/  1/  5/  0][0/0/0][1000000e0000][0-0] enum
-# 109>               TYPE|               ENUM|     PARENT_NOT_SET[  6/  6/  8/  1][0/0/0][100000000000][0-0]      e3
-# 109>          BIT_COLON|               ENUM|     PARENT_NOT_SET[  9/  9/ 10/  1][0/0/0][  200000000][0-0]         :
-# 109>               TYPE|          BIT_COLON|     PARENT_NOT_SET[ 11/ 11/ 16/  1][0/0/0][      c0000][0-0]           short
-# 109>          SEMICOLON|               ENUM|     PARENT_NOT_SET[ 16/ 16/ 17/  0][0/0/0][  200000000][0-0]                ;
-# 109>            NEWLINE|               NONE|     PARENT_NOT_SET[ 17/ 17/  1/  0][0/0/0][          0][2-0]
-# 111>        COMMENT_CPP|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  1/ 20/  0][0/0/0][          0][0-0] // enum type x, ...
-# 111>            NEWLINE|               NONE|     PARENT_NOT_SET[ 20/ 20/  1/  0][0/0/0][          0][1-0]
-# 112>               ENUM|               NONE|     PARENT_NOT_SET[  1/  1/  5/  0][0/0/0][      e0000][0-0] enum
-# 112>               TYPE|               ENUM|     PARENT_NOT_SET[  6/  6/  8/  1][0/0/0][     820000][0-0]      e3
-# 112>               WORD|               NONE|     PARENT_NOT_SET[  9/  9/ 12/  1][0/0/0][    3000000][0-0]         e31
-# 112>              COMMA|               NONE|     PARENT_NOT_SET[ 12/ 12/ 13/  0][0/0/0][  200000000][0-0]            ,
-# 112>               WORD|               NONE|     PARENT_NOT_SET[ 14/ 14/ 17/  1][0/0/0][    1080000][0-0]              e32
-# 112>          SEMICOLON|               ENUM|     PARENT_NOT_SET[ 17/ 17/ 18/  0][0/0/0][  200000000][0-0]                 ;
-# 112>            NEWLINE|               NONE|     PARENT_NOT_SET[ 18/ 18/  1/  0][0/0/0][          0][2-0]
-# 114>        COMMENT_CPP|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  1/ 50/  0][0/0/0][          0][0-0] // enum class type : integral_type { ... } x, ...
-# 114>            NEWLINE|               NONE|     PARENT_NOT_SET[ 50/ 50/  1/  0][0/0/0][          0][1-0]
-# 115>               ENUM|               NONE|     PARENT_NOT_SET[  1/  1/  5/  0][0/0/0][      e0000][0-0] enum
-# 115>         ENUM_CLASS|               NONE|     PARENT_NOT_SET[  6/  6/ 11/  1][0/0/0][      20000][0-0]      class
-# 115>               TYPE|               ENUM|     PARENT_NOT_SET[ 12/ 12/ 14/  1][0/0/0][     800000][0-0]            e4
-# 115>          BIT_COLON|               ENUM|     PARENT_NOT_SET[ 15/ 15/ 16/  1][0/0/0][  200000000][0-0]               :
-# 115>               TYPE|          BIT_COLON|     PARENT_NOT_SET[ 17/ 17/ 21/  1][0/0/0][      e0000][0-0]                 long
-# 115>               TYPE|          BIT_COLON|     PARENT_NOT_SET[ 22/ 22/ 26/  1][0/0/0][          0][0-0]                      long
-# 115>         BRACE_OPEN|               ENUM|     PARENT_NOT_SET[ 27/ 27/ 28/  1][0/0/0][  240000000][0-0]                           {
-# 115>               WORD|               NONE|     PARENT_NOT_SET[ 29/ 29/ 31/  1][1/1/0][   400c0004][0-0]                             a4
-# 115>              COMMA|               NONE|     PARENT_NOT_SET[ 31/ 31/ 32/  0][1/1/0][  240000004][0-0]                               ,
-# 115>               WORD|               NONE|     PARENT_NOT_SET[ 33/ 33/ 35/  1][1/1/0][   40080004][0-0]                                 b4
-# 115>              COMMA|               NONE|     PARENT_NOT_SET[ 35/ 35/ 36/  0][1/1/0][  240000004][0-0]                                   ,
-# 115>               WORD|               NONE|     PARENT_NOT_SET[ 37/ 37/ 39/  1][1/1/0][   40080004][0-0]                                     d4
-# 115>        BRACE_CLOSE|               ENUM|     PARENT_NOT_SET[ 40/ 40/ 41/  1][0/0/0][  240000004][0-0]                                        }
-# 115>               WORD|               NONE|     PARENT_NOT_SET[ 42/ 42/ 45/  1][0/0/0][    70c0000][0-0]                                          e41
-# 115>              COMMA|               NONE|     PARENT_NOT_SET[ 45/ 45/ 46/  0][0/0/0][  200000000][0-0]                                             ,
-# 115>               WORD|               NONE|     PARENT_NOT_SET[ 47/ 47/ 50/  1][0/0/0][    5080000][0-0]                                               e42
-# 115>              COMMA|               NONE|     PARENT_NOT_SET[ 50/ 50/ 51/  0][0/0/0][  200000000][0-0]                                                  ,
-# 115>               WORD|               NONE|     PARENT_NOT_SET[ 52/ 52/ 55/  1][0/0/0][    5080000][0-0]                                                    e43
-# 115>              COMMA|               NONE|     PARENT_NOT_SET[ 55/ 55/ 56/  0][0/0/0][  200000000][0-0]                                                       ,
-# 115>               WORD|               NONE|     PARENT_NOT_SET[ 57/ 57/ 60/  1][0/0/0][    5080000][0-0]                                                         e44
-# 115>          SEMICOLON|               ENUM|     PARENT_NOT_SET[ 60/ 60/ 61/  0][0/0/0][  200000000][0-0]                                                            ;
-# 115>            NEWLINE|               NONE|     PARENT_NOT_SET[ 61/ 61/  1/  0][0/0/0][          0][2-0]
-# 117>        COMMENT_CPP|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  1/ 43/  0][0/0/0][          0][0-0] // enum class type : integral_type { ... }
-# 117>            NEWLINE|               NONE|     PARENT_NOT_SET[ 43/ 43/  1/  0][0/0/0][          0][1-0]
-# 118>               ENUM|               NONE|     PARENT_NOT_SET[  1/  1/  5/  0][0/0/0][      e0000][0-0] enum
-# 118>         ENUM_CLASS|               NONE|     PARENT_NOT_SET[  6/  6/ 11/  1][0/0/0][      20000][0-0]      class
-# 118>               TYPE|               ENUM|     PARENT_NOT_SET[ 12/ 12/ 14/  1][0/0/0][          0][0-0]            e5
-# 118>          BIT_COLON|               ENUM|     PARENT_NOT_SET[ 15/ 15/ 16/  1][0/0/0][  200000000][0-0]               :
-# 118>               TYPE|          BIT_COLON|     PARENT_NOT_SET[ 17/ 17/ 25/  1][0/0/0][      e0000][0-0]                 unsigned
-# 118>               TYPE|          BIT_COLON|     PARENT_NOT_SET[ 26/ 26/ 29/  1][0/0/0][          0][0-0]                          int
-# 118>         BRACE_OPEN|               ENUM|     PARENT_NOT_SET[ 30/ 30/ 31/  1][0/0/0][  240000000][0-0]                              {
-# 118>               WORD|               NONE|     PARENT_NOT_SET[ 32/ 32/ 34/  1][1/1/0][   400c0004][0-0]                                a5
-# 118>              COMMA|               NONE|     PARENT_NOT_SET[ 34/ 34/ 35/  0][1/1/0][  240000004][0-0]                                  ,
-# 118>               WORD|               NONE|     PARENT_NOT_SET[ 36/ 36/ 38/  1][1/1/0][   40080004][0-0]                                    b5
-# 118>              COMMA|               NONE|     PARENT_NOT_SET[ 38/ 38/ 39/  0][1/1/0][  240000004][0-0]                                      ,
-# 118>               WORD|               NONE|     PARENT_NOT_SET[ 40/ 40/ 42/  1][1/1/0][   40080004][0-0]                                        d5
-# 118>        BRACE_CLOSE|               ENUM|     PARENT_NOT_SET[ 43/ 43/ 44/  1][0/0/0][  240000004][0-0]                                           }
-# 118>          SEMICOLON|               ENUM|     PARENT_NOT_SET[ 44/ 44/ 45/  0][0/0/0][  200000000][0-0]                                            ;
-# 118>            NEWLINE|               NONE|     PARENT_NOT_SET[ 45/ 45/  1/  0][0/0/0][          0][2-0]
-# 120>        COMMENT_CPP|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  1/ 35/  0][0/0/0][          0][0-0] // enum class type : integral_type
-# 120>            NEWLINE|               NONE|     PARENT_NOT_SET[ 35/ 35/  1/  0][0/0/0][          0][1-0]
-# 121>               ENUM|               NONE|     PARENT_NOT_SET[  1/  1/  5/  0][0/0/0][1000000e0000][0-0] enum
-# 121>         ENUM_CLASS|               NONE|     PARENT_NOT_SET[  6/  6/ 11/  1][0/0/0][100000020000][0-0]      class
-# 121>               TYPE|               ENUM|     PARENT_NOT_SET[ 12/ 12/ 14/  1][0/0/0][100000000000][0-0]            e6
-# 121>          BIT_COLON|               ENUM|     PARENT_NOT_SET[ 15/ 15/ 16/  1][0/0/0][  200000000][0-0]               :
-# 121>               TYPE|          BIT_COLON|     PARENT_NOT_SET[ 17/ 17/ 22/  1][0/0/0][      c0000][0-0]                 short
-# 121>          SEMICOLON|               ENUM|     PARENT_NOT_SET[ 22/ 22/ 23/  0][0/0/0][  200000000][0-0]                      ;
-# 121>            NEWLINE|               NONE|     PARENT_NOT_SET[ 23/ 23/  1/  0][0/0/0][          0][2-0]
-# 123>        COMMENT_CPP|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  1/ 19/  0][0/0/0][          0][0-0] // enum class type
-# 123>            NEWLINE|               NONE|     PARENT_NOT_SET[ 19/ 19/  1/  0][0/0/0][          0][1-0]
-# 124>               ENUM|               NONE|     PARENT_NOT_SET[  1/  1/  5/  0][0/0/0][1000000e0000][0-0] enum
-# 124>         ENUM_CLASS|               NONE|     PARENT_NOT_SET[  6/  6/ 11/  1][0/0/0][100000020000][0-0]      class
-# 124>               TYPE|               ENUM|     PARENT_NOT_SET[ 12/ 12/ 14/  1][0/0/0][100000000000][0-0]            e7
-# 124>          SEMICOLON|               ENUM|     PARENT_NOT_SET[ 14/ 14/ 15/  0][0/0/0][  200000000][0-0]              ;
-# 124>            NEWLINE|               NONE|     PARENT_NOT_SET[ 15/ 15/  1/  0][0/0/0][          0][2-0]
-# 126>        COMMENT_CPP|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  1/ 39/  0][0/0/0][          0][0-0] // enum : integral_type { ... } x, ...
-# 126>            NEWLINE|               NONE|     PARENT_NOT_SET[ 39/ 39/  1/  0][0/0/0][          0][1-0]
-# 127>               ENUM|               NONE|     PARENT_NOT_SET[  1/  1/  5/  0][0/0/0][      c0000][0-0] enum
-# 127>          BIT_COLON|               ENUM|     PARENT_NOT_SET[  6/  6/  7/  1][0/0/0][  200000000][0-0]      :
-# 127>               TYPE|          BIT_COLON|     PARENT_NOT_SET[  8/  8/ 12/  1][0/0/0][      e0000][0-0]        long
-# 127>               TYPE|          BIT_COLON|     PARENT_NOT_SET[ 13/ 13/ 17/  1][0/0/0][          0][0-0]             long
-# 127>         BRACE_OPEN|               ENUM|     PARENT_NOT_SET[ 18/ 18/ 19/  1][0/0/0][  240000000][0-0]                  {
-# 127>               WORD|               NONE|     PARENT_NOT_SET[ 20/ 20/ 22/  1][1/1/0][   400c0004][0-0]                    a8
-# 127>              COMMA|               NONE|     PARENT_NOT_SET[ 22/ 22/ 23/  0][1/1/0][  240000004][0-0]                      ,
-# 127>               WORD|               NONE|     PARENT_NOT_SET[ 24/ 24/ 26/  1][1/1/0][   40080004][0-0]                        b8
-# 127>              COMMA|               NONE|     PARENT_NOT_SET[ 26/ 26/ 27/  0][1/1/0][  240000004][0-0]                          ,
-# 127>               WORD|               NONE|     PARENT_NOT_SET[ 28/ 28/ 30/  1][1/1/0][   40080004][0-0]                            c8
-# 127>        BRACE_CLOSE|               ENUM|     PARENT_NOT_SET[ 31/ 31/ 32/  1][0/0/0][  240000004][0-0]                               }
-# 127>               WORD|               NONE|     PARENT_NOT_SET[ 33/ 33/ 36/  1][0/0/0][    70c0000][0-0]                                 e81
-# 127>              COMMA|               NONE|     PARENT_NOT_SET[ 36/ 36/ 37/  0][0/0/0][  200000000][0-0]                                    ,
-# 127>               WORD|               NONE|     PARENT_NOT_SET[ 38/ 38/ 41/  1][0/0/0][    5080000][0-0]                                      e82
-# 127>          SEMICOLON|               ENUM|     PARENT_NOT_SET[ 41/ 41/ 42/  0][0/0/0][  200000000][0-0]                                         ;
-# 127>            NEWLINE|               NONE|     PARENT_NOT_SET[ 42/ 42/  1/  0][0/0/0][          0][2-0]
-# 129>        COMMENT_CPP|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  1/ 23/  0][0/0/0][          0][0-0] // enum { ... } x, ...
-# 129>            NEWLINE|               NONE|     PARENT_NOT_SET[ 23/ 23/  1/  0][0/0/0][          0][1-0]
-# 130>               ENUM|               NONE|     PARENT_NOT_SET[  1/  1/  5/  0][0/0/0][      c0000][0-0] enum
-# 130>         BRACE_OPEN|               ENUM|     PARENT_NOT_SET[  6/  6/  7/  1][0/0/0][  240000000][0-0]      {
-# 130>               WORD|               NONE|     PARENT_NOT_SET[  8/  8/ 10/  1][1/1/0][   400c0004][0-0]        a9
-# 130>              COMMA|               NONE|     PARENT_NOT_SET[ 10/ 10/ 11/  0][1/1/0][  240000004][0-0]          ,
-# 130>               WORD|               NONE|     PARENT_NOT_SET[ 12/ 12/ 14/  1][1/1/0][   40080004][0-0]            b9
-# 130>              COMMA|               NONE|     PARENT_NOT_SET[ 14/ 14/ 15/  0][1/1/0][  240000004][0-0]              ,
-# 130>               WORD|               NONE|     PARENT_NOT_SET[ 16/ 16/ 18/  1][1/1/0][   40080004][0-0]                c9
-# 130>        BRACE_CLOSE|               ENUM|     PARENT_NOT_SET[ 19/ 19/ 20/  1][0/0/0][  240000004][0-0]                   }
-# 130>               WORD|               NONE|     PARENT_NOT_SET[ 21/ 21/ 24/  1][0/0/0][    70c0000][0-0]                     e91
-# 130>              COMMA|               NONE|     PARENT_NOT_SET[ 24/ 24/ 25/  0][0/0/0][  200000000][0-0]                        ,
-# 130>               WORD|               NONE|     PARENT_NOT_SET[ 26/ 26/ 29/  1][0/0/0][    5080000][0-0]                          e92
-# 130>          SEMICOLON|               ENUM|     PARENT_NOT_SET[ 29/ 29/ 30/  0][0/0/0][  200000000][0-0]                             ;
-# 130>            NEWLINE|               NONE|     PARENT_NOT_SET[ 30/ 30/  1/  0][0/0/0][          0][2-0]
-# 132>              UNION|               NONE|     PARENT_NOT_SET[  1/  1/  6/  0][0/0/0][      e0000][0-0] union
-# 132>               WORD|               NONE|     PARENT_NOT_SET[  7/  7/ 17/  1][0/0/0][      20000][0-0]       API_EXPORT
-# 132>               TYPE|              UNION|     PARENT_NOT_SET[ 18/ 18/ 20/  1][0/0/0][     800000][0-0]                  u1
-# 132>         BRACE_OPEN|              UNION|     PARENT_NOT_SET[ 21/ 21/ 22/  1][0/0/0][  240000000][0-0]                     {
-# 132>               TYPE|               NONE|     PARENT_NOT_SET[ 23/ 23/ 26/  1][1/1/0][   408e0000][0-0]                       int
-# 132>               WORD|               NONE|     PARENT_NOT_SET[ 27/ 27/ 28/  1][1/1/0][   43000000][0-0]                           x
-# 132>          SEMICOLON|               NONE|     PARENT_NOT_SET[ 28/ 28/ 29/  0][1/1/0][  240000000][0-0]                            ;
-# 132>               TYPE|               NONE|     PARENT_NOT_SET[ 30/ 30/ 34/  1][1/1/0][   408e0000][0-0]                              long
-# 132>               WORD|               NONE|     PARENT_NOT_SET[ 35/ 35/ 36/  1][1/1/0][   43000000][0-0]                                   y
-# 132>          SEMICOLON|               NONE|     PARENT_NOT_SET[ 36/ 36/ 37/  0][1/1/0][  240000000][0-0]                                    ;
-# 132>        BRACE_CLOSE|              UNION|     PARENT_NOT_SET[ 38/ 38/ 39/  1][0/0/0][  240000000][0-0]                                      }
-# 132>               WORD|               NONE|     PARENT_NOT_SET[ 40/ 40/ 43/  1][0/0/0][    70c0000][0-0]                                        u11
-# 132>              COMMA|               NONE|     PARENT_NOT_SET[ 43/ 43/ 44/  0][0/0/0][  200000000][0-0]                                           ,
-# 132>           PTR_TYPE|              UNION|     PARENT_NOT_SET[ 45/ 45/ 46/  1][0/0/0][  200080000][0-0]                                             *
-# 132>               WORD|               NONE|     PARENT_NOT_SET[ 46/ 46/ 49/  0][0/0/0][   25080000][0-0]                                              u12
-# 132>             ASSIGN|               NONE|     PARENT_NOT_SET[ 50/ 50/ 51/  1][0/0/0][  200000000][0-0]                                                  =
-# 132>               WORD|               NONE|     PARENT_NOT_SET[ 52/ 52/ 59/  1][0/0/0][      80000][0-0]                                                    nullptr
-# 132>              COMMA|               NONE|     PARENT_NOT_SET[ 59/ 59/ 60/  0][0/0/0][  200000000][0-0]                                                           ,
-# 132>           PTR_TYPE|              UNION|     PARENT_NOT_SET[ 61/ 61/ 62/  1][0/0/0][  200080000][0-0]                                                             *
-# 132>               WORD|               NONE|     PARENT_NOT_SET[ 62/ 62/ 65/  0][0/0/0][   25080000][0-0]                                                              u13
-# 132>         BRACE_OPEN|   BRACED_INIT_LIST|     PARENT_NOT_SET[ 65/ 65/ 66/  0][0/0/0][  240000000][0-0]                                                                 {
-# 132>             NUMBER|               NONE|     PARENT_NOT_SET[ 66/ 66/ 67/  0][1/1/0][   400c0000][0-0]                                                                  0
-# 132>        BRACE_CLOSE|   BRACED_INIT_LIST|     PARENT_NOT_SET[ 67/ 67/ 68/  0][0/0/0][  240000000][0-0]                                                                   }
-# 132>          SEMICOLON|              UNION|     PARENT_NOT_SET[ 68/ 68/ 69/  0][0/0/0][  200000000][0-0]                                                                    ;
-# 132>            NEWLINE|               NONE|     PARENT_NOT_SET[ 69/ 69/  1/  0][0/0/0][          0][2-0]
-# 134>              UNION|               NONE|     PARENT_NOT_SET[  1/  1/  6/  0][0/0/0][      e0000][0-0] union
-# 134>               WORD|               NONE|     PARENT_NOT_SET[  7/  7/ 17/  1][0/0/0][      20000][0-0]       API_EXPORT
-# 134>               TYPE|              UNION|     PARENT_NOT_SET[ 18/ 18/ 20/  1][0/0/0][     820000][0-0]                  u1
-# 134>               WORD|               NONE|     PARENT_NOT_SET[ 21/ 21/ 24/  1][0/0/0][    3000000][0-0]                     u21
-# 134>          SEMICOLON|              UNION|     PARENT_NOT_SET[ 24/ 24/ 25/  0][0/0/0][  200000000][0-0]                        ;
-# 134>            NEWLINE|               NONE|     PARENT_NOT_SET[ 25/ 25/  1/  0][0/0/0][          0][1-0]
-# -=====-
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/output/replace.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/output/replace.txt
deleted file mode 100644
index 6addb57b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/output/replace.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Parsing: input/I-3310.c as language C
-Parsing: input/backup.h as language C-Header
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/attribute_specifier_seqs.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/attribute_specifier_seqs.cfg
deleted file mode 100644
index 8eec117f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/attribute_specifier_seqs.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-sp_before_vardef_square  = ignore
-sp_type_brace_init_lst   = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/indent_columns-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/indent_columns-3.cfg
deleted file mode 100644
index 9c9e205f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/indent_columns-3.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-indent_columns   = 3
-sp_cond_colon    = add
-sp_cond_question = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2229.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2229.cfg
deleted file mode 100644
index 8527cbb2..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2229.cfg
+++ /dev/null
@@ -1,10 +0,0 @@
-# Add or remove braces on a single-line 'if' statement. Braces will not be
-# removed if the braced statement contains an 'else'.
-mod_full_brace_if = remove
-
-# Whether to enforce that all blocks of an 'if'/'else if'/'else' chain either
-# have, or do not have, braces. If true, braces will be added if any block
-# needs braces, and will only be removed if they can be removed from all
-# blocks.
-# Overrides mod_full_brace_if.
-mod_full_brace_if_chain = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2668.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2668.cfg
deleted file mode 100644
index 7649b34c..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2668.cfg
+++ /dev/null
@@ -1 +0,0 @@
-nl_var_def_blk_end = 2
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3097.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3097.cfg
deleted file mode 100644
index bce2060e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3097.cfg
+++ /dev/null
@@ -1 +0,0 @@
-nl_var_def_blk_start = 2
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/functype_param-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/functype_param-f.cfg
deleted file mode 100644
index 746b15f5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/functype_param-f.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-sp_after_byref                            = force
-sp_after_ptr_star                         = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/functype_param-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/functype_param-r.cfg
deleted file mode 100644
index 1576135f..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/functype_param-r.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-sp_after_byref                            = remove
-sp_after_ptr_star                         = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/i1516.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/i1516.cfg
deleted file mode 100644
index 8c03f30e..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/i1516.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-nl_func_var_def_blk             = 2
-nl_var_def_blk_start            = 2
-nl_var_def_blk_end              = 2
-nl_var_def_blk_in               = 1
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/if_chain_braces_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/if_chain_braces_2.cfg
deleted file mode 100644
index aa9251c7..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/if_chain_braces_2.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-mod_full_brace_if_chain         = true
-mod_full_brace_if_chain_only    = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_comma_brace.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_comma_brace.cfg
deleted file mode 100644
index 635c6cdf..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_comma_brace.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-code_width                      = 60
-indent_columns                  = 4
-indent_comma_brace              = true
-indent_with_tabs                = 0
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_shift.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_shift.cfg
deleted file mode 100644
index 8a848c34..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_shift.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-indent_columns                  = 4
-indent_continue                 = 4
-indent_shift                    = true
-align_left_shift                = false
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/issue_2124-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/issue_2124-2.cfg
deleted file mode 100644
index 34866fe3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/issue_2124-2.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-mod_full_brace_if_chain         = true
-mod_full_brace_nl               = 1
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/mod_full_brace_if_chain-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/mod_full_brace_if_chain-t.cfg
deleted file mode 100644
index 32a552ec..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/mod_full_brace_if_chain-t.cfg
+++ /dev/null
@@ -1 +0,0 @@
-mod_full_brace_if_chain         = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/mod_full_brace_nl_block_rem_mlcond-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/mod_full_brace_nl_block_rem_mlcond-1.cfg
deleted file mode 100644
index 800ba158..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/mod_full_brace_nl_block_rem_mlcond-1.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-mod_full_brace_if_chain         = true
-mod_full_brace_nl_block_rem_mlcond = true
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/vala/Issue_2090.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/vala/Issue_2090.cfg
deleted file mode 100644
index f6e8529b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/vala/Issue_2090.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-sp_type_question = force
-sp_cond_question = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30218-trailing_return.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30218-trailing_return.cpp
deleted file mode 100644
index be70a23b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30218-trailing_return.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-auto f0(int a, int b) -> int;
-
-struct Foo
-{
-	auto f01() -> bool;
-	auto f02() noexcept -> bool;
-	auto f03() noexcept(true) -> bool;
-	auto f04() noexcept(false) -> bool;
-	auto f05() noexcept -> bool = delete;
-	auto f06() noexcept(true) -> bool = delete;
-	auto f07() noexcept(false) -> bool = delete;
-
-	auto f11() const -> bool;
-	auto f12() const noexcept -> bool;
-	auto f13() const noexcept(true) -> bool;
-	auto f14() const noexcept(false) -> bool;
-	auto f15() const noexcept -> bool = delete;
-	auto f16() const noexcept(true) -> bool = delete;
-	auto f17() const noexcept(false) -> bool = delete;
-
-	auto f21() throw() -> bool;
-	auto f22() throw() -> bool = delete;
-	auto f23() const throw() -> bool;
-	auto f24() const throw() -> bool = delete;
-};
-
-struct Bar
-{
-	Bar() : m_func([](void*) -> result_t {
-		return magic;
-	}) {}
-};
-
-void foo()
-{
-	auto l = [](int n) -> x_t {
-			 return n + 5;
-		 };
-	x([](int n) -> x_t {
-		return n + 5;
-	});
-}
-
-static auto f25() -> bool {
-	return true;
-}
-
-static auto f26() const noexcept(true) -> bool {
-	return true;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30219-trailing_return.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30219-trailing_return.cpp
deleted file mode 100644
index e250cbd5..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30219-trailing_return.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-auto f0(int a, int b)->int;
-
-struct Foo
-{
-	auto f01()->bool;
-	auto f02() noexcept->bool;
-	auto f03() noexcept(true)->bool;
-	auto f04() noexcept(false)->bool;
-	auto f05() noexcept->bool = delete;
-	auto f06() noexcept(true)->bool = delete;
-	auto f07() noexcept(false)->bool = delete;
-
-	auto f11() const->bool;
-	auto f12() const noexcept->bool;
-	auto f13() const noexcept(true)->bool;
-	auto f14() const noexcept(false)->bool;
-	auto f15() const noexcept->bool = delete;
-	auto f16() const noexcept(true)->bool = delete;
-	auto f17() const noexcept(false)->bool = delete;
-
-	auto f21() throw()->bool;
-	auto f22() throw()->bool = delete;
-	auto f23() const throw()->bool;
-	auto f24() const throw()->bool = delete;
-};
-
-struct Bar
-{
-	Bar() : m_func([](void*)->result_t {
-		return magic;
-	}) {}
-};
-
-void foo()
-{
-	auto l = [](int n)->x_t {
-			 return n + 5;
-		 };
-	x([](int n)->x_t {
-		return n + 5;
-	});
-}
-
-static auto f25()->bool {
-	return true;
-}
-
-static auto f26() const noexcept(true)->bool {
-	return true;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30222-trailing_return.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30222-trailing_return.cpp
deleted file mode 100644
index 9c076282..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30222-trailing_return.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-auto f0(int a, int b)  ->  int;
-
-struct Foo
-{
-	auto f01()  ->  bool;
-	auto f02() noexcept  ->  bool;
-	auto f03() noexcept(true)  ->  bool;
-	auto f04() noexcept(false)  ->  bool;
-	auto f05() noexcept  ->  bool=delete;
-	auto f06() noexcept(true)  ->  bool=delete;
-	auto f07() noexcept(false)  ->  bool=delete;
-
-	auto f11() const  ->  bool;
-	auto f12() const noexcept  ->  bool;
-	auto f13() const noexcept(true)  ->  bool;
-	auto f14() const noexcept(false)  ->  bool;
-	auto f15() const noexcept  ->  bool=delete;
-	auto f16() const noexcept(true)  ->  bool=delete;
-	auto f17() const noexcept(false)  ->  bool=delete;
-
-	auto f21() throw()  ->  bool;
-	auto f22() throw()  ->  bool=delete;
-	auto f23() const throw()  ->  bool;
-	auto f24() const throw()  ->  bool=delete;
-};
-
-struct Bar
-{
-	Bar() : m_func([](void*)  ->  result_t {
-		return magic;
-	}) {}
-};
-
-void foo()
-{
-	auto l = [](int n)  ->  x_t {
-			 return n + 5;
-		 };
-	x([](int n)  ->  x_t {
-		return n + 5;
-	});
-}
-
-static auto f25()  ->  bool {
-	return true;
-}
-
-static auto f26() const noexcept(true)  ->  bool {
-	return true;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33029-cast.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33029-cast.cpp
deleted file mode 100644
index 179c98c8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33029-cast.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-	a = ( int ) 5.6;
-	b = int( 5.6 );
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34173-i1464.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34173-i1464.cpp
deleted file mode 100644
index e4005841..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34173-i1464.cpp
+++ /dev/null
@@ -1 +0,0 @@
-auto p = std::make_pair(r * cos(a), r * sin(a));
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34174-i1466.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34174-i1466.cpp
deleted file mode 100644
index 912488b3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34174-i1466.cpp
+++ /dev/null
@@ -1 +0,0 @@
-A a = {this->r * cos(b)};
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60050-semicolon-removal-after-ternary-operator.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60050-semicolon-removal-after-ternary-operator.cpp
deleted file mode 100644
index a344480b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60050-semicolon-removal-after-ternary-operator.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-std::string StrGet()
-{
-	return IsConnected() ? "Connected" : {};
-}
-
-std::string StrGet2()
-{
-	return !IsConnected() ? {} : "Connected";
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10018-delete-space-oc.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10018-delete-space-oc.mm
deleted file mode 100644
index 59496772..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10018-delete-space-oc.mm
+++ /dev/null
@@ -1,69 +0,0 @@
-/* EditorApplication */

-

-#include <string>

-

-#ifdef __OBJC__

-#import <Cocoa/Cocoa.h>

-

-class HierarchyState;

-@interface EditorApplication: NSObject

-{

-	IBOutlet id m_MainWindow;

-	IBOutlet id m_PaneController;

-	id m_RenderTimer;

-

-	IBOutlet id m_CutItem;

-	IBOutlet id m_CopyItem;

-	IBOutlet id m_PasteItem;

-

-	IBOutlet id m_DuplicateItem;

-	IBOutlet id m_DeleteItem;

-

-	IBOutlet id m_FrameSelectedItem;

-	IBOutlet id m_FindItem;

-	IBOutlet id m_SelectAllItem;

-}

-

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

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

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

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

-

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

-

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

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

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

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

-

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

-

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

-

--(void)RemoveDisplayTimer;

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

-

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

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

-

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

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

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

-

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

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

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

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

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

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

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

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

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

-

-// Assetstore protocol handler and registration

--(void)registerAssetStoreURLProtocol;

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

-

-@end

-

-#endif

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10019-func-param-wrap-oc.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10019-func-param-wrap-oc.mm
deleted file mode 100644
index 6e192eec..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10019-func-param-wrap-oc.mm
+++ /dev/null
@@ -1,5 +0,0 @@
-if(progress <= 0)

-{

-	[[NSBezierPath bezierPathWithOvalInRect: NSMakeRect(NSMinX(pieRect)+stroke,NSMinY(pieRect)+stroke,

-	                                                    NSWidth(pieRect)-2*stroke,NSHeight(pieRect)-2*stroke)] fill];

-}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/cast.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/cast.cpp
deleted file mode 100644
index d558e7f6..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/cast.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    a = ( int)5.6;
-    b = int (5.6 );
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/i1464.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/i1464.cpp
deleted file mode 100644
index e4005841..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/i1464.cpp
+++ /dev/null
@@ -1 +0,0 @@
-auto p = std::make_pair(r * cos(a), r * sin(a));
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/i1466.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/i1466.cpp
deleted file mode 100644
index 912488b3..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/i1466.cpp
+++ /dev/null
@@ -1 +0,0 @@
-A a = {this->r * cos(b)};
\ No newline at end of file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/semicolon-removal-after-ternary-operator.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/semicolon-removal-after-ternary-operator.cpp
deleted file mode 100644
index a344480b..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/semicolon-removal-after-ternary-operator.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-std::string StrGet()
-{
-	return IsConnected() ? "Connected" : {};
-}
-
-std::string StrGet2()
-{
-	return !IsConnected() ? {} : "Connected";
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/trailing_return.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/trailing_return.cpp
deleted file mode 100644
index de061955..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/trailing_return.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-auto f0(int a, int b)  ->  int;
-
-struct Foo
-{
-	auto f01()  ->  bool;
-	auto f02() noexcept  ->  bool;
-	auto f03() noexcept(true)  ->  bool;
-	auto f04() noexcept(false)  ->  bool;
-	auto f05() noexcept  ->  bool = delete;
-	auto f06() noexcept(true)  ->  bool = delete;
-	auto f07() noexcept(false)  ->  bool = delete;
-
-	auto f11() const  ->  bool;
-	auto f12() const noexcept  ->  bool;
-	auto f13() const noexcept(true)  ->  bool;
-	auto f14() const noexcept(false)  ->  bool;
-	auto f15() const noexcept  ->  bool = delete;
-	auto f16() const noexcept(true)  ->  bool = delete;
-	auto f17() const noexcept(false)  ->  bool = delete;
-
-	auto f21() throw()  ->  bool;
-	auto f22() throw()  ->  bool = delete;
-	auto f23() const throw()  ->  bool;
-	auto f24() const throw()  ->  bool = delete;
-};
-
-struct Bar
-{
-	Bar() : m_func([](void*)  ->  result_t{ return magic; }) {}
-};
-
-void foo()
-{
-	auto l = [](int n)  ->  x_t{ return n + 5; };
-	x([](int n)  ->  x_t{ return n + 5; });
-}
-
-static auto f25()  ->  bool {
-	return true;
-}
-
-static auto f26() const noexcept(true)  ->  bool {
-	return true;
-}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/delete-space-oc.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/delete-space-oc.mm
deleted file mode 100644
index 66e24dc8..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/delete-space-oc.mm
+++ /dev/null
@@ -1,69 +0,0 @@
-/* EditorApplication */

-

-#include <string>

-

-#ifdef __OBJC__

-#import <Cocoa/Cocoa.h>

-

-class HierarchyState;

-@interface EditorApplication : NSObject

-{

-    IBOutlet id             m_MainWindow;

-    IBOutlet id             m_PaneController;

-    id                      m_RenderTimer;

-

-    IBOutlet id             m_CutItem;

-    IBOutlet id             m_CopyItem;

-    IBOutlet id             m_PasteItem;

-

-    IBOutlet id             m_DuplicateItem;

-    IBOutlet id             m_DeleteItem;

-

-    IBOutlet id             m_FrameSelectedItem;

-    IBOutlet id             m_FindItem;

-    IBOutlet id             m_SelectAllItem;

-}

-

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

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

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

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

-

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

-

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

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

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

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

-

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

-

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

-

-- (void)RemoveDisplayTimer;

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

-

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

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

-

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

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

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

-

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

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

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

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

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

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

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

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

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

-

-// Assetstore protocol handler and registration

-- (void)registerAssetStoreURLProtocol;

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

-

-@end

-

-#endif

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/func-param-wrap-oc.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/func-param-wrap-oc.mm
deleted file mode 100644
index 16f98ce9..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/func-param-wrap-oc.mm
+++ /dev/null
@@ -1,5 +0,0 @@
-    if(progress <= 0)

-    {

-        [[NSBezierPath bezierPathWithOvalInRect:NSMakeRect(NSMinX(pieRect)+stroke,NSMinY(pieRect)+stroke,

-                                                           NSWidth(pieRect)-2*stroke,NSHeight(pieRect)-2*stroke)] fill];

-    }

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
new file mode 100644
index 00000000..63a0427a
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0.orig.tar.gz
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/.editorconfig b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/.editorconfig
index 3942fe21..3942fe21 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/.editorconfig
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/.editorconfig
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/.gitattributes b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/.gitattributes
index 5ef989a3..5ef989a3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/.gitattributes
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/.gitattributes
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/.github/ISSUE_TEMPLATE b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/.github/ISSUE_TEMPLATE
index d98e5cf5..d98e5cf5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/.github/ISSUE_TEMPLATE
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/.github/ISSUE_TEMPLATE
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/.github/workflows/uncrustify_test.yml b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/.github/workflows/uncrustify_test.yml
index 8d2198ab..a7fab544 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/.github/workflows/uncrustify_test.yml
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/.github/workflows/uncrustify_test.yml
@@ -1,7 +1,13 @@
 ---
 
 name: uncrustify_test
-on: [push]
+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
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/.gitignore b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/.gitignore
index 9fb21e7e..c4c9b54b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/.gitignore
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/.gitignore
@@ -62,3 +62,9 @@ cmake-build-*/
 
 # Vim
 *.swp
+
+# Clangd
+/.cache/clangd/
+
+# Compilation database
+compile_commands.json
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/.travis.yml b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/.travis.yml
index a3bfcf7a..a3bfcf7a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/.travis.yml
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/.travis.yml
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/AUTHORS b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/AUTHORS
index b013baac..e4d72680 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/AUTHORS
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/AUTHORS
@@ -38,7 +38,9 @@ Clint Lawrence
 Code Able
 Cody Schafer
 Corentin Noël
+Dandielo
 Daniel Chumak
+Daniele Bartolini
 Dan Rose
 Dave Lee
 David Catmull
@@ -55,6 +57,7 @@ Dženan Zukić
 Eism
 Emerson Knapp
 Emmanuel Christophe
+epac-tom
 Ethan Gao
 Florin Pop
 Gary Ash
@@ -76,6 +79,8 @@ Jeremy H
 Jeremy T Hilliker
 Jim Meyering
 Jiri Hruska
+jodi.the.tigger
+Jody Hagins
 Joel Ostraat
 Joergen Ibsen
 Johnny Oskarsson
@@ -132,10 +137,14 @@ Peter Jonas
 Peter Kolbus
 Peter Waller
 Piet Van Reepingen
+PMheart
 Randolph R. Settgast
 Randolph Settgast
 RaveTheTadpole
+Richard Maxwell
+Ricky Lopez
 Roland Schulz
+Roman Gordienko
 Ryan Maxwell
 Samish Chandra Kolli
 Samish Kolli
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/BUGS b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/BUGS
index a6e2ccaa..a6e2ccaa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/BUGS
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/BUGS
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/CMakeLists.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/CMakeLists.txt
index 1814a823..8c8a59ef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/CMakeLists.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/CMakeLists.txt
@@ -138,7 +138,7 @@ endif()
 # Generate uncrustify_version.h
 #
 
-set(UNCRUSTIFY_VERSION "0.74.0_f")
+set(UNCRUSTIFY_VERSION "0.75.0_f")
 
 option(NoGitVersionString "Do not use make_version.py and git to build a version string" OFF)
 if(NoGitVersionString)
@@ -243,6 +243,7 @@ set(uncrustify_sources
   src/align_add.cpp
   src/align_asm_colon.cpp
   src/align_assign.cpp
+  src/align_braced_init_list.cpp
   src/align.cpp
   src/align_eigen_comma_init.cpp
   src/align_func_params.cpp
@@ -268,7 +269,7 @@ set(uncrustify_sources
   src/brace_cleanup.cpp
   src/braces.cpp
   src/calculate_closing_brace_position.cpp
-  src/chunk_list.cpp
+  src/chunk.cpp
   src/ChunkStack.cpp
   src/combine.cpp
   src/combine_fix_mark.cpp
@@ -329,6 +330,7 @@ set(uncrustify_headers
   src/align_add.h
   src/align_asm_colon.h
   src/align_assign.h
+  src/align_braced_init_list.h
   src/align_func_params.h
   src/align_func_proto.h
   src/align.h
@@ -356,7 +358,7 @@ set(uncrustify_headers
   src/braces.h
   src/calculate_closing_brace_position.h
   src/char_table.h
-  src/chunk_list.h
+  src/chunk.h
   src/ChunkStack.h
   src/combine.h
   src/combine_fix_mark.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/CODEOWNERS b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/CODEOWNERS
new file mode 100644
index 00000000..56414821
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/CODEOWNERS
@@ -0,0 +1,11 @@
+*               @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.74.0/CONTRIBUTING.md b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/CONTRIBUTING.md
index 8a43f8a8..8a43f8a8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/CONTRIBUTING.md
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/CONTRIBUTING.md
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/COPYING b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/COPYING
index d60c31a9..d60c31a9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/COPYING
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/COPYING
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/ChangeLog b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/ChangeLog
index f8da1c50..0e456e37 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/ChangeLog
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/ChangeLog
@@ -1,3 +1,59 @@
+Change highlights in uncrustify-0.75.0 (May 2022)
+-------------------------------------------------------------------------------
+  52131d9fa22fd0c655ae2510563ff85306d4bd27
+    Added   : mod_move_case_return                 Nov 25 2021
+  d0008e933daca163ef8f7258f526e75fb8b5b160
+    Added   : sp_ptr_star_func_type                Dec  8 2021
+  a17751ae534cb7d1a8b505a111d7b8b50c9842d4
+    Added   : pp_indent_at_level0                  Dec 14 2021
+  498c1b3a6c96c9dd8ec13a4c0f616acdb7a03cc5
+    Added   : align_braced_init_list_thresh        Dec 16 2021
+    Added   : align_braced_init_list_span          Dec 16 2021
+  8e811b9a57bc43d280aa592d8838cff93227968e
+    Added   : align_assign_on_multi_var_defs       Dec 18 2021
+  75d3c536789ef23d2d8568d891a4e3ba73aa7045
+    Added   : sp_byref_paren                       Dec 24 2021
+  d8507bb212aa317dce0f51227b8fd862354e03c2
+    Added   : sp_not_not                           Dec 28 2021
+  d9e2ae9aad5481f9da818909893e2f55d51ba392
+    Added   : indent_ignore_comma_paren            Jan  4 2022
+    Added   : indent_ignore_comma_brace            Jan  4 2022
+  8eff5202a58732e17f063af8360ff3e2691713aa
+    Added   : indent_ignore_bool_paren             Jan 13 2022
+  2c02f5c8285882ddf756992d842db12d0f98188a
+    Added   : indent_ignore_arith                  Jan 18 2022
+  0664cacee7689cf838425e83f38fb84f5e71bc63
+    Added   : mod_full_paren_return_bool           Jan 21 2022
+    Added   : mod_full_paren_assign_bool           Jan 21 2022
+  d593f257e88161a3ed1cff15b354c85e3da68992
+    Added   : sp_type_colon                        Jan 25 2022
+  026162b8da51660126863b42d00245e21a47d7c0
+    Removed : indent_ignore_comma_paren            Jan 28 2022
+    Removed : indent_ignore_bool_paren             Jan 28 2022
+    Removed : indent_ignore_comma_brace            Jan 28 2022
+  6cb50031c5e2e3681d69c3dafdbb865a5b6b6a2c
+    Added   : indent_ignore_semicolon              Feb  1 2022
+  b6f55dd25fb6a12c7f81c0090f8ee42e8823ee93
+    Added   : sp_enum_brace                        Feb  2 2022
+  8aa0522fcc2ad468f1122943443f5ebf426fffc1
+    Added   : indent_ignore_before_class_colon     Feb  4 2022
+  133fe55d6fc0b2e1695bd7a70ccd6d2dcd1b2262
+    Added   : indent_ignore_before_constr_colon    Feb  4 2022
+  c95460809c74a73459c61712ff2d9142dff101d7
+    Added   : indent_ignore_bool                   Feb 25 2022
+  b37091110063b5c24b64516a49af09b8ca3cc18c
+    Added   : indent_ignore_first_continue         Feb 25 2022
+  e84f08879a7cf53b0301099a64faadeacf04a3a5
+    Added   : indent_ignore_assign                 Mar  1 2022
+  6ef69ee2a359f2e1bd8517ba4af25b969951fa71
+    Added   : indent_ignore_case_brace             Mar  9 2022
+  02a5e50419fd1bf7c9bf0ff9d208035b47db6fbf
+    Added   : indent_namespace_inner_only          Apr 12 2022
+  9040b9f068a179c3a09e0cf202a5ed7f91b2a12b
+    Added   : pp_warn_unbalanced_if                Apr 15 2022
+  df2ef721c95105b62a9e0cb0e9985947a739a44b
+    Removed : sp_type_question                     Apr 30 2022
+
 Change highlights in uncrustify-0.74.0 (November 2021)
 -------------------------------------------------------------------------------
   4714d5d673d5b9c8f45d70c179f508d60130b18a
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/Comments.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/Comments.txt
index 5375e829..5375e829 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/Comments.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/Comments.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/HELP b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/HELP
index 83792fa5..83792fa5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/HELP
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/HELP
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/LIMITATIONS.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/LIMITATIONS.txt
index a49f23f2..a49f23f2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/LIMITATIONS.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/LIMITATIONS.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/NEWS b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/NEWS
index 8b6344a0..8b6344a0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/NEWS
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/NEWS
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/README.md b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/README.md
index 0a1025c6..85fc2bd2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/README.md
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/README.md
@@ -8,7 +8,7 @@
 A source code beautifier for C, C++, C#, ObjectiveC, D, Java, Pawn and VALA
 
 ## Features
-* Highly configurable - 787 configurable options as of version 0.74.0
+* Highly configurable - 808 configurable options as of version 0.75.0
 - <details><summary>add/remove spaces</summary>
 
   - `sp_before_sparen`: _Add or remove space before '(' of 'if', 'for', 'switch', 'while', etc._
@@ -210,9 +210,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.
@@ -383,7 +383,7 @@ window that allows you to run commands without it closing as soon as
 they exit) and run uncrustify.exe there.
 
 ## Using uncrustify with vim
-Have a look [here]https://github.com/cofyc/vim-uncrustify
+Have a look [here](https://github.com/cofyc/vim-uncrustify)
   
 ## Using uncrustify with IntelliJ
 Have a look at https://plugins.jetbrains.com/plugin/17528-uncrustify
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/TESTING b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/TESTING
index 63efbff7..63efbff7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/TESTING
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/TESTING
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/appveyor.yml b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/appveyor.yml
index e5c01aac..1bdd8d4c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/appveyor.yml
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/appveyor.yml
@@ -5,7 +5,6 @@ environment:
   # MSVC
   - GENERATOR: Visual Studio 15 2017 Win64
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-  - GENERATOR: Visual Studio 14 2015 Win64
 configuration:
   - Debug
   - Release
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/cmake/CodeCoverage.cmake b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/cmake/CodeCoverage.cmake
index 670c5144..670c5144 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/cmake/CodeCoverage.cmake
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/cmake/CodeCoverage.cmake
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/cmake/GenerateTokenNames.cmake b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/cmake/GenerateTokenNames.cmake
index 02a6241a..02a6241a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/cmake/GenerateTokenNames.cmake
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/cmake/GenerateTokenNames.cmake
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/cmake/GenerateVersionHeader.cmake b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/cmake/GenerateVersionHeader.cmake
index 3d6d376b..3d6d376b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/cmake/GenerateVersionHeader.cmake
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/cmake/GenerateVersionHeader.cmake
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/cmake/Toolchain-mingw32.cmake b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/cmake/Toolchain-mingw32.cmake
index badd6994..218d9501 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/cmake/Toolchain-mingw32.cmake
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/cmake/Toolchain-mingw32.cmake
@@ -4,7 +4,7 @@
 
 set(CMAKE_SYSTEM_NAME Windows)
 
-if(NOT COMPILER_PREFIX)
+if(COMPILER_PREFIX STREQUAL "")
   if(EXISTS /usr/i686-w64-mingw32)
     # mingw-w64
     set(COMPILER_PREFIX "i686-w64-mingw32")
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/cmake/Toolchain-mingw64.cmake b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/cmake/Toolchain-mingw64.cmake
index 399cc26b..4ec9c43a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/cmake/Toolchain-mingw64.cmake
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/cmake/Toolchain-mingw64.cmake
@@ -4,7 +4,7 @@
 
 set(CMAKE_SYSTEM_NAME Windows)
 
-if(NOT COMPILER_PREFIX)
+if(COMPILER_PREFIX STREQUAL "")
   if(EXISTS /usr/x86_64-w64-mingw32)
     # mingw-w64
     set(COMPILER_PREFIX "x86_64-w64-mingw32")
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/cmake/uninstall.cmake b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/cmake/uninstall.cmake
index b9618a29..b9618a29 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/cmake/uninstall.cmake
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/cmake/uninstall.cmake
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/commit.log b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/commit.log
index 1a725f4e..1a725f4e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/commit.log
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/commit.log
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/coverity.sh b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/coverity.sh
index e52a3594..e52a3594 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/coverity.sh
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/coverity.sh
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/coverity.travis.yml b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/coverity.travis.yml
index ef306e8c..ef306e8c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/coverity.travis.yml
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/coverity.travis.yml
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/debian/cdbs/debian-tde.mk b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/debian/cdbs/debian-tde.mk
index f36e3527..f36e3527 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/debian/cdbs/debian-tde.mk
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/debian/cdbs/debian-tde.mk
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/debian/cdbs/versions.pl b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/debian/cdbs/versions.pl
index 1b110f7a..1b110f7a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/debian/cdbs/versions.pl
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/debian/cdbs/versions.pl
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/debian/changelog b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/debian/changelog
index 1729edda..40d2a1f0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/debian/changelog
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/debian/changelog
@@ -1,3 +1,9 @@
+uncrustify-trinity (0.75.0-0debian11.0.0+0) unstable; urgency=medium
+
+  * TDE version of upstream 0.75.0
+
+ -- Michele Calgaro <michele.calgaro@yahoo.it>  Fri, 06 May 2022 13:49:07 +0900
+
 uncrustify-trinity (0.74.0-0debian11.0.0+0) unstable; urgency=medium
 
   * TDE version of upstream 0.74.0
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/debian/compat b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/debian/compat
index ec635144..ec635144 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/debian/compat
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/debian/compat
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/debian/control b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/debian/control
index 97a69cb2..21e39cb0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/debian/control
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/debian/control
@@ -1,7 +1,8 @@
 Source: uncrustify-trinity
 Section: deps-r14/devel
 Priority: optional
-Maintainer: Alexander GQ Gerasiov <gq@debian.org>
+Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
+XSBC-Original-Maintainer: Alexander GQ Gerasiov <gq@debian.org>
 Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake (>= 3.0~), ninja-build, python3 (>= 3.3~), gcc (>= 4:4.9~)
 Standards-Version: 4.5.0
 Homepage: https://github.com/uncrustify/uncrustify
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/debian/copyright b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/debian/copyright
index 7c74f673..7c74f673 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/debian/copyright
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/debian/copyright
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/debian/docs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/debian/docs
index 3310d30d..3310d30d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/debian/docs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/debian/docs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/debian/patches/001_docs-remove-remote-images.patch b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/debian/patches/001_docs-remove-remote-images.patch
index 9c7d3e3b..9c7d3e3b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/debian/patches/001_docs-remove-remote-images.patch
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/debian/patches/001_docs-remove-remote-images.patch
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/debian/patches/002_trinity_customization.diff b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/debian/patches/002_trinity_customization.diff
index 2db6fc3c..c447cc39 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/debian/patches/002_trinity_customization.diff
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.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
-@@ -324,7 +324,7 @@
+@@ -325,7 +325,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
-@@ -419,7 +419,7 @@
+@@ -421,7 +421,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"
-@@ -428,31 +428,31 @@
+@@ -430,31 +430,31 @@
    "${PROJECT_SOURCE_DIR}/README.md"
  )
  
@@ -75,7 +75,7 @@ Customize and repackage as a TDE package.
  
  #
  # Generate uncrustify.xml (katepart highlighting file)
-@@ -474,7 +474,7 @@
+@@ -476,7 +476,7 @@
  #
  OPTION(ENABLE_CODECOVERAGE "Enable code coverage testing support")
  if(ENABLE_CODECOVERAGE)
@@ -84,7 +84,7 @@ Customize and repackage as a TDE package.
      include(${CMAKE_SOURCE_DIR}/cmake/CodeCoverage.cmake)
  endif(ENABLE_CODECOVERAGE)
  
-@@ -482,10 +482,10 @@
+@@ -484,10 +484,10 @@
  # Build command to run uncrustify on its own sources
  #
  add_custom_target(format-sources)
@@ -97,7 +97,7 @@ Customize and repackage as a TDE package.
        -c forUncrustifySources.cfg
        -lCPP --no-backup ${source}
      COMMENT "Formatting ${source}"
-@@ -497,7 +497,7 @@
+@@ -499,7 +499,7 @@
  #
  # Package
  #
@@ -106,7 +106,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")
-@@ -515,8 +515,8 @@
+@@ -517,8 +517,8 @@
  # Install
  #
  if(MSVC)
@@ -117,7 +117,7 @@ Customize and repackage as a TDE package.
      DESTINATION "."
    )
    install(FILES "${PROJECT_SOURCE_DIR}/documentation/htdocs/index.html"
-@@ -528,17 +528,17 @@
+@@ -530,17 +530,17 @@
    )
  else()
    include(GNUInstallDirs)
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/debian/patches/003_allow_older_distributions.diff b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/debian/patches/003_allow_older_distributions.diff
index 8643a7cd..8643a7cd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/debian/patches/003_allow_older_distributions.diff
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/debian/patches/003_allow_older_distributions.diff
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/debian/patches/004_fixed_usage.diff b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/debian/patches/004_fixed_usage.diff
index 3f2c57ff..3f2c57ff 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/debian/patches/004_fixed_usage.diff
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/debian/patches/004_fixed_usage.diff
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/debian/patches/series b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/debian/patches/series
index 383a9d11..383a9d11 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/debian/patches/series
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/debian/patches/series
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/debian/rules b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/debian/rules
index dd013fa1..dd013fa1 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/debian/rules
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/debian/rules
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/debian/source/format b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/debian/source/format
index 163aaf8d..163aaf8d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/debian/source/format
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/debian/source/format
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/debian/source/options b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/debian/source/options
index d71748bb..d71748bb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/debian/source/options
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/debian/source/options
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/Track.jpg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/Track.jpg
index b18b0477..b18b0477 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/Track.jpg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/Track.jpg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/Tracking.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/Tracking.txt
index a1fb7850..a1fb7850 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/Tracking.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/Tracking.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/align-thresholds.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/align-thresholds.txt
index 4c41f7db..5c18039d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/align-thresholds.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/align-thresholds.txt
@@ -172,22 +172,23 @@ How to do this generically in the code...
 
 Easy case - one item per line.
 
-Here's the functions and what each do:
-align_start(line_span, col_thresh)
-align_add(pc)
-align_flush()
-align_newline(count)
-align_end()
+An AlignStack is used to manage alignment.
+Here are the functions and what each of them do:
+AlignStack::Start(line_span, col_thresh)
+AlignStack::Add(pc)
+AlignStack::Flush()
+AlignStack::Newline(count)
+AlignStack::End()
 
 For each entry, a sequence number is kept.
 
-align_start(line_span, col_thresh)
+AlignStack::Start(line_span, col_thresh)
   - initializes the align and skipped lists
   - zero max_column
   - zero cur_seqnum
   - zero nl_count
 
-align_add(pc)
+AlignStack::Add(start, seqnum)
   - update cur_seqnum, assign to item
   - if item column is within threshold
     - zero nl_count
@@ -197,43 +198,22 @@ align_add(pc)
       - re-adds all items on the skipped list
   - if item column is not within threshold, add to skipped list
 
-align_newline(count)
+AlignStack::NewLines(count)
   - adds count to nl_count
-  - if nl_count > line_span, call align_flush()
+  - if nl_count > line_span, call AlignStack::Flush()
 
-align_flush()
+AlignStack::Flush()
   - step through all the items in aligned list and align the items to max_column
     - keep the seq_num of the last aligned item
   - zero max_column
   - remove all items with a seq_num < last aligned seq_num
-  - call align_add on all remaining items in the skipped list
+  - call AlignStack::Add on all remaining items in the skipped list
 
-align_end()
-  - call align_flush
+AlignStack::End()
+  - call AlignStack::Flush
   - clear the lists
   - free resources, etc
 
-Example usage:  Aligning trailing comments
-
-void align_trailing_comments(void)
-{
-   chunk_t *pc;
-
-   align_start(cpd.settings[UO_align_right_cmt_span],
-               cpd.settings[UO_align_right_cmt_thresh]);
-
-   for(pc = chunk_get_head(); pc != NULL; pc = chunk_get_next(pc))
-   {
-      if ((pc->flags & PCF_RIGHT_COMMENT) != 0)
-      {
-         align_add(pc);
-      }
-      else if (chunk_is_newline(pc))
-      {
-         align_newline(pc->nl_count);
-      }
-   }
-
-   align_end();
-}
+Example usage: see align_assign function in align_assign.cpp
 
+Chunk *align_assign(Chunk *first, size_t span, size_t thresh, size_t *p_nl_count);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/control_the_spaces.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/control_the_spaces.txt
index 8ea2ac52..8ea2ac52 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/control_the_spaces.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/control_the_spaces.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/dump-steps.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/dump-steps.txt
index 498a147e..498a147e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/dump-steps.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/dump-steps.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/example.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/example.c
index 7c8edf79..7c8edf79 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/example.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/example.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/goals.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/goals.txt
index 610ec121..610ec121 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/goals.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.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.75.0/documentation/how_to_configure_options.txt
new file mode 100644
index 00000000..2f0eee4e
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/how_to_configure_options.txt
@@ -0,0 +1,16 @@
+Here are some suggestions on how to familiarize yourself with the various options that uncrustify offers.
+
+1. Read through default.cfg config file. This lists all the available options and a brief description of what they do.
+2. Create an empty config file or make a copy of the default.cfg file
+3. Looking at the file default.cfg, add or change one or more options in the config file created in 2. and test the result.
+4. Iterate step 3. over and over changing just a few options at a time till the required output is reached. Working on one option at a time will give the best results.
+
+It is recommended to use a backup-update-compare cycle to ease your testing.
+
+1. save a copy of the last configuration and the last output
+2. modify the config file
+3. run uncrustify again on the original unmodified files with the new configuration 
+4. compare the new output with the saved one to see the effects of the changed configuration.
+
+If you discover an issue or you need some extra functionality, please report an issue at https://github.com/uncrustify/uncrustify/issues
+
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/how_to_format_cpp_lambda_functions.rst b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/how_to_format_cpp_lambda_functions.rst
index e15776d4..e15776d4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/how_to_format_cpp_lambda_functions.rst
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/how_to_format_cpp_lambda_functions.rst
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/align_typedef.html b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/align_typedef.html
index 6d94eadf..6d94eadf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/align_typedef.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/align_typedef.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/ben.cfg.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/ben.cfg.txt
index 5b19c7ca..5b19c7ca 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/ben.cfg.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/ben.cfg.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/config.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/config.txt
index 8e907784..571f4038 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/config.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/config.txt
@@ -1,4 +1,4 @@
-# Uncrustify-0.74.0
+# Uncrustify-0.75.0
 
 #
 # General options
@@ -127,6 +127,11 @@ sp_before_assign                = ignore   # ignore/add/remove/force/not_defined
 # Overrides sp_assign.
 sp_after_assign                 = ignore   # ignore/add/remove/force/not_defined
 
+# Add or remove space in 'enum {'.
+#
+# Default: add
+sp_enum_brace                   = add      # ignore/add/remove/force/not_defined
+
 # Add or remove space in 'NS_ENUM ('.
 sp_enum_paren                   = ignore   # ignore/add/remove/force/not_defined
 
@@ -218,6 +223,10 @@ sp_after_ptr_star_trailing      = ignore   # ignore/add/remove/force/not_defined
 # in a function pointer definition.
 sp_ptr_star_func_var            = ignore   # ignore/add/remove/force/not_defined
 
+# Add or remove space between the pointer star '*' and the name of the type
+# in a function pointer type definition.
+sp_ptr_star_func_type           = ignore   # ignore/add/remove/force/not_defined
+
 # Add or remove space after a pointer star '*', if followed by an open
 # parenthesis, as in 'void* (*)()'.
 sp_ptr_star_paren               = ignore   # ignore/add/remove/force/not_defined
@@ -252,6 +261,10 @@ sp_after_byref_func             = ignore   # ignore/add/remove/force/not_defined
 # prototype or function definition.
 sp_before_byref_func            = ignore   # ignore/add/remove/force/not_defined
 
+# Add or remove space after a reference sign '&', if followed by an open
+# parenthesis, as in 'char& (*)()'.
+sp_byref_paren                  = ignore   # ignore/add/remove/force/not_defined
+
 # Add or remove space between type and word. In cases where total removal of
 # whitespace would be a syntax error, a value of 'remove' is treated the same
 # as 'force'.
@@ -452,14 +465,17 @@ sp_between_mdatype_commas       = ignore   # ignore/add/remove/force/not_defined
 # Default: force
 sp_paren_comma                  = force    # ignore/add/remove/force/not_defined
 
+# Add or remove space between a type and ':'.
+sp_type_colon                   = ignore   # ignore/add/remove/force/not_defined
+
 # Add or remove space after the variadic '...' when preceded by a
 # non-punctuator.
-# The value REMOVE will be overriden with FORCE
+# The value REMOVE will be overridden with FORCE
 sp_after_ellipsis               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before the variadic '...' when preceded by a
 # non-punctuator.
-# The value REMOVE will be overriden with FORCE
+# The value REMOVE will be overridden with FORCE
 sp_before_ellipsis              = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between a type and '...'.
@@ -468,9 +484,6 @@ sp_type_ellipsis                = ignore   # ignore/add/remove/force/not_defined
 # Add or remove space between a '*' and '...'.
 sp_ptr_type_ellipsis            = ignore   # ignore/add/remove/force/not_defined
 
-# (D) Add or remove space between a type and '?'.
-sp_type_question                = ignore   # ignore/add/remove/force/not_defined
-
 # Add or remove space between ')' and '...'.
 sp_paren_ellipsis               = ignore   # ignore/add/remove/force/not_defined
 
@@ -790,6 +803,10 @@ sp_d_array_colon                = ignore   # ignore/add/remove/force/not_defined
 # Default: remove
 sp_not                          = remove   # ignore/add/remove/force/not_defined
 
+# Add or remove space between two '!' (not) unary operators.
+# If set to ignore, sp_not will be used.
+sp_not_not                      = ignore   # ignore/add/remove/force/not_defined
+
 # Add or remove space after the '~' (invert) unary operator.
 #
 # Default: remove
@@ -1044,15 +1061,21 @@ force_tab_after_define          = false    # true/false
 # Default: 8
 indent_columns                  = 8        # unsigned number
 
+# Whether to ignore indent for the first continuation line. Subsequent
+# continuation lines will still be indented to match the first.
+indent_ignore_first_continue    = false    # true/false
+
 # The continuation indent. If non-zero, this overrides the indent of '(', '['
 # and '=' continuation indents. Negative values are OK; negative value is
 # absolute and not increased for each '(' or '[' level.
 #
 # For FreeBSD, this is set to 4.
+# Requires indent_ignore_first_continue=false.
 indent_continue                 = 0        # number
 
 # The continuation indent, only for class header line(s). If non-zero, this
 # overrides the indent of 'class' continuation indents.
+# Requires indent_ignore_first_continue=false.
 indent_continue_class_head      = 0        # unsigned number
 
 # Whether to indent empty lines (i.e. lines which contain only spaces before
@@ -1128,16 +1151,23 @@ indent_namespace_level          = 0        # unsigned number
 # indented. Requires indent_namespace=true. 0 means no limit.
 indent_namespace_limit          = 0        # unsigned number
 
+# Whether to indent only in inner namespaces (nested in other namespaces).
+# Requires indent_namespace=true.
+indent_namespace_inner_only     = false    # true/false
+
 # Whether the 'extern "C"' body is indented.
 indent_extern                   = false    # true/false
 
 # Whether the 'class' body is indented.
 indent_class                    = false    # true/false
 
+# Whether to ignore indent for the leading base class colon.
+indent_ignore_before_class_colon = false    # true/false
+
 # Additional indent before the leading base class colon.
 # Negative values decrease indent down to the first column.
-# Requires a newline break before colon (see pos_class_colon
-# and nl_class_colon)
+# Requires indent_ignore_before_class_colon=false and a newline break before
+# the colon (see pos_class_colon and nl_class_colon)
 indent_before_class_colon       = 0        # number
 
 # Whether to indent the stuff after a leading base class colon.
@@ -1147,6 +1177,9 @@ indent_class_colon              = false    # true/false
 # colon. Requires indent_class_colon=true.
 indent_class_on_colon           = false    # true/false
 
+# Whether to ignore indent for a leading class initializer colon.
+indent_ignore_before_constr_colon = false    # true/false
+
 # Whether to indent the stuff after a leading class initializer colon.
 indent_constr_colon             = false    # true/false
 
@@ -1177,9 +1210,12 @@ indent_var_def_blk              = 0        # number
 # Whether to indent continued variable declarations instead of aligning.
 indent_var_def_cont             = false    # true/false
 
-# Whether to indent continued shift expressions ('<<' and '>>') instead of
-# aligning. Set align_left_shift=false when enabling this.
-indent_shift                    = false    # true/false
+# How to indent continued shift expressions ('<<' and '>>').
+# Set align_left_shift=false when using this.
+#  0: Align shift operators instead of indenting them (default)
+#  1: Indent by one level
+# -1: Preserve original indentation
+indent_shift                    = 0        # number
 
 # Whether to force indentation of function definitions to start in column 1.
 indent_func_def_force_col1      = false    # true/false
@@ -1266,6 +1302,9 @@ indent_switch_case              = 0        # unsigned number
 # Usually the same as indent_columns or indent_switch_case.
 indent_switch_body              = 0        # unsigned number
 
+# Whether to ignore indent for '{' following 'case'.
+indent_ignore_case_brace        = false    # true/false
+
 # Spaces to indent '{' from 'case'. By default, the brace will appear under
 # the 'c' in case. Usually set to 0 or indent_columns. Negative values are OK.
 # It might be wise to choose the same value for the option indent_switch_case.
@@ -1334,10 +1373,11 @@ indent_paren_nl                 = false    # true/false
 
 # How to indent a close parenthesis after a newline.
 #
-# 0: Indent to body level (default)
-# 1: Align under the open parenthesis
-# 2: Indent to the brace level
-indent_paren_close              = 0        # unsigned number
+#  0: Indent to body level (default)
+#  1: Align under the open parenthesis
+#  2: Indent to the brace level
+# -1: Preserve original indentation
+indent_paren_close              = 0        # number
 
 # Whether to indent the open parenthesis of a function definition,
 # if the parenthesis is on its own line.
@@ -1351,24 +1391,41 @@ indent_paren_after_func_decl    = false    # true/false
 # if the parenthesis is on its own line.
 indent_paren_after_func_call    = false    # true/false
 
-# Whether to indent a comma when inside a brace.
-# If true, aligns under the open brace.
-indent_comma_brace              = false    # true/false
+# How to indent a comma when inside braces.
+#  0: Indent by one level (default)
+#  1: Align under the open brace
+# -1: Preserve original indentation
+indent_comma_brace              = 0        # number
 
-# Whether to indent a comma when inside a parenthesis.
-# If true, aligns under the open parenthesis.
-indent_comma_paren              = false    # true/false
+# How to indent a comma when inside parentheses.
+#  0: Indent by one level (default)
+#  1: Align under the open parenthesis
+# -1: Preserve original indentation
+indent_comma_paren              = 0        # number
 
-# Whether to indent a Boolean operator when inside a parenthesis.
-# If true, aligns under the open parenthesis.
-indent_bool_paren               = false    # true/false
+# How to indent a Boolean operator when inside parentheses.
+#  0: Indent by one level (default)
+#  1: Align under the open parenthesis
+# -1: Preserve original indentation
+indent_bool_paren               = 0        # number
+
+# Whether to ignore the indentation of a Boolean operator when outside
+# parentheses.
+indent_ignore_bool              = false    # true/false
+
+# Whether to ignore the indentation of an arithmetic operator.
+indent_ignore_arith             = false    # true/false
 
 # Whether to indent a semicolon when inside a for parenthesis.
 # If true, aligns under the open for parenthesis.
 indent_semicolon_for_paren      = false    # true/false
 
+# Whether to ignore the indentation of a semicolon outside of a 'for'
+# statement.
+indent_ignore_semicolon         = false    # true/false
+
 # Whether to align the first expression to following ones
-# if indent_bool_paren=true.
+# if indent_bool_paren=1.
 indent_first_bool_expr          = false    # true/false
 
 # Whether to align the first expression to following ones
@@ -1382,6 +1439,9 @@ indent_square_nl                = false    # true/false
 # (ESQL/C) Whether to preserve the relative indent of 'EXEC SQL' bodies.
 indent_preserve_sql             = false    # true/false
 
+# Whether to ignore the indentation of an assignment operator.
+indent_ignore_assign            = false    # true/false
+
 # Whether to align continued statements at the '='. If false or if the '=' is
 # followed by a newline, the next line is indent one tab.
 #
@@ -1982,7 +2042,8 @@ nl_after_semicolon              = false    # true/false
 nl_paren_dbrace_open            = ignore   # ignore/add/remove/force/not_defined
 
 # Whether to add a newline after the type in an unnamed temporary
-# direct-list-initialization.
+# direct-list-initialization, better:
+# before a direct-list-initialization.
 nl_type_brace_init_lst          = ignore   # ignore/add/remove/force/not_defined
 
 # Whether to add a newline after the open brace in an unnamed temporary
@@ -2240,15 +2301,15 @@ nl_typedef_blk_end              = 0        # unsigned number
 # 0: No change (default).
 nl_typedef_blk_in               = 0        # unsigned number
 
-# The number of newlines before a block of variable definitions not at the top
-# of a function body. If nl_after_access_spec is non-zero, that option takes
-# precedence.
+# The 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.
 #
 # 0: No change (default).
 nl_var_def_blk_start            = 0        # unsigned number
 
-# The number of newlines after a block of variable definitions not at the top
-# of a function body.
+# The number of empty newlines after a block of variable definitions
+# not at the top of a function body.
 #
 # 0: No change (default).
 nl_var_def_blk_end              = 0        # unsigned number
@@ -2564,6 +2625,11 @@ 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).
@@ -2575,6 +2641,17 @@ align_assign_func_proto_span    = 0        # unsigned number
 # 0: No limit (default).
 align_assign_thresh             = 0        # number
 
+# Whether to align on the left most assignment when multiple
+# definitions are found on the same line.
+# Depends on 'align_assign_span' and 'align_assign_thresh' settings.
+align_assign_on_multi_var_defs  = false    # true/false
+
+# The threshold for aligning on '{' in braced init list.
+# Use a negative number for absolute thresholds.
+#
+# 0: No limit (default).
+align_braced_init_list_thresh   = 0        # number
+
 # How to apply align_assign_span to function declaration "assignments", i.e.
 # 'virtual void foo() = 0' or '~foo() = {default|delete}'.
 #
@@ -2780,7 +2857,7 @@ align_oc_decl_colon             = false    # true/false
 
 # (OC) Whether to not align parameters in an Objectve-C message call if first
 # colon is not on next line of the message call (the same way Xcode does
-# aligment)
+# alignment)
 align_oc_msg_colon_xcode_like   = false    # true/false
 
 #
@@ -2980,12 +3057,17 @@ mod_full_brace_function         = ignore   # ignore/add/remove/force/not_defined
 mod_full_brace_if               = ignore   # ignore/add/remove/force/not_defined
 
 # Whether to enforce that all blocks of an 'if'/'else if'/'else' chain either
-# have, or do not have, braces. If true, braces will be added if any block
-# needs braces, and will only be removed if they can be removed from all
-# blocks.
-#
-# Overrides mod_full_brace_if.
-mod_full_brace_if_chain         = false    # true/false
+# have, or do not have, braces. Overrides mod_full_brace_if.
+#
+# 0: Don't override mod_full_brace_if
+# 1: Add braces to all blocks if any block needs braces and remove braces if
+#    they can be removed from all blocks
+# 2: Add braces to all blocks if any block already has braces, regardless of
+#    whether it needs them
+# 3: Add braces to all blocks if any block needs braces and remove braces if
+#    they can be removed from all blocks, except if all blocks have braces
+#    despite none needing them
+mod_full_brace_if_chain         = 0        # unsigned number
 
 # Whether to add braces to all blocks of an 'if'/'else if'/'else' chain.
 # If true, mod_full_brace_if_chain will only remove braces from an 'if' that
@@ -3027,6 +3109,14 @@ mod_pawn_semicolon              = false    # true/false
 # statement, as in 'if (a && b > c)' => 'if (a && (b > c))'.
 mod_full_paren_if_bool          = false    # true/false
 
+# Whether to fully parenthesize Boolean expressions after '='
+# statement, as in 'x = a && b > c;' => 'x = (a && (b > c));'.
+mod_full_paren_assign_bool      = false    # true/false
+
+# Whether to fully parenthesize Boolean expressions after '='
+# statement, as in 'return  a && b > c;' => 'return (a && (b > c));'.
+mod_full_paren_return_bool      = false    # true/false
+
 # Whether to remove superfluous semicolons.
 mod_remove_extra_semicolon      = false    # true/false
 
@@ -3094,6 +3184,10 @@ mod_sort_incl_import_grouping_enabled = false    # true/false
 # the close brace, as in 'case X: { ... } break;' => 'case X: { ... break; }'.
 mod_move_case_break             = false    # true/false
 
+# Whether to move a 'return' that appears after a fully braced 'case' before
+# the close brace, as in 'case X: { ... } return;' => 'case X: { ... return; }'.
+mod_move_case_return            = false    # true/false
+
 # Add or remove braces around a fully braced case statement. Will only remove
 # braces if there are no variable declarations in the block.
 mod_case_brace                  = ignore   # ignore/add/remove/force/not_defined
@@ -3144,6 +3238,10 @@ pp_indent                       = ignore   # ignore/add/remove/force/not_defined
 # indented from column 1.
 pp_indent_at_level              = false    # true/false
 
+# Whether to indent #if/#else/#endif at the parenthesis level if the brace
+# level is 0. If false, these are indented from column 1.
+pp_indent_at_level0             = false    # true/false
+
 # Specifies the number of columns to indent preprocessors per level
 # at brace level 0 (file-level). If pp_indent_at_level=false, also specifies
 # the number of columns to indent preprocessors per level
@@ -3209,12 +3307,37 @@ pp_indent_func_def              = true     # true/false
 # Default: true
 pp_indent_extern                = true     # true/false
 
-# Whether to indent braces directly inside #if, #else, and #endif.
-# Only applies to the indent of the preprocesser that the braces are directly
-# inside of.
+# 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.
+#  0: No extra indent
+#  1: Indent by one level
+# -1: Preserve original indentation
 #
-# Default: true
-pp_indent_brace                 = true     # true/false
+# Default: 1
+pp_indent_brace                 = 1        # number
+
+# Whether to print warning messages for unbalanced #if and #else blocks.
+# This will print a message in the following cases:
+# - if an #ifdef block ends on a different indent level than
+#   where it started from. Example:
+#
+#    #ifdef TEST
+#      int i;
+#      {
+#        int j;
+#    #endif
+#
+# - an #elif/#else block ends on a different indent level than
+#   the corresponding #ifdef block. Example:
+#
+#    #ifdef TEST
+#        int i;
+#    #else
+#        }
+#      int j;
+#    #endif
+pp_warn_unbalanced_if           = false    # true/false
 
 #
 # Sort includes options
@@ -3253,17 +3376,16 @@ use_indent_func_call_param      = true     # true/false
 #
 # true:  indent_continue will be used only once
 # false: indent_continue will be used every time (default)
+#
+# Requires indent_ignore_first_continue=false.
 use_indent_continue_only_once   = false    # true/false
 
-# The value might be used twice:
-# - at the assignment
-# - at the opening brace
-#
-# To prevent the double use of the indentation value, use this option with the
-# value 'true'.
+# The indentation can be:
+# - after the assignment, at the '[' character
+# - at the begin of the lambda body
 #
-# true:  indentation will be used only once
-# false: indentation will be used every time (default)
+# true:  indentation will be after the assignment
+# false: indentation will be at the begin of the lambda body (default)
 indent_cpp_lambda_only_once     = false    # true/false
 
 # Whether sp_after_angle takes precedence over sp_inside_fparen. This was the
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/configuration.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/configuration.txt
index f61b1176..f61b1176 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/configuration.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/configuration.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/default.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/default.cfg
index 8e907784..571f4038 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/default.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/default.cfg
@@ -1,4 +1,4 @@
-# Uncrustify-0.74.0
+# Uncrustify-0.75.0
 
 #
 # General options
@@ -127,6 +127,11 @@ sp_before_assign                = ignore   # ignore/add/remove/force/not_defined
 # Overrides sp_assign.
 sp_after_assign                 = ignore   # ignore/add/remove/force/not_defined
 
+# Add or remove space in 'enum {'.
+#
+# Default: add
+sp_enum_brace                   = add      # ignore/add/remove/force/not_defined
+
 # Add or remove space in 'NS_ENUM ('.
 sp_enum_paren                   = ignore   # ignore/add/remove/force/not_defined
 
@@ -218,6 +223,10 @@ sp_after_ptr_star_trailing      = ignore   # ignore/add/remove/force/not_defined
 # in a function pointer definition.
 sp_ptr_star_func_var            = ignore   # ignore/add/remove/force/not_defined
 
+# Add or remove space between the pointer star '*' and the name of the type
+# in a function pointer type definition.
+sp_ptr_star_func_type           = ignore   # ignore/add/remove/force/not_defined
+
 # Add or remove space after a pointer star '*', if followed by an open
 # parenthesis, as in 'void* (*)()'.
 sp_ptr_star_paren               = ignore   # ignore/add/remove/force/not_defined
@@ -252,6 +261,10 @@ sp_after_byref_func             = ignore   # ignore/add/remove/force/not_defined
 # prototype or function definition.
 sp_before_byref_func            = ignore   # ignore/add/remove/force/not_defined
 
+# Add or remove space after a reference sign '&', if followed by an open
+# parenthesis, as in 'char& (*)()'.
+sp_byref_paren                  = ignore   # ignore/add/remove/force/not_defined
+
 # Add or remove space between type and word. In cases where total removal of
 # whitespace would be a syntax error, a value of 'remove' is treated the same
 # as 'force'.
@@ -452,14 +465,17 @@ sp_between_mdatype_commas       = ignore   # ignore/add/remove/force/not_defined
 # Default: force
 sp_paren_comma                  = force    # ignore/add/remove/force/not_defined
 
+# Add or remove space between a type and ':'.
+sp_type_colon                   = ignore   # ignore/add/remove/force/not_defined
+
 # Add or remove space after the variadic '...' when preceded by a
 # non-punctuator.
-# The value REMOVE will be overriden with FORCE
+# The value REMOVE will be overridden with FORCE
 sp_after_ellipsis               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before the variadic '...' when preceded by a
 # non-punctuator.
-# The value REMOVE will be overriden with FORCE
+# The value REMOVE will be overridden with FORCE
 sp_before_ellipsis              = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between a type and '...'.
@@ -468,9 +484,6 @@ sp_type_ellipsis                = ignore   # ignore/add/remove/force/not_defined
 # Add or remove space between a '*' and '...'.
 sp_ptr_type_ellipsis            = ignore   # ignore/add/remove/force/not_defined
 
-# (D) Add or remove space between a type and '?'.
-sp_type_question                = ignore   # ignore/add/remove/force/not_defined
-
 # Add or remove space between ')' and '...'.
 sp_paren_ellipsis               = ignore   # ignore/add/remove/force/not_defined
 
@@ -790,6 +803,10 @@ sp_d_array_colon                = ignore   # ignore/add/remove/force/not_defined
 # Default: remove
 sp_not                          = remove   # ignore/add/remove/force/not_defined
 
+# Add or remove space between two '!' (not) unary operators.
+# If set to ignore, sp_not will be used.
+sp_not_not                      = ignore   # ignore/add/remove/force/not_defined
+
 # Add or remove space after the '~' (invert) unary operator.
 #
 # Default: remove
@@ -1044,15 +1061,21 @@ force_tab_after_define          = false    # true/false
 # Default: 8
 indent_columns                  = 8        # unsigned number
 
+# Whether to ignore indent for the first continuation line. Subsequent
+# continuation lines will still be indented to match the first.
+indent_ignore_first_continue    = false    # true/false
+
 # The continuation indent. If non-zero, this overrides the indent of '(', '['
 # and '=' continuation indents. Negative values are OK; negative value is
 # absolute and not increased for each '(' or '[' level.
 #
 # For FreeBSD, this is set to 4.
+# Requires indent_ignore_first_continue=false.
 indent_continue                 = 0        # number
 
 # The continuation indent, only for class header line(s). If non-zero, this
 # overrides the indent of 'class' continuation indents.
+# Requires indent_ignore_first_continue=false.
 indent_continue_class_head      = 0        # unsigned number
 
 # Whether to indent empty lines (i.e. lines which contain only spaces before
@@ -1128,16 +1151,23 @@ indent_namespace_level          = 0        # unsigned number
 # indented. Requires indent_namespace=true. 0 means no limit.
 indent_namespace_limit          = 0        # unsigned number
 
+# Whether to indent only in inner namespaces (nested in other namespaces).
+# Requires indent_namespace=true.
+indent_namespace_inner_only     = false    # true/false
+
 # Whether the 'extern "C"' body is indented.
 indent_extern                   = false    # true/false
 
 # Whether the 'class' body is indented.
 indent_class                    = false    # true/false
 
+# Whether to ignore indent for the leading base class colon.
+indent_ignore_before_class_colon = false    # true/false
+
 # Additional indent before the leading base class colon.
 # Negative values decrease indent down to the first column.
-# Requires a newline break before colon (see pos_class_colon
-# and nl_class_colon)
+# Requires indent_ignore_before_class_colon=false and a newline break before
+# the colon (see pos_class_colon and nl_class_colon)
 indent_before_class_colon       = 0        # number
 
 # Whether to indent the stuff after a leading base class colon.
@@ -1147,6 +1177,9 @@ indent_class_colon              = false    # true/false
 # colon. Requires indent_class_colon=true.
 indent_class_on_colon           = false    # true/false
 
+# Whether to ignore indent for a leading class initializer colon.
+indent_ignore_before_constr_colon = false    # true/false
+
 # Whether to indent the stuff after a leading class initializer colon.
 indent_constr_colon             = false    # true/false
 
@@ -1177,9 +1210,12 @@ indent_var_def_blk              = 0        # number
 # Whether to indent continued variable declarations instead of aligning.
 indent_var_def_cont             = false    # true/false
 
-# Whether to indent continued shift expressions ('<<' and '>>') instead of
-# aligning. Set align_left_shift=false when enabling this.
-indent_shift                    = false    # true/false
+# How to indent continued shift expressions ('<<' and '>>').
+# Set align_left_shift=false when using this.
+#  0: Align shift operators instead of indenting them (default)
+#  1: Indent by one level
+# -1: Preserve original indentation
+indent_shift                    = 0        # number
 
 # Whether to force indentation of function definitions to start in column 1.
 indent_func_def_force_col1      = false    # true/false
@@ -1266,6 +1302,9 @@ indent_switch_case              = 0        # unsigned number
 # Usually the same as indent_columns or indent_switch_case.
 indent_switch_body              = 0        # unsigned number
 
+# Whether to ignore indent for '{' following 'case'.
+indent_ignore_case_brace        = false    # true/false
+
 # Spaces to indent '{' from 'case'. By default, the brace will appear under
 # the 'c' in case. Usually set to 0 or indent_columns. Negative values are OK.
 # It might be wise to choose the same value for the option indent_switch_case.
@@ -1334,10 +1373,11 @@ indent_paren_nl                 = false    # true/false
 
 # How to indent a close parenthesis after a newline.
 #
-# 0: Indent to body level (default)
-# 1: Align under the open parenthesis
-# 2: Indent to the brace level
-indent_paren_close              = 0        # unsigned number
+#  0: Indent to body level (default)
+#  1: Align under the open parenthesis
+#  2: Indent to the brace level
+# -1: Preserve original indentation
+indent_paren_close              = 0        # number
 
 # Whether to indent the open parenthesis of a function definition,
 # if the parenthesis is on its own line.
@@ -1351,24 +1391,41 @@ indent_paren_after_func_decl    = false    # true/false
 # if the parenthesis is on its own line.
 indent_paren_after_func_call    = false    # true/false
 
-# Whether to indent a comma when inside a brace.
-# If true, aligns under the open brace.
-indent_comma_brace              = false    # true/false
+# How to indent a comma when inside braces.
+#  0: Indent by one level (default)
+#  1: Align under the open brace
+# -1: Preserve original indentation
+indent_comma_brace              = 0        # number
 
-# Whether to indent a comma when inside a parenthesis.
-# If true, aligns under the open parenthesis.
-indent_comma_paren              = false    # true/false
+# How to indent a comma when inside parentheses.
+#  0: Indent by one level (default)
+#  1: Align under the open parenthesis
+# -1: Preserve original indentation
+indent_comma_paren              = 0        # number
 
-# Whether to indent a Boolean operator when inside a parenthesis.
-# If true, aligns under the open parenthesis.
-indent_bool_paren               = false    # true/false
+# How to indent a Boolean operator when inside parentheses.
+#  0: Indent by one level (default)
+#  1: Align under the open parenthesis
+# -1: Preserve original indentation
+indent_bool_paren               = 0        # number
+
+# Whether to ignore the indentation of a Boolean operator when outside
+# parentheses.
+indent_ignore_bool              = false    # true/false
+
+# Whether to ignore the indentation of an arithmetic operator.
+indent_ignore_arith             = false    # true/false
 
 # Whether to indent a semicolon when inside a for parenthesis.
 # If true, aligns under the open for parenthesis.
 indent_semicolon_for_paren      = false    # true/false
 
+# Whether to ignore the indentation of a semicolon outside of a 'for'
+# statement.
+indent_ignore_semicolon         = false    # true/false
+
 # Whether to align the first expression to following ones
-# if indent_bool_paren=true.
+# if indent_bool_paren=1.
 indent_first_bool_expr          = false    # true/false
 
 # Whether to align the first expression to following ones
@@ -1382,6 +1439,9 @@ indent_square_nl                = false    # true/false
 # (ESQL/C) Whether to preserve the relative indent of 'EXEC SQL' bodies.
 indent_preserve_sql             = false    # true/false
 
+# Whether to ignore the indentation of an assignment operator.
+indent_ignore_assign            = false    # true/false
+
 # Whether to align continued statements at the '='. If false or if the '=' is
 # followed by a newline, the next line is indent one tab.
 #
@@ -1982,7 +2042,8 @@ nl_after_semicolon              = false    # true/false
 nl_paren_dbrace_open            = ignore   # ignore/add/remove/force/not_defined
 
 # Whether to add a newline after the type in an unnamed temporary
-# direct-list-initialization.
+# direct-list-initialization, better:
+# before a direct-list-initialization.
 nl_type_brace_init_lst          = ignore   # ignore/add/remove/force/not_defined
 
 # Whether to add a newline after the open brace in an unnamed temporary
@@ -2240,15 +2301,15 @@ nl_typedef_blk_end              = 0        # unsigned number
 # 0: No change (default).
 nl_typedef_blk_in               = 0        # unsigned number
 
-# The number of newlines before a block of variable definitions not at the top
-# of a function body. If nl_after_access_spec is non-zero, that option takes
-# precedence.
+# The 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.
 #
 # 0: No change (default).
 nl_var_def_blk_start            = 0        # unsigned number
 
-# The number of newlines after a block of variable definitions not at the top
-# of a function body.
+# The number of empty newlines after a block of variable definitions
+# not at the top of a function body.
 #
 # 0: No change (default).
 nl_var_def_blk_end              = 0        # unsigned number
@@ -2564,6 +2625,11 @@ 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).
@@ -2575,6 +2641,17 @@ align_assign_func_proto_span    = 0        # unsigned number
 # 0: No limit (default).
 align_assign_thresh             = 0        # number
 
+# Whether to align on the left most assignment when multiple
+# definitions are found on the same line.
+# Depends on 'align_assign_span' and 'align_assign_thresh' settings.
+align_assign_on_multi_var_defs  = false    # true/false
+
+# The threshold for aligning on '{' in braced init list.
+# Use a negative number for absolute thresholds.
+#
+# 0: No limit (default).
+align_braced_init_list_thresh   = 0        # number
+
 # How to apply align_assign_span to function declaration "assignments", i.e.
 # 'virtual void foo() = 0' or '~foo() = {default|delete}'.
 #
@@ -2780,7 +2857,7 @@ align_oc_decl_colon             = false    # true/false
 
 # (OC) Whether to not align parameters in an Objectve-C message call if first
 # colon is not on next line of the message call (the same way Xcode does
-# aligment)
+# alignment)
 align_oc_msg_colon_xcode_like   = false    # true/false
 
 #
@@ -2980,12 +3057,17 @@ mod_full_brace_function         = ignore   # ignore/add/remove/force/not_defined
 mod_full_brace_if               = ignore   # ignore/add/remove/force/not_defined
 
 # Whether to enforce that all blocks of an 'if'/'else if'/'else' chain either
-# have, or do not have, braces. If true, braces will be added if any block
-# needs braces, and will only be removed if they can be removed from all
-# blocks.
-#
-# Overrides mod_full_brace_if.
-mod_full_brace_if_chain         = false    # true/false
+# have, or do not have, braces. Overrides mod_full_brace_if.
+#
+# 0: Don't override mod_full_brace_if
+# 1: Add braces to all blocks if any block needs braces and remove braces if
+#    they can be removed from all blocks
+# 2: Add braces to all blocks if any block already has braces, regardless of
+#    whether it needs them
+# 3: Add braces to all blocks if any block needs braces and remove braces if
+#    they can be removed from all blocks, except if all blocks have braces
+#    despite none needing them
+mod_full_brace_if_chain         = 0        # unsigned number
 
 # Whether to add braces to all blocks of an 'if'/'else if'/'else' chain.
 # If true, mod_full_brace_if_chain will only remove braces from an 'if' that
@@ -3027,6 +3109,14 @@ mod_pawn_semicolon              = false    # true/false
 # statement, as in 'if (a && b > c)' => 'if (a && (b > c))'.
 mod_full_paren_if_bool          = false    # true/false
 
+# Whether to fully parenthesize Boolean expressions after '='
+# statement, as in 'x = a && b > c;' => 'x = (a && (b > c));'.
+mod_full_paren_assign_bool      = false    # true/false
+
+# Whether to fully parenthesize Boolean expressions after '='
+# statement, as in 'return  a && b > c;' => 'return (a && (b > c));'.
+mod_full_paren_return_bool      = false    # true/false
+
 # Whether to remove superfluous semicolons.
 mod_remove_extra_semicolon      = false    # true/false
 
@@ -3094,6 +3184,10 @@ mod_sort_incl_import_grouping_enabled = false    # true/false
 # the close brace, as in 'case X: { ... } break;' => 'case X: { ... break; }'.
 mod_move_case_break             = false    # true/false
 
+# Whether to move a 'return' that appears after a fully braced 'case' before
+# the close brace, as in 'case X: { ... } return;' => 'case X: { ... return; }'.
+mod_move_case_return            = false    # true/false
+
 # Add or remove braces around a fully braced case statement. Will only remove
 # braces if there are no variable declarations in the block.
 mod_case_brace                  = ignore   # ignore/add/remove/force/not_defined
@@ -3144,6 +3238,10 @@ pp_indent                       = ignore   # ignore/add/remove/force/not_defined
 # indented from column 1.
 pp_indent_at_level              = false    # true/false
 
+# Whether to indent #if/#else/#endif at the parenthesis level if the brace
+# level is 0. If false, these are indented from column 1.
+pp_indent_at_level0             = false    # true/false
+
 # Specifies the number of columns to indent preprocessors per level
 # at brace level 0 (file-level). If pp_indent_at_level=false, also specifies
 # the number of columns to indent preprocessors per level
@@ -3209,12 +3307,37 @@ pp_indent_func_def              = true     # true/false
 # Default: true
 pp_indent_extern                = true     # true/false
 
-# Whether to indent braces directly inside #if, #else, and #endif.
-# Only applies to the indent of the preprocesser that the braces are directly
-# inside of.
+# 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.
+#  0: No extra indent
+#  1: Indent by one level
+# -1: Preserve original indentation
 #
-# Default: true
-pp_indent_brace                 = true     # true/false
+# Default: 1
+pp_indent_brace                 = 1        # number
+
+# Whether to print warning messages for unbalanced #if and #else blocks.
+# This will print a message in the following cases:
+# - if an #ifdef block ends on a different indent level than
+#   where it started from. Example:
+#
+#    #ifdef TEST
+#      int i;
+#      {
+#        int j;
+#    #endif
+#
+# - an #elif/#else block ends on a different indent level than
+#   the corresponding #ifdef block. Example:
+#
+#    #ifdef TEST
+#        int i;
+#    #else
+#        }
+#      int j;
+#    #endif
+pp_warn_unbalanced_if           = false    # true/false
 
 #
 # Sort includes options
@@ -3253,17 +3376,16 @@ use_indent_func_call_param      = true     # true/false
 #
 # true:  indent_continue will be used only once
 # false: indent_continue will be used every time (default)
+#
+# Requires indent_ignore_first_continue=false.
 use_indent_continue_only_once   = false    # true/false
 
-# The value might be used twice:
-# - at the assignment
-# - at the opening brace
-#
-# To prevent the double use of the indentation value, use this option with the
-# value 'true'.
+# The indentation can be:
+# - after the assignment, at the '[' character
+# - at the begin of the lambda body
 #
-# true:  indentation will be used only once
-# false: indentation will be used every time (default)
+# true:  indentation will be after the assignment
+# false: indentation will be at the begin of the lambda body (default)
 indent_cpp_lambda_only_once     = false    # true/false
 
 # Whether sp_after_angle takes precedence over sp_inside_fparen. This was the
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/examples/c-1.in.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/examples/c-1.in.c
index c1a53476..c1a53476 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/examples/c-1.in.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/examples/c-1.in.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/examples/c-1.out.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/examples/c-1.out.c
index ceb484c6..ceb484c6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/examples/c-1.out.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/examples/c-1.out.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/examples/example.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/examples/example.c
index 7c8edf79..7c8edf79 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/examples/example.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/examples/example.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/images/linuxlinks.gif b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/images/linuxlinks.gif
index d3adec5c..d3adec5c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/images/linuxlinks.gif
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/images/linuxlinks.gif
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/index.html b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/index.html
index 214ef64d..452b53bf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/index.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.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 - 787 configurable options as of version 0.74.0</li>
+   <li>Highly configurable - 808 configurable options as of version 0.75.0</li>
 </ul>
 
 <p>
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/linux.cfg.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/linux.cfg.txt
index baae9848..baae9848 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/linux.cfg.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/linux.cfg.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/options.html b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options.html
index 554836c3..554836c3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/options.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/options_ASM.html b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_ASM.html
index 4de0e7bb..4de0e7bb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/options_ASM.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_ASM.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/options_Align.html b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_Align.html
index b034a132..99edad58 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/options_Align.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_Align.html
@@ -10,7 +10,7 @@ The minimum space between label and value of a preprocessor define
 align_nl_cont                 = true
 
 #define LOG_STR(sev, str, len)                           \
-   do { if (log_sev_on(sev)) { log_str(sev, str, len); } } while (0)
+   if (log_sev_on(sev)) { log_str(sev, str, len); }
                                                           █
 nl_after_brace_close
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/options_CLI_NET.html b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_CLI_NET.html
index 8838cdf0..8838cdf0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/options_CLI_NET.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_CLI_NET.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/options_C_sharp.html b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_C_sharp.html
index 74767b9d..74767b9d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/options_C_sharp.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_C_sharp.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/options_D.html b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_D.html
index 308b5c58..308b5c58 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/options_D.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_D.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/options_Indenting.html b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_Indenting.html
index 7887f759..7887f759 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/options_Indenting.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_Indenting.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/options_Java.html b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_Java.html
index 80083042..80083042 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/options_Java.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_Java.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/options_ModifyCode.html b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_ModifyCode.html
index e20e1098..e20e1098 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/options_ModifyCode.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_ModifyCode.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/options_Namespace.html b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_Namespace.html
index 74589df0..74589df0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/options_Namespace.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_Namespace.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/options_NewLines.html b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_NewLines.html
index 9d9ad656..85a37821 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/options_NewLines.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_NewLines.html
@@ -141,7 +141,7 @@ class foo : public my_Class<a title="nl_class_brace"><strong><font color="red">
     };
     struct indent_ptr_t <a title="nl_struct_brace"><strong><font color="red">█</font></strong></a>
    {
-        chunk_t *ref;
+        Chunk *ref;
 <a title="nl_ds_struct_enum_cmt"><strong><font color="red">        █</font></strong></a>
         // comment
         int delta;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/options_Objectiv-C.html b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_Objectiv-C.html
index 993a1b95..993a1b95 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/options_Objectiv-C.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_Objectiv-C.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/options_Positioning.html b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_Positioning.html
index 4e8a36cc..4e8a36cc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/options_Positioning.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_Positioning.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/options_Preprocessor.html b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_Preprocessor.html
index 1d99b69d..1d99b69d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/options_Preprocessor.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_Preprocessor.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/options_Space_Assign.html b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_Space_Assign.html
index 10c8b6b0..10c8b6b0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/options_Space_Assign.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_Space_Assign.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/options_Space_Byref.html b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_Space_Byref.html
index 7ad47f72..7ad47f72 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/options_Space_Byref.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_Space_Byref.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/options_Space_Case.html b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_Space_Case.html
index e40bfc5b..e40bfc5b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/options_Space_Case.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_Space_Case.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/options_Space_Cast.html b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_Space_Cast.html
index 9e0b6e2d..9e0b6e2d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/options_Space_Cast.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_Space_Cast.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/options_Space_Class.html b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_Space_Class.html
index 1bd1c4a5..1bd1c4a5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/options_Space_Class.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_Space_Class.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/options_Space_Comma.html b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_Space_Comma.html
index 3b3f0de1..3b3f0de1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/options_Space_Comma.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_Space_Comma.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/options_Space_Enum.html b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_Space_Enum.html
index f208c95f..f208c95f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/options_Space_Enum.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_Space_Enum.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/options_Space_For.html b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_Space_For.html
index 5107f89f..5107f89f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/options_Space_For.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_Space_For.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/options_Space_New.html b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_Space_New.html
index 587844ae..587844ae 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/options_Space_New.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_Space_New.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/options_Space_Operator.html b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_Space_Operator.html
index d73c964d..d73c964d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/options_Space_Operator.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_Space_Operator.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/options_Space_Paren.html b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_Space_Paren.html
index caa4a5a5..caa4a5a5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/options_Space_Paren.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_Space_Paren.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/options_Space_Template.html b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_Space_Template.html
index d8792888..d8792888 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/options_Space_Template.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_Space_Template.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/options_Spaces.html b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_Spaces.html
index 5b69c590..35265fc6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/options_Spaces.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/options_Spaces.html
@@ -72,7 +72,7 @@ struct error { };
 
 #define LOG_FMT (sev, args ...) \
 <a title="sp_defined_paren"><strong><font color="red">               █</a><a title="sp_before_ellipsis">          █</font></strong></a>
-   do { if (log_sev_on(sev)) { log_fmt(sev, ## args); } } while (0)
+   if (log_sev_on(sev)) { log_fmt(sev, ## args); }
    <a title="sp_pp_concat"><strong><font color="red">                                        █  </a><a title="sp_pp_concat">█</font></strong></a>
 #endif
 #define FS_NOCOW_FL 0x00800000
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/project-support.jpg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/project-support.jpg
index 5d15550f..5d15550f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/project-support.jpg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/project-support.jpg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/uncrustify.css b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/uncrustify.css
index 240171e9..240171e9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/uncrustify.css
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/uncrustify.css
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/uncrustify.html b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/uncrustify.html
index 0528eb63..0528eb63 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/htdocs/uncrustify.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/htdocs/uncrustify.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/not_a_compiler.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/not_a_compiler.txt
index 01e0944c..439d4309 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/not_a_compiler.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/not_a_compiler.txt
@@ -16,4 +16,4 @@ Let have a look on:
 It will produce an error, because uncrustify doesn't evaluate the value of A.
 uncrustify will read all the lines, a compiler only a part of it, depending on A.
 
-uncrustify encounter two opening graces but only one closing brace. 
+uncrustify encounter two opening braces but only one closing brace. 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/overview.odt b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/overview.odt
index e14e3285..e14e3285 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/overview.odt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/overview.odt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/paren_stack.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/paren_stack.txt
index 109709dc..109709dc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/paren_stack.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.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.75.0/documentation/preprocessor_indentation.txt
new file mode 100644
index 00000000..a82947cb
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/preprocessor_indentation.txt
@@ -0,0 +1,414 @@
+
+Preprocessor blocks can arbitrarily alter the program flow and make indenting
+code a challenging task.
+
+This file covers the following topics:
+1) Uncrustify approach to indentation of preprocessor blocks
+2) Rationale for the chosen approach
+3) Recommendations for the user
+
+
+---------------------------------------------------------
+Uncrustify approach to indentation of preprocessor blocks
+---------------------------------------------------------
+
+Uncrustify handles different preprocessor blocks in different ways.
+There are just three simple rules to remember.
+
+A. #ifdef/#endif block
+----------------------
+The contents of the block are indented starting at the same brace level of the
+code preceding the block. Once #endif is reached, any indentation change caused
+by the block is discarded and the following code continues at the same brace
+level of the code preceding the block.
+
+B. #ifdef/#elif/#else/#endif block
+----------------------------------
+The contents of the #ifdef part of the block are indented starting at the same
+brace level of the code preceding the block.
+Once an #elif/#else is reached, the indentation restarts at the brace level of
+the code preceding the #ifdef part of the block. This is repeated for each
+#else and #elif part.
+Once #endif is reached, the following code continues at the same brace level
+reached at the end of the #ifdef part.
+
+C. #define block
+----------------
+The contents of the block are indented starting anew, therefore not following the
+indentation of the code preceding the block. Once the #define ends, any indentation
+change caused by the block is discarded and the following code continues at the same
+brace level of the code preceding the block.
+
+
+---------------------------------
+Rationale for the chosen approach
+---------------------------------
+
+Preprocessor blocks can be very hard to handle and there is no definitive
+correct way that works in all situations. Therefore a compromise approach is
+required, coupled with warning to the user when tricky code is encountered.
+
+A. #ifdef/#endif block
+----------------------
+Let's start with the simplest case, a balanced #ifdef/#endif block. This is a
+block that starts and ends at the same brace level. For example:
+
+    some code A
+  #ifdef TEST
+    some code B
+  #endif
+    some code C
+
+or
+
+    some code A
+  #ifdef TEST
+    {
+      some code B
+    }
+  #endif
+    some code C
+
+These cases are very easy to handle, since the indentation before, through and after
+the preprocessor block is consistent. There is no alteration of the brace level
+from 'some code A' to 'some code C'. Rule A applies nicely to the above code.
+
+Let's now look at a more complex example.
+
+    some code A
+  #ifdef TEST
+    {
+      some code B
+  #endif
+    some code C
+  #ifdef TEST
+      some code D
+    }
+  #endif
+    some code E
+
+This contains two unbalanced #ifdef blocks. Most likely the programmer intended to
+use them in pair, but that is not important when it comes to indentation. The code
+above could be indented as:
+
+    some code A
+  #ifdef TEST
+    {
+      some code B
+  #endif
+    some code C
+  #ifdef TEST
+      some code D
+    }
+  #endif
+    some code E
+
+or as:
+
+    some code A
+  #ifdef TEST
+    {
+      some code B
+  #endif
+      some code C
+  #ifdef TEST
+      some code D
+    }
+  #endif
+    some code E
+
+Note how 'some code C' is indented differently in the two cases: in the first, the
+indentation change caused by the first #ifdef block is discarded, while in the
+second it is taken into consideration.
+Depending on the options used at compile time, the code in the preprocessor blocks
+could be included or not included in the final code, therefore none of the two
+options is superior to the other. A better approach would be to avoid the use
+of unbalanced preprocessor blocks, so that indentation of the code could be uniquely
+defined.
+Uncrustify follows the first version, discarding indentation changes caused by
+the #ifdef block. Warning messages about unbalanced preprocessor blocks can optionally
+be printed by using the option 'pp_warn_unbalanced_if'.
+
+B. #ifdef/#elif/#else/#endif block
+----------------------------------
+Let's start with the simplest case, a balanced #ifdef/#else/#endif block. This is a
+block where each part starts and ends at the same brace level. For example:
+
+    some code A
+  #ifdef TEST
+    some code B
+  #else
+    some code C
+  #endif
+    some code D
+
+or
+
+    some code A
+  #ifdef TEST
+    {
+      some code B
+    }
+  #else
+    {
+      some code C
+    }
+  #endif
+    some code D
+
+or even:
+
+    some code A
+  #ifdef TEST
+    {
+      some code B
+    }
+  #else
+    some code C
+  #endif
+    some code D
+
+These cases are very easy to handle, since the indentation before, through and after
+the preprocessor blocks is consistent. There is no alteration of the brace level
+from 'some code A' to 'some code D'. Rule B applies nicely to the above code.
+
+Let's now look at a more complex example.
+
+    some code A
+  #ifdef TEST
+    {
+      some code B
+  #else
+    some code C
+  #endif
+    some code D
+  #ifdef TEST
+      some code E
+    }
+  #else
+    some code F
+  #endif
+    some code G
+
+This once again raises the question of where 'some code D' should be placed and
+there is no unique best choice.
+Uncrustify has chosen (for reasons explained further below) to:
+- indent each part of an #ifdef/#elif/#else/#endif block starting at the brace
+level of the code preceding #ifdef.
+- continue after #endif at the indentation level reached at the end of the #ifdef
+part.
+This would result in the following formatted code:
+
+    some code A
+  #ifdef TEST
+    {
+      some code B
+  #else
+    some code C
+  #endif
+      some code D
+  #ifdef TEST
+      some code E
+    }
+  #else
+      some code F
+  #endif
+    some code G
+
+And yes, the indentation of 'some code F' may surprise you a bit.
+Here is an even trickier example:
+
+    some code A
+  #ifdef TEST
+    some code B
+  #else
+    {
+      some code C
+  #endif
+    some code D
+  #ifndef TEST
+      some code E
+    }
+  #else
+    some code F
+  #endif
+    some code G
+
+which results in this bizarre output, where 'some code G' is no
+longer aligned with 'some code A':
+
+    some code A
+  #ifdef TEST
+    some code B
+  #else
+    {
+      some code C
+  #endif
+    some code D
+  #ifndef TEST
+    some code E
+  }
+  #else
+    some code F
+  #endif
+  some code G
+
+So why not simply discard all the indentation changes created by an
+#ifdef/#elif/#else/#endif block? The answer is simple: to make sure things
+still work fine after the #endif line! Without going into too much detail here
+(see the overview.odt and theory.txt files for more info) in addition to the
+visible braces, there is a thing called 'virtual braces' which also affects
+indentation. A common use of #ifdef/#elif/#else/#endif blocks is to do some
+different things on the same set of variables. In this case, there may not be
+any visible brace, but virtual braces may get modified between the code before
+and after the preprocessor block. Throwing away the whole thing would result
+in the code after #endif being formatted in a completely wrong manner.
+As an example, consider this piece of code:
+
+  some code A
+  if (cond1)
+    some var = value1;
+  else
+    some var =
+  #ifdef TEST
+      value2;
+  #else
+      value3;
+  #endif
+  some code B
+
+The formatted version looks exactly like the original. But if the complete
+#ifdef/#else/#endif block was thrown away, the result would be as if 'some code B'
+was being indented as part of the else (not #else) block, at a position just after
+the = symbol. By retaining the changes made in the #ifdef part, the 'else' block
+is correctly handled and 'some code B' is indented as per its original position.
+
+C. #define block
+----------------
+Here is an example showing how #define works. The following code:
+
+    {
+    {
+    some code A
+    #define TEST \
+    { \
+    some defs \
+    }
+    some code B
+    }
+    }
+
+would be formatted as:
+
+    {
+      {
+        some code A
+    #define TEST \
+    { \
+      some defs \
+    }
+        some code B
+      }
+    }
+
+Notice how 'some code B' and 'some code A' are indented in the same way, while the
+#define body starts from anew.
+
+
+----------------------------
+Recommendations for the user
+----------------------------
+The golden rule is to avoid unbalanced preprocessor blocks. This keeps things
+simple and indentation can be uniquely defined. Existing unbalanced blocks should
+be reworked so that all braces are properly balanced, either outside or inside the
+preprocessor blocks.
+If you have a huge code base, it may be difficult to quickly find offending blocks.
+If the option 'pp_warn_unbalanced_if' is set to true, Uncrustify will print warning
+messages at the end of each unbalanced preprocessor block part based on the following rules:
+
+1) unbalanced #ifdef part
+This works for either an #ifdef/#endif block or the first part of an #ifdef/#elif/#else/#endif
+block. If the #ifdef ends at a brace level different from where it starts, a message will
+be displayed, highlighting both the starting and ending indentation levels.
+
+2) unbalanced #elif or #else part
+If such part ends at a different brace level than the corresponding #ifdef part, a message
+will be displayed highlighting the ending indentation levels of both the part in question
+and the respective #ifdef part.
+
+3) unbalanced #define
+If a #define ends at a brace level different from where it starts, a message will
+be displayed, highlighting the ending indentation level.
+
+Here is an example with a mix of balanced and unbalanced blocks, with line numbers in front
+for easier reference:
+
+  1    void Fun(int &data)
+  2    {
+  3      data = 1;
+  4
+  5    #ifdef MANUAL_LAYOUT
+  6    {
+  7      data = 2;
+  8    }
+  9    #endif
+ 10
+ 11    #ifdef MANUAL_LAYOUT
+ 12    {
+ 13      {
+ 14      data = 2;
+ 15    #elif TEST1
+ 16      data = 21;
+ 17    #elif TEST2
+ 18    {
+ 19      data = 22;
+ 20    #elif TEST3
+ 21      {
+ 22        {
+ 23      data = 22;
+ 24    #else
+ 25      {
+ 26        {
+ 27      data = 22;
+ 28    #endif
+ 29
+ 30      data = 3;
+ 31
+ 32    #ifdef MANUAL_LAYOUT
+ 33    {
+ 34      data = 4;
+ 35    #else
+ 36      data = 5;
+ 37    #endif
+ 38
+ 39    #ifdef MANUAL_LAYOUT
+ 40      data = 6;
+ 41    #else
+ 42      data = 7;
+ 43    #endif
+ 44
+ 45    #ifdef MANUAL_LAYOUT
+ 46      }
+ 47    }
+ 48    #endif
+ 49
+ 50    #ifdef MANUAL_LAYOUT
+ 51    }
+ 52    #endif
+ 53
+ 54      data = 8;
+ 55
+ 56      data = 9;
+ 57    }
+
+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
+
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/theory.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/theory.txt
index 99324855..99324855 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/theory.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/theory.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/threads.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/threads.txt
index f6ed4edd..f6ed4edd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/threads.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/threads.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/track.html b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/track.html
index e49e4370..e49e4370 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/documentation/track.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/documentation/track.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/emscripten/CMakeLists.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/emscripten/CMakeLists.txt
index 72b6efa3..72b6efa3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/emscripten/CMakeLists.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/emscripten/CMakeLists.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/emscripten/CMake_catFiles.cmake b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/emscripten/CMake_catFiles.cmake
index c637ea24..c637ea24 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/emscripten/CMake_catFiles.cmake
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/emscripten/CMake_catFiles.cmake
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/emscripten/CMake_emscripten_test.cmake b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/emscripten/CMake_emscripten_test.cmake
index a37ee945..a37ee945 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/emscripten/CMake_emscripten_test.cmake
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/emscripten/CMake_emscripten_test.cmake
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/emscripten/README.md b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/emscripten/README.md
index 22012383..22012383 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/emscripten/README.md
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/emscripten/README.md
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/emscripten/build.sh b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/emscripten/build.sh
index df4b6fe3..df4b6fe3 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/emscripten/build.sh
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/emscripten/build.sh
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/emscripten/libUncrustify.d.ts b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/emscripten/libUncrustify.d.ts
index 1e7b7fb6..1e7b7fb6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/emscripten/libUncrustify.d.ts
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/emscripten/libUncrustify.d.ts
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/emscripten/postfix_file b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/emscripten/postfix_file
index 17315134..17315134 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/emscripten/postfix_file
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/emscripten/postfix_file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/emscripten/postfix_module.js b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/emscripten/postfix_module.js
index cbf8f57b..cbf8f57b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/emscripten/postfix_module.js
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/emscripten/postfix_module.js
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/emscripten/prefix_file b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/emscripten/prefix_file
index 6a6b5e98..6a6b5e98 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/emscripten/prefix_file
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/emscripten/prefix_file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/emscripten/prefix_module.js b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/emscripten/prefix_module.js
index 05d09cd7..05d09cd7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/emscripten/prefix_module.js
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/emscripten/prefix_module.js
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/emscripten/test/run_tests.py b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/emscripten/test/run_tests.py
index c7a4fcae..c7a4fcae 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/emscripten/test/run_tests.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/emscripten/test/run_tests.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/emscripten/test/test_run.js b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/emscripten/test/test_run.js
index 27627094..27627094 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/emscripten/test/test_run.js
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/emscripten/test/test_run.js
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/etc/MS-calling_conventions.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/MS-calling_conventions.cfg
index 36e9e14f..36e9e14f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/etc/MS-calling_conventions.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/MS-calling_conventions.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/etc/align_assign.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/align_assign.txt
index ecc85081..ecc85081 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/etc/align_assign.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/align_assign.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/etc/amxmodx.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/amxmodx.cfg
index 5f625076..5f625076 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/etc/amxmodx.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/amxmodx.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/etc/ben.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/ben.cfg
index 90309f8f..4ab301ce 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/etc/ben.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/ben.cfg
@@ -136,9 +136,12 @@ indent_var_def_blk                        = 0        # number
 # Indent continued variable declarations instead of aligning.
 indent_var_def_cont                       = false    # false/true
 
-# Indent continued shift expressions ('<<' and '>>') instead of aligning.
-# Turn align_left_shift off when enabling this.
-indent_shift                              = false    # false/true
+# How to indent continued shift expressions ('<<' and '>>').
+# Set align_left_shift=false when using this.
+#  0: Align shift operators instead of indenting them (default)
+#  1: Indent by one level
+# -1: Preserve original indentation
+indent_shift                              = 0        # number
 
 # True:  force indentation of function definition to start in column 1
 # False: use the default behavior
@@ -215,18 +218,19 @@ indent_access_spec_body                   = false    # false/true
 indent_paren_nl                           = false    # false/true
 
 # Controls the indent of a close paren after a newline.
-# 0: Indent to body level
-# 1: Align under the open paren
-# 2: Indent to the brace level
+#  0: Indent to body level
+#  1: Align under the open paren
+#  2: Indent to the brace level
+# -1: Preserve original indentation
 indent_paren_close                        = 0        # number
 
-# Controls the indent of a comma when inside a paren.If TRUE, aligns under the open paren
-indent_comma_paren                        = false    # false/true
+# Controls the indent of a comma when inside a paren.If 1, aligns under the open paren
+indent_comma_paren                        = 0        # number
 
-# Controls the indent of a BOOL operator when inside a paren.If TRUE, aligns under the open paren
-indent_bool_paren                         = false    # false/true
+# Controls the indent of a BOOL operator when inside a paren.If 1, aligns under the open paren
+indent_bool_paren                         = 0        # number
 
-# If 'indent_bool_paren' is true, controls the indent of the first expression. If TRUE, aligns the first expression to the following ones
+# If 'indent_bool_paren' is 1, controls the indent of the first expression. If TRUE, aligns the first expression to the following ones
 indent_first_bool_expr                    = false    # false/true
 
 # If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended)
@@ -977,7 +981,7 @@ mod_full_brace_if                         = add      # ignore/add/remove/force
 
 # Make all if/elseif/else statements in a chain be braced or not. Overrides mod_full_brace_if.
 # If any must be braced, they are all braced.  If all can be unbraced, then the braces are removed.
-mod_full_brace_if_chain                   = false    # false/true
+mod_full_brace_if_chain                   = 0        # unsigned number
 
 # Don't remove braces around statements that span N newlines
 mod_full_brace_nl                         = 0        # number
@@ -1124,6 +1128,10 @@ pp_indent                                 = remove   # ignore/add/remove/force
 # Whether to indent #if/#else/#endif at the brace level (true) or from column 1 (false)
 pp_indent_at_level                        = false    # false/true
 
+# Whether to indent #if/#else/#endif at the parenthesis level if the brace
+# level is 0. If false, these are indented from column 1.
+pp_indent_at_level0                       = false    # false/true
+
 # Specifies the number of columns to indent preprocessors per level at brace level 0 (file-level).
 # If pp_indent_at_level=false, specifies the number of columns to indent preprocessors per level at brace level > 0 (function-level).
 # Default=1.
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/etc/ben2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/ben2.cfg
index 38464c10..38464c10 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/etc/ben2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/ben2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/etc/d.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/d.cfg
index e69c37c7..e69c37c7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/etc/d.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/d.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/etc/defaults.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/defaults.cfg
index 8e907784..571f4038 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/etc/defaults.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/defaults.cfg
@@ -1,4 +1,4 @@
-# Uncrustify-0.74.0
+# Uncrustify-0.75.0
 
 #
 # General options
@@ -127,6 +127,11 @@ sp_before_assign                = ignore   # ignore/add/remove/force/not_defined
 # Overrides sp_assign.
 sp_after_assign                 = ignore   # ignore/add/remove/force/not_defined
 
+# Add or remove space in 'enum {'.
+#
+# Default: add
+sp_enum_brace                   = add      # ignore/add/remove/force/not_defined
+
 # Add or remove space in 'NS_ENUM ('.
 sp_enum_paren                   = ignore   # ignore/add/remove/force/not_defined
 
@@ -218,6 +223,10 @@ sp_after_ptr_star_trailing      = ignore   # ignore/add/remove/force/not_defined
 # in a function pointer definition.
 sp_ptr_star_func_var            = ignore   # ignore/add/remove/force/not_defined
 
+# Add or remove space between the pointer star '*' and the name of the type
+# in a function pointer type definition.
+sp_ptr_star_func_type           = ignore   # ignore/add/remove/force/not_defined
+
 # Add or remove space after a pointer star '*', if followed by an open
 # parenthesis, as in 'void* (*)()'.
 sp_ptr_star_paren               = ignore   # ignore/add/remove/force/not_defined
@@ -252,6 +261,10 @@ sp_after_byref_func             = ignore   # ignore/add/remove/force/not_defined
 # prototype or function definition.
 sp_before_byref_func            = ignore   # ignore/add/remove/force/not_defined
 
+# Add or remove space after a reference sign '&', if followed by an open
+# parenthesis, as in 'char& (*)()'.
+sp_byref_paren                  = ignore   # ignore/add/remove/force/not_defined
+
 # Add or remove space between type and word. In cases where total removal of
 # whitespace would be a syntax error, a value of 'remove' is treated the same
 # as 'force'.
@@ -452,14 +465,17 @@ sp_between_mdatype_commas       = ignore   # ignore/add/remove/force/not_defined
 # Default: force
 sp_paren_comma                  = force    # ignore/add/remove/force/not_defined
 
+# Add or remove space between a type and ':'.
+sp_type_colon                   = ignore   # ignore/add/remove/force/not_defined
+
 # Add or remove space after the variadic '...' when preceded by a
 # non-punctuator.
-# The value REMOVE will be overriden with FORCE
+# The value REMOVE will be overridden with FORCE
 sp_after_ellipsis               = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space before the variadic '...' when preceded by a
 # non-punctuator.
-# The value REMOVE will be overriden with FORCE
+# The value REMOVE will be overridden with FORCE
 sp_before_ellipsis              = ignore   # ignore/add/remove/force/not_defined
 
 # Add or remove space between a type and '...'.
@@ -468,9 +484,6 @@ sp_type_ellipsis                = ignore   # ignore/add/remove/force/not_defined
 # Add or remove space between a '*' and '...'.
 sp_ptr_type_ellipsis            = ignore   # ignore/add/remove/force/not_defined
 
-# (D) Add or remove space between a type and '?'.
-sp_type_question                = ignore   # ignore/add/remove/force/not_defined
-
 # Add or remove space between ')' and '...'.
 sp_paren_ellipsis               = ignore   # ignore/add/remove/force/not_defined
 
@@ -790,6 +803,10 @@ sp_d_array_colon                = ignore   # ignore/add/remove/force/not_defined
 # Default: remove
 sp_not                          = remove   # ignore/add/remove/force/not_defined
 
+# Add or remove space between two '!' (not) unary operators.
+# If set to ignore, sp_not will be used.
+sp_not_not                      = ignore   # ignore/add/remove/force/not_defined
+
 # Add or remove space after the '~' (invert) unary operator.
 #
 # Default: remove
@@ -1044,15 +1061,21 @@ force_tab_after_define          = false    # true/false
 # Default: 8
 indent_columns                  = 8        # unsigned number
 
+# Whether to ignore indent for the first continuation line. Subsequent
+# continuation lines will still be indented to match the first.
+indent_ignore_first_continue    = false    # true/false
+
 # The continuation indent. If non-zero, this overrides the indent of '(', '['
 # and '=' continuation indents. Negative values are OK; negative value is
 # absolute and not increased for each '(' or '[' level.
 #
 # For FreeBSD, this is set to 4.
+# Requires indent_ignore_first_continue=false.
 indent_continue                 = 0        # number
 
 # The continuation indent, only for class header line(s). If non-zero, this
 # overrides the indent of 'class' continuation indents.
+# Requires indent_ignore_first_continue=false.
 indent_continue_class_head      = 0        # unsigned number
 
 # Whether to indent empty lines (i.e. lines which contain only spaces before
@@ -1128,16 +1151,23 @@ indent_namespace_level          = 0        # unsigned number
 # indented. Requires indent_namespace=true. 0 means no limit.
 indent_namespace_limit          = 0        # unsigned number
 
+# Whether to indent only in inner namespaces (nested in other namespaces).
+# Requires indent_namespace=true.
+indent_namespace_inner_only     = false    # true/false
+
 # Whether the 'extern "C"' body is indented.
 indent_extern                   = false    # true/false
 
 # Whether the 'class' body is indented.
 indent_class                    = false    # true/false
 
+# Whether to ignore indent for the leading base class colon.
+indent_ignore_before_class_colon = false    # true/false
+
 # Additional indent before the leading base class colon.
 # Negative values decrease indent down to the first column.
-# Requires a newline break before colon (see pos_class_colon
-# and nl_class_colon)
+# Requires indent_ignore_before_class_colon=false and a newline break before
+# the colon (see pos_class_colon and nl_class_colon)
 indent_before_class_colon       = 0        # number
 
 # Whether to indent the stuff after a leading base class colon.
@@ -1147,6 +1177,9 @@ indent_class_colon              = false    # true/false
 # colon. Requires indent_class_colon=true.
 indent_class_on_colon           = false    # true/false
 
+# Whether to ignore indent for a leading class initializer colon.
+indent_ignore_before_constr_colon = false    # true/false
+
 # Whether to indent the stuff after a leading class initializer colon.
 indent_constr_colon             = false    # true/false
 
@@ -1177,9 +1210,12 @@ indent_var_def_blk              = 0        # number
 # Whether to indent continued variable declarations instead of aligning.
 indent_var_def_cont             = false    # true/false
 
-# Whether to indent continued shift expressions ('<<' and '>>') instead of
-# aligning. Set align_left_shift=false when enabling this.
-indent_shift                    = false    # true/false
+# How to indent continued shift expressions ('<<' and '>>').
+# Set align_left_shift=false when using this.
+#  0: Align shift operators instead of indenting them (default)
+#  1: Indent by one level
+# -1: Preserve original indentation
+indent_shift                    = 0        # number
 
 # Whether to force indentation of function definitions to start in column 1.
 indent_func_def_force_col1      = false    # true/false
@@ -1266,6 +1302,9 @@ indent_switch_case              = 0        # unsigned number
 # Usually the same as indent_columns or indent_switch_case.
 indent_switch_body              = 0        # unsigned number
 
+# Whether to ignore indent for '{' following 'case'.
+indent_ignore_case_brace        = false    # true/false
+
 # Spaces to indent '{' from 'case'. By default, the brace will appear under
 # the 'c' in case. Usually set to 0 or indent_columns. Negative values are OK.
 # It might be wise to choose the same value for the option indent_switch_case.
@@ -1334,10 +1373,11 @@ indent_paren_nl                 = false    # true/false
 
 # How to indent a close parenthesis after a newline.
 #
-# 0: Indent to body level (default)
-# 1: Align under the open parenthesis
-# 2: Indent to the brace level
-indent_paren_close              = 0        # unsigned number
+#  0: Indent to body level (default)
+#  1: Align under the open parenthesis
+#  2: Indent to the brace level
+# -1: Preserve original indentation
+indent_paren_close              = 0        # number
 
 # Whether to indent the open parenthesis of a function definition,
 # if the parenthesis is on its own line.
@@ -1351,24 +1391,41 @@ indent_paren_after_func_decl    = false    # true/false
 # if the parenthesis is on its own line.
 indent_paren_after_func_call    = false    # true/false
 
-# Whether to indent a comma when inside a brace.
-# If true, aligns under the open brace.
-indent_comma_brace              = false    # true/false
+# How to indent a comma when inside braces.
+#  0: Indent by one level (default)
+#  1: Align under the open brace
+# -1: Preserve original indentation
+indent_comma_brace              = 0        # number
 
-# Whether to indent a comma when inside a parenthesis.
-# If true, aligns under the open parenthesis.
-indent_comma_paren              = false    # true/false
+# How to indent a comma when inside parentheses.
+#  0: Indent by one level (default)
+#  1: Align under the open parenthesis
+# -1: Preserve original indentation
+indent_comma_paren              = 0        # number
 
-# Whether to indent a Boolean operator when inside a parenthesis.
-# If true, aligns under the open parenthesis.
-indent_bool_paren               = false    # true/false
+# How to indent a Boolean operator when inside parentheses.
+#  0: Indent by one level (default)
+#  1: Align under the open parenthesis
+# -1: Preserve original indentation
+indent_bool_paren               = 0        # number
+
+# Whether to ignore the indentation of a Boolean operator when outside
+# parentheses.
+indent_ignore_bool              = false    # true/false
+
+# Whether to ignore the indentation of an arithmetic operator.
+indent_ignore_arith             = false    # true/false
 
 # Whether to indent a semicolon when inside a for parenthesis.
 # If true, aligns under the open for parenthesis.
 indent_semicolon_for_paren      = false    # true/false
 
+# Whether to ignore the indentation of a semicolon outside of a 'for'
+# statement.
+indent_ignore_semicolon         = false    # true/false
+
 # Whether to align the first expression to following ones
-# if indent_bool_paren=true.
+# if indent_bool_paren=1.
 indent_first_bool_expr          = false    # true/false
 
 # Whether to align the first expression to following ones
@@ -1382,6 +1439,9 @@ indent_square_nl                = false    # true/false
 # (ESQL/C) Whether to preserve the relative indent of 'EXEC SQL' bodies.
 indent_preserve_sql             = false    # true/false
 
+# Whether to ignore the indentation of an assignment operator.
+indent_ignore_assign            = false    # true/false
+
 # Whether to align continued statements at the '='. If false or if the '=' is
 # followed by a newline, the next line is indent one tab.
 #
@@ -1982,7 +2042,8 @@ nl_after_semicolon              = false    # true/false
 nl_paren_dbrace_open            = ignore   # ignore/add/remove/force/not_defined
 
 # Whether to add a newline after the type in an unnamed temporary
-# direct-list-initialization.
+# direct-list-initialization, better:
+# before a direct-list-initialization.
 nl_type_brace_init_lst          = ignore   # ignore/add/remove/force/not_defined
 
 # Whether to add a newline after the open brace in an unnamed temporary
@@ -2240,15 +2301,15 @@ nl_typedef_blk_end              = 0        # unsigned number
 # 0: No change (default).
 nl_typedef_blk_in               = 0        # unsigned number
 
-# The number of newlines before a block of variable definitions not at the top
-# of a function body. If nl_after_access_spec is non-zero, that option takes
-# precedence.
+# The 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.
 #
 # 0: No change (default).
 nl_var_def_blk_start            = 0        # unsigned number
 
-# The number of newlines after a block of variable definitions not at the top
-# of a function body.
+# The number of empty newlines after a block of variable definitions
+# not at the top of a function body.
 #
 # 0: No change (default).
 nl_var_def_blk_end              = 0        # unsigned number
@@ -2564,6 +2625,11 @@ 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).
@@ -2575,6 +2641,17 @@ align_assign_func_proto_span    = 0        # unsigned number
 # 0: No limit (default).
 align_assign_thresh             = 0        # number
 
+# Whether to align on the left most assignment when multiple
+# definitions are found on the same line.
+# Depends on 'align_assign_span' and 'align_assign_thresh' settings.
+align_assign_on_multi_var_defs  = false    # true/false
+
+# The threshold for aligning on '{' in braced init list.
+# Use a negative number for absolute thresholds.
+#
+# 0: No limit (default).
+align_braced_init_list_thresh   = 0        # number
+
 # How to apply align_assign_span to function declaration "assignments", i.e.
 # 'virtual void foo() = 0' or '~foo() = {default|delete}'.
 #
@@ -2780,7 +2857,7 @@ align_oc_decl_colon             = false    # true/false
 
 # (OC) Whether to not align parameters in an Objectve-C message call if first
 # colon is not on next line of the message call (the same way Xcode does
-# aligment)
+# alignment)
 align_oc_msg_colon_xcode_like   = false    # true/false
 
 #
@@ -2980,12 +3057,17 @@ mod_full_brace_function         = ignore   # ignore/add/remove/force/not_defined
 mod_full_brace_if               = ignore   # ignore/add/remove/force/not_defined
 
 # Whether to enforce that all blocks of an 'if'/'else if'/'else' chain either
-# have, or do not have, braces. If true, braces will be added if any block
-# needs braces, and will only be removed if they can be removed from all
-# blocks.
-#
-# Overrides mod_full_brace_if.
-mod_full_brace_if_chain         = false    # true/false
+# have, or do not have, braces. Overrides mod_full_brace_if.
+#
+# 0: Don't override mod_full_brace_if
+# 1: Add braces to all blocks if any block needs braces and remove braces if
+#    they can be removed from all blocks
+# 2: Add braces to all blocks if any block already has braces, regardless of
+#    whether it needs them
+# 3: Add braces to all blocks if any block needs braces and remove braces if
+#    they can be removed from all blocks, except if all blocks have braces
+#    despite none needing them
+mod_full_brace_if_chain         = 0        # unsigned number
 
 # Whether to add braces to all blocks of an 'if'/'else if'/'else' chain.
 # If true, mod_full_brace_if_chain will only remove braces from an 'if' that
@@ -3027,6 +3109,14 @@ mod_pawn_semicolon              = false    # true/false
 # statement, as in 'if (a && b > c)' => 'if (a && (b > c))'.
 mod_full_paren_if_bool          = false    # true/false
 
+# Whether to fully parenthesize Boolean expressions after '='
+# statement, as in 'x = a && b > c;' => 'x = (a && (b > c));'.
+mod_full_paren_assign_bool      = false    # true/false
+
+# Whether to fully parenthesize Boolean expressions after '='
+# statement, as in 'return  a && b > c;' => 'return (a && (b > c));'.
+mod_full_paren_return_bool      = false    # true/false
+
 # Whether to remove superfluous semicolons.
 mod_remove_extra_semicolon      = false    # true/false
 
@@ -3094,6 +3184,10 @@ mod_sort_incl_import_grouping_enabled = false    # true/false
 # the close brace, as in 'case X: { ... } break;' => 'case X: { ... break; }'.
 mod_move_case_break             = false    # true/false
 
+# Whether to move a 'return' that appears after a fully braced 'case' before
+# the close brace, as in 'case X: { ... } return;' => 'case X: { ... return; }'.
+mod_move_case_return            = false    # true/false
+
 # Add or remove braces around a fully braced case statement. Will only remove
 # braces if there are no variable declarations in the block.
 mod_case_brace                  = ignore   # ignore/add/remove/force/not_defined
@@ -3144,6 +3238,10 @@ pp_indent                       = ignore   # ignore/add/remove/force/not_defined
 # indented from column 1.
 pp_indent_at_level              = false    # true/false
 
+# Whether to indent #if/#else/#endif at the parenthesis level if the brace
+# level is 0. If false, these are indented from column 1.
+pp_indent_at_level0             = false    # true/false
+
 # Specifies the number of columns to indent preprocessors per level
 # at brace level 0 (file-level). If pp_indent_at_level=false, also specifies
 # the number of columns to indent preprocessors per level
@@ -3209,12 +3307,37 @@ pp_indent_func_def              = true     # true/false
 # Default: true
 pp_indent_extern                = true     # true/false
 
-# Whether to indent braces directly inside #if, #else, and #endif.
-# Only applies to the indent of the preprocesser that the braces are directly
-# inside of.
+# 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.
+#  0: No extra indent
+#  1: Indent by one level
+# -1: Preserve original indentation
 #
-# Default: true
-pp_indent_brace                 = true     # true/false
+# Default: 1
+pp_indent_brace                 = 1        # number
+
+# Whether to print warning messages for unbalanced #if and #else blocks.
+# This will print a message in the following cases:
+# - if an #ifdef block ends on a different indent level than
+#   where it started from. Example:
+#
+#    #ifdef TEST
+#      int i;
+#      {
+#        int j;
+#    #endif
+#
+# - an #elif/#else block ends on a different indent level than
+#   the corresponding #ifdef block. Example:
+#
+#    #ifdef TEST
+#        int i;
+#    #else
+#        }
+#      int j;
+#    #endif
+pp_warn_unbalanced_if           = false    # true/false
 
 #
 # Sort includes options
@@ -3253,17 +3376,16 @@ use_indent_func_call_param      = true     # true/false
 #
 # true:  indent_continue will be used only once
 # false: indent_continue will be used every time (default)
+#
+# Requires indent_ignore_first_continue=false.
 use_indent_continue_only_once   = false    # true/false
 
-# The value might be used twice:
-# - at the assignment
-# - at the opening brace
-#
-# To prevent the double use of the indentation value, use this option with the
-# value 'true'.
+# The indentation can be:
+# - after the assignment, at the '[' character
+# - at the begin of the lambda body
 #
-# true:  indentation will be used only once
-# false: indentation will be used every time (default)
+# true:  indentation will be after the assignment
+# false: indentation will be at the begin of the lambda body (default)
 indent_cpp_lambda_only_once     = false    # true/false
 
 # Whether sp_after_angle takes precedence over sp_inside_fparen. This was the
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/etc/dofiles.sh b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/dofiles.sh
index e08fd6f7..e08fd6f7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/etc/dofiles.sh
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/dofiles.sh
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/etc/freebsd.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/freebsd.cfg
index af170f88..27c6d152 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/etc/freebsd.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/freebsd.cfg
@@ -42,8 +42,8 @@ indent_access_spec                       = 1
 indent_access_spec_body                  = false
 indent_paren_nl                          = false
 indent_paren_close                       = 0
-indent_comma_paren                       = false
-indent_bool_paren                        = false
+indent_comma_paren                       = 0
+indent_bool_paren                        = 0
 indent_square_nl                         = false
 indent_preserve_sql                      = false
 indent_align_assign                      = true
@@ -332,7 +332,7 @@ mod_full_brace_do                        = add
 mod_full_brace_for                       = add
 mod_full_brace_function                  = ignore
 mod_full_brace_if                        = add
-mod_full_brace_if_chain                  = false
+mod_full_brace_if_chain                  = 0
 mod_full_brace_nl                        = 0
 mod_full_brace_while                     = add
 mod_paren_on_return                      = add
@@ -375,6 +375,7 @@ cmt_insert_class_header                  = ""
 cmt_insert_before_preproc                = false
 pp_indent                                = remove
 pp_indent_at_level                       = false
+pp_indent_at_level0                      = false
 pp_indent_count                          = 1
 pp_space                                 = ignore
 pp_space_count                           = 0
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/etc/gnu-indent.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/gnu-indent.cfg
index 03045618..03045618 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/etc/gnu-indent.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/gnu-indent.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/etc/klaus.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/klaus.cfg
index 289ee792..289ee792 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/etc/klaus.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/klaus.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/etc/kr-indent.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/kr-indent.cfg
index cd39b27a..cd39b27a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/etc/kr-indent.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/kr-indent.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/etc/linux-indent.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/linux-indent.cfg
index d6baa165..d6baa165 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/etc/linux-indent.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/linux-indent.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/etc/linux.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/linux.cfg
index 51c88d56..af6f3d5d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/etc/linux.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/linux.cfg
@@ -41,7 +41,7 @@ nl_after_label_colon	= true		# "fail:\nfree(foo);" vs "fail: free(foo);"
 
 mod_paren_on_return	= remove	# "return 1;" vs "return (1);"
 #mod_full_brace_if	= remove	# "if (a) a--;" vs "if (a) { a--; }"
-mod_full_brace_if_chain	= true
+mod_full_brace_if_chain	= 1
 mod_full_brace_for	= remove	# "for () a--;" vs "for () { a--; }"
 mod_full_brace_do	= remove	# "do a--; while ();" vs "do { a--; } while ();"
 mod_full_brace_while	= remove	# "while (a) a--;" vs "while (a) { a--; }"
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/etc/mono.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/mono.cfg
index b7aa9779..b7aa9779 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/etc/mono.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/mono.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/etc/msvc.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/msvc.cfg
index 36e9e14f..36e9e14f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/etc/msvc.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/msvc.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/etc/objc.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/objc.cfg
index d3321f09..d3321f09 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/etc/objc.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/objc.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/etc/sun.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/sun.cfg
index d2f51c5d..1d6a8887 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/etc/sun.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/sun.cfg
@@ -138,9 +138,12 @@ indent_var_def_blk                        = 0        # number
 # Indent continued variable declarations instead of aligning.
 indent_var_def_cont                       = true     # false/true
 
-# Indent continued shift expressions ('<<' and '>>') instead of aligning.
-# Turn align_left_shift off when enabling this.
-indent_shift                              = true     # false/true
+# How to indent continued shift expressions ('<<' and '>>').
+# Set align_left_shift=false when using this.
+#  0: Align shift operators instead of indenting them (default)
+#  1: Indent by one level
+# -1: Preserve original indentation
+indent_shift                              = 0        # number
 
 # True:  force indentation of function definition to start in column 1
 # False: use the default behavior
@@ -222,13 +225,13 @@ indent_paren_nl                           = false    # false/true
 # 2: Indent to the brace level
 indent_paren_close                        = 0        # number
 
-# Controls the indent of a comma when inside a paren.If TRUE, aligns under the open paren
-indent_comma_paren                        = false    # false/true
+# Controls the indent of a comma when inside a paren.If 1, aligns under the open paren
+indent_comma_paren                        = 0        # number
 
-# Controls the indent of a BOOL operator when inside a paren.If TRUE, aligns under the open paren
-indent_bool_paren                         = false    # false/true
+# Controls the indent of a BOOL operator when inside a paren.If 1, aligns under the open paren
+indent_bool_paren                         = 0        # number
 
-# If 'indent_bool_paren' is true, controls the indent of the first expression. If TRUE, aligns the first expression to the following ones
+# If 'indent_bool_paren' is 1, controls the indent of the first expression. If TRUE, aligns the first expression to the following ones
 indent_first_bool_expr                    = false    # false/true
 
 # If an open square is followed by a newline, indent the next line so that it lines up after the open square (not recommended)
@@ -1558,7 +1561,7 @@ mod_full_brace_if                         = remove   # ignore/add/remove/force
 
 # Make all if/elseif/else statements in a chain be braced or not. Overrides mod_full_brace_if.
 # If any must be braced, they are all braced.  If all can be unbraced, then the braces are removed.
-mod_full_brace_if_chain                   = true     # false/true
+mod_full_brace_if_chain                   = 1        # unsigned number
 
 # Don't remove braces around statements that span N newlines
 mod_full_brace_nl                         = 2        # number
@@ -1704,6 +1707,10 @@ cmt_insert_before_preproc                 = false    # false/true
 # Whether to indent #if/#else/#endif at the brace level (true) or from column 1 (false)
 pp_indent_at_level                        = false    # false/true
 
+# Whether to indent #if/#else/#endif at the parenthesis level if the brace
+# level is 0. If false, these are indented from column 1.
+pp_indent_at_level0                       = false    # false/true
+
 # Specifies the number of columns to indent preprocessors per level at brace level 0 (file-level).
 # If pp_indent_at_level=false, specifies the number of columns to indent preprocessors per level at brace level > 0 (function-level).
 # Default=1.
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/etc/types.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/types.txt
index 0df27c78..0df27c78 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/etc/types.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/types.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/etc/uigui_uncrustify.ini b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/uigui_uncrustify.ini
index 19188d03..dfcf033f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/etc/uigui_uncrustify.ini
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/uigui_uncrustify.ini
@@ -2,7 +2,7 @@
 categories=General options|Spacing options|Indenting options|Newline adding and removing options|Blank line options|Positioning options|Line splitting options|Code alignment options (not left column spaces/tabs)|Comment modification options|Code modifying options (non-whitespace)|Preprocessor options|Sort includes options|Use or Do not Use options|Warn levels - 1: error, 2: warning (default), 3: note
 cfgFileParameterEnding=cr
 configFilename=uncrustify.cfg
-fileTypes=*.c|*.cpp|*.d|*.cs|*.vala|*.java|*.pawn|*.p|*.sma|*.inl|*.h|*.cxx|*.hpp|*.hxx|*.cc|*.cp|*.C|*.CPP|*.c++|*.di|*.m|*.mm|*.sqc|*.es
+fileTypes=*.c|*.c++|*.cc|*.cp|*.cpp|*.cs|*.cxx|*.d|*.di|*.es|*.h|*.h++|*.hh|*.hp|*.hpp|*.hxx|*.inl|*.java|*.js|*.m|*.mm|*.p|*.pawn|*.sma|*.sqc|*.sql|*.vala
 indenterFileName=uncrustify
 indenterName=Uncrustify (C, C++, C#, ObjectiveC, D, Java, Pawn, VALA)
 inputFileName=indentinput
@@ -15,7 +15,7 @@ parameterOrder=ipo
 showHelpParameter=-h
 stringparaminquotes=false
 useCfgFileParameter="-c "
-version=Uncrustify-0.74.0
+version=Uncrustify-0.75.0
 
 [Newlines]
 Category=0
@@ -255,6 +255,15 @@ Choices=sp_after_assign=ignore|sp_after_assign=add|sp_after_assign=remove|sp_aft
 ChoicesReadable="Ignore Sp After Assign|Add Sp After Assign|Remove Sp After Assign|Force Sp After Assign"
 ValueDefault=ignore
 
+[Sp Enum Brace]
+Category=1
+Description="<html>Add or remove space in 'enum {'.<br/><br/>Default: add</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_enum_brace=ignore|sp_enum_brace=add|sp_enum_brace=remove|sp_enum_brace=force|sp_enum_brace=not_defined
+ChoicesReadable="Ignore Sp Enum Brace|Add Sp Enum Brace|Remove Sp Enum Brace|Force Sp Enum Brace"
+ValueDefault=add
+
 [Sp Enum Paren]
 Category=1
 Description="<html>Add or remove space in 'NS_ENUM ('.</html>"
@@ -479,6 +488,15 @@ Choices=sp_ptr_star_func_var=ignore|sp_ptr_star_func_var=add|sp_ptr_star_func_va
 ChoicesReadable="Ignore Sp Ptr Star Func Var|Add Sp Ptr Star Func Var|Remove Sp Ptr Star Func Var|Force Sp Ptr Star Func Var"
 ValueDefault=ignore
 
+[Sp Ptr Star Func Type]
+Category=1
+Description="<html>Add or remove space between the pointer star '*' and the name of the type<br/>in a function pointer type definition.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_ptr_star_func_type=ignore|sp_ptr_star_func_type=add|sp_ptr_star_func_type=remove|sp_ptr_star_func_type=force|sp_ptr_star_func_type=not_defined
+ChoicesReadable="Ignore Sp Ptr Star Func Type|Add Sp Ptr Star Func Type|Remove Sp Ptr Star Func Type|Force Sp Ptr Star Func Type"
+ValueDefault=ignore
+
 [Sp Ptr Star Paren]
 Category=1
 Description="<html>Add or remove space after a pointer star '*', if followed by an open<br/>parenthesis, as in 'void* (*)()'.</html>"
@@ -551,6 +569,15 @@ Choices=sp_before_byref_func=ignore|sp_before_byref_func=add|sp_before_byref_fun
 ChoicesReadable="Ignore Sp Before Byref Func|Add Sp Before Byref Func|Remove Sp Before Byref Func|Force Sp Before Byref Func"
 ValueDefault=ignore
 
+[Sp Byref Paren]
+Category=1
+Description="<html>Add or remove space after a reference sign '&amp;', if followed by an open<br/>parenthesis, as in 'char&amp; (*)()'.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_byref_paren=ignore|sp_byref_paren=add|sp_byref_paren=remove|sp_byref_paren=force|sp_byref_paren=not_defined
+ChoicesReadable="Ignore Sp Byref Paren|Add Sp Byref Paren|Remove Sp Byref Paren|Force Sp Byref Paren"
+ValueDefault=ignore
+
 [Sp After Type]
 Category=1
 Description="<html>Add or remove space between type and word. In cases where total removal of<br/>whitespace would be a syntax error, a value of 'remove' is treated the same<br/>as 'force'.<br/><br/>This also affects some other instances of space following a type that are<br/>not covered by other options; for example, between the return type and<br/>parenthesis of a function type template argument, between the type and<br/>parenthesis of an array parameter, or between 'decltype(...)' and the<br/>following word.<br/><br/>Default: force</html>"
@@ -1009,9 +1036,18 @@ Choices=sp_paren_comma=ignore|sp_paren_comma=add|sp_paren_comma=remove|sp_paren_
 ChoicesReadable="Ignore Sp Paren Comma|Add Sp Paren Comma|Remove Sp Paren Comma|Force Sp Paren Comma"
 ValueDefault=force
 
+[Sp Type Colon]
+Category=1
+Description="<html>Add or remove space between a type and ':'.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_type_colon=ignore|sp_type_colon=add|sp_type_colon=remove|sp_type_colon=force|sp_type_colon=not_defined
+ChoicesReadable="Ignore Sp Type Colon|Add Sp Type Colon|Remove Sp Type Colon|Force Sp Type Colon"
+ValueDefault=ignore
+
 [Sp After Ellipsis]
 Category=1
-Description="<html>Add or remove space after the variadic '...' when preceded by a<br/>non-punctuator.<br/>The value REMOVE will be overriden with FORCE</html>"
+Description="<html>Add or remove space after the variadic '...' when preceded by a<br/>non-punctuator.<br/>The value REMOVE will be overridden with FORCE</html>"
 Enabled=false
 EditorType=multiple
 Choices=sp_after_ellipsis=ignore|sp_after_ellipsis=add|sp_after_ellipsis=remove|sp_after_ellipsis=force|sp_after_ellipsis=not_defined
@@ -1020,7 +1056,7 @@ ValueDefault=ignore
 
 [Sp Before Ellipsis]
 Category=1
-Description="<html>Add or remove space before the variadic '...' when preceded by a<br/>non-punctuator.<br/>The value REMOVE will be overriden with FORCE</html>"
+Description="<html>Add or remove space before the variadic '...' when preceded by a<br/>non-punctuator.<br/>The value REMOVE will be overridden with FORCE</html>"
 Enabled=false
 EditorType=multiple
 Choices=sp_before_ellipsis=ignore|sp_before_ellipsis=add|sp_before_ellipsis=remove|sp_before_ellipsis=force|sp_before_ellipsis=not_defined
@@ -1045,15 +1081,6 @@ Choices=sp_ptr_type_ellipsis=ignore|sp_ptr_type_ellipsis=add|sp_ptr_type_ellipsi
 ChoicesReadable="Ignore Sp Ptr Type Ellipsis|Add Sp Ptr Type Ellipsis|Remove Sp Ptr Type Ellipsis|Force Sp Ptr Type Ellipsis"
 ValueDefault=ignore
 
-[Sp Type Question]
-Category=1
-Description="<html>(D) Add or remove space between a type and '?'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_type_question=ignore|sp_type_question=add|sp_type_question=remove|sp_type_question=force|sp_type_question=not_defined
-ChoicesReadable="Ignore Sp Type Question|Add Sp Type Question|Remove Sp Type Question|Force Sp Type Question"
-ValueDefault=ignore
-
 [Sp Paren Ellipsis]
 Category=1
 Description="<html>Add or remove space between ')' and '...'.</html>"
@@ -1837,6 +1864,15 @@ Choices=sp_not=ignore|sp_not=add|sp_not=remove|sp_not=force|sp_not=not_defined
 ChoicesReadable="Ignore Sp Not|Add Sp Not|Remove Sp Not|Force Sp Not"
 ValueDefault=remove
 
+[Sp Not Not]
+Category=1
+Description="<html>Add or remove space between two '!' (not) unary operators.<br/>If set to ignore, sp_not will be used.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_not_not=ignore|sp_not_not=add|sp_not_not=remove|sp_not_not=force|sp_not_not=not_defined
+ChoicesReadable="Ignore Sp Not Not|Add Sp Not Not|Remove Sp Not Not|Force Sp Not Not"
+ValueDefault=ignore
+
 [Sp Inv]
 Category=1
 Description="<html>Add or remove space after the '~' (invert) unary operator.<br/><br/>Default: remove</html>"
@@ -2368,9 +2404,17 @@ MinVal=0
 MaxVal=16
 ValueDefault=8
 
+[Indent Ignore First Continue]
+Category=2
+Description="<html>Whether to ignore indent for the first continuation line. Subsequent<br/>continuation lines will still be indented to match the first.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_ignore_first_continue=true|indent_ignore_first_continue=false
+ValueDefault=false
+
 [Indent Continue]
 Category=2
-Description="<html>The continuation indent. If non-zero, this overrides the indent of '(', '['<br/>and '=' continuation indents. Negative values are OK; negative value is<br/>absolute and not increased for each '(' or '[' level.<br/><br/>For FreeBSD, this is set to 4.</html>"
+Description="<html>The continuation indent. If non-zero, this overrides the indent of '(', '['<br/>and '=' continuation indents. Negative values are OK; negative value is<br/>absolute and not increased for each '(' or '[' level.<br/><br/>For FreeBSD, this is set to 4.<br/>Requires indent_ignore_first_continue=false.</html>"
 Enabled=false
 EditorType=numeric
 CallName="indent_continue="
@@ -2380,7 +2424,7 @@ ValueDefault=0
 
 [Indent Continue Class Head]
 Category=2
-Description="<html>The continuation indent, only for class header line(s). If non-zero, this<br/>overrides the indent of 'class' continuation indents.</html>"
+Description="<html>The continuation indent, only for class header line(s). If non-zero, this<br/>overrides the indent of 'class' continuation indents.<br/>Requires indent_ignore_first_continue=false.</html>"
 Enabled=false
 EditorType=numeric
 CallName="indent_continue_class_head="
@@ -2551,6 +2595,14 @@ MinVal=0
 MaxVal=255
 ValueDefault=0
 
+[Indent Namespace Inner Only]
+Category=2
+Description="<html>Whether to indent only in inner namespaces (nested in other namespaces).<br/>Requires indent_namespace=true.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_namespace_inner_only=true|indent_namespace_inner_only=false
+ValueDefault=false
+
 [Indent Extern]
 Category=2
 Description="<html>Whether the 'extern "C"' body is indented.</html>"
@@ -2567,9 +2619,17 @@ EditorType=boolean
 TrueFalse=indent_class=true|indent_class=false
 ValueDefault=false
 
+[Indent Ignore Before Class Colon]
+Category=2
+Description="<html>Whether to ignore indent for the leading base class colon.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_ignore_before_class_colon=true|indent_ignore_before_class_colon=false
+ValueDefault=false
+
 [Indent Before Class Colon]
 Category=2
-Description="<html>Additional indent before the leading base class colon.<br/>Negative values decrease indent down to the first column.<br/>Requires a newline break before colon (see pos_class_colon<br/>and nl_class_colon)</html>"
+Description="<html>Additional indent before the leading base class colon.<br/>Negative values decrease indent down to the first column.<br/>Requires indent_ignore_before_class_colon=false and a newline break before<br/>the colon (see pos_class_colon and nl_class_colon)</html>"
 Enabled=false
 EditorType=numeric
 CallName="indent_before_class_colon="
@@ -2593,6 +2653,14 @@ EditorType=boolean
 TrueFalse=indent_class_on_colon=true|indent_class_on_colon=false
 ValueDefault=false
 
+[Indent Ignore Before Constr Colon]
+Category=2
+Description="<html>Whether to ignore indent for a leading class initializer colon.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_ignore_before_constr_colon=true|indent_ignore_before_constr_colon=false
+ValueDefault=false
+
 [Indent Constr Colon]
 Category=2
 Description="<html>Whether to indent the stuff after a leading class initializer colon.</html>"
@@ -2659,11 +2727,13 @@ ValueDefault=false
 
 [Indent Shift]
 Category=2
-Description="<html>Whether to indent continued shift expressions ('&lt;&lt;' and '&gt;&gt;') instead of<br/>aligning. Set align_left_shift=false when enabling this.</html>"
+Description="<html>How to indent continued shift expressions ('&lt;&lt;' and '&gt;&gt;').<br/>Set align_left_shift=false when using this.<br/> 0: Align shift operators instead of indenting them (default)<br/> 1: Indent by one level<br/>-1: Preserve original indentation</html>"
 Enabled=false
-EditorType=boolean
-TrueFalse=indent_shift=true|indent_shift=false
-ValueDefault=false
+EditorType=numeric
+CallName="indent_shift="
+MinVal=-1
+MaxVal=1
+ValueDefault=0
 
 [Indent Func Def Force Col1]
 Category=2
@@ -2843,6 +2913,14 @@ MinVal=0
 MaxVal=16
 ValueDefault=0
 
+[Indent Ignore Case Brace]
+Category=2
+Description="<html>Whether to ignore indent for '{' following 'case'.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_ignore_case_brace=true|indent_ignore_case_brace=false
+ValueDefault=false
+
 [Indent Case Brace]
 Category=2
 Description="<html>Spaces to indent '{' from 'case'. By default, the brace will appear under<br/>the 'c' in case. Usually set to 0 or indent_columns. Negative values are OK.<br/>It might be wise to choose the same value for the option indent_switch_case.</html>"
@@ -2967,11 +3045,11 @@ ValueDefault=false
 
 [Indent Paren Close]
 Category=2
-Description="<html>How to indent a close parenthesis after a newline.<br/><br/>0: Indent to body level (default)<br/>1: Align under the open parenthesis<br/>2: Indent to the brace level</html>"
+Description="<html>How to indent a close parenthesis after a newline.<br/><br/> 0: Indent to body level (default)<br/> 1: Align under the open parenthesis<br/> 2: Indent to the brace level<br/>-1: Preserve original indentation</html>"
 Enabled=false
 EditorType=numeric
 CallName="indent_paren_close="
-MinVal=0
+MinVal=-1
 MaxVal=2
 ValueDefault=0
 
@@ -3001,26 +3079,48 @@ ValueDefault=false
 
 [Indent Comma Brace]
 Category=2
-Description="<html>Whether to indent a comma when inside a brace.<br/>If true, aligns under the open brace.</html>"
+Description="<html>How to indent a comma when inside braces.<br/> 0: Indent by one level (default)<br/> 1: Align under the open brace<br/>-1: Preserve original indentation</html>"
 Enabled=false
-EditorType=boolean
-TrueFalse=indent_comma_brace=true|indent_comma_brace=false
-ValueDefault=false
+EditorType=numeric
+CallName="indent_comma_brace="
+MinVal=-1
+MaxVal=1
+ValueDefault=0
 
 [Indent Comma Paren]
 Category=2
-Description="<html>Whether to indent a comma when inside a parenthesis.<br/>If true, aligns under the open parenthesis.</html>"
+Description="<html>How to indent a comma when inside parentheses.<br/> 0: Indent by one level (default)<br/> 1: Align under the open parenthesis<br/>-1: Preserve original indentation</html>"
+Enabled=false
+EditorType=numeric
+CallName="indent_comma_paren="
+MinVal=-1
+MaxVal=1
+ValueDefault=0
+
+[Indent Bool Paren]
+Category=2
+Description="<html>How to indent a Boolean operator when inside parentheses.<br/> 0: Indent by one level (default)<br/> 1: Align under the open parenthesis<br/>-1: Preserve original indentation</html>"
+Enabled=false
+EditorType=numeric
+CallName="indent_bool_paren="
+MinVal=-1
+MaxVal=1
+ValueDefault=0
+
+[Indent Ignore Bool]
+Category=2
+Description="<html>Whether to ignore the indentation of a Boolean operator when outside<br/>parentheses.</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=indent_comma_paren=true|indent_comma_paren=false
+TrueFalse=indent_ignore_bool=true|indent_ignore_bool=false
 ValueDefault=false
 
-[Indent Bool Paren]
+[Indent Ignore Arith]
 Category=2
-Description="<html>Whether to indent a Boolean operator when inside a parenthesis.<br/>If true, aligns under the open parenthesis.</html>"
+Description="<html>Whether to ignore the indentation of an arithmetic operator.</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=indent_bool_paren=true|indent_bool_paren=false
+TrueFalse=indent_ignore_arith=true|indent_ignore_arith=false
 ValueDefault=false
 
 [Indent Semicolon For Paren]
@@ -3031,9 +3131,17 @@ EditorType=boolean
 TrueFalse=indent_semicolon_for_paren=true|indent_semicolon_for_paren=false
 ValueDefault=false
 
+[Indent Ignore Semicolon]
+Category=2
+Description="<html>Whether to ignore the indentation of a semicolon outside of a 'for'<br/>statement.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_ignore_semicolon=true|indent_ignore_semicolon=false
+ValueDefault=false
+
 [Indent First Bool Expr]
 Category=2
-Description="<html>Whether to align the first expression to following ones<br/>if indent_bool_paren=true.</html>"
+Description="<html>Whether to align the first expression to following ones<br/>if indent_bool_paren=1.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=indent_first_bool_expr=true|indent_first_bool_expr=false
@@ -3063,6 +3171,14 @@ EditorType=boolean
 TrueFalse=indent_preserve_sql=true|indent_preserve_sql=false
 ValueDefault=false
 
+[Indent Ignore Assign]
+Category=2
+Description="<html>Whether to ignore the indentation of an assignment operator.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_ignore_assign=true|indent_ignore_assign=false
+ValueDefault=false
+
 [Indent Align Assign]
 Category=2
 Description="<html>Whether to align continued statements at the '='. If false or if the '=' is<br/>followed by a newline, the next line is indent one tab.<br/><br/>Default: true</html>"
@@ -4475,7 +4591,7 @@ ValueDefault=ignore
 
 [Nl Type Brace Init Lst]
 Category=3
-Description="<html>Whether to add a newline after the type in an unnamed temporary<br/>direct-list-initialization.</html>"
+Description="<html>Whether to add a newline after the type in an unnamed temporary<br/>direct-list-initialization, better:<br/>before a direct-list-initialization.</html>"
 Enabled=false
 EditorType=multiple
 Choices=nl_type_brace_init_lst=ignore|nl_type_brace_init_lst=add|nl_type_brace_init_lst=remove|nl_type_brace_init_lst=force|nl_type_brace_init_lst=not_defined
@@ -5051,7 +5167,7 @@ ValueDefault=0
 
 [Nl Var Def Blk Start]
 Category=4
-Description="<html>The number of newlines before a block of variable definitions not at the top<br/>of a function body. If nl_after_access_spec is non-zero, that option takes<br/>precedence.<br/><br/>0: No change (default).</html>"
+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>"
 Enabled=false
 EditorType=numeric
 CallName="nl_var_def_blk_start="
@@ -5061,7 +5177,7 @@ ValueDefault=0
 
 [Nl Var Def Blk End]
 Category=4
-Description="<html>The number of newlines after a block of variable definitions not at the top<br/>of a function body.<br/><br/>0: No change (default).</html>"
+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>"
 Enabled=false
 EditorType=numeric
 CallName="nl_var_def_blk_end="
@@ -5720,6 +5836,16 @@ 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>"
@@ -5740,6 +5866,24 @@ MinVal=-1000
 MaxVal=5000
 ValueDefault=0
 
+[Align Assign On Multi Var Defs]
+Category=7
+Description="<html>Whether to align on the left most assignment when multiple<br/>definitions are found on the same line.<br/>Depends on 'align_assign_span' and 'align_assign_thresh' settings.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=align_assign_on_multi_var_defs=true|align_assign_on_multi_var_defs=false
+ValueDefault=false
+
+[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>"
+Enabled=false
+EditorType=numeric
+CallName="align_braced_init_list_thresh="
+MinVal=-1000
+MaxVal=5000
+ValueDefault=0
+
 [Align Assign Decl Func]
 Category=7
 Description="<html>How to apply align_assign_span to function declaration "assignments", i.e.<br/>'virtual void foo() = 0' or '~foo() = {default|delete}'.<br/><br/>0: Align with other assignments (default)<br/>1: Align with each other, ignoring regular assignments<br/>2: Don't align</html>"
@@ -6126,7 +6270,7 @@ ValueDefault=false
 
 [Align Oc Msg Colon Xcode Like]
 Category=7
-Description="<html>(OC) Whether to not align parameters in an Objectve-C message call if first<br/>colon is not on next line of the message call (the same way Xcode does<br/>aligment)</html>"
+Description="<html>(OC) Whether to not align parameters in an Objectve-C message call if first<br/>colon is not on next line of the message call (the same way Xcode does<br/>alignment)</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=align_oc_msg_colon_xcode_like=true|align_oc_msg_colon_xcode_like=false
@@ -6414,11 +6558,13 @@ ValueDefault=ignore
 
 [Mod Full Brace If Chain]
 Category=9
-Description="<html>Whether to enforce that all blocks of an 'if'/'else if'/'else' chain either<br/>have, or do not have, braces. If true, braces will be added if any block<br/>needs braces, and will only be removed if they can be removed from all<br/>blocks.<br/><br/>Overrides mod_full_brace_if.</html>"
+Description="<html>Whether to enforce that all blocks of an 'if'/'else if'/'else' chain either<br/>have, or do not have, braces. Overrides mod_full_brace_if.<br/><br/>0: Don't override mod_full_brace_if<br/>1: Add braces to all blocks if any block needs braces and remove braces if<br/>   they can be removed from all blocks<br/>2: Add braces to all blocks if any block already has braces, regardless of<br/>   whether it needs them<br/>3: Add braces to all blocks if any block needs braces and remove braces if<br/>   they can be removed from all blocks, except if all blocks have braces<br/>   despite none needing them</html>"
 Enabled=false
-EditorType=boolean
-TrueFalse=mod_full_brace_if_chain=true|mod_full_brace_if_chain=false
-ValueDefault=false
+EditorType=numeric
+CallName="mod_full_brace_if_chain="
+MinVal=0
+MaxVal=3
+ValueDefault=0
 
 [Mod Full Brace If Chain Only]
 Category=9
@@ -6489,6 +6635,22 @@ EditorType=boolean
 TrueFalse=mod_full_paren_if_bool=true|mod_full_paren_if_bool=false
 ValueDefault=false
 
+[Mod Full Paren Assign Bool]
+Category=9
+Description="<html>Whether to fully parenthesize Boolean expressions after '='<br/>statement, as in 'x = a &amp;&amp; b &gt; c;' =&gt; 'x = (a &amp;&amp; (b &gt; c));'.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=mod_full_paren_assign_bool=true|mod_full_paren_assign_bool=false
+ValueDefault=false
+
+[Mod Full Paren Return Bool]
+Category=9
+Description="<html>Whether to fully parenthesize Boolean expressions after '='<br/>statement, as in 'return  a &amp;&amp; b &gt; c;' =&gt; 'return (a &amp;&amp; (b &gt; c));'.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=mod_full_paren_return_bool=true|mod_full_paren_return_bool=false
+ValueDefault=false
+
 [Mod Remove Extra Semicolon]
 Category=9
 Description="<html>Whether to remove superfluous semicolons.</html>"
@@ -6645,6 +6807,14 @@ EditorType=boolean
 TrueFalse=mod_move_case_break=true|mod_move_case_break=false
 ValueDefault=false
 
+[Mod Move Case Return]
+Category=9
+Description="<html>Whether to move a 'return' that appears after a fully braced 'case' before<br/>the close brace, as in 'case X: { ... } return;' =&gt; 'case X: { ... return; }'.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=mod_move_case_return=true|mod_move_case_return=false
+ValueDefault=false
+
 [Mod Case Brace]
 Category=9
 Description="<html>Add or remove braces around a fully braced case statement. Will only remove<br/>braces if there are no variable declarations in the block.</html>"
@@ -6766,6 +6936,14 @@ EditorType=boolean
 TrueFalse=pp_indent_at_level=true|pp_indent_at_level=false
 ValueDefault=false
 
+[Pp Indent At Level0]
+Category=10
+Description="<html>Whether to indent #if/#else/#endif at the parenthesis level if the brace<br/>level is 0. If false, these are indented from column 1.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=pp_indent_at_level0=true|pp_indent_at_level0=false
+ValueDefault=false
+
 [Pp Indent Count]
 Category=10
 Description="<html>Specifies the number of columns to indent preprocessors per level<br/>at brace level 0 (file-level). If pp_indent_at_level=false, also specifies<br/>the number of columns to indent preprocessors per level<br/>at brace level &gt; 0 (function-level).<br/><br/>Default: 1</html>"
@@ -6889,11 +7067,21 @@ ValueDefault=true
 
 [Pp Indent Brace]
 Category=10
-Description="<html>Whether to indent braces directly inside #if, #else, and #endif.<br/>Only applies to the indent of the preprocesser that the braces are directly<br/>inside of.<br/><br/>Default: true</html>"
+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>"
+Enabled=false
+EditorType=numeric
+CallName="pp_indent_brace="
+MinVal=-1
+MaxVal=1
+ValueDefault=1
+
+[Pp Warn Unbalanced If]
+Category=10
+Description="<html>Whether to print warning messages for unbalanced #if and #else blocks.<br/>This will print a message in the following cases:<br/>- if an #ifdef block ends on a different indent level than<br/>  where it started from. Example:<br/><br/>   #ifdef TEST<br/>     int i;<br/>     {<br/>       int j;<br/>   #endif<br/><br/>- an #elif/#else block ends on a different indent level than<br/>  the corresponding #ifdef block. Example:<br/><br/>   #ifdef TEST<br/>       int i;<br/>   #else<br/>       }<br/>     int j;<br/>   #endif</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=pp_indent_brace=true|pp_indent_brace=false
-ValueDefault=true
+TrueFalse=pp_warn_unbalanced_if=true|pp_warn_unbalanced_if=false
+ValueDefault=false
 
 [Include Category 0]
 Category=11
@@ -6929,7 +7117,7 @@ ValueDefault=true
 
 [Use Indent Continue Only Once]
 Category=12
-Description="<html>The value of the indentation for a continuation line is calculated<br/>differently if the statement is:<br/>- a declaration: your case with QString fileName ...<br/>- an assignment: your case with pSettings = new QSettings( ...<br/><br/>At the second case the indentation value might be used twice:<br/>- at the assignment<br/>- at the function call (if present)<br/><br/>To prevent the double use of the indentation value, use this option with the<br/>value 'true'.<br/><br/>true:  indent_continue will be used only once<br/>false: indent_continue will be used every time (default)</html>"
+Description="<html>The value of the indentation for a continuation line is calculated<br/>differently if the statement is:<br/>- a declaration: your case with QString fileName ...<br/>- an assignment: your case with pSettings = new QSettings( ...<br/><br/>At the second case the indentation value might be used twice:<br/>- at the assignment<br/>- at the function call (if present)<br/><br/>To prevent the double use of the indentation value, use this option with the<br/>value 'true'.<br/><br/>true:  indent_continue will be used only once<br/>false: indent_continue will be used every time (default)<br/><br/>Requires indent_ignore_first_continue=false.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=use_indent_continue_only_once=true|use_indent_continue_only_once=false
@@ -6937,7 +7125,7 @@ ValueDefault=false
 
 [Indent Cpp Lambda Only Once]
 Category=12
-Description="<html>The value might be used twice:<br/>- at the assignment<br/>- at the opening brace<br/><br/>To prevent the double use of the indentation value, use this option with the<br/>value 'true'.<br/><br/>true:  indentation will be used only once<br/>false: indentation will be used every time (default)</html>"
+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>"
 Enabled=false
 EditorType=boolean
 TrueFalse=indent_cpp_lambda_only_once=true|indent_cpp_lambda_only_once=false
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/etc/uncrust-files.sh b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/uncrust-files.sh
index 3e1d09b3..3e1d09b3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/etc/uncrust-files.sh
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/uncrust-files.sh
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/etc/uncrustify.xml.in b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/uncrustify.xml.in
index 33f6c6a5..33f6c6a5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/etc/uncrustify.xml.in
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/uncrustify.xml.in
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/etc/xsupplicant.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/xsupplicant.cfg
index 45d16fa6..45d16fa6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/etc/xsupplicant.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/etc/xsupplicant.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/extras.vpj b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/extras.vpj
index 4b57772a..4b57772a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/extras.vpj
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/extras.vpj
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/forUncrustifySources.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/forUncrustifySources.cfg
index ffab574e..12dca2a2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/forUncrustifySources.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/forUncrustifySources.cfg
@@ -33,7 +33,7 @@ align_var_def_star_style                  = 1
 align_var_struct_span                     = 3
 
 # Indenting options
-indent_bool_paren                         = true
+indent_bool_paren                         = 1
 indent_class                              = true
 indent_columns                            = 3
 indent_compound_literal_return            = false
@@ -285,6 +285,7 @@ sp_paren_qualifier                        = force
 sp_pp_concat                              = force
 sp_pp_stringify                           = force
 sp_ptr_star_func_var                      = remove
+sp_ptr_star_func_type                     = remove
 sp_ptr_star_paren                         = force
 sp_return_brace                           = remove
 sp_return_paren                           = remove
@@ -390,6 +391,7 @@ use_form_feed_no_more_as_whitespace_character = false
 # sp_cpp_lambda_assign
 # sp_d_array_colon
 # sp_else_brace
+# sp_enum_brace
 # sp_enum_paren
 # sp_extern_paren
 # sp_finally_brace
@@ -428,7 +430,6 @@ use_form_feed_no_more_as_whitespace_character = false
 # sp_trailing_ret_t
 # sp_try_brace
 # sp_type_ellipsis
-# sp_type_question
 # sp_vala_after_translation
 # sp_version_paren
 # sp_word_brace
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/forUncrustifySources.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/forUncrustifySources.txt
index 5beb747f..5beb747f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/forUncrustifySources.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/forUncrustifySources.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/lnt/ChunkStack.lnt b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/lnt/ChunkStack.lnt
index cea5860f..cea5860f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/lnt/ChunkStack.lnt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/lnt/ChunkStack.lnt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/lnt/align.lnt b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/lnt/align.lnt
index 32e388c3..32e388c3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/lnt/align.lnt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/lnt/align.lnt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/lnt/chunk_list.lnt b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/lnt/chunk_list.lnt
index e69de29b..e69de29b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/lnt/chunk_list.lnt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/lnt/chunk_list.lnt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/lnt/logger.lnt b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/lnt/logger.lnt
index e41a1282..e41a1282 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/lnt/logger.lnt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/lnt/logger.lnt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/lnt/readme.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/lnt/readme.txt
index f2534349..f2534349 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/lnt/readme.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/lnt/readme.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/lnt/unc_text.lnt b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/lnt/unc_text.lnt
index 89cb4fdb..89cb4fdb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/lnt/unc_text.lnt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/lnt/unc_text.lnt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/lnt/uncrustify_types.lnt b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/lnt/uncrustify_types.lnt
index e69de29b..e69de29b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/lnt/uncrustify_types.lnt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/lnt/uncrustify_types.lnt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/man/uncrustify.1.in b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/man/uncrustify.1.in
index 41267296..41267296 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/man/uncrustify.1.in
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/man/uncrustify.1.in
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/osx/Xcode Organizer Actions.xccommands b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/osx/Xcode Organizer Actions.xccommands
index be727021..be727021 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/osx/Xcode Organizer Actions.xccommands
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/osx/Xcode Organizer Actions.xccommands
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/package.json b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/package.json
index e8ffb38c..48f9b7c5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/package.json
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/package.json
@@ -1,6 +1,6 @@
 {
   "name": "uncrustify",
-  "version": "0.74.0",
+  "version": "0.75.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.74.0/release-process.rst b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/release-process.rst
index 1cabf504..f16173a1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/release-process.rst
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/release-process.rst
@@ -234,7 +234,7 @@ Create a tarball:
 .. code::
 
    $ cd /path/to/uncrustify
-   $ git archive -o uncrustify-0.1.2.tar.gz uncrustify-0.1.2
+   $ git archive -o uncrustify-0.1.2.tar.gz --prefix=uncrustify-0.1.2/ uncrustify-0.1.2
 TODO: find the best strategie...
 
 (If you don't have Ninja_, or just don't want to use it for whatever reason,
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/scripts/Gcov_test.sh b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/Gcov_test.sh
index a3853773..a3853773 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/scripts/Gcov_test.sh
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/Gcov_test.sh
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/scripts/Run_clang-tidy.sh b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/Run_clang-tidy.sh
index c2f1c150..c2f1c150 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/scripts/Run_clang-tidy.sh
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/Run_clang-tidy.sh
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/scripts/add_test_list.awk b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/add_test_list.awk
index 1fbe2840..1fbe2840 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/scripts/add_test_list.awk
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/add_test_list.awk
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/scripts/check_options.py b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/check_options.py
index 1d32224b..1d32224b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/scripts/check_options.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/check_options.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/scripts/cmpcfg.pl b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/cmpcfg.pl
index df119dc1..df119dc1 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/scripts/cmpcfg.pl
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/cmpcfg.pl
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/scripts/compare_the_gcov.awk b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/compare_the_gcov.awk
index 30dba1ad..30dba1ad 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/scripts/compare_the_gcov.awk
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/compare_the_gcov.awk
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/scripts/gen_changelog.py b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/gen_changelog.py
index 8e042385..8e042385 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/scripts/gen_changelog.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/gen_changelog.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/scripts/gen_config_combinations_uniq_output.py b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/gen_config_combinations_uniq_output.py
index 2fa4fb0c..2fa4fb0c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/scripts/gen_config_combinations_uniq_output.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/gen_config_combinations_uniq_output.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/scripts/gen_config_combinations_uniq_output_example.json b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/gen_config_combinations_uniq_output_example.json
index 315fdfef..315fdfef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/scripts/gen_config_combinations_uniq_output_example.json
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/gen_config_combinations_uniq_output_example.json
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/scripts/grammar_permutator.py b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/grammar_permutator.py
index cd42bd9f..cd42bd9f 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/scripts/grammar_permutator.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/grammar_permutator.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/scripts/make_katehl.py b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/make_katehl.py
index e241986a..e241986a 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/scripts/make_katehl.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/make_katehl.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/scripts/make_option_enum.py b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/make_option_enum.py
index c141bb04..c141bb04 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/scripts/make_option_enum.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/make_option_enum.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/scripts/make_options.py b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/make_options.py
index 71e97115..71e97115 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/scripts/make_options.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/make_options.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/scripts/make_punctuator_table.py b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/make_punctuator_table.py
index f3d90081..f3d90081 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/scripts/make_punctuator_table.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/make_punctuator_table.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/scripts/make_version.py b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/make_version.py
index 14e20018..14e20018 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/scripts/make_version.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/make_version.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/scripts/option_reducer.py b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/option_reducer.py
index 403ff92b..403ff92b 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/scripts/option_reducer.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/option_reducer.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/scripts/pclint/au-sm123.lnt b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/pclint/au-sm123.lnt
index 6eaf9a6b..6eaf9a6b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/scripts/pclint/au-sm123.lnt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/pclint/au-sm123.lnt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/scripts/pclint/co-gcc.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/pclint/co-gcc.h
index e948a20f..e948a20f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/scripts/pclint/co-gcc.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/pclint/co-gcc.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/scripts/pclint/co-gcc.lnt b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/pclint/co-gcc.lnt
index f7bd38dd..f7bd38dd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/scripts/pclint/co-gcc.lnt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/pclint/co-gcc.lnt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/scripts/pclint/lint_cfg.lnt b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/pclint/lint_cfg.lnt
index 72530d53..72530d53 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/scripts/pclint/lint_cfg.lnt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/pclint/lint_cfg.lnt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/scripts/pclint/pclint_cfg_eclipse.lnt b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/pclint/pclint_cfg_eclipse.lnt
index d1945c5b..d1945c5b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/scripts/pclint/pclint_cfg_eclipse.lnt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/pclint/pclint_cfg_eclipse.lnt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/scripts/pclint/policy.lnt b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/pclint/policy.lnt
index 911e74b7..911e74b7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/scripts/pclint/policy.lnt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/pclint/policy.lnt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/scripts/pclint/run-pclint-eclipse.bat b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/pclint/run-pclint-eclipse.bat
index 1a778bfa..051813d6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/scripts/pclint/run-pclint-eclipse.bat
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/pclint/run-pclint-eclipse.bat
@@ -38,7 +38,7 @@ rem dir /s/b %SRC_DIR%\args.cpp			> .\%OUT_DIR%\files.lnt
 rem dir /s/b %SRC_DIR%\backup.cpp		> .\%OUT_DIR%\files.lnt
 rem dir /s/b %SRC_DIR%\brace_cleanup.cpp> .\%OUT_DIR%\files.lnt
 rem dir /s/b %SRC_DIR%\braces.cpp		> .\%OUT_DIR%\files.lnt
-rem dir /s/b %SRC_DIR%\chunk_list.cpp	> .\%OUT_DIR%\files.lnt
+rem dir /s/b %SRC_DIR%\chunk.cpp	> .\%OUT_DIR%\files.lnt
 rem dir /s/b %SRC_DIR%\ChunkStack.cpp	> .\%OUT_DIR%\files.lnt
 rem dir /s/b %SRC_DIR%\combine.cpp		> .\%OUT_DIR%\files.lnt
 rem dir /s/b %SRC_DIR%\compat_posix.cpp	> .\%OUT_DIR%\files.lnt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/scripts/pclint/usage.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/pclint/usage.txt
index fff1c305..fff1c305 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/scripts/pclint/usage.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/pclint/usage.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/scripts/prepare_list_of_authors.sh b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/prepare_list_of_authors.sh
index 6485d377..6485d377 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/scripts/prepare_list_of_authors.sh
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/prepare_list_of_authors.sh
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/scripts/release_tool.py b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/release_tool.py
index 2dd71676..2dd71676 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/scripts/release_tool.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/release_tool.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/scripts/run_ctest.py b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/run_ctest.py
index 0267e0ad..0267e0ad 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/scripts/run_ctest.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/run_ctest.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/scripts/tokenizer.py b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/tokenizer.py
index 0bc33bac..0bc33bac 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/scripts/tokenizer.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/tokenizer.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/scripts/update_emscripten_bindings.py b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/update_emscripten_bindings.py
index d44a58a6..781311e2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/scripts/update_emscripten_bindings.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/scripts/update_emscripten_bindings.py
@@ -65,7 +65,7 @@ ENUMS_INFO = [
         'suffix_chars': 1,
     },
     {
-        'name': 'c_token_t',
+        'name': 'E_Token',
         'substitute_name': 'TokenType',
         'filepath': '%s/src/token_enum.h' % ROOT_DIR,
         'extra_arg': [],
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/.kateconfig b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/.kateconfig
index 4d9024f0..4d9024f0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/.kateconfig
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/.kateconfig
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/ChunkStack.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/ChunkStack.cpp
index c04c6e5e..dfa0f888 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/ChunkStack.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/ChunkStack.cpp
@@ -43,7 +43,7 @@ const ChunkStack::Entry *ChunkStack::Get(size_t idx) const
 }
 
 
-chunk_t *ChunkStack::GetChunk(size_t idx) const
+Chunk *ChunkStack::GetChunk(size_t idx) const
 {
    if (idx < m_cse.size())
    {
@@ -53,9 +53,9 @@ chunk_t *ChunkStack::GetChunk(size_t idx) const
 }
 
 
-chunk_t *ChunkStack::Pop_Front()
+Chunk *ChunkStack::Pop_Front()
 {
-   chunk_t *pc = nullptr;
+   Chunk *pc = nullptr;
 
    if (!m_cse.empty())
    {
@@ -66,9 +66,9 @@ chunk_t *ChunkStack::Pop_Front()
 }
 
 
-chunk_t *ChunkStack::Pop_Back()
+Chunk *ChunkStack::Pop_Back()
 {
-   chunk_t *pc = nullptr;
+   Chunk *pc = nullptr;
 
    if (!m_cse.empty())
    {
@@ -79,7 +79,7 @@ chunk_t *ChunkStack::Pop_Back()
 }
 
 
-void ChunkStack::Push_Back(chunk_t *pc, size_t seqnum)
+void ChunkStack::Push_Back(Chunk *pc, size_t seqnum)
 {
    m_cse.push_back(Entry(seqnum, pc));
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/ChunkStack.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/ChunkStack.h
index 8434d895..b33e1dd5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/ChunkStack.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/ChunkStack.h
@@ -29,15 +29,15 @@ public:
       }
 
 
-      Entry(size_t sn, chunk_t *pc)
+      Entry(size_t sn, Chunk *pc)
          : m_seqnum(sn)
          , m_pc(pc)
       {
       }
 
 
-      size_t  m_seqnum;
-      chunk_t *m_pc;
+      size_t m_seqnum;
+      Chunk  *m_pc;
    };
 
 protected:
@@ -65,7 +65,7 @@ public:
    void Set(const ChunkStack &cs);
 
 
-   void Push_Back(chunk_t *pc)
+   void Push_Back(Chunk *pc)
    {
       Push_Back(pc, ++m_seqnum);
    }
@@ -89,16 +89,16 @@ public:
    const Entry *Get(size_t idx) const;
 
 
-   chunk_t *GetChunk(size_t idx) const;
+   Chunk *GetChunk(size_t idx) const;
 
 
-   chunk_t *Pop_Back();
+   Chunk *Pop_Back();
 
 
-   void Push_Back(chunk_t *pc, size_t seqnum);
+   void Push_Back(Chunk *pc, size_t seqnum);
 
 
-   chunk_t *Pop_Front();
+   Chunk *Pop_Front();
 
 
    void Reset()
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/EnumStructUnionParser.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/EnumStructUnionParser.cpp
index ff0e3a65..02536aa4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/EnumStructUnionParser.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/EnumStructUnionParser.cpp
@@ -17,24 +17,24 @@
 /**
  * Extern declarations
  */
-extern const char *get_token_name(c_token_t);
+extern const char *get_token_name(E_Token);
 extern void log_pcf_flags(log_sev_t, pcf_flags_t);
 
 
 /**
  * Forward declarations
  */
-static std::pair<chunk_t *, chunk_t *> match_variable_end(chunk_t *, std::size_t);
-static std::pair<chunk_t *, chunk_t *> match_variable_start(chunk_t *, std::size_t);
-static chunk_t *skip_scope_resolution_and_nested_name_specifiers(chunk_t *);
-static chunk_t *skip_scope_resolution_and_nested_name_specifiers_rev(chunk_t *);
+static std::pair<Chunk *, Chunk *> match_variable_end(Chunk *, std::size_t);
+static std::pair<Chunk *, Chunk *> match_variable_start(Chunk *, std::size_t);
+static Chunk *skip_scope_resolution_and_nested_name_specifiers(Chunk *);
+static Chunk *skip_scope_resolution_and_nested_name_specifiers_rev(Chunk *);
 
 
 /**
  * Returns true if two adjacent chunks potentially match a pattern consistent
  * with that of a qualified identifier
  */
-static bool adj_tokens_match_qualified_identifier_pattern(chunk_t *prev, chunk_t *next)
+static bool adj_tokens_match_qualified_identifier_pattern(Chunk *prev, Chunk *next)
 {
    LOG_FUNC_ENTRY();
 
@@ -59,7 +59,7 @@ static bool adj_tokens_match_qualified_identifier_pattern(chunk_t *prev, chunk_t
           * templated type, just check to see if there's a matching closing
           * angle
           */
-         return(chunk_skip_to_match(prev, scope_e::PREPROC) != nullptr);
+         return(chunk_skip_to_match(prev, E_Scope::PREPROC) != nullptr);
 
       case CT_DC_MEMBER:
          /**
@@ -95,7 +95,7 @@ static bool adj_tokens_match_qualified_identifier_pattern(chunk_t *prev, chunk_t
  * Returns true if two adjacent chunks potentially match a pattern consistent
  * with that of a variable definition
  */
-static bool adj_tokens_match_var_def_pattern(chunk_t *prev, chunk_t *next)
+static bool adj_tokens_match_var_def_pattern(Chunk *prev, Chunk *next)
 {
    LOG_FUNC_ENTRY();
 
@@ -129,7 +129,7 @@ static bool adj_tokens_match_var_def_pattern(chunk_t *prev, chunk_t *next)
           * templated type, just check to see if there's a matching closing
           * angle
           */
-         return(chunk_skip_to_match(prev, scope_e::PREPROC) != nullptr);
+         return(chunk_skip_to_match(prev, E_Scope::PREPROC) != nullptr);
 
       case CT_BRACE_CLOSE:
          /**
@@ -152,7 +152,7 @@ static bool adj_tokens_match_var_def_pattern(chunk_t *prev, chunk_t *next)
           * start of a braced initializer list - skip ahead to find a matching
           * closing brace
           */
-         return(chunk_skip_to_match(prev, scope_e::PREPROC) != nullptr);
+         return(chunk_skip_to_match(prev, E_Scope::PREPROC) != nullptr);
 
       case CT_BYREF:
          /**
@@ -202,7 +202,7 @@ static bool adj_tokens_match_var_def_pattern(chunk_t *prev, chunk_t *next)
           * start of a constructor call parameter list - skip ahead to find a
           * matching closing paren
           */
-         next = chunk_skip_to_match(prev, scope_e::PREPROC);
+         next = chunk_skip_to_match(prev, E_Scope::PREPROC);
 
          if (next != nullptr)
          {
@@ -248,7 +248,7 @@ static bool adj_tokens_match_var_def_pattern(chunk_t *prev, chunk_t *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, scope_e::PREPROC) != nullptr);
+         return(chunk_skip_to_match(prev, E_Scope::PREPROC) != nullptr);
 
       case CT_STAR:
          /**
@@ -327,11 +327,12 @@ static bool adj_tokens_match_var_def_pattern(chunk_t *prev, chunk_t *next)
  * @param after      points to the second chunk
  * @param test_equal if true, returns true when both chunks refer to the same chunk
  */
-static bool chunk_is_after(chunk_t *pc, chunk_t *after, bool test_equal = true)
+static bool chunk_is_after(Chunk *pc, Chunk *after, bool test_equal = true)
 {
    LOG_FUNC_ENTRY();
 
-   if (pc != nullptr)
+   if (  pc != nullptr
+      && pc->IsNotNullChunk())
    {
       if (  test_equal
          && pc == after)
@@ -361,11 +362,12 @@ static bool chunk_is_after(chunk_t *pc, chunk_t *after, bool test_equal = true)
  * @param before     points to the second chunk
  * @param test_equal if true, returns true when both chunks refer to the same chunk
  */
-static bool chunk_is_before(chunk_t *pc, chunk_t *before, bool test_equal = true)
+static bool chunk_is_before(Chunk *pc, Chunk *before, bool test_equal = true)
 {
    LOG_FUNC_ENTRY();
 
-   if (pc != nullptr)
+   if (  pc != nullptr
+      && pc->IsNotNullChunk())
    {
       if (  test_equal
          && pc == before)
@@ -397,7 +399,7 @@ static bool chunk_is_before(chunk_t *pc, chunk_t *before, bool test_equal = true
  * @param test_equal if true, returns true when the first chunk tests equal to
  *                   either the second or third chunk
  */
-static bool chunk_is_between(chunk_t *pc, chunk_t *after, chunk_t *before, bool test_equal = true)
+static bool chunk_is_between(Chunk *pc, Chunk *after, Chunk *before, bool test_equal = true)
 {
    LOG_FUNC_ENTRY();
 
@@ -411,18 +413,19 @@ static bool chunk_is_between(chunk_t *pc, chunk_t *after, chunk_t *before, bool
  * the source file currently being processed. Note that a macro may be defined in
  * another source or header file, for which this function does not currently account
  */
-static bool chunk_is_macro_reference(chunk_t *pc)
+static bool chunk_is_macro_reference(Chunk *pc)
 {
    LOG_FUNC_ENTRY();
 
-   auto *next = chunk_get_head();
+   Chunk *next = Chunk::GetHead();
 
    if (  (  language_is_set(LANG_CPP)
          || language_is_set(LANG_C))
       && chunk_is_token(pc, CT_WORD)
       && !pc->flags.test(PCF_IN_PREPROC))
    {
-      while (next != nullptr)
+      while (  next != nullptr
+            && next->IsNotNullChunk())
       {
          if (  next->flags.test(PCF_IN_PREPROC)
             && std::strcmp(pc->str.c_str(), next->str.c_str()) == 0)
@@ -440,7 +443,7 @@ static bool chunk_is_macro_reference(chunk_t *pc)
  * Returns true if the input chunk is a pointer/reference operator or a
  * qualifier
  */
-static bool chunk_is_pointer_reference_or_qualifier(chunk_t *pc)
+static bool chunk_is_pointer_reference_or_qualifier(Chunk *pc)
 {
    LOG_FUNC_ENTRY();
 
@@ -463,7 +466,7 @@ static bool chunk_is_pointer_reference_or_qualifier(chunk_t *pc)
  *           or the closing angle bracket of a template. If no match is found, a
  *           pair of null chunks is returned
  */
-static std::pair<chunk_t *, chunk_t *> match_qualified_identifier(chunk_t *pc)
+static std::pair<Chunk *, Chunk *> match_qualified_identifier(Chunk *pc)
 {
    LOG_FUNC_ENTRY();
 
@@ -496,7 +499,7 @@ static std::pair<chunk_t *, chunk_t *> match_qualified_identifier(chunk_t *pc)
  *              the identifier name, and the third chunk indicates the end associated
  *              with the variable declaration/definition
  */
-static std::tuple<chunk_t *, chunk_t *, chunk_t *> match_variable(chunk_t *pc, std::size_t level)
+static std::tuple<Chunk *, Chunk *, Chunk *> match_variable(Chunk *pc, std::size_t level)
 {
    LOG_FUNC_ENTRY();
 
@@ -512,10 +515,10 @@ static std::tuple<chunk_t *, chunk_t *, chunk_t *> match_variable(chunk_t *pc, s
     * chunk indicates a variable declaration/definition
     */
 
-   if (  identifier != nullptr
-      && start != nullptr
+   if (  identifier->IsNotNullChunk()
+      && start->IsNotNullChunk()
       && (  end != nullptr
-         || chunk_is_token(chunk_get_prev_ncnnlni(identifier), CT_WORD)))
+         || chunk_is_token(identifier->GetPrevNcNnlNi(), CT_WORD)))
    {
       return(std::make_tuple(start, identifier, end));
    }
@@ -538,18 +541,19 @@ static std::tuple<chunk_t *, chunk_t *, chunk_t *> match_variable(chunk_t *pc, s
  *              chunk may be null if the function is called with a starting chunk
  *              that occurs after the identifier
  */
-static std::pair<chunk_t *, chunk_t *> match_variable_end(chunk_t *pc, std::size_t level)
+static std::pair<Chunk *, Chunk *> match_variable_end(Chunk *pc, std::size_t level)
 {
    LOG_FUNC_ENTRY();
 
-   chunk_t *identifier = nullptr;
+   Chunk *identifier = nullptr;
 
-   while (pc != nullptr)
+   while (  pc != nullptr
+         && pc->IsNotNullChunk())
    {
       /**
        * skip any right-hand side assignments
        */
-      chunk_t *rhs_exp_end = nullptr;
+      Chunk *rhs_exp_end = nullptr;
 
       if (chunk_is_token(pc, CT_ASSIGN))
       {
@@ -565,9 +569,10 @@ static std::pair<chunk_t *, chunk_t *> match_variable_end(chunk_t *pc, std::size
        * skip current and preceding chunks if at a higher brace level
        */
       while (  pc != nullptr
+            && pc->IsNotNullChunk()
             && pc->level > level)
       {
-         pc = chunk_get_next_ncnnl(pc);
+         pc = pc->GetNextNcNnl();
       }
 
       /**
@@ -579,14 +584,14 @@ static std::pair<chunk_t *, chunk_t *> match_variable_end(chunk_t *pc, std::size
          || chunk_is_paren_open(pc)
          || chunk_is_token(pc, CT_SQUARE_OPEN))
       {
-         pc = chunk_skip_to_match(pc, scope_e::PREPROC);
+         pc = chunk_skip_to_match(pc, E_Scope::PREPROC);
       }
       /**
        * call a separate function to validate adjacent tokens as potentially
        * matching a variable declaration/definition
        */
 
-      chunk_t *next = chunk_get_next_ncnnl(pc);
+      Chunk *next = pc->GetNextNcNnl();
 
       if (  chunk_is_not_token(next, CT_COMMA)
          && chunk_is_not_token(next, CT_FPAREN_CLOSE)
@@ -642,26 +647,31 @@ static std::pair<chunk_t *, chunk_t *> match_variable_end(chunk_t *pc, std::size
  *              function is called with a starting chunk that occurs before the
  *              identifier
  */
-static std::pair<chunk_t *, chunk_t *> match_variable_start(chunk_t *pc, std::size_t level)
+static std::pair<Chunk *, Chunk *> match_variable_start(Chunk *pc, std::size_t level)
 {
    LOG_FUNC_ENTRY();
 
-   chunk_t *identifier = nullptr;
+   Chunk *identifier = Chunk::NullChunkPtr;
 
-   while (pc != nullptr)
+   if (pc == nullptr)
+   {
+      pc = Chunk::NullChunkPtr;
+   }
+
+   while (pc->IsNotNullChunk())
    {
       /**
        * skip any right-hand side assignments
        */
-      chunk_t *before_rhs_exp_start = skip_expression_rev(pc);
-      chunk_t *prev                 = nullptr;
-      chunk_t *next                 = pc;
+      Chunk *before_rhs_exp_start = skip_expression_rev(pc);
+      Chunk *prev                 = Chunk::NullChunkPtr;
+      Chunk *next                 = pc;
 
       while (  chunk_is_after(next, before_rhs_exp_start)
             && pc != prev)
       {
          next = prev;
-         prev = chunk_get_prev_ncnnlni(next);
+         prev = next->GetPrevNcNnlNi();
 
          if (chunk_is_token(next, CT_ASSIGN))
          {
@@ -672,10 +682,10 @@ static std::pair<chunk_t *, chunk_t *> match_variable_start(chunk_t *pc, std::si
        * skip current and preceding chunks if at a higher brace level
        */
 
-      while (  pc != nullptr
+      while (  pc->IsNotNullChunk()
             && pc->level > level)
       {
-         pc = chunk_get_prev_ncnnlni(pc);
+         pc = pc->GetPrevNcNnlNi();
       }
 
       /**
@@ -687,14 +697,14 @@ static std::pair<chunk_t *, chunk_t *> match_variable_start(chunk_t *pc, std::si
          || chunk_is_paren_close(pc)
          || chunk_is_token(pc, CT_SQUARE_CLOSE))
       {
-         pc = chunk_skip_to_match_rev(pc, scope_e::PREPROC);
+         pc = chunk_skip_to_match_rev(pc, E_Scope::PREPROC);
       }
       /**
        * call a separate function to validate adjacent tokens as potentially
        * matching a variable declaration/definition
        */
 
-      prev = chunk_get_prev_ncnnlni(pc);
+      prev = pc->GetPrevNcNnlNi();
 
       if (!adj_tokens_match_var_def_pattern(prev, pc))
       {
@@ -714,7 +724,7 @@ static std::pair<chunk_t *, chunk_t *> match_variable_start(chunk_t *pc, std::si
          }
       }
 
-      if (  identifier == nullptr
+      if (  identifier->IsNullChunk()
          && chunk_is_token(pc, CT_WORD))
       {
          /**
@@ -739,7 +749,7 @@ static std::pair<chunk_t *, chunk_t *> match_variable_start(chunk_t *pc, std::si
       }
       pc = prev;
    }
-   return(std::make_pair(nullptr, nullptr));
+   return(std::make_pair(Chunk::NullChunkPtr, Chunk::NullChunkPtr));
 } // match_variable_start
 
 
@@ -749,7 +759,7 @@ static std::pair<chunk_t *, chunk_t *> match_variable_start(chunk_t *pc, std::si
  * function, this function also takes into account templates that may comprise any
  * nested name specifiers
  */
-static chunk_t *skip_scope_resolution_and_nested_name_specifiers(chunk_t *pc)
+static Chunk *skip_scope_resolution_and_nested_name_specifiers(Chunk *pc)
 {
    LOG_FUNC_ENTRY();
 
@@ -759,16 +769,17 @@ static chunk_t *skip_scope_resolution_and_nested_name_specifiers(chunk_t *pc)
       || chunk_is_token(pc, CT_TYPE)
       || chunk_is_token(pc, CT_WORD))
    {
-      while (pc != nullptr)
+      while (  pc != nullptr
+            && pc->IsNotNullChunk())
       {
          /**
           * skip to any following match for angle brackets
           */
          if (chunk_is_token(pc, CT_ANGLE_OPEN))
          {
-            pc = chunk_skip_to_match(pc, scope_e::PREPROC);
+            pc = chunk_skip_to_match(pc, E_Scope::PREPROC);
          }
-         auto *next = chunk_get_next_ncnnl(pc);
+         Chunk *next = pc->GetNextNcNnl();
 
          /**
           * call a separate function to validate adjacent tokens as potentially
@@ -790,26 +801,31 @@ static chunk_t *skip_scope_resolution_and_nested_name_specifiers(chunk_t *pc)
  * the existing skip_dc_member_rev() function, this function also takes into account
  * templates that may comprise any nested name specifiers
  */
-static chunk_t *skip_scope_resolution_and_nested_name_specifiers_rev(chunk_t *pc)
+static Chunk *skip_scope_resolution_and_nested_name_specifiers_rev(Chunk *pc)
 {
    LOG_FUNC_ENTRY();
 
-   if (  (  pc != nullptr
+   if (pc == nullptr)
+   {
+      pc = Chunk::NullChunkPtr;
+   }
+
+   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))
    {
-      while (pc != nullptr)
+      while (pc->IsNotNullChunk())
       {
          /**
           * skip to any preceding match for angle brackets
           */
          if (chunk_is_token(pc, CT_ANGLE_CLOSE))
          {
-            pc = chunk_skip_to_match_rev(pc, scope_e::PREPROC);
+            pc = chunk_skip_to_match_rev(pc, E_Scope::PREPROC);
          }
-         auto *prev = chunk_get_prev_ncnnlni(pc);
+         Chunk *prev = pc->GetPrevNcNnlNi();
 
          /**
           * call a separate function to validate adjacent tokens as potentially
@@ -867,12 +883,12 @@ void EnumStructUnionParser::analyze_identifiers()
     * "class/struct [macros/attributes ...] [: bases] { } x, ..."
     */
 
-   chunk_t     *template_end      = get_template_end();
+   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_t     *pc                = body_end ? body_end : m_start;
+   Chunk       *pc                = body_end ? body_end : m_start;
 
    /**
     * first, try a simple approach to identify any associated type
@@ -896,14 +912,19 @@ void EnumStructUnionParser::analyze_identifiers()
       }
    }
 
-   if (chunk_get_next_ncnnl(pc) == m_end)
+   if (pc == nullptr)
+   {
+      pc = Chunk::NullChunkPtr;
+   }
+
+   if (pc->GetNextNcNnl() == m_end)
    {
       /**
        * we're likely at the end of a class/enum/struct/union body which lacks
        * any trailing inline definitions
        */
 
-      pc = chunk_get_next_ncnnl(m_end);
+      pc = m_end->GetNextNcNnl();
    }
 
    if (  type_identified()
@@ -915,7 +936,7 @@ void EnumStructUnionParser::analyze_identifiers()
        * by one more so that we don't perform a variable identifier search
        * below
        */
-      pc = chunk_get_next_ncnnl(pc);
+      pc = pc->GetNextNcNnl();
    }
 
    if (body_end != nullptr)
@@ -934,7 +955,7 @@ void EnumStructUnionParser::analyze_identifiers()
        * declspecs, and attributes
        */
 
-      chunk_t *tmp = pc;
+      Chunk *tmp = pc;
 
       do
       {
@@ -972,7 +993,7 @@ void EnumStructUnionParser::analyze_identifiers()
       {
          pc = end;
       }
-      pc = chunk_get_next_ncnnl(pc);
+      pc = pc->GetNextNcNnl();
 
       /**
        * skip any right-hand side assignments
@@ -990,7 +1011,7 @@ void EnumStructUnionParser::analyze_identifiers()
             && !pc->flags.test_any(PCF_IN_FCN_DEF | PCF_IN_FCN_CALL | PCF_IN_TEMPLATE)
             && !chunk_is_between(pc, inheritance_start, body_start)))
       {
-         pc = chunk_get_next_ncnnl(pc);
+         pc = pc->GetNextNcNnl();
       }
    }
    /**
@@ -1009,7 +1030,7 @@ void EnumStructUnionParser::analyze_identifiers()
          || !language_is_set(LANG_C)))
    {
       /**
-       * if a type has been identifies, mark any constructor matching constructor
+       * if a type has been identified, mark any constructor matching constructor
        * declarations/definitions
        */
       mark_constructors();
@@ -1066,7 +1087,7 @@ bool EnumStructUnionParser::enum_base_detected() const
 } // EnumStructUnionParser::enum_base_detected
 
 
-chunk_t *EnumStructUnionParser::get_body_end() const
+Chunk *EnumStructUnionParser::get_body_end() const
 {
    LOG_FUNC_ENTRY();
 
@@ -1080,7 +1101,7 @@ chunk_t *EnumStructUnionParser::get_body_end() const
 } // EnumStructUnionParser::get_body_end
 
 
-chunk_t *EnumStructUnionParser::get_body_start() const
+Chunk *EnumStructUnionParser::get_body_start() const
 {
    LOG_FUNC_ENTRY();
 
@@ -1094,7 +1115,7 @@ chunk_t *EnumStructUnionParser::get_body_start() const
 } // EnumStructUnionParser::get_body_start
 
 
-chunk_t *EnumStructUnionParser::get_enum_base_start() const
+Chunk *EnumStructUnionParser::get_enum_base_start() const
 {
    LOG_FUNC_ENTRY();
 
@@ -1108,7 +1129,7 @@ chunk_t *EnumStructUnionParser::get_enum_base_start() const
 } // EnumStructUnionParser::get_enum_base_start
 
 
-chunk_t *EnumStructUnionParser::get_first_top_level_comma() const
+Chunk *EnumStructUnionParser::get_first_top_level_comma() const
 {
    LOG_FUNC_ENTRY();
 
@@ -1122,12 +1143,12 @@ chunk_t *EnumStructUnionParser::get_first_top_level_comma() const
 } // EnumStructUnionParser::get_first_top_level_comma
 
 
-chunk_t *EnumStructUnionParser::get_inheritance_end() const
+Chunk *EnumStructUnionParser::get_inheritance_end() const
 {
    LOG_FUNC_ENTRY();
 
-   chunk_t *brace_open        = nullptr;
-   auto    *inheritance_start = get_inheritance_start();
+   Chunk *brace_open        = nullptr;
+   auto  *inheritance_start = get_inheritance_start();
 
    if (inheritance_start != nullptr)
    {
@@ -1135,17 +1156,14 @@ chunk_t *EnumStructUnionParser::get_inheritance_end() const
 
       if (brace_open == nullptr)
       {
-         brace_open = chunk_get_next_type(inheritance_start,
-                                          CT_BRACE_OPEN,
-                                          m_start->level,
-                                          scope_e::ALL);
+         brace_open = inheritance_start->GetNextType(CT_BRACE_OPEN, m_start->level, E_Scope::ALL);
       }
    }
    return(brace_open);
 } // EnumStructUnionParser::get_inheritance_end
 
 
-chunk_t *EnumStructUnionParser::get_inheritance_start() const
+Chunk *EnumStructUnionParser::get_inheritance_start() const
 {
    LOG_FUNC_ENTRY();
 
@@ -1159,7 +1177,7 @@ chunk_t *EnumStructUnionParser::get_inheritance_start() const
 } // EnumStructUnionParser::get_inheritance_start
 
 
-std::map<std::size_t, chunk_t *> EnumStructUnionParser::get_question_operators() const
+std::map<std::size_t, Chunk *> EnumStructUnionParser::get_question_operators() const
 {
    LOG_FUNC_ENTRY();
 
@@ -1169,11 +1187,11 @@ std::map<std::size_t, chunk_t *> EnumStructUnionParser::get_question_operators()
    {
       return(it_token_chunk_map_pair->second);
    }
-   return(std::map<std::size_t, chunk_t *>());
+   return(std::map<std::size_t, Chunk *>());
 } // EnumStructUnionParser::get_question_operators
 
 
-chunk_t *EnumStructUnionParser::get_template_end() const
+Chunk *EnumStructUnionParser::get_template_end() const
 {
    LOG_FUNC_ENTRY();
 
@@ -1187,7 +1205,7 @@ chunk_t *EnumStructUnionParser::get_template_end() const
 } // EnumStructUnionParser::get_template_end
 
 
-chunk_t *EnumStructUnionParser::get_template_start() const
+Chunk *EnumStructUnionParser::get_template_start() const
 {
    LOG_FUNC_ENTRY();
 
@@ -1201,7 +1219,7 @@ chunk_t *EnumStructUnionParser::get_template_start() const
 } // EnumStructUnionParser::get_template_start
 
 
-std::map<std::size_t, chunk_t *> EnumStructUnionParser::get_top_level_commas() const
+std::map<std::size_t, Chunk *> EnumStructUnionParser::get_top_level_commas() const
 {
    LOG_FUNC_ENTRY();
 
@@ -1211,16 +1229,16 @@ std::map<std::size_t, chunk_t *> EnumStructUnionParser::get_top_level_commas() c
    {
       return(it_token_chunk_map_pair->second);
    }
-   return(std::map<std::size_t, chunk_t *>());
+   return(std::map<std::size_t, Chunk *>());
 } // EnumStructUnionParser::get_top_level_commas
 
 
-chunk_t *EnumStructUnionParser::get_where_end() const
+Chunk *EnumStructUnionParser::get_where_end() const
 {
    LOG_FUNC_ENTRY();
 
-   chunk_t *brace_open  = nullptr;
-   auto    *where_start = get_where_start();
+   Chunk *brace_open  = nullptr;
+   auto  *where_start = get_where_start();
 
    if (where_start != nullptr)
    {
@@ -1228,17 +1246,14 @@ chunk_t *EnumStructUnionParser::get_where_end() const
 
       if (brace_open == nullptr)
       {
-         brace_open = chunk_get_next_type(where_start,
-                                          CT_BRACE_OPEN,
-                                          m_start->level,
-                                          scope_e::ALL);
+         brace_open = where_start->GetNextType(CT_BRACE_OPEN, m_start->level, E_Scope::ALL);
       }
    }
    return(brace_open);
 } // EnumStructUnionParser::get_where_end
 
 
-chunk_t *EnumStructUnionParser::get_where_start() const
+Chunk *EnumStructUnionParser::get_where_start() const
 {
    LOG_FUNC_ENTRY();
 
@@ -1260,7 +1275,7 @@ bool EnumStructUnionParser::inheritance_detected() const
 } // EnumStructUnionParser::inheritance_detected
 
 
-void EnumStructUnionParser::initialize(chunk_t *pc)
+void EnumStructUnionParser::initialize(Chunk *pc)
 {
    LOG_FUNC_ENTRY();
 
@@ -1274,7 +1289,7 @@ void EnumStructUnionParser::initialize(chunk_t *pc)
 } // EnumStructUnionParser::initialize
 
 
-bool EnumStructUnionParser::is_potential_end_chunk(chunk_t *pc) const
+bool EnumStructUnionParser::is_potential_end_chunk(Chunk *pc) const
 {
    LOG_FUNC_ENTRY();
 
@@ -1305,7 +1320,7 @@ bool EnumStructUnionParser::is_potential_end_chunk(chunk_t *pc) const
     * the following may identify cases where we've reached the
     * end of a cast terminated by a closing paren
     */
-   if (  (  chunk_is_token(pc, CT_PAREN_CLOSE)
+   if (  (  chunk_is_paren_close(pc) // Issue #3538
          && pc->level < m_start->level)
       || (start_in_funcdef ^ pc_in_funcdef).test_any()
       || (start_in_preproc ^ pc_in_preproc).test_any())
@@ -1350,7 +1365,7 @@ bool EnumStructUnionParser::is_potential_end_chunk(chunk_t *pc) const
 } // EnumStructUnionParser::is_potential_end_chunk
 
 
-bool EnumStructUnionParser::is_within_conditional(chunk_t *pc) const
+bool EnumStructUnionParser::is_within_conditional(Chunk *pc) const
 {
    LOG_FUNC_ENTRY();
 
@@ -1377,7 +1392,7 @@ bool EnumStructUnionParser::is_within_conditional(chunk_t *pc) const
 } // EnumStructUnionParser::is_within_conditional
 
 
-bool EnumStructUnionParser::is_within_inheritance_list(chunk_t *pc) const
+bool EnumStructUnionParser::is_within_inheritance_list(Chunk *pc) const
 {
    LOG_FUNC_ENTRY();
 
@@ -1398,7 +1413,7 @@ bool EnumStructUnionParser::is_within_inheritance_list(chunk_t *pc) const
 } // EnumStructUnionParser::is_within_inheritance_list
 
 
-bool EnumStructUnionParser::is_within_where_clause(chunk_t *pc) const
+bool EnumStructUnionParser::is_within_where_clause(Chunk *pc) const
 {
    LOG_FUNC_ENTRY();
 
@@ -1419,7 +1434,7 @@ bool EnumStructUnionParser::is_within_where_clause(chunk_t *pc) const
 } // EnumStructUnionParser::is_within_where_clause
 
 
-void EnumStructUnionParser::mark_base_classes(chunk_t *pc)
+void EnumStructUnionParser::mark_base_classes(Chunk *pc)
 {
    LOG_FUNC_ENTRY();
 
@@ -1435,7 +1450,7 @@ void EnumStructUnionParser::mark_base_classes(chunk_t *pc)
        */
       pc->flags &= ~PCF_VAR_TYPE;
 
-      chunk_t *next = chunk_get_next_ncnnl(pc, scope_e::PREPROC);
+      Chunk *next = pc->GetNextNcNnl(E_Scope::PREPROC);
 
       if (chunk_is_token(next, CT_DC_MEMBER))
       {
@@ -1489,7 +1504,7 @@ void EnumStructUnionParser::mark_base_classes(chunk_t *pc)
 } // EnumStructUnionParser::mark_base_classes
 
 
-void EnumStructUnionParser::mark_braces(chunk_t *brace_open)
+void EnumStructUnionParser::mark_braces(Chunk *brace_open)
 {
    LOG_FUNC_ENTRY();
 
@@ -1537,7 +1552,7 @@ void EnumStructUnionParser::mark_braces(chunk_t *brace_open)
    }
    set_chunk_parent(brace_open, m_start->type);
 
-   auto *brace_close = chunk_skip_to_match(brace_open, scope_e::PREPROC);
+   auto *brace_close = chunk_skip_to_match(brace_open, E_Scope::PREPROC);
 
    if (brace_close != nullptr)
    {
@@ -1546,7 +1561,7 @@ void EnumStructUnionParser::mark_braces(chunk_t *brace_open)
 } // EnumStructUnionParser::mark_braces
 
 
-void EnumStructUnionParser::mark_class_colon(chunk_t *colon)
+void EnumStructUnionParser::mark_class_colon(Chunk *colon)
 {
    LOG_FUNC_ENTRY();
 
@@ -1562,7 +1577,7 @@ void EnumStructUnionParser::mark_class_colon(chunk_t *colon)
 } // EnumStructUnionParser::mark_class_colon
 
 
-void EnumStructUnionParser::mark_conditional_colon(chunk_t *colon)
+void EnumStructUnionParser::mark_conditional_colon(Chunk *colon)
 {
    set_chunk_type(colon, CT_COND_COLON);
 } // EnumStructUnionParser::mark_conditional_colon
@@ -1586,7 +1601,7 @@ void EnumStructUnionParser::mark_constructors()
               __LINE__,
               m_start->orig_line,
               m_start->orig_col,
-              m_start->text(),
+              m_start->Text(),
               get_token_name(get_chunk_parent_type(m_start)));
 
       log_pcf_flags(LFTOR, m_start->flags);
@@ -1596,7 +1611,7 @@ void EnumStructUnionParser::mark_constructors()
        */
       auto *body_end   = get_body_end();
       auto *body_start = get_body_start();
-      auto *name       = m_type->text();
+      auto *name       = m_type->Text();
 
       LOG_FMT(LFTOR,
               "%s(%d): Name of type is '%s'\n",
@@ -1605,20 +1620,20 @@ void EnumStructUnionParser::mark_constructors()
               name);
       log_pcf_flags(LFTOR, m_type->flags);
 
-      chunk_t     *next = nullptr;
+      Chunk       *next = Chunk::NullChunkPtr;
       std::size_t level = m_type->brace_level + 1;
 
       for (auto *prev = body_start; next != body_end; prev = next)
       {
          chunk_flags_set(prev, PCF_IN_CLASS);
 
-         next = skip_template_next(chunk_get_next_ncnnl(prev, scope_e::PREPROC)); // Issue #3368
+         next = skip_template_next(prev->GetNextNcNnl(E_Scope::PREPROC));                         // Issue #3368
 
          /**
           * find a chunk within the class/struct body that
           */
-         if (  prev != nullptr
-            && std::strcmp(prev->text(), name) == 0
+         if (  prev->IsNotNullChunk()
+            && std::strcmp(prev->Text(), name) == 0
             && prev->level == level
             && chunk_is_paren_open(next))
          {
@@ -1642,7 +1657,7 @@ void EnumStructUnionParser::mark_constructors()
 } // EnumStructUnionParser::mark_constructor
 
 
-void EnumStructUnionParser::mark_enum_integral_type(chunk_t *colon)
+void EnumStructUnionParser::mark_enum_integral_type(Chunk *colon)
 {
    LOG_FUNC_ENTRY();
 
@@ -1650,7 +1665,7 @@ void EnumStructUnionParser::mark_enum_integral_type(chunk_t *colon)
    set_chunk_parent(colon, m_start->type);
 
    auto *body_start = get_body_start();
-   auto *pc         = chunk_get_next_ncnnl(colon);
+   auto *pc         = colon->GetNextNcNnl();
 
    /**
     * the chunk(s) between the colon and opening
@@ -1674,7 +1689,7 @@ void EnumStructUnionParser::mark_enum_integral_type(chunk_t *colon)
          set_chunk_type(pc, CT_TYPE);
          set_chunk_parent(pc, colon->type);
       }
-      pc = chunk_get_next_ncnnl(pc);
+      pc = pc->GetNextNcNnl();
    }
 } // EnumStructUnionParser::mark_enum_integral_type
 
@@ -1687,8 +1702,8 @@ void EnumStructUnionParser::mark_extracorporeal_lvalues()
     * TODO: the mark_lvalue() function needs some improvement so that the
     *       following isn't necessary
     */
-   chunk_t *next = m_start;
-   chunk_t *prev = nullptr;
+   Chunk *next = m_start;
+   Chunk *prev = Chunk::NullChunkPtr;
 
    /**
     * if the class is a template, go the extra step and correct the
@@ -1699,9 +1714,9 @@ void EnumStructUnionParser::mark_extracorporeal_lvalues()
    {
       while (true)
       {
-         prev = chunk_get_prev_ncnnlni(next);
+         prev = next->GetPrevNcNnlNi();
 
-         if (  prev == nullptr
+         if (  prev->IsNullChunk()
             || (  !prev->flags.test(PCF_IN_TEMPLATE)
                && chunk_is_not_token(prev, CT_TEMPLATE)))
          {
@@ -1710,8 +1725,8 @@ void EnumStructUnionParser::mark_extracorporeal_lvalues()
          next = prev;
       }
    }
-   auto *body_end   = get_body_end();
-   auto *body_start = get_body_start();
+   Chunk *body_end   = get_body_end();
+   Chunk *body_start = get_body_start();
 
    while (next != m_end)
    {
@@ -1728,12 +1743,12 @@ void EnumStructUnionParser::mark_extracorporeal_lvalues()
          chunk_flags_set(prev, PCF_LVALUE);
       }
       prev = next;
-      next = chunk_get_next_ncnnl(next);
+      next = next->GetNextNcNnl();
    }
 } // EnumStructUnionParser::mark_extracorporeal_lavlues
 
 
-void EnumStructUnionParser::mark_nested_name_specifiers(chunk_t *pc)
+void EnumStructUnionParser::mark_nested_name_specifiers(Chunk *pc)
 {
    LOG_FUNC_ENTRY();
 
@@ -1741,7 +1756,7 @@ void EnumStructUnionParser::mark_nested_name_specifiers(chunk_t *pc)
    auto start          = start_end_pair.first;
    auto end            = start_end_pair.second;
 
-   for (pc = start; chunk_is_between(pc, start, end); pc = chunk_get_next_ncnnl(pc))
+   for (pc = start; chunk_is_between(pc, start, end); pc = pc->GetNextNcNnl())
    {
       if (chunk_is_token(pc, CT_WORD))
       {
@@ -1749,7 +1764,7 @@ void EnumStructUnionParser::mark_nested_name_specifiers(chunk_t *pc)
           * if the next token is an opening angle, then we can safely
           * mark the current identifier as a type
           */
-         auto *next = chunk_get_next_ncnnl(pc);
+         auto *next = pc->GetNextNcNnl();
 
          if (chunk_is_token(next, CT_ANGLE_OPEN))
          {
@@ -1757,7 +1772,7 @@ void EnumStructUnionParser::mark_nested_name_specifiers(chunk_t *pc)
              * the template may have already been previously marked elsewhere...
              */
             auto *angle_open  = next;
-            auto *angle_close = chunk_skip_to_match(angle_open, scope_e::PREPROC);
+            auto *angle_close = chunk_skip_to_match(angle_open, E_Scope::PREPROC);
 
             if (angle_close == nullptr)
             {
@@ -1789,7 +1804,7 @@ void EnumStructUnionParser::mark_nested_name_specifiers(chunk_t *pc)
 } // EnumStructUnionParser::mark_nested_name_specifiers
 
 
-void EnumStructUnionParser::mark_pointer_types(chunk_t *pc)
+void EnumStructUnionParser::mark_pointer_types(Chunk *pc)
 {
    LOG_FUNC_ENTRY();
 
@@ -1798,7 +1813,7 @@ void EnumStructUnionParser::mark_pointer_types(chunk_t *pc)
       do
       {
          // TODO: should there be a CT_BYREF_TYPE?
-         pc = chunk_get_prev_ncnnlni(pc);
+         pc = pc->GetPrevNcNnlNi();
 
          if (chunk_is_ptr_operator(pc))
          {
@@ -1810,7 +1825,7 @@ void EnumStructUnionParser::mark_pointer_types(chunk_t *pc)
 } // EnumStructUnionParser::mark_pointer_types
 
 
-void EnumStructUnionParser::mark_template(chunk_t *start) const
+void EnumStructUnionParser::mark_template(Chunk *start) const
 {
    LOG_FUNC_ENTRY();
 
@@ -1820,13 +1835,13 @@ void EnumStructUnionParser::mark_template(chunk_t *start) const
               "%s(%d): Template detected: '%s' at orig_line %zu, orig_col %zu\n",
               __unqualified_func__,
               __LINE__,
-              start->text(),
+              start->Text(),
               start->orig_line,
               start->orig_col);
    }
    set_chunk_parent(start, CT_TEMPLATE);
 
-   auto *end = chunk_skip_to_match(start, scope_e::PREPROC);
+   auto *end = chunk_skip_to_match(start, E_Scope::PREPROC);
 
    if (end != nullptr)
    {
@@ -1837,7 +1852,7 @@ void EnumStructUnionParser::mark_template(chunk_t *start) const
 } // EnumStructUnionParser::mark_template
 
 
-void EnumStructUnionParser::mark_template_args(chunk_t *start, chunk_t *end) const
+void EnumStructUnionParser::mark_template_args(Chunk *start, Chunk *end) const
 {
    LOG_FUNC_ENTRY();
 
@@ -1848,12 +1863,12 @@ void EnumStructUnionParser::mark_template_args(chunk_t *start, chunk_t *end) con
               "%s(%d): Start of template detected: '%s' at orig_line %zu, orig_col %zu\n",
               __unqualified_func__,
               __LINE__,
-              start->text(),
+              start->Text(),
               start->orig_line,
               start->orig_col);
 
       pcf_flags_t flags = PCF_IN_TEMPLATE;
-      chunk_t     *next = start;
+      Chunk       *next = start;
 
       /**
        * TODO: for now, just mark the chunks within the template as PCF_IN_TEMPLATE;
@@ -1863,7 +1878,7 @@ void EnumStructUnionParser::mark_template_args(chunk_t *start, chunk_t *end) con
 
       while (true)
       {
-         next = chunk_get_next_ncnnl(next);
+         next = next->GetNextNcNnl();
 
          if (next == end)
          {
@@ -1875,14 +1890,14 @@ void EnumStructUnionParser::mark_template_args(chunk_t *start, chunk_t *end) con
               "%s(%d): End of template detected: '%s' at orig_line %zu, orig_col %zu\n",
               __unqualified_func__,
               __LINE__,
-              end->text(),
+              end->Text(),
               end->orig_line,
               end->orig_col);
    }
 } // EnumStructUnionParser::mark_template_args
 
 
-void EnumStructUnionParser::mark_type(chunk_t *pc)
+void EnumStructUnionParser::mark_type(Chunk *pc)
 {
    LOG_FUNC_ENTRY();
 
@@ -1894,13 +1909,13 @@ void EnumStructUnionParser::mark_type(chunk_t *pc)
       {
          make_type(pc);
          set_chunk_parent(pc, m_start->type);
-         pc = chunk_get_next_ncnnl(pc, scope_e::PREPROC);
+         pc = pc->GetNextNcNnl(E_Scope::PREPROC);
       } while (chunk_is_pointer_or_reference(pc));
    }
 } // EnumStructUnionParser::mark_type
 
 
-void EnumStructUnionParser::mark_variable(chunk_t *variable, pcf_flags_t flags)
+void EnumStructUnionParser::mark_variable(Chunk *variable, pcf_flags_t flags)
 {
    LOG_FUNC_ENTRY();
 
@@ -1910,7 +1925,7 @@ void EnumStructUnionParser::mark_variable(chunk_t *variable, pcf_flags_t flags)
               "%s(%d): Variable definition detected: '%s' at orig_line is %zu, orig_col is %zu, set %s\n",
               __unqualified_func__,
               __LINE__,
-              variable->text(),
+              variable->Text(),
               variable->orig_line,
               variable->orig_col,
               flags & PCF_VAR_1ST_DEF ? "PCF_VAR_1ST_DEF" : "PCF_VAR_1ST");
@@ -1922,7 +1937,7 @@ void EnumStructUnionParser::mark_variable(chunk_t *variable, pcf_flags_t flags)
 } // EnumStructUnionParser::mark_variable
 
 
-void EnumStructUnionParser::mark_where_clause(chunk_t *where)
+void EnumStructUnionParser::mark_where_clause(Chunk *where)
 {
    LOG_FUNC_ENTRY();
 
@@ -1944,14 +1959,14 @@ void EnumStructUnionParser::mark_where_clause(chunk_t *where)
 
    pcf_flags_t flags;
 
-   for (auto *pc = where_start; pc != where_end; pc = chunk_get_next_ncnnl(pc))
+   for (auto *pc = where_start; pc != where_end; pc = pc->GetNextNcNnl())
    {
       flags = mark_where_chunk(pc, m_start->type, flags);
    }
 } // EnumStructUnionParser::mark_where_clause
 
 
-void EnumStructUnionParser::mark_where_colon(chunk_t *colon)
+void EnumStructUnionParser::mark_where_colon(Chunk *colon)
 {
    LOG_FUNC_ENTRY();
 
@@ -1969,7 +1984,7 @@ void EnumStructUnionParser::mark_where_colon(chunk_t *colon)
 } // EnumStructUnionParser::mark_where_colon
 
 
-void EnumStructUnionParser::parse(chunk_t *pc)
+void EnumStructUnionParser::parse(Chunk *pc)
 {
    LOG_FUNC_ENTRY();
 
@@ -1984,8 +1999,8 @@ void EnumStructUnionParser::parse(chunk_t *pc)
    {
       return;
    }
-   chunk_t *prev = m_start;
-   chunk_t *next = chunk_get_next_ncnnl(prev);
+   Chunk *prev = m_start;
+   Chunk *next = prev->GetNextNcNnl();
 
    /**
     * the enum-key might be enum, enum class or enum struct
@@ -1993,11 +2008,11 @@ void EnumStructUnionParser::parse(chunk_t *pc)
    if (chunk_is_enum(next))
    {
       prev = next;
-      next = chunk_get_next_ncnnl(prev);
+      next = prev->GetNextNcNnl();
    }
    else if (chunk_is_enum(prev))
    {
-      auto *prev_prev = chunk_get_prev_ncnnlni(prev);
+      auto *prev_prev = prev->GetPrevNcNnlNi();
 
       if (  chunk_is_enum(prev_prev)
          && chunk_is_enum(prev))
@@ -2064,7 +2079,7 @@ void EnumStructUnionParser::parse(chunk_t *pc)
          {
             mark_template(next);
          }
-         next = chunk_skip_to_match(next, scope_e::PREPROC);
+         next = chunk_skip_to_match(next, E_Scope::PREPROC);
       }
       else if (  chunk_is_token(next, CT_QUALIFIER)
               && language_is_set(LANG_JAVA)
@@ -2085,8 +2100,8 @@ void EnumStructUnionParser::parse(chunk_t *pc)
 
       do
       {
-         next = chunk_get_next_ncnnl(next);
-      } while (  next != nullptr
+         next = next->GetNextNcNnl();
+      } while (  next->IsNotNullChunk()
               && next->level > m_start->level);
    }
    /**
@@ -2109,7 +2124,7 @@ void EnumStructUnionParser::parse(chunk_t *pc)
 } // EnumStructUnionParser::parse
 
 
-chunk_t *EnumStructUnionParser::parse_angles(chunk_t *angle_open)
+Chunk *EnumStructUnionParser::parse_angles(Chunk *angle_open)
 {
    LOG_FUNC_ENTRY();
 
@@ -2123,7 +2138,7 @@ chunk_t *EnumStructUnionParser::parse_angles(chunk_t *angle_open)
       /**
        * check to see if there's a matching closing angle bracket
        */
-      auto *angle_close = chunk_skip_to_match(angle_open, scope_e::PREPROC);
+      auto *angle_close = chunk_skip_to_match(angle_open, E_Scope::PREPROC);
 
       if (angle_close == nullptr)
       {
@@ -2144,7 +2159,7 @@ chunk_t *EnumStructUnionParser::parse_angles(chunk_t *angle_open)
           * check to make sure that the template is the final chunk in a list
           * of scope-resolution qualifications
           */
-         auto *next = chunk_get_next_ncnnl(angle_close);
+         auto *next = angle_close->GetNextNcNnl();
 
          if (chunk_is_not_token(next, CT_DC_MEMBER))
          {
@@ -2155,7 +2170,7 @@ chunk_t *EnumStructUnionParser::parse_angles(chunk_t *angle_open)
              * bracket should be preceded by a CT_WORD token and we should have
              * found a closing angle bracket
              */
-            auto *prev = chunk_get_prev_ncnnlni(angle_open);
+            auto *prev = angle_open->GetPrevNcNnlNi();
 
             if (chunk_is_not_token(prev, CT_WORD))
             {
@@ -2186,7 +2201,7 @@ chunk_t *EnumStructUnionParser::parse_angles(chunk_t *angle_open)
 } // EnumStructUnionParser::parse_angles
 
 
-chunk_t *EnumStructUnionParser::parse_braces(chunk_t *brace_open)
+Chunk *EnumStructUnionParser::parse_braces(Chunk *brace_open)
 {
    LOG_FUNC_ENTRY();
 
@@ -2195,7 +2210,7 @@ chunk_t *EnumStructUnionParser::parse_braces(chunk_t *brace_open)
     */
 
    auto *pc          = brace_open;
-   auto *brace_close = chunk_skip_to_match(pc, scope_e::PREPROC);
+   auto *brace_close = chunk_skip_to_match(pc, E_Scope::PREPROC);
 
    if (brace_close != nullptr)
    {
@@ -2222,7 +2237,7 @@ chunk_t *EnumStructUnionParser::parse_braces(chunk_t *brace_open)
 
       auto *enum_base_start   = get_enum_base_start();
       auto *inheritance_start = get_inheritance_start();
-      auto *prev              = chunk_get_prev_ncnnlni(pc);
+      auto *prev              = pc->GetPrevNcNnlNi();
 
       /**
        * check to see if the open brace was preceded by a closing paren;
@@ -2230,10 +2245,42 @@ chunk_t *EnumStructUnionParser::parse_braces(chunk_t *brace_open)
        * open brace, but it's more likely that we're dealing with a
        * signature associated with a function definition
        */
+      bool is_potential_function_definition = false;
+
+      if (  (  language_is_set(LANG_C)
+            || language_is_set(LANG_CPP))
+         && chunk_is_paren_close(prev))
+      {
+         /**
+          * we may be dealing with a c/cpp function definition, where the 'struct'
+          * or 'class' keywords appear as the return type preceding a pair of braces
+          * and therefore may be associated with a function definition body
+          */
+         auto *paren_close = prev;
+
+         // skip in reverse to the matching open paren
+         auto *paren_open = chunk_skip_to_match_rev(paren_close);
+
+         if (paren_open != nullptr)
+         {
+            /**
+             * determine if there's an identifier preceding the open paren;
+             * if so, the identifier is very likely to be associated with
+             * a function definition
+             */
+            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))
+                                               && type != identifier);
+         }
+      }
 
       if (  language_is_set(LANG_D)
          || language_is_set(LANG_PAWN)
          || !chunk_is_paren_close(prev)
+         || is_potential_function_definition
          || chunk_is_between(prev, enum_base_start, brace_open)
          || chunk_is_between(prev, inheritance_start, brace_open))
       {
@@ -2268,7 +2315,7 @@ chunk_t *EnumStructUnionParser::parse_braces(chunk_t *brace_open)
 } // EnumStructUnionParser::parse_braces
 
 
-void EnumStructUnionParser::parse_colon(chunk_t *colon)
+void EnumStructUnionParser::parse_colon(Chunk *colon)
 {
    LOG_FUNC_ENTRY();
 
@@ -2318,7 +2365,7 @@ void EnumStructUnionParser::parse_colon(chunk_t *colon)
 } // EnumStructUnionParser::parse_colon
 
 
-chunk_t *EnumStructUnionParser::parse_double_colon(chunk_t *double_colon)
+Chunk *EnumStructUnionParser::parse_double_colon(Chunk *double_colon)
 {
    LOG_FUNC_ENTRY();
 
@@ -2350,7 +2397,7 @@ void EnumStructUnionParser::parse_error_detected(bool status)
 } // EnumStructUnionParser::parse_error_detected
 
 
-void EnumStructUnionParser::record_question_operator(chunk_t *question)
+void EnumStructUnionParser::record_question_operator(Chunk *question)
 {
    LOG_FUNC_ENTRY();
 
@@ -2363,7 +2410,7 @@ void EnumStructUnionParser::record_question_operator(chunk_t *question)
 } // EnumStructUnionParser::record_question_operator
 
 
-void EnumStructUnionParser::record_top_level_comma(chunk_t *comma)
+void EnumStructUnionParser::record_top_level_comma(Chunk *comma)
 {
    if (  comma != nullptr
       && comma->level == m_start->level
@@ -2377,7 +2424,7 @@ void EnumStructUnionParser::record_top_level_comma(chunk_t *comma)
 } // EnumStructUnionParser::record_top_level_comma
 
 
-chunk_t *EnumStructUnionParser::refine_end_chunk(chunk_t *pc)
+Chunk *EnumStructUnionParser::refine_end_chunk(Chunk *pc)
 {
    LOG_FUNC_ENTRY();
 
@@ -2395,7 +2442,7 @@ chunk_t *EnumStructUnionParser::refine_end_chunk(chunk_t *pc)
        * the terminating chunk is located. For instance, see operator.cpp and
        * enum_comma.h for examples of offenders
        */
-      auto *next = chunk_get_next_ncnnl(pc);
+      auto *next = pc->GetNextNcNnl();
 
       while (true)
       {
@@ -2412,7 +2459,7 @@ chunk_t *EnumStructUnionParser::refine_end_chunk(chunk_t *pc)
              */
             if (chunk_is_token(next, CT_COMMA))
             {
-               next = chunk_get_next_ncnnl(next);
+               next = next->GetNextNcNnl();
             }
             auto match       = match_variable(next, m_start->level);
             auto *start      = std::get<0>(match);
@@ -2427,7 +2474,7 @@ chunk_t *EnumStructUnionParser::refine_end_chunk(chunk_t *pc)
             }
             else
             {
-               pc = chunk_get_next_ncnnl(end);
+               pc = end->GetNextNcNnl();
 
                /**
                 * skip any right-hand side assignments
@@ -2445,7 +2492,7 @@ chunk_t *EnumStructUnionParser::refine_end_chunk(chunk_t *pc)
 } // EnumStructUnionParser::refine_end_chunk
 
 
-void EnumStructUnionParser::set_body_end(chunk_t *body_end)
+void EnumStructUnionParser::set_body_end(Chunk *body_end)
 {
    LOG_FUNC_ENTRY();
 
@@ -2456,7 +2503,7 @@ void EnumStructUnionParser::set_body_end(chunk_t *body_end)
 } // EnumStructUnionParser::set_body_end
 
 
-void EnumStructUnionParser::set_body_start(chunk_t *body_start)
+void EnumStructUnionParser::set_body_start(Chunk *body_start)
 {
    LOG_FUNC_ENTRY();
 
@@ -2467,7 +2514,7 @@ void EnumStructUnionParser::set_body_start(chunk_t *body_start)
 } // EnumStructUnionParser::set_body_start
 
 
-void EnumStructUnionParser::set_enum_base_start(chunk_t *enum_base_start)
+void EnumStructUnionParser::set_enum_base_start(Chunk *enum_base_start)
 {
    LOG_FUNC_ENTRY();
 
@@ -2478,7 +2525,7 @@ void EnumStructUnionParser::set_enum_base_start(chunk_t *enum_base_start)
 } // EnumStructUnionParser::set_enum_base_start
 
 
-void EnumStructUnionParser::set_inheritance_start(chunk_t *inheritance_start)
+void EnumStructUnionParser::set_inheritance_start(Chunk *inheritance_start)
 {
    LOG_FUNC_ENTRY();
 
@@ -2489,7 +2536,7 @@ void EnumStructUnionParser::set_inheritance_start(chunk_t *inheritance_start)
 } // EnumStructUnionParser::set_inheritance_start
 
 
-void EnumStructUnionParser::set_template_end(chunk_t *template_end)
+void EnumStructUnionParser::set_template_end(Chunk *template_end)
 {
    LOG_FUNC_ENTRY();
 
@@ -2500,7 +2547,7 @@ void EnumStructUnionParser::set_template_end(chunk_t *template_end)
 } // EnumStructUnionParser::set_template_end
 
 
-void EnumStructUnionParser::set_template_start(chunk_t *template_start)
+void EnumStructUnionParser::set_template_start(Chunk *template_start)
 {
    LOG_FUNC_ENTRY();
 
@@ -2511,7 +2558,7 @@ void EnumStructUnionParser::set_template_start(chunk_t *template_start)
 } // EnumStructUnionParser::set_template_start
 
 
-void EnumStructUnionParser::set_where_end(chunk_t *where_end)
+void EnumStructUnionParser::set_where_end(Chunk *where_end)
 {
    LOG_FUNC_ENTRY();
 
@@ -2522,7 +2569,7 @@ void EnumStructUnionParser::set_where_end(chunk_t *where_end)
 } // EnumStructUnionParser::set_where_end
 
 
-void EnumStructUnionParser::set_where_start(chunk_t *where_start)
+void EnumStructUnionParser::set_where_start(Chunk *where_start)
 {
    LOG_FUNC_ENTRY();
 
@@ -2545,7 +2592,7 @@ bool EnumStructUnionParser::template_detected() const
 } // EnumStructUnionParser::template_detected
 
 
-chunk_t *EnumStructUnionParser::try_find_end_chunk(chunk_t *pc)
+Chunk *EnumStructUnionParser::try_find_end_chunk(Chunk *pc)
 {
    LOG_FUNC_ENTRY();
 
@@ -2566,8 +2613,8 @@ chunk_t *EnumStructUnionParser::try_find_end_chunk(chunk_t *pc)
 
       do
       {
-         pc = chunk_get_next_ncnnl(pc, scope_e::PREPROC);
-      } while (  pc != nullptr
+         pc = pc->GetNextNcNnl(E_Scope::PREPROC);
+      } while (  pc->IsNotNullChunk()
               && pc->level > m_start->level);
    } while (!is_potential_end_chunk(pc));
 
@@ -2593,10 +2640,10 @@ void EnumStructUnionParser::try_post_identify_macro_calls()
        * so is to avoid mis-interpretation by code executed at a later time
        */
 
-      auto    *body_start        = get_body_start();
-      auto    *inheritance_start = get_inheritance_start();
-      chunk_t *pc                = m_start;
-      chunk_t *prev              = nullptr;
+      auto  *body_start        = get_body_start();
+      auto  *inheritance_start = get_inheritance_start();
+      Chunk *pc                = m_start;
+      Chunk *prev              = nullptr;
 
       do
       {
@@ -2610,7 +2657,7 @@ void EnumStructUnionParser::try_post_identify_macro_calls()
             if (chunk_is_paren_open(pc))
             {
                auto *paren_open  = pc;
-               auto *paren_close = chunk_skip_to_match(paren_open, scope_e::PREPROC);
+               auto *paren_close = chunk_skip_to_match(paren_open, E_Scope::PREPROC);
 
                if (paren_close != nullptr)
                {
@@ -2623,7 +2670,7 @@ void EnumStructUnionParser::try_post_identify_macro_calls()
             }
          }
          prev = pc;
-         pc   = chunk_get_next_ncnnl(prev);
+         pc   = prev->GetNextNcNnl();
       } while (chunk_is_between(pc, m_start, m_end));
    }
 } // EnumStructUnionParser::try_post_identify_macro_calls
@@ -2633,7 +2680,7 @@ void EnumStructUnionParser::try_post_identify_type()
 {
    LOG_FUNC_ENTRY();
 
-   chunk_t *body_end = get_body_end();
+   Chunk *body_end = get_body_end();
 
    if (  !type_identified()
       && body_end == nullptr)
@@ -2647,8 +2694,8 @@ void EnumStructUnionParser::try_post_identify_type()
        * a type has yet to be identified, so search for the last word
        * that hasn't been marked as a variable
        */
-      chunk_t *type = nullptr;
-      chunk_t *pc   = m_start;
+      Chunk *type = nullptr;
+      Chunk *pc   = m_start;
 
       do
       {
@@ -2667,7 +2714,7 @@ void EnumStructUnionParser::try_post_identify_type()
          {
             type = skip_template_prev(pc);
          }
-         pc = chunk_get_next_ncnnl(pc);
+         pc = pc->GetNextNcNnl();
       } while (chunk_is_between(pc, m_start, m_end));
 
       if (type != nullptr)
@@ -2682,7 +2729,7 @@ bool EnumStructUnionParser::try_pre_identify_type()
 {
    LOG_FUNC_ENTRY();
 
-   chunk_t *pc = get_body_start();
+   Chunk *pc = get_body_start();
 
    if (  language_is_set(LANG_PAWN)
       && chunk_is_enum(m_start))
@@ -2723,7 +2770,7 @@ bool EnumStructUnionParser::try_pre_identify_type()
 
    if (pc == nullptr)
    {
-      chunk_t *next = chunk_get_next_ncnnl(m_start);
+      Chunk *next = m_start->GetNextNcNnl();
 
       /**
        * in case it's a qualified identifier, skip scope-resolution and
@@ -2731,7 +2778,7 @@ bool EnumStructUnionParser::try_pre_identify_type()
        */
       next = skip_scope_resolution_and_nested_name_specifiers(next);
 
-      chunk_t *next_next = chunk_get_next_ncnnl(next);
+      Chunk *next_next = next->GetNextNcNnl();
 
       /**
        * in case it's a qualified identifier, skip scope-resolution and
@@ -2750,10 +2797,10 @@ bool EnumStructUnionParser::try_pre_identify_type()
       {
          pc = next_next;
       }
-      else if (  next != nullptr
+      else if (  next->IsNotNullChunk()
               && chunk_is_token(next, CT_WORD)
               && chunk_is_token(next_next, CT_WORD)
-              && chunk_get_prev_ncnnlni(m_end) == next_next)
+              && m_end->GetPrevNcNnlNi() == next_next)
       {
          /**
           * check to see if we've got a macro reference preceding the last word chunk;
@@ -2776,7 +2823,7 @@ bool EnumStructUnionParser::try_pre_identify_type()
          /**
           * search for some common patterns that may indicate a type
           */
-         chunk_t *prev = m_start;
+         Chunk *prev = m_start;
 
          while (  chunk_is_between(next, m_start, m_end)
                && (  (  chunk_is_not_token(next, CT_ASSIGN)
@@ -2785,7 +2832,7 @@ bool EnumStructUnionParser::try_pre_identify_type()
                && !chunk_is_semicolon(next))
          {
             prev = next;
-            next = chunk_get_next_ncnnl(next);
+            next = next->GetNextNcNnl();
 
             /**
              * in case it's a qualified identifier, skip scope-resolution and
@@ -2793,6 +2840,18 @@ bool EnumStructUnionParser::try_pre_identify_type()
              */
             next = skip_scope_resolution_and_nested_name_specifiers(next);
 
+            /**
+             * skip array brackets, as the type cannot be located within;
+             * also skip a set of parens - there may be a type embedded within,
+             * but it's not the type with which we're concerned
+             */
+            if (  next->IsSquareBracket()                       // Issue #3601
+               || chunk_is_paren_open(next))
+            {
+               prev = chunk_skip_to_match(next, E_Scope::PREPROC);
+               next = prev->GetNextNcNnl(E_Scope::PREPROC);
+            }
+
             if (  chunk_is_token(prev, CT_WORD)
                && chunk_is_pointer_or_reference(next))
             {
@@ -2804,25 +2863,26 @@ bool EnumStructUnionParser::try_pre_identify_type()
       }
    }
 
-   if (pc != nullptr)
+   if (  pc != nullptr
+      && pc->IsNotNullChunk())
    {
       /**
        * the chunk preceding the previously selected chunk should indicate the type
        */
 
-      pc = chunk_get_prev_ncnnlni(pc, scope_e::PREPROC);
+      pc = pc->GetPrevNcNnlNi(E_Scope::PREPROC);
 
       if (  chunk_is_token(pc, CT_QUALIFIER)
          && std::strncmp(pc->str.c_str(), "final", 5) == 0)
       {
-         pc = chunk_get_prev_ncnnlni(pc, scope_e::PREPROC);
+         pc = pc->GetPrevNcNnlNi(E_Scope::PREPROC);
       }
 
       if (  language_is_set(LANG_D)
          && chunk_is_paren_close(pc))
       {
          pc = chunk_skip_to_match_rev(pc);
-         pc = chunk_get_prev_ncnnlni(pc);
+         pc = pc->GetPrevNcNnlNi();
       }
 
       if (chunk_is_token(pc, CT_WORD))
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/EnumStructUnionParser.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/EnumStructUnionParser.h
index b3062d48..422662da 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/EnumStructUnionParser.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/EnumStructUnionParser.h
@@ -11,6 +11,7 @@
 
 #include "pcf_flags.h"
 #include "token_enum.h"
+#include "uncrustify_types.h"
 #include <map>
 
 
@@ -74,84 +75,84 @@ private:
     * Returns the end chunk of a class/enum/struct/union body, if detected
     * during parsing
     */
-   struct chunk_t *get_body_end() const;
+   Chunk *get_body_end() const;
 
 
    /**
     * Returns the starting chunk of a class/enum/struct/union body, if detected
     * during parsing
     */
-   struct chunk_t *get_body_start() const;
+   Chunk *get_body_start() const;
 
 
    /**
     * Returns the starting chunk associated with an enumerated type's base
     * specifier statement, if detected during parsing
     */
-   struct chunk_t *get_enum_base_start() const;
+   Chunk *get_enum_base_start() const;
 
 
    /**
     * Returns the first comma encountered at the level of the starting chunk,
     * if detected during parsing
     */
-   struct chunk_t *get_first_top_level_comma() const;
+   Chunk *get_first_top_level_comma() const;
 
 
    /**
     * Returns the ending chunk associated with an class/struct inheritance
     * list, if detected during parsing
     */
-   struct chunk_t *get_inheritance_end() const;
+   Chunk *get_inheritance_end() const;
 
 
    /**
     * Returns the starting chunk associated with an class/struct inheritance
     * list, if detected during parsing
     */
-   struct chunk_t *get_inheritance_start() const;
+   Chunk *get_inheritance_start() const;
 
 
    /**
     * Returns a numerically-indexed map of all question operators encountered
     * during parsing
     */
-   std::map<std::size_t, struct chunk_t *> get_question_operators() const;
+   std::map<std::size_t, Chunk *> get_question_operators() const;
 
 
    /**
     * Returns the end chunk associated with a template parameter list, if
     * detected during parsing
     */
-   struct chunk_t *get_template_end() const;
+   Chunk *get_template_end() const;
 
 
    /**
     * Return the starting chunk associated with a template parameter list, if
     * detected during parsing
     */
-   struct chunk_t *get_template_start() const;
+   Chunk *get_template_start() const;
 
 
    /**
     * Returns a numerically-indexed map of all top-level commas encountered
     * during parsing
     */
-   std::map<std::size_t, struct chunk_t *> get_top_level_commas() const;
+   std::map<std::size_t, Chunk *> get_top_level_commas() const;
 
 
    /**
     * Return the starting chunk associated with a where clause, if
     * detected during parsing
     */
-   struct chunk_t *get_where_end() const;
+   Chunk *get_where_end() const;
 
 
    /**
     * Return the starting chunk associated with a where clause, if
     * detected during parsing
     */
-   struct chunk_t *get_where_start() const;
+   Chunk *get_where_start() const;
 
 
    /**
@@ -165,7 +166,7 @@ public:
    /**
     * Performs object initialization prior to parsing
     */
-   void initialize(struct chunk_t *pc);
+   void initialize(Chunk *pc);
 
 
 private:
@@ -173,34 +174,34 @@ private:
     * Returns true if the chunk under test represents a potential end chunk past
     * which further parsing is not likely warranted
     */
-   bool is_potential_end_chunk(struct chunk_t *pc) const;
+   bool is_potential_end_chunk(Chunk *pc) const;
 
 
    /**
     * Returns true if the chunk under test is deemed to be located within a
     * conditional/ternary statement
     */
-   bool is_within_conditional(struct chunk_t *pc) const;
+   bool is_within_conditional(Chunk *pc) const;
 
 
    /**
     * Returns true if the chunk under test is deemed to be located within an
     * inheritance list
     */
-   bool is_within_inheritance_list(struct chunk_t *pc) const;
+   bool is_within_inheritance_list(Chunk *pc) const;
 
 
    /**
     * Returns true if the chunk under test is deemed to be located within a
     * where clause
     */
-   bool is_within_where_clause(struct chunk_t *pc) const;
+   bool is_within_where_clause(Chunk *pc) const;
 
 
    /**
     * Marks all base classes that appear as part of an inheritance list
     */
-   void mark_base_classes(struct chunk_t *pc);
+   void mark_base_classes(Chunk *pc);
 
 
    /**
@@ -208,19 +209,19 @@ private:
     * and additionally calls a separate routine to mark any base classes for that
     * may precede the opening brace
     */
-   void mark_braces(struct chunk_t *start);
+   void mark_braces(Chunk *start);
 
 
    /**
     * Marks the beginning chunk of an inheritance list
     */
-   void mark_class_colon(struct chunk_t *colon);
+   void mark_class_colon(Chunk *colon);
 
 
    /**
     * Mark a colon as a conditional
     */
-   void mark_conditional_colon(struct chunk_t *colon);
+   void mark_conditional_colon(Chunk *colon);
 
 
    /**
@@ -232,7 +233,7 @@ private:
    /**
     * Marks the beginning chunk of an enumerated integral type specification
     */
-   void mark_enum_integral_type(struct chunk_t *colon);
+   void mark_enum_integral_type(Chunk *colon);
 
 
    /**
@@ -244,13 +245,13 @@ private:
    /**
     * Mark nested name specifiers preceding qualified identifiers
     */
-   void mark_nested_name_specifiers(struct chunk_t *pc);
+   void mark_nested_name_specifiers(Chunk *pc);
 
 
    /**
     * Marks pointer operators preceding a variable identifier
     */
-   void mark_pointer_types(struct chunk_t *pc);
+   void mark_pointer_types(Chunk *pc);
 
 
    /**
@@ -258,72 +259,72 @@ private:
     * (templates may appear after the identifier type name as part of a class
     * specialization)
     */
-   void mark_template(struct chunk_t *start) const;
+   void mark_template(Chunk *start) const;
 
 
    /**
     * Marks the arguments within a template argument list bounded by the
     * starting and ending chunks
     */
-   void mark_template_args(struct chunk_t *start, struct chunk_t *end) const;
+   void mark_template_args(Chunk *start, Chunk *end) const;
 
 
    /**
     * Marks the type identifier associated with the class/enum/struct/union,
     * if not anonymously defined
     */
-   void mark_type(struct chunk_t *pc);
+   void mark_type(Chunk *pc);
 
 
    /**
     * Marks all variable identifiers associated with the class/enum/struct/union
     */
-   void mark_variable(struct chunk_t *variable, pcf_flags_t flags);
+   void mark_variable(Chunk *variable, pcf_flags_t flags);
 
 
    /**
     * Marks all chunks belonging to a c# where clause
     */
-   void mark_where_clause(struct chunk_t *where);
+   void mark_where_clause(Chunk *where);
 
 
    /**
     * Marks the beginning of a where clause
     */
-   void mark_where_colon(struct chunk_t *colon);
+   void mark_where_colon(Chunk *colon);
 
 
 public:
    /**
     * Parses the class/enum/struct/union and all associated chunks
     */
-   void parse(struct chunk_t *pc);
+   void parse(Chunk *pc);
 
 
 private:
    /**
     * Parses closing and opening angle brackets
     */
-   struct chunk_t *parse_angles(struct chunk_t *angle_open);
+   Chunk *parse_angles(Chunk *angle_open);
 
 
    /**
     * Parses closing and opening braces
     */
-   struct chunk_t *parse_braces(struct chunk_t *brace_open);
+   Chunk *parse_braces(Chunk *brace_open);
 
 
    /**
     * Parses a single colon, which may precede an inheritance list or
     * enumerated integral type specification
     */
-   void parse_colon(struct chunk_t *colon);
+   void parse_colon(Chunk *colon);
 
 
    /**
     * Parses a double colon, which may indicate a scope resolution chain
     */
-   struct chunk_t *parse_double_colon(struct chunk_t *double_colon);
+   Chunk *parse_double_colon(Chunk *double_colon);
 
 
    /**
@@ -341,7 +342,7 @@ private:
    /**
     * Records all question operators encountered during parsing
     */
-   void record_question_operator(struct chunk_t *question);
+   void record_question_operator(Chunk *question);
 
 
    /**
@@ -351,7 +352,7 @@ private:
     * 3) it is not part of an inheritance list
     * 4) it is not part of a conditional/ternary expression
     */
-   void record_top_level_comma(struct chunk_t *comma);
+   void record_top_level_comma(Chunk *comma);
 
 
    /**
@@ -359,60 +360,60 @@ private:
     * for any potential trailing inline variable declarations that may follow
     * the body of a class/enum/struct/union definition
     */
-   struct chunk_t *refine_end_chunk(struct chunk_t *pc);
+   Chunk *refine_end_chunk(Chunk *pc);
 
 
    /**
     * Sets the chunk associated with the end of a class/enum/struct/union
     * body
     */
-   void set_body_end(struct chunk_t *body_end);
+   void set_body_end(Chunk *body_end);
 
 
    /**
     * Sets the chunk associated with the start of a class/enum/struct/union
     * body
     */
-   void set_body_start(struct chunk_t *body_start);
+   void set_body_start(Chunk *body_start);
 
 
    /**
     * Sets the chunk associated with the start of an enumerated integral
     * base type specification
     */
-   void set_enum_base_start(struct chunk_t *enum_base_start);
+   void set_enum_base_start(Chunk *enum_base_start);
 
 
    /**
     * Sets the chunk associated with the start of an inheritance list
     */
-   void set_inheritance_start(struct chunk_t *inheritance_start);
+   void set_inheritance_start(Chunk *inheritance_start);
 
 
    /**
     * Sets the chunk associated with the end of a template
     */
-   void set_template_end(struct chunk_t *template_end);
+   void set_template_end(Chunk *template_end);
 
 
    /**
     * Sets the chunk associated with the start of a template
     */
-   void set_template_start(struct chunk_t *template_start);
+   void set_template_start(Chunk *template_start);
 
 
    /**
     * Return the ending chunk associated with a where clause, if
     * detected during parsing
     */
-   void set_where_end(struct chunk_t *where_end);
+   void set_where_end(Chunk *where_end);
 
 
    /**
     * Return the starting chunk associated with a where clause, if
     * detected during parsing
     */
-   void set_where_start(struct chunk_t *where_start);
+   void set_where_start(Chunk *where_start);
 
 
    /**
@@ -424,7 +425,7 @@ private:
    /**
     * Attempts to find the last chunk associated with the class/enum/struct/union
     */
-   struct chunk_t *try_find_end_chunk(struct chunk_t *pc);
+   Chunk *try_find_end_chunk(Chunk *pc);
 
 
    /**
@@ -463,13 +464,13 @@ private:
    /**
     * Map of token-type, chunk pairs
     */
-   std::map<c_token_t, std::map<std::size_t, struct chunk_t *> > m_chunk_map;
+   std::map<E_Token, std::map<std::size_t, Chunk *> > m_chunk_map;
 
 
    /**
     * Indicates the last chunk associated with the class/enum/struct/union keyword
     */
-   struct chunk_t *m_end;
+   Chunk *m_end;
 
 
    /**
@@ -482,14 +483,14 @@ private:
     * Stores a pointer to the class/enum/struct/union keyword chunk with which the
     * parse() routine was invoked
     */
-   struct chunk_t *m_start;
+   Chunk *m_start;
 
 
    /**
     * Stores a pointer to the type identifier associated with the class/enum/struct/union,
     * if not anonymously defined
     */
-   struct chunk_t *m_type;
+   Chunk *m_type;
 };
 
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/ListManager.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/ListManager.h
index 1b45c2a4..f9e928c8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/ListManager.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/ListManager.h
@@ -29,15 +29,15 @@ private:
    // Hide copy constructor
    ListManager(const ListManager &ref)
    {
-      first = NULL;
-      last  = NULL;
+      first = nullptr;
+      last  = nullptr;
    }
 
 public:
    ListManager()
    {
-      first = NULL;
-      last  = NULL;
+      first = nullptr;
+      last  = nullptr;
    }
 
 
@@ -46,7 +46,7 @@ public:
     *
     * @return pointer to first element or nullptr if list is empty
     */
-   T *GetHead()
+   T *GetHead() const
    {
       return(first);
    }
@@ -57,7 +57,7 @@ public:
     *
     * @return pointer to last element or nullptr if list is empty
     */
-   T *GetTail()
+   T *GetTail() const
    {
       return(last);
    }
@@ -70,9 +70,9 @@ public:
     *
     * @return pointer to next element or nullptr if no next element exists
     */
-   T *GetNext(T *ref)
+   T *GetNext(const T *ref) const
    {
-      return((ref != NULL) ? ref->next : NULL);
+      return((ref != nullptr) ? ref->next : nullptr);
    }
 
 
@@ -83,19 +83,9 @@ public:
     *
     * @return pointer to previous element or nullptr if no previous element exists
     */
-   T *GetPrev(T *ref)
+   T *GetPrev(const T *ref) const
    {
-      return((ref != NULL) ? ref->prev : NULL);
-   }
-
-
-   void InitEntry(T *obj) const
-   {
-      if (obj != NULL)
-      {
-         obj->next = NULL;
-         obj->prev = NULL;
-      }
+      return((ref != nullptr) ? ref->prev : nullptr);
    }
 
 
@@ -106,7 +96,7 @@ public:
     */
    void Pop(T *obj)
    {
-      if (obj != NULL)
+      if (obj != nullptr)
       {
          if (first == obj)
          {
@@ -118,17 +108,17 @@ public:
             last = obj->prev;
          }
 
-         if (obj->next != NULL)
+         if (obj->next != nullptr)
          {
             obj->next->prev = obj->prev;
          }
 
-         if (obj->prev != NULL)
+         if (obj->prev != nullptr)
          {
             obj->prev->next = obj->next;
          }
-         obj->next = NULL;
-         obj->prev = NULL;
+         obj->next = nullptr;
+         obj->prev = nullptr;
       }
    }
 
@@ -136,8 +126,8 @@ public:
    //! swap two elements of a list
    void Swap(T *obj1, T *obj2)
    {
-      if (  obj1 != NULL
-         && obj2 != NULL)
+      if (  obj1 != nullptr
+         && obj2 != nullptr)
       {
          if (obj1->prev == obj2)
          {
@@ -172,14 +162,14 @@ public:
     */
    void AddAfter(T *obj, T *ref)
    {
-      if (  obj != NULL
-         && ref != NULL)
+      if (  obj != nullptr
+         && ref != nullptr)
       {
          Pop(obj); // TODO: is this necessary?
          obj->next = ref->next;
          obj->prev = ref;
 
-         if (ref->next != NULL)
+         if (ref->next != nullptr)
          {
             ref->next->prev = obj;
          }
@@ -200,14 +190,14 @@ public:
     */
    void AddBefore(T *obj, T *ref)
    {
-      if (  obj != NULL
-         && ref != NULL)
+      if (  obj != nullptr
+         && ref != nullptr)
       {
          Pop(obj);
          obj->next = ref;
          obj->prev = ref->prev;
 
-         if (ref->prev != NULL)
+         if (ref->prev != nullptr)
          {
             ref->prev->next = obj;
          }
@@ -227,10 +217,10 @@ public:
     */
    void AddTail(T *obj)
    {
-      obj->next = NULL;
+      obj->next = nullptr;
       obj->prev = last;
 
-      if (last == NULL)
+      if (last == nullptr)
       {
          last  = obj;
          first = obj;
@@ -251,9 +241,9 @@ public:
    void AddHead(T *obj)
    {
       obj->next = first;
-      obj->prev = NULL;
+      obj->prev = nullptr;
 
-      if (first == NULL)
+      if (first == nullptr)
       {
          last  = obj;
          first = obj;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/ParseFrame.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/ParseFrame.cpp
index b309ff79..dc742741 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/ParseFrame.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/ParseFrame.cpp
@@ -9,6 +9,7 @@
 
 #include "ParseFrame.h"
 
+#include "chunk.h"
 #include "uncrustify.h"
 
 #include <stdexcept>            // to get std::logic_error
@@ -54,7 +55,7 @@ void ParseFrame::clear()
    pp_level     = 0;
    sparen_count = 0;
    paren_count  = 0;
-   in_ifdef     = c_token_t::CT_NONE;
+   in_ifdef     = E_Token::CT_NONE;
    stmt_count   = 0;
    expr_count   = 0;
 }
@@ -147,14 +148,14 @@ const ContainerType &ParseFrame::top() const
 
 void ParseFrame::push(std::nullptr_t, brace_stage_e stage)
 {
-   static chunk_t dummy;
+   static Chunk dummy;
 
    push(&dummy, __func__, __LINE__, stage);
    top().pc = nullptr;
 }
 
 
-void ParseFrame::push(chunk_t *pc, const char *func, int line, brace_stage_e stage)
+void ParseFrame::push(Chunk *pc, const char *func, int line, brace_stage_e stage)
 {
    LOG_FUNC_ENTRY();
 
@@ -173,20 +174,21 @@ void ParseFrame::push(chunk_t *pc, const char *func, int line, brace_stage_e sta
    new_entry.in_preproc = pc->flags.test(PCF_IN_PREPROC);
    new_entry.non_vardef = false;
    new_entry.ip         = top().ip;
+   new_entry.pop_pc     = nullptr;
 
    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 %zu: orig_line is %zu, orig_col is %zu, type is %s, "
-           "brace_level is %zu, level is %zu, pse_tos: %zu -> %zu\n",
+   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,
            (pse.size() - 2), (pse.size() - 1));
 #else /* DEBUG_PUSH_POP */
-   LOG_FMT(LINDPSE, "ParseFrame::push(%s:%d): orig_line is %zu, orig_col is %zu, type is %s, "
-           "brace_level is %zu, level is %zu, pse_tos: %zu -> %zu\n",
+   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,
            (pse.size() - 2), (pse.size() - 1));
@@ -194,7 +196,7 @@ void ParseFrame::push(chunk_t *pc, const char *func, int line, brace_stage_e sta
 }
 
 
-void ParseFrame::pop(const char *func, int line)
+void ParseFrame::pop(const char *func, int line, Chunk *pc)
 {
    LOG_FUNC_ENTRY();
 
@@ -205,15 +207,66 @@ void ParseFrame::pop(const char *func, int line)
 //                        + "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)
+   {
+      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));
+   }
+   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)
+   {
+      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));
+   }
+   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_flush(true);
+      exit(EX_SOFTWARE);
+   }
 #ifdef DEBUG_PUSH_POP
-   LOG_FMT(LINDPSE, "ParseFrame::pop (%s:%d) Add is %zu: open_line is %zu, clos_col is %zu, type is %s, "
-           "cpd.level   is %d, level is %zu, pse_tos: %zu -> %zu\n",
+   LOG_FMT(LINDPSE, "ParseFrame::pop (%s:%d) Add is %4zu: open_line is %4zu, clos_col is %4zu, type is %12s, "
+           "cpd.level   is %2d, level is %2zu, pse_tos: %2zu -> %2zu\n",
            func, line, (size_t)this, pse.back().open_line, pse.back().open_colu,
            get_token_name(pse.back().type), cpd.pp_level, pse.back().level,
            (pse.size() - 1), (pse.size() - 2));
 #else /* DEBUG_PUSH_POP */
-   LOG_FMT(LINDPSE, "ParseFrame::pop (%s:%d): open_line is %zu, clos_col is %zu, type is %s, "
-           "cpd.level   is %d, level is %zu, pse_tos: %zu -> %zu\n",
+   LOG_FMT(LINDPSE, "ParseFrame::pop (%s:%d): open_line is %4zu, clos_col is %4zu, type is %12s, "
+           "cpd.level   is %2d, level is %2zu, pse_tos: %2zu -> %2zu\n",
            func, line, pse.back().open_line, pse.back().open_colu,
            get_token_name(pse.back().type), cpd.pp_level, pse.back().level,
            (pse.size() - 1), (pse.size() - 2));
@@ -229,7 +282,7 @@ void ParseFrame::pop(const char *func, int line)
    {
       pse.pop_back();
    }
-}
+} // ParseFrame::pop
 
 
 size_t ParseFrame::size() const
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/ParseFrame.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/ParseFrame.h
index cad34ab3..59d1090e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/ParseFrame.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/ParseFrame.h
@@ -18,23 +18,23 @@
 //! Structure for counting nested level
 struct paren_stack_entry_t
 {
-   c_token_t     type;         //! the type that opened the entry
+   E_Token       type;         //! the type that opened the entry
    size_t        level;        //! Level of opening type
    size_t        open_line;    //! line that open symbol is on, only for logging purposes
    size_t        open_colu;    //! column that open symbol is on, only for logging purposes
-   chunk_t       *pc;          //! Chunk that opened the level, TODO: make const
+   Chunk         *pc;          //! Chunk that opened the level, TODO: make const
    size_t        brace_indent; //! indent for braces - may not relate to indent
    size_t        indent;       //! indent level (depends on use)
    size_t        indent_tmp;   //! temporary indent level (depends on use)
    size_t        indent_tab;   //! the 'tab' indent (always <= real column)
    bool          indent_cont;  //! indent_continue was applied
-   c_token_t     parent;       //! if, for, function, etc
+   E_Token       parent;       //! if, for, function, etc
    brace_stage_e stage;        //! used to check progression of complex statements.
    bool          in_preproc;   //! whether this was created in a preprocessor
    size_t        ns_cnt;       //! Number of consecutive namespace levels
    bool          non_vardef;   //! Hit a non-vardef line
    indent_ptr_t  ip;
-   chunk_t       *pop_pc;
+   Chunk         *pop_pc;
 };
 
 class ParseFrame
@@ -46,15 +46,15 @@ private:
    void clear();
 
 public:
-   size_t    ref_no;
-   size_t    level;           //! level of parens/square/angle/brace
-   size_t    brace_level;     //! level of brace/vbrace
-   size_t    pp_level;        //! level of preproc #if stuff
-   size_t    sparen_count;
-   size_t    paren_count;
-   c_token_t in_ifdef;
-   size_t    stmt_count;
-   size_t    expr_count;
+   size_t  ref_no;
+   size_t  level;             //! level of parens/square/angle/brace
+   size_t  brace_level;       //! level of brace/vbrace
+   size_t  pp_level;          //! level of preproc #if stuff
+   size_t  sparen_count;
+   size_t  paren_count;
+   E_Token in_ifdef;
+   size_t  stmt_count;
+   size_t  expr_count;
 
 
    ParseFrame();
@@ -73,9 +73,9 @@ public:
 
    const paren_stack_entry_t &poped() const;
 
-   void push(chunk_t *pc, const char *func, int line, brace_stage_e stage = brace_stage_e::NONE);
+   void push(Chunk *pc, const char *func, int line, brace_stage_e stage = brace_stage_e::NONE);
    void push(std::nullptr_t, brace_stage_e stage = brace_stage_e::NONE);
-   void pop(const char *func, int line);
+   void pop(const char *func, int line, Chunk *pc);
 
    size_t size() const;
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/add_space_table.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/add_space_table.h
index cb664d2d..cb664d2d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/add_space_table.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/add_space_table.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align.cpp
index 09e45dc8..3ea306ed 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align.cpp
@@ -12,6 +12,7 @@
 
 #include "align_asm_colon.h"
 #include "align_assign.h"
+#include "align_braced_init_list.h"
 #include "align_eigen_comma_init.h"
 #include "align_func_params.h"
 #include "align_func_proto.h"
@@ -150,7 +151,7 @@ void align_all(void)
       || (options::align_var_struct_span() > 0)
       || (options::align_var_class_span() > 0))
    {
-      align_var_def_brace(chunk_get_head(), options::align_var_def_span(), nullptr);
+      align_var_def_brace(Chunk::GetHead(), options::align_var_def_span(), nullptr);
    }
    // Align assignments
    log_rule_B("align_enum_equ_span");
@@ -160,11 +161,20 @@ void align_all(void)
    if (  (options::align_enum_equ_span() > 0)
       || (options::align_assign_span() > 0))
    {
-      align_assign(chunk_get_head(),
+      align_assign(Chunk::GetHead(),
                    options::align_assign_span(),
                    options::align_assign_thresh(),
                    nullptr);
    }
+
+   if (  (options::align_braced_init_list_span() > 0)                   // Issue #750
+      || (options::align_braced_init_list_thresh() > 0))
+   {
+      align_braced_init_list(Chunk::GetHead(),
+                             options::align_braced_init_list_span(),
+                             options::align_braced_init_list_thresh(),
+                             nullptr);
+   }
    // Align structure initializers
    log_rule_B("align_struct_init_span");
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align.h
index 110a2c86..110a2c86 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_add.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_add.cpp
index 2bd93381..6fe3191d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_add.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_add.cpp
@@ -11,14 +11,19 @@
 #include "uncrustify.h"
 
 
-void align_add(ChunkStack &cs, chunk_t *pc, size_t &max_col)
+void align_add(ChunkStack &cs, Chunk *pc, size_t &max_col)
 {
    LOG_FUNC_ENTRY();
 
-   size_t  min_col;
-   chunk_t *prev = chunk_get_prev(pc);
+   size_t min_col;
+   Chunk  *prev = Chunk::NullChunkPtr;
 
-   if (  prev == nullptr
+   if (pc != nullptr)
+   {
+      prev = pc->GetPrev();
+   }
+
+   if (  prev->IsNullChunk()
       || chunk_is_newline(prev))
    {
       min_col = 1;
@@ -33,11 +38,11 @@ void align_add(ChunkStack &cs, chunk_t *pc, size_t &max_col)
       }
       else
       {
-         min_col = prev->column + prev->len() + 1;
+         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",
+      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));
+              (chunk_is_token(prev, CT_COMMENT_MULTI)) ? prev->orig_col_end : (UINT32)prev->column, prev->Len(), get_token_name(prev->type));
    }
 
    if (cs.Empty())
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_add.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_add.h
index 07f1efee..e178b5bd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_add.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_add.h
@@ -10,9 +10,9 @@
 #ifndef ALIGN_ADD_H_INCLUDED
 #define ALIGN_ADD_H_INCLUDED
 
-#include "chunk_list.h"
+#include "chunk.h"
 #include "ChunkStack.h"
 
-void align_add(ChunkStack &cs, chunk_t *pc, size_t &max_col);
+void align_add(ChunkStack &cs, Chunk *pc, size_t &max_col);
 
 #endif /* ALIGN_ADD_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_asm_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_asm_colon.cpp
index 1fb6c636..a04121b2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_asm_colon.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_asm_colon.cpp
@@ -10,7 +10,7 @@
 #include "align_asm_colon.h"
 
 #include "align_stack.h"
-#include "chunk_list.h"
+#include "chunk.h"
 
 
 void align_asm_colon(void)
@@ -22,22 +22,22 @@ void align_asm_colon(void)
 
    cas.Start(4);
 
-   chunk_t *pc = chunk_get_head();
+   Chunk *pc = Chunk::GetHead();
 
-   while (pc != nullptr)
+   while (pc->IsNotNullChunk())
    {
       if (chunk_is_not_token(pc, CT_ASM_COLON))
       {
-         pc = chunk_get_next(pc);
+         pc = pc->GetNext();
          continue;
       }
       cas.Reset();
 
-      pc = chunk_get_next_ncnnl(pc, scope_e::PREPROC);
+      pc = pc->GetNextNcNnl(E_Scope::PREPROC);
       size_t level = pc ? pc->level : 0;
       did_nl = true;
 
-      while (  pc != nullptr
+      while (  pc->IsNotNullChunk()
             && pc->level >= level)
       {
          if (chunk_is_newline(pc))
@@ -55,7 +55,7 @@ void align_asm_colon(void)
             did_nl = false;
             cas.Add(pc);
          }
-         pc = chunk_get_next_nc(pc, scope_e::PREPROC);
+         pc = pc->GetNextNc(E_Scope::PREPROC);
       }
       cas.End();
    }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_asm_colon.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_asm_colon.h
index 25704404..25704404 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_asm_colon.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_asm_colon.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_assign.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_assign.cpp
index 3e745bd7..cd08e53f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_assign.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_assign.cpp
@@ -17,11 +17,12 @@ constexpr static auto LCURRENT = LALASS;
 using namespace uncrustify;
 
 
-chunk_t *align_assign(chunk_t *first, size_t span, size_t thresh, size_t *p_nl_count)
+Chunk *align_assign(Chunk *first, size_t span, size_t thresh, size_t *p_nl_count)
 {
    LOG_FUNC_ENTRY();
 
-   if (first == nullptr)
+   if (  first == nullptr
+      || first->IsNullChunk())
    {
       // coveralls will complain here. There are no example for that.
       // see https://en.wikipedia.org/wiki/Robustness_principle
@@ -32,7 +33,7 @@ chunk_t *align_assign(chunk_t *first, size_t span, size_t thresh, size_t *p_nl_c
    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->elided_text(copy), first->orig_line, span, thresh);
+           __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
@@ -56,16 +57,17 @@ chunk_t *align_assign(chunk_t *first, size_t span, size_t thresh, size_t *p_nl_c
    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_t *pc = first;
+   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)
+   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->elided_text(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() '%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)
@@ -98,8 +100,9 @@ chunk_t *align_assign(chunk_t *first, size_t span, size_t thresh, size_t *p_nl_c
       }
 
       // Recurse if a brace set is found
-      if (  chunk_is_token(pc, CT_BRACE_OPEN)
-         || chunk_is_token(pc, CT_VBRACE_OPEN))
+      if (  (  chunk_is_token(pc, CT_BRACE_OPEN)
+            || chunk_is_token(pc, CT_VBRACE_OPEN))
+         && !(get_chunk_parent_type(pc) == CT_BRACED_INIT_LIST))
       {
          size_t myspan;
          size_t mythresh;
@@ -120,7 +123,7 @@ chunk_t *align_assign(chunk_t *first, size_t span, size_t thresh, size_t *p_nl_c
             log_rule_B("align_assign_thresh");
             mythresh = options::align_assign_thresh();
          }
-         pc = align_assign(chunk_get_next_ncnnl(pc), myspan, mythresh, &sub_nl_count);
+         pc = align_assign(pc->GetNextNcNnl(), myspan, mythresh, &sub_nl_count);
 
          if (sub_nl_count > 0)
          {
@@ -144,10 +147,11 @@ chunk_t *align_assign(chunk_t *first, size_t span, size_t thresh, size_t *p_nl_c
       }
 
       // Done with this brace set?
-      if (  chunk_is_token(pc, CT_BRACE_CLOSE)
-         || chunk_is_token(pc, CT_VBRACE_CLOSE))
+      if (  (  chunk_is_token(pc, CT_BRACE_CLOSE)
+            || chunk_is_token(pc, CT_VBRACE_CLOSE))
+         && !(get_chunk_parent_type(pc) == CT_BRACED_INIT_LIST))
       {
-         pc = chunk_get_next(pc);
+         pc = pc->GetNext();
          break;
       }
 
@@ -181,9 +185,12 @@ chunk_t *align_assign(chunk_t *first, size_t span, size_t thresh, size_t *p_nl_c
          //log_pcf_flags(LALASS, pc->flags);
          var_def_cnt++;
       }
-      else if (var_def_cnt > 1)
+      else if (  var_def_cnt > 1
+              && !options::align_assign_on_multi_var_defs())
       {
-         // we hit the second variable def - don't look for assigns, don't align
+         // 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
@@ -209,7 +216,7 @@ chunk_t *align_assign(chunk_t *first, size_t span, size_t thresh, size_t *p_nl_c
                || 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);
+                    __func__, __LINE__, fcn_idx, pc->Text(), pc->orig_line, pc->orig_col);
 
             if (++fcn_idx == fcnDefault.size())
             {
@@ -226,7 +233,7 @@ chunk_t *align_assign(chunk_t *first, size_t span, size_t thresh, size_t *p_nl_c
             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);
+                       __func__, __LINE__, fcn_idx, pc->Text(), pc->orig_line, pc->orig_col);
 
                if (++fcn_idx == fcnDefault.size())
                {
@@ -239,13 +246,13 @@ chunk_t *align_assign(chunk_t *first, size_t span, size_t thresh, size_t *p_nl_c
             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);
+                       __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);
+                       __func__, __LINE__, pc->Text(), pc->orig_line, pc->orig_col);
                vdas.Add(pc);
             }
          }
@@ -260,7 +267,7 @@ chunk_t *align_assign(chunk_t *first, size_t span, size_t thresh, size_t *p_nl_c
          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);
+                    __func__, __LINE__, pc->Text(), pc->orig_line, pc->orig_col);
             vdas.Add(pc);
          }
          else
@@ -268,12 +275,12 @@ chunk_t *align_assign(chunk_t *first, size_t span, size_t thresh, size_t *p_nl_c
             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);
+                       __func__, __LINE__, pc->Text(), pc->orig_line, pc->orig_col);
                as.Add(pc);
             }
          }
       }
-      pc = chunk_get_next(pc);
+      pc = pc->GetNext();
    }
    as.End();
    vdas.End();
@@ -288,7 +295,7 @@ chunk_t *align_assign(chunk_t *first, size_t span, size_t thresh, size_t *p_nl_c
    if (pc != nullptr)
    {
       LOG_FMT(LALASS, "%s(%d): done on '%s' on orig_line %zu\n",
-              __func__, __LINE__, pc->text(), pc->orig_line);
+              __func__, __LINE__, pc->Text(), pc->orig_line);
    }
    else
    {
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_assign.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_assign.h
index e14ad62c..8a23d0d5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_assign.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_assign.h
@@ -10,7 +10,7 @@
 #ifndef ALIGN_ASSIGN_H_INCLUDED
 #define ALIGN_ASSIGN_H_INCLUDED
 
-#include "chunk_list.h"
+#include "chunk.h"
 
 /**
  * Aligns all assignment operators on the same level as first, starting with
@@ -20,6 +20,6 @@
  *
  * @param first  chunk pointing to the first assignment
  */
-chunk_t *align_assign(chunk_t *first, size_t span, size_t thresh, size_t *p_nl_count);
+Chunk *align_assign(Chunk *first, size_t span, size_t thresh, size_t *p_nl_count);
 
 #endif /* ALIGN_ASSIGN_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_braced_init_list.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_braced_init_list.cpp
new file mode 100644
index 00000000..3fd21394
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_braced_init_list.cpp
@@ -0,0 +1,167 @@
+/**
+ * @file align_braced_init_list.cpp
+ *
+ * @author  Guy Maurel
+ * @license GPL v2+
+ */
+
+#include "align_braced_init_list.h"
+
+#include "align_stack.h"
+#include "log_rules.h"
+
+constexpr static auto LCURRENT = LALASS;
+
+using namespace uncrustify;
+
+
+Chunk *align_braced_init_list(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 vdas;  // variable def assigns
+
+   vdas.Start(span, thresh);
+   vdas.m_right_align = !options::align_on_tabstop();
+
+   size_t var_def_cnt = 0;
+   size_t equ_count   = 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_SQUARE_OPEN)
+         || chunk_is_token(pc, 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);
+
+         if (pc != nullptr)
+         {
+            vdas.NewLines(pc->orig_line - 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))
+      {
+         size_t myspan;
+         size_t mythresh;
+
+         size_t sub_nl_count = 0;
+
+         log_rule_B("align_braced_init_list_span");
+         myspan = options::align_braced_init_list_span();
+         log_rule_B("align_braced_init_list_thresh");
+         mythresh = options::align_braced_init_list_thresh();
+         pc       = align_braced_init_list(pc->GetNextNcNnl(), myspan, mythresh, &sub_nl_count);
+
+         if (sub_nl_count > 0)
+         {
+            vdas.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))
+      {
+         vdas.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)
+      {
+         // we hit the second variable def - don't look, don't align
+         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))
+
+      {
+         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);
+
+         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);
+            vdas.Add(pc);
+         }
+      }
+      pc = pc->GetNext();
+   }
+   vdas.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_braced_init_list
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_braced_init_list.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_braced_init_list.h
new file mode 100644
index 00000000..e29868e0
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_braced_init_list.h
@@ -0,0 +1,21 @@
+/**
+ * @file align_braced_init_list.h
+ *
+ * @author  Guy Maurel
+ * @license GPL v2+
+ */
+
+#ifndef ALIGN_BRACED_INIT_LIST_H_INCLUDED
+#define ALIGN_BRACED_INIT_LIST_H_INCLUDED
+
+#include "chunk.h"
+
+/**
+ * Aligns all braced init list operators on the same level as first, starting with
+ * first.
+ *
+ * @param first  chunk pointing to the first braced init list
+ */
+Chunk *align_braced_init_list(Chunk *first, size_t span, size_t thresh, size_t *p_nl_count);
+
+#endif /* ALIGN_BRACED_INIT_LIST_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_eigen_comma_init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_eigen_comma_init.cpp
index c659c214..19b114d6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_eigen_comma_init.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_eigen_comma_init.cpp
@@ -23,14 +23,14 @@ void align_eigen_comma_init(void)
 {
    LOG_FUNC_ENTRY();
 
-   chunk_t    *start = nullptr;
+   Chunk      *start = Chunk::NullChunkPtr;
    AlignStack as;
 
    as.Start(255);
 
-   auto *pc = chunk_get_head();
+   Chunk *pc = Chunk::GetHead();
 
-   while (pc != nullptr)
+   while (pc->IsNotNullChunk())
    {
       if (chunk_is_newline(pc))
       {
@@ -38,29 +38,29 @@ void align_eigen_comma_init(void)
       }
       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_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());
       }
 
-      if (  start != nullptr
+      if (  start->IsNotNullChunk()
          && ((pc->flags & PCF_IN_PREPROC) != (start->flags & PCF_IN_PREPROC)))
       {
          // a change in preproc status restarts the aligning
          as.Flush();
-         start = nullptr;
+         start = Chunk::NullChunkPtr;
       }
       else if (chunk_is_newline(pc))
       {
          as.NewLines(pc->nl_count);
       }
-      else if (  start != nullptr
+      else if (  start->IsNotNullChunk()
               && pc->level < start->level)
       {
          // A drop in level restarts the aligning
          as.Flush();
-         start = nullptr;
+         start = Chunk::NullChunkPtr;
       }
-      else if (  start != nullptr
+      else if (  start->IsNotNullChunk()
               && pc->level > start->level)
       {
          // Ignore any deeper levels when aligning
@@ -69,11 +69,11 @@ void align_eigen_comma_init(void)
       {
          // A semicolon at the same level flushes
          as.Flush();
-         start = nullptr;
+         start = Chunk::NullChunkPtr;
       }
       else if (  !pc->flags.test(PCF_IN_ENUM)
               && !pc->flags.test(PCF_IN_TYPEDEF)
-              && chunk_is_str(pc, "<<", 2))
+              && chunk_is_str(pc, "<<"))
       {
          if (get_chunk_parent_type(pc) == CT_OPERATOR)
          {
@@ -88,9 +88,9 @@ void align_eigen_comma_init(void)
              *      cout
              *          << "something";
              */
-            chunk_t *prev = chunk_get_prev(pc);
+            Chunk *prev = pc->GetPrev();
 
-            if (  prev != nullptr
+            if (  prev->IsNotNullChunk()
                && chunk_is_newline(prev))
             {
                log_rule_B("indent_columns");
@@ -100,22 +100,22 @@ void align_eigen_comma_init(void)
             }
             // Restart alignment
             as.Flush();
-            as.Add(chunk_get_next(pc));
+            as.Add(pc->GetNext());
             start = pc;
          }
       }
       else if (!as.m_aligned.Empty())
       {
-         auto *const prev = chunk_get_prev(pc);
+         Chunk *prev = pc->GetPrev();
 
          if (  chunk_is_newline(prev)
-            && chunk_is_token(chunk_get_prev_ncnnl(pc), CT_COMMA))
+            && chunk_is_token(pc->GetPrevNcNnl(), CT_COMMA))
          {
             log_rule_B("align_eigen_comma_init");
             as.Add(pc);
          }
       }
-      pc = chunk_get_next(pc);
+      pc = pc->GetNext();
    }
    as.End();
 } // align_left_shift
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_eigen_comma_init.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_eigen_comma_init.h
index 8f8ce34b..8f8ce34b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_eigen_comma_init.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_eigen_comma_init.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_func_params.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_func_params.cpp
index 41990576..fe488a10 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_func_params.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_func_params.cpp
@@ -19,12 +19,12 @@ constexpr static auto LCURRENT = LALIGN;
 using namespace uncrustify;
 
 
-chunk_t *align_func_param(chunk_t *start)
+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,
+           __func__, __LINE__, start->Text(), start->orig_line, start->column,
            get_token_name(start->type), start->level);
    // Defaults, if the align_func_params = true
    size_t myspan   = 2;
@@ -58,34 +58,34 @@ chunk_t *align_func_param(chunk_t *start)
       many_as[idx].m_amp_style  = static_cast<AlignStack::StarStyle>(options::align_var_def_amp_style());
    }
 
-   size_t  comma_count = 0;
-   size_t  chunk_count = 0;
-   chunk_t *pc         = start;
+   size_t comma_count = 0;
+   size_t chunk_count = 0;
+   Chunk  *pc         = start;
 
-   while ((pc = chunk_get_next(pc)) != nullptr)
+   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(),
+      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));
 
       if (chunk_is_token(pc, CT_FUNC_VAR))                    // Issue #2278
       {
          // look after 'protect parenthesis'
-         chunk_t *after = chunk_get_next_nc(pc);
+         Chunk *after = pc->GetNextNc();
 
          if (chunk_is_token(after, CT_PAREN_CLOSE))
          {
-            chunk_t *before = chunk_get_prev_type(after, CT_PAREN_OPEN, after->level);
+            Chunk *before = after->GetPrevType(CT_PAREN_OPEN, after->level);
 
-            if (before != nullptr)
+            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;
-               chunk_t *tmp = chunk_get_prev_nc(pc);
+               Chunk *tmp = pc->GetPrevNc();
 
                if (chunk_is_token(tmp, CT_PTR_TYPE))
                {
@@ -124,7 +124,7 @@ chunk_t *align_func_param(chunk_t *start)
       }
       else if (comma_count > 0)
       {
-         if (!chunk_is_comment(pc))
+         if (!pc->IsComment())
          {
             comma_count = 2;
             break;
@@ -139,7 +139,7 @@ chunk_t *align_func_param(chunk_t *start)
          }
          else
          {
-            chunk_t *tmp_prev = chunk_get_prev_nc(pc);
+            Chunk *tmp_prev = pc->GetPrevNc();
 
             if (!chunk_is_newline(tmp_prev))  // don't count leading commas
             {
@@ -165,12 +165,12 @@ chunk_t *align_func_param(chunk_t *start)
 void align_func_params(void)
 {
    LOG_FUNC_ENTRY();
-   chunk_t *pc = chunk_get_head();
+   Chunk *pc = Chunk::GetHead();
 
-   while ((pc = chunk_get_next(pc)) != nullptr)
+   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(),
+      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)
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_func_params.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_func_params.h
index b200a0cb..e2fbc42a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_func_params.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_func_params.h
@@ -10,10 +10,10 @@
 #ifndef ALIGN_FUNC_PARAMS_H_INCLUDED
 #define ALIGN_FUNC_PARAMS_H_INCLUDED
 
-#include "chunk_list.h"
+#include "chunk.h"
 
 void align_func_params(void);
 
-chunk_t *align_func_param(chunk_t *start);
+Chunk *align_func_param(Chunk *start);
 
 #endif /* ALIGN_FUNC_PARAMS_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_func_proto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_func_proto.cpp
index 9a0cbfd2..c4c9fa0e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_func_proto.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_func_proto.cpp
@@ -65,14 +65,14 @@ void align_func_proto(size_t span)
    size_t mybr_gap = options::align_single_line_brace_gap();
 
 
-   bool    look_bro = false;
-   chunk_t *toadd;
+   bool  look_bro = false;
+   Chunk *toadd;
 
-   for (chunk_t *pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next(pc))
+   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->elided_text(copy),
+      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);
 
       // make the vector larger if necessary
@@ -150,15 +150,15 @@ void align_func_proto(size_t span)
          if (  get_chunk_parent_type(pc) == CT_OPERATOR
             && options::align_on_operator())
          {
-            toadd = chunk_get_prev_ncnnl(pc);
+            toadd = pc->GetPrevNcNnl();
          }
          else
          {
             toadd = pc;
          }
-         chunk_t *tmp = step_back_over_member(toadd);
-         LOG_FMT(LAS, "%s(%d): tmp->text() is '%s', orig_line is %zu, orig_col is %zu, level is %zu, brace_level is %zu\n",
-                 __func__, __LINE__, tmp->text(), tmp->orig_line, tmp->orig_col,
+         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);
          // test the Stack
          AlignStack *stack_at_l_bl = many_as.at(pc->level).at(pc->brace_level);
@@ -185,6 +185,15 @@ void align_func_proto(size_t span)
               && pc->flags.test(PCF_ONE_LINER))
       {
          AlignStack *stack_at_l_bl_brace = many_as_brace.at(pc->level).at(pc->brace_level);
+
+         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->Debug();
          stack_at_l_bl_brace->Add(pc);
          look_bro = false;
       }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_func_proto.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_func_proto.h
index 0edf442d..811020e0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_func_proto.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_func_proto.h
@@ -10,7 +10,7 @@
 #ifndef ALIGN_FUNC_PROTO_H_INCLUDED
 #define ALIGN_FUNC_PROTO_H_INCLUDED
 
-#include "chunk_list.h"
+#include "chunk.h"
 
 //! Aligns all function prototypes in the file.
 void align_func_proto(size_t span);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_init_brace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_init_brace.cpp
index 2fbe59d4..ed1d2d39 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_init_brace.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_init_brace.cpp
@@ -20,11 +20,11 @@ constexpr static auto LCURRENT = LALBR;
 using namespace uncrustify;
 
 
-void align_init_brace(chunk_t *start)
+void align_init_brace(Chunk *start)
 {
    LOG_FUNC_ENTRY();
 
-   chunk_t *num_token = nullptr;
+   Chunk *num_token = nullptr;
 
    cpd.al_cnt       = 0;
    cpd.al_c99_array = false;
@@ -32,8 +32,8 @@ void align_init_brace(chunk_t *start)
    LOG_FMT(LALBR, "%s(%d): start @ orig_line is %zu, orig_col is %zu\n",
            __func__, __LINE__, start->orig_line, start->orig_col);
 
-   chunk_t *pc       = chunk_get_next_ncnnl(start);
-   chunk_t *pcSingle = scan_ib_line(pc, true);
+   Chunk *pc       = start->GetNextNcNnl();
+   Chunk *pcSingle = scan_ib_line(pc, true);
 
    if (  pcSingle == nullptr
       || (  chunk_is_token(pcSingle, CT_BRACE_CLOSE)
@@ -56,9 +56,10 @@ void align_init_brace(chunk_t *start)
 
       while (chunk_is_newline(pc))
       {
-         pc = chunk_get_next(pc);
+         pc = pc->GetNext();
       }
    } while (  pc != nullptr
+           && pc->IsNotNullChunk()
            && pc->level > start->level);
 
    // debug dump the current frame
@@ -72,26 +73,23 @@ void align_init_brace(chunk_t *start)
    {
       cpd.al[0].col = align_tab_column(cpd.al[0].col);
    }
-   pc = chunk_get_next(start);
+   pc = start->GetNext();
    size_t idx = 0;
 
    do
    {
-      chunk_t *tmp;
+      Chunk *tmp;
 
       if (  idx == 0
          && ((tmp = skip_c99_array(pc)) != nullptr))
       {
          pc = tmp;
 
-         if (pc != nullptr)
-         {
-            LOG_FMT(LALBR, " -%zu- skipped '[] =' to %s\n",
-                    pc->orig_line, get_token_name(pc->type));
-         }
+         LOG_FMT(LALBR, " -%zu- skipped '[] =' to %s\n",
+                 pc->orig_line, get_token_name(pc->type));
          continue;
       }
-      chunk_t *next = pc;
+      Chunk *next = pc;
 
       if (idx < cpd.al_cnt)
       {
@@ -103,14 +101,14 @@ void align_init_brace(chunk_t *start)
             if (  idx == 0
                && cpd.al_c99_array)
             {
-               chunk_t *prev = chunk_get_prev(pc);
+               Chunk *prev = pc->GetPrev();
 
                if (chunk_is_newline(prev))
                {
                   chunk_flags_set(pc, PCF_DONT_INDENT);
                }
             }
-            LOG_FMT(LALBR, " [%s] to col %zu\n", pc->text(), cpd.al[idx].col);
+            LOG_FMT(LALBR, " [%s] to col %zu\n", pc->Text(), cpd.al[idx].col);
 
             if (num_token != nullptr)
             {
@@ -119,7 +117,7 @@ void align_init_brace(chunk_t *start)
                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->text(), cpd.al[idx - 1].col, col_diff);
+               //        num_token->Text(), cpd.al[idx - 1].col, col_diff);
 
                chunk_flags_set(num_token, PCF_WAS_ALIGNED);
                num_token = nullptr;
@@ -128,13 +126,13 @@ void align_init_brace(chunk_t *start)
             // Comma's need to 'fall back' to the previous token
             if (chunk_is_token(pc, CT_COMMA))
             {
-               next = chunk_get_next(pc);
+               next = pc->GetNext();
 
                if (!chunk_is_newline(next))
                {
                   //LOG_FMT(LSYS, "-= %zu =- indent [%s] col=%d len=%d\n",
                   //        next->orig_line,
-                  //        next->text(), cpd.al[idx].col, cpd.al[idx].len);
+                  //        next->Text(), cpd.al[idx].col, cpd.al[idx].len);
 
                   log_rule_B("align_number_right");
 
@@ -171,7 +169,7 @@ void align_init_brace(chunk_t *start)
                if (  (idx < (cpd.al_cnt - 1))
                   && options::align_number_right())
                {
-                  next = chunk_get_next(pc);
+                  next = pc->GetNext();
 
                   if (  !chunk_is_newline(next)
                      && (  chunk_is_token(next, CT_NUMBER_FP)
@@ -197,7 +195,8 @@ void align_init_brace(chunk_t *start)
       {
          idx = 0;
       }
-      pc = chunk_get_next(pc);
+      pc = pc->GetNext();
    } while (  pc != nullptr
+           && pc->IsNotNullChunk()
            && pc->level > start->level);
 } // align_init_brace
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_init_brace.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_init_brace.h
index 6c0c4909..c749eb54 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_init_brace.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_init_brace.h
@@ -44,6 +44,6 @@
  *
  * @param start   Points to the open brace chunk
  */
-void align_init_brace(chunk_t *start);
+void align_init_brace(Chunk *start);
 
 #endif /* ALIGN_INIT_BRACE_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_left_shift.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_left_shift.cpp
index 777f7d27..21ef4ba6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_left_shift.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_left_shift.cpp
@@ -22,14 +22,14 @@ void align_left_shift(void)
 {
    LOG_FUNC_ENTRY();
 
-   chunk_t    *start = nullptr;
+   Chunk      *start = Chunk::NullChunkPtr;
    AlignStack as;
 
    as.Start(255);
 
-   chunk_t *pc = chunk_get_head();
+   Chunk *pc = Chunk::GetHead();
 
-   while (pc != nullptr)
+   while (pc->IsNotNullChunk())
    {
       if (chunk_is_newline(pc))
       {
@@ -38,29 +38,29 @@ void align_left_shift(void)
       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->elided_text(copy));
+         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));
       }
 
-      if (  start != nullptr
+      if (  start->IsNotNullChunk()
          && ((pc->flags & PCF_IN_PREPROC) != (start->flags & PCF_IN_PREPROC)))
       {
          // a change in preproc status restarts the aligning
          as.Flush();
-         start = nullptr;
+         start = Chunk::NullChunkPtr;
       }
       else if (chunk_is_newline(pc))
       {
          as.NewLines(pc->nl_count);
       }
-      else if (  start != nullptr
+      else if (  start->IsNotNullChunk()
               && pc->level < start->level)
       {
          // A drop in level restarts the aligning
          as.Flush();
-         start = nullptr;
+         start = Chunk::NullChunkPtr;
       }
-      else if (  start != nullptr
+      else if (  start->IsNotNullChunk()
               && pc->level > start->level)
       {
          // Ignore any deeper levels when aligning
@@ -69,11 +69,11 @@ void align_left_shift(void)
       {
          // A semicolon at the same level flushes
          as.Flush();
-         start = nullptr;
+         start = Chunk::NullChunkPtr;
       }
       else if (  !pc->flags.test(PCF_IN_ENUM)
               && !pc->flags.test(PCF_IN_TYPEDEF)
-              && chunk_is_str(pc, "<<", 2))
+              && chunk_is_str(pc, "<<"))
       {
          if (get_chunk_parent_type(pc) == CT_OPERATOR)
          {
@@ -88,9 +88,9 @@ void align_left_shift(void)
              *      cout
              *          << "something";
              */
-            chunk_t *prev = chunk_get_prev(pc);
+            Chunk *prev = pc->GetPrev();
 
-            if (  prev != nullptr
+            if (  prev->IsNotNullChunk()
                && chunk_is_newline(prev))
             {
                log_rule_B("indent_columns");
@@ -102,7 +102,7 @@ void align_left_shift(void)
             as.Add(pc);
             start = pc;
          }
-         else if (chunk_is_newline(chunk_get_prev(pc)))
+         else if (chunk_is_newline(pc->GetPrev()))
          {
             // subsequent ones must be after a newline
             as.Add(pc);
@@ -117,9 +117,9 @@ void align_left_shift(void)
           *      cout <<
           *          "something";
           */
-         chunk_t *prev = chunk_get_prev(pc);
+         Chunk *prev = pc->GetPrev();
 
-         if (  prev != nullptr
+         if (  prev->IsNotNullChunk()
             && chunk_is_newline(prev))
          {
             log_rule_B("indent_columns");
@@ -128,7 +128,7 @@ void align_left_shift(void)
             chunk_flags_set(pc, PCF_DONT_INDENT);
          }
       }
-      pc = chunk_get_next(pc);
+      pc = pc->GetNext();
    }
    as.End();
 } // align_left_shift
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_left_shift.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_left_shift.h
index 47d9eb81..47d9eb81 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_left_shift.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_left_shift.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_log_al.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_log_al.cpp
index 802b0280..802b0280 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_log_al.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_log_al.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_log_al.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_log_al.h
index 8cb2ece8..8cb2ece8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_log_al.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_log_al.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_nl_cont.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_nl_cont.cpp
index ffe17f57..4a3fd689 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_nl_cont.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_nl_cont.cpp
@@ -13,7 +13,7 @@
 #include "uncrustify.h"
 
 
-chunk_t *align_nl_cont(chunk_t *start)
+Chunk *align_nl_cont(Chunk *start)
 {
    LOG_FUNC_ENTRY();
 
@@ -23,19 +23,20 @@ chunk_t *align_nl_cont(chunk_t *start)
    // Find the max column
    ChunkStack cs;
    size_t     max_col = 0;
-   chunk_t    *pc     = start;
+   Chunk      *pc     = start;
 
-   while (  chunk_is_not_token(pc, CT_NEWLINE)
+   while (  pc->IsNotNullChunk()
+         && chunk_is_not_token(pc, CT_NEWLINE)
          && chunk_is_not_token(pc, CT_COMMENT_MULTI))
    {
       if (chunk_is_token(pc, CT_NL_CONT))
       {
          align_add(cs, pc, max_col);
       }
-      pc = chunk_get_next(pc);
+      pc = pc->GetNext();
    }
    // NL_CONT is always the last thing on a line
-   chunk_t *tmp;
+   Chunk *tmp;
 
    while ((tmp = cs.Pop_Back()) != nullptr)
    {
@@ -49,13 +50,13 @@ chunk_t *align_nl_cont(chunk_t *start)
 void align_backslash_newline(void)
 {
    LOG_FUNC_ENTRY();
-   chunk_t *pc = chunk_get_head();
+   Chunk *pc = Chunk::GetHead();
 
-   while (pc != nullptr)
+   while (pc->IsNotNullChunk())
    {
       if (chunk_is_not_token(pc, CT_NL_CONT))
       {
-         pc = chunk_get_next_type(pc, CT_NL_CONT, -1);
+         pc = pc->GetNextType(CT_NL_CONT, -1);
          continue;
       }
       pc = align_nl_cont(pc);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_nl_cont.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_nl_cont.h
index cdef76f7..7db6bad6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_nl_cont.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_nl_cont.h
@@ -12,7 +12,7 @@
 
 #include "uncrustify_types.h"
 
-#include "chunk_list.h"
+#include "chunk.h"
 
 /**
  * For a series of lines ending in backslash-newline, align them.
@@ -22,7 +22,7 @@
  *
  * @return pointer the last item looked at (nullptr/newline/comment)
  */
-chunk_t *align_nl_cont(chunk_t *start);
+Chunk *align_nl_cont(Chunk *start);
 
 /**
  * Aligns all backslash-newline combos in the file.
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_oc_decl_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_oc_decl_colon.cpp
index 628c9994..8c0bc078 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_oc_decl_colon.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_oc_decl_colon.cpp
@@ -10,7 +10,7 @@
 #include "align_oc_decl_colon.h"
 
 #include "align_stack.h"
-#include "chunk_list.h"
+#include "chunk.h"
 
 
 using namespace uncrustify;
@@ -28,24 +28,24 @@ void align_oc_decl_colon(void)
    nas.Start(4);
    nas.m_right_align = !options::align_on_tabstop();
 
-   chunk_t *pc = chunk_get_head();
+   Chunk *pc = Chunk::GetHead();
 
-   while (pc != nullptr)
+   while (pc->IsNotNullChunk())
    {
       if (chunk_is_not_token(pc, CT_OC_SCOPE))
       {
-         pc = chunk_get_next(pc);
+         pc = pc->GetNext();
          continue;
       }
       nas.Reset();
       cas.Reset();
 
       size_t level = pc->level;
-      pc = chunk_get_next_ncnnl(pc, scope_e::PREPROC);
+      pc = pc->GetNextNcNnl(E_Scope::PREPROC);
 
       did_line = false;
 
-      while (  pc != nullptr
+      while (  pc->IsNotNullChunk()
             && pc->level >= level)
       {
          // The declaration ends with an open brace or semicolon
@@ -66,8 +66,8 @@ void align_oc_decl_colon(void)
          {
             cas.Add(pc);
 
-            chunk_t *tmp  = chunk_get_prev(pc, scope_e::PREPROC);
-            chunk_t *tmp2 = chunk_get_prev_ncnnl(tmp, scope_e::PREPROC);
+            Chunk *tmp  = pc->GetPrev(E_Scope::PREPROC);
+            Chunk *tmp2 = tmp->GetPrevNcNnl(E_Scope::PREPROC);
 
             // Check for an un-labeled parameter
             if (  (  chunk_is_token(tmp, CT_WORD)
@@ -82,7 +82,7 @@ void align_oc_decl_colon(void)
             }
             did_line = true;
          }
-         pc = chunk_get_next(pc, scope_e::PREPROC);
+         pc = pc->GetNext(E_Scope::PREPROC);
       }
       nas.End();
       cas.End();
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_oc_decl_colon.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_oc_decl_colon.h
index 370ee655..370ee655 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_oc_decl_colon.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_oc_decl_colon.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_oc_msg_colons.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_oc_msg_colons.cpp
index fedec9a4..7357bb18 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_oc_msg_colons.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_oc_msg_colons.cpp
@@ -15,7 +15,7 @@ constexpr static auto LCURRENT = LOCMSG;
 using namespace uncrustify;
 
 
-void align_oc_msg_colon(chunk_t *so)
+void align_oc_msg_colon(Chunk *so)
 {
    LOG_FUNC_ENTRY();
 
@@ -33,15 +33,15 @@ void align_oc_msg_colon(chunk_t *so)
 
    cas.Start(span);
 
-   size_t  level = so->level;
-   chunk_t *pc   = chunk_get_next_ncnnl(so, scope_e::PREPROC);
+   size_t level = so->level;
+   Chunk  *pc   = so->GetNextNcNnl(E_Scope::PREPROC);
 
-   bool    did_line   = false;
-   bool    has_colon  = false;
-   size_t  lcnt       = 0; // line count with no colon for span
-   bool    first_line = true;
+   bool   did_line   = false;
+   bool   has_colon  = false;
+   size_t lcnt       = 0;  // line count with no colon for span
+   bool   first_line = true;
 
-   while (  pc != nullptr
+   while (  pc->IsNotNullChunk()
          && pc->level > level)
    {
       if (pc->level > (level + 1))
@@ -73,9 +73,9 @@ void align_oc_msg_colon(chunk_t *so)
       {
          has_colon = true;
          cas.Add(pc);
-         chunk_t *tmp = chunk_get_prev(pc);
+         Chunk *tmp = pc->GetPrev();
 
-         if (  tmp != nullptr
+         if (  tmp->IsNotNullChunk()
             && (  chunk_is_token(tmp, CT_OC_MSG_FUNC)
                || chunk_is_token(tmp, CT_OC_MSG_NAME)))
          {
@@ -84,22 +84,22 @@ void align_oc_msg_colon(chunk_t *so)
          }
          did_line = true;
       }
-      pc = chunk_get_next(pc, scope_e::PREPROC);
+      pc = pc->GetNext(E_Scope::PREPROC);
    }
    log_rule_B("align_oc_msg_colon_first");
    nas.m_skip_first = !options::align_oc_msg_colon_first();
    cas.m_skip_first = !options::align_oc_msg_colon_first();
 
    // find the longest args that isn't the first one
-   size_t  first_len = 0;
-   size_t  mlen      = 0;
-   chunk_t *longest  = nullptr;
+   size_t first_len = 0;
+   size_t mlen      = 0;
+   Chunk  *longest  = nullptr;
 
-   size_t  len = nas.m_aligned.Len();
+   size_t len = nas.m_aligned.Len();
 
    for (size_t idx = 0; idx < len; idx++)
    {
-      chunk_t *tmp = nas.m_aligned.GetChunk(idx);
+      Chunk *tmp = nas.m_aligned.GetChunk(idx);
 
       if (tmp != nullptr)
       {
@@ -144,7 +144,7 @@ void align_oc_msg_colon(chunk_t *so)
    else if (  longest != nullptr
            && len > 0)
    {
-      chunk_t chunk;
+      Chunk chunk;
 
       set_chunk_type(&chunk, CT_SPACE);
       set_chunk_parent(&chunk, CT_NONE);
@@ -171,7 +171,7 @@ void align_oc_msg_colons(void)
 {
    LOG_FUNC_ENTRY();
 
-   for (chunk_t *pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next(pc))
+   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)
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_oc_msg_colons.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_oc_msg_colons.h
index 4d8ea07d..4d8ea07d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_oc_msg_colons.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_oc_msg_colons.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_oc_msg_spec.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_oc_msg_spec.cpp
index f57fa881..4c7a2dd5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_oc_msg_spec.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_oc_msg_spec.cpp
@@ -21,7 +21,7 @@ void align_oc_msg_spec(size_t span)
 
    as.Start(span, 0);
 
-   for (chunk_t *pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next(pc))
+   for (Chunk *pc = Chunk::GetHead(); pc->IsNotNullChunk(); pc = pc->GetNext())
    {
       if (chunk_is_newline(pc))
       {
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_oc_msg_spec.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_oc_msg_spec.h
index b6500a6e..b6500a6e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_oc_msg_spec.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_oc_msg_spec.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_preprocessor.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_preprocessor.cpp
index 8d54188b..b05c0dd9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_preprocessor.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_preprocessor.cpp
@@ -36,9 +36,10 @@ void align_preprocessor(void)
    log_rule_B("align_pp_define_gap");
    asf.m_gap = options::align_pp_define_gap();
 
-   chunk_t *pc = chunk_get_head();
+   Chunk *pc = Chunk::GetHead();
 
-   while (pc != nullptr)
+   while (  pc != nullptr
+         && 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!
@@ -50,20 +51,20 @@ void align_preprocessor(void)
       // If we aren't on a 'define', then skip to the next non-comment
       if (chunk_is_not_token(pc, CT_PP_DEFINE))
       {
-         pc = chunk_get_next_nc(pc);
+         pc = pc->GetNextNc();
          continue;
       }
       // step past the 'define'
-      pc = chunk_get_next_nc(pc);
+      pc = pc->GetNextNc();
 
-      if (pc == nullptr)
+      if (pc->IsNullChunk())
       {
          // coveralls will complain here. There are no example for that.
          // see https://en.wikipedia.org/wiki/Robustness_principle
          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->orig_line, pc->orig_col);
 
       cur_as = &as;
 
@@ -76,16 +77,16 @@ void align_preprocessor(void)
             cur_as = &asf;
          }
          // Skip to the close parenthesis
-         pc = chunk_get_next_nc(pc); // point to open (
-         pc = chunk_get_next_type(pc, CT_FPAREN_CLOSE, pc->level);
+         pc = pc->GetNextNc(); // point to open (
+         pc = pc->GetNextType(CT_FPAREN_CLOSE, pc->level);
 
          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->orig_line, pc->orig_col);
       }
       // step to the value past the close parenthesis or the macro name
-      pc = chunk_get_next(pc);
+      pc = pc->GetNext();
 
-      if (pc == nullptr)
+      if (pc->IsNullChunk())
       {
          // coveralls will complain here. There are no example for that.
          // see https://en.wikipedia.org/wiki/Robustness_principle
@@ -99,7 +100,7 @@ void align_preprocessor(void)
       if (!chunk_is_newline(pc))
       {
          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->orig_line, pc->orig_col);
 
          cur_as->Add(pc);
       }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_preprocessor.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_preprocessor.h
index ec944587..ec944587 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_preprocessor.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_preprocessor.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_same_func_call_params.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_same_func_call_params.cpp
index 72e32337..588195da 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_same_func_call_params.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_same_func_call_params.cpp
@@ -21,16 +21,16 @@ void align_same_func_call_params(void)
 {
    LOG_FUNC_ENTRY();
 
-   chunk_t           *pc;
-   chunk_t           *align_root = nullptr;
-   chunk_t           *align_cur  = nullptr;
+   Chunk             *pc;
+   Chunk             *align_root = Chunk::NullChunkPtr;
+   Chunk             *align_cur  = Chunk::NullChunkPtr;
    size_t            align_len   = 0;
    size_t            span        = 3;
    size_t            thresh;
-   chunk_t           *align_fcn;
+   Chunk             *align_fcn;
    unc_text          align_fcn_name;
    unc_text          align_root_name;
-   deque<chunk_t *>  chunks;
+   deque<Chunk *>    chunks;
    deque<AlignStack> array_of_AlignStack;
    AlignStack        fcn_as;
    const char        *add_str;
@@ -49,7 +49,7 @@ void align_same_func_call_params(void)
    LOG_FMT(LAS, "%s(%d): (3): span is %zu, thresh is %zu\n",
            __func__, __LINE__, span, thresh);
 
-   for (pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next(pc))
+   for (pc = Chunk::GetHead(); pc->IsNotNullChunk(); pc = pc->GetNext())
    {
       if (chunk_is_newline(pc))
       {
@@ -57,8 +57,8 @@ void align_same_func_call_params(void)
       }
       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->orig_line, pc->orig_col, pc->Text());
       }
 
       if (chunk_is_not_token(pc, CT_FUNC_CALL))
@@ -75,7 +75,7 @@ void align_same_func_call_params(void)
          else
          {
             // if we drop below the brace level that started it, we are done
-            if (  align_root != nullptr
+            if (  align_root->IsNotNullChunk()
                && align_root->brace_level > pc->brace_level)
             {
                LOG_FMT(LASFCP, "  ++ (drop) Ended with %zu fcns\n", align_len);
@@ -88,32 +88,32 @@ void align_same_func_call_params(void)
                   as_v.Flush();
                }
 
-               align_root = nullptr;
+               align_root = Chunk::NullChunkPtr;
             }
          }
          continue;
       }
       // Only align function calls that are right after a newline
-      chunk_t *prev = chunk_get_prev(pc);
+      Chunk *prev = pc->GetPrev();
 
       while (  chunk_is_token(prev, CT_MEMBER)
             || chunk_is_token(prev, CT_DC_MEMBER))
       {
-         chunk_t *tprev = chunk_get_prev(prev);
+         Chunk *tprev = prev->GetPrev();
 
          if (chunk_is_not_token(tprev, CT_TYPE))
          {
             prev = tprev;
             break;
          }
-         prev = chunk_get_prev(tprev);
+         prev = tprev->GetPrev();
       }
 
       if (!chunk_is_newline(prev))
       {
          continue;
       }
-      prev      = chunk_get_next(prev);
+      prev      = prev->GetNext();
       align_fcn = prev;
       align_fcn_name.clear();
       LOG_FMT(LASFCP, "%s(%d):\n", __func__, __LINE__);
@@ -121,7 +121,7 @@ void align_same_func_call_params(void)
       while (prev != pc)
       {
          align_fcn_name += prev->str;
-         prev            = chunk_get_next(prev);
+         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",
@@ -131,7 +131,7 @@ void align_same_func_call_params(void)
 
       add_str = nullptr;
 
-      if (align_root != nullptr)
+      if (align_root->IsNotNullChunk())
       {
          // Issue # 1395
          // can only align functions on the same brace level
@@ -160,14 +160,14 @@ void align_same_func_call_params(void)
                as_v.Flush();
             }
 
-            align_root = nullptr;
+            align_root = Chunk::NullChunkPtr;
          }
       }
       LOG_FMT(LASFCP, "%s(%d):\n", __func__, __LINE__);
 
-      if (align_root == nullptr)
+      if (align_root->IsNullChunk())
       {
-         LOG_FMT(LASFCP, "%s(%d):align_root is nullptr, Add pc '%s'\n", __func__, __LINE__, pc->text());
+         LOG_FMT(LASFCP, "%s(%d):align_root is null chunk, Add pc '%s'\n", __func__, __LINE__, pc->Text());
          fcn_as.Add(pc);
          align_root      = align_fcn;
          align_root_name = align_fcn_name;
@@ -187,7 +187,7 @@ void align_same_func_call_params(void)
          for (size_t idx = 0; idx < chunks.size(); idx++)
          {
             // show the chunk(s)
-            LOG_FMT(LASFCP, " [%s]", chunks[idx]->text());
+            LOG_FMT(LASFCP, " [%s]", chunks[idx]->Text());
 
             if (idx < chunks.size() - 1)
             {
@@ -199,7 +199,7 @@ void align_same_func_call_params(void)
 
          for (size_t idx = 0; idx < chunks.size(); idx++)
          {
-            LOG_FMT(LASFCP, "%s(%d): chunks[%zu] is [%s]\n", __func__, __LINE__, idx, chunks[idx]->text());
+            LOG_FMT(LASFCP, "%s(%d): chunks[%zu] is [%s]\n", __func__, __LINE__, idx, chunks[idx]->Text());
             // Issue #2368
 
             if (array_of_AlignStack.size() > idx)
@@ -229,7 +229,7 @@ void align_same_func_call_params(void)
                   }
                }
             }
-            LOG_FMT(LASFCP, "%s(%d): save the chunk %s\n", __func__, __LINE__, chunks[idx]->text());
+            LOG_FMT(LASFCP, "%s(%d): save the chunk %s\n", __func__, __LINE__, chunks[idx]->Text());
             array_of_AlignStack[idx].Add(chunks[idx]);
          }
       }
@@ -248,16 +248,16 @@ void align_same_func_call_params(void)
 } // align_same_func_call_params
 
 
-void align_params(chunk_t *start, deque<chunk_t *> &chunks)
+void align_params(Chunk *start, deque<Chunk *> &chunks)
 {
    LOG_FUNC_ENTRY();
 
    chunks.clear();
 
-   bool    hit_comma = true;
-   chunk_t *pc       = chunk_get_next_type(start, CT_FPAREN_OPEN, start->level);
+   bool  hit_comma = true;
+   Chunk *pc       = start->GetNextType(CT_FPAREN_OPEN, start->level);
 
-   while ((pc = chunk_get_next(pc)) != nullptr)
+   while ((pc = pc->GetNext())->IsNotNullChunk())
    {
       if (  chunk_is_newline(pc)
          || chunk_is_token(pc, CT_SEMICOLON)
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_same_func_call_params.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_same_func_call_params.h
index c7e122fc..73420292 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_same_func_call_params.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_same_func_call_params.h
@@ -15,7 +15,7 @@
 
 using namespace std;
 
-void align_params(chunk_t *start, deque<chunk_t *> &chunks);
+void align_params(Chunk *start, deque<Chunk *> &chunks);
 
 void align_same_func_call_params(void);
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_stack.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_stack.cpp
index c8e15bc5..e03ca3df 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_stack.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_stack.cpp
@@ -13,9 +13,7 @@
 #include "align_tab_column.h"
 #include "indent.h"
 #include "space.h"
-#if defined WITH_STACKID
 #include "unc_tools.h"                   // to get stackID and get_A_Number()
-#endif
 
 
 constexpr static auto LCURRENT = LAS;
@@ -27,9 +25,8 @@ using std::numeric_limits;
 
 void AlignStack::Start(size_t span, int thresh)
 {
-#if defined WITH_STACKID
    stackID = get_A_Number();   // for debugging purpose only
-#endif
+
    // produces much more log output. Use it only debugging purpose
    //WITH_STACKID_DEBUG;
 
@@ -86,14 +83,14 @@ void AlignStack::ReAddSkipped()
 }
 
 
-void AlignStack::Add(chunk_t *start, size_t seqnum)
+void AlignStack::Add(Chunk *start, size_t seqnum)
 {
    // produces much more log output. Use it only debugging purpose
    //WITH_STACKID_DEBUG;
    LOG_FUNC_ENTRY();
 
    LOG_FMT(LAS, "AlignStack::%s(%d): Candidate is '%s': orig_line is %zu, column is %zu, type is %s, level is %zu\n",
-           __func__, __LINE__, start->text(), start->orig_line, start->column, get_token_name(start->type), start->level);
+           __func__, __LINE__, start->Text(), start->orig_line, start->column, get_token_name(start->type), start->level);
    LOG_FMT(LAS, "AlignStack::%s(%d): seqnum is %zu\n", __func__, __LINE__, seqnum);
 
    // Assign a seqnum if needed
@@ -173,9 +170,15 @@ void AlignStack::Add(chunk_t *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_t *prev = start;
+   Chunk *prev = Chunk::NullChunkPtr;
+
+   if (start != nullptr)
+   {
+      prev = start;
+   }
 
-   while (  (prev = chunk_get_prev(prev)) != nullptr
+   while (  (prev = prev->GetPrev()) != nullptr
+         && prev->IsNotNullChunk()
          && (  chunk_is_ptr_operator(prev)
             || chunk_is_token(prev, CT_TPAREN_OPEN)))
    {
@@ -186,46 +189,51 @@ void AlignStack::Add(chunk_t *start, size_t seqnum)
    {
       return;
    }
-   chunk_t *ref = prev;
+   Chunk *ref = prev;
 
    if (chunk_is_newline(ref))
    {
-      ref = chunk_get_next(ref);
+      ref = ref->GetNext();
    }
    // Find the item that we are going to align.
-   chunk_t *ali = start;
+   Chunk *ali = Chunk::NullChunkPtr;
+
+   if (start != nullptr)
+   {
+      ali = start;
+   }
 
    if (m_star_style != SS_IGNORE)
    {
       // back up to the first '*' or '^' preceding the token
-      chunk_t *tmp_prev = chunk_get_prev(ali);
+      Chunk *tmp_prev = ali->GetPrev();
 
-      while (  chunk_is_star(tmp_prev)
+      while (  tmp_prev->IsStar()
             || chunk_is_msref(tmp_prev))
       {
          ali      = tmp_prev;
-         tmp_prev = chunk_get_prev(ali);
+         tmp_prev = ali->GetPrev();
       }
 
       if (chunk_is_token(tmp_prev, CT_TPAREN_OPEN))
       {
          ali      = tmp_prev;
-         tmp_prev = chunk_get_prev(ali);
+         tmp_prev = ali->GetPrev();
          // this is correct, even Coverity says:
          // CID 76021 (#1 of 1): Unused value (UNUSED_VALUE)returned_pointer: Assigning value from
-         // chunk_get_prev(ali, nav_e::ALL) to prev here, but that stored value is overwritten before it can be used.
+         // ali->GetPrev(nav_e::ALL) to prev here, but that stored value is overwritten before it can be used.
       }
    }
 
    if (m_amp_style != SS_IGNORE)
    {
       // back up to the first '&' preceding the token
-      chunk_t *tmp_prev = chunk_get_prev(ali);
+      Chunk *tmp_prev = ali->GetPrev();
 
       while (chunk_is_addr(tmp_prev))
       {
          ali      = tmp_prev;
-         tmp_prev = chunk_get_prev(ali);
+         tmp_prev = ali->GetPrev();
       }
    }
    log_rule_B("align_keep_extra_space");
@@ -233,20 +241,20 @@ void AlignStack::Add(chunk_t *start, size_t seqnum)
    // Tighten down the spacing between ref and start
    if (!options::align_keep_extra_space())
    {
-      size_t  tmp_col = ref->column;
-      chunk_t *tmp    = ref;
+      size_t tmp_col = ref->column;
+      Chunk  *tmp    = ref;
       LOG_FMT(LAS, "AlignStack::%s(%d): tmp_col is %zu\n",
               __func__, __LINE__, tmp_col);
 
-      while (  tmp != nullptr
+      while (  tmp->IsNotNullChunk()
             && tmp != start)
       {
-         chunk_t *next = chunk_get_next(tmp);
+         Chunk *next = tmp->GetNext();
 
-         if (next != nullptr)
+         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->orig_line, next->orig_col, next->Text(), next->level, get_token_name(next->type));
             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);
@@ -279,26 +287,26 @@ void AlignStack::Add(chunk_t *start, size_t seqnum)
 
       if (ref != ali)
       {
-         gap = ali->column - (ref->column + ref->len());
+         gap = ali->column - (ref->column + ref->Len());
       }
-      chunk_t *tmp = ali;
+      Chunk *tmp = ali;
 
       if (chunk_is_token(tmp, CT_TPAREN_OPEN))
       {
-         tmp = chunk_get_next(tmp);
+         tmp = tmp->GetNext();
       }
 
-      if (  (  chunk_is_star(tmp)
+      if (  (  tmp->IsStar()
             && m_star_style == SS_DANGLE)
          || (  chunk_is_addr(tmp)
             && m_amp_style == SS_DANGLE)
          || (  chunk_is_nullable(tmp)
             && (m_star_style == SS_DANGLE))
          || (  chunk_is_msref(tmp)
-            && m_star_style == SS_DANGLE)) // TODO: add m_msref_style
+            && m_star_style == SS_DANGLE))     // TODO: add m_msref_style
       {
          col_adj = start->column - ali->column;
-         gap     = start->column - (ref->column + ref->len());
+         gap     = start->column - (ref->column + ref->Len());
       }
       // See if this pushes out the max_col
       const size_t endcol = ali->column + col_adj
@@ -314,15 +322,15 @@ void AlignStack::Add(chunk_t *start, size_t seqnum)
       if (chunk_is_token(ali, 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);
+                 __func__, __LINE__, ali->Text(), start->Text(), ali->orig_line, ali->column, get_token_name(ali->type), ali->level);
       }
       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);
+                 __func__, __LINE__, ali->Text(), ali->orig_line, ali->column, get_token_name(ali->type), ali->level);
       }
       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);
+              __func__, __LINE__, ali->align.col_adj, ref->Text(), endcol);
 
       if (m_min_col > endcol)
       {
@@ -409,10 +417,10 @@ void AlignStack::Flush()
    if (Len() == 1)
    {
       // check if we have *one* typedef in the line
-      chunk_t *pc   = m_aligned.Get(0)->m_pc;
-      chunk_t *temp = chunk_get_prev_type(pc, CT_TYPEDEF, pc->level);
+      Chunk *pc   = m_aligned.Get(0)->m_pc;
+      Chunk *temp = pc->GetPrevType(CT_TYPEDEF, pc->level);
 
-      if (temp != nullptr)
+      if (temp->IsNotNullChunk())
       {
          if (pc->orig_line == temp->orig_line)
          {
@@ -431,15 +439,15 @@ void AlignStack::Flush()
 
    for (size_t idx = 0; idx < Len(); idx++)
    {
-      chunk_t *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);
+      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);
    }
 
    // Recalculate the max_col - it may have shifted since the last Add()
    for (size_t idx = 0; idx < Len(); idx++)
    {
-      chunk_t *pc = m_aligned.Get(idx)->m_pc;
+      Chunk *pc = m_aligned.Get(idx)->m_pc;
 
       // Set the column adjust and gap
       size_t col_adj = 0;
@@ -447,17 +455,17 @@ void AlignStack::Flush()
 
       if (pc != pc->align.ref)
       {
-         gap = pc->column - (pc->align.ref->column + pc->align.ref->len());
+         gap = pc->column - (pc->align.ref->column + pc->align.ref->Len());
       }
 
       if (m_star_style == SS_DANGLE)
       {
-         chunk_t *tmp = (chunk_is_token(pc, CT_TPAREN_OPEN)) ? chunk_get_next(pc) : pc;
+         Chunk *tmp = (chunk_is_token(pc, CT_TPAREN_OPEN)) ? pc->GetNext() : pc;
 
          if (chunk_is_ptr_operator(tmp))
          {
             col_adj = pc->align.start->column - pc->column;
-            gap     = pc->align.start->column - (pc->align.ref->column + pc->align.ref->len());
+            gap     = pc->align.start->column - (pc->align.ref->column + pc->align.ref->Len());
          }
       }
 
@@ -466,15 +474,15 @@ void AlignStack::Flush()
          // Adjust the width for signed numbers
          if (pc->align.start != nullptr)
          {
-            size_t start_len = pc->align.start->len();
+            size_t start_len = pc->align.start->Len();
 
             if (pc->align.start->type == CT_NEG)
             {
-               chunk_t *next = chunk_get_next(pc->align.start);
+               Chunk *next = pc->align.start->GetNext();
 
                if (chunk_is_token(next, CT_NUMBER))
                {
-                  start_len += next->len();
+                  start_len += next->Len();
                }
             }
             col_adj += start_len;
@@ -507,14 +515,14 @@ 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, 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);
    }
 
    for (size_t idx = 0; idx < Len(); idx++)
    {
       ce = m_aligned.Get(idx);
-      chunk_t      *pc = ce->m_pc;
+      Chunk        *pc = ce->m_pc;
 
       const size_t tmp_col = m_max_col - pc->align.col_adj;
 
@@ -541,8 +549,8 @@ void AlignStack::Flush()
       pc->align.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->orig_line, pc->orig_col, pc->Text(), tmp_col, pc->align.col_adj);
       align_to_column(pc, tmp_col);
    }
 
@@ -625,17 +633,17 @@ void AlignStack::Debug()
 
       for (size_t idx = 0; idx < length; idx++)
       {
-         chunk_t *pc = m_aligned.Get(idx)->m_pc;
+         Chunk *pc = m_aligned.Get(idx)->m_pc;
 
          if (chunk_is_token(pc, 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);
+                    __func__, __LINE__, idx, pc->Text(), pc->next->Text(), pc->orig_line, pc->orig_col, get_token_name(pc->type), pc->level, pc->brace_level);
          }
          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);
+                    __func__, __LINE__, idx, pc->Text(), pc->orig_line, pc->orig_col, get_token_name(pc->type), pc->level, pc->brace_level);
          }
       }
    }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_stack.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_stack.h
index ebd29dcc..0aeefd48 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_stack.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_stack.h
@@ -1,6 +1,6 @@
 /**
  * @file align_stack.h
- * Manages a align stack, which is just a pair of chunk stacks with a few
+ * Manages an align stack, which is just a pair of chunk stacks with a few
  * fancy functions.
  *
  * @author  Ben Gardner
@@ -24,7 +24,7 @@ public:
       SS_DANGLE   //! include prev * after add
    };
 
-   ChunkStack m_aligned;      //! contains the token that is aligned
+   ChunkStack m_aligned;      //! contains the tokens that are aligned
    ChunkStack m_skipped;      //! contains the tokens sent to Add()
    size_t     m_max_col;
    size_t     m_min_col;
@@ -36,12 +36,9 @@ public:
    bool       m_right_align;
    bool       m_absolute_thresh;
    StarStyle  m_star_style;
-   StarStyle  m_amp_style;  //! do not include the first item if it causes it to be indented
+   StarStyle  m_amp_style;
    bool       m_skip_first; //! do not include the first item if it causes it to be indented
-#define WITH_STACKID    1
-#if defined WITH_STACKID
-   size_t stackID;      // for debugging purpose only
-#endif
+   size_t     stackID;      //! for debugging purpose only
 
 
    AlignStack()
@@ -57,9 +54,7 @@ public:
       , m_star_style(SS_IGNORE)
       , m_amp_style(SS_IGNORE)
       , m_skip_first(false)
-#if defined WITH_STACKID
       , stackID(std::numeric_limits<std::size_t>::max()) // under linux 64 bits: 18446744073709551615
-#endif
       , m_last_added(0)
    {
    }
@@ -104,7 +99,7 @@ public:
     * @param pc      the chunk
     * @param seqnum  optional sequence number (0=assign one)
     */
-   void Add(chunk_t *pc, size_t seqnum = 0);
+   void Add(Chunk *pc, size_t seqnum = 0);
 
 
    //! Adds some newline and calls Flush() if needed
@@ -144,7 +139,6 @@ protected:
    void ReAddSkipped();
 };
 
-#if defined WITH_STACKID
 #define WITH_STACKID_DEBUG                                                                                  \
    if (stackID == std::numeric_limits<std::size_t>::max())                                                  \
    {                                                                                                        \
@@ -156,8 +150,5 @@ protected:
    {                                                                                                        \
       LOG_FMT(LAS, "AlignStack::%s(%d): stackID is %zu\n", __func__, __LINE__, stackID);                    \
    }
-#else
-#define WITH_STACKID_DEBUG    ;
-#endif
 
 #endif /* ALIGN_STACK_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_struct_initializers.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_struct_initializers.cpp
index 95b09da0..9085b9ac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_struct_initializers.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_struct_initializers.cpp
@@ -10,17 +10,17 @@
 #include "align_struct_initializers.h"
 
 #include "align_init_brace.h"
-#include "chunk_list.h"
+#include "chunk.h"
 
 
 void align_struct_initializers(void)
 {
    LOG_FUNC_ENTRY();
-   chunk_t *pc = chunk_get_head();
+   Chunk *pc = Chunk::GetHead();
 
-   while (pc != nullptr)
+   while (pc->IsNotNullChunk())
    {
-      chunk_t *prev = chunk_get_prev_ncnnl(pc);
+      Chunk *prev = pc->GetPrevNcNnl();
 
       if (  chunk_is_token(prev, CT_ASSIGN)
          && (  chunk_is_token(pc, CT_BRACE_OPEN)
@@ -29,6 +29,6 @@ void align_struct_initializers(void)
       {
          align_init_brace(pc);
       }
-      pc = chunk_get_next_type(pc, CT_BRACE_OPEN, -1);
+      pc = pc->GetNextType(CT_BRACE_OPEN, -1);
    }
 } // align_struct_initializers
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_struct_initializers.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_struct_initializers.h
index 1c71d5af..1c71d5af 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_struct_initializers.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_struct_initializers.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_tab_column.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_tab_column.cpp
index 8d91b0ff..8d91b0ff 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_tab_column.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_tab_column.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_tab_column.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_tab_column.h
index 9e57baa0..9e57baa0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_tab_column.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_tab_column.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_tools.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_tools.cpp
index bd067be5..5cfd64e5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_tools.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_tools.cpp
@@ -13,30 +13,36 @@
 #include "uncrustify.h"
 
 
-chunk_t *skip_c99_array(chunk_t *sq_open)
+Chunk *skip_c99_array(Chunk *sq_open)
 {
    if (chunk_is_token(sq_open, CT_SQUARE_OPEN))
    {
-      chunk_t *tmp = chunk_get_next_nc(chunk_skip_to_match(sq_open));
+      Chunk *tmp = chunk_skip_to_match(sq_open);
+
+      if (tmp == nullptr)
+      {
+         tmp = Chunk::NullChunkPtr;
+      }
+      tmp = tmp->GetNextNc();
 
       if (chunk_is_token(tmp, CT_ASSIGN))
       {
-         return(chunk_get_next_nc(tmp));
+         return(tmp->GetNextNc());
       }
    }
    return(nullptr);
 } // skip_c99_array
 
 
-chunk_t *scan_ib_line(chunk_t *start, bool first_pass)
+Chunk *scan_ib_line(Chunk *start, bool first_pass)
 {
    UNUSED(first_pass);
    LOG_FUNC_ENTRY();
-   chunk_t *prev_match = nullptr;
-   size_t  idx         = 0;
+   Chunk  *prev_match = nullptr;
+   size_t idx         = 0;
 
    // Skip past C99 "[xx] =" stuff
-   chunk_t *tmp = skip_c99_array(start);
+   Chunk *tmp = skip_c99_array(start);
 
    if (tmp != nullptr)
    {
@@ -44,25 +50,29 @@ chunk_t *scan_ib_line(chunk_t *start, bool first_pass)
       start            = tmp;
       cpd.al_c99_array = true;
    }
-   chunk_t *pc = start;
+   Chunk *pc = start;
 
    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));
    }
+   else
+   {
+      pc = Chunk::NullChunkPtr;
+   }
 
-   while (  pc != nullptr
+   while (  pc->IsNotNullChunk()
          && !chunk_is_newline(pc)
          && pc->level >= start->level)
    {
       //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->column, pc->orig_col, pc->orig_line);
 
-      chunk_t *next = chunk_get_next(pc);
+      Chunk *next = pc->GetNext();
 
-      if (  next == nullptr
-         || chunk_is_comment(next))
+      if (  next->IsNullChunk()
+         || next->IsComment())
       {
          // do nothing
       }
@@ -82,8 +92,8 @@ chunk_t *scan_ib_line(chunk_t *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));
+            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;
             cpd.al[cpd.al_cnt].len  = token_width;
@@ -124,7 +134,7 @@ chunk_t *scan_ib_line(chunk_t *start, bool first_pass)
                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);
+                          __func__, __LINE__, prev_match->Text(), prev_match->orig_line, prev_match->orig_col);
                   int min_col_diff = pc->column - prev_match->column;
                   int cur_col_diff = cpd.al[idx].col - cpd.al[idx - 1].col;
 
@@ -142,7 +152,7 @@ chunk_t *scan_ib_line(chunk_t *start, bool first_pass)
          }
          prev_match = pc;
       }
-      pc = chunk_get_next_nc(pc);
+      pc = pc->GetNextNc();
    }
    return(pc);
 } // scan_ib_line
@@ -158,16 +168,20 @@ void ib_shift_out(size_t idx, size_t num)
 } // ib_shift_out
 
 
-chunk_t *step_back_over_member(chunk_t *pc)
+Chunk *step_back_over_member(Chunk *pc)
 {
-   chunk_t *tmp;
+   if (pc == nullptr)
+   {
+      pc = Chunk::NullChunkPtr;
+   }
+   Chunk *tmp = pc->GetPrevNcNnl();
 
    // Skip over any class stuff: bool CFoo::bar()
-   while (  ((tmp = chunk_get_prev_ncnnl(pc)) != nullptr)
+   while (  tmp->IsNotNullChunk()
          && chunk_is_token(tmp, CT_DC_MEMBER))
    {
-      // TODO: verify that we are pointing at something sane?
-      pc = chunk_get_prev_ncnnl(tmp);
+      pc  = tmp->GetPrevNcNnl();
+      tmp = pc->GetPrevNcNnl();
    }
    return(pc);
 } // step_back_over_member
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_tools.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_tools.h
index b22c5f3f..fe059dd5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_tools.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_tools.h
@@ -10,7 +10,7 @@
 #ifndef ALIGN_TOOLS_H_INCLUDED
 #define ALIGN_TOOLS_H_INCLUDED
 
-#include "chunk_list.h"
+#include "chunk.h"
 #include "uncrustify_types.h"
 
 
@@ -31,7 +31,7 @@
  * @return the chunk after the '=' if the check succeeds
  * @return nullptr in all other cases
  */
-chunk_t *skip_c99_array(chunk_t *sq_open);
+Chunk *skip_c99_array(Chunk *sq_open);
 
 /**
  * Scans a line for stuff to align on.
@@ -39,10 +39,10 @@ chunk_t *skip_c99_array(chunk_t *sq_open);
  * We trigger on BRACE_OPEN, FPAREN_OPEN, ASSIGN, and COMMA.
  * We want to align the NEXT item.
  */
-chunk_t *scan_ib_line(chunk_t *start, bool first_pass);
+Chunk *scan_ib_line(Chunk *start, bool first_pass);
 
 void ib_shift_out(size_t idx, size_t num);
 
-chunk_t *step_back_over_member(chunk_t *pc);
+Chunk *step_back_over_member(Chunk *pc);
 
 #endif /* ALIGN_TOOLS_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_trailing_comments.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_trailing_comments.cpp
index 2c94866b..7da86018 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_trailing_comments.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_trailing_comments.cpp
@@ -35,7 +35,7 @@ void align_stack(ChunkStack &cs, size_t col, bool align_single, log_sev_t sev)
          && (cs.Len() == 1)))
    {
       LOG_FMT(sev, "%s(%d): max_col=%zu\n", __func__, __LINE__, col);
-      chunk_t *pc;
+      Chunk *pc;
 
       while ((pc = cs.Pop_Back()) != nullptr)
       {
@@ -43,19 +43,19 @@ void align_stack(ChunkStack &cs, size_t col, bool align_single, log_sev_t sev)
          chunk_flags_set(pc, 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->orig_line, pc->column);
       }
    }
    cs.Reset();
 } // align_stack
 
 
-chunk_t *align_trailing_comments(chunk_t *start)
+Chunk *align_trailing_comments(Chunk *start)
 {
    LOG_FUNC_ENTRY();
    size_t       min_col  = 0;
    size_t       min_orig = 0;
-   chunk_t      *pc      = start;
+   Chunk        *pc      = start;
    const size_t lvl      = start->brace_level;
    size_t       nl_count = 0;
    ChunkStack   cs;
@@ -75,7 +75,7 @@ chunk_t *align_trailing_comments(chunk_t *start)
    // Find the max column
    log_rule_B("align_right_cmt_span");
 
-   while (  pc != nullptr
+   while (  pc->IsNotNullChunk()
          && (nl_count < options::align_right_cmt_span()))
    {
       if (  pc->flags.test(PCF_RIGHT_COMMENT)
@@ -84,7 +84,7 @@ chunk_t *align_trailing_comments(chunk_t *start)
          if (  same_level
             && pc->brace_level != lvl)
          {
-            pc = chunk_get_prev(pc);
+            pc = pc->GetPrev();
             break;
          }
          cmt_type_cur = get_comment_align_type(pc);
@@ -92,7 +92,7 @@ chunk_t *align_trailing_comments(chunk_t *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(),
+                    __func__, __LINE__, pc->orig_line, min_col, pc->column, pc->Len(),
                     get_token_name(pc->type));
 
             if (  min_orig == 0
@@ -109,7 +109,7 @@ chunk_t *align_trailing_comments(chunk_t *start)
       {
          nl_count += pc->nl_count;
       }
-      pc = chunk_get_next(pc);
+      pc = pc->GetNext();
    }
    // Start with the minimum original column
    col = min_orig;
@@ -142,19 +142,20 @@ chunk_t *align_trailing_comments(chunk_t *start)
    }
    align_stack(cs, col, (intended_col != 0), LALTC);
 
-   return(chunk_get_next(pc));
+   return(pc->GetNext());
 } // align_trailing_comments
 
 
-comment_align_e get_comment_align_type(chunk_t *cmt)
+comment_align_e get_comment_align_type(Chunk *cmt)
 {
-   chunk_t         *prev;
+   Chunk           *prev;
    comment_align_e cmt_type = comment_align_e::REGULAR;
 
    log_rule_B("align_right_cmt_mix");
 
    if (  !options::align_right_cmt_mix()
-      && ((prev = chunk_get_prev(cmt)) != nullptr))
+      && cmt != nullptr
+      && ((prev = cmt->GetPrev())->IsNotNullChunk()))
    {
       if (  chunk_is_token(prev, CT_PP_ENDIF)
          || chunk_is_token(prev, CT_PP_ELSE)
@@ -162,7 +163,7 @@ comment_align_e get_comment_align_type(chunk_t *cmt)
          || chunk_is_token(prev, CT_BRACE_CLOSE))
       {
          // TODO: make the magic 3 configurable
-         if ((cmt->column - (prev->column + prev->len())) < 3)
+         if ((cmt->column - (prev->column + prev->Len())) < 3)
          {
             cmt_type = (chunk_is_token(prev, CT_PP_ENDIF)) ? comment_align_e::ENDIF : comment_align_e::BRACE;
          }
@@ -176,7 +177,7 @@ void align_right_comments(void)
 {
    LOG_FUNC_ENTRY();
 
-   for (chunk_t *pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next(pc))
+   for (Chunk *pc = Chunk::GetHead(); pc->IsNotNullChunk(); pc = pc->GetNext())
    {
       if (  chunk_is_token(pc, CT_COMMENT)
          || chunk_is_token(pc, CT_COMMENT_CPP)
@@ -184,7 +185,7 @@ void align_right_comments(void)
       {
          if (get_chunk_parent_type(pc) == CT_COMMENT_END)
          {
-            chunk_t *prev = chunk_get_prev(pc);
+            Chunk *prev = pc->GetPrev();
 
             log_rule_B("align_right_cmt_gap");
 
@@ -220,9 +221,9 @@ void align_right_comments(void)
       }
    }
 
-   chunk_t *pc = chunk_get_head();
+   Chunk *pc = Chunk::GetHead();
 
-   while (pc != nullptr)
+   while (pc->IsNotNullChunk())
    {
       if (pc->flags.test(PCF_RIGHT_COMMENT))
       {
@@ -230,7 +231,7 @@ void align_right_comments(void)
       }
       else
       {
-         pc = chunk_get_next(pc);
+         pc = pc->GetNext();
       }
    }
 } // align_right_comments
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_trailing_comments.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_trailing_comments.h
index a7a7b743..d85c07d0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_trailing_comments.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_trailing_comments.h
@@ -10,7 +10,7 @@
 #ifndef ALIGN_TRAILING_COMMENTS_H_INCLUDED
 #define ALIGN_TRAILING_COMMENTS_H_INCLUDED
 
-#include "chunk_list.h"
+#include "chunk.h"
 #include "ChunkStack.h"
 
 enum class comment_align_e : unsigned int
@@ -35,9 +35,9 @@ enum class comment_align_e : unsigned int
  * @param start   Start point
  * @return        pointer the last item looked at
  */
-chunk_t *align_trailing_comments(chunk_t *start);
+Chunk *align_trailing_comments(Chunk *start);
 
-comment_align_e get_comment_align_type(chunk_t *cmt);
+comment_align_e get_comment_align_type(Chunk *cmt);
 
 void align_stack(ChunkStack &cs, size_t col, bool align_single, log_sev_t sev);
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_typedefs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_typedefs.cpp
index face575c..56fc30a0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_typedefs.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_typedefs.cpp
@@ -31,25 +31,25 @@ void align_typedefs(size_t span)
    log_rule_B("align_typedef_amp_style");
    as.m_amp_style = static_cast<AlignStack::StarStyle>(options::align_typedef_amp_style());
 
-   chunk_t *c_typedef = nullptr;
-   chunk_t *pc        = chunk_get_head();
+   Chunk *c_typedef = Chunk::NullChunkPtr;
+   Chunk *pc        = Chunk::GetHead();
 
-   while (pc != nullptr)
+   while (pc->IsNotNullChunk())
    {
       if (chunk_is_newline(pc))
       {
          as.NewLines(pc->nl_count);
-         c_typedef = nullptr;
+         c_typedef = Chunk::NullChunkPtr;
       }
-      else if (c_typedef != nullptr)
+      else if (c_typedef->IsNotNullChunk())
       {
          if (pc->flags.test(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);
-            c_typedef = nullptr;
+                    pc->Text(), pc->orig_line, pc->orig_col);
+            c_typedef = Chunk::NullChunkPtr;
          }
       }
       else
@@ -59,7 +59,7 @@ void align_typedefs(size_t span)
             c_typedef = pc;
          }
       }
-      pc = chunk_get_next(pc);
+      pc = pc->GetNext();
    }
    as.End();
 } // align_typedefs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_typedefs.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_typedefs.h
index 2902d0d2..2902d0d2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_typedefs.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_typedefs.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_var_def_brace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_var_def_brace.cpp
index 637fb054..adbc5daf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_var_def_brace.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_var_def_brace.cpp
@@ -18,18 +18,18 @@ constexpr static auto LCURRENT = LAVDB;
 using namespace uncrustify;
 
 
-chunk_t *align_var_def_brace(chunk_t *start, size_t span, size_t *p_nl_count)
+Chunk *align_var_def_brace(Chunk *start, size_t span, size_t *p_nl_count)
 {
    LOG_FUNC_ENTRY();
 
-   if (start == nullptr)
+   if (start->IsNullChunk())
    {
       return(nullptr);
    }
-   chunk_t *next;
-   size_t  myspan   = span;
-   size_t  mythresh = 0;
-   size_t  mygap    = 0;
+   Chunk  *next;
+   size_t myspan   = span;
+   size_t mythresh = 0;
+   size_t mygap    = 0;
 
    // Override the span, if this is a struct/union
    if (  get_chunk_parent_type(start) == CT_STRUCT
@@ -59,20 +59,20 @@ chunk_t *align_var_def_brace(chunk_t *start, size_t span, size_t *p_nl_count)
       mygap = options::align_var_def_gap();
    }
    // can't be any variable definitions in a "= {" block
-   chunk_t *prev = chunk_get_prev_ncnnl(start);
+   Chunk *prev = start->GetPrevNcNnl();
 
    if (chunk_is_token(prev, 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->type), start->orig_line);
 
-      chunk_t *pc = chunk_get_next_type(start, CT_BRACE_CLOSE, start->level);
-      return(chunk_get_next_ncnnl(pc));
+      Chunk *pc = start->GetNextType(CT_BRACE_CLOSE, start->level);
+      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->elided_text(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->type), start->orig_line);
 
    log_rule_B("align_var_def_inline");
    auto const align_mask =
@@ -111,10 +111,11 @@ chunk_t *align_var_def_brace(chunk_t *start, size_t span, size_t *p_nl_count)
    bool did_this_line = false;
 
    log_rule_B("align_mix_var_proto");
-   bool    fp_active = options::align_mix_var_proto();
-   chunk_t *pc       = chunk_get_next(start);
+   bool  fp_active = options::align_mix_var_proto();
+   Chunk *pc       = start->GetNext();
 
    while (  pc != nullptr
+         && pc->IsNotNullChunk()
          && (  pc->level >= start->level
             || pc->level == 0))
    {
@@ -125,11 +126,11 @@ chunk_t *align_var_def_brace(chunk_t *start, size_t span, size_t *p_nl_count)
       }
       else
       {
-         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\n",
+                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text(), get_token_name(pc->type));
       }
 
-      if (chunk_is_comment(pc))
+      if (pc->IsComment())
       {
          if (pc->nl_count > 0)
          {
@@ -138,7 +139,7 @@ chunk_t *align_var_def_brace(chunk_t *start, size_t span, size_t *p_nl_count)
             as_at.NewLines(pc->nl_count);
             as_br.NewLines(pc->nl_count);
          }
-         pc = chunk_get_next(pc);
+         pc = pc->GetNext();
          continue;
       }
 
@@ -153,16 +154,16 @@ chunk_t *align_var_def_brace(chunk_t *start, size_t span, size_t *p_nl_count)
                && 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);
+                    __func__, __LINE__, pc->Text(), pc->orig_line, pc->orig_col, pc->level);
 
-            chunk_t *toadd;
+            Chunk *toadd;
 
             log_rule_B("align_on_operator");
 
             if (  get_chunk_parent_type(pc) == CT_OPERATOR
                && options::align_on_operator())
             {
-               toadd = chunk_get_prev_ncnnl(pc);
+               toadd = pc->GetPrevNcNnl();
             }
             else
             {
@@ -209,7 +210,7 @@ chunk_t *align_var_def_brace(chunk_t *start, size_t span, size_t *p_nl_count)
       // Done with this brace set?
       if (chunk_is_token(pc, CT_BRACE_CLOSE))
       {
-         pc = chunk_get_next(pc);
+         pc = pc->GetNext();
          break;
       }
 
@@ -227,13 +228,13 @@ chunk_t *align_var_def_brace(chunk_t *start, size_t span, size_t *p_nl_count)
             *p_nl_count += pc->nl_count;
          }
       }
-      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, pc->brace_level is %zu\n",
+              __func__, __LINE__, chunk_is_newline(pc) ? "Newline" : pc->Text(), pc->level, pc->brace_level);
 
       if (!chunk_is_newline(pc))
       {
-         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->orig_line, pc->orig_col, pc->Text(), get_token_name(pc->type));
 
          if (chunk_is_not_token(pc, CT_IGNORED))
          {
@@ -245,7 +246,7 @@ chunk_t *align_var_def_brace(chunk_t *start, size_t span, size_t *p_nl_count)
       // don't align stuff inside parenthesis/squares/angles
       if (pc->level > pc->brace_level)
       {
-         pc = chunk_get_next(pc);
+         pc = pc->GetNext();
          continue;
       }
 
@@ -262,8 +263,8 @@ chunk_t *align_var_def_brace(chunk_t *start, size_t span, size_t *p_nl_count)
       {
          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->orig_line, pc->orig_col, pc->level);
 
          if (!did_this_line)
          {
@@ -271,27 +272,32 @@ chunk_t *align_var_def_brace(chunk_t *start, size_t span, size_t *p_nl_count)
                && (as.m_star_style == AlignStack::SS_INCLUDE))
             {
                // we must look after the previous token
-               chunk_t *prev_local = pc->prev;
+               Chunk *prev_local = pc->prev;
 
                while (  chunk_is_token(prev_local, CT_PTR_TYPE)
                      || chunk_is_token(prev_local, 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));
+                          __func__, __LINE__, prev_local->Text(), get_token_name(prev_local->type));
                   prev_local = prev_local->prev;
                }
                pc = prev_local->next;
             }
-            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);
+            // we must look after the previous token
+            Chunk *prev_local = pc->prev;
 
-            as.Add(step_back_over_member(pc));
+            if (chunk_is_not_token(prev_local, 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);
 
+               as.Add(step_back_over_member(pc));
+            }
             log_rule_B("align_var_def_colon");
 
             if (options::align_var_def_colon())
             {
-               next = chunk_get_next_nc(pc);
+               next = pc->GetNextNc();
 
                if (chunk_is_token(next, CT_BIT_COLON))
                {
@@ -304,7 +310,7 @@ chunk_t *align_var_def_brace(chunk_t *start, size_t span, size_t *p_nl_count)
             {
                next = pc;
 
-               while ((next = chunk_get_next_nc(next)) != nullptr)
+               while ((next = next->GetNextNc())->IsNotNullChunk())
                {
                   if (chunk_is_token(next, CT_ATTRIBUTE))
                   {
@@ -335,7 +341,7 @@ chunk_t *align_var_def_brace(chunk_t *start, size_t span, size_t *p_nl_count)
          LOG_FMT(LAVDB, "%s(%d): b-did_this_line is %s\n",
                  __func__, __LINE__, did_this_line ? "TRUE" : "FALSE");
       }
-      pc = chunk_get_next(pc);
+      pc = pc->GetNext();
    }
    as.End();
    as_bc.End();
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_var_def_brace.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_var_def_brace.h
index 0cc133ea..6d06adf9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/align_var_def_brace.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/align_var_def_brace.h
@@ -10,13 +10,13 @@
 #ifndef ALIGN_VAR_DEF_BRACE_H_INCLUDED
 #define ALIGN_VAR_DEF_BRACE_H_INCLUDED
 
-#include "chunk_list.h"
+#include "chunk.h"
 
 /**
  * Scan everything at the current level until the close brace and find the
  * variable def align column.  Also aligns bit-colons, but that assumes that
  * bit-types are the same! But that should always be the case...
  */
-chunk_t *align_var_def_brace(chunk_t *pc, size_t span, size_t *nl_count);
+Chunk *align_var_def_brace(Chunk *pc, size_t span, size_t *nl_count);
 
 #endif /* ALIGN_VAR_DEF_BRACE_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/args.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/args.cpp
index 4147bd91..a03bbe00 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/args.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/args.cpp
@@ -99,7 +99,7 @@ const char *Args::Params(const char *token, size_t &index)
             SetUsed(idx);
             return(m_values[idx]);
          }
-         return("");
+         return(nullptr);
       }
    }
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/args.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/args.h
index 712fbd59..712fbd59 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/args.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/args.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/backup.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/backup.cpp
index e85ecf97..e85ecf97 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/backup.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/backup.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/backup.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/backup.h
index 3e51f863..3e51f863 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/backup.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/backup.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/base_types.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/base_types.h
index 1e98b0ac..1e98b0ac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/base_types.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/base_types.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/brace_cleanup.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/brace_cleanup.cpp
index 0810c04c..5462b480 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/brace_cleanup.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/brace_cleanup.cpp
@@ -39,7 +39,7 @@ using std::stringstream;
 struct BraceState
 {
    std::vector<ParseFrame> frames     = {};
-   c_token_t               in_preproc = CT_NONE;
+   E_Token                 in_preproc = CT_NONE;
    int                     pp_level   = 0;
    bool                    consumed   = false;
 };
@@ -54,10 +54,10 @@ struct BraceState
  * @retval true   done with this chunk
  * @retval false  keep processing
  */
-static bool close_statement(ParseFrame &frm, chunk_t *pc, const BraceState &braceState);
+static bool close_statement(ParseFrame &frm, Chunk *pc, const BraceState &braceState);
 
 
-static size_t preproc_start(BraceState &braceState, ParseFrame &frm, chunk_t *pc);
+static size_t preproc_start(BraceState &braceState, ParseFrame &frm, Chunk *pc);
 
 
 static void print_stack(log_sev_t logsev, const char *str, const ParseFrame &frm);
@@ -67,19 +67,19 @@ static void print_stack(log_sev_t logsev, const char *str, const ParseFrame &frm
  * pc is a CT_WHILE.
  * Scan backwards to see if we find a brace/vbrace with the parent set to CT_DO
  */
-static bool maybe_while_of_do(chunk_t *pc);
+static bool maybe_while_of_do(Chunk *pc);
 
 
 /**
  * @param after  determines: true  - insert_vbrace_close_after(pc, frm)
  *                           false - insert_vbrace_open_before(pc, frm)
  */
-static chunk_t *insert_vbrace(chunk_t *pc, bool after, const ParseFrame &frm);
+static Chunk *insert_vbrace(Chunk *pc, bool after, const ParseFrame &frm);
 
 #define insert_vbrace_close_after(pc, frm)    insert_vbrace(pc, true, frm)
 #define insert_vbrace_open_before(pc, frm)    insert_vbrace(pc, false, frm)
 
-static void parse_cleanup(BraceState &braceState, ParseFrame &frm, chunk_t *pc);
+static void parse_cleanup(BraceState &braceState, ParseFrame &frm, Chunk *pc);
 
 
 /**
@@ -95,7 +95,7 @@ static void parse_cleanup(BraceState &braceState, ParseFrame &frm, chunk_t *pc);
  *
  * @return true - done with this chunk, false - keep processing
  */
-static bool check_complex_statements(ParseFrame &frm, chunk_t *pc, const BraceState &braceState);
+static bool check_complex_statements(ParseFrame &frm, Chunk *pc, const BraceState &braceState);
 
 
 /**
@@ -107,21 +107,21 @@ static bool check_complex_statements(ParseFrame &frm, chunk_t *pc, const BraceSt
  *
  * @return true - done with this chunk, false - keep processing
  */
-static bool handle_complex_close(ParseFrame &frm, chunk_t *pc, const BraceState &braceState);
+static bool handle_complex_close(ParseFrame &frm, Chunk *pc, const BraceState &braceState);
 
 
 //! We're on a 'namespace' skip the word and then set the parent of the braces.
-static void mark_namespace(chunk_t *pns);
+static void mark_namespace(Chunk *pns);
 
 
-static size_t preproc_start(BraceState &braceState, ParseFrame &frm, chunk_t *pc)
+static size_t preproc_start(BraceState &braceState, ParseFrame &frm, Chunk *pc)
 {
    LOG_FUNC_ENTRY();
    const size_t pp_level = braceState.pp_level;
 
-   chunk_t      *next = chunk_get_next_ncnnl(pc);
+   Chunk        *next = pc->GetNextNcNnl();
 
-   if (next == nullptr)
+   if (next->IsNullChunk())
    {
       return(pp_level);
    }
@@ -185,12 +185,12 @@ void brace_cleanup(void)
 
    BraceState braceState;
    ParseFrame frm{};
-   chunk_t    *pc = chunk_get_head();
+   Chunk      *pc = Chunk::GetHead();
 
-   while (pc != nullptr)
+   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_FMT(LTOK, "%s(%d): orig_line is %zu, orig_col is %zu, Text() is '%s'\n",
+              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text());
 
       // Check for leaving a #define body
       if (  braceState.in_preproc != CT_NONE
@@ -199,6 +199,14 @@ void brace_cleanup(void)
          if (braceState.in_preproc == CT_PP_DEFINE)
          {
             // out of the #define body, restore the frame
+            size_t brace_level = frm.brace_level;
+
+            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);
+            }
             fl_pop(braceState.frames, frm);
          }
          braceState.in_preproc = CT_NONE;
@@ -244,7 +252,7 @@ void brace_cleanup(void)
        * #define bodies get the full formatting treatment
        * Also need to pass in the initial '#' to close out any virtual braces.
        */
-      if (  !chunk_is_comment(pc)
+      if (  !pc->IsComment()
          && !chunk_is_newline(pc)
          && !chunk_is_token(pc, CT_ATTRIBUTE)
          && !chunk_is_token(pc, CT_IGNORED)            // Issue #2279
@@ -255,49 +263,49 @@ void brace_cleanup(void)
          parse_cleanup(braceState, frm, pc);
          print_stack(LBCSAFTER, (chunk_is_token(pc, CT_VBRACE_CLOSE)) ? "Virt-}\n" : pc->str.c_str(), frm);
       }
-      pc = chunk_get_next(pc);
+      pc = pc->GetNext();
    }
-//   pc = chunk_get_head();
+//   pc = Chunk::GetHead();
 //
-//   while (pc != nullptr)
+//   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_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_t *template_end = chunk_get_next_type(pc, CT_SEMICOLON, pc->level);
+//         Chunk *template_end = pc->GetNextType(CT_SEMICOLON, pc->level);
 //
 //         // look for a parameter pack
-//         while (pc != nullptr)
+//         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_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_t *parameter_pack = pc;
+//               Chunk *parameter_pack = pc;
 //
 //               // look for a token with the same text
-//               while (pc != nullptr)
+//               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 = chunk_get_next(pc);
+//                  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)
+//                  if (strcmp(pc->Text(), parameter_pack->Text()) == 0)
 //                  {
 //                     set_chunk_type(pc, CT_PARAMETER_PACK);
 //                  }
 //               }
 //            }
-//            pc = chunk_get_next(pc);
+//            pc = pc->GetNext();
 //
 //            if (pc == template_end)
 //            {
@@ -305,28 +313,28 @@ void brace_cleanup(void)
 //            }
 //         }
 //      }
-//      pc = chunk_get_next(pc);
+//      pc = pc->GetNext();
 //   }
 } // brace_cleanup
 
 
-static bool maybe_while_of_do(chunk_t *pc)
+static bool maybe_while_of_do(Chunk *pc)
 {
    LOG_FUNC_ENTRY();
 
-   chunk_t *prev = chunk_get_prev_ncnnl(pc);
+   Chunk *prev = pc->GetPrevNcNnl();
 
-   if (  prev == nullptr
+   if (  prev->IsNullChunk()
       || !prev->flags.test(PCF_IN_PREPROC))
    {
       return(false);
    }
 
    // Find the chunk before the preprocessor
-   while (  prev != nullptr
+   while (  prev->IsNullChunk()
          && prev->flags.test(PCF_IN_PREPROC))
    {
-      prev = chunk_get_prev_ncnnl(prev);
+      prev = prev->GetPrevNcNnl();
    }
 
    if (  (  chunk_is_token(prev, CT_VBRACE_CLOSE)
@@ -393,7 +401,7 @@ static bool maybe_while_of_do(chunk_t *pc)
  * When a #define is entered, the current frame is pushed and cleared.
  * When a #define is exited, the frame is popped.
  */
-static void parse_cleanup(BraceState &braceState, ParseFrame &frm, chunk_t *pc)
+static void parse_cleanup(BraceState &braceState, ParseFrame &frm, Chunk *pc)
 {
    LOG_FUNC_ENTRY();
 
@@ -404,8 +412,8 @@ static void parse_cleanup(BraceState &braceState, ParseFrame &frm, chunk_t *pc)
    log_pcf_flags(LTOK, pc->flags);
 
    // 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->orig_line, get_token_name(pc->type), 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);
 
@@ -414,12 +422,12 @@ static void parse_cleanup(BraceState &braceState, ParseFrame &frm, chunk_t *pc)
       && !chunk_is_semicolon(pc)
       && chunk_is_not_token(pc, CT_BRACE_CLOSE)
       && chunk_is_not_token(pc, CT_VBRACE_CLOSE)
-      && !chunk_is_str(pc, ")", 1)
-      && !chunk_is_str(pc, "]", 1))
+      && !chunk_is_str(pc, ")")
+      && !chunk_is_str(pc, "]"))
    {
       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(),
+              __func__, __LINE__, pc->orig_line, pc->Text(),
               pc->flags.test(PCF_STMT_START) ? "stmt" : "expr", frm.stmt_count,
               frm.expr_count);
    }
@@ -498,7 +506,7 @@ static void parse_cleanup(BraceState &braceState, ParseFrame &frm, chunk_t *pc)
             || (frm.top().type == CT_SPAREN_OPEN)))
       {
          // TODO: fix enum hack
-         set_chunk_type(pc, static_cast<c_token_t>(frm.top().type + 1));
+         set_chunk_type(pc, static_cast<E_Token>(frm.top().type + 1));
 
          if (chunk_is_token(pc, CT_SPAREN_CLOSE))
          {
@@ -508,30 +516,30 @@ static void parse_cleanup(BraceState &braceState, ParseFrame &frm, chunk_t *pc)
       }
 
       // Make sure the open / close match
-      if (chunk_is_not_token(pc, (c_token_t)(frm.top().type + 1)))
+      if (chunk_is_not_token(pc, (E_Token)(frm.top().type + 1)))
       {
-         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));
-         paren_stack_entry_t AA = frm.top();                // Issue #3055
-
-         if (AA.type != CT_EOF)
-         {
-            LOG_FMT(LWARN, "%s(%d): (frm.top().type + 1) is %s\n",
-                    __func__, __LINE__, get_token_name((c_token_t)(frm.top().type + 1)));
-         }
-
-         if (pc->flags.test(PCF_IN_PREPROC))                // Issue #3113
+         if (pc->flags.test(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));
+            paren_stack_entry_t AA = frm.top();                // Issue #3055
+
+            if (AA.type != CT_EOF)
+            {
+               LOG_FMT(LWARN, "%s(%d): (frm.top().type + 1) is %s\n",
+                       __func__, __LINE__, get_token_name((E_Token)(frm.top().type + 1)));
+            }
+
             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),
+                       pc->Text(), get_token_name(frm.top().pc->type),
                        frm.top().pc->orig_line);
                print_stack(LBCSPOP, "=Error  ", frm);
                cpd.error_count++;
@@ -560,9 +568,9 @@ static void parse_cleanup(BraceState &braceState, ParseFrame &frm, chunk_t *pc)
          pc->brace_level = 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));
-         frm.pop(__func__, __LINE__);
+         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));
+         frm.pop(__func__, __LINE__, pc);
          print_stack(LBCSPOP, "-Close  ", frm);
 
          if (  frm.top().stage == brace_stage_e::NONE
@@ -602,7 +610,7 @@ static void parse_cleanup(BraceState &braceState, ParseFrame &frm, chunk_t *pc)
           */
          if (language_is_set(LANG_PAWN))
          {
-            chunk_t *tmp = chunk_get_next_ncnnl(pc);
+            Chunk *tmp = pc->GetNextNcNnl();
 
             if (  chunk_is_not_token(tmp, CT_SEMICOLON)
                && chunk_is_not_token(tmp, CT_VSEMICOLON))
@@ -631,16 +639,16 @@ static void parse_cleanup(BraceState &braceState, ParseFrame &frm, chunk_t *pc)
       }
    }
    // Get the parent type for brace and parenthesis open
-   c_token_t parent = get_chunk_parent_type(pc);
+   E_Token parent = get_chunk_parent_type(pc);
 
    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))
    {
-      chunk_t *prev = chunk_get_prev_ncnnl(pc);
+      Chunk *prev = pc->GetPrevNcNnl();
 
-      if (prev != nullptr)
+      if (prev->IsNotNullChunk())
       {
          if (  chunk_is_token(pc, CT_PAREN_OPEN)
             || chunk_is_token(pc, CT_FPAREN_OPEN)
@@ -703,7 +711,7 @@ static void parse_cleanup(BraceState &braceState, ParseFrame &frm, chunk_t *pc)
                parent = CT_RETURN;
             }
             // Carry through CT_ENUM parent in NS_ENUM (type, name) {
-            // for the vim editor }
+            // only to help the vim command }
             else if (  chunk_is_token(prev, CT_FPAREN_CLOSE)
                     && language_is_set(LANG_OC)
                     && get_chunk_parent_type(prev) == CT_ENUM)
@@ -743,7 +751,7 @@ static void parse_cleanup(BraceState &braceState, ParseFrame &frm, chunk_t *pc)
          {
             LOG_FMT(LBCSPOP, "%s(%d): parent_type is NAMESPACE\n",
                     __func__, __LINE__);
-            chunk_t *tmp = frm.top().pc;
+            Chunk *tmp = frm.top().pc;
 
             if (  tmp != nullptr
                && get_chunk_parent_type(tmp) == CT_NAMESPACE)
@@ -763,8 +771,8 @@ static void parse_cleanup(BraceState &braceState, ParseFrame &frm, chunk_t *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->orig_line, pc->orig_col, pc->Text(), get_token_name(pc->type), get_token_name(get_chunk_parent_type(pc)));
 
          if (!single)
          {
@@ -786,7 +794,7 @@ static void parse_cleanup(BraceState &braceState, ParseFrame &frm, chunk_t *pc)
       size_t idx = frm.size();
       LOG_FMT(LBCSPOP, "%s(%d): idx is %zu\n",
               __func__, __LINE__, idx);
-      chunk_t *saved = frm.at(idx - 2).pc;
+      Chunk *saved = frm.at(idx - 2).pc;
 
       if (saved != nullptr)
       {
@@ -798,7 +806,7 @@ static void parse_cleanup(BraceState &braceState, ParseFrame &frm, chunk_t *pc)
    if (  chunk_is_token(pc, CT_CASE)
       || chunk_is_token(pc, CT_DEFAULT))
    {
-      chunk_t *prev = chunk_get_prev_ncnnl(pc);         // Issue #3176
+      Chunk *prev = pc->GetPrevNcNnl();         // Issue #3176
 
       if (  chunk_is_token(pc, CT_CASE)
          || (  chunk_is_token(pc, CT_DEFAULT)
@@ -811,7 +819,7 @@ static void parse_cleanup(BraceState &braceState, ParseFrame &frm, chunk_t *pc)
          size_t idx = frm.size();
          LOG_FMT(LBCSPOP, "%s(%d): idx is %zu\n",
                  __func__, __LINE__, idx);
-         chunk_t *saved = frm.at(idx - 2).pc;
+         Chunk *saved = frm.at(idx - 2).pc;
 
          if (saved != nullptr)
          {
@@ -828,7 +836,7 @@ static void parse_cleanup(BraceState &braceState, ParseFrame &frm, chunk_t *pc)
       size_t idx = frm.size();
       LOG_FMT(LBCSPOP, "%s(%d): idx is %zu\n",
               __func__, __LINE__, idx);
-      chunk_t *saved = frm.at(idx - 2).pc;
+      Chunk *saved = frm.at(idx - 2).pc;
 
       if (saved != nullptr)
       {
@@ -895,16 +903,16 @@ static void parse_cleanup(BraceState &braceState, ParseFrame &frm, chunk_t *pc)
       || chunk_is_token(pc, CT_MACRO))                         // Issue #2742
    {
       LOG_FMT(LSTMT, "%s(%d): orig_line is %zu, reset1 stmt on '%s'\n",
-              __func__, __LINE__, pc->orig_line, pc->text());
+              __func__, __LINE__, pc->orig_line, 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());
-   chunk_t *tmp = chunk_get_next_ncnnl(pc);
+   LOG_FMT(LSTMT, "%s(%d): Mark expression starts: orig_line is %zu, orig_col is %zu, Text() is '%s'\n",
+           __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text());
+   Chunk *tmp = pc->GetNextNcNnl();
 
    if (  chunk_is_token(pc, CT_ARITH)
       || chunk_is_token(pc, CT_SHIFT)
@@ -936,12 +944,12 @@ static void parse_cleanup(BraceState &braceState, ParseFrame &frm, chunk_t *pc)
    {
       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());
+              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text());
    }
 } // parse_cleanup
 
 
-static bool check_complex_statements(ParseFrame &frm, chunk_t *pc, const BraceState &braceState)
+static bool check_complex_statements(ParseFrame &frm, Chunk *pc, const BraceState &braceState)
 {
    LOG_FUNC_ENTRY();
 
@@ -973,9 +981,9 @@ static bool check_complex_statements(ParseFrame &frm, chunk_t *pc, const BraceSt
          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));
-      frm.pop(__func__, __LINE__);
+      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));
+      frm.pop(__func__, __LINE__, pc);
       print_stack(LBCSPOP, "-IF-CCS ", frm);
 
       if (close_statement(frm, pc, braceState))
@@ -991,7 +999,7 @@ static bool check_complex_statements(ParseFrame &frm, chunk_t *pc, const BraceSt
 
       if (  chunk_is_token(pc, CT_IF)
          && (  !options::indent_else_if()
-            || !chunk_is_newline(chunk_get_prev_nc(pc))))
+            || !chunk_is_newline(pc->GetPrevNc())))
       {
          // Replace CT_ELSE with CT_IF
          set_chunk_type(pc, CT_ELSEIF);
@@ -1028,9 +1036,9 @@ static bool check_complex_statements(ParseFrame &frm, chunk_t *pc, const BraceSt
          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));
-      frm.pop(__func__, __LINE__);
+      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));
+      frm.pop(__func__, __LINE__, pc);
       print_stack(LBCSPOP, "-TRY-CCS ", frm);
 
       if (close_statement(frm, pc, braceState))
@@ -1081,10 +1089,10 @@ static bool check_complex_statements(ParseFrame &frm, chunk_t *pc, const BraceSt
       }
       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,
-              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));
-      frm.pop(__func__, __LINE__);
+              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));
+      frm.pop(__func__, __LINE__, pc);
       print_stack(LBCSPOP, "-Error  ", frm);
       cpd.error_count++;
    }
@@ -1107,9 +1115,9 @@ static bool check_complex_statements(ParseFrame &frm, chunk_t *pc, const BraceSt
       }
       else
       {
-         const c_token_t parent = frm.top().type;
+         const E_Token parent = frm.top().type;
 
-         chunk_t         *vbrace = insert_vbrace_open_before(pc, frm);
+         Chunk         *vbrace = insert_vbrace_open_before(pc, frm);
          set_chunk_parent(vbrace, parent);
 
          frm.level++;
@@ -1136,7 +1144,7 @@ static bool check_complex_statements(ParseFrame &frm, chunk_t *pc, const BraceSt
          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());
+                 __func__, __LINE__, pc->orig_line, pc->Text());
       }
    }
 
@@ -1155,13 +1163,13 @@ static bool check_complex_statements(ParseFrame &frm, chunk_t *pc, const BraceSt
          || (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(),
+              __func__, __LINE__, cpd.filename.c_str(), pc->orig_line, 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));
-      frm.pop(__func__, __LINE__);
+      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));
+      frm.pop(__func__, __LINE__, pc);
       print_stack(LBCSPOP, "-Error  ", frm);
       cpd.error_count++;
    }
@@ -1169,7 +1177,7 @@ static bool check_complex_statements(ParseFrame &frm, chunk_t *pc, const BraceSt
 } // check_complex_statements
 
 
-static bool handle_complex_close(ParseFrame &frm, chunk_t *pc, const BraceState &braceState)
+static bool handle_complex_close(ParseFrame &frm, Chunk *pc, const BraceState &braceState)
 {
    LOG_FUNC_ENTRY();
 
@@ -1195,14 +1203,14 @@ static bool handle_complex_close(ParseFrame &frm, chunk_t *pc, const BraceState
          frm.top().stage = brace_stage_e::ELSE;
 
          // If the next chunk isn't CT_ELSE, close the statement
-         chunk_t *next = chunk_get_next_ncnnl(pc);
+         Chunk *next = pc->GetNextNcNnl();
 
-         if (  next == nullptr
+         if (  next->IsNullChunk()
             || chunk_is_not_token(next, 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));
-            frm.pop(__func__, __LINE__);
+            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));
+            frm.pop(__func__, __LINE__, pc);
             print_stack(LBCSPOP, "-IF-HCS ", frm);
 
             return(close_statement(frm, pc, braceState));
@@ -1214,14 +1222,14 @@ static bool handle_complex_close(ParseFrame &frm, chunk_t *pc, const BraceState
          frm.top().stage = brace_stage_e::CATCH;
 
          // If the next chunk isn't CT_CATCH or CT_FINALLY, close the statement
-         chunk_t *next = chunk_get_next_ncnnl(pc);
+         Chunk *next = pc->GetNextNcNnl();
 
          if (  chunk_is_not_token(next, CT_CATCH)
             && chunk_is_not_token(next, 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));
-            frm.pop(__func__, __LINE__);
+            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));
+            frm.pop(__func__, __LINE__, pc);
             print_stack(LBCSPOP, "-TRY-HCS ", frm);
 
             return(close_statement(frm, pc, braceState));
@@ -1231,9 +1239,9 @@ static bool handle_complex_close(ParseFrame &frm, chunk_t *pc, const BraceState
       {
          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));
-         frm.pop(__func__, __LINE__);
+         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));
+         frm.pop(__func__, __LINE__, pc);
          print_stack(LBCSPOP, "-HCC B2 ", frm);
 
          return(close_statement(frm, pc, braceState));
@@ -1254,9 +1262,9 @@ static bool handle_complex_close(ParseFrame &frm, chunk_t *pc, const BraceState
    {
       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));
-      frm.pop(__func__, __LINE__);
+      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));
+      frm.pop(__func__, __LINE__, pc);
       print_stack(LBCSPOP, "-HCC WoDS ", frm);
 
       return(close_statement(frm, pc, braceState));
@@ -1274,23 +1282,23 @@ static bool handle_complex_close(ParseFrame &frm, chunk_t *pc, const BraceState
 } // handle_complex_close
 
 
-static void mark_namespace(chunk_t *pns)
+static void mark_namespace(Chunk *pns)
 {
    LOG_FUNC_ENTRY();
    // Issue #1813
-   chunk_t *br_close;
-   bool    is_using = false;
+   Chunk *br_close;
+   bool  is_using = false;
 
-   chunk_t *pc = chunk_get_prev_ncnnl(pns);
+   Chunk *pc = pns->GetPrevNcNnl();
 
    if (chunk_is_token(pc, CT_USING))
    {
       is_using = true;
       set_chunk_parent(pns, CT_USING);
    }
-   pc = chunk_get_next_ncnnl(pns);
+   pc = pns->GetNextNcNnl();
 
-   while (pc != nullptr)
+   while (pc->IsNotNullChunk())
    {
       set_chunk_parent(pc, CT_NAMESPACE);
 
@@ -1304,7 +1312,7 @@ static void mark_namespace(chunk_t *pns)
             }
             return;
          }
-         pc = chunk_get_next_ncnnl(pc);
+         pc = pc->GetNextNcNnl();
          continue;
       }
       log_rule_B("indent_namespace_limit");
@@ -1334,11 +1342,11 @@ static void mark_namespace(chunk_t *pns)
 } // mark_namespace
 
 
-static chunk_t *insert_vbrace(chunk_t *pc, bool after, const ParseFrame &frm)
+static Chunk *insert_vbrace(Chunk *pc, bool after, const ParseFrame &frm)
 {
    LOG_FUNC_ENTRY();
 
-   chunk_t chunk;
+   Chunk chunk;
 
    set_chunk_parent(&chunk, frm.top().type);
    chunk.orig_line   = pc->orig_line;
@@ -1354,9 +1362,9 @@ static chunk_t *insert_vbrace(chunk_t *pc, bool after, const ParseFrame &frm)
       set_chunk_type(&chunk, CT_VBRACE_CLOSE);
       return(chunk_add_after(&chunk, pc));
    }
-   chunk_t *ref = chunk_get_prev(pc);
+   Chunk *ref = pc->GetPrev();
 
-   if (ref == nullptr)
+   if (ref->IsNullChunk())
    {
       return(nullptr);
    }
@@ -1365,17 +1373,17 @@ static chunk_t *insert_vbrace(chunk_t *pc, bool after, const ParseFrame &frm)
    {
       chunk.flags &= ~PCF_IN_PREPROC;
    }
-   bool ref_is_comment = chunk_is_comment(ref);      // Issue #3351
+   bool ref_is_comment = ref->IsComment();      // Issue #3351
 
    while (  chunk_is_newline(ref)
-         || chunk_is_comment(ref))
+         || ref->IsComment())
    {
       ref->level++;
       ref->brace_level++;
-      ref = chunk_get_prev(ref);
+      ref = ref->GetPrev();
    }
 
-   if (ref == nullptr)
+   if (ref->IsNullChunk())
    {
       return(nullptr);
    }
@@ -1386,35 +1394,35 @@ static chunk_t *insert_vbrace(chunk_t *pc, bool after, const ParseFrame &frm)
    {
       if (chunk_is_token(ref, CT_PREPROC_BODY))
       {
-         while (  ref != nullptr
+         while (  ref->IsNotNullChunk()
                && ref->flags.test(PCF_IN_PREPROC))
          {
-            ref = chunk_get_prev(ref);
+            ref = ref->GetPrev();
          }
       }
       else
       {
-         ref = chunk_get_next(ref);
+         ref = ref->GetNext();
 
          if (chunk_is_token(ref, CT_COMMENT)) // Issue #3034
          {
-            ref = chunk_get_next_nc(ref);
+            ref = ref->GetNextNc();
          }
       }
    }
 
    if (ref_is_comment)                                      // Issue #3351
    {
-      ref = chunk_get_next(ref);
+      ref = ref->GetNext();
    }
 
-   if (ref == nullptr)
+   if (ref->IsNullChunk())
    {
       return(nullptr);
    }
    chunk.orig_line = ref->orig_line;
    chunk.orig_col  = ref->orig_col;
-   chunk.column    = ref->column + ref->len() + 1;
+   chunk.column    = ref->column + ref->Len() + 1;
    chunk.pp_level  = ref->pp_level;                         // Issue #3055
    set_chunk_type(&chunk, CT_VBRACE_OPEN);
 
@@ -1422,7 +1430,7 @@ static chunk_t *insert_vbrace(chunk_t *pc, bool after, const ParseFrame &frm)
 } // insert_vbrace
 
 
-bool close_statement(ParseFrame &frm, chunk_t *pc, const BraceState &braceState)
+bool close_statement(ParseFrame &frm, Chunk *pc, const BraceState &braceState)
 {
    LOG_FUNC_ENTRY();
 
@@ -1433,7 +1441,7 @@ bool close_statement(ParseFrame &frm, chunk_t *pc, const BraceState &braceState)
    }
    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(),
+           get_token_name(pc->type), pc->Text(),
            get_token_name(frm.top().type),
            (unsigned int)frm.top().stage);
 
@@ -1442,13 +1450,13 @@ bool close_statement(ParseFrame &frm, chunk_t *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());
+              __func__, __LINE__, pc->orig_line, pc->Text());
    }
    /*
     * Insert a CT_VBRACE_CLOSE, if needed:
     * If we are in a virtual brace and we are not ON a CT_VBRACE_CLOSE add one
     */
-   chunk_t *vbc = pc;
+   Chunk *vbc = pc;
 
    if (frm.top().type == CT_VBRACE_OPEN)
    {
@@ -1460,7 +1468,7 @@ bool close_statement(ParseFrame &frm, chunk_t *pc, const BraceState &braceState)
       else
       {
          // otherwise, add before it and consume the vbrace
-         vbc = chunk_get_prev_ncnnl(pc);
+         vbc = pc->GetPrevNcNnl();
 
          frm.level--;
          frm.brace_level--;
@@ -1470,9 +1478,9 @@ bool close_statement(ParseFrame &frm, chunk_t *pc, const BraceState &braceState)
          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));
-         frm.pop(__func__, __LINE__);
+         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));
+         frm.pop(__func__, __LINE__, pc);
 
          // Update the token level
          pc->level       = frm.level;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/brace_cleanup.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/brace_cleanup.h
index 4b2cfbba..4b2cfbba 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/brace_cleanup.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/brace_cleanup.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/braces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/braces.cpp
index f13c0076..0f88354c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/braces.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/braces.cpp
@@ -21,11 +21,11 @@ using std::vector;
 
 
 //! Converts a single brace into a virtual brace
-static void convert_brace(chunk_t *br);
+static void convert_brace(Chunk *br);
 
 
 //! Converts a single virtual brace into a real brace
-static void convert_vbrace(chunk_t *br);
+static void convert_vbrace(Chunk *br);
 
 
 static void convert_vbrace_to_brace(void);
@@ -39,12 +39,15 @@ static void examine_braces(void);
  * Step forward and count the number of semi colons at the current level.
  * Abort if more than 1 or if we enter a preprocessor
  */
-static void examine_brace(chunk_t *bopen);
+static void examine_brace(Chunk *bopen);
 
 
 static void move_case_break(void);
 
 
+static void move_case_return(void);
+
+
 static void mod_case_brace(void);
 
 
@@ -56,7 +59,7 @@ static void mod_full_brace_if_chain(void);
  *  - less than a certain length
  *  - doesn't mess up if/else stuff
  */
-static bool can_remove_braces(chunk_t *bopen);
+static bool can_remove_braces(Chunk *bopen);
 
 
 /**
@@ -67,22 +70,22 @@ static bool can_remove_braces(chunk_t *bopen);
  *
  * @return true (convert to real braces) or false (leave alone)
  */
-static bool should_add_braces(chunk_t *vbopen);
+static bool should_add_braces(Chunk *vbopen);
 
 
 /**
  * Collect the text into txt that contains the full tag name.
  * Mainly for collecting namespace 'a.b.c' or function 'foo::bar()' names.
  */
-static void append_tag_name(unc_text &txt, chunk_t *pc);
+static void append_tag_name(unc_text &txt, Chunk *pc);
 
 
 //! Remove the case brace, if allowable.
-static chunk_t *mod_case_brace_remove(chunk_t *br_open);
+static Chunk *mod_case_brace_remove(Chunk *br_open);
 
 
 //! Add the case brace, if allowable.
-static chunk_t *mod_case_brace_add(chunk_t *cl_colon);
+static Chunk *mod_case_brace_add(Chunk *cl_colon);
 
 
 /**
@@ -90,7 +93,7 @@ static chunk_t *mod_case_brace_add(chunk_t *cl_colon);
  *
  * @param br_start  chunk pointing to opening brace of if clause
  */
-static void process_if_chain(chunk_t *br_start);
+static void process_if_chain(Chunk *br_start);
 
 
 /**
@@ -110,7 +113,7 @@ static void process_if_chain(chunk_t *br_start);
  *                 parenthesis or
  *                 when no newlines are found between the parenthesis
  */
-static bool paren_multiline_before_brace(chunk_t *brace)
+static bool paren_multiline_before_brace(Chunk *brace)
 {
    if (  brace == nullptr
       || (  chunk_is_not_token(brace, CT_BRACE_OPEN)
@@ -128,11 +131,11 @@ static bool paren_multiline_before_brace(chunk_t *brace)
    const auto paren_t = CT_SPAREN_CLOSE;
 
    // find parenthesis pair of the if/for/while/...
-   auto paren_close = chunk_get_prev_type(brace, paren_t, brace->level, scope_e::ALL);
-   auto paren_open  = chunk_skip_to_match_rev(paren_close, scope_e::ALL);
+   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);
 
-   if (  paren_close == nullptr
-      || paren_open == nullptr
+   if (  paren_close->IsNullChunk()
+      || paren_open->IsNullChunk()
       || paren_close == brace
       || paren_open == paren_close)
    {
@@ -157,19 +160,20 @@ void do_braces(void)
    LOG_FUNC_ENTRY();
    // Mark one-liners
    // Issue #2232 put this at the beginning
-   chunk_t *pc = chunk_get_head();
+   Chunk *pc = Chunk::GetHead()->GetNextNcNnl();
 
-   while ((pc = chunk_get_next_ncnnl(pc)) != nullptr)
+   while (pc->IsNotNullChunk())
    {
       if (  chunk_is_not_token(pc, CT_BRACE_OPEN)
          && chunk_is_not_token(pc, CT_VBRACE_OPEN))
       {
+         pc = pc->GetNextNcNnl();
          continue;
       }
-      chunk_t         *br_open = pc;
-      const c_token_t brc_type = c_token_t(pc->type + 1); // corresponds to closing type
+      Chunk         *br_open = pc;
+      const E_Token brc_type = E_Token(pc->type + 1); // corresponds to closing type
       // Detect empty bodies
-      chunk_t         *tmp = chunk_get_next_ncnnl(pc);
+      Chunk         *tmp = pc->GetNextNcNnl();
 
       if (chunk_is_token(tmp, brc_type))
       {
@@ -177,9 +181,9 @@ void do_braces(void)
          chunk_flags_set(tmp, PCF_EMPTY_BODY);
       }
       // Scan for the brace close or a newline
-      tmp = br_open;
+      tmp = br_open->GetNextNc();
 
-      while ((tmp = chunk_get_next_nc(tmp)) != nullptr)
+      while (tmp->IsNotNullChunk())
       {
          if (chunk_is_newline(tmp))
          {
@@ -192,7 +196,9 @@ void do_braces(void)
             flag_series(br_open, tmp, PCF_ONE_LINER);
             break;
          }
+         tmp = tmp->GetNextNc();
       }
+      pc = pc->GetNextNcNnl();
    }
    log_rule_B("mod_full_brace_if_chain");
    log_rule_B("mod_full_brace_if_chain_only");
@@ -245,6 +251,12 @@ void do_braces(void)
    {
       move_case_break();
    }
+   log_rule_B("mod_move_case_return");
+
+   if (options::mod_move_case_return())
+   {
+      move_case_return();
+   }
 } // do_braces
 
 
@@ -261,9 +273,9 @@ static void examine_braces(void)
    log_rule_B("mod_full_brace_using");
    log_rule_B("mod_full_brace_while");
 
-   for (auto pc = chunk_get_tail(); pc != nullptr;)
+   for (Chunk *pc = Chunk::GetTail(); pc->IsNotNullChunk();)
    {
-      auto prev = chunk_get_prev_type(pc, CT_BRACE_OPEN, -1);
+      Chunk *prev = pc->GetPrevType(CT_BRACE_OPEN, -1);
 
       if (  chunk_is_token(pc, CT_BRACE_OPEN)
          && !pc->flags.test(PCF_IN_PREPROC)
@@ -293,7 +305,7 @@ static void examine_braces(void)
 } // examine_braces
 
 
-static bool should_add_braces(chunk_t *vbopen)
+static bool should_add_braces(Chunk *vbopen)
 {
    LOG_FUNC_ENTRY();
    log_rule_B("mod_full_brace_nl");
@@ -306,13 +318,13 @@ static bool should_add_braces(chunk_t *vbopen)
    LOG_FMT(LBRDEL, "%s(%d): start on %zu:\n",
            __func__, __LINE__, vbopen->orig_line);
 
-   size_t  nl_count = 0;
+   size_t nl_count = 0;
 
-   chunk_t *pc = nullptr;
+   Chunk  *pc = Chunk::NullChunkPtr;
 
-   for (pc = chunk_get_next_nc(vbopen, scope_e::PREPROC);
-        (pc != nullptr && pc->level > vbopen->level);
-        pc = chunk_get_next_nc(pc, scope_e::PREPROC))
+   for (pc = vbopen->GetNextNc(E_Scope::PREPROC);
+        (pc->IsNotNullChunk() && pc->level > vbopen->level);
+        pc = pc->GetNextNc(E_Scope::PREPROC))
    {
       if (chunk_is_newline(pc))
       {
@@ -320,7 +332,7 @@ static bool should_add_braces(chunk_t *vbopen)
       }
    }
 
-   if (  pc != nullptr
+   if (  pc->IsNotNullChunk()
       && nl_count > nl_max
       && vbopen->pp_level == pc->pp_level)
    {
@@ -332,7 +344,7 @@ static bool should_add_braces(chunk_t *vbopen)
 }
 
 
-static bool can_remove_braces(chunk_t *bopen)
+static bool can_remove_braces(Chunk *bopen)
 {
    LOG_FUNC_ENTRY();
    LOG_FMT(LBRDEL, "%s(%d): start on line %zu:\n",
@@ -343,7 +355,7 @@ static bool can_remove_braces(chunk_t *bopen)
    {
       return(false);
    }
-   chunk_t *pc = chunk_get_next_ncnnl(bopen, scope_e::PREPROC);
+   Chunk *pc = bopen->GetNextNcNnl(E_Scope::PREPROC);
 
    if (chunk_is_token(pc, CT_BRACE_CLOSE))
    {
@@ -354,7 +366,7 @@ static bool can_remove_braces(chunk_t *bopen)
 
    log_rule_B("mod_full_brace_nl");
    const size_t nl_max = options::mod_full_brace_nl();
-   chunk_t      *prev  = nullptr;
+   Chunk        *prev  = Chunk::NullChunkPtr;
 
    size_t       semi_count = 0;
    bool         hit_semi   = false;
@@ -362,15 +374,15 @@ static bool can_remove_braces(chunk_t *bopen)
    size_t       if_count   = 0;
    int          br_count   = 0;
 
-   pc = chunk_get_next_nc(bopen, scope_e::ALL);
+   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);
+           __func__, __LINE__, pc->Text(), pc->orig_line, pc->orig_col);
 
-   while (  pc != nullptr
+   while (  pc->IsNotNullChunk()
          && pc->level >= level)
    {
       LOG_FMT(LBRDEL, "%s(%d): test token '%s', orig_line is %zu, orig_col is %zu\n",
-              __func__, __LINE__, pc->text(), pc->orig_line, pc->orig_col);
+              __func__, __LINE__, pc->Text(), pc->orig_line, pc->orig_col);
 
       if (pc->flags.test(PCF_IN_PREPROC))
       {
@@ -431,13 +443,13 @@ static bool can_remove_braces(chunk_t *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->orig_line, semi_count);
 
             if (chunk_is_token(pc, 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->orig_line);
                return(false);
             }
 
@@ -456,27 +468,27 @@ static bool can_remove_braces(chunk_t *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->orig_line, pc->Text(), pc->orig_line);
                   return(false);
                }
             }
          }
       }
       prev = pc;
-      pc   = chunk_get_next_nc(pc);
+      pc   = pc->GetNextNc();
    }
 
-   if (pc == nullptr)
+   if (pc->IsNullChunk())
    {
-      LOG_FMT(LBRDEL, "%s(%d):  pc is nullptr\n", __func__, __LINE__);
+      LOG_FMT(LBRDEL, "%s(%d):  pc is null chunk\n", __func__, __LINE__);
       return(false);
    }
 
    if (  chunk_is_token(pc, CT_BRACE_CLOSE)
       && get_chunk_parent_type(pc) == CT_IF)
    {
-      chunk_t *next     = chunk_get_next_ncnnl(pc, scope_e::PREPROC);
-      chunk_t *tmp_prev = chunk_get_prev_ncnnl(pc, scope_e::PREPROC);
+      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)
@@ -497,7 +509,7 @@ static bool can_remove_braces(chunk_t *bopen)
 } // can_remove_braces
 
 
-static void examine_brace(chunk_t *bopen)
+static void examine_brace(Chunk *bopen)
 {
    LOG_FUNC_ENTRY();
    LOG_FMT(LBRDEL, "%s(%d): start on orig_line %zu, bopen->level is %zu\n",
@@ -508,16 +520,16 @@ static void examine_brace(chunk_t *bopen)
    log_rule_B("mod_full_brace_nl");
    const size_t nl_max = options::mod_full_brace_nl();
 
-   chunk_t      *prev      = nullptr;
+   Chunk        *prev      = Chunk::NullChunkPtr;
    size_t       semi_count = 0;
    bool         hit_semi   = false;
    size_t       nl_count   = 0;
    size_t       if_count   = 0;
    int          br_count   = 0;
 
-   chunk_t      *pc = chunk_get_next_nc(bopen);
+   Chunk        *pc = bopen->GetNextNc();
 
-   while (  pc != nullptr
+   while (  pc->IsNotNullChunk()
          && pc->level >= level)
    {
       if (chunk_is_token(pc, CT_NEWLINE))
@@ -527,8 +539,8 @@ static void examine_brace(chunk_t *bopen)
       }
       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->orig_line, pc->orig_col, pc->Text());
       }
 
       if (pc->flags.test(PCF_IN_PREPROC))
@@ -552,8 +564,8 @@ static void examine_brace(chunk_t *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->level is %zu,  bopen->level is %zu\n",
+                 __func__, __LINE__, pc->Text(), pc->level, bopen->level);
 
          if (  chunk_is_token(pc, CT_BRACE_OPEN)
             && pc->level == bopen->level)
@@ -578,9 +590,9 @@ static void examine_brace(chunk_t *bopen)
 
             if (br_count == 0)
             {
-               chunk_t *next = chunk_get_next_ncnnl(pc, scope_e::PREPROC);
+               Chunk *next = pc->GetNextNcNnl(E_Scope::PREPROC);
 
-               if (  next == nullptr
+               if (  next->IsNullChunk()
                   || chunk_is_not_token(next, CT_BRACE_CLOSE))
                {
                   LOG_FMT(LBRDEL, "%s(%d):  junk after close brace\n", __func__, __LINE__);
@@ -606,28 +618,28 @@ static void examine_brace(chunk_t *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->orig_line, semi_count);
 
             if (chunk_is_token(pc, 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->orig_line);
                return;
             }
 
-            if (prev != nullptr)
+            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->type %s\n",
+                       __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text(), prev->Text(), get_token_name(prev->type));
             }
             else
             {
-               LOG_FMT(LBRDEL, "%s(%d): orig_line is %zu, orig_col is %zu, text() '%s', prev is nullptr\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->orig_line, pc->orig_col, 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);
+            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)
@@ -640,8 +652,8 @@ static void examine_brace(chunk_t *bopen)
                || (  chunk_is_token(pc, CT_BRACE_OPEN)
                   && pc->level == bopen->level)) // 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);
+               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);
                semi_count++;
                LOG_FMT(LBRDEL, "%s(%d): semi_count is %zu\n",
@@ -650,14 +662,14 @@ static void examine_brace(chunk_t *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->orig_line, pc->Text(), pc->orig_line);
                   return;
                }
             }
          }
       }
       prev = pc;
-      pc   = chunk_get_next(pc);                  // Issue #1907
+      pc   = pc->GetNext();                  // Issue #1907
    }
 
    if (pc == nullptr)
@@ -670,16 +682,16 @@ static void examine_brace(chunk_t *bopen)
 
    if (chunk_is_token(pc, CT_BRACE_CLOSE))
    {
-      chunk_t *next = chunk_get_next_ncnnl(pc);
+      Chunk *next = pc->GetNextNcNnl();
 
-      if (next != nullptr)
+      if (next->IsNotNullChunk())
       {
          while (chunk_is_token(next, CT_VBRACE_CLOSE))
          {
-            next = chunk_get_next_ncnnl(next);
+            next = next->GetNextNcNnl();
          }
 
-         if (next != nullptr)
+         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));
@@ -704,11 +716,11 @@ static void examine_brace(chunk_t *bopen)
 
          if (get_chunk_parent_type(bopen) == CT_ELSE)
          {
-            chunk_t *tmp_next = chunk_get_next_ncnnl(bopen);
+            Chunk *tmp_next = bopen->GetNextNcNnl();
 
             if (chunk_is_token(tmp_next, CT_IF))
             {
-               chunk_t *tmp_prev = chunk_get_prev_ncnnl(bopen);
+               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);
 
@@ -741,12 +753,12 @@ static void examine_brace(chunk_t *bopen)
    else
    {
       LOG_FMT(LBRDEL, "%s(%d):  not a close brace? - '%s'\n",
-              __func__, __LINE__, pc->text());
+              __func__, __LINE__, pc->Text());
    }
 } // examine_brace
 
 
-static void convert_brace(chunk_t *br)
+static void convert_brace(Chunk *br)
 {
    LOG_FUNC_ENTRY();
 
@@ -755,15 +767,15 @@ static void convert_brace(chunk_t *br)
    {
       return;
    }
-   chunk_t *tmp;
+   Chunk *tmp;
 
    if (chunk_is_token(br, CT_BRACE_OPEN))
    {
       set_chunk_type(br, CT_VBRACE_OPEN);
       br->str.clear();
-      tmp = chunk_get_prev(br);
+      tmp = br->GetPrev();
 
-      if (tmp == nullptr)
+      if (tmp->IsNullChunk())
       {
          return;
       }
@@ -772,9 +784,9 @@ static void convert_brace(chunk_t *br)
    {
       set_chunk_type(br, CT_VBRACE_CLOSE);
       br->str.clear();
-      tmp = chunk_get_next(br);
+      tmp = br->GetNext();
 
-      if (tmp == nullptr)
+      if (tmp->IsNullChunk())
       {
          return;
       }
@@ -790,13 +802,6 @@ static void convert_brace(chunk_t *br)
       {
          if (!br->flags.test(PCF_ONE_LINER)) // Issue #2232
          {
-            if (tmp->nl_count == 0)
-            {
-               fprintf(stderr, "%s(%d): tmp->nl_count is ZERO, cannot be decremented, at line %zu, column %zu\n",
-                       __func__, __LINE__, tmp->orig_line, tmp->orig_col);
-               log_flush(true);
-               exit(EX_SOFTWARE);
-            }
             tmp->nl_count--;
             LOG_FMT(LBRDEL, "%s(%d): tmp->nl_count is %zu\n",
                     __func__, __LINE__, tmp->nl_count);
@@ -806,7 +811,7 @@ static void convert_brace(chunk_t *br)
       {
          // Issue #2219
          // look for opening brace
-         chunk_t *brace = nullptr;
+         Chunk *brace = Chunk::NullChunkPtr;
 
          if (chunk_is_token(br, CT_VBRACE_OPEN))
          {
@@ -816,9 +821,9 @@ static void convert_brace(chunk_t *br)
          {
             brace = chunk_skip_to_match_rev(br);
 
-            if (brace == nullptr)
+            if (brace->IsNullChunk())
             {
-               brace = chunk_get_prev_type(br, CT_BRACE_OPEN, br->level);
+               brace = br->GetPrevType(CT_BRACE_OPEN, br->level);
             }
          }
 
@@ -836,7 +841,7 @@ static void convert_brace(chunk_t *br)
 } // convert_brace
 
 
-static void convert_vbrace(chunk_t *vbr)
+static void convert_vbrace(Chunk *vbr)
 {
    LOG_FUNC_ENTRY();
 
@@ -854,11 +859,11 @@ static void convert_vbrace(chunk_t *vbr)
        * If the next chunk is a preprocessor, then move the open brace after the
        * preprocessor.
        */
-      chunk_t *tmp = chunk_get_next(vbr);
+      Chunk *tmp = vbr->GetNext();
 
       if (chunk_is_token(tmp, CT_PREPROC))
       {
-         tmp = chunk_get_next(vbr, scope_e::PREPROC);
+         tmp = vbr->GetNext(E_Scope::PREPROC);
          chunk_move_after(vbr, tmp);
          newline_add_after(vbr);
       }
@@ -873,11 +878,11 @@ static void convert_vbrace(chunk_t *vbr)
        * move the brace after the newline and add another newline after
        * the close brace.
        */
-      chunk_t *tmp = chunk_get_next(vbr);
+      Chunk *tmp = vbr->GetNext();
 
-      if (chunk_is_comment(tmp))
+      if (tmp->IsComment())
       {
-         tmp = chunk_get_next(tmp);
+         tmp = tmp->GetNext();
 
          if (chunk_is_newline(tmp))
          {
@@ -902,7 +907,7 @@ static void convert_vbrace_to_brace(void)
    log_rule_B("mod_full_brace_using");
    log_rule_B("mod_full_brace_function");
 
-   for (chunk_t *pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next_ncnnl(pc))
+   for (Chunk *pc = Chunk::GetHead(); pc != nullptr && pc->IsNotNullChunk(); pc = pc->GetNextNcNnl())
    {
       if (chunk_is_not_token(pc, CT_VBRACE_OPEN))
       {
@@ -927,10 +932,10 @@ static void convert_vbrace_to_brace(void)
             && (options::mod_full_brace_function() & IARF_ADD)))
       {
          // Find the matching vbrace close
-         chunk_t *vbc = nullptr;
-         chunk_t *tmp = pc;
+         Chunk *vbc = Chunk::NullChunkPtr;
+         Chunk *tmp = pc->GetNext();
 
-         while ((tmp = chunk_get_next(tmp)) != nullptr)
+         while (tmp->IsNotNullChunk())
          {
             if (  in_preproc
                && !tmp->flags.test(PCF_IN_PREPROC))
@@ -947,9 +952,10 @@ static void convert_vbrace_to_brace(void)
                vbc = tmp;
                break;
             }
+            tmp = tmp->GetNext();
          }
 
-         if (vbc == nullptr)
+         if (vbc->IsNullChunk())
          {
             continue;
          }
@@ -961,12 +967,12 @@ static void convert_vbrace_to_brace(void)
 } // convert_vbrace_to_brace
 
 
-chunk_t *insert_comment_after(chunk_t *ref, c_token_t cmt_type,
-                              const unc_text &cmt_text)
+Chunk *insert_comment_after(Chunk *ref, E_Token cmt_type,
+                            const unc_text &cmt_text)
 {
    LOG_FUNC_ENTRY();
 
-   chunk_t new_cmt = *ref;
+   Chunk new_cmt = *ref;
 
    new_cmt.prev  = nullptr;
    new_cmt.next  = nullptr;
@@ -991,30 +997,30 @@ chunk_t *insert_comment_after(chunk_t *ref, c_token_t cmt_type,
    }
    // TODO: expand comment type to cover other comment styles?
 
-   new_cmt.column   = ref->column + ref->len() + 1;
+   new_cmt.column   = ref->column + ref->Len() + 1;
    new_cmt.orig_col = new_cmt.column;
 
    return(chunk_add_after(&new_cmt, ref));
 }
 
 
-static void append_tag_name(unc_text &txt, chunk_t *pc)
+static void append_tag_name(unc_text &txt, Chunk *pc)
 {
    LOG_FUNC_ENTRY();
-   chunk_t *tmp = pc;
+   Chunk *tmp = pc->GetPrevNcNnl();
 
    LOG_FMT(LMCB, "%s(%d): txt is '%s'\n",
            __func__, __LINE__, txt.c_str());
 
    // step backwards over all a::b stuff
-   while ((tmp = chunk_get_prev_ncnnl(tmp)) != nullptr)
+   while (tmp->IsNotNullChunk())
    {
       if (  chunk_is_not_token(tmp, CT_DC_MEMBER)
          && chunk_is_not_token(tmp, CT_MEMBER))
       {
          break;
       }
-      tmp = chunk_get_prev_ncnnl(tmp);
+      tmp = tmp->GetPrevNcNnl();
       pc  = tmp;
 
       if (!chunk_is_word(tmp))
@@ -1026,7 +1032,9 @@ static void append_tag_name(unc_text &txt, chunk_t *pc)
    LOG_FMT(LMCB, "%s(%d): txt is '%s'\n",
            __func__, __LINE__, txt.c_str());
 
-   while ((pc = chunk_get_next_ncnnl(pc)) != nullptr)
+   pc = pc->GetNextNcNnl();
+
+   while (pc->IsNotNullChunk())
    {
       if (  chunk_is_not_token(pc, CT_DC_MEMBER)
          && chunk_is_not_token(pc, CT_MEMBER))
@@ -1036,14 +1044,15 @@ static void append_tag_name(unc_text &txt, chunk_t *pc)
       txt += pc->str;
       LOG_FMT(LMCB, "%s(%d): txt is '%s'\n",
               __func__, __LINE__, txt.c_str());
-      pc = chunk_get_next_ncnnl(pc);
+      pc = pc->GetNextNcNnl();
 
-      if (pc != nullptr)
+      if (pc->IsNotNullChunk())
       {
          txt += pc->str;
          LOG_FMT(LMCB, "%s(%d): txt is '%s'\n",
                  __func__, __LINE__, txt.c_str());
       }
+      pc = pc->GetNextNcNnl();
    }
 } // append_tag_name
 
@@ -1051,12 +1060,12 @@ static void append_tag_name(unc_text &txt, chunk_t *pc)
 void add_long_closebrace_comment(void)
 {
    LOG_FUNC_ENTRY();
-   chunk_t *fcn_pc = nullptr;
-   chunk_t *sw_pc  = nullptr;
-   chunk_t *ns_pc  = nullptr;
-   chunk_t *cl_pc  = nullptr;
+   Chunk *fcn_pc = Chunk::NullChunkPtr;
+   Chunk *sw_pc  = Chunk::NullChunkPtr;
+   Chunk *ns_pc  = Chunk::NullChunkPtr;
+   Chunk *cl_pc  = Chunk::NullChunkPtr;
 
-   for (chunk_t *pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next_ncnnl(pc))
+   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))
@@ -1082,12 +1091,12 @@ void add_long_closebrace_comment(void)
       {
          continue;
       }
-      chunk_t *br_open = pc;
-      size_t  nl_count = 0;
+      Chunk  *br_open = pc;
+      size_t nl_count = 0;
 
-      chunk_t *tmp = pc;
+      Chunk  *tmp = pc;
 
-      while ((tmp = chunk_get_next(tmp, scope_e::PREPROC)) != nullptr)
+      while ((tmp = tmp->GetNext(E_Scope::PREPROC))->IsNotNullChunk())
       {
          if (chunk_is_newline(tmp))
          {
@@ -1101,9 +1110,9 @@ void add_long_closebrace_comment(void)
          {
             continue;
          }
-         chunk_t *br_close = tmp;
+         Chunk *br_close = tmp;
 
-         tmp = chunk_get_next(tmp);
+         tmp = tmp->GetNext();
 
          // check for a possible end semicolon
          if (chunk_is_token(tmp, CT_SEMICOLON))
@@ -1111,18 +1120,18 @@ void add_long_closebrace_comment(void)
             // set br_close to the semi token,
             // as br_close is used to add the coment after it
             br_close = tmp;
-            tmp      = chunk_get_next(tmp);
+            tmp      = tmp->GetNext();
          }
 
          // make sure a newline follows in order to not overwrite an already
          // existring comment
-         if (  tmp != nullptr
+         if (  tmp->IsNotNullChunk()
             && !chunk_is_newline(tmp))
          {
             break;
          }
          size_t   nl_min  = 0;
-         chunk_t  *tag_pc = nullptr;
+         Chunk    *tag_pc = Chunk::NullChunkPtr;
          unc_text xstr;
 
          if (  get_chunk_parent_type(br_open) == CT_FUNC_DEF
@@ -1132,7 +1141,7 @@ void add_long_closebrace_comment(void)
             nl_min = options::mod_add_long_function_closebrace_comment();
             tag_pc = fcn_pc;
 
-            if (tag_pc != nullptr)
+            if (tag_pc->IsNotNullChunk())
             {
                append_tag_name(xstr, tag_pc);
                LOG_FMT(LMCB, "%s(%d): xstr is '%s'\n",
@@ -1161,7 +1170,7 @@ void add_long_closebrace_comment(void)
 
             // next chunk, normally is going to be the namespace name
             // append it with a space to generate "namespace xyz"
-            chunk_t *tmp_next = chunk_get_next_ncnnl(tag_pc);
+            Chunk *tmp_next = tag_pc->GetNextNcNnl();
 
             if (chunk_is_not_token(tmp_next, CT_BRACE_OPEN)) // anonymous namespace -> ignore
             {
@@ -1174,7 +1183,7 @@ void add_long_closebrace_comment(void)
             }
          }
          else if (  get_chunk_parent_type(br_open) == CT_CLASS
-                 && cl_pc != nullptr
+                 && 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
          {
@@ -1185,9 +1194,9 @@ void add_long_closebrace_comment(void)
             LOG_FMT(LMCB, "%s(%d): xstr is '%s'\n",
                     __func__, __LINE__, xstr.c_str());
 
-            chunk_t *tmp_next = chunk_get_next(cl_pc);
+            Chunk *tmp_next = cl_pc->GetNext();
 
-            if (tag_pc != nullptr)
+            if (tag_pc->IsNotNullChunk())
             {
                xstr.append(" ");
                LOG_FMT(LMCB, "%s(%d): xstr is '%s'\n",
@@ -1200,10 +1209,10 @@ void add_long_closebrace_comment(void)
 
          if (  nl_min > 0
             && nl_count >= nl_min
-            && tag_pc != nullptr)
+            && tag_pc->IsNotNullChunk())
          {
             // use the comment style that fits to the selected language
-            const c_token_t style = language_is_set(LANG_CPP | LANG_CS)
+            const E_Token style = language_is_set(LANG_CPP | LANG_CS)
                                     ? CT_COMMENT_CPP : CT_COMMENT;
 
             // Add a comment after the close brace
@@ -1220,15 +1229,15 @@ void add_long_closebrace_comment(void)
 static void move_case_break(void)
 {
    LOG_FUNC_ENTRY();
-   chunk_t *prev = nullptr;
+   Chunk *prev = Chunk::NullChunkPtr;
 
-   for (chunk_t *pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next_ncnnl(pc))
+   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(chunk_get_prev(pc))
-         && chunk_is_newline(chunk_get_prev(prev)))
+         && chunk_is_newline(pc->GetPrev())
+         && chunk_is_newline(prev->GetPrev()))
       {
          chunk_swap_lines(prev, pc);
       }
@@ -1237,25 +1246,73 @@ static void move_case_break(void)
 }
 
 
-static chunk_t *mod_case_brace_remove(chunk_t *br_open)
+static void move_case_return(void)
+{
+   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()))
+      {
+         // Find the end of the return statement
+         while (chunk_is_not_token(pc, CT_SEMICOLON))
+         {
+            if (  chunk_is_token(pc, CT_CASE)
+               || chunk_is_token(pc, 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.
+               pc = Chunk::NullChunkPtr;
+               break;
+            }
+            pc = pc->GetNext();
+         }
+         pc = pc->GetNextNl();
+         pc = pc->GetNextNcNnl();
+
+         if (pc->IsNotNullChunk())
+         {
+            // 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);
+            Chunk *curr = prev->GetNextNcNnl();
+
+            while (curr != pc)
+            {
+               chunk_swap_lines(prev, curr);
+               curr = prev->GetNextNcNnl();
+            }
+         }
+      }
+      prev = pc;
+   }
+} // move_case_return
+
+
+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);
 
    // Find the matching brace close
-   chunk_t *next     = chunk_get_next_ncnnl(br_open, scope_e::PREPROC);
-   chunk_t *br_close = chunk_get_next_type(br_open, CT_BRACE_CLOSE, br_open->level, scope_e::PREPROC);
+   Chunk *next     = br_open->GetNextNcNnl(E_Scope::PREPROC);
+   Chunk *br_close = br_open->GetNextType(CT_BRACE_CLOSE, br_open->level, E_Scope::PREPROC);
 
-   if (br_close == nullptr)
+   if (br_close->IsNullChunk())
    {
       LOG_FMT(LMCB, "%s(%d):  - no close\n", __func__, __LINE__);
       return(next);
    }
    // Make sure 'break', 'return', 'goto', 'case' or '}' is after the close brace
-   chunk_t *pc = chunk_get_next_ncnnl(br_close, scope_e::PREPROC);
+   Chunk *pc = br_close->GetNextNcNnl(E_Scope::PREPROC);
 
-   if (  pc == nullptr
+   if (  pc->IsNullChunk()
       || (  chunk_is_not_token(pc, CT_BREAK)
          && chunk_is_not_token(pc, CT_RETURN)
          && chunk_is_not_token(pc, CT_CASE)
@@ -1268,15 +1325,15 @@ static chunk_t *mod_case_brace_remove(chunk_t *br_open)
    }
 
    // scan to make sure there are no definitions at brace level between braces
-   for (chunk_t *tmp_pc = br_open;
+   for (Chunk *tmp_pc = br_open;
         tmp_pc != br_close;
-        tmp_pc = chunk_get_next_ncnnl(tmp_pc, scope_e::PREPROC))
+        tmp_pc = tmp_pc->GetNextNcNnl(E_Scope::PREPROC))
    {
       if (  tmp_pc->level == (br_open->level + 1)
          && tmp_pc->flags.test(PCF_VAR_DEF))
       {
          LOG_FMT(LMCB, "%s(%d):  - vardef on line %zu: '%s'\n",
-                 __func__, __LINE__, tmp_pc->orig_line, pc->text());
+                 __func__, __LINE__, tmp_pc->orig_line, pc->Text());
          return(next);
       }
    }
@@ -1284,9 +1341,9 @@ static chunk_t *mod_case_brace_remove(chunk_t *br_open)
    LOG_FMT(LMCB, "%s(%d):  - removing braces on lines %zu and %zu\n",
            __func__, __LINE__, br_open->orig_line, br_close->orig_line);
 
-   for (chunk_t *tmp_pc = br_open;
+   for (Chunk *tmp_pc = br_open;
         tmp_pc != br_close;
-        tmp_pc = chunk_get_next_ncnnl(tmp_pc, scope_e::PREPROC))
+        tmp_pc = tmp_pc->GetNextNcNnl(E_Scope::PREPROC))
    {
       if (tmp_pc->brace_level == 0)
       {
@@ -1307,44 +1364,46 @@ static chunk_t *mod_case_brace_remove(chunk_t *br_open)
       tmp_pc->level--;
    }
 
-   next = chunk_get_prev(br_open, scope_e::PREPROC);
+   next = br_open->GetPrev(E_Scope::PREPROC);
 
    chunk_del(br_open);
    chunk_del(br_close);
 
-   return(chunk_get_next(next, scope_e::PREPROC));
+   return(next->GetNext(E_Scope::PREPROC));
 } // mod_case_brace_remove
 
 
-static chunk_t *mod_case_brace_add(chunk_t *cl_colon)
+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);
 
-   chunk_t *pc   = cl_colon;
-   chunk_t *last = nullptr;
+   Chunk *pc   = cl_colon;
+   Chunk *last = Chunk::NullChunkPtr;
    // look for the case token to the colon
-   chunk_t *cas_ = chunk_get_prev_type(cl_colon, CT_CASE, cl_colon->level);
+   Chunk *cas_ = cl_colon->GetPrevType(CT_CASE, cl_colon->level);
    // look for the parent
-   chunk_t *swit = cas_->parent;
+   Chunk *swit = cas_->parent;
    // look for the opening brace of the switch
-   chunk_t *open = chunk_get_next_type(swit, CT_BRACE_OPEN, swit->level);
+   Chunk *open = swit->GetNextType(CT_BRACE_OPEN, swit->level);
    // look for the closing brace of the switch
-   chunk_t *clos = chunk_skip_to_match(open);
+   Chunk *clos = chunk_skip_to_match(open);
 
    // find the end of the case-block
-   while ((pc = chunk_get_next_ncnnl(pc, scope_e::PREPROC)) != nullptr)
+   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->orig_line, pc->orig_col, pc->pp_level);
 
       if (pc->level == cl_colon->level)
       {
          if (chunk_is_token(pc, CT_CASE))
          {
-            LOG_FMT(LMCB, "%s(%d): text() is '%s', orig_line %zu, orig_col is %zu\n",
-                    __func__, __LINE__, pc->text(), pc->orig_line, pc->orig_col);
+            LOG_FMT(LMCB, "%s(%d): Text() is '%s', orig_line %zu, orig_col is %zu\n",
+                    __func__, __LINE__, pc->Text(), pc->orig_line, pc->orig_col);
             last = calculate_closing_brace_position(cl_colon, pc);
             break;
          }
@@ -1353,29 +1412,30 @@ static chunk_t *mod_case_brace_add(chunk_t *cl_colon)
       {
          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->orig_line, pc->orig_col);
             // end of switch is reached
             last = calculate_closing_brace_position(cl_colon, pc);
-            LOG_FMT(LMCB, "%s(%d): last->text() is '%s', orig_line %zu, orig_col is %zu\n",
-                    __func__, __LINE__, last->text(), last->orig_line, last->orig_col);
+            LOG_FMT(LMCB, "%s(%d): last->Text() is '%s', orig_line %zu, orig_col is %zu\n",
+                    __func__, __LINE__, last->Text(), last->orig_line, last->orig_col);
             break;
          }
       }
+      pc = pc->GetNextNcNnl(E_Scope::PREPROC);
    }
 
-   if (last == nullptr)
+   if (last->IsNullChunk())
    {
-      LOG_FMT(LMCB, "%s(%d):  - last is nullptr\n", __func__, __LINE__);
-      chunk_t *next = chunk_get_next_ncnnl(cl_colon, scope_e::PREPROC);
+      LOG_FMT(LMCB, "%s(%d):  - last is null chunk\n", __func__, __LINE__);
+      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->orig_line, last->orig_col);
    LOG_FMT(LMCB, "%s(%d): adding braces after '%s' on line %zu\n",
-           __func__, __LINE__, cl_colon->text(), cl_colon->orig_line);
+           __func__, __LINE__, cl_colon->Text(), cl_colon->orig_line);
 
-   chunk_t chunk;
+   Chunk chunk;
 
    set_chunk_type(&chunk, CT_BRACE_OPEN);
    set_chunk_parent(&chunk, CT_CASE);
@@ -1386,17 +1446,17 @@ static chunk_t *mod_case_brace_add(chunk_t *cl_colon)
    chunk.brace_level = cl_colon->brace_level;
    chunk.flags       = pc->flags & PCF_COPY_FLAGS;
    chunk.str         = "{";
-   chunk_t *br_open = chunk_add_after(&chunk, cl_colon);
+   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_t *br_close = chunk_add_after(&chunk, last);
+   Chunk *br_close = chunk_add_after(&chunk, last);
 
-   for (pc = chunk_get_next(br_open, scope_e::PREPROC);
+   for (pc = br_open->GetNext(E_Scope::PREPROC);
         pc != br_close;
-        pc = chunk_get_next(pc, scope_e::PREPROC))
+        pc = pc->GetNext(E_Scope::PREPROC))
    {
       pc->level++;
       pc->brace_level++;
@@ -1410,19 +1470,20 @@ static void mod_case_brace(void)
 {
    LOG_FUNC_ENTRY();
 
-   chunk_t *pc = chunk_get_head();
+   Chunk *pc = Chunk::GetHead();
 
    // Make sure to start outside of a preprocessor line (see issue #3366)
-   if (chunk_is_preproc(pc))
+   if (pc->IsPreproc())
    {
-      pc = chunk_get_next_ncnnlnp(pc);
+      pc = pc->GetNextNcNnlNpp();
    }
 
-   while (pc != nullptr)
+   while (  pc != nullptr
+         && pc->IsNotNullChunk())
    {
-      chunk_t *next = chunk_get_next_ncnnl(pc, scope_e::PREPROC);
+      Chunk *next = pc->GetNextNcNnl(E_Scope::PREPROC);
 
-      if (next == nullptr)
+      if (next->IsNullChunk())
       {
          return;
       }
@@ -1446,30 +1507,31 @@ static void mod_case_brace(void)
       }
       else
       {
-         pc = chunk_get_next_ncnnl(pc, scope_e::PREPROC);
+         pc = pc->GetNextNcNnl(E_Scope::PREPROC);
       }
    }
 } // mod_case_brace
 
 
-static void process_if_chain(chunk_t *br_start)
+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);
 
-   vector<chunk_t *> braces;
+   vector<Chunk *> braces;
 
    braces.reserve(16);
 
-   bool    must_have_braces = false;
+   bool  must_have_braces   = false;
+   bool  has_unbraced_block = false;
 
-   chunk_t *pc = br_start;
+   Chunk *pc = br_start;
 
    while (pc != nullptr)
    {
-      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_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);
 
       if (chunk_is_token(pc, CT_BRACE_OPEN))
       {
@@ -1478,7 +1540,8 @@ static void process_if_chain(chunk_t *br_start)
                  __func__, __LINE__, braces.size(), pc->orig_line, tmp ? "" : "not",
                  get_token_name(pc->type));
 
-         if (!tmp)
+         if (  !tmp
+            || options::mod_full_brace_if_chain() == 2)
          {
             must_have_braces = true;
          }
@@ -1494,9 +1557,17 @@ static void process_if_chain(chunk_t *br_start)
          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));
+
+         has_unbraced_block = true;
+      }
+
+      if (  options::mod_full_brace_if_chain() == 3
+         && !has_unbraced_block)
+      {
+         must_have_braces = true;
       }
       braces.push_back(pc);
-      chunk_t *br_close = chunk_skip_to_match(pc, scope_e::PREPROC);
+      Chunk *br_close = chunk_skip_to_match(pc, E_Scope::PREPROC);
 
       if (br_close == nullptr)
       {
@@ -1504,9 +1575,9 @@ static void process_if_chain(chunk_t *br_start)
       }
       braces.push_back(br_close);
 
-      pc = chunk_get_next_ncnnl(br_close, scope_e::PREPROC);
+      pc = br_close->GetNextNcNnl(E_Scope::PREPROC);
 
-      if (  pc == nullptr
+      if (  pc->IsNullChunk()
          || chunk_is_not_token(pc, CT_ELSE))
       {
          break;
@@ -1518,18 +1589,18 @@ static void process_if_chain(chunk_t *br_start)
          // There is an 'else' - we want full braces.
          must_have_braces = true;
       }
-      pc = chunk_get_next_ncnnl(pc, scope_e::PREPROC);
+      pc = pc->GetNextNcNnl(E_Scope::PREPROC);
 
       if (chunk_is_token(pc, CT_ELSEIF))
       {
          while (  chunk_is_not_token(pc, CT_VBRACE_OPEN)
                && chunk_is_not_token(pc, CT_BRACE_OPEN))
          {
-            pc = chunk_get_next_ncnnl(pc, scope_e::PREPROC);
+            pc = pc->GetNextNcNnl(E_Scope::PREPROC);
          }
       }
 
-      if (pc == nullptr)
+      if (pc->IsNullChunk())
       {
          break;
       }
@@ -1617,7 +1688,7 @@ static void mod_full_brace_if_chain(void)
 {
    LOG_FUNC_ENTRY();
 
-   for (chunk_t *pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next(pc))
+   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))
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/braces.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/braces.h
index d48f4014..c9695bbe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/braces.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/braces.h
@@ -27,7 +27,7 @@ void add_long_closebrace_comment(void);
  * Adds a comment after the ref chunk
  * Returns the added chunk or nullptr
  */
-chunk_t *insert_comment_after(chunk_t *ref, c_token_t cmt_type, const unc_text &cmt_text);
+Chunk *insert_comment_after(Chunk *ref, E_Token cmt_type, const unc_text &cmt_text);
 
 
 #endif /* BRACES_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/calculate_closing_brace_position.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/calculate_closing_brace_position.cpp
index a52ab017..30865900 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/calculate_closing_brace_position.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/calculate_closing_brace_position.cpp
@@ -7,17 +7,17 @@
 
 #include "calculate_closing_brace_position.h"
 
-#include "chunk_list.h"
+#include "chunk.h"
 
 using namespace uncrustify;
 
 
-chunk_t *calculate_closing_brace_position(const chunk_t *cl_colon, chunk_t *pc)
+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->orig_line, cl_colon->orig_col, cl_colon->level);
+   LOG_FMT(LMCB, "%s(%d): pc->Text()       is '%s', orig_line %zu, orig_col is %zu, level is %zu\n",
+           __func__, __LINE__, pc->Text(), pc->orig_line, pc->orig_col, pc->level);
    // end of block is reached
    // look back over newline, preprocessor BUT NOT #endif
 
@@ -36,13 +36,13 @@ chunk_t *calculate_closing_brace_position(const chunk_t *cl_colon, chunk_t *pc)
    {
       check_level = pc->level;
    }
-   size_t  erst_found      = 0;
-   chunk_t *is_brace_close = nullptr;
-   chunk_t *is_semicolon   = nullptr;
-   chunk_t *is_comment     = nullptr;
-   chunk_t *back           = chunk_get_prev_nnl(pc);
+   size_t erst_found      = 0;
+   Chunk  *is_brace_close = Chunk::NullChunkPtr;
+   Chunk  *is_semicolon   = Chunk::NullChunkPtr;
+   Chunk  *is_comment     = Chunk::NullChunkPtr;
+   Chunk  *back           = pc->GetPrevNnl();
 
-   while (back != nullptr)
+   while (back->IsNotNullChunk())
    {
       if (back == cl_colon)
       {
@@ -75,7 +75,7 @@ chunk_t *calculate_closing_brace_position(const chunk_t *cl_colon, chunk_t *pc)
             erst_found = 4;
          }
 
-         if (chunk_is_comment(back))
+         if (back->IsComment())
          {
             // comment found
             is_comment = back;
@@ -83,18 +83,18 @@ chunk_t *calculate_closing_brace_position(const chunk_t *cl_colon, chunk_t *pc)
                     __func__, __LINE__, back->orig_line, back->orig_col, back->level);
          }
       }
-      back = chunk_get_prev(back);
+      back = back->GetPrev();
    }
    LOG_FMT(LMCB, "%s(%d): erst_found is %zu\n",
            __func__, __LINE__, erst_found);
-   chunk_t *last = nullptr;
+   Chunk *last = Chunk::NullChunkPtr;
 
    if (  erst_found == 3
       || erst_found == 4)
    {
-      if (is_comment != nullptr)
+      if (is_comment->IsNotNullChunk())
       {
-         chunk_t *second = nullptr;
+         Chunk *second = Chunk::NullChunkPtr;
 
          if (erst_found == 3)
          {
@@ -106,7 +106,7 @@ chunk_t *calculate_closing_brace_position(const chunk_t *cl_colon, chunk_t *pc)
             second = is_semicolon;
          }
 
-         if (second != nullptr)
+         if (second->IsNotNullChunk())
          {
             if (is_comment->orig_line == second->orig_line)
             {
@@ -114,12 +114,12 @@ chunk_t *calculate_closing_brace_position(const chunk_t *cl_colon, chunk_t *pc)
 
                if (cl_colon->orig_line == is_comment->orig_line)
                {
-                  last = chunk_get_next(is_comment);
+                  last = is_comment->GetNext();
                }
             }
             else
             {
-               last = chunk_get_prev_ncnnl(pc);
+               last = pc->GetPrevNcNnl();
             }
          }
          else
@@ -132,7 +132,7 @@ chunk_t *calculate_closing_brace_position(const chunk_t *cl_colon, chunk_t *pc)
       }
       else
       {
-         last = chunk_get_prev_ncnnl(pc);
+         last = pc->GetPrevNcNnl();
       }
    }
    else
@@ -145,25 +145,25 @@ chunk_t *calculate_closing_brace_position(const chunk_t *cl_colon, chunk_t *pc)
 
    if (chunk_is_token(last, CT_COMMENT_CPP))         // Issue #3058
    {
-      last = chunk_get_next(last);
+      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->orig_line, last->orig_col);
 
-   if (chunk_is_preproc(last))
+   if (last->IsPreproc())
    {
       // we have a preprocessor token
-      while (last != nullptr)
+      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->orig_line, last->orig_col);
 
          if (chunk_is_token(last, CT_PP_ENDIF))
          {
             // look for the parent
-            chunk_t *parent_last = last->parent;
+            Chunk *parent_last = last->parent;
             // compare the positions
-            int     comp = chunk_compare_position(parent_last, cl_colon);
+            int   comp = chunk_compare_position(parent_last, cl_colon);
             LOG_FMT(LMCB, "%s(%d): comp is %d\n",
                     __func__, __LINE__, comp);
 
@@ -171,25 +171,25 @@ chunk_t *calculate_closing_brace_position(const chunk_t *cl_colon, chunk_t *pc)
             {
                // cl_colon is after parent_last ==>
                // the closing brace will be set before #endif
-               chunk_t *pp_start = chunk_get_pp_start(last);
-               last = chunk_get_prev_nnl(pp_start);
-               LOG_FMT(LMCB, "%s(%d): text() is '%s', orig_line %zu, orig_col is %zu\n",
-                       __func__, __LINE__, last->text(), last->orig_line, last->orig_col);
+               Chunk *pp_start = chunk_get_pp_start(last);
+               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);
             }
             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->orig_line, last->orig_col);
             }
             break;
          }
-         last = chunk_get_prev_ncnnl(last);
-         LOG_FMT(LMCB, "%s(%d): text() is '%s', orig_line %zu, orig_col is %zu\n",
-                 __func__, __LINE__, last->text(), last->orig_line, last->orig_col);
+         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);
 
-         if (!chunk_is_preproc(last))
+         if (!last->IsPreproc())
          {
             break;
          }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/calculate_closing_brace_position.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/calculate_closing_brace_position.h
index c82f4ace..6d2b0f06 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/calculate_closing_brace_position.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/calculate_closing_brace_position.h
@@ -12,7 +12,7 @@
 #include "uncrustify_types.h"
 
 
-chunk_t *calculate_closing_brace_position(const chunk_t *cl_colon, chunk_t *pc);
+Chunk *calculate_closing_brace_position(const Chunk *cl_colon, Chunk *pc);
 
 
 #endif /* CALCULATE_CLOSING_BRACE_POSITION_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/char_table.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/char_table.h
index 3fa23a54..3fa23a54 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/char_table.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/char_table.h
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
new file mode 100644
index 00000000..0ad879b4
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/chunk.cpp
@@ -0,0 +1,1167 @@
+/**
+ * @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
new file mode 100644
index 00000000..cf3b987f
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/chunk.h
@@ -0,0 +1,1262 @@
+/**
+ * @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.74.0/src/combine.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/combine.cpp
index c7bd48a1..f21d106c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/combine.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/combine.cpp
@@ -34,20 +34,20 @@ using namespace uncrustify;
  *
  * @param pc  the CT_ASM item
  */
-static void flag_asm(chunk_t *pc);
+static void flag_asm(Chunk *pc);
 
 
 /**
  * Skips the list of class/struct parent types.
  */
-chunk_t *skip_parent_types(chunk_t *colon);
+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_t *bo1);
+static void check_double_brace_init(Chunk *bo1);
 
 
 static void process_returns(void);
@@ -59,7 +59,7 @@ static void process_returns(void);
  *
  * @param pc  Pointer to the return chunk
  */
-static chunk_t *process_return(chunk_t *pc);
+static Chunk *process_return(Chunk *pc);
 
 
 /**
@@ -68,7 +68,7 @@ static chunk_t *process_return(chunk_t *pc);
  * Change colons, etc. Processes stuff until '@end'.
  * Skips anything in braces.
  */
-static void handle_oc_class(chunk_t *pc);
+static void handle_oc_class(Chunk *pc);
 
 
 /**
@@ -82,7 +82,7 @@ static void handle_oc_class(chunk_t *pc);
  *
  * @param pc  points to the '^'
  */
-static void handle_oc_block_literal(chunk_t *pc);
+static void handle_oc_block_literal(Chunk *pc);
 
 
 /**
@@ -97,7 +97,7 @@ static void handle_oc_block_literal(chunk_t *pc);
  *
  * @param pc  points to the '^'
  */
-static void handle_oc_block_type(chunk_t *pc);
+static void handle_oc_block_type(Chunk *pc);
 
 
 /**
@@ -117,7 +117,7 @@ static void handle_oc_block_type(chunk_t *pc);
  * -(void) foo: (int) arg: {  }
  * -(void) insertObject:(id)anObject atIndex:(int)index
  */
-static void handle_oc_message_decl(chunk_t *pc);
+static void handle_oc_message_decl(Chunk *pc);
 
 
 /**
@@ -132,14 +132,14 @@ static void handle_oc_message_decl(chunk_t *pc);
  *
  * @param pc  points to the open square '['
  */
-static void handle_oc_message_send(chunk_t *pc);
+static void handle_oc_message_send(Chunk *pc);
 
 
 //! Process @Property values and re-arrange them if necessary
-static void handle_oc_property_decl(chunk_t *pc);
+static void handle_oc_property_decl(Chunk *pc);
 
 //! Process @available annotation
-static void handle_oc_available(chunk_t *pc);
+static void handle_oc_available(Chunk *pc);
 
 /**
  * Process a type that is enclosed in parens in message declarations.
@@ -149,7 +149,7 @@ static void handle_oc_available(chunk_t *pc);
  *
  * @return the chunk after the type
  */
-static chunk_t *handle_oc_md_type(chunk_t *paren_open, c_token_t ptype, pcf_flags_t flags, bool &did_it);
+static Chunk *handle_oc_md_type(Chunk *paren_open, E_Token ptype, pcf_flags_t flags, bool &did_it);
 
 /**
  * Process an C# [] thingy:
@@ -161,7 +161,7 @@ static chunk_t *handle_oc_md_type(chunk_t *paren_open, c_token_t ptype, pcf_flag
  *
  * @param pc  points to the open square '['
  */
-static void handle_cs_square_stmt(chunk_t *pc);
+static void handle_cs_square_stmt(Chunk *pc);
 
 
 /**
@@ -169,7 +169,7 @@ static void handle_cs_square_stmt(chunk_t *pc);
  * Set the brace parent to CT_CS_PROPERTY and find the first item in the
  * property and set its parent, too.
  */
-static void handle_cs_property(chunk_t *pc);
+static void handle_cs_property(Chunk *pc);
 
 
 /**
@@ -177,7 +177,7 @@ static void handle_cs_property(chunk_t *pc);
  * Example: int[,,] x;
  * If there is nothing but commas between the open and close, then mark it.
  */
-static void handle_cs_array_type(chunk_t *pc);
+static void handle_cs_array_type(Chunk *pc);
 
 
 /**
@@ -193,7 +193,7 @@ static void handle_cs_array_type(chunk_t *pc);
  * Set the parent to the class after the <> to CT_TEMPLATE.
  * Set the parent of the semicolon to CT_TEMPLATE.
  */
-static void handle_cpp_template(chunk_t *pc);
+static void handle_cpp_template(Chunk *pc);
 
 
 /**
@@ -202,7 +202,7 @@ static void handle_cpp_template(chunk_t *pc);
  * sq_o is '[' CT_SQUARE_OPEN or '[]' CT_TSQUARE
  * Split the '[]' so we can control the space
  */
-static void handle_cpp_lambda(chunk_t *pc);
+static void handle_cpp_lambda(Chunk *pc);
 
 
 /**
@@ -215,7 +215,7 @@ static void handle_cpp_lambda(chunk_t *pc);
  * Set the parent of the parens and braces to CT_TEMPLATE.
  * Scan the body for each type in TYPELIST and change the type to CT_TYPE.
  */
-static void handle_d_template(chunk_t *pc);
+static void handle_d_template(Chunk *pc);
 
 
 /**
@@ -225,7 +225,7 @@ static void handle_d_template(chunk_t *pc);
  * A type wrap chunk and what follows should be treated as a simple type.
  * Create new text for the chunk and call it a CT_TYPE.
  */
-static void handle_wrap(chunk_t *pc);
+static void handle_wrap(Chunk *pc);
 
 
 /**
@@ -237,36 +237,36 @@ static void handle_wrap(chunk_t *pc);
  * NAME is marked as CT_WORD.
  * PARAMS is all marked as prototype parameters.
  */
-static void handle_proto_wrap(chunk_t *pc);
+static void handle_proto_wrap(Chunk *pc);
 
 
-static bool is_oc_block(chunk_t *pc);
+static bool is_oc_block(Chunk *pc);
 
 
 /**
  * Java assert statements are: "assert EXP1 [: EXP2] ;"
  * Mark the parent of the colon and semicolon
  */
-static void handle_java_assert(chunk_t *pc);
+static void handle_java_assert(Chunk *pc);
 
 
-static void flag_asm(chunk_t *pc)
+static void flag_asm(Chunk *pc)
 {
    LOG_FUNC_ENTRY();
 
-   chunk_t *tmp = chunk_get_next_ncnnl(pc, scope_e::PREPROC);
+   Chunk *tmp = pc->GetNextNcNnl(E_Scope::PREPROC);
 
    if (chunk_is_not_token(tmp, CT_QUALIFIER))
    {
       return;
    }
-   chunk_t *po = chunk_get_next_ncnnl(tmp, scope_e::PREPROC);
+   Chunk *po = tmp->GetNextNcNnl(E_Scope::PREPROC);
 
    if (!chunk_is_paren_open(po))
    {
       return;
    }
-   chunk_t *end = chunk_skip_to_match(po, scope_e::PREPROC);
+   Chunk *end = chunk_skip_to_match(po, E_Scope::PREPROC);
 
    if (end == nullptr)
    {
@@ -275,10 +275,10 @@ static void flag_asm(chunk_t *pc)
    set_chunk_parent(po, CT_ASM);
    set_chunk_parent(end, CT_ASM);
 
-   for (  tmp = chunk_get_next_ncnnl(po, scope_e::PREPROC);
-          tmp != nullptr
+   for (  tmp = po->GetNextNcNnl(E_Scope::PREPROC);
+          tmp->IsNotNullChunk()
        && tmp != end;
-          tmp = chunk_get_next_ncnnl(tmp, scope_e::PREPROC))
+          tmp = tmp->GetNextNcNnl(E_Scope::PREPROC))
    {
       if (chunk_is_token(tmp, CT_COLON))
       {
@@ -287,10 +287,10 @@ static void flag_asm(chunk_t *pc)
       else if (chunk_is_token(tmp, CT_DC_MEMBER))
       {
          // if there is a string on both sides, then this is two ASM_COLONs
-         if (  chunk_is_token(chunk_get_next_ncnnl(tmp, scope_e::PREPROC), CT_STRING)
-            && chunk_is_token(chunk_get_prev_ncnnlni(tmp, scope_e::PREPROC), CT_STRING)) // Issue #2279
+         if (  chunk_is_token(tmp->GetNextNcNnl(E_Scope::PREPROC), CT_STRING)
+            && chunk_is_token(tmp->GetPrevNcNnlNi(E_Scope::PREPROC), CT_STRING)) // Issue #2279
          {
-            chunk_t nc;
+            Chunk nc;
 
             nc = *tmp;
 
@@ -307,9 +307,9 @@ static void flag_asm(chunk_t *pc)
       }
    }
 
-   tmp = chunk_get_next_ncnnl(end, scope_e::PREPROC);
+   tmp = end->GetNextNcNnl(E_Scope::PREPROC);
 
-   if (tmp == nullptr)
+   if (tmp->IsNullChunk())
    {
       return;
    }
@@ -321,22 +321,31 @@ static void flag_asm(chunk_t *pc)
 } // flag_asm
 
 
-void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
+void do_symbol_check(Chunk *prev, Chunk *pc, Chunk *next)
 {
    LOG_FUNC_ENTRY();
-   LOG_FMT(LFCNR, "%s(%d): prev is '%s'/%s\n",
+   LOG_FMT(LFCNR, "%s(%d): prev is '%s' %s\n",
            __func__, __LINE__,
-           prev->text(), get_token_name(prev->type));
+           prev->Text(), get_token_name(prev->type));
    log_pcf_flags(LFCNR, prev->flags);
-   LOG_FMT(LFCNR, "%s(%d): pc is '%s'/%s\n",
+   LOG_FMT(LFCNR, "%s(%d): pc is '%s' %s\n",
            __func__, __LINE__,
-           pc->text(), get_token_name(pc->type));
+           pc->Text(), get_token_name(pc->type));
    log_pcf_flags(LFCNR, pc->flags);
-   LOG_FMT(LFCNR, "%s(%d): next is '%s'/%s\n",
+   LOG_FMT(LFCNR, "%s(%d): next is '%s' %s\n",
            __func__, __LINE__,
-           next->text(), get_token_name(next->type));
+           next->Text(), get_token_name(next->type));
    log_pcf_flags(LFCNR, next->flags);
 
+   if (  chunk_is_token(pc, CT_NOEXCEPT)                 // Issue #3284
+      && chunk_is_token(next, 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());
+      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)
@@ -344,22 +353,24 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
       && (  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_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);
+      return;
    }
 
    if (  (  chunk_is_token(prev, CT_FPAREN_CLOSE)
-         || (  (  chunk_is_str(prev, "const", 5)
-               || chunk_is_str(prev, "override", 8))
+         || (  (  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", 1)))
+         || chunk_is_str(next, "0")))
    {
       set_chunk_type(pc, CT_ASSIGN_FUNC_PROTO);
+      return;                  // cpp 30031
    }
 
    if (chunk_is_token(pc, CT_OC_AT))
@@ -373,17 +384,19 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
       else
       {
          set_chunk_parent(next, 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", 5)
+      && chunk_is_str(pc, "const")
       && chunk_is_token(next, CT_PAREN_OPEN))
    {
       set_chunk_type(pc, CT_D_CAST);
       set_paren_parent(next, pc->type);
+      return;                  // d_40061
    }
 
    if (  chunk_is_token(next, CT_PAREN_OPEN)
@@ -392,7 +405,7 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
          || chunk_is_token(pc, CT_ALIGN)))
    {
       // mark the parenthesis parent
-      chunk_t *tmp = set_paren_parent(next, pc->type);
+      Chunk *tmp = set_paren_parent(next, pc->type);
 
       // For a D cast - convert the next item
       if (  chunk_is_token(pc, CT_D_CAST)
@@ -401,18 +414,22 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
          if (chunk_is_token(tmp, CT_STAR))
          {
             set_chunk_type(tmp, CT_DEREF);
+            return;                  // d_40006
          }
          else if (chunk_is_token(tmp, CT_AMP))
          {
             set_chunk_type(tmp, CT_ADDR);
+            return;                  // d_40060
          }
          else if (chunk_is_token(tmp, CT_MINUS))
          {
             set_chunk_type(tmp, CT_NEG);
+            return;                  // d_40060
          }
          else if (chunk_is_token(tmp, CT_PLUS))
          {
             set_chunk_type(tmp, CT_POS);
+            return;                  // d_40060
          }
       }
 
@@ -432,7 +449,7 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
             }
          }
 
-         for (tmp = chunk_get_prev_ncnnlni(pc); tmp != nullptr; tmp = chunk_get_prev_ncnnlni(tmp)) // Issue #2279
+         for (tmp = pc->GetPrevNcNnlNi(); tmp->IsNotNullChunk(); tmp = tmp->GetPrevNcNnlNi()) // Issue #2279
          {
             if (  chunk_is_semicolon(tmp)
                || chunk_is_token(tmp, CT_BRACE_OPEN)
@@ -442,6 +459,8 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
             }
             make_type(tmp);
          }
+
+         return;                  // c-sharp_10160
       }
 
       if (  chunk_is_token(pc, CT_ALIGN)
@@ -450,10 +469,12 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
          if (chunk_is_token(tmp, CT_BRACE_OPEN))
          {
             set_paren_parent(tmp, pc->type);
+            return;                  // d_40024
          }
          else if (chunk_is_token(tmp, CT_COLON))
          {
             set_chunk_parent(tmp, pc->type);
+            return;                  // d_40024
          }
       }
    } // paren open + cast/align/delegate
@@ -463,9 +484,14 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
       if (chunk_is_token(next, CT_PAREN_OPEN))
       {
          set_chunk_parent(next, pc->type);
-         chunk_t *tmp = chunk_get_next(next);
+         Chunk *tmp = next->GetNext();
+
+         if (tmp == nullptr)
+         {
+            tmp = Chunk::NullChunkPtr;
+         }
 
-         while (tmp != nullptr)
+         while (tmp->IsNotNullChunk())
          {
             if (chunk_is_token(tmp, CT_PAREN_CLOSE))
             {
@@ -473,12 +499,14 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
                break;
             }
             make_type(tmp);
-            tmp = chunk_get_next(tmp);
+            tmp = tmp->GetNext();
          }
+         return;                  // d_40100
       }
       else
       {
          set_chunk_type(pc, CT_QUALIFIER);
+         return;
       }
    }
 
@@ -488,11 +516,13 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
          || chunk_is_token(pc, CT_GETSET_EMPTY)))
    {
       flag_parens(prev, PCF_NONE, CT_NONE, CT_GETSET, false);
+      return;
    }
 
    if (chunk_is_token(pc, CT_ASM))
    {
       flag_asm(pc);
+      return;
    }
 
    // clang stuff - A new derived type is introduced to C and, by extension, Objective-C, C++, and Objective-C++
@@ -504,6 +534,7 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
             || pc->flags.test(PCF_IN_PREPROC))
          {
             handle_oc_block_literal(pc);
+            return;
          }
       }
    }
@@ -514,11 +545,12 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
       // Check for message declarations
       if (pc->flags.test(PCF_STMT_START))
       {
-         if (  (  chunk_is_str(pc, "-", 1)
-               || chunk_is_str(pc, "+", 1))
-            && chunk_is_str(next, "(", 1))
+         if (  (  chunk_is_str(pc, "-")
+               || chunk_is_str(pc, "+"))
+            && chunk_is_str(next, "("))
          {
             handle_oc_message_decl(pc);
+            return;
          }
       }
 
@@ -528,17 +560,20 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
          if (chunk_is_token(pc, CT_SQUARE_OPEN))
          {
             handle_oc_message_send(pc);
+            return;                  // objective-c_50003
          }
       }
 
       if (chunk_is_token(pc, CT_OC_PROPERTY))
       {
          handle_oc_property_decl(pc);
+         return;
       }
 
       if (chunk_is_token(pc, CT_OC_AVAILABLE))
       {
          handle_oc_available(pc);
+         return;
       }
    }
 
@@ -550,6 +585,7 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
          && chunk_is_token(pc, CT_SQUARE_OPEN))
       {
          handle_cs_square_stmt(pc);
+         return;
       }
 
       if (  chunk_is_token(next, CT_BRACE_OPEN)
@@ -559,12 +595,14 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
             || chunk_is_token(pc, CT_WORD)))
       {
          handle_cs_property(next);
+         return;
       }
 
       if (  chunk_is_token(pc, CT_SQUARE_CLOSE)
          && chunk_is_token(next, CT_WORD))
       {
          handle_cs_array_type(pc);
+         return;
       }
 
       if (  (  chunk_is_token(pc, CT_LAMBDA)
@@ -572,13 +610,15 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
          && chunk_is_token(next, CT_BRACE_OPEN))
       {
          set_paren_parent(next, pc->type);
+         return;
       }
 
       if (  chunk_is_token(pc, CT_WHEN)
-         && pc->next != nullptr
-         && pc->next->type != CT_SPAREN_OPEN)
+         && pc->GetNext()->IsNotNullChunk()
+         && pc->GetNext()->type != CT_SPAREN_OPEN)
       {
          set_chunk_type(pc, CT_WORD);
+         return;
       }
    }
 
@@ -587,17 +627,18 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
       && chunk_is_token(next, CT_BRACE_OPEN))
    {
       set_paren_parent(next, pc->type);
+      return;
    }
 
    if (chunk_is_token(pc, CT_NEW))
    {
-      chunk_t *ts  = nullptr;
-      chunk_t *tmp = next;
+      Chunk *ts  = nullptr;
+      Chunk *tmp = next;
 
       if (chunk_is_token(tmp, CT_TSQUARE))
       {
          ts  = tmp;
-         tmp = chunk_get_next_ncnnl(tmp);
+         tmp = tmp->GetNextNcNnl();
       }
 
       if (  chunk_is_token(tmp, CT_BRACE_OPEN)
@@ -610,10 +651,8 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
             set_chunk_parent(ts, pc->type);
          }
       }
+      return;
    }
-   LOG_FMT(LFCNR, "%s(%d): pc is '%s'/%s\n",
-           __func__, __LINE__,
-           pc->text(), get_token_name(pc->type));
 
    // C++11 Lambda stuff
    if (  language_is_set(LANG_CPP)
@@ -633,9 +672,9 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
          set_paren_parent(next, CT_ASSIGN);
 
          // Mark one-liner assignment
-         chunk_t *tmp = next;
+         Chunk *tmp = next;
 
-         while ((tmp = chunk_get_next_nc(tmp)) != nullptr)
+         while ((tmp = tmp->GetNextNc())->IsNotNullChunk())
          {
             if (chunk_is_newline(tmp))
             {
@@ -650,39 +689,43 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
                break;
             }
          }
+         return;
       }
    }
 
    if (chunk_is_token(pc, CT_ASSERT))
    {
       handle_java_assert(pc);
+      return;
    }
 
    if (chunk_is_token(pc, CT_ANNOTATION))
    {
-      chunk_t *tmp = chunk_get_next_ncnnl(pc);
+      Chunk *tmp = pc->GetNextNcNnl();
 
       if (chunk_is_paren_open(tmp))
       {
          set_paren_parent(tmp, CT_ANNOTATION);
       }
+      return;
    }
 
    if (  chunk_is_token(pc, CT_SIZEOF)
       && language_is_set(LANG_ALLC))
    {
-      chunk_t *tmp = chunk_get_next_ncnnl(pc);
+      Chunk *tmp = pc->GetNextNcNnl();
 
       if (chunk_is_token(tmp, CT_ELLIPSIS))
       {
          set_chunk_parent(tmp, CT_SIZEOF);
       }
+      return;
    }
 
    if (  chunk_is_token(pc, CT_DECLTYPE)
       && pc->parent_type != CT_FUNC_DEF)
    {
-      chunk_t *tmp = chunk_get_next_ncnnl(pc);
+      Chunk *tmp = pc->GetNextNcNnl();
 
       if (chunk_is_paren_open(tmp))
       {
@@ -706,6 +749,7 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
             }
          }
       }
+      return;
    }
 
    // A [] in C# and D only follows a type
@@ -721,6 +765,7 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
       {
          chunk_flags_set(next, PCF_VAR_1ST_DEF);
       }
+      return;
    }
 
    if (  chunk_is_token(pc, CT_SQL_EXEC)
@@ -728,17 +773,20 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
       || chunk_is_token(pc, CT_SQL_END))
    {
       mark_exec_sql(pc);
+      return;
    }
 
    if (chunk_is_token(pc, CT_PROTO_WRAP))
    {
       handle_proto_wrap(pc);
+      return;
    }
 
    // Handle the typedef
    if (chunk_is_token(pc, CT_TYPEDEF))
    {
       fix_typedef(pc);
+      return;
    }
 
    if (  chunk_is_class_enum_struct_union(pc)
@@ -746,13 +794,14 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
    {
       EnumStructUnionParser parser;
       parser.parse(pc);
+      return;
    }
 
    if (chunk_is_token(pc, CT_EXTERN))
    {
       if (chunk_is_paren_open(next))
       {
-         chunk_t *tmp = flag_parens(next, PCF_NONE, CT_NONE, CT_EXTERN, true);
+         Chunk *tmp = flag_parens(next, PCF_NONE, CT_NONE, CT_EXTERN, true);
 
          if (chunk_is_token(tmp, CT_BRACE_OPEN))
          {
@@ -763,13 +812,14 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
       {
          // next likely is a string (see tokenize_cleanup.cpp)
          set_chunk_parent(next, CT_EXTERN);
-         chunk_t *tmp = chunk_get_next_ncnnl(next);
+         Chunk *tmp = next->GetNextNcNnl();
 
          if (chunk_is_token(tmp, CT_BRACE_OPEN))
          {
             set_paren_parent(tmp, CT_EXTERN);
          }
       }
+      return;
    }
 
    if (chunk_is_token(pc, CT_TEMPLATE))
@@ -782,6 +832,7 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
       {
          handle_cpp_template(pc);
       }
+      return;
    }
 
    if (  chunk_is_token(pc, CT_WORD)
@@ -789,17 +840,20 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
       && get_chunk_parent_type(next) == CT_TEMPLATE)
    {
       mark_template_func(pc, next);
+      return;
    }
 
    if (  chunk_is_token(pc, CT_SQUARE_CLOSE)
       && chunk_is_token(next, CT_PAREN_OPEN))
    {
       flag_parens(next, PCF_NONE, CT_FPAREN_OPEN, CT_NONE, false);
+      return;
    }
 
    if (chunk_is_token(pc, CT_TYPE_CAST))
    {
       fix_type_cast(pc);
+      return;
    }
 
    if (  get_chunk_parent_type(pc) == CT_ASSIGN
@@ -808,11 +862,13 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
    {
       // Mark everything in here as in assign
       flag_parens(pc, PCF_IN_ARRAY_ASSIGN, pc->type, CT_NONE, false);
+      return;
    }
 
    if (chunk_is_token(pc, CT_D_TEMPLATE))
    {
       set_paren_parent(next, pc->type);
+      return;
    }
 
    /*
@@ -821,7 +877,7 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
     */
    if (chunk_is_token(next, CT_PAREN_OPEN))
    {
-      chunk_t *tmp = chunk_get_next_ncnnl(next);
+      Chunk *tmp = next->GetNextNcNnl();
 
       if (  language_is_set(LANG_C | LANG_CPP | LANG_OC)
          && chunk_is_token(tmp, CT_CARET))
@@ -833,8 +889,8 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
                || chunk_is_token(tmp, CT_CARET))
             && chunk_is_token(pc, 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());
+            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);
          }
       }
@@ -861,8 +917,8 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *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->orig_line, pc->orig_col, pc->Text());
 
          bool is_byref_array = false;
 
@@ -871,20 +927,20 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
             // If the open paren is followed by an ampersand, an optional word,
             // a close parenthesis, and an open square bracket, then it is an
             // array being passed by reference, not a cast
-            tmp = chunk_get_next_ncnnl(next);
+            tmp = next->GetNextNcNnl();
 
             if (chunk_is_token(tmp, CT_AMP))
             {
-               auto tmp2 = chunk_get_next_ncnnl(tmp);
+               auto tmp2 = tmp->GetNextNcNnl();
 
                if (chunk_is_token(tmp2, CT_WORD))
                {
-                  tmp2 = chunk_get_next_ncnnl(tmp2);
+                  tmp2 = tmp2->GetNextNcNnl();
                }
 
                if (chunk_is_token(tmp2, CT_PAREN_CLOSE))
                {
-                  tmp2 = chunk_get_next_ncnnl(tmp2);
+                  tmp2 = tmp2->GetNextNcNnl();
 
                   if (chunk_is_token(tmp2, CT_SQUARE_OPEN))
                   {
@@ -897,11 +953,11 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
 
          if (!is_byref_array)
          {
-            tmp = chunk_get_next_type(next, CT_PAREN_CLOSE, next->level);
+            tmp = next->GetNextType(CT_PAREN_CLOSE, next->level);
 
-            if (tmp != nullptr)
+            if (tmp->IsNotNullChunk())
             {
-               tmp = chunk_get_next(tmp);
+               tmp = tmp->GetNext();
 
                if (chunk_is_token(tmp, CT_PAREN_OPEN))
                {
@@ -912,7 +968,7 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
                   if (  get_chunk_parent_type(pc) == CT_NONE
                      && !pc->flags.test(PCF_IN_TYPEDEF))
                   {
-                     tmp = chunk_get_next_ncnnl(next);
+                     tmp = next->GetNextNcNnl();
 
                      if (chunk_is_token(tmp, CT_PAREN_CLOSE))
                      {
@@ -937,8 +993,8 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
       if (  chunk_is_token(pc, CT_FUNCTION)
          && pc->brace_level > 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());
+         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);
       }
 
@@ -966,6 +1022,7 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
    {
       set_chunk_type(pc, CT_C99_MEMBER);
       set_chunk_parent(next, CT_C99_MEMBER);
+      return;
    }
 
    // Mark function parens and braces
@@ -974,7 +1031,7 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
       || chunk_is_token(pc, CT_FUNC_CALL_USER)
       || chunk_is_token(pc, CT_FUNC_PROTO))
    {
-      chunk_t *tmp = next;
+      Chunk *tmp = next;
 
       if (chunk_is_token(tmp, CT_SQUARE_OPEN))
       {
@@ -983,16 +1040,18 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
       else if (  chunk_is_token(tmp, CT_TSQUARE)
               || get_chunk_parent_type(tmp) == CT_OPERATOR)
       {
-         tmp = chunk_get_next_ncnnl(tmp);
+         tmp = tmp->GetNextNcNnl();
       }
 
-      if (tmp != nullptr)
+      if (  tmp != nullptr
+         && tmp->IsNotNullChunk())
       {
          if (chunk_is_paren_open(tmp))
          {
             tmp = flag_parens(tmp, PCF_NONE, CT_FPAREN_OPEN, pc->type, false);
 
-            if (tmp != nullptr)
+            if (  tmp != nullptr
+               && tmp->IsNotNullChunk())
             {
                if (chunk_is_token(tmp, CT_BRACE_OPEN))
                {
@@ -1010,6 +1069,7 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
             }
          }
       }
+      return;
    }
 
    // Mark the parameters in catch()
@@ -1017,6 +1077,7 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
       && chunk_is_token(next, CT_SPAREN_OPEN))
    {
       fix_fcn_def_params(next);
+      return;
    }
 
    if (  chunk_is_token(pc, CT_THROW)
@@ -1028,6 +1089,7 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
       {
          set_paren_parent(next, CT_THROW);
       }
+      return;
    }
 
    // Mark the braces in: "for_each_entry(xxx) { }"
@@ -1038,9 +1100,10 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
          || 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());
+      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());
       set_paren_parent(pc, CT_FUNC_CALL);
+      return;
    }
 
    /*
@@ -1055,8 +1118,8 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
       && !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, ")", 1)
-      && chunk_is_str(next, "(", 1))
+      && chunk_is_str(pc, ")")
+      && chunk_is_str(next, "("))
    {
       if (language_is_set(LANG_D))
       {
@@ -1066,11 +1129,13 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
       {
          mark_function_type(pc);
       }
+      return;
    }
 
    if (chunk_is_token(pc, CT_OC_CLASS))
    {
       handle_oc_class(pc);
+      return;
    }
    // TODO: Check for stuff that can only occur at the start of an statement
 
@@ -1100,12 +1165,13 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
          && !pc->flags.test(PCF_IN_TYPEDEF))
       {
          fix_casts(pc);
+         return;
       }
    }
 
    if (language_is_set(LANG_CPP))
    {
-      chunk_t *nnext = chunk_get_next_ncnnl(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)
@@ -1114,17 +1180,17 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
          && (  chunk_is_token(next, CT_DEFAULT)
             || chunk_is_token(next, CT_DELETE)
             || (  chunk_is_token(next, CT_NUMBER)
-               && chunk_is_str(next, "0", 1))))
+               && chunk_is_str(next, "0"))))
       {
          const size_t level        = pc->level;
          bool         found_status = false;
-         chunk_t      *pprev       = chunk_get_prev(pc);
+         Chunk        *pprev       = pc->GetPrev();
 
-         for ( ; (  pprev != nullptr
+         for ( ; (  pprev->IsNotNullChunk()
                  && pprev->level >= level
                  && chunk_is_not_token(pprev, CT_SEMICOLON)
                  && chunk_is_not_token(pprev, CT_ACCESS_COLON))
-               ; pprev = chunk_get_prev(pprev))
+               ; pprev = pprev->GetPrev())
          {
             if (pprev->level != level)
             {
@@ -1134,7 +1200,7 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
             if (chunk_is_token(next, CT_NUMBER))
             {
                if (  chunk_is_token(pprev, CT_QUALIFIER)
-                  && chunk_is_str(pprev, "virtual", 7))
+                  && chunk_is_str(pprev, "virtual"))
                {
                   found_status = true;
                   break;
@@ -1195,29 +1261,29 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
          set_chunk_type(pc, CT_PTR_TYPE);
       }
 
-      if (  language_is_set(LANG_CS)
+      if (  language_is_set(LANG_CS | LANG_VALA)
          && chunk_is_token(pc, CT_QUESTION)
          && chunk_is_token(prev, CT_ANGLE_CLOSE))
       {
          set_chunk_type(pc, CT_PTR_TYPE);
       }
 
-      if (chunk_is_token(pc, CT_MINUS))
+      else if (chunk_is_token(pc, CT_MINUS))
       {
          set_chunk_type(pc, CT_NEG);
       }
 
-      if (chunk_is_token(pc, CT_PLUS))
+      else if (chunk_is_token(pc, CT_PLUS))
       {
          set_chunk_type(pc, CT_POS);
       }
 
-      if (chunk_is_token(pc, CT_INCDEC_AFTER))
+      else if (chunk_is_token(pc, CT_INCDEC_AFTER))
       {
          set_chunk_type(pc, CT_INCDEC_BEFORE);
       }
 
-      if (chunk_is_token(pc, CT_AMP))
+      else if (chunk_is_token(pc, CT_AMP))
       {
          if (chunk_is_token(prev, CT_ANGLE_CLOSE))             // Issue #2324
          {
@@ -1229,7 +1295,7 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
          }
       }
 
-      if (chunk_is_token(pc, CT_CARET))
+      else if (chunk_is_token(pc, CT_CARET))
       {
          if (language_is_set(LANG_C | LANG_CPP | LANG_OC))
          {
@@ -1302,8 +1368,8 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
               || chunk_is_token(prev, CT_DC_MEMBER)
               || chunk_is_token(prev, 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_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);
       }
@@ -1326,10 +1392,10 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
             && language_is_set(LANG_CPP))
          {
             // Issue 1402
-            bool    is_multiplication = false;
-            chunk_t *tmp              = pc;
+            bool  is_multiplication = false;
+            Chunk *tmp              = pc;
 
-            while (tmp != nullptr)
+            while (tmp->IsNotNullChunk())
             {
                if (  chunk_is_token(tmp, CT_SEMICOLON)
                   || get_chunk_parent_type(tmp) == CT_CLASS)
@@ -1343,7 +1409,7 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
                   is_multiplication = true;
                   break;
                }
-               tmp = chunk_get_prev_ncnnlni(tmp); // Issue #2279
+               tmp = tmp->GetPrevNcNnlNi(); // Issue #2279
             }
 
             if (is_multiplication)
@@ -1383,7 +1449,7 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
          }
          else if (  (  get_chunk_parent_type(pc) == CT_FUNC_DEF
                     && (  chunk_is_opening_brace(next)
-                       || chunk_is_star(pc->next)))
+                       || pc->GetNext()->IsStar()))
                  || chunk_is_token(next, CT_QUALIFIER))               // Issue #2648
          {
             // example:
@@ -1418,9 +1484,9 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
 
          if (pc->flags.test(PCF_IN_TYPEDEF))  // Issue #1255/#633
          {
-            chunk_t *tmp = pc;
+            Chunk *tmp = pc;
 
-            while (tmp != nullptr)
+            while (tmp->IsNotNullChunk())
             {
                if (  chunk_is_token(tmp, CT_SEMICOLON)
                   || chunk_is_token(tmp, CT_BRACE_OPEN)
@@ -1432,7 +1498,7 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
                {
                   set_chunk_type(pc, CT_PTR_TYPE);
                }
-               tmp = chunk_get_prev_ncnnlni(tmp); // Issue #2279
+               tmp = tmp->GetPrevNcNnlNi(); // Issue #2279
             }
          }
       }
@@ -1485,11 +1551,12 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
          {
             set_chunk_type(pc, CT_ARITH);
 
-            if (chunk_is_token(prev, CT_WORD))
+            if (  chunk_is_token(prev, CT_WORD)
+               && !chunk_is_token(next, CT_NUMBER)) // Issue #3407
             {
-               chunk_t *tmp = chunk_get_prev_ncnnlni(prev); // Issue #2279
+               Chunk *tmp = prev->GetPrevNcNnlNi(); // Issue #2279
 
-               if (tmp != nullptr)
+               if (tmp->IsNotNullChunk())
                {
                   if (  chunk_is_semicolon(tmp)
                      || chunk_is_token(tmp, CT_BRACE_OPEN)
@@ -1502,19 +1569,14 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
                           || chunk_is_token(next, CT_TYPE)
                           || chunk_is_token(next, 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());
+                        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);
                      }
                   }
                   else if (chunk_is_token(tmp, CT_DC_MEMBER))
                   {
                      set_chunk_type(prev, CT_TYPE);
-
-                     if (chunk_is_not_token(next, CT_TYPE))            // Issue #2103
-                     {
-                        set_chunk_type(pc, CT_BYREF);
-                     }
                   }
                }
             }
@@ -1560,7 +1622,7 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
             {
                if (pc->prev->type == CT_STRING)
                {
-                  if (unc_text::compare(pc->prev->text(), "\"C\"") == 0)
+                  if (unc_text::compare(pc->prev->Text(), "\"C\"") == 0)
                   {
                      if (pc->prev->prev->type == CT_EXTERN)
                      {
@@ -1588,9 +1650,9 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
             {
                // look for the opening parenthesis
                // Issue 1403
-               chunk_t *tmp = chunk_get_prev_type(pc, CT_FPAREN_OPEN, pc->level - 1);
+               Chunk *tmp = pc->GetPrevType(CT_FPAREN_OPEN, pc->level - 1);
 
-               if (  tmp != nullptr
+               if (  tmp->IsNotNullChunk()
                   && get_chunk_parent_type(tmp) != CT_FUNC_CTOR_VAR)
                {
                   set_chunk_type(pc->next, CT_PTR_TYPE);
@@ -1613,15 +1675,16 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
       {
          if (pc->next->type == CT_STAR) // here *
          {
-            chunk_t *tmp = pc;
+            Chunk *tmp = pc;
 
-            while ((tmp != nullptr))
+            while (  tmp != nullptr
+                  && tmp->IsNotNullChunk())
             {
                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());
+                  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
@@ -1633,7 +1696,7 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
                   // we are at beginning of the line
                   break;
                }
-               tmp = chunk_get_prev(tmp);
+               tmp = tmp->GetPrev();
             }
          }
       }
@@ -1652,11 +1715,11 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
 
       auto const search_assign = [&pc, &is_preproc]()
       {
-         for (chunk_t *temp = pc; temp != nullptr; temp = chunk_get_next_ncnnl(temp))
+         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",
+            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));
+                    temp->Text(), get_token_name(temp->type));
 
             if (chunk_is_token(temp, CT_ASSIGN))
             {
@@ -1680,7 +1743,7 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
       if (assign_found)
       {
          // it is a Type alias, alias template
-         for (chunk_t *temp = pc; temp != nullptr; temp = chunk_get_next_ncnnl(temp))
+         for (Chunk *temp = pc; temp->IsNotNullChunk(); temp = temp->GetNextNcNnl())
          {
             if (get_chunk_parent_type(temp) == CT_NONE)
             {
@@ -1701,35 +1764,38 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *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, "&&", 2)
+      && chunk_is_str(pc, "&&")
       && chunk_ends_type(pc->prev))
    {
-      chunk_t *tmp = chunk_get_prev(pc);                 // Issue #2688
-      LOG_FMT(LFCNR, "%s(%d): orig_line is %zu, orig_col is %zu, text() '%s', type is %s\n",
+      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));
+              tmp->Text(), get_token_name(tmp->type));
       log_pcf_flags(LFCNR, tmp->flags);
       // look for a type
 
       if (chunk_is_token(tmp, CT_TYPE))
       {
+         LOG_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);
       }
       // look next, is there a "assign" before the ";"
-      chunk_t *semi = chunk_get_next_type(pc, CT_SEMICOLON, pc->level);                // Issue #2688
+      Chunk *semi = pc->GetNextType(CT_SEMICOLON, pc->level);                // Issue #2688
 
-      if (semi != nullptr)
+      if (semi->IsNotNullChunk())
       {
-         LOG_FMT(LFCNR, "%s(%d): orig_line is %zu, orig_col is %zu, text() '%s', type is %s\n",
+         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));
+                 semi->Text(), get_token_name(semi->type));
 
-         for (chunk_t *test_it = pc; test_it != semi; test_it = chunk_get_next(test_it))
+         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",
+            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));
+                    test_it->Text(), get_token_name(test_it->type));
 
             if (chunk_is_token(test_it, CT_ASSIGN))
             {
@@ -1746,7 +1812,10 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
    if (  chunk_is_token(pc, CT_INCDEC_AFTER)
       && pc->flags.test(PCF_IN_PREPROC))
    {
-      chunk_t *tmp_2 = chunk_get_next(pc);
+      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);
 
       if (chunk_is_token(tmp_2, CT_WORD))
@@ -1757,22 +1826,22 @@ void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next)
 } // do_symbol_check
 
 
-static void check_double_brace_init(chunk_t *bo1)
+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);
-   chunk_t *pc = chunk_get_prev_ncnnlni(bo1);   // Issue #2279
+   Chunk *pc = bo1->GetPrevNcNnlNi();   // Issue #2279
 
-   if (pc == nullptr)
+   if (pc->IsNullChunk())
    {
       return;
    }
 
    if (chunk_is_paren_close(pc))
    {
-      chunk_t *bo2 = chunk_get_next(bo1);
+      Chunk *bo2 = bo1->GetNext();
 
-      if (bo2 == nullptr)
+      if (bo2->IsNullChunk())
       {
          return;
       }
@@ -1780,15 +1849,15 @@ static void check_double_brace_init(chunk_t *bo1)
       if (chunk_is_token(bo2, CT_BRACE_OPEN))
       {
          // found a potential double brace
-         chunk_t *bc2 = chunk_skip_to_match(bo2);
+         Chunk *bc2 = chunk_skip_to_match(bo2);
 
          if (bc2 == nullptr)
          {
             return;
          }
-         chunk_t *bc1 = chunk_get_next(bc2);
+         Chunk *bc1 = bc2->GetNext();
 
-         if (bc1 == nullptr)
+         if (bc1->IsNullChunk())
          {
             return;
          }
@@ -1817,8 +1886,8 @@ static void check_double_brace_init(chunk_t *bo1)
 void fix_symbols(void)
 {
    LOG_FUNC_ENTRY();
-   chunk_t *pc;
-   chunk_t dummy;
+   Chunk *pc;
+   Chunk dummy;
 
    cpd.unc_stage = unc_stage_e::FIX_SYMBOLS;
 
@@ -1827,7 +1896,7 @@ void fix_symbols(void)
    bool is_cpp  = language_is_set(LANG_CPP);
    bool is_java = language_is_set(LANG_JAVA);
 
-   for (pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next_ncnnl(pc))
+   for (pc = Chunk::GetHead(); pc->IsNotNullChunk(); pc = pc->GetNextNcNnl())
    {
       if (  chunk_is_token(pc, CT_FUNC_WRAP)
          || chunk_is_token(pc, CT_TYPE_WRAP))
@@ -1842,7 +1911,7 @@ void fix_symbols(void)
       // a brace immediately preceded by word in C++11 is an initializer list though it may also
       // by a type casting initializer list if the word is really a type; sadly uncrustify knows
       // only built-in types and knows nothing of user-defined types
-      chunk_t *prev = chunk_get_prev_ncnnlni(pc);   // Issue #2279
+      Chunk *prev = pc->GetPrevNcNnlNi();   // Issue #2279
 
       if (  is_cpp
          && chunk_is_token(pc, CT_BRACE_OPEN)
@@ -1860,9 +1929,9 @@ void fix_symbols(void)
 
       if (chunk_is_token(pc, CT_ATTRIBUTE))
       {
-         chunk_t *next = chunk_get_next_ncnnl(pc, scope_e::PREPROC);
+         Chunk *next = pc->GetNextNcNnl(E_Scope::PREPROC);
 
-         if (  next != nullptr
+         if (  next->IsNotNullChunk()
             && chunk_is_token(next, CT_PAREN_OPEN))
          {
             flag_parens(next, PCF_NONE, CT_FPAREN_OPEN, CT_ATTRIBUTE, false);
@@ -1870,56 +1939,55 @@ void fix_symbols(void)
       }
    }
 
-   pc = chunk_get_head();
-
-   if (pc == nullptr)
-   {
-      return;
-   }
+   pc = Chunk::GetHead();
 
-   if (  chunk_is_newline(pc)
-      || chunk_is_comment(pc))
+   if (pc->IsCommentOrNewline())
    {
-      pc = chunk_get_next_ncnnl(pc);
+      pc = pc->GetNextNcNnl();
    }
 
-   while (pc != nullptr)
+   while (pc->IsNotNullChunk())
    {
       if (chunk_is_token(pc, CT_IGNORED))
       {
-         pc = chunk_get_next_ncnnl(pc);
+         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));
-      chunk_t *prev = chunk_get_prev_ncnnlni(pc, scope_e::PREPROC);   // Issue #2279
+      LOG_FMT(LFCNR, "%s(%d): pc->orig_line       is %zu, orig_col is %zu, Text() is '%s', type is %s\n",
+              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text(), get_token_name(pc->type));
+      Chunk *prev = pc->GetPrevNcNnlNi(E_Scope::PREPROC);   // Issue #2279
+
+      if (chunk_is_token(prev, CT_QUALIFIER))
+      {
+         prev = prev->GetPrevNcNnlNi(E_Scope::PREPROC);     // Issue #3513
+      }
 
-      if (prev == nullptr)
+      if (prev->IsNullChunk())
       {
          prev = &dummy;
       }
       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->orig_line, prev->orig_col, prev->Text(), get_token_name(prev->type));
       }
-      chunk_t *next = chunk_get_next_ncnnl(pc, scope_e::PREPROC);
+      Chunk *next = pc->GetNextNcNnl(E_Scope::PREPROC);
 
-      if (next == nullptr)
+      if (next->IsNullChunk())
       {
          next = &dummy;
       }
       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->orig_line, next->orig_col, next->Text(), get_token_name(next->type));
       }
       LOG_FMT(LFCNR, "%s(%d): do_symbol_check(%s, %s, %s)\n",
-              __func__, __LINE__, prev->text(), pc->text(), next->text());
+              __func__, __LINE__, prev->Text(), pc->Text(), next->Text());
       do_symbol_check(prev, pc, next);
-      pc = chunk_get_next_ncnnl(pc);
+      pc = pc->GetNextNcNnl();
    }
    pawn_add_virtual_semicolons();
    process_returns();
@@ -1928,14 +1996,15 @@ void fix_symbols(void)
     * 2nd pass - handle variable definitions
     * REVISIT: We need function params marked to do this (?)
     */
-   pc = chunk_get_head();
+   pc = Chunk::GetHead();
    int square_level = -1;
 
-   while (pc != nullptr)
+   while (  pc != nullptr
+         && 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->elided_text(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->orig_line, pc->orig_col, pc->ElidedText(copy), get_token_name(pc->type), get_token_name(pc->parent_type));
 
       // Can't have a variable definition inside [ ]
       if (square_level < 0)
@@ -1956,13 +2025,13 @@ void fix_symbols(void)
       if (  chunk_is_token(pc, CT_EXTERN)
          && language_is_set(LANG_ALLC))
       {
-         chunk_t *next = chunk_get_next_ncnnl(pc);
+         Chunk *next = pc->GetNextNcNnl();
 
          if (chunk_is_token(next, CT_STRING))
          {
-            chunk_t *tmp = chunk_get_next_ncnnl(next);
+            Chunk *tmp = next->GetNextNcNnl();
 
-            while (tmp != nullptr)
+            while (tmp->IsNotNullChunk())
             {
                if (  chunk_is_token(tmp, CT_TYPE)
                   || chunk_is_token(tmp, CT_BRACE_OPEN)
@@ -1976,7 +2045,7 @@ void fix_symbols(void)
                   chunk_flags_set(tmp, PCF_STMT_START | PCF_EXPR_START);
                   break;
                }
-               tmp = chunk_get_next_ncnnl(tmp);
+               tmp = tmp->GetNextNcNnl();
             }
          }
       }
@@ -1984,7 +2053,7 @@ void fix_symbols(void)
       if (  chunk_is_token(pc, CT_ATTRIBUTE)
          && language_is_set(LANG_ALLC))
       {
-         chunk_t *tmp = skip_attribute_next(pc);
+         Chunk *tmp = skip_attribute_next(pc);
 
          if (chunk_is_token(tmp, CT_WORD))
          {
@@ -1995,9 +2064,9 @@ void fix_symbols(void)
       if (  chunk_is_token(pc, CT_BRACE_OPEN)                       // Issue #2332
          && get_chunk_parent_type(pc) == 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 = chunk_get_next_type(pc, 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->orig_line, pc->orig_col, pc->Text());
+         pc = pc->GetNextType(CT_BRACE_CLOSE, pc->level);
       }
       /*
        * A variable definition is possible after at the start of a statement
@@ -2005,8 +2074,8 @@ 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->elided_text(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->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);
 
       if (  (square_level < 0)
@@ -2025,7 +2094,7 @@ void fix_symbols(void)
       }
       else
       {
-         pc = chunk_get_next_ncnnl(pc);
+         pc = pc->GetNextNcNnl();
       }
    }
 } // fix_symbols
@@ -2034,15 +2103,15 @@ void fix_symbols(void)
 static void process_returns(void)
 {
    LOG_FUNC_ENTRY();
-   chunk_t *pc;
+   Chunk *pc;
 
-   pc = chunk_get_head();
+   pc = Chunk::GetHead();
 
-   while (pc != nullptr)
+   while (pc->IsNotNullChunk())
    {
       if (chunk_is_not_token(pc, CT_RETURN))
       {
-         pc = chunk_get_next_type(pc, CT_RETURN, -1);
+         pc = pc->GetNextType(CT_RETURN, -1);
          continue;
       }
       pc = process_return(pc);
@@ -2050,19 +2119,19 @@ static void process_returns(void)
 }
 
 
-static chunk_t *process_return(chunk_t *pc)
+static Chunk *process_return(Chunk *pc)
 {
    LOG_FUNC_ENTRY();
-   chunk_t *next;
-   chunk_t *temp;
-   chunk_t *semi;
-   chunk_t *cpar;
-   chunk_t chunk;
+   Chunk *next;
+   Chunk *temp;
+   Chunk *semi;
+   Chunk *cpar;
+   Chunk chunk;
 
    // grab next and bail if it is a semicolon
-   next = chunk_ppa_get_next_ncnnl(pc);
+   next = pc->PpaGetNextNcNnl();
 
-   if (  next == nullptr
+   if (  next->IsNullChunk()
       || chunk_is_semicolon(next)
       || chunk_is_token(next, CT_NEWLINE))
    {
@@ -2079,17 +2148,17 @@ static chunk_t *process_return(chunk_t *pc)
    if (chunk_is_token(next, CT_PAREN_OPEN))
    {
       // See if the return is fully paren'd
-      cpar = chunk_get_next_type(next, CT_PAREN_CLOSE, next->level);
+      cpar = next->GetNextType(CT_PAREN_CLOSE, next->level);
 
-      if (cpar == nullptr)
+      if (cpar->IsNullChunk())
       {
-         return(nullptr);
+         return(Chunk::NullChunkPtr);
       }
-      semi = chunk_ppa_get_next_ncnnl(cpar);
+      semi = cpar->PpaGetNextNcNnl();
 
-      if (semi == nullptr)
+      if (semi->IsNullChunk())
       {
-         return(nullptr);
+         return(Chunk::NullChunkPtr);
       }
 
       if (  chunk_is_token(semi, CT_NEWLINE)
@@ -2103,7 +2172,7 @@ static chunk_t *process_return(chunk_t *pc)
                     __func__, __LINE__, pc->orig_line);
 
             // lower the level of everything
-            for (temp = next; temp != cpar; temp = chunk_get_next(temp))
+            for (temp = next; temp != cpar; temp = temp->GetNext())
             {
                if (temp->level == 0)
                {
@@ -2122,13 +2191,13 @@ static chunk_t *process_return(chunk_t *pc)
             // back up following chunks
             temp = semi;
 
-            while (  temp != nullptr
+            while (  temp->IsNotNullChunk()
                   && chunk_is_not_token(temp, CT_NEWLINE))
             {
                temp->column       = temp->column - 2;
                temp->orig_col     = temp->orig_col - 2;
                temp->orig_col_end = temp->orig_col_end - 2;
-               temp               = chunk_get_next(temp);
+               temp               = temp->GetNext();
             }
          }
          else
@@ -2169,7 +2238,7 @@ static chunk_t *process_return(chunk_t *pc)
 
    if (pc->flags.test(PCF_IN_PREPROC))
    {
-      while ((semi = semi->next) != nullptr)
+      while ((semi = semi->GetNext())->IsNotNullChunk())
       {
          if (!semi->flags.test(PCF_IN_PREPROC))
          {
@@ -2190,7 +2259,7 @@ static chunk_t *process_return(chunk_t *pc)
    }
    else
    {
-      while ((semi = chunk_get_next(semi)) != nullptr)
+      while ((semi = semi->GetNext())->IsNotNullChunk())
       {
          if (semi->level < pc->level)
          {
@@ -2228,7 +2297,7 @@ static chunk_t *process_return(chunk_t *pc)
       LOG_FMT(LRETURN, "%s(%d): added parens on orig_line %zu\n",
               __func__, __LINE__, pc->orig_line);
 
-      for (temp = next; temp != cpar; temp = chunk_get_next(temp))
+      for (temp = next; temp != cpar; temp = temp->GetNext())
       {
          temp->level++;
       }
@@ -2237,7 +2306,7 @@ static chunk_t *process_return(chunk_t *pc)
 } // process_return
 
 
-static bool is_oc_block(chunk_t *pc)
+static bool is_oc_block(Chunk *pc)
 {
    return(  pc != nullptr
          && (  get_chunk_parent_type(pc) == CT_OC_BLOCK_TYPE
@@ -2258,15 +2327,15 @@ void mark_comments(void)
 
    cpd.unc_stage = unc_stage_e::MARK_COMMENTS;
 
-   bool    prev_nl = true;
-   chunk_t *cur    = chunk_get_head();
+   bool  prev_nl = true;
+   Chunk *cur    = Chunk::GetHead();
 
-   while (cur != nullptr)
+   while (cur->IsNotNullChunk())
    {
-      chunk_t *next   = chunk_get_next_nvb(cur);
-      bool    next_nl = (next == nullptr) || chunk_is_newline(next);
+      Chunk *next   = cur->GetNextNvb();
+      bool  next_nl = next->IsNullChunk() || chunk_is_newline(next);
 
-      if (chunk_is_comment(cur))
+      if (cur->IsComment())
       {
          if (  next_nl
             && prev_nl)
@@ -2292,11 +2361,11 @@ void mark_comments(void)
 }
 
 
-static void handle_cpp_template(chunk_t *pc)
+static void handle_cpp_template(Chunk *pc)
 {
    LOG_FUNC_ENTRY();
 
-   chunk_t *tmp = chunk_get_next_ncnnl(pc);
+   Chunk *tmp = pc->GetNextNcNnl();
 
    if (chunk_is_not_token(tmp, CT_ANGLE_OPEN))
    {
@@ -2306,7 +2375,9 @@ static void handle_cpp_template(chunk_t *pc)
 
    size_t level = tmp->level;
 
-   while ((tmp = chunk_get_next(tmp)) != nullptr)
+   tmp = tmp->GetNext();
+
+   while (tmp->IsNotNullChunk())
    {
       if (  chunk_is_token(tmp, CT_CLASS)
          || chunk_is_token(tmp, CT_STRUCT))
@@ -2319,18 +2390,19 @@ static void handle_cpp_template(chunk_t *pc)
          set_chunk_parent(tmp, CT_TEMPLATE);
          break;
       }
+      tmp = tmp->GetNext();
    }
 
-   if (tmp != nullptr)
+   if (tmp->IsNotNullChunk())
    {
-      tmp = chunk_get_next_ncnnl(tmp);
+      tmp = tmp->GetNextNcNnl();
 
       if (chunk_is_token(tmp, CT_FRIEND))
       {
          // Account for a template friend declaration
          set_chunk_parent(tmp, CT_TEMPLATE);
 
-         tmp = chunk_get_next_ncnnl(tmp);
+         tmp = tmp->GetNextNcNnl();
       }
 
       if (  chunk_is_token(tmp, CT_CLASS)
@@ -2339,9 +2411,9 @@ static void handle_cpp_template(chunk_t *pc)
          set_chunk_parent(tmp, CT_TEMPLATE);
 
          // REVISIT: This may be a bit risky - might need to track the { };
-         tmp = chunk_get_next_type(tmp, CT_SEMICOLON, tmp->level);
+         tmp = tmp->GetNextType(CT_SEMICOLON, tmp->level);
 
-         if (tmp != nullptr)
+         if (tmp->IsNotNullChunk())
          {
             set_chunk_parent(tmp, CT_TEMPLATE);
          }
@@ -2350,30 +2422,21 @@ static void handle_cpp_template(chunk_t *pc)
 } // handle_cpp_template
 
 
-static void handle_cpp_lambda(chunk_t *sq_o)
+static void handle_cpp_lambda(Chunk *sq_o)
 {
    LOG_FUNC_ENTRY();
 
-   LOG_FMT(LFCNR, "%s(%d): sq_o is '%s'/%s\n",
-           __func__, __LINE__,
-           sq_o->text(), get_token_name(sq_o->type));
-   chunk_t *ret = nullptr;
+   Chunk *ret = Chunk::NullChunkPtr;
 
    // abort if type of the previous token is not contained in this whitelist
-   chunk_t *prev = chunk_get_prev_ncnnlni(sq_o);   // Issue #2279
+   Chunk *prev = sq_o->GetPrevNcNnlNi();   // Issue #2279
 
-   if (prev == nullptr)
+   if (prev->IsNullChunk())
    {
       LOG_FMT(LFCNR, "%s(%d): prev is nullptr\n", __func__, __LINE__);
    }
-   else
-   {
-      LOG_FMT(LFCNR, "%s(%d): prev is '%s'/%s\n",
-              __func__, __LINE__,
-              prev->text(), get_token_name(prev->type));
-   }
 
-   if (  prev == nullptr
+   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: ([](){})();
@@ -2386,7 +2449,7 @@ static void handle_cpp_lambda(chunk_t *sq_o)
       LOG_FMT(LFCNR, "%s(%d): return\n", __func__, __LINE__);
       return;
    }
-   chunk_t *sq_c = sq_o; // assuming '[]'
+   Chunk *sq_c = sq_o; // assuming '[]'
 
    if (chunk_is_token(sq_o, CT_SQUARE_OPEN))
    {
@@ -2399,22 +2462,22 @@ static void handle_cpp_lambda(chunk_t *sq_o)
          return;
       }
    }
-   chunk_t *pa_o = chunk_get_next_ncnnl(sq_c);
+   Chunk *pa_o = sq_c->GetNextNcNnl();
 
    // check to see if there is a lambda-specifier in the pa_o chunk;
    // assuming chunk is CT_EXECUTION_CONTEXT, ignore lambda-specifier
    while (chunk_is_token(pa_o, CT_EXECUTION_CONTEXT))
    {
       // set pa_o to next chunk after this specifier
-      pa_o = chunk_get_next_ncnnl(pa_o);
+      pa_o = pa_o->GetNextNcNnl();
    }
 
-   if (pa_o == nullptr)
+   if (pa_o->IsNullChunk())
    {
       LOG_FMT(LFCNR, "%s(%d): return\n", __func__, __LINE__);
       return;
    }
-   chunk_t *pa_c = nullptr;
+   Chunk *pa_c = Chunk::NullChunkPtr;
 
    // lambda-declarator '( params )' is optional
    if (chunk_is_token(pa_o, CT_PAREN_OPEN))
@@ -2422,27 +2485,27 @@ static void handle_cpp_lambda(chunk_t *sq_o)
       // and now find the ')'
       pa_c = chunk_skip_to_match(pa_o);
 
-      if (pa_c == nullptr)
+      if (pa_c->IsNullChunk())
       {
          LOG_FMT(LFCNR, "%s(%d): return\n", __func__, __LINE__);
          return;
       }
    }
    // Check for 'mutable' keyword: '[]() mutable {}' or []() mutable -> ret {}
-   chunk_t *br_o = pa_c ? chunk_get_next_ncnnl(pa_c) : pa_o;
+   Chunk *br_o = pa_c->IsNotNullChunk() ? pa_c->GetNextNcNnl() : pa_o;
 
-   if (chunk_is_str(br_o, "mutable", 7))
+   if (chunk_is_str(br_o, "mutable"))
    {
-      br_o = chunk_get_next_ncnnl(br_o);
+      br_o = br_o->GetNextNcNnl();
    }
    //TODO: also check for exception and attribute between [] ... {}
 
    // skip possible arrow syntax: '-> ret'
-   if (chunk_is_str(br_o, "->", 2))
+   if (chunk_is_str(br_o, "->"))
    {
       ret = br_o;
       // REVISIT: really should check the stuff we are skipping
-      br_o = chunk_get_next_type(br_o, CT_BRACE_OPEN, br_o->level);
+      br_o = br_o->GetNextType(CT_BRACE_OPEN, br_o->level);
    }
 
    // skip possible CT_NOEXCEPT
@@ -2450,22 +2513,27 @@ static void handle_cpp_lambda(chunk_t *sq_o)
    {
       ret = br_o;
       // REVISIT: really should check the stuff we are skipping
-      br_o = chunk_get_next_type(br_o, CT_BRACE_OPEN, br_o->level);
+      br_o = br_o->GetNextType(CT_BRACE_OPEN, br_o->level);
    }
 
-   if (  br_o == nullptr
-      || chunk_is_not_token(br_o, CT_BRACE_OPEN))
+   if (br_o->IsNullChunk())
+   {
+      LOG_FMT(LFCNR, "%s(%d): br_o is null. Return\n", __func__, __LINE__);
+      return;
+   }
+
+   if (chunk_is_not_token(br_o, 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->type));
       LOG_FMT(LFCNR, "%s(%d): return\n", __func__, __LINE__);
       return;
    }
    // and now find the '}'
-   chunk_t *br_c = chunk_skip_to_match(br_o);
+   Chunk *br_c = chunk_skip_to_match(br_o);
 
-   if (br_c == nullptr)
+   if (br_c->IsNullChunk())
    {
       LOG_FMT(LFCNR, "%s(%d): return\n", __func__, __LINE__);
       return;
@@ -2475,7 +2543,7 @@ static void handle_cpp_lambda(chunk_t *sq_o)
    if (chunk_is_token(sq_o, CT_TSQUARE))
    {
       // split into two chunks
-      chunk_t nc;
+      Chunk nc;
 
       nc = *sq_o;
       set_chunk_type(sq_o, CT_SQUARE_OPEN);
@@ -2499,7 +2567,7 @@ static void handle_cpp_lambda(chunk_t *sq_o)
    set_chunk_parent(sq_o, CT_CPP_LAMBDA);
    set_chunk_parent(sq_c, CT_CPP_LAMBDA);
 
-   if (pa_c != nullptr)
+   if (pa_c->IsNotNullChunk())
    {
       set_chunk_type(pa_o, CT_LPAREN_OPEN);                    // Issue #3054
       set_chunk_parent(pa_o, CT_CPP_LAMBDA);
@@ -2513,30 +2581,30 @@ static void handle_cpp_lambda(chunk_t *sq_o)
    set_chunk_parent(br_o, CT_CPP_LAMBDA);
    set_chunk_parent(br_c, CT_CPP_LAMBDA);
 
-   if (ret != nullptr)
+   if (ret->IsNotNullChunk())
    {
       set_chunk_type(ret, CT_CPP_LAMBDA_RET);
-      ret = chunk_get_next_ncnnl(ret);
+      ret = ret->GetNextNcNnl();
 
       while (ret != br_o)
       {
          make_type(ret);
-         ret = chunk_get_next_ncnnl(ret);
+         ret = ret->GetNextNcNnl();
       }
    }
 
-   if (pa_c != nullptr)
+   if (pa_c->IsNotNullChunk())
    {
       fix_fcn_def_params(pa_o);
    }
    //handle self calling lambda paren
-   chunk_t *call_pa_o = chunk_get_next_ncnnl(br_c);
+   Chunk *call_pa_o = br_c->GetNextNcNnl();
 
    if (chunk_is_token(call_pa_o, CT_PAREN_OPEN))
    {
-      chunk_t *call_pa_c = chunk_skip_to_match(call_pa_o);
+      Chunk *call_pa_c = chunk_skip_to_match(call_pa_o);
 
-      if (call_pa_c != nullptr)
+      if (call_pa_c->IsNotNullChunk())
       {
          set_chunk_type(call_pa_o, CT_FPAREN_OPEN);
          set_chunk_parent(call_pa_o, CT_FUNC_CALL);
@@ -2548,22 +2616,22 @@ static void handle_cpp_lambda(chunk_t *sq_o)
 } // handle_cpp_lambda
 
 
-static void handle_d_template(chunk_t *pc)
+static void handle_d_template(Chunk *pc)
 {
    LOG_FUNC_ENTRY();
 
-   chunk_t *name = chunk_get_next_ncnnl(pc);
-   chunk_t *po   = chunk_get_next_ncnnl(name);
+   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 == nullptr
+   if (  name->IsNullChunk()
       || chunk_is_not_token(name, CT_WORD))
    {
       // TODO: log an error, expected NAME
       return;
    }
 
-   if (  po == nullptr
+   if (  po->IsNullChunk()
       || chunk_is_not_token(po, CT_PAREN_OPEN))
    {
       // TODO: log an error, expected '('
@@ -2574,7 +2642,7 @@ static void handle_d_template(chunk_t *pc)
    set_chunk_parent(po, CT_TEMPLATE);
 
    ChunkStack cs;
-   chunk_t    *tmp = get_d_template_types(cs, po);
+   Chunk      *tmp = get_d_template_types(cs, po);
 
    if (  tmp == nullptr
       || chunk_is_not_token(tmp, CT_PAREN_CLOSE))
@@ -2584,7 +2652,7 @@ static void handle_d_template(chunk_t *pc)
    }
    set_chunk_parent(tmp, CT_TEMPLATE);
 
-   tmp = chunk_get_next_ncnnl(tmp);
+   tmp = tmp->GetNextNcNnl();
 
    if (chunk_is_not_token(tmp, CT_BRACE_OPEN))
    {
@@ -2592,11 +2660,10 @@ static void handle_d_template(chunk_t *pc)
       return;
    }
    set_chunk_parent(tmp, CT_TEMPLATE);
-   po = tmp;
-
-   tmp = po;
+   po  = tmp;
+   tmp = tmp->GetNextNcNnl();
 
-   while (  ((tmp = chunk_get_next_ncnnl(tmp)) != nullptr)
+   while (  tmp->IsNotNullChunk()
          && tmp->level > po->level)
    {
       if (  chunk_is_token(tmp, CT_WORD)
@@ -2604,6 +2671,7 @@ static void handle_d_template(chunk_t *pc)
       {
          set_chunk_type(tmp, CT_TYPE);
       }
+      tmp = tmp->GetNextNcNnl();
    }
 //   if (!chunk_is_token(tmp, CT_BRACE_CLOSE))
 //   {
@@ -2613,18 +2681,28 @@ static void handle_d_template(chunk_t *pc)
 } // handle_d_template
 
 
-chunk_t *skip_template_next(chunk_t *ang_open)
+Chunk *skip_template_next(Chunk *ang_open)
 {
+   if (ang_open == nullptr)
+   {
+      return(Chunk::NullChunkPtr);
+   }
+
    if (chunk_is_token(ang_open, CT_ANGLE_OPEN))
    {
-      chunk_t *pc = chunk_get_next_type(ang_open, CT_ANGLE_CLOSE, ang_open->level);
-      return(chunk_get_next_ncnnl(pc));
+      Chunk *pc = ang_open->GetNextType(CT_ANGLE_CLOSE, ang_open->level);
+
+      if (pc->IsNullChunk())
+      {
+         return(Chunk::NullChunkPtr);
+      }
+      return(pc->GetNextNcNnl());
    }
    return(ang_open);
 }
 
 
-static void handle_oc_class(chunk_t *pc)
+static void handle_oc_class(Chunk *pc)
 {
    enum class angle_state_e : unsigned int
    {
@@ -2634,18 +2712,18 @@ static void handle_oc_class(chunk_t *pc)
    };
 
    LOG_FUNC_ENTRY();
-   chunk_t       *tmp;
+   Chunk         *tmp;
    bool          hit_scope     = false;
    bool          passed_name   = false; // Did we pass the name of the class and now there can be only protocols, not generics
    int           generic_level = 0;     // level of depth of generic
    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(get_chunk_parent_type(pc)), pc->orig_line);
 
    if (get_chunk_parent_type(pc) == CT_OC_PROTOCOL)
    {
-      tmp = chunk_get_next_ncnnl(pc);
+      tmp = pc->GetNextNcNnl();
 
       if (chunk_is_semicolon(tmp))
       {
@@ -2656,10 +2734,11 @@ static void handle_oc_class(chunk_t *pc)
    }
    tmp = pc;
 
-   while ((tmp = chunk_get_next_nnl(tmp)) != nullptr)
+   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());
+              __func__, __LINE__, tmp->orig_line, tmp->Text());
 
       if (chunk_is_token(tmp, CT_OC_END))
       {
@@ -2671,7 +2750,7 @@ static void handle_oc_class(chunk_t *pc)
          passed_name = true;
       }
 
-      if (chunk_is_str(tmp, "<", 1))
+      if (chunk_is_str(tmp, "<"))
       {
          set_chunk_type(tmp, CT_ANGLE_OPEN);
 
@@ -2687,7 +2766,7 @@ static void handle_oc_class(chunk_t *pc)
          as = angle_state_e::OPEN;
       }
 
-      if (chunk_is_str(tmp, ">", 1))
+      if (chunk_is_str(tmp, ">"))
       {
          set_chunk_type(tmp, CT_ANGLE_CLOSE);
 
@@ -2716,7 +2795,7 @@ static void handle_oc_class(chunk_t *pc)
          }
       }
 
-      if (chunk_is_str(tmp, ">>", 2))
+      if (chunk_is_str(tmp, ">>"))
       {
          set_chunk_type(tmp, CT_ANGLE_CLOSE);
          set_chunk_parent(tmp, CT_OC_GENERIC_SPEC);
@@ -2734,9 +2813,9 @@ static void handle_oc_class(chunk_t *pc)
       {
          as = angle_state_e::CLOSE;
          set_chunk_parent(tmp, CT_OC_CLASS);
-         tmp = chunk_get_next_type(tmp, CT_BRACE_CLOSE, tmp->level);
+         tmp = tmp->GetNextType(CT_BRACE_CLOSE, tmp->level);
 
-         if (  tmp != nullptr
+         if (  tmp->IsNotNullChunk()
             && get_chunk_parent_type(tmp) != CT_ASSIGN)
          {
             set_chunk_parent(tmp, CT_OC_CLASS);
@@ -2755,12 +2834,12 @@ static void handle_oc_class(chunk_t *pc)
             set_chunk_parent(tmp, CT_OC_CLASS);
          }
       }
-      else if (  chunk_is_str(tmp, "-", 1)
-              || chunk_is_str(tmp, "+", 1))
+      else if (  chunk_is_str(tmp, "-")
+              || chunk_is_str(tmp, "+"))
       {
          as = angle_state_e::CLOSE;
 
-         if (chunk_is_newline(chunk_get_prev(tmp)))
+         if (chunk_is_newline(tmp->GetPrev()))
          {
             set_chunk_type(tmp, CT_OC_SCOPE);
             chunk_flags_set(tmp, PCF_STMT_START);
@@ -2783,9 +2862,9 @@ static void handle_oc_class(chunk_t *pc)
 
    if (chunk_is_token(tmp, CT_BRACE_OPEN))
    {
-      tmp = chunk_get_next_type(tmp, CT_BRACE_CLOSE, tmp->level);
+      tmp = tmp->GetNextType(CT_BRACE_CLOSE, tmp->level);
 
-      if (tmp != nullptr)
+      if (tmp->IsNotNullChunk())
       {
          set_chunk_parent(tmp, CT_OC_CLASS);
       }
@@ -2793,15 +2872,19 @@ static void handle_oc_class(chunk_t *pc)
 } // handle_oc_class
 
 
-static void handle_oc_block_literal(chunk_t *pc)
+static void handle_oc_block_literal(Chunk *pc)
 {
    LOG_FUNC_ENTRY();
-   chunk_t *prev = chunk_get_prev_ncnnlni(pc);   // Issue #2279
-   chunk_t *next = chunk_get_next_ncnnl(pc);
 
-   if (  pc == nullptr
-      || prev == nullptr
-      || next == nullptr)
+   if (pc == nullptr)
+   {
+      return; // let's be paranoid
+   }
+   Chunk *prev = pc->GetPrevNcNnlNi();   // Issue #2279
+   Chunk *next = pc->GetNextNcNnl();
+
+   if (  prev->IsNullChunk()
+      || next->IsNullChunk())
    {
       return; // let's be paranoid
    }
@@ -2812,37 +2895,42 @@ static void handle_oc_block_literal(chunk_t *pc)
    LOG_FMT(LOCBLK, "%s(%d): block literal @ orig_line is %zu, orig_col is %zu\n",
            __func__, __LINE__, pc->orig_line, pc->orig_col);
 
-   chunk_t *apo = nullptr; // arg paren open
-   chunk_t *bbo = nullptr; // block brace open
-   chunk_t *bbc;           // block brace close
+   Chunk *apo = Chunk::NullChunkPtr; // arg paren open
+   Chunk *bbo = Chunk::NullChunkPtr; // block brace open
+   Chunk *bbc;                       // block brace close
 
    LOG_FMT(LOCBLK, "%s(%d):  + scan", __func__, __LINE__);
-   chunk_t *tmp;
+   Chunk *tmp;
 
-   for (tmp = next; tmp; tmp = chunk_get_next_ncnnl(tmp))
+   for (tmp = next; tmp->IsNotNullChunk(); tmp = tmp->GetNextNcNnl())
    {
       /* handle '< protocol >' */
-      if (chunk_is_str(tmp, "<", 1))
+      if (chunk_is_str(tmp, "<"))
       {
-         chunk_t *ao = tmp;
-         chunk_t *ac = chunk_get_next_str(ao, ">", 1, ao->level);
+         Chunk *ao = tmp;
+         Chunk *ac = ao->GetNextString(">", 1, ao->level);
 
-         if (ac)
+         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);
 
-            for (tmp = chunk_get_next(ao); tmp != ac; tmp = chunk_get_next(tmp))
+            for (tmp = ao->GetNext(); tmp != ac; tmp = tmp->GetNext())
             {
                tmp->level += 1;
                set_chunk_parent(tmp, CT_OC_PROTO_LIST);
             }
+
+            tmp = ac->GetNextNcNnl();
+         }
+         else
+         {
+            tmp = Chunk::NullChunkPtr;
          }
-         tmp = chunk_get_next_ncnnl(ac);
       }
-      LOG_FMT(LOCBLK, " '%s'", tmp->text());
+      LOG_FMT(LOCBLK, " '%s'", tmp->Text());
 
       if (  tmp->level < pc->level
          || chunk_is_token(tmp, CT_SEMICOLON))
@@ -2871,8 +2959,9 @@ static void handle_oc_block_literal(chunk_t *pc)
    // make sure we have braces
    bbc = chunk_skip_to_match(bbo);
 
-   if (  bbo == nullptr
-      || bbc == nullptr)
+   if (  bbo->IsNullChunk()
+      || bbc == nullptr
+      || bbc->IsNullChunk())
    {
       LOG_FMT(LOCBLK, " -- no braces found\n");
       return;
@@ -2884,11 +2973,11 @@ static void handle_oc_block_literal(chunk_t *pc)
    set_chunk_parent(pc, CT_OC_BLOCK_EXPR);
 
    // handle the optional args
-   chunk_t *lbp; // last before paren - end of return type, if any
+   Chunk *lbp; // last before paren - end of return type, if any
 
-   if (apo)
+   if (apo->IsNotNullChunk())
    {
-      chunk_t *apc = chunk_skip_to_match(apo);  // arg parenthesis close
+      Chunk *apc = chunk_skip_to_match(apo);  // arg parenthesis close
 
       if (chunk_is_paren_close(apc))
       {
@@ -2897,21 +2986,21 @@ static void handle_oc_block_literal(chunk_t *pc)
          flag_parens(apo, PCF_OC_ATYPE, CT_FPAREN_OPEN, CT_OC_BLOCK_EXPR, true);
          fix_fcn_def_params(apo);
       }
-      lbp = chunk_get_prev_ncnnlni(apo);   // Issue #2279
+      lbp = apo->GetPrevNcNnlNi();   // Issue #2279
    }
    else
    {
-      lbp = chunk_get_prev_ncnnlni(bbo);   // Issue #2279
+      lbp = bbo->GetPrevNcNnlNi();   // Issue #2279
    }
 
    // 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->type));
       make_type(lbp);
       chunk_flags_set(lbp, PCF_OC_RTYPE);
       set_chunk_parent(lbp, CT_OC_BLOCK_EXPR);
-      lbp = chunk_get_prev_ncnnlni(lbp);   // Issue #2279
+      lbp = lbp->GetPrevNcNnlNi();   // Issue #2279
    }
    // mark the braces
    set_chunk_parent(bbo, CT_OC_BLOCK_EXPR);
@@ -2919,7 +3008,7 @@ static void handle_oc_block_literal(chunk_t *pc)
 } // handle_oc_block_literal
 
 
-static void handle_oc_block_type(chunk_t *pc)
+static void handle_oc_block_type(Chunk *pc)
 {
    LOG_FUNC_ENTRY();
 
@@ -2935,7 +3024,7 @@ static void handle_oc_block_type(chunk_t *pc)
       return;
    }
    // make sure we have '( ^'
-   chunk_t *tpo = chunk_get_prev_ncnnlni(pc); // type paren open   Issue #2279
+   Chunk *tpo = pc->GetPrevNcNnlNi(); // type paren open   Issue #2279
 
    if (chunk_is_paren_open(tpo))
    {
@@ -2943,10 +3032,10 @@ static void handle_oc_block_type(chunk_t *pc)
        * block type: 'RTYPE (^LABEL)(ARGS)'
        * LABEL is optional.
        */
-      chunk_t *tpc = chunk_skip_to_match(tpo);    // type close paren (after '^')
-      chunk_t *nam = chunk_get_prev_ncnnlni(tpc); // name (if any) or '^'   Issue #2279
-      chunk_t *apo = chunk_get_next_ncnnl(tpc);   // arg open paren
-      chunk_t *apc = chunk_skip_to_match(apo);    // arg close paren
+      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
 
       /*
        * If this is a block literal instead of a block type, 'nam'
@@ -2966,10 +3055,10 @@ static void handle_oc_block_type(chunk_t *pc)
 
       if (chunk_is_paren_close(apc))
       {
-         chunk_t   *aft = chunk_get_next_ncnnl(apc);
-         c_token_t pt;
+         Chunk   *aft = apc->GetNextNcNnl();
+         E_Token pt;
 
-         if (chunk_is_str(nam, "^", 1))
+         if (chunk_is_str(nam, "^"))
          {
             set_chunk_type(nam, CT_PTR_TYPE);
             pt = CT_FUNC_TYPE;
@@ -2985,8 +3074,8 @@ static void handle_oc_block_type(chunk_t *pc)
             set_chunk_type(nam, 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));
+         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);
@@ -2998,15 +3087,15 @@ static void handle_oc_block_type(chunk_t *pc)
          set_chunk_type(apc, CT_FPAREN_CLOSE);
          set_chunk_parent(apc, CT_FUNC_PROTO);
          fix_fcn_def_params(apo);
-         mark_function_return_type(nam, chunk_get_prev_ncnnlni(tpo), pt);   // Issue #2279
+         mark_function_return_type(nam, tpo->GetPrevNcNnlNi(), pt);   // Issue #2279
       }
    }
 } // handle_oc_block_type
 
 
-static chunk_t *handle_oc_md_type(chunk_t *paren_open, c_token_t ptype, pcf_flags_t flags, bool &did_it)
+static Chunk *handle_oc_md_type(Chunk *paren_open, E_Token ptype, pcf_flags_t flags, bool &did_it)
 {
-   chunk_t *paren_close;
+   Chunk *paren_close;
 
    if (  !chunk_is_paren_open(paren_open)
       || ((paren_close = chunk_skip_to_match(paren_open)) == nullptr))
@@ -3021,21 +3110,21 @@ static chunk_t *handle_oc_md_type(chunk_t *paren_open, c_token_t ptype, pcf_flag
    set_chunk_parent(paren_close, ptype);
    chunk_flags_set(paren_close, flags);
 
-   for (chunk_t *cur = chunk_get_next_ncnnl(paren_open);
+   for (Chunk *cur = paren_open->GetNextNcNnl();
         cur != paren_close;
-        cur = chunk_get_next_ncnnl(cur))
+        cur = cur->GetNextNcNnl())
    {
-      LOG_FMT(LOCMSGD, " <%s|%s>", cur->text(), get_token_name(cur->type));
+      LOG_FMT(LOCMSGD, " <%s|%s>", cur->Text(), get_token_name(cur->type));
       chunk_flags_set(cur, flags);
       make_type(cur);
    }
 
    // returning the chunk after the paren close
-   return(chunk_get_next_ncnnl(paren_close));
+   return(paren_close->GetNextNcNnl());
 }
 
 
-static void handle_oc_message_decl(chunk_t *pc)
+static void handle_oc_message_decl(Chunk *pc)
 {
    LOG_FUNC_ENTRY();
 
@@ -3045,9 +3134,14 @@ static void handle_oc_message_decl(chunk_t *pc)
    //int       arg_cnt   = 0;
 
    // Figure out if this is a spec or decl
-   chunk_t *tmp = pc;
+   Chunk *tmp = pc;
 
-   while ((tmp = chunk_get_next(tmp)) != nullptr)
+   if (tmp == nullptr)
+   {
+      tmp = Chunk::NullChunkPtr;
+   }
+
+   while ((tmp = tmp->GetNext())->IsNotNullChunk())
    {
       if (tmp->level < pc->level)
       {
@@ -3066,7 +3160,7 @@ static void handle_oc_message_decl(chunk_t *pc)
    {
       return;
    }
-   c_token_t pt = chunk_is_token(tmp, CT_SEMICOLON) ? CT_OC_MSG_SPEC : CT_OC_MSG_DECL;
+   E_Token pt = chunk_is_token(tmp, CT_SEMICOLON) ? CT_OC_MSG_SPEC : CT_OC_MSG_DECL;
 
    set_chunk_type(pc, CT_OC_SCOPE);
    set_chunk_parent(pc, pt);
@@ -3077,7 +3171,7 @@ static void handle_oc_message_decl(chunk_t *pc)
    // format: -(TYPE) NAME [: (TYPE)NAME
 
    // handle the return type
-   tmp = handle_oc_md_type(chunk_get_next_ncnnl(pc), pt, PCF_OC_RTYPE, did_it);
+   tmp = handle_oc_md_type(pc->GetNextNcNnl(), pt, PCF_OC_RTYPE, did_it);
 
    if (!did_it)
    {
@@ -3092,13 +3186,13 @@ static void handle_oc_message_decl(chunk_t *pc)
       return;
    }  // expect the method name/label
 
-   chunk_t *label = tmp;
+   Chunk *label = tmp;
 
    set_chunk_type(tmp, pt);
    set_chunk_parent(tmp, pt);
-   pc = chunk_get_next_ncnnl(tmp);
+   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->type));
 
    // if we have a colon next, we have args
    if (  chunk_is_token(pc, CT_COLON)
@@ -3113,20 +3207,20 @@ static void handle_oc_message_decl(chunk_t *pc)
             || chunk_is_token(pc, pt))
          {
             set_chunk_parent(pc, pt);
-            pc = chunk_get_next_ncnnl(pc);
+            pc = pc->GetNextNcNnl();
          }
 
          // a colon must be next
-         if (!chunk_is_str(pc, ":", 1))
+         if (!chunk_is_str(pc, ":"))
          {
             break;
          }
          set_chunk_type(pc, CT_OC_COLON);
          set_chunk_parent(pc, pt);
-         pc = chunk_get_next_ncnnl(pc);
+         pc = pc->GetNextNcNnl();
 
          // next is the type in parens
-         LOG_FMT(LOCMSGD, "  (%s)", pc->text());
+         LOG_FMT(LOCMSGD, "  (%s)", pc->Text());
          tmp = handle_oc_md_type(pc, pt, PCF_OC_ATYPE, did_it);
 
          if (!did_it)
@@ -3139,11 +3233,11 @@ static void handle_oc_message_decl(chunk_t *pc)
          pc = skip_attribute_next(tmp);
          // we should now be on the arg name
          chunk_flags_set(pc, PCF_VAR_DEF);
-         LOG_FMT(LOCMSGD, " arg[%s]", pc->text());
-         pc = chunk_get_next_ncnnl(pc);
+         LOG_FMT(LOCMSGD, " arg[%s]", pc->Text());
+         pc = pc->GetNextNcNnl();
       }
    }
-   LOG_FMT(LOCMSGD, " end[%s]", pc->text());
+   LOG_FMT(LOCMSGD, " end[%s]", pc->Text());
 
    if (chunk_is_token(pc, CT_BRACE_OPEN))
    {
@@ -3163,19 +3257,24 @@ static void handle_oc_message_decl(chunk_t *pc)
 } // handle_oc_message_decl
 
 
-static void handle_oc_message_send(chunk_t *os)
+static void handle_oc_message_send(Chunk *os)
 {
    LOG_FUNC_ENTRY();
 
-   chunk_t *cs = chunk_get_next(os);
+   Chunk *cs = Chunk::NullChunkPtr;
 
-   while (  cs != nullptr
+   if (os != nullptr)
+   {
+      cs = os->GetNext();
+   }
+
+   while (  cs->IsNotNullChunk()
          && cs->level > os->level)
    {
-      cs = chunk_get_next(cs);
+      cs = cs->GetNext();
    }
 
-   if (  cs == nullptr
+   if (  cs->IsNullChunk()
       || chunk_is_not_token(cs, CT_SQUARE_CLOSE))
    {
       return;
@@ -3183,23 +3282,28 @@ static void handle_oc_message_send(chunk_t *os)
    LOG_FMT(LOCMSG, "%s(%d): orig_line is %zu, orig_col is %zu\n",
            __func__, __LINE__, os->orig_line, os->orig_col);
 
-   chunk_t *tmp = chunk_get_next_ncnnl(cs);
+   Chunk *tmp = cs->GetNextNcNnl();
 
    if (chunk_is_semicolon(tmp))
    {
       set_chunk_parent(tmp, CT_OC_MSG);
    }
    // expect a word first thing or [...]
-   tmp = chunk_get_next_ncnnl(os);
+   tmp = Chunk::NullChunkPtr;
+
+   if (os != nullptr)
+   {
+      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))
    {
-      chunk_t *tt = chunk_get_next_ncnnl(tmp);
+      Chunk *tt = tmp->GetNextNcNnl();
 
       if (  chunk_is_token(tmp, CT_OC_AT)
-         && tt != nullptr)
+         && tt->IsNotNullChunk())
       {
          if (  chunk_is_token(tt, CT_PAREN_OPEN)
             || chunk_is_token(tt, CT_BRACE_OPEN)
@@ -3211,7 +3315,7 @@ static void handle_oc_message_send(chunk_t *os)
          {
             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));
+                    tmp->Text(), get_token_name(tmp->type));
             return;
          }
       }
@@ -3225,24 +3329,24 @@ static void handle_oc_message_send(chunk_t *os)
    {
       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));
+              tmp->Text(), get_token_name(tmp->type));
       return;
    }
    else
    {
-      if (chunk_is_star(tmp)) // Issue #2722
+      if (tmp->IsStar()) // Issue #2722
       {
          set_chunk_type(tmp, CT_PTR_TYPE);
-         tmp = chunk_get_next_ncnnl(tmp);
+         tmp = tmp->GetNextNcNnl();
       }
-      chunk_t *tt = chunk_get_next_ncnnl(tmp);
+      Chunk *tt = tmp->GetNextNcNnl();
 
       if (chunk_is_paren_open(tt))
       {
-         LOG_FMT(LFCN, "%s(%d): (18) SET TO CT_FUNC_CALL: orig_line is %zu, orig_col is %zu, text() '%s'\n",
-                 __func__, __LINE__, tmp->orig_line, tmp->orig_col, tmp->text());
+         LOG_FMT(LFCN, "%s(%d): (18) SET TO CT_FUNC_CALL: orig_line is %zu, orig_col is %zu, Text() '%s'\n",
+                 __func__, __LINE__, tmp->orig_line, tmp->orig_col, tmp->Text());
          set_chunk_type(tmp, CT_FUNC_CALL);
-         tmp = chunk_get_prev_ncnnlni(set_paren_parent(tt, CT_FUNC_CALL));   // Issue #2279
+         tmp = set_paren_parent(tt, CT_FUNC_CALL)->GetPrevNcNnlNi();   // Issue #2279
       }
       else
       {
@@ -3255,41 +3359,46 @@ static void handle_oc_message_send(chunk_t *os)
    chunk_flags_set(cs, PCF_IN_OC_MSG);
 
    // handle '< protocol >'
-   tmp = chunk_get_next_ncnnl(tmp);
+   tmp = tmp->GetNextNcNnl();
 
-   if (chunk_is_str(tmp, "<", 1))
+   if (chunk_is_str(tmp, "<"))
    {
-      chunk_t *ao = tmp;
-      chunk_t *ac = chunk_get_next_str(ao, ">", 1, ao->level);
+      Chunk *ao = tmp;
+      Chunk *ac = ao->GetNextString(">", 1, ao->level);
 
-      if (ac)
+      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);
 
-         for (tmp = chunk_get_next(ao); tmp != ac; tmp = chunk_get_next(tmp))
+         for (tmp = ao->GetNext(); tmp != ac; tmp = tmp->GetNext())
          {
             tmp->level += 1;
             set_chunk_parent(tmp, CT_OC_PROTO_LIST);
          }
+
+         tmp = ac->GetNextNcNnl();
+      }
+      else
+      {
+         tmp = Chunk::NullChunkPtr;
       }
-      tmp = chunk_get_next_ncnnl(ac);
    }
    // handle 'object.property' and 'collection[index]'
    else
    {
-      while (tmp)
+      while (tmp->IsNotNullChunk())
       {
          if (chunk_is_token(tmp, CT_MEMBER))  // move past [object.prop1.prop2
          {
-            chunk_t *typ = chunk_get_next_ncnnl(tmp);
+            Chunk *typ = tmp->GetNextNcNnl();
 
             if (  chunk_is_token(typ, CT_WORD)
                || chunk_is_token(typ, CT_TYPE))
             {
-               tmp = chunk_get_next_ncnnl(typ);
+               tmp = typ->GetNextNcNnl();
             }
             else
             {
@@ -3298,17 +3407,17 @@ static void handle_oc_message_send(chunk_t *os)
          }
          else if (chunk_is_token(tmp, CT_SQUARE_OPEN))  // move past [collection[index]
          {
-            chunk_t *tcs = chunk_get_next_ncnnl(tmp);
+            Chunk *tcs = tmp->GetNextNcNnl();
 
-            while (  tcs != nullptr
+            while (  tcs->IsNotNullChunk()
                   && tcs->level > tmp->level)
             {
-               tcs = chunk_get_next_ncnnl(tcs);
+               tcs = tcs->GetNextNcNnl();
             }
 
             if (chunk_is_token(tcs, CT_SQUARE_CLOSE))
             {
-               tmp = chunk_get_next_ncnnl(tcs);
+               tmp = tcs->GetNextNcNnl();
             }
             else
             {
@@ -3325,7 +3434,7 @@ static void handle_oc_message_send(chunk_t *os)
    // [(self.foo.bar) method]
    if (chunk_is_paren_open(tmp))
    {
-      tmp = chunk_get_next_ncnnl(chunk_skip_to_match(tmp));
+      tmp = chunk_skip_to_match(tmp)->GetNextNcNnl();
    }
 
    if (  chunk_is_token(tmp, CT_WORD)
@@ -3333,9 +3442,9 @@ static void handle_oc_message_send(chunk_t *os)
    {
       set_chunk_type(tmp, CT_OC_MSG_FUNC);
    }
-   chunk_t *prev = nullptr;
+   Chunk *prev = Chunk::NullChunkPtr;
 
-   for (tmp = chunk_get_next(os); tmp != cs; tmp = chunk_get_next(tmp))
+   for (tmp = os->GetNext(); tmp != cs; tmp = tmp->GetNext())
    {
       chunk_flags_set(tmp, PCF_IN_OC_MSG);
 
@@ -3349,9 +3458,9 @@ static void handle_oc_message_send(chunk_t *os)
                || chunk_is_token(prev, CT_TYPE))
             {
                // Might be a named param, check previous block
-               chunk_t *pp = chunk_get_prev(prev);
+               Chunk *pp = prev->GetPrev();
 
-               if (  pp != nullptr
+               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)
@@ -3368,34 +3477,46 @@ static void handle_oc_message_send(chunk_t *os)
 } // handle_oc_message_send
 
 
-static void handle_oc_available(chunk_t *os)
+static void handle_oc_available(Chunk *os)
 {
-   os = chunk_get_next(os);
+   if (os != nullptr)
+   {
+      os = os->GetNext();
+   }
+   else
+   {
+      os = Chunk::NullChunkPtr;
+   }
 
-   while (os != nullptr)
+   while (os->IsNotNullChunk())
    {
-      c_token_t origType = os->type;
+      E_Token origType = os->type;
       set_chunk_type(os, CT_OC_AVAILABLE_VALUE);
 
       if (origType == CT_PAREN_CLOSE)
       {
          break;
       }
-      os = chunk_get_next(os);
+      os = os->GetNext();
    }
 }
 
 
-static void handle_oc_property_decl(chunk_t *os)
+static void handle_oc_property_decl(Chunk *os)
 {
    log_rule_B("mod_sort_oc_properties");
 
    if (options::mod_sort_oc_properties())
    {
-      typedef std::vector<chunk_t *> ChunkGroup;
+      typedef std::vector<Chunk *> ChunkGroup;
 
-      chunk_t                 *next       = chunk_get_next(os);
-      chunk_t                 *open_paren = nullptr;
+      Chunk *next = Chunk::NullChunkPtr;
+
+      if (os != nullptr)
+      {
+         next = os->GetNext();
+      }
+      Chunk                   *open_paren = nullptr;
 
       std::vector<ChunkGroup> class_chunks;       // class
       std::vector<ChunkGroup> thread_chunks;      // atomic, nonatomic
@@ -3409,7 +3530,7 @@ static void handle_oc_property_decl(chunk_t *os)
       if (chunk_is_token(next, CT_PAREN_OPEN))
       {
          open_paren = next;
-         next       = chunk_get_next(next);
+         next       = next->GetNext();
 
          /*
           * Determine location of the property attributes
@@ -3418,87 +3539,90 @@ static void handle_oc_property_decl(chunk_t *os)
           * for each of the below types would be. It did break some items
           * when I attempted to add them so this is my hack for now.
           */
-         while (  next != nullptr
+         while (  next->IsNotNullChunk()
                && chunk_is_not_token(next, CT_PAREN_CLOSE))
          {
             if (chunk_is_token(next, CT_OC_PROPERTY_ATTR))
             {
-               if (  chunk_is_str(next, "atomic", 6)
-                  || chunk_is_str(next, "nonatomic", 9))
+               if (  chunk_is_str(next, "atomic")
+                  || chunk_is_str(next, "nonatomic"))
                {
                   ChunkGroup chunkGroup;
                   chunkGroup.push_back(next);
                   thread_chunks.push_back(chunkGroup);
                }
-               else if (  chunk_is_str(next, "readonly", 8)
-                       || chunk_is_str(next, "readwrite", 9))
+               else if (  chunk_is_str(next, "readonly")
+                       || chunk_is_str(next, "readwrite"))
                {
                   ChunkGroup chunkGroup;
                   chunkGroup.push_back(next);
                   readwrite_chunks.push_back(chunkGroup);
                }
-               else if (  chunk_is_str(next, "assign", 6)
-                       || chunk_is_str(next, "retain", 6)
-                       || chunk_is_str(next, "copy", 4)
-                       || chunk_is_str(next, "strong", 6)
-                       || chunk_is_str(next, "weak", 4)
-                       || chunk_is_str(next, "unsafe_unretained", 17))
+               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"))
                {
                   ChunkGroup chunkGroup;
                   chunkGroup.push_back(next);
                   ref_chunks.push_back(chunkGroup);
                }
-               else if (chunk_is_str(next, "getter", 6))
+               else if (chunk_is_str(next, "getter"))
                {
                   ChunkGroup chunkGroup;
 
                   do
                   {
                      chunkGroup.push_back(next);
-                     next = chunk_get_next(next);
-                  } while (  next
+                     next = next->GetNext();
+                  } while (  next->IsNotNullChunk()
                           && chunk_is_not_token(next, CT_COMMA)
                           && chunk_is_not_token(next, CT_PAREN_CLOSE));
 
-                  next = next->prev;
+                  next = next->GetPrev();
 
                   // coverity CID 160946
-                  if (next == nullptr)
+                  if (next->IsNullChunk())
                   {
                      break;
                   }
                   getter_chunks.push_back(chunkGroup);
                }
-               else if (chunk_is_str(next, "setter", 6))
+               else if (chunk_is_str(next, "setter"))
                {
                   ChunkGroup chunkGroup;
 
                   do
                   {
                      chunkGroup.push_back(next);
-                     next = chunk_get_next(next);
-                  } while (  next
+                     next = next->GetNext();
+                  } while (  next->IsNotNullChunk()
                           && chunk_is_not_token(next, CT_COMMA)
                           && chunk_is_not_token(next, CT_PAREN_CLOSE));
 
-                  next = chunk_get_prev(next);
+                  if (next->IsNotNullChunk())
+                  {
+                     next = next->GetPrev();
+                  }
 
-                  if (next == nullptr)
+                  if (next->IsNullChunk())
                   {
                      break;
                   }
                   setter_chunks.push_back(chunkGroup);
                }
-               else if (  chunk_is_str(next, "nullable", 8)
-                       || chunk_is_str(next, "nonnull", 7)
-                       || chunk_is_str(next, "null_resettable", 15)
-                       || chunk_is_str(next, "null_unspecified", 16))
+               else if (  chunk_is_str(next, "nullable")
+                       || chunk_is_str(next, "nonnull")
+                       || chunk_is_str(next, "null_resettable")
+                       || chunk_is_str(next, "null_unspecified"))
                {
                   ChunkGroup chunkGroup;
                   chunkGroup.push_back(next);
                   nullability_chunks.push_back(chunkGroup);
                }
-               else if (chunk_is_str(next, "class", 5))
+               else if (chunk_is_str(next, "class"))
                {
                   ChunkGroup chunkGroup;
                   chunkGroup.push_back(next);
@@ -3513,7 +3637,7 @@ static void handle_oc_property_decl(chunk_t *os)
             }
             else if (chunk_is_word(next))
             {
-               if (chunk_is_str(next, "class", 5))
+               if (chunk_is_str(next, "class"))
                {
                   ChunkGroup chunkGroup;
                   chunkGroup.push_back(next);
@@ -3526,7 +3650,7 @@ static void handle_oc_property_decl(chunk_t *os)
                   other_chunks.push_back(chunkGroup);
                }
             }
-            next = chunk_get_next(next);
+            next = next->GetNext();
          }
          log_rule_B("mod_sort_oc_property_class_weight");
          int class_w = options::mod_sort_oc_property_class_weight();
@@ -3554,7 +3678,7 @@ static void handle_oc_property_decl(chunk_t *os)
          sorted_chunk_map.insert(pair<int, std::vector<ChunkGroup> >(nullability_w, nullability_chunks));
          sorted_chunk_map.insert(pair<int, std::vector<ChunkGroup> >(std::numeric_limits<int>::min(), other_chunks));
 
-         chunk_t *curr_chunk = open_paren;
+         Chunk *curr_chunk = open_paren;
 
          for (multimap<int, std::vector<ChunkGroup> >::reverse_iterator it = sorted_chunk_map.rbegin(); it != sorted_chunk_map.rend(); ++it)
          {
@@ -3573,12 +3697,12 @@ static void handle_oc_property_decl(chunk_t *os)
                   }
                   else
                   {
-                     curr_chunk = chunk_get_next(curr_chunk);
+                     curr_chunk = curr_chunk->GetNext();
                   }
                }
 
                // add the parenthesis
-               chunk_t endchunk;
+               Chunk endchunk;
                set_chunk_type(&endchunk, CT_COMMA);
                set_chunk_parent(&endchunk, get_chunk_parent_type(curr_chunk));
                endchunk.str         = ",";
@@ -3590,43 +3714,53 @@ static void handle_oc_property_decl(chunk_t *os)
                endchunk.column      = curr_chunk->orig_col_end + 1;
                endchunk.flags       = curr_chunk->flags & PCF_COPY_FLAGS;
                chunk_add_after(&endchunk, curr_chunk);
-               curr_chunk = curr_chunk->next;
+               curr_chunk = curr_chunk->GetNext();
             }
          }
 
          // 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))
          {
-            chunk_t *rm_chunk = curr_chunk;
-            curr_chunk = chunk_get_next(curr_chunk);
+            Chunk *rm_chunk = curr_chunk;
+            curr_chunk = curr_chunk->GetNext();
             chunk_del(rm_chunk);
          }
       }
    }
-   chunk_t *tmp = chunk_get_next_ncnnl(os);
+   Chunk *tmp = Chunk::NullChunkPtr;
+
+   if (os != nullptr)
+   {
+      tmp = os->GetNextNcNnl();
+   }
 
    if (chunk_is_paren_open(tmp))
    {
-      tmp = chunk_get_next_ncnnl(chunk_skip_to_match(tmp));
+      tmp = chunk_skip_to_match(tmp)->GetNextNcNnl();
    }
    fix_variable_definition(tmp);
 } // handle_oc_property_decl
 
 
-static void handle_cs_square_stmt(chunk_t *os)
+static void handle_cs_square_stmt(Chunk *os)
 {
    LOG_FUNC_ENTRY();
 
-   chunk_t *cs = chunk_get_next(os);
+   if (os == nullptr)
+   {
+      os = Chunk::NullChunkPtr;
+   }
+   Chunk *cs = os->GetNext();
 
-   while (  cs != nullptr
+   while (  cs->IsNotNullChunk()
          && cs->level > os->level)
    {
-      cs = chunk_get_next(cs);
+      cs = cs->GetNext();
    }
 
-   if (  cs == nullptr
+   if (  cs->IsNullChunk()
       || chunk_is_not_token(cs, CT_SQUARE_CLOSE))
    {
       return;
@@ -3634,9 +3768,9 @@ static void handle_cs_square_stmt(chunk_t *os)
    set_chunk_parent(os, CT_CS_SQ_STMT);
    set_chunk_parent(cs, CT_CS_SQ_STMT);
 
-   chunk_t *tmp;
+   Chunk *tmp;
 
-   for (tmp = chunk_get_next(os); tmp != cs; tmp = chunk_get_next(tmp))
+   for (tmp = os->GetNext(); tmp != cs; tmp = tmp->GetNext())
    {
       set_chunk_parent(tmp, CT_CS_SQ_STMT);
 
@@ -3646,25 +3780,25 @@ static void handle_cs_square_stmt(chunk_t *os)
       }
    }
 
-   tmp = chunk_get_next_ncnnl(cs);
+   tmp = cs->GetNextNcNnl();
 
-   if (tmp != nullptr)
+   if (tmp->IsNotNullChunk())
    {
       chunk_flags_set(tmp, PCF_STMT_START | PCF_EXPR_START);
    }
-}
+} // handle_cs_square_stmt
 
 
-static void handle_cs_property(chunk_t *bro)
+static void handle_cs_property(Chunk *bro)
 {
    LOG_FUNC_ENTRY();
 
    set_paren_parent(bro, CT_CS_PROPERTY);
 
-   bool    did_prop = false;
-   chunk_t *pc      = bro;
+   bool  did_prop = false;
+   Chunk *pc      = bro;
 
-   while ((pc = chunk_get_prev_ncnnlni(pc)) != nullptr)   // Issue #2279
+   while ((pc = pc->GetPrevNcNnlNi())->IsNotNullChunk()) // Issue #2279
    {
       if (pc->level == bro->level)
       {
@@ -3697,13 +3831,18 @@ static void handle_cs_property(chunk_t *bro)
 }
 
 
-static void handle_cs_array_type(chunk_t *pc)
+static void handle_cs_array_type(Chunk *pc)
 {
-   chunk_t *prev;
+   if (  pc == nullptr
+      || pc->IsNullChunk())
+   {
+      return;
+   }
+   Chunk *prev = pc->GetPrev();
 
-   for (prev = chunk_get_prev(pc);
-        chunk_is_token(prev, CT_COMMA);
-        prev = chunk_get_prev(prev))
+   for ( ;
+         chunk_is_token(prev, CT_COMMA);
+         prev = prev->GetPrev())
    {
       // empty
    }
@@ -3713,19 +3852,24 @@ static void handle_cs_array_type(chunk_t *pc)
       while (pc != prev)
       {
          set_chunk_parent(pc, CT_TYPE);
-         pc = chunk_get_prev(pc);
+         pc = pc->GetPrev();
       }
       set_chunk_parent(prev, CT_TYPE);
    }
 }
 
 
-static void handle_wrap(chunk_t *pc)
+static void handle_wrap(Chunk *pc)
 {
    LOG_FUNC_ENTRY();
-   chunk_t *opp  = chunk_get_next(pc);
-   chunk_t *name = chunk_get_next(opp);
-   chunk_t *clp  = chunk_get_next(name);
+   Chunk *opp = Chunk::NullChunkPtr;
+
+   if (pc != nullptr)
+   {
+      opp = pc->GetNext();
+   }
+   Chunk *name = opp->GetNext();
+   Chunk *clp  = name->GetNext();
 
    log_rule_B("sp_func_call_paren");
    log_rule_B("sp_cpp_cast_paren");
@@ -3756,7 +3900,7 @@ static void handle_wrap(chunk_t *pc)
 
       set_chunk_type(pc, chunk_is_token(pc, CT_FUNC_WRAP) ? CT_FUNCTION : CT_TYPE);
 
-      pc->orig_col_end = pc->orig_col + pc->len();
+      pc->orig_col_end = pc->orig_col + pc->Len();
 
       chunk_del(opp);
       chunk_del(name);
@@ -3765,20 +3909,20 @@ static void handle_wrap(chunk_t *pc)
 } // handle_wrap
 
 
-static void handle_proto_wrap(chunk_t *pc)
+static void handle_proto_wrap(Chunk *pc)
 {
    LOG_FUNC_ENTRY();
-   chunk_t *opp  = chunk_get_next_ncnnl(pc);
-   chunk_t *name = chunk_get_next_ncnnl(opp);
-   chunk_t *tmp  = chunk_get_next_ncnnl(chunk_get_next_ncnnl(name));
-   chunk_t *clp  = chunk_skip_to_match(opp);
-   chunk_t *cma  = chunk_get_next_ncnnl(clp);
-
-   if (  opp == nullptr
-      || name == nullptr
-      || tmp == nullptr
+   Chunk *opp  = pc->GetNextNcNnl();
+   Chunk *name = opp->GetNextNcNnl();
+   Chunk *tmp  = name->GetNextNcNnl()->GetNextNcNnl();
+   Chunk *clp  = chunk_skip_to_match(opp);
+   Chunk *cma  = clp->GetNextNcNnl();
+
+   if (  opp->IsNullChunk()
+      || name->IsNullChunk()
+      || tmp->IsNullChunk()
       || clp == nullptr
-      || cma == 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))
@@ -3792,8 +3936,8 @@ static void handle_proto_wrap(chunk_t *pc)
    }
    else if (chunk_is_token(cma, 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());
+      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);
    }
    else
@@ -3823,7 +3967,7 @@ static void handle_proto_wrap(chunk_t *pc)
    // Mark return type (TODO: move to own function)
    tmp = pc;
 
-   while ((tmp = chunk_get_prev_ncnnlni(tmp)) != nullptr)   // Issue #2279
+   while ((tmp = tmp->GetPrevNcNnlNi())->IsNotNullChunk()) // Issue #2279
    {
       if (  !chunk_is_type(tmp)
          && chunk_is_not_token(tmp, CT_OPERATOR)
@@ -3842,13 +3986,18 @@ static void handle_proto_wrap(chunk_t *pc)
  * Java assert statements are: "assert EXP1 [: EXP2] ;"
  * Mark the parent of the colon and semicolon
  */
-static void handle_java_assert(chunk_t *pc)
+static void handle_java_assert(Chunk *pc)
 {
    LOG_FUNC_ENTRY();
-   bool    did_colon = false;
-   chunk_t *tmp      = pc;
+   bool  did_colon = false;
+   Chunk *tmp      = pc;
+
+   if (tmp == nullptr)
+   {
+      tmp = Chunk::NullChunkPtr;
+   }
 
-   while ((tmp = chunk_get_next(tmp)) != nullptr)
+   while ((tmp = tmp->GetNext())->IsNotNullChunk())
    {
       if (tmp->level == pc->level)
       {
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/combine.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/combine.h
index a34bf724..4d17706d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/combine.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/combine.h
@@ -9,7 +9,7 @@
 #ifndef COMBINE_H_INCLUDED
 #define COMBINE_H_INCLUDED
 
-#include "chunk_list.h"
+#include "chunk.h"
 #include "uncrustify_types.h"
 
 
@@ -40,14 +40,14 @@ void combine_labels(void);
 
 
 //! help function for mark_variable_definition...
-bool go_on(chunk_t *pc, chunk_t *start);
+bool go_on(Chunk *pc, Chunk *start);
 
 
 //! Sets the parent for comments.
 void mark_comments(void);
 
 
-void make_type(chunk_t *pc);
+void make_type(Chunk *pc);
 
 
 /**
@@ -60,7 +60,7 @@ void make_type(chunk_t *pc);
  *
  * @return The chunk after the close paren
  */
-chunk_t *set_paren_parent(chunk_t *start, c_token_t parent);
+Chunk *set_paren_parent(Chunk *start, E_Token parent);
 
 
 /**
@@ -71,7 +71,7 @@ chunk_t *set_paren_parent(chunk_t *start, c_token_t parent);
  * The three parameters never get the value nullptr.
  * it is not necessary to test.
  */
-void do_symbol_check(chunk_t *prev, chunk_t *pc, chunk_t *next);
+void do_symbol_check(Chunk *prev, Chunk *pc, Chunk *next);
 
 
 #endif /* COMBINE_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/combine_fix_mark.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/combine_fix_mark.cpp
index 6213e509..7c6ce813 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/combine_fix_mark.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/combine_fix_mark.cpp
@@ -16,15 +16,15 @@
 constexpr static auto LCURRENT = LCOMBINE;
 
 
-void fix_casts(chunk_t *start)
+void fix_casts(Chunk *start)
 {
    LOG_FUNC_ENTRY();
-   chunk_t    *pc;
-   chunk_t    *prev;
-   chunk_t    *first;
-   chunk_t    *after;
-   chunk_t    *last = nullptr;
-   chunk_t    *paren_close;
+   Chunk      *pc;
+   Chunk      *prev;
+   Chunk      *first;
+   Chunk      *after;
+   Chunk      *last = nullptr;
+   Chunk      *paren_close;
    const char *verb      = "likely";
    const char *detail    = "";
    size_t     count      = 0;
@@ -33,12 +33,12 @@ void fix_casts(chunk_t *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->orig_line, start->orig_col);
 
-   prev = chunk_get_prev_ncnnlni(start);   // Issue #2279
+   prev = start->GetPrevNcNnlNi();   // Issue #2279
 
-   if (prev == nullptr)
+   if (prev->IsNullChunk())
    {
       return;
    }
@@ -57,10 +57,10 @@ void fix_casts(chunk_t *start)
       return;
    }
    // Make sure there is only WORD, TYPE, and '*' or '^' before the close paren
-   pc    = chunk_get_next_ncnnl(start);
+   pc    = start->GetNextNcNnl();
    first = pc;
 
-   while (  pc != nullptr
+   while (  pc->IsNotNullChunk()
          && (  chunk_is_type(pc)
             || chunk_is_token(pc, CT_WORD)
             || chunk_is_token(pc, CT_QUALIFIER)
@@ -72,15 +72,17 @@ void fix_casts(chunk_t *start)
             || chunk_is_token(pc, CT_TSQUARE)
             || (  (  chunk_is_token(pc, CT_ANGLE_OPEN)
                   || chunk_is_token(pc, CT_ANGLE_CLOSE))
-               && language_is_set(LANG_OC | LANG_JAVA))
+               && 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))
-               && language_is_set(LANG_JAVA))
+               && language_is_set(LANG_JAVA | LANG_CS | LANG_VALA))
+            || (  chunk_is_token(pc, CT_COMMA)
+               && language_is_set(LANG_CPP))
             || chunk_is_token(pc, 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->orig_line, pc->orig_col, get_token_name(pc->type));
 
       if (  chunk_is_token(pc, CT_WORD)
          || (  chunk_is_token(last, CT_ANGLE_CLOSE)
@@ -97,16 +99,16 @@ void fix_casts(chunk_t *start)
          word_count--;
       }
       last = pc;
-      pc   = chunk_get_next_ncnnl(pc);
+      pc   = pc->GetNextNcNnl();
       count++;
    }
 
-   if (  pc == nullptr
+   if (  pc->IsNullChunk()
       || chunk_is_not_token(pc, CT_PAREN_CLOSE)
       || chunk_is_token(prev, CT_OC_CLASS))
    {
       LOG_FMT(LCASTS, "%s(%d):  -- not a cast, hit type is %s\n",
-              __func__, __LINE__, pc == nullptr ? "NULL" : get_token_name(pc->type));
+              __func__, __LINE__, pc->IsNullChunk() ? "Null chunk" : get_token_name(pc->type));
       return;
    }
 
@@ -124,7 +126,7 @@ void fix_casts(chunk_t *start)
       || chunk_is_token(last, CT_PTR_TYPE)
       || chunk_is_token(last, CT_TYPE)
       || (  chunk_is_token(last, CT_ANGLE_CLOSE)
-         && language_is_set(LANG_OC | LANG_JAVA)))
+         && language_is_set(LANG_OC | LANG_JAVA | LANG_CS | LANG_VALA | LANG_CPP)))
    {
       verb = "for sure";
    }
@@ -140,18 +142,18 @@ void fix_casts(chunk_t *start)
        */
       verb = "guessed";
 
-      if (  (last->len() > 3)
-         && (last->str[last->len() - 2] == '_')
-         && (last->str[last->len() - 1] == 't'))
+      if (  (last->Len() > 3)
+         && (last->str[last->Len() - 2] == '_')
+         && (last->str[last->Len() - 1] == 't'))
       {
          detail = " -- '_t'";
       }
-      else if (is_ucase_str(last->text(), last->len()))
+      else if (is_ucase_str(last->Text(), last->Len()))
       {
          detail = " -- upper case";
       }
       else if (  language_is_set(LANG_OC)
-              && chunk_is_str(last, "id", 2))
+              && chunk_is_str(last, "id"))
       {
          detail = " -- Objective-C id";
       }
@@ -176,17 +178,17 @@ void fix_casts(chunk_t *start)
        *
        * Find the next non-open paren item.
        */
-      pc    = chunk_get_next_ncnnl(paren_close);
+      pc    = paren_close->GetNextNcNnl();
       after = pc;
 
       do
       {
-         after = chunk_get_next_ncnnl(after);
+         after = after->GetNextNcNnl();
       } while (chunk_is_token(after, CT_PAREN_OPEN));
 
-      if (after == nullptr)
+      if (after->IsNullChunk())
       {
-         LOG_FMT(LCASTS, "%s(%d):  -- not a cast - hit NULL\n",
+         LOG_FMT(LCASTS, "%s(%d):  -- not a cast - hit null chunk\n",
                  __func__, __LINE__);
          return;
       }
@@ -239,22 +241,22 @@ void fix_casts(chunk_t *start)
               && (!(  chunk_is_token(pc, 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));
+         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));
          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));
+         LOG_FMT(LCASTS, "%s(%d):  -- not a cast - Text() '%s' followed by type %s\n",
+                 __func__, __LINE__, pc->Text(), get_token_name(after->type));
          return;
       }
    }
    // if the 'cast' is followed by a semicolon, comma, bool or close parenthesis, it isn't
-   pc = chunk_get_next_ncnnl(paren_close);
+   pc = paren_close->GetNextNcNnl();
 
-   if (pc == nullptr)
+   if (pc->IsNullChunk())
    {
       return;
    }
@@ -275,20 +277,20 @@ void fix_casts(chunk_t *start)
            __func__, __LINE__, verb);
 
    for (pc = first;
-        pc != nullptr && pc != paren_close;
-        pc = chunk_get_next_ncnnl(pc))
+        pc->IsNotNullChunk() && pc != paren_close;
+        pc = pc->GetNextNcNnl())
    {
       set_chunk_parent(pc, CT_C_CAST);
       make_type(pc);
-      LOG_FMT(LCASTS, " %s", pc->text());
+      LOG_FMT(LCASTS, " %s", pc->Text());
    }
 
    LOG_FMT(LCASTS, " )%s\n", detail);
 
    // Mark the next item as an expression start
-   pc = chunk_get_next_ncnnl(paren_close);
+   pc = paren_close->GetNextNcNnl();
 
-   if (pc != nullptr)
+   if (pc->IsNotNullChunk())
    {
       chunk_flags_set(pc, PCF_EXPR_START);
 
@@ -300,7 +302,7 @@ void fix_casts(chunk_t *start)
 } // fix_casts
 
 
-void fix_fcn_def_params(chunk_t *start)
+void fix_fcn_def_params(Chunk *start)
 {
    LOG_FUNC_ENTRY();
 
@@ -308,47 +310,48 @@ void fix_fcn_def_params(chunk_t *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->type), start->orig_line, start->level);
 
-   while (  start != nullptr
+   while (  start->IsNotNullChunk()
          && !chunk_is_paren_open(start))
    {
-      start = chunk_get_next_ncnnl(start);
+      start = start->GetNextNcNnl();
    }
 
-   if (start == nullptr)// Coverity CID 76003, 1100782
+   if (start->IsNullChunk()) // Coverity CID 76003, 1100782
    {
       return;
    }
    // ensure start chunk holds a single '(' character
-   assert(  (start->len() == 1)
+   assert(  (start->Len() == 1)
          && (start->str[0] == '('));
 
    ChunkStack cs;
    size_t     level = start->level + 1;
-   chunk_t    *pc   = start;
+   Chunk      *pc   = start->GetNextNcNnl();
 
-   while ((pc = chunk_get_next_ncnnl(pc)) != nullptr)
+   while (pc->IsNotNullChunk())
    {
-      if (  (  (start->len() == 1)
+      if (  (  (start->Len() == 1)
             && (start->str[0] == ')'))
          || pc->level < 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->orig_line);
          break;
       }
-      LOG_FMT(LFCNP, "%s(%d): %s, text() '%s' on orig_line %zu, level %zu\n",
+      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);
+              pc->Text(), pc->orig_line, pc->level);
 
       if (pc->level > level)
       {
+         pc = pc->GetNextNcNnl();
          continue;
       }
 
-      if (  chunk_is_star(pc)
+      if (  pc->IsStar()
          || chunk_is_msref(pc)
          || chunk_is_nullable(pc))
       {
@@ -357,7 +360,7 @@ void fix_fcn_def_params(chunk_t *start)
       }
       else if (  chunk_is_token(pc, CT_AMP)
               || (  language_is_set(LANG_CPP)
-                 && chunk_is_str(pc, "&&", 2)))
+                 && chunk_is_str(pc, "&&")))
       {
          set_chunk_type(pc, CT_BYREF);
          cs.Push_Back(pc);
@@ -382,49 +385,55 @@ void fix_fcn_def_params(chunk_t *start)
             set_chunk_parent(pc, CT_FUNC_PROTO);
          }
       }
+      pc = pc->GetNextNcNnl();
    }
    mark_variable_stack(cs, LFCNP);
 } // fix_fcn_def_params
 
 
-void fix_type_cast(chunk_t *start)
+void fix_type_cast(Chunk *start)
 {
    LOG_FUNC_ENTRY();
-   chunk_t *pc;
 
-   pc = chunk_get_next_ncnnl(start);
+   if (start == nullptr)
+   {
+      return;
+   }
+   Chunk *pc = start->GetNextNcNnl();
 
-   if (  pc == nullptr
+   if (  pc->IsNullChunk()
       || chunk_is_not_token(pc, CT_ANGLE_OPEN))
    {
       return;
    }
+   pc = pc->GetNextNcNnl();
 
-   while (  ((pc = chunk_get_next_ncnnl(pc)) != nullptr)
+   while (  pc->IsNotNullChunk()
          && pc->level >= start->level)
    {
       if (  pc->level == start->level
          && chunk_is_token(pc, CT_ANGLE_CLOSE))
       {
-         pc = chunk_get_next_ncnnl(pc);
+         pc = pc->GetNextNcNnl();
 
-         if (pc == nullptr)
+         if (pc->IsNullChunk())
          {
             return;
          }
 
-         if (chunk_is_str(pc, "(", 1))
+         if (chunk_is_str(pc, "("))
          {
             set_paren_parent(pc, CT_TYPE_CAST);
          }
          return;
       }
       make_type(pc);
+      pc = pc->GetNextNcNnl();
    }
 } // fix_type_cast
 
 
-void fix_typedef(chunk_t *start)
+void fix_typedef(Chunk *start)
 {
    LOG_FUNC_ENTRY();
 
@@ -435,16 +444,16 @@ void fix_typedef(chunk_t *start)
    LOG_FMT(LTYPEDEF, "%s(%d): typedef @ orig_line %zu, orig_col %zu\n",
            __func__, __LINE__, start->orig_line, start->orig_col);
 
-   chunk_t *the_type = nullptr;
-   chunk_t *last_op  = nullptr;
+   Chunk *the_type = Chunk::NullChunkPtr;
+   Chunk *last_op  = Chunk::NullChunkPtr;
 
    /*
     * Mark everything in the typedef and scan for ")(", which makes it a
     * function type
     */
-   for (chunk_t *next = chunk_get_next_ncnnl(start, scope_e::PREPROC)
-        ; next != nullptr && next->level >= start->level
-        ; next = chunk_get_next_ncnnl(next, scope_e::PREPROC))
+   for (Chunk *next = start->GetNextNcNnl(E_Scope::PREPROC)
+        ; next->IsNotNullChunk() && next->level >= start->level
+        ; next = next->GetNextNcNnl(E_Scope::PREPROC))
    {
       chunk_flags_set(next, PCF_IN_TYPEDEF);
 
@@ -483,28 +492,28 @@ void fix_typedef(chunk_t *start)
    }
 
    // avoid interpreting typedef NS_ENUM (NSInteger, MyEnum) as a function def
-   if (  last_op != nullptr
+   if (  last_op->IsNotNullChunk()
       && !(  language_is_set(LANG_OC)
           && get_chunk_parent_type(last_op) == CT_ENUM))
    {
       flag_parens(last_op, PCF_NONE, CT_FPAREN_OPEN, CT_TYPEDEF, false);
       fix_fcn_def_params(last_op);
 
-      the_type = chunk_get_prev_ncnnlni(last_op, scope_e::PREPROC);   // Issue #2279
+      the_type = last_op->GetPrevNcNnlNi(E_Scope::PREPROC);   // Issue #2279
 
-      if (the_type == nullptr)
+      if (the_type->IsNullChunk())
       {
          return;
       }
-      chunk_t *open_paren = nullptr;
+      Chunk *open_paren = nullptr;
 
       if (chunk_is_paren_close(the_type))
       {
          open_paren = chunk_skip_to_match_rev(the_type);
          mark_function_type(the_type);
-         the_type = chunk_get_prev_ncnnlni(the_type, scope_e::PREPROC);   // Issue #2279
+         the_type = the_type->GetPrevNcNnlNi(E_Scope::PREPROC);   // Issue #2279
 
-         if (the_type == nullptr)
+         if (the_type->IsNullChunk())
          {
             return;
          }
@@ -516,8 +525,8 @@ void fix_typedef(chunk_t *start)
       }
       set_chunk_parent(the_type, 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->orig_line);
 
       // If we are aligning on the open parenthesis, grab that instead
       log_rule_B("align_typedef_func");
@@ -531,8 +540,8 @@ void fix_typedef(chunk_t *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);
+         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);
       }
       // already did everything we need to do
@@ -542,9 +551,9 @@ void fix_typedef(chunk_t *start)
     * Skip over enum/struct/union stuff, as we know it isn't a return type
     * for a function type
     */
-   chunk_t *after = chunk_get_next_ncnnl(start, scope_e::PREPROC);
+   Chunk *after = start->GetNextNcNnl(E_Scope::PREPROC);
 
-   if (after == nullptr)
+   if (after->IsNullChunk())
    {
       return;
    }
@@ -553,28 +562,29 @@ void fix_typedef(chunk_t *start)
       && chunk_is_not_token(after, CT_STRUCT)
       && chunk_is_not_token(after, CT_UNION))
    {
-      if (the_type != nullptr)
+      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);
+         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);
       }
       return;
    }
    // We have a struct/union/enum, next should be either a type or {
-   chunk_t *next = chunk_get_next_ncnnl(after, scope_e::PREPROC);
+   Chunk *next = after->GetNextNcNnl(E_Scope::PREPROC);
 
-   if (next == nullptr)
+   if (next->IsNullChunk())
    {
       return;
    }
 
    if (chunk_is_token(next, CT_TYPE))
    {
-      next = chunk_get_next_ncnnl(next, scope_e::PREPROC);
+      next = next->GetNextNcNnl(E_Scope::PREPROC);
 
-      if (next == nullptr)
+      if (next->IsNullChunk())
       {
          return;
       }
@@ -583,11 +593,11 @@ void fix_typedef(chunk_t *start)
    if (chunk_is_token(next, CT_BRACE_OPEN))
    {
       // Skip to the closing brace
-      chunk_t *br_c = chunk_get_next_type(next, CT_BRACE_CLOSE, next->level, scope_e::PREPROC);
+      Chunk *br_c = next->GetNextType(CT_BRACE_CLOSE, next->level, E_Scope::PREPROC);
 
-      if (br_c != nullptr)
+      if (br_c->IsNotNullChunk())
       {
-         const c_token_t tag = after->type;
+         const E_Token tag = after->type;
          set_chunk_parent(next, tag);
          set_chunk_parent(br_c, tag);
 
@@ -602,22 +612,23 @@ void fix_typedef(chunk_t *start)
       }
    }
 
-   if (the_type != nullptr)
+   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(),
+      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);
    }
 } // fix_typedef
 
 
-chunk_t *fix_variable_definition(chunk_t *start)
+Chunk *fix_variable_definition(Chunk *start)
 {
    LOG_FUNC_ENTRY();
-   chunk_t    *pc = start;
-   chunk_t    *end;
-   chunk_t    *tmp_pc;
+   Chunk      *pc = start;
+   Chunk      *end;
+   Chunk      *tmp_pc;
    ChunkStack cs;
    int        idx;
    int        ref_idx;
@@ -635,51 +646,59 @@ chunk_t *fix_variable_definition(chunk_t *start)
          || chunk_is_token(pc, CT_PP)                       // Issue #3169
          || chunk_is_ptr_operator(pc))
    {
-      LOG_FMT(LFVD, "%s(%d):   1:pc->text() '%s', type is %s\n",
-              __func__, __LINE__, pc->text(), get_token_name(pc->type));
+      LOG_FMT(LFVD, "%s(%d):   1:pc->Text() '%s', type is %s\n",
+              __func__, __LINE__, pc->Text(), get_token_name(pc->type));
       cs.Push_Back(pc);
-      pc = chunk_get_next_ncnnl(pc);
+      pc = pc->GetNextNcNnl();
 
-      if (pc == nullptr)
+      if (pc->IsNullChunk())
       {
-         LOG_FMT(LFVD, "%s(%d): pc is nullptr\n", __func__, __LINE__);
-         return(nullptr);
+         LOG_FMT(LFVD, "%s(%d): pc is null chunk\n", __func__, __LINE__);
+         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));
+      LOG_FMT(LFVD, "%s(%d):   2:pc->Text() '%s', type is %s\n",
+              __func__, __LINE__, pc->Text(), get_token_name(pc->type));
 
       // Skip templates and attributes
       pc = skip_template_next(pc);
 
-      if (pc == nullptr)
+      if (pc->IsNullChunk())
       {
-         LOG_FMT(LFVD, "%s(%d): pc is nullptr\n", __func__, __LINE__);
-         return(nullptr);
+         LOG_FMT(LFVD, "%s(%d): pc is null chunk\n", __func__, __LINE__);
+         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));
+      LOG_FMT(LFVD, "%s(%d):   3:pc->Text() '%s', type is %s\n",
+              __func__, __LINE__, pc->Text(), get_token_name(pc->type));
 
       pc = skip_attribute_next(pc);
 
-      if (pc == nullptr)
+      if (pc->IsNullChunk())
       {
-         LOG_FMT(LFVD, "%s(%d): pc is nullptr\n", __func__, __LINE__);
-         return(nullptr);
+         LOG_FMT(LFVD, "%s(%d): pc is null chunk\n", __func__, __LINE__);
+         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));
+      LOG_FMT(LFVD, "%s(%d):   4:pc->Text() '%s', type is %s\n",
+              __func__, __LINE__, pc->Text(), get_token_name(pc->type));
 
       if (language_is_set(LANG_JAVA))
       {
          pc = skip_tsquare_next(pc);
-         LOG_FMT(LFVD, "%s(%d):   5:pc->text() '%s', type is %s\n", __func__, __LINE__, pc->text(), get_token_name(pc->type));
+
+         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));
+         }
+         else
+         {
+            pc = Chunk::NullChunkPtr;
+         }
       }
    }
    end = pc;
 
-   if (end == nullptr)
+   if (end->IsNullChunk())
    {
-      LOG_FMT(LFVD, "%s(%d): end is nullptr\n", __func__, __LINE__);
+      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));
@@ -725,14 +744,6 @@ chunk_t *fix_variable_definition(chunk_t *start)
          {
             break;
          }
-
-         if (idx == 0)
-         {
-            fprintf(stderr, "%s(%d): idx is ZERO, cannot be decremented, at line %zu, column %zu\n",
-                    __func__, __LINE__, tmp_pc->orig_line, tmp_pc->orig_col);
-            log_flush(true);
-            exit(EX_SOFTWARE);
-         }
          idx--;
          tmp_pc = cs.Get(idx)->m_pc;
 
@@ -747,7 +758,7 @@ chunk_t *fix_variable_definition(chunk_t *start)
       ref_idx = idx + 1;
    }
    tmp_pc = cs.Get(ref_idx)->m_pc;
-   LOG_FMT(LFVD, "%s(%d): ref_idx(%d) is '%s'\n", __func__, __LINE__, ref_idx, tmp_pc->text());
+   LOG_FMT(LFVD, "%s(%d): ref_idx(%d) is '%s'\n", __func__, __LINE__, ref_idx, tmp_pc->Text());
 
    // No type part found!
    if (ref_idx <= 0)
@@ -761,7 +772,7 @@ chunk_t *fix_variable_definition(chunk_t *start)
       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));
+      LOG_FMT(LFVD2, " Text() is '%s', type is %s", tmp_pc->Text(), get_token_name(tmp_pc->type));
    }
 
    LOG_FMT(LFVD2, "\n");
@@ -773,22 +784,22 @@ chunk_t *fix_variable_definition(chunk_t *start)
 
    if (chunk_is_token(end, CT_COMMA))
    {
-      return(chunk_get_next_ncnnl(end));
+      return(end->GetNextNcNnl());
    }
    return(skip_to_next_statement(end));
 } // fix_variable_definition
 
 
-void mark_cpp_constructor(chunk_t *pc)
+void mark_cpp_constructor(Chunk *pc)
 {
    LOG_FUNC_ENTRY();
-   chunk_t *paren_open;
-   chunk_t *tmp;
-   chunk_t *after;
-   chunk_t *var;
-   bool    is_destr = false;
+   Chunk *paren_open;
+   Chunk *tmp;
+   Chunk *after;
+   Chunk *var;
+   bool  is_destr = false;
 
-   tmp = chunk_get_prev_ncnnlni(pc);   // Issue #2279
+   tmp = pc->GetPrevNcNnlNi();   // Issue #2279
 
    if (  chunk_is_token(tmp, CT_INV)
       || chunk_is_token(tmp, CT_DESTRUCTOR))
@@ -800,39 +811,39 @@ void mark_cpp_constructor(chunk_t *pc)
    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,
            is_destr ? "DE" : "CON",
-           pc->text(), get_token_name(pc->type),
-           tmp->text(), get_token_name(tmp->type));
+           pc->Text(), get_token_name(pc->type),
+           tmp->Text(), get_token_name(tmp->type));
 
-   paren_open = skip_template_next(chunk_get_next_ncnnl(pc));
+   paren_open = skip_template_next(pc->GetNextNcNnl());
 
-   if (!chunk_is_str(paren_open, "(", 1))
+   if (!chunk_is_str(paren_open, "("))
    {
       LOG_FMT(LWARN, "%s:%zu Expected '(', got: [%s]\n",
               cpd.filename.c_str(), paren_open->orig_line,
-              paren_open->text());
+              paren_open->Text());
       return;
    }
    // Mark parameters
    fix_fcn_def_params(paren_open);
    after = flag_parens(paren_open, PCF_IN_FCN_CALL, CT_FPAREN_OPEN, CT_FUNC_CLASS_PROTO, false);
 
-   LOG_FMT(LFTOR, "%s(%d): text() '%s'\n", __func__, __LINE__, after->text());
+   LOG_FMT(LFTOR, "%s(%d): Text() '%s'\n", __func__, __LINE__, after->Text());
 
    // Scan until the brace open, mark everything
    tmp = paren_open;
    bool hit_colon = false;
 
-   while (  tmp != nullptr
+   while (  tmp->IsNotNullChunk()
          && (  chunk_is_not_token(tmp, CT_BRACE_OPEN)
             || tmp->level != paren_open->level)
          && !chunk_is_semicolon(tmp))
    {
       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);
+              __func__, __LINE__, tmp->Text(), tmp->orig_line, tmp->orig_col);
       chunk_flags_set(tmp, PCF_IN_CONST_ARGS);
-      tmp = chunk_get_next_ncnnl(tmp);
+      tmp = tmp->GetNextNcNnl();
 
-      if (  chunk_is_str(tmp, ":", 1)
+      if (  chunk_is_str(tmp, ":")
          && tmp->level == paren_open->level)
       {
          set_chunk_type(tmp, CT_CONSTR_COLON);
@@ -844,7 +855,7 @@ void mark_cpp_constructor(chunk_t *pc)
             || chunk_is_opening_brace(tmp))
          && tmp->level == paren_open->level)
       {
-         var = skip_template_prev(chunk_get_prev_ncnnlni(tmp));   // Issue #2279
+         var = skip_template_prev(tmp->GetPrevNcNnlNi());   // Issue #2279
 
          if (  chunk_is_token(var, CT_TYPE)
             || chunk_is_token(var, CT_WORD))
@@ -860,41 +871,41 @@ void mark_cpp_constructor(chunk_t *pc)
       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);
+              __func__, __LINE__, pc->Text(), pc->orig_line, pc->orig_col);
    }
    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);
+              __func__, __LINE__, pc->Text(), pc->orig_line, pc->orig_col);
    }
-   tmp = chunk_get_prev_ncnnlni(pc); // Issue #2907
+   tmp = pc->GetPrevNcNnlNi(); // Issue #2907
 
    if (chunk_is_token(tmp, CT_DESTRUCTOR))
    {
       set_chunk_parent(tmp, pc->type);
-      tmp = chunk_get_prev_ncnnlni(tmp);
+      tmp = tmp->GetPrevNcNnlNi();
    }
 
    while (chunk_is_token(tmp, CT_QUALIFIER))
    {
       set_chunk_parent(tmp, pc->type);
-      tmp = chunk_get_prev_ncnnlni(tmp);
+      tmp = tmp->GetPrevNcNnlNi();
    }
 } // mark_cpp_constructor
 
 
-void mark_cpp_lambda(chunk_t *square_open)
+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)
    {
-      auto *brace_close = chunk_get_next_type(square_open, CT_BRACE_CLOSE, square_open->level);
+      auto *brace_close = square_open->GetNextType(CT_BRACE_CLOSE, square_open->level);
 
       if (get_chunk_parent_type(brace_close) == CT_CPP_LAMBDA)
       {
-         for (auto *pc = square_open; pc != brace_close; pc = chunk_get_next_ncnnl(pc))
+         for (auto *pc = square_open; pc != brace_close; pc = pc->GetNextNcNnl())
          {
             chunk_flags_set(pc, PCF_IN_LAMBDA);
          }
@@ -907,12 +918,12 @@ void mark_define_expressions(void)
 {
    LOG_FUNC_ENTRY();
 
-   bool    in_define = false;
-   bool    first     = true;
-   chunk_t *pc       = chunk_get_head();
-   chunk_t *prev     = pc;
+   bool  in_define = false;
+   bool  first     = true;
+   Chunk *pc       = Chunk::GetHead();
+   Chunk *prev     = pc;
 
-   while (pc != nullptr)
+   while (pc->IsNotNullChunk())
    {
       if (!in_define)
       {
@@ -958,18 +969,18 @@ void mark_define_expressions(void)
          }
       }
       prev = pc;
-      pc   = chunk_get_next(pc);
+      pc   = pc->GetNext();
    }
 } // mark_define_expressions
 
 
-void mark_exec_sql(chunk_t *pc)
+void mark_exec_sql(Chunk *pc)
 {
    LOG_FUNC_ENTRY();
-   chunk_t *tmp;
+   Chunk *tmp;
 
    // Change CT_WORD to CT_SQL_WORD
-   for (tmp = chunk_get_next(pc); tmp != nullptr; tmp = chunk_get_next(tmp))
+   for (tmp = pc->GetNext(); tmp != nullptr && tmp->IsNotNullChunk(); tmp = tmp->GetNext())
    {
       set_chunk_parent(tmp, pc->type);
 
@@ -985,45 +996,45 @@ void mark_exec_sql(chunk_t *pc)
    }
 
    if (  chunk_is_not_token(pc, CT_SQL_BEGIN)
-      || tmp == nullptr
+      || tmp->IsNullChunk()
       || chunk_is_not_token(tmp, CT_SEMICOLON))
    {
       return;
    }
 
-   for (tmp = chunk_get_next(tmp);
-        tmp != nullptr && chunk_is_not_token(tmp, CT_SQL_END);
-        tmp = chunk_get_next(tmp))
+   for (tmp = tmp->GetNext();
+        tmp->IsNotNullChunk() && chunk_is_not_token(tmp, CT_SQL_END);
+        tmp = tmp->GetNext())
    {
       tmp->level++;
    }
 } // mark_exec_sql
 
 
-void mark_function_return_type(chunk_t *fname, chunk_t *start, c_token_t parent_type)
+void mark_function_return_type(Chunk *fname, Chunk *start, E_Token parent_type)
 {
    LOG_FUNC_ENTRY();
-   chunk_t *pc = start;
+   Chunk *pc = start;
 
    if (pc != nullptr)
    {
       // 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);
+              __func__, __LINE__, fname->Text(), fname->orig_line, fname->orig_col);
 
-      chunk_t *first = pc;
+      Chunk *first = pc;
 
-      while (pc != nullptr)
+      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_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);
 
          if (chunk_is_token(pc, CT_ANGLE_CLOSE))
          {
             pc = skip_template_prev(pc);
 
-            if (  pc == nullptr
+            if (  pc->IsNullChunk()
                || chunk_is_token(pc, CT_TEMPLATE))
             {
                //either expression is not complete or this is smth like 'template<T> void func()'
@@ -1049,7 +1060,7 @@ void mark_function_return_type(chunk_t *fname, chunk_t *start, c_token_t parent_
          {
             first = pc;
          }
-         pc = chunk_get_prev_ncnnlni(pc);   // Issue #2279
+         pc = pc->GetPrevNcNnlNi();   // Issue #2279
       }
       LOG_FMT(LFCNR, "%s(%d): marking returns...", __func__, __LINE__);
 
@@ -1064,19 +1075,19 @@ void mark_function_return_type(chunk_t *fname, chunk_t *start, c_token_t parent_
       }
       pc = first;
 
-      while (pc != nullptr)
+      while (pc->IsNotNullChunk())
       {
-         LOG_FMT(LFCNR, " text() '%s', type is %s", pc->text(), get_token_name(pc->type));
+         LOG_FMT(LFCNR, " Text() '%s', type is %s", pc->Text(), get_token_name(pc->type));
 
          if (parent_type != CT_NONE)
          {
             set_chunk_parent(pc, parent_type);
          }
-         chunk_t *prev = chunk_get_prev_ncnnlni(pc);   // Issue #2279
+         Chunk *prev = pc->GetPrevNcNnlNi();   // Issue #2279
 
          if (  !is_return_tuple
             || chunk_is_not_token(pc, CT_WORD)
-            || (  prev != nullptr
+            || (  prev->IsNullChunk()
                && chunk_is_not_token(prev, CT_TYPE)))
          {
             make_type(pc);
@@ -1086,18 +1097,18 @@ void mark_function_return_type(chunk_t *fname, chunk_t *start, c_token_t parent_
          {
             break;
          }
-         pc = chunk_get_next_ncnnl(pc);
+         pc = pc->GetNextNcNnl();
 
          //template angles should keep parent type CT_TEMPLATE
          if (chunk_is_token(pc, CT_ANGLE_OPEN))
          {
-            pc = chunk_get_next_type(pc, CT_ANGLE_CLOSE, pc->level);
+            pc = pc->GetNextType(CT_ANGLE_CLOSE, pc->level);
 
             if (pc == start)
             {
                break;
             }
-            pc = chunk_get_next_ncnnl(pc);
+            pc = pc->GetNextNcNnl();
          }
       }
       LOG_FMT(LFCNR, "\n");
@@ -1107,7 +1118,7 @@ void mark_function_return_type(chunk_t *fname, chunk_t *start, c_token_t parent_
          && first
          && first->flags.test(PCF_IN_CLASS))
       {
-         pc = chunk_get_prev_ncnnlni(first);   // Issue #2279
+         pc = first->GetPrevNcNnlNi();   // Issue #2279
 
          if (chunk_is_token(pc, CT_FRIEND))
          {
@@ -1116,7 +1127,7 @@ void mark_function_return_type(chunk_t *fname, chunk_t *start, c_token_t parent_
             // A friend might be preceded by a template specification, as in:
             //   template <...> friend type func(...);
             // If so, we need to mark that also
-            pc = chunk_get_prev_ncnnlni(pc);   // Issue #2279
+            pc = pc->GetPrevNcNnlNi();   // Issue #2279
 
             if (chunk_is_token(pc, CT_ANGLE_CLOSE))
             {
@@ -1135,7 +1146,7 @@ void mark_function_return_type(chunk_t *fname, chunk_t *start, c_token_t parent_
 } // mark_function_return_type
 
 
-void mark_function(chunk_t *pc)
+void mark_function(Chunk *pc)
 {
    LOG_FUNC_ENTRY();
 
@@ -1143,33 +1154,33 @@ void mark_function(chunk_t *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());
-   chunk_t *prev = chunk_get_prev_ncnnlni(pc);   // Issue #2279
-   chunk_t *next = chunk_get_next_ncnnl_in_pp(pc);
+   LOG_FMT(LFCN, "%s(%d): orig_line is %zu, orig_col is %zu, Text() '%s'\n",
+           __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text());
+   Chunk *prev = pc->GetPrevNcNnlNi();   // Issue #2279
+   Chunk *next = pc->GetNextNppOrNcNnl();
 
-   if (next == nullptr)
+   if (next->IsNullChunk())
    {
       return;
    }
-   chunk_t *tmp;
-   chunk_t *semi = nullptr;
-   chunk_t *paren_open;
-   chunk_t *paren_close;
+   Chunk *tmp;
+   Chunk *semi = nullptr;
+   Chunk *paren_open;
+   Chunk *paren_close;
 
    // Find out what is before the operator
    if (get_chunk_parent_type(pc) == 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_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_t *pc_op = chunk_get_prev_type(pc, CT_OPERATOR, pc->level);
+      Chunk *pc_op = pc->GetPrevType(CT_OPERATOR, pc->level);
 
-      if (  pc_op != nullptr
+      if (  pc_op->IsNotNullChunk()
          && pc_op->flags.test(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());
+         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);
       }
 
@@ -1177,7 +1188,7 @@ void mark_function(chunk_t *pc)
       {
          tmp = pc;
 
-         while ((tmp = chunk_get_prev_ncnnlni(tmp)) != nullptr)   // Issue #2279
+         while ((tmp = tmp->GetPrevNcNnlNi())->IsNotNullChunk()) // Issue #2279
          {
             if (  chunk_is_token(tmp, CT_BRACE_CLOSE)
                || chunk_is_token(tmp, CT_BRACE_OPEN)             // Issue 575
@@ -1189,26 +1200,26 @@ void mark_function(chunk_t *pc)
             if (  chunk_is_paren_open(tmp)
                && !pc->flags.test(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());
+               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);
                break;
             }
 
             if (chunk_is_token(tmp, 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());
+               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);
                break;
             }
 
             if (chunk_is_token(tmp, 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());
+               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);
                break;
             }
@@ -1217,16 +1228,16 @@ void mark_function(chunk_t *pc)
             {
                if (get_chunk_parent_type(tmp) == 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());
+                  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);
                }
 
                if (  get_chunk_parent_type(tmp) == CT_CLASS
                   || get_chunk_parent_type(tmp) == 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());
+                  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);
                }
                break;
@@ -1237,10 +1248,13 @@ void mark_function(chunk_t *pc)
             && chunk_is_not_token(pc, CT_FUNC_CALL))
          {
             // Mark the return type
-            while (  (tmp = chunk_get_next_ncnnl(tmp)) != pc
-                  && tmp != nullptr)
+            tmp = tmp->GetNextNcNnl();
+
+            while (  tmp != pc
+                  && tmp->IsNotNullChunk())
             {
                make_type(tmp); // Mark the return type
+               tmp = tmp->GetNextNcNnl();
             }
          }
       }
@@ -1249,25 +1263,25 @@ void mark_function(chunk_t *pc)
    if (  chunk_is_ptr_operator(next)
       || chunk_is_newline(next))
    {
-      next = chunk_get_next_ncnnl_in_pp(next);
+      next = next->GetNextNppOrNcNnl();
 
-      if (next == nullptr)
+      if (next->IsNullChunk())
       {
          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(),
+   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",
+   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);
+           next->Text(), get_token_name(next->type), next->level);
 
    if (pc->flags.test(PCF_IN_CONST_ARGS))
    {
       set_chunk_type(pc, 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->orig_line, pc->orig_col);
       next = skip_template_next(next);
 
       if (next == nullptr)
@@ -1291,14 +1305,14 @@ void mark_function(chunk_t *pc)
       return;
    }
    // Find the open and close parenthesis
-   paren_open  = chunk_get_next_str(pc, "(", 1, pc->level);
-   paren_close = chunk_get_next_str(paren_open, ")", 1, pc->level);
+   paren_open  = pc->GetNextString("(", 1, pc->level);
+   paren_close = paren_open->GetNextString(")", 1, pc->level);
 
-   if (  paren_open == nullptr
-      || paren_close == nullptr)
+   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);
+              __func__, __LINE__, pc->Text(), pc->orig_line, pc->orig_col);
       return;
    }
    /*
@@ -1311,54 +1325,54 @@ void mark_function(chunk_t *pc)
     *
     * Otherwise, it must be chained function calls.
     */
-   tmp = chunk_get_next_ncnnl(paren_close);
+   tmp = paren_close->GetNextNcNnl();
 
-   if (  tmp != nullptr
-      && chunk_is_str(tmp, "(", 1))
+   if (  tmp->IsNotNullChunk()
+      && chunk_is_str(tmp, "("))
    {
-      chunk_t *tmp1;
-      chunk_t *tmp2;
-      chunk_t *tmp3;
+      Chunk *tmp1;
+      Chunk *tmp2;
+      Chunk *tmp3;
 
       // skip over any leading class/namespace in: "T(F::*A)();"
-      tmp1 = chunk_get_next_ncnnl(next);
+      tmp1 = next->GetNextNcNnl();
 
-      while (tmp1 != nullptr)
+      while (tmp1->IsNotNullChunk())
       {
-         tmp2 = chunk_get_next_ncnnl(tmp1);
+         tmp2 = tmp1->GetNextNcNnl();
 
          if (  !chunk_is_word(tmp1)
             || chunk_is_not_token(tmp2, CT_DC_MEMBER))
          {
             break;
          }
-         tmp1 = chunk_get_next_ncnnl(tmp2);
+         tmp1 = tmp2->GetNextNcNnl();
       }
-      tmp2 = chunk_get_next_ncnnl(tmp1);
+      tmp2 = tmp1->GetNextNcNnl();
 
-      if (chunk_is_str(tmp2, ")", 1))
+      if (chunk_is_str(tmp2, ")"))
       {
          tmp3 = tmp2;
-         tmp2 = nullptr;
+         tmp2 = Chunk::NullChunkPtr;
       }
       else
       {
-         tmp3 = chunk_get_next_ncnnl(tmp2);
+         tmp3 = tmp2->GetNextNcNnl();
       }
       tmp3 = chunk_get_next_ssq(tmp3);
 
-      if (  chunk_is_str(tmp3, ")", 1)
-         && (  chunk_is_star(tmp1)
+      if (  chunk_is_str(tmp3, ")")
+         && (  tmp1->IsStar()
             || chunk_is_msref(tmp1)
             || (  language_is_set(LANG_OC)
                && chunk_is_token(tmp1, CT_CARET)))
-         && (  tmp2 == nullptr
+         && (  tmp2->IsNullChunk()
             || chunk_is_token(tmp2, CT_WORD)))
       {
-         if (tmp2)
+         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());
+                    __func__, __LINE__, pc->orig_line, pc->orig_col, tmp2->Text(), pc->Text());
             set_chunk_type(tmp2, CT_FUNC_VAR);
             flag_parens(paren_open, PCF_NONE, CT_PAREN_OPEN, CT_FUNC_VAR, false);
 
@@ -1368,7 +1382,7 @@ void mark_function(chunk_t *pc)
          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());
+                    __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text());
 
             if (tmp2)
             {
@@ -1380,7 +1394,7 @@ void mark_function(chunk_t *pc)
          set_chunk_type(tmp1, CT_PTR_TYPE);
          chunk_flags_clr(pc, PCF_VAR_1ST_DEF);
 
-         if (tmp2 != nullptr)
+         if (tmp2->IsNotNullChunk())
          {
             chunk_flags_set(tmp2, PCF_VAR_1ST_DEF);
          }
@@ -1388,50 +1402,54 @@ void mark_function(chunk_t *pc)
          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->orig_line, pc->orig_col);
    }
 
    // Assume it is a function call if not already labeled
    if (chunk_is_token(pc, 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));
+      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_t *temp = chunk_get_next_type(pc, CT_ASSIGN, pc->level);
+      Chunk *temp = pc->GetNextType(CT_ASSIGN, pc->level);
 
-      if (temp != nullptr)
+      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());
+         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);
       }
       else
       {
-         LOG_FMT(LFCN, "%s(%d): (11) SET TO %s: orig_line is %zu, orig_col is %zu, text() '%s'",
+         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());
+                 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): 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->orig_line, pc->orig_col, get_token_name(pc->type));
 
    if (prev != nullptr)
    {
-      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->orig_line, prev->orig_col, get_token_name(prev->type));
+   }
+   else
+   {
+      prev = Chunk::NullChunkPtr;
    }
 
    // Check for C++ function def
    if (  chunk_is_token(pc, CT_FUNC_CLASS_DEF)
-      || (  prev != nullptr
+      || (  prev->IsNotNullChunk()
          && (  chunk_is_token(prev, CT_INV)
             || chunk_is_token(prev, CT_DC_MEMBER))))
    {
-      chunk_t *destr = nullptr;
+      Chunk *destr = Chunk::NullChunkPtr;
 
       if (chunk_is_token(prev, CT_INV))
       {
@@ -1443,25 +1461,25 @@ void mark_function(chunk_t *pc)
 
          destr = prev;
          // Point to the item previous to the class name
-         prev = chunk_get_prev_ncnnlnp(prev);
+         prev = prev->GetPrevNcNnlNpp();
       }
 
       if (chunk_is_token(prev, CT_DC_MEMBER))
       {
-         prev = chunk_get_prev_ncnnlnp(prev);
+         prev = prev->GetPrevNcNnlNpp();
 
-         if (prev)
+         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,
+            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));
             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,
+            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));
             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,
+            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));
          }
 
@@ -1470,21 +1488,21 @@ void mark_function(chunk_t *pc)
          {
             if (pc->str.equals(prev->str))
             {
-               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,
+               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",
                        __func__, __LINE__,
                        prev->orig_line, prev->orig_col,
-                       (destr != nullptr) ? "DE" : "CON",
-                       prev->text(), get_token_name(prev->type));
+                       (destr->IsNotNullChunk()) ? "DE" : "CON",
+                       prev->Text(), get_token_name(prev->type));
 
                mark_cpp_constructor(pc);
                return;
             }
             // Point to the item previous to the class name
-            prev = chunk_get_prev_ncnnlnp(prev);
+            prev = prev->GetPrevNcNnlNpp();
          }
       }
    }
@@ -1501,19 +1519,19 @@ void mark_function(chunk_t *pc)
    {
       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,
+      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));
 
-      if (prev == nullptr)
+      if (prev->IsNullChunk())
       {
-         LOG_FMT(LFCN, "%s(%d): Checking func call: prev is NULL\n",
+         LOG_FMT(LFCN, "%s(%d): Checking func call: prev is null chunk\n",
                  __func__, __LINE__);
       }
       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->type is %s\n",
+                 __func__, __LINE__, prev->Text(), get_token_name(prev->type));
       }
       // if (!chunk_ends_type(prev))
       // {
@@ -1538,10 +1556,10 @@ void mark_function(chunk_t *pc)
        * a.y = foo() * bar();              -- fcn call
        * static const char * const fizz(); -- fcn def
        */
-      while (prev != nullptr)
+      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->orig_line, prev->orig_col, prev->Text());
 
          if (get_chunk_parent_type(pc) == CT_FIXED)
          {
@@ -1550,7 +1568,7 @@ void mark_function(chunk_t *pc)
 
          if (prev->flags.test(PCF_IN_PREPROC))
          {
-            prev = chunk_get_prev_ncnnlnp(prev);
+            prev = prev->GetPrevNcNnlNpp();
             continue;
          }
 
@@ -1575,11 +1593,19 @@ void mark_function(chunk_t *pc)
          if (get_chunk_parent_type(prev) == CT_DECLSPEC)  // Issue 1289
          {
             prev = chunk_skip_to_match_rev(prev);
-            prev = chunk_get_prev(prev);
+
+            if (prev != nullptr)
+            {
+               prev = prev->GetPrev();
+            }
 
             if (chunk_is_token(prev, CT_DECLSPEC))
             {
-               prev = chunk_get_prev(prev);
+               if (  prev != nullptr
+                  && prev->IsNotNullChunk())
+               {
+                  prev = prev->GetPrev();
+               }
             }
          }
 
@@ -1599,39 +1625,39 @@ void mark_function(chunk_t *pc)
             while (  chunk_is_token(prev, CT_DC_MEMBER)
                   || chunk_is_token(prev, CT_MEMBER))
             {
-               prev = chunk_get_prev_ncnnlnp(prev);
+               prev = prev->GetPrevNcNnlNpp();
 
-               if (  prev == nullptr
+               if (  prev->IsNullChunk()
                   || (  chunk_is_not_token(prev, CT_WORD)
                      && chunk_is_not_token(prev, CT_TYPE)
                      && chunk_is_not_token(prev, CT_THIS)))
                {
                   LOG_FMT(LFCN, "%s(%d): --? skipped MEMBER and landed on %s\n",
-                          __func__, __LINE__, (prev == nullptr) ? "<null>" : get_token_name(prev->type));
+                          __func__, __LINE__, (prev->IsNullChunk()) ? "<null chunk>" : get_token_name(prev->type));
                   break;
                }
                LOG_FMT(LFCN, "%s(%d): <skip> '%s'\n",
-                       __func__, __LINE__, prev->text());
+                       __func__, __LINE__, prev->Text());
 
                // Issue #1112
                // clarification: this will skip the CT_WORD, CT_TYPE or CT_THIS landing on either
                // another CT_DC_MEMBER or CT_MEMBER or a token that indicates the context of the
                // token in question; therefore, exit loop when not a CT_DC_MEMBER or CT_MEMBER
-               prev = chunk_get_prev_ncnnlnp(prev);
+               prev = prev->GetPrevNcNnlNpp();
 
-               if (prev == nullptr)
+               if (prev->IsNullChunk())
                {
-                  LOG_FMT(LFCN, "%s(%d): prev is nullptr\n",
+                  LOG_FMT(LFCN, "%s(%d): prev is null chunk\n",
                           __func__, __LINE__);
                }
                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->orig_line, prev->orig_col, prev->Text());
                }
             }
 
-            if (prev == nullptr)
+            if (prev->IsNullChunk())
             {
                break;
             }
@@ -1648,7 +1674,7 @@ void mark_function(chunk_t *pc)
                isa_def = true;
                break;
             }
-            chunk_t *prev_prev = chunk_get_prev_ncnnlnp(prev);
+            Chunk *prev_prev = prev->GetPrevNcNnlNpp();
 
             if (!chunk_is_token(prev_prev, CT_QUESTION))               // Issue #1753
             {
@@ -1656,7 +1682,7 @@ void mark_function(chunk_t *pc)
                        __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,
+                       __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);
                isa_def = true;
@@ -1677,7 +1703,7 @@ void mark_function(chunk_t *pc)
             && !chunk_is_ptr_operator(prev))
          {
             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));
+                    __func__, __LINE__, prev->Text(), prev->orig_line, prev->orig_col, get_token_name(prev->type));
 
             // certain tokens are unlikely to precede a prototype or definition
             if (  chunk_is_token(prev, CT_ARITH)
@@ -1703,44 +1729,45 @@ void mark_function(chunk_t *pc)
          }
          else
          {
-            prev = chunk_get_prev_ncnnlnp(prev);
+            prev = prev->GetPrevNcNnlNpp();
          }
       }
       //LOG_FMT(LFCN, " -- stopped on %s [%s]\n",
-      //        prev->text(), get_token_name(prev->type));
+      //        prev->Text(), get_token_name(prev->type));
 
       // Fixes issue #1634
       if (chunk_is_paren_close(prev))
       {
-         chunk_t *preproc = chunk_get_next_ncnnl(prev);
+         Chunk *preproc = prev->GetNextNcNnl();
 
          if (chunk_is_token(preproc, CT_PREPROC))
          {
             size_t pp_level = preproc->pp_level;
 
-            if (chunk_is_token(chunk_get_next_ncnnl(preproc), CT_PP_ELSE))
+            if (chunk_is_token(preproc->GetNextNcNnl(), CT_PP_ELSE))
             {
                do
                {
-                  preproc = chunk_get_prev_ncnnlni(preproc);      // Issue #2279
+                  preproc = preproc->GetPrevNcNnlNi();      // Issue #2279
 
                   if (chunk_is_token(preproc, CT_PP_IF))
                   {
-                     preproc = chunk_get_prev_ncnnlni(preproc);   // Issue #2279
+                     preproc = preproc->GetPrevNcNnlNi();   // Issue #2279
 
                      if (preproc->pp_level == pp_level)
                      {
-                        prev = chunk_get_prev_ncnnlnp(preproc);
+                        prev = preproc->GetPrevNcNnlNpp();
                         break;
                      }
                   }
-               } while (preproc != nullptr);
+               } while (preproc->IsNotNullChunk());
             }
          }
       }
 
       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
@@ -1749,50 +1776,55 @@ void mark_function(chunk_t *pc)
             || chunk_is_token(prev, 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->type));
          isa_def = false;
       }
 
       // Fixes issue #1266, identification of a tuple return type in CS.
       if (  !isa_def
          && chunk_is_token(prev, CT_PAREN_CLOSE)
-         && chunk_get_next_ncnnl(prev) == pc)
+         && prev->GetNextNcNnl() == pc)
       {
          tmp = chunk_skip_to_match_rev(prev);
 
-         while (  tmp != nullptr                     // Issue #2315
+         if (tmp == nullptr)
+         {
+            tmp = Chunk::NullChunkPtr;
+         }
+
+         while (  tmp->IsNotNullChunk() // Issue #2315
                && tmp != prev)
          {
             if (  chunk_is_token(tmp, CT_COMMA)
                && tmp->level == prev->level + 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->type));
                isa_def = true;
                break;
             }
-            tmp = chunk_get_next_ncnnl(tmp);
+            tmp = tmp->GetNextNcNnl();
          }
       }
 
       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());
+                 __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);
 
-         if (prev == nullptr)
+         if (  prev == nullptr
+            || prev->IsNullChunk())
          {
-            prev = chunk_get_head();
+            prev = Chunk::GetHead();
          }
 
-         for (  tmp = prev; (tmp != nullptr)
-             && tmp != pc; tmp = chunk_get_next_ncnnlnp(tmp))
+         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));
+            LOG_FMT(LFCN, "%s(%d): Text() is '%s', type is %s\n",
+                    __func__, __LINE__, tmp->Text(), get_token_name(tmp->type));
             make_type(tmp);
          }
       }
@@ -1800,9 +1832,9 @@ void mark_function(chunk_t *pc)
 
    if (chunk_is_not_token(pc, CT_FUNC_DEF))
    {
-      LOG_FMT(LFCN, "%s(%d):  Detected type %s, text() is '%s', on orig_line %zu, orig_col %zu\n",
+      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);
+              pc->Text(), pc->orig_line, pc->orig_col);
 
       tmp = flag_parens(next, PCF_IN_FCN_CALL, CT_FPAREN_OPEN, CT_FUNC_CALL, false);
 
@@ -1824,9 +1856,9 @@ void mark_function(chunk_t *pc)
    // FIXME: this doesn't take the old K&R parameter definitions into account
 
    // Scan tokens until we hit a brace open (def) or semicolon (proto)
-   tmp = paren_close;
+   tmp = paren_close->GetNextNcNnl();
 
-   while ((tmp = chunk_get_next_ncnnl(tmp)) != nullptr)
+   while (tmp->IsNotNullChunk())
    {
       // Only care about brace or semicolon on the same level
       if (tmp->level < pc->level)
@@ -1849,18 +1881,19 @@ void mark_function(chunk_t *pc)
             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);
+            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);
             break;
          }
          else if (chunk_is_token(pc, 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);
+            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);
             break;
          }
       }
+      tmp = tmp->GetNextNcNnl();
    }
 
    /*
@@ -1880,7 +1913,7 @@ void mark_function(chunk_t *pc)
    {
       LOG_FMT(LFPARAM, "%s(%d):", __func__, __LINE__);
       LOG_FMT(LFPARAM, "  checking '%s' for constructor variable %s %s\n",
-              pc->text(),
+              pc->Text(),
               get_token_name(paren_open->type),
               get_token_name(paren_close->type));
 
@@ -1890,12 +1923,12 @@ void mark_function(chunk_t *pc)
        */
       tmp = pc;
 
-      while (  tmp != nullptr
+      while (  tmp->IsNotNullChunk()
             && !tmp->flags.test(PCF_STMT_START))
       {
-         tmp = chunk_get_prev_ncnnlni(tmp);   // Issue #2279
+         tmp = tmp->GetPrevNcNnlNi();   // Issue #2279
       }
-      const bool is_extern = (  tmp != nullptr
+      const bool is_extern = (  tmp->IsNotNullChunk()
                              && tmp->str.equals("extern"));
 
       /*
@@ -1905,14 +1938,14 @@ void mark_function(chunk_t *pc)
        *  - non-type fields
        *  - function calls
        */
-      chunk_t *ref = chunk_get_next_ncnnl(paren_open);
-      chunk_t *tmp2;
-      bool    is_param = true;
+      Chunk *ref = paren_open->GetNextNcNnl();
+      Chunk *tmp2;
+      bool  is_param = true;
       tmp = ref;
 
       while (tmp != paren_close)
       {
-         tmp2 = chunk_get_next_ncnnl(tmp);
+         tmp2 = tmp->GetNextNcNnl();
 
          if (  chunk_is_token(tmp, CT_COMMA)
             && (tmp->level == (paren_open->level + 1)))
@@ -1941,33 +1974,33 @@ void mark_function(chunk_t *pc)
          && !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);
+         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);
       }
       else if (pc->brace_level > 0)
       {
-         chunk_t *br_open = chunk_get_prev_type(pc, CT_BRACE_OPEN, pc->brace_level - 1);
+         Chunk *br_open = pc->GetPrevType(CT_BRACE_OPEN, pc->brace_level - 1);
 
-         if (  br_open != nullptr
+         if (  br_open->IsNotNullChunk()
             && get_chunk_parent_type(br_open) != CT_EXTERN
             && get_chunk_parent_type(br_open) != CT_NAMESPACE)
          {
             // Do a check to see if the level is right
-            prev = chunk_get_prev_ncnnlni(pc);   // Issue #2279
+            prev = pc->GetPrevNcNnlNi();   // Issue #2279
 
-            if (  !chunk_is_str(prev, "*", 1)
-               && !chunk_is_str(prev, "&", 1))
+            if (  !chunk_is_str(prev, "*")
+               && !chunk_is_str(prev, "&"))
             {
-               chunk_t *p_op = chunk_get_prev_type(pc, CT_BRACE_OPEN, pc->brace_level - 1);
+               Chunk *p_op = pc->GetPrevType(CT_BRACE_OPEN, pc->brace_level - 1);
 
-               if (  p_op != nullptr
+               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)
                {
                   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);
+                  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);
                }
             }
          }
@@ -1998,66 +2031,66 @@ void mark_function(chunk_t *pc)
 
    if (chunk_is_token(next, CT_TSQUARE))
    {
-      next = chunk_get_next_ncnnl(next);
+      next = next->GetNextNcNnl();
 
-      if (next == nullptr)
+      if (next->IsNullChunk())
       {
          return;
       }
    }
    // Mark parameters and return type
    fix_fcn_def_params(next);
-   mark_function_return_type(pc, chunk_get_prev_ncnnlni(pc), pc->type);   // Issue #2279
+   mark_function_return_type(pc, pc->GetPrevNcNnlNi(), pc->type);   // Issue #2279
 
    /* mark C# where chunk */
    if (  language_is_set(LANG_CS)
       && (  (chunk_is_token(pc, CT_FUNC_DEF))
          || (chunk_is_token(pc, CT_FUNC_PROTO))))
    {
-      tmp = chunk_get_next_ncnnl(paren_close);
+      tmp = paren_close->GetNextNcNnl();
       pcf_flags_t in_where_spec_flags = PCF_NONE;
 
-      while (  tmp != nullptr
+      while (  tmp->IsNotNullChunk()
             && chunk_is_not_token(tmp, CT_BRACE_OPEN)
             && chunk_is_not_token(tmp, CT_SEMICOLON))
       {
          mark_where_chunk(tmp, pc->type, tmp->flags | in_where_spec_flags);
          in_where_spec_flags = tmp->flags & PCF_IN_WHERE_SPEC;
 
-         tmp = chunk_get_next_ncnnl(tmp);
+         tmp = tmp->GetNextNcNnl();
       }
    }
 
    // Find the brace pair and set the parent
    if (chunk_is_token(pc, CT_FUNC_DEF))
    {
-      tmp = chunk_get_next_ncnnl(paren_close);
+      tmp = paren_close->GetNextNcNnl();
 
-      while (  tmp != nullptr
+      while (  tmp->IsNotNullChunk()
             && chunk_is_not_token(tmp, 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());
+         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);
 
          if (!chunk_is_semicolon(tmp))
          {
             chunk_flags_set(tmp, PCF_OLD_FCN_PARAMS);
          }
-         tmp = chunk_get_next_ncnnl(tmp);
+         tmp = tmp->GetNextNcNnl();
       }
 
       if (chunk_is_token(tmp, 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());
+         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);
 
          if (tmp != nullptr)
          {
-            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());
+            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);
          }
       }
@@ -2065,49 +2098,49 @@ void mark_function(chunk_t *pc)
 } // mark_function
 
 
-bool mark_function_type(chunk_t *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(),
+   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);
 
-   size_t    star_count = 0;
-   size_t    word_count = 0;
-   chunk_t   *ptrcnk    = nullptr;
-   chunk_t   *tmp;
-   chunk_t   *apo;
-   chunk_t   *apc;
-   chunk_t   *aft;
-   bool      anon = false;
-   c_token_t pt, ptp;
+   size_t  star_count = 0;
+   size_t  word_count = 0;
+   Chunk   *ptrcnk    = nullptr;
+   Chunk   *tmp;
+   Chunk   *apo;
+   Chunk   *apc;
+   Chunk   *aft;
+   bool    anon = false;
+   E_Token pt, ptp;
 
    // Scan backwards across the name, which can only be a word and single star
-   chunk_t *varcnk = chunk_get_prev_ncnnlni(pc);   // Issue #2279
+   Chunk *varcnk = pc->GetPrevNcNnlNi();   // Issue #2279
 
    varcnk = chunk_get_prev_ssq(varcnk);
 
-   if (  varcnk != nullptr
+   if (  varcnk->IsNotNullChunk()
       && !chunk_is_word(varcnk))
    {
       if (  language_is_set(LANG_OC)
-         && chunk_is_str(varcnk, "^", 1)
-         && chunk_is_paren_open(chunk_get_prev_ncnnlni(varcnk)))   // Issue #2279
+         && chunk_is_str(varcnk, "^")
+         && chunk_is_paren_open(varcnk->GetPrevNcNnlNi()))   // 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),
+         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);
          goto nogo_exit;
       }
    }
-   apo = chunk_get_next_ncnnl(pc);
+   apo = pc->GetNextNcNnl();
 
-   if (apo == nullptr)
+   if (apo->IsNullChunk())
    {
       return(false);
    }
@@ -2120,7 +2153,7 @@ bool mark_function_type(chunk_t *pc)
       LOG_FMT(LFTYPE, "%s(%d): not followed by parens\n", __func__, __LINE__);
       goto nogo_exit;
    }
-   aft = chunk_get_next_ncnnl(apc);
+   aft = apc->GetNextNcNnl();
 
    if (chunk_is_token(aft, CT_BRACE_OPEN))
    {
@@ -2140,15 +2173,15 @@ bool mark_function_type(chunk_t *pc)
 
    tmp = pc;
 
-   while ((tmp = chunk_get_prev_ncnnlni(tmp)) != nullptr)   // Issue #2279
+   while ((tmp = tmp->GetPrevNcNnlNi())->IsNotNullChunk()) // Issue #2279
    {
       tmp = chunk_get_prev_ssq(tmp);
 
       LOG_FMT(LFTYPE, " -- type is %s, %s on orig_line %zu, orig_col is %zu",
-              get_token_name(tmp->type), tmp->text(),
+              get_token_name(tmp->type), tmp->Text(),
               tmp->orig_line, tmp->orig_col);
 
-      if (  chunk_is_star(tmp)
+      if (  tmp->IsStar()
          || chunk_is_token(tmp, CT_PTR_TYPE)
          || chunk_is_token(tmp, CT_CARET))
       {
@@ -2161,22 +2194,22 @@ bool mark_function_type(chunk_t *pc)
               || chunk_is_token(tmp, CT_TYPE))
       {
          word_count++;
-         LOG_FMT(LFTYPE, " -- TYPE(%s)\n", tmp->text());
+         LOG_FMT(LFTYPE, " -- TYPE(%s)\n", tmp->Text());
       }
       else if (chunk_is_token(tmp, CT_DC_MEMBER))
       {
          word_count = 0;
          LOG_FMT(LFTYPE, " -- :: reset word_count\n");
       }
-      else if (chunk_is_str(tmp, "(", 1))
+      else if (chunk_is_str(tmp, "("))
       {
          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(),
+         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);
          goto nogo_exit;
       }
@@ -2197,7 +2230,7 @@ bool mark_function_type(chunk_t *pc)
    }
 
    // make sure what appears before the first open paren can be a return type
-   if (!chunk_ends_type(chunk_get_prev_ncnnlni(tmp)))   // Issue #2279
+   if (!chunk_ends_type(tmp->GetPrevNcNnlNi()))   // Issue #2279
    {
       goto nogo_exit;
    }
@@ -2211,7 +2244,7 @@ bool mark_function_type(chunk_t *pc)
    {
       if (pc->flags.test(PCF_IN_TYPEDEF))
       {
-         set_chunk_type(varcnk, CT_TYPE);
+         set_chunk_type(varcnk, CT_FUNC_TYPE);   // Issue #3402
       }
       else
       {
@@ -2239,10 +2272,10 @@ bool mark_function_type(chunk_t *pc)
    // Step backwards to the previous open paren and mark everything a
    tmp = pc;
 
-   while ((tmp = chunk_get_prev_ncnnlni(tmp)) != nullptr)   // Issue #2279
+   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(),
+      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);
 
       if (*tmp->str.c_str() == '(')
@@ -2254,7 +2287,7 @@ bool mark_function_type(chunk_t *pc)
          set_chunk_type(tmp, CT_TPAREN_OPEN);
          set_chunk_parent(tmp, ptp);
 
-         tmp = chunk_get_prev_ncnnlni(tmp);   // Issue #2279
+         tmp = tmp->GetPrevNcNnlNi();   // Issue #2279
 
          if (  chunk_is_token(tmp, CT_FUNCTION)
             || chunk_is_token(tmp, CT_FUNC_CALL)
@@ -2272,7 +2305,7 @@ bool mark_function_type(chunk_t *pc)
    return(true);
 
 nogo_exit:
-   tmp = chunk_get_next_ncnnl(pc);
+   tmp = pc->GetNextNcNnl();
 
    if (chunk_is_paren_open(tmp))
    {
@@ -2284,19 +2317,19 @@ nogo_exit:
 } // mark_function_type
 
 
-void mark_lvalue(chunk_t *pc)
+void mark_lvalue(Chunk *pc)
 {
    LOG_FUNC_ENTRY();
-   chunk_t *prev;
+   Chunk *prev;
 
    if (pc->flags.test(PCF_IN_PREPROC))
    {
       return;
    }
 
-   for (prev = chunk_get_prev_ncnnlni(pc);     // Issue #2279
-        prev != nullptr;
-        prev = chunk_get_prev_ncnnlni(prev))   // Issue #2279
+   for (prev = pc->GetPrevNcNnlNi();     // Issue #2279
+        prev->IsNotNullChunk();
+        prev = prev->GetPrevNcNnlNi())   // Issue #2279
    {
       if (  prev->level < pc->level
          || chunk_is_token(prev, CT_ACCESS_COLON)
@@ -2305,9 +2338,9 @@ void mark_lvalue(chunk_t *pc)
          || chunk_is_token(prev, CT_COMMA)
          || chunk_is_cpp_inheritance_access_specifier(prev)
          || chunk_is_semicolon(prev)
-         || chunk_is_str(prev, "(", 1)
-         || chunk_is_str(prev, "{", 1)
-         || chunk_is_str(prev, "[", 1)
+         || 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)
@@ -2317,7 +2350,7 @@ void mark_lvalue(chunk_t *pc)
       chunk_flags_set(prev, PCF_LVALUE);
 
       if (  prev->level == pc->level
-         && chunk_is_str(prev, "&", 1))
+         && chunk_is_str(prev, "&"))
       {
          make_type(prev);
       }
@@ -2325,12 +2358,12 @@ void mark_lvalue(chunk_t *pc)
 } // mark_lvalue
 
 
-void mark_struct_union_body(chunk_t *start)
+void mark_struct_union_body(Chunk *start)
 {
    LOG_FUNC_ENTRY();
-   chunk_t *pc = start;
+   Chunk *pc = start;
 
-   while (  pc != nullptr
+   while (  pc->IsNotNullChunk()
          && pc->level >= start->level
          && !(  pc->level == start->level
              && chunk_is_token(pc, CT_BRACE_CLOSE)))
@@ -2339,9 +2372,9 @@ void mark_struct_union_body(chunk_t *start)
          || chunk_is_token(pc, CT_BRACE_CLOSE)
          || chunk_is_token(pc, CT_SEMICOLON))
       {
-         pc = chunk_get_next_ncnnl(pc);
+         pc = pc->GetNextNcNnl();
 
-         if (pc == nullptr)
+         if (pc->IsNullChunk())
          {
             break;
          }
@@ -2351,7 +2384,7 @@ void mark_struct_union_body(chunk_t *start)
       {
          pc = skip_align(pc); // "align(x)" or "align(x):"
 
-         if (pc == nullptr)
+         if (pc->IsNullChunk())
          {
             break;
          }
@@ -2364,7 +2397,7 @@ void mark_struct_union_body(chunk_t *start)
       {
          pc = fix_variable_definition(pc);
 
-         if (pc == nullptr)
+         if (pc->IsNullChunk())
          {
             break;
          }
@@ -2373,24 +2406,24 @@ void mark_struct_union_body(chunk_t *start)
 } // mark_struct_union_body
 
 
-void mark_template_func(chunk_t *pc, chunk_t *pc_next)
+void mark_template_func(Chunk *pc, Chunk *pc_next)
 {
    LOG_FUNC_ENTRY();
 
    // We know angle_close must be there...
-   chunk_t *angle_close = chunk_get_next_type(pc_next, CT_ANGLE_CLOSE, pc->level);
-   chunk_t *after       = chunk_get_next_ncnnl(angle_close);
+   Chunk *angle_close = pc_next->GetNextType(CT_ANGLE_CLOSE, pc->level);
+   Chunk *after       = angle_close->GetNextNcNnl();
 
-   if (after != nullptr)
+   if (after->IsNotNullChunk())
    {
-      if (chunk_is_str(after, "(", 1))
+      if (chunk_is_str(after, "("))
       {
          if (angle_close->flags.test(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());
+                    __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);
             flag_parens(after, PCF_IN_FCN_CALL, CT_FPAREN_OPEN, CT_FUNC_CALL, false);
          }
@@ -2405,10 +2438,10 @@ void mark_template_func(chunk_t *pc, chunk_t *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->orig_line);
             // 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());
+            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);
             mark_function(pc);
          }
@@ -2424,7 +2457,7 @@ void mark_template_func(chunk_t *pc, chunk_t *pc_next)
 } // mark_template_func
 
 
-chunk_t *mark_variable_definition(chunk_t *start)
+Chunk *mark_variable_definition(Chunk *start)
 {
    LOG_FUNC_ENTRY();
 
@@ -2432,11 +2465,11 @@ chunk_t *mark_variable_definition(chunk_t *start)
    {
       return(nullptr);
    }
-   chunk_t     *pc   = start;
+   Chunk       *pc   = start;
    pcf_flags_t 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(),
+   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));
 
    // Issue #596
@@ -2454,19 +2487,19 @@ chunk_t *mark_variable_definition(chunk_t *start)
             chunk_flags_set(pc, 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->orig_line, pc->orig_col, pc->Text());
 
          LOG_FMT(LVARDEF,
-                 "%s(%d): orig_line is %zu, marked text() '%s'[%s]\n"
+                 "%s(%d): orig_line is %zu, marked Text() '%s'[%s]\n"
                  "   in orig_col %zu, flags: %s -> %s\n",
-                 __func__, __LINE__, pc->orig_line, pc->text(),
+                 __func__, __LINE__, pc->orig_line, pc->Text(),
                  get_token_name(pc->type), pc->orig_col,
                  pcf_flags_str(orig_flags).c_str(),
                  pcf_flags_str(pc->flags).c_str());
       }
       else if (  !bit_field_colon_is_present                      // Issue #2689
-              && (  chunk_is_star(pc)
+              && (  pc->IsStar()
                  || chunk_is_msref(pc)))
       {
          set_chunk_type(pc, CT_PTR_TYPE);
@@ -2485,7 +2518,7 @@ chunk_t *mark_variable_definition(chunk_t *start)
       {
          bit_field_colon_is_present = true;                    // Issue #2689
       }
-      pc = chunk_get_next_ncnnl(pc);
+      pc = pc->GetNextNcNnl();
    }
    return(pc);
 } // mark_variable_definition
@@ -2497,11 +2530,11 @@ void mark_variable_stack(ChunkStack &cs, log_sev_t sev)
    LOG_FUNC_ENTRY();
 
    // throw out the last word and mark the rest
-   chunk_t *var_name = cs.Pop_Back();
+   Chunk *var_name = cs.Pop_Back();
 
    if (  var_name != nullptr
-      && var_name->prev != nullptr
-      && var_name->prev->type == CT_DC_MEMBER)
+      && var_name->GetPrev()->IsNotNullChunk()
+      && var_name->GetPrev()->type == CT_DC_MEMBER)
    {
       cs.Push_Back(var_name);
    }
@@ -2511,8 +2544,8 @@ void mark_variable_stack(ChunkStack &cs, log_sev_t sev)
       LOG_FMT(LFCNP, "%s(%d): parameter on orig_line %zu, orig_col %zu:\n",
               __func__, __LINE__, var_name->orig_line, var_name->orig_col);
 
-      size_t  word_cnt = 0;
-      chunk_t *word_type;
+      size_t word_cnt = 0;
+      Chunk  *word_type;
 
       while ((word_type = cs.Pop_Back()) != nullptr)
       {
@@ -2520,7 +2553,7 @@ void mark_variable_stack(ChunkStack &cs, log_sev_t sev)
             || chunk_is_token(word_type, 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());
+                    __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);
          }
@@ -2532,13 +2565,13 @@ void mark_variable_stack(ChunkStack &cs, log_sev_t sev)
          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());
+                    __func__, __LINE__, var_name->orig_line, var_name->orig_col, var_name->Text());
             chunk_flags_set(var_name, 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());
+                    __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);
          }
@@ -2547,7 +2580,7 @@ void mark_variable_stack(ChunkStack &cs, log_sev_t sev)
 } // mark_variable_stack
 
 
-pcf_flags_t mark_where_chunk(chunk_t *pc, c_token_t parent_type, pcf_flags_t flags)
+pcf_flags_t mark_where_chunk(Chunk *pc, E_Token parent_type, pcf_flags_t 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.) */
@@ -2562,7 +2595,7 @@ pcf_flags_t mark_where_chunk(chunk_t *pc, c_token_t parent_type, pcf_flags_t fla
    }
    else if (flags.test(PCF_IN_WHERE_SPEC))
    {
-      if (chunk_is_str(pc, ":", 1))
+      if (chunk_is_str(pc, ":"))
       {
          set_chunk_type(pc, CT_WHERE_COLON);
          LOG_FMT(LFTOR, "%s: where-spec colon on line %zu\n",
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/combine_fix_mark.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/combine_fix_mark.h
index c0e724dd..4671fbb3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/combine_fix_mark.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/combine_fix_mark.h
@@ -19,7 +19,7 @@
  *
  * @param start  Pointer to the open paren
  */
-void fix_casts(chunk_t *start);
+void fix_casts(Chunk *start);
 
 
 /**
@@ -27,7 +27,7 @@ void fix_casts(chunk_t *start);
  *
  * @param start  points to the open paren
  */
-void fix_fcn_def_params(chunk_t *start);
+void fix_fcn_def_params(Chunk *start);
 
 
 /**
@@ -36,7 +36,7 @@ void fix_fcn_def_params(chunk_t *start);
  *
  * Mark everything between the <> as a type and set the paren parent
  */
-void fix_type_cast(chunk_t *start);
+void fix_type_cast(Chunk *start);
 
 
 /**
@@ -53,7 +53,7 @@ void fix_type_cast(chunk_t *start);
  * typedef <enum/struct/union> [type] [*] type [, [*]type] ;
  * typedef <enum/struct/union> [type] { ... } [*] type [, [*]type] ;
  */
-void fix_typedef(chunk_t *start);
+void fix_typedef(Chunk *start);
 
 
 /**
@@ -62,10 +62,10 @@ void fix_typedef(chunk_t *start);
  *  - BRACE_OPEN
  *  - SEMICOLON
  */
-chunk_t *fix_variable_definition(chunk_t *start);
+Chunk *fix_variable_definition(Chunk *start);
 
 
-void mark_cpp_constructor(chunk_t *pc);
+void mark_cpp_constructor(Chunk *pc);
 
 
 /**
@@ -77,7 +77,7 @@ void mark_cpp_constructor(chunk_t *pc);
  *                    until the corresponding closing CT_BRACE_CLOSE (with parent type
  *                    CT_CPP_LAMBDA) is encountered
  */
-void mark_cpp_lambda(chunk_t *square_open);
+void mark_cpp_lambda(Chunk *square_open);
 
 
 /**
@@ -91,7 +91,7 @@ void mark_define_expressions(void);
  * Just mark every CT_WORD until a semicolon as CT_SQL_WORD.
  * Adjust the levels if pc is CT_SQL_BEGIN
  */
-void mark_exec_sql(chunk_t *pc);
+void mark_exec_sql(Chunk *pc);
 
 
 /**
@@ -100,7 +100,7 @@ void mark_exec_sql(chunk_t *pc);
  * @param pc           the last chunk of the return type
  * @param parent_type  CT_NONE (no change) or the new parent type
  */
-void mark_function_return_type(chunk_t *fname, chunk_t *start, c_token_t parent_type);
+void mark_function_return_type(Chunk *fname, Chunk *start, E_Token parent_type);
 
 
 /**
@@ -124,7 +124,7 @@ void mark_function_return_type(chunk_t *fname, chunk_t *start, c_token_t parent_
  * Constructor/destructor detection should have already been done when the
  * 'class' token was encountered (see mark_class_ctor).
  */
-void mark_function(chunk_t *pc);
+void mark_function(Chunk *pc);
 
 
 /**
@@ -139,14 +139,14 @@ void mark_function(chunk_t *pc);
  *
  * @return whether a function type was processed
  */
-bool mark_function_type(chunk_t *pc);
+bool mark_function_type(Chunk *pc);
 
 
 /**
  *  Just hit an assign. Go backwards until we hit an open brace/paren/square or
  * semicolon (TODO: other limiter?) and mark as a LValue.
  */
-void mark_lvalue(chunk_t *pc);
+void mark_lvalue(Chunk *pc);
 
 
 /**
@@ -154,7 +154,7 @@ void mark_lvalue(chunk_t *pc);
  * There should only be variable definitions and methods.
  * Skip the methods, as they will get handled elsewhere.
  */
-void mark_struct_union_body(chunk_t *start);
+void mark_struct_union_body(Chunk *start);
 
 
 /**
@@ -165,7 +165,7 @@ void mark_struct_union_body(chunk_t *start);
  * Or we could be on a variable def if it's followed by a word:
  *   Renderer<rgb32> rend;
  */
-void mark_template_func(chunk_t *pc, chunk_t *pc_next);
+void mark_template_func(Chunk *pc, Chunk *pc_next);
 
 
 /**
@@ -180,7 +180,7 @@ void mark_template_func(chunk_t *pc, chunk_t *pc_next);
  * struct {...} *a, *b;                ## called with 'a' or '*'
  * myclass a(4);
  */
-chunk_t *mark_variable_definition(chunk_t *start);
+Chunk *mark_variable_definition(Chunk *start);
 
 
 void mark_variable_stack(ChunkStack &cs, log_sev_t sev);
@@ -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_t *pc, c_token_t parent_type, pcf_flags_t flags);
+pcf_flags_t mark_where_chunk(Chunk *pc, E_Token parent_type, pcf_flags_t flags);
 
 
 #endif /* COMBINE_FIX_MARK_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/combine_labels.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/combine_labels.cpp
index 9abebc4f..72e91b1a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/combine_labels.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/combine_labels.cpp
@@ -8,35 +8,45 @@
 
 #include "combine_labels.h"
 
-#include "chunk_list.h"
+#include "chunk.h"
 #include "cs_top_is_question.h"
 #include "uncrustify.h"
 
 
-chunk_t *chunk_get_next_local(chunk_t *pc, scope_e scope = scope_e::ALL)
+Chunk *chunk_get_next_local(Chunk *pc, E_Scope scope = E_Scope::ALL)
 {
-   chunk_t *tmp = pc;
+   Chunk *tmp = pc;
+
+   if (tmp == nullptr)
+   {
+      tmp = Chunk::NullChunkPtr;
+   }
 
    do
    {
-      tmp = chunk_get_next(tmp, scope);
-   } while (  tmp != nullptr
-           && (  chunk_is_comment(tmp)
+      tmp = tmp->GetNext(scope);
+   } while (  tmp->IsNotNullChunk()
+           && (  tmp->IsComment()
               || chunk_is_token(tmp, CT_NOEXCEPT)));
 
    return(tmp);
 }
 
 
-chunk_t *chunk_get_prev_local(chunk_t *pc, scope_e scope = scope_e::ALL)
+Chunk *chunk_get_prev_local(Chunk *pc, E_Scope scope = E_Scope::ALL)
 {
-   chunk_t *tmp = pc;
+   Chunk *tmp = pc;
+
+   if (tmp == nullptr)
+   {
+      tmp = Chunk::NullChunkPtr;
+   }
 
    do
    {
-      tmp = chunk_get_prev(tmp, scope);
-   } while (  tmp != nullptr
-           && (  chunk_is_comment(tmp)
+      tmp = tmp->GetPrev(scope);
+   } while (  tmp->IsNotNullChunk()
+           && (  tmp->IsComment()
               || chunk_is_newline(tmp)
               || chunk_is_token(tmp, CT_NOEXCEPT)));
 
@@ -47,34 +57,32 @@ chunk_t *chunk_get_prev_local(chunk_t *pc, scope_e scope = scope_e::ALL)
 void combine_labels(void)
 {
    LOG_FUNC_ENTRY();
-   chunk_t *cur;
-   chunk_t *prev;
-   chunk_t *next;
-   bool    hit_case  = false;
-   bool    hit_class = false;
+   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;
 
-   prev = chunk_get_head();
+   Chunk      *prev = Chunk::GetHead();
 
-   if (prev == nullptr)
+   if (prev->IsNullChunk())
    {
       return;
    }
-   cur = chunk_get_next_nc(prev);
+   Chunk *cur = prev->GetNextNc();
 
-   if (cur == nullptr)
+   if (cur->IsNullChunk())
    {
       return;
    }
-   next = chunk_get_next_nc(cur);
+   Chunk *next = cur->GetNextNc();
 
    // unlikely that the file will start with a label...
    // prev cur next
-   while (next != nullptr)
+   while (  next != nullptr
+         && next->IsNotNullChunk())
    {
       if (chunk_is_token(next, CT_NEWLINE))
       {
@@ -93,8 +101,8 @@ void combine_labels(void)
       }
       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());
+         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
@@ -122,7 +130,7 @@ void combine_labels(void)
          // pop until we hit '['
          while (!cs.Empty())
          {
-            chunk_t *t2 = cs.Top()->m_pc;
+            Chunk *t2 = cs.Top()->m_pc;
             cs.Pop_Back();
 
             if (chunk_is_token(t2, CT_SQUARE_OPEN))
@@ -168,14 +176,14 @@ void combine_labels(void)
          {
             hit_case = false;
             set_chunk_type(next, CT_CASE_COLON);
-            chunk_t *tmp = chunk_get_next_ncnnlnp(next);                // Issue #2150
+            Chunk *tmp = next->GetNextNcNnlNpp();                // Issue #2150
 
             if (chunk_is_token(tmp, CT_BRACE_OPEN))
             {
                set_chunk_parent(tmp, CT_CASE);
-               tmp = chunk_get_next_type(tmp, CT_BRACE_CLOSE, tmp->level);
+               tmp = tmp->GetNextType(CT_BRACE_CLOSE, tmp->level);
 
-               if (tmp != nullptr)
+               if (tmp->IsNotNullChunk())
                {
                   set_chunk_parent(tmp, CT_CASE);
                }
@@ -184,7 +192,7 @@ void combine_labels(void)
             if (  chunk_is_token(cur, CT_NUMBER)
                && chunk_is_token(prev, CT_ELLIPSIS))
             {
-               chunk_t *pre_elipsis = chunk_get_prev_ncnnlnp(prev);
+               Chunk *pre_elipsis = prev->GetPrevNcNnlNpp();
 
                if (chunk_is_token(pre_elipsis, CT_NUMBER))
                {
@@ -198,13 +206,13 @@ void combine_labels(void)
          }
          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_t *nextprev = chunk_get_prev_local(next);   // Issue #2279
+            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)
             {
@@ -216,11 +224,11 @@ void combine_labels(void)
                if (  chunk_is_token(cur, CT_WORD)
                   || chunk_is_token(cur, CT_BRACE_CLOSE))
                {
-                  c_token_t new_type = CT_TAG;
+                  E_Token new_type = CT_TAG;
 
-                  chunk_t   *tmp = chunk_get_next_nc(next);
+                  Chunk   *tmp = next->GetNextNc();
 
-                  if (tmp == nullptr)
+                  if (tmp->IsNullChunk())
                   {
                      return;
                   }
@@ -256,16 +264,16 @@ void combine_labels(void)
             }
             else if (chunk_is_token(cur, CT_WORD))
             {
-               chunk_t *tmp = chunk_get_next_nc(next, scope_e::PREPROC);
+               Chunk *tmp = next->GetNextNc(E_Scope::PREPROC);
 
                // Issue #1187
-               if (tmp == nullptr)
+               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());
+                       (chunk_is_token(tmp, CT_NEWLINE)) ? "<Newline>" : tmp->Text());
                log_pcf_flags(LGUY, tmp->flags);
 
                if (next->flags.test(PCF_IN_FCN_CALL))
@@ -273,7 +281,7 @@ void combine_labels(void)
                   // Must be a macro thingy, assume some sort of label
                   set_chunk_type(next, CT_LABEL_COLON);
                }
-               else if (  tmp == nullptr
+               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)
@@ -291,14 +299,14 @@ void combine_labels(void)
                   if (  language_is_set(LANG_C | LANG_CPP | LANG_CS)
                      && (!language_is_set(LANG_OC)))
                   {
-                     chunk_t *labelPrev = prev;
+                     Chunk *labelPrev = prev;
 
                      if (chunk_is_token(labelPrev, CT_NEWLINE))
                      {
-                        labelPrev = chunk_get_prev_ncnnlni(prev);   // Issue #2279
+                        labelPrev = prev->GetPrevNcNnlNi();   // Issue #2279
                      }
 
-                     if (  labelPrev != nullptr
+                     if (  labelPrev->IsNotNullChunk()
                         && chunk_is_not_token(labelPrev, CT_FPAREN_CLOSE))
                      {
                         set_chunk_type(cur, CT_LABEL);
@@ -315,14 +323,14 @@ void combine_labels(void)
                {
                   set_chunk_type(next, CT_BIT_COLON);
 
-                  chunk_t *nnext = chunk_get_next(next);
+                  Chunk *nnext = next->GetNext();
 
-                  if (nnext == nullptr)
+                  if (nnext->IsNullChunk())
                   {
                      return;
                   }
 
-                  while ((nnext = chunk_get_next(nnext)) != nullptr)
+                  while ((nnext = nnext->GetNext())->IsNotNullChunk())
                   {
                      if (chunk_is_token(nnext, CT_SEMICOLON))
                      {
@@ -338,11 +346,11 @@ void combine_labels(void)
             }
             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,
+               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,
+               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
@@ -396,14 +404,13 @@ void combine_labels(void)
             }
             else
             {
-               chunk_t *tmp = chunk_get_next_ncnnl(next);
+               Chunk *tmp = next->GetNextNcNnl();
 
                //tmp = chunk_get_next_local(next);
-               if (tmp != nullptr)
-
+               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,
+                  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)
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/combine_labels.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/combine_labels.h
index 4a273d0b..4a273d0b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/combine_labels.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/combine_labels.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/combine_skip.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/combine_skip.cpp
index 4e8040f1..2567470f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/combine_skip.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/combine_skip.cpp
@@ -11,22 +11,26 @@
 #include "combine_tools.h"
 
 
-chunk_t *skip_align(chunk_t *start)
+Chunk *skip_align(Chunk *start)
 {
-   chunk_t *pc = start;
+   Chunk *pc = start;
 
    if (chunk_is_token(pc, CT_ALIGN))
    {
-      pc = chunk_get_next_ncnnl(pc);
+      pc = pc->GetNextNcNnl();
 
       if (chunk_is_token(pc, CT_PAREN_OPEN))
       {
-         pc = chunk_get_next_type(pc, CT_PAREN_CLOSE, pc->level);
-         pc = chunk_get_next_ncnnl(pc);
+         pc = pc->GetNextType(CT_PAREN_CLOSE, pc->level);
+
+         if (pc->IsNotNullChunk())
+         {
+            pc = pc->GetNextNcNnl();
+         }
 
          if (chunk_is_token(pc, CT_COLON))
          {
-            pc = chunk_get_next_ncnnl(pc);
+            pc = pc->GetNextNcNnl();
          }
       }
    }
@@ -34,30 +38,34 @@ chunk_t *skip_align(chunk_t *start)
 }
 
 
-chunk_t *skip_expression(chunk_t *pc)
+Chunk *skip_expression(Chunk *pc)
 {
-   return(chunk_get_next_ncnnl(skip_to_expression_end(pc)));
+   return(skip_to_expression_end(pc)->GetNextNcNnl());
 }
 
 
-chunk_t *skip_expression_rev(chunk_t *pc)
+Chunk *skip_expression_rev(Chunk *pc)
 {
-   return(chunk_get_prev_ncnnlni(skip_to_expression_start(pc)));
+   return(skip_to_expression_start(pc)->GetPrevNcNnlNi());
 }
 
 
-static chunk_t *skip_to_expression_edge(chunk_t *pc, chunk_t *(*chunk_get_next)(chunk_t *cur, scope_e scope))
+static Chunk *skip_to_expression_edge(Chunk *pc, Chunk *(Chunk::*GetNextFn)(E_Scope scope)const)
 {
-   chunk_t *prev = pc;
+   Chunk *prev = pc;
+
+   if (prev == nullptr)
+   {
+      prev = Chunk::NullChunkPtr;
+   }
 
-   if (  prev != nullptr
-      && chunk_get_next != nullptr)
+   if (prev->IsNotNullChunk())
    {
       std::size_t level         = prev->level;
-      chunk_t     *next         = prev;
+      Chunk       *next         = prev;
       std::size_t template_nest = get_cpp_template_angle_nest_level(prev);
 
-      while (  next != nullptr
+      while (  next->IsNotNullChunk()
             && next->level >= level)
       {
          /**
@@ -81,48 +89,53 @@ static chunk_t *skip_to_expression_edge(chunk_t *pc, chunk_t *(*chunk_get_next)(
             break;
          }
          prev = next;
-         next = (*chunk_get_next)(next, scope_e::PREPROC);
+         next = (next->*GetNextFn)(E_Scope::PREPROC);
       }
    }
    return(prev);
 }
 
 
-chunk_t *skip_to_expression_end(chunk_t *pc)
+Chunk *skip_to_expression_end(Chunk *pc)
 {
-   return(skip_to_expression_edge(pc, chunk_get_next_ncnnl));
+   return(skip_to_expression_edge(pc, &Chunk::GetNextNcNnl));
 }
 
 
-chunk_t *skip_to_expression_start(chunk_t *pc)
+Chunk *skip_to_expression_start(Chunk *pc)
 {
-   return(skip_to_expression_edge(pc, chunk_get_prev_ncnnlni));
+   return(skip_to_expression_edge(pc, &Chunk::GetPrevNcNnlNi));
 }
 
 
-chunk_t *skip_to_next_statement(chunk_t *pc)
+Chunk *skip_to_next_statement(Chunk *pc)
 {
-   while (  pc != nullptr
+   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 = chunk_get_next_ncnnl(pc);
+      pc = pc->GetNextNcNnl();
    }
    return(pc);
 }
 
 
-chunk_t *skip_parent_types(chunk_t *colon)
+Chunk *skip_parent_types(Chunk *colon)
 {
-   auto pc = chunk_get_next_ncnnlnp(colon);
+   Chunk *pc = colon->GetNextNcNnlNpp();
 
    while (pc)
    {
       // Skip access specifier
       if (chunk_is_token(pc, CT_ACCESS))
       {
-         pc = chunk_get_next_ncnnlnp(pc);
+         pc = pc->GetNextNcNnlNpp();
          continue;
       }
 
@@ -138,17 +151,17 @@ chunk_t *skip_parent_types(chunk_t *colon)
          return(colon);
       }
       // Get next token
-      auto next = skip_template_next(chunk_get_next_ncnnlnp(pc));
+      Chunk *next = skip_template_next(pc->GetNextNcNnlNpp());
 
       if (  chunk_is_token(next, CT_DC_MEMBER)
          || chunk_is_token(next, CT_COMMA))
       {
-         pc = chunk_get_next_ncnnlnp(next);
+         pc = next->GetNextNcNnlNpp();
       }
-      else if (next)
+      else if (next != nullptr)
       {
          LOG_FMT(LPCU, "%s -> %zu:%zu ('%s')\n", __func__,
-                 next->orig_line, next->orig_col, next->text());
+                 next->orig_line, next->orig_col, next->Text());
          return(next);
       }
       else
@@ -162,76 +175,86 @@ chunk_t *skip_parent_types(chunk_t *colon)
 } // skip_parent_types
 
 
-chunk_t *skip_template_prev(chunk_t *ang_close)
+Chunk *skip_template_prev(Chunk *ang_close)
 {
    if (chunk_is_token(ang_close, CT_ANGLE_CLOSE))
    {
-      chunk_t *pc = chunk_get_prev_type(ang_close, CT_ANGLE_OPEN, ang_close->level);
-      return(chunk_get_prev_ncnnlni(pc));   // Issue #2279
+      Chunk *pc = ang_close->GetPrevType(CT_ANGLE_OPEN, ang_close->level);
+      return(pc->GetPrevNcNnlNi());   // Issue #2279
    }
    return(ang_close);
 }
 
 
-chunk_t *skip_tsquare_next(chunk_t *ary_def)
+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(chunk_get_next_nisq(ary_def));
+      return(ary_def->GetNextNisq());
    }
    return(ary_def);
 }
 
 
-chunk_t *skip_attribute(chunk_t *attr)
+Chunk *skip_attribute(Chunk *attr)
 {
-   chunk_t *pc = attr;
+   Chunk *pc = attr;
 
    while (chunk_is_token(pc, CT_ATTRIBUTE))
    {
-      pc = chunk_get_next_ncnnl(pc);
+      pc = pc->GetNextNcNnl();
 
       if (chunk_is_token(pc, CT_FPAREN_OPEN))
       {
-         pc = chunk_get_next_type(pc, CT_FPAREN_CLOSE, pc->level);
+         pc = pc->GetNextType(CT_FPAREN_CLOSE, pc->level);
       }
    }
    return(pc);
 }
 
 
-chunk_t *skip_attribute_next(chunk_t *attr)
+Chunk *skip_attribute_next(Chunk *attr)
 {
-   chunk_t *next = skip_attribute(attr);
+   Chunk *next = skip_attribute(attr);
 
    if (  next != attr
       && chunk_is_token(next, CT_FPAREN_CLOSE))
    {
-      attr = chunk_get_next_ncnnl(next);
+      attr = next->GetNextNcNnl();
+   }
+
+   if (attr == nullptr)
+   {
+      return(Chunk::NullChunkPtr);
    }
    return(attr);
 }
 
 
-chunk_t *skip_attribute_prev(chunk_t *fp_close)
+Chunk *skip_attribute_prev(Chunk *fp_close)
 {
-   chunk_t *pc = fp_close;
+   Chunk *pc = fp_close;
 
    while (true)
    {
       if (  chunk_is_token(pc, CT_FPAREN_CLOSE)
          && get_chunk_parent_type(pc) == CT_ATTRIBUTE)
       {
-         pc = chunk_get_prev_type(pc, CT_ATTRIBUTE, pc->level);
+         pc = pc->GetPrevType(CT_ATTRIBUTE, pc->level);
       }
       else if (chunk_is_not_token(pc, CT_ATTRIBUTE))
       {
          break;
       }
-      pc = chunk_get_prev_ncnnlni(pc);   // Issue #2279
+      pc = pc->GetPrevNcNnlNi(); // Issue #2279
 
-      if (pc == nullptr)                 // Issue #3356
+      if (pc->IsNullChunk())     // Issue #3356
       {
          break;
       }
@@ -240,11 +263,11 @@ chunk_t *skip_attribute_prev(chunk_t *fp_close)
 }
 
 
-chunk_t *skip_declspec(chunk_t *pc)
+Chunk *skip_declspec(Chunk *pc)
 {
    if (chunk_is_token(pc, CT_DECLSPEC))
    {
-      pc = chunk_get_next_ncnnl(pc);
+      pc = pc->GetNextNcNnl();
 
       if (chunk_is_token(pc, CT_PAREN_OPEN))
       {
@@ -255,37 +278,37 @@ chunk_t *skip_declspec(chunk_t *pc)
 }
 
 
-chunk_t *skip_declspec_next(chunk_t *pc)
+Chunk *skip_declspec_next(Chunk *pc)
 {
-   chunk_t *next = skip_declspec(pc);
+   Chunk *next = skip_declspec(pc);
 
    if (  next != pc
       && chunk_is_token(next, CT_PAREN_CLOSE))
    {
-      pc = chunk_get_next_ncnnl(next);
+      pc = next->GetNextNcNnl();
    }
    return(pc);
 }
 
 
-chunk_t *skip_declspec_prev(chunk_t *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 = chunk_get_prev_ncnnlni(pc);
+      pc = pc->GetPrevNcNnlNi();
 
       if (chunk_is_token(pc, CT_DECLSPEC))
       {
-         pc = chunk_get_prev_ncnnlni(pc);
+         pc = pc->GetPrevNcNnlNi();
       }
    }
    return(pc);
 }
 
 
-chunk_t *skip_matching_brace_bracket_paren_next(chunk_t *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)
@@ -300,14 +323,14 @@ chunk_t *skip_matching_brace_bracket_paren_next(chunk_t *pc)
           * retrieve the subsequent chunk
           */
 
-         pc = chunk_get_next_ncnnl(pc);
+         pc = pc->GetNextNcNnl();
       }
    }
    return(pc);
 }
 
 
-chunk_t *skip_to_chunk_before_matching_brace_bracket_paren_rev(chunk_t *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)
@@ -322,7 +345,7 @@ chunk_t *skip_to_chunk_before_matching_brace_bracket_paren_rev(chunk_t *pc)
           * retrieve the preceding chunk
           */
 
-         pc = chunk_get_prev_ncnnlni(pc);
+         pc = pc->GetPrevNcNnlNi();
       }
    }
    return(pc);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/combine_skip.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/combine_skip.h
index d31d1792..b1595647 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/combine_skip.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/combine_skip.h
@@ -9,7 +9,7 @@
 #ifndef COMBINE_SKIP_H_INCLUDED
 #define COMBINE_SKIP_H_INCLUDED
 
-#include "chunk_list.h"
+#include "chunk.h"
 
 
 /**
@@ -18,7 +18,7 @@
  *    align(4):          -- returns 'int'
  *    int bar;
  */
-chunk_t *skip_align(chunk_t *start);
+Chunk *skip_align(Chunk *start);
 
 
 /**
@@ -29,7 +29,7 @@ chunk_t *skip_align(chunk_t *start);
  * 2) Preceding chunk is at higher template nest level relative to the
  *    current chunk under test
  */
-chunk_t *skip_expression(chunk_t *pc);
+Chunk *skip_expression(Chunk *pc);
 
 
 /**
@@ -40,7 +40,7 @@ chunk_t *skip_expression(chunk_t *pc);
  * 2) Preceding chunk is at lower template nest level relative to the
  *    current chunk under test
  */
-chunk_t *skip_expression_rev(chunk_t *pc);
+Chunk *skip_expression_rev(Chunk *pc);
 
 
 /**
@@ -52,7 +52,7 @@ chunk_t *skip_expression_rev(chunk_t *pc);
  * 2) Preceding chunk is at a higher template nest level relative to the
  *    subsequent chunk
  */
-chunk_t *skip_to_expression_end(chunk_t *pc);
+Chunk *skip_to_expression_end(Chunk *pc);
 
 
 /**
@@ -64,13 +64,13 @@ chunk_t *skip_to_expression_end(chunk_t *pc);
  * 2) Preceding chunk is at a lower template nest level relative to the
  *    subsequent chunk
  */
-chunk_t *skip_to_expression_start(chunk_t *pc);
+Chunk *skip_to_expression_start(Chunk *pc);
 
 
 /**
  * Skips the list of class/struct parent types.
  */
-chunk_t *skip_parent_types(chunk_t *colon);
+Chunk *skip_parent_types(Chunk *colon);
 
 
 /**
@@ -78,7 +78,7 @@ chunk_t *skip_parent_types(chunk_t *colon);
  * Points to the chunk after the CT_ANGLE_CLOSE.
  * If the chunk isn't an CT_ANGLE_OPEN, then it is returned.
  */
-chunk_t *skip_template_next(chunk_t *ang_open);
+Chunk *skip_template_next(Chunk *ang_open);
 
 
 /**
@@ -86,18 +86,18 @@ chunk_t *skip_template_next(chunk_t *ang_open);
  * Points to the chunk before the CT_ANGLE_OPEN
  * If the chunk isn't an CT_ANGLE_CLOSE, then it is returned.
  */
-chunk_t *skip_template_prev(chunk_t *ang_close);
+Chunk *skip_template_prev(Chunk *ang_close);
 
 
 //! Skips to the start of the next statement.
-chunk_t *skip_to_next_statement(chunk_t *pc);
+Chunk *skip_to_next_statement(Chunk *pc);
 
 
 /**
  * Skips the rest of the array definitions if ary_def is indeed a
  * CT_TSQUARE or CT_SQUARE_OPEN
  */
-chunk_t *skip_tsquare_next(chunk_t *ary_def);
+Chunk *skip_tsquare_next(Chunk *ary_def);
 
 
 /**
@@ -105,7 +105,7 @@ chunk_t *skip_tsquare_next(chunk_t *ary_def);
  * paren; return the chunk marked CT_FPAREN_CLOSE
  * If the chunk isn't a CT_ATTRIBUTE, then it is returned.
  */
-chunk_t *skip_attribute(chunk_t *attr);
+Chunk *skip_attribute(Chunk *attr);
 
 
 /**
@@ -113,7 +113,7 @@ chunk_t *skip_attribute(chunk_t *attr);
  * after the CT_FPAREN_CLOSE.
  * If the chunk isn't an CT_ATTRIBUTE, then it is returned.
  */
-chunk_t *skip_attribute_next(chunk_t *attr);
+Chunk *skip_attribute_next(Chunk *attr);
 
 
 /**
@@ -121,7 +121,7 @@ chunk_t *skip_attribute_next(chunk_t *attr);
  * and the '__attribute__' thingy and return the chunk before CT_ATTRIBUTE.
  * Otherwise return fp_close.
  */
-chunk_t *skip_attribute_prev(chunk_t *fp_close);
+Chunk *skip_attribute_prev(Chunk *fp_close);
 
 
 /**
@@ -129,7 +129,7 @@ chunk_t *skip_attribute_prev(chunk_t *fp_close);
  * paren; return the chunk marked CT_FPAREN_CLOSE
  * If the chunk isn't a CT_DECLSPEC, then it is returned.
  */
-chunk_t *skip_declspec(chunk_t *pc);
+Chunk *skip_declspec(Chunk *pc);
 
 
 /**
@@ -137,7 +137,7 @@ chunk_t *skip_declspec(chunk_t *pc);
  * after the CT_FPAREN_CLOSE.
  * If the chunk isn't a CT_DECLSPEC, then it is returned.
  */
-chunk_t *skip_declspec_next(chunk_t *pc);
+Chunk *skip_declspec_next(Chunk *pc);
 
 
 /**
@@ -145,7 +145,7 @@ chunk_t *skip_declspec_next(chunk_t *pc);
  * and the '__declspec' keyword and return the chunk before CT_DECLSPEC.
  * Otherwise return pc.
  */
-chunk_t *skip_declspec_prev(chunk_t *pc);
+Chunk *skip_declspec_prev(Chunk *pc);
 
 
 /**
@@ -154,7 +154,7 @@ chunk_t *skip_declspec_prev(chunk_t *pc);
  * CT_BRACE_CLOSE, CT_PAREN_CLOSE or CT_SQUARE_CLOSE; if pc is none of these
  * upon calling this function, then pc is returned.
  */
-chunk_t *skip_matching_brace_bracket_paren_next(chunk_t *pc);
+Chunk *skip_matching_brace_bracket_paren_next(Chunk *pc);
 
 
 /**
@@ -163,7 +163,7 @@ chunk_t *skip_matching_brace_bracket_paren_next(chunk_t *pc);
  * CT_BRACE_OPEN, CT_PAREN_OPEN or CT_SQUARE_OPEN; if pc is none of these upon
  * calling this function, then pc is returned.
  */
-chunk_t *skip_to_chunk_before_matching_brace_bracket_paren_rev(chunk_t *pc);
+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.74.0/src/combine_tools.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/combine_tools.cpp
index 9a942367..b6866e00 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/combine_tools.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/combine_tools.cpp
@@ -12,27 +12,27 @@
 #include "uncrustify.h"
 
 
-bool can_be_full_param(chunk_t *start, chunk_t *end)
+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));
-   LOG_FMT(LFPARAM, "%s(%d): end->text()   is '%s', type is %s\n",
-           __func__, __LINE__, end->text(), get_token_name(end->type));
+   LOG_FMT(LFPARAM, "%s(%d): start->Text() is '%s', type is %s\n",
+           __func__, __LINE__, start->Text(), get_token_name(start->type));
+   LOG_FMT(LFPARAM, "%s(%d): end->Text()   is '%s', type is %s\n",
+           __func__, __LINE__, end->Text(), get_token_name(end->type));
 
-   int     word_count     = 0;
-   int     type_count     = 0;
-   chunk_t *pc            = nullptr;
-   chunk_t *first_word    = nullptr;
-   bool    first_word_set = false;
+   int   word_count     = 0;
+   int   type_count     = 0;
+   Chunk *pc            = nullptr;
+   Chunk *first_word    = nullptr;
+   bool  first_word_set = false;
 
    for (pc = start;
-        pc != nullptr && pc != end;
-        pc = chunk_get_next_ncnnl(pc, scope_e::PREPROC))
+        pc != nullptr && pc->IsNotNullChunk() && pc != 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));
+      LOG_FMT(LFPARAM, "%s(%d): pc->Text() is '%s', type is %s\n",
+              __func__, __LINE__, pc->Text(), get_token_name(pc->type));
 
       if (  chunk_is_token(pc, CT_QUALIFIER)
          || chunk_is_token(pc, CT_STRUCT)
@@ -97,15 +97,15 @@ bool can_be_full_param(chunk_t *start, chunk_t *end)
               && chunk_is_token(pc, CT_PAREN_OPEN))
       {
          // Check for old-school func proto param '(type)'
-         chunk_t *tmp1 = chunk_skip_to_match(pc, scope_e::PREPROC);
+         Chunk *tmp1 = chunk_skip_to_match(pc, E_Scope::PREPROC);
 
          if (tmp1 == nullptr)
          {
             return(false);
          }
-         chunk_t *tmp2 = chunk_get_next_ncnnl(tmp1, scope_e::PREPROC);
+         Chunk *tmp2 = tmp1->GetNextNcNnl(E_Scope::PREPROC);
 
-         if (tmp2 == nullptr)
+         if (tmp2->IsNullChunk())
          {
             return(false);
          }
@@ -115,14 +115,14 @@ bool can_be_full_param(chunk_t *start, chunk_t *end)
          {
             do
             {
-               pc = chunk_get_next_ncnnl(pc, scope_e::PREPROC);
+               pc = pc->GetNextNcNnl(E_Scope::PREPROC);
 
-               if (pc == nullptr)
+               if (pc->IsNullChunk())
                {
                   return(false);
                }
-               LOG_FMT(LFPARAM, "%s(%d): pc->text() is '%s', type is %s\n",
-                       __func__, __LINE__, pc->text(), get_token_name(pc->type));
+               LOG_FMT(LFPARAM, "%s(%d): pc->Text() is '%s', type is %s\n",
+                       __func__, __LINE__, pc->Text(), get_token_name(pc->type));
             } while (pc != tmp1);
 
             // reset some vars to allow [] after parens
@@ -142,30 +142,30 @@ bool can_be_full_param(chunk_t *start, chunk_t *end)
       {
          // Check for func proto param 'void (*name)' or 'void (*name)(params)' or 'void (^name)(params)'
          // <name> can be optional
-         chunk_t *tmp1 = chunk_get_next_ncnnl(pc, scope_e::PREPROC);
+         Chunk *tmp1 = pc->GetNextNcNnl(E_Scope::PREPROC);
 
-         if (tmp1 == nullptr)
+         if (tmp1->IsNullChunk())
          {
             return(false);
          }
-         chunk_t *tmp2 = chunk_get_next_ncnnl(tmp1, scope_e::PREPROC);
+         Chunk *tmp2 = tmp1->GetNextNcNnl(E_Scope::PREPROC);
 
-         if (tmp2 == nullptr)
+         if (tmp2->IsNullChunk())
          {
             return(false);
          }
-         chunk_t *tmp3 = (chunk_is_str(tmp2, ")", 1)) ? tmp2 : chunk_get_next_ncnnl(tmp2, scope_e::PREPROC);
+         Chunk *tmp3 = (chunk_is_str(tmp2, ")")) ? tmp2 : tmp2->GetNextNcNnl(E_Scope::PREPROC);
 
-         if (tmp3 == nullptr)
+         if (tmp3->IsNullChunk())
          {
             return(false);
          }
 
-         if (  !chunk_is_str(tmp3, ")", 1)
-            || !(  chunk_is_str(tmp1, "*", 1)
-                || chunk_is_str(tmp1, "^", 1)) // Issue #2656
+         if (  !chunk_is_str(tmp3, ")")
+            || !(  chunk_is_str(tmp1, "*")
+                || chunk_is_str(tmp1, "^")) // Issue #2656
             || !(  tmp2->type == CT_WORD
-                || chunk_is_str(tmp2, ")", 1)))
+                || chunk_is_str(tmp2, ")")))
          {
             LOG_FMT(LFPARAM, "%s(%d): <== '%s' not fcn type!\n",
                     __func__, __LINE__, get_token_name(pc->type));
@@ -174,20 +174,20 @@ bool can_be_full_param(chunk_t *start, chunk_t *end)
          LOG_FMT(LFPARAM, "%s(%d): <skip fcn type>\n",
                  __func__, __LINE__);
 
-         tmp1 = chunk_get_next_ncnnl(tmp3, scope_e::PREPROC);
+         tmp1 = tmp3->GetNextNcNnl(E_Scope::PREPROC);
 
-         if (tmp1 == nullptr)
+         if (tmp1->IsNullChunk())
          {
             return(false);
          }
 
-         if (chunk_is_str(tmp1, "(", 1))
+         if (chunk_is_str(tmp1, "("))
          {
-            tmp3 = chunk_skip_to_match(tmp1, scope_e::PREPROC);
+            tmp3 = chunk_skip_to_match(tmp1, 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));
+         LOG_FMT(LFPARAM, "%s(%d): pc->Text() is '%s', type is %s\n",
+                 __func__, __LINE__, pc->Text(), get_token_name(pc->type));
 
          // reset some vars to allow [] after parens
          word_count = 1;
@@ -201,21 +201,21 @@ bool can_be_full_param(chunk_t *start, chunk_t *end)
               && chunk_is_token(pc, CT_SQUARE_OPEN))
       {
          // skip over any array stuff
-         pc = chunk_skip_to_match(pc, scope_e::PREPROC);
-         LOG_FMT(LFPARAM, "%s(%d): pc->text() is '%s', type is %s\n",
-                 __func__, __LINE__, pc->text(), get_token_name(pc->type));
+         pc = chunk_skip_to_match(pc, 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));
       }
       else if (  word_count == 2
               && chunk_is_token(pc, CT_SQUARE_OPEN))
       {
          // Bug #671: is it such as: bool foo[FOO_MAX]
-         pc = chunk_skip_to_match(pc, scope_e::PREPROC);
-         LOG_FMT(LFPARAM, "%s(%d): pc->text() is '%s', type is %s\n",
-                 __func__, __LINE__, pc->text(), get_token_name(pc->type));
+         pc = chunk_skip_to_match(pc, 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));
       }
       else if (  word_count == 1
               && language_is_set(LANG_CPP)
-              && chunk_is_str(pc, "&&", 2))
+              && chunk_is_str(pc, "&&"))
       {
          // ignore possible 'move' operator
       }
@@ -225,14 +225,14 @@ bool can_be_full_param(chunk_t *start, chunk_t *end)
                  __func__, __LINE__, get_token_name(pc->type), type_count, word_count);
          return(false);
       }
-      LOG_FMT(LFPARAM, "%s(%d): pc->text() is '%s', type is %s\n",
-              __func__, __LINE__, pc->text(), get_token_name(pc->type));
+      LOG_FMT(LFPARAM, "%s(%d): pc->Text() is '%s', type is %s\n",
+              __func__, __LINE__, pc->Text(), get_token_name(pc->type));
    }
 
-   chunk_t *last = chunk_get_prev_ncnnlni(pc);   // Issue #2279
+   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));
+   LOG_FMT(LFPARAM, "%s(%d): last->Text() is '%s', type is %s\n",
+           __func__, __LINE__, last->Text(), get_token_name(last->type));
 
    if (chunk_is_ptr_operator(last))
    {
@@ -248,17 +248,17 @@ bool can_be_full_param(chunk_t *start, chunk_t *end)
       LOG_FMT(LFPARAM, "%s(%d): !MVP!\n",
               __func__, __LINE__);
       // Oh, joy, we are in Most Vexing Parse territory
-      auto const brace =
-         chunk_get_prev_type(start, CT_BRACE_OPEN, start->brace_level - 1);
+      Chunk *brace =
+         start->GetPrevType(CT_BRACE_OPEN, start->brace_level - 1);
 
-      if (brace != nullptr)
+      if (brace->IsNotNullChunk())
       {
          LOG_FMT(LFPARAM, "%s(%d): (matching %s brace at orig_line %zu, orig_col is %zu)",
                  __func__, __LINE__,
                  get_token_name(get_chunk_parent_type(brace)), brace->orig_line, brace->orig_col);
       }
 
-      if (  brace != nullptr
+      if (  brace->IsNotNullChunk()
          && (  get_chunk_parent_type(brace) == CT_CLASS
             || get_chunk_parent_type(brace) == CT_STRUCT))
       {
@@ -269,13 +269,13 @@ bool can_be_full_param(chunk_t *start, chunk_t *end)
          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);
+   LOG_FMT(LFPARAM, "%s(%d): pc->Text() is '%s', word_count is %d, type_count is %d\n",
+           __func__, __LINE__, pc->Text(), word_count, type_count);
 
    if (first_word != nullptr)
    {
-      LOG_FMT(LFPARAM, "%s(%d): first_word->text() is '%s'\n",
-              __func__, __LINE__, first_word->text());
+      LOG_FMT(LFPARAM, "%s(%d): first_word->Text() is '%s'\n",
+              __func__, __LINE__, first_word->Text());
    }
    bool ret = (  word_count >= 2
               || (  word_count == 1
@@ -284,8 +284,8 @@ bool can_be_full_param(chunk_t *start, chunk_t *end)
    LOG_FMT(LFPARAM, "%s(%d): ret is %s\n",
            __func__, __LINE__, ret ? "TRUE" : "FALSE");
 
-   LOG_FMT(LFPARAM, "%s(%d): pc->text() is '%s', ",
-           __func__, __LINE__, pc->text());
+   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)));
 
@@ -301,26 +301,26 @@ bool can_be_full_param(chunk_t *start, chunk_t *end)
 } // can_be_full_param
 
 
-bool chunk_ends_type(chunk_t *start)
+bool chunk_ends_type(Chunk *start)
 {
    LOG_FUNC_ENTRY();
-   chunk_t *pc       = start;
-   bool    ret       = false;
-   size_t  cnt       = 0;
-   bool    last_expr = false;
-   bool    last_lval = false;
+   Chunk  *pc       = start;
+   bool   ret       = false;
+   size_t cnt       = 0;
+   bool   last_expr = false;
+   bool   last_lval = false;
 
-   bool    a = pc->flags.test(PCF_IN_FCN_CTOR);
+   bool   a = pc->flags.test(PCF_IN_FCN_CTOR);
 
    if (a)
    {
       return(false);
    }
 
-   for ( ; pc != nullptr; pc = chunk_get_prev_ncnnlni(pc)) // Issue #2279
+   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(),
+      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);
 
@@ -336,7 +336,7 @@ bool chunk_ends_type(chunk_t *start)
             && get_chunk_parent_type(pc) == CT_TEMPLATE
             && (  chunk_is_token(pc, CT_ANGLE_OPEN)
                || chunk_is_token(pc, CT_ANGLE_CLOSE)))
-         || (  language_is_set(LANG_CS)
+         || (  language_is_set(LANG_CS | LANG_VALA)
             && (chunk_is_token(pc, CT_MEMBER))))
       {
          cnt++;
@@ -376,7 +376,7 @@ bool chunk_ends_type(chunk_t *start)
       break;
    }
 
-   if (pc == nullptr)
+   if (pc->IsNullChunk())
    {
       // first token
       ret = true;
@@ -388,11 +388,11 @@ bool chunk_ends_type(chunk_t *start)
 } // chunk_ends_type
 
 
-bool chunkstack_match(ChunkStack &cs, chunk_t *pc)
+bool chunkstack_match(ChunkStack &cs, Chunk *pc)
 {
    for (size_t idx = 0; idx < cs.Len(); idx++)
    {
-      chunk_t *tmp = cs.GetChunk(idx);
+      Chunk *tmp = cs.GetChunk(idx);
 
       if (pc->str.equals(tmp->str))
       {
@@ -404,36 +404,43 @@ bool chunkstack_match(ChunkStack &cs, chunk_t *pc)
 } // chunkstack_match
 
 
-void flag_series(chunk_t *start, chunk_t *end, pcf_flags_t set_flags, pcf_flags_t clr_flags, scope_e nav)
+void flag_series(Chunk *start, Chunk *end, pcf_flags_t set_flags, pcf_flags_t clr_flags, E_Scope nav)
 {
    LOG_FUNC_ENTRY();
 
    while (  start != nullptr
+         && start->IsNotNullChunk()
          && start != end)
    {
       chunk_flags_upd(start, clr_flags, set_flags);
 
-      start = chunk_get_next(start, nav);
+      start = start->GetNext(nav);
 
-      if (start == nullptr)
+      if (start->IsNullChunk())
       {
          return;
       }
    }
 
-   if (end != nullptr)
+   if (  end != nullptr
+      && end->IsNotNullChunk())
    {
       chunk_flags_upd(end, clr_flags, set_flags);
    }
 } // flag_series
 
 
-size_t get_cpp_template_angle_nest_level(chunk_t *pc)
+size_t get_cpp_template_angle_nest_level(Chunk *pc)
 {
    LOG_FUNC_ENTRY();
    int nestLevel = 0;
 
-   while (  pc != nullptr
+   if (pc == nullptr)
+   {
+      pc = Chunk::NullChunkPtr;
+   }
+
+   while (  pc->IsNotNullChunk()
          && pc->flags.test(PCF_IN_TEMPLATE))
    {
       if (  chunk_is_token(pc, CT_ANGLE_CLOSE)
@@ -446,19 +453,19 @@ size_t get_cpp_template_angle_nest_level(chunk_t *pc)
       {
          ++nestLevel;
       }
-      pc = chunk_get_prev_ncnnlni(pc);
+      pc = pc->GetPrevNcNnlNi();
    }
    return(nestLevel <= 0 ? 0 : size_t(nestLevel));
 }
 
 
-chunk_t *get_d_template_types(ChunkStack &cs, chunk_t *open_paren)
+Chunk *get_d_template_types(ChunkStack &cs, Chunk *open_paren)
 {
    LOG_FUNC_ENTRY();
-   chunk_t *tmp       = open_paren;
-   bool    maybe_type = true;
+   Chunk *tmp       = open_paren->GetNextNcNnl();
+   bool  maybe_type = true;
 
-   while (  ((tmp = chunk_get_next_ncnnl(tmp)) != nullptr)
+   while (  tmp->IsNullChunk()
          && tmp->level > open_paren->level)
    {
       if (  chunk_is_token(tmp, CT_TYPE)
@@ -475,14 +482,16 @@ chunk_t *get_d_template_types(ChunkStack &cs, chunk_t *open_paren)
       {
          maybe_type = true;
       }
+      tmp = tmp->GetNextNcNnl();
    }
    return(tmp);
 } // get_d_template_types
 
 
-bool go_on(chunk_t *pc, chunk_t *start)
+bool go_on(Chunk *pc, Chunk *start)
 {
    if (  pc == nullptr
+      || pc->IsNullChunk()
       || pc->level != start->level)
    {
       return(false);
@@ -511,7 +520,7 @@ bool is_ucase_str(const char *str, size_t len)
 } // is_ucase_str
 
 
-void make_type(chunk_t *pc)
+void make_type(Chunk *pc)
 {
    LOG_FUNC_ENTRY();
 
@@ -521,7 +530,7 @@ void make_type(chunk_t *pc)
       {
          set_chunk_type(pc, CT_TYPE);
       }
-      else if (  (  chunk_is_star(pc)
+      else if (  (  pc->IsStar()
                  || chunk_is_msref(pc)
                  || chunk_is_nullable(pc))
               && chunk_is_type(pc->prev))                              // Issue # 2640
@@ -537,23 +546,25 @@ void make_type(chunk_t *pc)
 } // make_type
 
 
-chunk_t *set_paren_parent(chunk_t *start, c_token_t parent)
+Chunk *set_paren_parent(Chunk *start, E_Token parent)
 {
    LOG_FUNC_ENTRY();
-   chunk_t *end;
+   Chunk *end;
 
-   end = chunk_skip_to_match(start, scope_e::PREPROC);
+   end = chunk_skip_to_match(start, E_Scope::PREPROC);
 
    if (end != nullptr)
    {
       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(),
+              __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_func_stack_inline(LFLPAREN);
       set_chunk_parent(start, parent);
       set_chunk_parent(end, parent);
+      LOG_FMT(LFLPAREN, "%s(%d):\n", __func__, __LINE__);
+      return(end->GetNextNcNnl(E_Scope::PREPROC));
    }
    LOG_FMT(LFLPAREN, "%s(%d):\n", __func__, __LINE__);
-   return(chunk_get_next_ncnnl(end, scope_e::PREPROC));
+   return(nullptr);
 } // set_paren_parent
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/combine_tools.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/combine_tools.h
index f7f83d12..40ea915f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/combine_tools.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/combine_tools.h
@@ -9,7 +9,7 @@
 #ifndef COMBINE_TOOLS_H_INCLUDED
 #define COMBINE_TOOLS_H_INCLUDED
 
-#include "chunk_list.h"
+#include "chunk.h"
 #include "ChunkStack.h"
 
 /**
@@ -33,14 +33,14 @@
  * @param start  the first chunk to look at
  * @param end    the chunk after the last one to look at
  */
-bool can_be_full_param(chunk_t *start, chunk_t *end);
+bool can_be_full_param(Chunk *start, Chunk *end);
 
 
 //! Scan backwards to see if we might be on a type declaration
-bool chunk_ends_type(chunk_t *start);
+bool chunk_ends_type(Chunk *start);
 
 
-bool chunkstack_match(ChunkStack &cs, chunk_t *pc);
+bool chunkstack_match(ChunkStack &cs, Chunk *pc);
 
 
 ///**
@@ -48,10 +48,10 @@ bool chunkstack_match(ChunkStack &cs, chunk_t *pc);
 // *
 // * @param start  points to the open paren
 // */
-void fix_fcn_def_params(chunk_t *pc);
+void fix_fcn_def_params(Chunk *pc);
 
 
-void flag_series(chunk_t *start, chunk_t *end, pcf_flags_t set_flags, pcf_flags_t clr_flags = {}, scope_e nav = scope_e::ALL);
+void flag_series(Chunk *start, Chunk *end, pcf_flags_t set_flags, pcf_flags_t clr_flags = {}, E_Scope nav = E_Scope::ALL);
 
 
 /*
@@ -60,26 +60,26 @@ void flag_series(chunk_t *start, chunk_t *end, pcf_flags_t set_flags, pcf_flags_
  * with respect to the root parent template; returns 0 if
  * the chunk is not part of a template parameter list
  */
-size_t get_cpp_template_angle_nest_level(chunk_t *pc);
+size_t get_cpp_template_angle_nest_level(Chunk *pc);
 
 
 /**
  * Parse off the types in the D template args, adds to cs
  * returns the close_paren
  */
-chunk_t *get_d_template_types(ChunkStack &cs, chunk_t *open_paren);
+Chunk *get_d_template_types(ChunkStack &cs, Chunk *open_paren);
 
 
 //! help function for mark_variable_definition...
-bool go_on(chunk_t *pc, chunk_t *start);
+bool go_on(Chunk *pc, Chunk *start);
 
 
 bool is_ucase_str(const char *str, size_t len);
 
 
-void make_type(chunk_t *pc);
+void make_type(Chunk *pc);
 
-chunk_t *set_paren_parent(chunk_t *start, c_token_t parent);
+Chunk *set_paren_parent(Chunk *start, E_Token parent);
 
 
 #endif /* COMBINE_TOOLS_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/compat.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/compat.h
index 32fce459..32fce459 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/compat.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/compat.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/compat_posix.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/compat_posix.cpp
index c77c7a89..c77c7a89 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/compat_posix.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/compat_posix.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/compat_win32.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/compat_win32.cpp
index d7292466..e1617876 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/compat_win32.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/compat_win32.cpp
@@ -36,7 +36,7 @@ bool unc_getenv(const char *name, std::string &str)
    buf[len] = 0;
 
    str = buf;
-   //printf("%s: name=%s len=%d value=%s\n", __func__, name, (int)len, str.c_str());
+   //printf("%s: name=%s len=%zu value=%s\n", __func__, name, len, str.c_str());
    free(buf);
 
    return(true);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/config.h.in b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/config.h.in
index 4270a733..4270a733 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/config.h.in
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/config.h.in
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/cs_top_is_question.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/cs_top_is_question.cpp
index d358912c..4fd2fd66 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/cs_top_is_question.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/cs_top_is_question.cpp
@@ -8,12 +8,12 @@
 
 #include "cs_top_is_question.h"
 
-#include "chunk_list.h"
+#include "chunk.h"
 
 
 bool cs_top_is_question(ChunkStack &cs, size_t level)
 {
-   chunk_t *pc = cs.Empty() ? nullptr : cs.Top()->m_pc;
+   Chunk *pc = cs.Empty() ? nullptr : cs.Top()->m_pc;
 
    return(  chunk_is_token(pc, CT_QUESTION)
          && pc->level == level);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/cs_top_is_question.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/cs_top_is_question.h
index de6ace3e..de6ace3e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/cs_top_is_question.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/cs_top_is_question.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/detect.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/detect.cpp
index f3629e9f..b7fc17ca 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/detect.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/detect.cpp
@@ -34,11 +34,11 @@ public:
    //! Figure out the result of the vote and maybe update *m_av
    ~sp_votes();
 
-   void vote(chunk_t *first, chunk_t *second);
+   void vote(Chunk *first, Chunk *second);
 };
 
 
-void sp_votes::vote(chunk_t *first, chunk_t *second)
+void sp_votes::vote(Chunk *first, Chunk *second)
 {
    if (  first == nullptr
       || chunk_is_newline(first)
@@ -47,7 +47,7 @@ void sp_votes::vote(chunk_t *first, chunk_t *second)
    {
       return;
    }
-   int col_dif = second->column - (first->column + first->len());
+   int col_dif = second->column - (first->column + first->Len());
 
    if (col_dif == 0)
    {
@@ -148,15 +148,15 @@ static void detect_space_options(void)
    SP_VOTE_VAR(sp_try_brace);
    SP_VOTE_VAR(sp_getset_brace);
 
-   chunk_t *prev = chunk_get_head();
-   chunk_t *pc   = chunk_get_next(prev);
-   chunk_t *next;
+   Chunk *prev = Chunk::GetHead();
+   Chunk *pc   = prev->GetNext();
+   Chunk *next;
 
-   while (pc != nullptr)
+   while (pc->IsNotNullChunk())
    {
-      next = chunk_get_next(pc);
+      next = pc->GetNext();
 
-      if (next == nullptr)
+      if (next->IsNullChunk())
       {
          break;
       }
@@ -357,7 +357,7 @@ static void detect_space_options(void)
          }
          else if (chunk_is_token(prev, CT_VBRACE_OPEN))
          {
-            vote_sp_special_semi.vote(chunk_get_prev(prev), pc);
+            vote_sp_special_semi.vote(prev->GetPrev(), pc);
          }
          else
          {
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/detect.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/detect.h
index 5c6ec1e2..5c6ec1e2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/detect.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/detect.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/enum_cleanup.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/enum_cleanup.cpp
new file mode 100644
index 00000000..f91a1a2a
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/enum_cleanup.cpp
@@ -0,0 +1,96 @@
+/**
+ * @file enum_cleanup.cpp
+ * works on the last comma withing enum
+ *
+ * @author  Guy Maurel Juli 2018
+ * @license GPL v2+
+ */
+
+#include "enum_cleanup.h"
+
+#include "log_rules.h"
+
+constexpr static auto LCURRENT = LTOK;
+
+using namespace uncrustify;
+
+
+void enum_cleanup(void)
+{
+   LOG_FUNC_ENTRY();
+
+   log_rule_B("mod_enum_last_comma");
+
+   if (options::mod_enum_last_comma() == IARF_IGNORE)
+   {
+      // nothing to do
+      return;
+   }
+   Chunk *pc = Chunk::GetHead();  // Issue #858
+
+   while (pc->IsNotNullChunk())
+   {
+      if (  get_chunk_parent_type(pc) == CT_ENUM
+         && chunk_is_token(pc, 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));
+         Chunk *prev = pc->GetPrevNcNnl();                           // Issue #3604
+
+         if (  prev != nullptr
+            && prev->IsNotNullChunk())
+         {
+            if (chunk_is_token(prev, CT_COMMA))
+            {
+               log_rule_B("mod_enum_last_comma");
+
+               if (options::mod_enum_last_comma() == IARF_REMOVE)
+               {
+                  chunk_del(prev);
+               }
+            }
+            else
+            {
+               if (chunk_is_token(prev, CT_BRACE_OPEN))                // Issue #2902
+               {
+                  // nothing between CT_BRACE_OPEN and CT_BRACE_CLOSE
+               }
+               else
+               {
+                  log_rule_B("mod_enum_last_comma");
+
+                  if (  options::mod_enum_last_comma() == IARF_ADD
+                     || options::mod_enum_last_comma() == IARF_FORCE)
+                  {
+                     // 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       = ",";
+
+                     if (chunk_is_token(prev, CT_PP_ENDIF))                // Issue #3604
+                     {
+                        prev = prev->GetPrevNcNnlNpp();
+                     }
+
+                     if (chunk_is_token(prev, CT_COMMA))                   // Issue #3604
+                     {
+                        // nothing to do
+                     }
+                     else
+                     {
+                        chunk_add_after(&comma, prev);
+                     }
+                     pc = pc->GetNext();
+                  }
+               }
+            }
+         }
+      }
+      pc = pc->GetNext();
+   }
+} // enum_cleanup
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/enum_cleanup.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/enum_cleanup.h
index 3853c8ea..3853c8ea 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/enum_cleanup.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/enum_cleanup.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/enum_flags.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/enum_flags.h
index badd8226..badd8226 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/enum_flags.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/enum_flags.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/error_types.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/error_types.h
index f0ebb502..4b162768 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/error_types.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/error_types.h
@@ -45,7 +45,8 @@
 #define EX__MAX           78   //! maximum listed value
 
 #else // not WIN32 or not __QNXNTO__
-// TODO: do all non windows systems know sysexits.h, Linux probably not?
+// TODO: do all non windows systems know sysexits.h?
+//       Linux knows: /usr/include/sysexits.h
 #include "sysexits.h"      // comes from BSD
 #endif
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/flag_braced_init_list.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/flag_braced_init_list.cpp
index 7e5badac..8a5cbf3f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/flag_braced_init_list.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/flag_braced_init_list.cpp
@@ -4,14 +4,14 @@
  * @license GPL v2+
  */
 
-#include "chunk_list.h"
+#include "chunk.h"
 
 #include "flag_braced_init_list.h"
 
 #include "uncrustify.h"
 
 
-bool detect_cpp_braced_init_list(chunk_t *pc, chunk_t *next)
+bool detect_cpp_braced_init_list(Chunk *pc, Chunk *next)
 {
    LOG_FUNC_ENTRY();
    // Issue #2332
@@ -20,13 +20,13 @@ bool detect_cpp_braced_init_list(chunk_t *pc, chunk_t *next)
    if (chunk_is_token(pc, CT_COLON))
    {
       // check if we have a case before
-      chunk_t *switch_before = chunk_get_prev_type(pc, CT_CASE, pc->level);
+      Chunk *switch_before = pc->GetPrevType(CT_CASE, pc->level);
 
-      if (switch_before != nullptr)
+      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",
+         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));
+                 switch_before->Text(), get_token_name(switch_before->type));
          we_have_a_case_before = true;
       }
    }
@@ -48,8 +48,10 @@ bool detect_cpp_braced_init_list(chunk_t *pc, chunk_t *next)
          && (  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 = chunk_get_next_ncnnl(pc);
+      auto brace_open = pc->GetNextNcNnl();
 
       if (  chunk_is_token(brace_open, CT_BRACE_OPEN)
          && (  get_chunk_parent_type(brace_open) == CT_NONE
@@ -70,17 +72,17 @@ bool detect_cpp_braced_init_list(chunk_t *pc, chunk_t *next)
 } // detect_cpp_braced_init_list
 
 
-void flag_cpp_braced_init_list(chunk_t *pc, chunk_t *next)
+void flag_cpp_braced_init_list(Chunk *pc, Chunk *next)
 {
-   auto brace_open  = chunk_get_next_ncnnl(pc);
+   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 = chunk_get_next_ncnnl(brace_close);
+   auto *tmp = brace_close->GetNextNcNnl();
 
-   if (tmp != nullptr)
+   if (tmp->IsNotNullChunk())
    {
       chunk_flags_clr(tmp, PCF_EXPR_START | PCF_STMT_START);
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/flag_braced_init_list.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/flag_braced_init_list.h
index 4500a260..8d89dd08 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/flag_braced_init_list.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/flag_braced_init_list.h
@@ -11,7 +11,7 @@
 /**
  * Detect a cpp braced init list
  */
-bool detect_cpp_braced_init_list(chunk_t *pc, chunk_t *next);
+bool detect_cpp_braced_init_list(Chunk *pc, Chunk *next);
 
 
 /**
@@ -19,7 +19,7 @@ bool detect_cpp_braced_init_list(chunk_t *pc, chunk_t *next);
  * a cpp braced initializer list; a call to detect_cpp_braced_init_list()
  * should first be made prior to calling this function
  */
-void flag_cpp_braced_init_list(chunk_t *pc, chunk_t *next);
+void flag_cpp_braced_init_list(Chunk *pc, Chunk *next);
 
 
 #endif
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/flag_decltype.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/flag_decltype.cpp
new file mode 100644
index 00000000..a3036f81
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/flag_decltype.cpp
@@ -0,0 +1,46 @@
+/**
+ * @file flag_decltype.cpp
+ *
+ * @license GPL v2+
+ */
+
+#include "chunk.h"
+
+
+bool flag_cpp_decltype(Chunk *pc)
+{
+   LOG_FUNC_ENTRY();
+
+   if (chunk_is_token(pc, CT_DECLTYPE))
+   {
+      auto paren_open = pc->GetNextNcNnl();
+
+      if (chunk_is_token(paren_open, CT_PAREN_OPEN))
+      {
+         // We would like to simply call chunk_skip_to_match(), but it finds
+         // a match based on level, and the level is 0 for all chunks in some
+         // cases, like the following example.
+         //
+         // template <typename T>
+         // decltype(std::declval<T &>().put(foo), std::true_type())
+         // has_something(Tag<2>);
+         //
+         // This means that IN_DECLTYPE is only set for tokens through the
+         // 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);
+         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);
+         }
+
+         return(pc->IsNotNullChunk());
+      }
+   }
+   return(false);
+} // mark_cpp_decltype
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/flag_decltype.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/flag_decltype.h
index f6946575..80677c8e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/flag_decltype.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/flag_decltype.h
@@ -14,7 +14,7 @@
  *
  * @return Returns true if expression is a valid decltype expression
  */
-bool flag_cpp_decltype(chunk_t *pc);
+bool flag_cpp_decltype(Chunk *pc);
 
 
 #endif
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/flag_parens.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/flag_parens.cpp
index c0983745..0f881553 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/flag_parens.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/flag_parens.cpp
@@ -10,30 +10,30 @@
 #include "uncrustify.h"
 
 
-chunk_t *flag_parens(chunk_t *po, pcf_flags_t flags, c_token_t opentype, c_token_t parenttype, bool parent_all)
+Chunk *flag_parens(Chunk *po, pcf_flags_t flags, E_Token opentype, E_Token parenttype, bool parent_all)
 {
    LOG_FUNC_ENTRY();
-   chunk_t *paren_close;
+   Chunk *paren_close;
 
-   paren_close = chunk_skip_to_match(po, scope_e::PREPROC);
+   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);
+              __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);
+           __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,
+           __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_t *after_paren_close = chunk_get_next(paren_close);
+   Chunk *after_paren_close = paren_close->GetNext();
 
    if (po != paren_close)
    {
@@ -41,11 +41,11 @@ chunk_t *flag_parens(chunk_t *po, pcf_flags_t flags, c_token_t opentype, c_token
          || (  parent_all
             && parenttype != CT_NONE))
       {
-         chunk_t *pc;
+         Chunk *pc;
 
-         for (pc = chunk_get_next(po, scope_e::PREPROC);
-              pc != nullptr && pc != after_paren_close;
-              pc = chunk_get_next(pc, scope_e::PREPROC))
+         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);
 
@@ -59,7 +59,7 @@ chunk_t *flag_parens(chunk_t *po, pcf_flags_t flags, c_token_t opentype, c_token
       if (opentype != CT_NONE)
       {
          set_chunk_type(po, opentype);
-         set_chunk_type(paren_close, (c_token_t)(opentype + 1));
+         set_chunk_type(paren_close, (E_Token)(opentype + 1));
       }
 
       if (parenttype != CT_NONE)
@@ -68,5 +68,5 @@ chunk_t *flag_parens(chunk_t *po, pcf_flags_t flags, c_token_t opentype, c_token
          set_chunk_parent(paren_close, parenttype);
       }
    }
-   return(chunk_get_next_ncnnl(paren_close, scope_e::PREPROC));
+   return(paren_close->GetNextNcNnl(E_Scope::PREPROC));
 } // flag_parens
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/flag_parens.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/flag_parens.h
index 5c4d1e43..a093886c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/flag_parens.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/flag_parens.h
@@ -8,7 +8,7 @@
 #ifndef FLAG_PARENS_H_INCLUDED
 #define FLAG_PARENS_H_INCLUDED
 
-#include "chunk_list.h"
+#include "chunk.h"
 
 
 /**
@@ -22,7 +22,7 @@
  *
  * @return The token after the close paren
  */
-chunk_t *flag_parens(chunk_t *po, pcf_flags_t flags, c_token_t opentype, c_token_t parenttype, bool parent_all);
+Chunk *flag_parens(Chunk *po, pcf_flags_t flags, E_Token opentype, E_Token parenttype, bool parent_all);
 
 
 #endif /* FLAG_PARENS_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/frame_list.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/frame_list.cpp
index 82bc3781..36c11020 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/frame_list.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/frame_list.cpp
@@ -148,15 +148,15 @@ void fl_pop(std::vector<ParseFrame> &frames, ParseFrame &pf)
 }
 
 
-int fl_check(std::vector<ParseFrame> &frames, ParseFrame &frm, int &pp_level, chunk_t *pc)
+int fl_check(std::vector<ParseFrame> &frames, ParseFrame &frm, int &pp_level, Chunk *pc)
 {
    if (pc->type != CT_PREPROC)
    {
       return(pp_level);
    }
-   chunk_t *next = chunk_get_next(pc);
+   Chunk *next = pc->GetNext();
 
-   if (next == nullptr)
+   if (next->IsNullChunk())
    {
       return(pp_level);
    }
@@ -173,11 +173,11 @@ int fl_check(std::vector<ParseFrame> &frames, ParseFrame &frm, int &pp_level, ch
    fl_log_frms(LPFCHK, "TOP", frm, frames);
 
 
-   int             out_pp_level = pp_level;
-   const c_token_t in_ifdef     = frm.in_ifdef;
-   const size_t    b4_cnt       = frames.size();
+   int           out_pp_level = pp_level;
+   const E_Token in_ifdef     = frm.in_ifdef;
+   const size_t  b4_cnt       = frames.size();
 
-   const char      *txt = nullptr;
+   const char    *txt = nullptr;
 
    if (pc->flags.test(PCF_IN_PREPROC))
    {
@@ -210,16 +210,45 @@ int fl_check(std::vector<ParseFrame> &frames, ParseFrame &frm, int &pp_level, ch
           * pop and then push.
           * We need to use the copy right before the if.
           */
+         bool if_block = false;
+
          if (frm.in_ifdef == CT_PP_IF)
          {
             // we have [...] [base]-[if], so push an [else]
             fl_push(frames, frm);
             frm.in_ifdef = CT_PP_ELSE;
+            if_block     = true;
          }
+         size_t brace_level = frm.brace_level;
          // we have [...] [base] [if]-[else], copy [base] over [else]
          fl_copy_2nd_tos(frm, frames);
          frm.in_ifdef = CT_PP_ELSE;
-         txt          = "else-push";
+
+         if (if_block)
+         {
+            // check if #if block was unbalanced
+            size_t base_brace_level = frames[frames.size() - 2].brace_level;
+
+            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);
+            }
+         }
+         else
+         {
+            // check if previous #else block has a different indentation than the corresponding #if block
+            size_t if_brace_level = frames[frames.size() - 1].brace_level;
+
+            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);
+            }
+         }
+         txt = "else-push";
       }
       else if (get_chunk_parent_type(pc) == CT_PP_ENDIF)
       {
@@ -248,11 +277,19 @@ int fl_check(std::vector<ParseFrame> &frames, ParseFrame &frm, int &pp_level, ch
 
          if (frm.in_ifdef == CT_PP_ELSE)
          {
+            size_t brace_level = frm.brace_level; // brace level or current #else block
             /*
              * We have: [...] [base] [if]-[else]
              * We want: [...]-[if]
              */
-            fl_copy_tos(frm, frames);     // [...] [base] [if]-[if]
+            fl_copy_tos(frm, frames);             // [...] [base] [if]-[if]
+
+            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);
+            }
 
             if (frames.size() < 2)
             {
@@ -273,7 +310,16 @@ int fl_check(std::vector<ParseFrame> &frames, ParseFrame &frm, int &pp_level, ch
              * We have: [...] [base] [if]
              * We want: [...] [base]
              */
+            // check if #if block was unbalanced
+            size_t brace_level = frm.brace_level;
             fl_pop(frames, frm);
+
+            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);
+            }
             txt = "endif-pop";
          }
          else
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/frame_list.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/frame_list.h
index eef2f00d..5fd09a52 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/frame_list.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/frame_list.h
@@ -34,7 +34,7 @@ void fl_pop(std::vector<ParseFrame> &frames, ParseFrame &pf);
 // - what is it checking?
 // - why does is much more than simple checks, it allters kinds of stuff
 //! Returns the pp_indent to use for this line
-int fl_check(std::vector<ParseFrame> &frames, ParseFrame &frm, int &pp_level, chunk_t *pc);
+int fl_check(std::vector<ParseFrame> &frames, ParseFrame &frm, int &pp_level, Chunk *pc);
 
 
 #endif /* PARSE_FRAME_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/indent.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/indent.cpp
index 0006ff1d..e23dc25c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/indent.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/indent.cpp
@@ -20,6 +20,10 @@
 #include <algorithm>                   // to get max
 #endif // ifdef WIN32
 
+#ifdef IGNORE // WinBase.h
+#undef IGNORE
+#endif
+
 
 constexpr static auto LCURRENT = LINDENT;
 
@@ -157,10 +161,10 @@ using namespace uncrustify;
  * @param pc   The comment, which is the first item on a line
  * @param col  The column if this is to be put at indent level
  */
-static void indent_comment(chunk_t *pc, size_t col);
+static void indent_comment(Chunk *pc, size_t col);
 
 
-static size_t token_indent(c_token_t type);
+static size_t token_indent(E_Token type);
 
 
 static size_t calc_indent_continue(const ParseFrame &frm, size_t pse_tos);
@@ -168,13 +172,13 @@ static size_t calc_indent_continue(const ParseFrame &frm, size_t pse_tos);
 /**
  * Get candidate chunk first on line to which OC blocks can be indented against.
  */
-static chunk_t *candidate_chunk_first_on_line(chunk_t *pc);
+static Chunk *candidate_chunk_first_on_line(Chunk *pc);
 
 /**
  * We are on a '{' that has parent = OC_BLOCK_EXPR
  * find the column of the param tag
  */
-static chunk_t *oc_msg_block_indent(chunk_t *pc, bool from_brace, bool from_caret, bool from_colon, bool from_keyword);
+static Chunk *oc_msg_block_indent(Chunk *pc, bool from_brace, bool from_caret, bool from_colon, bool from_keyword);
 
 
 /**
@@ -182,16 +186,16 @@ static chunk_t *oc_msg_block_indent(chunk_t *pc, bool from_brace, bool from_care
  * stops when hits code
  * false if next thing hit is a closing brace, also if 2 newlines in a row
  */
-static bool single_line_comment_indent_rule_applies(chunk_t *start, bool forward);
+static bool single_line_comment_indent_rule_applies(Chunk *start, bool forward);
 
 /**
  * returns true if semicolon on the same level ends any assign operations
  * false if next thing hit is not the end of an assign operation
  */
-static bool is_end_of_assignment(chunk_t *pc, const ParseFrame &frm);
+static bool is_end_of_assignment(Chunk *pc, const ParseFrame &frm);
 
 
-void indent_to_column(chunk_t *pc, size_t column)
+void indent_to_column(Chunk *pc, size_t column)
 {
    LOG_FUNC_ENTRY();
 
@@ -211,7 +215,15 @@ enum class align_mode_e : unsigned int
 };
 
 
-void align_to_column(chunk_t *pc, size_t column)
+enum class indent_mode_e : int
+{
+   INDENT = 0,   //! indent by one level
+   ALIGN  = 1,   //! align under the open brace/parenthesis
+   IGNORE = -1,  //! preserve original indentation
+};
+
+
+void align_to_column(Chunk *pc, size_t column)
 {
    LOG_FUNC_ENTRY();
 
@@ -220,8 +232,8 @@ void align_to_column(chunk_t *pc, size_t column)
    {
       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(),
+   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);
 
    const auto col_delta = static_cast<int>(column) - static_cast<int>(pc->column);
@@ -231,9 +243,9 @@ void align_to_column(chunk_t *pc, size_t column)
 
    do
    {
-      auto *next = chunk_get_next(pc);
+      auto *next = pc->GetNext();
 
-      if (next == nullptr)
+      if (next->IsNullChunk())
       {
          break;
       }
@@ -245,7 +257,7 @@ void align_to_column(chunk_t *pc, size_t column)
 
       auto almod = align_mode_e::SHIFT;
 
-      if (  chunk_is_comment(pc)
+      if (  pc->IsComment()
          && get_chunk_parent_type(pc) != CT_COMMENT_EMBED)
       {
          log_rule_B("indent_relative_single_line_comments");
@@ -279,19 +291,19 @@ void align_to_column(chunk_t *pc, size_t column)
               __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);
-   } while (  pc != nullptr
+              pc->Text(), get_token_name(pc->type), pc->orig_line, pc->column, pc->orig_col);
+   } while (  pc->IsNotNullChunk()
            && pc->nl_count == 0);
 } // align_to_column
 
 
-void reindent_line(chunk_t *pc, size_t column)
+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->elided_text(copy),
+           __func__, __LINE__, pc->orig_line, pc->orig_col, pc->ElidedText(copy),
            get_token_name(pc->type), get_token_name(get_chunk_parent_type(pc)),
            column);
    log_func_stack_inline(LINDLINE);
@@ -327,9 +339,9 @@ void reindent_line(chunk_t *pc, size_t column)
             save_set_options_for_QT(pc->level);
          }
       }
-      chunk_t *next = chunk_get_next(pc);
+      Chunk *next = pc->GetNext();
 
-      if (next == nullptr)
+      if (next->IsNullChunk())
       {
          break;
       }
@@ -342,7 +354,7 @@ void reindent_line(chunk_t *pc, size_t column)
       min_col += space_col_align(pc, next);
       pc       = next;
 
-      const bool is_comment = chunk_is_comment(pc);
+      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)
@@ -369,16 +381,16 @@ void reindent_line(chunk_t *pc, size_t column)
          }
          else
          {
-            LOG_FMT(LINDLINED, "'%s'", pc->text());
+            LOG_FMT(LINDLINED, "'%s'", pc->Text());
          }
          LOG_FMT(LINDLINED, " to %zu (orig %zu)\n", pc->column, pc->orig_col);
       }
-   } while (  pc != nullptr
+   } while (  pc->IsNotNullChunk()
            && pc->nl_count == 0);
 } // reindent_line
 
 
-static size_t token_indent(c_token_t type)
+static size_t token_indent(E_Token type)
 {
    switch (type)
    {
@@ -417,6 +429,24 @@ static size_t token_indent(c_token_t type)
    } while (false)
 
 
+static size_t get_indent_first_continue(Chunk *pc)
+{
+   log_rule_B("indent_ignore_first_continue");
+   Chunk *continuation = pc->GetNextType(CT_NEWLINE, pc->level);
+
+   if (continuation->IsNotNullChunk())
+   {
+      continuation = continuation->GetNext();
+
+      if (continuation->IsNotNullChunk())
+      {
+         return(continuation->orig_col);
+      }
+   }
+   return(0);
+}
+
+
 static size_t calc_indent_continue(const ParseFrame &frm, size_t pse_tos)
 {
    log_rule_B("indent_continue");
@@ -437,9 +467,9 @@ static size_t calc_indent_continue(const ParseFrame &frm)
 }
 
 
-static chunk_t *candidate_chunk_first_on_line(chunk_t *pc)
+static Chunk *candidate_chunk_first_on_line(Chunk *pc)
 {
-   chunk_t *first = chunk_first_on_line(pc);
+   Chunk *first = chunk_first_on_line(pc);
 
    log_rule_B("indent_inside_ternary_operator");
 
@@ -447,7 +477,7 @@ static chunk_t *candidate_chunk_first_on_line(chunk_t *pc)
       && (  chunk_is_token(first, CT_QUESTION)
          || chunk_is_token(first, CT_COND_COLON)))
    {
-      return(chunk_get_next_ncnnl(first));
+      return(first->GetNextNcNnl());
    }
    else
    {
@@ -456,12 +486,17 @@ static chunk_t *candidate_chunk_first_on_line(chunk_t *pc)
 }
 
 
-static chunk_t *oc_msg_block_indent(chunk_t *pc, bool from_brace,
-                                    bool from_caret, bool from_colon,
-                                    bool from_keyword)
+static Chunk *oc_msg_block_indent(Chunk *pc, bool from_brace,
+                                  bool from_caret, bool from_colon,
+                                  bool from_keyword)
 {
    LOG_FUNC_ENTRY();
-   chunk_t *tmp = chunk_get_prev_nc(pc);
+   Chunk *tmp = Chunk::NullChunkPtr;
+
+   if (pc != nullptr)
+   {
+      tmp = pc->GetPrevNc();
+   }
 
    if (from_brace)
    {
@@ -471,37 +506,37 @@ static chunk_t *oc_msg_block_indent(chunk_t *pc, bool from_brace,
    // Skip to open paren in ':^TYPE *(ARGS) {'
    if (chunk_is_paren_close(tmp))
    {
-      tmp = chunk_get_prev_nc(chunk_skip_to_match_rev(tmp));
+      tmp = chunk_skip_to_match_rev(tmp)->GetPrevNc();
    }
 
    // // Check for star in ':^TYPE *(ARGS) {'. Issue 2477
    if (chunk_is_token(tmp, CT_PTR_TYPE))
    {
-      tmp = chunk_get_prev_nc(tmp);
+      tmp = tmp->GetPrevNc();
    }
 
    // Check for type in ':^TYPE *(ARGS) {'. Issue 2482
    if (chunk_is_token(tmp, CT_TYPE))
    {
-      tmp = chunk_get_prev_nc(tmp);
+      tmp = tmp->GetPrevNc();
    }
    // Check for caret in ':^TYPE *(ARGS) {'
    // Store the caret position
-   chunk_t *caret_tmp = nullptr;
+   Chunk *caret_tmp = Chunk::NullChunkPtr;
 
-   if (  tmp != nullptr
+   if (  tmp->IsNotNullChunk()
       && tmp->type == CT_OC_BLOCK_CARET)
    {
       caret_tmp = tmp;
    }
    else
    {
-      caret_tmp = chunk_get_prev_type(tmp, CT_OC_BLOCK_CARET, -1);
+      caret_tmp = tmp->GetPrevType(CT_OC_BLOCK_CARET, -1);
       tmp       = caret_tmp;
    }
 
    // If we still cannot find caret then return first chunk on the line
-   if (  tmp == nullptr
+   if (  tmp->IsNullChunk()
       || tmp->type != CT_OC_BLOCK_CARET)
    {
       return(candidate_chunk_first_on_line(pc));
@@ -511,12 +546,12 @@ static chunk_t *oc_msg_block_indent(chunk_t *pc, bool from_brace,
    {
       return(tmp);
    }
-   tmp = chunk_get_prev_nc(tmp);
+   tmp = tmp->GetPrevNc();
 
    // Check for colon in ':^TYPE *(ARGS) {'
    if (from_colon)
    {
-      if (  tmp == nullptr
+      if (  tmp->IsNullChunk()
          || tmp->type != CT_OC_COLON)
       {
          return(candidate_chunk_first_on_line(pc));
@@ -526,11 +561,11 @@ static chunk_t *oc_msg_block_indent(chunk_t *pc, bool from_brace,
          return(tmp);
       }
    }
-   tmp = chunk_get_prev_nc(tmp);
+   tmp = tmp->GetPrevNc();
 
    if (from_keyword)
    {
-      if (  tmp == nullptr
+      if (  tmp->IsNullChunk()
          || (  tmp->type != CT_OC_MSG_NAME
             && tmp->type != CT_OC_MSG_FUNC))
       {
@@ -587,13 +622,13 @@ static void quick_indent_again(void)
 {
    LOG_FUNC_ENTRY();
 
-   for (chunk_t *pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next(pc))
+   for (Chunk *pc = Chunk::GetHead(); pc->IsNotNullChunk(); pc = pc->GetNext())
    {
       if (pc->indent.ref == nullptr)
       {
          continue;
       }
-      chunk_t *tmp = chunk_get_prev(pc);
+      Chunk *tmp = pc->GetPrev();
 
       if (!chunk_is_newline(tmp))
       {
@@ -603,8 +638,8 @@ static void quick_indent_again(void)
       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,
+              __func__, __LINE__, pc->orig_line, pc->Text(), col,
+              pc->indent.ref->Text(), pc->indent.ref->orig_line,
               pc->indent.ref->column);
    }
 }
@@ -629,11 +664,14 @@ void indent_text(void)
    ParseFrame              frm{};
 
 
-   chunk_t *pc        = chunk_get_head();
-   bool    classFound = false;                               // Issue #672
+   Chunk *pc        = Chunk::GetHead();
+   bool  classFound = false;                                 // Issue #672
 
-   while (pc != nullptr)
+   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());
       //  forces string literal to column-1 [Fix for 1246]
       log_rule_B("indent_col1_multi_string_literal");
 
@@ -641,14 +679,14 @@ void indent_text(void)
          && !(cpd.lang_flags & LANG_OC)                      // Issue #1795
          && options::indent_col1_multi_string_literal())
       {
-         string str = pc->text();
+         string str = pc->Text();
 
          if (  (str[0] == '@')
-            && (chunk_get_prev(pc)->type == CT_NEWLINE))
+            && (pc->GetPrev()->type == CT_NEWLINE))
          {
             indent_column_set(1);
             reindent_line(pc, indent_column);
-            pc          = chunk_get_next(pc);
+            pc          = pc->GetNext();
             did_newline = false;
          }
       }
@@ -667,14 +705,14 @@ void indent_text(void)
       {
          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->elided_text(copy));
+                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->column, pc->ElidedText(copy));
          log_pcf_flags(LINDLINE, pc->flags);
       }
       log_rule_B("use_options_overriding_for_qt_macros");
 
       if (  options::use_options_overriding_for_qt_macros()
-         && (  strcmp(pc->text(), "SIGNAL") == 0
-            || strcmp(pc->text(), "SLOT") == 0))
+         && (  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));
@@ -691,11 +729,11 @@ void indent_text(void)
       {
          if (!in_func_def)
          {
-            chunk_t *next = chunk_get_next_ncnnl(pc);
+            Chunk *next = pc->GetNextNcNnl();
 
             if (  get_chunk_parent_type(pc) == CT_FUNC_DEF
                || (  chunk_is_token(pc, CT_COMMENT)
-                  && next != nullptr
+                  && next->IsNotNullChunk()
                   && get_chunk_parent_type(next) == CT_FUNC_DEF))
             {
                in_func_def = true;
@@ -707,15 +745,15 @@ void indent_text(void)
          }
          else
          {
-            chunk_t *prev = chunk_get_prev(pc);
+            Chunk *prev = pc->GetPrev();
 
             if (  chunk_is_token(prev, CT_BRACE_CLOSE)
                && get_chunk_parent_type(prev) == 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));
-               frm.pop(__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));
+               frm.pop(__func__, __LINE__, pc);
             }
          }
       }
@@ -727,10 +765,10 @@ void indent_text(void)
          while (  !frm.empty()
                && frm.top().in_preproc)
          {
-            const c_token_t type = frm.top().type;
-            LOG_FMT(LINDLINE, "%s(%d): pc->orig_line is %zu, orig_col is %zu, text() is '%s', type is %s\n",
-                    __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
-            frm.pop(__func__, __LINE__);
+            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));
+            frm.pop(__func__, __LINE__, pc);
 
             /*
              * If we just removed an #endregion, then check to see if a
@@ -739,9 +777,9 @@ 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));
-               frm.pop(__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));
+               frm.pop(__func__, __LINE__, pc);
             }
          }
       }
@@ -752,9 +790,9 @@ void indent_text(void)
             && (  get_chunk_parent_type(pc) == CT_PP_ENDIF
                || get_chunk_parent_type(pc) == CT_PP_ELSE))
          {
-            LOG_FMT(LINDLINE, "%s(%d): pc->orig_line is %zu, orig_col is %zu, text() is '%s', type is %s\n",
-                    __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
-            frm.pop(__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));
+            frm.pop(__func__, __LINE__, pc);
          }
          ParseFrame frmbkup = frm;
          fl_check(frames, frm, cpd.pp_level, pc);
@@ -765,9 +803,9 @@ void indent_text(void)
          if (  options::pp_region_indent_code()
             && get_chunk_parent_type(pc) == CT_PP_REGION)
          {
-            chunk_t *next = chunk_get_next(pc);
+            Chunk *next = pc->GetNext();
 
-            if (next == nullptr)
+            if (next->IsNullChunk())
             {
                break;
             }
@@ -808,15 +846,16 @@ void indent_text(void)
             && (  get_chunk_parent_type(pc) == CT_PP_IF
                || get_chunk_parent_type(pc) == CT_PP_ELSE))
          {
-            chunk_t *next = chunk_get_next(pc);
+            Chunk *next = pc->GetNext();
 
-            if (next == nullptr)
+            if (next->IsNullChunk())
             {
                break;
             }
-            int     should_indent_preproc = true;
-            chunk_t *preproc_next         = chunk_get_next_nl(pc);
-            preproc_next = chunk_get_next_nblank(preproc_next);
+            int   should_indent_preproc = true;
+            int   should_ignore_preproc = false;
+            Chunk *preproc_next         = pc->GetNextNl();
+            preproc_next = preproc_next->GetNextNcNnlNet();
 
             /* Look ahead at what's on the line after the #if */
             log_rule_B("pp_indent_brace");
@@ -824,43 +863,63 @@ void indent_text(void)
             log_rule_B("pp_indent_case");
             log_rule_B("pp_indent_extern");
 
-            while (  preproc_next != nullptr
+            while (  preproc_next->IsNotNullChunk()
                   && preproc_next->type != CT_NEWLINE)
             {
-               if (  (  (  (chunk_is_token(preproc_next, CT_BRACE_OPEN))
-                        || (chunk_is_token(preproc_next, CT_BRACE_CLOSE)))
-                     && !options::pp_indent_brace())
-                  || (  chunk_is_token(preproc_next, CT_FUNC_DEF)
-                     && !options::pp_indent_func_def())
-                  || (  chunk_is_token(preproc_next, CT_CASE)
-                     && !options::pp_indent_case())
-                  || (  chunk_is_token(preproc_next, CT_EXTERN)
-                     && !options::pp_indent_extern()))
+               if (  (chunk_is_token(preproc_next, CT_BRACE_OPEN))
+                  || (chunk_is_token(preproc_next, CT_BRACE_CLOSE)))
+               {
+                  if (options::pp_indent_brace() == 0)
+                  {
+                     should_indent_preproc = false;
+                     break;
+                  }
+                  else if (options::pp_indent_brace() == -1)
+                  {
+                     should_ignore_preproc = true;
+                     break;
+                  }
+               }
+               else if (  (  chunk_is_token(preproc_next, CT_FUNC_DEF)
+                          && !options::pp_indent_func_def())
+                       || (  chunk_is_token(preproc_next, CT_CASE)
+                          && !options::pp_indent_case())
+                       || (  chunk_is_token(preproc_next, CT_EXTERN)
+                          && !options::pp_indent_extern()))
                {
                   should_indent_preproc = false;
                   break;
                }
-               preproc_next = chunk_get_next(preproc_next);
+               preproc_next = preproc_next->GetNext();
             }
 
             if (should_indent_preproc)
             {
                // Hack to get the logs to look right
 
-               const c_token_t memtype = next->type;
+               const E_Token memtype = next->type;
                set_chunk_type(next, CT_PP_IF_INDENT);
                frm.push(next, __func__, __LINE__);
                set_chunk_type(next, memtype);
 
-               // Indent one level except if the #if is a #include guard
-               size_t extra = (  pc->pp_level == 0
-                              && ifdef_over_whole_file())
-                              ? 0 : indent_size;
+               if (should_ignore_preproc)
+               {
+                  // Preserve original indentation
+                  frm.top().indent = pc->GetNextNl()->GetNext()->orig_col;
+                  log_indent();
+               }
+               else
+               {
+                  // Indent one level except if the #if is a #include guard
+                  size_t extra = (  pc->pp_level == 0
+                                 && ifdef_over_whole_file())
+                                 ? 0 : indent_size;
 
-               frm.top().indent = frm.prev().indent + extra;
-               log_indent();
+                  frm.top().indent = frm.prev().indent + extra;
+                  log_indent();
 
-               frm.top().indent_tab = frm.prev().indent_tab + extra;
+                  frm.top().indent_tab = frm.prev().indent_tab + extra;
+               }
                frm.top().indent_tmp = frm.top().indent;
                frm.top().in_preproc = false;
                log_indent_tmp();
@@ -877,30 +936,30 @@ void indent_text(void)
             else if (get_chunk_parent_type(pc) == CT_PP_ELSE)
             {
                if (  frm.top().type == CT_MEMBER
-                  && frm.top().pop_pc
+                  && frm.top().pop_pc != nullptr
                   && frm.top().pc != frmbkup.top().pc)
                {
-                  chunk_t *tmp = chunk_get_next_ncnnlnp(pc);
+                  Chunk *tmp = pc->GetNextNcNnlNpp();
 
-                  if (tmp != nullptr)
+                  if (tmp->IsNotNullChunk())
                   {
                      if (  chunk_is_token(tmp, CT_WORD)
                         || chunk_is_token(tmp, CT_TYPE))
                      {
-                        tmp = chunk_get_next_ncnnlnp(pc);
+                        tmp = pc->GetNextNcNnlNpp();
                      }
                      else if (  chunk_is_token(tmp, CT_FUNC_CALL)
                              || chunk_is_token(tmp, CT_FPAREN_OPEN))
                      {
-                        tmp = chunk_get_next_type(tmp, CT_FPAREN_CLOSE, tmp->level);
+                        tmp = tmp->GetNextType(CT_FPAREN_CLOSE, tmp->level);
 
-                        if (tmp != nullptr)
+                        if (tmp->IsNotNullChunk())
                         {
-                           tmp = chunk_get_next_ncnnlnp(pc);
+                           tmp = pc->GetNextNcNnlNpp();
                         }
                      }
 
-                     if (tmp != nullptr)
+                     if (tmp->IsNotNullChunk())
                      {
                         frm.top().pop_pc = tmp;
                      }
@@ -917,9 +976,9 @@ void indent_text(void)
             }
          }
          // Transition into a preproc by creating a dummy indent
-         chunk_t *pp_next = chunk_get_next(pc);
+         Chunk *pp_next = pc->GetNext();
 
-         if (pp_next == nullptr)
+         if (pp_next->IsNullChunk())
          {
             return;
          }
@@ -1014,7 +1073,7 @@ void indent_text(void)
       {
          if (chunk_is_token(pc, CT_STRING))
          {
-            if (  pc->len() > 4
+            if (  pc->Len() > 4
                && xml_indent > 0
                && pc->str[1] == '<'
                && pc->str[2] == '/')
@@ -1023,7 +1082,7 @@ void indent_text(void)
                xml_indent -= options::indent_xml_string();
             }
          }
-         else if (  !chunk_is_comment(pc)
+         else if (  !pc->IsComment()
                  && !chunk_is_newline(pc))
          {
             xml_indent = 0;
@@ -1041,12 +1100,12 @@ void indent_text(void)
 
          // End anything that drops a level
          if (  !chunk_is_newline(pc)
-            && !chunk_is_comment(pc)
+            && !pc->IsComment()
             && frm.top().level > pc->level)
          {
-            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));
-            frm.pop(__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));
+            frm.pop(__func__, __LINE__, pc);
          }
 
          if (frm.top().level >= pc->level)
@@ -1055,12 +1114,14 @@ void indent_text(void)
             if (  chunk_is_token(pc, 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));
-               frm.pop(__func__, __LINE__);
-               pc = chunk_get_next(pc);
-
-               if (pc == nullptr)
+               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));
+               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));
+
+               if (pc->IsNullChunk())
                {
                   // need to break out of both the do and while loops
                   goto null_pc;
@@ -1070,9 +1131,9 @@ void indent_text(void)
             if (  chunk_is_token(pc, CT_BRACE_CLOSE)
                && get_chunk_parent_type(pc) == CT_ENUM)
             {
-               chunk_t *prev_ncnl = chunk_get_prev_ncnnl(pc);
+               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);
+                       __func__, __LINE__, prev_ncnl->Text(), prev_ncnl->orig_line, prev_ncnl->orig_col);
 
                if (chunk_is_token(prev_ncnl, CT_COMMA))
                {
@@ -1087,9 +1148,9 @@ 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));
-               frm.pop(__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));
+               frm.pop(__func__, __LINE__, pc);
             }
             // Pop Colon from stack in ternary operator
             // a
@@ -1104,9 +1165,9 @@ void indent_text(void)
                   || chunk_is_token(pc, CT_OC_MSG_NAME)
                   || chunk_is_token(pc, 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));
-               frm.pop(__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));
+               frm.pop(__func__, __LINE__, pc);
             }
 
             // End any assign operations with a semicolon on the same level
@@ -1114,9 +1175,9 @@ void indent_text(void)
                && (  (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));
-               frm.pop(__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));
+               frm.pop(__func__, __LINE__, pc);
             }
 
             // End any custom macro-based open/closes
@@ -1125,9 +1186,9 @@ void indent_text(void)
                && chunk_is_token(pc, 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));
-               frm.pop(__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));
+               frm.pop(__func__, __LINE__, pc);
             }
 
             // End any CPP/ObjC class colon stuff
@@ -1141,13 +1202,13 @@ void indent_text(void)
                   || chunk_is_token(pc, CT_MACRO_OPEN)
                   || chunk_is_token(pc, CT_MACRO_CLOSE)
                   || (  language_is_set(LANG_OC)
-                     && chunk_is_comment(pc)
+                     && pc->IsComment()
                      && get_chunk_parent_type(pc) == CT_COMMENT_WHOLE) // Issue #2675
                   || chunk_is_semicolon(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));
-               frm.pop(__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));
+               frm.pop(__func__, __LINE__, pc);
             }
 
             // End ObjC class colon stuff inside of generic definition (like Test<T1: id<T3>>)
@@ -1155,9 +1216,9 @@ void indent_text(void)
                && chunk_is_token(pc, CT_ANGLE_CLOSE)
                && get_chunk_parent_type(pc) == 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));
-               frm.pop(__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));
+               frm.pop(__func__, __LINE__, pc);
             }
 
             // End Objc nested message and boxed array
@@ -1167,10 +1228,10 @@ void indent_text(void)
                && get_chunk_parent_type(pc) == CT_OC_AT
                && frm.top().level >= pc->level)
             {
-               size_t  count = 1;
-               chunk_t *next = chunk_get_next_nc(pc);
+               size_t count = 1;
+               Chunk  *next = pc->GetNextNc();
 
-               while (  next != nullptr
+               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)
@@ -1179,7 +1240,7 @@ void indent_text(void)
                            && get_chunk_parent_type(next) == CT_OC_MSG)))
                {
                   count++;
-                  next = chunk_get_next_nc(next);
+                  next = next->GetNextNc();
                }
                count = std::min(count, frm.size());
 
@@ -1198,9 +1259,9 @@ void indent_text(void)
                         }
                         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));
-                     frm.pop(__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));
+                     frm.pop(__func__, __LINE__, pc);
                   }
 
                   if (next)
@@ -1208,9 +1269,9 @@ 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));
-                        frm.pop(__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));
+                        frm.pop(__func__, __LINE__, pc);
                      }
                   }
                   // Indent the brace to match outer most brace/square
@@ -1224,17 +1285,26 @@ void indent_text(void)
                && (  chunk_is_token(pc, CT_BRACE_CLOSE)
                   || chunk_is_token(pc, CT_CASE)))
             {
-               LOG_FMT(LINDLINE, "%s(%d): pc->orig_line is %zu, orig_col is %zu, text() is '%s', type is %s\n",
-                       __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
-               frm.pop(__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));
+               frm.pop(__func__, __LINE__, pc);
+            }
+
+            if (frm.top().pop_pc != nullptr)
+            {
+               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): 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 == 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));
-               frm.pop(__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));
+               frm.pop(__func__, __LINE__, pc);
             }
 
             if (  (frm.top().type == CT_LAMBDA)
@@ -1242,9 +1312,9 @@ void indent_text(void)
                   || chunk_is_token(pc, CT_COMMA)
                   || chunk_is_token(pc, CT_BRACE_OPEN)))
             {
-               LOG_FMT(LINDLINE, "%s(%d): pc->orig_line is %zu, orig_col is %zu, text() is '%s', type is %s\n",
-                       __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
-               frm.pop(__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));
+               frm.pop(__func__, __LINE__, pc);
             }
             // a class scope is ended with another class scope or a close brace
             log_rule_B("indent_access_spec_body");
@@ -1254,9 +1324,9 @@ void indent_text(void)
                && (  chunk_is_token(pc, CT_BRACE_CLOSE)
                   || chunk_is_token(pc, CT_ACCESS)))
             {
-               LOG_FMT(LINDLINE, "%s(%d): pc->orig_line is %zu, orig_col is %zu, text() is '%s', type is %s\n",
-                       __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
-               frm.pop(__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));
+               frm.pop(__func__, __LINE__, pc);
             }
 
             // return & throw are ended with a semicolon
@@ -1264,9 +1334,9 @@ void indent_text(void)
                && (  (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));
-               frm.pop(__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));
+               frm.pop(__func__, __LINE__, pc);
             }
 
             // an OC SCOPE ('-' or '+') ends with a semicolon or brace open
@@ -1274,9 +1344,9 @@ void indent_text(void)
                && (  chunk_is_semicolon(pc)
                   || chunk_is_token(pc, CT_BRACE_OPEN)))
             {
-               LOG_FMT(LINDLINE, "%s(%d): pc->orig_line is %zu, orig_col is %zu, text() is '%s', type is %s\n",
-                       __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
-               frm.pop(__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));
+               frm.pop(__func__, __LINE__, pc);
             }
 
             /*
@@ -1288,18 +1358,18 @@ void indent_text(void)
                   || chunk_is_paren_open(pc)
                   || chunk_is_token(pc, CT_BRACE_OPEN)))
             {
-               LOG_FMT(LINDLINE, "%s(%d): pc->orig_line is %zu, orig_col is %zu, text() is '%s', type is %s\n",
-                       __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
-               frm.pop(__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));
+               frm.pop(__func__, __LINE__, pc);
             }
 
             // an SQL EXEC is ended with a semicolon
             if (  (frm.top().type == CT_SQL_EXEC)
                && chunk_is_semicolon(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));
-               frm.pop(__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));
+               frm.pop(__func__, __LINE__, pc);
             }
 
             // an CLASS is ended with a semicolon or brace open
@@ -1308,9 +1378,9 @@ void indent_text(void)
                   || chunk_is_token(pc, CT_BRACE_OPEN)
                   || chunk_is_semicolon(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));
-               frm.pop(__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));
+               frm.pop(__func__, __LINE__, pc);
             }
             log_rule_B("indent_oc_inside_msg_sel");
 
@@ -1321,9 +1391,9 @@ void indent_text(void)
                && (  chunk_is_token(pc, CT_OC_MSG_FUNC)
                   || chunk_is_token(pc, CT_OC_MSG_NAME))) // Issue #2658
             {
-               LOG_FMT(LINDLINE, "%s(%d): pc->orig_line is %zu, orig_col is %zu, text() is '%s', type is %s\n",
-                       __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
-               frm.pop(__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));
+               frm.pop(__func__, __LINE__, pc);
             }
 
             // Close out parenthesis and squares
@@ -1335,9 +1405,9 @@ void indent_text(void)
                   || 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));
-               frm.pop(__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));
+               frm.pop(__func__, __LINE__, pc);
 
                if (frm.paren_count == 0)
                {
@@ -1352,7 +1422,7 @@ void indent_text(void)
       } while (old_frm_size > frm.size());
 
       // Grab a copy of the current indent
-      indent_column_set(frm.top().indent_tmp);
+      indent_column_set(frm.top().indent_tmp);                        // Issue #3294
       log_indent_tmp();
 
       log_rule_B("indent_single_newlines");
@@ -1364,12 +1434,12 @@ void indent_text(void)
       }
 
       if (  !chunk_is_newline(pc)
-         && !chunk_is_comment(pc)
+         && !pc->IsComment()
          && 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->orig_line, pc->orig_col, pc->Text(), frm.size());
 
          for (size_t ttidx = frm.size() - 1; ttidx > 0; ttidx--)
          {
@@ -1377,7 +1447,7 @@ void indent_text(void)
                     ttidx,
                     frm.at(ttidx).pc->orig_line,
                     frm.at(ttidx).pc->orig_col,
-                    frm.at(ttidx).pc->text(),
+                    frm.at(ttidx).pc->Text(),
                     get_token_name(frm.at(ttidx).type),
                     get_token_name(frm.at(ttidx).pc->parent_type),
                     frm.at(ttidx).indent_tmp,
@@ -1390,8 +1460,8 @@ void indent_text(void)
          }
       }
       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->elided_text(copy));
+      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));
 
       // Issue #672
       if (  chunk_is_token(pc, CT_BRACE_OPEN)
@@ -1399,13 +1469,8 @@ void indent_text(void)
       {
          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));
-         frm.pop(__func__, __LINE__);
-         frm.top().indent_tmp = 1;
-         frm.top().indent     = 1;
-         frm.top().indent_tab = 1;
-         log_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));
          classFound = false;
       }
       /*
@@ -1438,6 +1503,8 @@ void indent_text(void)
                                    || get_chunk_parent_type(pc) != CT_CLASS)
                                 && (  !options::indent_braces_no_struct()
                                    || get_chunk_parent_type(pc) != CT_STRUCT));
+      LOG_FMT(LINDENT, "%s(%d): brace_indent is %s\n",
+              __func__, __LINE__, brace_indent ? "TRue" : "FAlse");
 
       if (chunk_is_token(pc, CT_BRACE_CLOSE))
       {
@@ -1446,10 +1513,10 @@ void indent_text(void)
             if (  frm.top().type == CT_BRACE_OPEN
                && frm.top().level >= pc->level)
             {
-               size_t  count = 1;
-               chunk_t *next = chunk_get_next_nc(pc);
+               size_t count = 1;
+               Chunk  *next = pc->GetNextNc();
 
-               while (  next != nullptr
+               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)
@@ -1458,7 +1525,7 @@ void indent_text(void)
                            && get_chunk_parent_type(next) == CT_OC_MSG)))
                {
                   count++;
-                  next = chunk_get_next_nc(next);
+                  next = next->GetNextNc();
                }
                count = std::min(count, frm.size());
 
@@ -1476,9 +1543,9 @@ void indent_text(void)
 
                   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));
-                     frm.pop(__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));
+                     frm.pop(__func__, __LINE__, pc);
                   }
 
                   if (next)
@@ -1486,9 +1553,9 @@ 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));
-                        frm.pop(__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));
+                        frm.pop(__func__, __LINE__, pc);
                      }
                   }
 
@@ -1512,13 +1579,13 @@ void indent_text(void)
                      pc->indent.ref   = frm.top().ip.ref;
                      pc->indent.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));
-                  frm.pop(__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));
+                  frm.pop(__func__, __LINE__, pc);
                }
             }
          }
-         else
+         else if (frm.top().brace_indent) // Issue #3421
          {
             // Indent the brace to match the open brace
             indent_column_set(frm.top().brace_indent);
@@ -1528,9 +1595,9 @@ void indent_text(void)
                pc->indent.ref   = frm.top().ip.ref;
                pc->indent.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));
-            frm.pop(__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));
+            frm.pop(__func__, __LINE__, pc);
          }
       }
       else if (chunk_is_token(pc, CT_VBRACE_OPEN))
@@ -1565,8 +1632,8 @@ void indent_text(void)
               && (  pc->next != nullptr
                  && pc->next->type != CT_NAMESPACE))
       {
-         LOG_FMT(LINDENT2, "%s(%d): orig_line is %zu, orig_col is %zu, text() is '%s'\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text());
+         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());
          frm.push(pc, __func__, __LINE__);
 
          log_rule_B("indent_macro_brace");
@@ -1583,10 +1650,12 @@ void indent_text(void)
             log_rule_B("indent_cpp_lambda_body");
             frm.top().brace_indent = frm.prev().indent;
 
-            chunk_t *head     = chunk_get_prev_ncnnlnp(frm.top().pc);
-            chunk_t *tail     = nullptr;
-            bool    enclosure = frm.prev().pc != chunk_skip_to_match(frm.prev().pc);
-            bool    linematch = true;
+            Chunk *head     = frm.top().pc->GetPrevNcNnlNpp();
+            Chunk *tail     = nullptr;
+            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  linematch = true;
 
             for (auto it = frm.rbegin(); it != frm.rend() && tail == nullptr; ++it)
             {
@@ -1594,16 +1663,16 @@ void indent_text(void)
                {
                   linematch &= are_chunks_in_same_line(it->pc, head);
                }
-               chunk_t *match = chunk_skip_to_match(it->pc);
+               Chunk *match = chunk_skip_to_match(it->pc);
 
                if (match == nullptr)
                {
                   continue;
                }
-               chunk_t *target = chunk_get_next_ncnnlnp(match);
+               Chunk *target = match->GetNextNcNnlNpp();
 
                while (  tail == nullptr
-                     && target != nullptr)
+                     && target->IsNotNullChunk())
                {
                   if (  chunk_is_semicolon(target)
                      && target->level == match->level)
@@ -1616,7 +1685,7 @@ void indent_text(void)
                   }
                   else
                   {
-                     target = chunk_get_next_ncnnlnp(target);
+                     target = target->GetNextNcNnlNpp();
                   }
                }
             }
@@ -1637,6 +1706,45 @@ void indent_text(void)
                }
             }
 
+            // 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
@@ -1646,8 +1754,8 @@ void indent_text(void)
                && (  (  !enclosure
                      && options::align_assign_span() == 0
                      && !options::indent_align_assign()
-                     && are_chunks_in_same_line(chunk_get_prev_ncnnlnp(frm.prev().pc), frm.prev().pc)
-                     && are_chunks_in_same_line(frm.prev().pc, chunk_get_next_ncnnlnp(frm.prev().pc)))
+                     && 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)))
@@ -1676,6 +1784,7 @@ void indent_text(void)
                  && options::indent_cpp_lambda_only_once()
                  && (get_chunk_parent_type(pc) == CT_CPP_LAMBDA))
          {
+            // test example cpp:30756
             log_rule_B("indent_cpp_lambda_only_once");
 
             size_t namespace_indent_to_ignore = 0;                   // Issue #1813
@@ -1732,7 +1841,7 @@ void indent_text(void)
             frm.top().brace_indent = frm.prev().indent;
 
             // Issue # 1620, UNI-24090.cs
-            if (are_chunks_in_same_line(frm.prev().pc, chunk_get_prev_ncnnlnp(frm.top().pc)))
+            if (are_chunks_in_same_line(frm.prev().pc, frm.top().pc->GetPrevNcNnlNpp()))
             {
                frm.top().brace_indent -= indent_size;
             }
@@ -1750,12 +1859,12 @@ void indent_text(void)
                  && 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(chunk_get_next_nc(pc)))
+                 && chunk_is_newline(pc->GetNextNc()))
          {
             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);
+                    __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);
             indent_column_set(frm.top().brace_indent);
             frm.top().indent = frm.prev().indent_tmp;
@@ -1765,13 +1874,14 @@ void indent_text(void)
             log_indent_tmp();
          }
          // any '{' that is inside of a '(' overrides the '(' indent
+         // only to help the vim command }
          else if (  !options::indent_paren_open_brace()
                  && chunk_is_paren_open(frm.prev().pc)
-                 && chunk_is_newline(chunk_get_next_nc(pc)))
+                 && chunk_is_newline(pc->GetNextNc()))
          {
             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);
+                    __func__, __LINE__, pc->orig_line, pc->brace_level, pc->Text(), pc->level, frm.prev().pc->level);
             // 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);
             indent_column_set(frm.top().brace_indent);
@@ -1835,8 +1945,8 @@ void indent_text(void)
 
                   if (options::indent_oc_block_msg_xcode_style())
                   {
-                     chunk_t *bbc           = chunk_skip_to_match(pc); // block brace close '}'
-                     chunk_t *bbc_next_ncnl = chunk_get_next_ncnnl(bbc);
+                     Chunk *bbc           = chunk_skip_to_match(pc); // 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)
@@ -1854,10 +1964,10 @@ void indent_text(void)
                         indent_from_keyword = false;
                      }
                   }
-                  chunk_t *ref = oc_msg_block_indent(pc, indent_from_brace,
-                                                     indent_from_caret,
-                                                     indent_from_colon,
-                                                     indent_from_keyword);
+                  Chunk *ref = oc_msg_block_indent(pc, indent_from_brace,
+                                                   indent_from_caret,
+                                                   indent_from_colon,
+                                                   indent_from_keyword);
 
                   if (ref)
                   {
@@ -1898,18 +2008,20 @@ void indent_text(void)
             {
                log_rule_B("indent_align_paren");
                // We are inside ({ ... }) -- where { and ( are on the same line, avoiding double indentations.
+               // only to help the vim command }
                frm.top().brace_indent = frm.prev().indent - indent_size;
                indent_column_set(frm.top().brace_indent);
                frm.top().indent = frm.prev().indent_tmp;
                log_indent();
             }
-            else if (  are_chunks_in_same_line(frm.prev().pc, chunk_get_prev_ncnnlnp(frm.top().pc))
+            else if (  are_chunks_in_same_line(frm.prev().pc, frm.top().pc->GetPrevNcNnlNpp())
                     && !options::indent_align_paren()
                     && chunk_is_paren_open(frm.prev().pc)
                     && !pc->flags.test(PCF_ONE_LINER))
             {
                log_rule_B("indent_align_paren");
                // We are inside ({ ... }) -- where { and ( are on adjacent lines, avoiding indentation of brace.
+               // only to help the vim command }
                frm.top().brace_indent = frm.prev().indent - indent_size;
                indent_column_set(frm.top().brace_indent);
                frm.top().indent = frm.prev().indent_tmp;
@@ -1984,8 +2096,8 @@ 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(),
+            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)));
 
             // If this brace is part of a statement, bump it out by indent_brace
@@ -2016,20 +2128,26 @@ void indent_text(void)
             }
             else if (get_chunk_parent_type(pc) == CT_CASE)
             {
-               log_rule_B("indent_case_brace");
-               const auto tmp_indent = static_cast<int>(frm.prev().indent)
-                                       - static_cast<int>(indent_size)
-                                       + options::indent_case_brace();
-
-               /*
-                * An open brace with the parent of case does not indent by default
-                * UO_indent_case_brace can be used to indent the brace.
-                * So we need to take the CASE indent, subtract off the
-                * indent_size that was added above and then add indent_case_brace.
-                * may take negative value
-                */
-               indent_column_set(max(tmp_indent, 0));
-
+               if (options::indent_ignore_case_brace())
+               {
+                  log_rule_B("indent_ignore_case_brace");
+                  indent_column_set(pc->orig_col);
+               }
+               else
+               {
+                  log_rule_B("indent_case_brace");
+                  const auto tmp_indent = static_cast<int>(frm.prev().indent)
+                                          - static_cast<int>(indent_size)
+                                          + options::indent_case_brace();
+                  /*
+                   * An open brace with the parent of case does not indent by default
+                   * UO_indent_case_brace can be used to indent the brace.
+                   * So we need to take the CASE indent, subtract off the
+                   * indent_size that was added above and then add indent_case_brace.
+                   * may take negative value
+                   */
+                  indent_column_set(max(tmp_indent, 0));
+               }
                // Stuff inside the brace still needs to be indented
                frm.top().indent = indent_column + indent_size;
                log_indent();
@@ -2042,7 +2160,7 @@ void indent_text(void)
             {
                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());
+                       __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text());
                frm.top().indent -= indent_size;
                log_indent();
             }
@@ -2064,6 +2182,16 @@ void indent_text(void)
                   }
                   indent_column_set(frm.prev(frm.top().ns_cnt).indent);
                }
+               else if (  options::indent_namespace()
+                       && options::indent_namespace_inner_only())
+               {
+                  if (frm.top().ns_cnt == 1)
+                  {
+                     // undo indent on first namespace only
+                     frm.top().indent -= indent_size;
+                     log_indent();
+                  }
+               }
                else if (  pc->flags.test(PCF_LONG_BLOCK)
                        || !options::indent_namespace())
                {
@@ -2113,13 +2241,13 @@ void indent_text(void)
              * { a++;
              *   b--; };
              */
-            chunk_t *next = chunk_get_next_ncnnl(pc);
+            Chunk *next = pc->GetNextNcNnl();
 
-            if (next == nullptr)
+            if (next->IsNullChunk())
             {
                break;
             }
-            chunk_t *prev = chunk_get_prev(pc);
+            Chunk *prev = pc->GetPrev();
 
             if (  get_chunk_parent_type(pc) == CT_BRACED_INIT_LIST
                && chunk_is_token(prev, CT_BRACE_OPEN)
@@ -2142,6 +2270,8 @@ void indent_text(void)
             frm.top().open_line  = pc->orig_line;
             log_indent_tmp();
 
+            log_rule_B("Update the indent_column");
+
             // Update the indent_column if needed
             if (  brace_indent
                || parent_token_indent != 0)
@@ -2157,16 +2287,17 @@ void indent_text(void)
       {
          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));
-            frm.pop(__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));
+            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))
+              || (  chunk_is_token(pc, CT_CLASS)
+                 && language_is_set(LANG_CS))) // Issue #3536
       {
          frm.push(pc, __func__, __LINE__);
 
@@ -2217,12 +2348,12 @@ void indent_text(void)
          if (options::indent_case_comment())
          {
             // comments before 'case' need to be aligned with the 'case'
-            chunk_t *pct = pc;
+            Chunk *pct = pc;
 
-            while (  ((pct = chunk_get_prev_nnl(pct)) != nullptr)
-                  && chunk_is_comment(pct))
+            while (  ((pct = pct->GetPrevNnl())->IsNotNullChunk())
+                  && pct->IsComment())
             {
-               chunk_t *t2 = chunk_get_prev(pct);
+               Chunk *t2 = pct->GetPrev();
 
                if (chunk_is_newline(t2))
                {
@@ -2234,23 +2365,18 @@ void indent_text(void)
       }
       else if (chunk_is_token(pc, CT_BREAK))
       {
-         chunk_t *prev = chunk_get_prev_ncnnl(pc);
+         Chunk *prev = pc->GetPrevNcNnl();
 
          if (  chunk_is_token(prev, CT_BRACE_CLOSE)
             && get_chunk_parent_type(prev) == CT_CASE)
          {
             // issue #663 + issue #1366
-            chunk_t *prev_newline = chunk_get_prev_nl(pc);
+            Chunk *prev_prev_newline = pc->GetPrevNl()->GetPrevNl();
 
-            if (prev_newline != nullptr)
+            if (prev_prev_newline->IsNotNullChunk())
             {
-               chunk_t *prev_prev_newline = chunk_get_prev_nl(prev_newline);
-
-               if (prev_prev_newline != nullptr)
-               {
-                  // This only affects the 'break', so no need for a stack entry
-                  indent_column_set(prev_prev_newline->next->column);
-               }
+               // This only affects the 'break', so no need for a stack entry
+               indent_column_set(prev_prev_newline->GetNext()->column);
             }
          }
       }
@@ -2272,12 +2398,12 @@ void indent_text(void)
             {
                indent_column_set(val);
 
-               chunk_t *next = chunk_get_next(chunk_get_next(pc));  // colon + possible statement
+               Chunk *next = pc->GetNext()->GetNext();  // colon + possible statement
 
-               if (  next != nullptr
+               if (  next->IsNotNullChunk()
                   && !chunk_is_newline(next)
                      // label (+ 2, because there is colon and space after it) must fit into indent
-                  && (val + static_cast<int>(pc->len()) + 2 <= static_cast<int>(pse_indent)))
+                  && (val + static_cast<int>(pc->Len()) + 2 <= static_cast<int>(pse_indent)))
                {
                   reindent_line(next, pse_indent);
                }
@@ -2313,13 +2439,13 @@ void indent_text(void)
             // Issues 1161 + 2704
             // comments before 'access specifier' need to be aligned with the 'access specifier'
             // unless it is a Doxygen comment
-            chunk_t *pct = pc;
+            Chunk *pct = pc;
 
-            while (  ((pct = chunk_get_prev_nnl(pct)) != nullptr)
-                  && chunk_is_comment(pct)
+            while (  ((pct = pct->GetPrevNnl())->IsNotNullChunk())
+                  && pct->IsComment()
                   && !chunk_is_Doxygen_comment(pct))
             {
-               chunk_t *t2 = chunk_get_prev(pct);
+               Chunk *t2 = pct->GetPrev();
 
                if (chunk_is_newline(t2))
                {
@@ -2360,12 +2486,20 @@ void indent_text(void)
          frm.top().indent_tab = frm.top().indent;
          log_indent_tmp();
 
-         if (  options::indent_before_class_colon() != 0
-            && chunk_is_token(pc, CT_CLASS_COLON))
+         if (chunk_is_token(pc, CT_CLASS_COLON))
          {
-            log_rule_B("indent_before_class_colon");
-            frm.top().indent_tmp = std::max<ptrdiff_t>(frm.top().indent_tmp + options::indent_before_class_colon(), 0);
-            log_indent_tmp();
+            if (options::indent_ignore_before_class_colon())
+            {
+               log_rule_B("indent_ignore_before_class_colon");
+               frm.top().indent_tmp = pc->orig_col;
+               log_indent_tmp();
+            }
+            else if (options::indent_before_class_colon() != 0)
+            {
+               log_rule_B("indent_before_class_colon");
+               frm.top().indent_tmp = std::max<ptrdiff_t>(frm.top().indent_tmp + options::indent_before_class_colon(), 0);
+               log_indent_tmp();
+            }
          }
          indent_column_set(frm.top().indent_tmp);
 
@@ -2383,9 +2517,9 @@ void indent_text(void)
             }
             else
             {
-               chunk_t *next = chunk_get_next(pc);
+               Chunk *next = pc->GetNext();
 
-               if (  next != nullptr
+               if (  next->IsNotNullChunk()
                   && !chunk_is_newline(next))
                {
                   frm.top().indent = next->column;
@@ -2393,67 +2527,76 @@ void indent_text(void)
                }
             }
          }
-         else if (  options::indent_constr_colon()
-                 && chunk_is_token(pc, CT_CONSTR_COLON))
+         else if (chunk_is_token(pc, CT_CONSTR_COLON))
          {
-            log_rule_B("indent_constr_colon");
-            chunk_t *prev = chunk_get_prev(pc);
-
-            if (chunk_is_newline(prev))
+            if (options::indent_ignore_before_constr_colon())
             {
-               log_rule_B("indent_ctor_init_following");
-               frm.top().indent += options::indent_ctor_init_following();
-               log_indent();
-            }
-            // TODO: Create a dedicated indent_constr_on_colon?
-            log_rule_B("indent_class_on_colon");
-
-            if (options::indent_class_on_colon())
-            {
-               frm.top().indent = pc->column;
-               log_indent();
-            }
-            else if (options::indent_ctor_init() != 0)
-            {
-               log_rule_B("indent_ctor_init");
-               /*
-                * If the std::max() calls were specialized with size_t (the type of the underlying variable),
-                * they would never actually do their job, because size_t is unsigned and therefore even
-                * a "negative" result would be always greater than zero.
-                * Using ptrdiff_t (a standard signed type of the same size as size_t) in order to avoid that.
-                */
-               frm.top().indent = std::max<ptrdiff_t>(frm.top().indent + options::indent_ctor_init(), 0);
-               log_indent();
-               frm.top().indent_tmp = std::max<ptrdiff_t>(frm.top().indent_tmp + options::indent_ctor_init(), 0);
-               frm.top().indent_tab = std::max<ptrdiff_t>(frm.top().indent_tab + options::indent_ctor_init(), 0);
-               log_indent_tmp();
+               log_rule_B("indent_ignore_before_constr_colon");
+               frm.top().indent_tmp = pc->orig_col;
                indent_column_set(frm.top().indent_tmp);
             }
-            else
+
+            if (options::indent_constr_colon())
             {
-               chunk_t *next = chunk_get_next(pc);
+               log_rule_B("indent_constr_colon");
+               Chunk *prev = pc->GetPrev();
 
-               if (  next != nullptr
-                  && !chunk_is_newline(next))
+               if (chunk_is_newline(prev))
                {
-                  frm.top().indent = next->column;
+                  log_rule_B("indent_ctor_init_following");
+                  frm.top().indent += options::indent_ctor_init_following();
+                  log_indent();
+               }
+               // TODO: Create a dedicated indent_constr_on_colon?
+               log_rule_B("indent_class_on_colon");
+
+               if (options::indent_ctor_init() != 0)
+               {
+                  log_rule_B("indent_ctor_init");
+                  /*
+                   * If the std::max() calls were specialized with size_t (the type of the underlying variable),
+                   * they would never actually do their job, because size_t is unsigned and therefore even
+                   * a "negative" result would be always greater than zero.
+                   * Using ptrdiff_t (a standard signed type of the same size as size_t) in order to avoid that.
+                   */
+                  frm.top().indent = std::max<ptrdiff_t>(frm.top().indent + options::indent_ctor_init(), 0);
                   log_indent();
+                  frm.top().indent_tmp = std::max<ptrdiff_t>(frm.top().indent_tmp + options::indent_ctor_init(), 0);
+                  frm.top().indent_tab = std::max<ptrdiff_t>(frm.top().indent_tab + options::indent_ctor_init(), 0);
+                  log_indent_tmp();
+                  indent_column_set(frm.top().indent_tmp);
+               }
+               else if (options::indent_class_on_colon())
+               {
+                  frm.top().indent = pc->column;
+                  log_indent();
+               }
+               else
+               {
+                  Chunk *next = pc->GetNext();
+
+                  if (  next->IsNotNullChunk()
+                     && !chunk_is_newline(next))
+                  {
+                     frm.top().indent = next->column;
+                     log_indent();
+                  }
                }
             }
          }
       }
       else if (  chunk_is_token(pc, CT_PAREN_OPEN)
               && (  get_chunk_parent_type(pc) == CT_ASM
-                 || (  chunk_get_prev_ncnnl(pc) != nullptr
-                    && chunk_get_prev_ncnnl(pc)->type == CT_ASM))
+                 || (  pc->GetPrevNcNnl()->IsNotNullChunk()
+                    && pc->GetPrevNcNnl()->type == CT_ASM))
               && options::indent_ignore_asm_block())
       {
          log_rule_B("indent_ignore_asm_block");
-         chunk_t *tmp = chunk_skip_to_match(pc);
+         Chunk *tmp = chunk_skip_to_match(pc);
 
-         int     move = 0;
+         int   move = 0;
 
-         if (  chunk_is_newline(chunk_get_prev(pc))
+         if (  chunk_is_newline(pc->GetPrev())
             && pc->column != indent_column)
          {
             move = indent_column - pc->column;
@@ -2466,7 +2609,7 @@ void indent_text(void)
          do
          {
             pc->column = pc->orig_col + move;
-            pc         = chunk_get_next(pc);
+            pc         = pc->GetNext();
          } while (pc != tmp);
 
          reindent_line(pc, indent_column);
@@ -2484,15 +2627,15 @@ void indent_text(void)
           */
          frm.push(pc, __func__, __LINE__);
 
-         if (  chunk_is_newline(chunk_get_prev(pc))
+         if (  chunk_is_newline(pc->GetPrev())
             && pc->column != indent_column
             && !pc->flags.test(PCF_DONT_INDENT))
          {
-            LOG_FMT(LINDENT, "%s[line %d]: %zu] indent => %zu [%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->orig_line, indent_column, pc->Text());
             reindent_line(pc, indent_column);
          }
-         frm.top().indent = pc->column + pc->len();
+         frm.top().indent = pc->column + pc->Len();
          log_indent();
 
          if (  chunk_is_token(pc, CT_SQUARE_OPEN)
@@ -2524,8 +2667,7 @@ void indent_text(void)
                        && (  get_chunk_parent_type(pc) == CT_FUNC_CALL
                           || get_chunk_parent_type(pc) == CT_FUNC_CALL_USER))
                     || (  options::indent_func_proto_param()
-                       && (  get_chunk_parent_type(pc) == CT_FUNC_PROTO
-                          || get_chunk_parent_type(pc) == CT_FUNC_CLASS_PROTO))
+                       && get_chunk_parent_type(pc) == 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))
@@ -2568,7 +2710,7 @@ void indent_text(void)
                   && (  frm.at(idx).type != CT_CLASS_COLON
                      && frm.at(idx).type != CT_CONSTR_COLON
                      && !(  frm.at(idx).type == CT_LAMBDA
-                         && chunk_get_prev_nc(frm.at(idx).pc)->type == CT_NEWLINE)))
+                         && frm.at(idx).pc->GetPrevNc()->type == CT_NEWLINE)))
             {
                if (idx == 0)
                {
@@ -2621,7 +2763,7 @@ void indent_text(void)
             log_indent_tmp();
          }
          else if (  chunk_is_token(pc, CT_PAREN_OPEN)
-                 && !chunk_is_newline(chunk_get_next(pc))
+                 && !chunk_is_newline(pc->GetNext())
                  && !options::indent_align_paren()
                  && !pc->flags.test(PCF_IN_SPAREN))
          {
@@ -2631,13 +2773,6 @@ void indent_text(void)
             while (  idx > 0
                   && are_chunks_in_same_line(frm.at(idx).pc, frm.top().pc))
             {
-               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);
-                  log_flush(true);
-                  exit(EX_SOFTWARE);
-               }
                idx--;
                skipped = true;
             }
@@ -2647,18 +2782,18 @@ void indent_text(void)
             frm.top().indent_tab = frm.top().indent;
             skipped = true;
          }
-         else if (  (  chunk_is_str(pc, "(", 1)
+         else if (  (  chunk_is_str(pc, "(")
                     && !options::indent_paren_nl())
-                 || (  chunk_is_str(pc, "<", 1)
+                 || (  chunk_is_str(pc, "<")
                     && !options::indent_paren_nl())    // TODO: add indent_angle_nl?
-                 || (  chunk_is_str(pc, "[", 1)
+                 || (  chunk_is_str(pc, "[")
                     && !options::indent_square_nl()))
          {
             log_rule_B("indent_paren_nl");
             log_rule_B("indent_square_nl");
-            chunk_t *next = chunk_get_next_nc(pc);
+            Chunk *next = pc->GetNextNc();
 
-            if (next == nullptr)
+            if (next->IsNullChunk())
             {
                break;
             }
@@ -2689,13 +2824,6 @@ void indent_text(void)
                   while (  sub > 0
                         && are_chunks_in_same_line(frm.at(sub).pc, frm.top().pc))
                   {
-                     if (sub == 0)
-                     {
-                        fprintf(stderr, "%s(%d): sub is ZERO, cannot be decremented, at line %zu, column %zu\n",
-                                __func__, __LINE__, pc->orig_line, pc->orig_col);
-                        log_flush(true);
-                        exit(EX_SOFTWARE);
-                     }
                      sub--;
                      skipped = true;
                   }
@@ -2715,20 +2843,20 @@ void indent_text(void)
             }
             else
             {
-               if (  next != nullptr
-                  && !chunk_is_comment(next))
+               if (  next->IsNotNullChunk()
+                  && !next->IsComment())
                {
                   if (chunk_is_token(next, CT_SPACE))
                   {
-                     next = chunk_get_next_nc(next);
+                     next = next->GetNextNc();
 
-                     if (next == nullptr)
+                     if (next->IsNullChunk())
                      {
                         break;
                      }
                   }
 
-                  if (chunk_is_comment(next->prev))
+                  if (next->prev->IsComment())
                   {
                      // Issue #2099
                      frm.top().indent = next->prev->column;
@@ -2746,18 +2874,22 @@ void indent_text(void)
          log_rule_B("indent_paren_after_func_def");
          log_rule_B("indent_paren_after_func_call");
 
-         if (  !options::use_indent_continue_only_once() // Issue #1160
+         if (  (  (  !frm.top().indent_cont                     // Issue #3567
+                  && 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(chunk_get_prev(pc)))
+               && chunk_is_newline(pc->GetPrev()))
             && (  (  (  get_chunk_parent_type(pc) == CT_FUNC_PROTO
                      || get_chunk_parent_type(pc) == 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_DEF
+                     || get_chunk_parent_type(pc) == 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)
                   && options::indent_paren_after_func_call())
-               || !chunk_is_newline(chunk_get_next(pc))))
+               || !chunk_is_newline(pc->GetNext())))
          {
             frm.top().indent = frm.prev().indent + indent_size;
             log_indent();
@@ -2767,13 +2899,22 @@ void indent_text(void)
          log_rule_B("indent_continue");
 
          if (  get_chunk_parent_type(pc) != CT_OC_AT
-            && options::indent_continue() != 0
+            && (  options::indent_ignore_first_continue()
+               || options::indent_continue() != 0)
             && !skipped)
          {
-            frm.top().indent = frm.prev().indent;
+            if (options::indent_ignore_first_continue())
+            {
+               frm.top().indent = get_indent_first_continue(pc->GetNext());
+            }
+            else
+            {
+               frm.top().indent = frm.prev().indent;
+            }
             log_indent();
 
             if (  pc->level == pc->brace_level
+               && !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)
@@ -2833,7 +2974,7 @@ void indent_text(void)
       }
       else if (  options::indent_member_single()
               && chunk_is_token(pc, CT_MEMBER)
-              && (strcmp(pc->text(), ".") == 0)
+              && (strcmp(pc->Text(), ".") == 0)
               && language_is_set(LANG_CS | LANG_CPP))
       {
          log_rule_B("indent_member_single");
@@ -2841,7 +2982,7 @@ void indent_text(void)
          if (frm.top().type != CT_MEMBER)
          {
             frm.push(pc, __func__, __LINE__);
-            chunk_t *tmp = chunk_get_prev_ncnnlnp(frm.top().pc);
+            Chunk *tmp = frm.top().pc->GetPrevNcNnlNpp();
 
             if (are_chunks_in_same_line(frm.prev().pc, tmp))
             {
@@ -2856,7 +2997,7 @@ void indent_text(void)
             log_indent_tmp();
          }
 
-         if (chunk_is_newline(chunk_get_prev(pc)))
+         if (chunk_is_newline(pc->GetPrev()))
          {
             if (  chunk_is_token(pc, CT_MEMBER)                           // Issue #2890
                && language_is_set(LANG_CPP))
@@ -2872,37 +3013,44 @@ void indent_text(void)
             }
          }
          //check for the series of CT_member chunks else pop it.
-         chunk_t *tmp = chunk_get_next_ncnnlnp(pc);
+         Chunk *tmp = pc->GetNextNcNnlNpp();
 
-         if (tmp != nullptr)
+         if (tmp->IsNotNullChunk())
          {
             if (chunk_is_token(tmp, CT_FUNC_CALL))
             {
-               tmp = chunk_get_next_ncnnlnp(chunk_get_next_type(tmp, CT_FPAREN_CLOSE, tmp->level));
+               tmp = tmp->GetNextType(CT_FPAREN_CLOSE, tmp->level);
+               tmp = tmp->GetNextNcNnlNpp();
             }
             else if (  chunk_is_token(tmp, CT_WORD)
                     || chunk_is_token(tmp, CT_TYPE))
             {
-               tmp = chunk_get_next_ncnnlnp(tmp);
+               tmp = tmp->GetNextNcNnlNpp();
             }
          }
 
-         if (  tmp != nullptr
-            && (  (strcmp(tmp->text(), ".") != 0)
+         if (  tmp->IsNotNullChunk()
+            && (  (strcmp(tmp->Text(), ".") != 0)
                || tmp->type != CT_MEMBER))
          {
             if (chunk_is_paren_close(tmp))
             {
-               tmp = chunk_get_prev_ncnnlnp(tmp);
+               tmp = tmp->GetPrevNcNnlNpp();
             }
+            Chunk *local_prev = tmp->GetPrev();             // Issue #3294
 
-            if (  tmp != nullptr
-               && chunk_is_newline(tmp->prev))
+            if (local_prev->IsComment())
             {
-               tmp = chunk_get_next_nl(chunk_get_prev_ncnnlnp(tmp));
+               tmp = tmp->GetPrev();                        // Issue #3294
             }
 
-            if (tmp != nullptr)
+            if (  tmp->IsNotNullChunk()
+               && chunk_is_newline(tmp->GetPrev()))
+            {
+               tmp = tmp->GetPrevNcNnlNpp()->GetNextNl();
+            }
+
+            if (tmp->IsNotNullChunk())
             {
                frm.top().pop_pc = tmp;
             }
@@ -2919,7 +3067,7 @@ void indent_text(void)
           * otherwise align on the '='.
           */
          if (  chunk_is_token(pc, CT_ASSIGN)
-            && chunk_is_newline(chunk_get_prev(pc)))
+            && chunk_is_newline(pc->GetPrev()))
          {
             if (frm.top().type == CT_ASSIGN_NL)
             {
@@ -2933,12 +3081,12 @@ 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->orig_line, indent_column, pc->Text());
             reindent_line(pc, frm.top().indent_tmp);
          }
-         chunk_t *next = chunk_get_next(pc);
+         Chunk *next = pc->GetNext();
 
-         if (next != nullptr)
+         if (next->IsNotNullChunk())
          {
             /*
              * fixes  1260 , 1268 , 1277 (Extra indentation after line with multiple assignments)
@@ -2949,20 +3097,26 @@ void indent_text(void)
             if (  frm.top().type == CT_ASSIGN
                && chunk_is_token(pc, CT_ASSIGN))
             {
-               LOG_FMT(LINDLINE, "%s(%d): pc->orig_line is %zu, orig_col is %zu, text() is '%s', type is %s\n",
-                       __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), get_token_name(pc->type));
-               frm.pop(__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));
+               frm.pop(__func__, __LINE__, pc);
             }
             frm.push(pc, __func__, __LINE__);
 
             if (  chunk_is_token(pc, CT_ASSIGN)
-               && chunk_is_newline(chunk_get_prev(pc)))
+               && chunk_is_newline(pc->GetPrev()))
             {
                frm.top().type = CT_ASSIGN_NL;
             }
             log_rule_B("indent_continue");
 
-            if (options::indent_continue() != 0)
+            if (options::indent_ignore_first_continue())
+            {
+               frm.top().indent = get_indent_first_continue(pc);
+               log_indent();
+               frm.top().indent_cont = true; // Issue #3567
+            }
+            else if (options::indent_continue() != 0)
             {
                frm.top().indent = frm.prev().indent;
                log_indent();
@@ -3017,7 +3171,7 @@ void indent_text(void)
             }
             else
             {
-               frm.top().indent = pc->column + pc->len() + 1;
+               frm.top().indent = pc->column + pc->Len() + 1;
                log_indent();
             }
             frm.top().indent_tmp = frm.top().indent;
@@ -3032,7 +3186,7 @@ void indent_text(void)
          if (  pc->level == pc->brace_level
             || pc->flags.test(PCF_IN_LAMBDA))
          {
-            chunk_t *next = chunk_get_next(pc);
+            Chunk *next = pc->GetNext();
 
             // Avoid indentation on return token set by the option.
             log_rule_B("indent_off_after_return");
@@ -3040,13 +3194,13 @@ void indent_text(void)
             // Avoid indentation on return token if the next token is a new token
             // to properly indent object initializers returned by functions.
             log_rule_B("indent_off_after_return_new");
-            bool indent_after_return = (  next != nullptr
+            bool indent_after_return = (  next->IsNotNullChunk()
                                        && next->type == CT_NEW)
                                        ? !options::indent_off_after_return_new()
                                        : !options::indent_off_after_return();
 
             if (  indent_after_return
-               || next == nullptr)
+               || next->IsNullChunk())
             {
                frm.push(pc, __func__, __LINE__);
 
@@ -3062,7 +3216,7 @@ void indent_text(void)
                else
                {
                   // indent after the return token
-                  frm.top().indent = frm.prev().indent + pc->len() + 1;
+                  frm.top().indent = frm.prev().indent + pc->Len() + 1;
                }
                log_indent();
                frm.top().indent_tmp = frm.prev().indent;
@@ -3085,7 +3239,12 @@ void indent_text(void)
 
          log_rule_B("indent_continue");
 
-         if (options::indent_continue() != 0)
+         if (options::indent_ignore_first_continue())
+         {
+            frm.top().indent = get_indent_first_continue(pc);
+            log_indent();
+         }
+         else if (options::indent_continue() != 0)
          {
             frm.top().indent = calc_indent_continue(frm, frm.size() - 2);
             log_indent();
@@ -3124,7 +3283,7 @@ void indent_text(void)
          while (  chunk_is_token(pc, CT_COND_COLON)
                && frm.top().type == CT_COND_COLON)
          {
-            frm.pop(__func__, __LINE__);
+            frm.pop(__func__, __LINE__, pc);
          }
          log_rule_B("indent_inside_ternary_operator");
 
@@ -3133,9 +3292,9 @@ void indent_text(void)
             && chunk_is_token(pc, 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));
-            frm.pop(__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));
+            frm.pop(__func__, __LINE__, pc);
             indent_column_set(frm.top().indent_tmp);
          }
          frm.push(pc, __func__, __LINE__);
@@ -3148,7 +3307,7 @@ void indent_text(void)
       }
       else if (  chunk_is_token(pc, CT_LAMBDA)
               && (language_is_set(LANG_CS | LANG_JAVA))
-              && chunk_get_next_ncnnlnp(pc)->type != CT_BRACE_OPEN
+              && pc->GetNextNcNnlNpp()->type != CT_BRACE_OPEN
               && options::indent_cs_delegate_body())
       {
          log_rule_B("indent_cs_delegate_body");
@@ -3156,15 +3315,15 @@ void indent_text(void)
          frm.top().indent = frm.prev().indent;
          log_indent();
 
-         if (  chunk_is_newline(chunk_get_prev_nc(pc))
-            && !are_chunks_in_same_line(frm.prev().pc, chunk_get_prev_ncnnl(pc)))
+         if (  chunk_is_newline(pc->GetPrevNc())
+            && !are_chunks_in_same_line(frm.prev().pc, 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(chunk_get_next_nc(pc))
+         else if (  chunk_is_newline(pc->GetNextNc())
                  && !are_chunks_in_same_line(frm.prev().pc, frm.top().pc))
          {
             frm.top().indent = frm.prev().indent + indent_size;
@@ -3176,7 +3335,7 @@ void indent_text(void)
       else if (  options::indent_oc_inside_msg_sel()
               && (  chunk_is_token(pc, CT_OC_MSG_FUNC)
                  || chunk_is_token(pc, CT_OC_MSG_NAME))
-              && chunk_is_token(chunk_get_next_ncnnl(pc), CT_OC_COLON)) // Issue #2658
+              && chunk_is_token(pc->GetNextNcNnl(), 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
@@ -3189,16 +3348,47 @@ void indent_text(void)
          frm.top().indent_tmp = frm.prev().indent_tmp;
          log_indent_tmp();
       }
+      else if (pc->IsComment())
+      {
+         // Issue #3294
+         Chunk *next = pc->GetNext();
+
+         if (chunk_is_token(next, 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));
+            frm.pop(__func__, __LINE__, pc);
+         }
+// uncomment the line below to get debug info
+// #define ANYTHING_ELSE
+#ifdef ANYTHING_ELSE
+         else
+         {
+            // 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(LSPACE, "\n\n%s(%d): WARNING: unrecognize indent_text:\n",
+                    __func__, __LINE__);
+         }
+#endif /* ANYTHING_ELSE */
+      }
       else
       {
          // 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(LSPACE, "\n\n%s(%d): WARNING: unrecognize indent_text:\n",
+                 __func__, __LINE__);
+#endif /* ANYTHING_ELSE */
       }
       // Handle shift expression continuation indenting
       size_t shiftcontcol = 0;
 
       log_rule_B("indent_shift");
 
-      if (  options::indent_shift()
+      if (  options::indent_shift() == 1
          && !pc->flags.test(PCF_IN_ENUM)
          && get_chunk_parent_type(pc) != CT_OPERATOR
          && pc->type != CT_COMMENT
@@ -3206,13 +3396,13 @@ void indent_text(void)
          && pc->type != CT_COMMENT_MULTI
          && pc->type != CT_BRACE_OPEN
          && pc->level > 0
-         && !chunk_is_blank(pc))
+         && !pc->IsEmptyText())
       {
          bool in_shift    = false;
          bool is_operator = false;
 
          // Are we in such an expression? Go both forwards and backwards.
-         chunk_t *tmp = pc;
+         Chunk *tmp = pc;
 
          do
          {
@@ -3222,7 +3412,7 @@ void indent_text(void)
                LOG_FMT(LINDENT2, "%s(%d): in_shift set to TRUE\n",
                        __func__, __LINE__);
 
-               tmp = chunk_get_prev_ncnnl(tmp);
+               tmp = tmp->GetPrevNcNnl();
 
                if (chunk_is_token(tmp, CT_OPERATOR))
                {
@@ -3230,9 +3420,9 @@ void indent_text(void)
                }
                break;
             }
-            tmp = chunk_get_prev_ncnnl(tmp);
+            tmp = tmp->GetPrevNcNnl();
          } while (  !in_shift
-                 && tmp != nullptr
+                 && tmp->IsNotNullChunk()
                  && tmp->type != CT_SEMICOLON
                  && tmp->type != CT_BRACE_OPEN
                  && tmp->type != CT_BRACE_CLOSE
@@ -3244,16 +3434,16 @@ void indent_text(void)
 
          do
          {
-            tmp = chunk_get_next_ncnnl(tmp);
+            tmp = tmp->GetNextNcNnl();
 
-            if (  tmp != nullptr
+            if (  tmp->IsNotNullChunk()
                && chunk_is_token(tmp, CT_SHIFT))
             {
                in_shift = true;
                LOG_FMT(LINDENT2, "%s(%d): in_shift set to TRUE\n",
                        __func__, __LINE__);
 
-               tmp = chunk_get_prev_ncnnl(tmp);
+               tmp = tmp->GetPrevNcNnl();
 
                if (chunk_is_token(tmp, CT_OPERATOR))
                {
@@ -3262,7 +3452,7 @@ void indent_text(void)
                break;
             }
          } while (  !in_shift
-                 && tmp != nullptr
+                 && tmp->IsNotNullChunk()
                  && tmp->type != CT_SEMICOLON
                  && tmp->type != CT_BRACE_OPEN
                  && tmp->type != CT_BRACE_CLOSE
@@ -3272,8 +3462,8 @@ void indent_text(void)
 
          LOG_FMT(LINDENT2, "%s(%d): in_shift is %s\n",
                  __func__, __LINE__, in_shift ? "TRUE" : "FALSE");
-         chunk_t *prev_nonl = chunk_get_prev_ncnnl(pc);
-         chunk_t *prev2     = chunk_get_prev_nc(pc);
+         Chunk *prev_nonl = pc->GetPrevNcNnl();
+         Chunk *prev2     = pc->GetPrevNc();
 
          if ((  chunk_is_semicolon(prev_nonl)
              || chunk_is_token(prev_nonl, CT_BRACE_OPEN)
@@ -3281,7 +3471,7 @@ void indent_text(void)
              || chunk_is_token(prev_nonl, CT_VBRACE_CLOSE)
              || chunk_is_token(prev_nonl, CT_VBRACE_OPEN)
              || chunk_is_token(prev_nonl, CT_CASE_COLON)
-             || (  prev_nonl != nullptr
+             || (  prev_nonl->IsNotNullChunk()
                 && prev_nonl->flags.test(PCF_IN_PREPROC)) != pc->flags.test(PCF_IN_PREPROC)
              || chunk_is_token(prev_nonl, CT_COMMA)
              || is_operator))
@@ -3331,7 +3521,11 @@ void indent_text(void)
       {
          log_rule_B("indent_continue");
 
-         if (options::indent_continue() != 0)
+         if (options::indent_ignore_first_continue())
+         {
+            vardefcol = get_indent_first_continue(pc);
+         }
+         else if (options::indent_continue() != 0)
          {
             vardefcol = calc_indent_continue(frm);
             // Setting frm.top().indent_cont = true in the top context when the indent is not also set
@@ -3340,7 +3534,7 @@ void indent_text(void)
             // should only be set if frm.top().indent is also set.
          }
          else if (  options::indent_var_def_cont()
-                 || chunk_is_newline(chunk_get_prev(pc)))
+                 || chunk_is_newline(pc->GetPrev()))
          {
             log_rule_B("indent_var_def_cont");
             vardefcol = frm.top().indent + indent_size;
@@ -3350,20 +3544,20 @@ void indent_text(void)
             // Issue #3010
             vardefcol = pc->column;
             // BUT, we need to skip backward over any '*'
-            chunk_t *tmp = chunk_get_prev_nc(pc);
+            Chunk *tmp = pc->GetPrevNc();
 
             while (chunk_is_token(tmp, CT_PTR_TYPE))
             {
                vardefcol = tmp->column;
-               tmp       = chunk_get_prev_nc(tmp);
+               tmp       = tmp->GetPrevNc();
             }
             // BUT, we need to skip backward over any '::' or TYPE
-            //tmp = chunk_get_prev_nc(pc);
+            //tmp = pc->GetPrevNc();
 
             //if (chunk_is_token(tmp, CT_DC_MEMBER))
             //{
             //   // look for a type
-            //   chunk_t *tmp2 = chunk_get_prev_nc(tmp);
+            //   Chunk *tmp2 = tmp->GetPrevNc();
             //   if (chunk_is_token(tmp2, CT_TYPE))
             //   {
             //      // we have something like "SomeLongNamespaceName::Foo()"
@@ -3377,7 +3571,8 @@ void indent_text(void)
 
       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_FUNCTION
+               || get_chunk_parent_type(pc) == CT_CLASS))) //Issue #3576
       {
          vardefcol = 0;
       }
@@ -3385,7 +3580,7 @@ void indent_text(void)
       // Indent the line if needed
       if (  did_newline
          && !chunk_is_newline(pc)
-         && (pc->len() != 0))
+         && (pc->Len() != 0))
       {
          pc->column_indent = frm.top().indent_tab;
 
@@ -3395,7 +3590,7 @@ void indent_text(void)
             pc->indent.delta = frm.top().ip.delta;
          }
          LOG_FMT(LINDENT2, "%s(%d): orig_line is %zu, pc->column_indent is %zu, indent_column is %zu, for '%s'\n",
-                 __func__, __LINE__, pc->orig_line, pc->column_indent, indent_column, pc->elided_text(copy));
+                 __func__, __LINE__, pc->orig_line, pc->column_indent, indent_column, pc->ElidedText(copy));
 
          /*
           * Check for special continuations.
@@ -3403,9 +3598,9 @@ void indent_text(void)
           * everything else
           */
 
-         auto prev  = chunk_get_prev_ncnnl(pc);
-         auto prevv = chunk_get_prev_ncnnl(prev);
-         auto next  = chunk_get_next_ncnnl(pc);
+         auto prev  = pc->GetPrevNcNnl();
+         auto prevv = prev->GetPrevNcNnl();
+         auto next  = pc->GetNextNcNnl();
 
          bool do_vardefcol = false;
 
@@ -3416,14 +3611,14 @@ void indent_text(void)
                || chunk_is_token(prev, CT_PTR_TYPE)
                || chunk_is_token(prev, CT_WORD)))
          {
-            chunk_t *tmp = pc;
+            Chunk *tmp = pc;
 
             while (chunk_is_token(tmp, CT_PTR_TYPE))
             {
-               tmp = chunk_get_next_ncnnl(tmp);
+               tmp = tmp->GetNextNcNnl();
             }
             LOG_FMT(LINDENT2, "%s(%d): orig_line is %zu, for '%s'",
-                    __func__, __LINE__, tmp->orig_line, tmp->text());
+                    __func__, __LINE__, tmp->orig_line, tmp->Text());
             LOG_FMT(LINDENT2, " tmp->flags: ");
             log_pcf_flags(LINDENT2, tmp->flags);                   // Issue #2332
 
@@ -3446,7 +3641,7 @@ void indent_text(void)
             log_rule_B("indent_preserve_sql");
             reindent_line(pc, sql_col + (pc->orig_col - 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->column, sql_col, sql_orig_col);
          }
          else if (  !options::indent_member_single()
                  && !pc->flags.test(PCF_STMT_START)
@@ -3498,7 +3693,7 @@ void indent_text(void)
                     __func__, __LINE__, pc->orig_line, tmp);
             reindent_line(pc, tmp);
          }
-         else if (chunk_is_comment(pc))
+         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);
@@ -3507,7 +3702,7 @@ void indent_text(void)
          else if (chunk_is_token(pc, 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());
+                    __func__, __LINE__, pc->orig_line, indent_column, pc->Text());
             reindent_line(pc, indent_column);
          }
          else if (  chunk_is_paren_close(pc)
@@ -3520,28 +3715,36 @@ void indent_text(void)
             LOG_FMT(LINDLINE, "%s(%d): indent_column is %zu\n",
                     __func__, __LINE__, indent_column);
 
-            if (frm.poped().type == c_token_t(pc->type - 1))
+            if (frm.poped().type == E_Token(pc->type - 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));
-               chunk_t *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));
-               chunk_t *ck2 = chunk_get_prev(ck1);
-               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));
-
-               /*
-                * If the open parenthesis was the first thing on the line or we
-                * are doing mode 1, then put the close parenthesis in the same
-                * column
-                */
+               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));
+               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));
+               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_rule_B("indent_paren_close");
 
-               if (  chunk_is_newline(ck2)
-                  || (options::indent_paren_close() == 1))
+               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);
+                  LOG_FMT(LINDLINE, "%s(%d): [%zu:%zu] indent_column set to %zu\n",
+                          __func__, __LINE__, ck2->orig_line, ck2->orig_col, indent_column);
+               }
+               else if (  chunk_is_newline(ck2)
+                       || (options::indent_paren_close() == 1))
                {
+                  /*
+                   * If the open parenthesis was the first thing on the line or we
+                   * are doing mode 1, then put the close parenthesis in the same
+                   * 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);
@@ -3550,8 +3753,6 @@ void indent_text(void)
                }
                else
                {
-                  log_rule_B("indent_paren_close");
-
                   if (options::indent_paren_close() != 2)
                   {
                      // indent_paren_close is 0 or 1
@@ -3585,22 +3786,28 @@ 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, ck2->orig_col is %zu, ck2->Text() is '%s'\n",
+                             __func__, __LINE__, ck2->orig_line, ck2->orig_col, ck2->Text());
 
-                     if (chunk_get_prev(pc)->type == CT_NEWLINE)
+                     if (pc->GetPrev()->type == 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->orig_line, pc->orig_col, pc->Text(), get_token_name(pc->type));
                         LOG_FMT(LINDLINE, "%s(%d): prev is <newline>\n",
                                 __func__, __LINE__);
-                        chunk_t *search = pc;
+                        Chunk *search = pc;
+
+                        while (chunk_is_paren_close(search->GetNext()))
+                        {
+                           search = search->GetNext();
+                        }
+                        Chunk *searchNext = search->GetNext();
 
-                        while (chunk_is_paren_close(chunk_get_next(search)))
+                        // Issue #3407 - Skip over a possible 'noexcept' keyword before going forward.
+                        if (searchNext->type == CT_NOEXCEPT)
                         {
-                           search = chunk_get_next(search);
+                           searchNext = searchNext->GetNext();
                         }
-                        chunk_t *searchNext = chunk_get_next(search);
 
                         if (  searchNext->type == CT_SEMICOLON
                            || searchNext->type == CT_MEMBER            // Issue #2582
@@ -3610,7 +3817,7 @@ void indent_text(void)
                            search = chunk_skip_to_match_rev(search);
 
                            if (  options::indent_oc_inside_msg_sel()
-                              && chunk_is_token(chunk_get_prev_ncnnl(search), CT_OC_COLON)
+                              && chunk_is_token(search->GetPrevNcNnl(), CT_OC_COLON)
                               && (  frm.top().type == CT_OC_MSG_FUNC
                                  || frm.top().type == CT_OC_MSG_NAME)) // Issue #2658
                            {
@@ -3627,11 +3834,11 @@ void indent_text(void)
                            }
                            else
                            {
-                              search = chunk_get_next(chunk_get_prev_nl(search));
+                              search = search->GetPrevNl()->GetNext();
 
-                              if (search == nullptr)
+                              if (search->IsNullChunk())
                               {
-                                 search = chunk_get_head();
+                                 search = Chunk::GetHead();
                               }
                               indent_column_set(search->column);
                            }
@@ -3642,16 +3849,16 @@ 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());
+                    __func__, __LINE__, pc->orig_line, 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)));
-            chunk_t *prev2 = chunk_get_prev(pc);                  // Issue #2930
+            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());
-            chunk_t *next2 = chunk_get_next(pc);
+                    __func__, __LINE__, prev2->orig_line, 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());
+                    __func__, __LINE__, next2->orig_line, next2->Text());
 
             if (  get_chunk_parent_type(pc) == CT_FUNC_DEF
                && chunk_is_newline(prev2)
@@ -3675,24 +3882,37 @@ void indent_text(void)
          }
          else if (chunk_is_token(pc, CT_COMMA))
          {
-            log_rule_B("indent_comma_paren");
-            bool comma_paren = options::indent_comma_paren()
-                               && chunk_is_paren_open(frm.top().pc);
-            log_rule_B("indent_comma_brace");
-            bool comma_brace = options::indent_comma_brace()
-                               && chunk_is_opening_brace(frm.top().pc);
+            bool align  = false;
+            bool ignore = false;
 
-            if (comma_paren || comma_brace)
+            if (chunk_is_paren_open(frm.top().pc))
+            {
+               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;
+            }
+            else if (chunk_is_opening_brace(frm.top().pc))
+            {
+               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;
+            }
+
+            if (ignore)
+            {
+               indent_column_set(pc->orig_col);
+            }
+            else if (align)
             {
                indent_column_set(frm.top().pc->column);
             }
             LOG_FMT(LINDENT, "%s(%d): %zu] comma => %zu [%s]\n",
-                    __func__, __LINE__, pc->orig_line, indent_column, pc->text());
+                    __func__, __LINE__, pc->orig_line, indent_column, pc->Text());
             reindent_line(pc, indent_column);
          }
          else if (  options::indent_func_const()
                  && chunk_is_token(pc, CT_QUALIFIER)
-                 && strncasecmp(pc->text(), "const", pc->len()) == 0
+                 && strncasecmp(pc->Text(), "const", pc->Len()) == 0
                  && (  next == nullptr
                     || chunk_is_token(next, CT_BRACED)
                     || chunk_is_token(next, CT_BRACE_OPEN)
@@ -3705,7 +3925,7 @@ void indent_text(void)
             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->orig_line, indent_column, pc->Text());
             reindent_line(pc, indent_column);
          }
          else if (  options::indent_func_throw()
@@ -3716,46 +3936,112 @@ void indent_text(void)
             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->orig_line, indent_column, pc->Text());
             reindent_line(pc, indent_column);
          }
-         else if (  pc->flags.test(PCF_IN_FOR)
-                 && options::indent_semicolon_for_paren()
-                 && chunk_is_token(pc, CT_SEMICOLON))
+         else if (chunk_is_token(pc, CT_SEMICOLON))
          {
-            log_rule_B("indent_semicolon_for_paren");
-            indent_column_set(frm.top().pc->column);
+            if (  pc->flags.test(PCF_IN_FOR)
+               && options::indent_semicolon_for_paren())
+            {
+               log_rule_B("indent_semicolon_for_paren");
+               indent_column_set(frm.top().pc->column);
 
-            log_rule_B("indent_first_for_expr");
+               log_rule_B("indent_first_for_expr");
 
-            if (options::indent_first_for_expr())
+               if (options::indent_first_for_expr())
+               {
+                  reindent_line(frm.top().pc->GetNext(),
+                                indent_column + pc->Len() + 1);
+               }
+               LOG_FMT(LINDENT, "%s(%d): %zu] SEMICOLON => %zu [%s]\n",
+                       __func__, __LINE__, pc->orig_line, indent_column, pc->Text());
+               reindent_line(pc, indent_column);
+            }
+            else
             {
-               reindent_line(chunk_get_next(frm.top().pc),
-                             indent_column + pc->len() + 1);
+               log_rule_B("indent_ignore_semicolon");
+
+               if (options::indent_ignore_semicolon())
+               {
+                  indent_column_set(pc->orig_col);
+               }
+               LOG_FMT(LINDENT, "%s(%d): %zu] semicolon => %zu [%s]\n",
+                       __func__, __LINE__, pc->orig_line, indent_column, pc->Text());
+               reindent_line(pc, indent_column);
             }
-            LOG_FMT(LINDENT, "%s(%d): %zu] SEMICOLON => %zu [%s]\n",
-                    __func__, __LINE__, pc->orig_line, indent_column, pc->text());
-            reindent_line(pc, indent_column);
          }
          else if (chunk_is_token(pc, CT_BOOL))
          {
-            log_rule_B("indent_bool_paren");
-
-            if (  options::indent_bool_paren()
-               && chunk_is_paren_open(frm.top().pc))
+            if (chunk_is_paren_open(frm.top().pc))
             {
-               indent_column_set(frm.top().pc->column);
+               log_rule_B("indent_bool_paren");
+
+               if (options::indent_bool_paren() == (int)indent_mode_e::IGNORE)
+               {
+                  indent_column_set(pc->orig_col);
+               }
+               else if (options::indent_bool_paren() == (int)indent_mode_e::ALIGN)
+               {
+                  indent_column_set(frm.top().pc->column);
 
-               log_rule_B("indent_first_bool_expr");
+                  log_rule_B("indent_first_bool_expr");
 
-               if (options::indent_first_bool_expr())
+                  if (options::indent_first_bool_expr())
+                  {
+                     reindent_line(frm.top().pc->GetNext(),
+                                   indent_column + pc->Len() + 1);
+                  }
+               }
+            }
+            else
+            {
+               log_rule_B("indent_ignore_bool");
+
+               if (options::indent_ignore_bool())
                {
-                  reindent_line(chunk_get_next(frm.top().pc),
-                                indent_column + pc->len() + 1);
+                  indent_column_set(pc->orig_col);
                }
             }
             LOG_FMT(LINDENT, "%s(%d): %zu] bool => %zu [%s]\n",
-                    __func__, __LINE__, pc->orig_line, indent_column, pc->text());
+                    __func__, __LINE__, pc->orig_line, indent_column, pc->Text());
+            reindent_line(pc, indent_column);
+         }
+         else if (  chunk_is_token(pc, CT_ARITH)
+                 || chunk_is_token(pc, CT_CARET))
+         {
+            log_rule_B("indent_ignore_arith");
+
+            if (options::indent_ignore_arith())
+            {
+               indent_column_set(pc->orig_col);
+            }
+            LOG_FMT(LINDENT, "%s(%d): %zu] arith => %zu [%s]\n",
+                    __func__, __LINE__, pc->orig_line, indent_column, pc->Text());
+            reindent_line(pc, indent_column);
+         }
+         else if (chunk_is_token(pc, CT_SHIFT))
+         {
+            log_rule_B("indent_shift");
+
+            if (options::indent_shift() == -1)
+            {
+               indent_column_set(pc->orig_col);
+            }
+            LOG_FMT(LINDENT, "%s(%d): %zu] shift => %zu [%s]\n",
+                    __func__, __LINE__, pc->orig_line, indent_column, pc->Text());
+            reindent_line(pc, indent_column);
+         }
+         else if (chunk_is_token(pc, CT_ASSIGN))
+         {
+            log_rule_B("indent_ignore_assign");
+
+            if (options::indent_ignore_assign())
+            {
+               indent_column_set(pc->orig_col);
+            }
+            LOG_FMT(LINDENT, "%s(%d): %zu] assign => %zu [%s]\n",
+                    __func__, __LINE__, pc->orig_line, indent_column, pc->Text());
             reindent_line(pc, indent_column);
          }
          else if (  options::indent_ternary_operator() == 1
@@ -3768,16 +4054,16 @@ void indent_text(void)
                     || chunk_is_token(pc, CT_PAREN_OPEN)))
          {
             log_rule_B("indent_ternary_operator");
-            chunk_t *tmp = chunk_get_prev_type(prev, CT_QUESTION, -1);
+            Chunk *tmp = prev->GetPrevType(CT_QUESTION, -1);
 
-            if (tmp != nullptr)
+            if (tmp->IsNotNullChunk())
             {
-               tmp = chunk_get_next_ncnnl(tmp);
+               tmp = tmp->GetNextNcNnl();
 
-               if (tmp != nullptr)
+               if (tmp->IsNotNullChunk())
                {
                   LOG_FMT(LINDENT, "%s: %zu] ternarydefcol => %zu [%s]\n",
-                          __func__, pc->orig_line, tmp->column, pc->text());
+                          __func__, pc->orig_line, tmp->column, pc->Text());
                   reindent_line(pc, tmp->column);
                }
             }
@@ -3786,12 +4072,12 @@ void indent_text(void)
                  && chunk_is_token(pc, CT_COND_COLON))
          {
             log_rule_B("indent_ternary_operator");
-            chunk_t *tmp = chunk_get_prev_type(pc, CT_QUESTION, -1);
+            Chunk *tmp = pc->GetPrevType(CT_QUESTION, -1);
 
-            if (tmp != nullptr)
+            if (tmp->IsNotNullChunk())
             {
                LOG_FMT(LINDENT, "%s: %zu] ternarydefcol => %zu [%s]\n",
-                       __func__, pc->orig_line, tmp->column, pc->text());
+                       __func__, pc->orig_line, tmp->column, pc->Text());
                reindent_line(pc, tmp->column);
             }
          }
@@ -3829,8 +4115,8 @@ void indent_text(void)
                   }
                }
             }
-            LOG_FMT(LINDENT, "%s(%d): pc->line is %zu, pc->column is %zu, pc->text() is '%s, indent_column is %zu\n",
-                    __func__, __LINE__, pc->orig_line, pc->column, pc->text(), indent_column);
+            LOG_FMT(LINDENT, "%s(%d): pc->line is %zu, pc->column is %zu, pc->Text() is '%s, indent_column is %zu\n",
+                    __func__, __LINE__, pc->orig_line, pc->column, pc->Text(), indent_column);
 
             if (  use_indent
                && pc->type != CT_PP_IGNORE) // Leave indentation alone for PP_IGNORE tokens
@@ -3855,12 +4141,12 @@ void indent_text(void)
                      && get_type_of_the_parent(pc) == CT_SWITCH)
                   {
                      // look for a case before Issue #2735
-                     chunk_t *whereIsCase = chunk_get_prev_type(pc, CT_CASE, pc->level);
+                     Chunk *whereIsCase = pc->GetPrevType(CT_CASE, pc->level);
 
-                     if (whereIsCase != nullptr)
+                     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->orig_line, whereIsCase->orig_col, whereIsCase->Text());
                         LOG_FMT(LINDENT, "%s(%d): column is %zu\n",
                                 __func__, __LINE__, whereIsCase->column);
                         reindent_line(pc, whereIsCase->column);
@@ -3868,8 +4154,8 @@ void indent_text(void)
                   }
                   else
                   {
-                     LOG_FMT(LINDENT, "%s(%d): orig_line is %zu, indent 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->orig_line, indent_column, pc->Text());
                      reindent_line(pc, indent_column);
                   }
                }
@@ -3877,14 +4163,14 @@ void indent_text(void)
                        && language_is_set(LANG_CPP))
                {
                   // comment name: XXXXXXXXXXXXXXXXXXXXXXXXXX
-                  LOG_FMT(LINDENT, "%s(%d): orig_line is %zu, indent 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->orig_line, 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)->type is %s\n",
+                          __func__, __LINE__, (frm.at(frm_size - 1).pc)->Text(), get_token_name((frm.at(frm_size - 1).pc)->type));
                   // get the token before
                   const size_t temp_ttidx = frm_size - 2;
 
@@ -3893,17 +4179,17 @@ void indent_text(void)
                      indent_column = 1 + indent_size;
                      reindent_line(pc, indent_column);
                   }
-                  else if (temp_ttidx > 0)
+                  else
                   {
-                     chunk_t *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));
+                     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));
 
                      size_t vor_col = 0;
 
                      if (chunk_is_token(token_before, CT_ASSIGN))
                      {
-                        chunk_t *before_Assign = frm.at(temp_ttidx - 1).pc;
+                        Chunk *before_Assign = frm.at(temp_ttidx - 1).pc;
 
                         if (before_Assign == nullptr)
                         {
@@ -3912,24 +4198,24 @@ void indent_text(void)
                         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);
+                           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);
                            indent_column = vor_col + 2 * indent_size;
                         }
                      }
                      else if (chunk_is_token(token_before, 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);
+                        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);
                         indent_column = vor_col + 2 * indent_size;
                      }
                      else if (chunk_is_token(token_before, CT_RETURN))
                      {
-                        chunk_t *before_Return = frm.at(temp_ttidx - 1).pc;
+                        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);
+                        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);
                         indent_column = vor_col + 2 * indent_size;
                      }
                      else
@@ -3938,17 +4224,12 @@ void indent_text(void)
                      }
                      reindent_line(pc, indent_column);
                   }
-                  else
-                  {
-                     LOG_FMT(LINDPC, "%s(%d): temp_ttidx is zero\n",
-                             __func__, __LINE__);
-                  }
                   reindent_line(pc, indent_column);
                }
                else
                {
-                  LOG_FMT(LINDENT, "%s(%d): orig_line is %zu, indent 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->orig_line, indent_column, pc->Text());
                   reindent_line(pc, indent_column);
                }
             }
@@ -3986,7 +4267,7 @@ void indent_text(void)
                            ? (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->orig_line, indent, pc->Text());
                   reindent_line(pc, indent);
                }
             }
@@ -4024,10 +4305,10 @@ void indent_text(void)
 
       if (  options::indent_xml_string() > 0
          && chunk_is_token(pc, CT_STRING)
-         && pc->len() > 4
+         && pc->Len() > 4
          && pc->str[1] == '<'
          && pc->str[2] != '/'
-         && pc->str[pc->len() - 3] != '/')
+         && pc->str[pc->Len() - 3] != '/')
       {
          if (xml_indent <= 0)
          {
@@ -4041,13 +4322,22 @@ void indent_text(void)
 
       if (  chunk_is_token(pc, CT_CLASS)
          && language_is_set(LANG_CPP | LANG_JAVA)
-         && options::indent_continue_class_head() != 0
+         && (  options::indent_ignore_first_continue()
+            || options::indent_continue_class_head() != 0)
          && !classFound)
       {
-         LOG_FMT(LINDENT, "%s(%d): orig_line is %zu, CT_CLASS found and UO_indent_continue != 0, OPEN IT\n",
+         LOG_FMT(LINDENT, "%s(%d): orig_line is %zu, CT_CLASS found, OPEN IT\n",
                  __func__, __LINE__, pc->orig_line);
          frm.push(pc, __func__, __LINE__);
-         frm.top().indent = options::indent_continue_class_head() + 1;
+
+         if (options::indent_ignore_first_continue())
+         {
+            frm.top().indent = get_indent_first_continue(pc);
+         }
+         else
+         {
+            frm.top().indent = frm.prev().indent + options::indent_continue_class_head();
+         }
          log_indent();
 
          frm.top().indent_tmp = frm.top().indent;
@@ -4055,7 +4345,9 @@ void indent_text(void)
          log_indent_tmp();
          classFound = true;
       }
-      pc = chunk_get_next(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));
    }
 null_pc:
 
@@ -4063,14 +4355,14 @@ null_pc:
    while (  !frm.empty()
          && frm.top().in_preproc)
    {
-      frm.pop(__func__, __LINE__);
+      frm.pop(__func__, __LINE__, pc);
    }
 
    // Throw out any VBRACE_OPEN at the end - implied with the end of file
    while (  !frm.empty()
          && frm.top().type == CT_VBRACE_OPEN)
    {
-      frm.pop(__func__, __LINE__);
+      frm.pop(__func__, __LINE__, pc);
    }
 
    for (size_t idx_temp = 1; idx_temp < frm.size(); idx_temp++)
@@ -4091,7 +4383,7 @@ null_pc:
 } // indent_text
 
 
-static bool single_line_comment_indent_rule_applies(chunk_t *start, bool forward)
+static bool single_line_comment_indent_rule_applies(Chunk *start, bool forward)
 {
    LOG_FUNC_ENTRY();
 
@@ -4099,10 +4391,15 @@ static bool single_line_comment_indent_rule_applies(chunk_t *start, bool forward
    {
       return(false);
    }
-   chunk_t *pc      = start;
-   size_t  nl_count = 0;
+   Chunk *pc = start;
 
-   while ((pc = forward ? chunk_get_next(pc) : chunk_get_prev(pc)) != nullptr)
+   if (pc == nullptr)
+   {
+      pc = Chunk::NullChunkPtr;
+   }
+   size_t nl_count = 0;
+
+   while ((pc = forward ? pc->GetNext() : pc->GetPrev())->IsNotNullChunk())
    {
       if (chunk_is_newline(pc))
       {
@@ -4136,7 +4433,7 @@ static bool single_line_comment_indent_rule_applies(chunk_t *start, bool forward
 } // single_line_comment_indent_rule_applies
 
 
-static bool is_end_of_assignment(chunk_t *pc, const ParseFrame &frm)
+static bool is_end_of_assignment(Chunk *pc, const ParseFrame &frm)
 {
    return(  (  frm.top().type == CT_ASSIGN_NL
             || frm.top().type == CT_MEMBER
@@ -4151,42 +4448,42 @@ static bool is_end_of_assignment(chunk_t *pc, const ParseFrame &frm)
 }
 
 
-static size_t calc_comment_next_col_diff(chunk_t *pc)
+static size_t calc_comment_next_col_diff(Chunk *pc)
 {
-   chunk_t *next = pc; // assumes pc has a comment type
+   Chunk *next = pc; // assumes pc has a comment type
 
-   LOG_FMT(LCMTIND, "%s(%d): next->text() is '%s'\n",
-           __func__, __LINE__, next->text());
+   LOG_FMT(LCMTIND, "%s(%d): next->Text() is '%s'\n",
+           __func__, __LINE__, next->Text());
 
    // Note: every comment is squashed into a single token
    // (including newline chars for multiline comments) and is followed by
    // a newline token (unless there are no more tokens left)
    do
    {
-      chunk_t *newline_token = chunk_get_next(next);
-      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);
+      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);
 
-      if (  newline_token == nullptr
+      if (  newline_token->IsNullChunk()
          || newline_token->nl_count > 1)
       {
          return(5000);  // FIXME: Max thresh magic number 5000
       }
-      next = chunk_get_next(newline_token);
+      next = newline_token->GetNext();
 
-      if (next != nullptr)
+      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->orig_line, next->orig_col);
       }
-   } while (chunk_is_comment(next));
+   } while (next->IsComment());
 
-   if (next == nullptr)
+   if (next->IsNullChunk())
    {
       return(5000);     // FIXME: Max thresh magic number 5000
    }
-   LOG_FMT(LCMTIND, "%s(%d): next->text() is '%s'\n",
-           __func__, __LINE__, next->text());
+   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
@@ -4194,13 +4491,13 @@ static size_t calc_comment_next_col_diff(chunk_t *pc)
 }
 
 
-static void indent_comment(chunk_t *pc, size_t col)
+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->elided_text(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->orig_line, pc->orig_col, pc->level);
 
    // force column 1 comment to column 1 if not changing them
    log_rule_B("indent_col1_comment");
@@ -4213,26 +4510,26 @@ static void indent_comment(chunk_t *pc, size_t col)
       reindent_line(pc, 1);
       return;
    }
-   chunk_t *nl = chunk_get_prev(pc);
+   Chunk *nl = pc->GetPrev();
 
-   if (nl != nullptr)
+   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->orig_line, nl->orig_col, nl->level);
    }
 
    if (pc->orig_col > 1)
    {
-      chunk_t *prev = chunk_get_prev(nl);
+      Chunk *prev = nl->GetPrev();
 
-      if (prev != nullptr)
+      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_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);
       }
 
-      if (  chunk_is_comment(prev)
+      if (  prev->IsComment()
          && nl->nl_count == 1)
       {
          const size_t prev_col_diff = (prev->orig_col > pc->orig_col)
@@ -4247,10 +4544,10 @@ static void indent_comment(chunk_t *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");
-            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");
+            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");
+            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");
 
             if (chunk_is_Doxygen_comment(prev) == chunk_is_Doxygen_comment(pc))
             {
@@ -4313,7 +4610,9 @@ bool ifdef_over_whole_file(void)
    LOG_FUNC_ENTRY();
 
    // if requested, treat an #if that guards the entire file the same as any other #if
-   if (options::pp_indent_in_guard())
+   // if running as frag, assume #if is not a guard
+   if (  options::pp_indent_in_guard()
+      || cpd.frag)
    {
       return(false);
    }
@@ -4323,16 +4622,16 @@ bool ifdef_over_whole_file(void)
    {
       return(cpd.ifdef_over_whole_file > 0);
    }
-   chunk_t *start_pp = nullptr;
-   chunk_t *end_pp   = nullptr;
-   size_t  IFstage   = 0;
+   Chunk  *start_pp = Chunk::NullChunkPtr;
+   Chunk  *end_pp   = Chunk::NullChunkPtr;
+   size_t IFstage   = 0;
 
-   for (chunk_t *pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next(pc))
+   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, pc->orig_col is %zu, pc->Text() is '%s'\n",
+              __func__, __LINE__, pc->pp_level, pc->orig_line, pc->orig_col, pc->Text());
 
-      if (  chunk_is_comment(pc)
+      if (  pc->IsComment()
          || chunk_is_newline(pc))
       {
          continue;
@@ -4345,9 +4644,9 @@ bool ifdef_over_whole_file(void)
          {
             break;
          }
-         chunk_t *next = chunk_get_next(pc);
+         Chunk *next = pc->GetNext();
 
-         if (  next == nullptr
+         if (  next->IsNullChunk()
             || next->type != CT_PP_IF)
          {
             break;
@@ -4400,18 +4699,18 @@ void indent_preproc(void)
    // Scan to see if the whole file is covered by one #ifdef
    const size_t pp_level_sub = ifdef_over_whole_file() ? 1 : 0;
 
-   for (chunk_t *pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next(pc))
+   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->orig_line, pc->orig_col, pc->Text());
 
       if (pc->type != CT_PREPROC)
       {
          continue;
       }
-      chunk_t *next = chunk_get_next_ncnnl(pc);
+      Chunk *next = pc->GetNextNcNnl();
 
-      if (next == nullptr)
+      if (next->IsNullChunk())
       {
          break;
       }
@@ -4442,19 +4741,23 @@ void indent_preproc(void)
             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));
+            reindent_line(next, pc->column + pc->Len() + (pp_level * mult));
          }
          else if (options::pp_space() & IARF_REMOVE)
          {
             log_rule_B("pp_space");
-            reindent_line(next, pc->column + pc->len());
+            reindent_line(next, pc->column + pc->Len());
          }
       }
       // Mark as already handled if not region stuff or in column 1
       log_rule_B("pp_indent_at_level");
 
-      if (  (  !options::pp_indent_at_level()
-            || (pc->brace_level <= ((get_chunk_parent_type(pc) == CT_PP_DEFINE) ? 1 : 0)))
+      bool at_file_level = pc->brace_level <= ((get_chunk_parent_type(pc) == 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)
       {
@@ -4467,7 +4770,7 @@ void indent_preproc(void)
          }
       }
       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(),
+              __func__, __LINE__, pc->orig_line, 1 + pp_level, pc->Len(),
               next ? next->column : -1);
    }
 } // indent_preproc
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/indent.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/indent.h
index dc703eed..9e91a94a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/indent.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/indent.h
@@ -31,7 +31,7 @@ void indent_preproc(void);
  * @param pc      chunk at the start of the line
  * @param column  desired column
  */
-void indent_to_column(chunk_t *pc, size_t column);
+void indent_to_column(Chunk *pc, size_t column);
 
 
 /**
@@ -40,7 +40,7 @@ void indent_to_column(chunk_t *pc, size_t column);
  * @param pc      chunk at the start of the line
  * @param column  desired column
  */
-void align_to_column(chunk_t *pc, size_t column);
+void align_to_column(Chunk *pc, size_t column);
 
 
 //! Scan to see if the whole file is covered by one #ifdef
@@ -53,7 +53,7 @@ bool ifdef_over_whole_file(void);
  * @param pc      The chunk at the start of the line
  * @param column  The desired column
  */
-void reindent_line(chunk_t *pc, size_t column);
+void reindent_line(Chunk *pc, size_t column);
 
 
 #endif /* INDENT_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/keywords.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/keywords.cpp
index 56a8a693..78fb2134 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/keywords.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/keywords.cpp
@@ -12,6 +12,8 @@
 
 #include "args.h"
 #include "prototypes.h"
+#include "uncrustify.h"
+#include "uncrustify_limits.h"
 
 #include <cerrno>
 #include <map>
@@ -20,7 +22,7 @@
 using namespace std;
 
 // Dynamic keyword map
-typedef map<string, c_token_t> dkwmap;
+typedef map<string, E_Token> dkwmap;
 static dkwmap dkwm;
 
 
@@ -45,8 +47,14 @@ static int kw_compare(const void *p1, const void *p2);
 static const chunk_tag_t *kw_static_first(const chunk_tag_t *tag);
 
 
-//static const chunk_tag_t *kw_static_match(const chunk_tag_t *tag);
-static const chunk_tag_t *kw_static_match(const chunk_tag_t *tag, int lang_flags);
+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.
+ */
+
+static chunk_tag_t keyword_for_lang[uncrustify::limits::MAX_KEYWORDS];
+static size_t      language_count;
 
 /**
  * interesting static keywords - keep sorted.
@@ -54,7 +62,7 @@ static const chunk_tag_t *kw_static_match(const chunk_tag_t *tag, int lang_flags
  */
 static chunk_tag_t keywords[] =
 {
-   // TODO: it might be useful if users could add there custom keywords to this list
+   // TODO: it might be useful if users could add their custom keywords to this list
    { "@autoreleasepool",                CT_AUTORELEASEPOOL,  LANG_OC                                                                     },
    { "@available",                      CT_OC_AVAILABLE,     LANG_OC                                                                     },
    { "@catch",                          CT_CATCH,            LANG_OC                                                                     },
@@ -81,55 +89,55 @@ static chunk_tag_t keywords[] =
    { "BOOL",                            CT_TYPE,             LANG_OC                                                                     },
    { "NS_ENUM",                         CT_ENUM,             LANG_OC                                                                     },
    { "NS_OPTIONS",                      CT_ENUM,             LANG_OC                                                                     },
-   { "Q_EMIT",                          CT_Q_EMIT,           LANG_CPP                                                                    }, // guy 2015-10-16
-   { "Q_FOREACH",                       CT_FOR,              LANG_CPP                                                                    }, // guy 2015-09-23
-   { "Q_FOREVER",                       CT_Q_FOREVER,        LANG_CPP                                                                    }, // guy 2015-10-18
-   { "Q_GADGET",                        CT_Q_GADGET,         LANG_CPP                                                                    }, // guy 2016-05-04
+   { "Q_EMIT",                          CT_Q_EMIT,           LANG_CPP                                                                    },
+   { "Q_FOREACH",                       CT_FOR,              LANG_CPP                                                                    },
+   { "Q_FOREVER",                       CT_Q_FOREVER,        LANG_CPP                                                                    },
+   { "Q_GADGET",                        CT_Q_GADGET,         LANG_CPP                                                                    },
    { "Q_OBJECT",                        CT_COMMENT_EMBED,    LANG_CPP                                                                    },
    { "Q_SIGNALS",                       CT_ACCESS,           LANG_CPP                                                                    },
-   { "_Bool",                           CT_TYPE,             LANG_C                                                                      },
-   { "_Complex",                        CT_TYPE,             LANG_C                                                                      },
-   { "_Imaginary",                      CT_TYPE,             LANG_C                                                                      },
+   { "_Bool",                           CT_TYPE,             LANG_C | LANG_CPP                                                           },
+   { "_Complex",                        CT_TYPE,             LANG_C | LANG_CPP                                                           },
+   { "_Imaginary",                      CT_TYPE,             LANG_C | LANG_CPP                                                           },
    { "_Nonnull",                        CT_QUALIFIER,        LANG_OC                                                                     },
    { "_Null_unspecified",               CT_QUALIFIER,        LANG_OC                                                                     },
    { "_Nullable",                       CT_QUALIFIER,        LANG_OC                                                                     },
    { "_Pragma",                         CT_PP_PRAGMA,        LANG_ALL | FLAG_PP                                                          },
-   { "__DI__",                          CT_DI,               LANG_C                                                                      },
-   { "__HI__",                          CT_HI,               LANG_C                                                                      },
-   { "__QI__",                          CT_QI,               LANG_C                                                                      },
-   { "__SI__",                          CT_SI,               LANG_C                                                                      },
-   { "__asm__",                         CT_ASM,              LANG_C                                                                      },
-   { "__attribute__",                   CT_ATTRIBUTE,        LANG_C                                                                      },
-   { "__autoreleasing",                 CT_QUALIFIER,        LANG_C                                                                      },
-   { "__block",                         CT_QUALIFIER,        LANG_C                                                                      },
-   { "__bridge",                        CT_QUALIFIER,        LANG_C                                                                      },
-   { "__bridge_retained",               CT_QUALIFIER,        LANG_C                                                                      },
-   { "__bridge_transfer",               CT_QUALIFIER,        LANG_C                                                                      },
-   { "__const__",                       CT_QUALIFIER,        LANG_C                                                                      },
-   { "__declspec",                      CT_DECLSPEC,         LANG_C                                                                      },
-   { "__except",                        CT_CATCH,            LANG_C                                                                      },
-   { "__finally",                       CT_FINALLY,          LANG_C                                                                      },
-   { "__has_include",                   CT_CNG_HASINC,       LANG_C | FLAG_PP                                                            }, // clang
-   { "__has_include_next",              CT_CNG_HASINCN,      LANG_C | FLAG_PP                                                            }, // clang
-   { "__inline__",                      CT_QUALIFIER,        LANG_C                                                                      },
+   { "__DI__",                          CT_DI,               LANG_C | LANG_CPP                                                           },
+   { "__HI__",                          CT_HI,               LANG_C | LANG_CPP                                                           },
+   { "__QI__",                          CT_QI,               LANG_C | LANG_CPP                                                           },
+   { "__SI__",                          CT_SI,               LANG_C | LANG_CPP                                                           },
+   { "__asm__",                         CT_ASM,              LANG_C | LANG_CPP                                                           },
+   { "__attribute__",                   CT_ATTRIBUTE,        LANG_C | LANG_CPP | LANG_OC                                                 },
+   { "__autoreleasing",                 CT_QUALIFIER,        LANG_C | LANG_CPP                                                           },
+   { "__block",                         CT_QUALIFIER,        LANG_C | LANG_CPP | LANG_OC                                                 },
+   { "__bridge",                        CT_QUALIFIER,        LANG_C | LANG_CPP                                                           },
+   { "__bridge_retained",               CT_QUALIFIER,        LANG_C | LANG_CPP                                                           },
+   { "__bridge_transfer",               CT_QUALIFIER,        LANG_C | LANG_CPP                                                           },
+   { "__const__",                       CT_QUALIFIER,        LANG_C | LANG_CPP                                                           },
+   { "__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_next",              CT_CNG_HASINCN,      LANG_C | LANG_CPP | FLAG_PP                                                 },
+   { "__inline__",                      CT_QUALIFIER,        LANG_C | LANG_CPP                                                           },
    { "__nonnull",                       CT_QUALIFIER,        LANG_OC                                                                     },
-   { "__nothrow__",                     CT_NOTHROW,          LANG_C                                                                      },
+   { "__nothrow__",                     CT_NOTHROW,          LANG_C | LANG_CPP                                                           },
    { "__null_unspecified",              CT_QUALIFIER,        LANG_OC                                                                     },
    { "__nullable",                      CT_QUALIFIER,        LANG_OC                                                                     },
    { "__pragma",                        CT_PP_PRAGMA,        LANG_ALL | FLAG_PP                                                          },
-   { "__restrict",                      CT_QUALIFIER,        LANG_C                                                                      },
-   { "__signed__",                      CT_TYPE,             LANG_C                                                                      },
-   { "__strong",                        CT_QUALIFIER,        LANG_C                                                                      },
-   { "__thread",                        CT_QUALIFIER,        LANG_C                                                                      },
+   { "__restrict",                      CT_QUALIFIER,        LANG_C | LANG_CPP                                                           },
+   { "__signed__",                      CT_TYPE,             LANG_C | LANG_CPP                                                           },
+   { "__strong",                        CT_QUALIFIER,        LANG_C | LANG_CPP                                                           },
+   { "__thread",                        CT_QUALIFIER,        LANG_C | LANG_CPP                                                           },
    { "__traits",                        CT_QUALIFIER,        LANG_D                                                                      },
-   { "__try",                           CT_TRY,              LANG_C                                                                      },
-   { "__typeof",                        CT_DECLTYPE,         LANG_C                                                                      },
-   { "__typeof__",                      CT_DECLTYPE,         LANG_C                                                                      },
+   { "__try",                           CT_TRY,              LANG_C | LANG_CPP                                                           },
+   { "__typeof",                        CT_DECLTYPE,         LANG_C | LANG_CPP | LANG_OC                                                 },
+   { "__typeof__",                      CT_DECLTYPE,         LANG_C | LANG_CPP                                                           },
    { "__unsafe_unretained",             CT_QUALIFIER,        LANG_OC                                                                     },
-   { "__unused",                        CT_ATTRIBUTE,        LANG_C                                                                      },
-   { "__volatile__",                    CT_QUALIFIER,        LANG_C                                                                      },
-   { "__weak",                          CT_QUALIFIER,        LANG_C                                                                      },
-   { "__word__",                        CT_WORD_,            LANG_C                                                                      },
+   { "__unused",                        CT_ATTRIBUTE,        LANG_C | LANG_CPP                                                           },
+   { "__volatile__",                    CT_QUALIFIER,        LANG_C | LANG_CPP                                                           },
+   { "__weak",                          CT_QUALIFIER,        LANG_C | LANG_CPP                                                           },
+   { "__word__",                        CT_WORD_,            LANG_C | LANG_CPP                                                           },
    { "abstract",                        CT_QUALIFIER,        LANG_CS | LANG_D | LANG_JAVA | LANG_VALA | LANG_ECMA                        },
    { "add",                             CT_GETSET,           LANG_CS                                                                     },
    { "alias",                           CT_USING,            LANG_D                                                                      },
@@ -138,98 +146,98 @@ static chunk_tag_t keywords[] =
    { "and",                             CT_SBOOL,            LANG_CPP                                                                    },
    { "and_eq",                          CT_SASSIGN,          LANG_CPP                                                                    },
    { "as",                              CT_AS,               LANG_CS | LANG_VALA                                                         },
-   { "asm",                             CT_ASM,              LANG_C | LANG_D                                                             },
+   { "asm",                             CT_ASM,              LANG_C | LANG_CPP | LANG_D                                                  },
    { "asm",                             CT_PP_ASM,           LANG_ALL | FLAG_PP                                                          },
    { "assert",                          CT_ASSERT,           LANG_JAVA                                                                   },
-   { "assert",                          CT_FUNCTION,         LANG_D | LANG_PAWN                                                          }, // PAWN
-   { "assert",                          CT_PP_ASSERT,        LANG_PAWN | FLAG_PP                                                         }, // PAWN
-   { "auto",                            CT_TYPE,             LANG_C | LANG_D                                                             },
+   { "assert",                          CT_FUNCTION,         LANG_D | LANG_PAWN                                                          },
+   { "assert",                          CT_PP_ASSERT,        LANG_PAWN | FLAG_PP                                                         },
+   { "auto",                            CT_TYPE,             LANG_C | LANG_CPP | LANG_D                                                  },
    { "base",                            CT_BASE,             LANG_CS | LANG_VALA                                                         },
    { "bit",                             CT_TYPE,             LANG_D                                                                      },
-   { "bitand",                          CT_ARITH,            LANG_C                                                                      },
-   { "bitor",                           CT_ARITH,            LANG_C                                                                      },
+   { "bitand",                          CT_ARITH,            LANG_C | LANG_CPP                                                           },
+   { "bitor",                           CT_ARITH,            LANG_C | LANG_CPP                                                           },
    { "body",                            CT_BODY,             LANG_D                                                                      },
-   { "bool",                            CT_TYPE,             LANG_C | LANG_CS | LANG_VALA                                                },
+   { "bool",                            CT_TYPE,             LANG_C | LANG_CPP | LANG_CS | LANG_VALA                                     },
    { "boolean",                         CT_TYPE,             LANG_JAVA | LANG_ECMA                                                       },
-   { "break",                           CT_BREAK,            LANG_ALL                                                                    }, // PAWN
+   { "break",                           CT_BREAK,            LANG_ALL                                                                    },
    { "byte",                            CT_TYPE,             LANG_CS | LANG_D | LANG_JAVA | LANG_ECMA                                    },
    { "callback",                        CT_QUALIFIER,        LANG_VALA                                                                   },
-   { "case",                            CT_CASE,             LANG_ALL                                                                    }, // PAWN
+   { "case",                            CT_CASE,             LANG_ALL                                                                    },
    { "cast",                            CT_D_CAST,           LANG_D                                                                      },
    { "catch",                           CT_CATCH,            LANG_CPP | LANG_CS | LANG_VALA | LANG_D | LANG_JAVA | LANG_ECMA             },
    { "cdouble",                         CT_TYPE,             LANG_D                                                                      },
    { "cent",                            CT_TYPE,             LANG_D                                                                      },
    { "cfloat",                          CT_TYPE,             LANG_D                                                                      },
-   { "char",                            CT_CHAR,             LANG_PAWN                                                                   }, // PAWN
+   { "char",                            CT_CHAR,             LANG_PAWN                                                                   },
    { "char",                            CT_TYPE,             LANG_ALLC                                                                   },
    { "checked",                         CT_QUALIFIER,        LANG_CS                                                                     },
    { "class",                           CT_CLASS,            LANG_CPP | LANG_CS | LANG_D | LANG_JAVA | LANG_VALA | LANG_ECMA             },
    { "compl",                           CT_ARITH,            LANG_CPP                                                                    },
-   { "const",                           CT_QUALIFIER,        LANG_ALL                                                                    }, // PAWN
+   { "const",                           CT_QUALIFIER,        LANG_ALL                                                                    },
    { "const_cast",                      CT_TYPE_CAST,        LANG_CPP                                                                    },
    { "constexpr",                       CT_QUALIFIER,        LANG_CPP                                                                    },
    { "construct",                       CT_CONSTRUCT,        LANG_VALA                                                                   },
-   { "continue",                        CT_CONTINUE,         LANG_ALL                                                                    }, // PAWN
+   { "continue",                        CT_CONTINUE,         LANG_ALL                                                                    },
    { "creal",                           CT_TYPE,             LANG_D                                                                      },
    { "dchar",                           CT_TYPE,             LANG_D                                                                      },
    { "debug",                           CT_DEBUG,            LANG_D                                                                      },
    { "debugger",                        CT_DEBUGGER,         LANG_ECMA                                                                   },
    { "decltype",                        CT_DECLTYPE,         LANG_CPP                                                                    },
-   { "default",                         CT_DEFAULT,          LANG_ALL                                                                    }, // PAWN
-   { "define",                          CT_PP_DEFINE,        LANG_ALL | FLAG_PP                                                          }, // PAWN
-   { "defined",                         CT_DEFINED,          LANG_PAWN                                                                   }, // PAWN
+   { "default",                         CT_DEFAULT,          LANG_ALL                                                                    },
+   { "define",                          CT_PP_DEFINE,        LANG_ALL | FLAG_PP                                                          },
+   { "defined",                         CT_DEFINED,          LANG_PAWN                                                                   },
    { "defined",                         CT_PP_DEFINED,       LANG_ALLC | FLAG_PP                                                         },
    { "delegate",                        CT_DELEGATE,         LANG_CS | LANG_VALA | LANG_D                                                },
    { "delete",                          CT_DELETE,           LANG_CPP | LANG_D | LANG_ECMA | LANG_VALA                                   },
    { "deprecated",                      CT_QUALIFIER,        LANG_D                                                                      },
-   { "do",                              CT_DO,               LANG_ALL                                                                    }, // PAWN
+   { "do",                              CT_DO,               LANG_ALL                                                                    },
    { "double",                          CT_TYPE,             LANG_ALLC                                                                   },
    { "dynamic_cast",                    CT_TYPE_CAST,        LANG_CPP                                                                    },
    { "elif",                            CT_PP_ELSE,          LANG_ALLC | FLAG_PP                                                         },
-   { "else",                            CT_ELSE,             LANG_ALL                                                                    }, // PAWN
-   { "else",                            CT_PP_ELSE,          LANG_ALL | FLAG_PP                                                          }, // PAWN
-   { "elseif",                          CT_PP_ELSE,          LANG_PAWN | FLAG_PP                                                         }, // PAWN
-   { "emit",                            CT_PP_EMIT,          LANG_PAWN | FLAG_PP                                                         }, // PAWN
-   { "endif",                           CT_PP_ENDIF,         LANG_ALL | FLAG_PP                                                          }, // PAWN
-   { "endinput",                        CT_PP_ENDINPUT,      LANG_PAWN | FLAG_PP                                                         }, // PAWN
+   { "else",                            CT_ELSE,             LANG_ALL                                                                    },
+   { "else",                            CT_PP_ELSE,          LANG_ALL | FLAG_PP                                                          },
+   { "elseif",                          CT_PP_ELSE,          LANG_PAWN | FLAG_PP                                                         },
+   { "emit",                            CT_PP_EMIT,          LANG_PAWN | FLAG_PP                                                         },
+   { "endif",                           CT_PP_ENDIF,         LANG_ALL | FLAG_PP                                                          },
+   { "endinput",                        CT_PP_ENDINPUT,      LANG_PAWN | FLAG_PP                                                         },
    { "endregion",                       CT_PP_ENDREGION,     LANG_ALL | FLAG_PP                                                          },
-   { "endscript",                       CT_PP_ENDINPUT,      LANG_PAWN | FLAG_PP                                                         }, // PAWN
-   { "enum",                            CT_ENUM,             LANG_ALL                                                                    }, // PAWN
-   { "error",                           CT_PP_ERROR,         LANG_PAWN | FLAG_PP                                                         }, // PAWN
+   { "endscript",                       CT_PP_ENDINPUT,      LANG_PAWN | FLAG_PP                                                         },
+   { "enum",                            CT_ENUM,             LANG_ALL                                                                    },
+   { "error",                           CT_PP_ERROR,         LANG_PAWN | FLAG_PP                                                         },
    { "event",                           CT_TYPE,             LANG_CS                                                                     },
-   { "exit",                            CT_FUNCTION,         LANG_PAWN                                                                   }, // PAWN
+   { "exit",                            CT_FUNCTION,         LANG_PAWN                                                                   },
    { "explicit",                        CT_QUALIFIER,        LANG_CPP | LANG_CS                                                          },
    { "export",                          CT_EXPORT,           LANG_CPP | LANG_D | LANG_ECMA                                               },
    { "extends",                         CT_QUALIFIER,        LANG_JAVA | LANG_ECMA                                                       },
-   { "extern",                          CT_EXTERN,           LANG_C | LANG_CS | LANG_D | LANG_VALA                                       },
+   { "extern",                          CT_EXTERN,           LANG_C | LANG_CPP | LANG_OC | LANG_CS | LANG_D | LANG_VALA                  },
    { "false",                           CT_WORD,             LANG_ALL                                                                    },
-   { "file",                            CT_PP_FILE,          LANG_PAWN | FLAG_PP                                                         }, // PAWN
+   { "file",                            CT_PP_FILE,          LANG_PAWN | FLAG_PP                                                         },
    { "final",                           CT_QUALIFIER,        LANG_CPP | LANG_D | LANG_ECMA                                               },
    { "finally",                         CT_FINALLY,          LANG_D | LANG_CS | LANG_VALA | LANG_ECMA | LANG_JAVA                        },
    { "fixed",                           CT_FIXED,            LANG_CS                                                                     },
    { "flags",                           CT_TYPE,             LANG_VALA                                                                   },
    { "float",                           CT_TYPE,             LANG_ALLC                                                                   },
-   { "for",                             CT_FOR,              LANG_ALL                                                                    }, // PAWN
+   { "for",                             CT_FOR,              LANG_ALL                                                                    },
    { "foreach",                         CT_FOR,              LANG_CS | LANG_D | LANG_VALA                                                },
    { "foreach_reverse",                 CT_FOR,              LANG_D                                                                      },
-   { "forward",                         CT_FORWARD,          LANG_PAWN                                                                   }, // PAWN
+   { "forward",                         CT_FORWARD,          LANG_PAWN                                                                   },
    { "friend",                          CT_FRIEND,           LANG_CPP                                                                    },
    { "function",                        CT_FUNCTION,         LANG_D | LANG_ECMA                                                          },
    { "get",                             CT_GETSET,           LANG_CS | LANG_VALA                                                         },
-   { "goto",                            CT_GOTO,             LANG_ALL                                                                    }, // PAWN
+   { "goto",                            CT_GOTO,             LANG_ALL                                                                    },
    { "idouble",                         CT_TYPE,             LANG_D                                                                      },
-   { "if",                              CT_IF,               LANG_ALL                                                                    }, // PAWN
-   { "if",                              CT_PP_IF,            LANG_ALL | FLAG_PP                                                          }, // PAWN
+   { "if",                              CT_IF,               LANG_ALL                                                                    },
+   { "if",                              CT_PP_IF,            LANG_ALL | FLAG_PP                                                          },
    { "ifdef",                           CT_PP_IF,            LANG_ALLC | FLAG_PP                                                         },
    { "ifloat",                          CT_TYPE,             LANG_D                                                                      },
    { "ifndef",                          CT_PP_IF,            LANG_ALLC | FLAG_PP                                                         },
    { "implements",                      CT_QUALIFIER,        LANG_JAVA | LANG_ECMA                                                       },
    { "implicit",                        CT_QUALIFIER,        LANG_CS                                                                     },
-   { "import",                          CT_IMPORT,           LANG_D | LANG_JAVA | LANG_ECMA                                              }, // fudged to get indenting
-   { "import",                          CT_PP_INCLUDE,       LANG_OC | FLAG_PP                                                           }, // ObjectiveC version of include
+   { "import",                          CT_IMPORT,           LANG_D | LANG_JAVA | LANG_ECMA                                              },
+   { "import",                          CT_PP_INCLUDE,       LANG_OC | FLAG_PP                                                           },
    { "in",                              CT_IN,               LANG_D | LANG_CS | LANG_VALA | LANG_ECMA | LANG_OC                          },
-   { "include",                         CT_PP_INCLUDE,       LANG_C | LANG_PAWN | FLAG_PP                                                }, // PAWN
-   { "inline",                          CT_QUALIFIER,        LANG_C                                                                      },
+   { "include",                         CT_PP_INCLUDE,       LANG_C | LANG_CPP | LANG_OC | LANG_PAWN | FLAG_PP                           },
+   { "inline",                          CT_QUALIFIER,        LANG_C | LANG_CPP                                                           },
    { "inout",                           CT_QUALIFIER,        LANG_D                                                                      },
    { "instanceof",                      CT_SIZEOF,           LANG_JAVA | LANG_ECMA                                                       },
    { "int",                             CT_TYPE,             LANG_ALLC                                                                   },
@@ -239,7 +247,7 @@ static chunk_tag_t keywords[] =
    { "ireal",                           CT_TYPE,             LANG_D                                                                      },
    { "is",                              CT_SCOMPARE,         LANG_D | LANG_CS | LANG_VALA                                                },
    { "lazy",                            CT_LAZY,             LANG_D                                                                      },
-   { "line",                            CT_PP_LINE,          LANG_PAWN | FLAG_PP                                                         }, // PAWN
+   { "line",                            CT_PP_LINE,          LANG_PAWN | FLAG_PP                                                         },
    { "lock",                            CT_LOCK,             LANG_CS | LANG_VALA                                                         },
    { "long",                            CT_TYPE,             LANG_ALLC                                                                   },
    { "macro",                           CT_D_MACRO,          LANG_D                                                                      },
@@ -247,9 +255,9 @@ static chunk_tag_t keywords[] =
    { "module",                          CT_D_MODULE,         LANG_D                                                                      },
    { "mutable",                         CT_QUALIFIER,        LANG_CPP                                                                    },
    { "namespace",                       CT_NAMESPACE,        LANG_CPP | LANG_CS | LANG_VALA                                              },
-   { "native",                          CT_NATIVE,           LANG_PAWN                                                                   }, // PAWN
+   { "native",                          CT_NATIVE,           LANG_PAWN                                                                   },
    { "native",                          CT_QUALIFIER,        LANG_JAVA | LANG_ECMA                                                       },
-   { "new",                             CT_NEW,              LANG_CPP | LANG_CS | LANG_D | LANG_JAVA | LANG_PAWN | LANG_VALA | LANG_ECMA }, // PAWN
+   { "new",                             CT_NEW,              LANG_CPP | LANG_CS | LANG_D | LANG_JAVA | LANG_PAWN | LANG_VALA | LANG_ECMA },
    { "noexcept",                        CT_NOEXCEPT,         LANG_CPP                                                                    },
    { "nonnull",                         CT_TYPE,             LANG_OC                                                                     },
    { "not",                             CT_SARITH,           LANG_CPP                                                                    },
@@ -259,7 +267,7 @@ static chunk_tag_t keywords[] =
    { "null_unspecified",                CT_TYPE,             LANG_OC                                                                     },
    { "nullable",                        CT_TYPE,             LANG_OC                                                                     },
    { "object",                          CT_TYPE,             LANG_CS                                                                     },
-   { "operator",                        CT_OPERATOR,         LANG_CPP | LANG_CS | LANG_PAWN                                              }, // PAWN
+   { "operator",                        CT_OPERATOR,         LANG_CPP | LANG_CS | LANG_PAWN                                              },
    { "or",                              CT_SBOOL,            LANG_CPP                                                                    },
    { "or_eq",                           CT_SASSIGN,          LANG_CPP                                                                    },
    { "out",                             CT_QUALIFIER,        LANG_CS | LANG_D | LANG_VALA                                                },
@@ -276,37 +284,37 @@ static chunk_tag_t keywords[] =
    { "real",                            CT_TYPE,             LANG_D                                                                      },
    { "ref",                             CT_QUALIFIER,        LANG_CS | LANG_VALA                                                         },
    { "region",                          CT_PP_REGION,        LANG_ALL | FLAG_PP                                                          },
-   { "register",                        CT_QUALIFIER,        LANG_C                                                                      },
+   { "register",                        CT_QUALIFIER,        LANG_C | LANG_CPP                                                           },
    { "reinterpret_cast",                CT_TYPE_CAST,        LANG_CPP                                                                    },
    { "remove",                          CT_GETSET,           LANG_CS                                                                     },
-   { "restrict",                        CT_QUALIFIER,        LANG_C                                                                      },
-   { "return",                          CT_RETURN,           LANG_ALL                                                                    }, // PAWN
+   { "restrict",                        CT_QUALIFIER,        LANG_C | LANG_CPP                                                           },
+   { "return",                          CT_RETURN,           LANG_ALL                                                                    },
    { "sbyte",                           CT_TYPE,             LANG_CS                                                                     },
    { "scope",                           CT_D_SCOPE,          LANG_D                                                                      },
    { "sealed",                          CT_QUALIFIER,        LANG_CS                                                                     },
-   { "section",                         CT_PP_SECTION,       LANG_PAWN | FLAG_PP                                                         }, // PAWN
+   { "section",                         CT_PP_SECTION,       LANG_PAWN | FLAG_PP                                                         },
    { "self",                            CT_THIS,             LANG_OC                                                                     },
    { "set",                             CT_GETSET,           LANG_CS | LANG_VALA                                                         },
    { "short",                           CT_TYPE,             LANG_ALLC                                                                   },
    { "signal",                          CT_ACCESS,           LANG_VALA                                                                   },
    { "signals",                         CT_ACCESS,           LANG_CPP                                                                    },
-   { "signed",                          CT_TYPE,             LANG_C                                                                      },
+   { "signed",                          CT_TYPE,             LANG_C | LANG_CPP                                                           },
    { "size_t",                          CT_TYPE,             LANG_ALLC                                                                   },
-   { "sizeof",                          CT_SIZEOF,           LANG_C | LANG_CS | LANG_VALA | LANG_PAWN                                    }, // PAWN
-   { "sleep",                           CT_SIZEOF,           LANG_PAWN                                                                   }, // PAWN
+   { "sizeof",                          CT_SIZEOF,           LANG_C | LANG_CPP | LANG_CS | LANG_VALA | LANG_PAWN                         },
+   { "sleep",                           CT_SIZEOF,           LANG_PAWN                                                                   },
    { "stackalloc",                      CT_NEW,              LANG_CS                                                                     },
-   { "state",                           CT_STATE,            LANG_PAWN                                                                   }, // PAWN
-   { "static",                          CT_QUALIFIER,        LANG_ALL                                                                    }, // PAWN
+   { "state",                           CT_STATE,            LANG_PAWN                                                                   },
+   { "static",                          CT_QUALIFIER,        LANG_ALL                                                                    },
    { "static_cast",                     CT_TYPE_CAST,        LANG_CPP                                                                    },
-   { "stock",                           CT_STOCK,            LANG_PAWN                                                                   }, // PAWN
+   { "stock",                           CT_STOCK,            LANG_PAWN                                                                   },
    { "strictfp",                        CT_QUALIFIER,        LANG_JAVA                                                                   },
    { "string",                          CT_TYPE,             LANG_CS | LANG_VALA                                                         },
-   { "struct",                          CT_STRUCT,           LANG_C | LANG_CS | LANG_D | LANG_VALA                                       },
+   { "struct",                          CT_STRUCT,           LANG_C | LANG_CPP | LANG_OC | LANG_CS | LANG_D | LANG_VALA                  },
    { "super",                           CT_SUPER,            LANG_D | LANG_JAVA | LANG_ECMA                                              },
-   { "switch",                          CT_SWITCH,           LANG_ALL                                                                    }, // PAWN
+   { "switch",                          CT_SWITCH,           LANG_ALL                                                                    },
    { "synchronized",                    CT_QUALIFIER,        LANG_D | LANG_ECMA                                                          },
    { "synchronized",                    CT_SYNCHRONIZED,     LANG_JAVA                                                                   },
-   { "tagof",                           CT_TAGOF,            LANG_PAWN                                                                   }, // PAWN
+   { "tagof",                           CT_TAGOF,            LANG_PAWN                                                                   },
    { "template",                        CT_TEMPLATE,         LANG_CPP | LANG_D                                                           },
    { "this",                            CT_THIS,             LANG_CPP | LANG_CS | LANG_D | LANG_JAVA | LANG_VALA | LANG_ECMA             },
    { "throw",                           CT_THROW,            LANG_CPP | LANG_CS | LANG_VALA | LANG_D | LANG_JAVA | LANG_ECMA             },
@@ -314,76 +322,70 @@ static chunk_tag_t keywords[] =
    { "transient",                       CT_QUALIFIER,        LANG_JAVA | LANG_ECMA                                                       },
    { "true",                            CT_WORD,             LANG_ALL                                                                    },
    { "try",                             CT_TRY,              LANG_CPP | LANG_CS | LANG_D | LANG_JAVA | LANG_ECMA | LANG_VALA             },
-   { "tryinclude",                      CT_PP_INCLUDE,       LANG_PAWN | FLAG_PP                                                         }, // PAWN
-   { "typedef",                         CT_TYPEDEF,          LANG_C | LANG_D                                                             },
+   { "tryinclude",                      CT_PP_INCLUDE,       LANG_PAWN | FLAG_PP                                                         },
+   { "typedef",                         CT_TYPEDEF,          LANG_C | LANG_CPP | LANG_OC | LANG_D                                        },
    { "typeid",                          CT_SIZEOF,           LANG_CPP | LANG_D                                                           },
    { "typename",                        CT_TYPENAME,         LANG_CPP                                                                    },
-   { "typeof",                          CT_DECLTYPE,         LANG_C                                                                      },
+   { "typeof",                          CT_DECLTYPE,         LANG_C | LANG_CPP                                                           },
    { "typeof",                          CT_SIZEOF,           LANG_CS | LANG_D | LANG_VALA | LANG_ECMA                                    },
    { "ubyte",                           CT_TYPE,             LANG_D                                                                      },
    { "ucent",                           CT_TYPE,             LANG_D                                                                      },
    { "uint",                            CT_TYPE,             LANG_CS | LANG_VALA | LANG_D                                                },
    { "ulong",                           CT_TYPE,             LANG_CS | LANG_VALA | LANG_D                                                },
    { "unchecked",                       CT_QUALIFIER,        LANG_CS                                                                     },
-   { "undef",                           CT_PP_UNDEF,         LANG_ALL | FLAG_PP                                                          }, // PAWN
-   { "union",                           CT_UNION,            LANG_C | LANG_D                                                             },
+   { "undef",                           CT_PP_UNDEF,         LANG_ALL | FLAG_PP                                                          },
+   { "union",                           CT_UNION,            LANG_C | LANG_CPP | LANG_D                                                  },
    { "unittest",                        CT_UNITTEST,         LANG_D                                                                      },
    { "unsafe",                          CT_UNSAFE,           LANG_CS                                                                     },
    { "unsafe_unretained",               CT_QUALIFIER,        LANG_OC                                                                     },
-   { "unsigned",                        CT_TYPE,             LANG_C                                                                      },
+   { "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                                                       },
    { "version",                         CT_D_VERSION,        LANG_D                                                                      },
    { "virtual",                         CT_QUALIFIER,        LANG_CPP | LANG_CS | LANG_VALA                                              },
    { "void",                            CT_TYPE,             LANG_ALLC                                                                   },
-   { "volatile",                        CT_QUALIFIER,        LANG_C | LANG_CS | LANG_JAVA | LANG_ECMA                                    },
+   { "volatile",                        CT_QUALIFIER,        LANG_C | LANG_CPP | LANG_CS | LANG_JAVA | LANG_ECMA                         },
    { "volatile",                        CT_VOLATILE,         LANG_D                                                                      },
    { "wchar",                           CT_TYPE,             LANG_D                                                                      },
-   { "wchar_t",                         CT_TYPE,             LANG_C                                                                      },
+   { "wchar_t",                         CT_TYPE,             LANG_C | LANG_CPP                                                           },
    { "weak",                            CT_QUALIFIER,        LANG_VALA                                                                   },
    { "when",                            CT_WHEN,             LANG_CS                                                                     },
    { "where",                           CT_WHERE,            LANG_CS                                                                     },
-   { "while",                           CT_WHILE,            LANG_ALL                                                                    }, // PAWN
+   { "while",                           CT_WHILE,            LANG_ALL                                                                    },
    { "with",                            CT_D_WITH,           LANG_D | LANG_ECMA                                                          },
    { "xor",                             CT_SARITH,           LANG_CPP                                                                    },
    { "xor_eq",                          CT_SASSIGN,          LANG_CPP                                                                    },
 };
 
 
-void init_keywords()
+// Issue #3353
+void init_keywords_for_language()
 {
-   /* Please read comments above keywords array */
+   unsigned int local_flags    = cpd.lang_flags;
+   size_t       keywords_count = ARRAY_SIZE(keywords);
 
-   for (int idx = 1; idx < (int)ARRAY_SIZE(keywords); idx++)
+   language_count = 0;
+
+   for (size_t idx = 0; idx < keywords_count; idx++)
    {
       chunk_tag_t *tag = &keywords[idx];
 
-      if (  (tag->lang_flags == LANG_ALL)
-         || (tag->lang_flags == LANG_ALLC))
-      {
-         continue;
-      }
-
-      if ((tag->lang_flags & LANG_C) != 0)
+      if ((tag->lang_flags & local_flags) != 0)
       {
-         int               lang_flags = LANG_OC;
-         const chunk_tag_t *probe     = kw_static_match(tag, lang_flags);
-
-         if (probe == NULL)
-         {
-            tag->lang_flags |= lang_flags;
-         }
-         lang_flags = LANG_CPP;
-         probe      = kw_static_match(tag, lang_flags);
-
-         if (probe == NULL)
-         {
-            tag->lang_flags |= lang_flags;
-         }
+         // for debugging only
+         // fprintf(stderr, "%s(%d): %zu Keyword: '%s', type is '%s'\n",
+         //         __func__, __LINE__, idx, tag->tag, get_token_name(tag->type));
+         keyword_for_lang[language_count].tag        = tag->tag;
+         keyword_for_lang[language_count].type       = tag->type;
+         keyword_for_lang[language_count].lang_flags = tag->lang_flags;
+         language_count++;
       }
    }
-}
+
+   LOG_FMT(LDYNKW, "%s(%d): Number of Keywords for language %d: '%zu'\n",
+           __func__, __LINE__, local_flags, language_count);
+} // init_keywords_for_language
 
 
 static int kw_compare(const void *p1, const void *p2)
@@ -392,17 +394,19 @@ static int kw_compare(const void *p1, const void *p2)
    const chunk_tag_t *t2 = static_cast<const chunk_tag_t *>(p2);
 
    return(strcmp(t1->tag, t2->tag));
-}
+} // kw_compare
 
 
 bool keywords_are_sorted(void)
 {
-   for (int idx = 1; idx < static_cast<int> ARRAY_SIZE(keywords); idx++)
+   size_t keywords_count = ARRAY_SIZE(keywords);
+
+   for (size_t idx = 1; idx < keywords_count; idx++)
    {
       if (kw_compare(&keywords[idx - 1], &keywords[idx]) > 0)
       {
          fprintf(stderr, "%s: bad sort order at idx %d, words '%s' and '%s'\n",
-                 __func__, idx - 1, keywords[idx - 1].tag, keywords[idx].tag);
+                 __func__, (int)idx - 1, keywords[idx - 1].tag, keywords[idx].tag);
          // coveralls will always complain.
          // these lines are only needed for the developper.
          log_flush(true);
@@ -412,10 +416,10 @@ bool keywords_are_sorted(void)
    }
 
    return(true);
-}
+} // keywords_are_sorted
 
 
-void add_keyword(const std::string &tag, c_token_t type)
+void add_keyword(const std::string &tag, E_Token type)
 {
    // See if the keyword has already been added
    dkwmap::iterator it = dkwm.find(tag);
@@ -431,7 +435,7 @@ void add_keyword(const std::string &tag, c_token_t type)
    dkwm.insert(dkwmap::value_type(tag, type));
    LOG_FMT(LDYNKW, "%s(%d): added '%s' as '%s'\n",
            __func__, __LINE__, tag.c_str(), get_token_name(type));
-}
+} // add_keyword
 
 
 static const chunk_tag_t *kw_static_first(const chunk_tag_t *tag)
@@ -440,23 +444,23 @@ static const chunk_tag_t *kw_static_first(const chunk_tag_t *tag)
 
    // TODO: avoid pointer arithmetics
    // loop over static keyword array
-   while (  prev >= &keywords[0]                // not at beginning of keyword array
+   while (  prev >= &keyword_for_lang[0]        // not at beginning of keyword array
          && strcmp(prev->tag, tag->tag) == 0)   // tags match
    {
       tag = prev;
       prev--;
    }
    return(tag);
-}
+} // kw_static_first
 
 
-static const chunk_tag_t *kw_static_match(const chunk_tag_t *tag, int lang_flags)
+static const chunk_tag_t *kw_static_match(bool orig_list, const chunk_tag_t *tag, int lang_flags)
 {
    bool in_pp = (  cpd.in_preproc != CT_NONE
                 && cpd.in_preproc != CT_PP_DEFINE);
 
    for (const chunk_tag_t *iter = kw_static_first(tag);
-        iter < &keywords[ARRAY_SIZE(keywords)];
+        (orig_list) ? (iter < &keywords[ARRAY_SIZE(keywords)]) : (iter < &keyword_for_lang[language_count]);
         iter++)
    {
       bool pp_iter = (iter->lang_flags & FLAG_PP) != 0; // forcing value to bool
@@ -471,10 +475,10 @@ static const chunk_tag_t *kw_static_match(const chunk_tag_t *tag, int lang_flags
    }
 
    return(nullptr);
-}
+} // kw_static_match
 
 
-c_token_t find_keyword_type(const char *word, size_t len)
+E_Token find_keyword_type(const char *word, size_t len)
 {
    if (len <= 0)
    {
@@ -494,7 +498,7 @@ c_token_t find_keyword_type(const char *word, size_t len)
 
    // check the static word list
    const chunk_tag_t *p_ret = static_cast<const chunk_tag_t *>(
-      bsearch(&key, keywords, ARRAY_SIZE(keywords), sizeof(keywords[0]), kw_compare));
+      bsearch(&key, keyword_for_lang, language_count, sizeof(keyword_for_lang[0]), kw_compare));
 
    if (p_ret != nullptr)
    {
@@ -503,10 +507,10 @@ c_token_t find_keyword_type(const char *word, size_t len)
       {
          cpd.in_preproc = CT_PREPROC;
       }
-      p_ret = kw_static_match(p_ret, cpd.lang_flags);
+      p_ret = kw_static_match(false, p_ret, cpd.lang_flags);
    }
    return((p_ret != nullptr) ? p_ret->type : CT_WORD);
-}
+} // find_keyword_type
 
 
 int load_keyword_file(const char *filename)
@@ -566,16 +570,16 @@ int load_keyword_file(const char *filename)
 } // load_keyword_file
 
 
-void print_keywords(FILE *pfile)
+void print_custom_keywords(FILE *pfile)
 {
    for (const auto &keyword_pair : dkwm)
    {
-      c_token_t tt = keyword_pair.second;
+      E_Token tt = keyword_pair.second;
 
       if (tt == CT_TYPE)
       {
-         fprintf(pfile, "type %*.s%s\n",
-                 uncrustify::limits::MAX_OPTION_NAME_LEN - 4, " ",
+         fprintf(pfile, "custom type %*.s%s\n",
+                 uncrustify::limits::MAX_OPTION_NAME_LEN - 10, " ",
                  keyword_pair.first.c_str());
       }
       else if (tt == CT_MACRO_OPEN)
@@ -606,16 +610,16 @@ void print_keywords(FILE *pfile)
                  " ", keyword_pair.first.c_str());
       }
    }
-}
+} // print_custom_keywords
 
 
 void clear_keyword_file(void)
 {
    dkwm.clear();
-}
+} // clear_keyword_file
 
 
-pattern_class_e get_token_pattern_class(c_token_t tok)
+pattern_class_e get_token_pattern_class(E_Token tok)
 {
    // TODO: instead of this switch better assign the pattern class to each statement
    switch (tok)
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/keywords.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/keywords.h
index 3a6f9ea5..95c41aad 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/keywords.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/keywords.h
@@ -12,9 +12,31 @@
 #include "uncrustify_types.h"
 
 /**
- * Initializes keywords table
+ * Initializes keywords table for a given language.
+ *
+ * Let us have a look on the problem is caused by the tokens "in" and "out",
+ * used in the file "Issue_3353.h" under.
+ * The strings representing the tokens ("in" and "out"), are found in the
+ * original table: static chunk_tag_t keywords[] because they are used by
+ * other languages. They are tokenized as CT_IN and CT_OUT.
+ * The correct tokenization is CT_FUNC_VAR.
+ *
+ * It is necessary to create (at run time) a new table with all the keywords
+ * proper to the used language.
+ *
+ */
+
+/**
+ * The file
+ * "Issue_3353.h"
+ *    struct A {
+ *        void (*in)(
+ *            void);
+ *        void (*out)(
+ *            void);
+ *    };
  */
-void init_keywords(void);
+void init_keywords_for_language(void);
 
 /**
  * Loads the dynamic keywords from a file
@@ -35,7 +57,7 @@ int load_keyword_file(const char *filename);
  *
  * @return CT_WORD (no match) or the keyword token
  */
-c_token_t find_keyword_type(const char *word, size_t len);
+E_Token find_keyword_type(const char *word, size_t len);
 
 
 /**
@@ -44,17 +66,17 @@ c_token_t find_keyword_type(const char *word, size_t len);
  * @param tag   The tag (string) must be zero terminated
  * @param type  The type, usually CT_TYPE
  */
-void add_keyword(const std::string &tag, c_token_t type);
+void add_keyword(const std::string &tag, E_Token type);
 
 
-void print_keywords(FILE *pfile);
+void print_custom_keywords(FILE *pfile);
 
 
 void clear_keyword_file(void);
 
 
 //! Returns the pattern that the keyword needs based on the token
-pattern_class_e get_token_pattern_class(c_token_t tok);
+pattern_class_e get_token_pattern_class(E_Token tok);
 
 
 bool keywords_are_sorted(void);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/lang_pawn.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/lang_pawn.cpp
index a3b3ed65..77831f55 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/lang_pawn.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/lang_pawn.cpp
@@ -18,7 +18,7 @@ using namespace uncrustify;
  * We need to check for 'open' braces/paren/etc because the level doesn't
  * change until the token after the open.
  */
-static bool pawn_continued(chunk_t *pc, size_t br_level);
+static bool pawn_continued(Chunk *pc, size_t br_level);
 
 
 /**
@@ -37,24 +37,24 @@ static bool pawn_continued(chunk_t *pc, size_t br_level);
  *
  * Variable definitions start with 'stock', 'static', 'new', or 'public'.
  */
-static chunk_t *pawn_process_line(chunk_t *start);
+static Chunk *pawn_process_line(Chunk *start);
 
 
 //! We are on a level 0 function proto of def
-static chunk_t *pawn_mark_function0(chunk_t *start, chunk_t *fcn);
+static Chunk *pawn_mark_function0(Chunk *start, Chunk *fcn);
 
 
 /**
  * follows a variable definition at level 0 until the end.
  * Adds a semicolon at the end, if needed.
  */
-static chunk_t *pawn_process_variable(chunk_t *start);
+static Chunk *pawn_process_variable(Chunk *start);
 
 
-static chunk_t *pawn_process_func_def(chunk_t *pc);
+static Chunk *pawn_process_func_def(Chunk *pc);
 
 
-chunk_t *pawn_add_vsemi_after(chunk_t *pc)
+Chunk *pawn_add_vsemi_after(Chunk *pc)
 {
    LOG_FUNC_ENTRY();
 
@@ -63,23 +63,28 @@ chunk_t *pawn_add_vsemi_after(chunk_t *pc)
    {
       return(pc);
    }
-   chunk_t *next = chunk_get_next_nc(pc);
 
-   if (  next != nullptr
+   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)))
    {
       return(pc);
    }
-   chunk_t chunk = *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.column += pc->Len();
 
    LOG_FMT(LPVSEMI, "%s: Added VSEMI on line %zu, prev='%s' [%s]\n",
-           __func__, pc->orig_line, pc->text(),
+           __func__, pc->orig_line, pc->Text(),
            get_token_name(pc->type));
 
    return(chunk_add_after(&chunk, pc));
@@ -99,13 +104,13 @@ void pawn_scrub_vsemi(void)
       return;
    }
 
-   for (chunk_t *pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next(pc))
+   for (Chunk *pc = Chunk::GetHead(); pc->IsNotNullChunk(); pc = pc->GetNext())
    {
       if (pc->type != CT_VSEMICOLON)
       {
          continue;
       }
-      chunk_t *prev = chunk_get_prev_ncnnl(pc);
+      Chunk *prev = pc->GetPrevNcNnl();
 
       if (chunk_is_token(prev, CT_BRACE_CLOSE))
       {
@@ -122,7 +127,7 @@ void pawn_scrub_vsemi(void)
 }
 
 
-static bool pawn_continued(chunk_t *pc, size_t br_level)
+static bool pawn_continued(Chunk *pc, size_t br_level)
 {
    LOG_FUNC_ENTRY();
 
@@ -158,9 +163,9 @@ static bool pawn_continued(chunk_t *pc, size_t br_level)
       || 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, ":", 1)
-      || chunk_is_str(pc, "+", 1)
-      || chunk_is_str(pc, "-", 1))
+      || chunk_is_str(pc, ":")
+      || chunk_is_str(pc, "+")
+      || chunk_is_str(pc, "-"))
    {
       return(true);
    }
@@ -176,10 +181,11 @@ void pawn_prescan(void)
     * Start at the beginning and step through the entire file, and clean up
     * any questionable stuff
     */
-   bool    did_nl = true;
-   chunk_t *pc    = chunk_get_head();
+   bool  did_nl = true;
+   Chunk *pc    = Chunk::GetHead();
 
-   while (pc != nullptr)
+   while (  pc != nullptr
+         && pc->IsNotNullChunk())
    {
       if (  did_nl
          && pc->type != CT_PREPROC
@@ -191,38 +197,44 @@ void pawn_prescan(void)
       }
 
       // note that continued lines are ignored
-      if (pc != nullptr)
+      if (  pc != nullptr
+         && pc->IsNotNullChunk())
       {
          did_nl = (chunk_is_token(pc, CT_NEWLINE));
       }
-      pc = chunk_get_next_nc(pc);
+      pc = pc->GetNextNc();
    }
 }
 
 
-static chunk_t *pawn_process_line(chunk_t *start)
+static Chunk *pawn_process_line(Chunk *start)
 {
    LOG_FUNC_ENTRY();
 
    //LOG_FMT(LSYS, "%s: %d - %s\n", __func__,
-   //        start->orig_line, start->text());
+   //        start->orig_line, start->Text());
 
    if (  chunk_is_token(start, CT_NEW)
-      || chunk_is_str(start, "const", 5))
+      || chunk_is_str(start, "const"))
    {
       return(pawn_process_variable(start));
    }
    // if a open paren is found before an assign, then this is a function
-   chunk_t *fcn = nullptr;
+   Chunk *fcn = nullptr;
 
    if (chunk_is_token(start, CT_WORD))
    {
       fcn = start;
    }
-   chunk_t *pc = start;
+   Chunk *pc = Chunk::NullChunkPtr;
 
-   while (  ((pc = chunk_get_next_nc(pc)) != nullptr)
-         && !chunk_is_str(pc, "(", 1)
+   if (start != nullptr)
+   {
+      pc = start;
+   }
+
+   while (  ((pc = pc->GetNextNc())->IsNotNullChunk())
+         && !chunk_is_str(pc, "(")
          && pc->type != CT_ASSIGN
          && pc->type != CT_NEWLINE)
    {
@@ -235,7 +247,7 @@ static chunk_t *pawn_process_line(chunk_t *start)
       }
    }
 
-   if (pc != nullptr)
+   if (pc->IsNotNullChunk())
    {
       if (chunk_is_token(pc, CT_ASSIGN))
       {
@@ -245,31 +257,36 @@ static chunk_t *pawn_process_line(chunk_t *start)
 
    if (fcn != nullptr)
    {
-      //LOG_FMT(LSYS, "FUNCTION: %s\n", fcn->text());
+      //LOG_FMT(LSYS, "FUNCTION: %s\n", fcn->Text());
       return(pawn_mark_function0(start, fcn));
    }
 
    if (chunk_is_token(start, CT_ENUM))
    {
-      pc = chunk_get_next_type(start, CT_BRACE_CLOSE, start->level);
+      pc = start->GetNextType(CT_BRACE_CLOSE, start->level);
       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->orig_line, start->Text(), get_token_name(start->type));
    return(start);
 } // pawn_process_line
 
 
-static chunk_t *pawn_process_variable(chunk_t *start)
+static Chunk *pawn_process_variable(Chunk *start)
 {
    LOG_FUNC_ENTRY();
-   chunk_t *prev = nullptr;
-   chunk_t *pc   = start;
+   Chunk *pc = Chunk::NullChunkPtr;
 
-   while ((pc = chunk_get_next_nc(pc)) != nullptr)
+   if (start != nullptr)
+   {
+      pc = start;
+   }
+   Chunk *prev = Chunk::NullChunkPtr;
+
+   while ((pc = pc->GetNextNc())->IsNotNullChunk())
    {
       if (  chunk_is_token(pc, CT_NEWLINE)
-         && prev != nullptr                          // Issue 2586
+         && prev->IsNotNullChunk()
          && !pawn_continued(prev, start->level))
       {
          if (  prev->type != CT_VSEMICOLON
@@ -292,12 +309,12 @@ void pawn_add_virtual_semicolons(void)
    // Add Pawn virtual semicolons
    if (language_is_set(LANG_PAWN))
    {
-      chunk_t *prev = nullptr;
-      chunk_t *pc   = chunk_get_head();
+      Chunk *prev = Chunk::NullChunkPtr;
+      Chunk *pc   = Chunk::GetHead();
 
-      while ((pc = chunk_get_next(pc)) != nullptr)
+      while ((pc = pc->GetNext())->IsNotNullChunk())
       {
-         if (  !chunk_is_comment(pc)
+         if (  !pc->IsComment()
             && !chunk_is_newline(pc)
             && pc->type != CT_VBRACE_CLOSE
             && pc->type != CT_VBRACE_OPEN)
@@ -305,7 +322,7 @@ void pawn_add_virtual_semicolons(void)
             prev = pc;
          }
 
-         if (  prev == nullptr
+         if (  prev->IsNullChunk()
             || (  pc->type != CT_NEWLINE
                && pc->type != CT_BRACE_CLOSE
                && pc->type != CT_VBRACE_CLOSE))
@@ -321,27 +338,26 @@ void pawn_add_virtual_semicolons(void)
             && !pawn_continued(prev, prev->brace_level))
          {
             pawn_add_vsemi_after(prev);
-            prev = nullptr;
+            prev = Chunk::NullChunkPtr;
          }
       }
    }
-}
+} // pawn_add_virtual_semicolons
 
 
-static chunk_t *pawn_mark_function0(chunk_t *start, chunk_t *fcn)
+static Chunk *pawn_mark_function0(Chunk *start, Chunk *fcn)
 {
    LOG_FUNC_ENTRY();
 
    // handle prototypes
    if (start == fcn)
    {
-      chunk_t *last = chunk_get_next_type(fcn, CT_PAREN_CLOSE, fcn->level);
-      last = chunk_get_next(last);
+      Chunk *last = fcn->GetNextType(CT_PAREN_CLOSE, fcn->level)->GetNext();
 
       if (chunk_is_token(last, CT_SEMICOLON))
       {
          LOG_FMT(LPFUNC, "%s: %zu] '%s' proto due to semicolon\n",
-                 __func__, fcn->orig_line, fcn->text());
+                 __func__, fcn->orig_line, fcn->Text());
          set_chunk_type(fcn, CT_FUNC_PROTO);
          return(last);
       }
@@ -352,11 +368,11 @@ static chunk_t *pawn_mark_function0(chunk_t *start, chunk_t *fcn)
          || chunk_is_token(start, CT_NATIVE))
       {
          LOG_FMT(LPFUNC, "%s: %zu] '%s' [%s] proto due to %s\n",
-                 __func__, fcn->orig_line, fcn->text(),
+                 __func__, fcn->orig_line, fcn->Text(),
                  get_token_name(fcn->type),
                  get_token_name(start->type));
          set_chunk_type(fcn, CT_FUNC_PROTO);
-         return(chunk_get_next_nc(fcn));
+         return(fcn->GetNextNc());
       }
    }
    // Not a prototype, so it must be a function def
@@ -364,7 +380,7 @@ static chunk_t *pawn_mark_function0(chunk_t *start, chunk_t *fcn)
 }
 
 
-static chunk_t *pawn_process_func_def(chunk_t *pc)
+static Chunk *pawn_process_func_def(Chunk *pc)
 {
    LOG_FUNC_ENTRY();
 
@@ -372,48 +388,48 @@ static chunk_t *pawn_process_func_def(chunk_t *pc)
    set_chunk_type(pc, CT_FUNC_DEF);
 
    LOG_FMT(LPFUNC, "%s: %zu:%zu %s\n",
-           __func__, pc->orig_line, pc->orig_col, pc->text());
+           __func__, pc->orig_line, pc->orig_col, pc->Text());
 
    /*
     * If we don't have a brace open right after the close fparen, then
     * we need to add virtual braces around the function body.
     */
-   chunk_t *clp  = chunk_get_next_str(pc, ")", 1, 0);
-   chunk_t *last = chunk_get_next_ncnnl(clp);
+   Chunk *clp  = pc->GetNextString(")", 1, 0);
+   Chunk *last = clp->GetNextNcNnl();
 
-   if (last != nullptr)
+   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->orig_line, last->Text(), get_token_name(last->type));
    }
 
    // See if there is a state clause after the function
-   if (  last != nullptr
-      && chunk_is_str(last, "<", 1))
+   if (  last->IsNotNullChunk()
+      && chunk_is_str(last, "<"))
    {
       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->orig_line, pc->Text(), get_token_name(last->type));
 
       set_chunk_type(last, CT_ANGLE_OPEN);
       set_chunk_parent(last, CT_FUNC_DEF);
 
-      while (  ((last = chunk_get_next(last)) != nullptr)
-            && !chunk_is_str(last, ">", 1))
+      while (  ((last = last->GetNext())->IsNotNullChunk())
+            && !chunk_is_str(last, ">"))
       {
          // do nothing just search, TODO: use search_chunk
       }
 
-      if (last != nullptr)
+      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));
+                 __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);
       }
-      last = chunk_get_next_ncnnl(last);
+      last = last->GetNextNcNnl();
    }
 
-   if (last == nullptr)
+   if (last->IsNullChunk())
    {
       return(last);
    }
@@ -421,9 +437,9 @@ static chunk_t *pawn_process_func_def(chunk_t *pc)
    if (chunk_is_token(last, CT_BRACE_OPEN))
    {
       set_chunk_parent(last, CT_FUNC_DEF);
-      last = chunk_get_next_type(last, CT_BRACE_CLOSE, last->level);
+      last = last->GetNextType(CT_BRACE_CLOSE, last->level);
 
-      if (last != nullptr)
+      if (last->IsNotNullChunk())
       {
          set_chunk_parent(last, CT_FUNC_DEF);
       }
@@ -431,23 +447,23 @@ static chunk_t *pawn_process_func_def(chunk_t *pc)
    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->orig_line, pc->Text(), get_token_name(last->type));
 
       // do not insert a vbrace before a preproc
       if (last->flags.test(PCF_IN_PREPROC))
       {
          return(last);
       }
-      chunk_t chunk = *last;
+      Chunk chunk = *last;
       chunk.str.clear();
       set_chunk_type(&chunk, CT_VBRACE_OPEN);
       set_chunk_parent(&chunk, CT_FUNC_DEF);
 
-      chunk_t *prev = chunk_add_before(&chunk, last);
+      Chunk *prev = chunk_add_before(&chunk, last);
       last = prev;
 
       // find the next newline at level 0
-      prev = chunk_get_next_ncnnl(prev);
+      prev = prev->GetNextNcNnl();
 
       do
       {
@@ -457,9 +473,9 @@ static chunk_t *pawn_process_func_def(chunk_t *pc)
          if (  chunk_is_token(prev, CT_NEWLINE)
             && prev->level == 0)
          {
-            chunk_t *next = chunk_get_next_ncnnl(prev);
+            Chunk *next = prev->GetNextNcNnl();
 
-            if (  next != nullptr
+            if (  next->IsNotNullChunk()
                && next->type != CT_ELSE
                && next->type != CT_WHILE_OF_DO)
             {
@@ -469,9 +485,10 @@ static chunk_t *pawn_process_func_def(chunk_t *pc)
          prev->level++;
          prev->brace_level++;
          last = prev;
-      } while ((prev = chunk_get_next(prev)) != nullptr);
+      } while ((prev = prev->GetNext())->IsNotNullChunk());
 
-      if (last != nullptr)
+      if (  last != nullptr
+         && last->IsNotNullChunk())
       {
          LOG_FMT(LPFUNC, "%s:%zu] ended on %s, level %zu\n",
                  __func__, last->orig_line, get_token_name(last->type), last->level);
@@ -480,7 +497,7 @@ static chunk_t *pawn_process_func_def(chunk_t *pc)
       chunk.str.clear();
       set_chunk_type(&chunk, CT_VBRACE_CLOSE);
       set_chunk_parent(&chunk, CT_FUNC_DEF);
-      chunk.column     += last->len();
+      chunk.column     += last->Len();
       chunk.level       = 0;
       chunk.brace_level = 0;
       last              = chunk_add_after(&chunk, last);
@@ -489,12 +506,12 @@ static chunk_t *pawn_process_func_def(chunk_t *pc)
 } // pawn_process_func_def
 
 
-chunk_t *pawn_check_vsemicolon(chunk_t *pc)
+Chunk *pawn_check_vsemicolon(Chunk *pc)
 {
    LOG_FUNC_ENTRY();
 
    // Grab the open VBrace
-   chunk_t *vb_open = chunk_get_prev_type(pc, CT_VBRACE_OPEN, -1);
+   Chunk *vb_open = pc->GetPrevType(CT_VBRACE_OPEN, -1);
 
    /*
     * Grab the item before the newline
@@ -505,17 +522,17 @@ chunk_t *pawn_check_vsemicolon(chunk_t *pc)
     *  - it is something that needs a continuation
     *    + arith, assign, bool, comma, compare
     */
-   chunk_t *prev = chunk_get_prev_ncnnl(pc);
+   Chunk *prev = pc->GetPrevNcNnl();
 
-   if (  prev == nullptr
+   if (  prev->IsNullChunk()
       || prev == vb_open
       || prev->flags.test(PCF_IN_PREPROC)
       || pawn_continued(prev, vb_open->level + 1))
    {
-      if (prev != nullptr)
+      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->orig_line, prev->Text(), get_token_name(prev->type));
       }
       return(pc);
    }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/lang_pawn.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/lang_pawn.h
index 01fd5908..9e2d7832 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/lang_pawn.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/lang_pawn.h
@@ -32,7 +32,7 @@ void pawn_add_virtual_semicolons(void);
  *
  * @return Either the newline or the newly inserted virtual semicolon
  */
-chunk_t *pawn_check_vsemicolon(chunk_t *pc);
+Chunk *pawn_check_vsemicolon(Chunk *pc);
 
 
 /**
@@ -43,7 +43,7 @@ void pawn_scrub_vsemi(void);
 
 
 //! add a semicolon after ...
-chunk_t *pawn_add_vsemi_after(chunk_t *pc);
+Chunk *pawn_add_vsemi_after(Chunk *pc);
 
 
 #endif /* LONG_PAWN_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/language_tools.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/language_tools.cpp
index 77e577f4..77e577f4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/language_tools.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/language_tools.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/language_tools.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/language_tools.h
index 5f57c3f1..5f57c3f1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/language_tools.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/language_tools.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/log_levels.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/log_levels.h
index d809514a..d809514a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/log_levels.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/log_levels.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/log_rules.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/log_rules.cpp
index ebc1082e..82ee8b8e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/log_rules.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/log_rules.cpp
@@ -11,17 +11,17 @@
 #include "unc_tools.h"
 
 
-void log_rule2(const char *func, size_t line, const char *rule, chunk_t *first, chunk_t *second)
+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(),
+      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(),
+      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);
@@ -52,7 +52,7 @@ void log_rule3(log_sev_t sev, const char *func, const char *rule)
 }
 
 
-void log_rule4(const char *rule, chunk_t *first)
+void log_rule4(const char *rule, Chunk *first)
 {
    if (cpd.html_file == nullptr)
    {
@@ -76,5 +76,5 @@ void log_rule4(const char *rule, chunk_t *first)
    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);
+           __LINE__, rule, first->Text(), first->orig_line, a_number, sizeOfTrack);
 }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/log_rules.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/log_rules.h
index 1d73077d..e7916702 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/log_rules.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/log_rules.h
@@ -9,7 +9,7 @@
 #ifndef LOG_RULES_H_INCLUDED
 #define LOG_RULES_H_INCLUDED
 
-#include "chunk_list.h"
+#include "chunk.h"
 #include "uncrustify.h"
 
 using namespace uncrustify;
@@ -33,7 +33,7 @@ using namespace uncrustify;
    log_rule3(LCURRENT, __func__, (rule))
 #endif
 
-void log_rule2(const char *func, size_t line, const char *rule, chunk_t *first, chunk_t *second);
+void log_rule2(const char *func, size_t line, const char *rule, Chunk *first, Chunk *second);
 
 
 #ifdef SUPER_LOG
@@ -44,6 +44,6 @@ void log_rule3(log_sev_t sev, const char *func, const char *rule);
 
 #endif
 
-void log_rule4(const char *rule, chunk_t *first);
+void log_rule4(const char *rule, Chunk *first);
 
 #endif /* LOG_RULES_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/logger.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/logger.cpp
index 969a4192..969a4192 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/logger.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/logger.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/logger.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/logger.h
index df63b276..68501967 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/logger.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/logger.h
@@ -112,9 +112,8 @@ void log_flush(bool force_nl);
 #define LOG_FMT    log_fmt
 // TODO during debugging add source file and line number
 #else
-#define LOG_FMT(sev, ...)                                   \
-   do { if (log_sev_on(sev)) { log_fmt(sev, __VA_ARGS__); } \
-   } while (0)
+#define LOG_FMT(sev, ...) \
+   if (log_sev_on(sev)) { log_fmt(sev, __VA_ARGS__); }
 #endif
 
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/logmask.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/logmask.cpp
index ca94cd05..ca94cd05 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/logmask.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/logmask.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/logmask.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/logmask.h
index 7cc24ca4..7cc24ca4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/logmask.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/logmask.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/md5.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/md5.cpp
index af8874a4..af8874a4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/md5.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/md5.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/md5.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/md5.h
index d1148b5e..d1148b5e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/md5.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/md5.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/newlines.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/newlines.cpp
index 78b557f2..1b4f09b5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/newlines.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/newlines.cpp
@@ -26,6 +26,7 @@
 #include "keywords.h"
 #include "prototypes.h"
 #include "space.h"
+#include "unc_tools.h"
 
 #ifdef WIN32
 #include <algorithm>                   // to get max
@@ -52,7 +53,7 @@ static void mark_change(const char *func, size_t line);
  *    - unless the brace belongs to a namespace
  *      and nl_inside_namespace is non-zero
  */
-static bool can_increase_nl(chunk_t *nl);
+static bool can_increase_nl(Chunk *nl);
 
 
 /**
@@ -65,15 +66,15 @@ static bool can_increase_nl(chunk_t *nl);
  * b. if/while/switch/for/etc ") {"
  * d. else "} else {"
  */
-static void setup_newline_add(chunk_t *prev, chunk_t *nl, chunk_t *next);
+static void setup_newline_add(Chunk *prev, Chunk *nl, Chunk *next);
 
 
 //! Make sure there is a blank line after a commented group of values
-static void newlines_double_space_struct_enum_union(chunk_t *open_brace);
+static void newlines_double_space_struct_enum_union(Chunk *open_brace);
 
 
 //! If requested, make sure each entry in an enum is on its own line
-static void newlines_enum_entries(chunk_t *open_brace, iarf_e av);
+static void newlines_enum_entries(Chunk *open_brace, iarf_e av);
 
 
 /**
@@ -83,19 +84,19 @@ static void newlines_enum_entries(chunk_t *open_brace, iarf_e av);
  *  true: a new line may be added
  * false: a new line may NOT be added
  */
-static bool one_liner_nl_ok(chunk_t *pc);
+static bool one_liner_nl_ok(Chunk *pc);
 
 
-static void nl_create_one_liner(chunk_t *vbrace_open);
+static void nl_create_one_liner(Chunk *vbrace_open);
 
 
-static void nl_create_list_liner(chunk_t *brace_open);
+static void nl_create_list_liner(Chunk *brace_open);
 
 
 /**
  * Test if a chunk belongs to a one-liner method definition inside a class body
  */
-static bool is_class_one_liner(chunk_t *pc);
+static bool is_class_one_liner(Chunk *pc);
 
 
 /**
@@ -106,11 +107,11 @@ static bool is_class_one_liner(chunk_t *pc);
  * a definition of the same sort as surrounding prototypes. This checks against
  * either the function name, or the function closing brace.
  */
-bool is_func_proto_group(chunk_t *pc, c_token_t one_liner_type);
+bool is_func_proto_group(Chunk *pc, E_Token one_liner_type);
 
 
 //! Find the next newline or nl_cont
-static void nl_handle_define(chunk_t *pc);
+static void nl_handle_define(Chunk *pc);
 
 
 /**
@@ -120,24 +121,24 @@ static void nl_handle_define(chunk_t *pc);
  * @param after   The second chunk
  * @param av      The IARF value
  */
-static void newline_iarf_pair(chunk_t *before, chunk_t *after, iarf_e av, bool check_nl_assign_leave_one_liners = false);
+static void newline_iarf_pair(Chunk *before, Chunk *after, iarf_e av, bool check_nl_assign_leave_one_liners = false);
 
 
 /**
  * Adds newlines to multi-line function call/decl/def
  * Start points to the open paren
  */
-static void newline_func_multi_line(chunk_t *start);
+static void newline_func_multi_line(Chunk *start);
 
 
-static void newline_template(chunk_t *start);
+static void newline_template(Chunk *start);
 
 
 /**
  * Formats a function declaration
  * Start points to the open paren
  */
-static void newline_func_def_or_call(chunk_t *start);
+static void newline_func_def_or_call(Chunk *start);
 
 
 /**
@@ -147,11 +148,11 @@ static void newline_func_def_or_call(chunk_t *start);
  * [myObject doFooWith:arg1 name:arg2  // some lines with >1 arg
  *            error:arg3];
  */
-static void newline_oc_msg(chunk_t *start);
+static void newline_oc_msg(Chunk *start);
 
 
 //! Ensure that the next non-comment token after close brace is a newline
-static void newline_end_newline(chunk_t *br_close);
+static void newline_end_newline(Chunk *br_close);
 
 
 /**
@@ -163,7 +164,7 @@ static void newline_end_newline(chunk_t *br_close);
  * For virtual braces, we can only add a newline after the vbrace open.
  * If we do so, also add a newline after the vbrace close.
  */
-static bool newlines_if_for_while_switch(chunk_t *start, iarf_e nl_opt);
+static bool newlines_if_for_while_switch(Chunk *start, iarf_e nl_opt);
 
 
 /**
@@ -172,10 +173,10 @@ static bool newlines_if_for_while_switch(chunk_t *start, iarf_e nl_opt);
  * Doesn't do anything if open brace before it
  * "code\n\ncomment\nif (...)" or "code\ncomment\nif (...)"
  */
-static void newlines_if_for_while_switch_pre_blank_lines(chunk_t *start, iarf_e nl_opt);
+static void newlines_if_for_while_switch_pre_blank_lines(Chunk *start, iarf_e nl_opt);
 
 
-static void blank_line_set(chunk_t *pc, Option<unsigned> &opt);
+static void blank_line_set(Chunk *pc, Option<unsigned> &opt);
 
 
 /**
@@ -185,17 +186,17 @@ static void blank_line_set(chunk_t *pc, Option<unsigned> &opt);
  * Doesn't do anything if open brace before it
  * "code\n\ncomment\nif (...)" or "code\ncomment\nif (...)"
  */
-static void newlines_func_pre_blank_lines(chunk_t *start, c_token_t start_type);
+static void newlines_func_pre_blank_lines(Chunk *start, E_Token start_type);
 
 
-static chunk_t *get_closing_brace(chunk_t *start);
+static Chunk *get_closing_brace(Chunk *start);
 
 
 /**
  * remove any consecutive newlines following this chunk
  * skip vbraces
  */
-static void remove_next_newlines(chunk_t *start);
+static void remove_next_newlines(Chunk *start);
 
 
 /**
@@ -205,7 +206,7 @@ static void remove_next_newlines(chunk_t *start);
  * VBraces will stay VBraces, conversion to real ones should have already happened
  * "if (...)\ncode\ncode" or "if (...)\ncode\n\ncode"
  */
-static void newlines_if_for_while_switch_post_blank_lines(chunk_t *start, iarf_e nl_opt);
+static void newlines_if_for_while_switch_post_blank_lines(Chunk *start, iarf_e nl_opt);
 
 
 /**
@@ -216,9 +217,9 @@ static void newlines_if_for_while_switch_post_blank_lines(chunk_t *start, iarf_e
  *
  * "struct [name] {" or "struct [name] \n {"
  */
-static void newlines_struct_union(chunk_t *start, iarf_e nl_opt, bool leave_trailing);
-static void newlines_enum(chunk_t *start);
-static void newlines_namespace(chunk_t *start); // Issue #2186
+static void newlines_struct_union(Chunk *start, iarf_e nl_opt, bool leave_trailing);
+static void newlines_enum(Chunk *start);
+static void newlines_namespace(Chunk *start); // Issue #2186
 
 
 /**
@@ -229,22 +230,22 @@ static void newlines_namespace(chunk_t *start); // Issue #2186
  *
  * @param start  The chunk - should be CT_ELSE or CT_WHILE_OF_DO
  */
-static void newlines_cuddle_uncuddle(chunk_t *start, iarf_e nl_opt);
+static void newlines_cuddle_uncuddle(Chunk *start, iarf_e nl_opt);
 
 
 /**
  * Adds/removes a newline between else and '{'.
  * "else {" or "else \n {"
  */
-static void newlines_do_else(chunk_t *start, iarf_e nl_opt);
+static void newlines_do_else(Chunk *start, iarf_e nl_opt);
 
 
 //! Check if token starts a variable declaration
-static bool is_var_def(chunk_t *pc, chunk_t *next);
+static bool is_var_def(Chunk *pc, Chunk *next);
 
 
 //! Put newline(s) before and/or after a block of variable definitions
-static chunk_t *newline_def_blk(chunk_t *start, bool fn_top);
+static Chunk *newline_def_blk(Chunk *start, bool fn_top);
 
 
 /**
@@ -268,7 +269,7 @@ static chunk_t *newline_def_blk(chunk_t *start, bool fn_top);
  * void foo() {
  * }
  */
-static void newlines_brace_pair(chunk_t *br_open);
+static void newlines_brace_pair(Chunk *br_open);
 
 
 /**
@@ -276,14 +277,14 @@ static void newlines_brace_pair(chunk_t *br_open);
  * or semicolon.
  * Does not work with PAWN (?)
  */
-static void newline_case(chunk_t *start);
+static void newline_case(Chunk *start);
 
 
-static void newline_case_colon(chunk_t *start);
+static void newline_case_colon(Chunk *start);
 
 
 //! Put a blank line before a return statement, unless it is after an open brace
-static void newline_before_return(chunk_t *start);
+static void newline_before_return(Chunk *start);
 
 
 /**
@@ -292,13 +293,13 @@ static void newline_before_return(chunk_t *start);
  *
  * May not work with PAWN
  */
-static void newline_after_return(chunk_t *start);
+static void newline_after_return(Chunk *start);
 
 
-static void blank_line_max(chunk_t *pc, Option<unsigned> &opt);
+static void blank_line_max(Chunk *pc, Option<unsigned> &opt);
 
 
-static iarf_e newline_template_option(chunk_t *pc, iarf_e special, iarf_e base, iarf_e fallback);
+static iarf_e newline_template_option(Chunk *pc, iarf_e special, iarf_e base, iarf_e fallback);
 
 
 #define MARK_CHANGE()    mark_change(__func__, __LINE__)
@@ -318,20 +319,20 @@ static void mark_change(const char *func, size_t line)
 } // mark_change
 
 
-static bool can_increase_nl(chunk_t *nl)
+static bool can_increase_nl(Chunk *nl)
 {
    LOG_FUNC_ENTRY();
 
-   chunk_t *prev = chunk_get_prev_nc(nl);
+   Chunk *prev = nl->GetPrevNc();
 
-   chunk_t *pcmt = chunk_get_prev(nl);
-   chunk_t *next = chunk_get_next(nl);
+   Chunk *pcmt = nl->GetPrev();
+   Chunk *next = nl->GetNext();
 
    if (options::nl_squeeze_ifdef())
    {
       log_rule_B("nl_squeeze_ifdef");
 
-      chunk_t *pp_start = chunk_get_pp_start(prev);
+      Chunk *pp_start = chunk_get_pp_start(prev);
 
       if (  pp_start != nullptr
          && (  get_chunk_parent_type(pp_start) == CT_PP_IF
@@ -443,7 +444,7 @@ static bool can_increase_nl(chunk_t *nl)
    }
    log_rule_B("nl_end_of_file");
 
-   if (  !next
+   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);
@@ -453,7 +454,7 @@ static bool can_increase_nl(chunk_t *nl)
 } // can_increase_nl
 
 
-static void setup_newline_add(chunk_t *prev, chunk_t *nl, chunk_t *next)
+static void setup_newline_add(Chunk *prev, Chunk *nl, Chunk *next)
 {
    LOG_FUNC_ENTRY();
 
@@ -494,13 +495,18 @@ static void setup_newline_add(chunk_t *prev, chunk_t *nl, chunk_t *next)
 } // setup_newline_add
 
 
-void double_newline(chunk_t *nl)
+void double_newline(Chunk *nl)
 {
    LOG_FUNC_ENTRY();
 
-   chunk_t *prev = chunk_get_prev(nl);
+   Chunk *prev = Chunk::NullChunkPtr;
 
-   if (prev == nullptr)
+   if (nl != nullptr)
+   {
+      prev = nl->GetPrev();
+   }
+
+   if (prev->IsNullChunk())
    {
       return;
    }
@@ -512,7 +518,7 @@ void double_newline(chunk_t *nl)
    }
    else
    {
-      LOG_FMT(LNEWLINE, "'%s' ", prev->text());
+      LOG_FMT(LNEWLINE, "'%s' ", prev->Text());
    }
    LOG_FMT(LNEWLINE, "on line %zu", prev->orig_line);
 
@@ -531,20 +537,20 @@ void double_newline(chunk_t *nl)
 } // double_newline
 
 
-chunk_t *newline_add_before(chunk_t *pc)
+Chunk *newline_add_before(Chunk *pc)
 {
    LOG_FUNC_ENTRY();
 
-   chunk_t nl;
-   chunk_t *prev = chunk_get_prev_nvb(pc);
+   Chunk nl;
+   Chunk *prev = pc->GetPrevNvb();
 
    if (chunk_is_newline(prev))
    {
       // 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->orig_line, pc->orig_col, pc->column);
    log_func_stack_inline(LNEWLINE);
 
    setup_newline_add(prev, &nl, pc);
@@ -558,13 +564,13 @@ chunk_t *newline_add_before(chunk_t *pc)
 } // newline_add_before
 
 
-chunk_t *newline_force_before(chunk_t *pc)
+Chunk *newline_force_before(Chunk *pc)
 {
    LOG_FUNC_ENTRY();
 
-   chunk_t *nl = newline_add_before(pc);
+   Chunk *nl = newline_add_before(pc);
 
-   if (  nl != nullptr
+   if (  nl->IsNotNullChunk()
       && nl->nl_count > 1)
    {
       nl->nl_count = 1;
@@ -574,15 +580,15 @@ chunk_t *newline_force_before(chunk_t *pc)
 } // newline_force_before
 
 
-chunk_t *newline_add_after(chunk_t *pc)
+Chunk *newline_add_after(Chunk *pc)
 {
    LOG_FUNC_ENTRY();
 
    if (pc == nullptr)
    {
-      return(nullptr);
+      return(Chunk::NullChunkPtr);
    }
-   chunk_t *next = chunk_get_next_nvb(pc);
+   Chunk *next = pc->GetNextNvb();
 
    if (chunk_is_newline(next))
    {
@@ -590,10 +596,10 @@ chunk_t *newline_add_after(chunk_t *pc)
       return(next);
    }
    LOG_FMT(LNEWLINE, "%s(%d): '%s' on line %zu",
-           __func__, __LINE__, pc->text(), pc->orig_line);
+           __func__, __LINE__, pc->Text(), pc->orig_line);
    log_func_stack_inline(LNEWLINE);
 
-   chunk_t nl;
+   Chunk nl;
 
    nl.orig_line = pc->orig_line;
    nl.orig_col  = pc->orig_col;
@@ -607,13 +613,13 @@ chunk_t *newline_add_after(chunk_t *pc)
 } // newline_add_after
 
 
-chunk_t *newline_force_after(chunk_t *pc)
+Chunk *newline_force_after(Chunk *pc)
 {
    LOG_FUNC_ENTRY();
 
-   chunk_t *nl = newline_add_after(pc);   // add a newline
+   Chunk *nl = newline_add_after(pc);   // add a newline
 
-   if (  nl != nullptr
+   if (  nl->IsNotNullChunk()
       && nl->nl_count > 1) // check if there are more than 1 newline
    {
       nl->nl_count = 1;                   // if so change the newline count back to 1
@@ -623,15 +629,15 @@ chunk_t *newline_force_after(chunk_t *pc)
 } // newline_force_after
 
 
-static void newline_end_newline(chunk_t *br_close)
+static void newline_end_newline(Chunk *br_close)
 {
    LOG_FUNC_ENTRY();
 
-   chunk_t *next = chunk_get_next(br_close);
-   chunk_t nl;
+   Chunk *next = br_close->GetNext();
+   Chunk nl;
 
    if (  !chunk_is_newline(next)
-      && !chunk_is_comment(next))
+      && !next->IsComment())
    {
       nl.orig_line = br_close->orig_line;
       nl.orig_col  = br_close->orig_col;
@@ -640,7 +646,7 @@ static void newline_end_newline(chunk_t *br_close)
       nl.flags     = (br_close->flags & PCF_COPY_FLAGS) & ~PCF_IN_PREPROC;
 
       if (  br_close->flags.test(PCF_IN_PREPROC)
-         && next != nullptr
+         && next->IsNotNullChunk()
          && next->flags.test(PCF_IN_PREPROC))
       {
          nl.flags |= PCF_IN_PREPROC;
@@ -658,44 +664,44 @@ static void newline_end_newline(chunk_t *br_close)
       }
       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());
+              __func__, __LINE__, br_close->orig_line, br_close->orig_col, br_close->Text());
       chunk_add_after(&nl, br_close);
    }
 } // newline_end_newline
 
 
-static void newline_min_after(chunk_t *ref, size_t count, pcf_flag_e flag)
+static void newline_min_after(Chunk *ref, size_t count, pcf_flag_e flag)
 {
    LOG_FUNC_ENTRY();
 
-   LOG_FMT(LNEWLINE, "%s(%d): for '%s', at orig_line %zu, count is %zu, 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->orig_line, count,
            pcf_flags_str(flag).c_str());
    log_func_stack_inline(LNEWLINE);
 
-   chunk_t *pc = ref;
+   Chunk *pc = ref;
 
    do
    {
-      pc = chunk_get_next(pc);
-   } while (  pc != nullptr
+      pc = pc->GetNext();
+   } while (  pc->IsNotNullChunk()
            && !chunk_is_newline(pc));
 
-   if (pc != nullptr)                 // Coverity CID 76002
+   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);
    }
-   chunk_t *next = chunk_get_next(pc);
+   Chunk *next = pc->GetNext();
 
-   if (next == nullptr)
+   if (next->IsNullChunk())
    {
       return;
    }
 
-   if (  chunk_is_comment(next)
+   if (  next->IsComment()
       && next->nl_count == 1
-      && chunk_is_comment(chunk_get_prev(pc)))
+      && pc->GetPrev()->IsComment())
    {
       newline_min_after(next, count, flag);
       return;
@@ -714,7 +720,7 @@ static void newline_min_after(chunk_t *ref, size_t count, pcf_flag_e flag)
 } // newline_min_after
 
 
-chunk_t *newline_add_between(chunk_t *start, chunk_t *end)
+Chunk *newline_add_between(Chunk *start, Chunk *end)
 {
    LOG_FUNC_ENTRY();
 
@@ -724,11 +730,11 @@ chunk_t *newline_add_between(chunk_t *start, chunk_t *end)
    {
       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),
+   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): 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_func_stack_inline(LNEWLINE);
 
    // Back-up check for one-liners (should never be true!)
@@ -741,7 +747,7 @@ chunk_t *newline_add_between(chunk_t *start, chunk_t *end)
     * Scan for a line break, if there is a line break between start and end
     * we won't add another one
     */
-   for (chunk_t *pc = start; pc != end; pc = chunk_get_next(pc))
+   for (Chunk *pc = start; pc != end; pc = pc->GetNext())
    {
       if (chunk_is_newline(pc))
       {
@@ -755,21 +761,21 @@ chunk_t *newline_add_between(chunk_t *start, chunk_t *end)
     */
    if (chunk_is_token(end, CT_BRACE_OPEN))
    {
-      chunk_t *pc = chunk_get_next(end);
+      Chunk *pc = end->GetNext();
 
-      if (chunk_is_comment(pc))
+      if (pc->IsComment())
       {
-         pc = chunk_get_next(pc);
+         pc = pc->GetNext();
 
          if (chunk_is_newline(pc))
          {
             // are there some more (comment + newline)s ?
-            chunk_t *pc1 = chunk_get_next_ncnnl(end);
+            Chunk *pc1 = end->GetNextNcNnl();
 
             if (!chunk_is_newline(pc1))
             {
                // yes, go back
-               chunk_t *pc2 = chunk_get_prev(pc1);
+               Chunk *pc2 = pc1->GetPrev();
                pc = pc2;
             }
          }
@@ -797,20 +803,20 @@ chunk_t *newline_add_between(chunk_t *start, chunk_t *end)
    {
       LOG_FMT(LNEWLINE, "%s(%d):\n", __func__, __LINE__);
    }
-   chunk_t *tmp = newline_add_before(end);
+   Chunk *tmp = newline_add_before(end);
 
    return(tmp);
 } // newline_add_between
 
 
-void newline_del_between(chunk_t *start, chunk_t *end)
+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,
+   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_func_stack_inline(LNEWLINE);
@@ -820,19 +826,19 @@ void newline_del_between(chunk_t *start, chunk_t *end)
    {
       return;
    }
-   chunk_t *pc           = start;
-   bool    start_removed = false;
+   Chunk *pc           = start;
+   bool  start_removed = false;
 
    do
    {
-      chunk_t *next = chunk_get_next(pc);
+      Chunk *next = pc->GetNext();
 
       if (chunk_is_newline(pc))
       {
-         chunk_t *prev = chunk_get_prev(pc);
+         Chunk *prev = pc->GetPrev();
 
-         if (  (  !chunk_is_comment(prev)
-               && !chunk_is_comment(next))
+         if (  (  !prev->IsComment()
+               && !next->IsComment())
             || chunk_is_newline(prev)
             || chunk_is_newline(next))
          {
@@ -864,8 +870,8 @@ void newline_del_between(chunk_t *start, chunk_t *end)
    } while (pc != end);
 
    if (  !start_removed
-      && chunk_is_str(end, "{", 1)
-      && (  chunk_is_str(start, ")", 1)
+      && chunk_is_str(end, "{")
+      && (  chunk_is_str(start, ")")
          || chunk_is_token(start, CT_DO)
          || chunk_is_token(start, CT_ELSE)))
    {
@@ -878,23 +884,23 @@ void newlines_sparens()
 {
    LOG_FUNC_ENTRY();
 
-   //chunk_t *sparen_open;
+   //Chunk *sparen_open;
 
-   for (chunk_t *sparen_open = chunk_get_next_type(chunk_get_head(), CT_SPAREN_OPEN, ANY_LEVEL);
-        sparen_open != nullptr; sparen_open = chunk_get_next_type(
-           sparen_open, CT_SPAREN_OPEN, ANY_LEVEL))
+   for (Chunk *sparen_open = Chunk::GetHead()->GetNextType(CT_SPAREN_OPEN, ANY_LEVEL);
+        sparen_open->IsNotNullChunk();
+        sparen_open = sparen_open->GetNextType(CT_SPAREN_OPEN, ANY_LEVEL))
    {
-      chunk_t *sparen_close = chunk_get_next_type(sparen_open, CT_SPAREN_CLOSE, sparen_open->level);
+      Chunk *sparen_close = sparen_open->GetNextType(CT_SPAREN_CLOSE, sparen_open->level);
 
-      if (sparen_close == nullptr)
+      if (sparen_close->IsNullChunk())
       {
          continue;
       }
-      chunk_t *sparen_content_start = chunk_get_next_nnl(sparen_open);
-      chunk_t *sparen_content_end   = chunk_get_prev_nnl(sparen_close);
-      bool    is_multiline          = (
+      Chunk *sparen_content_start = sparen_open->GetNextNnl();
+      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));
+                                    && !are_chunks_in_same_line(sparen_content_start, 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:
@@ -915,7 +921,7 @@ void newlines_sparens()
       else
       {
          // add/remove trailing newline in an if condition
-         chunk_t *ctrl_structure = chunk_get_prev_ncnnl(sparen_open);
+         Chunk *ctrl_structure = sparen_open->GetPrevNcNnl();
 
          if (  chunk_is_token(ctrl_structure, CT_IF)
             || chunk_is_token(ctrl_structure, CT_ELSEIF))
@@ -928,7 +934,7 @@ void newlines_sparens()
 } // newlines_sparens
 
 
-static bool newlines_if_for_while_switch(chunk_t *start, iarf_e nl_opt)
+static bool newlines_if_for_while_switch(Chunk *start, iarf_e nl_opt)
 {
    LOG_FUNC_ENTRY();
 
@@ -940,13 +946,13 @@ static bool newlines_if_for_while_switch(chunk_t *start, iarf_e nl_opt)
    {
       return(false);
    }
-   bool    retval = false;
-   chunk_t *pc    = chunk_get_next_ncnnl(start);
+   bool  retval = false;
+   Chunk *pc    = start->GetNextNcNnl();
 
    if (chunk_is_token(pc, CT_SPAREN_OPEN))
    {
-      chunk_t *close_paren = chunk_get_next_type(pc, CT_SPAREN_CLOSE, pc->level);
-      chunk_t *brace_open  = chunk_get_next_ncnnl(close_paren);
+      Chunk *close_paren = pc->GetNextType(CT_SPAREN_CLOSE, pc->level);
+      Chunk *brace_open  = close_paren->GetNextNcNnl();
 
       if (  (  chunk_is_token(brace_open, CT_BRACE_OPEN)
             || chunk_is_token(brace_open, CT_VBRACE_OPEN))
@@ -956,7 +962,7 @@ static bool newlines_if_for_while_switch(chunk_t *start, iarf_e nl_opt)
 
          if (options::nl_multi_line_cond())
          {
-            while ((pc = chunk_get_next(pc)) != close_paren)
+            while ((pc = pc->GetNext()) != close_paren)
             {
                if (chunk_is_newline(pc))
                {
@@ -971,11 +977,11 @@ static bool newlines_if_for_while_switch(chunk_t *start, iarf_e nl_opt)
             // Can only add - we don't want to create a one-line here
             if (nl_opt & IARF_ADD)
             {
-               newline_iarf_pair(close_paren, chunk_get_next_ncnnl(brace_open), nl_opt);
-               pc = chunk_get_next_type(brace_open, CT_VBRACE_CLOSE, brace_open->level);
+               newline_iarf_pair(close_paren, brace_open->GetNextNcNnl(), nl_opt);
+               pc = brace_open->GetNextType(CT_VBRACE_CLOSE, brace_open->level);
 
-               if (  !chunk_is_newline(chunk_get_prev_nc(pc))
-                  && !chunk_is_newline(chunk_get_next_nc(pc)))
+               if (  !chunk_is_newline(pc->GetPrevNc())
+                  && !chunk_is_newline(pc->GetNextNc()))
                {
                   newline_add_after(pc);
                   retval = true;
@@ -985,15 +991,15 @@ static bool newlines_if_for_while_switch(chunk_t *start, iarf_e nl_opt)
          else
          {
             newline_iarf_pair(close_paren, brace_open, nl_opt);
-            chunk_t *next = chunk_get_next_ncnnl(brace_open);
+            Chunk *next = brace_open->GetNextNcNnl();
 
             if (brace_open->type != next->type)                       // Issue #2836
             {
-               newline_add_between(brace_open, chunk_get_next_ncnnl(brace_open));
+               newline_add_between(brace_open, brace_open->GetNextNcNnl());
             }
             // Make sure nothing is cuddled with the closing brace
-            pc = chunk_get_next_type(brace_open, CT_BRACE_CLOSE, brace_open->level);
-            newline_add_between(pc, chunk_get_next_nblank(pc));
+            pc = brace_open->GetNextType(CT_BRACE_CLOSE, brace_open->level);
+            newline_add_between(pc, pc->GetNextNcNnlNet());
             retval = true;
          }
       }
@@ -1002,12 +1008,12 @@ static bool newlines_if_for_while_switch(chunk_t *start, iarf_e nl_opt)
 } // newlines_if_for_while_switch
 
 
-static void newlines_if_for_while_switch_pre_blank_lines(chunk_t *start, iarf_e nl_opt)
+static void newlines_if_for_while_switch_pre_blank_lines(Chunk *start, iarf_e nl_opt)
 {
    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_column is %zu\n",
+           __func__, __LINE__, start->Text(), get_token_name(start->type), start->orig_line, start->orig_col);
 
    log_rule_B("nl_define_macro");
 
@@ -1024,11 +1030,11 @@ static void newlines_if_for_while_switch_pre_blank_lines(chunk_t *start, iarf_e
     *   2 newlines in a row (don't add)
     *   something else (don't remove)
     */
-   for (chunk_t *pc = chunk_get_prev(start); pc != nullptr; pc = chunk_get_prev(pc))
+   for (Chunk *pc = start->GetPrev(); pc != nullptr && pc->IsNotNullChunk(); pc = pc->GetPrev())
    {
-      size_t  level    = start->level;
-      bool    do_add   = (nl_opt & IARF_ADD) != IARF_IGNORE; // forcing value to bool
-      chunk_t *last_nl = nullptr;
+      size_t level    = start->level;
+      bool   do_add   = (nl_opt & IARF_ADD) != IARF_IGNORE;  // forcing value to bool
+      Chunk  *last_nl = nullptr;
 
       if (chunk_is_newline(pc))
       {
@@ -1036,7 +1042,7 @@ static void newlines_if_for_while_switch_pre_blank_lines(chunk_t *start, iarf_e
 
          // if we found 2 or more in a row
          if (  pc->nl_count > 1
-            || chunk_is_newline(chunk_get_prev_nvb(pc)))
+            || chunk_is_newline(pc->GetPrevNvb()))
          {
             // need to remove
             if (  (nl_opt & IARF_REMOVE)
@@ -1050,10 +1056,10 @@ static void newlines_if_for_while_switch_pre_blank_lines(chunk_t *start, iarf_e
                   pc->nl_count = nl_count;
                   MARK_CHANGE();
                }
-               chunk_t *prev;
+               Chunk *prev;
 
                // can keep using pc because anything other than newline stops loop, and we delete if newline
-               while (chunk_is_newline(prev = chunk_get_prev_nvb(pc)))
+               while (chunk_is_newline(prev = pc->GetPrevNvb()))
                {
                   // Make sure we don't combine a preproc and non-preproc
                   if (!chunk_safe_to_del_nl(prev))
@@ -1072,7 +1078,7 @@ static void newlines_if_for_while_switch_pre_blank_lines(chunk_t *start, iarf_e
       {
          return;
       }
-      else if (chunk_is_comment(pc))
+      else if (pc->IsComment())
       {
          // vbrace close is ok because it won't go into output, so we should skip it
          last_nl = nullptr;
@@ -1098,16 +1104,16 @@ static void newlines_if_for_while_switch_pre_blank_lines(chunk_t *start, iarf_e
             }
             else
             {
-               chunk_t *next;
+               Chunk *next;
 
                // we didn't run into a newline, so we need to add one
-               if (  ((next = chunk_get_next(pc)) != nullptr)
-                  && chunk_is_comment(next))
+               if (  ((next = pc->GetNext())->IsNotNullChunk())
+                  && next->IsComment())
                {
                   pc = next;
                }
 
-               if ((last_nl = newline_add_after(pc)) != nullptr)
+               if ((last_nl = newline_add_after(pc))->IsNotNullChunk())
                {
                   double_newline(last_nl);
                }
@@ -1119,7 +1125,7 @@ static void newlines_if_for_while_switch_pre_blank_lines(chunk_t *start, iarf_e
 } // newlines_if_for_while_switch_pre_blank_lines
 
 
-static void blank_line_set(chunk_t *pc, Option<unsigned> &opt)
+static void blank_line_set(Chunk *pc, Option<unsigned> &opt)
 {
    LOG_FUNC_ENTRY();
 
@@ -1140,7 +1146,7 @@ static void blank_line_set(chunk_t *pc, Option<unsigned> &opt)
 } // blank_line_set
 
 
-bool do_it_newlines_func_pre_blank_lines(chunk_t *last_nl, c_token_t start_type)
+bool do_it_newlines_func_pre_blank_lines(Chunk *last_nl, E_Token start_type)
 {
    LOG_FUNC_ENTRY();
 
@@ -1148,9 +1154,9 @@ bool do_it_newlines_func_pre_blank_lines(chunk_t *last_nl, c_token_t 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->orig_line, last_nl->orig_col, get_token_name(last_nl->type), last_nl->Text());
 
    switch (start_type)
    {
@@ -1242,7 +1248,7 @@ bool do_it_newlines_func_pre_blank_lines(chunk_t *last_nl, c_token_t start_type)
 } // do_it_newlines_func_pre_blank_lines
 
 
-static void newlines_func_pre_blank_lines(chunk_t *start, c_token_t start_type)
+static void newlines_func_pre_blank_lines(Chunk *start, E_Token start_type)
 {
    LOG_FUNC_ENTRY();
 
@@ -1266,7 +1272,7 @@ static void newlines_func_pre_blank_lines(chunk_t *start, c_token_t start_type)
    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));
    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->orig_line);
    /*
     * look backwards until we find:
     *   - open brace (don't add or remove)
@@ -1274,15 +1280,15 @@ static void newlines_func_pre_blank_lines(chunk_t *start, c_token_t start_type)
     *   - a destructor
     *   - something else (don't remove)
     */
-   chunk_t *pc           = nullptr;
-   chunk_t *last_nl      = nullptr;
-   chunk_t *last_comment = nullptr;
-   size_t  first_line    = start->orig_line;
+   Chunk  *pc           = nullptr;
+   Chunk  *last_nl      = nullptr;
+   Chunk  *last_comment = nullptr;
+   size_t first_line    = start->orig_line;
 
-   for (pc = chunk_get_prev(start); pc != nullptr; pc = chunk_get_prev(pc))
+   for (pc = start->GetPrev(); pc != nullptr && 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', nl_count is %zu\n",
+              __func__, __LINE__, pc->orig_line, pc->orig_col, get_token_name(pc->type), pc->Text(), pc->nl_count);
 
       if (chunk_is_newline(pc))
       {
@@ -1309,7 +1315,7 @@ static void newlines_func_pre_blank_lines(chunk_t *start, c_token_t start_type)
             continue;
          }
       }
-      else if (chunk_is_comment(pc))
+      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);
@@ -1373,14 +1379,14 @@ static void newlines_func_pre_blank_lines(chunk_t *start, c_token_t start_type)
 } // newlines_func_pre_blank_lines
 
 
-static chunk_t *get_closing_brace(chunk_t *start)
+static Chunk *get_closing_brace(Chunk *start)
 {
    LOG_FUNC_ENTRY();
 
-   chunk_t *pc;
-   size_t  level = start->level;
+   Chunk  *pc;
+   size_t level = start->level;
 
-   for (pc = start; (pc = chunk_get_next(pc)) != nullptr;)
+   for (pc = start; (pc = pc->GetNext())->IsNotNullChunk();)
    {
       if (  (  chunk_is_token(pc, CT_BRACE_CLOSE)
             || chunk_is_token(pc, CT_VBRACE_CLOSE))
@@ -1401,13 +1407,13 @@ static chunk_t *get_closing_brace(chunk_t *start)
 } // get_closing_brace
 
 
-static void remove_next_newlines(chunk_t *start)
+static void remove_next_newlines(Chunk *start)
 {
    LOG_FUNC_ENTRY();
 
-   chunk_t *next;
+   Chunk *next;
 
-   while ((next = chunk_get_next(start)) != nullptr)
+   while ((next = start->GetNext())->IsNotNullChunk())
    {
       if (  chunk_is_newline(next)
          && chunk_safe_to_del_nl(next))
@@ -1415,7 +1421,7 @@ static void remove_next_newlines(chunk_t *start)
          chunk_del(next);
          MARK_CHANGE();
       }
-      else if (chunk_is_vbrace(next))
+      else if (next->IsVBrace())
       {
          start = next;
       }
@@ -1427,14 +1433,14 @@ static void remove_next_newlines(chunk_t *start)
 } // remove_next_newlines
 
 
-static void newlines_if_for_while_switch_post_blank_lines(chunk_t *start, iarf_e nl_opt)
+static void newlines_if_for_while_switch_post_blank_lines(Chunk *start, iarf_e nl_opt)
 {
    LOG_FUNC_ENTRY();
 
-   chunk_t *prev;
+   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_column is %zu\n",
+           __func__, __LINE__, start->Text(), get_token_name(start->type), start->orig_line, start->orig_col);
 
    log_rule_B("nl_define_macro");
 
@@ -1444,15 +1450,15 @@ static void newlines_if_for_while_switch_post_blank_lines(chunk_t *start, iarf_e
    {
       return;
    }
-   chunk_t *pc = get_closing_brace(start);
+   Chunk *pc = get_closing_brace(start);
 
    // first find ending brace
    if (pc == nullptr)
    {
       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_column is %zu\n",
+           __func__, __LINE__, pc->Text(), get_token_name(pc->type), pc->orig_line, pc->orig_col);
 
    /*
     * if we're dealing with an if, we actually want to add or remove
@@ -1460,13 +1466,13 @@ static void newlines_if_for_while_switch_post_blank_lines(chunk_t *start, iarf_e
     */
    if (chunk_is_token(start, CT_IF))
    {
-      chunk_t *next;
+      Chunk *next;
 
       while (true)
       {
-         next = chunk_get_next_ncnnl(pc);
+         next = pc->GetNextNcNnl();
 
-         if (  next != nullptr
+         if (  next->IsNotNullChunk()
             && (  chunk_is_token(next, CT_ELSE)
                || chunk_is_token(next, CT_ELSEIF)))
          {
@@ -1475,8 +1481,8 @@ static void newlines_if_for_while_switch_post_blank_lines(chunk_t *start, iarf_e
             {
                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_column %zu\n",
+                    __func__, __LINE__, pc->Text(), get_token_name(pc->type), pc->orig_line, pc->orig_col);
          }
          else
          {
@@ -1492,12 +1498,12 @@ static void newlines_if_for_while_switch_post_blank_lines(chunk_t *start, iarf_e
    if (chunk_is_token(start, CT_DO))
    {
       // point to the next semicolon
-      if ((pc = chunk_get_next_type(pc, CT_SEMICOLON, start->level)) == nullptr)
+      if ((pc = pc->GetNextType(CT_SEMICOLON, start->level))->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_column %zu\n",
+              __func__, __LINE__, pc->Text(), get_token_name(pc->type), pc->orig_line, pc->orig_col);
    }
    bool isVBrace = (chunk_is_token(pc, CT_VBRACE_CLOSE));
 
@@ -1510,7 +1516,7 @@ static void newlines_if_for_while_switch_post_blank_lines(chunk_t *start, iarf_e
       LOG_FMT(LNEWLINE, "%s(%d): isVBrace is FALSE\n", __func__, __LINE__);
    }
 
-   if ((prev = chunk_get_prev_nvb(pc)) == nullptr)
+   if ((prev = pc->GetPrevNvb())->IsNullChunk())
    {
       return;
    }
@@ -1527,7 +1533,7 @@ static void newlines_if_for_while_switch_post_blank_lines(chunk_t *start, iarf_e
 
    if (nl_opt & IARF_REMOVE)
    {
-      chunk_t *next;
+      Chunk *next;
 
       // if chunk before is a vbrace, remove any newlines after it
       if (have_pre_vbrace_nl)
@@ -1539,7 +1545,7 @@ static void newlines_if_for_while_switch_post_blank_lines(chunk_t *start, iarf_e
          }
          remove_next_newlines(pc);
       }
-      else if (  (chunk_is_newline(next = chunk_get_next_nvb(pc)))
+      else if (  (chunk_is_newline(next = pc->GetNextNvb()))
               && !next->flags.test(PCF_VAR_DEF))
       {
          // otherwise just deal with newlines after brace
@@ -1556,26 +1562,24 @@ static void newlines_if_for_while_switch_post_blank_lines(chunk_t *start, iarf_e
    // don't do anything with it if the next non newline chunk is a closing brace
    if (nl_opt & IARF_ADD)
    {
-      chunk_t *next;
-      chunk_t *nextNNL = chunk_get_next_nnl(pc);
+      Chunk *next = pc->GetNextNnl();
 
       do
       {
-         if (nextNNL == nullptr)
+         if (next->IsNullChunk())
          {
             return;
          }
 
-         if (chunk_is_not_token(nextNNL, CT_VBRACE_CLOSE))
+         if (chunk_is_not_token(next, CT_VBRACE_CLOSE))
          {
-            next = nextNNL;
             break;
          }
-         nextNNL = chunk_get_next_nnl(nextNNL);
+         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_column %zu\n",
+              __func__, __LINE__, next->Text(), get_token_name(next->type), next->orig_line, next->orig_col);
 
       if (chunk_is_not_token(next, CT_BRACE_CLOSE))
       {
@@ -1584,10 +1588,10 @@ static void newlines_if_for_while_switch_post_blank_lines(chunk_t *start, iarf_e
          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);
 
-         if (chunk_is_newline(next = chunk_get_next_nvb(pc)))
+         if (chunk_is_newline(next = pc->GetNextNvb()))
          {
-            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_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);
          }
@@ -1597,22 +1601,22 @@ static void newlines_if_for_while_switch_post_blank_lines(chunk_t *start, iarf_e
          {
             LOG_FMT(LNEWLINE, "%s(%d): nl_count is 0\n", __func__, __LINE__);
 
-            if (  ((next = chunk_get_next(pc)) != nullptr)
-               && chunk_is_comment(next))
+            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_column %zu\n",
+                       __func__, __LINE__, next->Text(), get_token_name(next->type), next->orig_line, next->orig_col);
                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_column %zu\n",
+                       __func__, __LINE__, pc->Text(), get_token_name(pc->type), pc->orig_line, pc->orig_col);
             }
 
-            if ((next = newline_add_after(pc)) == nullptr)
+            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_column %zu\n",
+                    __func__, __LINE__, next->Text(), get_token_name(next->type), next->orig_line, next->orig_col);
             double_newline(next);
          }
          else if (nl_count == 1) // if we don't have enough newlines
@@ -1624,25 +1628,25 @@ static void newlines_if_for_while_switch_post_blank_lines(chunk_t *start, iarf_e
             {
                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_column %zu\n",
+                       __func__, __LINE__, next->Text(), get_token_name(next->type), next->orig_line, next->orig_col);
             }
             else
             {
                LOG_FMT(LNEWLINE, "%s(%d): have_pre_vbrace_nl is FALSE\n", __func__, __LINE__);
-               prev = chunk_get_prev_nnl(next);
-               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);
-               pc = chunk_get_next_nl(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);
-               chunk_t *pc2 = chunk_get_next(pc);
-
-               if (pc2 != nullptr)
+               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);
+               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);
+               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_column %zu\n",
+                          __func__, __LINE__, pc->Text(), get_token_name(pc->type), pc->orig_line, pc->orig_col);
                }
                else
                {
@@ -1670,7 +1674,7 @@ static void newlines_if_for_while_switch_post_blank_lines(chunk_t *start, iarf_e
 } // newlines_if_for_while_switch_post_blank_lines
 
 
-static void newlines_struct_union(chunk_t *start, iarf_e nl_opt, bool leave_trailing)
+static void newlines_struct_union(Chunk *start, iarf_e nl_opt, bool leave_trailing)
 {
    LOG_FUNC_ENTRY();
 
@@ -1686,10 +1690,10 @@ static void newlines_struct_union(chunk_t *start, iarf_e nl_opt, bool leave_trai
     * step past any junk between the keyword and the open brace
     * Quit if we hit a semicolon or '=', which are not expected.
     */
-   size_t  level = start->level;
-   chunk_t *pc   = start;
+   size_t level = start->level;
+   Chunk  *pc   = start->GetNextNcNnl();
 
-   while (  ((pc = chunk_get_next_ncnnl(pc)) != nullptr)
+   while (  pc->IsNotNullChunk()
          && pc->level >= level)
    {
       if (  pc->level == level
@@ -1700,21 +1704,22 @@ static void newlines_struct_union(chunk_t *start, iarf_e nl_opt, bool leave_trai
          break;
       }
       start = pc;
+      pc    = pc->GetNextNcNnl();
    }
 
    // If we hit a brace open, then we need to toy with the newlines
    if (chunk_is_token(pc, CT_BRACE_OPEN))
    {
       // Skip over embedded C comments
-      chunk_t *next = chunk_get_next(pc);
+      Chunk *next = pc->GetNext();
 
       while (chunk_is_token(next, CT_COMMENT))
       {
-         next = chunk_get_next(next);
+         next = next->GetNext();
       }
 
       if (  leave_trailing
-         && !chunk_is_comment(next)
+         && !next->IsComment()
          && !chunk_is_newline(next))
       {
          nl_opt = IARF_IGNORE;
@@ -1732,7 +1737,7 @@ static void newlines_struct_union(chunk_t *start, iarf_e nl_opt, bool leave_trai
 // identifier       - the name of the enumeration that's being declared
 // enum-base(C++11) - colon (:), followed by a type-specifier-seq
 // enumerator-list  - comma-separated list of enumerator definitions
-static void newlines_enum(chunk_t *start)
+static void newlines_enum(Chunk *start)
 {
    LOG_FUNC_ENTRY();
 
@@ -1744,35 +1749,35 @@ static void newlines_enum(chunk_t *start)
       return;
    }
    // look for 'enum class'
-   chunk_t *pcClass = chunk_get_next_ncnnl(start);
+   Chunk *pcClass = start->GetNextNcNnl();
 
    if (chunk_is_token(pcClass, CT_ENUM_CLASS))
    {
       log_rule_B("nl_enum_class");
       newline_iarf_pair(start, pcClass, options::nl_enum_class());
       // look for 'identifier'/ 'type'
-      chunk_t *pcType = chunk_get_next_ncnnl(pcClass);
+      Chunk *pcType = pcClass->GetNextNcNnl();
 
       if (chunk_is_token(pcType, CT_TYPE))
       {
          log_rule_B("nl_enum_class_identifier");
          newline_iarf_pair(pcClass, pcType, options::nl_enum_class_identifier());
          // look for ':'
-         chunk_t *pcColon = chunk_get_next_ncnnl(pcType);
+         Chunk *pcColon = pcType->GetNextNcNnl();
 
          if (chunk_is_token(pcColon, CT_BIT_COLON))
          {
             log_rule_B("nl_enum_identifier_colon");
             newline_iarf_pair(pcType, pcColon, options::nl_enum_identifier_colon());
             // look for 'type' i.e. unsigned
-            chunk_t *pcType1 = chunk_get_next_ncnnl(pcColon);
+            Chunk *pcType1 = pcColon->GetNextNcNnl();
 
             if (chunk_is_token(pcType1, CT_TYPE))
             {
                log_rule_B("nl_enum_colon_type");
                newline_iarf_pair(pcColon, pcType1, options::nl_enum_colon_type());
                // look for 'type' i.e. int
-               chunk_t *pcType2 = chunk_get_next_ncnnl(pcType1);
+               Chunk *pcType2 = pcType1->GetNextNcNnl();
 
                if (chunk_is_token(pcType2, CT_TYPE))
                {
@@ -1787,10 +1792,10 @@ static void newlines_enum(chunk_t *start)
     * step past any junk between the keyword and the open brace
     * Quit if we hit a semicolon or '=', which are not expected.
     */
-   size_t  level = start->level;
-   chunk_t *pc   = start;
+   size_t level = start->level;
+   Chunk  *pc   = start->GetNextNcNnl();
 
-   while (  ((pc = chunk_get_next_ncnnl(pc)) != nullptr)
+   while (  pc->IsNotNullChunk()
          && pc->level >= level)
    {
       if (  pc->level == level
@@ -1801,21 +1806,22 @@ static void newlines_enum(chunk_t *start)
          break;
       }
       start = pc;
+      pc    = pc->GetNextNcNnl();
    }
 
    // If we hit a brace open, then we need to toy with the newlines
    if (chunk_is_token(pc, CT_BRACE_OPEN))
    {
       // Skip over embedded C comments
-      chunk_t *next = chunk_get_next(pc);
+      Chunk *next = pc->GetNext();
 
       while (chunk_is_token(next, CT_COMMENT))
       {
-         next = chunk_get_next(next);
+         next = next->GetNext();
       }
       iarf_e nl_opt;
 
-      if (  !chunk_is_comment(next)
+      if (  !next->IsComment()
          && !chunk_is_newline(next))
       {
          nl_opt = IARF_IGNORE;
@@ -1833,7 +1839,7 @@ static void newlines_enum(chunk_t *start)
 // namespace {
 // namespace word {
 // namespace type::word {
-static void newlines_namespace(chunk_t *start)
+static void newlines_namespace(Chunk *start)
 {
    LOG_FUNC_ENTRY();
 
@@ -1849,10 +1855,10 @@ static void newlines_namespace(chunk_t *start)
    {
       return;
    }
-   chunk_t *braceOpen = chunk_get_next_type(start, CT_BRACE_OPEN, start->level);
+   Chunk *braceOpen = start->GetNextType(CT_BRACE_OPEN, start->level);
 
-   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->orig_line, braceOpen->orig_col, braceOpen->Text());
    // produces much more log output. Use it only debugging purpose
    //log_pcf_flags(LNEWLINE, braceOpen->flags);
 
@@ -1862,16 +1868,16 @@ static void newlines_namespace(chunk_t *start)
               __func__, __LINE__);
       return;
    }
-   chunk_t *beforeBrace = chunk_get_prev(braceOpen);
+   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->orig_line, beforeBrace->orig_col, beforeBrace->Text());
    // 'namespace' 'BRACE_OPEN'
    newline_iarf_pair(beforeBrace, braceOpen, nl_opt);
 } // newlines_namespace
 
 
-static void newlines_cuddle_uncuddle(chunk_t *start, iarf_e nl_opt)
+static void newlines_cuddle_uncuddle(Chunk *start, iarf_e nl_opt)
 {
    LOG_FUNC_ENTRY();
 
@@ -1882,7 +1888,7 @@ static void newlines_cuddle_uncuddle(chunk_t *start, iarf_e nl_opt)
    {
       return;
    }
-   chunk_t *br_close = chunk_get_prev_ncnnlni(start);   // Issue #2279
+   Chunk *br_close = start->GetPrevNcNnlNi();   // Issue #2279
 
    if (chunk_is_token(br_close, CT_BRACE_CLOSE))
    {
@@ -1891,7 +1897,7 @@ static void newlines_cuddle_uncuddle(chunk_t *start, iarf_e nl_opt)
 } // newlines_cuddle_uncuddle
 
 
-static void newlines_do_else(chunk_t *start, iarf_e nl_opt)
+static void newlines_do_else(Chunk *start, iarf_e nl_opt)
 {
    LOG_FUNC_ENTRY();
 
@@ -1903,9 +1909,9 @@ static void newlines_do_else(chunk_t *start, iarf_e nl_opt)
    {
       return;
    }
-   chunk_t *next = chunk_get_next_ncnnl(start);
+   Chunk *next = start->GetNextNcNnl();
 
-   if (  next != nullptr
+   if (  next->IsNotNullChunk()
       && (  chunk_is_token(next, CT_BRACE_OPEN)
          || chunk_is_token(next, CT_VBRACE_OPEN)))
    {
@@ -1921,11 +1927,11 @@ static void newlines_do_else(chunk_t *start, iarf_e nl_opt)
          // Can only add - we don't want to create a one-line here
          if (nl_opt & IARF_ADD)
          {
-            newline_iarf_pair(start, chunk_get_next_ncnnl(next), nl_opt);
-            chunk_t *tmp = chunk_get_next_type(next, CT_VBRACE_CLOSE, next->level);
+            newline_iarf_pair(start, next->GetNextNcNnl(), nl_opt);
+            Chunk *tmp = next->GetNextType(CT_VBRACE_CLOSE, next->level);
 
-            if (  !chunk_is_newline(chunk_get_next_nc(tmp))
-               && !chunk_is_newline(chunk_get_prev_nc(tmp)))
+            if (  !chunk_is_newline(tmp->GetNextNc())
+               && !chunk_is_newline(tmp->GetPrevNc()))
             {
                newline_add_after(tmp);
             }
@@ -1934,20 +1940,20 @@ static void newlines_do_else(chunk_t *start, iarf_e nl_opt)
       else
       {
          newline_iarf_pair(start, next, nl_opt);
-         newline_add_between(next, chunk_get_next_ncnnl(next));
+         newline_add_between(next, next->GetNextNcNnl());
       }
    }
 } // newlines_do_else
 
 
-static bool is_var_def(chunk_t *pc, chunk_t *next)
+static bool is_var_def(Chunk *pc, Chunk *next)
 {
    if (  chunk_is_token(pc, CT_DECLTYPE)
       && chunk_is_token(next, CT_PAREN_OPEN))
    {
       // If current token starts a decltype expression, skip it
       next = chunk_skip_to_match(next);
-      next = chunk_get_next_ncnnl(next);
+      next = next->GetNextNcNnl();
    }
    else if (!chunk_is_type(pc))
    {
@@ -1963,7 +1969,7 @@ static bool is_var_def(chunk_t *pc, chunk_t *next)
    {
       // If we have a template type, skip it
       next = chunk_skip_to_match(next);
-      next = chunk_get_next_ncnnl(next);
+      next = next->GetNextNcNnl();
    }
    bool is = (  (  chunk_is_type(next)
                 && get_chunk_parent_type(next) != CT_FUNC_DEF)           // Issue #2639
@@ -1975,31 +1981,32 @@ static bool is_var_def(chunk_t *pc, chunk_t *next)
 
 
 // Put newline(s) before and/or after a block of variable definitions
-static chunk_t *newline_def_blk(chunk_t *start, bool fn_top)
+static Chunk *newline_def_blk(Chunk *start, bool fn_top)
 {
    LOG_FUNC_ENTRY();
 
-   chunk_t *prev = chunk_get_prev_ncnnlni(start);   // Issue #2279
+   Chunk *prev = start->GetPrevNcNnlNi();               // Issue #2279
 
    // can't be any variable definitions in a "= {" block
    if (chunk_is_token(prev, CT_ASSIGN))
    {
-      chunk_t *tmp = chunk_get_next_type(start, CT_BRACE_CLOSE, start->level);
-      return(chunk_get_next_ncnnl(tmp));
+      Chunk *tmp = start->GetNextType(CT_BRACE_CLOSE, start->level);
+      return(tmp->GetNextNcNnl());
    }
-   chunk_t *pc           = chunk_get_next(start);
-   bool    did_this_line = false;
-   bool    first_var_blk = true;
-   bool    var_blk       = false;
+   Chunk *pc = start->GetNext();
+
+   bool  did_this_line = false;
+   bool  first_var_blk = true;
+   bool  var_blk       = false;
 
-   while (  pc != nullptr
+   while (  pc->IsNotNullChunk()
          && (  pc->level >= start->level
             || pc->level == 0))
    {
-      LOG_FMT(LNL1LINE, "%s(%d): pc->orig_line is %zu, pc->orig_col is %zu, text() is '%s'\n",
-              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text());
+      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());
 
-      chunk_t *next_pc = chunk_get_next(pc);
+      Chunk *next_pc = pc->GetNext();
 
       if (chunk_is_token(next_pc, CT_DC_MEMBER))
       {
@@ -2007,9 +2014,9 @@ static chunk_t *newline_def_blk(chunk_t *start, bool fn_top)
          pc = chunk_skip_dc_member(pc);
       }
 
-      if (chunk_is_comment(pc))
+      if (pc->IsComment())
       {
-         pc = chunk_get_next(pc);
+         pc = pc->GetNext();
          continue;
       }
 
@@ -2023,15 +2030,15 @@ static chunk_t *newline_def_blk(chunk_t *start, bool fn_top)
       // Done with this brace set?
       if (chunk_is_token(pc, CT_BRACE_CLOSE))
       {
-         pc = chunk_get_next(pc);
+         pc = pc->GetNext();
          break;
       }
 
-      if (chunk_is_preproc(pc))
+      if (pc->IsPreproc())
       {
          if (!var_blk)
          {
-            pc = chunk_get_next(pc);
+            pc = pc->GetNext();
             break;
          }
       }
@@ -2039,22 +2046,22 @@ static chunk_t *newline_def_blk(chunk_t *start, bool fn_top)
       // skip vbraces
       if (chunk_is_token(pc, CT_VBRACE_OPEN))
       {
-         pc = chunk_get_next_type(pc, CT_VBRACE_CLOSE, pc->level);
-         pc = chunk_get_next(pc);
+         pc = pc->GetNextType(CT_VBRACE_CLOSE, pc->level);
+         pc = pc->GetNext();
          continue;
       }
 
       // Ignore stuff inside parenthesis/squares/angles
       if (pc->level > pc->brace_level)
       {
-         pc = chunk_get_next(pc);
+         pc = pc->GetNext();
          continue;
       }
 
       if (chunk_is_newline(pc))
       {
          did_this_line = false;
-         pc            = chunk_get_next(pc);
+         pc            = pc->GetNext();
          continue;
       }
 
@@ -2065,50 +2072,50 @@ static chunk_t *newline_def_blk(chunk_t *start, bool fn_top)
          && (  (pc->level == (start->level + 1))
             || pc->level == 0))
       {
-         chunk_t *next = chunk_get_next_ncnnl(pc);
+         Chunk *next = pc->GetNextNcNnl();
 
          if (  chunk_is_token(next, CT_PTR_TYPE) // Issue #2692
             || chunk_is_token(next, CT_BYREF))   // Issue #3018
          {
-            next = chunk_get_next_ncnnl(next);
+            next = next->GetNextNcNnl();
          }
 
-         if (next == nullptr)
+         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(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());
 
-         prev = chunk_get_prev_ncnnl(pc);
+         prev = pc->GetPrevNcNnl();
 
          while (  chunk_is_token(prev, CT_DC_MEMBER)
                || chunk_is_token(prev, CT_TYPE))
          {
-            prev = chunk_get_prev_ncnnl(prev);
+            prev = prev->GetPrevNcNnl();
          }
 
          if (!(chunk_is_opening_brace(prev) || chunk_is_closing_brace(prev)))
          {
-            prev = chunk_get_prev_type(pc, CT_SEMICOLON, pc->level);
+            prev = pc->GetPrevType(CT_SEMICOLON, pc->level);
          }
 
-         if (prev == nullptr)
+         if (prev->IsNullChunk())
          {
-            prev = chunk_get_prev_type(pc, CT_BRACE_OPEN, pc->level - 1);      // Issue #2692
+            prev = pc->GetPrevType(CT_BRACE_OPEN, pc->level - 1);      // Issue #2692
          }
 
          if (  chunk_is_token(prev, CT_STRING)
             && get_chunk_parent_type(prev) == CT_EXTERN
             && chunk_is_token(prev->prev, CT_EXTERN))
          {
-            prev = chunk_get_prev_ncnnlni(prev->prev);   // Issue #2279
+            prev = prev->GetPrev()->GetPrevNcNnlNi();   // Issue #2279
          }
 
          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);
+                    __func__, __LINE__, pc->Text(), next->Text(), pc->orig_line);
             // Put newline(s) before a block of variable definitions
             log_rule_B("nl_var_def_blk_start");
 
@@ -2117,23 +2124,32 @@ static chunk_t *newline_def_blk(chunk_t *start, bool fn_top)
                && 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(LBLANKD, "%s(%d): prev is '%s', orig_line is %zu\n",
-                       __func__, __LINE__, prev->text(), prev->orig_line);
+                       __func__, __LINE__, pc->Text(), pc->orig_line);
 
-               if (!chunk_is_opening_brace(prev))
+               if (prev == nullptr)
                {
-                  newline_min_after(prev, options::nl_var_def_blk_start(), PCF_VAR_DEF);
+                  LOG_FMT(LBLANKD, "%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);
+
+                  if (!chunk_is_opening_brace(prev))
+                  {
+                     newline_min_after(prev, options::nl_var_def_blk_start() + 1, PCF_VAR_DEF);
+                  }
                }
             }
 
             // set newlines within var def block
-            if (var_blk && (options::nl_var_def_blk_in() > 0))
+            if (  var_blk
+               && (options::nl_var_def_blk_in() > 0))
             {
                log_rule_B("nl_var_def_blk_in");
-               prev = chunk_get_prev(pc);
-               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());
+               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());
 
                if (chunk_is_newline(prev))
                {
@@ -2146,7 +2162,7 @@ static chunk_t *newline_def_blk(chunk_t *start, bool fn_top)
                   }
                }
             }
-            pc      = chunk_get_next_type(pc, CT_SEMICOLON, pc->level);
+            pc      = pc->GetNextType(CT_SEMICOLON, pc->level);
             var_blk = true;
          }
          else if (var_blk)
@@ -2155,20 +2171,24 @@ static chunk_t *newline_def_blk(chunk_t *start, bool fn_top)
 
             if (options::nl_var_def_blk_end() > 0)
             {
-               newline_min_after(prev, options::nl_var_def_blk_end(), PCF_VAR_DEF);
+               // Issue #3516
+               newline_min_after(prev, options::nl_var_def_blk_end() + 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 (  var_blk
-               && first_var_blk
+            if (  first_var_blk
                && fn_top
                && (options::nl_func_var_def_blk() > 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, 1 + options::nl_func_var_def_blk(), PCF_VAR_DEF);
+               newline_min_after(prev, options::nl_func_var_def_blk() + 1, PCF_VAR_DEF);
             }
             // reset the variables for the next block
             first_var_blk = true;
@@ -2184,41 +2204,46 @@ static chunk_t *newline_def_blk(chunk_t *start, bool fn_top)
             if (  var_blk
                && options::nl_var_def_blk_end() > 0)
             {
-               prev = chunk_get_prev(pc);
-               prev = chunk_get_prev(prev);
-               newline_min_after(prev, options::nl_var_def_blk_end(), PCF_VAR_DEF);
-               pc            = chunk_get_next(pc);
+               prev = pc->GetPrev();
+               prev = prev->GetPrev();
+               newline_min_after(prev, options::nl_var_def_blk_end() + 1, PCF_VAR_DEF);
+               pc            = pc->GetNext();
                first_var_blk = false;
                var_blk       = false;
             }
          }
       }
       did_this_line = true;
-      pc            = chunk_get_next(pc);
+
+      if (pc == nullptr)
+      {
+         pc = Chunk::NullChunkPtr;
+      }
+      pc = pc->GetNext();
    }
    return(pc);
 } // newline_def_blk
 
 
-static bool collapse_empty_body(chunk_t *br_open)
+static bool collapse_empty_body(Chunk *br_open)
 {
    log_rule_B("nl_collapse_empty_body");
 
    if (  !options::nl_collapse_empty_body()
-      || !chunk_is_token(chunk_get_next_nnl(br_open), CT_BRACE_CLOSE))
+      || !chunk_is_token(br_open->GetNextNnl(), CT_BRACE_CLOSE))
    {
       return(false);
    }
 
-   for (chunk_t *pc = chunk_get_next(br_open)
+   for (Chunk *pc = br_open->GetNext()
         ; chunk_is_not_token(pc, CT_BRACE_CLOSE)
-        ; pc = chunk_get_next(pc))
+        ; pc = pc->GetNext())
    {
       if (  chunk_is_token(pc, CT_NEWLINE)
          && chunk_safe_to_del_nl(pc))
       {
          pc = pc->prev;
-         chunk_t *next = pc->next;
+         Chunk *next = pc->next;
          chunk_del(next);
          MARK_CHANGE();
       }
@@ -2228,7 +2253,7 @@ static bool collapse_empty_body(chunk_t *br_open)
 } // collapse_empty_body
 
 
-static void newlines_brace_pair(chunk_t *br_open)
+static void newlines_brace_pair(Chunk *br_open)
 {
    LOG_FUNC_ENTRY();
 
@@ -2243,9 +2268,9 @@ static void newlines_brace_pair(chunk_t *br_open)
    //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(chunk_get_prev(br_open)))
+      && chunk_is_newline(br_open->GetPrev()))
    {
-      chunk_t *chunk_brace_close = chunk_skip_to_match(br_open, scope_e::ALL);
+      Chunk *chunk_brace_close = chunk_skip_to_match(br_open, E_Scope::ALL);
 
       if (chunk_brace_close != nullptr)
       {
@@ -2255,13 +2280,13 @@ static void newlines_brace_pair(chunk_t *br_open)
 
             if (options::nl_namespace_two_to_one_liner())
             {
-               chunk_t *prev = chunk_get_prev_nnl(br_open);
+               Chunk *prev = br_open->GetPrevNnl();
                newline_del_between(prev, br_open);
             }
             /* Below code is to support conversion of 2 liner to 4 liners
              * else
              * {
-             *  chunk_t *nxt = chunk_get_next(br_open);
+             *  Chunk *nxt = br_open->GetNext();
              *  newline_add_between(br_open, nxt);
              * }*/
          }
@@ -2274,25 +2299,25 @@ static void newlines_brace_pair(chunk_t *br_open)
       && options::nl_create_func_def_one_liner()
       && !br_open->flags.test(PCF_NOT_POSSIBLE))          // Issue #2795
    {
-      chunk_t *br_close = chunk_skip_to_match(br_open, scope_e::ALL);
-      chunk_t *tmp      = chunk_get_prev_ncnnlni(br_open); // Issue #2279
+      Chunk *br_close = chunk_skip_to_match(br_open, E_Scope::ALL);
+      Chunk *tmp      = br_open->GetPrevNcNnlNi(); // Issue #2279
 
-      if (  br_close != nullptr                            // Issue #2594
+      if (  br_close != nullptr                    // Issue #2594
          && ((br_close->orig_line - br_open->orig_line) <= 2)
-         && chunk_is_paren_close(tmp))                     // need to check the conditions.
+         && chunk_is_paren_close(tmp))             // need to check the conditions.
       {
          // Issue #1825
          bool is_it_possible = true;
 
-         while (  tmp != nullptr
-               && (tmp = chunk_get_next(tmp)) != nullptr
+         while (  tmp->IsNotNullChunk()
+               && (tmp = tmp->GetNext())->IsNotNullChunk()
                && !chunk_is_closing_brace(tmp)
-               && (chunk_get_next(tmp) != nullptr))
+               && (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, tmp->orig_col is %zu, Text() is '%s'\n",
+                    __func__, __LINE__, tmp->orig_line, tmp->orig_col, tmp->Text());
 
-            if (chunk_is_comment(tmp))
+            if (tmp->IsComment())
             {
                is_it_possible = false;
                break;
@@ -2304,24 +2329,24 @@ static void newlines_brace_pair(chunk_t *br_open)
             // Issue 2795
             // we have to check if it could be too long for code_width
             // make a vector to save the chunk
-            vector<chunk_t> saved_chunk;
+            vector<Chunk> saved_chunk;
             log_rule_B("code_width");
 
             if (options::code_width() > 0)
             {
                saved_chunk.reserve(16);
-               chunk_t *current       = chunk_get_prev_ncnnlni(br_open);
-               chunk_t *next_br_close = chunk_get_next(br_close);
-               current = chunk_get_next(current);
+               Chunk *current       = br_open->GetPrevNcNnlNi();
+               Chunk *next_br_close = br_close->GetNext();
+               current = current->GetNext();
 
-               while (current != nullptr)
+               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->orig_line, current->orig_col, current->Text());
                   saved_chunk.push_back(*current);
-                  chunk_t *the_next = chunk_get_next(current);
+                  Chunk *the_next = current->GetNext();
 
-                  if (  the_next == nullptr
+                  if (  the_next->IsNullChunk()
                      || the_next == next_br_close)
                   {
                      break;
@@ -2329,20 +2354,20 @@ static void newlines_brace_pair(chunk_t *br_open)
                   current = the_next;
                }
             }
-            chunk_t *tmp_1 = chunk_get_prev_ncnnlni(br_open);
+            Chunk *tmp_1 = br_open->GetPrevNcNnlNi();
 
-            while (  tmp_1 != nullptr
-                  && (tmp_1 = chunk_get_next(tmp_1)) != nullptr
+            while (  tmp_1->IsNotNullChunk()
+                  && (tmp_1 = tmp_1->GetNext())->IsNotNullChunk()
                   && !chunk_is_closing_brace(tmp_1)
-                  && (chunk_get_next(tmp_1) != nullptr))
+                  && (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->orig_line, tmp_1->orig_col, tmp_1->Text());
 
                if (chunk_is_newline(tmp_1))
                {
-                  tmp_1 = chunk_get_prev(tmp_1);                 // Issue #1825
-                  newline_iarf_pair(tmp_1, chunk_get_next_ncnnl(tmp_1), IARF_REMOVE);
+                  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
@@ -2357,9 +2382,9 @@ static void newlines_brace_pair(chunk_t *br_open)
                // because the line would be too long
                chunk_flags_set(br_open, PCF_NOT_POSSIBLE);
                // restore the code
-               size_t  count;
-               chunk_t tmp_2;
-               chunk_t *current = br_open;
+               size_t count;
+               Chunk  tmp_2;
+               Chunk  *current = br_open;
 
                for (count = 0; count < saved_chunk.size(); count++)
                {
@@ -2368,7 +2393,7 @@ static void newlines_brace_pair(chunk_t *br_open)
                   if (tmp_2.orig_line != current->orig_line)
                   {
                      // restore the newline
-                     chunk_t chunk;
+                     Chunk chunk;
                      set_chunk_type(&chunk, CT_NEWLINE);
                      chunk.orig_line = current->orig_line;
                      chunk.orig_col  = current->orig_col;
@@ -2376,11 +2401,11 @@ static void newlines_brace_pair(chunk_t *br_open)
                      chunk.nl_count  = 1;
                      chunk_add_before(&chunk, 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->orig_line, current->orig_col, current->Text());
                   }
                   else
                   {
-                     current = chunk_get_next(current);
+                     current = current->GetNext();
                   }
                }
             }
@@ -2397,11 +2422,11 @@ static void newlines_brace_pair(chunk_t *br_open)
    }
    LOG_FMT(LNL1LINE, "%s(%d): a new line may be added\n", __func__, __LINE__);
 
-   chunk_t *next = chunk_get_next_nc(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),
+   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)));
 
    if (get_chunk_parent_type(br_open) == CT_ASSIGN)
@@ -2409,7 +2434,7 @@ static void newlines_brace_pair(chunk_t *br_open)
       // Only mess with it if the open brace is followed by a newline
       if (chunk_is_newline(next))
       {
-         chunk_t *prev = chunk_get_prev_ncnnlni(br_open);   // Issue #2279
+         Chunk *prev = br_open->GetPrevNcNnlNi();   // Issue #2279
          log_rule_B("nl_assign_brace");
          newline_iarf_pair(prev, br_open, options::nl_assign_brace());
       }
@@ -2424,8 +2449,8 @@ static void newlines_brace_pair(chunk_t *br_open)
       || get_chunk_parent_type(br_open) == CT_FUNC_CALL
       || get_chunk_parent_type(br_open) == CT_FUNC_CALL_USER)
    {
-      chunk_t *prev = nullptr;
-      iarf_e  val;
+      Chunk  *prev = Chunk::NullChunkPtr;
+      iarf_e val;
 
       if (get_chunk_parent_type(br_open) == CT_OC_MSG_DECL)
       {
@@ -2444,7 +2469,7 @@ static void newlines_brace_pair(chunk_t *br_open)
 
             if (nl_fdef_brace_cond_v != IARF_IGNORE)
             {
-               prev = chunk_get_prev_ncnnlni(br_open);   // Issue #2279
+               prev = br_open->GetPrevNcNnlNi();   // Issue #2279
 
                if (chunk_is_token(prev, CT_FPAREN_CLOSE))
                {
@@ -2473,10 +2498,10 @@ static void newlines_brace_pair(chunk_t *br_open)
 
       if (val != IARF_IGNORE)
       {
-         if (prev == nullptr)
+         if (prev->IsNullChunk())
          {
             // Grab the chunk before the open brace
-            prev = chunk_get_prev_ncnnlni(br_open);   // Issue #2279
+            prev = br_open->GetPrevNcNnlNi();   // Issue #2279
          }
          newline_iarf_pair(prev, br_open, val);
       }
@@ -2490,13 +2515,13 @@ static void newlines_brace_pair(chunk_t *br_open)
 
    if (chunk_is_token(br_open, CT_BRACE_OPEN))
    {
-      chunk_t *chunk_closeing_brace = chunk_skip_to_match(br_open, scope_e::ALL);
+      Chunk *chunk_closeing_brace = chunk_skip_to_match(br_open, E_Scope::ALL);
 
       if (chunk_closeing_brace != nullptr)
       {
          if (chunk_closeing_brace->orig_line > br_open->orig_line)
          {
-            chunk_t *prev = chunk_get_prev_nc(br_open);
+            Chunk *prev = br_open->GetPrevNc();
 
             if (  chunk_is_token(prev, CT_TSQUARE)
                && chunk_is_newline(next))
@@ -2518,7 +2543,7 @@ static void newlines_brace_pair(chunk_t *br_open)
          log_rule_B("nl_inside_namespace");
 
          if (  options::nl_inside_empty_func() > 0
-            && chunk_is_token(chunk_get_next_nnl(br_open), CT_BRACE_CLOSE)
+            && 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))
          {
@@ -2556,10 +2581,12 @@ static void newlines_brace_pair(chunk_t *br_open)
          nl_close_brace = true;
       }
       // handle newlines after the open brace
-      chunk_t *pc = chunk_get_next_ncnnl(br_open);
+      Chunk *pc = br_open->GetNextNcNnl();
       newline_add_between(br_open, pc);
 
-      newline_def_blk(br_open, true);
+      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
@@ -2569,9 +2596,9 @@ static void newlines_brace_pair(chunk_t *br_open)
       newline_def_blk(br_open, false);
    }
    // Grab the matching brace close
-   chunk_t *br_close = chunk_get_next_type(br_open, CT_BRACE_CLOSE, br_open->level);
+   Chunk *br_close = br_open->GetNextType(CT_BRACE_CLOSE, br_open->level);
 
-   if (br_close == nullptr)
+   if (br_close->IsNullChunk())
    {
       return;
    }
@@ -2583,20 +2610,20 @@ static void newlines_brace_pair(chunk_t *br_open)
        * CT_COMMENT_CPP without hitting anything other than CT_COMMENT, then
        * there should be a newline before the close brace.
        */
-      chunk_t *pc = chunk_get_next(br_open);
+      Chunk *pc = br_open->GetNext();
 
       while (chunk_is_token(pc, CT_COMMENT))
       {
-         pc = chunk_get_next(pc);
+         pc = pc->GetNext();
       }
 
       if (  chunk_is_newline(pc)
-         || chunk_is_comment(pc))
+         || pc->IsComment())
       {
          nl_close_brace = true;
       }
    }
-   chunk_t *prev = chunk_get_prev_nblank(br_close);
+   Chunk *prev = br_close->GetPrevNcNnlNet();
 
    if (nl_close_brace)
    {
@@ -2609,7 +2636,7 @@ static void newlines_brace_pair(chunk_t *br_open)
 } // newlines_brace_pair
 
 
-static void newline_case(chunk_t *start)
+static void newline_case(Chunk *start)
 {
    LOG_FUNC_ENTRY();
 
@@ -2618,13 +2645,13 @@ static void newline_case(chunk_t *start)
    //          start->orig_line, start->orig_col);
 
    // Scan backwards until a '{' or ';' or ':'. Abort if a multi-newline is found
-   chunk_t *prev = start;
+   Chunk *prev = start;
 
    do
    {
-      prev = chunk_get_prev_nc(prev);
+      prev = prev->GetPrevNc();
 
-      if (  prev != nullptr
+      if (  prev->IsNotNullChunk()
          && chunk_is_newline(prev)
          && prev->nl_count > 1)
       {
@@ -2635,11 +2662,11 @@ static void newline_case(chunk_t *start)
            && chunk_is_not_token(prev, CT_SEMICOLON)
            && chunk_is_not_token(prev, CT_CASE_COLON));
 
-   if (prev == nullptr)
+   if (prev->IsNullChunk())
    {
       return;
    }
-   chunk_t *pc = newline_add_between(prev, start);
+   Chunk *pc = newline_add_between(prev, start);
 
    if (pc == nullptr)
    {
@@ -2659,19 +2686,19 @@ static void newline_case(chunk_t *start)
 } // newline_case
 
 
-static void newline_case_colon(chunk_t *start)
+static void newline_case_colon(Chunk *start)
 {
    LOG_FUNC_ENTRY();
 
    // Scan forwards until a non-comment is found
-   chunk_t *pc = start;
+   Chunk *pc = start;
 
    do
    {
-      pc = chunk_get_next(pc);
-   } while (chunk_is_comment(pc));
+      pc = pc->GetNext();
+   } while (pc->IsComment());
 
-   if (  pc != nullptr
+   if (  pc->IsNotNullChunk()
       && !chunk_is_newline(pc))
    {
       newline_add_before(pc);
@@ -2679,12 +2706,17 @@ static void newline_case_colon(chunk_t *start)
 } // newline_case_colon
 
 
-static void newline_before_return(chunk_t *start)
+static void newline_before_return(Chunk *start)
 {
    LOG_FUNC_ENTRY();
 
-   chunk_t *pc = chunk_get_prev(start);
-   chunk_t *nl = pc;
+   Chunk *pc = Chunk::NullChunkPtr;
+
+   if (start != nullptr)
+   {
+      pc = start->GetPrev();
+   }
+   Chunk *nl = pc;
 
    // Skip over single preceding newline
    if (chunk_is_newline(pc))
@@ -2694,32 +2726,32 @@ static void newline_before_return(chunk_t *start)
       {
          return;
       }
-      pc = chunk_get_prev(nl);
+      pc = nl->GetPrev();
    }
 
    // Skip over preceding comments that are not a trailing comment, taking
    // into account that comment blocks may span multiple lines.
    // Trailing comments are considered part of the previous token, not the
    // return statement.  They are handled below.
-   while (  chunk_is_comment(pc)
+   while (  pc->IsComment()
          && get_chunk_parent_type(pc) != CT_COMMENT_END)
    {
-      pc = chunk_get_prev(pc);
+      pc = pc->GetPrev();
 
       if (!chunk_is_newline(pc))
       {
          return;
       }
       nl = pc;
-      pc = chunk_get_prev(pc);
+      pc = pc->GetPrev();
    }
-   pc = chunk_get_prev(nl);
+   pc = nl->GetPrev();
 
    // Peek over trailing comment of previous token
-   if (  chunk_is_comment(pc)
+   if (  pc->IsComment()
       && get_chunk_parent_type(pc) == CT_COMMENT_END)
    {
-      pc = chunk_get_prev(pc);
+      pc = pc->GetPrev();
    }
 
    // Don't add extra blanks after an opening brace or a case statement
@@ -2736,28 +2768,30 @@ static void newline_before_return(chunk_t *start)
    {
       nl->nl_count++;
       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);
    }
 } // newline_before_return
 
 
-static void newline_after_return(chunk_t *start)
+static void newline_after_return(Chunk *start)
 {
    LOG_FUNC_ENTRY();
 
-   chunk_t *semi  = chunk_get_next_type(start, CT_SEMICOLON, start->level);
-   chunk_t *after = chunk_get_next_nblank(semi);
+   Chunk *semi  = start->GetNextType(CT_SEMICOLON, start->level);
+   Chunk *after = semi->GetNextNcNnlNet();
 
    // If we hit a brace or an 'else', then a newline isn't needed
-   if (  after == nullptr
+   if (  after->IsNullChunk()
       || chunk_is_token(after, CT_BRACE_CLOSE)
       || chunk_is_token(after, CT_VBRACE_CLOSE)
       || chunk_is_token(after, CT_ELSE))
    {
       return;
    }
-   chunk_t *pc;
+   Chunk *pc;
 
-   for (pc = chunk_get_next(semi); pc != after; pc = chunk_get_next(pc))
+   for (pc = semi->GetNext(); pc != after; pc = pc->GetNext())
    {
       if (chunk_is_token(pc, CT_NEWLINE))
       {
@@ -2771,7 +2805,7 @@ static void newline_after_return(chunk_t *start)
 } // newline_after_return
 
 
-static void newline_iarf_pair(chunk_t *before, chunk_t *after, iarf_e av, bool check_nl_assign_leave_one_liners)
+static void newline_iarf_pair(Chunk *before, Chunk *after, iarf_e av, bool check_nl_assign_leave_one_liners)
 {
    LOG_FUNC_ENTRY();
 
@@ -2779,7 +2813,9 @@ static void newline_iarf_pair(chunk_t *before, chunk_t *after, iarf_e av, bool c
    log_func_stack(LNEWLINE, "CallStack:");
 
    if (  before == nullptr
+      || before == Chunk::NullChunkPtr
       || after == nullptr
+      || after == Chunk::NullChunkPtr
       || chunk_is_token(after, CT_IGNORED))
    {
       return;
@@ -2794,9 +2830,9 @@ static void newline_iarf_pair(chunk_t *before, chunk_t *after, iarf_e av, bool c
          log_rule_B("nl_assign_leave_one_liners");
          return;
       }
-      chunk_t *nl = newline_add_between(before, after);
+      Chunk *nl = newline_add_between(before, after);
       LOG_FMT(LNEWLINE, "%s(%d): newline_add_between '%s' and '%s'\n",
-              __func__, __LINE__, before->text(), after->text());
+              __func__, __LINE__, before->Text(), after->Text());
 
       if (  nl != nullptr
          && av == IARF_FORCE
@@ -2808,19 +2844,24 @@ static void newline_iarf_pair(chunk_t *before, chunk_t *after, iarf_e av, bool c
    else if (av & IARF_REMOVE)
    {
       LOG_FMT(LNEWLINE, "%s(%d): newline_remove_between '%s' and '%s'\n",
-              __func__, __LINE__, before->text(), after->text());
+              __func__, __LINE__, before->Text(), after->Text());
       newline_del_between(before, after);
    }
 } // newline_iarf_pair
 
 
-void newline_iarf(chunk_t *pc, iarf_e av)
+void newline_iarf(Chunk *pc, iarf_e av)
 {
    LOG_FUNC_ENTRY();
 
    LOG_FMT(LNFD, "%s(%d): ", __func__, __LINE__);
    log_func_stack(LNFD, "CallStack:");
-   chunk_t *after = chunk_get_next_nnl(pc);
+   Chunk *after = Chunk::NullChunkPtr;
+
+   if (pc != nullptr)
+   {
+      after = pc->GetNextNnl();
+   }
 
    if (  chunk_is_token(pc, CT_FPAREN_OPEN)                         // Issue #2914
       && get_chunk_parent_type(pc) == CT_FUNC_CALL
@@ -2833,13 +2874,13 @@ void newline_iarf(chunk_t *pc, iarf_e av)
 } // newline_iarf
 
 
-static void newline_func_multi_line(chunk_t *start)
+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)));
+           start->Text(), get_token_name(start->type), get_token_name(get_chunk_parent_type(start)));
 
    bool add_start;
    bool add_args;
@@ -2881,29 +2922,29 @@ static void newline_func_multi_line(chunk_t *start)
    {
       return;
    }
-   chunk_t *pc = chunk_get_next_ncnnl(start);
+   Chunk *pc = start->GetNextNcNnl();
 
-   while (  pc != nullptr
+   while (  pc->IsNotNullChunk()
          && pc->level > start->level)
    {
-      pc = chunk_get_next_ncnnl(pc);
+      pc = pc->GetNextNcNnl();
    }
 
    if (  chunk_is_token(pc, CT_FPAREN_CLOSE)
       && chunk_is_newline_between(start, pc))
    {
-      chunk_t *start_next         = chunk_get_next_ncnnl(start);
-      bool    has_leading_closure = (  start_next->parent_type == CT_OC_BLOCK_EXPR
-                                    || start_next->parent_type == CT_CPP_LAMBDA
-                                    || chunk_is_token(start_next, CT_BRACE_OPEN));
+      Chunk *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));
 
-      chunk_t *prev_end            = chunk_get_prev_ncnnl(pc);
-      bool    has_trailing_closure = (  prev_end->parent_type == CT_OC_BLOCK_EXPR
-                                     || prev_end->parent_type == CT_CPP_LAMBDA
-                                     || chunk_is_token(prev_end, CT_BRACE_OPEN));
+      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));
 
       if (  add_start
-         && !chunk_is_newline(chunk_get_next(start)))
+         && !chunk_is_newline(start->GetNext()))
       {
          log_rule_B("nl_func_call_args_multi_line_ignore_closures");
 
@@ -2922,7 +2963,7 @@ static void newline_func_multi_line(chunk_t *start)
       }
 
       if (  add_end
-         && !chunk_is_newline(chunk_get_prev(pc)))
+         && !chunk_is_newline(pc->GetPrev()))
       {
          log_rule_B("nl_func_call_args_multi_line_ignore_closures");
 
@@ -2931,12 +2972,12 @@ static void newline_func_multi_line(chunk_t *start)
             if (  !has_leading_closure
                && !has_trailing_closure)
             {
-               newline_iarf(chunk_get_prev(pc), IARF_ADD);
+               newline_iarf(pc->GetPrev(), IARF_ADD);
             }
          }
          else
          {
-            newline_iarf(chunk_get_prev(pc), IARF_ADD);
+            newline_iarf(pc->GetPrev(), IARF_ADD);
          }
       }
 
@@ -2944,28 +2985,28 @@ static void newline_func_multi_line(chunk_t *start)
       {
          // process the function in reverse and leave the first comma if the option to leave trailing closure
          // is on. nl_func_call_args_multi_line_ignore_trailing_closure
-         for (pc = chunk_get_next_ncnnl(start);
-              pc != nullptr && pc->level > start->level;
-              pc = chunk_get_next_ncnnl(pc))
+         for (pc = start->GetNextNcNnl();
+              pc->IsNotNullChunk() && pc->level > start->level;
+              pc = pc->GetNextNcNnl())
          {
             if (  chunk_is_token(pc, CT_COMMA)
                && (pc->level == (start->level + 1)))
             {
-               chunk_t *tmp = chunk_get_next(pc);
+               Chunk *tmp = pc->GetNext();
 
-               if (chunk_is_comment(tmp))
+               if (tmp->IsComment())
                {
                   pc = tmp;
                }
 
-               if (!chunk_is_newline(chunk_get_next(pc)))
+               if (!chunk_is_newline(pc->GetNext()))
                {
                   log_rule_B("nl_func_call_args_multi_line_ignore_closures");
 
                   if (options::nl_func_call_args_multi_line_ignore_closures())
                   {
-                     chunk_t *prev_comma  = chunk_get_prev_ncnnl(pc);
-                     chunk_t *after_comma = chunk_get_next_ncnnl(pc);
+                     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
@@ -2989,13 +3030,13 @@ static void newline_func_multi_line(chunk_t *start)
 } // newline_func_multi_line
 
 
-static void newline_template(chunk_t *start)
+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)));
+           start->Text(), get_token_name(start->type), get_token_name(get_chunk_parent_type(start)));
 
    log_rule_B("nl_template_start");
    bool add_start = options::nl_template_start();
@@ -3012,12 +3053,12 @@ static void newline_template(chunk_t *start)
    {
       return;
    }
-   chunk_t *pc = chunk_get_next_ncnnl(start);
+   Chunk *pc = start->GetNextNcNnl();
 
-   while (  pc != nullptr
+   while (  pc->IsNotNullChunk()
          && pc->level > start->level)
    {
-      pc = chunk_get_next_ncnnl(pc);
+      pc = pc->GetNextNcNnl();
    }
 
    if (chunk_is_token(pc, CT_ANGLE_CLOSE))
@@ -3029,28 +3070,28 @@ static void newline_template(chunk_t *start)
 
       if (add_end)
       {
-         newline_iarf(chunk_get_prev(pc), IARF_ADD);
+         newline_iarf(pc->GetPrev(), IARF_ADD);
       }
 
       if (add_args)
       {
-         chunk_t *pc_1;
+         Chunk *pc_1;
 
-         for (pc_1 = chunk_get_next_ncnnl(start);
-              pc_1 != nullptr && pc_1->level > start->level;
-              pc_1 = chunk_get_next_ncnnl(pc_1))
+         for (pc_1 = start->GetNextNcNnl();
+              pc_1->IsNotNullChunk() && pc_1->level > start->level;
+              pc_1 = pc_1->GetNextNcNnl())
          {
             if (  chunk_is_token(pc_1, CT_COMMA)
                && (pc_1->level == (start->level + 1)))
             {
-               chunk_t *tmp = chunk_get_next(pc_1);
+               Chunk *tmp = pc_1->GetNext();
 
-               if (chunk_is_comment(tmp))
+               if (tmp->IsComment())
                {
                   pc_1 = tmp;
                }
 
-               if (!chunk_is_newline(chunk_get_next(pc_1)))
+               if (!chunk_is_newline(pc_1->GetNext()))
                {
                   newline_iarf(pc_1, IARF_ADD);
                }
@@ -3061,12 +3102,12 @@ static void newline_template(chunk_t *start)
 } // newline_template
 
 
-static void newline_func_def_or_call(chunk_t *start)
+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,
+   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)));
 
    bool is_def = (get_chunk_parent_type(start) == CT_FUNC_DEF)
@@ -3084,25 +3125,25 @@ static void newline_func_def_or_call(chunk_t *start)
 
       if (atmp != IARF_IGNORE)
       {
-         chunk_t *prev = chunk_get_prev_ncnnlni(start);   // Issue #2279
+         Chunk *prev = start->GetPrevNcNnlNi();   // Issue #2279
 
-         if (prev != nullptr)
+         if (prev->IsNotNullChunk())
          {
             newline_iarf(prev, atmp);
          }
       }
-      chunk_t *pc = chunk_get_next_ncnnl(start);
+      Chunk *pc = start->GetNextNcNnl();
 
-      if (chunk_is_str(pc, ")", 1))
+      if (chunk_is_str(pc, ")"))
       {
          log_rule_B("nl_func_call_paren_empty");
          atmp = options::nl_func_call_paren_empty();
 
          if (atmp != IARF_IGNORE)
          {
-            chunk_t *prev = chunk_get_prev_ncnnlni(start);   // Issue #2279
+            Chunk *prev = start->GetPrevNcNnlNi();   // Issue #2279
 
-            if (prev != nullptr)
+            if (prev->IsNotNullChunk())
             {
                newline_iarf(prev, atmp);
             }
@@ -3131,35 +3172,35 @@ static void newline_func_def_or_call(chunk_t *start)
 
       if (atmp != IARF_IGNORE)
       {
-         chunk_t *prev = chunk_get_prev_ncnnlni(start);      // Issue #2279
+         Chunk *prev = start->GetPrevNcNnlNi();      // Issue #2279
 
-         if (prev != nullptr)
+         if (prev->IsNotNullChunk())
          {
             newline_iarf(prev, atmp);
          }
       }
       // Handle break newlines type and function
-      chunk_t *prev = chunk_get_prev_ncnnlni(start);   // Issue #2279
+      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 : chunk_get_prev_ncnnlni(prev);   // Issue #2279
+      prev = chunk_is_paren_close(prev) ? nullptr : prev->GetPrevNcNnlNi();   // Issue #2279
 
       log_rule_B("nl_func_class_scope");
 
       if (  chunk_is_token(prev, CT_DC_MEMBER)
          && (options::nl_func_class_scope() != IARF_IGNORE))
       {
-         newline_iarf(chunk_get_prev_ncnnlni(prev), options::nl_func_class_scope());   // Issue #2279
+         newline_iarf(prev->GetPrevNcNnlNi(), options::nl_func_class_scope());   // Issue #2279
       }
 
       if (chunk_is_not_token(prev, CT_ACCESS_COLON))
       {
-         chunk_t *tmp;
+         Chunk *tmp;
 
          if (chunk_is_token(prev, CT_OPERATOR))
          {
             tmp  = prev;
-            prev = chunk_get_prev_ncnnlni(prev);   // Issue #2279
+            prev = prev->GetPrevNcNnlNi();   // Issue #2279
          }
          else
          {
@@ -3170,18 +3211,19 @@ static void newline_func_def_or_call(chunk_t *start)
          {
             log_rule_B("nl_func_scope_name");
 
-            if (options::nl_func_scope_name() != IARF_IGNORE)
+            if (  options::nl_func_scope_name() != IARF_IGNORE
+               && !start->flags.test(PCF_IN_DECLTYPE))
             {
                newline_iarf(prev, options::nl_func_scope_name());
             }
          }
-         const chunk_t *tmp_next = chunk_get_next_ncnnl(prev);
+         const Chunk *tmp_next = prev->GetNextNcNnl();
 
          if (chunk_is_not_token(tmp_next, CT_FUNC_CLASS_DEF))
          {
-            chunk_t *closing = chunk_skip_to_match(tmp);
-            chunk_t *brace   = chunk_get_next_ncnnl(closing);
-            iarf_e  a;                                           // Issue #2561
+            Chunk  *closing = chunk_skip_to_match(tmp);
+            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)
@@ -3219,14 +3261,14 @@ static void newline_func_def_or_call(chunk_t *start)
             if (  a != IARF_IGNORE
                && prev != nullptr)
             {
-               LOG_FMT(LNFD, "%s(%d): prev->text() '%s', orig_line is %zu, orig_col is %zu, [%s/%s]\n",
-                       __func__, __LINE__, prev->text(), prev->orig_line, prev->orig_col,
+               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)));
 
                if (chunk_is_token(prev, CT_DESTRUCTOR))
                {
-                  prev = chunk_get_prev_ncnnlni(prev);   // Issue #2279
+                  prev = prev->GetPrevNcNnlNi();   // Issue #2279
                }
 
                /*
@@ -3235,9 +3277,9 @@ static void newline_func_def_or_call(chunk_t *start)
                 */
                while (chunk_is_token(prev, CT_DC_MEMBER))
                {
-                  prev = chunk_get_prev_ncnnlni(prev);   // Issue #2279
+                  prev = prev->GetPrevNcNnlNi();   // Issue #2279
                   prev = skip_template_prev(prev);
-                  prev = chunk_get_prev_ncnnlni(prev);   // Issue #2279
+                  prev = prev->GetPrevNcNnlNi();   // Issue #2279
                }
 
                if (  chunk_is_not_token(prev, CT_BRACE_CLOSE)
@@ -3256,9 +3298,9 @@ static void newline_func_def_or_call(chunk_t *start)
             }
          }
       }
-      chunk_t *pc = chunk_get_next_ncnnl(start);
+      Chunk *pc = start->GetNextNcNnl();
 
-      if (chunk_is_str(pc, ")", 1))
+      if (chunk_is_str(pc, ")"))
       {
          log_rule_B("nl_func_def_empty");
          log_rule_B("nl_func_decl_empty");
@@ -3276,9 +3318,9 @@ static void newline_func_def_or_call(chunk_t *start)
 
          if (atmp != IARF_IGNORE)
          {
-            prev = chunk_get_prev_ncnnlni(start);   // Issue #2279
+            prev = start->GetPrevNcNnlNi();   // Issue #2279
 
-            if (prev != nullptr)
+            if (prev->IsNotNullChunk())
             {
                newline_iarf(prev, atmp);
             }
@@ -3287,21 +3329,21 @@ static void newline_func_def_or_call(chunk_t *start)
       }
    }
    // Now scan for commas
-   size_t  comma_count = 0;
-   chunk_t *tmp;
-   chunk_t *pc;
+   size_t comma_count = 0;
+   Chunk  *tmp;
+   Chunk  *pc;
 
-   for (pc = chunk_get_next_ncnnl(start);
-        pc != nullptr && pc->level > start->level;
-        pc = chunk_get_next_ncnnl(pc))
+   for (pc = start->GetNextNcNnl();
+        pc->IsNotNullChunk() && pc->level > start->level;
+        pc = pc->GetNextNcNnl())
    {
       if (  chunk_is_token(pc, CT_COMMA)
          && (pc->level == (start->level + 1)))
       {
          comma_count++;
-         tmp = chunk_get_next(pc);
+         tmp = pc->GetNext();
 
-         if (chunk_is_comment(tmp))
+         if (tmp->IsComment())
          {
             pc = tmp;
          }
@@ -3364,7 +3406,7 @@ static void newline_func_def_or_call(chunk_t *start)
    // and fix up the close parenthesis
    if (chunk_is_token(pc, CT_FPAREN_CLOSE))
    {
-      chunk_t *prev = chunk_get_prev_nnl(pc);
+      Chunk *prev = pc->GetPrevNnl();
 
       if (  chunk_is_not_token(prev, CT_FPAREN_OPEN)
          && !is_call)
@@ -3376,11 +3418,11 @@ static void newline_func_def_or_call(chunk_t *start)
 } // newline_func_def_or_call
 
 
-static void newline_oc_msg(chunk_t *start)
+static void newline_oc_msg(Chunk *start)
 {
    LOG_FUNC_ENTRY();
 
-   chunk_t *sq_c = chunk_skip_to_match(start);
+   Chunk *sq_c = chunk_skip_to_match(start);
 
    if (sq_c == nullptr)
    {
@@ -3393,7 +3435,7 @@ static void newline_oc_msg(chunk_t *start)
       return;
    }
 
-   for (chunk_t *pc = chunk_get_next_ncnnl(start); pc; pc = chunk_get_next_ncnnl(pc))
+   for (Chunk *pc = start->GetNextNcNnl(); pc->IsNotNullChunk(); pc = pc->GetNextNcNnl())
    {
       if (pc->level <= start->level)
       {
@@ -3408,7 +3450,7 @@ static void newline_oc_msg(chunk_t *start)
 } // newline_oc_msg
 
 
-static bool one_liner_nl_ok(chunk_t *pc)
+static bool one_liner_nl_ok(Chunk *pc)
 {
    LOG_FUNC_ENTRY();
 
@@ -3422,27 +3464,26 @@ static bool one_liner_nl_ok(chunk_t *pc)
       return(true);
    }
    // Step back to find the opening brace
-   chunk_t *br_open = pc;
+   Chunk *br_open = pc;
 
    if (chunk_is_closing_brace(br_open))
    {
-      br_open = chunk_get_prev_type(br_open,
-                                    chunk_is_token(br_open, CT_BRACE_CLOSE) ? CT_BRACE_OPEN : CT_VBRACE_OPEN,
-                                    br_open->level, scope_e::ALL);
+      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);
    }
    else
    {
-      while (  br_open != nullptr
+      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 = chunk_get_prev(br_open);
+         br_open = br_open->GetPrev();
       }
    }
    pc = br_open;
 
-   if (  pc != nullptr
+   if (  pc->IsNotNullChunk()
       && pc->flags.test(PCF_ONE_LINER)
       && (  chunk_is_token(pc, CT_BRACE_OPEN)
          || chunk_is_token(pc, CT_BRACE_CLOSE)
@@ -3571,31 +3612,31 @@ static bool one_liner_nl_ok(chunk_t *pc)
 } // one_liner_nl_ok
 
 
-void undo_one_liner(chunk_t *pc)
+void undo_one_liner(Chunk *pc)
 {
    LOG_FUNC_ENTRY();
 
    if (  pc != nullptr
       && pc->flags.test(PCF_ONE_LINER))
    {
-      LOG_FMT(LNL1LINE, "%s(%d): pc->text() '%s', orig_line is %zu, orig_col is %zu",
-              __func__, __LINE__, pc->text(), pc->orig_line, pc->orig_col);
+      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);
 
       // scan backward
       LOG_FMT(LNL1LINE, "%s(%d): scan backward\n", __func__, __LINE__);
-      chunk_t *tmp = pc;
+      Chunk *tmp = pc;
 
-      while ((tmp = chunk_get_prev(tmp)) != nullptr)
+      while ((tmp = tmp->GetPrev())->IsNotNullChunk())
       {
          if (!tmp->flags.test(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->orig_line, tmp->orig_col);
             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);
+         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);
       }
       // scan forward
@@ -3603,16 +3644,16 @@ void undo_one_liner(chunk_t *pc)
       tmp = pc;
       LOG_FMT(LNL1LINE, "%s(%d): - \n", __func__, __LINE__);
 
-      while ((tmp = chunk_get_next(tmp)) != nullptr)
+      while ((tmp = tmp->GetNext())->IsNotNullChunk())
       {
          if (!tmp->flags.test(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->orig_line, tmp->orig_col);
             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);
+         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, "\n");
@@ -3620,15 +3661,15 @@ void undo_one_liner(chunk_t *pc)
 } // undo_one_liner
 
 
-static void nl_create_one_liner(chunk_t *vbrace_open)
+static void nl_create_one_liner(Chunk *vbrace_open)
 {
    LOG_FUNC_ENTRY();
 
    // See if we get a newline between the next text and the vbrace_close
-   chunk_t *tmp   = chunk_get_next_ncnnl(vbrace_open);
-   chunk_t *first = tmp;
+   Chunk *tmp   = vbrace_open->GetNextNcNnl();
+   Chunk *first = tmp;
 
-   if (  first == nullptr
+   if (  first->IsNullChunk()
       || get_token_pattern_class(first->type) != pattern_class_e::NONE)
    {
       return;
@@ -3646,10 +3687,10 @@ static void nl_create_one_liner(chunk_t *vbrace_open)
             return;
          }
       }
-      tmp = chunk_get_next(tmp);
+      tmp = tmp->GetNext();
    }
 
-   if (  tmp != nullptr
+   if (  tmp->IsNotNullChunk()
       && first != nullptr)
    {
       newline_del_between(vbrace_open, first);
@@ -3657,7 +3698,7 @@ static void nl_create_one_liner(chunk_t *vbrace_open)
 } // nl_create_one_liner
 
 
-static void nl_create_list_liner(chunk_t *brace_open)
+static void nl_create_list_liner(Chunk *brace_open)
 {
    LOG_FUNC_ENTRY();
 
@@ -3666,8 +3707,8 @@ static void nl_create_list_liner(chunk_t *brace_open)
    {
       return;
    }
-   chunk_t *closing = chunk_get_next_type(brace_open, CT_BRACE_CLOSE, brace_open->level);
-   chunk_t *tmp     = brace_open;
+   Chunk *closing = brace_open->GetNextType(CT_BRACE_CLOSE, brace_open->level);
+   Chunk *tmp     = brace_open;
 
    do
    {
@@ -3675,7 +3716,7 @@ static void nl_create_list_liner(chunk_t *brace_open)
       {
          return;
       }
-      tmp = chunk_get_next(tmp);
+      tmp = tmp->GetNext();
    } while (tmp != closing);
 
    newline_del_between(brace_open, closing);
@@ -3687,36 +3728,36 @@ void newlines_remove_newlines(void)
    LOG_FUNC_ENTRY();
 
    LOG_FMT(LBLANK, "%s(%d):\n", __func__, __LINE__);
-   chunk_t *pc = chunk_get_head();
+   Chunk *pc = Chunk::GetHead();
 
    if (!chunk_is_newline(pc))
    {
-      pc = chunk_get_next_nl(pc);
+      pc = pc->GetNextNl();
    }
-   chunk_t *next;
-   chunk_t *prev;
+   Chunk *next;
+   Chunk *prev;
 
-   while (pc != nullptr)
+   while (pc->IsNotNullChunk())
    {
       // Remove all newlines not in preproc
       if (!pc->flags.test(PCF_IN_PREPROC))
       {
-         next = pc->next;
-         prev = pc->prev;
+         next = pc->GetNext();
+         prev = pc->GetPrev();
          newline_iarf(pc, IARF_REMOVE);
 
-         if (next == chunk_get_head())
+         if (next == Chunk::GetHead())
          {
             pc = next;
             continue;
          }
-         else if (  prev != nullptr
-                 && !chunk_is_newline(prev->next))
+         else if (  prev->IsNotNullChunk()
+                 && !chunk_is_newline(prev->GetNext()))
          {
             pc = prev;
          }
       }
-      pc = chunk_get_next_nl(pc);
+      pc = pc->GetNextNl();
    }
 } // newlines_remove_newlines
 
@@ -3725,17 +3766,17 @@ void newlines_remove_disallowed()
 {
    LOG_FUNC_ENTRY();
 
-   chunk_t *pc = chunk_get_head();
-   chunk_t *next;
+   Chunk *pc = Chunk::GetHead();
+   Chunk *next;
 
-   while ((pc = chunk_get_next_nl(pc)) != nullptr)
+   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);
 
-      next = chunk_get_next(pc);
+      next = pc->GetNext();
 
-      if (  next != nullptr
+      if (  next->IsNotNullChunk()
          && !chunk_is_token(next, CT_NEWLINE)
          && !can_increase_nl(pc))
       {
@@ -3757,11 +3798,11 @@ void newlines_cleanup_angles()
    // Issue #1167
    LOG_FUNC_ENTRY();
 
-   for (chunk_t *pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next_ncnnl(pc))
+   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->elided_text(copy));
+      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));
 
       if (chunk_is_token(pc, CT_ANGLE_OPEN))
       {
@@ -3776,18 +3817,18 @@ void newlines_cleanup_braces(bool first)
    LOG_FUNC_ENTRY();
 
    // Get the first token that's not an empty line:
-   chunk_t *pc;
+   Chunk *pc = Chunk::GetHead();
 
-   if (chunk_is_newline(pc = chunk_get_head()))
+   if (chunk_is_newline(pc))
    {
-      pc = chunk_get_next_ncnnl(pc);
+      pc = pc->GetNextNcNnl();
    }
 
-   for ( ; pc != nullptr; pc = chunk_get_next_ncnnl(pc))
+   for ( ; 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->elided_text(copy));
+      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));
 
       if (  chunk_is_token(pc, CT_IF)
          || chunk_is_token(pc, CT_CONSTEXPR))
@@ -3823,7 +3864,7 @@ void newlines_cleanup_braces(bool first)
             log_rule_B("nl_brace_catch");
             newlines_cuddle_uncuddle(pc, options::nl_brace_catch());
          }
-         chunk_t *next = chunk_get_next_ncnnl(pc);
+         Chunk *next = pc->GetNextNcNnl();
 
          if (chunk_is_token(next, CT_BRACE_OPEN))
          {
@@ -3901,7 +3942,7 @@ void newlines_cleanup_braces(bool first)
       {
          log_rule_B("nl_brace_else");
          newlines_cuddle_uncuddle(pc, options::nl_brace_else());
-         chunk_t *next = chunk_get_next_ncnnl(pc);
+         Chunk *next = pc->GetNextNcNnl();
 
          if (chunk_is_token(next, CT_ELSEIF))
          {
@@ -3916,7 +3957,7 @@ void newlines_cleanup_braces(bool first)
          log_rule_B("nl_try_brace");
          newlines_do_else(pc, options::nl_try_brace());
          // Issue #1734
-         chunk_t *po = chunk_get_next_ncnnl(pc);
+         Chunk *po = pc->GetNextNcNnl();
          flag_parens(po, PCF_IN_TRY_BLOCK, po->type, CT_NONE, false);
       }
       else if (chunk_is_token(pc, CT_GETSET))
@@ -3946,7 +3987,7 @@ void newlines_cleanup_braces(bool first)
 
             if (options::nl_paren_dbrace_open() != IARF_IGNORE)
             {
-               chunk_t *prev = chunk_get_prev_ncnnlni(pc, scope_e::PREPROC);   // Issue #2279
+               Chunk *prev = pc->GetPrevNcNnlNi(E_Scope::PREPROC);   // Issue #2279
 
                if (chunk_is_paren_close(prev))
                {
@@ -3991,7 +4032,7 @@ void newlines_cleanup_braces(bool first)
             if (pc->level == pc->brace_level)
             {
                log_rule_B("nl_class_brace");
-               newlines_do_else(chunk_get_prev_nnl(pc), options::nl_class_brace());
+               newlines_do_else(pc->GetPrevNnl(), options::nl_class_brace());
             }
             break;
          }
@@ -4000,15 +4041,13 @@ void newlines_cleanup_braces(bool first)
          {
             if (pc->level == pc->brace_level)
             {
-               chunk_t *tmp = nullptr;
-
                // Request #126
                // introduce two new options
                // look back if we have a @interface or a @implementation
-               for (tmp = chunk_get_prev(pc); tmp != nullptr; tmp = chunk_get_prev(tmp))
+               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->orig_line, tmp->orig_col, tmp->Text());
 
                   if (  chunk_is_token(tmp, CT_OC_INTF)
                      || chunk_is_token(tmp, CT_OC_IMPL))
@@ -4019,12 +4058,12 @@ void newlines_cleanup_braces(bool first)
                      if (chunk_is_token(tmp, CT_OC_INTF))
                      {
                         log_rule_B("nl_oc_interface_brace");
-                        newlines_do_else(chunk_get_prev_nnl(pc), options::nl_oc_interface_brace());
+                        newlines_do_else(pc->GetPrevNnl(), options::nl_oc_interface_brace());
                      }
                      else
                      {
                         log_rule_B("nl_oc_implementation_brace");
-                        newlines_do_else(chunk_get_prev_nnl(pc), options::nl_oc_implementation_brace());
+                        newlines_do_else(pc->GetPrevNnl(), options::nl_oc_implementation_brace());
                      }
                      break;
                   }
@@ -4043,11 +4082,12 @@ void newlines_cleanup_braces(bool first)
                nl_create_list_liner(pc);
                break;
             }
-            chunk_t *prev = chunk_get_prev_nnl(pc);
+            Chunk *prev = pc->GetPrevNnl();
 
-            if (  prev != nullptr
+            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))
             {
@@ -4061,7 +4101,7 @@ void newlines_cleanup_braces(bool first)
          {
             // issue # 477
             log_rule_B("nl_oc_block_brace");
-            newline_iarf_pair(chunk_get_prev(pc), pc, options::nl_oc_block_brace());
+            newline_iarf_pair(pc->GetPrev(), pc, options::nl_oc_block_brace());
             break;
          }
 
@@ -4078,7 +4118,7 @@ void newlines_cleanup_braces(bool first)
 
                if (options::nl_before_opening_brace_func_class_def() != IARF_IGNORE)
                {
-                  newline_iarf_pair(chunk_get_prev(pc), pc, options::nl_before_opening_brace_func_class_def());
+                  newline_iarf_pair(pc->GetPrev(), pc, options::nl_before_opening_brace_func_class_def());
                }
             }
          }
@@ -4093,16 +4133,16 @@ void newlines_cleanup_braces(bool first)
 
          if (options::nl_brace_brace() != IARF_IGNORE)
          {
-            chunk_t *next = chunk_get_next_nc(pc, scope_e::PREPROC);
+            Chunk *next = pc->GetNextNc(E_Scope::PREPROC);
 
             if (chunk_is_token(next, CT_BRACE_OPEN))
             {
                newline_iarf_pair(pc, next, options::nl_brace_brace());
             }
          }
-         chunk_t *next = chunk_get_next_nnl(pc);
+         Chunk *next = pc->GetNextNnl();
 
-         if (next == nullptr)
+         if (next->IsNullChunk())
          {
             // do nothing
          }
@@ -4116,13 +4156,13 @@ void newlines_cleanup_braces(bool first)
          }
          else
          {
-            next = chunk_get_next_ncnnl(pc);
+            next = pc->GetNextNcNnl();
 
             // Handle unnamed temporary direct-list-initialization
             if (get_chunk_parent_type(pc) == CT_BRACED_INIT_LIST)
             {
                log_rule_B("nl_type_brace_init_lst_open");
-               newline_iarf_pair(pc, chunk_get_next_nnl(pc),
+               newline_iarf_pair(pc, pc->GetNextNnl(),
                                  options::nl_type_brace_init_lst_open(), true);
             }
             // Handle nl_after_brace_open
@@ -4145,11 +4185,11 @@ void newlines_cleanup_braces(bool first)
                else
                {
                   // Step back from next to the first non-newline item
-                  chunk_t *tmp = chunk_get_prev(next);
+                  Chunk *tmp = next->GetPrev();
 
                   while (tmp != pc)
                   {
-                     if (chunk_is_comment(tmp))
+                     if (tmp->IsComment())
                      {
                         log_rule_B("nl_after_brace_open_cmt");
 
@@ -4159,7 +4199,7 @@ void newlines_cleanup_braces(bool first)
                            break;
                         }
                      }
-                     tmp = chunk_get_prev(tmp);
+                     tmp = tmp->GetPrev();
                   }
                   // Add the newline
                   newline_iarf(tmp, IARF_ADD);
@@ -4199,7 +4239,7 @@ void newlines_cleanup_braces(bool first)
             else
             {
                // Step back to previous non-newline item
-               chunk_t *tmp = chunk_get_prev(pc);
+               Chunk *tmp = pc->GetPrev();
 
                if (!chunk_is_token(tmp, CT_NEWLINE))
                {
@@ -4215,7 +4255,7 @@ void newlines_cleanup_braces(bool first)
 
          if (options::nl_brace_brace() != IARF_IGNORE)
          {
-            chunk_t *next = chunk_get_next_nc(pc, scope_e::PREPROC);
+            Chunk *next = pc->GetNextNc(E_Scope::PREPROC);
 
             if (chunk_is_token(next, CT_BRACE_CLOSE))
             {
@@ -4227,7 +4267,7 @@ void newlines_cleanup_braces(bool first)
 
          if (options::nl_brace_square() != IARF_IGNORE)
          {
-            chunk_t *next = chunk_get_next_nc(pc, scope_e::PREPROC);
+            Chunk *next = pc->GetNextNc(E_Scope::PREPROC);
 
             if (chunk_is_token(next, CT_SQUARE_CLOSE))
             {
@@ -4239,14 +4279,14 @@ void newlines_cleanup_braces(bool first)
 
          if (options::nl_brace_fparen() != IARF_IGNORE)
          {
-            chunk_t *next = chunk_get_next_nc(pc, scope_e::PREPROC);
+            Chunk *next = pc->GetNextNc(E_Scope::PREPROC);
 
             log_rule_B("nl_brace_fparen");
 
             if (  chunk_is_token(next, CT_NEWLINE)
                && (options::nl_brace_fparen() == IARF_REMOVE))
             {
-               next = chunk_get_next_nc(next, scope_e::PREPROC);  // Issue #1000
+               next = next->GetNextNc(E_Scope::PREPROC);  // Issue #1000
             }
 
             if (chunk_is_token(next, CT_FPAREN_CLOSE))
@@ -4262,7 +4302,7 @@ void newlines_cleanup_braces(bool first)
             && options::nl_type_brace_init_lst_close() != IARF_IGNORE)
          {
             // Handle unnamed temporary direct-list-initialization
-            newline_iarf_pair(chunk_get_prev_nnl(pc), pc,
+            newline_iarf_pair(pc->GetPrevNnl(), pc,
                               options::nl_type_brace_init_lst_close(), true);
          }
          // blanks before a close brace
@@ -4271,7 +4311,7 @@ void newlines_cleanup_braces(bool first)
          if (options::eat_blanks_before_close_brace())
          {
             // Limit the newlines before the close brace to 1
-            chunk_t *prev = chunk_get_prev(pc);
+            Chunk *prev = pc->GetPrev();
 
             if (chunk_is_newline(prev))
             {
@@ -4279,7 +4319,7 @@ void newlines_cleanup_braces(bool first)
                log_rule_B("nl_inside_empty_func");
 
                if (  options::nl_inside_empty_func() > 0
-                  && chunk_is_token(chunk_get_prev_nnl(pc), CT_BRACE_OPEN)
+                  && 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))
                {
@@ -4309,7 +4349,7 @@ void newlines_cleanup_braces(bool first)
             if (!pc->flags.test(PCF_ONE_LINER))
             {
                // Make sure the brace is preceded by two newlines
-               chunk_t *prev = chunk_get_prev(pc);
+               Chunk *prev = pc->GetPrev();
 
                if (!chunk_is_newline(prev))
                {
@@ -4330,7 +4370,7 @@ void newlines_cleanup_braces(bool first)
                || get_chunk_parent_type(pc) == CT_ENUM
                || get_chunk_parent_type(pc) == CT_UNION))
          {
-            chunk_t *next = chunk_get_next_ncnnl(pc, scope_e::PREPROC);
+            Chunk *next = pc->GetNextNcNnl(E_Scope::PREPROC);
 
             if (  chunk_is_not_token(next, CT_SEMICOLON)
                && chunk_is_not_token(next, CT_COMMA))
@@ -4347,7 +4387,7 @@ void newlines_cleanup_braces(bool first)
                     || get_chunk_parent_type(pc) == CT_OC_MSG_DECL))
          {
             log_rule_B("nl_after_brace_close");
-            chunk_t *next = chunk_get_next(pc);
+            Chunk *next = pc->GetNext();
 
             if (  chunk_is_not_token(next, CT_SEMICOLON)
                && chunk_is_not_token(next, CT_COMMA)
@@ -4362,7 +4402,7 @@ void newlines_cleanup_braces(bool first)
                && !pc->flags.test(PCF_IN_ARRAY_ASSIGN)
                && !pc->flags.test(PCF_IN_TYPEDEF)
                && !chunk_is_newline(next)
-               && !chunk_is_comment(next))
+               && !next->IsComment())
             {
                // #1258
                // dont add newline between two consecutive braces closes, if the second is a part of one liner.
@@ -4375,9 +4415,9 @@ void newlines_cleanup_braces(bool first)
 
             if (options::nl_after_namespace() > 0)
             {
-               chunk_t *next = chunk_get_next_ncnnl(pc, scope_e::PREPROC);
+               Chunk *next = pc->GetNextNcNnl(E_Scope::PREPROC);
 
-               if (next != nullptr)
+               if (next->IsNotNullChunk())
                {
                   newline_add_before(next);
                   // newline_iarf(next, IARF_ADD);
@@ -4393,8 +4433,8 @@ void newlines_cleanup_braces(bool first)
          if (  options::nl_after_vbrace_open()
             || options::nl_after_vbrace_open_empty())
          {
-            chunk_t *next = chunk_get_next(pc, scope_e::PREPROC);
-            bool    add_it;
+            Chunk *next = pc->GetNext(E_Scope::PREPROC);
+            bool  add_it;
 
             if (chunk_is_semicolon(next))
             {
@@ -4406,7 +4446,7 @@ 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)
-                        && !chunk_is_comment(next)
+                        && !next->IsComment()
                         && !chunk_is_newline(next));
             }
 
@@ -4446,15 +4486,15 @@ void newlines_cleanup_braces(bool first)
             if (pc->flags.test(PCF_ONE_LINER))
             {
                // split one-liner
-               chunk_t *end = chunk_get_next(chunk_get_next_type(pc->next, CT_SEMICOLON, -1));
+               Chunk *end = pc->GetNext()->GetNextType(CT_SEMICOLON, -1)->GetNext();
                // Scan for clear flag
                LOG_FMT(LNEWLINE, "(%d) ", __LINE__);
                LOG_FMT(LNEWLINE, "\n");
 
-               for (chunk_t *temp = pc; temp != end; temp = chunk_get_next(temp))
+               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);
+                  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);
                   // produces much more log output. Use it only debugging purpose
                   //log_pcf_flags(LNEWLINE, temp->flags);
                   chunk_flags_clr(temp, PCF_ONE_LINER);
@@ -4471,7 +4511,7 @@ void newlines_cleanup_braces(bool first)
 
          if (options::nl_after_vbrace_close())
          {
-            if (!chunk_is_newline(chunk_get_next_nc(pc)))
+            if (!chunk_is_newline(pc->GetNextNc()))
             {
                newline_iarf(pc, IARF_ADD);
             }
@@ -4513,30 +4553,30 @@ void newlines_cleanup_braces(bool first)
       }
       else if (chunk_is_token(pc, CT_THROW))
       {
-         chunk_t *prev = chunk_get_prev(pc);
+         Chunk *prev = pc->GetPrev();
 
          if (  chunk_is_token(prev, CT_PAREN_CLOSE)
             || chunk_is_token(prev, CT_FPAREN_CLOSE))         // Issue #1122
          {
             log_rule_B("nl_before_throw");
-            newline_iarf(chunk_get_prev_ncnnlni(pc), options::nl_before_throw());   // Issue #2279
+            newline_iarf(pc->GetPrevNcNnlNi(), options::nl_before_throw());   // Issue #2279
          }
       }
       else if (  chunk_is_token(pc, CT_QUALIFIER)
-              && !strcmp(pc->text(), "throws"))
+              && !strcmp(pc->Text(), "throws"))
       {
-         chunk_t *prev = chunk_get_prev(pc);
+         Chunk *prev = pc->GetPrev();
 
          if (  chunk_is_token(prev, CT_PAREN_CLOSE)
             || chunk_is_token(prev, CT_FPAREN_CLOSE))         // Issue #1122
          {
             log_rule_B("nl_before_throw");
-            newline_iarf(chunk_get_prev_ncnnlni(pc), options::nl_before_throw());   // Issue #2279
+            newline_iarf(pc->GetPrevNcNnlNi(), options::nl_before_throw());   // Issue #2279
          }
       }
       else if (chunk_is_token(pc, CT_CASE_COLON))
       {
-         chunk_t *next = chunk_get_next_nnl(pc);
+         Chunk *next = pc->GetNextNnl();
 
          log_rule_B("nl_case_colon_brace");
 
@@ -4553,7 +4593,7 @@ void newlines_cleanup_braces(bool first)
       }
       else if (chunk_is_token(pc, CT_SPAREN_CLOSE))
       {
-         chunk_t *next = chunk_get_next_ncnnl(pc);
+         Chunk *next = pc->GetNextNcNnl();
 
          if (chunk_is_token(next, CT_BRACE_OPEN))
          {
@@ -4587,15 +4627,15 @@ void newlines_cleanup_braces(bool first)
             && !pc->flags.test(PCF_IN_PREPROC)
             && options::nl_after_semicolon())
          {
-            chunk_t *next = chunk_get_next(pc);
+            Chunk *next = pc->GetNext();
 
             while (chunk_is_token(next, CT_VBRACE_CLOSE))
             {
-               next = chunk_get_next(next);
+               next = next->GetNext();
             }
 
-            if (  next != nullptr
-               && !chunk_is_comment(next)
+            if (  next->IsNotNullChunk()
+               && !next->IsComment()
                && !chunk_is_newline(next))
             {
                if (one_liner_nl_ok(next))
@@ -4740,12 +4780,12 @@ void newlines_cleanup_braces(bool first)
       {
          if (get_chunk_parent_type(pc) == CT_TEMPLATE)
          {
-            chunk_t *next = chunk_get_next_ncnnl(pc);
+            Chunk *next = pc->GetNextNcNnl();
 
-            if (  next != nullptr
+            if (  next->IsNotNullChunk()
                && next->level == next->brace_level)
             {
-               chunk_t *tmp = chunk_get_prev_ncnnlni(chunk_get_prev_type(pc, CT_ANGLE_OPEN, pc->level));   // Issue #2279
+               Chunk *tmp = pc->GetPrevType(CT_ANGLE_OPEN, pc->level)->GetPrevNcNnlNi();   // Issue #2279
 
                if (chunk_is_token(tmp, CT_TEMPLATE))
                {
@@ -4820,27 +4860,27 @@ void newlines_cleanup_braces(bool first)
               && get_chunk_parent_type(pc) != CT_USING)
       {
          // Issue #2387
-         chunk_t *next = chunk_get_next_ncnnl(pc);
+         Chunk *next = pc->GetNextNcNnl();
 
-         if (next != nullptr)
+         if (next->IsNotNullChunk())
          {
-            next = chunk_get_next_ncnnl(next);
+            next = next->GetNextNcNnl();
 
             if (!chunk_is_token(next, CT_ASSIGN))
             {
                // Issue #1235
                // Issue #2186
-               chunk_t *braceOpen = chunk_get_next_type(pc, CT_BRACE_OPEN, pc->level);
+               Chunk *braceOpen = pc->GetNextType(CT_BRACE_OPEN, pc->level);
 
-               if (braceOpen == nullptr)
+               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);
                   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->orig_line, braceOpen->orig_col, braceOpen->Text());
                // produces much more log output. Use it only debugging purpose
                //log_pcf_flags(LNEWLINE, braceOpen->flags);
                newlines_namespace(pc);
@@ -4852,7 +4892,7 @@ void newlines_cleanup_braces(bool first)
          if (  get_chunk_parent_type(pc) == CT_ASSIGN
             && !pc->flags.test(PCF_ONE_LINER))
          {
-            chunk_t *tmp = chunk_get_prev_ncnnlni(pc);   // Issue #2279
+            Chunk *tmp = pc->GetPrevNcNnlNi();   // Issue #2279
             newline_iarf(tmp, options::nl_assign_square());
             log_rule_B("nl_assign_square");
 
@@ -4870,13 +4910,13 @@ void newlines_cleanup_braces(bool first)
              * if there is a newline after the open, then force a newline
              * before the close
              */
-            tmp = chunk_get_next_nc(pc);
+            tmp = pc->GetNextNc();
 
             if (chunk_is_newline(tmp))
             {
-               tmp = chunk_get_next_type(pc, CT_SQUARE_CLOSE, pc->level);
+               tmp = pc->GetNextType(CT_SQUARE_CLOSE, pc->level);
 
-               if (tmp != nullptr)
+               if (tmp->IsNotNullChunk())
                {
                   newline_add_before(tmp);
                }
@@ -4889,7 +4929,7 @@ void newlines_cleanup_braces(bool first)
          if (options::nl_before_access_spec() > 0)
          {
             log_rule_B("nl_before_access_spec");
-            chunk_t *prev = chunk_get_prev(pc);
+            Chunk *prev = pc->GetPrev();
 
             if (!chunk_is_newline(prev))
             {
@@ -4903,7 +4943,7 @@ void newlines_cleanup_braces(bool first)
          if (options::nl_after_access_spec() > 0)
          {
             log_rule_B("nl_after_access_spec");
-            chunk_t *next = chunk_get_next(pc);
+            Chunk *next = pc->GetNext();
 
             if (!chunk_is_newline(next))
             {
@@ -4933,7 +4973,7 @@ void newlines_cleanup_braces(bool first)
          // Issue #1124
          if (pc->parent_type != CT_FUNC_DEF)
          {
-            newline_iarf(chunk_get_prev_nnl(pc), options::nl_before_member());
+            newline_iarf(pc->GetPrevNnl(), options::nl_before_member());
             log_rule_B("nl_before_member");
             newline_iarf(pc, options::nl_after_member());
             log_rule_B("nl_after_member");
@@ -4945,18 +4985,18 @@ void newlines_cleanup_braces(bool first)
       }
    }
 
-   newline_def_blk(chunk_get_head(), false);
+   newline_def_blk(Chunk::GetHead(), false);
 } // newlines_cleanup_braces
 
 
-static void nl_handle_define(chunk_t *pc)
+static void nl_handle_define(Chunk *pc)
 {
    LOG_FUNC_ENTRY();
 
-   chunk_t *nl  = pc;
-   chunk_t *ref = nullptr;
+   Chunk *nl  = pc;
+   Chunk *ref = Chunk::NullChunkPtr;
 
-   while ((nl = chunk_get_next(nl)) != nullptr)
+   while ((nl = nl->GetNext())->IsNotNullChunk())
    {
       if (chunk_is_token(nl, CT_NEWLINE))
       {
@@ -4972,7 +5012,7 @@ static void nl_handle_define(chunk_t *pc)
 
       if (chunk_is_token(nl, CT_NL_CONT))
       {
-         if (ref != nullptr)
+         if (ref->IsNotNullChunk())
          {
             newline_add_after(ref);
          }
@@ -4986,18 +5026,18 @@ void newline_after_multiline_comment(void)
 {
    LOG_FUNC_ENTRY();
 
-   for (chunk_t *pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next(pc))
+   for (Chunk *pc = Chunk::GetHead(); pc->IsNotNullChunk(); pc = pc->GetNext())
    {
       if (chunk_is_not_token(pc, CT_COMMENT_MULTI))
       {
          continue;
       }
-      chunk_t *tmp = pc;
+      Chunk *tmp = pc;
 
-      while (  ((tmp = chunk_get_next(tmp)) != nullptr)
+      while (  ((tmp = tmp->GetNext())->IsNotNullChunk())
             && !chunk_is_newline(tmp))
       {
-         if (!chunk_is_comment(tmp))
+         if (!tmp->IsComment())
          {
             newline_add_before(tmp);
             break;
@@ -5011,7 +5051,7 @@ void newline_after_label_colon(void)
 {
    LOG_FUNC_ENTRY();
 
-   for (chunk_t *pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next(pc))
+   for (Chunk *pc = Chunk::GetHead(); pc->IsNotNullChunk(); pc = pc->GetNext())
    {
       if (chunk_is_not_token(pc, CT_LABEL_COLON))
       {
@@ -5022,15 +5062,15 @@ void newline_after_label_colon(void)
 } // newline_after_label_colon
 
 
-static bool is_class_one_liner(chunk_t *pc)
+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))
    {
       // Find opening brace
-      pc = chunk_get_next_type(pc, CT_BRACE_OPEN, pc->level);
-      return(  pc != nullptr
+      pc = pc->GetNextType(CT_BRACE_OPEN, pc->level);
+      return(  pc->IsNotNullChunk()
             && pc->flags.test(PCF_ONE_LINER));
    }
    return(false);
@@ -5041,10 +5081,10 @@ void newlines_insert_blank_lines(void)
 {
    LOG_FUNC_ENTRY();
 
-   for (chunk_t *pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next_ncnnl(pc))
+   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));
+      //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))
       {
          newlines_if_for_while_switch_pre_blank_lines(pc, options::nl_before_if());
@@ -5141,10 +5181,10 @@ void newlines_functions_remove_extra_blank_lines(void)
       return;
    }
 
-   for (chunk_t *pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next(pc))
+   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->orig_line, pc->orig_col, pc->Text(), get_token_name(pc->type));
 
       if (  chunk_is_not_token(pc, CT_BRACE_OPEN)
          || (  get_chunk_parent_type(pc) != CT_FUNC_DEF
@@ -5154,7 +5194,7 @@ void newlines_functions_remove_extra_blank_lines(void)
       }
       const size_t startMoveLevel = pc->level;
 
-      while (pc != nullptr)
+      while (pc->IsNotNullChunk())
       {
          if (  chunk_is_token(pc, CT_BRACE_CLOSE)
             && pc->level == startMoveLevel)
@@ -5166,15 +5206,15 @@ void newlines_functions_remove_extra_blank_lines(void)
          if (  !chunk_is_token(pc, CT_COMMENT_MULTI)   // Issue #2195
             && 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->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->orig_line, pc->orig_col, pc->Text(), get_token_name(pc->type));
             pc->nl_count = nl_max_blank_in_func;
             MARK_CHANGE();
             remove_next_newlines(pc);
          }
          else
          {
-            pc = chunk_get_next(pc);
+            pc = pc->GetNext();
          }
       }
    }
@@ -5185,43 +5225,43 @@ void newlines_squeeze_ifdef(void)
 {
    LOG_FUNC_ENTRY();
 
-   chunk_t *pc;
+   Chunk *pc;
 
-   for (pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next_ncnnl(pc))
+   for (pc = Chunk::GetHead(); pc->IsNotNullChunk(); pc = pc->GetNextNcNnl())
    {
       if (  chunk_is_token(pc, CT_PREPROC)
          && (  pc->level > 0
             || options::nl_squeeze_ifdef_top_level()))
       {
          log_rule_B("nl_squeeze_ifdef_top_level");
-         chunk_t *ppr = chunk_get_next(pc);
+         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))
          {
-            chunk_t *pnl = nullptr;
-            chunk_t *nnl = chunk_get_next_nl(ppr);
+            Chunk *pnl = Chunk::NullChunkPtr;
+            Chunk *nnl = ppr->GetNextNl();
 
             if (  chunk_is_token(ppr, CT_PP_ELSE)
                || chunk_is_token(ppr, CT_PP_ENDIF))
             {
-               pnl = chunk_get_prev_nl(pc);
+               pnl = pc->GetPrevNl();
             }
-            chunk_t *tmp1;
-            chunk_t *tmp2;
+            Chunk *tmp1;
+            Chunk *tmp2;
 
-            if (nnl != nullptr)
+            if (nnl->IsNotNullChunk())
             {
-               if (pnl != nullptr)
+               if (pnl->IsNotNullChunk())
                {
                   if (pnl->nl_count > 1)
                   {
                      pnl->nl_count = 1;
                      MARK_CHANGE();
 
-                     tmp1 = chunk_get_prev_nnl(pnl);
-                     tmp2 = chunk_get_prev_nnl(nnl);
+                     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);
@@ -5233,7 +5273,7 @@ void newlines_squeeze_ifdef(void)
                {
                   if (nnl->nl_count > 1)
                   {
-                     tmp1 = chunk_get_prev_nnl(nnl);
+                     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;
@@ -5251,39 +5291,39 @@ void newlines_squeeze_paren_close(void)
 {
    LOG_FUNC_ENTRY();
 
-   chunk_t *pc;
+   Chunk *pc;
 
-   for (pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next(pc))
+   for (pc = Chunk::GetHead(); pc->IsNotNullChunk(); pc = pc->GetNext())
    {
-      chunk_t *next;
-      chunk_t *prev;
+      Chunk *next;
+      Chunk *prev;
 
       if (chunk_is_token(pc, CT_NEWLINE))
       {
-         prev = chunk_get_prev(pc);
+         prev = pc->GetPrev();
       }
       else
       {
          prev = pc;
       }
-      next = chunk_get_next(pc);
+      next = pc->GetNext();
 
-      if (  next != nullptr
-         && prev != nullptr
+      if (  next->IsNotNullChunk()
+         && prev->IsNotNullChunk()
          && chunk_is_paren_close(next)
          && chunk_is_paren_close(prev))
       {
-         chunk_t *prev_op = chunk_skip_to_match_rev(prev);
-         chunk_t *next_op = chunk_skip_to_match_rev(next);
-         bool    flag     = true;
+         Chunk *prev_op = chunk_skip_to_match_rev(prev);
+         Chunk *next_op = chunk_skip_to_match_rev(next);
+         bool  flag     = true;
 
          if (true)
          {
-            chunk_t *tmp = prev;
+            Chunk *tmp = prev;
 
             while (chunk_is_paren_close(tmp))
             {
-               tmp = chunk_get_prev(tmp);
+               tmp = tmp->GetPrev();
             }
 
             if (chunk_is_not_token(tmp, CT_NEWLINE))
@@ -5316,7 +5356,7 @@ void newlines_eat_start_end(void)
 {
    LOG_FUNC_ENTRY();
 
-   chunk_t *pc;
+   Chunk *pc;
 
    // Process newlines at the start of the file
    if (  cpd.frag_cols == 0
@@ -5326,9 +5366,9 @@ void newlines_eat_start_end(void)
    {
       log_rule_B("nl_start_of_file");
       log_rule_B("nl_start_of_file_min");
-      pc = chunk_get_head();
+      pc = Chunk::GetHead();
 
-      if (pc != nullptr)
+      if (pc->IsNotNullChunk())
       {
          if (chunk_is_token(pc, CT_NEWLINE))
          {
@@ -5356,7 +5396,7 @@ void newlines_eat_start_end(void)
          {
             log_rule_B("nl_start_of_file");
             log_rule_B("nl_start_of_file_min");
-            chunk_t chunk;
+            Chunk chunk;
             set_chunk_type(&chunk, CT_NEWLINE);
             chunk.orig_line = pc->orig_line;
             chunk.orig_col  = pc->orig_col;
@@ -5365,7 +5405,7 @@ void newlines_eat_start_end(void)
             log_rule_B("nl_start_of_file_min");
             chunk_add_before(&chunk, 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->orig_line, pc->orig_col, pc->Text());
             MARK_CHANGE();
          }
       }
@@ -5379,9 +5419,9 @@ void newlines_eat_start_end(void)
    {
       log_rule_B("nl_end_of_file");
       log_rule_B("nl_end_of_file_min");
-      pc = chunk_get_tail();
+      pc = Chunk::GetTail();
 
-      if (pc != nullptr)
+      if (pc->IsNotNullChunk())
       {
          if (chunk_is_token(pc, CT_NEWLINE))
          {
@@ -5415,7 +5455,7 @@ void newlines_eat_start_end(void)
          {
             log_rule_B("nl_end_of_file");
             log_rule_B("nl_end_of_file_min");
-            chunk_t chunk;
+            Chunk chunk;
             set_chunk_type(&chunk, CT_NEWLINE);
             chunk.orig_line = pc->orig_line;
             chunk.orig_col  = pc->orig_col;
@@ -5424,7 +5464,7 @@ void newlines_eat_start_end(void)
             log_rule_B("nl_end_of_file_min");
             chunk_add_before(&chunk, nullptr);
             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->orig_line, pc->orig_col, pc->Text());
             MARK_CHANGE();
          }
       }
@@ -5432,7 +5472,7 @@ void newlines_eat_start_end(void)
 } // newlines_eat_start_end
 
 
-void newlines_chunk_pos(c_token_t chunk_type, token_pos_e mode)
+void newlines_chunk_pos(E_Token chunk_type, token_pos_e mode)
 {
    LOG_FUNC_ENTRY();
 
@@ -5445,11 +5485,11 @@ void newlines_chunk_pos(c_token_t chunk_type, token_pos_e mode)
       return;
    }
 
-   for (chunk_t *pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next_ncnnl(pc))
+   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->elided_text(copy));
+      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));
       // produces much more log output. Use it only debugging purpose
       //log_pcf_flags(LNEWLINE, pc->flags);
 
@@ -5459,8 +5499,8 @@ void newlines_chunk_pos(c_token_t chunk_type, token_pos_e mode)
 
          if (chunk_type == CT_COMMA)
          {
-            LOG_FMT(LNEWLINE, "%s(%d): orig_line is %zu, orig_col is %zu, text() is '%s', type is %s\n",
-                    __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->orig_line, pc->orig_col, pc->Text(), get_token_name(pc->type));
             // produces much more log output. Use it only debugging purpose
             //log_pcf_flags(LNEWLINE, pc->flags);
 
@@ -5497,16 +5537,16 @@ void newlines_chunk_pos(c_token_t chunk_type, token_pos_e mode)
          {
             mode_local = mode;
          }
-         chunk_t *prev = chunk_get_prev_nc(pc);
-         chunk_t *next = chunk_get_next_nc(pc);
+         Chunk *prev = pc->GetPrevNc();
+         Chunk *next = pc->GetNextNc();
 
          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());
+         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): nl_flag is %zu\n",
@@ -5517,10 +5557,10 @@ void newlines_chunk_pos(c_token_t chunk_type, token_pos_e mode)
             if (nl_flag & 1)
             {
                // remove newline if not preceded by a comment
-               chunk_t *prev2 = chunk_get_prev(prev);
+               Chunk *prev2 = prev->GetPrev();
 
-               if (  prev2 != nullptr
-                  && !(chunk_is_comment(prev2)))
+               if (  prev2->IsNotNullChunk()
+                  && !(prev2->IsComment()))
                {
                   remove_next_newlines(prev2);
                }
@@ -5529,10 +5569,10 @@ void newlines_chunk_pos(c_token_t chunk_type, token_pos_e mode)
             if (nl_flag & 2)
             {
                // remove newline if not followed by a comment or by '{'
-               chunk_t *next2 = chunk_get_next(next);
+               Chunk *next2 = next->GetNext();
 
-               if (  next2 != nullptr
-                  && !(chunk_is_comment(next2))
+               if (  next2->IsNotNullChunk()
+                  && !next2->IsComment()
                   && !(chunk_is_token(next2, CT_BRACE_OPEN)))
                {
                   remove_next_newlines(pc);
@@ -5582,7 +5622,7 @@ void newlines_chunk_pos(c_token_t chunk_type, token_pos_e mode)
             }
             else
             {
-               remove_next_newlines(chunk_get_prev_ncnnlni(pc));   // Issue #2279
+               remove_next_newlines(pc->GetPrevNcNnlNi());   // Issue #2279
             }
             continue;
          }
@@ -5590,7 +5630,7 @@ void newlines_chunk_pos(c_token_t chunk_type, token_pos_e mode)
          // we need to move the newline
          if (mode_local & TP_LEAD)
          {
-            chunk_t *next2 = chunk_get_next(next);
+            Chunk *next2 = next->GetNext();
 
             if (  chunk_is_token(next2, CT_PREPROC)
                || (  chunk_type == CT_ASSIGN
@@ -5611,17 +5651,17 @@ void newlines_chunk_pos(c_token_t chunk_type, token_pos_e mode)
          }
          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', nl_count is %zu\n",
+                    __func__, __LINE__, prev->orig_line, prev->orig_col, prev->Text(), prev->nl_count);
 
             if (prev->nl_count == 1)
             {
                // Back up to the next non-comment item
-               prev = chunk_get_prev_nc(prev);
-               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());
+               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());
 
-               if (  prev != nullptr
+               if (  prev->IsNotNullChunk()
                   && !chunk_is_newline(prev)
                   && !prev->flags.test(PCF_IN_PREPROC)
                   && !prev->flags.test(PCF_IN_OC_MSG))
@@ -5635,7 +5675,7 @@ void newlines_chunk_pos(c_token_t chunk_type, token_pos_e mode)
 } // newlines_chunk_pos
 
 
-void newlines_class_colon_pos(c_token_t tok)
+void newlines_class_colon_pos(E_Token tok)
 {
    LOG_FUNC_ENTRY();
 
@@ -5666,8 +5706,8 @@ void newlines_class_colon_pos(c_token_t tok)
       pcc = options::pos_constr_comma();
       log_rule_B("pos_constr_comma");
    }
-   chunk_t *ccolon  = nullptr;
-   size_t  acv_span = options::align_constr_value_span();
+   Chunk  *ccolon  = nullptr;
+   size_t acv_span = options::align_constr_value_span();
 
    log_rule_B("align_constr_value_span");
    bool       with_acv = (acv_span > 0) && language_is_set(LANG_CPP);
@@ -5685,36 +5725,36 @@ void newlines_class_colon_pos(c_token_t tok)
       log_rule_B("align_on_tabstop");
    }
 
-   for (chunk_t *pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next_ncnnl(pc))
+   for (Chunk *pc = Chunk::GetHead(); pc->IsNotNullChunk(); pc = pc->GetNextNcNnl())
    {
       if (  ccolon == nullptr
          && chunk_is_not_token(pc, tok))
       {
          continue;
       }
-      chunk_t *prev;
-      chunk_t *next;
+      Chunk *prev;
+      Chunk *next;
 
       if (chunk_is_token(pc, 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->orig_line, pc->orig_col, pc->Text(), get_token_name(pc->type));
          ccolon = pc;
-         prev   = chunk_get_prev_nc(pc);
-         next   = chunk_get_next_nc(pc);
+         prev   = pc->GetPrevNc();
+         next   = pc->GetNextNc();
 
          if (chunk_is_token(pc, 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_t *paren_vor_value = chunk_get_next_type(pc, 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->orig_line, pc->orig_col, pc->Text(), get_token_name(pc->type));
+            Chunk *paren_vor_value = pc->GetNextType(CT_FPAREN_OPEN, pc->level);
 
             if (  with_acv
-               && paren_vor_value != nullptr)
+               && 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",
+               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));
+                       paren_vor_value->Text(), get_token_name(paren_vor_value->type));
                constructorValue.NewLines(paren_vor_value->nl_count);
                constructorValue.Add(paren_vor_value);
             }
@@ -5726,8 +5766,8 @@ void newlines_class_colon_pos(c_token_t tok)
 
          {
             newline_add_after(pc);
-            prev = chunk_get_prev_nc(pc);
-            next = chunk_get_next_nc(pc);
+            prev = pc->GetPrevNc();
+            next = pc->GetNextNc();
          }
 
          if (anc == IARF_REMOVE)                   // nl_class_colon, nl_constr_colon: 2
@@ -5737,7 +5777,7 @@ void newlines_class_colon_pos(c_token_t tok)
             {
                chunk_del(prev);
                MARK_CHANGE();
-               prev = chunk_get_prev_nc(pc);
+               prev = pc->GetPrevNc();
             }
 
             if (  chunk_is_newline(next)
@@ -5745,7 +5785,7 @@ void newlines_class_colon_pos(c_token_t tok)
             {
                chunk_del(next);
                MARK_CHANGE();
-               next = chunk_get_next_nc(pc);
+               next = pc->GetNextNc();
             }
          }
 
@@ -5786,16 +5826,16 @@ void newlines_class_colon_pos(c_token_t tok)
          if (  chunk_is_token(pc, CT_COMMA)
             && pc->level == ccolon->level)
          {
-            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_t *paren_vor_value = chunk_get_next_type(pc, 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->orig_line, pc->orig_col, pc->Text(), get_token_name(pc->type));
+            Chunk *paren_vor_value = pc->GetNextType(CT_FPAREN_OPEN, pc->level);
 
             if (  with_acv
-               && paren_vor_value != nullptr)
+               && 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",
+               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));
+                       paren_vor_value->Text(), get_token_name(paren_vor_value->type));
                constructorValue.NewLines(paren_vor_value->nl_count);
                constructorValue.Add(paren_vor_value);
             }
@@ -5806,7 +5846,7 @@ void newlines_class_colon_pos(c_token_t tok)
                {
                   if (ncia == IARF_FORCE)          // nl_class_init_args, nl_constr_init_args: 5
                   {
-                     chunk_t *after = chunk_get_next(pc);   // Issue #2759
+                     Chunk *after = pc->GetNext();   // Issue #2759
 
                      if (chunk_is_not_token(after, CT_COMMENT_CPP))
                      {
@@ -5818,7 +5858,7 @@ void newlines_class_colon_pos(c_token_t tok)
                      // (ncia == IARF_ADD)         // nl_class_init_args, nl_constr_init_args: 8
                      newline_add_after(pc);
                   }
-                  prev = chunk_get_prev_nc(pc);
+                  prev = pc->GetPrevNc();
 
                   if (  chunk_is_newline(prev)
                      && chunk_safe_to_del_nl(prev))
@@ -5838,7 +5878,7 @@ void newlines_class_colon_pos(c_token_t tok)
                      // (ncia == IARF_ADD)         // nl_class_init_args, nl_constr_init_args: 9
                      newline_add_before(pc);
                   }
-                  next = chunk_get_next_nc(pc);
+                  next = pc->GetNextNc();
 
                   if (  chunk_is_newline(next)
                      && chunk_safe_to_del_nl(next))
@@ -5850,7 +5890,7 @@ void newlines_class_colon_pos(c_token_t tok)
             }
             else if (ncia == IARF_REMOVE)          // nl_class_init_args, nl_constr_init_args: 6
             {
-               next = chunk_get_next(pc);
+               next = pc->GetNext();
 
                if (  chunk_is_newline(next)
                   && chunk_safe_to_del_nl(next))
@@ -5861,7 +5901,7 @@ void newlines_class_colon_pos(c_token_t tok)
                }
                else
                {
-                  prev = chunk_get_prev(pc);
+                  prev = pc->GetPrev();
 
                   if (  chunk_is_newline(prev)
                      && chunk_safe_to_del_nl(prev))
@@ -5878,7 +5918,7 @@ void newlines_class_colon_pos(c_token_t tok)
 } // newlines_class_colon_pos
 
 
-static void blank_line_max(chunk_t *pc, Option<unsigned> &opt)
+static void blank_line_max(Chunk *pc, Option<unsigned> &opt)
 {
    LOG_FUNC_ENTRY();
 
@@ -5899,9 +5939,9 @@ static void blank_line_max(chunk_t *pc, Option<unsigned> &opt)
 } // blank_line_max
 
 
-iarf_e newline_template_option(chunk_t *pc, iarf_e special, iarf_e base, iarf_e fallback)
+iarf_e newline_template_option(Chunk *pc, iarf_e special, iarf_e base, iarf_e fallback)
 {
-   chunk_t *const prev = chunk_get_prev_ncnnl(pc);
+   Chunk *const prev = pc->GetPrevNcNnl();
 
    if (  chunk_is_token(prev, CT_ANGLE_OPEN)
       && special != IARF_IGNORE)
@@ -5919,7 +5959,7 @@ iarf_e newline_template_option(chunk_t *pc, iarf_e special, iarf_e base, iarf_e
 } // newline_template_option
 
 
-bool is_func_proto_group(chunk_t *pc, c_token_t one_liner_type)
+bool is_func_proto_group(Chunk *pc, E_Token one_liner_type)
 {
    if (  pc != nullptr
       && options::nl_class_leave_one_liner_groups()
@@ -5936,8 +5976,8 @@ bool is_func_proto_group(chunk_t *pc, c_token_t one_liner_type)
       else
       {
          // Find opening brace
-         pc = chunk_get_next_type(pc, CT_BRACE_OPEN, pc->level);
-         return(  pc != nullptr
+         pc = pc->GetNextType(CT_BRACE_OPEN, pc->level);
+         return(  pc->IsNotNullChunk()
                && pc->flags.test(PCF_ONE_LINER));
       }
    }
@@ -5949,7 +5989,7 @@ void do_blank_lines(void)
 {
    LOG_FUNC_ENTRY();
 
-   for (chunk_t *pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next(pc))
+   for (Chunk *pc = Chunk::GetHead(); pc != nullptr && pc->IsNotNullChunk(); pc = pc->GetNext())
    {
       if (chunk_is_token(pc, CT_NEWLINE))
       {
@@ -5959,8 +5999,8 @@ void do_blank_lines(void)
       else
       {
          char copy[1000];
-         LOG_FMT(LBLANKD, "%s(%d): orig_line is %zu, orig_col is %zu, text() '%s', type is %s\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->elided_text(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->orig_line, pc->orig_col, pc->ElidedText(copy), get_token_name(pc->type));
       }
       LOG_FMT(LBLANK, "%s(%d): nl_count is %zu\n",
               __func__, __LINE__, pc->nl_count);
@@ -5970,33 +6010,35 @@ void do_blank_lines(void)
       {
          continue;
       }
-      chunk_t *prev = chunk_get_prev_nc(pc);
+      Chunk *prev = pc->GetPrevNc();
 
-      if (prev != nullptr)
+      if (prev->IsNotNullChunk())
       {
-         LOG_FMT(LBLANK, "%s(%d): prev->orig_line is %zu, prev->text() '%s', prev->type is %s\n",
+         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));
+                 prev->Text(), get_token_name(prev->type));
 
          if (chunk_is_token(prev, CT_IGNORED))
          {
             continue;
          }
       }
-      chunk_t *next = chunk_get_next(pc);
-      chunk_t *pcmt = chunk_get_prev(pc);
+      Chunk *next = pc->GetNext();
+      Chunk *pcmt = pc->GetPrev();
 
-      bool    line_added = false;
+      bool  line_added = false;
 
       /*
        * If this is the first or the last token, pretend that there is an extra
        * line. It will be removed at the end.
        */
-      if (  pc == chunk_get_head()
-         || next == nullptr)
+      if (  pc == Chunk::GetHead()
+         || 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);
       }
 
       // Limit consecutive newlines
@@ -6080,40 +6122,40 @@ void do_blank_lines(void)
          && (  get_chunk_parent_type(prev) == CT_CLASS
             || get_chunk_parent_type(prev) == CT_STRUCT))
       {
-         c_token_t parent_type = get_chunk_parent_type(prev);
-         chunk_t   *start      = chunk_get_prev_type(prev, parent_type, prev->level);
-         chunk_t   *tmp        = start;
+         E_Token parent_type = get_chunk_parent_type(prev);
+         Chunk   *start      = prev->GetPrevType(parent_type, prev->level);
+         Chunk   *tmp        = start;
 
          // Is this a class/struct template?
          if (get_chunk_parent_type(tmp) == CT_TEMPLATE)
          {
-            tmp = chunk_get_prev_type(tmp, CT_TEMPLATE, prev->level);
-            tmp = chunk_get_prev_nc(tmp);
+            tmp = tmp->GetPrevType(CT_TEMPLATE, prev->level);
+            tmp = tmp->GetPrevNc();
          }
          else
          {
-            tmp = chunk_get_prev_nc(tmp);
+            tmp = tmp->GetPrevNc();
 
             while (  chunk_is_token(tmp, CT_NEWLINE)
-                  && chunk_is_comment(tmp->prev))
+                  && tmp->GetPrev()->IsComment())
             {
-               tmp = chunk_get_prev_nc(tmp->prev);
+               tmp = tmp->GetPrev()->GetPrevNc();
             }
 
             if (chunk_is_token(tmp, CT_FRIEND))
             {
                // Account for a friend declaration
-               tmp = chunk_get_prev_nc(tmp);
+               tmp = tmp->GetPrevNc();
             }
          }
 
          while (  chunk_is_token(tmp, CT_NEWLINE)
-               && chunk_is_comment(tmp->prev))
+               && tmp->GetPrev()->IsComment())
          {
-            tmp = chunk_get_prev_nc(tmp->prev);
+            tmp = tmp->GetPrev()->GetPrevNc();
          }
 
-         if (  tmp != nullptr
+         if (  tmp->IsNotNullChunk()
             && !start->flags.test(PCF_INCOMPLETE))
          {
             if (parent_type == CT_CLASS && options::nl_before_class() > tmp->nl_count)
@@ -6133,16 +6175,16 @@ void do_blank_lines(void)
          && get_chunk_parent_type(prev) == CT_NAMESPACE)
       {
          // Control blanks before a namespace
-         chunk_t *tmp = chunk_get_prev_type(prev, CT_NAMESPACE, prev->level);
-         tmp = chunk_get_prev_nc(tmp);
+         Chunk *tmp = prev->GetPrevType(CT_NAMESPACE, prev->level);
+         tmp = tmp->GetPrevNc();
 
          while (  chunk_is_token(tmp, CT_NEWLINE)
-               && chunk_is_comment(tmp->prev))
+               && tmp->GetPrev()->IsComment())
          {
-            tmp = chunk_get_prev_nc(tmp->prev);
+            tmp = tmp->GetPrev()->GetPrevNc();
          }
 
-         if (  tmp != nullptr
+         if (  tmp->IsNotNullChunk()
             && options::nl_before_namespace() > tmp->nl_count)
          {
             log_rule_B("nl_before_namespace");
@@ -6177,7 +6219,7 @@ void do_blank_lines(void)
          log_rule_B("nl_after_access_spec");
 
          // Don't add blanks before a closing brace
-         if (  next == nullptr
+         if (  next->IsNullChunk()
             || (  chunk_is_not_token(next, CT_BRACE_CLOSE)
                && chunk_is_not_token(next, CT_VBRACE_CLOSE)))
          {
@@ -6244,7 +6286,7 @@ void do_blank_lines(void)
          }
 
          if (  (options::nl_after_func_proto_group() > pc->nl_count)
-            && next != nullptr
+            && next->IsNotNullChunk()
             && get_chunk_parent_type(next) != CT_FUNC_PROTO
             && !is_func_proto_group(next, CT_FUNC_DEF))
          {
@@ -6293,18 +6335,18 @@ void do_blank_lines(void)
          {
             // Issue #1702
             // look back if we have a variable
-            chunk_t *tmp        = pc;
-            bool    is_var_def  = false;
-            bool    is_fwd_decl = false;
+            Chunk *tmp        = pc;
+            bool  is_var_def  = false;
+            bool  is_fwd_decl = false;
 
-            while ((tmp = chunk_get_prev(tmp)) != nullptr)
+            while ((tmp = tmp->GetPrev())->IsNotNullChunk())
             {
                if (tmp->level > pc->level)
                {
                   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->orig_line, tmp->orig_col, tmp->Text());
 
                if (tmp->flags.test(PCF_VAR_DEF))
                {
@@ -6335,7 +6377,7 @@ void do_blank_lines(void)
       if (  (options::nl_comment_func_def() != 0)
          && chunk_is_token(pcmt, CT_COMMENT_MULTI)
          && get_chunk_parent_type(pcmt) == CT_COMMENT_WHOLE
-         && next != nullptr
+         && next->IsNotNullChunk()
          && (  get_chunk_parent_type(next) == CT_FUNC_DEF
             || get_chunk_parent_type(next) == CT_FUNC_CLASS_DEF))
       {
@@ -6352,7 +6394,7 @@ void do_blank_lines(void)
       if (  (options::nl_after_try_catch_finally() != 0)
          && (options::nl_after_try_catch_finally() != pc->nl_count)
          && prev != nullptr
-         && next != nullptr)
+         && next->IsNotNullChunk())
       {
          log_rule_B("nl_after_try_catch_finally");
 
@@ -6374,7 +6416,7 @@ void do_blank_lines(void)
       if (  (options::nl_between_get_set() != 0)
          && (options::nl_between_get_set() != pc->nl_count)
          && prev != nullptr
-         && next != nullptr)
+         && next->IsNotNullChunk())
       {
          log_rule_B("nl_between_get_set");
 
@@ -6392,7 +6434,7 @@ void do_blank_lines(void)
       if (  (options::nl_around_cs_property() != 0)
          && (options::nl_around_cs_property() != pc->nl_count)
          && prev != nullptr
-         && next != nullptr)
+         && next->IsNotNullChunk())
       {
          log_rule_B("nl_around_cs_property");
 
@@ -6456,7 +6498,7 @@ void do_blank_lines(void)
       if (  options::nl_after_whole_file_ifdef() != 0
          && options::nl_after_whole_file_ifdef() != pc->nl_count)
       {
-         chunk_t *pp_start = chunk_get_pp_start(prev);
+         Chunk *pp_start = chunk_get_pp_start(prev);
 
          if (  pp_start != nullptr
             && get_chunk_parent_type(pp_start) == CT_PP_IF
@@ -6484,7 +6526,7 @@ void do_blank_lines(void)
       if (  options::nl_after_whole_file_endif() != 0
          && options::nl_after_whole_file_endif() != pc->nl_count)
       {
-         chunk_t *pp_start = chunk_get_pp_start(prev);
+         Chunk *pp_start = chunk_get_pp_start(prev);
 
          if (  pp_start != nullptr
             && get_chunk_parent_type(pp_start) == CT_PP_ENDIF
@@ -6500,9 +6542,11 @@ void do_blank_lines(void)
          && pc->nl_count > 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);
       }
-      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);
+      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);
    }
 } // do_blank_lines
 
@@ -6511,12 +6555,12 @@ void newlines_cleanup_dup(void)
 {
    LOG_FUNC_ENTRY();
 
-   chunk_t *pc   = chunk_get_head();
-   chunk_t *next = pc;
+   Chunk *pc   = Chunk::GetHead();
+   Chunk *next = pc;
 
-   while (pc != nullptr)
+   while (pc->IsNotNullChunk())
    {
-      next = chunk_get_next(next);
+      next = next->GetNext();
 
       if (  chunk_is_token(pc, CT_NEWLINE)
          && chunk_is_token(next, CT_NEWLINE))
@@ -6530,21 +6574,26 @@ void newlines_cleanup_dup(void)
 } // newlines_cleanup_dup
 
 
-static void newlines_enum_entries(chunk_t *open_brace, iarf_e av)
+static void newlines_enum_entries(Chunk *open_brace, iarf_e av)
 {
    LOG_FUNC_ENTRY();
 
-   chunk_t *pc = open_brace;
+   Chunk *pc = Chunk::NullChunkPtr;
+
+   if (open_brace != nullptr)
+   {
+      pc = open_brace;
+   }
 
-   while (  (pc = chunk_get_next_nc(pc)) != nullptr
+   while (  (pc = pc->GetNextNc())->IsNotNullChunk()
          && pc->level > open_brace->level)
    {
       if (  (pc->level != (open_brace->level + 1))
          || chunk_is_not_token(pc, CT_COMMA)
          || (  chunk_is_token(pc, CT_COMMA)
-            && pc->next != nullptr
-            && (  pc->next->type == CT_COMMENT_CPP
-               || pc->next->type == CT_COMMENT)))
+            && pc->GetNext()->IsNotNullChunk()
+            && (  pc->GetNext()->type == CT_COMMENT_CPP
+               || pc->GetNext()->type == CT_COMMENT)))
       {
          continue;
       }
@@ -6554,13 +6603,18 @@ static void newlines_enum_entries(chunk_t *open_brace, iarf_e av)
 } // newlines_enum_entries
 
 
-static void newlines_double_space_struct_enum_union(chunk_t *open_brace)
+static void newlines_double_space_struct_enum_union(Chunk *open_brace)
 {
    LOG_FUNC_ENTRY();
 
-   chunk_t *pc = open_brace;
+   Chunk *pc = Chunk::NullChunkPtr;
+
+   if (open_brace != nullptr)
+   {
+      pc = open_brace;
+   }
 
-   while (  (pc = chunk_get_next_nc(pc)) != nullptr
+   while (  (pc = pc->GetNextNc())->IsNotNullChunk()
          && pc->level > open_brace->level)
    {
       if (  pc->level != (open_brace->level + 1)
@@ -6573,11 +6627,11 @@ static void newlines_double_space_struct_enum_union(chunk_t *open_brace)
        * it is before a comment, then make sure that the newline is
        * at least doubled
        */
-      chunk_t *prev = chunk_get_prev(pc);
+      Chunk *prev = pc->GetPrev();
 
-      if (  !chunk_is_comment(prev)
+      if (  !prev->IsComment()
          && chunk_is_not_token(prev, CT_BRACE_OPEN)
-         && chunk_is_comment(chunk_get_next(pc)))
+         && pc->GetNext()->IsComment())
       {
          if (pc->nl_count < 2)
          {
@@ -6592,13 +6646,13 @@ void annotations_newlines(void)
 {
    LOG_FUNC_ENTRY();
 
-   chunk_t *next;
-   chunk_t *prev;
-   chunk_t *ae;   // last token of the annotation
-   chunk_t *pc = chunk_get_head();
+   Chunk *next;
+   Chunk *prev;
+   Chunk *ae;   // last token of the annotation
+   Chunk *pc = Chunk::GetHead();
 
-   while (  (pc = chunk_get_next_type(pc, CT_ANNOTATION, -1)) != nullptr
-         && (next = chunk_get_next_nnl(pc)) != nullptr)
+   while (  (pc = pc->GetNextType(CT_ANNOTATION, -1))->IsNotNullChunk()
+         && (next = pc->GetNextNnl())->IsNotNullChunk())
    {
       // find the end of this annotation
       if (chunk_is_paren_open(next))
@@ -6611,18 +6665,18 @@ void annotations_newlines(void)
          ae = pc;
       }
 
-      if (ae == nullptr)
+      if (ae->IsNullChunk())
       {
          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());
+              __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text(),
+              ae->orig_line, ae->orig_col, ae->Text());
 
-      prev = chunk_get_prev(ae);             // 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());
-      next = chunk_get_next_nnl(ae);
+      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());
+      next = ae->GetNextNnl();
 
       if (chunk_is_token(next, CT_ANNOTATION))
       {
@@ -6646,7 +6700,7 @@ void annotations_newlines(void)
 } // annotations_newlines
 
 
-bool newlines_between(chunk_t *pc_start, chunk_t *pc_end, size_t &newlines, scope_e scope)
+bool newlines_between(Chunk *pc_start, Chunk *pc_end, size_t &newlines, E_Scope scope)
 {
    if (  pc_start == nullptr
       || pc_end == nullptr)
@@ -6655,9 +6709,9 @@ bool newlines_between(chunk_t *pc_start, chunk_t *pc_end, size_t &newlines, scop
    }
    newlines = 0;
 
-   chunk_t *it = pc_start;
+   Chunk *it = pc_start;
 
-   for ( ; it != nullptr && it != pc_end; it = chunk_get_next(it, scope))
+   for ( ; it->IsNotNullChunk() && it != pc_end; it = it->GetNext(scope))
    {
       newlines += it->nl_count;
    }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/newlines.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/newlines.h
index cd5d61db..b5c7db03 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/newlines.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/newlines.h
@@ -9,12 +9,12 @@
 #ifndef NEWLINES_H_INCLUDED
 #define NEWLINES_H_INCLUDED
 
-#include "chunk_list.h"
+#include "chunk.h"
 
 /**
  * Double the newline, if allowed.
  */
-void double_newline(chunk_t *nl);
+void double_newline(Chunk *nl);
 
 /**
  * Remove all extra newlines.
@@ -87,14 +87,14 @@ void newlines_eat_start_end(void);
  * exactly 1 newline before (UO_pos_comma == TRAIL) or after (UO_pos_comma == LEAD).
  * We can't remove a newline if it is right before a preprocessor.
  */
-void newlines_chunk_pos(c_token_t chunk_type, uncrustify::token_pos_e mode);
+void newlines_chunk_pos(E_Token chunk_type, uncrustify::token_pos_e mode);
 
 
 /**
  * Searches for CT_CLASS_COLON and moves them, if needed.
  * Also breaks up the args
  */
-void newlines_class_colon_pos(c_token_t tok);
+void newlines_class_colon_pos(E_Token tok);
 
 
 void newlines_cleanup_dup(void);
@@ -124,7 +124,7 @@ void do_blank_lines(void);
  * Clears the PCF_ONE_LINER flag on the current line.
  * Done right before inserting a newline.
  */
-void undo_one_liner(chunk_t *pc);
+void undo_one_liner(Chunk *pc);
 
 
 /**
@@ -133,27 +133,27 @@ void undo_one_liner(chunk_t *pc);
  * @param pc  The chunk
  * @param av  The IARF value
  */
-void newline_iarf(chunk_t *pc, uncrustify::iarf_e av);
+void newline_iarf(Chunk *pc, uncrustify::iarf_e av);
 
 
 /**
  * Add a newline before the chunk if there isn't already a newline present.
  * Virtual braces are skipped, as they do not contribute to the output.
  */
-chunk_t *newline_add_before(chunk_t *pc);
+Chunk *newline_add_before(Chunk *pc);
 
 
 /**
  * Add a newline after the chunk if there isn't already a newline present.
  * Virtual braces are skipped, as they do not contribute to the output.
  */
-chunk_t *newline_force_before(chunk_t *pc);
+Chunk *newline_force_before(Chunk *pc);
 
 
-chunk_t *newline_add_after(chunk_t *pc);
+Chunk *newline_add_after(Chunk *pc);
 
 
-chunk_t *newline_force_after(chunk_t *pc);
+Chunk *newline_force_after(Chunk *pc);
 
 
 /**
@@ -167,7 +167,7 @@ chunk_t *newline_force_after(chunk_t *pc);
  *
  * @return true/false - removed something
  */
-void newline_del_between(chunk_t *start, chunk_t *end);
+void newline_del_between(Chunk *start, Chunk *end);
 
 
 /**
@@ -185,7 +185,7 @@ void newline_del_between(chunk_t *start, chunk_t *end);
  *    if (...)   //comment
  *    {
  */
-chunk_t *newline_add_between(chunk_t *start, chunk_t *end);
+Chunk *newline_add_between(Chunk *start, Chunk *end);
 
 
 /**
@@ -200,7 +200,7 @@ chunk_t *newline_add_between(chunk_t *start, chunk_t *end);
  * @return false  if pc_start or pc_end are nullptr or if pc_end is not reached
  * @return true   if above cases are not met
  */
-bool newlines_between(chunk_t *pc_start, chunk_t *pc_end, size_t &newlines, scope_e scope = scope_e::ALL);
+bool newlines_between(Chunk *pc_start, Chunk *pc_end, size_t &newlines, E_Scope scope = E_Scope::ALL);
 
 
 #endif /* NEWLINES_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/option.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/option.cpp
index 5089f37a..8160c22b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/option.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/option.cpp
@@ -86,9 +86,8 @@ static const char *DOC_TEXT_END = u8R"___(
 std::vector<OptionGroup>                         option_groups;
 std::unordered_map<std::string, GenericOption *> option_map;
 
-#define LOG_CONFIG(...)                            \
-   do { log_config(); LOG_FMT(LNOTE, __VA_ARGS__); \
-   } while (0)
+#define LOG_CONFIG(...) \
+   log_config(); LOG_FMT(LNOTE, __VA_ARGS__);
 
 
 //-----------------------------------------------------------------------------
@@ -378,6 +377,21 @@ bool process_option_line_compat_0_73(const std::string &cmd,
    return(false);
 } // process_option_line_compat_0_73
 
+
+bool process_option_line_compat_0_74(const std::string &cmd,
+                                     const char        *filename)
+{
+   if (cmd == "sp_type_question")         // PR #3638
+   {
+      OptionWarning w{ filename, OptionWarning::MINOR };
+      w("option '%s' is deprecated; did you want to use '%s' instead?",
+        cmd.c_str(), options::sp_before_ptr_star.name());
+
+      return(true);
+   }
+   return(false);
+} // process_option_line_compat_0_74
+
 } // namespace
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -1067,6 +1081,14 @@ void process_option_line(const std::string &config_line, const char *filename,
             return;
          }
       }
+
+      if (compat_level < option_level(0, 75))
+      {
+         if (process_option_line_compat_0_74(cmd, filename))
+         {
+            return;
+         }
+      }
       const auto oi = option_map.find(cmd);
 
       if (oi == option_map.end())
@@ -1118,6 +1140,12 @@ bool load_option_file(const char *filename, int compat_level)
       {
          ch = line[n];
 
+         // do not check characters in comment part of line
+         if ('#' == ch)
+         {
+            break;
+         }
+
          // ch >= 0 && ch <= 255
          if (  ch < 0
             || ch > 255)
@@ -1237,8 +1265,8 @@ void save_option_file(FILE *pfile, bool with_doc, bool minimal)
    {
       fprintf(pfile, "%s", DOC_TEXT_END);
    }
-   print_keywords(pfile);    // Print custom keywords
-   print_extensions(pfile);  // Print custom file extensions
+   print_custom_keywords(pfile);   // Print custom keywords
+   print_extensions(pfile);        // Print custom file extensions
 
    fprintf(pfile, "# option(s) with 'not default' value: %d%s#%s",
            non_default_values, eol_marker, eol_marker);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/option.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/option.h
index 4ab356b5..4ab356b5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/option.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/option.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/option_enum.cpp.in b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/option_enum.cpp.in
index aeb976b2..aeb976b2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/option_enum.cpp.in
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/option_enum.cpp.in
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/option_enum.h.in b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/option_enum.h.in
index e50a9281..e50a9281 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/option_enum.h.in
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/option_enum.h.in
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/options.cpp.in b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/options.cpp.in
index 2ee14c8b..2ee14c8b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/options.cpp.in
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/options.cpp.in
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/options.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/options.h
index e76a4c4f..d3e5386d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/options.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/options.h
@@ -182,6 +182,10 @@ sp_before_assign;
 extern Option<iarf_e>
 sp_after_assign;
 
+// Add or remove space in 'enum {'.
+extern Option<iarf_e>
+sp_enum_brace; // = IARF_ADD
+
 // Add or remove space in 'NS_ENUM ('.
 extern Option<iarf_e>
 sp_enum_paren;
@@ -296,6 +300,11 @@ sp_after_ptr_star_trailing;
 extern Option<iarf_e>
 sp_ptr_star_func_var;
 
+// Add or remove space between the pointer star '*' and the name of the type
+// in a function pointer type definition.
+extern Option<iarf_e>
+sp_ptr_star_func_type;
+
 // Add or remove space after a pointer star '*', if followed by an open
 // parenthesis, as in 'void* (*)()'.
 extern Option<iarf_e>
@@ -338,6 +347,11 @@ sp_after_byref_func;
 extern Option<iarf_e>
 sp_before_byref_func;
 
+// Add or remove space after a reference sign '&', if followed by an open
+// parenthesis, as in 'char& (*)()'.
+extern Option<iarf_e>
+sp_byref_paren;
+
 // 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
 // as 'force'.
@@ -573,15 +587,19 @@ sp_between_mdatype_commas;
 extern Option<iarf_e>
 sp_paren_comma; // = IARF_FORCE
 
+// Add or remove space between a type and ':'.
+extern Option<iarf_e>
+sp_type_colon;
+
 // Add or remove space after the variadic '...' when preceded by a
 // non-punctuator.
-// The value REMOVE will be overriden with FORCE
+// The value REMOVE will be overridden with FORCE
 extern Option<iarf_e>
 sp_after_ellipsis;
 
 // Add or remove space before the variadic '...' when preceded by a
 // non-punctuator.
-// The value REMOVE will be overriden with FORCE
+// The value REMOVE will be overridden with FORCE
 extern Option<iarf_e>
 sp_before_ellipsis;
 
@@ -593,10 +611,6 @@ sp_type_ellipsis;
 extern Option<iarf_e>
 sp_ptr_type_ellipsis;
 
-// (D) Add or remove space between a type and '?'.
-extern Option<iarf_e>
-sp_type_question;
-
 // Add or remove space between ')' and '...'.
 extern Option<iarf_e>
 sp_paren_ellipsis;
@@ -987,6 +1001,11 @@ sp_d_array_colon;
 extern Option<iarf_e>
 sp_not; // = IARF_REMOVE
 
+// Add or remove space between two '!' (not) unary operators.
+// If set to ignore, sp_not will be used.
+extern Option<iarf_e>
+sp_not_not; // = IARF_IGNORE
+
 // Add or remove space after the '~' (invert) unary operator.
 extern Option<iarf_e>
 sp_inv; // = IARF_REMOVE
@@ -1277,16 +1296,23 @@ force_tab_after_define;
 extern BoundedOption<unsigned, 0, 16>
 indent_columns; // = 8
 
+// Whether to ignore indent for the first continuation line. Subsequent
+// continuation lines will still be indented to match the first.
+extern Option<bool>
+indent_ignore_first_continue;
+
 // The continuation indent. If non-zero, this overrides the indent of '(', '['
 // and '=' continuation indents. Negative values are OK; negative value is
 // absolute and not increased for each '(' or '[' level.
 //
 // For FreeBSD, this is set to 4.
+// Requires indent_ignore_first_continue=false.
 extern BoundedOption<signed, -16, 16>
 indent_continue;
 
 // The continuation indent, only for class header line(s). If non-zero, this
 // overrides the indent of 'class' continuation indents.
+// Requires indent_ignore_first_continue=false.
 extern BoundedOption<unsigned, 0, 16>
 indent_continue_class_head;
 
@@ -1380,6 +1406,11 @@ indent_namespace_level;
 extern BoundedOption<unsigned, 0, 255>
 indent_namespace_limit;
 
+// Whether to indent only in inner namespaces (nested in other namespaces).
+// Requires indent_namespace=true.
+extern Option<bool>
+indent_namespace_inner_only;
+
 // Whether the 'extern "C"' body is indented.
 extern Option<bool>
 indent_extern;
@@ -1388,10 +1419,14 @@ indent_extern;
 extern Option<bool>
 indent_class;
 
+// Whether to ignore indent for the leading base class colon.
+extern Option<bool>
+indent_ignore_before_class_colon;
+
 // Additional indent before the leading base class colon.
 // Negative values decrease indent down to the first column.
-// Requires a newline break before colon (see pos_class_colon
-// and nl_class_colon)
+// Requires indent_ignore_before_class_colon=false and a newline break before
+// the colon (see pos_class_colon and nl_class_colon)
 extern BoundedOption<signed, -16, 16>
 indent_before_class_colon;
 
@@ -1404,6 +1439,10 @@ indent_class_colon;
 extern Option<bool>
 indent_class_on_colon;
 
+// Whether to ignore indent for a leading class initializer colon.
+extern Option<bool>
+indent_ignore_before_constr_colon;
+
 // Whether to indent the stuff after a leading class initializer colon.
 extern Option<bool>
 indent_constr_colon;
@@ -1437,9 +1476,12 @@ indent_var_def_blk;
 extern Option<bool>
 indent_var_def_cont;
 
-// Whether to indent continued shift expressions ('<<' and '>>') instead of
-// aligning. Set align_left_shift=false when enabling this.
-extern Option<bool>
+// How to indent continued shift expressions ('<<' and '>>').
+// Set align_left_shift=false when using this.
+//  0: Align shift operators instead of indenting them (default)
+//  1: Indent by one level
+// -1: Preserve original indentation
+extern BoundedOption<signed, -1, 1>
 indent_shift;
 
 // Whether to force indentation of function definitions to start in column 1.
@@ -1545,6 +1587,10 @@ indent_switch_case;
 extern BoundedOption<unsigned, 0, 16>
 indent_switch_body;
 
+// Whether to ignore indent for '{' following 'case'.
+extern Option<bool>
+indent_ignore_case_brace;
+
 // Spaces to indent '{' from 'case'. By default, the brace will appear under
 // the 'c' in case. Usually set to 0 or indent_columns. Negative values are OK.
 // It might be wise to choose the same value for the option indent_switch_case.
@@ -1615,10 +1661,11 @@ indent_paren_nl;
 
 // How to indent a close parenthesis after a newline.
 //
-// 0: Indent to body level (default)
-// 1: Align under the open parenthesis
-// 2: Indent to the brace level
-extern BoundedOption<unsigned, 0, 2>
+//  0: Indent to body level (default)
+//  1: Align under the open parenthesis
+//  2: Indent to the brace level
+// -1: Preserve original indentation
+extern BoundedOption<signed, -1, 2>
 indent_paren_close;
 
 // Whether to indent the open parenthesis of a function definition,
@@ -1636,28 +1683,48 @@ indent_paren_after_func_decl;
 extern Option<bool>
 indent_paren_after_func_call;
 
-// Whether to indent a comma when inside a brace.
-// If true, aligns under the open brace.
-extern Option<bool>
+// How to indent a comma when inside braces.
+//  0: Indent by one level (default)
+//  1: Align under the open brace
+// -1: Preserve original indentation
+extern BoundedOption<signed, -1, 1>
 indent_comma_brace;
 
-// Whether to indent a comma when inside a parenthesis.
-// If true, aligns under the open parenthesis.
-extern Option<bool>
+// How to indent a comma when inside parentheses.
+//  0: Indent by one level (default)
+//  1: Align under the open parenthesis
+// -1: Preserve original indentation
+extern BoundedOption<signed, -1, 1>
 indent_comma_paren;
 
-// Whether to indent a Boolean operator when inside a parenthesis.
-// If true, aligns under the open parenthesis.
-extern Option<bool>
+// How to indent a Boolean operator when inside parentheses.
+//  0: Indent by one level (default)
+//  1: Align under the open parenthesis
+// -1: Preserve original indentation
+extern BoundedOption<signed, -1, 1>
 indent_bool_paren;
 
+// Whether to ignore the indentation of a Boolean operator when outside
+// parentheses.
+extern Option<bool>
+indent_ignore_bool;
+
+// Whether to ignore the indentation of an arithmetic operator.
+extern Option<bool>
+indent_ignore_arith;
+
 // Whether to indent a semicolon when inside a for parenthesis.
 // If true, aligns under the open for parenthesis.
 extern Option<bool>
 indent_semicolon_for_paren;
 
+// Whether to ignore the indentation of a semicolon outside of a 'for'
+// statement.
+extern Option<bool>
+indent_ignore_semicolon;
+
 // Whether to align the first expression to following ones
-// if indent_bool_paren=true.
+// if indent_bool_paren=1.
 extern Option<bool>
 indent_first_bool_expr;
 
@@ -1675,6 +1742,10 @@ indent_square_nl;
 extern Option<bool>
 indent_preserve_sql;
 
+// Whether to ignore the indentation of an assignment operator.
+extern Option<bool>
+indent_ignore_assign;
+
 // Whether to align continued statements at the '='. If false or if the '=' is
 // followed by a newline, the next line is indent one tab.
 extern Option<bool>
@@ -2426,7 +2497,8 @@ extern Option<iarf_e>
 nl_paren_dbrace_open;
 
 // Whether to add a newline after the type in an unnamed temporary
-// direct-list-initialization.
+// direct-list-initialization, better:
+// before a direct-list-initialization.
 extern Option<iarf_e>
 nl_type_brace_init_lst;
 
@@ -2750,16 +2822,16 @@ nl_typedef_blk_end;
 extern BoundedOption<unsigned, 0, 16>
 nl_typedef_blk_in;
 
-// The number of newlines before a block of variable definitions not at the top
-// of a function body. If nl_after_access_spec is non-zero, that option takes
-// precedence.
+// The 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.
 //
 // 0: No change (default).
 extern BoundedOption<unsigned, 0, 16>
 nl_var_def_blk_start;
 
-// The number of newlines after a block of variable definitions not at the top
-// of a function body.
+// The number of empty newlines after a block of variable definitions
+// not at the top of a function body.
 //
 // 0: No change (default).
 extern BoundedOption<unsigned, 0, 16>
@@ -3149,6 +3221,12 @@ 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).
@@ -3162,6 +3240,19 @@ align_assign_func_proto_span;
 extern BoundedOption<signed, -1000, 5000>
 align_assign_thresh;
 
+// Whether to align on the left most assignment when multiple
+// definitions are found on the same line.
+// Depends on 'align_assign_span' and 'align_assign_thresh' settings.
+extern Option<bool>
+align_assign_on_multi_var_defs;
+
+// The threshold for aligning on '{' in braced init list.
+// Use a negative number for absolute thresholds.
+//
+// 0: No limit (default).
+extern BoundedOption<signed, -1000, 5000>
+align_braced_init_list_thresh;
+
 // How to apply align_assign_span to function declaration "assignments", i.e.
 // 'virtual void foo() = 0' or '~foo() = {default|delete}'.
 //
@@ -3406,7 +3497,7 @@ align_oc_decl_colon;
 
 // (OC) Whether to not align parameters in an Objectve-C message call if first
 // colon is not on next line of the message call (the same way Xcode does
-// aligment)
+// alignment)
 extern Option<bool>
 align_oc_msg_colon_xcode_like;
 
@@ -3640,12 +3731,17 @@ extern Option<iarf_e>
 mod_full_brace_if;
 
 // Whether to enforce that all blocks of an 'if'/'else if'/'else' chain either
-// have, or do not have, braces. If true, braces will be added if any block
-// needs braces, and will only be removed if they can be removed from all
-// blocks.
+// have, or do not have, braces. Overrides mod_full_brace_if.
 //
-// Overrides mod_full_brace_if.
-extern Option<bool>
+// 0: Don't override mod_full_brace_if
+// 1: Add braces to all blocks if any block needs braces and remove braces if
+//    they can be removed from all blocks
+// 2: Add braces to all blocks if any block already has braces, regardless of
+//    whether it needs them
+// 3: Add braces to all blocks if any block needs braces and remove braces if
+//    they can be removed from all blocks, except if all blocks have braces
+//    despite none needing them
+extern BoundedOption<unsigned, 0, 3>
 mod_full_brace_if_chain;
 
 // Whether to add braces to all blocks of an 'if'/'else if'/'else' chain.
@@ -3696,6 +3792,16 @@ mod_pawn_semicolon;
 extern Option<bool>
 mod_full_paren_if_bool;
 
+// Whether to fully parenthesize Boolean expressions after '='
+// statement, as in 'x = a && b > c;' => 'x = (a && (b > c));'.
+extern Option<bool>
+mod_full_paren_assign_bool;
+
+// Whether to fully parenthesize Boolean expressions after '='
+// statement, as in 'return  a && b > c;' => 'return (a && (b > c));'.
+extern Option<bool>
+mod_full_paren_return_bool;
+
 // Whether to remove superfluous semicolons.
 extern Option<bool>
 mod_remove_extra_semicolon;
@@ -3781,6 +3887,11 @@ mod_sort_incl_import_grouping_enabled;
 extern Option<bool>
 mod_move_case_break;
 
+// Whether to move a 'return' that appears after a fully braced 'case' before
+// the close brace, as in 'case X: { ... } return;' => 'case X: { ... return; }'.
+extern Option<bool>
+mod_move_case_return;
+
 // Add or remove braces around a fully braced case statement. Will only remove
 // braces if there are no variable declarations in the block.
 extern Option<iarf_e>
@@ -3845,6 +3956,11 @@ pp_indent;
 extern Option<bool>
 pp_indent_at_level;
 
+// Whether to indent #if/#else/#endif at the parenthesis level if the brace
+// level is 0. If false, these are indented from column 1.
+extern Option<bool>
+pp_indent_at_level0;
+
 // Specifies the number of columns to indent preprocessors per level
 // at brace level 0 (file-level). If pp_indent_at_level=false, also specifies
 // the number of columns to indent preprocessors per level
@@ -3919,11 +4035,37 @@ pp_indent_func_def; // = true
 extern Option<bool>
 pp_indent_extern; // = true
 
-// Whether to indent braces directly inside #if, #else, and #endif.
-// Only applies to the indent of the preprocesser that the braces are directly
-// inside of.
+// 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.
+//  0: No extra indent
+//  1: Indent by one level
+// -1: Preserve original indentation
+extern BoundedOption<signed, -1, 1>
+pp_indent_brace; // = 1
+
+// Whether to print warning messages for unbalanced #if and #else blocks.
+// This will print a message in the following cases:
+// - if an #ifdef block ends on a different indent level than
+//   where it started from. Example:
+//
+//    #ifdef TEST
+//      int i;
+//      {
+//        int j;
+//    #endif
+//
+// - an #elif/#else block ends on a different indent level than
+//   the corresponding #ifdef block. Example:
+//
+//    #ifdef TEST
+//        int i;
+//    #else
+//        }
+//      int j;
+//    #endif
 extern Option<bool>
-pp_indent_brace; // = true
+pp_warn_unbalanced_if; // = false
 
 // TODO ...until here.
 
@@ -3968,18 +4110,17 @@ use_indent_func_call_param; // = true
 //
 // true:  indent_continue will be used only once
 // false: indent_continue will be used every time (default)
+//
+// Requires indent_ignore_first_continue=false.
 extern Option<bool>
 use_indent_continue_only_once;
 
-// The value might be used twice:
-// - at the assignment
-// - at the opening brace
-//
-// To prevent the double use of the indentation value, use this option with the
-// value 'true'.
+// The indentation can be:
+// - after the assignment, at the '[' character
+// - at the begin of the lambda body
 //
-// true:  indentation will be used only once
-// false: indentation will be used every time (default)
+// true:  indentation will be after the assignment
+// false: indentation will be at the begin of the lambda body (default)
 extern Option<bool>
 indent_cpp_lambda_only_once;
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/options_for_QT.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/options_for_QT.cpp
index f4a1d040..f4a1d040 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/options_for_QT.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/options_for_QT.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/options_for_QT.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/options_for_QT.h
index c114eb75..c114eb75 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/options_for_QT.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/options_for_QT.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/output.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/output.cpp
index 2736512c..57d4f0bd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/output.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/output.cpp
@@ -30,7 +30,7 @@ using namespace uncrustify;
 
 struct cmt_reflow
 {
-   chunk_t  *pc         = nullptr;
+   Chunk    *pc         = nullptr;
    size_t   column      = 0;   //! Column of the comment start
    size_t   brace_col   = 0;   //! Brace column (for indenting with tabs)
    size_t   base_col    = 0;   //! Base column (for indenting with tabs)
@@ -46,25 +46,25 @@ struct cmt_reflow
  * The only trick here is that we have to trim out whitespace characters
  * to get the comment to line up.
  */
-static void output_comment_multi(chunk_t *pc);
+static void output_comment_multi(Chunk *pc);
 
 
-static bool kw_fcn_filename(chunk_t *cmt, unc_text &out_txt);
+static bool kw_fcn_filename(Chunk *cmt, unc_text &out_txt);
 
 
-static bool kw_fcn_class(chunk_t *cmt, unc_text &out_txt);
+static bool kw_fcn_class(Chunk *cmt, unc_text &out_txt);
 
 
-static bool kw_fcn_message(chunk_t *cmt, unc_text &out_txt);
+static bool kw_fcn_message(Chunk *cmt, unc_text &out_txt);
 
 
-static bool kw_fcn_category(chunk_t *cmt, unc_text &out_txt);
+static bool kw_fcn_category(Chunk *cmt, unc_text &out_txt);
 
 
-static bool kw_fcn_scope(chunk_t *cmt, unc_text &out_txt);
+static bool kw_fcn_scope(Chunk *cmt, unc_text &out_txt);
 
 
-static bool kw_fcn_function(chunk_t *cmt, unc_text &out_txt);
+static bool kw_fcn_function(Chunk *cmt, unc_text &out_txt);
 
 
 /**
@@ -73,13 +73,13 @@ static bool kw_fcn_function(chunk_t *cmt, unc_text &out_txt);
  * If the arg list is '()' or '(void)', then no @params are added.
  * Likewise, if the return value is 'void', then no @return is added.
  */
-static bool kw_fcn_javaparam(chunk_t *cmt, unc_text &out_txt);
+static bool kw_fcn_javaparam(Chunk *cmt, unc_text &out_txt);
 
 
-static bool kw_fcn_fclass(chunk_t *cmt, unc_text &out_txt);
+static bool kw_fcn_fclass(Chunk *cmt, unc_text &out_txt);
 
 
-static bool kw_fcn_year(chunk_t *cmt, unc_text &out_txt);
+static bool kw_fcn_year(Chunk *cmt, unc_text &out_txt);
 
 
 /**
@@ -88,7 +88,7 @@ static bool kw_fcn_year(chunk_t *cmt, unc_text &out_txt);
  *
  * Trims trailing whitespaces.
  */
-static void output_comment_multi_simple(chunk_t *pc);
+static void output_comment_multi_simple(Chunk *pc);
 
 
 /**
@@ -97,7 +97,7 @@ static void output_comment_multi_simple(chunk_t *pc);
  * @param[out] dst    unc_text buffer to be filled
  * @param[in]  ifdef  if conditional as chunk list
  */
-static void generate_if_conditional_as_text(unc_text &dst, chunk_t *ifdef);
+static void generate_if_conditional_as_text(unc_text &dst, Chunk *ifdef);
 
 
 /**
@@ -105,7 +105,7 @@ static void generate_if_conditional_as_text(unc_text &dst, chunk_t *ifdef);
  * NOTE: it is assumed that a comment will contain at most one of each type
  * of keyword.
  */
-static void do_kw_subst(chunk_t *pc);
+static void do_kw_subst(Chunk *pc);
 
 
 //! All output text is sent here, one char at a time.
@@ -188,7 +188,7 @@ static int next_up(const unc_text &text, size_t idx, const unc_text &tag);
  *
  * @return the last chunk output'd
  */
-static chunk_t *output_comment_c(chunk_t *pc);
+static Chunk *output_comment_c(Chunk *pc);
 
 
 /**
@@ -197,7 +197,7 @@ static chunk_t *output_comment_c(chunk_t *pc);
  *
  * @return the last chunk output'd
  */
-static chunk_t *output_comment_cpp(chunk_t *pc);
+static Chunk *output_comment_cpp(Chunk *pc);
 
 
 static void cmt_trim_whitespace(unc_text &line, bool in_preproc);
@@ -218,7 +218,7 @@ static void cmt_trim_whitespace(unc_text &line, bool in_preproc);
 static void add_comment_text(const unc_text &text, cmt_reflow &cmt, bool esc_close, size_t continuation_indent = 0);
 
 
-static void output_cmt_start(cmt_reflow &cmt, chunk_t *pc);
+static void output_cmt_start(cmt_reflow &cmt, Chunk *pc);
 
 
 /**
@@ -228,7 +228,7 @@ static void output_cmt_start(cmt_reflow &cmt, chunk_t *pc);
  *  2. There is exactly one newline between then
  *  3. They are indented to the same level
  */
-static bool can_combine_comment(chunk_t *pc, cmt_reflow &cmt);
+static bool can_combine_comment(Chunk *pc, cmt_reflow &cmt);
 
 
 #define LOG_CONTTEXT() \
@@ -468,10 +468,10 @@ 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         Flag   Nl  Text");
 #endif // ifdef WIN32
 
-   for (chunk_t *pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next(pc))
+   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]",
@@ -485,14 +485,16 @@ void output_parsed(FILE *pfile, bool withOptions)
               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, "[%11llx]",
-              static_cast<pcf_flags_t::int_t>(pc->flags));
+      // 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);
       fprintf(pfile, "[%zu-%d]",
               pc->nl_count, pc->after_tab);
 #endif // ifdef WIN32
 
       if (  pc->type != CT_NEWLINE
-         && (pc->len() != 0))
+         && (pc->Len() != 0))
       {
          for (size_t cnt = 0; cnt < pc->column; cnt++)
          {
@@ -501,7 +503,7 @@ void output_parsed(FILE *pfile, bool withOptions)
 
          if (pc->type != CT_NL_CONT)
          {
-            fprintf(pfile, "%s", pc->text());
+            fprintf(pfile, "%s", pc->Text());
          }
          else
          {
@@ -524,7 +526,7 @@ void output_parsed_csv(FILE *pfile)
    fprintf(pfile, "Line,Tag,Parent_type,Type of the parent,Column,Orig Col Strt,"
            "Orig Col End,Orig Sp Before,Br,Lvl,pp,Flags,Nl Before,Nl After,Text,");
 
-   for (chunk_t *pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next(pc))
+   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),
@@ -546,7 +548,7 @@ void output_parsed_csv(FILE *pfile)
               pc->nl_count, pc->after_tab);
 
       if (  pc->type != CT_NEWLINE
-         && (pc->len() != 0))
+         && (pc->Len() != 0))
       {
          fprintf(pfile, "\"");
 
@@ -557,7 +559,7 @@ void output_parsed_csv(FILE *pfile)
 
          if (pc->type != CT_NL_CONT)
          {
-            for (auto *ch = pc->text(); *ch != '\0'; ++ch)
+            for (auto *ch = pc->Text(); *ch != '\0'; ++ch)
             {
                fprintf(pfile, "%c", *ch);
 
@@ -592,14 +594,14 @@ void output_text(FILE *pfile)
    {
       write_bom();
    }
-   chunk_t *pc;
+   Chunk *pc;
 
    if (cpd.frag_cols > 0)
    {
       size_t indent = cpd.frag_cols - 1;
 
       // loop over the whole chunk list
-      for (pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next(pc))
+      for (pc = Chunk::GetHead(); pc->IsNotNullChunk(); pc = pc->GetNext())
       {
          pc->column        += indent;
          pc->column_indent += indent;
@@ -623,14 +625,14 @@ void output_text(FILE *pfile)
    bool write_in_tracking = false;
 
    // loop over the whole chunk list
-   for (pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next(pc))
+   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->elided_text(copy), get_token_name(pc->type), pc->orig_line, pc->column, pc->nl_count);
+      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()
-                                && chunk_is_comment(pc));
+                                && pc->IsComment());
 
       if (chunk_is_token(pc, CT_NEWLINE))
       {
@@ -665,7 +667,7 @@ void output_text(FILE *pfile)
             else
             {
                // Try to keep the same relative spacing
-               chunk_t *prev = chunk_get_prev(pc);
+               Chunk *prev = pc->GetPrev();
 
                if (chunk_is_token(prev, CT_PP_IGNORE))
                {
@@ -680,13 +682,15 @@ void output_text(FILE *pfile)
                {
                   // Try to keep the same relative spacing
                   while (  prev != nullptr
+                        && prev->IsNotNullChunk()
                         && prev->orig_col == 0
                         && prev->nl_count == 0)
                   {
-                     prev = chunk_get_prev(prev);
+                     prev = prev->GetPrev();
                   }
 
                   if (  prev != nullptr
+                     && prev->IsNotNullChunk()
                      && prev->nl_count == 0)
                   {
                      int orig_sp = (pc->orig_col - prev->orig_col_end);
@@ -761,12 +765,12 @@ void output_text(FILE *pfile)
       else if (  chunk_is_token(pc, CT_JUNK)
               || chunk_is_token(pc, CT_IGNORED))
       {
-         LOG_FMT(LOUTIND, "%s(%d): orig_line is %zu, orig_col is %zu,\npc->text() >%s<, pc->str.size() is %zu\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->text(), pc->str.size());
+         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());
          // do not adjust the column for junk
          add_text(pc->str, true);
       }
-      else if (pc->len() == 0)
+      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",
@@ -813,7 +817,7 @@ void output_text(FILE *pfile)
             }
             log_rule_B("indent_with_tabs");
             allow_tabs = (options::indent_with_tabs() == 2)
-                         || (  chunk_is_comment(pc)
+                         || (  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",
@@ -832,11 +836,11 @@ void output_text(FILE *pfile)
                reindent_line(pc, cpd.column);
             }
             // not the first item on a line
-            chunk_t *prev = chunk_get_prev(pc);
+            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));
+                         && ((prev->column + prev->Len() + 1) != pc->column));
 
             log_rule_B("align_keep_tabs");
 
@@ -1122,15 +1126,16 @@ static int match_doxygen_javadoc_tag(const std::wstring &str, size_t idx)
 
    if (str[idx] == L'@')
    {
+      // Issue #3357
       std::wregex criteria(L"(@(?:author|"
                            L"deprecated|"
                            L"exception|"
-                           L"param(?:\\s*\\[\\s*(?:in\\s*,\\s*out|in|out)\\s*\\])?|"
+                           L"param(?:\\s*?\\[\\s*(?:in\\s*,\\s*out|in|out)\\s*?\\])?|"
                            L"return|"
                            L"see|"
                            L"since|"
                            L"throws|"
-                           L"version)\\b)");
+                           L"version)(?=\\s))");
 
       if (  std::regex_search(str.cbegin() + idx, str.cend(), match, criteria)
          && match[1].matched
@@ -1374,9 +1379,14 @@ static void calculate_comment_body_indent(cmt_reflow &cmt, const unc_text &str)
 
 
 // TODO: can we use search_next_chunk here?
-static chunk_t *get_next_function(chunk_t *pc)
+static Chunk *get_next_function(Chunk *pc)
 {
-   while ((pc = chunk_get_next(pc)) != nullptr)
+   if (pc == nullptr)
+   {
+      pc = Chunk::NullChunkPtr;
+   }
+
+   while ((pc = pc->GetNext())->IsNotNullChunk())
    {
       if (  chunk_is_token(pc, CT_FUNC_DEF)
          || chunk_is_token(pc, CT_FUNC_PROTO)
@@ -1391,25 +1401,25 @@ static chunk_t *get_next_function(chunk_t *pc)
 }
 
 
-static chunk_t *get_next_class(chunk_t *pc)
+static Chunk *get_next_class(Chunk *pc)
 {
-   return(chunk_get_next(chunk_search_next_cat(pc, CT_CLASS)));
+   return(chunk_search_next_cat(pc, CT_CLASS)->GetNext());
 }
 
 
-static chunk_t *get_prev_category(chunk_t *pc)
+static Chunk *get_prev_category(Chunk *pc)
 {
    return(chunk_search_prev_cat(pc, CT_OC_CATEGORY));
 }
 
 
-static chunk_t *get_next_scope(chunk_t *pc)
+static Chunk *get_next_scope(Chunk *pc)
 {
    return(chunk_search_next_cat(pc, CT_OC_SCOPE));
 }
 
 
-static chunk_t *get_prev_oc_class(chunk_t *pc)
+static Chunk *get_prev_oc_class(Chunk *pc)
 {
    return(chunk_search_prev_cat(pc, CT_OC_CLASS));
 }
@@ -1589,7 +1599,7 @@ static void add_comment_text(const unc_text &text,
 } // add_comment_text
 
 
-static void output_cmt_start(cmt_reflow &cmt, chunk_t *pc)
+static void output_cmt_start(cmt_reflow &cmt, Chunk *pc)
 {
    cmt.pc          = pc;
    cmt.column      = pc->column;
@@ -1666,21 +1676,26 @@ static void output_cmt_start(cmt_reflow &cmt, chunk_t *pc)
 } // output_cmt_start
 
 
-static bool can_combine_comment(chunk_t *pc, cmt_reflow &cmt)
+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)
    {
       return(false);
    }
+
    // next is a newline for sure, make sure it is a single newline
-   chunk_t *next = chunk_get_next(pc);
+   if (pc == nullptr)
+   {
+      pc = Chunk::NullChunkPtr;
+   }
+   Chunk *next = pc->GetNext();
 
-   if (  next != nullptr
+   if (  next->IsNotNullChunk()
       && next->nl_count == 1)
    {
       // Make sure the comment is the same type at the same column
-      next = chunk_get_next(next);
+      next = next->GetNext();
 
       if (  chunk_is_token(next, pc->type)
          && (  (  next->column == 1
@@ -1697,7 +1712,7 @@ static bool can_combine_comment(chunk_t *pc, cmt_reflow &cmt)
 } // can_combine_comment
 
 
-static chunk_t *output_comment_c(chunk_t *first)
+static Chunk *output_comment_c(Chunk *first)
 {
    cmt_reflow cmt;
 
@@ -1718,12 +1733,12 @@ static chunk_t *output_comment_c(chunk_t *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() && chunk_is_last_on_line(first))
       {
          add_text("//");
 
          unc_text tmp;
-         tmp.set(first->str, 2, first->len() - 4);
+         tmp.set(first->str, 2, first->Len() - 4);
          cmt_trim_whitespace(tmp, false);
          add_comment_text(tmp, cmt, false);
       }
@@ -1745,14 +1760,14 @@ static chunk_t *output_comment_c(chunk_t *first)
    {
       add_comment_text("\n", cmt, false);
    }
-   chunk_t  *pc = first;
+   Chunk    *pc = first;
    unc_text tmp;
 
    while (can_combine_comment(pc, cmt))
    {
-      LOG_FMT(LCONTTEXT, "%s(%d): text() is '%s'\n",
-              __func__, __LINE__, pc->text());
-      tmp.set(pc->str, 2, pc->len() - 4);
+      LOG_FMT(LCONTTEXT, "%s(%d): Text() is '%s'\n",
+              __func__, __LINE__, pc->Text());
+      tmp.set(pc->str, 2, pc->Len() - 4);
 
       if (  cpd.last_char == '*'
          && (  tmp[0] == '/'
@@ -1770,10 +1785,10 @@ static chunk_t *output_comment_c(chunk_t *first)
       LOG_FMT(LCONTTEXT, "%s(%d): add_comment_text(newline)\n",
               __func__, __LINE__);
       add_comment_text("\n", cmt, false);
-      pc = chunk_get_next(pc);
-      pc = chunk_get_next(pc);
+      pc = pc->GetNext();
+      pc = pc->GetNext();
    }
-   tmp.set(pc->str, 2, pc->len() - 4);
+   tmp.set(pc->str, 2, pc->Len() - 4);
 
    if (  cpd.last_char == '*'
       && tmp[0] == '/')
@@ -1797,7 +1812,7 @@ static chunk_t *output_comment_c(chunk_t *first)
 } // output_comment_c
 
 
-static chunk_t *output_comment_cpp(chunk_t *first)
+static Chunk *output_comment_cpp(Chunk *first)
 {
    cmt_reflow cmt;
 
@@ -1813,7 +1828,7 @@ static chunk_t *output_comment_cpp(chunk_t *first)
 
    if (options::sp_cmt_cpp_doxygen())  // special treatment for doxygen style comments (treat as unity)
    {
-      const char *sComment = first->text();
+      const char *sComment = first->Text();
       bool       grouping  = (sComment[2] == '@');
       size_t     brace     = 3;
 
@@ -1913,7 +1928,7 @@ static chunk_t *output_comment_cpp(chunk_t *first)
          unc_text tmp(first->str, 0, iLISz);
          add_comment_text(tmp, cmt, false);
 
-         tmp.set(first->str, iLISz, first->len() - iLISz);
+         tmp.set(first->str, iLISz, first->Len() - iLISz);
 
          // Add or remove space after the opening of a C++ comment,
          // i.e. '// A' vs. '//A'.
@@ -1973,7 +1988,7 @@ static chunk_t *output_comment_cpp(chunk_t *first)
       {
          add_char(' ');
       }
-      tmp.set(first->str, 2, first->len() - 2);
+      tmp.set(first->str, 2, first->Len() - 2);
       add_comment_text(tmp, cmt, true);
       add_text(" */");
       return(first);
@@ -1990,13 +2005,13 @@ static chunk_t *output_comment_cpp(chunk_t *first)
    {
       add_text(" ");
    }
-   chunk_t *pc = first;
-   int     offs;
+   Chunk *pc = first;
+   int   offs;
 
    while (can_combine_comment(pc, cmt))
    {
       offs = unc_isspace(pc->str[2]) ? 1 : 0;
-      tmp.set(pc->str, 2 + offs, pc->len() - (2 + offs));
+      tmp.set(pc->str, 2 + offs, pc->Len() - (2 + offs));
 
       if (  cpd.last_char == '*'
          && tmp[0] == '/')
@@ -2005,10 +2020,10 @@ static chunk_t *output_comment_cpp(chunk_t *first)
       }
       add_comment_text(tmp, cmt, true);
       add_comment_text("\n", cmt, false);
-      pc = chunk_get_next(chunk_get_next(pc));
+      pc = pc->GetNext()->GetNext();
    }
    offs = unc_isspace(pc->str[2]) ? 1 : 0;
-   tmp.set(pc->str, 2 + offs, pc->len() - (2 + offs));
+   tmp.set(pc->str, 2 + offs, pc->Len() - (2 + offs));
    add_comment_text(tmp, cmt, true);
 
    log_rule_B("cmt_cpp_nl_end");
@@ -2112,7 +2127,7 @@ static std::map<std::size_t, std::pair<std::wregex, std::wregex> > get_reflow_fo
 } // get_reflow_fold_regex_map
 
 
-static void output_comment_multi(chunk_t *pc)
+static void output_comment_multi(Chunk *pc)
 {
    if (pc == nullptr)
    {
@@ -2122,8 +2137,8 @@ static void output_comment_multi(chunk_t *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->elided_text(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->type), pc->orig_col, pc->column);
 
    output_cmt_start(cmt, pc);
    log_rule_B("cmt_reflow_mode");
@@ -2165,8 +2180,8 @@ static void output_comment_multi(chunk_t *pc)
    auto &&cmt_reflow_regex_map = get_reflow_fold_regex_map();
 
    line.clear();
-   LOG_FMT(LCONTTEXT, "%s(%d): pc->len() is %zu\n",
-           __func__, __LINE__, pc->len());
+   LOG_FMT(LCONTTEXT, "%s(%d): pc->Len() is %zu\n",
+           __func__, __LINE__, pc->Len());
    //LOG_FMT(LCONTTEXT, "%s(%d): pc->str is %s\n",
    //        __func__, __LINE__, pc->str.c_str());
 
@@ -2177,7 +2192,7 @@ static void output_comment_multi(chunk_t *pc)
    auto disable_processing_cmt_idx = find_disable_processing_comment_marker(pc->str);
    auto enable_processing_cmt_idx  = find_enable_processing_comment_marker(pc->str);
 
-   while (cmt_idx < pc->len())
+   while (cmt_idx < pc->Len())
    {
       int ch = pc->str[cmt_idx];
       cmt_idx++;
@@ -2215,7 +2230,7 @@ static void output_comment_multi(chunk_t *pc)
       {
          ch = '\n';
 
-         if (  cmt_idx < pc->len()
+         if (  cmt_idx < pc->Len()
             && pc->str[cmt_idx] == '\n')
          {
             cmt_idx++;
@@ -2304,7 +2319,7 @@ static void output_comment_multi(chunk_t *pc)
                   cmt_idx = eat_line_whitespace(pc->str,
                                                 cmt_idx);
 
-                  while (  cmt_idx < pc->len()
+                  while (  cmt_idx < pc->Len()
                         && !unc_isspace(pc->str[cmt_idx])
                         && pc->str[cmt_idx] != ',')
                   {
@@ -2338,7 +2353,7 @@ static void output_comment_multi(chunk_t *pc)
                line.append(' ');
             }
 
-            while (  cmt_idx < pc->len()
+            while (  cmt_idx < pc->Len()
                   && !unc_isspace(pc->str[cmt_idx]))
             {
                line.append(pc->str[cmt_idx++]);
@@ -2354,7 +2369,7 @@ static void output_comment_multi(chunk_t *pc)
 
       if (  options::cmt_reflow_mode() == 2
          && ch == '\n'
-         && cmt_idx < pc->len())
+         && cmt_idx < pc->Len())
       {
          int    next_nonempty_line = -1;
          int    prev_nonempty_line = -1;
@@ -2379,7 +2394,7 @@ static void output_comment_multi(chunk_t *pc)
          }
 
          for (size_t nxt_idx = cmt_idx;
-              (  nxt_idx < pc->len()
+              (  nxt_idx < pc->Len()
               && pc->str[nxt_idx] != '\r'
               && pc->str[nxt_idx] != '\n');
               nxt_idx++)
@@ -2490,7 +2505,7 @@ static void output_comment_multi(chunk_t *pc)
 
       // If we just hit an end of line OR we just hit end-of-comment...
       if (  ch == '\n'
-         || cmt_idx == pc->len())
+         || cmt_idx == pc->Len())
       {
          if (ch == '\n')
          {
@@ -2619,7 +2634,7 @@ static void output_comment_multi(chunk_t *pc)
 
                   // Checks for and updates the lead chars.
                   // @return 0=not present, >0=number of chars that are part of the lead
-                  idx = cmt_parse_lead(line, (cmt_idx == pc->len()));
+                  idx = cmt_parse_lead(line, (cmt_idx == pc->Len()));
 
                   if (idx > 0)
                   {
@@ -2673,7 +2688,7 @@ static void output_comment_multi(chunk_t *pc)
 } // output_comment_multi
 
 
-static bool kw_fcn_filename(chunk_t *cmt, unc_text &out_txt)
+static bool kw_fcn_filename(Chunk *cmt, unc_text &out_txt)
 {
    UNUSED(cmt);
    out_txt.append(path_basename(cpd.filename.c_str()));
@@ -2681,13 +2696,13 @@ static bool kw_fcn_filename(chunk_t *cmt, unc_text &out_txt)
 }
 
 
-static bool kw_fcn_class(chunk_t *cmt, unc_text &out_txt)
+static bool kw_fcn_class(Chunk *cmt, unc_text &out_txt)
 {
-   chunk_t *tmp = nullptr;
+   Chunk *tmp = nullptr;
 
    if (language_is_set(LANG_CPP | LANG_OC))
    {
-      chunk_t *fcn = get_next_function(cmt);
+      Chunk *fcn = get_next_function(cmt);
 
       if (chunk_is_token(fcn, CT_OC_MSG_DECL))
       {
@@ -2712,15 +2727,15 @@ static bool kw_fcn_class(chunk_t *cmt, unc_text &out_txt)
    {
       out_txt.append(tmp->str);
 
-      while ((tmp = chunk_get_next(tmp)) != nullptr)
+      while ((tmp = tmp->GetNext())->IsNotNullChunk())
       {
          if (tmp->type != CT_DC_MEMBER)
          {
             break;
          }
-         tmp = chunk_get_next(tmp);
+         tmp = tmp->GetNext();
 
-         if (tmp != nullptr)
+         if (tmp->IsNotNullChunk())
          {
             out_txt.append("::");
             out_txt.append(tmp->str);
@@ -2732,20 +2747,20 @@ static bool kw_fcn_class(chunk_t *cmt, unc_text &out_txt)
 } // kw_fcn_class
 
 
-static bool kw_fcn_message(chunk_t *cmt, unc_text &out_txt)
+static bool kw_fcn_message(Chunk *cmt, unc_text &out_txt)
 {
-   chunk_t *fcn = get_next_function(cmt);
+   Chunk *fcn = get_next_function(cmt);
 
-   if (!fcn)
+   if (fcn == nullptr)
    {
       return(false);
    }
    out_txt.append(fcn->str);
 
-   chunk_t *tmp  = chunk_get_next_ncnnl(fcn);
-   chunk_t *word = nullptr;
+   Chunk *tmp  = fcn->GetNextNcNnl();
+   Chunk *word = Chunk::NullChunkPtr;
 
-   while (tmp != nullptr)
+   while (tmp->IsNotNullChunk())
    {
       if (  chunk_is_token(tmp, CT_BRACE_OPEN)
          || chunk_is_token(tmp, CT_SEMICOLON))
@@ -2755,10 +2770,10 @@ static bool kw_fcn_message(chunk_t *cmt, unc_text &out_txt)
 
       if (chunk_is_token(tmp, CT_OC_COLON))
       {
-         if (word != nullptr)
+         if (word->IsNotNullChunk())
          {
             out_txt.append(word->str);
-            word = nullptr;
+            word = Chunk::NullChunkPtr;
          }
          out_txt.append(":");
       }
@@ -2767,15 +2782,15 @@ static bool kw_fcn_message(chunk_t *cmt, unc_text &out_txt)
       {
          word = tmp;
       }
-      tmp = chunk_get_next_ncnnl(tmp);
+      tmp = tmp->GetNextNcNnl();
    }
    return(true);
 } // kw_fcn_message
 
 
-static bool kw_fcn_category(chunk_t *cmt, unc_text &out_txt)
+static bool kw_fcn_category(Chunk *cmt, unc_text &out_txt)
 {
-   chunk_t *category = get_prev_category(cmt);
+   Chunk *category = get_prev_category(cmt);
 
    if (category)
    {
@@ -2787,9 +2802,9 @@ static bool kw_fcn_category(chunk_t *cmt, unc_text &out_txt)
 } // kw_fcn_category
 
 
-static bool kw_fcn_scope(chunk_t *cmt, unc_text &out_txt)
+static bool kw_fcn_scope(Chunk *cmt, unc_text &out_txt)
 {
-   chunk_t *scope = get_next_scope(cmt);
+   Chunk *scope = get_next_scope(cmt);
 
    if (scope)
    {
@@ -2800,9 +2815,9 @@ static bool kw_fcn_scope(chunk_t *cmt, unc_text &out_txt)
 } // kw_fcn_scope
 
 
-static bool kw_fcn_function(chunk_t *cmt, unc_text &out_txt)
+static bool kw_fcn_function(Chunk *cmt, unc_text &out_txt)
 {
-   chunk_t *fcn = get_next_function(cmt);
+   Chunk *fcn = get_next_function(cmt);
 
    if (fcn)
    {
@@ -2823,25 +2838,25 @@ static bool kw_fcn_function(chunk_t *cmt, unc_text &out_txt)
 }
 
 
-static bool kw_fcn_javaparam(chunk_t *cmt, unc_text &out_txt)
+static bool kw_fcn_javaparam(Chunk *cmt, unc_text &out_txt)
 {
-   chunk_t *fcn = get_next_function(cmt);
+   Chunk *fcn = get_next_function(cmt);
 
-   if (!fcn)
+   if (fcn == nullptr)
    {
       return(false);
    }
-   chunk_t *fpo;
-   chunk_t *fpc;
-   bool    has_param = true;
-   bool    need_nl   = false;
+   Chunk *fpo;
+   Chunk *fpc;
+   bool  has_param = true;
+   bool  need_nl   = false;
 
    if (chunk_is_token(fcn, CT_OC_MSG_DECL))
    {
-      chunk_t *tmp = chunk_get_next_ncnnl(fcn);
+      Chunk *tmp = fcn->GetNextNcNnl();
       has_param = false;
 
-      while (tmp != nullptr)
+      while (tmp->IsNotNullChunk())
       {
          if (  chunk_is_token(tmp, CT_BRACE_OPEN)
             || chunk_is_token(tmp, CT_SEMICOLON))
@@ -2867,49 +2882,52 @@ static bool kw_fcn_javaparam(chunk_t *cmt, unc_text &out_txt)
          {
             has_param = true;
          }
-         tmp = chunk_get_next_ncnnl(tmp);
+         tmp = tmp->GetNextNcNnl();
       }
-      fpo = fpc = nullptr;
+      fpo = fpc = Chunk::NullChunkPtr;
    }
    else
    {
-      fpo = chunk_get_next_type(fcn, CT_FPAREN_OPEN, fcn->level);
+      fpo = fcn->GetNextType(CT_FPAREN_OPEN, fcn->level);
 
-      if (fpo == nullptr)
+      if (fpo->IsNullChunk())
       {
          return(true);
       }
-      fpc = chunk_get_next_type(fpo, CT_FPAREN_CLOSE, fcn->level);
+      fpc = fpo->GetNextType(CT_FPAREN_CLOSE, fcn->level);
 
-      if (fpc == nullptr)
+      if (fpc->IsNullChunk())
       {
          return(true);
       }
    }
-   chunk_t *tmp;
+   Chunk *tmp;
 
    // Check for 'foo()' and 'foo(void)'
-   if (chunk_get_next_ncnnl(fpo) == fpc)
-   {
-      has_param = false;
-   }
-   else
+   if (fpo->IsNotNullChunk())
    {
-      tmp = chunk_get_next_ncnnl(fpo);
-
-      if (  (tmp == chunk_get_prev_ncnnl(fpc))
-         && chunk_is_str(tmp, "void", 4))
+      if (fpo->GetNextNcNnl() == fpc)
       {
          has_param = false;
       }
+      else
+      {
+         tmp = fpo->GetNextNcNnl();
+
+         if (  (tmp == fpc->GetPrevNcNnl())
+            && chunk_is_str(tmp, "void"))
+         {
+            has_param = false;
+         }
+      }
    }
 
    if (has_param)
    {
-      chunk_t *prev = nullptr;
+      Chunk *prev = Chunk::NullChunkPtr;
       tmp = fpo;
 
-      while ((tmp = chunk_get_next(tmp)) != nullptr)
+      while ((tmp = tmp->GetNext())->IsNotNullChunk())
       {
          if (  chunk_is_token(tmp, CT_COMMA)
             || tmp == fpc)
@@ -2921,13 +2939,13 @@ static bool kw_fcn_javaparam(chunk_t *cmt, unc_text &out_txt)
             need_nl = true;
             out_txt.append("@param");
 
-            if (prev != nullptr)
+            if (prev->IsNotNullChunk())
             {
                out_txt.append(" ");
                out_txt.append(prev->str);
                out_txt.append(" TODO");
             }
-            prev = nullptr;
+            prev = Chunk::NullChunkPtr;
 
             if (tmp == fpc)
             {
@@ -2942,18 +2960,18 @@ static bool kw_fcn_javaparam(chunk_t *cmt, unc_text &out_txt)
       }
    }
    // Do the return stuff
-   tmp = chunk_get_prev_ncnnl(fcn);
+   tmp = fcn->GetPrevNcNnl();
 
    // For Objective-C we need to go to the previous chunk
-   if (  tmp != nullptr
+   if (  tmp->IsNotNullChunk()
       && get_chunk_parent_type(tmp) == CT_OC_MSG_DECL
       && chunk_is_token(tmp, CT_PAREN_CLOSE))
    {
-      tmp = chunk_get_prev_ncnnl(tmp);
+      tmp = tmp->GetPrevNcNnl();
    }
 
-   if (  tmp != nullptr
-      && !chunk_is_str(tmp, "void", 4))
+   if (  tmp->IsNotNullChunk()
+      && !chunk_is_str(tmp, "void"))
    {
       if (need_nl)
       {
@@ -2965,9 +2983,9 @@ static bool kw_fcn_javaparam(chunk_t *cmt, unc_text &out_txt)
 } // kw_fcn_javaparam
 
 
-static bool kw_fcn_fclass(chunk_t *cmt, unc_text &out_txt)
+static bool kw_fcn_fclass(Chunk *cmt, unc_text &out_txt)
 {
-   chunk_t *fcn = get_next_function(cmt);
+   Chunk *fcn = get_next_function(cmt);
 
    if (!fcn)
    {
@@ -2977,17 +2995,26 @@ static bool kw_fcn_fclass(chunk_t *cmt, unc_text &out_txt)
    if (fcn->flags.test(PCF_IN_CLASS))
    {
       // if inside a class, we need to find to the class name
-      chunk_t *tmp = chunk_get_prev_type(fcn, CT_BRACE_OPEN, fcn->level - 1);
-      tmp = chunk_get_prev_type(tmp, CT_CLASS, tmp->level);
-      tmp = chunk_get_next_ncnnl(tmp);
+      Chunk *tmp = fcn->GetPrevType(CT_BRACE_OPEN, fcn->level - 1);
+      tmp = tmp->GetPrevType(CT_CLASS, tmp->level);
 
-      while (chunk_is_token(chunk_get_next_ncnnl(tmp), CT_DC_MEMBER))
+      if (tmp->IsNullChunk())
       {
-         tmp = chunk_get_next_ncnnl(tmp);
-         tmp = chunk_get_next_ncnnl(tmp);
+         tmp = Chunk::NullChunkPtr;
+      }
+      else
+      {
+         tmp = tmp->GetNextNcNnl();
       }
 
-      if (tmp != nullptr)
+      while (  tmp->IsNotNullChunk()
+            && chunk_is_token(tmp->GetNextNcNnl(), CT_DC_MEMBER))
+      {
+         tmp = tmp->GetNextNcNnl();
+         tmp = tmp->GetNextNcNnl();
+      }
+
+      if (tmp->IsNotNullChunk())
       {
          out_txt.append(tmp->str);
          return(true);
@@ -2996,18 +3023,18 @@ static bool kw_fcn_fclass(chunk_t *cmt, unc_text &out_txt)
    else
    {
       // if outside a class, we expect "CLASS::METHOD(...)"
-      chunk_t *tmp = chunk_get_prev_ncnnl(fcn);
+      Chunk *tmp = fcn->GetPrevNcNnl();
 
       if (chunk_is_token(tmp, CT_OPERATOR))
       {
-         tmp = chunk_get_prev_ncnnl(tmp);
+         tmp = tmp->GetPrevNcNnl();
       }
 
-      if (  tmp != nullptr
+      if (  tmp->IsNotNullChunk()
          && (  chunk_is_token(tmp, CT_DC_MEMBER)
             || chunk_is_token(tmp, CT_MEMBER)))
       {
-         tmp = chunk_get_prev_ncnnl(tmp);
+         tmp = tmp->GetPrevNcNnl();
          out_txt.append(tmp->str);
          return(true);
       }
@@ -3016,7 +3043,7 @@ static bool kw_fcn_fclass(chunk_t *cmt, unc_text &out_txt)
 } // kw_fcn_fclass
 
 
-static bool kw_fcn_year(chunk_t *cmt, unc_text &out_txt)
+static bool kw_fcn_year(Chunk *cmt, unc_text &out_txt)
 {
    UNUSED(cmt);
    time_t now = time(nullptr);
@@ -3029,7 +3056,7 @@ static bool kw_fcn_year(chunk_t *cmt, unc_text &out_txt)
 struct kw_subst_t
 {
    const char *tag;
-   bool       (*func)(chunk_t *cmt, unc_text &out_txt);
+   bool       (*func)(Chunk *cmt, unc_text &out_txt);
 };
 
 
@@ -3047,7 +3074,7 @@ static const kw_subst_t kw_subst_table[] =
 };
 
 
-static void do_kw_subst(chunk_t *pc)
+static void do_kw_subst(Chunk *pc)
 {
    for (const auto &kw : kw_subst_table)
    {
@@ -3088,16 +3115,17 @@ static void do_kw_subst(chunk_t *pc)
 } // do_kw_subst
 
 
-static void output_comment_multi_simple(chunk_t *pc)
+static void output_comment_multi_simple(Chunk *pc)
 {
-   if (pc == nullptr)
+   if (  pc == nullptr
+      && pc->IsNotNullChunk())
    {
       return;
    }
    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->type), pc->orig_col, pc->column);
 
    output_cmt_start(cmt, pc);
 
@@ -3109,7 +3137,7 @@ static void output_comment_multi_simple(chunk_t *pc)
    {
       int diff = 0;
 
-      if (chunk_is_newline(chunk_get_prev(pc)))
+      if (chunk_is_newline(pc->GetPrev()))
       {
          // The comment should be indented correctly
          diff = pc->column - pc->orig_col;
@@ -3129,7 +3157,7 @@ static void output_comment_multi_simple(chunk_t *pc)
    size_t   line_column = pc->column;
    size_t   cmt_idx     = 0;
 
-   while (cmt_idx < pc->len())
+   while (cmt_idx < pc->Len())
    {
       int ch = pc->str[cmt_idx];
       cmt_idx++;
@@ -3188,7 +3216,7 @@ static void output_comment_multi_simple(chunk_t *pc)
       {
          ch = '\n';
 
-         if (  (cmt_idx < pc->len())
+         if (  (cmt_idx < pc->Len())
             && (pc->str[cmt_idx] == '\n'))
          {
             cmt_idx++;
@@ -3200,7 +3228,7 @@ static void output_comment_multi_simple(chunk_t *pc)
 
       // If we just hit an end of line OR we just hit end-of-comment...
       if (  ch == '\n'
-         || cmt_idx == pc->len())
+         || cmt_idx == pc->Len())
       {
          line_count++;
          LOG_FMT(LCONTTEXT, "%s(%d):line_count is %zu\n", __func__, __LINE__, line_count);
@@ -3243,13 +3271,13 @@ static void output_comment_multi_simple(chunk_t *pc)
 } // output_comment_multi_simple
 
 
-static void generate_if_conditional_as_text(unc_text &dst, chunk_t *ifdef)
+static void generate_if_conditional_as_text(unc_text &dst, Chunk *ifdef)
 {
    int column = -1;
 
    dst.clear();
 
-   for (chunk_t *pc = ifdef; pc != nullptr; pc = chunk_get_next(pc))
+   for (Chunk *pc = ifdef; pc != nullptr && pc->IsNotNullChunk(); pc = pc->GetNext())
    {
       if (column == -1)
       {
@@ -3280,7 +3308,7 @@ static void generate_if_conditional_as_text(unc_text &dst, chunk_t *ifdef)
          }
 
          dst.append(pc->str);
-         column += pc->len();
+         column += pc->Len();
       }
    }
 } // generate_if_conditional_as_text
@@ -3288,10 +3316,10 @@ static void generate_if_conditional_as_text(unc_text &dst, chunk_t *ifdef)
 
 void add_long_preprocessor_conditional_block_comment(void)
 {
-   chunk_t *pp_start = nullptr;
-   chunk_t *pp_end   = nullptr;
+   Chunk *pp_start = nullptr;
+   Chunk *pp_end   = nullptr;
 
-   for (chunk_t *pc = chunk_get_head(); pc; pc = chunk_get_next_ncnnl(pc))
+   for (Chunk *pc = Chunk::GetHead(); pc->IsNotNullChunk(); pc = pc->GetNextNcNnl())
    {
       // just track the preproc level:
       if (chunk_is_token(pc, CT_PREPROC))
@@ -3311,13 +3339,13 @@ void add_long_preprocessor_conditional_block_comment(void)
       }
 #endif
 
-      chunk_t *br_close;
-      chunk_t *br_open = pc;
-      size_t  nl_count = 0;
+      Chunk  *br_close;
+      Chunk  *br_open = pc;
+      size_t nl_count = 0;
 
-      chunk_t *tmp = pc;
+      Chunk  *tmp = pc;
 
-      while ((tmp = chunk_get_next(tmp)) != nullptr)
+      while ((tmp = tmp->GetNext())->IsNotNullChunk())
       {
          // just track the preproc level:
          if (chunk_is_token(tmp, CT_PREPROC))
@@ -3340,13 +3368,13 @@ void add_long_preprocessor_conditional_block_comment(void)
                     br_open->orig_line, br_close->orig_line, nl_count);
 
             // Found the matching #else or #endif - make sure a newline is next
-            tmp = chunk_get_next(tmp);
+            tmp = tmp->GetNext();
 
             LOG_FMT(LPPIF, "next item type %d (is %s)\n",
                     (tmp ? tmp->type : -1), (tmp ? chunk_is_newline(tmp) ? "newline"
-                                             : chunk_is_comment(tmp) ? "comment" : "other" : "---"));
+                                             : tmp->IsComment() ? "comment" : "other" : "---"));
 
-            if (  tmp == nullptr
+            if (  tmp->IsNullChunk()
                || chunk_is_token(tmp, CT_NEWLINE)) // chunk_is_newline(tmp))
             {
                size_t nl_min;
@@ -3369,8 +3397,8 @@ void add_long_preprocessor_conditional_block_comment(void)
                   && nl_count > nl_min) // nl_count is 1 too large at all times as #if line was counted too
                {
                   // determine the added comment style
-                  c_token_t style = (language_is_set(LANG_CPP)) ?
-                                    CT_COMMENT_CPP : CT_COMMENT;
+                  E_Token style = (language_is_set(LANG_CPP)) ?
+                                  CT_COMMENT_CPP : CT_COMMENT;
 
                   unc_text str;
                   generate_if_conditional_as_text(str, br_open);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/output.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/output.h
index b3e685d9..b3e685d9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/output.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/output.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/parameter_pack_cleanup.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/parameter_pack_cleanup.cpp
index 4a2afbaa..7b81175a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/parameter_pack_cleanup.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/parameter_pack_cleanup.cpp
@@ -7,55 +7,54 @@
 
 #include "parameter_pack_cleanup.h"
 
-#include "chunk_list.h"
+#include "chunk.h"
 
 
 void parameter_pack_cleanup(void)
 {
    LOG_FUNC_ENTRY();
 
-   chunk_t *pc = chunk_get_head();
+   Chunk *pc = Chunk::GetHead();
 
-   while (pc != nullptr)
+   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_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_t *template_end = chunk_get_next_type(pc, CT_SEMICOLON, pc->level);
+         Chunk *template_end = pc->GetNextType(CT_SEMICOLON, pc->level);
 
          // look for a parameter pack
-         while (pc != nullptr)
+         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_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_t *parameter_pack = pc;
+               Chunk *parameter_pack = pc;
 
                // look for a token with the same text
-               while (pc != nullptr)
+               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 = chunk_get_next(pc);
+                  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 (pc == template_end)
                   {
                      break;
                   }
 
-                  if (strcmp(pc->text(), parameter_pack->text()) == 0)
+                  if (strcmp(pc->Text(), parameter_pack->Text()) == 0)
                   {
                      set_chunk_type(pc, CT_PARAMETER_PACK);
                   }
-                  pc = chunk_get_next(pc);
+                  pc = pc->GetNext();
                }
             }
-            pc = chunk_get_next(pc);
+            pc = pc->GetNext();
 
             if (pc == template_end)
             {
@@ -63,6 +62,6 @@ void parameter_pack_cleanup(void)
             }
          }
       }
-      pc = chunk_get_next(pc);
+      pc = pc->GetNext();
    }
 } // parameter_pack_cleanup
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/parameter_pack_cleanup.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/parameter_pack_cleanup.h
index 97ff6b17..97ff6b17 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/parameter_pack_cleanup.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/parameter_pack_cleanup.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/parens.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/parens.cpp
new file mode 100644
index 00000000..64f65f50
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/parens.cpp
@@ -0,0 +1,349 @@
+/**
+ * @file parens.cpp
+ * Adds or removes parens.
+ *
+ * @author  Ben Gardner
+ * @license GPL v2+
+ */
+
+#include "parens.h"
+
+#include "log_rules.h"
+
+using namespace uncrustify;
+
+
+//! Add an open parenthesis after first and add a close parenthesis before the last
+static void add_parens_between(Chunk *first, Chunk *last);
+
+
+/**
+ * Scans between two parens and adds additional parens if needed.
+ * This function is recursive. If it hits another open paren, it'll call itself
+ * with the new bounds.
+ *
+ * Adds optional parens in an IF or SWITCH conditional statement.
+ *
+ * This basically just checks for a CT_COMPARE that isn't surrounded by parens.
+ * The edges for the compare are the open, close and any CT_BOOL tokens.
+ *
+ * This only handles VERY simple patterns:
+ *   (!a && b)         => (!a && b)          -- no change
+ *   (a && b == 1)     => (a && (b == 1))
+ *   (a == 1 || b > 2) => ((a == 1) || (b > 2))
+ *
+ * FIXME: we really should bail if we transition between a preprocessor and
+ *        a non-preprocessor
+ */
+static void check_bool_parens(Chunk *popen, Chunk *pclose, int nest);
+
+
+void do_parens(void)
+{
+   constexpr static auto LCURRENT = LPARADD;
+
+   LOG_FUNC_ENTRY();
+
+   log_rule_B("mod_full_paren_if_bool");
+
+   if (options::mod_full_paren_if_bool())
+   {
+      Chunk *pc = Chunk::GetHead();
+
+      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))
+         {
+            continue;
+         }
+         // Grab the close sparen
+         Chunk *pclose = pc->GetNextType(CT_SPAREN_CLOSE, pc->level, E_Scope::PREPROC);
+
+         if (pclose->IsNotNullChunk())
+         {
+            check_bool_parens(pc, pclose, 0);
+            pc = pclose;
+         }
+      }
+   }
+} // do_parens
+
+
+void do_parens_assign(void)                         // Issue #3316
+{
+   constexpr static auto LCURRENT = LPARADD;
+
+   LOG_FUNC_ENTRY();
+
+   log_rule_B("mod_full_paren_assign_bool");
+
+   if (options::mod_full_paren_assign_bool())
+   {
+      Chunk *pc = Chunk::GetHead();
+
+      while (  (pc = pc->GetNextNcNnl()) != nullptr
+            && pc->IsNotNullChunk())
+      {
+         if (chunk_is_token(pc, 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);
+            // look before for a open sparen
+            size_t check_level = pc->level;
+            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_pcf_flags(LPARADD, p->flags);
+               if (p->flags.test(PCF_STMT_START))
+               {
+                  break;
+               }
+
+               if (chunk_is_token(p, CT_PAREN_OPEN))
+               {
+                  check_level--;
+               }
+
+               if (chunk_is_token(p, CT_SPAREN_OPEN))
+               {
+                  break;
+               }
+               p = p->GetPrevNc(E_Scope::PREPROC);
+
+               if (p->level < 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));
+
+            if (get_chunk_parent_type(p) == CT_WHILE)
+            {
+               continue;
+            }
+            // Grab the semicolon
+            Chunk *semicolon = pc->GetNextType(CT_SEMICOLON, pc->level, E_Scope::PREPROC);
+
+            if (semicolon->IsNotNullChunk())
+            {
+               check_bool_parens(pc, semicolon, 0);
+               pc = semicolon;
+            }
+         }
+      }
+   }
+} // do_parens_assign
+
+
+void do_parens_return(void)                         // Issue #3316
+{
+   constexpr static auto LCURRENT = LPARADD;
+
+   LOG_FUNC_ENTRY();
+
+   log_rule_B("mod_full_paren_return_bool");
+
+   if (options::mod_full_paren_return_bool())
+   {
+      Chunk *pc = Chunk::GetHead();
+
+      while (  (pc = pc->GetNextNcNnl()) != nullptr
+            && pc->IsNotNullChunk())
+      {
+         if (chunk_is_token(pc, 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);
+            // look before for a open sparen
+            size_t check_level = pc->level;
+            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_pcf_flags(LPARADD, p->flags);
+               if (p->flags.test(PCF_STMT_START))
+               {
+                  break;
+               }
+
+               if (chunk_is_token(p, CT_PAREN_OPEN))
+               {
+                  check_level--;
+               }
+
+               if (chunk_is_token(p, CT_SPAREN_OPEN))
+               {
+                  break;
+               }
+               p = p->GetPrevNc(E_Scope::PREPROC);
+
+               if (p->level < 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));
+
+            if (get_chunk_parent_type(p) == CT_WHILE)
+            {
+               continue;
+            }
+            // Grab the semicolon
+            Chunk *semicolon = pc->GetNextType(CT_SEMICOLON, pc->level, E_Scope::PREPROC);
+
+            if (semicolon->IsNotNullChunk())
+            {
+               check_bool_parens(pc, semicolon, 0);
+               pc = semicolon;
+            }
+         }
+      }
+   }
+} // do_parens_return
+
+
+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);
+
+   // Don't do anything if we have a bad sequence, ie "&& )"
+   Chunk *first_n = first->GetNextNcNnl();
+
+   if (first_n == last)
+   {
+      return;
+   }
+   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;
+
+   chunk_add_before(&pc, 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;
+
+   chunk_add_after(&pc, last_p);
+
+   for (Chunk *tmp = first_n;
+        tmp != last_p;
+        tmp = tmp->GetNextNcNnl())
+   {
+      tmp->level++;
+   }
+
+   last_p->level++;
+} // add_parens_between
+
+
+static void check_bool_parens(Chunk *popen, Chunk *pclose, int nest)
+{
+   LOG_FUNC_ENTRY();
+
+   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",
+           __func__, __LINE__, nest,
+           popen->orig_line, popen->orig_col,
+           pclose->orig_line, pclose->orig_col,
+           popen->level);
+
+   Chunk *pc = popen;
+
+   while (  (pc = pc->GetNextNcNnl()) != nullptr
+         && pc->IsNotNullChunk()
+         && pc != pclose)
+   {
+      if (pc->flags.test(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);
+         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))
+      {
+         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);
+
+         if (hit_compare)
+         {
+            hit_compare = false;
+
+            if (!language_is_set(LANG_CS))
+            {
+               add_parens_between(ref, pc);
+            }
+         }
+         ref = pc;
+      }
+      else if (chunk_is_token(pc, 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);
+         hit_compare = true;
+      }
+      else if (chunk_is_paren_open(pc))
+      {
+         Chunk *next = chunk_skip_to_match(pc);
+
+         if (next != nullptr)
+         {
+            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))
+      {
+         // Skip [], {}, and <>
+         pc = chunk_skip_to_match(pc);
+      }
+   }
+
+   if (  hit_compare
+      && ref != popen
+      && !language_is_set(LANG_CS))
+   {
+      add_parens_between(ref, pclose);
+   }
+} // check_bool_parens
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/parens.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/parens.h
index c0433f92..0c961529 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/parens.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/parens.h
@@ -15,4 +15,10 @@
 void do_parens(void);
 
 
+void do_parens_assign(void);
+
+
+void do_parens_return(void);
+
+
 #endif /* PARENS_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/parent_for_pp.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/parent_for_pp.cpp
index 42a3f840..3ed93ef2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/parent_for_pp.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/parent_for_pp.cpp
@@ -7,18 +7,18 @@
 
 #include "parent_for_pp.h"
 
-#include "chunk_list.h"
+#include "chunk.h"
 
 
 void do_parent_for_pp(void)
 {
    LOG_FUNC_ENTRY();
 
-   vector<chunk_t *> viz;
+   vector<Chunk *> viz;
 
-   chunk_t           *pc = chunk_get_head();
+   Chunk           *pc = Chunk::GetHead()->GetNextNcNnl();
 
-   while ((pc = chunk_get_next_ncnnl(pc)) != nullptr)
+   while (pc->IsNotNullChunk())
    {
       // CT_PP_IF,            // #if, #ifdef, or #ifndef
       // CT_PP_ELSE,          // #else or #elif
@@ -35,8 +35,8 @@ void do_parent_for_pp(void)
          LOG_FMT(LMCB, "%s(%d): ELSE: orig_line %zu, orig_col is %zu\n",
                  __func__, __LINE__, pc->orig_line, pc->orig_col);
          log_pcf_flags(LMCB, pc->flags);
-         size_t  level = pc->pp_level;
-         chunk_t *a    = viz.at(level - 1);
+         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))
@@ -44,10 +44,11 @@ void do_parent_for_pp(void)
          LOG_FMT(LMCB, "%s(%d): ENDIF: orig_line %zu, orig_col is %zu\n",
                  __func__, __LINE__, pc->orig_line, pc->orig_col);
          log_pcf_flags(LMCB, pc->flags);
-         size_t  level = pc->pp_level;
-         chunk_t *a    = viz.at(level);
+         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.74.0/src/parent_for_pp.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/parent_for_pp.h
index cb069680..cb069680 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/parent_for_pp.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/parent_for_pp.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/pcf_flags.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/pcf_flags.cpp
index 0a22bf72..0a22bf72 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/pcf_flags.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/pcf_flags.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/pcf_flags.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/pcf_flags.h
index c0465c14..f0c7bbd5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/pcf_flags.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/pcf_flags.h
@@ -11,8 +11,6 @@
 #include "enum_flags.h"
 #include "logger.h"
 
-#include <cstddef>      // do get the definition of size_t
-
 // and the ever-so-important array size macro
 #ifndef ARRAY_SIZE
 #define ARRAY_SIZE(x)    (sizeof(x) / sizeof((x)[0]))
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/prototypes.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/prototypes.h
index dde8edc3..55fe35b6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/prototypes.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/prototypes.h
@@ -9,7 +9,7 @@
 #ifndef C_PARSE_PROTOTYPES_H_INCLUDED
 #define C_PARSE_PROTOTYPES_H_INCLUDED
 
-#include "chunk_list.h"
+#include "chunk.h"
 #include "log_rules.h"
 #include "uncrustify_types.h"
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/punctuators.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/punctuators.cpp
index 6c9c41f4..6c9c41f4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/punctuators.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/punctuators.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/punctuators.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/punctuators.h
index ed4c3fa5..ed4c3fa5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/punctuators.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/punctuators.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/quick_align_again.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/quick_align_again.cpp
index d63e96e7..45dd3943 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/quick_align_again.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/quick_align_again.cpp
@@ -10,18 +10,18 @@
 #include "quick_align_again.h"
 
 #include "align_stack.h"
-#include "chunk_list.h"
+#include "chunk.h"
 
 
 void quick_align_again(void)
 {
    LOG_FUNC_ENTRY();
 
-   for (chunk_t *pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next(pc))
+   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->elided_text(copy));
+      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))
@@ -33,17 +33,17 @@ void quick_align_again(void)
          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);
+         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_t *tmp = pc->align.next; tmp != nullptr; tmp = tmp->align.next)
+         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, "%s(%d):    => tmp->Text() is '%s', orig_line is %zu\n",
+                    __func__, __LINE__, tmp->Text(), tmp->orig_line);
          }
 
          LOG_FMT(LALAGAIN, "\n");
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/quick_align_again.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/quick_align_again.h
index b31a450a..b31a450a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/quick_align_again.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/quick_align_again.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/remove_duplicate_include.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/remove_duplicate_include.cpp
index 118db91c..90cf0abb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/remove_duplicate_include.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/remove_duplicate_include.cpp
@@ -8,7 +8,7 @@
 
 #include "remove_duplicate_include.h"
 
-#include "chunk_list.h"
+#include "chunk.h"
 #include "uncrustify.h"
 
 using std::vector;
@@ -18,15 +18,15 @@ void remove_duplicate_include(void)
 {
    LOG_FUNC_ENTRY();
 
-   vector<chunk_t *> includes;
+   vector<Chunk *> includes;
 
-   chunk_t           *preproc = nullptr;
-   chunk_t           *pc      = chunk_get_head();
+   Chunk           *preproc = Chunk::NullChunkPtr;
+   Chunk           *pc      = Chunk::GetHead();
 
-   while (pc != nullptr)
+   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(),
+      //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));
 
       if (chunk_is_token(pc, CT_PREPROC))
@@ -35,16 +35,16 @@ void remove_duplicate_include(void)
       }
       else if (chunk_is_token(pc, CT_PP_INCLUDE))
       {
-         chunk_t *next = chunk_get_next(pc);
+         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(),
+         //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));
          if (includes.empty())
          {
             includes.push_back(next);
             // goto next newline
-            pc = chunk_get_next_nl(next);
+            pc = next->GetNextNl();
          }
          else
          {
@@ -55,19 +55,19 @@ void remove_duplicate_include(void)
 
             for (auto itc = includes.begin(); itc != ite; ++itc)
             {
-               chunk_t *current = *itc;
+               Chunk *current = *itc;
 
-               //LOG_FMT(LRMRETURN, "%s(%d): next->text()    is '%s'\n",
-               //        __func__, __LINE__, next->text());
-               //LOG_FMT(LRMRETURN, "%s(%d): current->text() is '%s'\n",
-               //        __func__, __LINE__, current->text());
-               if (std::strcmp(next->text(), current->text()) == 0)
+               //LOG_FMT(LRMRETURN, "%s(%d): next->Text()    is '%s'\n",
+               //        __func__, __LINE__, next->Text());
+               //LOG_FMT(LRMRETURN, "%s(%d): current->Text() is '%s'\n",
+               //        __func__, __LINE__, current->Text());
+               if (std::strcmp(next->Text(), current->Text()) == 0)
                {
                   // erase the statement
-                  chunk_t *temp    = pc;
-                  chunk_t *comment = chunk_get_next(next);
-                  chunk_t *eol     = chunk_get_next_nl(next);
-                  pc = chunk_get_prev(preproc);
+                  Chunk *temp    = pc;
+                  Chunk *comment = next->GetNext();
+                  Chunk *eol     = next->GetNextNl();
+                  pc = preproc->GetPrev();
                   chunk_del(preproc);
                   chunk_del(temp);
                   chunk_del(next);
@@ -82,13 +82,13 @@ void remove_duplicate_include(void)
                else
                {
                   // goto next newline
-                  pc = chunk_get_next_nl(next);
+                  pc = next->GetNextNl();
                   // and still look for duplicate
                }
             } // for (auto itc = includes.begin();
          } // if (includes.empty())
       } // else if (chunk_is_token(pc, CT_PP_INCLUDE))
       // get the next token
-      pc = chunk_get_next(pc);
+      pc = pc->GetNext();
    }
 } // remove_duplicate_include
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/remove_duplicate_include.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/remove_duplicate_include.h
index 97538ba5..a7ade094 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/remove_duplicate_include.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/remove_duplicate_include.h
@@ -9,7 +9,7 @@
 #ifndef REMOVE_DUPLICATE_INCLUDE_H_INCLUDED
 #define REMOVE_DUPLICATE_INCLUDE_H_INCLUDED
 
-#include "chunk_list.h"
+#include "chunk.h"
 
 /**
  * @brief Remove duplicate include
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/remove_extra_returns.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/remove_extra_returns.cpp
index 92cb5b37..6fe4d6f0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/remove_extra_returns.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/remove_extra_returns.cpp
@@ -9,7 +9,7 @@
 
 #include "remove_extra_returns.h"
 
-#include "chunk_list.h"
+#include "chunk.h"
 #include "uncrustify.h"
 
 
@@ -17,12 +17,12 @@ void remove_extra_returns(void)
 {
    LOG_FUNC_ENTRY();
 
-   chunk_t *pc = chunk_get_head();
+   Chunk *pc = Chunk::GetHead();
 
-   while (pc != nullptr)
+   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(),
+      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));
 
       if (  chunk_is_token(pc, CT_RETURN)
@@ -30,12 +30,12 @@ void remove_extra_returns(void)
       {
          // we might be in a class, check it                                     Issue #2705
          // look for a closing brace
-         bool    remove_it      = false;
-         chunk_t *closing_brace = chunk_get_next_type(pc, CT_BRACE_CLOSE, 1);
+         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);
 
-         if (closing_brace != nullptr)
+         if (closing_brace->IsNotNullChunk())
          {
             if (get_chunk_parent_type(closing_brace) == CT_FUNC_CLASS_DEF)
             {
@@ -51,11 +51,11 @@ void remove_extra_returns(void)
          {
             // it is not a class
             // look for a closing brace
-            closing_brace = chunk_get_next_type(pc, CT_BRACE_CLOSE, 0);
+            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);
 
-            if (closing_brace != nullptr)
+            if (closing_brace->IsNotNullChunk())
             {
                if (get_chunk_parent_type(closing_brace) == CT_FUNC_DEF)
                {
@@ -66,9 +66,9 @@ void remove_extra_returns(void)
 
          if (remove_it)
          {
-            chunk_t *semicolon = chunk_get_next_ncnnl(pc);
+            Chunk *semicolon = pc->GetNextNcNnl();
 
-            if (  semicolon != nullptr
+            if (  semicolon->IsNotNullChunk()
                && chunk_is_token(semicolon, CT_SEMICOLON))
             {
                LOG_FMT(LRMRETURN, "%s(%d): Removed 'return;' on orig_line %zu\n",
@@ -79,6 +79,6 @@ void remove_extra_returns(void)
             }
          }
       }
-      pc = chunk_get_next(pc);
+      pc = pc->GetNext();
    }
 } // remove_extra_returns
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/remove_extra_returns.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/remove_extra_returns.h
index df0974c9..df0974c9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/remove_extra_returns.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/remove_extra_returns.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/semicolons.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/semicolons.cpp
index bfb65107..6f78099c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/semicolons.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/semicolons.cpp
@@ -11,7 +11,7 @@
 #include "prototypes.h"
 
 
-static void remove_semicolon(chunk_t *pc);
+static void remove_semicolon(Chunk *pc);
 
 
 /**
@@ -19,10 +19,10 @@ static void remove_semicolon(chunk_t *pc);
  * 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_t *semi, chunk_t *brace_close);
+static void check_unknown_brace_close(Chunk *semi, Chunk *brace_close);
 
 
-static void remove_semicolon(chunk_t *pc)
+static void remove_semicolon(Chunk *pc)
 {
    LOG_FUNC_ENTRY();
    LOG_FMT(LDELSEMI, "%s(%d): Removed semicolon: orig_line is %zu, orig_col is %zu",
@@ -37,20 +37,20 @@ void remove_extra_semicolons(void)
 {
    LOG_FUNC_ENTRY();
 
-   chunk_t *pc = chunk_get_head();
+   Chunk *pc = Chunk::GetHead();
 
-   while (pc != nullptr)
+   while (pc->IsNotNullChunk())
    {
-      chunk_t *next = chunk_get_next_ncnnl(pc);
-      chunk_t *prev;
+      Chunk *next = pc->GetNextNcNnl();
+      Chunk *prev;
 
       if (  chunk_is_token(pc, CT_SEMICOLON)
          && !pc->flags.test(PCF_IN_PREPROC)
-         && (prev = chunk_get_prev_ncnnl(pc)) != nullptr)
+         && (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(),
+                 prev->Text(),
                  get_token_name(prev->type), get_token_name(get_chunk_parent_type(prev)));
 
          if (get_chunk_parent_type(pc) == CT_TYPEDEF)
@@ -104,14 +104,14 @@ void remove_extra_semicolons(void)
 } // remove_extra_semicolons
 
 
-static void check_unknown_brace_close(chunk_t *semi, chunk_t *brace_close)
+static void check_unknown_brace_close(Chunk *semi, Chunk *brace_close)
 {
    LOG_FUNC_ENTRY();
-   chunk_t *pc = chunk_get_prev_type(brace_close, CT_BRACE_OPEN, brace_close->level);
+   Chunk *pc = brace_close->GetPrevType(CT_BRACE_OPEN, brace_close->level);
 
-   pc = chunk_get_prev_ncnnl(pc);
+   pc = pc->GetPrevNcNnl();
 
-   if (  pc != nullptr
+   if (  pc->IsNotNullChunk()
       && pc->type != CT_RETURN
       && pc->type != CT_WORD
       && pc->type != CT_TYPE
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/semicolons.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/semicolons.h
index c0542a76..c0542a76 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/semicolons.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/semicolons.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/sorting.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/sorting.cpp
index bec55749..888569f2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/sorting.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/sorting.cpp
@@ -49,7 +49,7 @@ include_category *include_categories[kIncludeCategoriesCount];
  * @retval  > 0
  * @retval  < 0
  */
-static int compare_chunks(chunk_t *pc1, chunk_t *pc2, bool tcare = false);
+static int compare_chunks(Chunk *pc1, Chunk *pc2, bool tcare = false);
 
 
 /**
@@ -57,7 +57,7 @@ static int compare_chunks(chunk_t *pc1, chunk_t *pc2, bool tcare = false);
  * We need to minimize the number of swaps, as those are expensive.
  * So, we do a min sort.
  */
-static void do_the_sort(chunk_t **chunks, size_t num_chunks);
+static void do_the_sort(Chunk **chunks, size_t num_chunks);
 
 
 #define MARK_CHANGE()    mark_change(__func__, __LINE__)
@@ -108,13 +108,13 @@ static void cleanup_categories()
 }
 
 
-static int get_chunk_priority(chunk_t *pc)
+static int get_chunk_priority(Chunk *pc)
 {
    for (int i = 0; i < kIncludeCategoriesCount; i++)
    {
       if (include_categories[i] != nullptr)
       {
-         if (std::regex_match(pc->text(), include_categories[i]->regex))
+         if (std::regex_match(pc->Text(), include_categories[i]->regex))
          {
             return(i);
          }
@@ -180,32 +180,32 @@ static bool has_dot(const unc_text &chunk_text)
 /**
  * Returns chunk string required for sorting.
  */
-static unc_text chunk_sort_str(chunk_t *pc)
+static unc_text chunk_sort_str(Chunk *pc)
 {
    if (get_chunk_parent_type(pc) == CT_PP_INCLUDE)
    {
-      return(unc_text{ pc->str, 0, pc->len() - 1 });
+      return(unc_text{ pc->str, 0, pc->Len() - 1 });
    }
    return(pc->str);
 }
 
 
 //! Compare two chunks
-static int compare_chunks(chunk_t *pc1, chunk_t *pc2, bool tcare)
+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->orig_line, pc1->orig_col);
    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->orig_line, pc2->orig_col);
 
    if (pc1 == pc2) // same chunk is always identical thus return 0 differences
    {
       return(0);
    }
 
-   while (  pc1 != nullptr
-         && pc2 != nullptr)
+   while (  pc1->IsNotNullChunk()
+         && pc2->IsNotNullChunk())
    {
       auto const &s1_ext = chunk_sort_str(pc1);
       auto const &s2_ext = chunk_sort_str(pc2);
@@ -273,9 +273,9 @@ static int compare_chunks(chunk_t *pc1, chunk_t *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->orig_line, pc1->orig_col);
       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->orig_line, pc2->orig_col);
 
       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",
@@ -286,47 +286,47 @@ static int compare_chunks(chunk_t *pc1, chunk_t *pc2, bool tcare)
          return(ret_val);
       }
 
-      if (pc1->len() != pc2->len())
+      if (pc1->Len() != pc2->Len())
       {
-         return(pc1->len() - pc2->len());
+         return(pc1->Len() - pc2->Len());
       }
       // Same word, same length. Step to the next chunk.
-      pc1 = chunk_get_next(pc1);
+      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->orig_line, pc1->orig_col);
 
       if (chunk_is_token(pc1, CT_MEMBER))
       {
-         pc1 = chunk_get_next(pc1);
+         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->orig_line, pc1->orig_col);
       }
-      pc2 = chunk_get_next(pc2);
+      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->orig_line, pc2->orig_col);
 
       if (chunk_is_token(pc2, CT_MEMBER))
       {
-         pc2 = chunk_get_next(pc2);
+         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->orig_line, pc2->orig_col);
       }
       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->orig_line, pc1->orig_col);
       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->orig_line, pc2->orig_col);
 
       // If we hit a newline or nullptr, we are done
-      if (  pc1 == nullptr
+      if (  pc1->IsNullChunk()
          || chunk_is_newline(pc1)
-         || pc2 == nullptr
+         || pc2->IsNullChunk()
          || chunk_is_newline(pc2))
       {
          break;
       }
    }
 
-   if (  pc1 == nullptr
+   if (  pc1->IsNullChunk()
       || !chunk_is_newline(pc2))
    {
       return(-1);
@@ -345,7 +345,7 @@ static int compare_chunks(chunk_t *pc1, chunk_t *pc2, bool tcare)
  * We need to minimize the number of swaps, as those are expensive.
  * So, we do a min sort.
  */
-static void do_the_sort(chunk_t **chunks, size_t num_chunks)
+static void do_the_sort(Chunk **chunks, size_t num_chunks)
 {
    LOG_FUNC_ENTRY();
 
@@ -354,7 +354,7 @@ static void do_the_sort(chunk_t **chunks, size_t num_chunks)
 
    for (size_t idx = 0; idx < num_chunks; idx++)
    {
-      LOG_FMT(LSORT, " [%s]", chunks[idx]->text());
+      LOG_FMT(LSORT, " [%s]", chunks[idx]->Text());
    }
 
    LOG_FMT(LSORT, "\n");
@@ -385,7 +385,7 @@ static void do_the_sort(chunk_t **chunks, size_t num_chunks)
 
          if (options::mod_sort_incl_import_grouping_enabled())
          {
-            chunk_t *pc = chunks[min_idx];
+            Chunk *pc = chunks[min_idx];
             chunks[min_idx]   = chunks[start_idx];
             chunks[start_idx] = pc;
          }
@@ -402,7 +402,7 @@ static void do_the_sort(chunk_t **chunks, size_t num_chunks)
 /**
  * Remove blank lines between chunks.
  */
-static void remove_blank_lines_between_imports(chunk_t **chunks, size_t num_chunks)
+static void remove_blank_lines_between_imports(Chunk **chunks, size_t num_chunks)
 {
    LOG_FUNC_ENTRY();
 
@@ -413,7 +413,7 @@ static void remove_blank_lines_between_imports(chunk_t **chunks, size_t num_chun
 
    for (size_t idx = 0; idx < (num_chunks - 1); idx++)
    {
-      chunk_t *chunk1 = chunk_get_next_nl(chunks[idx]);
+      Chunk *chunk1 = chunks[idx]->GetNextNl();
       chunk1->nl_count = 1;
       MARK_CHANGE();
    }
@@ -423,18 +423,19 @@ static void remove_blank_lines_between_imports(chunk_t **chunks, size_t num_chun
 /**
  * Delete chunks on line having chunk.
  */
-static void delete_chunks_on_line_having_chunk(chunk_t *chunk)
+static void delete_chunks_on_line_having_chunk(Chunk *chunk)
 {
    LOG_FUNC_ENTRY();
 
-   chunk_t *pc = chunk_first_on_line(chunk);
+   Chunk *pc = chunk_first_on_line(chunk);
 
    while (  pc != nullptr
-         && !chunk_is_comment(pc))
+         && pc->IsNotNullChunk()
+         && !pc->IsComment())
    {
-      chunk_t *next_pc = chunk_get_next(pc);
+      Chunk *next_pc = pc->GetNext();
       LOG_FMT(LCHUNK, "%s(%d): Removed '%s' on orig_line %zu\n",
-              __func__, __LINE__, pc->text(), pc->orig_line);
+              __func__, __LINE__, pc->Text(), pc->orig_line);
 
       if (chunk_is_newline(pc))
       {
@@ -453,7 +454,7 @@ static void delete_chunks_on_line_having_chunk(chunk_t *chunk)
 /**
  * Dedupe import/include directives.
  */
-static void dedupe_imports(chunk_t **chunks, size_t num_chunks)
+static void dedupe_imports(Chunk **chunks, size_t num_chunks)
 {
    LOG_FUNC_ENTRY();
    log_rule_B("mod_sort_case_sensitive");
@@ -480,9 +481,9 @@ static void dedupe_imports(chunk_t **chunks, size_t num_chunks)
 /**
  * Add blank line before the chunk.
  */
-static void blankline_add_before(chunk_t *pc)
+static void blankline_add_before(Chunk *pc)
 {
-   chunk_t *newline = newline_add_before(chunk_first_on_line(pc));
+   Chunk *newline = newline_add_before(chunk_first_on_line(pc));
 
    if (newline->nl_count < 2)
    {
@@ -494,7 +495,7 @@ static void blankline_add_before(chunk_t *pc)
 /**
  * Group imports.
  */
-static void group_imports_by_adding_newlines(chunk_t **chunks, size_t num_chunks)
+static void group_imports_by_adding_newlines(Chunk **chunks, size_t num_chunks)
 {
    LOG_FUNC_ENTRY();
 
@@ -579,19 +580,19 @@ void sort_imports(void)
    const int max_lines_to_check_for_sort_after_include = 128;
    const int max_gap_threshold_between_include_to_sort = 32;
 
-   chunk_t   *chunks[max_number_to_sort];
+   Chunk     *chunks[max_number_to_sort];
    size_t    num_chunks  = 0;
-   chunk_t   *p_last     = nullptr;
-   chunk_t   *p_imp      = nullptr;
-   chunk_t   *p_imp_last = nullptr;
+   Chunk     *p_last     = nullptr;
+   Chunk     *p_imp      = nullptr;
+   Chunk     *p_imp_last = nullptr;
 
    prepare_categories();
 
-   chunk_t *pc = chunk_get_head();
+   Chunk *pc = Chunk::GetHead();
 
    log_rule_B("mod_sort_incl_import_grouping_enabled");
 
-   while (pc != nullptr)
+   while (pc->IsNotNullChunk())
    {
       // Simple optimization to limit the sorting. Any MAX_LINES_TO_CHECK_AFTER_INCLUDE lines after last
       // import is seen are ignore from sorting.
@@ -601,13 +602,14 @@ void sort_imports(void)
       {
          break;
       }
-      chunk_t *next = chunk_get_next(pc);
+      Chunk *next = pc->GetNext();
 
       if (chunk_is_newline(pc))
       {
          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)))
@@ -615,7 +617,7 @@ void sort_imports(void)
             if (num_chunks < max_number_to_sort)
             {
                LOG_FMT(LSORT, "%s(%d): p_imp is %s\n",
-                       __func__, __LINE__, p_imp->text());
+                       __func__, __LINE__, p_imp->Text());
                chunks[num_chunks++] = p_imp;
             }
             else
@@ -636,7 +638,7 @@ void sort_imports(void)
             || (  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)
-            || next == nullptr)
+            || next->IsNullChunk())
          {
             if (num_chunks > 1)
             {
@@ -666,7 +668,7 @@ void sort_imports(void)
 
          if (options::mod_sort_import())
          {
-            p_imp = chunk_get_next(pc);
+            p_imp = pc->GetNext();
          }
       }
       else if (chunk_is_token(pc, CT_USING))
@@ -675,7 +677,7 @@ void sort_imports(void)
 
          if (options::mod_sort_using())
          {
-            p_imp = chunk_get_next(pc);
+            p_imp = pc->GetNext();
          }
       }
       else if (chunk_is_token(pc, CT_PP_INCLUDE))
@@ -684,11 +686,11 @@ void sort_imports(void)
 
          if (options::mod_sort_include())
          {
-            p_imp  = chunk_get_next(pc);
+            p_imp  = pc->GetNext();
             p_last = pc;
          }
       }
-      else if (!chunk_is_comment(pc))
+      else if (!pc->IsComment())
       {
          p_last = pc;
       }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/sorting.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/sorting.h
index 5d767824..5d767824 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/sorting.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/sorting.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/space.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/space.cpp
index fc026a4b..e907d1ef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/space.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/space.cpp
@@ -40,7 +40,7 @@ using namespace uncrustify;
  *
  * @return IARF_IGNORE, IARF_ADD, IARF_REMOVE or IARF_FORCE
  */
-static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp);
+static iarf_e do_space(Chunk *first, Chunk *second, int &min_sp);
 
 /**
  * Ensure to force the space between the \a first and the \a second chunks
@@ -52,13 +52,13 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp);
  *
  * @return IARF_IGNORE, IARF_ADD, IARF_REMOVE or IARF_FORCE
  */
-static iarf_e ensure_force_space(chunk_t *first, chunk_t *second, iarf_e av);
+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
 {
-   c_token_t first;  //! first  chunk
-   c_token_t second; //! second chunk
+   E_Token first;  //! first  chunk
+   E_Token second; //! second chunk
 };
 
 
@@ -120,14 +120,19 @@ const no_space_table_t no_space_table[] =
 };
 
 
-bool token_is_within_trailing_return(chunk_t *pc)
+bool token_is_within_trailing_return(Chunk *pc)
 {
    // look back for '->' type is TRAILING_RET
    // until CT_FPAREN_CLOSE
    //   or  CT_FPAREN_OPEN is found
-   chunk_t *prev = pc;
+   Chunk *prev = pc;
 
-   while (prev != nullptr)
+   if (prev == nullptr)
+   {
+      prev = Chunk::NullChunkPtr;
+   }
+
+   while (prev->IsNotNullChunk())
    {
       if (chunk_is_token(prev, CT_TRAILING_RET))
       {
@@ -140,7 +145,7 @@ bool token_is_within_trailing_return(chunk_t *pc)
       }
       else
       {
-         prev = chunk_get_prev(prev);
+         prev = prev->GetPrev();
       }
    }
    return(false);
@@ -151,12 +156,12 @@ bool token_is_within_trailing_return(chunk_t *pc)
  * this function is called for every chunk in the input file.
  * Thus it is important to keep this function efficient
  */
-static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
+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->orig_line, first->orig_col, first->Text(), get_token_name(first->type));
 
    min_sp = 1;
 
@@ -322,9 +327,6 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
          log_rule("sp_cond_question_after");
          return(options::sp_cond_question_after());
       }
-      // Issue #2596
-      // Add or remove space around the '?' in 'b ? t : f'.
-      // replace "if (chunk_is_token(first, CT_PAREN_CLOSE) && chunk_is_token(second, CT_QUESTION))"
       log_rule("sp_cond_question");
       return(options::sp_cond_question());
    }
@@ -514,7 +516,7 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
             return(options::sp_after_semi_for());
          }
       }
-      else if (  !chunk_is_comment(second)
+      else if (  !second->IsComment()
               && second->type != CT_BRACE_CLOSE) // issue #197
       {
          // Add or remove space after ';', except when followed by a comment.
@@ -557,7 +559,7 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
          return(options::sp_return_brace());
       }
       // Everything else requires a space
-      // The value REMOVE will be overriden with FORCE
+      // The value REMOVE will be overridden with FORCE
       log_rule("sp_return");
 
       if (options::sp_return() == IARF_REMOVE)
@@ -661,7 +663,7 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
             || chunk_is_token(first, CT_TYPE)
             || chunk_is_token(first, CT_PAREN_CLOSE)
             || CharTable::IsKw1(first->str[0]))
-         && (strcmp(first->text(), "void") != 0)) // Issue 1249
+         && (strcmp(first->Text(), "void") != 0)) // Issue 1249
       {
          // Add or remove space before the '::' operator.
          log_rule("sp_before_dc");
@@ -745,12 +747,12 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
    if (chunk_is_token(second, CT_ELLIPSIS))
    {
       // type followed by a ellipsis
-      chunk_t *tmp = first;
+      Chunk *tmp = first;
 
       if (  chunk_is_token(tmp, CT_PTR_TYPE)
          || chunk_is_token(tmp, CT_BYREF))
       {
-         tmp = chunk_get_prev_ncnnl(tmp);
+         tmp = tmp->GetPrevNcNnl();
       }
 
       if (  chunk_is_token(tmp, CT_TYPE)
@@ -1020,12 +1022,20 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
       return(options::sp_cpp_lambda_fparen());
    }
 
-   if (  chunk_is_token(first, CT_ENUM)
-      && chunk_is_token(second, CT_FPAREN_OPEN))
+   if (chunk_is_token(first, CT_ENUM))
    {
-      // Add or remove space in 'NS_ENUM ('.
-      log_rule("sp_enum_paren");
-      return(options::sp_enum_paren());
+      if (chunk_is_token(second, 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))
+      {
+         // Add or remove space in 'NS_ENUM ('.
+         log_rule("sp_enum_paren");
+         return(options::sp_enum_paren());
+      }
    }
 
    if (chunk_is_token(second, CT_ASSIGN))
@@ -1343,7 +1353,7 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
       if (  chunk_is_token(second, CT_FPAREN_OPEN)
          || chunk_is_token(second, CT_PAREN_OPEN))
       {
-         chunk_t *next = chunk_get_next_ncnnl(second);
+         Chunk *next = second->GetNextNcNnl();
 
          if (chunk_is_token(next, CT_FPAREN_CLOSE))
          {
@@ -1395,20 +1405,25 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
 
    if (chunk_is_token(first, CT_BYREF))                             // see the tests cpp:34509-34512
    {
-      if (  get_chunk_parent_type(first) == CT_FUNC_DEF             // Issue #3197, #3210
-         || get_chunk_parent_type(first) == CT_FUNC_PROTO)
+      if (chunk_is_token(second, 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)
       {
          // 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());
       }
-
-      if (  (  CharTable::IsKw1(second->str[0])
-            && (  options::sp_after_byref() != IARF_IGNORE
-               || (  !chunk_is_token(second, CT_FUNC_PROTO)
-                  && !chunk_is_token(second, CT_FUNC_DEF))))
-         || chunk_is_token(second, CT_PAREN_OPEN))
+      else if (  CharTable::IsKw1(second->str[0])
+              && (  options::sp_after_byref() != IARF_IGNORE
+                 || (  !chunk_is_token(second, CT_FUNC_PROTO)
+                    && !chunk_is_token(second, CT_FUNC_DEF))))
       {
          // Add or remove space after reference sign '&', if followed by a word.
          log_rule("sp_after_byref");                               // byref 1
@@ -1427,9 +1442,9 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
          log_rule("sp_before_byref_func");                         // byref 4
          return(options::sp_before_byref_func());
       }
-      chunk_t *next = chunk_get_next(second);
+      Chunk *next = second->GetNext();
 
-      if (  next != nullptr
+      if (  next->IsNotNullChunk()
          && (  chunk_is_token(next, CT_COMMA)
             || chunk_is_token(next, CT_FPAREN_CLOSE)
             || chunk_is_token(next, CT_SEMICOLON)))
@@ -1487,7 +1502,7 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
          }
       }
 
-      if (  !chunk_is_comment(second)
+      if (  !second->IsComment()
          && (options::sp_after_sparen() != IARF_IGNORE))
       {
          // Add or remove space after ')' of control statements.
@@ -1503,7 +1518,7 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
       if (  (options::sp_after_operator_sym_empty() != IARF_IGNORE)
          && chunk_is_token(second, CT_FPAREN_OPEN))
       {
-         chunk_t *next = chunk_get_next_ncnnl(second);
+         Chunk *next = second->GetNextNcNnl();
 
          if (chunk_is_token(next, CT_FPAREN_CLOSE))
          {
@@ -1524,7 +1539,7 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
    if (  language_is_set(LANG_VALA)
       && chunk_is_token(first, CT_FUNC_CALL))
    {
-      if (  chunk_is_str(first, "_", 1)
+      if (  chunk_is_str(first, "_")
          && chunk_is_token(second, CT_FPAREN_OPEN)
          && (options::sp_vala_after_translation() != IARF_IGNORE))
       {
@@ -1562,7 +1577,7 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
       if (  (options::sp_func_call_paren_empty() != IARF_IGNORE)
          && chunk_is_token(second, CT_FPAREN_OPEN))
       {
-         chunk_t *next = chunk_get_next_ncnnl(second);
+         Chunk *next = second->GetNextNcNnl();
 
          if (chunk_is_token(next, CT_FPAREN_CLOSE))
          {
@@ -1600,7 +1615,7 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
       if (  (options::sp_func_def_paren_empty() != IARF_IGNORE)
          && chunk_is_token(second, CT_FPAREN_OPEN))
       {
-         chunk_t *next = chunk_get_next_ncnnl(second);
+         Chunk *next = second->GetNextNcNnl();
 
          if (chunk_is_token(next, CT_FPAREN_CLOSE))
          {
@@ -1660,8 +1675,8 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
    }
 
    // ")(" vs. ") ("
-   if (  (  chunk_is_str(first, ")", 1)
-         && chunk_is_str(second, "(", 1))
+   if (  (  chunk_is_str(first, ")")
+         && chunk_is_str(second, "("))
       || (  chunk_is_paren_close(first)
          && chunk_is_paren_open(second)))
    {
@@ -1677,7 +1692,7 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
       if (  (options::sp_func_proto_paren_empty() != IARF_IGNORE)
          && chunk_is_token(second, CT_FPAREN_OPEN))
       {
-         chunk_t *next = chunk_get_next_ncnnl(second);
+         Chunk *next = second->GetNextNcNnl();
 
          if (chunk_is_token(next, CT_FPAREN_CLOSE))
          {
@@ -1707,7 +1722,7 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
       if (  (options::sp_func_class_paren_empty() != IARF_IGNORE)
          && chunk_is_token(second, CT_FPAREN_OPEN))
       {
-         chunk_t *next = chunk_get_next_ncnnl(second);
+         Chunk *next = second->GetNextNcNnl();
 
          if (chunk_is_token(next, CT_FPAREN_CLOSE))
          {
@@ -1790,7 +1805,7 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
          || get_chunk_parent_type(second) == CT_UNION)
       {
          // Fix for issue #1240  adding space in struct initializers
-         chunk_t *tmp = chunk_get_prev_ncnnl(chunk_skip_to_match_rev(second));
+         Chunk *tmp = chunk_skip_to_match_rev(second)->GetPrevNcNnl();
 
          if (chunk_is_token(tmp, CT_ASSIGN))
          {
@@ -1937,8 +1952,8 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
       // check for initializers and add space or ignore based on the option.
       if (get_chunk_parent_type(first) == CT_FUNC_CALL)
       {
-         chunk_t *tmp = chunk_get_prev_type(first, get_chunk_parent_type(first), first->level);
-         tmp = chunk_get_prev_ncnnl(tmp);
+         Chunk *tmp = first->GetPrevType(get_chunk_parent_type(first), first->level);
+         tmp = tmp->GetPrevNcNnl();
 
          if (chunk_is_token(tmp, CT_NEW))
          {
@@ -2064,10 +2079,10 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
 
    /* "((" vs. "( (" or "))" vs. ") )" */
    // Issue #1342
-   if (  (  chunk_is_str(first, "(", 1)
-         && chunk_is_str(second, "(", 1))
-      || (  chunk_is_str(first, ")", 1)
-         && chunk_is_str(second, ")", 1)))
+   if (  (  chunk_is_str(first, "(")
+         && chunk_is_str(second, "("))
+      || (  chunk_is_str(first, ")")
+         && chunk_is_str(second, ")")))
    {
       if (get_chunk_parent_type(second) == CT_FUNC_CALL_USER)
       {
@@ -2372,13 +2387,9 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
 
    if (chunk_is_token(first, CT_CLASS_COLON))
    {
-      //chunk_t *a = chunk_get_prev_type(first, CT_OC_INTF, first->level, scope_e::ALL);
-      //chunk_t *b = chunk_get_prev_type(first, CT_OC_IMPL, first->level, scope_e::ALL);
-      //bool B_a = a != nullptr;
-      //bool B_b = b != nullptr;
       if (  get_chunk_parent_type(first) == CT_OC_CLASS
-         && (  !chunk_get_prev_type(first, CT_OC_INTF, first->level, scope_e::ALL)
-            && !chunk_get_prev_type(first, CT_OC_IMPL, first->level, scope_e::ALL)))
+         && (  first->GetPrevType(CT_OC_INTF, first->level, E_Scope::ALL)->IsNullChunk()
+            && first->GetPrevType(CT_OC_IMPL, first->level, E_Scope::ALL)->IsNullChunk()))
       {
          if (options::sp_after_oc_colon() != IARF_IGNORE)
          {
@@ -2402,11 +2413,11 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
    {
       if (  language_is_set(LANG_OC)
          && get_chunk_parent_type(second) == CT_OC_CLASS
-         && (  !chunk_get_prev_type(second, CT_OC_INTF, second->level, scope_e::ALL)
-            && !chunk_get_prev_type(second, CT_OC_IMPL, second->level, scope_e::ALL)))
+         && (  second->GetPrevType(CT_OC_INTF, second->level, E_Scope::ALL)->IsNullChunk()
+            && second->GetPrevType(CT_OC_IMPL, second->level, E_Scope::ALL)->IsNullChunk()))
       {
          if (  get_chunk_parent_type(second) == CT_OC_CLASS
-            && !chunk_get_prev_type(second, CT_OC_INTF, second->level, scope_e::ALL))
+            && second->GetPrevType(CT_OC_INTF, second->level, E_Scope::ALL)->IsNullChunk())
          {
             if (options::sp_before_oc_colon() != IARF_IGNORE)
             {
@@ -2555,6 +2566,13 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
          log_rule("sp_ptr_star_func_var");
          return(options::sp_ptr_star_func_var());
       }
+      else if (chunk_is_token(second, 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)
@@ -2576,7 +2594,7 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
       }
       else if (CharTable::IsKw1(second->str[0]))
       {
-         chunk_t *prev = chunk_get_prev(first);
+         Chunk *prev = first->GetPrev();
 
          if (chunk_is_token(prev, CT_IN))
          {
@@ -2628,24 +2646,16 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
          return(options::sp_before_ptr_star_trailing());
       }
 
-      if (  language_is_set(LANG_CS)
-         && chunk_is_nullable(second))
-      {
-         min_sp = 0;
-         log_rule("REMOVE");
-         return(IARF_REMOVE);
-      }
-
       // Add or remove space before a pointer star '*', if followed by a function
       // prototype or function definition.
       if (options::sp_before_ptr_star_func() != IARF_IGNORE)
       {
          // Find the next non-'*' chunk
-         chunk_t *next = second;
+         Chunk *next = second;
 
          do
          {
-            next = chunk_get_next(next);
+            next = next->GetNext();
          } while (chunk_is_token(next, CT_PTR_TYPE));
 
          if (  chunk_is_token(next, CT_FUNC_DEF)
@@ -2660,14 +2670,14 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
       // variable name. If set to 'ignore', sp_before_ptr_star is used instead.
       if (options::sp_before_unnamed_ptr_star() != IARF_IGNORE)
       {
-         chunk_t *next = chunk_get_next_nc(second);
+         Chunk *next = second->GetNextNc();
 
          while (chunk_is_token(next, CT_PTR_TYPE))
          {
-            next = chunk_get_next_nc(next);
+            next = next->GetNextNc();
          }
 
-         if (  next != nullptr
+         if (  next->IsNotNullChunk()
             && next->type != CT_WORD)
          {
             log_rule("sp_before_unnamed_ptr_star");                   // ptr_star 8
@@ -2765,7 +2775,7 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
          || get_chunk_parent_type(first) == CT_UNION)
       {
          // Fix for issue #1240  adding space in struct initializers
-         chunk_t *tmp = chunk_get_prev_ncnnl(first);
+         Chunk *tmp = first->GetPrevNcNnl();
 
          if (chunk_is_token(tmp, CT_ASSIGN))
          {
@@ -2818,7 +2828,7 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
          }
       }
 
-      if (!chunk_is_comment(second))
+      if (!second->IsComment())
       {
          // Add or remove space inside '{' and '}'.
          log_rule("sp_inside_braces");
@@ -2870,16 +2880,6 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
       return(options::sp_after_type());
    }
 
-   if (  language_is_set(LANG_VALA)
-      && chunk_is_token(second, CT_QUESTION))
-   {
-      // TODO: provide some test data to check this block
-      // Issue #2090
-      // (D) Add or remove space between a type and '?'.
-      log_rule("sp_type_question");
-      return(options::sp_type_question());
-   }
-
    // see if the D template expression is used as a type
    if (  language_is_set(LANG_D)
       && chunk_is_token(first, CT_PAREN_CLOSE)
@@ -2893,8 +2893,13 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
 
       if (chunk_is_token(second, CT_WORD))
       {
-         chunk_t *open_paren = chunk_skip_to_match_rev(first);
-         chunk_t *type       = chunk_get_prev(chunk_get_prev(open_paren));
+         Chunk *open_paren = chunk_skip_to_match_rev(first);
+
+         if (open_paren == nullptr)
+         {
+            open_paren = Chunk::NullChunkPtr;
+         }
+         Chunk *type = open_paren->GetPrev()->GetPrev();
 
          if (chunk_is_token(type, CT_TYPE))
          {
@@ -2904,6 +2909,13 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
       }
    }
 
+   if (  chunk_is_token(first, CT_TYPE)                   // Issue #3457
+      && chunk_is_token(second, 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)))
@@ -2939,6 +2951,12 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
 
    if (chunk_is_token(first, CT_NOT))
    {
+      if (  chunk_is_token(second, CT_NOT)
+         && (options::sp_not_not() != IARF_IGNORE))
+      {
+         log_rule("sp_not_not");
+         return(options::sp_not_not());
+      }
       // Add or remove space after the '!' (not) unary operator.
       log_rule("sp_not");
       return(options::sp_not());
@@ -3249,7 +3267,7 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
    {
       // Add or remove space after the variadic '...' when preceded by a
       // non-punctuator.
-      // The value REMOVE will be overriden with FORCE
+      // The value REMOVE will be overridden with FORCE
       if (options::sp_after_ellipsis() == IARF_REMOVE)
       {
          log_rule("sp_after_ellipsis/FORCE");
@@ -3267,7 +3285,7 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
    {
       // Add or remove space before the variadic '...' when preceded by a
       // non-punctuator.
-      // The value REMOVE will be overriden with FORCE
+      // The value REMOVE will be overridden with FORCE
       if (options::sp_before_ellipsis() == IARF_REMOVE)
       {
          log_rule("sp_before_ellipsis/FORCE");
@@ -3284,10 +3302,10 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
    // 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, 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, "   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",
@@ -3299,19 +3317,19 @@ static iarf_e do_space(chunk_t *first, chunk_t *second, int &min_sp)
 } // do_space
 
 
-static iarf_e ensure_force_space(chunk_t *first, chunk_t *second, iarf_e av)
+static iarf_e ensure_force_space(Chunk *first, Chunk *second, iarf_e av)
 {
    if (first->flags.test(PCF_FORCE_SPACE))
    {
       LOG_FMT(LSPACE, "%s(%d): <force between '%s' and '%s'>",
-              __func__, __LINE__, first->text(), second->text());
+              __func__, __LINE__, first->Text(), second->Text());
       return(av | IARF_ADD);
    }
    return(av);
 }
 
 
-static iarf_e do_space_ensured(chunk_t *first, chunk_t *second, int &min_sp)
+static iarf_e do_space_ensured(Chunk *first, Chunk *second, int &min_sp)
 {
    iarf_e aa = ensure_force_space(first, second, do_space(first, second, min_sp));
 
@@ -3323,17 +3341,12 @@ void space_text(void)
 {
    LOG_FUNC_ENTRY();
 
-   chunk_t *pc = chunk_get_head();
-
-   if (pc == nullptr)
-   {
-      return;
-   }
-   chunk_t *next;
-   size_t  prev_column;
-   size_t  column = pc->column;
+   Chunk  *pc = Chunk::GetHead();
+   Chunk  *next;
+   size_t prev_column;
+   size_t column = pc->column;
 
-   while (pc != nullptr)
+   while (pc->IsNotNullChunk())
    {
       if (chunk_is_token(pc, CT_NEWLINE))
       {
@@ -3344,12 +3357,12 @@ void space_text(void)
       {
          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->elided_text(copy), get_token_name(pc->type));
+                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->ElidedText(copy), get_token_name(pc->type));
       }
 
       if (  (options::use_options_overriding_for_qt_macros())
-         && (  (strcmp(pc->text(), "SIGNAL") == 0)
-            || (strcmp(pc->text(), "SLOT") == 0)))
+         && (  (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));
@@ -3363,9 +3376,9 @@ void space_text(void)
       // If true, vbrace tokens are dropped to the previous token and skipped.
       if (options::sp_skip_vbrace_tokens())
       {
-         next = chunk_get_next(pc);
+         next = pc->GetNext();
 
-         while (  chunk_is_blank(next)
+         while (  next->IsEmptyText()
                && !chunk_is_newline(next)
                && (  chunk_is_token(next, CT_VBRACE_OPEN)
                   || chunk_is_token(next, CT_VBRACE_CLOSE)))
@@ -3374,15 +3387,15 @@ void space_text(void)
                     __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         = chunk_get_next(next);
+            next         = next->GetNext();
          }
       }
       else
       {
-         next = pc->next;
+         next = pc->GetNext();
       }
 
-      if (!next)
+      if (next->IsNullChunk())
       {
          break;
       }
@@ -3392,9 +3405,9 @@ void space_text(void)
       if (  QT_SIGNAL_SLOT_found
          && options::sp_balance_nested_parens())
       {
-         chunk_t *nn = next->next;                                          // Issue #2734
+         Chunk *nn = next->GetNext();                                    // Issue #2734
 
-         if (  nn != nullptr
+         if (  nn->IsNotNullChunk()
             && chunk_is_token(nn, CT_SPACE))
          {
             chunk_del(nn); // remove the space
@@ -3416,7 +3429,7 @@ void space_text(void)
          // Set to the minimum allowed column
          if (pc->nl_count == 0)
          {
-            column += pc->len();
+            column += pc->Len();
          }
          else
          {
@@ -3433,55 +3446,54 @@ void space_text(void)
           */
          chunk_flags_clr(pc, PCF_FORCE_SPACE);
 
-         if (  (pc->len() > 0)
-            && !chunk_is_str(pc, "[]", 2)
-            && !chunk_is_str(pc, "{{", 2)
-            && !chunk_is_str(pc, "}}", 2)
-            && !chunk_is_str(pc, "()", 2)
+         if (  (pc->Len() > 0)
+            && !chunk_is_str(pc, "[]")
+            && !chunk_is_str(pc, "{{")
+            && !chunk_is_str(pc, "}}")
+            && !chunk_is_str(pc, "()")
             && !pc->str.startswith("@\""))
          {
             // Find the next non-empty chunk on this line
-            chunk_t *tmp = next;
+            Chunk *tmp = next;
 
-            // TODO: better use chunk_search here
-            while (  tmp != nullptr
-                  && (tmp->len() == 0)
+            while (  tmp->IsNotNullChunk()
+                  && (tmp->Len() == 0)
                   && !chunk_is_newline(tmp))
             {
-               tmp = chunk_get_next(tmp);
+               tmp = tmp->GetNext();
             }
 
-            if (  tmp != nullptr
-               && tmp->len() > 0)
+            if (  tmp->IsNotNullChunk()
+               && tmp->Len() > 0)
             {
-               bool kw1 = CharTable::IsKw2(pc->str[pc->len() - 1]);
+               bool kw1 = CharTable::IsKw2(pc->str[pc->Len() - 1]);
                bool kw2 = CharTable::IsKw1(next->str[0]);
 
                if (  kw1
                   && kw2)
                {
                   // back-to-back words need a space
-                  LOG_FMT(LSPACE, "%s(%d): back-to-back words need a space: pc->text() '%s', next->text() '%s'\n",
-                          __func__, __LINE__, pc->text(), next->text());
+                  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);
                }
                // TODO:  what is the meaning of 4
                else if (  !kw1
                        && !kw2
-                       && (pc->len() < 4)
-                       && (next->len() < 4))
+                       && (pc->Len() < 4)
+                       && (next->Len() < 4))
                {
                   // We aren't dealing with keywords. concat and try punctuators
                   char buf[9];
-                  memcpy(buf, pc->text(), pc->len());
-                  memcpy(buf + pc->len(), next->text(), next->len());
-                  buf[pc->len() + next->len()] = 0;
+                  memcpy(buf, pc->Text(), pc->Len());
+                  memcpy(buf + pc->Len(), next->Text(), next->Len());
+                  buf[pc->Len() + next->Len()] = 0;
 
                   const chunk_tag_t *ct;
                   ct = find_punctuator(buf, cpd.lang_flags);
 
                   if (  ct != nullptr
-                     && (strlen(ct->tag) != pc->len()))
+                     && (strlen(ct->tag) != pc->Len()))
                   {
                      // punctuator parsed to a different size..
 
@@ -3505,8 +3517,8 @@ void space_text(void)
                      }
                      else
                      {
-                        LOG_FMT(LSPACE, "%s(%d): : pc->text() is %s, next->text() is %s\n",
-                                __func__, __LINE__, pc->text(), next->text());
+                        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);
                      }
                   }
@@ -3514,8 +3526,8 @@ void space_text(void)
             }
          }
          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->orig_line, pc->orig_col, pc->Text(), get_token_name(pc->type));
          iarf_e av = do_space_ensured(pc, next, min_sp);
          min_sp = max(1, min_sp);
 
@@ -3572,8 +3584,8 @@ void space_text(void)
             break;
          } // switch
 
-         if (  chunk_is_comment(next)
-            && chunk_is_newline(chunk_get_next(next))
+         if (  next->IsComment()
+            && chunk_is_newline(next->GetNext())
             && column < next->orig_col)
          {
             /*
@@ -3592,7 +3604,7 @@ void space_text(void)
                   // 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",
-                          __func__, __LINE__, pc->text(),
+                          __func__, __LINE__, pc->Text(),
                           pc->orig_col, next->orig_col, pc->orig_col_end);
                   column = pc->column + (next->orig_col - pc->orig_col_end);
                }
@@ -3602,7 +3614,7 @@ 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);
+                  size_t col_min = pc->column + pc->Len() + ((next->orig_prev_sp > 0) ? 1 : 0);
                   column = next->orig_col;
 
                   if (column < col_min)
@@ -3641,42 +3653,42 @@ void space_text_balance_nested_parens(void)
 {
    LOG_FUNC_ENTRY();
 
-   chunk_t *first = chunk_get_head();
+   Chunk *first = Chunk::GetHead();
 
-   while (first != nullptr)
+   while (first->IsNotNullChunk())
    {
-      chunk_t *next = chunk_get_next(first);
+      Chunk *next = first->GetNext();
 
-      if (next == nullptr)
+      if (next->IsNullChunk())
       {
          break;
       }
 
       // if there are two successive opening parenthesis
-      if (  chunk_is_str(first, "(", 1)
-         && chunk_is_str(next, "(", 1))
+      if (  chunk_is_str(first, "(")
+         && chunk_is_str(next, "("))
       {
          // insert a space between them
          space_add_after(first, 1);
 
          // test after the closing parens   Issue #1703
-         chunk_t *closing = chunk_get_next_type(first, (c_token_t)(first->type + 1), first->level);
+         Chunk *closing = first->GetNextType((E_Token)(first->type + 1), first->level);
 
          if (closing->orig_col == closing->prev->orig_col_end)
          {
             space_add_after(closing->prev, 1);
          }
       }
-      else if (  chunk_is_str(first, ")", 1)
-              && chunk_is_str(next, ")", 1))
+      else if (  chunk_is_str(first, ")")
+              && chunk_is_str(next, ")"))
       {
          // insert a space between the two closing parens
          space_add_after(first, 1);
 
          // test after the opening parens   Issue #1703
-         chunk_t *opening = chunk_get_prev_type(next, (c_token_t)(next->type - 1), next->level);
+         Chunk *opening = next->GetPrevType((E_Token)(next->type - 1), next->level);
 
-         if (opening->orig_col_end == opening->next->orig_col)
+         if (opening->orig_col_end == opening->GetNext()->orig_col)
          {
             space_add_after(opening, 1);
          }
@@ -3686,7 +3698,7 @@ void space_text_balance_nested_parens(void)
 } // space_text_balance_nested_parens
 
 
-size_t space_needed(chunk_t *first, chunk_t *second)
+size_t space_needed(Chunk *first, Chunk *second)
 {
    LOG_FUNC_ENTRY();
    LOG_FMT(LSPACE, "%s(%d)\n", __func__, __LINE__);
@@ -3704,23 +3716,23 @@ size_t space_needed(chunk_t *first, chunk_t *second)
 
    case IARF_IGNORE:
    default:
-      return(second->orig_col > (first->orig_col + first->len()));
+      return(second->orig_col > (first->orig_col + first->Len()));
    }
 }
 
 
-size_t space_col_align(chunk_t *first, chunk_t *second)
+size_t space_col_align(Chunk *first, Chunk *second)
 {
    LOG_FUNC_ENTRY();
 
-   LOG_FMT(LSPACE, "%s(%d): first->orig_line is %zu, orig_col is %zu, [%s/%s], text() '%s' <==>\n",
+   LOG_FMT(LSPACE, "%s(%d): 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)),
-           first->text());
-   LOG_FMT(LSPACE, "%s(%d): second->orig_line is %zu, orig_col is %zu [%s/%s], text() '%s',",
+           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)),
-           second->text());
+           second->Text());
    log_func_stack_inline(LSPACE);
 
    int    min_sp;
@@ -3736,8 +3748,8 @@ size_t space_col_align(chunk_t *first, chunk_t *second)
    }
    else
    {
-      LOG_FMT(LSPACE, "%s(%d):    len is %zu\n", __func__, __LINE__, first->len());
-      coldiff = first->len();
+      LOG_FMT(LSPACE, "%s(%d):    Len is %zu\n", __func__, __LINE__, first->Len());
+      coldiff = first->Len();
    }
    LOG_FMT(LSPACE, "%s(%d):    => coldiff is %zu\n", __func__, __LINE__, coldiff);
 
@@ -3759,14 +3771,14 @@ size_t space_col_align(chunk_t *first, chunk_t *second)
    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->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->Len()      is %zu\n", __func__, __LINE__, first->Len());
 
       if (  first->orig_line == second->orig_line
-         && second->orig_col > (first->orig_col + first->len()))
+         && second->orig_col > (first->orig_col + first->Len()))
       {
          coldiff++;
       }
@@ -3781,14 +3793,14 @@ size_t space_col_align(chunk_t *first, chunk_t *second)
 } // space_col_align
 
 
-void space_add_after(chunk_t *pc, size_t count)
+void space_add_after(Chunk *pc, size_t count)
 {
    LOG_FUNC_ENTRY();
 
-   chunk_t *next = chunk_get_next(pc);
+   Chunk *next = pc->GetNext();
 
    // don't add at the end of the file or before a newline
-   if (  next == nullptr
+   if (  next->IsNullChunk()
       || chunk_is_newline(next))
    {
       return;
@@ -3803,16 +3815,16 @@ void space_add_after(chunk_t *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->len() < count)
+      if (next->Len() < count)
       {
-         while (next->len() < count)
+         while (next->Len() < count)
          {
             next->str.append(' ');
          }
       }
       return;
    }
-   chunk_t sp;
+   Chunk sp;
 
    set_chunk_type(&sp, CT_SPACE);
    sp.flags = pc->flags & PCF_COPY_FLAGS;
@@ -3821,7 +3833,7 @@ void space_add_after(chunk_t *pc, size_t count)
    sp.level       = pc->level;
    sp.brace_level = pc->brace_level;
    sp.pp_level    = pc->pp_level;
-   sp.column      = pc->column + pc->len();
+   sp.column      = pc->column + pc->Len();
    sp.orig_line   = pc->orig_line;
    sp.orig_col    = pc->orig_col;
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/space.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/space.h
index e856f135..3989e126 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/space.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/space.h
@@ -23,7 +23,7 @@ void space_text_balance_nested_parens(void);
 
 
 //! Determines if a space is required between two chunks
-size_t space_needed(chunk_t *first, chunk_t *second);
+size_t space_needed(Chunk *first, Chunk *second);
 
 
 /**
@@ -36,10 +36,10 @@ size_t space_needed(chunk_t *first, chunk_t *second);
  *
  * @return the column difference between the two chunks
  */
-size_t space_col_align(chunk_t *first, chunk_t *second);
+size_t space_col_align(Chunk *first, Chunk *second);
 
 
-void space_add_after(chunk_t *pc, size_t count);
+void space_add_after(Chunk *pc, size_t count);
 
 
 #endif /* SPACE_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/symbols_table.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/symbols_table.h
index 1a864478..1a864478 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/symbols_table.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/symbols_table.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/token_enum.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/token_enum.h
index 2ffc6b23..7a138d41 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/token_enum.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/token_enum.h
@@ -22,7 +22,7 @@
  * program can work with. The parser and scanner assigns one of these to
  * each chunk/token.
  */
-enum c_token_t
+enum E_Token
 {
    CT_NONE,
    CT_PARENT_NOT_SET,
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/tokenize.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/tokenize.cpp
index f412b6f1..4d446f6c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/tokenize.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/tokenize.cpp
@@ -161,7 +161,7 @@ struct tok_ctx
  *
  * @return Whether a string was parsed
  */
-static bool parse_string(tok_ctx &ctx, chunk_t &pc, size_t quote_idx, bool allow_escape);
+static bool parse_string(tok_ctx &ctx, Chunk &pc, size_t quote_idx, bool allow_escape);
 
 
 /**
@@ -172,7 +172,7 @@ static bool parse_string(tok_ctx &ctx, chunk_t &pc, size_t quote_idx, bool allow
  *
  * @return Whether a string was parsed
  */
-static bool parse_cs_string(tok_ctx &ctx, chunk_t &pc);
+static bool parse_cs_string(tok_ctx &ctx, Chunk &pc);
 
 
 /**
@@ -180,7 +180,7 @@ static bool parse_cs_string(tok_ctx &ctx, chunk_t &pc);
  *
  * @param pc  The structure to update, str is an input.
  */
-static void parse_verbatim_string(tok_ctx &ctx, chunk_t &pc);
+static void parse_verbatim_string(tok_ctx &ctx, Chunk &pc);
 
 
 static bool tag_compare(const deque<int> &d, size_t a_idx, size_t b_idx, size_t len);
@@ -192,7 +192,7 @@ static bool tag_compare(const deque<int> &d, size_t a_idx, size_t b_idx, size_t
  *
  * @param pc  structure to update, str is an input.
  */
-static bool parse_cr_string(tok_ctx &ctx, chunk_t &pc, size_t q_idx);
+static bool parse_cr_string(tok_ctx &ctx, Chunk &pc, size_t q_idx);
 
 
 /**
@@ -202,7 +202,7 @@ static bool parse_cr_string(tok_ctx &ctx, chunk_t &pc, size_t q_idx);
  *
  * @return Whether whitespace was parsed
  */
-static bool parse_whitespace(tok_ctx &ctx, chunk_t &pc);
+static bool parse_whitespace(tok_ctx &ctx, Chunk &pc);
 
 
 /**
@@ -212,7 +212,7 @@ static bool parse_whitespace(tok_ctx &ctx, chunk_t &pc);
  *
  * @param pc  structure to update, str is an input
  */
-static bool parse_bs_newline(tok_ctx &ctx, chunk_t &pc);
+static bool parse_bs_newline(tok_ctx &ctx, Chunk &pc);
 
 
 /**
@@ -233,10 +233,10 @@ static bool parse_newline(tok_ctx &ctx);
  *
  * @param pc  structure to update, str is an input
  */
-static void parse_pawn_pattern(tok_ctx &ctx, chunk_t &pc, c_token_t tt);
+static void parse_pawn_pattern(tok_ctx &ctx, Chunk &pc, E_Token tt);
 
 
-static bool parse_ignored(tok_ctx &ctx, chunk_t &pc);
+static bool parse_ignored(tok_ctx &ctx, Chunk &pc);
 
 
 /**
@@ -252,7 +252,7 @@ static bool parse_ignored(tok_ctx &ctx, chunk_t &pc);
  *
  * @return true/false - whether anything was parsed
  */
-static bool parse_next(tok_ctx &ctx, chunk_t &pc, const chunk_t *prev_pc);
+static bool parse_next(tok_ctx &ctx, Chunk &pc, const Chunk *prev_pc);
 
 
 /**
@@ -277,7 +277,7 @@ static bool parse_next(tok_ctx &ctx, chunk_t &pc, const chunk_t *prev_pc);
  *
  * @return Whether a string was parsed
  */
-static bool d_parse_string(tok_ctx &ctx, chunk_t &pc);
+static bool d_parse_string(tok_ctx &ctx, Chunk &pc);
 
 
 /**
@@ -292,7 +292,7 @@ static bool d_parse_string(tok_ctx &ctx, chunk_t &pc);
  *
  * @return Whether a comment was parsed
  */
-static bool parse_comment(tok_ctx &ctx, chunk_t &pc);
+static bool parse_comment(tok_ctx &ctx, Chunk &pc);
 
 
 /**
@@ -303,7 +303,7 @@ static bool parse_comment(tok_ctx &ctx, chunk_t &pc);
  *
  * @return Whether a placeholder was parsed.
  */
-static bool parse_code_placeholder(tok_ctx &ctx, chunk_t &pc);
+static bool parse_code_placeholder(tok_ctx &ctx, Chunk &pc);
 
 
 /**
@@ -311,7 +311,7 @@ static bool parse_code_placeholder(tok_ctx &ctx, chunk_t &pc);
  * If for a string, explicitly exclude common format and scan specifiers, ie,
  * PRIx32 and SCNx64.
  */
-static void parse_suffix(tok_ctx &ctx, chunk_t &pc, bool forstring);
+static void parse_suffix(tok_ctx &ctx, Chunk &pc, bool forstring);
 
 
 //! check if a symbol holds a boolean value
@@ -350,10 +350,10 @@ static bool is_hex_(int ch);
  *
  * @return Whether a number was parsed
  */
-static bool parse_number(tok_ctx &ctx, chunk_t &pc);
+static bool parse_number(tok_ctx &ctx, Chunk &pc);
 
 
-static bool d_parse_string(tok_ctx &ctx, chunk_t &pc)
+static bool d_parse_string(tok_ctx &ctx, Chunk &pc)
 {
    size_t ch = ctx.peek();
 
@@ -497,7 +497,7 @@ static const char *str_search(const char *needle, const char *haystack, int hays
 #endif
 
 
-static bool parse_comment(tok_ctx &ctx, chunk_t &pc)
+static bool parse_comment(tok_ctx &ctx, Chunk &pc)
 {
    bool   is_d    = language_is_set(LANG_D);
    bool   is_cs   = language_is_set(LANG_CS);
@@ -736,7 +736,7 @@ static bool parse_comment(tok_ctx &ctx, chunk_t &pc)
 } // parse_comment
 
 
-static bool parse_code_placeholder(tok_ctx &ctx, chunk_t &pc)
+static bool parse_code_placeholder(tok_ctx &ctx, Chunk &pc)
 {
    if (  (ctx.peek() != '<')
       || (ctx.peek(1) != '#'))
@@ -770,7 +770,7 @@ static bool parse_code_placeholder(tok_ctx &ctx, chunk_t &pc)
 }
 
 
-static void parse_suffix(tok_ctx &ctx, chunk_t &pc, bool forstring = false)
+static void parse_suffix(tok_ctx &ctx, Chunk &pc, bool forstring = false)
 {
    if (CharTable::IsKw1(ctx.peek()))
    {
@@ -877,7 +877,7 @@ static bool is_hex_(int ch)
 }
 
 
-static bool parse_number(tok_ctx &ctx, chunk_t &pc)
+static bool parse_number(tok_ctx &ctx, Chunk &pc)
 {
    /*
     * A number must start with a digit or a dot, followed by a digit
@@ -907,8 +907,8 @@ static bool parse_number(tok_ctx &ctx, chunk_t &pc)
    if (  ctx.peek() == '0'
       && !language_is_set(LANG_CS))
    {
-      size_t  ch;
-      chunk_t pc_temp;
+      size_t ch;
+      Chunk  pc_temp;
 
       pc.str.append(ctx.get());  // store the '0'
       pc_temp.str.append('0');
@@ -922,9 +922,9 @@ static bool parse_number(tok_ctx &ctx, chunk_t &pc)
          ch = ctx.get();
          pc_temp.str.append(ch);
       }
-      ch = pc_temp.str[pc_temp.len() - 1];
+      ch = pc_temp.str[pc_temp.Len() - 1];
       ctx.restore();
-      LOG_FMT(LGUY, "%s(%d): pc_temp:%s\n", __func__, __LINE__, pc_temp.text());
+      LOG_FMT(LGUY, "%s(%d): pc_temp:%s\n", __func__, __LINE__, pc_temp.Text());
 
       if (ch == 'h') // TODO can we combine this in analyze_character
       {
@@ -938,7 +938,7 @@ static bool parse_number(tok_ctx &ctx, chunk_t &pc)
          } while (is_hex_(ctx.peek()));
 
          pc.str.append(ctx.get());    // store the h
-         LOG_FMT(LGUY, "%s(%d): pc:%s\n", __func__, __LINE__, pc.text());
+         LOG_FMT(LGUY, "%s(%d): pc:%s\n", __func__, __LINE__, pc.Text());
       }
       else
       {
@@ -1117,7 +1117,7 @@ static bool parse_number(tok_ctx &ctx, chunk_t &pc)
 } // parse_number
 
 
-static bool parse_string(tok_ctx &ctx, chunk_t &pc, size_t quote_idx, bool allow_escape)
+static bool parse_string(tok_ctx &ctx, Chunk &pc, size_t quote_idx, bool allow_escape)
 {
    log_rule_B("string_escape_char");
    const size_t escape_char = options::string_escape_char();
@@ -1219,7 +1219,7 @@ static cs_string_t operator|=(cs_string_t &value, cs_string_t other)
 }
 
 
-static cs_string_t parse_cs_string_start(tok_ctx &ctx, chunk_t &pc)
+static cs_string_t parse_cs_string_start(tok_ctx &ctx, Chunk &pc)
 {
    cs_string_t stringType = CS_STRING_NONE;
    int         offset     = 0;
@@ -1272,7 +1272,7 @@ struct CsStringParseState
 /**
  * C# strings are complex enough (mostly due to interpolation and nesting) that they need a custom parser.
  */
-static bool parse_cs_string(tok_ctx &ctx, chunk_t &pc)
+static bool parse_cs_string(tok_ctx &ctx, Chunk &pc)
 {
    cs_string_t stringType = parse_cs_string_start(ctx, pc);
 
@@ -1423,7 +1423,7 @@ static bool parse_cs_string(tok_ctx &ctx, chunk_t &pc)
 } // parse_cs_string
 
 
-static void parse_verbatim_string(tok_ctx &ctx, chunk_t &pc)
+static void parse_verbatim_string(tok_ctx &ctx, Chunk &pc)
 {
    set_chunk_type(&pc, CT_STRING);
 
@@ -1473,7 +1473,7 @@ static bool tag_compare(const deque<int> &d, size_t a_idx, size_t b_idx, size_t
 }
 
 
-static bool parse_cr_string(tok_ctx &ctx, chunk_t &pc, size_t q_idx)
+static bool parse_cr_string(tok_ctx &ctx, Chunk &pc, size_t q_idx)
 {
    size_t tag_idx = ctx.c.idx + q_idx + 1;
    size_t tag_len = 0;
@@ -1543,7 +1543,7 @@ static bool parse_cr_string(tok_ctx &ctx, chunk_t &pc, size_t q_idx)
  * @param pc   The structure to update, str is an input.
  * @return     Whether a word was parsed (always true)
  */
-static bool parse_word(tok_ctx &ctx, chunk_t &pc, bool skipcheck)
+static bool parse_word(tok_ctx &ctx, Chunk &pc, bool skipcheck)
 {
    static unc_text intr_txt("@interface");
 
@@ -1621,7 +1621,7 @@ static bool parse_word(tok_ctx &ctx, chunk_t &pc, bool skipcheck)
       {
          // Turn it into a keyword now
          // Issue #1460 will return "COMMENT_CPP"
-         set_chunk_type(&pc, find_keyword_type(pc.text(), pc.str.size()));
+         set_chunk_type(&pc, find_keyword_type(pc.Text(), pc.str.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
@@ -1631,7 +1631,7 @@ static bool parse_word(tok_ctx &ctx, chunk_t &pc, bool skipcheck)
          if (  pc.type == CT_PP_IGNORE
             && !cpd.in_preproc)
          {
-            set_chunk_type(&pc, find_keyword_type(pc.text(), pc.str.size()));
+            set_chunk_type(&pc, find_keyword_type(pc.Text(), pc.str.size()));
          }
          else if (pc.type == CT_COMMENT_CPP)   // Issue #1460
          {
@@ -1775,7 +1775,7 @@ static size_t parse_attribute_specifier_sequence(tok_ctx &ctx)
 } // parse_attribute_specifier_sequence
 
 
-static bool extract_attribute_specifier_sequence(tok_ctx &ctx, chunk_t &pc, size_t length)
+static bool extract_attribute_specifier_sequence(tok_ctx &ctx, Chunk &pc, size_t length)
 {
    pc.str.clear();
 
@@ -1788,7 +1788,7 @@ static bool extract_attribute_specifier_sequence(tok_ctx &ctx, chunk_t &pc, size
 } // extract_attribute_specifier_sequence
 
 
-static bool parse_whitespace(tok_ctx &ctx, chunk_t &pc)
+static bool parse_whitespace(tok_ctx &ctx, Chunk &pc)
 {
    size_t nl_count = 0;
    size_t ch       = 0;
@@ -1850,7 +1850,7 @@ static bool parse_whitespace(tok_ctx &ctx, chunk_t &pc)
 } // parse_whitespace
 
 
-static bool parse_bs_newline(tok_ctx &ctx, chunk_t &pc)
+static bool parse_bs_newline(tok_ctx &ctx, Chunk &pc)
 {
    ctx.save();
    ctx.get(); // skip the '\'
@@ -1906,7 +1906,7 @@ static bool parse_newline(tok_ctx &ctx)
 }
 
 
-static void parse_pawn_pattern(tok_ctx &ctx, chunk_t &pc, c_token_t tt)
+static void parse_pawn_pattern(tok_ctx &ctx, Chunk &pc, E_Token tt)
 {
    pc.str.clear();
    set_chunk_type(&pc, tt);
@@ -1929,7 +1929,7 @@ static void parse_pawn_pattern(tok_ctx &ctx, chunk_t &pc, c_token_t tt)
 }
 
 
-static bool parse_off_newlines(tok_ctx &ctx, chunk_t &pc)
+static bool parse_off_newlines(tok_ctx &ctx, Chunk &pc)
 {
    size_t nl_count = 0;
 
@@ -1949,7 +1949,7 @@ static bool parse_off_newlines(tok_ctx &ctx, chunk_t &pc)
 }
 
 
-static bool parse_macro(tok_ctx &ctx, chunk_t &pc, const chunk_t *prev_pc)
+static bool parse_macro(tok_ctx &ctx, Chunk &pc, const Chunk *prev_pc)
 {
    if (parse_off_newlines(ctx, pc))
    {
@@ -1995,7 +1995,7 @@ static bool parse_macro(tok_ctx &ctx, chunk_t &pc, const chunk_t *prev_pc)
 } // parse_macro
 
 
-static bool parse_ignored(tok_ctx &ctx, chunk_t &pc)
+static bool parse_ignored(tok_ctx &ctx, Chunk &pc)
 {
    if (parse_off_newlines(ctx, pc))
    {
@@ -2095,7 +2095,7 @@ static bool parse_ignored(tok_ctx &ctx, chunk_t &pc)
 } // parse_ignored
 
 
-static bool parse_next(tok_ctx &ctx, chunk_t &pc, const chunk_t *prev_pc)
+static bool parse_next(tok_ctx &ctx, Chunk &pc, const Chunk *prev_pc)
 {
    if (!ctx.more())
    {
@@ -2367,19 +2367,20 @@ static bool parse_next(tok_ctx &ctx, chunk_t &pc, const chunk_t *prev_pc)
       if (  (ch == '<')
          && cpd.in_preproc == CT_PP_DEFINE)
       {
-         if (chunk_is_token(chunk_get_tail(), CT_MACRO))
+         if (chunk_is_token(Chunk::GetTail(), CT_MACRO))
          {
             // We have "#define XXX <", assume '<' starts an include string
             parse_string(ctx, pc, 0, false);
             return(true);
          }
       }
-
       /* Inside clang's __has_include() could be "path/to/file.h" or system-style <path/to/file.h> */
+      Chunk *tail = Chunk::GetTail();
+
       if (  (ch == '(')
-         && (chunk_get_tail() != nullptr)
-         && (  chunk_is_token(chunk_get_tail(), CT_CNG_HASINC)
-            || chunk_is_token(chunk_get_tail(), CT_CNG_HASINCN)))
+         && (tail->IsNotNullChunk())
+         && (  chunk_is_token(tail, CT_CNG_HASINC)
+            || chunk_is_token(tail, CT_CNG_HASINCN)))
       {
          parse_string(ctx, pc, 0, false);
          return(true);
@@ -2504,8 +2505,8 @@ static bool parse_next(tok_ctx &ctx, chunk_t &pc, const chunk_t *prev_pc)
    set_chunk_type(&pc, CT_UNKNOWN);
    pc.str.append(ctx.get());
 
-   LOG_FMT(LWARN, "%s:%zu Garbage in col %d: %x\n",
-           cpd.filename.c_str(), pc.orig_line, (int)ctx.c.col, pc.str[0]);
+   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);
 } // parse_next
@@ -2620,12 +2621,12 @@ int find_enable_processing_comment_marker(const unc_text &text,
 } // find_enable_processing_comment_marker
 
 
-void tokenize(const deque<int> &data, chunk_t *ref)
+void tokenize(const deque<int> &data, Chunk *ref)
 {
    tok_ctx ctx(data);
-   chunk_t chunk;
-   chunk_t *pc          = nullptr;
-   chunk_t *rprev       = nullptr;
+   Chunk   chunk;
+   Chunk   *pc          = nullptr;
+   Chunk   *rprev       = nullptr;
    bool    last_was_tab = false;
    size_t  prev_sp      = 0;
    int     num_stripped = 0;                    // Issue #1966
@@ -2634,7 +2635,7 @@ void tokenize(const deque<int> &data, chunk_t *ref)
 
    while (ctx.more())
    {
-      chunk.reset();
+      chunk.Reset();
       chunk.pp_level = 0;
 
       if (!parse_next(ctx, chunk, pc))
@@ -2647,7 +2648,7 @@ void tokenize(const deque<int> &data, chunk_t *ref)
 
       if (  language_is_set(LANG_JAVA)
          && chunk.type == CT_MEMBER
-         && !memcmp(chunk.text(), "->", 2))
+         && !memcmp(chunk.Text(), "->", 2))
       {
          chunk.type = CT_LAMBDA;
       }
@@ -2679,13 +2680,12 @@ void tokenize(const deque<int> &data, chunk_t *ref)
          chunk.after_tab = last_was_tab;
          last_was_tab    = false;
       }
+      num_stripped = 0; // Issue #1966 and #3565
 
       if (chunk.type != CT_IGNORED)
       {
          // Issue #1338
          // Strip trailing whitespace (for CPP comments and PP blocks)
-         num_stripped = 0;                     // Issue #1966
-
          while (  (chunk.str.size() > 0)
                && (  (chunk.str[chunk.str.size() - 1] == ' ')
                   || (chunk.str[chunk.str.size() - 1] == '\t')))
@@ -2702,16 +2702,8 @@ void tokenize(const deque<int> &data, chunk_t *ref)
          }
       }
       // Store off the end column
-      chunk.orig_col_end = ctx.c.col;
+      chunk.orig_col_end = ctx.c.col - num_stripped; // Issue #1966 and #3565
 
-      if (  (  chunk.type == CT_COMMENT_MULTI                  // Issue #1966
-            || chunk.type == CT_COMMENT
-            || chunk.type == CT_COMMENT_CPP)
-         && (pc != nullptr)
-         && chunk_is_token(pc, CT_PP_IGNORE))
-      {
-         chunk.orig_col_end -= num_stripped;
-      }
       // Add the chunk to the list
       rprev = pc;
 
@@ -2756,7 +2748,7 @@ void tokenize(const deque<int> &data, chunk_t *ref)
          chunk_flags_set(pc, PCF_IN_PREPROC);
 
          // Count words after the preprocessor
-         if (  !chunk_is_comment(pc)
+         if (  !pc->IsComment()
             && !chunk_is_newline(pc))
          {
             cpd.preproc_ncnl_count++;
@@ -2765,7 +2757,7 @@ void tokenize(const deque<int> &data, chunk_t *ref)
          // Disable indentation if a #pragma asm directive is found
          if (cpd.in_preproc == CT_PP_PRAGMA)
          {
-            if (memcmp(pc->text(), "asm", 3) == 0)
+            if (memcmp(pc->Text(), "asm", 3) == 0)
             {
                LOG_FMT(LBCTRL, "Found a pragma %s on line %zu\n", "asm", pc->orig_line);
                cpd.unc_off = true;
@@ -2829,8 +2821,8 @@ void tokenize(const deque<int> &data, chunk_t *ref)
       else
       {
          char copy[1000];
-         LOG_FMT(LGUY, "%s(%d): orig_line is %zu, orig_col is %zu, text() '%s', type is %s, orig_col_end is %zu\n",
-                 __func__, __LINE__, pc->orig_line, pc->orig_col, pc->elided_text(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->orig_line, pc->orig_col, pc->ElidedText(copy), get_token_name(pc->type), pc->orig_col_end);
       }
    }
    // Set the cpd.newline string for this file
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/tokenize.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/tokenize.h
index 896dd511..a111143b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/tokenize.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/tokenize.h
@@ -49,7 +49,7 @@ int find_enable_processing_comment_marker(const unc_text &text, std::size_t star
  * All the tokens are inserted before ref. If ref is NULL, they are inserted
  * at the end of the list.  Line numbers are relative to the start of the data.
  */
-void tokenize(const std::deque<int> &data, chunk_t *ref);
+void tokenize(const std::deque<int> &data, Chunk *ref);
 
 
 #endif /* TOKENIZE_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/tokenize_cleanup.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/tokenize_cleanup.cpp
index 23a87479..108a8db8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/tokenize_cleanup.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/tokenize_cleanup.cpp
@@ -32,7 +32,7 @@ using namespace uncrustify;
  * @param start  chunk to start check at
  * @param end    chunk to end check at
  */
-static void check_template_arg(chunk_t *start, chunk_t *end);
+static void check_template_arg(Chunk *start, Chunk *end);
 
 
 /**
@@ -41,7 +41,7 @@ static void check_template_arg(chunk_t *start, chunk_t *end);
  * @param start  chunk to start check at
  * @param end    chunk to end check at
  */
-static void check_template_args(chunk_t *start, chunk_t *end);
+static void check_template_args(Chunk *start, Chunk *end);
 
 
 /**
@@ -50,7 +50,7 @@ static void check_template_args(chunk_t *start, chunk_t *end);
  *
  * @param start  chunk to start check at
  */
-static void check_template(chunk_t *start, bool in_type_cast);
+static void check_template(Chunk *start, bool in_type_cast);
 
 
 /**
@@ -59,35 +59,39 @@ static void check_template(chunk_t *start, bool in_type_cast);
  *
  * @param pc  chunk to start at
  */
-static chunk_t *handle_double_angle_close(chunk_t *pc);
+static Chunk *handle_double_angle_close(Chunk *pc);
 
 
 /**
  * Marks ObjC specific chunks in propery declaration, by setting
  * parent types and chunk types.
  */
-static void cleanup_objc_property(chunk_t *start);
+static void cleanup_objc_property(Chunk *start);
 
 
 /**
  * Marks ObjC specific chunks in propery 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_t *open_paren);
+static void mark_selectors_in_property_with_open_paren(Chunk *open_paren);
 
 
 /**
  * Marks ObjC specific chunks in propery 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_t *open_paren);
+static void mark_attributes_in_property_with_open_paren(Chunk *open_paren);
 
 
-static chunk_t *handle_double_angle_close(chunk_t *pc)
+static Chunk *handle_double_angle_close(Chunk *pc)
 {
-   chunk_t *next = chunk_get_next(pc);
+   if (pc == nullptr)
+   {
+      pc = Chunk::NullChunkPtr;
+   }
+   Chunk *next = pc->GetNext();
 
-   if (next != nullptr)
+   if (next->IsNotNullChunk())
    {
       if (  chunk_is_token(pc, CT_ANGLE_CLOSE)
          && chunk_is_token(next, CT_ANGLE_CLOSE)
@@ -99,7 +103,7 @@ static chunk_t *handle_double_angle_close(chunk_t *pc)
          set_chunk_type(pc, CT_SHIFT);
          pc->orig_col_end = next->orig_col_end;
 
-         chunk_t *tmp = chunk_get_next_ncnnl(next);
+         Chunk *tmp = next->GetNextNcNnl();
          chunk_del(next);
          next = tmp;
       }
@@ -113,15 +117,15 @@ static chunk_t *handle_double_angle_close(chunk_t *pc)
 }
 
 
-void split_off_angle_close(chunk_t *pc)
+void split_off_angle_close(Chunk *pc)
 {
-   const chunk_tag_t *ct = find_punctuator(pc->text() + 1, cpd.lang_flags);
+   const chunk_tag_t *ct = find_punctuator(pc->Text() + 1, cpd.lang_flags);
 
    if (ct == nullptr)
    {
       return;
    }
-   chunk_t nc = *pc;
+   Chunk nc = *pc;
 
    pc->str.resize(1);
    pc->orig_col_end = pc->orig_col + 1;
@@ -158,37 +162,36 @@ void tokenize_trailing_return_types(void)
    // auto f22() throw() -> bool = delete;
    // auto f23() const throw() -> bool;
    // auto f24() const throw() -> bool = delete;
-   chunk_t *pc;
 
-   for (pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next_ncnnl(pc))
+   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->elided_text(copy));
+      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));
 
       if (  chunk_is_token(pc, CT_MEMBER)
-         && (strcmp(pc->text(), "->") == 0))
+         && (strcmp(pc->Text(), "->") == 0))
       {
-         chunk_t *tmp = chunk_get_prev_ncnnl(pc);
-         chunk_t *tmp_2;
-         chunk_t *open_paren;
+         Chunk *tmp = pc->GetPrevNcNnl();
+         Chunk *tmp_2;
+         Chunk *open_paren;
 
          if (chunk_is_token(tmp, CT_QUALIFIER))
          {
             // auto max(int a, int b) const -> int;
             // auto f11() const -> bool;
-            tmp = chunk_get_prev_ncnnl(tmp);
+            tmp = tmp->GetPrevNcNnl();
          }
          else if (chunk_is_token(tmp, CT_NOEXCEPT))
          {
             // noexcept is present
-            tmp_2 = chunk_get_prev_ncnnl(tmp);
+            tmp_2 = tmp->GetPrevNcNnl();
 
             if (chunk_is_token(tmp_2, CT_QUALIFIER))
             {
                // auto f12() const noexcept -> bool;
                // auto f15() const noexcept -> bool = delete;
-               tmp = chunk_get_prev_ncnnl(tmp_2);
+               tmp = tmp_2->GetPrevNcNnl();
             }
             else
             {
@@ -199,13 +202,13 @@ void tokenize_trailing_return_types(void)
          }
          else if (chunk_is_token(tmp, CT_PAREN_CLOSE))
          {
-            open_paren = chunk_get_prev_type(tmp, CT_PAREN_OPEN, tmp->level);
-            tmp        = chunk_get_prev_ncnnl(open_paren);
+            open_paren = tmp->GetPrevType(CT_PAREN_OPEN, tmp->level);
+            tmp        = open_paren->GetPrevNcNnl();
 
             if (chunk_is_token(tmp, CT_NOEXCEPT))
             {
                // noexcept is present
-               tmp_2 = chunk_get_prev_ncnnl(tmp);
+               tmp_2 = tmp->GetPrevNcNnl();
 
                if (chunk_is_token(tmp_2, CT_QUALIFIER))
                {
@@ -213,7 +216,7 @@ void tokenize_trailing_return_types(void)
                   // auto f14() const noexcept(false) -> bool;
                   // auto f16() const noexcept(true) -> bool = delete;
                   // auto f17() const noexcept(false) -> bool = delete;
-                  tmp = chunk_get_prev_ncnnl(tmp_2);
+                  tmp = tmp_2->GetPrevNcNnl();
                }
                else
                {
@@ -227,13 +230,13 @@ void tokenize_trailing_return_types(void)
             else if (chunk_is_token(tmp, CT_THROW))
             {
                // throw is present
-               tmp_2 = chunk_get_prev_ncnnl(tmp);
+               tmp_2 = tmp->GetPrevNcNnl();
 
                if (chunk_is_token(tmp_2, CT_QUALIFIER))
                {
                   // auto f23() const throw() -> bool;
                   // auto f24() const throw() -> bool = delete;
-                  tmp = chunk_get_prev_ncnnl(tmp_2);
+                  tmp = tmp_2->GetPrevNcNnl();
                }
                else
                {
@@ -257,12 +260,12 @@ void tokenize_trailing_return_types(void)
                || get_chunk_parent_type(tmp) == CT_FUNC_DEF))
          {
             set_chunk_type(pc, CT_TRAILING_RET);
-            LOG_FMT(LNOTE, "%s(%d): set trailing return type for text() is '%s'\n",
-                    __func__, __LINE__, pc->text());                  // Issue #3222
+            LOG_FMT(LNOTE, "%s(%d): set trailing return type for Text() is '%s'\n",
+                    __func__, __LINE__, pc->Text());                  // Issue #3222
             // TODO
             // https://en.cppreference.com/w/cpp/language/function
             // noptr-declarator ( parameter-list ) cv(optional) ref(optional) except(optional) attr(optional) -> trailing
-            chunk_t *next = chunk_get_next_ncnnl(pc);
+            Chunk *next = pc->GetNextNcNnl();
 
             if (chunk_is_token(next, CT_DECLTYPE))
             {
@@ -271,12 +274,18 @@ void tokenize_trailing_return_types(void)
             else if (chunk_is_token(next, CT_WORD))
             {
                set_chunk_type(next, CT_TYPE);                         // Issue #3222
-               next = chunk_get_next_ncnnl(next);
+               next = next->GetNextNcNnl();
 
-               if (  chunk_is_token(next, CT_ARITH)
-                  && (next->str[0] == '*'))
+               if (chunk_is_token(next, CT_ARITH))
                {
-                  set_chunk_type(next, CT_PTR_TYPE);
+                  if (next->str[0] == '*')
+                  {
+                     set_chunk_type(next, CT_PTR_TYPE);
+                  }
+                  else if (next->str[0] == '&')                       // Issue #3407
+                  {
+                     set_chunk_type(next, CT_BYREF);
+                  }
                }
             }
             else
@@ -293,9 +302,9 @@ void tokenize_cleanup(void)
 {
    LOG_FUNC_ENTRY();
 
-   chunk_t *prev = nullptr;
-   chunk_t *next;
-   bool    in_type_cast = false;
+   Chunk *prev = nullptr;
+   Chunk *next;
+   bool  in_type_cast = false;
 
    cpd.unc_stage = unc_stage_e::TOKENIZE_CLEANUP;
 
@@ -303,13 +312,13 @@ void tokenize_cleanup(void)
     * Since [] is expected to be TSQUARE for the 'operator', we need to make
     * this change in the first pass.
     */
-   chunk_t *pc;
+   Chunk *pc;
 
-   for (pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next_ncnnl(pc))
+   for (pc = Chunk::GetHead(); pc->IsNotNullChunk(); pc = pc->GetNextNcNnl())
    {
       if (chunk_is_token(pc, CT_SQUARE_OPEN))
       {
-         next = chunk_get_next_ncnnl(pc);
+         next = pc->GetNextNcNnl();
 
          if (chunk_is_token(next, CT_SQUARE_CLOSE))
          {
@@ -328,7 +337,7 @@ void tokenize_cleanup(void)
 
       if (  chunk_is_token(pc, CT_SEMICOLON)
          && pc->flags.test(PCF_IN_PREPROC)
-         && !chunk_get_next_ncnnl(pc, scope_e::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);
@@ -336,11 +345,11 @@ void tokenize_cleanup(void)
    }
 
    // change := to CT_SQL_ASSIGN Issue #527
-   for (pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next_ncnnl(pc))
+   for (pc = Chunk::GetHead(); pc->IsNotNullChunk(); pc = pc->GetNextNcNnl())
    {
       if (chunk_is_token(pc, CT_COLON))
       {
-         next = chunk_get_next_ncnnl(pc);
+         next = pc->GetNextNcNnl();
 
          if (chunk_is_token(next, CT_ASSIGN))
          {
@@ -354,11 +363,11 @@ void tokenize_cleanup(void)
    }
 
    // We can handle everything else in the second pass
-   pc   = chunk_get_head();
-   next = chunk_get_next_ncnnl(pc);
+   pc   = Chunk::GetHead();
+   next = pc->GetNextNcNnl();
 
-   while (  pc != nullptr
-         && next != nullptr)
+   while (  pc->IsNotNullChunk()
+         && next->IsNotNullChunk())
    {
       if (  chunk_is_token(pc, CT_DOT)
          && language_is_set(LANG_ALLC))
@@ -423,7 +432,7 @@ void tokenize_cleanup(void)
       {
          set_chunk_type(next, CT_ENUM_CLASS);
       }
-      chunk_t *next_non_attr = language_is_set(LANG_CPP) ? skip_attribute_next(next) : next;
+      Chunk *next_non_attr = language_is_set(LANG_CPP) ? skip_attribute_next(next) : next;
 
       /*
        * Change CT_WORD after CT_ENUM, CT_UNION, CT_STRUCT, or CT_CLASS to CT_TYPE
@@ -463,9 +472,9 @@ void tokenize_cleanup(void)
          else
          {
             // Something else followed by a open brace
-            chunk_t *tmp = chunk_get_next_ncnnl(next);
+            Chunk *tmp = next->GetNextNcNnl();
 
-            if (  tmp == nullptr
+            if (  tmp->IsNullChunk()
                || tmp->type != CT_BRACE_OPEN)
             {
                set_chunk_type(pc, CT_QUALIFIER);
@@ -482,9 +491,9 @@ void tokenize_cleanup(void)
       if (  (chunk_is_token(next, CT_STAR))
          || (  language_is_set(LANG_CPP)
             && (chunk_is_token(next, CT_CARET)))
-         || (  language_is_set(LANG_CS)
+         || (  language_is_set(LANG_CS | LANG_VALA)
             && (chunk_is_token(next, CT_QUESTION))
-            && (strcmp(pc->text(), "null") != 0)))
+            && (strcmp(pc->Text(), "null") != 0)))
       {
          if (  chunk_is_token(pc, CT_TYPE)
             || chunk_is_token(pc, CT_QUALIFIER)
@@ -574,17 +583,17 @@ void tokenize_cleanup(void)
 
          // handle 'static if' and merge the tokens
          if (  chunk_is_token(pc, CT_IF)
-            && chunk_is_str(prev, "static", 6))
+            && chunk_is_str(prev, "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;
-            chunk_t *to_be_deleted = prev;
-            prev = chunk_get_prev_ncnnl(prev);
+            Chunk *to_be_deleted = prev;
+            prev = prev->GetPrevNcNnl();
 
-            if (prev != nullptr)
+            if (prev->IsNotNullChunk())
             {
                chunk_del(to_be_deleted);
             }
@@ -597,9 +606,9 @@ void tokenize_cleanup(void)
          if (  chunk_is_token(pc, CT_WORD)
             && chunk_is_token(next, CT_DC_MEMBER))
          {
-            prev = chunk_get_prev(pc);
+            prev = pc->GetPrev();
 
-            if (prev == nullptr)                  // Issue #3010
+            if (prev->IsNullChunk())                  // Issue #3010
             {
                set_chunk_type(pc, CT_TYPE);
             }
@@ -619,7 +628,7 @@ void tokenize_cleanup(void)
          // Set parent type for 'if constexpr'
          if (  chunk_is_token(prev, CT_IF)
             && chunk_is_token(pc, CT_QUALIFIER)
-            && chunk_is_str(pc, "constexpr", 9))
+            && chunk_is_str(pc, "constexpr"))
          {
             set_chunk_type(pc, CT_CONSTEXPR);
          }
@@ -662,11 +671,11 @@ void tokenize_cleanup(void)
          }
          else if (chunk_is_token(next, CT_DC_MEMBER))
          {
-            chunk_t *next2 = chunk_get_next_nblank(next);
+            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
-                  && !strcmp(pc->text(), next2->text())))
+                  && !strcmp(pc->Text(), next2->Text())))
             {
                set_chunk_type(pc, CT_TYPE);
             }
@@ -692,12 +701,12 @@ void tokenize_cleanup(void)
        */
       if (chunk_is_token(pc, CT_OPERATOR))
       {
-         chunk_t *tmp2 = chunk_get_next(next);
+         Chunk *tmp2 = next->GetNext();
 
          // Handle special case of () operator -- [] already handled
          if (chunk_is_token(next, CT_PAREN_OPEN))
          {
-            chunk_t *tmp = chunk_get_next(next);
+            Chunk *tmp = next->GetNext();
 
             if (chunk_is_token(tmp, CT_PAREN_CLOSE))
             {
@@ -729,9 +738,9 @@ void tokenize_cleanup(void)
              * the type.
              */
             tmp2 = next;
-            chunk_t *tmp;
+            Chunk *tmp;
 
-            while ((tmp = chunk_get_next(tmp2)) != nullptr)
+            while ((tmp = tmp2->GetNext())->IsNotNullChunk())
             {
                if (  tmp->type != CT_WORD
                   && tmp->type != CT_TYPE
@@ -755,28 +764,28 @@ void tokenize_cleanup(void)
                tmp2 = tmp;
             }
 
-            while ((tmp2 = chunk_get_next(next)) != tmp)
+            while ((tmp2 = next->GetNext()) != tmp)
             {
                chunk_del(tmp2);
             }
             set_chunk_type(next, CT_OPERATOR_VAL);
 
-            next->orig_col_end = next->orig_col + next->len();
+            next->orig_col_end = next->orig_col + next->Len();
          }
          set_chunk_parent(next, 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->orig_line, pc->orig_col, next->Text());
       }
 
       // Change private, public, protected into either a qualifier or label
       if (chunk_is_token(pc, CT_ACCESS))
       {
          // Handle Qt slots - maybe should just check for a CT_WORD?
-         if (  chunk_is_str(next, "slots", 5)
-            || chunk_is_str(next, "Q_SLOTS", 7))
+         if (  chunk_is_str(next, "slots")
+            || chunk_is_str(next, "Q_SLOTS"))
          {
-            chunk_t *tmp = chunk_get_next(next);
+            Chunk *tmp = next->GetNext();
 
             if (chunk_is_token(tmp, CT_COLON))
             {
@@ -787,17 +796,17 @@ void tokenize_cleanup(void)
          if (chunk_is_token(next, CT_COLON))
          {
             set_chunk_type(next, CT_ACCESS_COLON);
-            chunk_t *tmp;
+            Chunk *tmp;
 
-            if ((tmp = chunk_get_next_ncnnl(next)) != nullptr)
+            if ((tmp = next->GetNextNcNnl())->IsNotNullChunk())
             {
                chunk_flags_set(tmp, PCF_STMT_START | PCF_EXPR_START);
             }
          }
          else
          {
-            set_chunk_type(pc, (  chunk_is_str(pc, "signals", 7)
-                               || chunk_is_str(pc, "Q_SIGNALS", 9))
+            set_chunk_type(pc, (  chunk_is_str(pc, "signals")
+                               || chunk_is_str(pc, "Q_SIGNALS"))
                            ? CT_WORD : CT_QUALIFIER);
          }
       }
@@ -813,7 +822,7 @@ void tokenize_cleanup(void)
                   && (!pc->str.startswith("$\""))
                   && (!pc->str.startswith("$@\""))))))
       {
-         chunk_t *tmp = chunk_get_prev(pc);
+         Chunk *tmp = pc->GetPrev();
 
          if (chunk_is_newline(tmp))
          {
@@ -821,10 +830,10 @@ void tokenize_cleanup(void)
             {
                set_chunk_type(pc, CT_SQL_EXEC);
 
-               if (pc->len() > 1)
+               if (pc->Len() > 1)
                {
                   // SPLIT OFF '$'
-                  chunk_t nc;
+                  Chunk nc;
 
                   nc = *pc;
                   pc->str.resize(1);
@@ -836,10 +845,10 @@ void tokenize_cleanup(void)
                   nc.column++;
                   chunk_add_after(&nc, pc);
 
-                  next = chunk_get_next(pc);
+                  next = pc->GetNext();
                }
             }
-            tmp = chunk_get_next(next);
+            tmp = next->GetNext();
 
             if (chunk_is_str_case(tmp, "BEGIN", 5))
             {
@@ -855,50 +864,50 @@ void tokenize_cleanup(void)
             }
 
             // Change words into CT_SQL_WORD until CT_SEMICOLON
-            while (tmp != nullptr)
+            while (tmp->IsNotNullChunk())
             {
                if (chunk_is_token(tmp, CT_SEMICOLON))
                {
                   break;
                }
 
-               if (  (tmp->len() > 0)
+               if (  (tmp->Len() > 0)
                   && (  unc_isalpha(*tmp->str.c_str())
                      || (*tmp->str.c_str() == '$')))
                {
                   set_chunk_type(tmp, CT_SQL_WORD);
                }
-               tmp = chunk_get_next_ncnnl(tmp);
+               tmp = tmp->GetNextNcNnl();
             }
          }
       }
 
       // handle MS abomination 'for each'
       if (  chunk_is_token(pc, CT_FOR)
-         && chunk_is_str(next, "each", 4)
-         && (next == chunk_get_next(pc)))
+         && chunk_is_str(next, "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);
-         next = chunk_get_next_ncnnl(pc);
+         next = pc->GetNextNcNnl();
 
          // label the 'in'
          if (chunk_is_token(next, CT_PAREN_OPEN))
          {
-            chunk_t *tmp = chunk_get_next_ncnnl(next);
+            Chunk *tmp = next->GetNextNcNnl();
 
-            while (  tmp != nullptr
+            while (  tmp->IsNotNullChunk()
                   && tmp->type != CT_PAREN_CLOSE)
             {
-               if (chunk_is_str(tmp, "in", 2))
+               if (chunk_is_str(tmp, "in"))
                {
                   set_chunk_type(tmp, CT_IN);
                   break;
                }
-               tmp = chunk_get_next_ncnnl(tmp);
+               tmp = tmp->GetNextNcNnl();
             }
          }
       }
@@ -926,7 +935,7 @@ void tokenize_cleanup(void)
 
          // Fix self keyword back to word when mixing c++/objective-c
          if (  chunk_is_token(pc, CT_THIS)
-            && !strcmp(pc->text(), "self")
+            && !strcmp(pc->Text(), "self")
             && (  chunk_is_token(next, CT_COMMA)
                || chunk_is_token(next, CT_PAREN_CLOSE)))
          {
@@ -935,7 +944,7 @@ void tokenize_cleanup(void)
 
          // Fix self keyword back to word when mixing c++/objective-c
          if (  chunk_is_token(pc, CT_THIS)
-            && !strcmp(pc->text(), "self")
+            && !strcmp(pc->Text(), "self")
             && (  chunk_is_token(next, CT_COMMA)
                || chunk_is_token(next, CT_PAREN_CLOSE)))
          {
@@ -964,15 +973,15 @@ void tokenize_cleanup(void)
          }
          set_chunk_parent(next, pc->type);
 
-         chunk_t *tmp = chunk_get_next_ncnnl(next);
+         Chunk *tmp = next->GetNextNcNnl();
 
-         if (tmp != nullptr)
+         if (tmp->IsNotNullChunk())
          {
             chunk_flags_set(tmp, PCF_STMT_START | PCF_EXPR_START);
          }
-         tmp = chunk_get_next_type(pc, CT_OC_END, pc->level);
+         tmp = pc->GetNextType(CT_OC_END, pc->level);
 
-         if (tmp != nullptr)
+         if (tmp->IsNotNullChunk())
          {
             set_chunk_parent(tmp, pc->type);
          }
@@ -980,19 +989,19 @@ void tokenize_cleanup(void)
 
       if (chunk_is_token(pc, CT_OC_INTF))
       {
-         chunk_t *tmp = chunk_get_next_ncnnl(pc, scope_e::PREPROC);
+         Chunk *tmp = pc->GetNextNcNnl(E_Scope::PREPROC);
 
-         while (  tmp != nullptr
+         while (  tmp->IsNotNullChunk()
                && tmp->type != CT_OC_END)
          {
             if (get_token_pattern_class(tmp->type) != 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(),
+                       __func__, __LINE__, pc->orig_line, pc->orig_col, tmp->Text(),
                        get_token_name(tmp->type));
                set_chunk_type(tmp, CT_WORD);
             }
-            tmp = chunk_get_next_ncnnl(tmp, scope_e::PREPROC);
+            tmp = tmp->GetNextNcNnl(E_Scope::PREPROC);
          }
       }
 
@@ -1010,10 +1019,10 @@ void tokenize_cleanup(void)
       {
          set_chunk_parent(next, get_chunk_parent_type(pc));
 
-         chunk_t *tmp = chunk_get_next(next);
+         Chunk *tmp = next->GetNext();
 
-         if (  tmp != nullptr
-            && tmp->next != nullptr)
+         if (  tmp->IsNotNullChunk()
+            && tmp->GetNext()->IsNotNullChunk())
          {
             if (chunk_is_token(tmp, CT_PAREN_CLOSE))
             {
@@ -1026,9 +1035,9 @@ void tokenize_cleanup(void)
                set_chunk_parent(tmp, get_chunk_parent_type(pc));
             }
          }
-         tmp = chunk_get_next_type(pc, CT_PAREN_CLOSE, pc->level);
+         tmp = pc->GetNextType(CT_PAREN_CLOSE, pc->level);
 
-         if (tmp != nullptr)
+         if (tmp->IsNotNullChunk())
          {
             set_chunk_parent(tmp, get_chunk_parent_type(pc));
          }
@@ -1062,14 +1071,14 @@ void tokenize_cleanup(void)
       {
          set_chunk_parent(next, pc->type);
 
-         chunk_t *tmp = chunk_get_next(next);
+         Chunk *tmp = next->GetNext();
 
-         if (tmp != nullptr)
+         if (tmp->IsNotNullChunk())
          {
             set_chunk_type(tmp, CT_OC_SEL_NAME);
             set_chunk_parent(tmp, pc->type);
 
-            while ((tmp = chunk_get_next_ncnnl(tmp)) != nullptr)
+            while ((tmp = tmp->GetNextNcNnl())->IsNotNullChunk())
             {
                if (chunk_is_token(tmp, CT_PAREN_CLOSE))
                {
@@ -1127,7 +1136,7 @@ void tokenize_cleanup(void)
       // Add minimal support for C++0x rvalue references
       if (  chunk_is_token(pc, CT_BOOL)
          && language_is_set(LANG_CPP)
-         && chunk_is_str(pc, "&&", 2))
+         && chunk_is_str(pc, "&&"))
       {
          if (chunk_is_token(prev, CT_TYPE))
          {
@@ -1144,7 +1153,7 @@ void tokenize_cleanup(void)
        *   A::A(int) try : B() { } catch (...) { }
        */
       if (  chunk_is_token(pc, CT_TRY)
-         && chunk_is_str(pc, "try", 3)
+         && chunk_is_str(pc, "try")
          && chunk_is_token(next, CT_COLON))
       {
          set_chunk_type(pc, CT_QUALIFIER);
@@ -1171,12 +1180,12 @@ void tokenize_cleanup(void)
 
       prev = pc;
       pc   = next;
-      next = chunk_get_next_ncnnl(pc);
+      next = pc->GetNextNcNnl();
    }
 } // tokenize_cleanup
 
 
-bool invalid_open_angle_template(chunk_t *prev)
+bool invalid_open_angle_template(Chunk *prev)
 {
    if (prev == nullptr)
    {
@@ -1192,19 +1201,19 @@ bool invalid_open_angle_template(chunk_t *prev)
 }
 
 
-static void check_template(chunk_t *start, bool in_type_cast)
+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);
 
-   chunk_t *prev = chunk_get_prev_ncnnl(start, scope_e::PREPROC);
+   Chunk *prev = start->GetPrevNcNnl(E_Scope::PREPROC);
 
-   if (prev == nullptr)
+   if (prev->IsNullChunk())
    {
       return;
    }
-   chunk_t *end;
-   chunk_t *pc;
+   Chunk *end;
+   Chunk *pc;
 
    if (chunk_is_token(prev, CT_TEMPLATE))
    {
@@ -1214,25 +1223,25 @@ static void check_template(chunk_t *start, bool in_type_cast)
       size_t level  = 1;
       size_t parens = 0;
 
-      for (pc = chunk_get_next_ncnnl(start, scope_e::PREPROC);
-           pc != nullptr;
-           pc = chunk_get_next_ncnnl(pc, scope_e::PREPROC))
+      for (pc = start->GetNextNcNnl(E_Scope::PREPROC);
+           pc->IsNotNullChunk();
+           pc = pc->GetNextNcNnl(E_Scope::PREPROC))
       {
          LOG_FMT(LTEMPL, "%s(%d): type is %s, level is %zu\n",
                  __func__, __LINE__, get_token_name(pc->type), level);
 
          if (  (pc->str[0] == '>')
-            && (pc->len() > 1))
+            && (pc->Len() > 1))
          {
             if (pc->str[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);
+                       __func__, __LINE__, pc->Text(), pc->orig_line, pc->orig_col);
             }
             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);
+                       __func__, __LINE__, pc->Text(), pc->orig_line, pc->orig_col);
                split_off_angle_close(pc);
             }
          }
@@ -1252,11 +1261,11 @@ static void check_template(chunk_t *start, bool in_type_cast)
 
          if (parens == 0)
          {
-            if (chunk_is_str(pc, "<", 1))
+            if (chunk_is_str(pc, "<"))
             {
                level++;
             }
-            else if (chunk_is_str(pc, ">", 1))
+            else if (chunk_is_str(pc, ">"))
             {
                if (level == 0)
                {
@@ -1313,9 +1322,9 @@ static void check_template(chunk_t *start, bool in_type_cast)
       // Scan back and make sure we aren't inside square parenthesis
       bool in_if         = false;
       bool hit_semicolon = false;
-      pc = start;
+      pc = start->GetPrevNcNnl(E_Scope::PREPROC);
 
-      while ((pc = chunk_get_prev_ncnnl(pc, scope_e::PREPROC)) != nullptr)
+      while (pc->IsNotNullChunk())
       {
          if (  (  chunk_is_token(pc, CT_SEMICOLON)
                && hit_semicolon)
@@ -1363,20 +1372,21 @@ static void check_template(chunk_t *start, bool in_type_cast)
             in_if = true;
             break;
          }
+         pc = pc->GetPrevNcNnl(E_Scope::PREPROC);
       }
       /*
        * Scan forward to the angle close
        * If we have a comparison in there, then it can't be a template.
        */
       const int max_token_count = 1024;
-      c_token_t tokens[max_token_count];
+      E_Token   tokens[max_token_count];
       size_t    num_tokens = 1;
 
       tokens[0] = CT_ANGLE_OPEN;
 
-      for (pc = chunk_get_next_ncnnl(start, scope_e::PREPROC);
-           pc != nullptr;
-           pc = chunk_get_next_ncnnl(pc, scope_e::PREPROC))
+      for (pc = start->GetNextNcNnl(E_Scope::PREPROC);
+           pc->IsNotNullChunk();
+           pc = pc->GetNextNcNnl(E_Scope::PREPROC))
       {
          constexpr static auto LCURRENT = LTEMPL;
 
@@ -1388,29 +1398,29 @@ static void check_template(chunk_t *start, bool in_type_cast)
          if (chunk_is_token(pc, CT_BRACE_OPEN))                     // Issue #2886
          {
             // look for the closing brace
-            chunk_t *A = chunk_skip_to_match(pc);
+            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));
-            pc = chunk_get_next(A);
+            pc = A->GetNext();
          }
 
          if (  (tokens[num_tokens - 1] == CT_ANGLE_OPEN)
             && (pc->str[0] == '>')
-            && (pc->len() > 1)
+            && (pc->Len() > 1)
             && (  options::tok_split_gte()
-               || (  (  chunk_is_str(pc, ">>", 2)
-                     || chunk_is_str(pc, ">>>", 3))
+               || (  (  chunk_is_str(pc, ">>")
+                     || chunk_is_str(pc, ">>>"))
                   && (  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);
+                    __func__, __LINE__, pc->Text(), pc->orig_line, pc->orig_col);
 
             split_off_angle_close(pc);
          }
 
-         if (chunk_is_str(pc, "<", 1))
+         if (chunk_is_str(pc, "<"))
          {
             if (  num_tokens > 0 && (tokens[num_tokens - 1] == CT_PAREN_OPEN)
                && invalid_open_angle_template(pc->prev))
@@ -1423,7 +1433,7 @@ static void check_template(chunk_t *start, bool in_type_cast)
                num_tokens++;
             }
          }
-         else if (chunk_is_str(pc, ">", 1))
+         else if (chunk_is_str(pc, ">"))
          {
             if (num_tokens > 0 && (tokens[num_tokens - 1] == CT_PAREN_OPEN))
             {
@@ -1451,7 +1461,7 @@ static void check_template(chunk_t *start, bool in_type_cast)
             {
                break;
             }
-            auto brace_open  = chunk_get_next_ncnnl(pc);
+            auto brace_open  = pc->GetNextNcNnl();
             auto brace_close = chunk_skip_to_match(brace_open);
 
             set_chunk_parent(brace_open, CT_BRACED_INIT_LIST);
@@ -1504,9 +1514,9 @@ static void check_template(chunk_t *start, bool in_type_cast)
 
    if (chunk_is_token(end, CT_ANGLE_CLOSE))
    {
-      pc = chunk_get_next_ncnnl(end, scope_e::PREPROC);
+      pc = end->GetNextNcNnl(E_Scope::PREPROC);
 
-      if (  pc == nullptr
+      if (  pc->IsNullChunk()
          || pc->type != CT_NUMBER)
       {
          LOG_FMT(LTEMPL, "%s(%d): Template detected\n", __func__, __LINE__);
@@ -1529,7 +1539,7 @@ static void check_template(chunk_t *start, bool in_type_cast)
 } // check_template
 
 
-static void check_template_arg(chunk_t *start, chunk_t *end)
+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",
@@ -1547,12 +1557,12 @@ static void check_template_arg(chunk_t *start, chunk_t *end)
    //   pFunc, const QVector<S>& pItems)
    // we need two runs
    // 1. run to test if expression is numeric
-   bool    expressionIsNumeric = false;
-   chunk_t *pc                 = start;
+   bool  expressionIsNumeric = false;
+   Chunk *pc                 = start;
 
    while (pc != end)
    {
-      chunk_t *next = chunk_get_next_ncnnl(pc, scope_e::PREPROC);
+      Chunk *next = pc->GetNextNcNnl(E_Scope::PREPROC);
       // a test "if (next == nullptr)" is not necessary
       chunk_flags_set(pc, PCF_IN_TEMPLATE);
 
@@ -1585,12 +1595,12 @@ static void check_template_arg(chunk_t *start, chunk_t *end)
 
       while (pc != end)
       {
-         chunk_t *next = chunk_get_next_ncnnl(pc, scope_e::PREPROC);
+         Chunk *next = pc->GetNextNcNnl(E_Scope::PREPROC);
          // a test "if (next == nullptr)" is not necessary
          chunk_flags_set(pc, PCF_IN_TEMPLATE);
 
-         chunk_t *prev  = chunk_get_prev_ncnnl(pc, scope_e::PREPROC);
-         chunk_t *prev2 = chunk_get_prev_ncnnl(prev, scope_e::PREPROC);
+         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))
@@ -1607,16 +1617,16 @@ static void check_template_arg(chunk_t *start, chunk_t *end)
 } // check_template_arg
 
 
-static void check_template_args(chunk_t *start, chunk_t *end)
+static void check_template_args(Chunk *start, Chunk *end)
 {
-   std::vector<c_token_t> tokens;
+   std::vector<E_Token> tokens;
 
    // Scan for commas
-   chunk_t *pc;
+   Chunk *pc;
 
-   for (pc = chunk_get_next_ncnnl(start, scope_e::PREPROC);
-        pc != nullptr && pc != end;
-        pc = chunk_get_next_ncnnl(pc, scope_e::PREPROC))
+   for (pc = start->GetNextNcNnl(E_Scope::PREPROC);
+        pc->IsNotNullChunk() && pc != end;
+        pc = pc->GetNextNcNnl(E_Scope::PREPROC))
    {
       switch (pc->type)
       {
@@ -1663,33 +1673,33 @@ static void check_template_args(chunk_t *start, chunk_t *end)
 } // check_template_args
 
 
-static void cleanup_objc_property(chunk_t *start)
+static void cleanup_objc_property(Chunk *start)
 {
    assert(chunk_is_token(start, CT_OC_PROPERTY));
 
-   chunk_t *open_paren = chunk_get_next_type(start, CT_PAREN_OPEN, start->level);
+   Chunk *open_paren = start->GetNextType(CT_PAREN_OPEN, start->level);
 
-   if (open_paren == nullptr)
+   if (open_paren->IsNullChunk())
    {
       LOG_FMT(LTEMPL, "%s(%d): Property is not followed by openning paren\n", __func__, __LINE__);
       return;
    }
    set_chunk_parent(open_paren, start->type);
 
-   chunk_t *tmp = chunk_get_next_type(start, CT_PAREN_CLOSE, start->level);
+   Chunk *tmp = start->GetNextType(CT_PAREN_CLOSE, start->level);
 
-   if (tmp != nullptr)
+   if (tmp->IsNotNullChunk())
    {
       set_chunk_parent(tmp, start->type);
-      tmp = chunk_get_next_ncnnl(tmp);
+      tmp = tmp->GetNextNcNnl();
 
-      if (tmp != nullptr)
+      if (tmp->IsNotNullChunk())
       {
          chunk_flags_set(tmp, PCF_STMT_START | PCF_EXPR_START);
 
-         tmp = chunk_get_next_type(tmp, CT_SEMICOLON, start->level);
+         tmp = tmp->GetNextType(CT_SEMICOLON, start->level);
 
-         if (tmp != nullptr)
+         if (tmp->IsNotNullChunk())
          {
             set_chunk_parent(tmp, start->type);
          }
@@ -1700,18 +1710,18 @@ static void cleanup_objc_property(chunk_t *start)
 }
 
 
-static void mark_selectors_in_property_with_open_paren(chunk_t *open_paren)
+static void mark_selectors_in_property_with_open_paren(Chunk *open_paren)
 {
    assert(chunk_is_token(open_paren, CT_PAREN_OPEN));
 
-   chunk_t *tmp = open_paren;
+   Chunk *tmp = open_paren;
 
    while (  tmp != nullptr
          && tmp->type != CT_PAREN_CLOSE)
    {
       if (  chunk_is_token(tmp, CT_WORD)
-         && (  chunk_is_str(tmp, "setter", 6)
-            || chunk_is_str(tmp, "getter", 6)))
+         && (  chunk_is_str(tmp, "setter")
+            || chunk_is_str(tmp, "getter")))
       {
          tmp = tmp->next;
 
@@ -1720,7 +1730,7 @@ static void mark_selectors_in_property_with_open_paren(chunk_t *open_paren)
                && tmp->type != CT_PAREN_CLOSE)
          {
             if (  chunk_is_token(tmp, CT_WORD)
-               || chunk_is_str(tmp, ":", 1))
+               || chunk_is_str(tmp, ":"))
             {
                set_chunk_type(tmp, CT_OC_SEL_NAME);
             }
@@ -1735,11 +1745,11 @@ static void mark_selectors_in_property_with_open_paren(chunk_t *open_paren)
 }
 
 
-static void mark_attributes_in_property_with_open_paren(chunk_t *open_paren)
+static void mark_attributes_in_property_with_open_paren(Chunk *open_paren)
 {
    assert(chunk_is_token(open_paren, CT_PAREN_OPEN));
 
-   chunk_t *tmp = open_paren;
+   Chunk *tmp = open_paren;
 
    while (  tmp != nullptr
          && tmp->type != CT_PAREN_CLOSE)
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/tokenize_cleanup.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/tokenize_cleanup.h
index 4d85cfc4..1a75cde9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/tokenize_cleanup.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/tokenize_cleanup.h
@@ -25,7 +25,7 @@ void tokenize_cleanup(void);
 void tokenize_trailing_return_types(void);
 
 
-void split_off_angle_close(chunk_t *pc);
+void split_off_angle_close(Chunk *pc);
 
 
 #endif /* TOKENIZ_CLEANUP_H_INCLUDED */
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/unc_ctype.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/unc_ctype.h
index 50b7a6f3..50b7a6f3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/unc_ctype.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/unc_ctype.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/unc_text.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/unc_text.cpp
index 1f96a67c..1f96a67c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/unc_text.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/unc_text.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/unc_text.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/unc_text.h
index dd678f16..dd678f16 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/unc_text.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/unc_text.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/unc_tools.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/unc_tools.cpp
index f20b5c4a..20aa4b99 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/unc_tools.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/unc_tools.cpp
@@ -48,11 +48,11 @@ static size_t tokenCounter;
  */
 void prot_the_line(const char *func_name, int theLine, unsigned int actual_line, size_t partNumber)
 {
-   prot_the_line_pc(chunk_get_head(), func_name, theLine, actual_line, partNumber);
+   prot_the_line_pc(Chunk::GetHead(), func_name, theLine, actual_line, partNumber);
 }
 
 
-void prot_the_line_pc(chunk_t *pc_sub, const char *func_name, int theLine, unsigned int actual_line, size_t partNumber)
+void prot_the_line_pc(Chunk *pc_sub, const char *func_name, int theLine, unsigned int actual_line, size_t partNumber)
 {
    if (actual_line == 0)
    {
@@ -69,7 +69,7 @@ void prot_the_line_pc(chunk_t *pc_sub, const char *func_name, int theLine, unsig
    tokenCounter = 0;
    LOG_FMT(LGUY, "Prot_the_line:(%s:%d)(%zu)\n", func_name, theLine, counter);
 
-   for (chunk_t *pc = pc_sub; pc != nullptr; pc = pc->next)
+   for (Chunk *pc = pc_sub; pc->IsNotNullChunk(); pc = pc->GetNext())
    {
       if (pc->orig_line == actual_line)
       {
@@ -106,7 +106,7 @@ void prot_the_line_pc(chunk_t *pc_sub, const char *func_name, int theLine, unsig
             }
             else
             {
-               LOG_FMT(LGUY, "text() '%s', ", pc->text());
+               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),
@@ -154,7 +154,7 @@ void prot_all_lines(const char *func_name, int theLine)
 
    LOG_FMT(LGUY, "Prot_all_lines:(%s:%d)(%zu)\n", func_name, theLine, counter);
 
-   for (chunk_t *pc = chunk_get_head(); pc != nullptr; pc = pc->next)
+   for (Chunk *pc = Chunk::GetHead(); pc->IsNotNullChunk(); pc = pc->GetNext())
    {
       tokenCounter++;
 
@@ -188,7 +188,7 @@ void prot_all_lines(const char *func_name, int theLine)
       }
       else
       {
-         LOG_FMT(LGUY, "text() '%s', ", pc->text());
+         LOG_FMT(LGUY, "Text() '%s', ", pc->Text());
       }
       LOG_FMT(LGUY, " column is %zu, type is %s\n",
               pc->column, get_token_name(pc->type));
@@ -210,20 +210,20 @@ void examine_Data(const char *func_name, int theLine, int what)
 {
    LOG_FMT(LGUY, "\n%s:", func_name);
 
-   chunk_t *pc;
+   Chunk *pc;
 
    switch (what)
    {
    case 1:
 
-      for (pc = chunk_get_head(); pc != nullptr; pc = pc->next)
+      for (pc = Chunk::GetHead(); pc->IsNotNullChunk(); pc = pc->GetNext())
       {
          if (  chunk_is_token(pc, CT_SQUARE_CLOSE)
             || chunk_is_token(pc, 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->orig_col, pc->orig_col_end);
          }
       }
 
@@ -232,7 +232,7 @@ void examine_Data(const char *func_name, int theLine, int what)
    case 2:
       LOG_FMT(LGUY, "2:(%d)\n", theLine);
 
-      for (pc = chunk_get_head(); pc != nullptr; pc = pc->next)
+      for (pc = Chunk::GetHead(); pc->IsNotNullChunk(); pc = pc->GetNext())
       {
          if (pc->orig_line == 7)
          {
@@ -242,7 +242,7 @@ void examine_Data(const char *func_name, int theLine, int what)
             }
             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->orig_line, pc->Text(), get_token_name(pc->type), pc->orig_col, pc->column);
             }
          }
       }
@@ -252,7 +252,7 @@ void examine_Data(const char *func_name, int theLine, int what)
    case 3:
       LOG_FMT(LGUY, "3:(%d)\n", theLine);
 
-      for (pc = chunk_get_head(); pc != nullptr; pc = pc->next)
+      for (pc = Chunk::GetHead(); pc->IsNotNullChunk(); pc = pc->GetNext())
       {
          if (chunk_is_token(pc, CT_NEWLINE))
          {
@@ -260,7 +260,7 @@ void examine_Data(const char *func_name, int theLine, int what)
          }
          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->orig_line, pc->Text(), get_token_name(pc->type), pc->orig_col, pc->column);
          }
       }
 
@@ -269,7 +269,7 @@ void examine_Data(const char *func_name, int theLine, int what)
    case 4:
       LOG_FMT(LGUY, "4:(%d)\n", theLine);
 
-      for (pc = chunk_get_head(); pc != nullptr; pc = pc->next)
+      for (pc = Chunk::GetHead(); pc->IsNotNullChunk(); pc = pc->GetNext())
       {
          if (pc->orig_line == 6)
          {
@@ -279,7 +279,7 @@ void examine_Data(const char *func_name, int theLine, int what)
             }
             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->orig_line, pc->Text(), get_token_name(pc->type), pc->orig_col, pc->column);
             }
          }
       }
@@ -308,7 +308,7 @@ void dump_out(unsigned int type)
 
    if (D_file != nullptr)
    {
-      for (chunk_t *pc = chunk_get_head(); pc != nullptr; pc = pc->next)
+      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));
@@ -358,7 +358,7 @@ void dump_out(unsigned int type)
 
          if (pc->type != CT_NEWLINE)
          {
-            fprintf(D_file, "  text %s\n", pc->text());
+            fprintf(D_file, "  Text %s\n", pc->Text());
          }
       }
 
@@ -369,10 +369,10 @@ void dump_out(unsigned int type)
 
 void dump_in(unsigned int type)
 {
-   char    buffer[256];
-   bool    aNewChunkIsFound = false;
-   chunk_t chunk;
-   char    dumpFileName[300];
+   char  buffer[256];
+   bool  aNewChunkIsFound = false;
+   Chunk chunk;
+   char  dumpFileName[300];
 
    if (cpd.dumped_file == nullptr)
    {
@@ -402,7 +402,7 @@ void dump_in(unsigned int type)
                aNewChunkIsFound = false;
                // add the chunk in the list
                chunk_add_before(&chunk, nullptr);
-               chunk.reset();
+               chunk.Reset();
                aNewChunkIsFound = true;
                continue;
             }
@@ -420,7 +420,7 @@ void dump_in(unsigned int type)
 
             if (strcasecmp(parts[0], "type") == 0)
             {
-               c_token_t tokenName = find_token_name(parts[1]);
+               E_Token tokenName = find_token_name(parts[1]);
                set_chunk_type(&chunk, tokenName);
             }
             else if (strcasecmp(parts[0], "orig_line") == 0)
@@ -469,7 +469,7 @@ void dump_in(unsigned int type)
             if (first == '[')
             {
                aNewChunkIsFound = true;
-               chunk.reset();
+               chunk.Reset();
             }
          }
       }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/unc_tools.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/unc_tools.h
index 3ee393d7..acd199b9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/unc_tools.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/unc_tools.h
@@ -21,7 +21,7 @@
 void prot_the_line(const char *func_name, int theLine, unsigned int actual_line, size_t partNumber);
 
 
-void prot_the_line_pc(chunk_t *pc_sub, const char *func_name, int theLine, unsigned int actual_line, size_t partNumber);
+void prot_the_line_pc(Chunk *pc_sub, const char *func_name, int theLine, unsigned int actual_line, size_t partNumber);
 
 
 void prot_all_lines(const char *func_name, int theLine);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/uncrustify.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/uncrustify.cpp
index 6de98934..ee5dac2b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/uncrustify.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/uncrustify.cpp
@@ -128,10 +128,10 @@ static void add_file_header();
 static void add_file_footer();
 
 
-static void add_func_header(c_token_t type, file_mem &fm);
+static void add_func_header(E_Token type, file_mem &fm);
 
 
-static void add_msg_header(c_token_t type, file_mem &fm);
+static void add_msg_header(E_Token type, file_mem &fm);
 
 
 static void process_source_list(const char *source_list, const char *prefix, const char *suffix, bool no_backup, bool keep_mtime);
@@ -226,8 +226,8 @@ void usage_error(const char *msg)
 static void tease()
 {
    fprintf(stdout,
-           "There are currently %d options and minimal documentation.\n"
-           "Try UniversalIndentGUI and good luck.\n", (int)get_option_count());
+           "There are currently %zu options and minimal documentation.\n"
+           "Try UniversalIndentGUI and good luck.\n", get_option_count());
 }
 
 
@@ -410,11 +410,6 @@ int main(int argc, char *argv[])
 
    setup_crash_handling();
 
-   init_keywords();
-
-   // check keyword sort
-   assert(keywords_are_sorted());
-
    // Build options map
    register_options();
 
@@ -978,10 +973,12 @@ int main(int argc, char *argv[])
       cpd.filename = "stdin";
 
       // Done reading from stdin
-      LOG_FMT(LSYS, "Parsing: %d bytes (%d chars) from stdin as language %s\n",
-              (int)fm.raw.size(), (int)fm.data.size(),
+      LOG_FMT(LSYS, "%s(%d): Parsing: %zu bytes (%zu chars) from stdin as language %s\n",
+              __func__, __LINE__, fm.raw.size(), fm.data.size(),
               language_name_from_flags(cpd.lang_flags));
 
+      // Issue #3427
+      init_keywords_for_language();
       uncrustify_file(fm, stdout, parsed_file, dump_file);
    }
    else if (source_file != nullptr)
@@ -1091,7 +1088,7 @@ static void process_source_list(const char *source_list,
             fname[len] = '/';
          }
       }
-      LOG_FMT(LFILELIST, "%3d] %s\n", line, fname);
+      LOG_FMT(LFILELIST, "%3d file to uncrustify: %s\n", line, fname);
 
       if (fname[0] != '#')
       {
@@ -1506,8 +1503,14 @@ static void do_source_file(const char *filename_in,
       cpd.error_count++;
       return;
    }
-   LOG_FMT(LSYS, "Parsing: %s as language %s\n",
-           filename_in, language_name_from_flags(cpd.lang_flags));
+   LOG_FMT(LSYS, "%s(%d): Parsing: %s as language %s\n",
+           __func__, __LINE__, filename_in, language_name_from_flags(cpd.lang_flags));
+
+   // check keyword sort
+   assert(keywords_are_sorted());
+
+   // Issue #3353
+   init_keywords_for_language();
 
    cpd.filename = filename_in;
 
@@ -1645,30 +1648,32 @@ static void do_source_file(const char *filename_in,
 
 static void add_file_header()
 {
-   if (!chunk_is_comment(chunk_get_head()))
+   // don't add the file header if running as frag
+   if (  !Chunk::GetHead()->IsComment()
+      && !cpd.frag)
    {
       // TODO: detect the typical #ifndef FOO / #define FOO sequence
-      tokenize(cpd.file_hdr.data, chunk_get_head());
+      tokenize(cpd.file_hdr.data, Chunk::GetHead());
    }
 }
 
 
 static void add_file_footer()
 {
-   chunk_t *pc = chunk_get_tail();
+   Chunk *pc = Chunk::GetTail();
 
    // Back up if the file ends with a newline
-   if (  pc != nullptr
+   if (  pc->IsNotNullChunk()
       && chunk_is_newline(pc))
    {
-      pc = chunk_get_prev(pc);
+      pc = pc->GetPrev();
    }
 
-   if (  pc != nullptr
-      && (  !chunk_is_comment(pc)
-         || !chunk_is_newline(chunk_get_prev(pc))))
+   if (  pc->IsNotNullChunk()
+      && (  !pc->IsComment()
+         || !chunk_is_newline(pc->GetPrev())))
    {
-      pc = chunk_get_tail();
+      pc = Chunk::GetTail();
 
       if (!chunk_is_newline(pc))
       {
@@ -1680,14 +1685,14 @@ static void add_file_footer()
 }
 
 
-static void add_func_header(c_token_t type, file_mem &fm)
+static void add_func_header(E_Token type, file_mem &fm)
 {
-   chunk_t *pc;
-   chunk_t *ref;
-   chunk_t *tmp;
-   bool    do_insert;
+   Chunk *pc;
+   Chunk *ref;
+   Chunk *tmp;
+   bool  do_insert;
 
-   for (pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next_ncnnlnp(pc))
+   for (pc = Chunk::GetHead(); pc->IsNotNullChunk(); pc = pc->GetNextNcNnlNpp())
    {
       if (pc->type != type)
       {
@@ -1705,15 +1710,15 @@ static void add_func_header(c_token_t type, file_mem &fm)
 
       if (  chunk_is_token(ref, CT_CLASS)
          && get_chunk_parent_type(ref) == CT_NONE
-         && ref->next)
+         && ref->GetNext())
       {
-         ref = ref->next;
+         ref = ref->GetNext();
 
          if (  chunk_is_token(ref, CT_TYPE)
             && get_chunk_parent_type(ref) == type
-            && ref->next)
+            && ref->GetNext())
          {
-            ref = ref->next;
+            ref = ref->GetNext();
 
             if (  chunk_is_token(ref, CT_SEMICOLON)
                && ref->level == pc->level)
@@ -1727,12 +1732,12 @@ static void add_func_header(c_token_t type, file_mem &fm)
 
       if (  chunk_is_token(ref, CT_FUNC_DEF)
          && get_chunk_parent_type(ref) == CT_NONE
-         && ref->next)
+         && ref->GetNext())
       {
          int found_brace = 0;                                 // Set if a close brace is found before a newline
 
          while (  ref->type != CT_NEWLINE
-               && (ref = ref->next)) // TODO: is the assignment of ref wanted here?, better move it to the loop
+               && (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))
             {
@@ -1754,7 +1759,8 @@ static void add_func_header(c_token_t type, file_mem &fm)
        */
       ref = pc;
 
-      while ((ref = chunk_get_prev(ref)) != nullptr)
+      while (  (ref = ref->GetPrev())
+            && ref->IsNotNullChunk())
       {
          // Bail if we change level or find an access specifier colon
          if (  ref->level != pc->level
@@ -1767,23 +1773,23 @@ static void add_func_header(c_token_t type, file_mem &fm)
          // If we hit an angle close, back up to the angle open
          if (chunk_is_token(ref, CT_ANGLE_CLOSE))
          {
-            ref = chunk_get_prev_type(ref, CT_ANGLE_OPEN, ref->level, scope_e::PREPROC);
+            ref = ref->GetPrevType(CT_ANGLE_OPEN, ref->level, E_Scope::PREPROC);
             continue;
          }
 
          // Bail if we hit a preprocessor and cmt_insert_before_preproc is false
          if (ref->flags.test(PCF_IN_PREPROC))
          {
-            tmp = chunk_get_prev_type(ref, CT_PREPROC, ref->level);
+            tmp = ref->GetPrevType(CT_PREPROC, ref->level);
 
-            if (  tmp != nullptr
+            if (  tmp->IsNotNullChunk()
                && get_chunk_parent_type(tmp) == CT_PP_IF)
             {
-               tmp = chunk_get_prev_nnl(tmp);
+               tmp = tmp->GetPrevNnl();
 
                log_rule_B("cmt_insert_before_preproc");
 
-               if (  chunk_is_comment(tmp)
+               if (  tmp->IsComment()
                   && !options::cmt_insert_before_preproc())
                {
                   break;
@@ -1792,8 +1798,8 @@ static void add_func_header(c_token_t type, file_mem &fm)
          }
 
          // Ignore 'right' comments
-         if (  chunk_is_comment(ref)
-            && chunk_is_newline(chunk_get_prev(ref)))
+         if (  ref->IsComment()
+            && chunk_is_newline(ref->GetPrev()))
          {
             break;
          }
@@ -1808,24 +1814,24 @@ static void add_func_header(c_token_t type, file_mem &fm)
          }
       }
 
-      if (  ref == nullptr
-         && !chunk_is_comment(chunk_get_head())
-         && get_chunk_parent_type(chunk_get_head()) == type)
+      if (  ref->IsNullChunk()
+         && !Chunk::GetHead()->IsComment()
+         && get_chunk_parent_type(Chunk::GetHead()) == type)
       {
          /**
           * In addition to testing for preceding semicolons, closing braces, etc.,
           * we need to also account for the possibility that the function declaration
           * or definition occurs at the very beginning of the file
           */
-         tokenize(fm.data, chunk_get_head());
+         tokenize(fm.data, Chunk::GetHead());
       }
       else if (do_insert)
       {
          // Insert between after and ref
-         chunk_t *after = chunk_get_next_ncnnl(ref);
+         Chunk *after = ref->GetNextNcNnl();
          tokenize(fm.data, after);
 
-         for (tmp = chunk_get_next(ref); tmp != after; tmp = chunk_get_next(tmp))
+         for (tmp = ref->GetNext(); tmp != after; tmp = tmp->GetNext())
          {
             tmp->level = after->level;
          }
@@ -1834,14 +1840,14 @@ static void add_func_header(c_token_t type, file_mem &fm)
 } // add_func_header
 
 
-static void add_msg_header(c_token_t type, file_mem &fm)
+static void add_msg_header(E_Token type, file_mem &fm)
 {
-   chunk_t *pc;
-   chunk_t *ref;
-   chunk_t *tmp;
-   bool    do_insert;
+   Chunk *pc;
+   Chunk *ref;
+   Chunk *tmp;
+   bool  do_insert;
 
-   for (pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next_ncnnlnp(pc))
+   for (pc = Chunk::GetHead(); pc->IsNotNullChunk(); pc = pc->GetNextNcNnlNpp())
    {
       if (pc->type != type)
       {
@@ -1855,7 +1861,8 @@ static void add_msg_header(c_token_t type, file_mem &fm)
        */
       ref = pc;
 
-      while ((ref = chunk_get_prev(ref)) != nullptr)
+      while (  (ref = ref->GetPrev()) != nullptr
+            && ref->IsNotNullChunk())
       {
          // ignore the CT_TYPE token that is the result type
          if (  ref->level != pc->level
@@ -1868,23 +1875,23 @@ static void add_msg_header(c_token_t type, file_mem &fm)
          // If we hit a parentheses around return type, back up to the open parentheses
          if (chunk_is_token(ref, CT_PAREN_CLOSE))
          {
-            ref = chunk_get_prev_type(ref, CT_PAREN_OPEN, ref->level, scope_e::PREPROC);
+            ref = ref->GetPrevType(CT_PAREN_OPEN, ref->level, E_Scope::PREPROC);
             continue;
          }
 
          // Bail if we hit a preprocessor and cmt_insert_before_preproc is false
          if (ref->flags.test(PCF_IN_PREPROC))
          {
-            tmp = chunk_get_prev_type(ref, CT_PREPROC, ref->level);
+            tmp = ref->GetPrevType(CT_PREPROC, ref->level);
 
-            if (  tmp != nullptr
+            if (  tmp->IsNotNullChunk()
                && get_chunk_parent_type(tmp) == CT_PP_IF)
             {
-               tmp = chunk_get_prev_nnl(tmp);
+               tmp = tmp->GetPrevNnl();
 
                log_rule_B("cmt_insert_before_preproc");
 
-               if (  chunk_is_comment(tmp)
+               if (  tmp->IsComment()
                   && !options::cmt_insert_before_preproc())
                {
                   break;
@@ -1896,13 +1903,13 @@ static void add_msg_header(c_token_t type, file_mem &fm)
             && (  ref->flags.test(PCF_IN_PREPROC)
                || chunk_is_token(ref, CT_OC_SCOPE)))
          {
-            ref = chunk_get_prev(ref);
+            ref = ref->GetPrev();
 
-            if (ref != nullptr)
+            if (ref->IsNotNullChunk())
             {
                // Ignore 'right' comments
                if (  chunk_is_newline(ref)
-                  && chunk_is_comment(chunk_get_prev(ref)))
+                  && ref->GetPrev()->IsComment())
                {
                   break;
                }
@@ -1915,10 +1922,10 @@ static void add_msg_header(c_token_t type, file_mem &fm)
       if (do_insert)
       {
          // Insert between after and ref
-         chunk_t *after = chunk_get_next_ncnnl(ref);
+         Chunk *after = ref->GetNextNcNnl();
          tokenize(fm.data, after);
 
-         for (tmp = chunk_get_next(ref); tmp != after; tmp = chunk_get_next(tmp))
+         for (tmp = ref->GetNext(); tmp != after; tmp = tmp->GetNext())
          {
             tmp->level = after->level;
          }
@@ -1938,9 +1945,9 @@ static void uncrustify_start(const deque<int> &data)
    // Get the column for the fragment indent
    if (cpd.frag)
    {
-      chunk_t *pc = chunk_get_head();
+      Chunk *pc = Chunk::GetHead();
 
-      cpd.frag_cols = (pc != nullptr) ? pc->orig_col : 0;
+      cpd.frag_cols = pc->orig_col;
    }
 
    // Add the file header
@@ -2116,6 +2123,8 @@ void uncrustify_file(const file_mem &fm, FILE *pfout, const char *parsed_file,
       }
       // Add parens
       do_parens();
+      do_parens_assign();
+      do_parens_return();
 
       // Modify line breaks as needed
       bool first = true;
@@ -2358,9 +2367,14 @@ void uncrustify_file(const file_mem &fm, FILE *pfout, const char *parsed_file,
          // create the tracking file
          FILE *t_file;
          t_file = fopen(cpd.html_file, "wb");
-         output_text(t_file);
-         fclose(t_file);
-         exit(EX_OK);
+
+         if (t_file)
+         {
+            output_text(t_file);
+            fclose(t_file);
+            exit(EX_OK);
+         }
+         exit(EX_USAGE);
       }
    }
 
@@ -2419,11 +2433,11 @@ void uncrustify_file(const file_mem &fm, FILE *pfout, const char *parsed_file,
 void uncrustify_end()
 {
    // Free all the memory
-   chunk_t *pc;
+   Chunk *pc;
 
    cpd.unc_stage = unc_stage_e::CLEANUP;
 
-   while ((pc = chunk_get_head()) != nullptr)
+   while ((pc = Chunk::GetHead())->IsNotNullChunk())
    {
       chunk_del(pc);
    }
@@ -2446,7 +2460,7 @@ void uncrustify_end()
 }
 
 
-const char *get_token_name(c_token_t token)
+const char *get_token_name(E_Token token)
 {
    if (  token >= 0
       && (token < static_cast<int> ARRAY_SIZE(token_names))
@@ -2458,7 +2472,7 @@ const char *get_token_name(c_token_t token)
 }
 
 
-c_token_t find_token_name(const char *text)
+E_Token find_token_name(const char *text)
 {
    if (  text != nullptr
       && (*text != 0))
@@ -2467,7 +2481,7 @@ c_token_t find_token_name(const char *text)
       {
          if (strcasecmp(text, token_names[idx]) == 0)
          {
-            return(static_cast<c_token_t>(idx));
+            return(static_cast<E_Token>(idx));
          }
       }
    }
@@ -2496,18 +2510,18 @@ struct lang_name_t
 
 static lang_name_t language_names[] =
 {
-   { "C",        LANG_C                        },
-   { "CPP",      LANG_CPP                      },
-   { "D",        LANG_D                        },
-   { "CS",       LANG_CS                       },
-   { "VALA",     LANG_VALA                     },
-   { "JAVA",     LANG_JAVA                     },
-   { "PAWN",     LANG_PAWN                     },
-   { "OC",       LANG_OC                       },
-   { "OC+",      LANG_OC | LANG_CPP            },
-   { "CS+",      LANG_CS | LANG_CPP            },
-   { "ECMA",     LANG_ECMA                     },
-   { "C-Header", LANG_OC | LANG_CPP | FLAG_HDR },
+   { "C",        LANG_C                       },      // 0x0001
+   { "CPP",      LANG_CPP                     },      // 0x0002
+   { "D",        LANG_D                       },      // 0x0004
+   { "CS",       LANG_CS                      },      // 0x0008
+   { "JAVA",     LANG_JAVA                    },      // 0x0010
+   { "OC",       LANG_OC                      },      // 0x0020
+   { "VALA",     LANG_VALA                    },      // 0x0040
+   { "PAWN",     LANG_PAWN                    },      // 0x0080
+   { "ECMA",     LANG_ECMA                    },      // 0x0100
+   { "OC+",      LANG_OC | LANG_CPP           },      // 0x0020 + 0x0002
+   { "CS+",      LANG_CS | LANG_CPP           },      // 0x0008 + 0x0002
+   { "C-Header", LANG_C | LANG_CPP | FLAG_HDR },      // 0x0001 + 0x0002 + 0x2000 = 0x2022
 };
 
 
@@ -2560,29 +2574,32 @@ struct lang_ext_t
 struct lang_ext_t language_exts[] =
 {
    { ".c",    "C"        },
+   { ".c++",  "CPP"      },
+   { ".cc",   "CPP"      },
+   { ".cp",   "CPP"      },
    { ".cpp",  "CPP"      },
-   { ".d",    "D"        },
    { ".cs",   "CS"       },
-   { ".vala", "VALA"     },
-   { ".java", "JAVA"     },
-   { ".pawn", "PAWN"     },
-   { ".p",    "PAWN"     },
-   { ".sma",  "PAWN"     },
-   { ".inl",  "PAWN"     },
-   { ".h",    "C-Header" },
    { ".cxx",  "CPP"      },
+   { ".d",    "D"        },
+   { ".di",   "D"        },
+   { ".es",   "ECMA"     },
+   { ".h",    "C-Header" },
+   { ".h++",  "CPP"      },
+   { ".hh",   "CPP"      },
+   { ".hp",   "CPP"      },
    { ".hpp",  "CPP"      },
    { ".hxx",  "CPP"      },
-   { ".cc",   "CPP"      },
-   { ".cp",   "CPP"      },
-   { ".C",    "CPP"      },
-   { ".CPP",  "CPP"      },
-   { ".c++",  "CPP"      },
-   { ".di",   "D"        },
+   { ".inl",  "PAWN"     },
+   { ".java", "JAVA"     },
+   { ".js",   "ECMA"     },
    { ".m",    "OC"       },
    { ".mm",   "OC+"      },
+   { ".p",    "PAWN"     },
+   { ".pawn", "PAWN"     },
+   { ".sma",  "PAWN"     },
    { ".sqc",  "C"        },  // embedded SQL
-   { ".es",   "ECMA"     },
+   { ".sql",  "SQL"      },
+   { ".vala", "VALA"     },
 };
 
 
@@ -2662,11 +2679,11 @@ static size_t language_flags_from_filename(const char *filename)
       }
    }
 
-   for (auto &lanugage : language_exts)
+   for (auto &language : language_exts)
    {
-      if (ends_with(filename, lanugage.ext))
+      if (ends_with(filename, language.ext))
       {
-         return(language_flags_from_name(lanugage.name));
+         return(language_flags_from_name(language.name));
       }
    }
 
@@ -2679,13 +2696,13 @@ static size_t language_flags_from_filename(const char *filename)
       }
    }
 
-   for (auto &lanugage : language_exts)
+   for (auto &language : language_exts)
    {
-      if (ends_with(filename, lanugage.ext, false))
+      if (ends_with(filename, language.ext, false))
       {
-         return(language_flags_from_name(lanugage.name));
+         return(language_flags_from_name(language.name));
       }
    }
 
    return(LANG_C);
-}
+} // language_flags_from_filename
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/uncrustify.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/uncrustify.h
index 4b6872c7..1f85b993 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/uncrustify.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/uncrustify.h
@@ -22,7 +22,7 @@ void uncrustify_file(const file_mem &fm, FILE *pfout, const char *parsed_file, c
 void uncrustify_end();
 
 
-const char *get_token_name(c_token_t token);
+const char *get_token_name(E_Token token);
 
 
 /**
@@ -40,7 +40,7 @@ const char *language_name_from_flags(size_t lang);
  *
  * @return token, will be CT_NONE on failure to match
  */
-c_token_t find_token_name(const char *text);
+E_Token find_token_name(const char *text);
 
 std::string pcf_flags_str(pcf_flags_t flags);
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/uncrustify_emscripten.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/uncrustify_emscripten.cpp
index 2ba7d091..a336fea4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/uncrustify_emscripten.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/uncrustify_emscripten.cpp
@@ -40,7 +40,7 @@
  *   --file, -f ( use uncrustify( string _file ) )
  *   --show ( use log_type_show_name( bool ) )
  *   --frag ( use uncrustify( string _file, bool frag = true ) )
- *   --type ( use add_keyword( string _type, c_token_t type ) )
+ *   --type ( use add_keyword( string _type, E_Token type ) )
  *   -l ( use uncrustify() )
  *   --parsed, -p  ( use debug() )
  */
@@ -173,7 +173,7 @@ int load_option_fileChar(char *configString)
  * @param tag:  keyword that is going to be added
  * @param type: type of the keyword
  */
-void _add_keyword(string tag, c_token_t type)
+void _add_keyword(string tag, E_Token type)
 {
    if (tag.empty())
    {
@@ -524,8 +524,8 @@ intptr_t _uncrustify(intptr_t _file, lang_flag_e langIDX, bool frag, bool defer)
       return(0);
    }
    // Done reading from stdin
-   LOG_FMT(LSYS, "Parsing: %d bytes (%d chars) from stdin as language %s\n",
-           (int)fm.raw.size(), (int)fm.data.size(),
+   LOG_FMT(LSYS, "Parsing: %zu bytes (%zu chars) from stdin as language %s\n",
+           fm.raw.size(), fm.data.size(),
            language_name_from_flags(cpd.lang_flags));
 
 
@@ -799,305 +799,305 @@ EMSCRIPTEN_BINDINGS(MainModule)
       .value("GUY98", log_sev_t::LGUY98)
       .value("GUY", log_sev_t::LGUY);
 
-   enum_<c_token_t>("TokenType")
-      .value("NONE", c_token_t::CT_NONE)
-      .value("EOF", c_token_t::CT_EOF)
-      .value("UNKNOWN", c_token_t::CT_UNKNOWN)
-      .value("JUNK", c_token_t::CT_JUNK)
-      .value("WHITESPACE", c_token_t::CT_WHITESPACE)
-      .value("SPACE", c_token_t::CT_SPACE)
-      .value("NEWLINE", c_token_t::CT_NEWLINE)
-      .value("NL_CONT", c_token_t::CT_NL_CONT)
-      .value("COMMENT_CPP", c_token_t::CT_COMMENT_CPP)
-      .value("COMMENT", c_token_t::CT_COMMENT)
-      .value("COMMENT_MULTI", c_token_t::CT_COMMENT_MULTI)
-      .value("COMMENT_EMBED", c_token_t::CT_COMMENT_EMBED)
-      .value("COMMENT_START", c_token_t::CT_COMMENT_START)
-      .value("COMMENT_END", c_token_t::CT_COMMENT_END)
-      .value("COMMENT_WHOLE", c_token_t::CT_COMMENT_WHOLE)
-      .value("COMMENT_ENDIF", c_token_t::CT_COMMENT_ENDIF)
-      .value("IGNORED", c_token_t::CT_IGNORED)
-      .value("WORD", c_token_t::CT_WORD)
-      .value("NUMBER", c_token_t::CT_NUMBER)
-      .value("NUMBER_FP", c_token_t::CT_NUMBER_FP)
-      .value("STRING", c_token_t::CT_STRING)
-      .value("STRING_MULTI", c_token_t::CT_STRING_MULTI)
-      .value("IF", c_token_t::CT_IF)
-      .value("ELSE", c_token_t::CT_ELSE)
-      .value("ELSEIF", c_token_t::CT_ELSEIF)
-      .value("FOR", c_token_t::CT_FOR)
-      .value("WHILE", c_token_t::CT_WHILE)
-      .value("WHILE_OF_DO", c_token_t::CT_WHILE_OF_DO)
-      .value("SWITCH", c_token_t::CT_SWITCH)
-      .value("CASE", c_token_t::CT_CASE)
-      .value("DO", c_token_t::CT_DO)
-      .value("SYNCHRONIZED", c_token_t::CT_SYNCHRONIZED)
-      .value("VOLATILE", c_token_t::CT_VOLATILE)
-      .value("TYPEDEF", c_token_t::CT_TYPEDEF)
-      .value("STRUCT", c_token_t::CT_STRUCT)
-      .value("ENUM", c_token_t::CT_ENUM)
-      .value("ENUM_CLASS", c_token_t::CT_ENUM_CLASS)
-      .value("SIZEOF", c_token_t::CT_SIZEOF)
-      .value("DECLTYPE", c_token_t::CT_DECLTYPE)
-      .value("RETURN", c_token_t::CT_RETURN)
-      .value("BREAK", c_token_t::CT_BREAK)
-      .value("UNION", c_token_t::CT_UNION)
-      .value("GOTO", c_token_t::CT_GOTO)
-      .value("CONTINUE", c_token_t::CT_CONTINUE)
-      .value("C_CAST", c_token_t::CT_C_CAST)
-      .value("CPP_CAST", c_token_t::CT_CPP_CAST)
-      .value("D_CAST", c_token_t::CT_D_CAST)
-      .value("TYPE_CAST", c_token_t::CT_TYPE_CAST)
-      .value("TYPENAME", c_token_t::CT_TYPENAME)
-      .value("TEMPLATE", c_token_t::CT_TEMPLATE)
-      .value("WHERE_SPEC", c_token_t::CT_WHERE_SPEC)
-      .value("ASSIGN", c_token_t::CT_ASSIGN)
-      .value("ASSIGN_NL", c_token_t::CT_ASSIGN_NL)
-      .value("SASSIGN", c_token_t::CT_SASSIGN)
-      .value("ASSIGN_DEFAULT_ARG", c_token_t::CT_ASSIGN_DEFAULT_ARG)
-      .value("ASSIGN_FUNC_PROTO", c_token_t::CT_ASSIGN_FUNC_PROTO)
-      .value("COMPARE", c_token_t::CT_COMPARE)
-      .value("SCOMPARE", c_token_t::CT_SCOMPARE)
-      .value("BOOL", c_token_t::CT_BOOL)
-      .value("SBOOL", c_token_t::CT_SBOOL)
-      .value("ARITH", c_token_t::CT_ARITH)
-      .value("SARITH", c_token_t::CT_SARITH)
-      .value("CARET", c_token_t::CT_CARET)
-      .value("DEREF", c_token_t::CT_DEREF)
-      .value("INCDEC_BEFORE", c_token_t::CT_INCDEC_BEFORE)
-      .value("INCDEC_AFTER", c_token_t::CT_INCDEC_AFTER)
-      .value("MEMBER", c_token_t::CT_MEMBER)
-      .value("DC_MEMBER", c_token_t::CT_DC_MEMBER)
-      .value("C99_MEMBER", c_token_t::CT_C99_MEMBER)
-      .value("INV", c_token_t::CT_INV)
-      .value("DESTRUCTOR", c_token_t::CT_DESTRUCTOR)
-      .value("NOT", c_token_t::CT_NOT)
-      .value("D_TEMPLATE", c_token_t::CT_D_TEMPLATE)
-      .value("ADDR", c_token_t::CT_ADDR)
-      .value("NEG", c_token_t::CT_NEG)
-      .value("POS", c_token_t::CT_POS)
-      .value("STAR", c_token_t::CT_STAR)
-      .value("PLUS", c_token_t::CT_PLUS)
-      .value("MINUS", c_token_t::CT_MINUS)
-      .value("AMP", c_token_t::CT_AMP)
-      .value("BYREF", c_token_t::CT_BYREF)
-      .value("POUND", c_token_t::CT_POUND)
-      .value("PREPROC", c_token_t::CT_PREPROC)
-      .value("PREPROC_INDENT", c_token_t::CT_PREPROC_INDENT)
-      .value("PREPROC_BODY", c_token_t::CT_PREPROC_BODY)
-      .value("PP", c_token_t::CT_PP)
-      .value("ELLIPSIS", c_token_t::CT_ELLIPSIS)
-      .value("RANGE", c_token_t::CT_RANGE)
-      .value("NULLCOND", c_token_t::CT_NULLCOND)
-      .value("SEMICOLON", c_token_t::CT_SEMICOLON)
-      .value("VSEMICOLON", c_token_t::CT_VSEMICOLON)
-      .value("COLON", c_token_t::CT_COLON)
-      .value("ASM_COLON", c_token_t::CT_ASM_COLON)
-      .value("CASE_COLON", c_token_t::CT_CASE_COLON)
-      .value("CLASS_COLON", c_token_t::CT_CLASS_COLON)
-      .value("CONSTR_COLON", c_token_t::CT_CONSTR_COLON)
-      .value("D_ARRAY_COLON", c_token_t::CT_D_ARRAY_COLON)
-      .value("COND_COLON", c_token_t::CT_COND_COLON)
-      .value("WHERE_COLON", c_token_t::CT_WHERE_COLON)
-      .value("QUESTION", c_token_t::CT_QUESTION)
-      .value("COMMA", c_token_t::CT_COMMA)
-      .value("ASM", c_token_t::CT_ASM)
-      .value("ATTRIBUTE", c_token_t::CT_ATTRIBUTE)
-      .value("AUTORELEASEPOOL", c_token_t::CT_AUTORELEASEPOOL)
-      .value("OC_AVAILABLE", c_token_t::CT_OC_AVAILABLE)
-      .value("OC_AVAILABLE_VALUE", c_token_t::CT_OC_AVAILABLE_VALUE)
-      .value("CATCH", c_token_t::CT_CATCH)
-      .value("WHEN", c_token_t::CT_WHEN)
-      .value("WHERE", c_token_t::CT_WHERE)
-      .value("CLASS", c_token_t::CT_CLASS)
-      .value("DELETE", c_token_t::CT_DELETE)
-      .value("EXPORT", c_token_t::CT_EXPORT)
-      .value("FRIEND", c_token_t::CT_FRIEND)
-      .value("NAMESPACE", c_token_t::CT_NAMESPACE)
-      .value("PACKAGE", c_token_t::CT_PACKAGE)
-      .value("NEW", c_token_t::CT_NEW)
-      .value("OPERATOR", c_token_t::CT_OPERATOR)
-      .value("OPERATOR_VAL", c_token_t::CT_OPERATOR_VAL)
-      .value("ASSIGN_OPERATOR", c_token_t::CT_ASSIGN_OPERATOR)
-      .value("ACCESS", c_token_t::CT_ACCESS)
-      .value("ACCESS_COLON", c_token_t::CT_ACCESS_COLON)
-      .value("THROW", c_token_t::CT_THROW)
-      .value("NOEXCEPT", c_token_t::CT_NOEXCEPT)
-      .value("TRY", c_token_t::CT_TRY)
-      .value("BRACED_INIT_LIST", c_token_t::CT_BRACED_INIT_LIST)
-      .value("USING", c_token_t::CT_USING)
-      .value("USING_STMT", c_token_t::CT_USING_STMT)
-      .value("USING_ALIAS", c_token_t::CT_USING_ALIAS)
-      .value("D_WITH", c_token_t::CT_D_WITH)
-      .value("D_MODULE", c_token_t::CT_D_MODULE)
-      .value("SUPER", c_token_t::CT_SUPER)
-      .value("DELEGATE", c_token_t::CT_DELEGATE)
-      .value("BODY", c_token_t::CT_BODY)
-      .value("DEBUG", c_token_t::CT_DEBUG)
-      .value("DEBUGGER", c_token_t::CT_DEBUGGER)
-      .value("INVARIANT", c_token_t::CT_INVARIANT)
-      .value("UNITTEST", c_token_t::CT_UNITTEST)
-      .value("UNSAFE", c_token_t::CT_UNSAFE)
-      .value("FINALLY", c_token_t::CT_FINALLY)
-      .value("FIXED", c_token_t::CT_FIXED)
-      .value("IMPORT", c_token_t::CT_IMPORT)
-      .value("D_SCOPE", c_token_t::CT_D_SCOPE)
-      .value("D_SCOPE_IF", c_token_t::CT_D_SCOPE_IF)
-      .value("LAZY", c_token_t::CT_LAZY)
-      .value("D_MACRO", c_token_t::CT_D_MACRO)
-      .value("D_VERSION", c_token_t::CT_D_VERSION)
-      .value("D_VERSION_IF", c_token_t::CT_D_VERSION_IF)
-      .value("PAREN_OPEN", c_token_t::CT_PAREN_OPEN)
-      .value("PAREN_CLOSE", c_token_t::CT_PAREN_CLOSE)
-      .value("ANGLE_OPEN", c_token_t::CT_ANGLE_OPEN)
-      .value("ANGLE_CLOSE", c_token_t::CT_ANGLE_CLOSE)
-      .value("SPAREN_OPEN", c_token_t::CT_SPAREN_OPEN)
-      .value("SPAREN_CLOSE", c_token_t::CT_SPAREN_CLOSE)
-      .value("FPAREN_OPEN", c_token_t::CT_FPAREN_OPEN)
-      .value("FPAREN_CLOSE", c_token_t::CT_FPAREN_CLOSE)
-      .value("TPAREN_OPEN", c_token_t::CT_TPAREN_OPEN)
-      .value("TPAREN_CLOSE", c_token_t::CT_TPAREN_CLOSE)
-      .value("BRACE_OPEN", c_token_t::CT_BRACE_OPEN)
-      .value("BRACE_CLOSE", c_token_t::CT_BRACE_CLOSE)
-      .value("VBRACE_OPEN", c_token_t::CT_VBRACE_OPEN)
-      .value("VBRACE_CLOSE", c_token_t::CT_VBRACE_CLOSE)
-      .value("SQUARE_OPEN", c_token_t::CT_SQUARE_OPEN)
-      .value("SQUARE_CLOSE", c_token_t::CT_SQUARE_CLOSE)
-      .value("TSQUARE", c_token_t::CT_TSQUARE)
-      .value("MACRO_OPEN", c_token_t::CT_MACRO_OPEN)
-      .value("MACRO_CLOSE", c_token_t::CT_MACRO_CLOSE)
-      .value("MACRO_ELSE", c_token_t::CT_MACRO_ELSE)
-      .value("LABEL", c_token_t::CT_LABEL)
-      .value("LABEL_COLON", c_token_t::CT_LABEL_COLON)
-      .value("FUNCTION", c_token_t::CT_FUNCTION)
-      .value("FUNC_CALL", c_token_t::CT_FUNC_CALL)
-      .value("FUNC_CALL_USER", c_token_t::CT_FUNC_CALL_USER)
-      .value("FUNC_DEF", c_token_t::CT_FUNC_DEF)
-      .value("FUNC_TYPE", c_token_t::CT_FUNC_TYPE)
-      .value("FUNC_VAR", c_token_t::CT_FUNC_VAR)
-      .value("FUNC_PROTO", c_token_t::CT_FUNC_PROTO)
-      .value("FUNC_START", c_token_t::CT_FUNC_START)
-      .value("FUNC_CLASS_DEF", c_token_t::CT_FUNC_CLASS_DEF)
-      .value("FUNC_CLASS_PROTO", c_token_t::CT_FUNC_CLASS_PROTO)
-      .value("FUNC_CTOR_VAR", c_token_t::CT_FUNC_CTOR_VAR)
-      .value("FUNC_WRAP", c_token_t::CT_FUNC_WRAP)
-      .value("PROTO_WRAP", c_token_t::CT_PROTO_WRAP)
-      .value("MACRO_FUNC", c_token_t::CT_MACRO_FUNC)
-      .value("MACRO", c_token_t::CT_MACRO)
-      .value("QUALIFIER", c_token_t::CT_QUALIFIER)
-      .value("EXTERN", c_token_t::CT_EXTERN)
-      .value("DECLSPEC", c_token_t::CT_DECLSPEC)
-      .value("ALIGN", c_token_t::CT_ALIGN)
-      .value("TYPE", c_token_t::CT_TYPE)
-      .value("PTR_TYPE", c_token_t::CT_PTR_TYPE)
-      .value("TYPE_WRAP", c_token_t::CT_TYPE_WRAP)
-      .value("CPP_LAMBDA", c_token_t::CT_CPP_LAMBDA)
-      .value("CPP_LAMBDA_RET", c_token_t::CT_CPP_LAMBDA_RET)
-      .value("TRAILING_RET", c_token_t::CT_TRAILING_RET)
-      .value("BIT_COLON", c_token_t::CT_BIT_COLON)
-      .value("OC_DYNAMIC", c_token_t::CT_OC_DYNAMIC)
-      .value("OC_END", c_token_t::CT_OC_END)
-      .value("OC_IMPL", c_token_t::CT_OC_IMPL)
-      .value("OC_INTF", c_token_t::CT_OC_INTF)
-      .value("OC_PROTOCOL", c_token_t::CT_OC_PROTOCOL)
-      .value("OC_PROTO_LIST", c_token_t::CT_OC_PROTO_LIST)
-      .value("OC_GENERIC_SPEC", c_token_t::CT_OC_GENERIC_SPEC)
-      .value("OC_PROPERTY", c_token_t::CT_OC_PROPERTY)
-      .value("OC_CLASS", c_token_t::CT_OC_CLASS)
-      .value("OC_CLASS_EXT", c_token_t::CT_OC_CLASS_EXT)
-      .value("OC_CATEGORY", c_token_t::CT_OC_CATEGORY)
-      .value("OC_SCOPE", c_token_t::CT_OC_SCOPE)
-      .value("OC_MSG", c_token_t::CT_OC_MSG)
-      .value("OC_MSG_CLASS", c_token_t::CT_OC_MSG_CLASS)
-      .value("OC_MSG_FUNC", c_token_t::CT_OC_MSG_FUNC)
-      .value("OC_MSG_NAME", c_token_t::CT_OC_MSG_NAME)
-      .value("OC_MSG_SPEC", c_token_t::CT_OC_MSG_SPEC)
-      .value("OC_MSG_DECL", c_token_t::CT_OC_MSG_DECL)
-      .value("OC_RTYPE", c_token_t::CT_OC_RTYPE)
-      .value("OC_ATYPE", c_token_t::CT_OC_ATYPE)
-      .value("OC_COLON", c_token_t::CT_OC_COLON)
-      .value("OC_DICT_COLON", c_token_t::CT_OC_DICT_COLON)
-      .value("OC_SEL", c_token_t::CT_OC_SEL)
-      .value("OC_SEL_NAME", c_token_t::CT_OC_SEL_NAME)
-      .value("OC_BLOCK", c_token_t::CT_OC_BLOCK)
-      .value("OC_BLOCK_ARG", c_token_t::CT_OC_BLOCK_ARG)
-      .value("OC_BLOCK_TYPE", c_token_t::CT_OC_BLOCK_TYPE)
-      .value("OC_BLOCK_EXPR", c_token_t::CT_OC_BLOCK_EXPR)
-      .value("OC_BLOCK_CARET", c_token_t::CT_OC_BLOCK_CARET)
-      .value("OC_AT", c_token_t::CT_OC_AT)
-      .value("OC_PROPERTY_ATTR", c_token_t::CT_OC_PROPERTY_ATTR)
-      .value("PP_DEFINE", c_token_t::CT_PP_DEFINE)
-      .value("PP_DEFINED", c_token_t::CT_PP_DEFINED)
-      .value("PP_INCLUDE", c_token_t::CT_PP_INCLUDE)
-      .value("PP_IF", c_token_t::CT_PP_IF)
-      .value("PP_ELSE", c_token_t::CT_PP_ELSE)
-      .value("PP_ENDIF", c_token_t::CT_PP_ENDIF)
-      .value("PP_ASSERT", c_token_t::CT_PP_ASSERT)
-      .value("PP_EMIT", c_token_t::CT_PP_EMIT)
-      .value("PP_ENDINPUT", c_token_t::CT_PP_ENDINPUT)
-      .value("PP_ERROR", c_token_t::CT_PP_ERROR)
-      .value("PP_FILE", c_token_t::CT_PP_FILE)
-      .value("PP_LINE", c_token_t::CT_PP_LINE)
-      .value("PP_SECTION", c_token_t::CT_PP_SECTION)
-      .value("PP_ASM", c_token_t::CT_PP_ASM)
-      .value("PP_UNDEF", c_token_t::CT_PP_UNDEF)
-      .value("PP_PROPERTY", c_token_t::CT_PP_PROPERTY)
-      .value("PP_BODYCHUNK", c_token_t::CT_PP_BODYCHUNK)
-      .value("PP_PRAGMA", c_token_t::CT_PP_PRAGMA)
-      .value("PP_REGION", c_token_t::CT_PP_REGION)
-      .value("PP_ENDREGION", c_token_t::CT_PP_ENDREGION)
-      .value("PP_REGION_INDENT", c_token_t::CT_PP_REGION_INDENT)
-      .value("PP_IF_INDENT", c_token_t::CT_PP_IF_INDENT)
-      .value("PP_IGNORE", c_token_t::CT_PP_IGNORE)
-      .value("PP_OTHER", c_token_t::CT_PP_OTHER)
-      .value("CHAR", c_token_t::CT_CHAR)
-      .value("DEFINED", c_token_t::CT_DEFINED)
-      .value("FORWARD", c_token_t::CT_FORWARD)
-      .value("NATIVE", c_token_t::CT_NATIVE)
-      .value("STATE", c_token_t::CT_STATE)
-      .value("STOCK", c_token_t::CT_STOCK)
-      .value("TAGOF", c_token_t::CT_TAGOF)
-      .value("DOT", c_token_t::CT_DOT)
-      .value("TAG", c_token_t::CT_TAG)
-      .value("TAG_COLON", c_token_t::CT_TAG_COLON)
-      .value("LOCK", c_token_t::CT_LOCK)
-      .value("AS", c_token_t::CT_AS)
-      .value("IN", c_token_t::CT_IN)
-      .value("BRACED", c_token_t::CT_BRACED)
-      .value("THIS", c_token_t::CT_THIS)
-      .value("BASE", c_token_t::CT_BASE)
-      .value("DEFAULT", c_token_t::CT_DEFAULT)
-      .value("GETSET", c_token_t::CT_GETSET)
-      .value("GETSET_EMPTY", c_token_t::CT_GETSET_EMPTY)
-      .value("CONCAT", c_token_t::CT_CONCAT)
-      .value("CS_SQ_STMT", c_token_t::CT_CS_SQ_STMT)
-      .value("CS_SQ_COLON", c_token_t::CT_CS_SQ_COLON)
-      .value("CS_PROPERTY", c_token_t::CT_CS_PROPERTY)
-      .value("SQL_EXEC", c_token_t::CT_SQL_EXEC)
-      .value("SQL_BEGIN", c_token_t::CT_SQL_BEGIN)
-      .value("SQL_END", c_token_t::CT_SQL_END)
-      .value("SQL_WORD", c_token_t::CT_SQL_WORD)
-      .value("SQL_ASSIGN", c_token_t::CT_SQL_ASSIGN)
-      .value("CONSTRUCT", c_token_t::CT_CONSTRUCT)
-      .value("LAMBDA", c_token_t::CT_LAMBDA)
-      .value("ASSERT", c_token_t::CT_ASSERT)
-      .value("ANNOTATION", c_token_t::CT_ANNOTATION)
-      .value("FOR_COLON", c_token_t::CT_FOR_COLON)
-      .value("DOUBLE_BRACE", c_token_t::CT_DOUBLE_BRACE)
-      .value("CNG_HASINC", c_token_t::CT_CNG_HASINC)
-      .value("CNG_HASINCN", c_token_t::CT_CNG_HASINCN)
-      .value("Q_EMIT", c_token_t::CT_Q_EMIT)
-      .value("Q_FOREACH", c_token_t::CT_Q_FOREACH)
-      .value("Q_FOREVER", c_token_t::CT_Q_FOREVER)
-      .value("Q_GADGET", c_token_t::CT_Q_GADGET)
-      .value("Q_OBJECT", c_token_t::CT_Q_OBJECT)
-      .value("MODE", c_token_t::CT_MODE)
-      .value("DI", c_token_t::CT_DI)
-      .value("HI", c_token_t::CT_HI)
-      .value("QI", c_token_t::CT_QI)
-      .value("SI", c_token_t::CT_SI)
-      .value("NOTHROW", c_token_t::CT_NOTHROW)
-      .value("WORD_", c_token_t::CT_WORD_);
+   enum_<E_Token>("TokenType")
+      .value("NONE", E_Token::CT_NONE)
+      .value("EOF", E_Token::CT_EOF)
+      .value("UNKNOWN", E_Token::CT_UNKNOWN)
+      .value("JUNK", E_Token::CT_JUNK)
+      .value("WHITESPACE", E_Token::CT_WHITESPACE)
+      .value("SPACE", E_Token::CT_SPACE)
+      .value("NEWLINE", E_Token::CT_NEWLINE)
+      .value("NL_CONT", E_Token::CT_NL_CONT)
+      .value("COMMENT_CPP", E_Token::CT_COMMENT_CPP)
+      .value("COMMENT", E_Token::CT_COMMENT)
+      .value("COMMENT_MULTI", E_Token::CT_COMMENT_MULTI)
+      .value("COMMENT_EMBED", E_Token::CT_COMMENT_EMBED)
+      .value("COMMENT_START", E_Token::CT_COMMENT_START)
+      .value("COMMENT_END", E_Token::CT_COMMENT_END)
+      .value("COMMENT_WHOLE", E_Token::CT_COMMENT_WHOLE)
+      .value("COMMENT_ENDIF", E_Token::CT_COMMENT_ENDIF)
+      .value("IGNORED", E_Token::CT_IGNORED)
+      .value("WORD", E_Token::CT_WORD)
+      .value("NUMBER", E_Token::CT_NUMBER)
+      .value("NUMBER_FP", E_Token::CT_NUMBER_FP)
+      .value("STRING", E_Token::CT_STRING)
+      .value("STRING_MULTI", E_Token::CT_STRING_MULTI)
+      .value("IF", E_Token::CT_IF)
+      .value("ELSE", E_Token::CT_ELSE)
+      .value("ELSEIF", E_Token::CT_ELSEIF)
+      .value("FOR", E_Token::CT_FOR)
+      .value("WHILE", E_Token::CT_WHILE)
+      .value("WHILE_OF_DO", E_Token::CT_WHILE_OF_DO)
+      .value("SWITCH", E_Token::CT_SWITCH)
+      .value("CASE", E_Token::CT_CASE)
+      .value("DO", E_Token::CT_DO)
+      .value("SYNCHRONIZED", E_Token::CT_SYNCHRONIZED)
+      .value("VOLATILE", E_Token::CT_VOLATILE)
+      .value("TYPEDEF", E_Token::CT_TYPEDEF)
+      .value("STRUCT", E_Token::CT_STRUCT)
+      .value("ENUM", E_Token::CT_ENUM)
+      .value("ENUM_CLASS", E_Token::CT_ENUM_CLASS)
+      .value("SIZEOF", E_Token::CT_SIZEOF)
+      .value("DECLTYPE", E_Token::CT_DECLTYPE)
+      .value("RETURN", E_Token::CT_RETURN)
+      .value("BREAK", E_Token::CT_BREAK)
+      .value("UNION", E_Token::CT_UNION)
+      .value("GOTO", E_Token::CT_GOTO)
+      .value("CONTINUE", E_Token::CT_CONTINUE)
+      .value("C_CAST", E_Token::CT_C_CAST)
+      .value("CPP_CAST", E_Token::CT_CPP_CAST)
+      .value("D_CAST", E_Token::CT_D_CAST)
+      .value("TYPE_CAST", E_Token::CT_TYPE_CAST)
+      .value("TYPENAME", E_Token::CT_TYPENAME)
+      .value("TEMPLATE", E_Token::CT_TEMPLATE)
+      .value("WHERE_SPEC", E_Token::CT_WHERE_SPEC)
+      .value("ASSIGN", E_Token::CT_ASSIGN)
+      .value("ASSIGN_NL", E_Token::CT_ASSIGN_NL)
+      .value("SASSIGN", E_Token::CT_SASSIGN)
+      .value("ASSIGN_DEFAULT_ARG", E_Token::CT_ASSIGN_DEFAULT_ARG)
+      .value("ASSIGN_FUNC_PROTO", E_Token::CT_ASSIGN_FUNC_PROTO)
+      .value("COMPARE", E_Token::CT_COMPARE)
+      .value("SCOMPARE", E_Token::CT_SCOMPARE)
+      .value("BOOL", E_Token::CT_BOOL)
+      .value("SBOOL", E_Token::CT_SBOOL)
+      .value("ARITH", E_Token::CT_ARITH)
+      .value("SARITH", E_Token::CT_SARITH)
+      .value("CARET", E_Token::CT_CARET)
+      .value("DEREF", E_Token::CT_DEREF)
+      .value("INCDEC_BEFORE", E_Token::CT_INCDEC_BEFORE)
+      .value("INCDEC_AFTER", E_Token::CT_INCDEC_AFTER)
+      .value("MEMBER", E_Token::CT_MEMBER)
+      .value("DC_MEMBER", E_Token::CT_DC_MEMBER)
+      .value("C99_MEMBER", E_Token::CT_C99_MEMBER)
+      .value("INV", E_Token::CT_INV)
+      .value("DESTRUCTOR", E_Token::CT_DESTRUCTOR)
+      .value("NOT", E_Token::CT_NOT)
+      .value("D_TEMPLATE", E_Token::CT_D_TEMPLATE)
+      .value("ADDR", E_Token::CT_ADDR)
+      .value("NEG", E_Token::CT_NEG)
+      .value("POS", E_Token::CT_POS)
+      .value("STAR", E_Token::CT_STAR)
+      .value("PLUS", E_Token::CT_PLUS)
+      .value("MINUS", E_Token::CT_MINUS)
+      .value("AMP", E_Token::CT_AMP)
+      .value("BYREF", E_Token::CT_BYREF)
+      .value("POUND", E_Token::CT_POUND)
+      .value("PREPROC", E_Token::CT_PREPROC)
+      .value("PREPROC_INDENT", E_Token::CT_PREPROC_INDENT)
+      .value("PREPROC_BODY", E_Token::CT_PREPROC_BODY)
+      .value("PP", E_Token::CT_PP)
+      .value("ELLIPSIS", E_Token::CT_ELLIPSIS)
+      .value("RANGE", E_Token::CT_RANGE)
+      .value("NULLCOND", E_Token::CT_NULLCOND)
+      .value("SEMICOLON", E_Token::CT_SEMICOLON)
+      .value("VSEMICOLON", E_Token::CT_VSEMICOLON)
+      .value("COLON", E_Token::CT_COLON)
+      .value("ASM_COLON", E_Token::CT_ASM_COLON)
+      .value("CASE_COLON", E_Token::CT_CASE_COLON)
+      .value("CLASS_COLON", E_Token::CT_CLASS_COLON)
+      .value("CONSTR_COLON", E_Token::CT_CONSTR_COLON)
+      .value("D_ARRAY_COLON", E_Token::CT_D_ARRAY_COLON)
+      .value("COND_COLON", E_Token::CT_COND_COLON)
+      .value("WHERE_COLON", E_Token::CT_WHERE_COLON)
+      .value("QUESTION", E_Token::CT_QUESTION)
+      .value("COMMA", E_Token::CT_COMMA)
+      .value("ASM", E_Token::CT_ASM)
+      .value("ATTRIBUTE", E_Token::CT_ATTRIBUTE)
+      .value("AUTORELEASEPOOL", E_Token::CT_AUTORELEASEPOOL)
+      .value("OC_AVAILABLE", E_Token::CT_OC_AVAILABLE)
+      .value("OC_AVAILABLE_VALUE", E_Token::CT_OC_AVAILABLE_VALUE)
+      .value("CATCH", E_Token::CT_CATCH)
+      .value("WHEN", E_Token::CT_WHEN)
+      .value("WHERE", E_Token::CT_WHERE)
+      .value("CLASS", E_Token::CT_CLASS)
+      .value("DELETE", E_Token::CT_DELETE)
+      .value("EXPORT", E_Token::CT_EXPORT)
+      .value("FRIEND", E_Token::CT_FRIEND)
+      .value("NAMESPACE", E_Token::CT_NAMESPACE)
+      .value("PACKAGE", E_Token::CT_PACKAGE)
+      .value("NEW", E_Token::CT_NEW)
+      .value("OPERATOR", E_Token::CT_OPERATOR)
+      .value("OPERATOR_VAL", E_Token::CT_OPERATOR_VAL)
+      .value("ASSIGN_OPERATOR", E_Token::CT_ASSIGN_OPERATOR)
+      .value("ACCESS", E_Token::CT_ACCESS)
+      .value("ACCESS_COLON", E_Token::CT_ACCESS_COLON)
+      .value("THROW", E_Token::CT_THROW)
+      .value("NOEXCEPT", E_Token::CT_NOEXCEPT)
+      .value("TRY", E_Token::CT_TRY)
+      .value("BRACED_INIT_LIST", E_Token::CT_BRACED_INIT_LIST)
+      .value("USING", E_Token::CT_USING)
+      .value("USING_STMT", E_Token::CT_USING_STMT)
+      .value("USING_ALIAS", E_Token::CT_USING_ALIAS)
+      .value("D_WITH", E_Token::CT_D_WITH)
+      .value("D_MODULE", E_Token::CT_D_MODULE)
+      .value("SUPER", E_Token::CT_SUPER)
+      .value("DELEGATE", E_Token::CT_DELEGATE)
+      .value("BODY", E_Token::CT_BODY)
+      .value("DEBUG", E_Token::CT_DEBUG)
+      .value("DEBUGGER", E_Token::CT_DEBUGGER)
+      .value("INVARIANT", E_Token::CT_INVARIANT)
+      .value("UNITTEST", E_Token::CT_UNITTEST)
+      .value("UNSAFE", E_Token::CT_UNSAFE)
+      .value("FINALLY", E_Token::CT_FINALLY)
+      .value("FIXED", E_Token::CT_FIXED)
+      .value("IMPORT", E_Token::CT_IMPORT)
+      .value("D_SCOPE", E_Token::CT_D_SCOPE)
+      .value("D_SCOPE_IF", E_Token::CT_D_SCOPE_IF)
+      .value("LAZY", E_Token::CT_LAZY)
+      .value("D_MACRO", E_Token::CT_D_MACRO)
+      .value("D_VERSION", E_Token::CT_D_VERSION)
+      .value("D_VERSION_IF", E_Token::CT_D_VERSION_IF)
+      .value("PAREN_OPEN", E_Token::CT_PAREN_OPEN)
+      .value("PAREN_CLOSE", E_Token::CT_PAREN_CLOSE)
+      .value("ANGLE_OPEN", E_Token::CT_ANGLE_OPEN)
+      .value("ANGLE_CLOSE", E_Token::CT_ANGLE_CLOSE)
+      .value("SPAREN_OPEN", E_Token::CT_SPAREN_OPEN)
+      .value("SPAREN_CLOSE", E_Token::CT_SPAREN_CLOSE)
+      .value("FPAREN_OPEN", E_Token::CT_FPAREN_OPEN)
+      .value("FPAREN_CLOSE", E_Token::CT_FPAREN_CLOSE)
+      .value("TPAREN_OPEN", E_Token::CT_TPAREN_OPEN)
+      .value("TPAREN_CLOSE", E_Token::CT_TPAREN_CLOSE)
+      .value("BRACE_OPEN", E_Token::CT_BRACE_OPEN)
+      .value("BRACE_CLOSE", E_Token::CT_BRACE_CLOSE)
+      .value("VBRACE_OPEN", E_Token::CT_VBRACE_OPEN)
+      .value("VBRACE_CLOSE", E_Token::CT_VBRACE_CLOSE)
+      .value("SQUARE_OPEN", E_Token::CT_SQUARE_OPEN)
+      .value("SQUARE_CLOSE", E_Token::CT_SQUARE_CLOSE)
+      .value("TSQUARE", E_Token::CT_TSQUARE)
+      .value("MACRO_OPEN", E_Token::CT_MACRO_OPEN)
+      .value("MACRO_CLOSE", E_Token::CT_MACRO_CLOSE)
+      .value("MACRO_ELSE", E_Token::CT_MACRO_ELSE)
+      .value("LABEL", E_Token::CT_LABEL)
+      .value("LABEL_COLON", E_Token::CT_LABEL_COLON)
+      .value("FUNCTION", E_Token::CT_FUNCTION)
+      .value("FUNC_CALL", E_Token::CT_FUNC_CALL)
+      .value("FUNC_CALL_USER", E_Token::CT_FUNC_CALL_USER)
+      .value("FUNC_DEF", E_Token::CT_FUNC_DEF)
+      .value("FUNC_TYPE", E_Token::CT_FUNC_TYPE)
+      .value("FUNC_VAR", E_Token::CT_FUNC_VAR)
+      .value("FUNC_PROTO", E_Token::CT_FUNC_PROTO)
+      .value("FUNC_START", E_Token::CT_FUNC_START)
+      .value("FUNC_CLASS_DEF", E_Token::CT_FUNC_CLASS_DEF)
+      .value("FUNC_CLASS_PROTO", E_Token::CT_FUNC_CLASS_PROTO)
+      .value("FUNC_CTOR_VAR", E_Token::CT_FUNC_CTOR_VAR)
+      .value("FUNC_WRAP", E_Token::CT_FUNC_WRAP)
+      .value("PROTO_WRAP", E_Token::CT_PROTO_WRAP)
+      .value("MACRO_FUNC", E_Token::CT_MACRO_FUNC)
+      .value("MACRO", E_Token::CT_MACRO)
+      .value("QUALIFIER", E_Token::CT_QUALIFIER)
+      .value("EXTERN", E_Token::CT_EXTERN)
+      .value("DECLSPEC", E_Token::CT_DECLSPEC)
+      .value("ALIGN", E_Token::CT_ALIGN)
+      .value("TYPE", E_Token::CT_TYPE)
+      .value("PTR_TYPE", E_Token::CT_PTR_TYPE)
+      .value("TYPE_WRAP", E_Token::CT_TYPE_WRAP)
+      .value("CPP_LAMBDA", E_Token::CT_CPP_LAMBDA)
+      .value("CPP_LAMBDA_RET", E_Token::CT_CPP_LAMBDA_RET)
+      .value("TRAILING_RET", E_Token::CT_TRAILING_RET)
+      .value("BIT_COLON", E_Token::CT_BIT_COLON)
+      .value("OC_DYNAMIC", E_Token::CT_OC_DYNAMIC)
+      .value("OC_END", E_Token::CT_OC_END)
+      .value("OC_IMPL", E_Token::CT_OC_IMPL)
+      .value("OC_INTF", E_Token::CT_OC_INTF)
+      .value("OC_PROTOCOL", E_Token::CT_OC_PROTOCOL)
+      .value("OC_PROTO_LIST", E_Token::CT_OC_PROTO_LIST)
+      .value("OC_GENERIC_SPEC", E_Token::CT_OC_GENERIC_SPEC)
+      .value("OC_PROPERTY", E_Token::CT_OC_PROPERTY)
+      .value("OC_CLASS", E_Token::CT_OC_CLASS)
+      .value("OC_CLASS_EXT", E_Token::CT_OC_CLASS_EXT)
+      .value("OC_CATEGORY", E_Token::CT_OC_CATEGORY)
+      .value("OC_SCOPE", E_Token::CT_OC_SCOPE)
+      .value("OC_MSG", E_Token::CT_OC_MSG)
+      .value("OC_MSG_CLASS", E_Token::CT_OC_MSG_CLASS)
+      .value("OC_MSG_FUNC", E_Token::CT_OC_MSG_FUNC)
+      .value("OC_MSG_NAME", E_Token::CT_OC_MSG_NAME)
+      .value("OC_MSG_SPEC", E_Token::CT_OC_MSG_SPEC)
+      .value("OC_MSG_DECL", E_Token::CT_OC_MSG_DECL)
+      .value("OC_RTYPE", E_Token::CT_OC_RTYPE)
+      .value("OC_ATYPE", E_Token::CT_OC_ATYPE)
+      .value("OC_COLON", E_Token::CT_OC_COLON)
+      .value("OC_DICT_COLON", E_Token::CT_OC_DICT_COLON)
+      .value("OC_SEL", E_Token::CT_OC_SEL)
+      .value("OC_SEL_NAME", E_Token::CT_OC_SEL_NAME)
+      .value("OC_BLOCK", E_Token::CT_OC_BLOCK)
+      .value("OC_BLOCK_ARG", E_Token::CT_OC_BLOCK_ARG)
+      .value("OC_BLOCK_TYPE", E_Token::CT_OC_BLOCK_TYPE)
+      .value("OC_BLOCK_EXPR", E_Token::CT_OC_BLOCK_EXPR)
+      .value("OC_BLOCK_CARET", E_Token::CT_OC_BLOCK_CARET)
+      .value("OC_AT", E_Token::CT_OC_AT)
+      .value("OC_PROPERTY_ATTR", E_Token::CT_OC_PROPERTY_ATTR)
+      .value("PP_DEFINE", E_Token::CT_PP_DEFINE)
+      .value("PP_DEFINED", E_Token::CT_PP_DEFINED)
+      .value("PP_INCLUDE", E_Token::CT_PP_INCLUDE)
+      .value("PP_IF", E_Token::CT_PP_IF)
+      .value("PP_ELSE", E_Token::CT_PP_ELSE)
+      .value("PP_ENDIF", E_Token::CT_PP_ENDIF)
+      .value("PP_ASSERT", E_Token::CT_PP_ASSERT)
+      .value("PP_EMIT", E_Token::CT_PP_EMIT)
+      .value("PP_ENDINPUT", E_Token::CT_PP_ENDINPUT)
+      .value("PP_ERROR", E_Token::CT_PP_ERROR)
+      .value("PP_FILE", E_Token::CT_PP_FILE)
+      .value("PP_LINE", E_Token::CT_PP_LINE)
+      .value("PP_SECTION", E_Token::CT_PP_SECTION)
+      .value("PP_ASM", E_Token::CT_PP_ASM)
+      .value("PP_UNDEF", E_Token::CT_PP_UNDEF)
+      .value("PP_PROPERTY", E_Token::CT_PP_PROPERTY)
+      .value("PP_BODYCHUNK", E_Token::CT_PP_BODYCHUNK)
+      .value("PP_PRAGMA", E_Token::CT_PP_PRAGMA)
+      .value("PP_REGION", E_Token::CT_PP_REGION)
+      .value("PP_ENDREGION", E_Token::CT_PP_ENDREGION)
+      .value("PP_REGION_INDENT", E_Token::CT_PP_REGION_INDENT)
+      .value("PP_IF_INDENT", E_Token::CT_PP_IF_INDENT)
+      .value("PP_IGNORE", E_Token::CT_PP_IGNORE)
+      .value("PP_OTHER", E_Token::CT_PP_OTHER)
+      .value("CHAR", E_Token::CT_CHAR)
+      .value("DEFINED", E_Token::CT_DEFINED)
+      .value("FORWARD", E_Token::CT_FORWARD)
+      .value("NATIVE", E_Token::CT_NATIVE)
+      .value("STATE", E_Token::CT_STATE)
+      .value("STOCK", E_Token::CT_STOCK)
+      .value("TAGOF", E_Token::CT_TAGOF)
+      .value("DOT", E_Token::CT_DOT)
+      .value("TAG", E_Token::CT_TAG)
+      .value("TAG_COLON", E_Token::CT_TAG_COLON)
+      .value("LOCK", E_Token::CT_LOCK)
+      .value("AS", E_Token::CT_AS)
+      .value("IN", E_Token::CT_IN)
+      .value("BRACED", E_Token::CT_BRACED)
+      .value("THIS", E_Token::CT_THIS)
+      .value("BASE", E_Token::CT_BASE)
+      .value("DEFAULT", E_Token::CT_DEFAULT)
+      .value("GETSET", E_Token::CT_GETSET)
+      .value("GETSET_EMPTY", E_Token::CT_GETSET_EMPTY)
+      .value("CONCAT", E_Token::CT_CONCAT)
+      .value("CS_SQ_STMT", E_Token::CT_CS_SQ_STMT)
+      .value("CS_SQ_COLON", E_Token::CT_CS_SQ_COLON)
+      .value("CS_PROPERTY", E_Token::CT_CS_PROPERTY)
+      .value("SQL_EXEC", E_Token::CT_SQL_EXEC)
+      .value("SQL_BEGIN", E_Token::CT_SQL_BEGIN)
+      .value("SQL_END", E_Token::CT_SQL_END)
+      .value("SQL_WORD", E_Token::CT_SQL_WORD)
+      .value("SQL_ASSIGN", E_Token::CT_SQL_ASSIGN)
+      .value("CONSTRUCT", E_Token::CT_CONSTRUCT)
+      .value("LAMBDA", E_Token::CT_LAMBDA)
+      .value("ASSERT", E_Token::CT_ASSERT)
+      .value("ANNOTATION", E_Token::CT_ANNOTATION)
+      .value("FOR_COLON", E_Token::CT_FOR_COLON)
+      .value("DOUBLE_BRACE", E_Token::CT_DOUBLE_BRACE)
+      .value("CNG_HASINC", E_Token::CT_CNG_HASINC)
+      .value("CNG_HASINCN", E_Token::CT_CNG_HASINCN)
+      .value("Q_EMIT", E_Token::CT_Q_EMIT)
+      .value("Q_FOREACH", E_Token::CT_Q_FOREACH)
+      .value("Q_FOREVER", E_Token::CT_Q_FOREVER)
+      .value("Q_GADGET", E_Token::CT_Q_GADGET)
+      .value("Q_OBJECT", E_Token::CT_Q_OBJECT)
+      .value("MODE", E_Token::CT_MODE)
+      .value("DI", E_Token::CT_DI)
+      .value("HI", E_Token::CT_HI)
+      .value("QI", E_Token::CT_QI)
+      .value("SI", E_Token::CT_SI)
+      .value("NOTHROW", E_Token::CT_NOTHROW)
+      .value("WORD_", E_Token::CT_WORD_);
 
    enum_<lang_flag_e>("Language")
       .value("C", lang_flag_e::LANG_C)
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/uncrustify_limits.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/uncrustify_limits.h
new file mode 100644
index 00000000..9f226870
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/uncrustify_limits.h
@@ -0,0 +1,19 @@
+#pragma once
+
+namespace uncrustify
+{
+
+namespace limits
+{
+
+static constexpr int MAX_OPTION_NAME_LEN = 32;
+static constexpr int AL_SIZE             = 8000;
+static constexpr int MAX_KEYWORDS        = 300;
+
+// uncrustify doesn't support more than one variable definition per line/ type,
+// the maximum level of pointer indirection is 3 (i.e., ***p).
+// TODO add some more limitations
+
+} // namespace limits
+
+} // namespace uncrustify
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/uncrustify_types.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/uncrustify_types.cpp
index bd57f2d5..bd57f2d5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/uncrustify_types.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/uncrustify_types.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/uncrustify_types.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/uncrustify_types.h
index 1aeb43c3..b0bdae8d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/uncrustify_types.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/uncrustify_types.h
@@ -12,11 +12,12 @@
 
 #include "options.h"
 #include "pcf_flags.h"
-#include "token_enum.h"    // c_token_t
+#include "token_enum.h"    // E_Token
 #include "unc_text.h"
 #include "uncrustify_limits.h"
 
 #include <assert.h>
+#include <cstddef>      // do get the definition of size_t
 
 #ifdef HAVE_UTIME_H
 #include <utime.h>
@@ -87,7 +88,7 @@ enum class char_encoding_e : unsigned int
 };
 
 
-struct chunk_t; //forward declaration
+class Chunk; //forward declaration
 
 
 /**
@@ -97,27 +98,27 @@ struct chunk_t; //forward declaration
  */
 struct indent_ptr_t
 {
-   chunk_t *ref;
-   int     delta;
+   Chunk *ref;
+   int   delta;
 };
 
 
 struct align_ptr_t
 {
-   chunk_t *next;       //! nullptr or the chunk that should be under this one
-   bool    right_align; //! AlignStack.m_right_align
-   size_t  star_style;  //! AlignStack.m_star_style
-   size_t  amp_style;   //! AlignStack.m_amp_style
-   int     gap;         //! AlignStack.m_gap
+   Chunk  *next;       //! nullptr or the chunk that should be under this one
+   bool   right_align; //! AlignStack.m_right_align
+   size_t star_style;  //! AlignStack.m_star_style
+   size_t amp_style;   //! AlignStack.m_amp_style
+   int    gap;         //! AlignStack.m_gap
 
    /*
     * col_adj is the amount to alter the column for the token.
     * For example, a dangling '*' would be set to -1.
     * A right-aligned word would be a positive value.
     */
-   int     col_adj;
-   chunk_t *ref;
-   chunk_t *start;
+   int   col_adj;
+   Chunk *ref;
+   Chunk *start;
 };
 
 
@@ -125,125 +126,6 @@ struct align_ptr_t
 typedef std::pair<size_t, char *>   Track_nr;         // track for "trackNumber" and "rule"
 typedef std::vector<Track_nr>       track_list;       // liste for many tracks
 
-// This is the main type of this program
-struct chunk_t
-{
-   chunk_t()
-   {
-      reset();
-   }
-
-
-   //! sets all elements of the struct to their default value
-   void 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();
-   }
-
-
-   //! provides the number of characters of string
-   size_t len() const
-   {
-      return(str.size());
-   }
-
-
-   //! provides the content of a string a zero terminated character pointer
-   const char *text() const
-   {
-      return(str.c_str());
-   }
-
-
-   // Issue #2984, fill up, if necessary, a copie of the first chars of the text() string
-   const char *elided_text(char *for_the_copy)
-   {
-      const char *test_it       = text();
-      size_t     test_it_length = strlen(test_it);
-
-      size_t     truncate_value = uncrustify::options::debug_truncate();
-
-      if (truncate_value != 0)
-      {
-         if (test_it_length > truncate_value)
-         {
-            memset(for_the_copy, 0, 1000);
-
-            if (test_it_length < truncate_value + 30)
-            {
-               strncpy(for_the_copy, test_it, truncate_value - 30);
-               for_the_copy[truncate_value - 30] = 0;
-            }
-            else
-            {
-               strncpy(for_the_copy, test_it, truncate_value);
-               for_the_copy[truncate_value] = 0;
-            }
-            char *message = strcat(for_the_copy, " ... <The string is truncated>");
-
-            return(message);
-         }
-         else
-         {
-            return(test_it);
-         }
-      }
-      return(test_it);
-   }
-
-   chunk_t      *next;            //! pointer to next chunk in list
-   chunk_t      *prev;            //! pointer to previous chunk in list
-   chunk_t      *parent;          //! pointer to parent chunk(not always set)
-   align_ptr_t  align;
-   indent_ptr_t indent;
-   c_token_t    type;             //! type of the chunk itself
-   c_token_t    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;
-};
-
-
 //! list of all programming languages Uncrustify supports
 enum lang_flag_e
 {
@@ -291,17 +173,17 @@ enum class pattern_class_e : unsigned int
 //! used to link language keywords with some addition information
 struct chunk_tag_t
 {
-   const char *tag;        //! name of the keyword e.g. "bool"
-   c_token_t  type;        //! uncrustify type assigned to that keyword
-   size_t     lang_flags;  //! programming language that uses this keyword
+   const char *tag;       //! name of the keyword e.g. "bool"
+   E_Token    type;       //! uncrustify type assigned to that keyword
+   size_t     lang_flags; //! programming language that uses this keyword
 };
 
 
 struct align_t
 {
-   size_t    col;
-   c_token_t type;
-   size_t    len;    //! length of the token + space
+   size_t  col;
+   E_Token type;
+   size_t  len;      //! length of the token + space
 };
 
 //! holds information and data of a file
@@ -368,7 +250,7 @@ struct cp_data_t
    unc_text          newline;
 
    int               did_newline;       //! flag indicates if a newline was added or converted
-   c_token_t         in_preproc;
+   E_Token           in_preproc;
    int               preproc_ncnl_count;
    bool              output_trailspace;
    bool              output_tab_as_space;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/uncrustify_version.h.in b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/uncrustify_version.h.in
index 079e0fa6..079e0fa6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/uncrustify_version.h.in
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/uncrustify_version.h.in
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/unicode.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/unicode.cpp
index 172cda28..172cda28 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/unicode.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/unicode.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/unicode.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/unicode.h
index e9cbd97c..e9cbd97c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/unicode.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/unicode.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/universalindentgui.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/universalindentgui.cpp
index eff612be..eff612be 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/universalindentgui.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/universalindentgui.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/universalindentgui.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/universalindentgui.h
index 35a65167..35a65167 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/universalindentgui.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/universalindentgui.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/width.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/width.cpp
index c5ed4b2f..a3dbeab4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/width.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/width.cpp
@@ -25,26 +25,26 @@ using namespace uncrustify;
 
 struct cw_entry
 {
-   chunk_t *pc;
-   size_t  pri;
+   Chunk  *pc;
+   size_t pri;
 };
 
 
 struct token_pri
 {
-   c_token_t tok;
-   size_t    pri;
+   E_Token tok;
+   size_t  pri;
 };
 
 
-static inline bool is_past_width(chunk_t *pc);
+static inline bool is_past_width(Chunk *pc);
 
 
 //! Split right after the chunk
-static void split_before_chunk(chunk_t *pc);
+static void split_before_chunk(Chunk *pc);
 
 
-static size_t get_split_pri(c_token_t tok);
+static size_t get_split_pri(E_Token tok);
 
 
 /**
@@ -63,7 +63,7 @@ static size_t get_split_pri(c_token_t tok);
  *  - ? :
  *  - function open paren not followed by close paren
  */
-static void try_split_here(cw_entry &ent, chunk_t *pc);
+static void try_split_here(cw_entry &ent, Chunk *pc);
 
 
 /**
@@ -75,7 +75,7 @@ static void try_split_here(cw_entry &ent, chunk_t *pc);
  *
  * @param start The first chunk that exceeded the limit
  */
-static bool split_line(chunk_t *pc);
+static bool split_line(Chunk *pc);
 
 
 /**
@@ -95,7 +95,7 @@ static bool split_line(chunk_t *pc);
  * @return        the token that should have a newline
  *                inserted before it
  */
-static void split_fcn_params(chunk_t *start);
+static void split_fcn_params(Chunk *start);
 
 
 /**
@@ -104,7 +104,7 @@ static void split_fcn_params(chunk_t *start);
  *
  * @param start   the offending token
  */
-static void split_template(chunk_t *start);
+static void split_template(Chunk *start);
 
 
 /**
@@ -112,7 +112,7 @@ static void split_template(chunk_t *start);
  *
  * @param start   the offending token
  */
-static void split_fcn_params_full(chunk_t *start);
+static void split_fcn_params_full(Chunk *start);
 
 
 /**
@@ -123,26 +123,26 @@ static void split_fcn_params_full(chunk_t *start);
  * If that doesn't work, then look for an assignment at paren level.
  * If that doesn't work, then give up.
  */
-static void split_for_stmt(chunk_t *start);
+static void split_for_stmt(Chunk *start);
 
 
-static inline bool is_past_width(chunk_t *pc)
+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());
+           __func__, __LINE__, pc->orig_line, pc->orig_col, pc->Text());
    log_rule_B("code_width");
-   return((pc->column + pc->len() - 1) > options::code_width());
+   return((pc->column + pc->Len() - 1) > options::code_width());
 }
 
 
-static void split_before_chunk(chunk_t *pc)
+static void split_before_chunk(Chunk *pc)
 {
    LOG_FUNC_ENTRY();
-   LOG_FMT(LSPLIT, "%s(%d): text() '%s'\n", __func__, __LINE__, pc->text());
+   LOG_FMT(LSPLIT, "%s(%d): Text() '%s'\n", __func__, __LINE__, pc->Text());
 
    if (  !chunk_is_newline(pc)
-      && !chunk_is_newline(chunk_get_prev(pc)))
+      && !chunk_is_newline(pc->GetPrev()))
    {
       newline_add_before(pc);
       // reindent needs to include the indent_continue value and was off by one
@@ -160,15 +160,15 @@ void do_code_width(void)
    LOG_FUNC_ENTRY();
    LOG_FMT(LSPLIT, "%s(%d)\n", __func__, __LINE__);
 
-   for (chunk_t *pc = chunk_get_head(); pc != nullptr; pc = chunk_get_next(pc))
+   for (Chunk *pc = Chunk::GetHead(); pc->IsNotNullChunk(); pc = pc->GetNext())
    {
       if (  !chunk_is_newline(pc)
-         && !chunk_is_comment(pc)
+         && !pc->IsComment()
          && chunk_is_not_token(pc, 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
+            && chunk_is_last_on_line(pc))          // is the last chunk on its line
          {
             continue;
          }
@@ -176,13 +176,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->orig_line, pc->orig_col, 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->orig_line, pc->orig_col, pc->Text());
             break;
          }
       }
@@ -216,7 +216,7 @@ static const token_pri pri_table[] =
 };
 
 
-static size_t get_split_pri(c_token_t tok)
+static size_t get_split_pri(E_Token tok)
 {
    for (auto token : pri_table)
    {
@@ -230,11 +230,11 @@ static size_t get_split_pri(c_token_t tok)
 }
 
 
-static void try_split_here(cw_entry &ent, chunk_t *pc)
+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);
+   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): pc_pri is %zu\n", __func__, __LINE__, pc_pri);
@@ -246,7 +246,7 @@ static void try_split_here(cw_entry &ent, chunk_t *pc)
    }
    LOG_FMT(LSPLIT, "%s(%d):\n", __func__, __LINE__);
    // Can't split after a newline
-   chunk_t *prev = chunk_get_prev(pc);
+   Chunk *prev = pc->GetPrev();
 
    if (  prev == nullptr
       || (  chunk_is_newline(prev)
@@ -264,7 +264,7 @@ static void try_split_here(cw_entry &ent, chunk_t *pc)
    // Can't split a function without arguments
    if (chunk_is_token(pc, CT_FPAREN_OPEN))
    {
-      chunk_t *next = chunk_get_next(pc);
+      Chunk *next = pc->GetNext();
 
       if (chunk_is_token(next, CT_FPAREN_CLOSE))
       {
@@ -277,7 +277,7 @@ static void try_split_here(cw_entry &ent, chunk_t *pc)
    // Only split concatenated strings
    if (chunk_is_token(pc, CT_STRING))
    {
-      chunk_t *next = chunk_get_next(pc);
+      Chunk *next = pc->GetNext();
 
       if (chunk_is_not_token(next, CT_STRING))
       {
@@ -301,7 +301,7 @@ static void try_split_here(cw_entry &ent, chunk_t *pc)
    // don't break after last term of a qualified type
    if (pc_pri == 25)
    {
-      chunk_t *next = chunk_get_next(pc);
+      Chunk *next = pc->GetNext();
 
       if (  chunk_is_not_token(next, CT_WORD)
          && (get_split_pri(next->type) != 25))
@@ -322,8 +322,7 @@ static void try_split_here(cw_entry &ent, chunk_t *pc)
    }
    else
    {
-      if (  pc->level >= ent.pc->level
-         && pc_pri < ent.pri)
+      if (pc_pri < ent.pri)
       {
          LOG_FMT(LSPLIT, "%s(%d):\n", __func__, __LINE__);
          change = true;
@@ -340,11 +339,11 @@ static void try_split_here(cw_entry &ent, chunk_t *pc)
 } // try_split_here
 
 
-static bool split_line(chunk_t *start)
+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, "%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",
@@ -423,14 +422,15 @@ static bool split_line(chunk_t *start)
    cw_entry ent;
 
    memset(&ent, 0, sizeof(ent));
-   chunk_t *pc = start;
-   chunk_t *prev;
+   Chunk *pc = start;
+   Chunk *prev;
 
-   while (  ((pc = chunk_get_prev(pc)) != nullptr)
+   while (  ((pc = pc->GetPrev()) != nullptr)
+         && pc->IsNotNullChunk()
          && !chunk_is_newline(pc))
    {
       LOG_FMT(LSPLIT, "%s(%d): at %s, orig_line is %zu, orig_col is %zu\n",
-              __func__, __LINE__, pc->text(), pc->orig_line, pc->orig_col);
+              __func__, __LINE__, pc->Text(), pc->orig_line, pc->orig_col);
 
       if (chunk_is_not_token(pc, CT_SPACE))
       {
@@ -450,14 +450,14 @@ static bool split_line(chunk_t *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));
+              __func__, __LINE__, start->orig_line, start->Text(), get_token_name(start->type));
    }
    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);
+              __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);
+              __func__, __LINE__, ent.pc->Text(), ent.pc->orig_col);
    }
 
    // Break before the token instead of after it according to the pos_xxx rules
@@ -493,13 +493,14 @@ static bool split_line(chunk_t *start)
       }
       else
       {
-         pc = chunk_get_next(ent.pc);
+         pc = ent.pc->GetNext();
       }
       LOG_FMT(LSPLIT, "%s(%d): at '%s', orig_col is %zu\n",
-              __func__, __LINE__, pc->text(), pc->orig_col);
+              __func__, __LINE__, pc->Text(), pc->orig_col);
    }
 
-   if (pc == nullptr)
+   if (  pc == nullptr
+      || pc->IsNullChunk())
    {
       pc = start;
 
@@ -515,7 +516,7 @@ static bool split_line(chunk_t *start)
          || chunk_is_token(start, CT_COMMA)
          || chunk_is_token(start, CT_SEMICOLON)
          || chunk_is_token(start, CT_VSEMICOLON)
-         || start->len() == 0)
+         || start->Len() == 0)
       {
          LOG_FMT(LSPLIT, " ** NO GO **\n");
 
@@ -524,20 +525,21 @@ static bool split_line(chunk_t *start)
       }
    }
    // add a newline before pc
-   prev = chunk_get_prev(pc);
+   prev = pc->GetPrev();
 
    if (  prev != nullptr
+      && prev->IsNotNullChunk()
       && !chunk_is_newline(pc)
       && !chunk_is_newline(prev))
    {
-      //int plen = (pc->len() < 5) ? pc->len() : 5;
-      //int slen = (start->len() < 5) ? start->len() : 5;
+      //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));
-      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));
+      //        plen, pc->Text(), get_token_name(pc->type),
+      //        slen, start->Text(), get_token_name(start->type));
+      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));
 
       split_before_chunk(pc);
    }
@@ -553,22 +555,23 @@ static bool split_line(chunk_t *start)
  *   4. If that doesn't work, then look for an assignment at paren level.
  *   5. If that doesn't work, then give up.
  */
-static void split_for_stmt(chunk_t *start)
+static void split_for_stmt(Chunk *start)
 {
    LOG_FUNC_ENTRY();
    // how many semicolons (1 or 2) do we need to find
    log_rule_B("ls_for_split_full");
-   size_t  max_cnt     = options::ls_for_split_full() ? 2 : 1;
-   chunk_t *open_paren = nullptr;
-   size_t  nl_cnt      = 0;
+   size_t max_cnt     = options::ls_for_split_full() ? 2 : 1;
+   Chunk  *open_paren = nullptr;
+   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->orig_line);
 
    // Find the open paren so we know the level and count newlines
-   chunk_t *pc = start;
+   Chunk *pc = start;
 
-   while ((pc = chunk_get_prev(pc)) != nullptr)
+   while (  ((pc = pc->GetPrev()) != nullptr)
+         && pc->IsNotNullChunk())
    {
       if (chunk_is_token(pc, CT_SPAREN_OPEN))
       {
@@ -588,8 +591,8 @@ static void split_for_stmt(chunk_t *start)
       return;
    }
    // see if we started on the semicolon
-   int     count = 0;
-   chunk_t *st[2];
+   int   count = 0;
+   Chunk *st[2];
 
    pc = start;
 
@@ -601,7 +604,8 @@ static void split_for_stmt(chunk_t *start)
 
    // first scan backwards for the semicolons
    while (  (count < static_cast<int>(max_cnt))
-         && ((pc = chunk_get_prev(pc)) != nullptr)
+         && ((pc = pc->GetPrev()) != nullptr)
+         && pc->IsNotNullChunk()
          && pc->flags.test(PCF_IN_SPAREN))
    {
       if (  chunk_is_token(pc, CT_SEMICOLON)
@@ -614,7 +618,7 @@ static void split_for_stmt(chunk_t *start)
    pc = start;
 
    while (  (count < static_cast<int>(max_cnt))
-         && ((pc = chunk_get_next(pc)) != nullptr)
+         && ((pc = pc->GetNext())->IsNotNullChunk())
          && pc->flags.test(PCF_IN_SPAREN))
    {
       if (  chunk_is_token(pc, CT_SEMICOLON)
@@ -627,8 +631,8 @@ static void split_for_stmt(chunk_t *start)
    while (--count >= 0)
    {
       // TODO: st[0] may be uninitialized here
-      LOG_FMT(LSPLIT, "%s(%d): split before %s\n", __func__, __LINE__, st[count]->text());
-      split_before_chunk(chunk_get_next(st[count]));
+      LOG_FMT(LSPLIT, "%s(%d): split before %s\n", __func__, __LINE__, st[count]->Text());
+      split_before_chunk(st[count]->GetNext());
    }
 
    if (  !is_past_width(start)
@@ -639,12 +643,12 @@ static void split_for_stmt(chunk_t *start)
    // Still past width, check for commas at parenthese level
    pc = open_paren;
 
-   while ((pc = chunk_get_next(pc)) != start)
+   while ((pc = pc->GetNext()) != start)
    {
       if (  chunk_is_token(pc, CT_COMMA)
          && (pc->level == (open_paren->level + 1)))
       {
-         split_before_chunk(chunk_get_next(pc));
+         split_before_chunk(pc->GetNext());
 
          if (!is_past_width(pc))
          {
@@ -655,12 +659,12 @@ static void split_for_stmt(chunk_t *start)
    // Still past width, check for a assignments at parenthese level
    pc = open_paren;
 
-   while ((pc = chunk_get_next(pc)) != start)
+   while ((pc = pc->GetNext()) != start)
    {
       if (  chunk_is_token(pc, CT_ASSIGN)
          && (pc->level == (open_paren->level + 1)))
       {
-         split_before_chunk(chunk_get_next(pc));
+         split_before_chunk(pc->GetNext());
 
          if (!is_past_width(pc))
          {
@@ -672,20 +676,21 @@ static void split_for_stmt(chunk_t *start)
 } // split_for_stmt
 
 
-static void split_fcn_params_full(chunk_t *start)
+static void split_fcn_params_full(Chunk *start)
 {
    LOG_FUNC_ENTRY();
-   LOG_FMT(LSPLIT, "%s(%d): %s\n", __func__, __LINE__, start->text());
+   LOG_FMT(LSPLIT, "%s(%d): %s\n", __func__, __LINE__, start->Text());
 
    // Find the opening function parenthesis
-   chunk_t *fpo = start;
+   Chunk *fpo = start;
 
    LOG_FMT(LSPLIT, "  %s(%d): Find the opening function parenthesis\n", __func__, __LINE__);
 
-   while ((fpo = chunk_get_prev(fpo)) != nullptr)
+   while (  (fpo = fpo->GetPrev()) != nullptr
+         && fpo->IsNotNullChunk())
    {
       LOG_FMT(LSPLIT, "%s(%d): %s, orig_col is %zu, level is %zu\n",
-              __func__, __LINE__, fpo->text(), fpo->orig_col, fpo->level);
+              __func__, __LINE__, fpo->Text(), fpo->orig_col, fpo->level);
 
       if (  chunk_is_token(fpo, CT_FPAREN_OPEN)
          && (fpo->level == start->level - 1))
@@ -694,9 +699,9 @@ static void split_fcn_params_full(chunk_t *start)
       }
    }
    // Now break after every comma
-   chunk_t *pc = fpo;
+   Chunk *pc = fpo->GetNextNcNnl();
 
-   while ((pc = chunk_get_next_ncnnl(pc)) != nullptr)
+   while (pc->IsNotNullChunk())
    {
       if (pc->level <= fpo->level)
       {
@@ -706,34 +711,36 @@ static void split_fcn_params_full(chunk_t *start)
       if (  (pc->level == (fpo->level + 1))
          && chunk_is_token(pc, CT_COMMA))
       {
-         split_before_chunk(chunk_get_next(pc));
+         split_before_chunk(pc->GetNext());
       }
+      pc = pc->GetNextNcNnl();
    }
 }
 
 
-static void split_fcn_params(chunk_t *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);
-   chunk_t *fpo = start;
+   LOG_FMT(LSPLIT, "%s(%d): start->Text() is '%s', orig_line is %zu, orig_col is %zu\n",
+           __func__, __LINE__, start->Text(), start->orig_line, start->orig_col);
+   Chunk *fpo = start;
 
    if (!chunk_is_token(start, CT_FPAREN_OPEN))
    {
       // Find the opening function parenthesis
       LOG_FMT(LSPLIT, "%s(%d): Find the opening function parenthesis\n", __func__, __LINE__);
 
-      while (  ((fpo = chunk_get_prev(fpo)) != nullptr)
+      while (  ((fpo = fpo->GetPrev()) != nullptr)
+            && fpo->IsNotNullChunk()
             && chunk_is_not_token(fpo, 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);
+                 __func__, __LINE__, fpo->Text(), fpo->orig_col, fpo->level);
       }
    }
-   chunk_t *pc     = chunk_get_next_ncnnl(fpo);
-   size_t  min_col = pc->column;
+   Chunk  *pc     = fpo->GetNextNcNnl();
+   size_t min_col = pc->column;
 
    log_rule_B("code_width");
    LOG_FMT(LSPLIT, "    mincol is %zu, max_width is %zu\n",
@@ -744,10 +751,10 @@ static void split_fcn_params(chunk_t *start)
 
    LOG_FMT(LSPLIT, "%s(%d):look forward until CT_COMMA or CT_FPAREN_CLOSE\n", __func__, __LINE__);
 
-   while (pc != nullptr)
+   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_FMT(LSPLIT, "%s(%d): pc->Text() '%s', type is %s\n",
+              __func__, __LINE__, pc->Text(), get_token_name(pc->type));
 
       if (chunk_is_newline(pc))
       {
@@ -762,8 +769,8 @@ static void split_fcn_params(chunk_t *start)
             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->column - last_col) + pc->Len();
+         last_col   = pc->column + pc->Len();
 
          LOG_FMT(LSPLIT, "%s(%d): last_col is %d\n",
                  __func__, __LINE__, last_col);
@@ -791,20 +798,20 @@ static void split_fcn_params(chunk_t *start)
             }
          }
       }
-      pc = chunk_get_next(pc);
+      pc = pc->GetNext();
    }
    // back up until the prev is a comma
-   chunk_t *prev = pc;
+   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->level);
 
-   while ((prev = chunk_get_prev(prev)) != nullptr)
+   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->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));
+              __func__, __LINE__, prev->level, prev->Text(), get_token_name(prev->type));
 
       if (  chunk_is_newline(prev)
          || chunk_is_token(prev, CT_COMMA))
@@ -813,15 +820,15 @@ static void split_fcn_params(chunk_t *start)
                  __func__, __LINE__, prev->orig_col);
          break;
       }
-      LOG_FMT(LSPLIT, "%s(%d): last_col is %d, prev->len() is %zu\n",
-              __func__, __LINE__, last_col, prev->len());
-      last_col -= prev->len();
+      LOG_FMT(LSPLIT, "%s(%d): last_col is %d, prev->Len() is %zu\n",
+              __func__, __LINE__, last_col, prev->Len());
+      last_col -= prev->Len();
       LOG_FMT(LSPLIT, "%s(%d): last_col is %d\n",
               __func__, __LINE__, last_col);
 
       if (chunk_is_token(prev, CT_FPAREN_OPEN))
       {
-         pc = chunk_get_next(prev);
+         pc = prev->GetNext();
 
          log_rule_B("indent_paren_nl");
 
@@ -848,21 +855,21 @@ static void split_fcn_params(chunk_t *start)
          }
 
          // Don't split "()"
-         if (pc->type != c_token_t(prev->type + 1))
+         if (pc->type != E_Token(prev->type + 1))
          {
             break;
          }
       }
    }
 
-   if (  prev != nullptr
+   if (  prev->IsNotNullChunk()
       && !chunk_is_newline(prev))
    {
       LOG_FMT(LSPLIT, "%s(%d): -- ended on %s --\n",
               __func__, __LINE__, get_token_name(prev->type));
       LOG_FMT(LSPLIT, "%s(%d): min_col is %zu\n",
               __func__, __LINE__, min_col);
-      pc = chunk_get_next(prev);
+      pc = prev->GetNext();
       newline_add_before(pc);
       reindent_line(pc, min_col);
       cpd.changes++;
@@ -870,18 +877,18 @@ static void split_fcn_params(chunk_t *start)
 } // split_fcn_params
 
 
-static void split_template(chunk_t *start)
+static void split_template(Chunk *start)
 {
    LOG_FUNC_ENTRY();
-   LOG_FMT(LSPLIT, "  %s(%d): start %s\n", __func__, __LINE__, start->text());
+   LOG_FMT(LSPLIT, "  %s(%d): start %s\n", __func__, __LINE__, start->Text());
    LOG_FMT(LSPLIT, "  %s(%d): back up until the prev is a comma\n", __func__, __LINE__);
 
    // back up until the prev is a comma
-   chunk_t *prev = start;
+   Chunk *prev = start;
 
-   while ((prev = chunk_get_prev(prev)) != nullptr)
+   while ((prev = prev->GetPrev())->IsNotNullChunk())
    {
-      LOG_FMT(LSPLIT, "  %s(%d): prev '%s'\n", __func__, __LINE__, prev->text());
+      LOG_FMT(LSPLIT, "  %s(%d): prev '%s'\n", __func__, __LINE__, prev->Text());
 
       if (  chunk_is_newline(prev)
          || chunk_is_token(prev, CT_COMMA))
@@ -895,9 +902,9 @@ static void split_template(chunk_t *start)
    {
       LOG_FMT(LSPLIT, "  %s(%d):", __func__, __LINE__);
       LOG_FMT(LSPLIT, " -- ended on %s --\n", get_token_name(prev->type));
-      chunk_t *pc = chunk_get_next(prev);
+      Chunk  *pc = prev->GetNext();
       newline_add_before(pc);
-      size_t  min_col = 1;
+      size_t min_col = 1;
 
       log_rule_B("indent_continue");
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/width.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/width.h
index 3c5ad0b0..3c5ad0b0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/width.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/width.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/windows_compat.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/windows_compat.h
index 8210adab..8210adab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/src/windows_compat.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/src/windows_compat.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/.editorconfig b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/.editorconfig
index fcea945e..fcea945e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/.editorconfig
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/.editorconfig
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/CMakeLists.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/CMakeLists.txt
index 13839df9..13839df9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/CMakeLists.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/CMakeLists.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/c-sharp.test b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/c-sharp.test
index 232315a7..4837a5ae 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/c-sharp.test
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/c-sharp.test
@@ -40,7 +40,7 @@
 
 10090  cs/ben_043.cfg                               cs/string_multi.cs
 
-10100  common/empty.cfg                             cs/bug_600.cs
+10100  cs/bug_600.cfg                               cs/bug_600.cs
 10101  cs/sf607.cfg                                 cs/sf607.cs
 
 10110  cs/mda_space_a.cfg                           cs/mdarray_space.cs
@@ -90,19 +90,12 @@
 10014  common/empty.cfg                             cs/630_bad-new-init-semicolon-removal.cs
 10015  cs/misc-failures.cfg                         cs/misc-failures.cs
 10016  cs/new-constraint-paren-space.cfg            cs/new-constraint-paren-space.cs
-10018  common/empty.cfg                             cs/delete-space-oc.mm
-10019  common/empty.cfg                             cs/func-param-wrap-oc.mm
 10027  cs/U01-Cs.cfg                                cs/oneline_property.cs
 10028  cs/U02-Cs.cfg                                cs/ifcolalign.cs
 10029  cs/U03-Cs.cfg                                cs/when.cs
-10033  cs/U11-Cpp.cfg                               cs/objc.mm
-10034  cs/U12-Cpp.cfg                               cs/asm.h.mm
-10035  cs/U13-Cpp.cfg                               cs/definesalign.h.mm
-10036  cs/U14-Cpp.cfg                               cs/inttypes.h.mm
 10039  cs/615_nested_usings.cfg                     cs/615_nested-usings.cs
 10044  cs/U04-Cs.cfg                                cs/ifcomment.cs
 10045  cs/UNI-1288.cfg                              cs/UNI-1288.cs
-10046  cs/U15-Cpp.cfg                               cs/UNI-1333.mm
 10051  cs/UNI-1338.cfg                              cs/UNI-1338.cs
 10055  cs/U06-Cs.cfg                                cs/UNI-1345.cs
 10066  cs/UNI-1977.cfg                              cs/UNI-1977.cs
@@ -111,13 +104,9 @@
 10076  cs/UNI-1343.cfg                              cs/UNI-1343.cs
 10077  cs/U09-Cs.cfg                                cs/UNI-1919.cs
 10078  cs/U10-Cs.cfg                                cs/UNI-3484.cs
-10102  cs/U24-Cpp.cfg                               cs/pp-ignore.mm
 10103  cs/U11-Cs.cfg                                cs/UNI-2506.cs
 10104  common/empty.cfg                             cs/UNI-2505.cs
 11011  cs/620_getset-brace.cfg                      cs/620_getset-brace.cs
-11030  cs/U08-Cpp.cfg                               cs/argtypes.mm
-11031  cs/U09-Cpp.cfg                               cs/casting.mm
-11032  cs/U10-Cpp.cfg                               cs/newlines.mm
 11072  cs/U07-Cs.cfg                                cs/UNI-2007.cs
 11073  cs/U08-Cs.cfg                                cs/UNI-2008.cs
 20010  cs/UNI-32658.cfg                             cs/UNI-32658.cs
@@ -128,7 +117,6 @@
 60007  cs/UNI-3083.cfg                              cs/UNI-3083.cs
 60008  cs/U-J.cfg                                   cs/UNI-17253.cs
 60009  cs/UNI-9917.cfg                              cs/UNI-9917.cs
-60011  cs/UNI-11095.cfg                             cs/UNI-11095.mm
 60012  cs/U13-Cs.cfg                                cs/UNI-12303.cs
 60013  cs/UNI-13955.cfg                             cs/UNI-13955.cs
 60015  cs/UNI-14131.cfg                             cs/UNI-14131.cs
@@ -147,3 +135,4 @@
 60042  cs/indent-multistring-coulmn1.cfg            cs/indent-multistring-coulmn1.cs
 60044  cs/UNI-37241.cfg                             cs/UNI-37241.cs
 60045  common/nl_before_after.cfg                   cs/add-nl-before-namespace.cs
+60046  common/sp_after_cast.cfg                     cs/cast.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/c.test b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/c.test
index eaf30d4e..584ca033 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/c.test
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/c.test
@@ -1,7 +1,6 @@
 #
 # Test cases specifically for the C language.
 #
-# Range: 00000 - 09999
 # test.name  config.file  input.file
 
 
@@ -46,8 +45,6 @@
 00065  c/ben_053.cfg                              c/braces-5.c
 00066  c/ben_054.cfg                              c/vb-while.c
 00067  c/ben_055.cfg                              c/vb-do.c
-
-
 00068  c/ben_056.cfg                              c/bsnl.c
 00069  c/ben_057.cfg                              c/vb-pp.c
 
@@ -60,10 +57,12 @@
 
 00081  c/else-if-1.cfg                            c/else-if.c
 00082  c/else-if-2.cfg                            c/else-if.c
+00083  c/Issue_3601.cfg                           c/Issue_3601.c
 
 00091  c/cond-1.cfg                               c/cond.c
 00092  common/indent_columns-3.cfg                c/cond.c
 00093  c/sp_cond_colon.cfg                        c/cond.c
+00094  c/Issue_3457.cfg                           c/Issue_3457.c
 
 00101  c/ben_061.cfg                              c/bugs-1.c
 00102  c/space_indent_columns-3.cfg               c/bugs-2.c
@@ -91,7 +90,9 @@
 00143  c/ben_074.cfg                              c/t3.in.c
 00144  c/ben_075.cfg                              c/align-proto-vars.c
 00145  c/ben_076.cfg                              c/vardefcol.c
-
+00146  c/Issue_3516.cfg                           c/Issue_3516.c
+00147  c/Issue_3517.cfg                           c/Issue_3516.c
+00148  c/Issue_3518.cfg                           c/Issue_3518.c
 
 # casts
 
@@ -255,6 +256,8 @@
 01006  common/mod_case_brace_rm.cfg               c/mod_case_brace.c
 01007  c/mod_move_case_brace.cfg                  c/mod_case_brace.c
 01008  c/mod_case_brace_add.cfg                   c/Issue_3366.c
+01009  c/mod_move_case_return.cfg                 c/mod_move_case_return.c
+01010  c/mod_move_case_return.cfg                 c/mod_move_case_return_bad.c
 
 01011  common/del_semicolon.cfg                   c/semicolons.c
 01012  c/ben_086.cfg                              c/semicolons.c
@@ -288,6 +291,7 @@
 02000  c/ben_087.cfg                              c/i2c-core.c
 02001  c/preproc-cleanup.cfg                      c/directfb.h
 02002  common/ben2.cfg                            c/i2c-core.c
+02003  c/Issue_3353.cfg                           c/Issue_3353.h
 
 # clark's style - blank lines before and after flow control, indented comments
 
@@ -433,3 +437,26 @@
 10043  c/sp_ptr_star_func_var-a.cfg               c/Issue_3376.c
 10044  c/sp_ptr_star_func_var-r.cfg               c/Issue_3376.c
 10045  c/sp_ptr_star_func_var-f.cfg               c/Issue_3376.c
+10046  c/Issue_3402.cfg                           c/Issue_3402.c
+10047  c/pp_if_indent_code-true.cfg               c/Issue_3421.h
+10048  c/Issue_3431.cfg                           c/Issue_3431.c
+10049  c/indent_paren_close--1.cfg                c/Issue_3436.c
+10050  common/empty.cfg                           c/Issue_3192.c
+10051  c/Issue_3454.cfg                           c/Issue_3454.c
+10052  c/Issue_3472.cfg                           c/Issue_3472.c
+10053  c/Issue_3476.cfg                           c/Issue_3476.c
+10054  c/Issue_3480.cfg                           c/Issue_3480.c
+10055  c/Issue_3493.cfg                           c/Issue_3493.c
+10056  c/sp_enum_brace-i.cfg                      c/Issue_3496.h
+10057  c/sp_enum_brace-a.cfg                      c/Issue_3496.h
+10058  c/sp_enum_brace-r.cfg                      c/Issue_3496.h
+10059  c/sp_enum_brace-f.cfg                      c/Issue_3496.h
+10060  c/indent_ignore_bool-true.cfg              c/Issue_3548.c
+10061  c/Issue_3556.cfg                           c/Issue_3556.c
+10062  c/Issue_3561.cfg                           c/Issue_3561.c
+10063  c/Issue_3565.cfg                           c/Issue_3565.c
+10064  c/Issue_3567-a.cfg                         c/Issue_3567.c
+10065  c/Issue_3567-b.cfg                         c/Issue_3567.c
+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
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/config/I-842.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/config/I-842.cfg
index e69de29b..e69de29b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/config/I-842.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/config/I-842.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/config/copyright-header.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/config/copyright-header.cfg
index 13d5020b..13d5020b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/config/copyright-header.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/config/copyright-header.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/config/copyright-header.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/config/copyright-header.txt
index f96c1ae8..f96c1ae8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/config/copyright-header.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/config/copyright-header.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/config/mini_d.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/config/mini_d.cfg
index ddd51138..ddd51138 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/config/mini_d.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/config/mini_d.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/config/mini_nd.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/config/mini_nd.cfg
index 23db4460..23db4460 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/config/mini_nd.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/config/mini_nd.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/config/replace.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/config/replace.cfg
index 16473bf2..16473bf2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/config/replace.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/config/replace.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/config/tracking_space.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/config/tracking_space.cfg
index 8b37aa38..8b37aa38 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/config/tracking_space.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/config/tracking_space.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/config/truncate.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/config/truncate.cfg
index cc48c57e..cc48c57e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/config/truncate.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/config/truncate.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/config/unmatched_close_pp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/config/unmatched_close_pp.cfg
index e69de29b..e69de29b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/config/unmatched_close_pp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/config/unmatched_close_pp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/input/I-3310.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/input/I-3310.c
index e69de29b..e69de29b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/input/I-3310.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/input/I-3310.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/input/I-842.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/input/I-842.cpp
index 7f7bcaf3..7f7bcaf3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/input/I-842.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/input/I-842.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/input/backup.h-save b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/input/backup.h-save
index 9a66578c..9a66578c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/input/backup.h-save
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/input/backup.h-save
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/input/class_enum_struct_union.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/input/class_enum_struct_union.cpp
index 6a72c823..6a72c823 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/input/class_enum_struct_union.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/input/class_enum_struct_union.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/input/logger.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/input/logger.cs
index defede8a..defede8a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/input/logger.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/input/logger.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/input/replace.list b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/input/replace.list
index 009e6f33..009e6f33 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/input/replace.list
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/input/replace.list
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/input/testSrc.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/input/testSrc.cpp
index 1a22f6d9..1a22f6d9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/input/testSrc.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/input/testSrc.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/input/testSrcP.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/input/testSrcP.cpp
index 85e36674..85e36674 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/input/testSrcP.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/input/testSrcP.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/input/tracking_space.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/input/tracking_space.cpp
index 5b0b8aa1..5b0b8aa1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/input/tracking_space.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/input/tracking_space.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/input/truncate.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/input/truncate.cpp
index 7ef9530d..7ef9530d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/input/truncate.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/input/truncate.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/input/unmatched_close_pp.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/input/unmatched_close_pp.cpp
index b79d12fd..b79d12fd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/input/unmatched_close_pp.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/input/unmatched_close_pp.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/output/21.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/21.txt
index 7c702d87..91ddb8ed 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/output/21.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/21.txt
@@ -12,10 +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
 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->column is 1, pc->Text() is 'struct, indent_column is 1
 log_rule(indent_text : rule is 'pos_conditional'
-indent_text : orig_line is 1, indent set to 1, for 'struct'
+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'
@@ -31,6 +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
 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'
@@ -47,6 +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
 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'
@@ -63,11 +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
 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->column is 1, pc->Text() is '{, indent_column is 1
 log_rule(indent_text : rule is 'pos_conditional'
-indent_text : orig_line is 2, indent set to 1, for '{'
+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'
@@ -80,6 +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
 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'
@@ -93,10 +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
 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->column is 1, pc->Text() is 'TelegramIndex, indent_column is 9
 log_rule(indent_text : rule is 'pos_conditional'
-indent_text : orig_line is 3, indent set to 9, for 'TelegramIndex'
+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'
@@ -121,6 +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
 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'
@@ -146,6 +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
 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'
@@ -159,6 +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
 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'
@@ -172,6 +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
 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'
@@ -185,6 +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
 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'
@@ -198,6 +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
 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'
@@ -211,6 +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
 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,6 +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
 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'
@@ -237,6 +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
 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'
@@ -253,6 +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
 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'
@@ -266,6 +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
 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'
@@ -283,6 +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
 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'
@@ -299,10 +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
 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->column is 1, pc->Text() is 'pTelName, indent_column is 17
 log_rule(indent_text : rule is 'pos_conditional'
-indent_text : orig_line is 4, indent set to 17, for 'pTelName'
+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'
@@ -323,6 +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
 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'
@@ -348,6 +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
 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'
@@ -367,6 +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
 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'
@@ -383,6 +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
 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'
@@ -399,6 +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
 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'
@@ -415,10 +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
 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->column is 1, pc->Text() is 'nTelIndex, indent_column is 17
 log_rule(indent_text : rule is 'pos_conditional'
-indent_text : orig_line is 5, indent set to 17, for 'nTelIndex'
+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'
@@ -438,6 +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
 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'
@@ -463,6 +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
 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'
@@ -482,6 +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
 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'
@@ -498,6 +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
 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'
@@ -514,11 +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
 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->column is 1, pc->Text() is '{, indent_column is 9
 log_rule(indent_text : rule is 'pos_conditional'
-indent_text : orig_line is 6, indent set to 9, for '{'
+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'
@@ -532,6 +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
 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'
@@ -548,10 +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
 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->column is 1, pc->Text() is '}, indent_column is 9
 log_rule(indent_text : rule is 'pos_conditional'
-indent_text : orig_line is 7, indent set to 9, for '}'
+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'
@@ -565,6 +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
 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'
@@ -578,10 +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
 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->column is 1, pc->Text() is '~, indent_column is 9
 log_rule(indent_text : rule is 'pos_conditional'
-indent_text : orig_line is 9, indent set to 9, for '~'
+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'
@@ -598,6 +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
 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'
@@ -611,6 +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
 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'
@@ -639,6 +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
 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'
@@ -652,6 +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
 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'
@@ -665,11 +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
 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->column is 1, pc->Text() is '{, indent_column is 9
 log_rule(indent_text : rule is 'pos_conditional'
-indent_text : orig_line is 10, indent set to 9, for '{'
+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'
@@ -683,6 +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
 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'
@@ -699,10 +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
 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->column is 1, pc->Text() is '}, indent_column is 9
 log_rule(indent_text : rule is 'pos_conditional'
-indent_text : orig_line is 11, indent set to 9, for '}'
+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'
@@ -716,6 +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
 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'
@@ -729,10 +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
 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->column is 1, pc->Text() is 'const, indent_column is 9
 log_rule(indent_text : rule is 'pos_conditional'
-indent_text : orig_line is 13, indent set to 9, for 'const'
+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'
@@ -751,6 +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
 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'
@@ -764,6 +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
 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'
@@ -777,6 +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
 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'
@@ -790,6 +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
 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'
@@ -804,6 +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
 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'
@@ -817,6 +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
 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'
@@ -830,10 +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
 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->column is 1, pc->Text() is 'unsigned, indent_column is 9
 log_rule(indent_text : rule is 'pos_conditional'
-indent_text : orig_line is 14, indent set to 9, for 'unsigned'
+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'
@@ -850,6 +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
 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'
@@ -863,6 +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
 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'
@@ -877,6 +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
 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'
@@ -890,6 +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
 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'
@@ -906,10 +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
 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->column is 1, pc->Text() is '}, indent_column is 1
 log_rule(indent_text : rule is 'pos_conditional'
-indent_text : orig_line is 15, indent set to 1, for '}'
+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'
@@ -925,6 +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
 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'
@@ -941,6 +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
 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'
@@ -958,10 +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
 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->column is 1, pc->Text() is 'struct, indent_column is 1
 log_rule(indent_text : rule is 'pos_conditional'
-indent_text : orig_line is 1, indent set to 1, for 'struct'
+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'
@@ -977,6 +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
 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'
@@ -993,6 +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
 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'
@@ -1009,11 +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
 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->column is 1, pc->Text() is '{, indent_column is 1
 log_rule(indent_text : rule is 'pos_conditional'
-indent_text : orig_line is 2, indent set to 1, for '{'
+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'
@@ -1026,6 +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
 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'
@@ -1039,10 +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
 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->column is 9, pc->Text() is 'TelegramIndex, indent_column is 9
 log_rule(indent_text : rule is 'pos_conditional'
-indent_text : orig_line is 3, indent set to 9, for 'TelegramIndex'
+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'
@@ -1055,6 +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
 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'
@@ -1080,6 +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
 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'
@@ -1093,6 +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
 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'
@@ -1106,6 +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
 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'
@@ -1119,6 +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
 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'
@@ -1132,6 +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
 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'
@@ -1145,6 +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
 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'
@@ -1158,6 +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
 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'
@@ -1171,6 +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
 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'
@@ -1187,6 +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
 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'
@@ -1200,6 +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
 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'
@@ -1217,6 +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
 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'
@@ -1233,10 +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
 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->column is 17, pc->Text() is 'pTelName, indent_column is 17
 log_rule(indent_text : rule is 'pos_conditional'
-indent_text : orig_line is 4, indent set to 17, for 'pTelName'
+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'
@@ -1252,6 +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
 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'
@@ -1277,6 +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
 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'
@@ -1296,6 +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
 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,6 +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
 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'
@@ -1328,6 +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
 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'
@@ -1344,10 +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
 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->column is 17, pc->Text() is 'nTelIndex, indent_column is 17
 log_rule(indent_text : rule is 'pos_conditional'
-indent_text : orig_line is 5, indent set to 17, for 'nTelIndex'
+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'
@@ -1363,6 +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
 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'
@@ -1388,6 +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
 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'
@@ -1407,6 +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
 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'
@@ -1423,6 +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
 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'
@@ -1439,11 +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
 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->column is 9, pc->Text() is '{, indent_column is 9
 log_rule(indent_text : rule is 'pos_conditional'
-indent_text : orig_line is 6, indent set to 9, for '{'
+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'
@@ -1456,6 +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
 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'
@@ -1472,10 +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
 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->column is 9, pc->Text() is '}, indent_column is 9
 log_rule(indent_text : rule is 'pos_conditional'
-indent_text : orig_line is 7, indent set to 9, for '}'
+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'
@@ -1488,6 +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
 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'
@@ -1501,10 +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
 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->column is 9, pc->Text() is '~, indent_column is 9
 log_rule(indent_text : rule is 'pos_conditional'
-indent_text : orig_line is 9, indent set to 9, for '~'
+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'
@@ -1517,6 +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
 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'
@@ -1530,6 +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
 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'
@@ -1558,6 +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
 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'
@@ -1571,6 +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
 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'
@@ -1584,11 +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
 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->column is 9, pc->Text() is '{, indent_column is 9
 log_rule(indent_text : rule is 'pos_conditional'
-indent_text : orig_line is 10, indent set to 9, for '{'
+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'
@@ -1601,6 +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
 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'
@@ -1617,10 +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
 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->column is 9, pc->Text() is '}, indent_column is 9
 log_rule(indent_text : rule is 'pos_conditional'
-indent_text : orig_line is 11, indent set to 9, for '}'
+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'
@@ -1633,6 +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
 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'
@@ -1646,10 +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
 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->column is 9, pc->Text() is 'const, indent_column is 9
 log_rule(indent_text : rule is 'pos_conditional'
-indent_text : orig_line is 13, indent set to 9, for 'const'
+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'
@@ -1662,6 +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
 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'
@@ -1675,6 +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
 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'
@@ -1688,6 +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
 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'
@@ -1701,6 +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
 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'
@@ -1715,6 +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
 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'
@@ -1728,6 +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
 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'
@@ -1741,10 +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
 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->column is 9, pc->Text() is 'unsigned, indent_column is 9
 log_rule(indent_text : rule is 'pos_conditional'
-indent_text : orig_line is 14, indent set to 9, for 'unsigned'
+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'
@@ -1757,6 +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
 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'
@@ -1770,6 +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
 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'
@@ -1784,6 +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
 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'
@@ -1797,6 +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
 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'
@@ -1813,10 +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
 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->column is 1, pc->Text() is '}, indent_column is 1
 log_rule(indent_text : rule is 'pos_conditional'
-indent_text : orig_line is 15, indent set to 1, for '}'
+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'
@@ -1832,6 +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
 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'
@@ -1848,6 +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
 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.74.0/tests/cli/output/25.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/25.txt
index 12967a1b..b801ef15 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/output/25.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/25.txt
@@ -13,8 +13,8 @@ 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'
@@ -110,11 +110,11 @@ log_rule(newlines_brace_pair : rule is 'nl_fdef_brace_cond'
 log_rule(newlines_brace_pair : rule is 'nl_fdef_brace'
 log_rule(collapse_empty_body : rule is 'nl_collapse_empty_body'
 log_rule(newlines_brace_pair : rule is 'eat_blanks_after_open_brace'
-newline_add_between : start->text() is '{', type is BRACE_OPEN, orig_line is 6, orig_col is 1
-newline_add_between : and end->text() is '}', orig_line is 7, orig_col is 1
+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'
@@ -161,11 +161,11 @@ log_rule(newlines_brace_pair : rule is 'nl_fdef_brace_cond'
 log_rule(newlines_brace_pair : rule is 'nl_fdef_brace'
 log_rule(collapse_empty_body : rule is 'nl_collapse_empty_body'
 log_rule(newlines_brace_pair : rule is 'eat_blanks_after_open_brace'
-newline_add_between : start->text() is '{', type is BRACE_OPEN, orig_line is 10, orig_col is 1
-newline_add_between : and end->text() is '}', orig_line is 11, orig_col is 1
+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'
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/output/28.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/28.txt
index f49f675e..7dc7aab8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/output/28.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/28.txt
@@ -68,361 +68,361 @@ 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 : 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 ''
+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.74.0/tests/cli/output/31.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/31.txt
index a890e117..b683ad53 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/output/31.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/31.txt
@@ -1,38 +1,55 @@
+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 : 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
@@ -40,149 +57,222 @@ 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 : 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 : 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 : 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 : 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 : 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
+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
@@ -190,149 +280,214 @@ 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 : 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 : 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
+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
+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 : 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
@@ -340,149 +495,222 @@ 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 : 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 : 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 : 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 : 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 : 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
+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
@@ -490,111 +718,159 @@ 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 : 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 : 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
+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
+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
new file mode 100644
index 00000000..5eed370e
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.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.74.0/tests/cli/output/66.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/66.txt
index 71b7804d..85cdb21a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/output/66.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/66.txt
@@ -1,741 +1,741 @@
 space_text : orig_line is 1, orig_col is 1, 'struct' type is STRUCT
-space_text : back-to-back words need a space: pc->text() 'struct', next->text() 'TelegramIndex'
-space_text : orig_line is 1, orig_col is 1, pc-text() 'struct', type is STRUCT
-do_space : orig_line is 1, orig_col is 1, first->text() 'struct', type is STRUCT
-do_space : first->orig_line is 1, first->orig_col is 1, first->text() is 'struct', [STRUCT/NONE] <===>
-           second->orig_line is 1, second->orig_col is 8, second->text() is 'TelegramIndex', [TYPE/STRUCT] : rule ADD from add_space_table[ ]
+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
+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
+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[ ]
+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[ ]
+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[ ]
+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[ ]
+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[ ]
+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[ ]
+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[ ]
+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[ ]
+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[ ]
+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[ ]
+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[ ]
+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
+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[ ]
+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[ ]
+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[ ]
+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[ ]
+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
+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[ ]
+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[ ]
+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[ ]
+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
+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
+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
+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[ ]
+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[ ]
+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[ ]
+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
+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
+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
+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[ ]
+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[ ]
+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[ ]
+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[ ]
+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[ ]
+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
+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[ ]
+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[ ]
+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[ ]
+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
+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[ ]
+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
+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 : 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 :    Len is 13
 space_col_align :    => coldiff is 13
 space_col_align :    => av is IGNORE
 space_col_align :    => first->orig_line  is 3
 space_col_align :    => second->orig_line is 3
-space_col_align :    => first->text()     is 'TelegramIndex'
-space_col_align :    => second->text()    is '('
+space_col_align :    => first->Text()     is 'TelegramIndex'
+space_col_align :    => second->Text()    is '('
 space_col_align :    => first->orig_col   is 1
 space_col_align :    => second->orig_col  is 14
-space_col_align :    => first->len()      is 13
+space_col_align :    => first->Len()      is 13
 space_col_align :    => coldiff is 13
-space_col_align : first->orig_line is 3, orig_col is 14, [FPAREN_OPEN/FUNC_CLASS_DEF], text() '(' <==>
-space_col_align : second->orig_line is 3, orig_col is 15 [QUALIFIER/NONE], text() 'const', [CallStack]
-do_space : orig_line is 3, orig_col is 14, first->text() '(', type is FPAREN_OPEN
-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 : 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 :    Len is 1
 space_col_align :    => coldiff is 1
 space_col_align :    => av is IGNORE
 space_col_align :    => first->orig_line  is 3
 space_col_align :    => second->orig_line is 3
-space_col_align :    => first->text()     is '('
-space_col_align :    => second->text()    is 'const'
+space_col_align :    => first->Text()     is '('
+space_col_align :    => second->Text()    is 'const'
 space_col_align :    => first->orig_col   is 14
 space_col_align :    => second->orig_col  is 15
-space_col_align :    => first->len()      is 1
+space_col_align :    => first->Len()      is 1
 space_col_align :    => coldiff is 1
-space_col_align : first->orig_line is 3, orig_col is 15, [QUALIFIER/NONE], text() 'const' <==>
-space_col_align : second->orig_line is 3, orig_col is 21 [TYPE/NONE], text() 'char', [CallStack]
-do_space : orig_line is 3, orig_col is 15, first->text() 'const', type is QUALIFIER
-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[ ]
+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 :    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 : 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 :    Len is 4
 space_col_align :    => coldiff is 4
 space_col_align :    => av is IGNORE
 space_col_align :    => first->orig_line  is 3
 space_col_align :    => second->orig_line is 3
-space_col_align :    => first->text()     is 'char'
-space_col_align :    => second->text()    is '*'
+space_col_align :    => first->Text()     is 'char'
+space_col_align :    => second->Text()    is '*'
 space_col_align :    => first->orig_col   is 21
 space_col_align :    => second->orig_col  is 25
-space_col_align :    => first->len()      is 4
+space_col_align :    => first->Len()      is 4
 space_col_align :    => coldiff is 4
-space_col_align : first->orig_line is 3, orig_col is 25, [PTR_TYPE/NONE], text() '*' <==>
-space_col_align : second->orig_line is 3, orig_col is 27 [WORD/NONE], text() 'pN', [CallStack]
-do_space : orig_line is 3, orig_col is 25, first->text() '*', type is PTR_TYPE
-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 : 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 :    Len is 1
 space_col_align :    => coldiff is 1
 space_col_align :    => av is IGNORE
 space_col_align :    => first->orig_line  is 3
 space_col_align :    => second->orig_line is 3
-space_col_align :    => first->text()     is '*'
-space_col_align :    => second->text()    is 'pN'
+space_col_align :    => first->Text()     is '*'
+space_col_align :    => second->Text()    is 'pN'
 space_col_align :    => first->orig_col   is 25
 space_col_align :    => second->orig_col  is 27
-space_col_align :    => first->len()      is 1
+space_col_align :    => first->Len()      is 1
 space_col_align :    => coldiff is 2
-space_col_align : first->orig_line is 3, orig_col is 27, [WORD/NONE], text() 'pN' <==>
-space_col_align : second->orig_line is 3, orig_col is 29 [COMMA/NONE], text() ',', [CallStack]
-do_space : orig_line is 3, orig_col is 27, first->text() 'pN', type is WORD
-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 : 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 :    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 : 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 :    Len is 1
 space_col_align :    => coldiff is 1
 space_col_align :    => av is IGNORE
 space_col_align :    => first->orig_line  is 3
 space_col_align :    => second->orig_line is 3
-space_col_align :    => first->text()     is ','
-space_col_align :    => second->text()    is 'unsigned'
+space_col_align :    => first->Text()     is ','
+space_col_align :    => second->Text()    is 'unsigned'
 space_col_align :    => first->orig_col   is 29
 space_col_align :    => second->orig_col  is 31
-space_col_align :    => first->len()      is 1
+space_col_align :    => first->Len()      is 1
 space_col_align :    => coldiff is 2
-space_col_align : first->orig_line is 3, orig_col is 31, [TYPE/NONE], text() 'unsigned' <==>
-space_col_align : second->orig_line is 3, orig_col is 40 [TYPE/NONE], text() 'long', [CallStack]
-do_space : orig_line is 3, orig_col is 31, first->text() 'unsigned', type is TYPE
-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[ ]
+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 :    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[ ]
+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 :    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 : 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 :    Len is 2
 space_col_align :    => coldiff is 2
 space_col_align :    => av is IGNORE
 space_col_align :    => first->orig_line  is 3
 space_col_align :    => second->orig_line is 3
-space_col_align :    => first->text()     is 'nI'
-space_col_align :    => second->text()    is ')'
+space_col_align :    => first->Text()     is 'nI'
+space_col_align :    => second->Text()    is ')'
 space_col_align :    => first->orig_col   is 45
 space_col_align :    => second->orig_col  is 47
-space_col_align :    => first->len()      is 2
+space_col_align :    => first->Len()      is 2
 space_col_align :    => coldiff is 2
-space_col_align : first->orig_line is 3, orig_col is 47, [FPAREN_CLOSE/FUNC_CLASS_DEF], text() ')' <==>
-space_col_align : second->orig_line is 3, orig_col is 49 [CONSTR_COLON/NONE], text() ':', [CallStack]
-do_space : orig_line is 3, orig_col is 47, first->text() ')', type is FPAREN_CLOSE
-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 : 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 :    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 : 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 :    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 : 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 :    Len is 8
 space_col_align :    => coldiff is 8
 space_col_align :    => av is IGNORE
 space_col_align :    => first->orig_line  is 4
 space_col_align :    => second->orig_line is 4
-space_col_align :    => first->text()     is 'pTelName'
-space_col_align :    => second->text()    is '('
+space_col_align :    => first->Text()     is 'pTelName'
+space_col_align :    => second->Text()    is '('
 space_col_align :    => first->orig_col   is 1
 space_col_align :    => second->orig_col  is 9
-space_col_align :    => first->len()      is 8
+space_col_align :    => first->Len()      is 8
 space_col_align :    => coldiff is 8
-space_col_align : first->orig_line is 4, orig_col is 9, [FPAREN_OPEN/FUNC_CTOR_VAR], text() '(' <==>
-space_col_align : second->orig_line is 4, orig_col is 10 [WORD/NONE], text() 'pN', [CallStack]
-do_space : orig_line is 4, orig_col is 9, first->text() '(', type is FPAREN_OPEN
-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 : 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 :    Len is 1
 space_col_align :    => coldiff is 1
 space_col_align :    => av is IGNORE
 space_col_align :    => first->orig_line  is 4
 space_col_align :    => second->orig_line is 4
-space_col_align :    => first->text()     is '('
-space_col_align :    => second->text()    is 'pN'
+space_col_align :    => first->Text()     is '('
+space_col_align :    => second->Text()    is 'pN'
 space_col_align :    => first->orig_col   is 9
 space_col_align :    => second->orig_col  is 10
-space_col_align :    => first->len()      is 1
+space_col_align :    => first->Len()      is 1
 space_col_align :    => coldiff is 1
-space_col_align : first->orig_line is 4, orig_col is 10, [WORD/NONE], text() 'pN' <==>
-space_col_align : second->orig_line is 4, orig_col is 12 [FPAREN_CLOSE/FUNC_CTOR_VAR], text() ')', [CallStack]
-do_space : orig_line is 4, orig_col is 10, first->text() 'pN', type is WORD
-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 : 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 :    Len is 2
 space_col_align :    => coldiff is 2
 space_col_align :    => av is IGNORE
 space_col_align :    => first->orig_line  is 4
 space_col_align :    => second->orig_line is 4
-space_col_align :    => first->text()     is 'pN'
-space_col_align :    => second->text()    is ')'
+space_col_align :    => first->Text()     is 'pN'
+space_col_align :    => second->Text()    is ')'
 space_col_align :    => first->orig_col   is 10
 space_col_align :    => second->orig_col  is 12
-space_col_align :    => first->len()      is 2
+space_col_align :    => first->Len()      is 2
 space_col_align :    => coldiff is 2
-space_col_align : first->orig_line is 4, orig_col is 12, [FPAREN_CLOSE/FUNC_CTOR_VAR], text() ')' <==>
-space_col_align : second->orig_line is 4, orig_col is 13 [COMMA/NONE], text() ',', [CallStack]
-do_space : orig_line is 4, orig_col is 12, first->text() ')', type is FPAREN_CLOSE
-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 : 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 :    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 : 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 :    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 : 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 :    Len is 9
 space_col_align :    => coldiff is 9
 space_col_align :    => av is IGNORE
 space_col_align :    => first->orig_line  is 5
 space_col_align :    => second->orig_line is 5
-space_col_align :    => first->text()     is 'nTelIndex'
-space_col_align :    => second->text()    is '('
+space_col_align :    => first->Text()     is 'nTelIndex'
+space_col_align :    => second->Text()    is '('
 space_col_align :    => first->orig_col   is 1
 space_col_align :    => second->orig_col  is 10
-space_col_align :    => first->len()      is 9
+space_col_align :    => first->Len()      is 9
 space_col_align :    => coldiff is 9
-space_col_align : first->orig_line is 5, orig_col is 10, [FPAREN_OPEN/FUNC_CTOR_VAR], text() '(' <==>
-space_col_align : second->orig_line is 5, orig_col is 11 [WORD/NONE], text() 'n', [CallStack]
-do_space : orig_line is 5, orig_col is 10, first->text() '(', type is FPAREN_OPEN
-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 : 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 :    Len is 1
 space_col_align :    => coldiff is 1
 space_col_align :    => av is IGNORE
 space_col_align :    => first->orig_line  is 5
 space_col_align :    => second->orig_line is 5
-space_col_align :    => first->text()     is '('
-space_col_align :    => second->text()    is 'n'
+space_col_align :    => first->Text()     is '('
+space_col_align :    => second->Text()    is 'n'
 space_col_align :    => first->orig_col   is 10
 space_col_align :    => second->orig_col  is 11
-space_col_align :    => first->len()      is 1
+space_col_align :    => first->Len()      is 1
 space_col_align :    => coldiff is 1
-space_col_align : first->orig_line is 5, orig_col is 11, [WORD/NONE], text() 'n' <==>
-space_col_align : second->orig_line is 5, orig_col is 12 [FPAREN_CLOSE/FUNC_CTOR_VAR], text() ')', [CallStack]
-do_space : orig_line is 5, orig_col is 11, first->text() 'n', type is WORD
-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 : 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 :    Len is 1
 space_col_align :    => coldiff is 1
 space_col_align :    => av is IGNORE
 space_col_align :    => first->orig_line  is 5
 space_col_align :    => second->orig_line is 5
-space_col_align :    => first->text()     is 'n'
-space_col_align :    => second->text()    is ')'
+space_col_align :    => first->Text()     is 'n'
+space_col_align :    => second->Text()    is ')'
 space_col_align :    => first->orig_col   is 11
 space_col_align :    => second->orig_col  is 12
-space_col_align :    => first->len()      is 1
+space_col_align :    => first->Len()      is 1
 space_col_align :    => coldiff is 1
-space_col_align : first->orig_line is 5, orig_col is 12, [FPAREN_CLOSE/FUNC_CTOR_VAR], text() ')' <==>
-space_col_align : second->orig_line is 5, orig_col is 13 [NEWLINE/NONE], text() '', [CallStack]
-do_space : orig_line is 5, orig_col is 12, first->text() ')', type is FPAREN_CLOSE
+space_col_align : 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 :    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 : 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 :    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 : 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 :    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 : 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 :    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 : 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 :    Len is 13
 space_col_align :    => coldiff is 13
 space_col_align :    => av is IGNORE
 space_col_align :    => first->orig_line  is 9
 space_col_align :    => second->orig_line is 9
-space_col_align :    => first->text()     is 'TelegramIndex'
-space_col_align :    => second->text()    is '('
+space_col_align :    => first->Text()     is 'TelegramIndex'
+space_col_align :    => second->Text()    is '('
 space_col_align :    => first->orig_col   is 2
 space_col_align :    => second->orig_col  is 15
-space_col_align :    => first->len()      is 13
+space_col_align :    => first->Len()      is 13
 space_col_align :    => coldiff is 13
-space_col_align : first->orig_line is 9, orig_col is 15, [FPAREN_OPEN/FUNC_CLASS_DEF], text() '(' <==>
-space_col_align : second->orig_line is 9, orig_col is 16 [FPAREN_CLOSE/FUNC_CLASS_DEF], text() ')', [CallStack]
-do_space : orig_line is 9, orig_col is 15, first->text() '(', type is FPAREN_OPEN
-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 : 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 :    Len is 1
 space_col_align :    => coldiff is 1
 space_col_align :    => av is IGNORE
 space_col_align :    => first->orig_line  is 9
 space_col_align :    => second->orig_line is 9
-space_col_align :    => first->text()     is '('
-space_col_align :    => second->text()    is ')'
+space_col_align :    => first->Text()     is '('
+space_col_align :    => second->Text()    is ')'
 space_col_align :    => first->orig_col   is 15
 space_col_align :    => second->orig_col  is 16
-space_col_align :    => first->len()      is 1
+space_col_align :    => first->Len()      is 1
 space_col_align :    => coldiff is 1
-space_col_align : first->orig_line is 9, orig_col is 16, [FPAREN_CLOSE/FUNC_CLASS_DEF], text() ')' <==>
-space_col_align : second->orig_line is 9, orig_col is 17 [NEWLINE/NONE], text() '', [CallStack]
-do_space : orig_line is 9, orig_col is 16, first->text() ')', type is FPAREN_CLOSE
+space_col_align : 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 :    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 : 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 :    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 : 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 :    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[ ]
+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 :    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 : 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 :    Len is 4
 space_col_align :    => coldiff is 4
 space_col_align :    => av is IGNORE
 space_col_align :    => first->orig_line  is 13
 space_col_align :    => second->orig_line is 13
-space_col_align :    => first->text()     is 'char'
-space_col_align :    => second->text()    is '*'
+space_col_align :    => first->Text()     is 'char'
+space_col_align :    => second->Text()    is '*'
 space_col_align :    => first->orig_col   is 7
 space_col_align :    => second->orig_col  is 11
-space_col_align :    => first->len()      is 4
+space_col_align :    => first->Len()      is 4
 space_col_align :    => coldiff is 4
-space_col_align : first->orig_line is 13, orig_col is 11, [PTR_TYPE/NONE], text() '*' <==>
-space_col_align : second->orig_line is 13, orig_col is 13 [QUALIFIER/NONE], text() 'const', [CallStack]
-do_space : orig_line is 13, orig_col is 11, first->text() '*', type is PTR_TYPE
-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 : 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 :    Len is 1
 space_col_align :    => coldiff is 1
 space_col_align :    => av is IGNORE
 space_col_align :    => first->orig_line  is 13
 space_col_align :    => second->orig_line is 13
-space_col_align :    => first->text()     is '*'
-space_col_align :    => second->text()    is 'const'
+space_col_align :    => first->Text()     is '*'
+space_col_align :    => second->Text()    is 'const'
 space_col_align :    => first->orig_col   is 11
 space_col_align :    => second->orig_col  is 13
-space_col_align :    => first->len()      is 1
+space_col_align :    => first->Len()      is 1
 space_col_align :    => coldiff is 2
-space_col_align : first->orig_line is 13, orig_col is 13, [QUALIFIER/NONE], text() 'const' <==>
-space_col_align : second->orig_line is 13, orig_col is 19 [WORD/NONE], text() 'pTelName', [CallStack]
-do_space : orig_line is 13, orig_col is 13, first->text() 'const', type is QUALIFIER
-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[ ]
+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 :    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 : 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 :    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 : 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 :    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[ ]
+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 :    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[ ]
+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 :    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 : 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 :    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 : 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 :    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.74.0/tests/cli/output/9.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/9.txt
index 98afe921..98afe921 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/output/9.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/9.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/output/92.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/92.txt
index eb0d7c05..95a7ecd5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/output/92.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/92.txt
@@ -1,196 +1,196 @@
-parse_word : orig_line is 1, orig_col is 1, pc->text() 'struct'
+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'
+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() ''
+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'
+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>
+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() '{'
+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>
+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'
+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() '('
+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'
+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'
+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() ''
+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'
+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'
+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() '*'
+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() ''
+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'
+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() ','
+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() ''
+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'
+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'
+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() ''
+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'
+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'
+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() ''
+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'
+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() ')'
+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() ''
+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() ':'
+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>
+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'
+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() '('
+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'
+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() ')'
+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() ','
+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>
+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'
+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() '('
+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'
+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() ')'
+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>
+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() '{'
+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>
+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() '}'
+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>
+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() '~'
+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'
+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() '('
+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() ')'
+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>
+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() '{'
+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>
+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() '}'
+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>
+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'
+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'
+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() ''
+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'
+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'
+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() '*'
+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() ''
+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'
+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'
+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() ''
+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'
+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() ';'
+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>
+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'
+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'
+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() ''
+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'
+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'
+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() ''
+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'
+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() ';'
+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>
+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() '}'
+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() ';'
+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>
+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'
+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() '*'
+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() '*'
+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'
+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'
+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'
+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() '('
+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() ')'
+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() ':'
+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'
+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() '('
+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() ')'
+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'
+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() '('
+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() ')'
+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'
+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() '~'
+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() '('
+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() ')'
+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.74.0/tests/cli/output/Debug_tracking_space.html b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/Debug_tracking_space.html
index b7adc237..b7adc237 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/output/Debug_tracking_space.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/Debug_tracking_space.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/output/I-842.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/I-842.txt
index e69de29b..e69de29b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/output/I-842.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/I-842.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/output/backup.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/backup.h
index 210c6f7c..210c6f7c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/output/backup.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/backup.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/output/class_enum_struct_union.csv b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/class_enum_struct_union.csv
index 3b5c4a4e..3b5c4a4e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/output/class_enum_struct_union.csv
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/class_enum_struct_union.csv
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
new file mode 100644
index 00000000..c104ff44
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/class_enum_struct_union.txt
@@ -0,0 +1,692 @@
+
+# option(s) with 'not default' value: 0
+#
+# -=====-
+# number of loops               = 1
+# -=====-
+# language                      = CPP
+# -=====-
+# Line                Tag         Parent_type  Type of the parent         Columns Br/Lvl/pp         Flag   Nl  Text
+#   1>      COMMENT_MULTI|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  4/  7/  3][0/0/0][             0][9-0] /**␤    * the enum (and variable declarations thereof) could be of␤    * the following forms:␤    *␤    * "enum type [: integral_type] { ... } [x, ...]"␤    * "enum type [: integral_type]"␤    * "enum class type [: integral_type] { ... } [x, ...]"␤    * "enum class type [: integral_type]"␤    * "enum [: integral_type] { ... } x, ..."␤    */
+#  10>            NEWLINE|               NONE|     PARENT_NOT_SET[  7/  7/  4/  0][0/0/0][             0][2-0]
+#  12>      COMMENT_MULTI|      COMMENT_WHOLE|     PARENT_NOT_SET[  1/  4/  7/  0][0/0/0][             0][9-0] /**␤    * the class/struct (and variable declarations thereof) could be of␤    * the following forms:␤    *␤    * template<...> class/struct[<...>] [macros/attributes ...] type [: bases ...] { }␤    * template<...> class/struct[<...>] [macros/attributes ...] type␤    * class/struct[ [macros/attributes ...] type [: bases ...] { } [x, ...]␤    * class/struct [macros/attributes ...] type [x, ...]␤    * class/struct [macros/attributes ...] [: bases] { } x, ...␤    */
+#  21>            NEWLINE|               NONE|     PARENT_NOT_SET[  7/  7/  1/  0][0/0/0][             0][2-0]
+#  23>            PREPROC|          PP_DEFINE|     PARENT_NOT_SET[  1/  1/  2/  0][1/1/0][   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.74.0/tests/cli/output/copyright-header.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/copyright-header.cpp
index 348902a5..348902a5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/output/copyright-header.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/copyright-header.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/output/help.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/help.txt
index ff83f72b..ff83f72b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/output/help.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/help.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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
index e839831f..7e7b6f8a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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
@@ -1,8 +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 , 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 , 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 , 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 , 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.74.0/tests/cli/output/p.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/p.txt
index f74c1cb2..88b242fb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/output/p.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/p.txt
@@ -7,73 +7,73 @@ newlines                        = crlf
 # -=====-

 # 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][  2001c0001][0-0] #

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-#   6>       CONSTR_COLON|               NONE|     PARENT_NOT_SET[ 57/ 49/ 50/  1][1/1/0][  200000502][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][      c0502][0-0]                 pTelName

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

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

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

-#   7>              COMMA|               NONE|     PARENT_NOT_SET[ 29/ 13/ 14/  0][1/1/0][  200000502][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][      80502][0-0]                 nTelIndex

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

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

-#   8>       FPAREN_CLOSE|      FUNC_CTOR_VAR|     PARENT_NOT_SET[ 28/ 12/ 13/  0][1/1/0][  200000512][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][  280000402][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][  280000402][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][  2000c0402][0-0]         ~

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

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

-#  12>       FPAREN_CLOSE|     FUNC_CLASS_DEF|     PARENT_NOT_SET[ 24/ 16/ 17/  0][1/1/0][  200000512][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][  280000402][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][  280000402][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][     8e0402][0-0]         const

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

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

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

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

-#  16>          SEMICOLON|               NONE|     PARENT_NOT_SET[ 35/ 27/ 28/  0][1/1/0][  200000402][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][     8e0402][0-0]         unsigned

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

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

-#  17>          SEMICOLON|               NONE|     PARENT_NOT_SET[ 32/ 24/ 25/  0][1/1/0][  200000402][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][  200000402][0-0] }

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

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

+# 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.74.0/tests/cli/output/pc-.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/pc-.txt
index 63ed3d2c..2b7e9280 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/output/pc-.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.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         Flag   Nl  Text
 # -=====-
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
new file mode 100644
index 00000000..ba5422dd
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/replace.txt
@@ -0,0 +1,2 @@
+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.74.0/tests/cli/output/tracking_space.html b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/tracking_space.html
index b0098a0e..b0098a0e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/output/tracking_space.html
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/tracking_space.html
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/output/truncate.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/truncate.txt
index 8c428d84..ab5bb332 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/output/truncate.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.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.74.0/tests/cli/output/universalindent.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/universalindent.cfg
index bdf8aaba..722ba239 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/output/universalindent.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/universalindent.cfg
@@ -2,7 +2,7 @@
 categories=General options|Spacing options|Indenting options|Newline adding and removing options|Blank line options|Positioning options|Line splitting options|Code alignment options (not left column spaces/tabs)|Comment modification options|Code modifying options (non-whitespace)|Preprocessor options|Sort includes options|Use or Do not Use options|Warn levels - 1: error, 2: warning (default), 3: note
 cfgFileParameterEnding=cr
 configFilename=uncrustify.cfg
-fileTypes=*.c|*.cpp|*.d|*.cs|*.vala|*.java|*.pawn|*.p|*.sma|*.inl|*.h|*.cxx|*.hpp|*.hxx|*.cc|*.cp|*.C|*.CPP|*.c++|*.di|*.m|*.mm|*.sqc|*.es
+fileTypes=*.c|*.c++|*.cc|*.cp|*.cpp|*.cs|*.cxx|*.d|*.di|*.es|*.h|*.h++|*.hh|*.hp|*.hpp|*.hxx|*.inl|*.java|*.js|*.m|*.mm|*.p|*.pawn|*.sma|*.sqc|*.sql|*.vala
 indenterFileName=uncrustify
 indenterName=Uncrustify (C, C++, C#, ObjectiveC, D, Java, Pawn, VALA)
 inputFileName=indentinput
@@ -255,6 +255,15 @@ Choices=sp_after_assign=ignore|sp_after_assign=add|sp_after_assign=remove|sp_aft
 ChoicesReadable="Ignore Sp After Assign|Add Sp After Assign|Remove Sp After Assign|Force Sp After Assign"
 ValueDefault=ignore
 
+[Sp Enum Brace]
+Category=1
+Description="<html>Add or remove space in 'enum {'.<br/><br/>Default: add</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_enum_brace=ignore|sp_enum_brace=add|sp_enum_brace=remove|sp_enum_brace=force|sp_enum_brace=not_defined
+ChoicesReadable="Ignore Sp Enum Brace|Add Sp Enum Brace|Remove Sp Enum Brace|Force Sp Enum Brace"
+ValueDefault=add
+
 [Sp Enum Paren]
 Category=1
 Description="<html>Add or remove space in 'NS_ENUM ('.</html>"
@@ -479,6 +488,15 @@ Choices=sp_ptr_star_func_var=ignore|sp_ptr_star_func_var=add|sp_ptr_star_func_va
 ChoicesReadable="Ignore Sp Ptr Star Func Var|Add Sp Ptr Star Func Var|Remove Sp Ptr Star Func Var|Force Sp Ptr Star Func Var"
 ValueDefault=ignore
 
+[Sp Ptr Star Func Type]
+Category=1
+Description="<html>Add or remove space between the pointer star '*' and the name of the type<br/>in a function pointer type definition.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_ptr_star_func_type=ignore|sp_ptr_star_func_type=add|sp_ptr_star_func_type=remove|sp_ptr_star_func_type=force|sp_ptr_star_func_type=not_defined
+ChoicesReadable="Ignore Sp Ptr Star Func Type|Add Sp Ptr Star Func Type|Remove Sp Ptr Star Func Type|Force Sp Ptr Star Func Type"
+ValueDefault=ignore
+
 [Sp Ptr Star Paren]
 Category=1
 Description="<html>Add or remove space after a pointer star '*', if followed by an open<br/>parenthesis, as in 'void* (*)()'.</html>"
@@ -551,6 +569,15 @@ Choices=sp_before_byref_func=ignore|sp_before_byref_func=add|sp_before_byref_fun
 ChoicesReadable="Ignore Sp Before Byref Func|Add Sp Before Byref Func|Remove Sp Before Byref Func|Force Sp Before Byref Func"
 ValueDefault=ignore
 
+[Sp Byref Paren]
+Category=1
+Description="<html>Add or remove space after a reference sign '&amp;', if followed by an open<br/>parenthesis, as in 'char&amp; (*)()'.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_byref_paren=ignore|sp_byref_paren=add|sp_byref_paren=remove|sp_byref_paren=force|sp_byref_paren=not_defined
+ChoicesReadable="Ignore Sp Byref Paren|Add Sp Byref Paren|Remove Sp Byref Paren|Force Sp Byref Paren"
+ValueDefault=ignore
+
 [Sp After Type]
 Category=1
 Description="<html>Add or remove space between type and word. In cases where total removal of<br/>whitespace would be a syntax error, a value of 'remove' is treated the same<br/>as 'force'.<br/><br/>This also affects some other instances of space following a type that are<br/>not covered by other options; for example, between the return type and<br/>parenthesis of a function type template argument, between the type and<br/>parenthesis of an array parameter, or between 'decltype(...)' and the<br/>following word.<br/><br/>Default: force</html>"
@@ -1009,9 +1036,18 @@ Choices=sp_paren_comma=ignore|sp_paren_comma=add|sp_paren_comma=remove|sp_paren_
 ChoicesReadable="Ignore Sp Paren Comma|Add Sp Paren Comma|Remove Sp Paren Comma|Force Sp Paren Comma"
 ValueDefault=force
 
+[Sp Type Colon]
+Category=1
+Description="<html>Add or remove space between a type and ':'.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_type_colon=ignore|sp_type_colon=add|sp_type_colon=remove|sp_type_colon=force|sp_type_colon=not_defined
+ChoicesReadable="Ignore Sp Type Colon|Add Sp Type Colon|Remove Sp Type Colon|Force Sp Type Colon"
+ValueDefault=ignore
+
 [Sp After Ellipsis]
 Category=1
-Description="<html>Add or remove space after the variadic '...' when preceded by a<br/>non-punctuator.<br/>The value REMOVE will be overriden with FORCE</html>"
+Description="<html>Add or remove space after the variadic '...' when preceded by a<br/>non-punctuator.<br/>The value REMOVE will be overridden with FORCE</html>"
 Enabled=false
 EditorType=multiple
 Choices=sp_after_ellipsis=ignore|sp_after_ellipsis=add|sp_after_ellipsis=remove|sp_after_ellipsis=force|sp_after_ellipsis=not_defined
@@ -1020,7 +1056,7 @@ ValueDefault=ignore
 
 [Sp Before Ellipsis]
 Category=1
-Description="<html>Add or remove space before the variadic '...' when preceded by a<br/>non-punctuator.<br/>The value REMOVE will be overriden with FORCE</html>"
+Description="<html>Add or remove space before the variadic '...' when preceded by a<br/>non-punctuator.<br/>The value REMOVE will be overridden with FORCE</html>"
 Enabled=false
 EditorType=multiple
 Choices=sp_before_ellipsis=ignore|sp_before_ellipsis=add|sp_before_ellipsis=remove|sp_before_ellipsis=force|sp_before_ellipsis=not_defined
@@ -1045,15 +1081,6 @@ Choices=sp_ptr_type_ellipsis=ignore|sp_ptr_type_ellipsis=add|sp_ptr_type_ellipsi
 ChoicesReadable="Ignore Sp Ptr Type Ellipsis|Add Sp Ptr Type Ellipsis|Remove Sp Ptr Type Ellipsis|Force Sp Ptr Type Ellipsis"
 ValueDefault=ignore
 
-[Sp Type Question]
-Category=1
-Description="<html>(D) Add or remove space between a type and '?'.</html>"
-Enabled=false
-EditorType=multiple
-Choices=sp_type_question=ignore|sp_type_question=add|sp_type_question=remove|sp_type_question=force|sp_type_question=not_defined
-ChoicesReadable="Ignore Sp Type Question|Add Sp Type Question|Remove Sp Type Question|Force Sp Type Question"
-ValueDefault=ignore
-
 [Sp Paren Ellipsis]
 Category=1
 Description="<html>Add or remove space between ')' and '...'.</html>"
@@ -1837,6 +1864,15 @@ Choices=sp_not=ignore|sp_not=add|sp_not=remove|sp_not=force|sp_not=not_defined
 ChoicesReadable="Ignore Sp Not|Add Sp Not|Remove Sp Not|Force Sp Not"
 ValueDefault=remove
 
+[Sp Not Not]
+Category=1
+Description="<html>Add or remove space between two '!' (not) unary operators.<br/>If set to ignore, sp_not will be used.</html>"
+Enabled=false
+EditorType=multiple
+Choices=sp_not_not=ignore|sp_not_not=add|sp_not_not=remove|sp_not_not=force|sp_not_not=not_defined
+ChoicesReadable="Ignore Sp Not Not|Add Sp Not Not|Remove Sp Not Not|Force Sp Not Not"
+ValueDefault=ignore
+
 [Sp Inv]
 Category=1
 Description="<html>Add or remove space after the '~' (invert) unary operator.<br/><br/>Default: remove</html>"
@@ -2368,9 +2404,17 @@ MinVal=0
 MaxVal=16
 ValueDefault=8
 
+[Indent Ignore First Continue]
+Category=2
+Description="<html>Whether to ignore indent for the first continuation line. Subsequent<br/>continuation lines will still be indented to match the first.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_ignore_first_continue=true|indent_ignore_first_continue=false
+ValueDefault=false
+
 [Indent Continue]
 Category=2
-Description="<html>The continuation indent. If non-zero, this overrides the indent of '(', '['<br/>and '=' continuation indents. Negative values are OK; negative value is<br/>absolute and not increased for each '(' or '[' level.<br/><br/>For FreeBSD, this is set to 4.</html>"
+Description="<html>The continuation indent. If non-zero, this overrides the indent of '(', '['<br/>and '=' continuation indents. Negative values are OK; negative value is<br/>absolute and not increased for each '(' or '[' level.<br/><br/>For FreeBSD, this is set to 4.<br/>Requires indent_ignore_first_continue=false.</html>"
 Enabled=false
 EditorType=numeric
 CallName="indent_continue="
@@ -2380,7 +2424,7 @@ ValueDefault=0
 
 [Indent Continue Class Head]
 Category=2
-Description="<html>The continuation indent, only for class header line(s). If non-zero, this<br/>overrides the indent of 'class' continuation indents.</html>"
+Description="<html>The continuation indent, only for class header line(s). If non-zero, this<br/>overrides the indent of 'class' continuation indents.<br/>Requires indent_ignore_first_continue=false.</html>"
 Enabled=false
 EditorType=numeric
 CallName="indent_continue_class_head="
@@ -2551,6 +2595,14 @@ MinVal=0
 MaxVal=255
 ValueDefault=0
 
+[Indent Namespace Inner Only]
+Category=2
+Description="<html>Whether to indent only in inner namespaces (nested in other namespaces).<br/>Requires indent_namespace=true.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_namespace_inner_only=true|indent_namespace_inner_only=false
+ValueDefault=false
+
 [Indent Extern]
 Category=2
 Description="<html>Whether the 'extern "C"' body is indented.</html>"
@@ -2567,9 +2619,17 @@ EditorType=boolean
 TrueFalse=indent_class=true|indent_class=false
 ValueDefault=false
 
+[Indent Ignore Before Class Colon]
+Category=2
+Description="<html>Whether to ignore indent for the leading base class colon.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_ignore_before_class_colon=true|indent_ignore_before_class_colon=false
+ValueDefault=false
+
 [Indent Before Class Colon]
 Category=2
-Description="<html>Additional indent before the leading base class colon.<br/>Negative values decrease indent down to the first column.<br/>Requires a newline break before colon (see pos_class_colon<br/>and nl_class_colon)</html>"
+Description="<html>Additional indent before the leading base class colon.<br/>Negative values decrease indent down to the first column.<br/>Requires indent_ignore_before_class_colon=false and a newline break before<br/>the colon (see pos_class_colon and nl_class_colon)</html>"
 Enabled=false
 EditorType=numeric
 CallName="indent_before_class_colon="
@@ -2593,6 +2653,14 @@ EditorType=boolean
 TrueFalse=indent_class_on_colon=true|indent_class_on_colon=false
 ValueDefault=false
 
+[Indent Ignore Before Constr Colon]
+Category=2
+Description="<html>Whether to ignore indent for a leading class initializer colon.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_ignore_before_constr_colon=true|indent_ignore_before_constr_colon=false
+ValueDefault=false
+
 [Indent Constr Colon]
 Category=2
 Description="<html>Whether to indent the stuff after a leading class initializer colon.</html>"
@@ -2659,11 +2727,13 @@ ValueDefault=false
 
 [Indent Shift]
 Category=2
-Description="<html>Whether to indent continued shift expressions ('&lt;&lt;' and '&gt;&gt;') instead of<br/>aligning. Set align_left_shift=false when enabling this.</html>"
+Description="<html>How to indent continued shift expressions ('&lt;&lt;' and '&gt;&gt;').<br/>Set align_left_shift=false when using this.<br/> 0: Align shift operators instead of indenting them (default)<br/> 1: Indent by one level<br/>-1: Preserve original indentation</html>"
 Enabled=false
-EditorType=boolean
-TrueFalse=indent_shift=true|indent_shift=false
-ValueDefault=false
+EditorType=numeric
+CallName="indent_shift="
+MinVal=-1
+MaxVal=1
+ValueDefault=0
 
 [Indent Func Def Force Col1]
 Category=2
@@ -2843,6 +2913,14 @@ MinVal=0
 MaxVal=16
 ValueDefault=0
 
+[Indent Ignore Case Brace]
+Category=2
+Description="<html>Whether to ignore indent for '{' following 'case'.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_ignore_case_brace=true|indent_ignore_case_brace=false
+ValueDefault=false
+
 [Indent Case Brace]
 Category=2
 Description="<html>Spaces to indent '{' from 'case'. By default, the brace will appear under<br/>the 'c' in case. Usually set to 0 or indent_columns. Negative values are OK.<br/>It might be wise to choose the same value for the option indent_switch_case.</html>"
@@ -2967,11 +3045,11 @@ ValueDefault=false
 
 [Indent Paren Close]
 Category=2
-Description="<html>How to indent a close parenthesis after a newline.<br/><br/>0: Indent to body level (default)<br/>1: Align under the open parenthesis<br/>2: Indent to the brace level</html>"
+Description="<html>How to indent a close parenthesis after a newline.<br/><br/> 0: Indent to body level (default)<br/> 1: Align under the open parenthesis<br/> 2: Indent to the brace level<br/>-1: Preserve original indentation</html>"
 Enabled=false
 EditorType=numeric
 CallName="indent_paren_close="
-MinVal=0
+MinVal=-1
 MaxVal=2
 ValueDefault=0
 
@@ -3001,26 +3079,48 @@ ValueDefault=false
 
 [Indent Comma Brace]
 Category=2
-Description="<html>Whether to indent a comma when inside a brace.<br/>If true, aligns under the open brace.</html>"
+Description="<html>How to indent a comma when inside braces.<br/> 0: Indent by one level (default)<br/> 1: Align under the open brace<br/>-1: Preserve original indentation</html>"
 Enabled=false
-EditorType=boolean
-TrueFalse=indent_comma_brace=true|indent_comma_brace=false
-ValueDefault=false
+EditorType=numeric
+CallName="indent_comma_brace="
+MinVal=-1
+MaxVal=1
+ValueDefault=0
 
 [Indent Comma Paren]
 Category=2
-Description="<html>Whether to indent a comma when inside a parenthesis.<br/>If true, aligns under the open parenthesis.</html>"
+Description="<html>How to indent a comma when inside parentheses.<br/> 0: Indent by one level (default)<br/> 1: Align under the open parenthesis<br/>-1: Preserve original indentation</html>"
+Enabled=false
+EditorType=numeric
+CallName="indent_comma_paren="
+MinVal=-1
+MaxVal=1
+ValueDefault=0
+
+[Indent Bool Paren]
+Category=2
+Description="<html>How to indent a Boolean operator when inside parentheses.<br/> 0: Indent by one level (default)<br/> 1: Align under the open parenthesis<br/>-1: Preserve original indentation</html>"
+Enabled=false
+EditorType=numeric
+CallName="indent_bool_paren="
+MinVal=-1
+MaxVal=1
+ValueDefault=0
+
+[Indent Ignore Bool]
+Category=2
+Description="<html>Whether to ignore the indentation of a Boolean operator when outside<br/>parentheses.</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=indent_comma_paren=true|indent_comma_paren=false
+TrueFalse=indent_ignore_bool=true|indent_ignore_bool=false
 ValueDefault=false
 
-[Indent Bool Paren]
+[Indent Ignore Arith]
 Category=2
-Description="<html>Whether to indent a Boolean operator when inside a parenthesis.<br/>If true, aligns under the open parenthesis.</html>"
+Description="<html>Whether to ignore the indentation of an arithmetic operator.</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=indent_bool_paren=true|indent_bool_paren=false
+TrueFalse=indent_ignore_arith=true|indent_ignore_arith=false
 ValueDefault=false
 
 [Indent Semicolon For Paren]
@@ -3031,9 +3131,17 @@ EditorType=boolean
 TrueFalse=indent_semicolon_for_paren=true|indent_semicolon_for_paren=false
 ValueDefault=false
 
+[Indent Ignore Semicolon]
+Category=2
+Description="<html>Whether to ignore the indentation of a semicolon outside of a 'for'<br/>statement.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_ignore_semicolon=true|indent_ignore_semicolon=false
+ValueDefault=false
+
 [Indent First Bool Expr]
 Category=2
-Description="<html>Whether to align the first expression to following ones<br/>if indent_bool_paren=true.</html>"
+Description="<html>Whether to align the first expression to following ones<br/>if indent_bool_paren=1.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=indent_first_bool_expr=true|indent_first_bool_expr=false
@@ -3063,6 +3171,14 @@ EditorType=boolean
 TrueFalse=indent_preserve_sql=true|indent_preserve_sql=false
 ValueDefault=false
 
+[Indent Ignore Assign]
+Category=2
+Description="<html>Whether to ignore the indentation of an assignment operator.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=indent_ignore_assign=true|indent_ignore_assign=false
+ValueDefault=false
+
 [Indent Align Assign]
 Category=2
 Description="<html>Whether to align continued statements at the '='. If false or if the '=' is<br/>followed by a newline, the next line is indent one tab.<br/><br/>Default: true</html>"
@@ -4475,7 +4591,7 @@ ValueDefault=ignore
 
 [Nl Type Brace Init Lst]
 Category=3
-Description="<html>Whether to add a newline after the type in an unnamed temporary<br/>direct-list-initialization.</html>"
+Description="<html>Whether to add a newline after the type in an unnamed temporary<br/>direct-list-initialization, better:<br/>before a direct-list-initialization.</html>"
 Enabled=false
 EditorType=multiple
 Choices=nl_type_brace_init_lst=ignore|nl_type_brace_init_lst=add|nl_type_brace_init_lst=remove|nl_type_brace_init_lst=force|nl_type_brace_init_lst=not_defined
@@ -5051,7 +5167,7 @@ ValueDefault=0
 
 [Nl Var Def Blk Start]
 Category=4
-Description="<html>The number of newlines before a block of variable definitions not at the top<br/>of a function body. If nl_after_access_spec is non-zero, that option takes<br/>precedence.<br/><br/>0: No change (default).</html>"
+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>"
 Enabled=false
 EditorType=numeric
 CallName="nl_var_def_blk_start="
@@ -5061,7 +5177,7 @@ ValueDefault=0
 
 [Nl Var Def Blk End]
 Category=4
-Description="<html>The number of newlines after a block of variable definitions not at the top<br/>of a function body.<br/><br/>0: No change (default).</html>"
+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>"
 Enabled=false
 EditorType=numeric
 CallName="nl_var_def_blk_end="
@@ -5720,6 +5836,16 @@ 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>"
@@ -5740,6 +5866,24 @@ MinVal=-1000
 MaxVal=5000
 ValueDefault=0
 
+[Align Assign On Multi Var Defs]
+Category=7
+Description="<html>Whether to align on the left most assignment when multiple<br/>definitions are found on the same line.<br/>Depends on 'align_assign_span' and 'align_assign_thresh' settings.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=align_assign_on_multi_var_defs=true|align_assign_on_multi_var_defs=false
+ValueDefault=false
+
+[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>"
+Enabled=false
+EditorType=numeric
+CallName="align_braced_init_list_thresh="
+MinVal=-1000
+MaxVal=5000
+ValueDefault=0
+
 [Align Assign Decl Func]
 Category=7
 Description="<html>How to apply align_assign_span to function declaration "assignments", i.e.<br/>'virtual void foo() = 0' or '~foo() = {default|delete}'.<br/><br/>0: Align with other assignments (default)<br/>1: Align with each other, ignoring regular assignments<br/>2: Don't align</html>"
@@ -6126,7 +6270,7 @@ ValueDefault=false
 
 [Align Oc Msg Colon Xcode Like]
 Category=7
-Description="<html>(OC) Whether to not align parameters in an Objectve-C message call if first<br/>colon is not on next line of the message call (the same way Xcode does<br/>aligment)</html>"
+Description="<html>(OC) Whether to not align parameters in an Objectve-C message call if first<br/>colon is not on next line of the message call (the same way Xcode does<br/>alignment)</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=align_oc_msg_colon_xcode_like=true|align_oc_msg_colon_xcode_like=false
@@ -6414,11 +6558,13 @@ ValueDefault=ignore
 
 [Mod Full Brace If Chain]
 Category=9
-Description="<html>Whether to enforce that all blocks of an 'if'/'else if'/'else' chain either<br/>have, or do not have, braces. If true, braces will be added if any block<br/>needs braces, and will only be removed if they can be removed from all<br/>blocks.<br/><br/>Overrides mod_full_brace_if.</html>"
+Description="<html>Whether to enforce that all blocks of an 'if'/'else if'/'else' chain either<br/>have, or do not have, braces. Overrides mod_full_brace_if.<br/><br/>0: Don't override mod_full_brace_if<br/>1: Add braces to all blocks if any block needs braces and remove braces if<br/>   they can be removed from all blocks<br/>2: Add braces to all blocks if any block already has braces, regardless of<br/>   whether it needs them<br/>3: Add braces to all blocks if any block needs braces and remove braces if<br/>   they can be removed from all blocks, except if all blocks have braces<br/>   despite none needing them</html>"
 Enabled=false
-EditorType=boolean
-TrueFalse=mod_full_brace_if_chain=true|mod_full_brace_if_chain=false
-ValueDefault=false
+EditorType=numeric
+CallName="mod_full_brace_if_chain="
+MinVal=0
+MaxVal=3
+ValueDefault=0
 
 [Mod Full Brace If Chain Only]
 Category=9
@@ -6489,6 +6635,22 @@ EditorType=boolean
 TrueFalse=mod_full_paren_if_bool=true|mod_full_paren_if_bool=false
 ValueDefault=false
 
+[Mod Full Paren Assign Bool]
+Category=9
+Description="<html>Whether to fully parenthesize Boolean expressions after '='<br/>statement, as in 'x = a &amp;&amp; b &gt; c;' =&gt; 'x = (a &amp;&amp; (b &gt; c));'.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=mod_full_paren_assign_bool=true|mod_full_paren_assign_bool=false
+ValueDefault=false
+
+[Mod Full Paren Return Bool]
+Category=9
+Description="<html>Whether to fully parenthesize Boolean expressions after '='<br/>statement, as in 'return  a &amp;&amp; b &gt; c;' =&gt; 'return (a &amp;&amp; (b &gt; c));'.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=mod_full_paren_return_bool=true|mod_full_paren_return_bool=false
+ValueDefault=false
+
 [Mod Remove Extra Semicolon]
 Category=9
 Description="<html>Whether to remove superfluous semicolons.</html>"
@@ -6645,6 +6807,14 @@ EditorType=boolean
 TrueFalse=mod_move_case_break=true|mod_move_case_break=false
 ValueDefault=false
 
+[Mod Move Case Return]
+Category=9
+Description="<html>Whether to move a 'return' that appears after a fully braced 'case' before<br/>the close brace, as in 'case X: { ... } return;' =&gt; 'case X: { ... return; }'.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=mod_move_case_return=true|mod_move_case_return=false
+ValueDefault=false
+
 [Mod Case Brace]
 Category=9
 Description="<html>Add or remove braces around a fully braced case statement. Will only remove<br/>braces if there are no variable declarations in the block.</html>"
@@ -6766,6 +6936,14 @@ EditorType=boolean
 TrueFalse=pp_indent_at_level=true|pp_indent_at_level=false
 ValueDefault=false
 
+[Pp Indent At Level0]
+Category=10
+Description="<html>Whether to indent #if/#else/#endif at the parenthesis level if the brace<br/>level is 0. If false, these are indented from column 1.</html>"
+Enabled=false
+EditorType=boolean
+TrueFalse=pp_indent_at_level0=true|pp_indent_at_level0=false
+ValueDefault=false
+
 [Pp Indent Count]
 Category=10
 Description="<html>Specifies the number of columns to indent preprocessors per level<br/>at brace level 0 (file-level). If pp_indent_at_level=false, also specifies<br/>the number of columns to indent preprocessors per level<br/>at brace level &gt; 0 (function-level).<br/><br/>Default: 1</html>"
@@ -6889,11 +7067,21 @@ ValueDefault=true
 
 [Pp Indent Brace]
 Category=10
-Description="<html>Whether to indent braces directly inside #if, #else, and #endif.<br/>Only applies to the indent of the preprocesser that the braces are directly<br/>inside of.<br/><br/>Default: true</html>"
+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>"
+Enabled=false
+EditorType=numeric
+CallName="pp_indent_brace="
+MinVal=-1
+MaxVal=1
+ValueDefault=1
+
+[Pp Warn Unbalanced If]
+Category=10
+Description="<html>Whether to print warning messages for unbalanced #if and #else blocks.<br/>This will print a message in the following cases:<br/>- if an #ifdef block ends on a different indent level than<br/>  where it started from. Example:<br/><br/>   #ifdef TEST<br/>     int i;<br/>     {<br/>       int j;<br/>   #endif<br/><br/>- an #elif/#else block ends on a different indent level than<br/>  the corresponding #ifdef block. Example:<br/><br/>   #ifdef TEST<br/>       int i;<br/>   #else<br/>       }<br/>     int j;<br/>   #endif</html>"
 Enabled=false
 EditorType=boolean
-TrueFalse=pp_indent_brace=true|pp_indent_brace=false
-ValueDefault=true
+TrueFalse=pp_warn_unbalanced_if=true|pp_warn_unbalanced_if=false
+ValueDefault=false
 
 [Include Category 0]
 Category=11
@@ -6929,7 +7117,7 @@ ValueDefault=true
 
 [Use Indent Continue Only Once]
 Category=12
-Description="<html>The value of the indentation for a continuation line is calculated<br/>differently if the statement is:<br/>- a declaration: your case with QString fileName ...<br/>- an assignment: your case with pSettings = new QSettings( ...<br/><br/>At the second case the indentation value might be used twice:<br/>- at the assignment<br/>- at the function call (if present)<br/><br/>To prevent the double use of the indentation value, use this option with the<br/>value 'true'.<br/><br/>true:  indent_continue will be used only once<br/>false: indent_continue will be used every time (default)</html>"
+Description="<html>The value of the indentation for a continuation line is calculated<br/>differently if the statement is:<br/>- a declaration: your case with QString fileName ...<br/>- an assignment: your case with pSettings = new QSettings( ...<br/><br/>At the second case the indentation value might be used twice:<br/>- at the assignment<br/>- at the function call (if present)<br/><br/>To prevent the double use of the indentation value, use this option with the<br/>value 'true'.<br/><br/>true:  indent_continue will be used only once<br/>false: indent_continue will be used every time (default)<br/><br/>Requires indent_ignore_first_continue=false.</html>"
 Enabled=false
 EditorType=boolean
 TrueFalse=use_indent_continue_only_once=true|use_indent_continue_only_once=false
@@ -6937,7 +7125,7 @@ ValueDefault=false
 
 [Indent Cpp Lambda Only Once]
 Category=12
-Description="<html>The value might be used twice:<br/>- at the assignment<br/>- at the opening brace<br/><br/>To prevent the double use of the indentation value, use this option with the<br/>value 'true'.<br/><br/>true:  indentation will be used only once<br/>false: indentation will be used every time (default)</html>"
+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>"
 Enabled=false
 EditorType=boolean
 TrueFalse=indent_cpp_lambda_only_once=true|indent_cpp_lambda_only_once=false
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/output/unmatched_close_pp.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/unmatched_close_pp.txt
index e69de29b..e69de29b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/output/unmatched_close_pp.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/unmatched_close_pp.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/output/v-out.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/v-out.txt
index 129af768..129af768 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/output/v-out.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/v-out.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/output/xyz-err.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/xyz-err.txt
index a16550ed..a16550ed 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/output/xyz-err.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/output/xyz-err.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/test_cli_options.py b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/test_cli_options.py
index 69c1c620..69c1c620 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cli/test_cli_options.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cli/test_cli_options.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/1225.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/1225.cfg
index cbc83adb..cbc83adb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/1225.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/1225.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/1liner-no-split.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/1liner-no-split.cfg
index 84eba64d..84eba64d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/1liner-no-split.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/1liner-no-split.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/1liner-split.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/1liner-split.cfg
index e666ea24..e666ea24 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/1liner-split.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/1liner-split.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/Issue-2278.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue-2278.cfg
index 80ba4f6f..80ba4f6f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/Issue-2278.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue-2278.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/Issue_2279.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_2279.cfg
index 1f646668..1f646668 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/Issue_2279.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_2279.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/Issue_2360-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_2360-a.cfg
index 85052020..85052020 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/Issue_2360-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_2360-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/Issue_2360-b.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_2360-b.cfg
index b61841cc..b61841cc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/Issue_2360-b.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_2360-b.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/Issue_2411.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_2411.cfg
index a4770ec9..a4770ec9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/Issue_2411.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_2411.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/Issue_2640.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_2640.cfg
index a4dd2354..a4dd2354 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/Issue_2640.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_2640.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/Issue_3169.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3169.cfg
index 9feaa3d8..9feaa3d8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/Issue_3169.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3169.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/Issue_3233.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3233.cfg
index 71ee918b..71ee918b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/Issue_3233.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3233.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/Issue_3269.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3269.cfg
index 3a4bb6bf..3a4bb6bf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/Issue_3269.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3269.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/Issue_3272.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3272.cfg
index 2cda9402..2cda9402 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/Issue_3272.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3272.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/Issue_3274.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3274.cfg
index 63aa1d0c..63aa1d0c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/Issue_3274.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3274.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/Issue_3327.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3327.cfg
index 1470c6b5..1470c6b5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/Issue_3327.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3327.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/Issue_3350.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3350.cfg
index d53c8094..d53c8094 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/Issue_3350.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3350.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/Issue_3351.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3351.cfg
index 67df4d20..67df4d20 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/Issue_3351.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.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.75.0/tests/config/c/Issue_3353.cfg
new file mode 100644
index 00000000..56810833
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3353.cfg
@@ -0,0 +1,3 @@
+sp_func_call_paren = remove
+indent_columns     = 4
+indent_with_tabs   = 0
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/Issue_3356.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3356.cfg
index 2791f6c6..2791f6c6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/Issue_3356.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3356.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/Issue_3370.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3370.cfg
index 05f38590..05f38590 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/Issue_3370.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3370.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/Issue_3377.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3377.cfg
index ca7a07db..ca7a07db 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/Issue_3377.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.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.75.0/tests/config/c/Issue_3402.cfg
new file mode 100644
index 00000000..5252c78d
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3402.cfg
@@ -0,0 +1,3 @@
+sp_after_ptr_star = add
+sp_ptr_star_func_var = force
+sp_ptr_star_func_type = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3431.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3431.cfg
new file mode 100644
index 00000000..45dbff25
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3431.cfg
@@ -0,0 +1,4 @@
+indent_paren_close  = 1
+pp_if_indent_code   = true
+pp_indent_at_level  = true
+pp_indent_at_level0 = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3454.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3454.cfg
new file mode 100644
index 00000000..9674606a
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3454.cfg
@@ -0,0 +1,4 @@
+indent_columns     = 4
+indent_with_tabs   = 0
+indent_comma_brace = -1
+indent_comma_paren = -1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3457.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3457.cfg
new file mode 100644
index 00000000..78984566
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3457.cfg
@@ -0,0 +1 @@
+sp_type_colon = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3472.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3472.cfg
new file mode 100644
index 00000000..9e1acf21
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3472.cfg
@@ -0,0 +1,3 @@
+indent_columns    = 4
+indent_with_tabs  = 0
+indent_bool_paren = -1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3476.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3476.cfg
new file mode 100644
index 00000000..3fef0a75
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3476.cfg
@@ -0,0 +1,3 @@
+indent_columns      = 4
+indent_with_tabs    = 0
+indent_ignore_arith = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3480.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3480.cfg
new file mode 100644
index 00000000..d86880ad
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3480.cfg
@@ -0,0 +1,4 @@
+indent_columns   = 4
+indent_with_tabs = 0
+indent_shift     = -1
+align_left_shift = false
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3493.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3493.cfg
new file mode 100644
index 00000000..cfc36660
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3493.cfg
@@ -0,0 +1,3 @@
+indent_columns          = 4
+indent_with_tabs        = 0
+indent_ignore_semicolon = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3516.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3516.cfg
new file mode 100644
index 00000000..ba1f9656
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3516.cfg
@@ -0,0 +1,5 @@
+# The number of newlines after a block of variable definitions not at the top
+# of a function body.
+#
+# 0: No change (default).
+nl_var_def_blk_end  = 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3517.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3517.cfg
new file mode 100644
index 00000000..ed31649e
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3517.cfg
@@ -0,0 +1 @@
+nl_var_def_blk_start = 1
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
new file mode 100644
index 00000000..6e8afc35
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3518.cfg
@@ -0,0 +1 @@
+nl_func_var_def_blk = 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.75.0/tests/config/c/Issue_3556.cfg
new file mode 100644
index 00000000..9840c82d
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3556.cfg
@@ -0,0 +1,3 @@
+indent_columns       = 4
+indent_with_tabs     = 0
+indent_ignore_assign = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3561.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3561.cfg
new file mode 100644
index 00000000..56965ae8
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3561.cfg
@@ -0,0 +1,3 @@
+indent_with_tabs = 0
+indent_columns = 4
+indent_ignore_first_continue = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3565.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3565.cfg
new file mode 100644
index 00000000..c1a793e8
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3565.cfg
@@ -0,0 +1,4 @@
+indent_with_tabs = 0
+pp_ignore_define_body = true
+sp_before_emb_cmt = ignore
+sp_after_emb_cmt = ignore
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.75.0/tests/config/c/Issue_3567-a.cfg
new file mode 100644
index 00000000..1659f46a
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3567-a.cfg
@@ -0,0 +1,4 @@
+indent_paren_after_func_def   = true
+indent_paren_after_func_decl  = true
+indent_paren_after_func_call  = true
+use_indent_continue_only_once = true
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.75.0/tests/config/c/Issue_3567-b.cfg
new file mode 100644
index 00000000..454bc264
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3567-b.cfg
@@ -0,0 +1,4 @@
+indent_paren_after_func_def   = true
+indent_paren_after_func_decl  = true
+indent_paren_after_func_call  = true
+use_indent_continue_only_once = false
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3580.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3580.cfg
new file mode 100644
index 00000000..fc53aac2
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3580.cfg
@@ -0,0 +1,3 @@
+indent_with_tabs = 0
+indent_columns = 4
+indent_ignore_case_brace = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3582.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3582.cfg
new file mode 100644
index 00000000..d6b1a287
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3582.cfg
@@ -0,0 +1,5 @@
+indent_with_tabs   = 0
+indent_columns     = 4
+pp_indent_at_level = true
+pp_if_indent_code  = true
+pp_indent_brace    = -1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3601.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3601.cfg
new file mode 100644
index 00000000..3537fd11
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/Issue_3601.cfg
@@ -0,0 +1,2 @@
+#Config file
+sp_after_ptr_star = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/add_long_closebrace_comment_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/add_long_closebrace_comment_1.cfg
index b8190eb1..b8190eb1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/add_long_closebrace_comment_1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/add_long_closebrace_comment_1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align-2.cfg
index ea78a8d4..ea78a8d4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align-3.cfg
index 1b46c840..1b46c840 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align-3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align_attr.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align_attr.cfg
index 3249cd7b..3249cd7b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align_attr.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align_attr.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align_func_proto_star_amp-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align_func_proto_star_amp-1.cfg
index 83874b8b..83874b8b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align_func_proto_star_amp-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align_func_proto_star_amp-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align_func_proto_star_amp-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align_func_proto_star_amp-2.cfg
index 3afaa70a..3afaa70a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align_func_proto_star_amp-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align_func_proto_star_amp-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align_func_proto_star_amp-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align_func_proto_star_amp-3.cfg
index 1b1e7541..1b1e7541 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align_func_proto_star_amp-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align_func_proto_star_amp-3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align_func_proto_star_amp-4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align_func_proto_star_amp-4.cfg
index 391526e0..391526e0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align_func_proto_star_amp-4.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align_func_proto_star_amp-4.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align_func_proto_star_amp-5.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align_func_proto_star_amp-5.cfg
index 7fd9cd6c..7fd9cd6c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align_func_proto_star_amp-5.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align_func_proto_star_amp-5.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align_func_proto_star_amp-6.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align_func_proto_star_amp-6.cfg
index 00d18433..00d18433 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align_func_proto_star_amp-6.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align_func_proto_star_amp-6.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align_func_proto_star_amp-7.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align_func_proto_star_amp-7.cfg
index 64af8258..64af8258 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align_func_proto_star_amp-7.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align_func_proto_star_amp-7.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align_func_proto_star_amp-8.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align_func_proto_star_amp-8.cfg
index 4531b895..4531b895 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align_func_proto_star_amp-8.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align_func_proto_star_amp-8.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align_func_proto_star_amp-9.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align_func_proto_star_amp-9.cfg
index 2b2b6b02..2b2b6b02 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align_func_proto_star_amp-9.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align_func_proto_star_amp-9.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align_keep_extra.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align_keep_extra.cfg
index fcaab9f2..fcaab9f2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align_keep_extra.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align_keep_extra.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align_right_cmt_gap-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align_right_cmt_gap-1.cfg
index 46aaf838..46aaf838 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align_right_cmt_gap-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align_right_cmt_gap-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align_sf_call_span_418.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align_sf_call_span_418.cfg
index cdf7f052..cdf7f052 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align_sf_call_span_418.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align_sf_call_span_418.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align_sf_call_span_419.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align_sf_call_span_419.cfg
index a11c2102..a11c2102 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align_sf_call_span_419.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align_sf_call_span_419.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align_sf_call_thresh_416.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align_sf_call_thresh_416.cfg
index 6280b856..6280b856 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align_sf_call_thresh_416.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align_sf_call_thresh_416.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align_sf_call_thresh_417.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align_sf_call_thresh_417.cfg
index 9d09abb2..9d09abb2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align_sf_call_thresh_417.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align_sf_call_thresh_417.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align_stack.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align_stack.cfg
index d53a6bb3..d53a6bb3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align_stack.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align_stack.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align_typedef_func-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align_typedef_func-1.cfg
index ea45e4d8..ea45e4d8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align_typedef_func-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align_typedef_func-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align_typedef_func-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align_typedef_func-2.cfg
index 252f07ea..252f07ea 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align_typedef_func-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align_typedef_func-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align_typedef_gap-3_span-5.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align_typedef_gap-3_span-5.cfg
index 338f078f..338f078f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/align_typedef_gap-3_span-5.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/align_typedef_gap-3_span-5.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_047.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_047.cfg
index 2af44bb3..2af44bb3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_047.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_047.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_048.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_048.cfg
index 81d0ba54..81d0ba54 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_048.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_048.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_049.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_049.cfg
index b8e6f708..b8e6f708 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_049.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_049.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_050.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_050.cfg
index 0f0e30ac..0f0e30ac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_050.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_050.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_051.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_051.cfg
index 786fb030..786fb030 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_051.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_051.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_052.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_052.cfg
index ba150be7..ba150be7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_052.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_052.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_053.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_053.cfg
index 7cf1c682..7cf1c682 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_053.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_053.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_054.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_054.cfg
index 56661763..56661763 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_054.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_054.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_055.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_055.cfg
index f050b219..f050b219 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_055.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_055.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_056.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_056.cfg
index 43e9f6cc..43e9f6cc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_056.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_056.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_057.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_057.cfg
index fbf24d72..fbf24d72 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_057.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_057.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_058.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_058.cfg
index 7c908d56..7c908d56 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_058.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_058.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_061.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_061.cfg
index 89f76fae..89f76fae 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_061.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_061.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_063.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_063.cfg
index 3c5e88f1..3c5e88f1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_063.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_063.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_064.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_064.cfg
index f56efbdf..f56efbdf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_064.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_064.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_065.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_065.cfg
index 21d55b16..21d55b16 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_065.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_065.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_069.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_069.cfg
index d42173e1..d42173e1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_069.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_069.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_070.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_070.cfg
index f304ca8a..f304ca8a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_070.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_070.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_071.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_071.cfg
index 869f2a94..869f2a94 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_071.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_071.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_072.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_072.cfg
index 973d8c6c..973d8c6c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_072.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_072.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_073.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_073.cfg
index 49f69643..49f69643 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_073.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_073.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_074.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_074.cfg
index 31a1de44..31a1de44 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_074.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_074.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_075.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_075.cfg
index 9eca8a9b..9eca8a9b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_075.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_075.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_076.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_076.cfg
index fb27ba74..fb27ba74 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_076.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_076.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_077.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_077.cfg
index 4e9760f7..4e9760f7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_077.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_077.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_078.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_078.cfg
index 54fcc628..54fcc628 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_078.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_078.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_079.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_079.cfg
index 77a732e5..77a732e5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_079.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_079.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_080.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_080.cfg
index 45e16a8d..45e16a8d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_080.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_080.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_081.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_081.cfg
index dc15820d..dc15820d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_081.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_081.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_083.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_083.cfg
index 2ccee465..2ccee465 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_083.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_083.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_084.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_084.cfg
index bbb0e675..bbb0e675 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_084.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_084.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_085.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_085.cfg
index b02673d7..b02673d7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_085.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_085.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_086.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_086.cfg
index 7ffcd831..7ffcd831 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_086.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_086.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_087.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_087.cfg
index 2184c985..2184c985 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_087.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_087.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_088.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_088.cfg
index 19cc7dc4..19cc7dc4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_088.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_088.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_089.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_089.cfg
index d3c152df..d3c152df 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_089.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_089.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_090.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_090.cfg
index eba1ab79..eba1ab79 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_090.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_090.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_091.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_091.cfg
index aec90af1..aec90af1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_091.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_091.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_092.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_092.cfg
index bb993d75..bb993d75 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_092.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_092.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_093.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_093.cfg
index 4e50b52b..4e50b52b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_093.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_093.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_094.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_094.cfg
index 9ab0c51f..9ab0c51f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_094.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_094.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_095.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_095.cfg
index edb10a4f..edb10a4f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ben_095.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ben_095.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/bool-pos-eol-break.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/bool-pos-eol-break.cfg
index d2abdeb6..d2abdeb6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/bool-pos-eol-break.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/bool-pos-eol-break.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/bool-pos-eol.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/bool-pos-eol.cfg
index f7fe1330..f7fe1330 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/bool-pos-eol.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/bool-pos-eol.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/bool-pos-sol-break.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/bool-pos-sol-break.cfg
index e07ab7e9..e07ab7e9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/bool-pos-sol-break.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/bool-pos-sol-break.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/bool-pos-sol-force.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/bool-pos-sol-force.cfg
index 36f81a26..36f81a26 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/bool-pos-sol-force.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/bool-pos-sol-force.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/bool-pos-sol.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/bool-pos-sol.cfg
index 9dbcbaf2..9dbcbaf2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/bool-pos-sol.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/bool-pos-sol.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/brace-banner.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/brace-banner.cfg
index 2fc753a6..2fc753a6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/brace-banner.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/brace-banner.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/brace-banner.rerun.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/brace-banner.rerun.cfg
index df289545..df289545 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/brace-banner.rerun.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/brace-banner.rerun.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/brace-gnu.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/brace-gnu.cfg
index c5bd1371..c5bd1371 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/brace-gnu.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/brace-gnu.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/brace-kr-br.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/brace-kr-br.cfg
index 59bc4084..59bc4084 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/brace-kr-br.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/brace-kr-br.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/brace-kr-nobr.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/brace-kr-nobr.cfg
index 970b1ab0..970b1ab0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/brace-kr-nobr.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/brace-kr-nobr.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/brace-kr.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/brace-kr.cfg
index 7ef5aa16..7ef5aa16 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/brace-kr.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/brace-kr.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/brace-remove-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/brace-remove-2.cfg
index 9aa693fc..9aa693fc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/brace-remove-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/brace-remove-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/brace-remove-all.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/brace-remove-all.cfg
index ca279abd..ca279abd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/brace-remove-all.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/brace-remove-all.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/brace-ws.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/brace-ws.cfg
index 76d8908a..76d8908a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/brace-ws.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/brace-ws.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/brace-ws2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/brace-ws2.cfg
index 55eb6ece..55eb6ece 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/brace-ws2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/brace-ws2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/bug_1702.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/bug_1702.cfg
index 1c415eec..1c415eec 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/bug_1702.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/bug_1702.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/bug_1718.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/bug_1718.cfg
index e55de095..e55de095 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/bug_1718.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/bug_1718.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/bug_2331.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/bug_2331.cfg
index 4a4af2f3..4a4af2f3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/bug_2331.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/bug_2331.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/bug_489.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/bug_489.cfg
index 61d4693c..61d4693c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/bug_489.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/bug_489.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/bug_i_771.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/bug_i_771.cfg
index 69b6e1a3..69b6e1a3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/bug_i_771.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/bug_i_771.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/case-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/case-1.cfg
index 7c65a819..7c65a819 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/case-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/case-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/case-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/case-2.cfg
index 07c0566d..07c0566d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/case-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/case-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/case-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/case-3.cfg
index 74f16293..74f16293 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/case-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/case-3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/cast-sp-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/cast-sp-a.cfg
index 488198a9..488198a9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/cast-sp-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/cast-sp-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/cast-sp-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/cast-sp-r.cfg
index 1d0138a2..1d0138a2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/cast-sp-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/cast-sp-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/cast-type.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/cast-type.cfg
index 5900ffd5..5900ffd5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/cast-type.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/cast-type.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/cgal.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/cgal.cfg
index a4ec1fa0..a4ec1fa0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/cgal.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/cgal.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/clang-has_include.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/clang-has_include.cfg
index 35d668f3..35d668f3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/clang-has_include.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/clang-has_include.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/cmt_indent_multi-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/cmt_indent_multi-f.cfg
index 1bd265a3..1bd265a3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/cmt_indent_multi-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/cmt_indent_multi-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/cmt_multi_check_last-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/cmt_multi_check_last-f.cfg
index 7fdebde0..7fdebde0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/cmt_multi_check_last-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/cmt_multi_check_last-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/cmt_nl_end.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/cmt_nl_end.cfg
index 1c0b396a..1c0b396a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/cmt_nl_end.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/cmt_nl_end.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/cmt_reflow.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/cmt_reflow.cfg
index 9b280d18..9b280d18 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/cmt_reflow.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/cmt_reflow.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/code_width-80.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/code_width-80.cfg
index 4bdb0ce7..4bdb0ce7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/code_width-80.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/code_width-80.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/cond-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/cond-1.cfg
index 61669da9..61669da9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/cond-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/cond-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/cpp_to_c-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/cpp_to_c-1.cfg
index 83e3aa7c..83e3aa7c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/cpp_to_c-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/cpp_to_c-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/cpp_to_c-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/cpp_to_c-2.cfg
index 9f0d9e3a..9f0d9e3a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/cpp_to_c-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/cpp_to_c-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/cpp_to_c-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/cpp_to_c-3.cfg
index 20bbb9e1..20bbb9e1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/cpp_to_c-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/cpp_to_c-3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/custom_types_ssl.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/custom_types_ssl.cfg
index 4005234e..4005234e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/custom_types_ssl.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/custom_types_ssl.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/doxy-comment-no.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/doxy-comment-no.cfg
index bd2bd258..bd2bd258 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/doxy-comment-no.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/doxy-comment-no.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/doxy-comment-yes.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/doxy-comment-yes.cfg
index 74043b68..bc1d5584 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/doxy-comment-yes.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/doxy-comment-yes.cfg
@@ -8,4 +8,6 @@ align_on_tabstop                = true
 align_var_def_span              = 8
 align_var_def_gap               = 8
 align_right_cmt_span            = 16
-align_right_cmt_at_col          = 64
\ No newline at end of file
+align_right_cmt_at_col          = 64
+
+cmt_cpp_to_c                    = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/else-if-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/else-if-1.cfg
index b4e4aecb..b4e4aecb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/else-if-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/else-if-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/else-if-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/else-if-2.cfg
index 75d7936e..75d7936e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/else-if-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/else-if-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/empty_body.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/empty_body.cfg
index 4563a84f..4563a84f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/empty_body.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/empty_body.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/endif.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/endif.cfg
index ff69251b..ff69251b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/endif.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/endif.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/enum_comma_ifdef.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/enum_comma_ifdef.cfg
index a2622767..a2622767 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/enum_comma_ifdef.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/enum_comma_ifdef.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/force_tab_after_define-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/force_tab_after_define-t.cfg
index 67b04e78..67b04e78 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/force_tab_after_define-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/force_tab_after_define-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/freebsd.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/freebsd.cfg
index 725b00b0..725b00b0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/freebsd.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/freebsd.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/func_call_user.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/func_call_user.cfg
index 504fb3d8..504fb3d8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/func_call_user.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/func_call_user.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ger.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ger.cfg
index 976c0c35..976c0c35 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ger.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ger.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/i1564.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/i1564.cfg
index 74c53e52..74c53e52 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/i1564.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/i1564.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/if_chain.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/if_chain.cfg
index b59d69f8..d3449cc5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/if_chain.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/if_chain.cfg
@@ -6,6 +6,6 @@ nl_if_brace                     = remove
 nl_brace_else                   = remove
 nl_else_brace                   = remove
 align_right_cmt_span            = 3
-mod_full_brace_if_chain         = true
+mod_full_brace_if_chain         = 1
 mod_full_brace_nl               = 3
-mod_full_brace_while            = remove
\ No newline at end of file
+mod_full_brace_while            = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/indent-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent-1.cfg
index 943d0eb6..943d0eb6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/indent-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/indent-vbrace.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent-vbrace.cfg
index 7e6ca7c1..7e6ca7c1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/indent-vbrace.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent-vbrace.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/indent_assign.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent_assign.cfg
index 6bad61f1..6bad61f1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/indent_assign.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent_assign.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/indent_case_comment-false.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent_case_comment-false.cfg
index 15e0e2e8..15e0e2e8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/indent_case_comment-false.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent_case_comment-false.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/indent_case_comment-true.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent_case_comment-true.cfg
index abcadd59..abcadd59 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/indent_case_comment-true.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent_case_comment-true.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/indent_comment_align_thresh-0.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent_comment_align_thresh-0.cfg
index dc730bf8..dc730bf8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/indent_comment_align_thresh-0.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent_comment_align_thresh-0.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/indent_compound_literal_return-false.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent_compound_literal_return-false.cfg
index b686aabe..b686aabe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/indent_compound_literal_return-false.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent_compound_literal_return-false.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/indent_compound_literal_return-true.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent_compound_literal_return-true.cfg
index 9fa1d2ef..9fa1d2ef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/indent_compound_literal_return-true.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent_compound_literal_return-true.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/indent_func_call_param.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent_func_call_param.cfg
index 26b4e03a..26b4e03a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/indent_func_call_param.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent_func_call_param.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/indent_func_def_param.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent_func_def_param.cfg
index c448b21f..c448b21f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/indent_func_def_param.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent_func_def_param.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/indent_func_param.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent_func_param.cfg
index 7db464b4..7db464b4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/indent_func_param.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent_func_param.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/indent_func_proto_param.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent_func_proto_param.cfg
index 6cfb83ed..6cfb83ed 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/indent_func_proto_param.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.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.75.0/tests/config/c/indent_ignore_bool-true.cfg
new file mode 100644
index 00000000..0f952471
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent_ignore_bool-true.cfg
@@ -0,0 +1 @@
+indent_ignore_bool = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/indent_macro_brace-false.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent_macro_brace-false.cfg
index f9e3bdca..f9e3bdca 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/indent_macro_brace-false.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent_macro_brace-false.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/indent_macro_brace-true.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent_macro_brace-true.cfg
index 62573cad..62573cad 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/indent_macro_brace-true.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.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.75.0/tests/config/c/indent_paren_close--1.cfg
new file mode 100644
index 00000000..0656a55f
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent_paren_close--1.cfg
@@ -0,0 +1 @@
+indent_paren_close = -1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/indent_paren_close-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent_paren_close-1.cfg
index 309be3e5..e380b281 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/indent_paren_close-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent_paren_close-1.cfg
@@ -1,6 +1,6 @@
 sp_after_comma                  = force
 sp_inside_fparen                = force
 indent_paren_close              = 1
-indent_comma_paren              = true
-indent_bool_paren               = true
-pos_comma                       = lead
\ No newline at end of file
+indent_comma_paren              = 1
+indent_bool_paren               = 1
+pos_comma                       = lead
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/indent_paren_close-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent_paren_close-2.cfg
index 2a77fedf..2a77fedf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/indent_paren_close-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent_paren_close-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/indent_single_line_comments_after.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent_single_line_comments_after.cfg
index bae9787c..bae9787c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/indent_single_line_comments_after.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent_single_line_comments_after.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/indent_sparen_extra-8.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent_sparen_extra-8.cfg
index 6344ceb2..6344ceb2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/indent_sparen_extra-8.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent_sparen_extra-8.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/indent_ternary_operator-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent_ternary_operator-1.cfg
index 80ea4e7a..80ea4e7a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/indent_ternary_operator-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent_ternary_operator-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/indent_ternary_operator-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent_ternary_operator-2.cfg
index 1d5a91ab..1d5a91ab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/indent_ternary_operator-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/indent_ternary_operator-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/issue_527.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/issue_527.cfg
index 1ab56eb9..aa11dbbc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/issue_527.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/issue_527.cfg
@@ -46,8 +46,8 @@ indent_label                  = 1
 indent_access_spec            = 1

 indent_paren_nl               = false

 indent_paren_close            = 0

-indent_comma_paren            = false

-indent_bool_paren             = false

+indent_comma_paren            = 0

+indent_bool_paren             = 0

 indent_square_nl              = false

 indent_preserve_sql           = false

 sp_arith                      = ignore

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/label_colon_nl_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/label_colon_nl_1.cfg
index 5c394f28..5c394f28 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/label_colon_nl_1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/label_colon_nl_1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/label_colon_nl_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/label_colon_nl_2.cfg
index b1fafca7..b1fafca7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/label_colon_nl_2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/label_colon_nl_2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/leave_one_liners.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/leave_one_liners.cfg
index 931e9465..931e9465 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/leave_one_liners.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/leave_one_liners.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/mod-paren.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/mod-paren.cfg
index 2c0049ab..2c0049ab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/mod-paren.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/mod-paren.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/mod-paren2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/mod-paren2.cfg
index 113ee868..113ee868 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/mod-paren2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/mod-paren2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/mod_case_brace_add.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/mod_case_brace_add.cfg
index bfcca51a..bfcca51a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/mod_case_brace_add.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/mod_case_brace_add.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/mod_move_case_brace.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/mod_move_case_brace.cfg
index acb25734..acb25734 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/mod_move_case_brace.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.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.75.0/tests/config/c/mod_move_case_return.cfg
new file mode 100644
index 00000000..0e698ea9
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/mod_move_case_return.cfg
@@ -0,0 +1 @@
+mod_move_case_return = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/my_conf.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/my_conf.cfg
index 6bfddbb5..6bfddbb5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/my_conf.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/my_conf.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/nepenthes.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/nepenthes.cfg
index 150294da..150294da 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/nepenthes.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/nepenthes.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/newline_after_endif.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/newline_after_endif.cfg
index afd7693d..afd7693d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/newline_after_endif.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/newline_after_endif.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/nl-comment.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/nl-comment.cfg
index c6ef78f9..c6ef78f9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/nl-comment.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/nl-comment.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/nl_assign1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/nl_assign1.cfg
index 1f4da850..1f4da850 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/nl_assign1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/nl_assign1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/nl_assign2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/nl_assign2.cfg
index b4cfb4d1..b4cfb4d1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/nl_assign2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/nl_assign2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/nl_before_return_false.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/nl_before_return_false.cfg
index 7636745b..7636745b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/nl_before_return_false.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/nl_before_return_false.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/nl_before_return_true.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/nl_before_return_true.cfg
index 1e6976fc..1e6976fc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/nl_before_return_true.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/nl_before_return_true.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/nl_brace_test.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/nl_brace_test.cfg
index c9faeb04..c9faeb04 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/nl_brace_test.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/nl_brace_test.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/nl_create_one_liner.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/nl_create_one_liner.cfg
index ec8b120c..ec8b120c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/nl_create_one_liner.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/nl_create_one_liner.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/nl_ds_struct_enum-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/nl_ds_struct_enum-2.cfg
index 01c60de4..01c60de4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/nl_ds_struct_enum-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/nl_ds_struct_enum-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/nl_ds_struct_enum_cmt-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/nl_ds_struct_enum_cmt-t.cfg
index 1864b51d..1864b51d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/nl_ds_struct_enum_cmt-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/nl_ds_struct_enum_cmt-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/nl_endif.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/nl_endif.cfg
index b056153e..b056153e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/nl_endif.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/nl_endif.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/nl_enum_own_lines-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/nl_enum_own_lines-3.cfg
index b6a28869..b6a28869 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/nl_enum_own_lines-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/nl_enum_own_lines-3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/nl_enum_own_lines-3.rerun.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/nl_enum_own_lines-3.rerun.cfg
index f0d3f7b2..f0d3f7b2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/nl_enum_own_lines-3.rerun.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/nl_enum_own_lines-3.rerun.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/nl_enum_own_lines-4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/nl_enum_own_lines-4.cfg
index 70973ec8..70973ec8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/nl_enum_own_lines-4.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/nl_enum_own_lines-4.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/nl_enum_own_lines-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/nl_enum_own_lines-a.cfg
index 66e7dbfa..66e7dbfa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/nl_enum_own_lines-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/nl_enum_own_lines-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/nl_semicolon.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/nl_semicolon.cfg
index d099e0c7..d099e0c7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/nl_semicolon.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/nl_semicolon.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/nl_whole_file_ifdef.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/nl_whole_file_ifdef.cfg
index 1d6a585a..1d6a585a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/nl_whole_file_ifdef.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/nl_whole_file_ifdef.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/pascal_ptr.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/pascal_ptr.cfg
index 1760abca..1760abca 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/pascal_ptr.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/pascal_ptr.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/pos_compare-eol.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/pos_compare-eol.cfg
index 90267209..90267209 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/pos_compare-eol.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/pos_compare-eol.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/pos_compare-sol.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/pos_compare-sol.cfg
index a4235d7d..a4235d7d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/pos_compare-sol.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/pos_compare-sol.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/pos_conditional-l.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/pos_conditional-l.cfg
index 11eb46fd..11eb46fd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/pos_conditional-l.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/pos_conditional-l.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/pos_conditional-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/pos_conditional-t.cfg
index 79bb52d0..79bb52d0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/pos_conditional-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/pos_conditional-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/pp-indent-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/pp-indent-2.cfg
index 64f53643..64f53643 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/pp-indent-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/pp-indent-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/pp-space.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/pp-space.cfg
index e91685ab..e91685ab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/pp-space.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/pp-space.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/pp_if_indent-0.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/pp_if_indent-0.cfg
index 82f11f27..82f11f27 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/pp_if_indent-0.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/pp_if_indent-0.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/pp_if_indent-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/pp_if_indent-1.cfg
index 7c01e819..7c01e819 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/pp_if_indent-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/pp_if_indent-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/pp_if_indent-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/pp_if_indent-2.cfg
index 6f912806..6f912806 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/pp_if_indent-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/pp_if_indent-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/pp_if_indent-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/pp_if_indent-3.cfg
index 4b876498..4b876498 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/pp_if_indent-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/pp_if_indent-3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/pp_if_indent-4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/pp_if_indent-4.cfg
index fe29f734..fe29f734 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/pp_if_indent-4.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.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.75.0/tests/config/c/pp_if_indent_code-true.cfg
new file mode 100644
index 00000000..cb00f671
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/pp_if_indent_code-true.cfg
@@ -0,0 +1 @@
+pp_if_indent_code = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/pp_include_at_level-false.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/pp_include_at_level-false.cfg
index 6f780147..6f780147 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/pp_include_at_level-false.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/pp_include_at_level-false.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/pp_include_at_level-true.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/pp_include_at_level-true.cfg
index bc062b9f..bc062b9f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/pp_include_at_level-true.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/pp_include_at_level-true.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/pp_indent-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/pp_indent-a.cfg
index f9f9b3b3..f9f9b3b3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/pp_indent-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.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.75.0/tests/config/c/pp_indent_brace--1.cfg
new file mode 100644
index 00000000..ecd054cb
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/pp_indent_brace--1.cfg
@@ -0,0 +1,2 @@
+pp_if_indent_code = true
+pp_indent_brace   = -1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/pp_indent_in_guard.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/pp_indent_in_guard.cfg
index 2c4e2545..2c4e2545 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/pp_indent_in_guard.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/pp_indent_in_guard.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/pp_ret.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/pp_ret.cfg
index b1fb2000..b1fb2000 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/pp_ret.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/pp_ret.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/preproc-cleanup.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/preproc-cleanup.cfg
index 73fc557c..73fc557c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/preproc-cleanup.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/preproc-cleanup.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ptr-arith.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ptr-arith.cfg
index ff1949d3..ff1949d3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/ptr-arith.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/ptr-arith.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/rdan.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/rdan.cfg
index b000b33d..4eb5f019 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/rdan.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/rdan.cfg
@@ -9,7 +9,7 @@ indent_columns                  = 3
 indent_with_tabs                = 0
 indent_func_def_force_col1      = true
 indent_col1_comment             = true
-indent_bool_paren               = true
+indent_bool_paren               = 1
 indent_first_bool_expr          = true
 nl_func_var_def_blk             = 2
 nl_if_brace                     = force
@@ -30,4 +30,4 @@ mod_full_paren_if_bool          = true
 pp_indent                       = add
 pp_indent_at_level              = true
 pp_indent_count                 = 3
-pp_if_indent_code               = true
\ No newline at end of file
+pp_if_indent_code               = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/return-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/return-1.cfg
index 996ca632..996ca632 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/return-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/return-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/return-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/return-2.cfg
index 87b361d8..87b361d8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/return-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/return-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/return-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/return-3.cfg
index 9caf1a7e..9caf1a7e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/return-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/return-3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/return-4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/return-4.cfg
index 9a885287..9a885287 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/return-4.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/return-4.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/sf537.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sf537.cfg
index 400c7e0b..400c7e0b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/sf537.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sf537.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/sf538.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sf538.cfg
index 8c6d149b..8c6d149b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/sf538.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sf538.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/sp_after_pointer_star-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sp_after_pointer_star-r.cfg
index 92a637a1..92a637a1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/sp_after_pointer_star-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sp_after_pointer_star-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/sp_after_sparen.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sp_after_sparen.cfg
index c9b9afbf..c9b9afbf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/sp_after_sparen.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sp_after_sparen.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/sp_between_semi_for_empty-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sp_between_semi_for_empty-i.cfg
index 146f6d61..146f6d61 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/sp_between_semi_for_empty-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sp_between_semi_for_empty-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/sp_between_semi_for_empty-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sp_between_semi_for_empty-r.cfg
index 26dcc001..26dcc001 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/sp_between_semi_for_empty-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sp_between_semi_for_empty-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/sp_cmt_cpp_start-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sp_cmt_cpp_start-r.cfg
index 13ceebfc..13ceebfc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/sp_cmt_cpp_start-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sp_cmt_cpp_start-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/sp_cond_colon.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sp_cond_colon.cfg
index d39afa14..d39afa14 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/sp_cond_colon.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sp_cond_colon.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/sp_emb_cmt-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sp_emb_cmt-f.cfg
index 68a83e91..68a83e91 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/sp_emb_cmt-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sp_emb_cmt-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/sp_emb_cmt-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sp_emb_cmt-i.cfg
index 04f49ee7..04f49ee7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/sp_emb_cmt-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sp_emb_cmt-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/sp_emb_cmt-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sp_emb_cmt-r.cfg
index f45d357b..f45d357b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/sp_emb_cmt-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.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.75.0/tests/config/c/sp_enum_brace-a.cfg
new file mode 100644
index 00000000..ada72096
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sp_enum_brace-a.cfg
@@ -0,0 +1 @@
+sp_enum_brace = add
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.75.0/tests/config/c/sp_enum_brace-f.cfg
new file mode 100644
index 00000000..0e358549
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sp_enum_brace-f.cfg
@@ -0,0 +1 @@
+sp_enum_brace = force
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.75.0/tests/config/c/sp_enum_brace-i.cfg
new file mode 100644
index 00000000..f18a88b3
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sp_enum_brace-i.cfg
@@ -0,0 +1 @@
+sp_enum_brace = ignore
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.75.0/tests/config/c/sp_enum_brace-r.cfg
new file mode 100644
index 00000000..22785029
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sp_enum_brace-r.cfg
@@ -0,0 +1 @@
+sp_enum_brace = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/sp_func_call_user_inside_fparen.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sp_func_call_user_inside_fparen.cfg
index e5650760..e5650760 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/sp_func_call_user_inside_fparen.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sp_func_call_user_inside_fparen.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/sp_ptr_star_func_var-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sp_ptr_star_func_var-a.cfg
index a21ed3da..a21ed3da 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/sp_ptr_star_func_var-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sp_ptr_star_func_var-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/sp_ptr_star_func_var-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sp_ptr_star_func_var-f.cfg
index 9562f157..9562f157 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/sp_ptr_star_func_var-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sp_ptr_star_func_var-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/sp_ptr_star_func_var-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sp_ptr_star_func_var-i.cfg
index e18cc959..e18cc959 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/sp_ptr_star_func_var-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sp_ptr_star_func_var-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/sp_ptr_star_func_var-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sp_ptr_star_func_var-r.cfg
index ec9bf9c0..ec9bf9c0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/sp_ptr_star_func_var-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sp_ptr_star_func_var-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/sp_sparen_paren-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sp_sparen_paren-a.cfg
index 0d477f4d..0d477f4d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/sp_sparen_paren-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sp_sparen_paren-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/sp_sparen_paren-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sp_sparen_paren-i.cfg
index 750b77ff..750b77ff 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/sp_sparen_paren-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/sp_sparen_paren-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/space_indent_columns-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/space_indent_columns-3.cfg
index ec130371..ec130371 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/space_indent_columns-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/space_indent_columns-3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/type_wrap.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/type_wrap.cfg
index eeea5786..eeea5786 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/type_wrap.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/type_wrap.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/width-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/width-3.cfg
index 843f6669..843f6669 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/width-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/width-3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/width.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/width.cfg
index 10cb731c..10cb731c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/width.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/width.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/xml-str.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/xml-str.cfg
index bd667ab4..bd667ab4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/c/xml-str.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/c/xml-str.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/UNI-18777.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/UNI-18777.cfg
index 7d4c013e..7d4c013e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/UNI-18777.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/UNI-18777.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/aet-func_call_user.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/aet-func_call_user.cfg
index 3219bc4b..3219bc4b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/aet-func_call_user.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/aet-func_call_user.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/aet-func_def.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/aet-func_def.cfg
index c4575b88..c4575b88 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/aet-func_def.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/aet-func_def.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/aet-sp_after_oc_msg_receiver.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/aet-sp_after_oc_msg_receiver.cfg
index 8e25aaed..8e25aaed 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/aet-sp_after_oc_msg_receiver.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/aet-sp_after_oc_msg_receiver.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/aet-sp_inside_braces_oc_dict.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/aet-sp_inside_braces_oc_dict.cfg
index 57e2463e..57e2463e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/aet-sp_inside_braces_oc_dict.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/aet-sp_inside_braces_oc_dict.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/aet.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/aet.cfg
index a5d95a8a..f1a4b429 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/aet.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/aet.cfg
@@ -38,7 +38,7 @@ indent_ctor_init                                     = 0
 indent_else_if                                       = false
 indent_var_def_blk                                   = 0
 indent_var_def_cont                                  = false
-indent_shift                                         = false
+indent_shift                                         = 0
 indent_func_def_force_col1                           = false
 indent_func_call_param                               = true
 indent_func_def_param                                = true
@@ -61,8 +61,8 @@ indent_access_spec                                   = -4
 indent_access_spec_body                              = false
 indent_paren_nl                                      = false
 indent_paren_close                                   = 0
-indent_comma_paren                                   = false
-indent_bool_paren                                    = false
+indent_comma_paren                                   = 0
+indent_bool_paren                                    = 0
 indent_first_bool_expr                               = false
 indent_square_nl                                     = false
 indent_preserve_sql                                  = false
@@ -105,6 +105,7 @@ sp_between_ptr_star                                  = remove
 sp_after_ptr_star                                    = remove
 sp_after_ptr_star_qualifier                          = remove
 sp_after_ptr_star_func                               = remove
+sp_ptr_star_func_type                                = remove
 sp_ptr_star_paren                                    = remove
 sp_before_ptr_star_func                              = force
 sp_before_byref                                      = remove
@@ -453,7 +454,7 @@ mod_full_brace_do                                    = ignore
 mod_full_brace_for                                   = ignore
 mod_full_brace_function                              = ignore
 mod_full_brace_if                                    = ignore
-mod_full_brace_if_chain                              = false
+mod_full_brace_if_chain                              = 0
 mod_full_brace_nl                                    = 0
 mod_full_brace_while                                 = ignore
 mod_full_brace_using                                 = ignore
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/align-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/align-1.cfg
index 720f003e..720f003e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/align-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/align-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/align_same_func_call_params-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/align_same_func_call_params-t.cfg
index d1496108..d1496108 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/align_same_func_call_params-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.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.75.0/tests/config/common/attribute_specifier_seqs.cfg
new file mode 100644
index 00000000..3a7f6096
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/attribute_specifier_seqs.cfg
@@ -0,0 +1,3 @@
+sp_before_vardef_square    = ignore
+sp_type_brace_init_lst     = remove
+indent_continue_class_head = 8
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/ben2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/ben2.cfg
index 8398a6b9..8398a6b9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/ben2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/ben2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/ben_011.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/ben_011.cfg
index 6ade29ad..6ade29ad 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/ben_011.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/ben_011.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/ben_042.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/ben_042.cfg
index c98cdf54..c98cdf54 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/ben_042.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/ben_042.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/bool-pos-eol-force.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/bool-pos-eol-force.cfg
index 51044559..51044559 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/bool-pos-eol-force.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/bool-pos-eol-force.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/brace-allman.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/brace-allman.cfg
index 0e903302..0e903302 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/brace-allman.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/brace-allman.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/bug_671.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/bug_671.cfg
index 00c0cf36..00c0cf36 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/bug_671.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/bug_671.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/clark.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/clark.cfg
index 0ca4890e..0ca4890e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/clark.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/clark.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/clark.rerun.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/clark.rerun.cfg
index 3b33c7d6..3b33c7d6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/clark.rerun.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/clark.rerun.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/class-header.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/class-header.h
index 32e68a34..32e68a34 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/class-header.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/class-header.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/cmt_insert-0.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/cmt_insert-0.cfg
index 86d05f95..86d05f95 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/cmt_insert-0.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/cmt_insert-0.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/cmt_insert-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/cmt_insert-1.cfg
index 91dbf03a..91dbf03a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/cmt_insert-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/cmt_insert-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/d.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/d.cfg
index d6261dd9..e9be1e99 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/d.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/d.cfg
@@ -27,6 +27,7 @@ indent_class                    = true
 indent_case_brace               = 4
 indent_label                    = 2
 nl_func_var_def_blk             = 1
+nl_var_def_blk_end              = 1
 nl_enum_brace                   = add
 nl_if_brace                     = add
 nl_else_brace                   = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/del_semicolon.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/del_semicolon.cfg
index 13434168..13434168 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/del_semicolon.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/del_semicolon.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/empty.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/empty.cfg
index e69de29b..e69de29b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/empty.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/empty.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/file-header.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/file-header.h
index 63fb5185..63fb5185 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/file-header.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/file-header.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/file_footer.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/file_footer.txt
index 7ce80bad..7ce80bad 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/file_footer.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/file_footer.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/file_header.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/file_header.txt
index 5431d0ff..5431d0ff 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/file_header.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/file_header.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/func-def-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/func-def-1.cfg
index 14879a94..14879a94 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/func-def-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/func-def-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/func-def-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/func-def-2.cfg
index f9cf836c..f9cf836c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/func-def-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/func-def-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/func-def-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/func-def-3.cfg
index c868ae02..c868ae02 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/func-def-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/func-def-3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/func-header.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/func-header.h
index e6f83943..e6f83943 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/func-header.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/func-header.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/func-header2.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/func-header2.h
index 52bdf970..52bdf970 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/func-header2.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/func-header2.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/function_header.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/function_header.txt
index c6508a02..c6508a02 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/function_header.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.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.75.0/tests/config/common/indent_columns-3.cfg
new file mode 100644
index 00000000..d49cfc22
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/indent_columns-3.cfg
@@ -0,0 +1,7 @@
+indent_columns   = 3
+
+# Add or remove space around the ':' in 'b ? t : f'.
+# Добавить или удалить пробел вокруг ':' в операторе 'b ? t : f'.
+sp_cond_colon    = add # 只是一组象形文字
+
+sp_cond_question = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/indent_continue-8.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/indent_continue-8.cfg
index 9bc69559..9bc69559 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/indent_continue-8.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/indent_continue-8.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/indent_inside_ternary_operator.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/indent_inside_ternary_operator.cfg
index ad5f98ed..ad5f98ed 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/indent_inside_ternary_operator.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/indent_inside_ternary_operator.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/indent_var_def.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/indent_var_def.cfg
index 2faffc24..2faffc24 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/indent_var_def.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/indent_var_def.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/issue_672.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/issue_672.cfg
index fb436753..fb436753 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/issue_672.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/issue_672.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/kw_subst.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/kw_subst.cfg
index 163d6f64..163d6f64 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/kw_subst.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/kw_subst.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/kw_subst2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/kw_subst2.cfg
index 7f531264..7f531264 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/kw_subst2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/kw_subst2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/kw_subst3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/kw_subst3.cfg
index b96dc493..b96dc493 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/kw_subst3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/kw_subst3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/kw_subst4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/kw_subst4.cfg
index a269bdf8..a269bdf8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/kw_subst4.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/kw_subst4.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/mod_case_brace_rm.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/mod_case_brace_rm.cfg
index 51252b69..51252b69 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/mod_case_brace_rm.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/mod_case_brace_rm.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/mod_full_brace_if_chain_only-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/mod_full_brace_if_chain_only-t.cfg
index ec61c84b..ec61c84b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/mod_full_brace_if_chain_only-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/mod_full_brace_if_chain_only-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/mod_paren_on_return-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/mod_paren_on_return-a.cfg
index 6e5a38ec..6e5a38ec 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/mod_paren_on_return-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/mod_paren_on_return-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/mod_paren_on_return-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/mod_paren_on_return-r.cfg
index fb547f72..fb547f72 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/mod_paren_on_return-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/mod_paren_on_return-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/msg-header.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/msg-header.h
index 79a0919f..79a0919f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/msg-header.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/msg-header.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/nl_before_after.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/nl_before_after.cfg
index b80dafa0..b80dafa0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/nl_before_after.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/nl_before_after.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/nl_before_ignore_after_case.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/nl_before_ignore_after_case.cfg
index 6d1bbb7d..6d1bbb7d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/nl_before_ignore_after_case.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/nl_before_ignore_after_case.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/region-0.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/region-0.cfg
index a837d86f..a837d86f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/region-0.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/region-0.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/region-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/region-1.cfg
index 48ae77f3..48ae77f3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/region-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/region-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/region-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/region-2.cfg
index 5beed445..5beed445 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/region-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/region-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/region-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/region-3.cfg
index 30a01c96..30a01c96 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/region-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/region-3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/sort_imports.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/sort_imports.cfg
index 655a684f..655a684f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/sort_imports.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/sort_imports.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/sp_after_cast.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/sp_after_cast.cfg
index c16cc978..c16cc978 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/sp_after_cast.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/sp_after_cast.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/sp_after_type-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/sp_after_type-f.cfg
index b7fa74f4..b7fa74f4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/sp_after_type-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/sp_after_type-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/sp_after_type-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/sp_after_type-r.cfg
index 78a64119..78a64119 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/sp_after_type-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/sp_after_type-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/sp_arith-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/sp_arith-f.cfg
index 6cd2b6b0..6cd2b6b0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/sp_arith-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/sp_arith-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/sp_before_byref-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/sp_before_byref-r.cfg
index 2f5d1eff..2f5d1eff 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/sp_before_byref-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/sp_before_byref-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/sp_cmt_cpp_start-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/sp_cmt_cpp_start-a.cfg
index d7e6adf1..d7e6adf1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/sp_cmt_cpp_start-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/sp_cmt_cpp_start-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/sp_cmt_cpp_start_force.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/sp_cmt_cpp_start_force.cfg
index e87c9b0d..e87c9b0d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/sp_cmt_cpp_start_force.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/sp_cmt_cpp_start_force.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/sp_cparen_oparen-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/sp_cparen_oparen-f.cfg
index c2af4d15..c2af4d15 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/sp_cparen_oparen-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/sp_cparen_oparen-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/sp_inside_fparen-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/sp_inside_fparen-f.cfg
index 2b159a36..2b159a36 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/sp_inside_fparen-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/sp_inside_fparen-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/space_indent_columns-4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/space_indent_columns-4.cfg
index f05c685f..f05c685f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/space_indent_columns-4.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/space_indent_columns-4.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/star_pos-0.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/star_pos-0.cfg
index 6798b186..3648d94a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/star_pos-0.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/star_pos-0.cfg
@@ -1,6 +1,7 @@
 # Places the byref as follows: "int &foo"
 sp_before_ptr_star              = remove
 sp_after_ptr_star               = force
+sp_ptr_star_func_type           = force
 sp_before_byref                 = remove
 indent_columns                  = 3
 align_var_def_span              = 2
@@ -8,4 +9,4 @@ align_var_struct_span           = 2
 align_typedef_gap               = 3
 align_typedef_span              = 5
 align_typedef_func              = 1
-align_func_proto_span           = 2
\ No newline at end of file
+align_func_proto_span           = 2
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/width-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/width-2.cfg
index 6c18a158..6c18a158 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/width-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/width-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/width-2.rerun.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/width-2.rerun.cfg
index c74e4020..c74e4020 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/common/width-2.rerun.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/common/width-2.rerun.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/2185.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/2185.cfg
index fda2290c..fda2290c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/2185.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/2185.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/2203.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/2203.cfg
index e9c359cf..e9c359cf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/2203.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/2203.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/623_caret-spacing.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/623_caret-spacing.cfg
index 4d60daa9..4d60daa9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/623_caret-spacing.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/623_caret-spacing.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/633_decl-in-func-typedef.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/633_decl-in-func-typedef.cfg
index 5ca47821..0edd4124 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/633_decl-in-func-typedef.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/633_decl-in-func-typedef.cfg
@@ -1,4 +1,5 @@
 sp_arith = add
 sp_before_ptr_star = force
 sp_after_ptr_star = remove
+sp_ptr_star_func_type = remove
 sp_ptr_star_paren = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/DefaultAndDelete-0.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/DefaultAndDelete-0.cfg
index 8aef4713..8aef4713 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/DefaultAndDelete-0.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/DefaultAndDelete-0.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/DefaultAndDelete-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/DefaultAndDelete-1.cfg
index f97e0abe..f97e0abe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/DefaultAndDelete-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/DefaultAndDelete-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/DefaultAndDelete-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/DefaultAndDelete-2.cfg
index 6c39bace..6c39bace 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/DefaultAndDelete-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/DefaultAndDelete-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/I1112-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/I1112-2.cfg
index 6b1bba41..6b1bba41 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/I1112-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/I1112-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/I2103.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/I2103.cfg
index 5c34ca18..5c34ca18 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/I2103.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/I2103.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_1052.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_1052.cfg
index 91fe8899..91fe8899 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_1052.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_1052.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_1167.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_1167.cfg
index feb56c83..feb56c83 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_1167.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_1167.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_1184.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_1184.cfg
index 0fdd95de..0fdd95de 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_1184.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_1184.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_1460.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_1460.cfg
index 7adee60a..7adee60a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_1460.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_1460.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_1511.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_1511.cfg
index 71c01f4d..71c01f4d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_1511.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_1511.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_1692.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_1692.cfg
index db3cbdbe..db3cbdbe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_1692.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_1692.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_1703.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_1703.cfg
index f8c889ab..f8c889ab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_1703.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_1703.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_1734.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_1734.cfg
index 37a4c192..37a4c192 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_1734.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_1734.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_1753.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_1753.cfg
index e0e5ab0b..e0e5ab0b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_1753.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_1753.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_1813.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_1813.cfg
index ff1ce9d3..ff1ce9d3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_1813.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_1813.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_1923.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_1923.cfg
index f242e902..f242e902 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_1923.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_1923.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_1966.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_1966.cfg
index be3a873d..be3a873d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_1966.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_1966.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2020.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2020.cfg
index 2104e036..2104e036 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2020.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2020.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2045.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2045.cfg
index 3fb7cfe9..3fb7cfe9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2045.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2045.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2085.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2085.cfg
index 2df8ebd8..2df8ebd8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2085.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2085.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2091.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2091.cfg
index 898b035b..898b035b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2091.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2091.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2101.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2101.cfg
index 44e5a0e6..44e5a0e6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2101.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2101.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2149.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2149.cfg
index 23a8583a..721daf0b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2149.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2149.cfg
@@ -1,3 +1,3 @@
 indent_namespace   = true
 indent_continue    = 8
-indent_shift       = true
+indent_shift       = 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2150.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2150.cfg
index 5f518291..5f518291 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2150.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2150.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2151.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2151.cfg
index 0660e498..0660e498 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2151.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2151.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2163.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2163.cfg
index b7c31fe2..b7c31fe2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2163.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2163.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2166.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2166.cfg
index 2b473436..2b473436 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2166.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2166.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2170.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2170.cfg
index f66f0022..f66f0022 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2170.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2170.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2186.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2186.cfg
index d694b699..d694b699 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2186.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2186.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2195.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2195.cfg
index 0c70840d..0c70840d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2195.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2195.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2219.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2219.cfg
index 865142a1..865142a1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2219.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2219.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2224.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2224.cfg
index 8973a14f..8973a14f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2224.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.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.75.0/tests/config/cpp/Issue_2229.cfg
new file mode 100644
index 00000000..38cb5554
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2229.cfg
@@ -0,0 +1,16 @@
+# Add or remove braces on a single-line 'if' statement. Braces will not be
+# removed if the braced statement contains an 'else'.
+mod_full_brace_if = remove
+
+# Whether to enforce that all blocks of an 'if'/'else if'/'else' chain either
+# have, or do not have, braces. Overrides mod_full_brace_if.
+#
+# 0: Don't override mod_full_brace_if
+# 1: Add braces to all blocks if any block needs braces and remove braces if
+#    they can be removed from all blocks
+# 2: Add braces to all blocks if any block already has braces, regardless of
+#    whether it needs them
+# 3: Add braces to all blocks if any block needs braces and remove braces if
+#    they can be removed from all blocks, except if all blocks have braces
+#    despite none needing them
+mod_full_brace_if_chain = 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2232.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2232.cfg
index 06730341..06730341 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2232.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2232.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2236.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2236.cfg
index 6d30f256..6d30f256 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2236.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2236.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2250.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2250.cfg
index 94a8d306..705176b2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2250.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2250.cfg
@@ -1,5 +1,5 @@
 indent_columns                  = 3
-indent_func_proto_param         = true
+indent_func_class_param         = true
 indent_func_param_double        = true
 nl_cpp_lambda_leave_one_liners  = true
 pos_bool                        = trail
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2281.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2281.cfg
index 1d8b164e..1d8b164e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2281.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2281.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2302.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2302.cfg
index e69de29b..e69de29b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2302.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2302.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2305.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2305.cfg
index 7200d9ac..7200d9ac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2305.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2305.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2319.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2319.cfg
index aeb132b5..aeb132b5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2319.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2319.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2343.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2343.cfg
index 955a1f9a..955a1f9a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2343.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2343.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2345.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2345.cfg
index 27213b45..27213b45 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2345.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2345.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2368.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2368.cfg
index d1496108..d1496108 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2368.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2368.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2383.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2383.cfg
index 313d9efb..313d9efb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2383.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2383.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2386.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2386.cfg
index 3a121c2e..3a121c2e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2386.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2386.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2428.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2428.cfg
index 8af28414..8af28414 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2428.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2428.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2437.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2437.cfg
index b21679ce..b21679ce 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2437.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2437.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2440.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2440.cfg
index 3da56066..3da56066 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2440.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2440.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2440_nl.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2440_nl.cfg
index 3da56066..3da56066 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2440_nl.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2440_nl.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2478.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2478.cfg
index bb4425d9..bb4425d9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2478.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2478.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2561.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2561.cfg
index 03a40504..03a40504 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2561.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2561.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2570.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2570.cfg
index 6a9f2d25..6a9f2d25 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2570.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2570.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2574.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2574.cfg
index d96f0980..d96f0980 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2574.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2574.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2582.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2582.cfg
index f634b12e..f634b12e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2582.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2582.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2591.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2591.cfg
index 6ca8934c..6ca8934c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2591.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2591.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2594.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2594.cfg
index 6d847dfc..1d7941be 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2594.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2594.cfg
@@ -7,5 +7,5 @@ nl_func_leave_one_liners        = true
 nl_if_brace                     = add
 nl_brace_else                   = remove
 nl_create_if_one_liner          = true
-mod_full_brace_if_chain         = true
+mod_full_brace_if_chain         = 1
 mod_full_brace_nl               = 2
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2596.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2596.cfg
index b6338859..b6338859 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2596.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2596.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2604.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2604.cfg
index daeb9bc6..daeb9bc6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2604.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.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.75.0/tests/config/cpp/Issue_2668.cfg
new file mode 100644
index 00000000..40a69dcf
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2668.cfg
@@ -0,0 +1 @@
+nl_var_def_blk_end = 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2688.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2688.cfg
index 4baf4b3f..4baf4b3f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2688.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2688.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2689.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2689.cfg
index e498e830..e498e830 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2689.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2689.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2692.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2692.cfg
index bce2060e..bce2060e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2692.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2692.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2703.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2703.cfg
index 80c42da9..80c42da9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2703.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2703.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2734.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2734.cfg
index 83fdd868..83fdd868 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2734.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2734.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2735.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2735.cfg
index 32a72aa2..32a72aa2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2735.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2735.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2742.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2742.cfg
index eba0468c..eba0468c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2742.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2742.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2752.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2752.cfg
index e15e7702..e15e7702 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2752.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2752.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2757.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2757.cfg
index e2118df5..e2118df5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2757.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2757.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2758.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2758.cfg
index dd2d0f6b..dd2d0f6b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2758.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2758.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2759.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2759.cfg
index abdc53f4..abdc53f4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2759.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2759.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2771.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2771.cfg
index b34e82a7..b34e82a7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2771.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2771.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2794.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2794.cfg
index c193054f..c193054f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2794.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2794.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2795.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2795.cfg
index 353cafa8..353cafa8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2795.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2795.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2823.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2823.cfg
index de58e056..de58e056 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2823.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2823.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2831.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2831.cfg
index e7271af0..e7271af0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2831.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2831.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2836.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2836.cfg
index 41151a57..41151a57 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2836.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2836.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2873.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2873.cfg
index be881c98..be881c98 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2873.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2873.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2879.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2879.cfg
index ba98f974..ba98f974 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2879.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2879.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2886.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2886.cfg
index eb4b5ca2..eb4b5ca2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2886.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2886.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2890.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2890.cfg
index 81ba72ca..81ba72ca 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2890.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2890.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2902.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2902.cfg
index 5806b371..5806b371 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2902.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2902.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2907.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2907.cfg
index fa5b3018..fa5b3018 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2907.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2907.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2914.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2914.cfg
index 98d4511c..98d4511c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2914.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2914.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2921.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2921.cfg
index 142dc8dc..142dc8dc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2921.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2921.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2930.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2930.cfg
index bd8cb9b0..bd8cb9b0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2930.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2930.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2942.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2942.cfg
index e72ddc77..e72ddc77 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2942.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2942.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2949.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2949.cfg
index b5ea1ffb..b5ea1ffb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_2949.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.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.75.0/tests/config/cpp/Issue_2957.cfg
new file mode 100644
index 00000000..aaf2b1a1
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2957.cfg
@@ -0,0 +1,4 @@
+# Whether to add a newline after the type in an unnamed temporary
+# direct-list-initialization, better:
+# before a direct-list-initialization.
+nl_type_brace_init_lst = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2971.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2971.cfg
new file mode 100644
index 00000000..1255b541
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_2971.cfg
@@ -0,0 +1,4 @@
+indent_columns     = 3
+indent_with_tabs   = 0
+align_var_def_span = 1
+indent_class       = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3010.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3010.cfg
index 5f518291..5f518291 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3010.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3010.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3025.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3025.cfg
index 5e545c50..5e545c50 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3025.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3025.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3034.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3034.cfg
index 77557ac3..77557ac3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3034.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3034.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3040.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3040.cfg
index 12c8ebaf..12c8ebaf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3040.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3040.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3044.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3044.cfg
index c2f9ade5..c2f9ade5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3044.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3044.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3048.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3048.cfg
index fb4171d7..fb4171d7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3048.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3048.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3052.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3052.cfg
index f7c29b8e..f7c29b8e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3052.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3052.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3054-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3054-2.cfg
index a41640f0..a41640f0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3054-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3054-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3054.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3054.cfg
index a88303ba..a88303ba 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3054.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3054.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3055.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3055.cfg
index 307e5d93..307e5d93 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3055.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3055.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3058.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3058.cfg
index 1619b851..1619b851 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3058.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3058.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3061_0nl.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3061_0nl.cfg
index 53a71184..53a71184 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3061_0nl.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3061_0nl.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3061_1nl.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3061_1nl.cfg
index ad1c0bbc..ad1c0bbc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3061_1nl.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3061_1nl.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3061_2nl.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3061_2nl.cfg
index 27325b31..27325b31 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3061_2nl.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3061_2nl.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3061_3nl.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3061_3nl.cfg
index 276c7d72..276c7d72 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3061_3nl.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3061_3nl.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3080.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3080.cfg
index 748a6dad..748a6dad 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3080.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.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.75.0/tests/config/cpp/Issue_3097.cfg
new file mode 100644
index 00000000..ed31649e
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3097.cfg
@@ -0,0 +1 @@
+nl_var_def_blk_start = 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3164.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3164.cfg
index 10cf639b..10cf639b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3164.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3164.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3197.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3197.cfg
index 2177bfff..2177bfff 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3197.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3197.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3198.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3198.cfg
index 28852f24..28852f24 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3198.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3198.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3203.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3203.cfg
index 69cd5054..69cd5054 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3203.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3203.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3220-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3220-f.cfg
index fffa496d..fffa496d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3220-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3220-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3220-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3220-i.cfg
index 52060d80..52060d80 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3220-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3220-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3220-ir.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3220-ir.cfg
index 17d298b2..17d298b2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3220-ir.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3220-ir.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3220-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3220-r.cfg
index c62cb16e..c62cb16e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3220-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3220-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3237.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3237.cfg
index 5c47913d..5c47913d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3237.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3237.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3252.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3252.cfg
index db7fe8f2..db7fe8f2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3252.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.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.75.0/tests/config/cpp/Issue_3284.cfg
new file mode 100644
index 00000000..51de787c
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3284.cfg
@@ -0,0 +1,5 @@
+align_assign_span      = 1
+# 0: Align with other assignments (default)
+# 1: Align with each other, ignoring regular assignments
+# 2: Don't align
+align_assign_decl_func = 2 # (don't align) didn't work if function contains noexcept keyword.
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3294.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3294.cfg
new file mode 100644
index 00000000..994a3fe7
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3294.cfg
@@ -0,0 +1,4 @@
+indent_with_tabs                = 0
+indent_member_single            = true
+
+indent_inside_ternary_operator  = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3309-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3309-f.cfg
index e74d7570..e74d7570 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3309-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3309-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3309-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3309-i.cfg
index dd286b9d..dd286b9d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3309-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3309-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3309-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3309-r.cfg
index 771903f1..771903f1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_3309-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3309-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3316.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3316.cfg
new file mode 100644
index 00000000..901ad6e4
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3316.cfg
@@ -0,0 +1,3 @@
+mod_full_paren_if_bool     = true
+mod_full_paren_assign_bool = true
+mod_full_paren_return_bool = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3357.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3357.cfg
new file mode 100644
index 00000000..3f3c5075
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3357.cfg
@@ -0,0 +1 @@
+cmt_align_doxygen_javadoc_tags = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3409.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3409.cfg
new file mode 100644
index 00000000..f82a74fc
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3409.cfg
@@ -0,0 +1,6 @@
+indent_cpp_lambda_body = true

+indent_cpp_lambda_only_once = true

+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.75.0/tests/config/cpp/Issue_3413.cfg
new file mode 100644
index 00000000..99a9f4a9
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3413.cfg
@@ -0,0 +1,4 @@
+align_func_proto_span   = 1
+align_single_line_func  = true
+align_single_line_brace = true
+nl_func_leave_one_liners = true
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.75.0/tests/config/cpp/Issue_3422-1.cfg
new file mode 100644
index 00000000..6c86f2db
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3422-1.cfg
@@ -0,0 +1,3 @@
+align_assign_span   = 1
+align_assign_thresh = 40
+align_assign_on_multi_var_defs = false
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.75.0/tests/config/cpp/Issue_3422-2.cfg
new file mode 100644
index 00000000..beb76fde
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3422-2.cfg
@@ -0,0 +1,3 @@
+align_assign_span   = 1
+align_assign_thresh = 40
+align_assign_on_multi_var_defs = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3428.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3428.cfg
new file mode 100644
index 00000000..d8796682
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3428.cfg
@@ -0,0 +1,7 @@
+indent_cpp_lambda_body         = true

+indent_cpp_lambda_only_once    = true

+

+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.75.0/tests/config/cpp/Issue_3428_2.cfg
new file mode 100644
index 00000000..26e8a8ed
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3428_2.cfg
@@ -0,0 +1,8 @@
+indent_cpp_lambda_body         = true

+indent_cpp_lambda_only_once    = true

+indent_namespace               = true

+

+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.75.0/tests/config/cpp/Issue_3428_3.cfg
new file mode 100644
index 00000000..b61cf6b5
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3428_3.cfg
@@ -0,0 +1,9 @@
+indent_cpp_lambda_body         = true

+indent_cpp_lambda_only_once    = true

+indent_namespace               = true

+indent_namespace_single_indent = true

+

+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.75.0/tests/config/cpp/Issue_3428_4.cfg
new file mode 100644
index 00000000..e0f3a865
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3428_4.cfg
@@ -0,0 +1,7 @@
+indent_cpp_lambda_body         = true

+indent_cpp_lambda_only_once    = 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.75.0/tests/config/cpp/Issue_3428_5.cfg
new file mode 100644
index 00000000..1d4c1f30
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3428_5.cfg
@@ -0,0 +1,8 @@
+indent_cpp_lambda_body         = true

+indent_cpp_lambda_only_once    = false

+indent_namespace               = true

+

+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.75.0/tests/config/cpp/Issue_3428_6.cfg
new file mode 100644
index 00000000..6b139435
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3428_6.cfg
@@ -0,0 +1,9 @@
+indent_cpp_lambda_body         = true

+indent_cpp_lambda_only_once    = false

+indent_namespace               = true

+indent_namespace_single_indent = true

+

+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.75.0/tests/config/cpp/Issue_3446.cfg
new file mode 100644
index 00000000..a66901cc
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3446.cfg
@@ -0,0 +1 @@
+nl_func_scope_name = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3448.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3448.cfg
new file mode 100644
index 00000000..77619e74
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3448.cfg
@@ -0,0 +1,22 @@
+indent_with_tabs                = 0
+indent_columns                  = 4
+indent_continue                 = 4
+indent_class                    = true
+indent_class_colon              = true
+indent_class_on_colon           = true
+indent_constr_colon             = true
+indent_ctor_init_leading        = 0
+indent_ctor_init_following      = 0
+indent_ctor_init                = -4
+indent_access_spec              = -4
+indent_before_class_colon       = -4
+nl_class_brace                  = true
+nl_class_init_args              = force
+nl_class_colon                  = force
+nl_constr_init_args             = force
+nl_constr_colon                 = force
+pos_class_colon                 = lead_force
+pos_class_comma                 = lead_force
+pos_constr_colon                = lead_force
+pos_constr_comma                = lead_force
+nl_collapse_empty_body          = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3513.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3513.cfg
new file mode 100644
index 00000000..34f93540
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3513.cfg
@@ -0,0 +1,4 @@
+nl_fcall_brace                  = force
+nl_struct_brace                 = force
+nl_fdef_brace                   = force
+nl_ds_struct_enum_close_brace   = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3546.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3546.cfg
new file mode 100644
index 00000000..56965ae8
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3546.cfg
@@ -0,0 +1,3 @@
+indent_with_tabs = 0
+indent_columns = 4
+indent_ignore_first_continue = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3552.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3552.cfg
new file mode 100644
index 00000000..f9a0eca8
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3552.cfg
@@ -0,0 +1,6 @@
+indent_with_tabs           = 0
+indent_columns             = 4
+indent_namespace           = true
+indent_class               = true
+indent_access_spec         = -4
+indent_continue_class_head = 2
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3570.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3570.cfg
new file mode 100644
index 00000000..f291c20d
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3570.cfg
@@ -0,0 +1,3 @@
+indent_class                 = true
+indent_paren_after_func_def  = true
+indent_paren_after_func_decl = true
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.75.0/tests/config/cpp/Issue_3576-a.cfg
new file mode 100644
index 00000000..052cf16f
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3576-a.cfg
@@ -0,0 +1,2 @@
+indent_paren_after_func_def   = true
+use_indent_continue_only_once = true
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.75.0/tests/config/cpp/Issue_3576-b.cfg
new file mode 100644
index 00000000..2b187f20
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3576-b.cfg
@@ -0,0 +1,2 @@
+indent_paren_after_func_def  = true
+indent_ignore_first_continue = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3604.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3604.cfg
new file mode 100644
index 00000000..5806b371
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_3604.cfg
@@ -0,0 +1 @@
+mod_enum_last_comma = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_750.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_750.cfg
new file mode 100644
index 00000000..b22aff36
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_750.cfg
@@ -0,0 +1,9 @@
+indent_class                = true
+
+align_var_def_span          = 1
+align_var_def_thresh        = 0
+align_var_def_gap           = 0
+
+align_assign_span           = 1
+align_braced_init_list_span = 1
+align_var_class_span        = 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_931.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_931.cfg
index 45879950..45879950 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_931.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_931.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_995-do.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_995-do.cfg
index ba4e6387..ba4e6387 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Issue_995-do.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Issue_995-do.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/NewLine-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/NewLine-f.cfg
index 8da1e530..8da1e530 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/NewLine-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/NewLine-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/NewLine-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/NewLine-r.cfg
index 329f5112..329f5112 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/NewLine-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/NewLine-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/STUCK_macro-difficulties.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/STUCK_macro-difficulties.cfg
index c7ce0fd8..c7ce0fd8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/STUCK_macro-difficulties.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/STUCK_macro-difficulties.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/U02-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/U02-Cpp.cfg
index e8b4846a..e8b4846a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/U02-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/U02-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/U03-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/U03-Cpp.cfg
index d0f33089..d0f33089 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/U03-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/U03-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/U04-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/U04-Cpp.cfg
index 75f78b42..75f78b42 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/U04-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/U04-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/U05-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/U05-Cpp.cfg
index ac01c51c..ac01c51c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/U05-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/U05-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/U06-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/U06-Cpp.cfg
index 55fcc716..55fcc716 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/U06-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/U06-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/U07-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/U07-Cpp.cfg
index 9cee7fef..9cee7fef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/U07-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/U07-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/U16-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/U16-Cpp.cfg
index 425ee375..425ee375 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/U16-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/U16-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/U18-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/U18-Cpp.cfg
index 75f78b42..75f78b42 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/U18-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/U18-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/U21-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/U21-Cpp.cfg
index fd27114f..fd27114f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/U21-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/U21-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/U23-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/U23-Cpp.cfg
index 04863187..04863187 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/U23-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/U23-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/U25-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/U25-Cpp.cfg
index 75f78b42..75f78b42 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/U25-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/U25-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/U26-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/U26-Cpp.cfg
index 39c58934..39c58934 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/U26-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/U26-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/U27-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/U27-Cpp.cfg
index e8b4846a..e8b4846a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/U27-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/U27-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/U28-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/U28-Cpp.cfg
index ac01c51c..ac01c51c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/U28-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/U28-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/U29-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/U29-Cpp.cfg
index d65f6b27..d65f6b27 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/U29-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/U29-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/U30-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/U30-Cpp.cfg
index 75f78b42..75f78b42 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/U30-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/U30-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/U31-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/U31-Cpp.cfg
index bd45658a..bd45658a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/U31-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/U31-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/U33-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/U33-Cpp.cfg
index 0d78de45..0d78de45 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/U33-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/U33-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/U36-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/U36-Cpp.cfg
index b655be2c..b655be2c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/U36-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/U36-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/UNI-10496.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/UNI-10496.cfg
index 42f6ee64..42f6ee64 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/UNI-10496.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/UNI-10496.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/UNI-12046.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/UNI-12046.cfg
index 4dcd62eb..4dcd62eb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/UNI-12046.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/UNI-12046.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/UNI-1340.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/UNI-1340.cfg
index 8a43dca1..8a43dca1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/UNI-1340.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/UNI-1340.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/UNI-1344.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/UNI-1344.cfg
index 9e9937d2..9e9937d2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/UNI-1344.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/UNI-1344.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/UNI-1346.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/UNI-1346.cfg
index 4074ff52..4074ff52 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/UNI-1346.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/UNI-1346.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/UNI-1347.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/UNI-1347.cfg
index ee4173ec..ee4173ec 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/UNI-1347.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/UNI-1347.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/UNI-1350.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/UNI-1350.cfg
index 082a647f..082a647f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/UNI-1350.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/UNI-1350.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/UNI-1356.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/UNI-1356.cfg
index 948f20b6..948f20b6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/UNI-1356.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/UNI-1356.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/UNI-1358.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/UNI-1358.cfg
index 0d78de45..0d78de45 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/UNI-1358.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/UNI-1358.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/UNI-2049.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/UNI-2049.cfg
index f075ea03..f075ea03 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/UNI-2049.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/UNI-2049.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/UNI-2650.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/UNI-2650.cfg
index 46279443..46279443 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/UNI-2650.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/UNI-2650.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/UNI-2680.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/UNI-2680.cfg
index 99790699..99790699 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/UNI-2680.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/UNI-2680.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/UNI-29935.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/UNI-29935.cfg
index 28d338ee..28d338ee 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/UNI-29935.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/UNI-29935.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/UNI-30088.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/UNI-30088.cfg
index 4abe03e1..4abe03e1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/UNI-30088.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/UNI-30088.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/UNI-32657.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/UNI-32657.cfg
index cfc6c300..91e21a06 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/UNI-32657.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/UNI-32657.cfg
@@ -38,8 +38,8 @@ indent_col1_comment=false
 indent_label=-4
 indent_access_spec=-4
 indent_paren_nl=false
-indent_comma_paren=false
-indent_bool_paren=false
+indent_comma_paren=0
+indent_bool_paren=0
 indent_first_bool_expr=false
 indent_square_nl=false
 indent_preserve_sql=false
@@ -223,7 +223,7 @@ nl_property_brace=force
 eat_blanks_after_open_brace=true
 eat_blanks_before_close_brace=true
 nl_after_return=false
-mod_full_brace_if_chain=false
+mod_full_brace_if_chain=0
 mod_paren_on_return=ignore
 mod_pawn_semicolon=false
 mod_full_paren_if_bool=false
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Uncrustify.Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Uncrustify.Cpp.cfg
index 89855c3c..89855c3c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/Uncrustify.Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/Uncrustify.Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/al.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/al.cfg
index 669cef45..669cef45 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/al.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/al.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align-330.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align-330.cfg
index 7a2ce116..7a2ce116 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align-330.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align-330.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_assign_decl_func-0.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_assign_decl_func-0.cfg
index fee6fea1..fee6fea1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_assign_decl_func-0.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_assign_decl_func-0.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_assign_decl_func-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_assign_decl_func-1.cfg
index 2175c1e2..2175c1e2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_assign_decl_func-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_assign_decl_func-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_assign_decl_func-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_assign_decl_func-2.cfg
index 9e3a2779..9e3a2779 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_assign_decl_func-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_assign_decl_func-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_assign_func_proto_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_assign_func_proto_1.cfg
index 378039a7..378039a7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_assign_func_proto_1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_assign_func_proto_1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_assign_span-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_assign_span-1.cfg
index fda177f9..fda177f9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_assign_span-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_assign_span-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_asterisk_after_type_cast.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_asterisk_after_type_cast.cfg
index 4a781152..4a781152 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_asterisk_after_type_cast.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_asterisk_after_type_cast.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_class-constr.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_class-constr.cfg
index 8824d97a..8824d97a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_class-constr.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_class-constr.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_continuation_left_shift.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_continuation_left_shift.cfg
index 767f2adc..767f2adc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_continuation_left_shift.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_continuation_left_shift.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_default_after_override.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_default_after_override.cfg
index 7373e8d1..7373e8d1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_default_after_override.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_default_after_override.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_eigen_comma_init.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_eigen_comma_init.cfg
index a798cc5f..a798cc5f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_eigen_comma_init.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_eigen_comma_init.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_fcall-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_fcall-2.cfg
index 795a16e9..795a16e9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_fcall-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_fcall-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_fcall.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_fcall.cfg
index 2df9b2e0..2df9b2e0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_fcall.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_fcall.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_func_params-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_func_params-t.cfg
index 6072ca53..6072ca53 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_func_params-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_func_params-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_func_params_gap.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_func_params_gap.cfg
index 314c2e1b..314c2e1b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_func_params_gap.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_func_params_gap.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_func_params_span-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_func_params_span-1.cfg
index 5695e5a4..5695e5a4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_func_params_span-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_func_params_span-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_func_params_thresh_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_func_params_thresh_1.cfg
index acae1cc7..acae1cc7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_func_params_thresh_1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_func_params_thresh_1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_func_params_thresh_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_func_params_thresh_2.cfg
index 355705f1..355705f1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_func_params_thresh_2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_func_params_thresh_2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_func_params_thresh_3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_func_params_thresh_3.cfg
index 48912fce..48912fce 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_func_params_thresh_3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_func_params_thresh_3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_func_params_thresh_4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_func_params_thresh_4.cfg
index 284a5ee8..284a5ee8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_func_params_thresh_4.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_func_params_thresh_4.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_func_proto_thresh_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_func_proto_thresh_1.cfg
index b6a93b5b..b6a93b5b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_func_proto_thresh_1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_func_proto_thresh_1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_func_proto_thresh_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_func_proto_thresh_2.cfg
index 363ea06c..363ea06c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_func_proto_thresh_2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_func_proto_thresh_2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_func_proto_thresh_3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_func_proto_thresh_3.cfg
index 3a5ac106..3a5ac106 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_func_proto_thresh_3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_func_proto_thresh_3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_func_proto_thresh_4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_func_proto_thresh_4.cfg
index 6b084d86..6b084d86 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_func_proto_thresh_4.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_func_proto_thresh_4.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_func_proto_thresh_5.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_func_proto_thresh_5.cfg
index 8a8dff6b..8a8dff6b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_func_proto_thresh_5.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_func_proto_thresh_5.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_right_comment.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_right_comment.cfg
index 1551b394..1551b394 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_right_comment.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_right_comment.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_var_class_span-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_var_class_span-1.cfg
index a1b4122c..a1b4122c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_var_class_span-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_var_class_span-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_var_def_thresh_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_var_def_thresh_1.cfg
index 5cadc402..5cadc402 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_var_def_thresh_1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_var_def_thresh_1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_var_def_thresh_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_var_def_thresh_2.cfg
index bb9be8ad..bb9be8ad 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_var_def_thresh_2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_var_def_thresh_2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_var_def_thresh_3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_var_def_thresh_3.cfg
index edb77f43..edb77f43 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/align_var_def_thresh_3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/align_var_def_thresh_3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/anonymous_enum.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/anonymous_enum.cfg
index 503a2cb5..503a2cb5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/anonymous_enum.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.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.75.0/tests/config/cpp/arith-vs-byref.cfg
new file mode 100644
index 00000000..006060ca
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/arith-vs-byref.cfg
@@ -0,0 +1,6 @@
+sp_arith                     = force
+sp_before_byref              = remove
+sp_after_byref               = remove
+
+# Similar to the issues tested by arith-vs-ptr this test is checks
+#   if the '&' opertor is properly recognized as 'arith' and not 'byref' in some contexts
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/arith-vs-ptr.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/arith-vs-ptr.cfg
index 60c8d23c..60c8d23c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/arith-vs-ptr.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/arith-vs-ptr.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/avalon.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/avalon.cfg
index aef9ed44..aef9ed44 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/avalon.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/avalon.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/avalon2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/avalon2.cfg
index 97783b66..97783b66 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/avalon2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/avalon2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/avalon3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/avalon3.cfg
index 30f50cb7..30f50cb7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/avalon3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/avalon3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/avalon4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/avalon4.cfg
index 1577d2b3..1577d2b3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/avalon4.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/avalon4.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_001.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_001.cfg
index e1bce1fa..e1bce1fa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_001.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_001.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_003.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_003.cfg
index b6dffc7c..b6dffc7c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_003.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_003.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_004.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_004.cfg
index fa3c13c3..fa3c13c3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_004.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_004.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_005.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_005.cfg
index 6784d5f8..6784d5f8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_005.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_005.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_006.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_006.cfg
index 2767d063..2767d063 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_006.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_006.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_008.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_008.cfg
index 432f7093..432f7093 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_008.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_008.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_009.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_009.cfg
index 314bb848..314bb848 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_009.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_009.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_010.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_010.cfg
index c4536db3..c4536db3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_010.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_010.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_012.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_012.cfg
index 805f96ed..805f96ed 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_012.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_012.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_013.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_013.cfg
index be76962d..be76962d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_013.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_013.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_014.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_014.cfg
index 33c1e6e4..33c1e6e4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_014.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_014.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_015.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_015.cfg
index 0e139678..0e139678 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_015.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_015.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_016.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_016.cfg
index 9b863f1d..9b863f1d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_016.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_016.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_017.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_017.cfg
index a4acecc3..a4acecc3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_017.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_017.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_018.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_018.cfg
index c8dd1ab6..c8dd1ab6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_018.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_018.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_020.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_020.cfg
index 8cd270ef..8cd270ef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_020.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_020.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_021.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_021.cfg
index e8024afb..e8024afb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_021.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_021.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_022.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_022.cfg
index e258b9a3..e258b9a3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_022.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_022.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_023.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_023.cfg
index acb9b682..acb9b682 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_023.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_023.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_024.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_024.cfg
index 37954be0..37954be0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_024.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_024.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_026.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_026.cfg
index f7008ee3..f7008ee3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_026.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_026.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_027.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_027.cfg
index fbbdb06a..fbbdb06a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_027.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_027.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_028.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_028.cfg
index 62848095..62848095 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_028.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_028.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_029.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_029.cfg
index a0c2e18c..a0c2e18c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_029.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_029.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_030.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_030.cfg
index 8663afd4..8663afd4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_030.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_030.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_031.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_031.cfg
index fe2182c9..fe2182c9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ben_031.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ben_031.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1001.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1001.cfg
index d8255ca7..d8255ca7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1001.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1001.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1003.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1003.cfg
index 242b3a13..242b3a13 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1003.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1003.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1004.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1004.cfg
index f479bada..f479bada 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1004.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1004.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1020.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1020.cfg
index 51643e87..51643e87 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1020.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1020.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1108.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1108.cfg
index 741ba79d..741ba79d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1108.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1108.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1160.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1160.cfg
index afc7030d..afc7030d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1160.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1160.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1161.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1161.cfg
index c7977cf0..c7977cf0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1161.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1161.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1169.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1169.cfg
index 0615b330..0615b330 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1169.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1169.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1170.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1170.cfg
index 9171180b..9171180b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1170.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1170.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1236.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1236.cfg
index 0c60d5be..0c60d5be 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1236.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.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.75.0/tests/config/cpp/bug_1296-F.cfg
new file mode 100644
index 00000000..613f85d5
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1296-F.cfg
@@ -0,0 +1,2 @@
+indent_with_tabs            = 0
+indent_cpp_lambda_only_once = false
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1296.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1296-T.cfg
index 82a970ff..82a970ff 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1296.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1296-T.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1315.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1315.cfg
index 49a716d0..49a716d0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1315.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1315.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1324.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1324.cfg
index 289ca9d5..289ca9d5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1324.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1324.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1340.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1340.cfg
index 6ec6568e..6ec6568e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1340.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1340.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1349.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1349.cfg
index abe4253c..abe4253c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1349.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1349.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1395.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1395.cfg
index c2bed595..c2bed595 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1395.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1395.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1402.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1402.cfg
index e69de29b..e69de29b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1402.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1402.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1403.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1403.cfg
index 8e10acd4..8e10acd4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1403.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1403.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1432.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1432.cfg
index 4ae27492..4ae27492 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1432.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1432.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1439.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1439.cfg
index f625249d..f625249d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1439.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1439.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1452.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1452.cfg
index dbd0e9b4..dbd0e9b4 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1452.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1452.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1649.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1649.cfg
index 472975ab..472975ab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1649.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1649.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1689.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1689.cfg
index 7c1462f1..7c1462f1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1689.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1689.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1691.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1691.cfg
index 03600f80..03600f80 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1691.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1691.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1717.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1717.cfg
index a6c7322f..a6c7322f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1717.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1717.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1758-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1758-f.cfg
index 90d17ebd..90d17ebd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1758-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1758-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1854.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1854.cfg
index ebc5c5e3..ebc5c5e3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1854.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1854.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1862.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1862.cfg
index c23b9027..c23b9027 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_1862.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_1862.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_2285.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_2285.cfg
index fa3b437b..fa3b437b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_2285.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_2285.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_2322.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_2322.cfg
index 9743a828..a16bec3d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_2322.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_2322.cfg
@@ -2,7 +2,7 @@ indent_columns          = 4
 output_tab_size         = 4
 indent_with_tabs        = 0
 sp_while_paren_open     = force
-mod_full_brace_if_chain = true
+mod_full_brace_if_chain = 1
 
 mod_full_brace_for      = remove
 mod_full_brace_if       = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_2371.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_2371.cfg
index 1f207beb..1f207beb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_2371.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_2371.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_2402.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_2402.cfg
index 85c3a458..85c3a458 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_2402.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_2402.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_2433_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_2433_1.cfg
index 17fd04a4..17fd04a4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_2433_1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_2433_1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_2433_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_2433_2.cfg
index 89f0b916..89f0b916 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_2433_2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_2433_2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_472.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_472.cfg
index 68d6f99b..68d6f99b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_472.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_472.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_488.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_488.cfg
index 0319ef54..0319ef54 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_488.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_488.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_633.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_633.cfg
index 61833884..61833884 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_633.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_633.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_657.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_657.cfg
index 109e3750..109e3750 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_657.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_657.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_664.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_664.cfg
index 3799bd89..3799bd89 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_664.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_664.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_670.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_670.cfg
index fe57c0af..fe57c0af 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_670.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_670.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_858-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_858-f.cfg
index 1f03334a..1f03334a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_858-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_858-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_858-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_858-r.cfg
index 82e3cb22..82e3cb22 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_858-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_858-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_i_322.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_i_322.cfg
index e49770be..e49770be 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_i_322.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_i_322.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_i_359.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_i_359.cfg
index ab9c63fb..ab9c63fb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_i_359.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_i_359.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_i_405.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_i_405.cfg
index 0bdfce99..0bdfce99 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_i_405.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_i_405.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_i_409-create.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_i_409-create.cfg
index ec0f6ca4..ec0f6ca4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_i_409-create.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_i_409-create.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_i_409-split.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_i_409-split.cfg
index 9e272905..9e272905 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_i_409-split.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_i_409-split.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_i_478.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_i_478.cfg
index 18db9a6d..18db9a6d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_i_478.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_i_478.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_i_663.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_i_663.cfg
index 9d780855..9d780855 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_i_663.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_i_663.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_i_666.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_i_666.cfg
index 6acabd49..6acabd49 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_i_666.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_i_666.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_i_752.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_i_752.cfg
index 93191dc0..93191dc0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/bug_i_752.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/bug_i_752.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/byref-center.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/byref-center.cfg
index 5d370736..5d370736 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/byref-center.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/byref-center.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/byref-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/byref-f.cfg
index a50d0c1a..a50d0c1a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/byref-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/byref-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/byref-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/byref-i.cfg
index 9d15782c..9d15782c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/byref-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/byref-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/byref-ir.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/byref-ir.cfg
index df89f6e3..df89f6e3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/byref-ir.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/byref-ir.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/byref-left.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/byref-left.cfg
index d28c4e5e..d28c4e5e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/byref-left.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/byref-left.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/byref-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/byref-r.cfg
index 505f9dc0..505f9dc0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/byref-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/byref-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/byref-right.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/byref-right.cfg
index 82fb7287..82fb7287 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/byref-right.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/byref-right.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/cast.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/cast.cfg
index feac5350..feac5350 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/cast.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/cast.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/class-colon-pos-eol-add.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/class-colon-pos-eol-add.cfg
index fb14545e..fb14545e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/class-colon-pos-eol-add.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/class-colon-pos-eol-add.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/class-colon-pos-eol.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/class-colon-pos-eol.cfg
index ddb0e11b..ddb0e11b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/class-colon-pos-eol.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/class-colon-pos-eol.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/class-colon-pos-sol-add.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/class-colon-pos-sol-add.cfg
index 960dade0..960dade0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/class-colon-pos-sol-add.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/class-colon-pos-sol-add.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/class-colon-pos-sol.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/class-colon-pos-sol.cfg
index a57e30d3..a57e30d3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/class-colon-pos-sol.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/class-colon-pos-sol.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/class-nl_func-add.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/class-nl_func-add.cfg
index d60ffa9b..d60ffa9b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/class-nl_func-add.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/class-nl_func-add.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/class-nl_func-add2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/class-nl_func-add2.cfg
index f8a35e0d..f8a35e0d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/class-nl_func-add2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/class-nl_func-add2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/class-nl_func-del.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/class-nl_func-del.cfg
index b90f2f75..b90f2f75 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/class-nl_func-del.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/class-nl_func-del.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/class-on-colon-indent.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/class-on-colon-indent.cfg
index 86fec34f..86fec34f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/class-on-colon-indent.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/class-on-colon-indent.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/cmt_convert_tab_to_spaces-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/cmt_convert_tab_to_spaces-t.cfg
index 98b3bcf3..98b3bcf3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/cmt_convert_tab_to_spaces-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/cmt_convert_tab_to_spaces-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/cmt_cpp_to_c-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/cmt_cpp_to_c-t.cfg
index 85c3fec8..85c3fec8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/cmt_cpp_to_c-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/cmt_cpp_to_c-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/cmt_indent-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/cmt_indent-1.cfg
index 8d0a8a16..8d0a8a16 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/cmt_indent-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/cmt_indent-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/cmt_indent-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/cmt_indent-2.cfg
index fd9b9d25..fd9b9d25 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/cmt_indent-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/cmt_indent-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/cmt_indent-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/cmt_indent-3.cfg
index c8e6ce41..c8e6ce41 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/cmt_indent-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/cmt_indent-3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/cmt_multi_first_len_minimum-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/cmt_multi_first_len_minimum-1.cfg
index e7d99a98..e7d99a98 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/cmt_multi_first_len_minimum-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/cmt_multi_first_len_minimum-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/cmt_trailing_single_line_c_to_cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/cmt_trailing_single_line_c_to_cpp.cfg
index 0754b419..0754b419 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/cmt_trailing_single_line_c_to_cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/cmt_trailing_single_line_c_to_cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/code_width-70.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/code_width-70.cfg
index 07c25e5c..07c25e5c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/code_width-70.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/code_width-70.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/comma-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/comma-f.cfg
index 29eb50b5..29eb50b5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/comma-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/comma-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/comma-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/comma-i.cfg
index 2dad1026..2dad1026 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/comma-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/comma-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/comma-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/comma-r.cfg
index 5194e6da..5194e6da 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/comma-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/comma-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/const_throw.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/const_throw.cfg
index 41b3ecef..41b3ecef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/const_throw.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/const_throw.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/constr_colon.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/constr_colon.cfg
index 3397573a..3397573a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/constr_colon.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/constr_colon.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/cpp17.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/cpp17.cfg
index 1865e0c8..1865e0c8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/cpp17.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/cpp17.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/cu.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/cu.cfg
index 40dff3e5..40dff3e5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/cu.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/cu.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/custom-open.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/custom-open.cfg
index 5b4539e2..5b4539e2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/custom-open.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/custom-open.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/custom-open2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/custom-open2.cfg
index 38e507b5..38e507b5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/custom-open2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/custom-open2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/disable_nl_cont.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/disable_nl_cont.cfg
index 9ea9350f..9ea9350f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/disable_nl_cont.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/disable_nl_cont.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/dont-detab-strings.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/dont-detab-strings.cfg
index 9e36729d..9e36729d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/dont-detab-strings.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/dont-detab-strings.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/dont-process-defines.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/dont-process-defines.cfg
index bfb66ec8..bfb66ec8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/dont-process-defines.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/dont-process-defines.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/eat_blanks_after_codewidth.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/eat_blanks_after_codewidth.cfg
index 1b24a7ac..1b24a7ac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/eat_blanks_after_codewidth.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/eat_blanks_after_codewidth.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ellipsis-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ellipsis-i.cfg
index 3b4d8ec6..3b4d8ec6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ellipsis-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ellipsis-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/enum.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/enum.cfg
index b39c0840..b39c0840 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/enum.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/enum.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/enum_comma-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/enum_comma-3.cfg
index 7fe548e2..7fe548e2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/enum_comma-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/enum_comma-3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/enum_comma-4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/enum_comma-4.cfg
index d42e6b1e..d42e6b1e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/enum_comma-4.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/enum_comma-4.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/enum_comma-6.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/enum_comma-6.cfg
index 6d4279ec..6d4279ec 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/enum_comma-6.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/enum_comma-6.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/enum_comment_wrap.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/enum_comment_wrap.cfg
index e42e00a1..e42e00a1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/enum_comment_wrap.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/enum_comment_wrap.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/extern_func.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/extern_func.cfg
index a6135e8a..a6135e8a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/extern_func.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/extern_func.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/footer.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/footer.txt
index 1d2f941f..1d2f941f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/footer.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/footer.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/func_class.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/func_class.cfg
index 7f01b7be..7f01b7be 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/func_class.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/func_class.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/func_param.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/func_param.cfg
index 81ce43a4..9162fd6d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/func_param.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/func_param.cfg
@@ -1,6 +1,7 @@
 sp_paren_paren                  = remove
 sp_after_ptr_star               = remove
 sp_ptr_star_func_var            = remove
+sp_ptr_star_func_type           = remove
 sp_func_proto_paren             = remove
 sp_inside_fparen                = remove
 sp_after_tparen_close           = remove
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.75.0/tests/config/cpp/functype_param-f.cfg
new file mode 100644
index 00000000..a870e0c5
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/functype_param-f.cfg
@@ -0,0 +1,3 @@
+sp_after_byref    = force
+sp_after_ptr_star = force
+sp_byref_paren    = force
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.75.0/tests/config/cpp/functype_param-r.cfg
new file mode 100644
index 00000000..9b70479a
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/functype_param-r.cfg
@@ -0,0 +1,3 @@
+sp_after_byref    = remove
+sp_after_ptr_star = remove
+sp_byref_paren    = remove
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
new file mode 100644
index 00000000..e6c98a53
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/i1516.cfg
@@ -0,0 +1,4 @@
+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.74.0/tests/config/cpp/i1536.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/i1536.cfg
index 5506f68c..5506f68c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/i1536.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/i1536.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/i1536.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/i1536.txt
index d34c497d..d34c497d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/i1536.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/i1536.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/i1768.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/i1768.cfg
index 9174483a..9174483a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/i1768.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/i1768.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/i683.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/i683.cfg
index 2b6edefe..2b6edefe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/i683.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.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.75.0/tests/config/cpp/if_chain_braces_2.cfg
new file mode 100644
index 00000000..6547c095
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/if_chain_braces_2.cfg
@@ -0,0 +1,2 @@
+mod_full_brace_if_chain         = 1
+mod_full_brace_if_chain_only    = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_braces_no.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_braces_no.cfg
index 24ca060b..24ca060b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_braces_no.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_braces_no.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_class-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_class-t.cfg
index 78320e8a..78320e8a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_class-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_class-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_class-t_columns-4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_class-t_columns-4.cfg
index 5184fc9a..5184fc9a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_class-t_columns-4.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_class-t_columns-4.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_columns-11.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_columns-11.cfg
index 15cef67e..15cef67e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_columns-11.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_columns-11.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_columns-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_columns-2.cfg
index f33cb665..f33cb665 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_columns-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_columns-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_columns-4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_columns-4.cfg
index f4f5183a..f4f5183a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_columns-4.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.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.75.0/tests/config/cpp/indent_comma_brace.cfg
new file mode 100644
index 00000000..19c3b161
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_comma_brace.cfg
@@ -0,0 +1,4 @@
+code_width                      = 60
+indent_columns                  = 4
+indent_comma_brace              = 1
+indent_with_tabs                = 0
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_comment_align_thresh_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_comment_align_thresh_2.cfg
index 2f5d5cab..2f5d5cab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_comment_align_thresh_2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_comment_align_thresh_2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_ctor_init.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_ctor_init.cfg
index cb1cef12..cb1cef12 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_ctor_init.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_ctor_init.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_ctor_init_following.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_ctor_init_following.cfg
index 140e8f17..140e8f17 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_ctor_init_following.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_ctor_init_following.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_ctor_init_leading.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_ctor_init_leading.cfg
index ce8fb22f..ce8fb22f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_ctor_init_leading.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_ctor_init_leading.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_ctor_members_twice.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_ctor_members_twice.cfg
index 82c708d4..82c708d4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_ctor_members_twice.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_ctor_members_twice.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_else_if-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_else_if-t.cfg
index 2dcd9a57..2dcd9a57 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_else_if-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_else_if-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_first_for_expr-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_first_for_expr-t.cfg
index ff68e85c..ff68e85c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_first_for_expr-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.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.75.0/tests/config/cpp/indent_func_proto_param-t.cfg
new file mode 100644
index 00000000..04301ff7
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_func_proto_param-t.cfg
@@ -0,0 +1 @@
+indent_func_proto_param = true
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.75.0/tests/config/cpp/indent_ignore_before_class_colon-t.cfg
new file mode 100644
index 00000000..6564f4d0
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_ignore_before_class_colon-t.cfg
@@ -0,0 +1 @@
+indent_ignore_before_class_colon = true
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.75.0/tests/config/cpp/indent_ignore_before_constr_colon-t.cfg
new file mode 100644
index 00000000..6e9fa193
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_ignore_before_constr_colon-t.cfg
@@ -0,0 +1 @@
+indent_ignore_before_constr_colon = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_namespace-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_namespace-t.cfg
index 90bbdaec..90bbdaec 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_namespace-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.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.75.0/tests/config/cpp/indent_namespace_inner_only.cfg
new file mode 100644
index 00000000..bb715758
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_namespace_inner_only.cfg
@@ -0,0 +1,2 @@
+indent_namespace = true
+indent_namespace_inner_only = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_namespace_single_indent.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_namespace_single_indent.cfg
index 9f66fea4..9f66fea4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_namespace_single_indent.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_namespace_single_indent.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_off_after_return.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_off_after_return.cfg
index 077c5f94..077c5f94 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_off_after_return.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_off_after_return.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_once.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_once.cfg
index 013985b9..013985b9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_once.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_once.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_param.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_param.cfg
index 07d98897..07d98897 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_param.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_param.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_paren_after_func_call-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_paren_after_func_call-t.cfg
index eafffebc..eafffebc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_paren_after_func_call-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_paren_after_func_call-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_paren_after_func_decl-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_paren_after_func_decl-t.cfg
index c4db2ffe..c4db2ffe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_paren_after_func_decl-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_paren_after_func_decl-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_paren_after_func_def-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_paren_after_func_def-t.cfg
index 5d2895e9..5d2895e9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_paren_after_func_def-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.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.75.0/tests/config/cpp/indent_paren_close_0.cfg
new file mode 100644
index 00000000..b14f0bc5
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_paren_close_0.cfg
@@ -0,0 +1 @@
+indent_paren_close = 0

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.75.0/tests/config/cpp/indent_paren_close_1.cfg
new file mode 100644
index 00000000..06795707
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_paren_close_1.cfg
@@ -0,0 +1 @@
+indent_paren_close = 1

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.75.0/tests/config/cpp/indent_paren_close_2.cfg
new file mode 100644
index 00000000..b78b2995
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_paren_close_2.cfg
@@ -0,0 +1 @@
+indent_paren_close = 2

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_semicolon_for_paren-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_semicolon_for_paren-t.cfg
index 6b49dbd6..6b49dbd6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_semicolon_for_paren-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.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.75.0/tests/config/cpp/indent_shift.cfg
new file mode 100644
index 00000000..481d7d07
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_shift.cfg
@@ -0,0 +1,4 @@
+indent_columns                  = 4
+indent_continue                 = 4
+indent_shift                    = 1
+align_left_shift                = false
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_var_def_cont-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_var_def_cont-t.cfg
index f439a00b..f439a00b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_var_def_cont-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_var_def_cont-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_with_tabs-0.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_with_tabs-0.cfg
index bd2c3a08..bd2c3a08 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/indent_with_tabs-0.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/indent_with_tabs-0.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/initlist_leading_commas.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/initlist_leading_commas.cfg
index ebd35547..ebd35547 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/initlist_leading_commas.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/initlist_leading_commas.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/interface-keyword-in-cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/interface-keyword-in-cpp.cfg
index cbbf215b..cbbf215b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/interface-keyword-in-cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/interface-keyword-in-cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/issue_1778.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_1778.cfg
index 2f4bd642..2f4bd642 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/issue_1778.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_1778.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/issue_1782.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_1782.cfg
index 6d50bfeb..6d50bfeb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/issue_1782.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_1782.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/issue_1804.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_1804.cfg
index 4c424b89..4c424b89 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/issue_1804.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_1804.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/issue_1887.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_1887.cfg
index 956ea6a9..956ea6a9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/issue_1887.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_1887.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/issue_1916.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_1916.cfg
index 414a4a96..414a4a96 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/issue_1916.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_1916.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/issue_1985.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_1985.cfg
index 3be58c29..3be58c29 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/issue_1985.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_1985.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/issue_1997.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_1997.cfg
index 1f79d36e..1f79d36e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/issue_1997.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_1997.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/issue_2124-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_2124-1.cfg
index e69de29b..e69de29b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/issue_2124-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.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.75.0/tests/config/cpp/issue_2124-2.cfg
new file mode 100644
index 00000000..37eeb5f2
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_2124-2.cfg
@@ -0,0 +1,2 @@
+mod_full_brace_if_chain         = 1
+mod_full_brace_nl               = 1
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/issue_2209.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_2209.cfg
index 414a7273..414a7273 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/issue_2209.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_2209.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/issue_2623_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_2623_1.cfg
index 56ab3a56..56ab3a56 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/issue_2623_1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_2623_1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/issue_2623_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_2623_2.cfg
index 2848fb59..2848fb59 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/issue_2623_2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_2623_2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/issue_2623_3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_2623_3.cfg
index 52d17555..52d17555 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/issue_2623_3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_2623_3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/issue_3116-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_3116-2.cfg
index f26ef61e..f26ef61e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/issue_3116-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_3116-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/issue_3116.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_3116.cfg
index 034f2697..034f2697 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/issue_3116.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_3116.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/issue_3378.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_3378.cfg
index 8ecc9f2f..8ecc9f2f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/issue_3378.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_3378.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/issue_564.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_564.cfg
index d1496108..d1496108 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/issue_564.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_564.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/issue_574-i-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_574-i-a.cfg
index 24a1a182..24a1a182 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/issue_574-i-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_574-i-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/issue_574-i-b.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_574-i-b.cfg
index b61ac3e2..b61ac3e2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/issue_574-i-b.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_574-i-b.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/issue_574-i-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_574-i-i.cfg
index c0177cb1..c0177cb1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/issue_574-i-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_574-i-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/issue_574.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_574.cfg
index 925ee5fe..925ee5fe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/issue_574.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/issue_574.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/kdepim2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/kdepim2.cfg
index 18b12bbe..18b12bbe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/kdepim2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/kdepim2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/kdepim3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/kdepim3.cfg
index 0fe42133..0fe42133 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/kdepim3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/kdepim3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/kdepim5.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/kdepim5.cfg
index 56a1b3da..56a1b3da 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/kdepim5.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/kdepim5.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/lambda1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/lambda1.cfg
index c0fbc795..c0fbc795 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/lambda1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/lambda1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/lambda2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/lambda2.cfg
index 9f698209..9f698209 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/lambda2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/lambda2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/lambda3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/lambda3.cfg
index ffed35eb..ffed35eb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/lambda3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.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.75.0/tests/config/cpp/lambda4.cfg
new file mode 100644
index 00000000..63a99010
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/lambda4.cfg
@@ -0,0 +1,20 @@
+sp_arith                        = force
+sp_assign                       = force
+sp_cpp_lambda_assign            = remove
+sp_cpp_lambda_square_paren      = force
+sp_inside_paren                 = remove
+sp_before_ptr_star              = force
+sp_after_ptr_star               = remove
+sp_before_byref                 = remove
+sp_inside_braces                = force
+sp_fparen_brace                 = force
+indent_columns                  = 3
+indent_with_tabs                = 0
+nl_cpp_lambda_leave_one_liners  = true
+nl_cpp_ldef_brace               = remove
+eat_blanks_before_close_brace   = true
+mod_paren_on_return             = add
+
+# Specific testing of the following two settings
+indent_cpp_lambda_body          = true
+indent_continue                 = 4        # number
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/lambda_in_one_liner.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/lambda_in_one_liner.cfg
index 7b61e767..7b61e767 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/lambda_in_one_liner.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/lambda_in_one_liner.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/lineEndings-to-Mac.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/lineEndings-to-Mac.cfg
index d8b41944..d8b41944 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/lineEndings-to-Mac.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/lineEndings-to-Mac.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/lineEndings-to-Unix.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/lineEndings-to-Unix.cfg
index e6cf9411..e6cf9411 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/lineEndings-to-Unix.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/lineEndings-to-Unix.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/lineEndings-to-Win.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/lineEndings-to-Win.cfg
index cb40d365..cb40d365 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/lineEndings-to-Win.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/lineEndings-to-Win.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/long_br_cmt.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/long_br_cmt.cfg
index f66ee7c7..f66ee7c7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/long_br_cmt.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/long_br_cmt.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/long_namespace.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/long_namespace.cfg
index 74f99a18..74f99a18 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/long_namespace.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/long_namespace.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/mod_add_long_namespace_closebrace_comment-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/mod_add_long_namespace_closebrace_comment-1.cfg
index a94f5a62..a94f5a62 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/mod_add_long_namespace_closebrace_comment-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.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.75.0/tests/config/cpp/mod_full_brace_if_chain-1.cfg
new file mode 100644
index 00000000..a0b0f5d3
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/mod_full_brace_if_chain-1.cfg
@@ -0,0 +1 @@
+mod_full_brace_if_chain         = 1
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.75.0/tests/config/cpp/mod_full_brace_if_chain-2.cfg
new file mode 100644
index 00000000..c78f179b
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/mod_full_brace_if_chain-2.cfg
@@ -0,0 +1 @@
+mod_full_brace_if_chain         = 2
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.75.0/tests/config/cpp/mod_full_brace_if_chain-3.cfg
new file mode 100644
index 00000000..dd552dd0
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/mod_full_brace_if_chain-3.cfg
@@ -0,0 +1 @@
+mod_full_brace_if_chain         = 3
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/mod_remove_empty_return-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/mod_remove_empty_return-t.cfg
index 3e1bcd1f..3e1bcd1f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/mod_remove_empty_return-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/mod_remove_empty_return-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/mod_remove_extra_semicolon-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/mod_remove_extra_semicolon-t.cfg
index 0f2d5246..0f2d5246 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/mod_remove_extra_semicolon-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/mod_remove_extra_semicolon-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/multi_line_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/multi_line_1.cfg
index fe15ff0a..fe15ff0a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/multi_line_1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/multi_line_1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/multi_line_10.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/multi_line_10.cfg
index e5b917e8..e5b917e8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/multi_line_10.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/multi_line_10.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/multi_line_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/multi_line_2.cfg
index b4063fd3..b4063fd3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/multi_line_2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/multi_line_2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/multi_line_3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/multi_line_3.cfg
index d1c40d07..d1c40d07 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/multi_line_3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/multi_line_3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/multi_line_4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/multi_line_4.cfg
index 651b4823..651b4823 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/multi_line_4.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/multi_line_4.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/multi_line_5.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/multi_line_5.cfg
index 94140b21..94140b21 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/multi_line_5.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/multi_line_5.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/multi_line_6.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/multi_line_6.cfg
index 4fd7a077..4fd7a077 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/multi_line_6.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/multi_line_6.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/multi_line_7.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/multi_line_7.cfg
index 4ee5733c..4ee5733c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/multi_line_7.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/multi_line_7.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/multi_line_8.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/multi_line_8.cfg
index 5d6d9c63..5d6d9c63 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/multi_line_8.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/multi_line_8.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/multi_line_9.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/multi_line_9.cfg
index be9a43e3..be9a43e3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/multi_line_9.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/multi_line_9.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nSolve.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nSolve.cfg
index 6cc6fc27..6cc6fc27 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nSolve.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nSolve.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/negative_indent.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/negative_indent.cfg
index 39b1b007..39b1b007 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/negative_indent.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/negative_indent.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/new_op_a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/new_op_a.cfg
index d7501092..d7501092 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/new_op_a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/new_op_a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/new_op_f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/new_op_f.cfg
index 16784899..16784899 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/new_op_f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/new_op_f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/new_op_paren_open_close.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/new_op_paren_open_close.cfg
index 789c7abe..789c7abe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/new_op_paren_open_close.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/new_op_paren_open_close.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/new_op_r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/new_op_r.cfg
index b72cd2ae..b72cd2ae 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/new_op_r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/new_op_r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl-brAfter-fcallParen.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl-brAfter-fcallParen.cfg
index 6a83f800..6a83f800 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl-brAfter-fcallParen.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl-brAfter-fcallParen.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_access_spec.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_access_spec.cfg
index a5d98c44..a5d98c44 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_access_spec.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_access_spec.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_after_func_body-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_after_func_body-2.cfg
index 9c9e7d57..9c9e7d57 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_after_func_body-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_after_func_body-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_after_func_body.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_after_func_body.cfg
index 68633b6d..68633b6d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_after_func_body.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_after_func_body.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_after_func_class_proto-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_after_func_class_proto-3.cfg
index 87b84e91..87b84e91 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_after_func_class_proto-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_after_func_class_proto-3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_after_func_proto-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_after_func_proto-3.cfg
index c9bc1f45..c9bc1f45 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_after_func_proto-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_after_func_proto-3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_after_func_proto_group-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_after_func_proto_group-3.cfg
index 63fa256a..63fa256a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_after_func_proto_group-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_after_func_proto_group-3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_assign_leave_one_liners.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_assign_leave_one_liners.cfg
index 6914813b..6914813b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_assign_leave_one_liners.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_assign_leave_one_liners.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_before_brace_open_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_before_brace_open_1.cfg
index 4146c6fb..4146c6fb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_before_brace_open_1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_before_brace_open_1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_before_brace_open_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_before_brace_open_2.cfg
index bc1aaf83..bc1aaf83 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_before_brace_open_2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_before_brace_open_2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_before_brace_open_3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_before_brace_open_3.cfg
index 02daa843..02daa843 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_before_brace_open_3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_before_brace_open_3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_before_func_body_def-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_before_func_body_def-1.cfg
index 03ee374a..03ee374a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_before_func_body_def-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_before_func_body_def-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_before_func_body_def-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_before_func_body_def-2.cfg
index 2f3ba945..2f3ba945 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_before_func_body_def-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_before_func_body_def-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_before_if_closing_paren-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_before_if_closing_paren-f.cfg
index 39539a4e..39539a4e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_before_if_closing_paren-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_before_if_closing_paren-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_before_if_closing_paren-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_before_if_closing_paren-r.cfg
index d3ab2d68..d3ab2d68 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_before_if_closing_paren-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_before_if_closing_paren-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_before_struct.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_before_struct.cfg
index ab325b19..ab325b19 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_before_struct.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_before_struct.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_brace_brace-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_brace_brace-a.cfg
index 25d3c271..25d3c271 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_brace_brace-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_brace_brace-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_brace_fparen-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_brace_fparen-f.cfg
index 0a731344..0a731344 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_brace_fparen-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_brace_fparen-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_brace_fparen-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_brace_fparen-r.cfg
index 5a749682..5a749682 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_brace_fparen-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_brace_fparen-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_class-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_class-a.cfg
index 8c1eb70e..8c1eb70e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_class-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_class-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_class-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_class-r.cfg
index 29cc4dc6..29cc4dc6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_class-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_class-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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
index 7aac9635..7aac9635 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_fdef_brace_cond-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_fdef_brace_cond-f.cfg
index 7f08f9e3..7f08f9e3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_fdef_brace_cond-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_fdef_brace_cond-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_fdef_brace_cond-fr.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_fdef_brace_cond-fr.cfg
index affe7156..affe7156 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_fdef_brace_cond-fr.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_fdef_brace_cond-fr.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_fdef_brace_cond-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_fdef_brace_cond-r.cfg
index e64f7f0c..e64f7f0c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_fdef_brace_cond-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_fdef_brace_cond-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_fdef_brace_cond-rf.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_fdef_brace_cond-rf.cfg
index 9b12913e..9b12913e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_fdef_brace_cond-rf.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_fdef_brace_cond-rf.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_for_leave_one_liners-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_for_leave_one_liners-f.cfg
index bdcceefd..bdcceefd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_for_leave_one_liners-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_for_leave_one_liners-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_for_leave_one_liners-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_for_leave_one_liners-t.cfg
index 4d11891e..4d11891e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_for_leave_one_liners-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_for_leave_one_liners-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_func_call_empty-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_func_call_empty-r.cfg
index da04d6fa..da04d6fa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_func_call_empty-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_func_call_empty-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_func_call_paren-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_func_call_paren-f.cfg
index 480ce89f..480ce89f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_func_call_paren-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_func_call_paren-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_func_call_paren_empty-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_func_call_paren_empty-r.cfg
index 48612eb5..48612eb5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_func_call_paren_empty-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_func_call_paren_empty-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_func_class_scope-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_func_class_scope-a.cfg
index dc9b2ec5..dc9b2ec5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_func_class_scope-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_func_class_scope-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_func_decl_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_func_decl_1.cfg
index 438afe8f..438afe8f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_func_decl_1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_func_decl_1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_func_decl_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_func_decl_2.cfg
index c0495a4b..c0495a4b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_func_decl_2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_func_decl_2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_func_def_paren_empty-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_func_def_paren_empty-r.cfg
index ddc5e5d2..ddc5e5d2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_func_def_paren_empty-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_func_def_paren_empty-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_func_paren_empty.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_func_paren_empty.cfg
index 63f0b8ad..63f0b8ad 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_func_paren_empty.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_func_paren_empty.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_func_scope_name-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_func_scope_name-a.cfg
index c814477d..c814477d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_func_scope_name-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_func_scope_name-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_func_type_name-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_func_type_name-r.cfg
index 9cc10873..9cc10873 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_func_type_name-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_func_type_name-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_func_type_name_class.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_func_type_name_class.cfg
index fcb08501..fcb08501 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_func_type_name_class.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_func_type_name_class.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_func_type_name_force.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_func_type_name_force.cfg
index ef8b317e..ef8b317e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_func_type_name_force.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_func_type_name_force.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_func_type_name_mixed.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_func_type_name_mixed.cfg
index 515400f2..515400f2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_func_type_name_mixed.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_func_type_name_mixed.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_func_type_name_remove.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_func_type_name_remove.cfg
index ee38dd7e..ee38dd7e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_func_type_name_remove.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_func_type_name_remove.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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
index 2fc79eb3..2fc79eb3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_inside_namespace_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_inside_namespace_1.cfg
index c84309ca..c84309ca 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_inside_namespace_1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_inside_namespace_1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_inside_namespace_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_inside_namespace_2.cfg
index 9edefd02..9edefd02 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_inside_namespace_2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_inside_namespace_2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_max_blank_in_func-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_max_blank_in_func-1.cfg
index 9aa3416c..9aa3416c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_max_blank_in_func-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_max_blank_in_func-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_max_blank_in_func-4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_max_blank_in_func-4.cfg
index 8d0bdf67..8d0bdf67 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_max_blank_in_func-4.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_max_blank_in_func-4.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_namespace-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_namespace-a.cfg
index bc5d6469..bc5d6469 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_namespace-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_namespace-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_namespace-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_namespace-r.cfg
index ca9c198d..ca9c198d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_namespace-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_namespace-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_remove_extra_newlines-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_remove_extra_newlines-1.cfg
index 2d0c48b2..2d0c48b2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_remove_extra_newlines-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_remove_extra_newlines-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_template-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_template-f.cfg
index a90d1500..a90d1500 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_template-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_template-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_template-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_template-r.cfg
index 443693e5..443693e5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_template-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_template-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_try-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_try-a.cfg
index b85fcb08..b85fcb08 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_try-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_try-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_type_brace_init_lst-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_type_brace_init_lst-f.cfg
index 1b29c5cd..1b29c5cd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_type_brace_init_lst-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_type_brace_init_lst-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_type_brace_init_lst-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_type_brace_init_lst-r.cfg
index ef8d1de1..ef8d1de1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_type_brace_init_lst-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_type_brace_init_lst-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_type_brace_init_lst_close-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_type_brace_init_lst_close-f.cfg
index 4e070657..4e070657 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_type_brace_init_lst_close-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_type_brace_init_lst_close-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_type_brace_init_lst_close-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_type_brace_init_lst_close-r.cfg
index d4834efd..d4834efd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_type_brace_init_lst_close-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_type_brace_init_lst_close-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_type_brace_init_lst_open-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_type_brace_init_lst_open-f.cfg
index 1e9289e4..1e9289e4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_type_brace_init_lst_open-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_type_brace_init_lst_open-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_type_brace_init_lst_open-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_type_brace_init_lst_open-r.cfg
index 7d493c8b..7d493c8b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/nl_type_brace_init_lst_open-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/nl_type_brace_init_lst_open-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/no_squeeze_ifdef.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/no_squeeze_ifdef.cfg
index af4a3020..af4a3020 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/no_squeeze_ifdef.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/no_squeeze_ifdef.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/op-space-force.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/op-space-force.cfg
index 4feac69a..4feac69a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/op-space-force.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/op-space-force.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/op-space-remove-align-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/op-space-remove-align-1.cfg
index 5be45718..5be45718 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/op-space-remove-align-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/op-space-remove-align-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/op-space-remove-align-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/op-space-remove-align-2.cfg
index 32b7687a..32b7687a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/op-space-remove-align-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/op-space-remove-align-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/op-space-remove.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/op-space-remove.cfg
index 5424ede9..5424ede9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/op-space-remove.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/op-space-remove.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/op_sym_empty.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/op_sym_empty.cfg
index d9a57ce1..d9a57ce1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/op_sym_empty.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/op_sym_empty.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/out-668-F.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/out-668-F.cfg
index 77d9e08c..77d9e08c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/out-668-F.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/out-668-F.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/out-668-T.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/out-668-T.cfg
index a48c3ebb..a48c3ebb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/out-668-T.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/out-668-T.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/pos_assign.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/pos_assign.cfg
index 3b9c3700..3b9c3700 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/pos_assign.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/pos_assign.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/pos_comma-lf.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/pos_comma-lf.cfg
index 9f2daab6..9f2daab6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/pos_comma-lf.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/pos_comma-lf.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/pos_comma-tb.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/pos_comma-tb.cfg
index 3530982a..3530982a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/pos_comma-tb.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/pos_comma-tb.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/pos_enum_comma-tf.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/pos_enum_comma-tf.cfg
index 26cf3dff..26cf3dff 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/pos_enum_comma-tf.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/pos_enum_comma-tf.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/pos_shift-join.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/pos_shift-join.cfg
index 69ce2c94..69ce2c94 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/pos_shift-join.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/pos_shift-join.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/pos_shift-lead.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/pos_shift-lead.cfg
index 08e7d5de..08e7d5de 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/pos_shift-lead.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/pos_shift-lead.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/pos_shift-trail.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/pos_shift-trail.cfg
index a6b45298..a6b45298 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/pos_shift-trail.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/pos_shift-trail.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/pp-pragma.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/pp-pragma.cfg
index e143a69c..e143a69c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/pp-pragma.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/pp-pragma.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/pp_define_at_level-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/pp_define_at_level-1.cfg
index 12d12161..12d12161 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/pp_define_at_level-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/pp_define_at_level-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/pp_multi_comment.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/pp_multi_comment.cfg
index 0c23b380..0c23b380 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/pp_multi_comment.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/pp_multi_comment.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ptr_star-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ptr_star-1.cfg
index 34a504be..34a504be 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ptr_star-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ptr_star-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ptr_star-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ptr_star-2.cfg
index 6af95864..6af95864 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ptr_star-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ptr_star-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ptr_star-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ptr_star-3.cfg
index 3a5ed163..3a5ed163 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/ptr_star-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/ptr_star-3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/qt-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/qt-1.cfg
index b15663f7..b15663f7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/qt-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/qt-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sef.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sef.cfg
index ee467d79..ee467d79 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sef.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sef.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/semi-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/semi-f.cfg
index 0ffadc4a..0ffadc4a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/semi-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/semi-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/semi-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/semi-i.cfg
index b4260607..b4260607 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/semi-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/semi-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/semi-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/semi-r.cfg
index a8465b8c..a8465b8c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/semi-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/semi-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sf.2886991-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sf.2886991-f.cfg
index 46a15bac..46a15bac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sf.2886991-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sf.2886991-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sf.2886991-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sf.2886991-r.cfg
index 8f6c0f6d..8f6c0f6d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sf.2886991-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sf.2886991-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sf.3315874.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sf.3315874.cfg
index 99da8446..99da8446 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sf.3315874.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sf.3315874.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sf574.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sf574.cfg
index 8fc266f7..8fc266f7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sf574.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sf574.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sim.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sim.cfg
index a772734b..a772734b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sim.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sim.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_after_angle-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_after_angle-1.cfg
index cae5bbb7..cae5bbb7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_after_angle-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_after_angle-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_after_angle-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_after_angle-2.cfg
index c14d7901..c14d7901 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_after_angle-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_after_angle-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_after_angle-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_after_angle-3.cfg
index d0428a10..d0428a10 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_after_angle-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_after_angle-3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_after_cast-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_after_cast-f.cfg
index d92ffb0d..d92ffb0d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_after_cast-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_after_cast-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_after_cast-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_after_cast-r.cfg
index 130602eb..130602eb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_after_cast-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_after_cast-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_after_constr_colon.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_after_constr_colon.cfg
index aa1189dd..aa1189dd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_after_constr_colon.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_after_constr_colon.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_after_decltype-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_after_decltype-f.cfg
index 077c5f94..077c5f94 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_after_decltype-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_after_decltype-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_after_decltype-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_after_decltype-r.cfg
index 64a318a0..64a318a0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_after_decltype-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_after_decltype-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_after_ellipsis-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_after_ellipsis-f.cfg
index e30e169a..e30e169a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_after_ellipsis-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_after_ellipsis-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_after_ptr_star_qualifier-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_after_ptr_star_qualifier-f.cfg
index 7e26046f..7e26046f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_after_ptr_star_qualifier-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_after_ptr_star_qualifier-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_after_type-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_after_type-i.cfg
index bd45658a..bd45658a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_after_type-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_after_type-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_after_type_brace_init_lst_open-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_after_type_brace_init_lst_open-f.cfg
index d3b744b4..d3b744b4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_after_type_brace_init_lst_open-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_after_type_brace_init_lst_open-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_after_type_brace_init_lst_open-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_after_type_brace_init_lst_open-r.cfg
index f370b82e..f370b82e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_after_type_brace_init_lst_open-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_after_type_brace_init_lst_open-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_angle_colon.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_angle_colon.cfg
index e247bbbe..e247bbbe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_angle_colon.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_angle_colon.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_angle_paren-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_angle_paren-f.cfg
index 0b3d2f92..0b3d2f92 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_angle_paren-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_angle_paren-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_angle_paren_empty.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_angle_paren_empty.cfg
index 1e3c592b..1e3c592b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_angle_paren_empty.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_angle_paren_empty.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_arith-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_arith-a.cfg
index 4d60daa9..4d60daa9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_arith-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_arith-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_arith_additive-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_arith_additive-f.cfg
index 8e6f0585..8e6f0585 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_arith_additive-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_arith_additive-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_arith_additive-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_arith_additive-r.cfg
index e01e86f7..e01e86f7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_arith_additive-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_arith_additive-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_assign_default.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_assign_default.cfg
index 29411834..29411834 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_assign_default.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_assign_default.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_balance_nested_parens.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_balance_nested_parens.cfg
index 8e9dbb6f..8e9dbb6f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_balance_nested_parens.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_balance_nested_parens.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_before_byref_func.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_before_byref_func.cfg
index 6f5e2783..6f5e2783 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_before_byref_func.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_before_byref_func.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_before_case_colon.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_before_case_colon.cfg
index d0bef793..d0bef793 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_before_case_colon.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_before_case_colon.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_before_comma-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_before_comma-f.cfg
index dc25e313..dc25e313 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_before_comma-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_before_comma-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_before_constr_colon.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_before_constr_colon.cfg
index 9d0ec317..9d0ec317 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_before_constr_colon.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_before_constr_colon.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_before_ellipsis-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_before_ellipsis-f.cfg
index ed701425..ed701425 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_before_ellipsis-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_before_ellipsis-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_before_ellipsis-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_before_ellipsis-r.cfg
index e2163788..e2163788 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_before_ellipsis-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_before_ellipsis-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_before_ptr_star-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_before_ptr_star-f.cfg
index 7653ec0b..7653ec0b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_before_ptr_star-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_before_ptr_star-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_before_ptr_star-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_before_ptr_star-r.cfg
index 55f99c73..55f99c73 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_before_ptr_star-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_before_ptr_star-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_before_tr_emb_cmt-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_before_tr_emb_cmt-a.cfg
index 834fd302..834fd302 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_before_tr_emb_cmt-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_before_tr_emb_cmt-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_before_tr_emb_cmt-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_before_tr_emb_cmt-f.cfg
index 54720c71..54720c71 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_before_tr_emb_cmt-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_before_tr_emb_cmt-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_before_type_brace_init_lst_close-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_before_type_brace_init_lst_close-f.cfg
index 3dda0281..3dda0281 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_before_type_brace_init_lst_close-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_before_type_brace_init_lst_close-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_before_type_brace_init_lst_close-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_before_type_brace_init_lst_close-r.cfg
index 5fb0bf36..5fb0bf36 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_before_type_brace_init_lst_close-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_before_type_brace_init_lst_close-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_bool-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_bool-f.cfg
index b5a9e09f..b5a9e09f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_bool-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_bool-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_bool-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_bool-i.cfg
index ae79b0a8..ae79b0a8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_bool-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_bool-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_bool-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_bool-r.cfg
index 3baee576..3baee576 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_bool-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_bool-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_brace_brace-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_brace_brace-f.cfg
index 090c2858..090c2858 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_brace_brace-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_brace_brace-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_brace_brace-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_brace_brace-r.cfg
index c652b3cd..c652b3cd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_brace_brace-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_brace_brace-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_brace_catch.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_brace_catch.cfg
index 7ee0209d..7ee0209d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_brace_catch.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.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.75.0/tests/config/cpp/sp_byref_paren-a.cfg
new file mode 100644
index 00000000..f2c79e1a
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_byref_paren-a.cfg
@@ -0,0 +1 @@
+sp_byref_paren = add
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.75.0/tests/config/cpp/sp_byref_paren-f.cfg
new file mode 100644
index 00000000..8e7a167c
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_byref_paren-f.cfg
@@ -0,0 +1 @@
+sp_byref_paren = force
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.75.0/tests/config/cpp/sp_byref_paren-i.cfg
new file mode 100644
index 00000000..1ba244a9
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_byref_paren-i.cfg
@@ -0,0 +1 @@
+sp_byref_paren = ignore
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.75.0/tests/config/cpp/sp_byref_paren-r.cfg
new file mode 100644
index 00000000..fe59915e
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_byref_paren-r.cfg
@@ -0,0 +1 @@
+sp_byref_paren = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_catch_brace.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_catch_brace.cfg
index d2da6d91..d2da6d91 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_catch_brace.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_catch_brace.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cmt.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_cmt.cfg
index fb7f6ef1..fb7f6ef1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cmt.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_cmt.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cmt_cpp_region-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_cmt_cpp_region-f.cfg
index 1c626401..1c626401 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cmt_cpp_region-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_cmt_cpp_region-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cmt_cpp_region-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_cmt_cpp_region-r.cfg
index 67a0ff11..67a0ff11 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cmt_cpp_region-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_cmt_cpp_region-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cond_question-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_cond_question-f.cfg
index dd6f0faf..dd6f0faf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cond_question-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_cond_question-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cond_question-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_cond_question-i.cfg
index d671d519..d671d519 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cond_question-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_cond_question-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cond_question-ir.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_cond_question-ir.cfg
index 4a557554..4a557554 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cond_question-ir.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_cond_question-ir.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cond_question-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_cond_question-r.cfg
index 0d013cf7..0d013cf7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cond_question-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_cond_question-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_constr_colon-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_constr_colon-i.cfg
index c5cd823a..c5cd823a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_constr_colon-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_constr_colon-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cparen_oparen-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_cparen_oparen-r.cfg
index f584c02d..f584c02d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cparen_oparen-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_cparen_oparen-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cpp_lambda_fparen-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_cpp_lambda_fparen-f.cfg
index f45270e7..f45270e7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cpp_lambda_fparen-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_cpp_lambda_fparen-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cpp_lambda_fparen-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_cpp_lambda_fparen-i.cfg
index cda81b02..cda81b02 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cpp_lambda_fparen-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_cpp_lambda_fparen-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cpp_lambda_fparen-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_cpp_lambda_fparen-r.cfg
index c64da54c..c64da54c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cpp_lambda_fparen-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_cpp_lambda_fparen-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cpp_lambda_paren_brace-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_cpp_lambda_paren_brace-f.cfg
index f632d9d6..f632d9d6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cpp_lambda_paren_brace-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_cpp_lambda_paren_brace-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cpp_lambda_paren_brace-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_cpp_lambda_paren_brace-i.cfg
index 9c8e2748..9c8e2748 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cpp_lambda_paren_brace-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_cpp_lambda_paren_brace-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cpp_lambda_paren_brace-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_cpp_lambda_paren_brace-r.cfg
index 492af499..492af499 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cpp_lambda_paren_brace-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_cpp_lambda_paren_brace-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cpp_lambda_square_brace-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_cpp_lambda_square_brace-f.cfg
index cc067763..cc067763 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cpp_lambda_square_brace-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_cpp_lambda_square_brace-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cpp_lambda_square_brace-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_cpp_lambda_square_brace-i.cfg
index a035f41e..a035f41e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cpp_lambda_square_brace-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_cpp_lambda_square_brace-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cpp_lambda_square_brace-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_cpp_lambda_square_brace-r.cfg
index cf703b2f..cf703b2f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cpp_lambda_square_brace-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_cpp_lambda_square_brace-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cpp_lambda_square_paren-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_cpp_lambda_square_paren-f.cfg
index 55ac955d..55ac955d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cpp_lambda_square_paren-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_cpp_lambda_square_paren-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cpp_lambda_square_paren-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_cpp_lambda_square_paren-i.cfg
index e8525fe5..e8525fe5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cpp_lambda_square_paren-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_cpp_lambda_square_paren-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cpp_lambda_square_paren-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_cpp_lambda_square_paren-r.cfg
index bcb937c3..bcb937c3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_cpp_lambda_square_paren-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_cpp_lambda_square_paren-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_dc.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_dc.cfg
index c9b14cc2..c9b14cc2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_dc.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_dc.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_decltype_paren-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_decltype_paren-f.cfg
index 3636cd02..3636cd02 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_decltype_paren-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_decltype_paren-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_decltype_paren-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_decltype_paren-r.cfg
index b11add96..b11add96 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_decltype_paren-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_decltype_paren-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_endif_cmt.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_endif_cmt.cfg
index 13ddf4fe..13ddf4fe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_endif_cmt.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_endif_cmt.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_enum_assign-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_enum_assign-f.cfg
index 37928822..37928822 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_enum_assign-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_enum_assign-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_enum_assign-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_enum_assign-i.cfg
index c30b6525..c30b6525 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_enum_assign-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_enum_assign-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_enum_colon-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_enum_colon-i.cfg
index d154830c..d154830c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_enum_colon-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_enum_colon-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_enum_colon-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_enum_colon-r.cfg
index 87f44474..87f44474 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_enum_colon-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_enum_colon-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_enum_colon.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_enum_colon.cfg
index 27716eca..27716eca 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_enum_colon.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_enum_colon.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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
index e6d960bb..e6d960bb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_func_call_paren.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_func_call_paren.cfg
index c5f8927b..c5f8927b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_func_call_paren.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_func_call_paren.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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
index eb4aa154..eb4aa154 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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
index bb1260ab..bb1260ab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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
index e6da9e5f..e6da9e5f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.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
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_inside_braces_empty-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_inside_braces_empty-r.cfg
index f7b1b239..f7b1b239 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_inside_braces_empty-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_inside_braces_empty-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_inside_braces_enum-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_inside_braces_enum-f.cfg
index bd854828..bd854828 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_inside_braces_enum-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_inside_braces_enum-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_inside_braces_enum-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_inside_braces_enum-i.cfg
index a56a9ecb..a56a9ecb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_inside_braces_enum-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_inside_braces_enum-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_inside_braces_enum-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_inside_braces_enum-r.cfg
index ca8a03a0..ca8a03a0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_inside_braces_enum-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_inside_braces_enum-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_inside_fparen-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_inside_fparen-r.cfg
index 98f867f4..98f867f4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_inside_fparen-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_inside_fparen-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_inside_fparens-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_inside_fparens-f.cfg
index b56756d1..b56756d1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_inside_fparens-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_inside_fparens-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_inside_type_brace_init_lst-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_inside_type_brace_init_lst-f.cfg
index 72db534b..72db534b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_inside_type_brace_init_lst-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_inside_type_brace_init_lst-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_inside_type_brace_init_lst-iif.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_inside_type_brace_init_lst-iif.cfg
index c42436bf..c42436bf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_inside_type_brace_init_lst-iif.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_inside_type_brace_init_lst-iif.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_inside_type_brace_init_lst-iii.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_inside_type_brace_init_lst-iii.cfg
index e352ee6c..e352ee6c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_inside_type_brace_init_lst-iii.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_inside_type_brace_init_lst-iii.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_inside_type_brace_init_lst-irf.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_inside_type_brace_init_lst-irf.cfg
index ed72df5e..ed72df5e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_inside_type_brace_init_lst-irf.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_inside_type_brace_init_lst-irf.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_inside_type_brace_init_lst-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_inside_type_brace_init_lst-r.cfg
index b0881eaf..b0881eaf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_inside_type_brace_init_lst-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_inside_type_brace_init_lst-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_inside_type_brace_init_lst-rf.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_inside_type_brace_init_lst-rf.cfg
index cafaab52..cafaab52 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_inside_type_brace_init_lst-rf.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.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.75.0/tests/config/cpp/sp_not_not.cfg
new file mode 100644
index 00000000..1c0335a4
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_not_not.cfg
@@ -0,0 +1,2 @@
+sp_not = add
+sp_not_not = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_paren_brace-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_paren_brace-f.cfg
index 8f9206ab..8f9206ab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_paren_brace-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_paren_brace-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_paren_brace-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_paren_brace-i.cfg
index f3d0f22d..f3d0f22d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_paren_brace-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_paren_brace-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_paren_brace-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_paren_brace-r.cfg
index 7e2fce85..7e2fce85 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_paren_brace-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_paren_brace-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_paren_ellipsis-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_paren_ellipsis-f.cfg
index 3cc88128..3cc88128 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_paren_ellipsis-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_paren_ellipsis-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_paren_ellipsis-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_paren_ellipsis-i.cfg
index 093de258..093de258 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_paren_ellipsis-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_paren_ellipsis-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_paren_ellipsis-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_paren_ellipsis-r.cfg
index 5971dfa8..5971dfa8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_paren_ellipsis-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_paren_ellipsis-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_paren_noexcept-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_paren_noexcept-f.cfg
index 35e76a33..35e76a33 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_paren_noexcept-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_paren_noexcept-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_paren_qualifier-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_paren_qualifier-f.cfg
index f91f2aee..f91f2aee 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_paren_qualifier-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_paren_qualifier-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_return-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_return-a.cfg
index 16e78850..16e78850 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_return-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_return-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_return-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_return-f.cfg
index b37d9b03..b37d9b03 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_return-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_return-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_return-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_return-i.cfg
index 80d2d26d..80d2d26d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_return-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_return-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_return-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_return-r.cfg
index b3d64b3f..b3d64b3f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_return-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_return-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_return_brace-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_return_brace-f.cfg
index bdea1673..bdea1673 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_return_brace-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_return_brace-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_return_brace-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_return_brace-r.cfg
index a2541527..a2541527 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_return_brace-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_return_brace-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_return_paren-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_return_paren-f.cfg
index 11637ca1..11637ca1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_return_paren-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_return_paren-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_return_paren-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_return_paren-r.cfg
index 8fbef0b8..8fbef0b8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_return_paren-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_return_paren-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_sizeof_ellipsis-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_sizeof_ellipsis-f.cfg
index 853db73a..853db73a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_sizeof_ellipsis-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_sizeof_ellipsis-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_sizeof_ellipsis-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_sizeof_ellipsis-i.cfg
index 48871cc9..48871cc9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_sizeof_ellipsis-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_sizeof_ellipsis-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_sizeof_ellipsis-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_sizeof_ellipsis-r.cfg
index 7d1c2068..7d1c2068 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_sizeof_ellipsis-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_sizeof_ellipsis-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_sizeof_ellipsis_paren-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_sizeof_ellipsis_paren-f.cfg
index 46dfb49d..46dfb49d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_sizeof_ellipsis_paren-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_sizeof_ellipsis_paren-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_sizeof_ellipsis_paren-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_sizeof_ellipsis_paren-i.cfg
index 2b7d0b44..2b7d0b44 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_sizeof_ellipsis_paren-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_sizeof_ellipsis_paren-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_sizeof_ellipsis_paren-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_sizeof_ellipsis_paren-r.cfg
index 27953868..27953868 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_sizeof_ellipsis_paren-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_sizeof_ellipsis_paren-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_skip_vbrace_tokens.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_skip_vbrace_tokens.cfg
index d5ce739d..d5ce739d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_skip_vbrace_tokens.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_skip_vbrace_tokens.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_throw_paren-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_throw_paren-f.cfg
index 611cd750..611cd750 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_throw_paren-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_throw_paren-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_throw_paren-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_throw_paren-r.cfg
index 893c8782..893c8782 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_throw_paren-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_throw_paren-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_trailing_return-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_trailing_return-f.cfg
index 9e1fe074..9e1fe074 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_trailing_return-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_trailing_return-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_trailing_return-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_trailing_return-r.cfg
index b26929ba..b26929ba 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_trailing_return-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.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.75.0/tests/config/cpp/sp_trailing_return_byref_ptr-left.cfg
new file mode 100644
index 00000000..071f30d0
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_trailing_return_byref_ptr-left.cfg
@@ -0,0 +1,7 @@
+sp_assign_default = force
+sp_trailing_return = force
+
+sp_before_byref = remove
+sp_after_byref = force
+
+sp_before_ptr_star_trailing = remove
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.75.0/tests/config/cpp/sp_trailing_return_byref_ptr-right.cfg
new file mode 100644
index 00000000..f5078788
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_trailing_return_byref_ptr-right.cfg
@@ -0,0 +1,7 @@
+sp_assign_default = force
+sp_trailing_return = force
+
+sp_before_byref = force
+sp_after_byref = remove
+
+sp_before_ptr_star_trailing = force
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_type_brace_init_lst-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_type_brace_init_lst-f.cfg
index 2f0d5258..2f0d5258 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_type_brace_init_lst-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_type_brace_init_lst-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_type_brace_init_lst-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_type_brace_init_lst-r.cfg
index 199dc1eb..199dc1eb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_type_brace_init_lst-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_type_brace_init_lst-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_type_ellipsis-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_type_ellipsis-f.cfg
index 888a68b0..888a68b0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_type_ellipsis-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_type_ellipsis-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_type_ellipsis-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_type_ellipsis-i.cfg
index f6cb6d0c..f6cb6d0c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_type_ellipsis-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_type_ellipsis-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_type_ellipsis-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_type_ellipsis-r.cfg
index bf831e30..bf831e30 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_type_ellipsis-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_type_ellipsis-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_type_func-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_type_func-1.cfg
index 010876e0..010876e0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_type_func-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_type_func-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_type_func-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_type_func-2.cfg
index de86218b..de86218b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_type_func-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_type_func-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_type_func-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_type_func-f.cfg
index e8e5f08a..e8e5f08a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_type_func-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_type_func-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_type_func-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_type_func-r.cfg
index 62324f98..62324f98 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_type_func-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_type_func-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_word_brace_force.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_word_brace_force.cfg
index d9c53345..d9c53345 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_word_brace_force.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_word_brace_force.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_word_brace_remove.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_word_brace_remove.cfg
index 3fd1fa26..3fd1fa26 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/sp_word_brace_remove.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/sp_word_brace_remove.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/space_indent_class-t_columns-4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/space_indent_class-t_columns-4.cfg
index a454237c..a454237c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/space_indent_class-t_columns-4.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/space_indent_class-t_columns-4.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/squeeze_ifdef.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/squeeze_ifdef.cfg
index fa3f980c..fa3f980c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/squeeze_ifdef.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/squeeze_ifdef.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/squeeze_ifdef_top.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/squeeze_ifdef_top.cfg
index 6b45f49a..6b45f49a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/squeeze_ifdef_top.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/squeeze_ifdef_top.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/star_pos-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/star_pos-1.cfg
index 6c9f5806..6c9f5806 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/star_pos-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/star_pos-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/star_pos-2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/star_pos-2.cfg
index dc1f45fc..dc1f45fc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/star_pos-2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/star_pos-2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/string_replace_tab_chars-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/string_replace_tab_chars-t.cfg
index 9e36729d..9e36729d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/string_replace_tab_chars-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/string_replace_tab_chars-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/tab-0-11.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/tab-0-11.cfg
index 96f745a3..96f745a3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/tab-0-11.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/tab-0-11.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/template_sp-force.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/template_sp-force.cfg
index 852277ca..852277ca 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/template_sp-force.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/template_sp-force.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/template_sp-ignore.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/template_sp-ignore.cfg
index b5bbb248..b5bbb248 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/template_sp-ignore.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/template_sp-ignore.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/template_sp-remove.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/template_sp-remove.cfg
index 5e20f3b5..5e20f3b5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/template_sp-remove.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/template_sp-remove.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/templates-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/templates-i.cfg
index 25622a57..25622a57 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/templates-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/templates-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/templates-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/templates-r.cfg
index 7efd2a7d..7efd2a7d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/templates-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/templates-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/toggle_processing_cmt.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/toggle_processing_cmt.cfg
index 08ef987e..08ef987e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/toggle_processing_cmt.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/toggle_processing_cmt.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/toggle_processing_cmt2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/toggle_processing_cmt2.cfg
index 0b9be532..0b9be532 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/toggle_processing_cmt2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/toggle_processing_cmt2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/toggle_processing_cmt3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/toggle_processing_cmt3.cfg
index d7f1f675..d7f1f675 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/toggle_processing_cmt3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/toggle_processing_cmt3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/toggle_processing_cmt4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/toggle_processing_cmt4.cfg
index ccd7bb03..ccd7bb03 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/toggle_processing_cmt4.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/toggle_processing_cmt4.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/var_def_gap.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/var_def_gap.cfg
index 3d77d117..3d77d117 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/var_def_gap.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/var_def_gap.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/wessex.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/wessex.cfg
index 77fc3303..77fc3303 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cpp/wessex.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cpp/wessex.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/615_nested_usings.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/615_nested_usings.cfg
index ae152fd4..ae152fd4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/615_nested_usings.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/615_nested_usings.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/620_getset-brace.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/620_getset-brace.cfg
index 8e5510d0..8e5510d0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/620_getset-brace.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/620_getset-brace.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/625_where-constraints.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/625_where-constraints.cfg
index a6fa8175..a6fa8175 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/625_where-constraints.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/625_where-constraints.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/Issue_2705.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/Issue_2705.cfg
index 0a3ecb71..0a3ecb71 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/Issue_2705.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/Issue_2705.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/U-J.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/U-J.cfg
index 21e55d74..21e55d74 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/U-J.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/U-J.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/U01-Cs.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/U01-Cs.cfg
index 4edc0426..db379631 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/U01-Cs.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/U01-Cs.cfg
@@ -37,8 +37,8 @@ indent_col1_comment=false
 indent_label=-4
 indent_access_spec=-4
 indent_paren_nl=false
-indent_comma_paren=false
-indent_bool_paren=false
+indent_comma_paren=0
+indent_bool_paren=0
 indent_first_bool_expr=false
 indent_square_nl=false
 indent_preserve_sql=false
@@ -218,7 +218,7 @@ nl_property_brace=force
 eat_blanks_after_open_brace=true
 eat_blanks_before_close_brace=true
 nl_after_return=false
-mod_full_brace_if_chain=false
+mod_full_brace_if_chain=0
 mod_paren_on_return=ignore
 mod_pawn_semicolon=false
 mod_full_paren_if_bool=false
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/U02-Cs.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/U02-Cs.cfg
index c7d6aeda..c7d6aeda 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/U02-Cs.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/U02-Cs.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/U03-Cs.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/U03-Cs.cfg
index 24961370..24961370 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/U03-Cs.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/U03-Cs.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/U04-Cs.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/U04-Cs.cfg
index b331f6f8..b331f6f8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/U04-Cs.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/U04-Cs.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/U06-Cs.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/U06-Cs.cfg
index 03c2c765..03c2c765 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/U06-Cs.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/U06-Cs.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/U07-Cs.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/U07-Cs.cfg
index 62ee120e..81f320b8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/U07-Cs.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/U07-Cs.cfg
@@ -37,8 +37,8 @@ indent_col1_comment=false
 indent_label=-4
 indent_access_spec=-4
 indent_paren_nl=false
-indent_comma_paren=false
-indent_bool_paren=false
+indent_comma_paren=0
+indent_bool_paren=0
 indent_first_bool_expr=false
 indent_square_nl=false
 indent_preserve_sql=false
@@ -218,7 +218,7 @@ nl_property_brace=force
 eat_blanks_after_open_brace=true
 eat_blanks_before_close_brace=true
 nl_after_return=false
-mod_full_brace_if_chain=false
+mod_full_brace_if_chain=0
 mod_paren_on_return=ignore
 mod_pawn_semicolon=false
 mod_full_paren_if_bool=false
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/U08-Cs.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/U08-Cs.cfg
index 2378cb43..aeff4b58 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/U08-Cs.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/U08-Cs.cfg
@@ -37,8 +37,8 @@ indent_col1_comment=false
 indent_label=-4
 indent_access_spec=-4
 indent_paren_nl=false
-indent_comma_paren=false
-indent_bool_paren=false
+indent_comma_paren=0
+indent_bool_paren=0
 indent_first_bool_expr=false
 indent_square_nl=false
 indent_preserve_sql=false
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/U09-Cs.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/U09-Cs.cfg
index d74080d2..d74080d2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/U09-Cs.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/U09-Cs.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/U10-Cs.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/U10-Cs.cfg
index 42254ddb..42254ddb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/U10-Cs.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/U10-Cs.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/U11-Cs.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/U11-Cs.cfg
index 70557c46..70557c46 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/U11-Cs.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/U11-Cs.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/U13-Cs.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/U13-Cs.cfg
index 75f78b42..75f78b42 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/U13-Cs.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/U13-Cs.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/U15-Cs.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/U15-Cs.cfg
index 5a700342..5a700342 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/U15-Cs.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/U15-Cs.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/UNI-11662.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-11662.cfg
index 24cf86a8..24cf86a8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/UNI-11662.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-11662.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/UNI-11993.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-11993.cfg
index 79b2e445..34cf0529 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/UNI-11993.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-11993.cfg
@@ -38,8 +38,8 @@ indent_col1_comment=false
 indent_label=-4
 indent_access_spec=-4
 indent_paren_nl=false
-indent_comma_paren=false
-indent_bool_paren=false
+indent_comma_paren=0
+indent_bool_paren=0
 indent_first_bool_expr=false
 indent_square_nl=false
 indent_preserve_sql=false
@@ -223,7 +223,7 @@ nl_property_brace=force
 eat_blanks_after_open_brace=true
 eat_blanks_before_close_brace=true
 nl_after_return=false
-mod_full_brace_if_chain=false
+mod_full_brace_if_chain=0
 mod_paren_on_return=ignore
 mod_pawn_semicolon=false
 mod_full_paren_if_bool=false
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/UNI-1288.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-1288.cfg
index 3b6cf1b4..3b6cf1b4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/UNI-1288.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-1288.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/UNI-1338.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-1338.cfg
index 0eef21b4..0eef21b4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/UNI-1338.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-1338.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/UNI-1343.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-1343.cfg
index f5276e1f..f5276e1f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/UNI-1343.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-1343.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/UNI-13955.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-13955.cfg
index d1c7c955..d1c7c955 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/UNI-13955.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-13955.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/UNI-14131.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-14131.cfg
index 7c5535ea..7c5535ea 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/UNI-14131.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-14131.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/UNI-18437.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-18437.cfg
index a40e16a6..340e06dd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/UNI-18437.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-18437.cfg
@@ -37,8 +37,8 @@ indent_col1_comment=false
 indent_label=-4
 indent_access_spec=-4
 indent_paren_nl=false
-indent_comma_paren=false
-indent_bool_paren=false
+indent_comma_paren=0
+indent_bool_paren=0
 indent_first_bool_expr=false
 indent_square_nl=false
 indent_preserve_sql=false
@@ -222,7 +222,7 @@ nl_property_brace=force
 eat_blanks_after_open_brace=true
 eat_blanks_before_close_brace=true
 nl_after_return=false
-mod_full_brace_if_chain=false
+mod_full_brace_if_chain=0
 mod_paren_on_return=ignore
 mod_pawn_semicolon=false
 mod_full_paren_if_bool=false
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/UNI-18829.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-18829.cfg
index d65f6b27..d65f6b27 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/UNI-18829.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-18829.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/UNI-1975.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-1975.cfg
index 80528dc6..80528dc6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/UNI-1975.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-1975.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/UNI-1977.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-1977.cfg
index 4563bfde..4563bfde 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/UNI-1977.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-1977.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/UNI-1978.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-1978.cfg
index 2cf794e3..2cf794e3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/UNI-1978.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-1978.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/UNI-19895.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-19895.cfg
index ac4012d1..ac4012d1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/UNI-19895.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-19895.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/UNI-2020.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-2020.cfg
index 0d78de45..0d78de45 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/UNI-2020.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-2020.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/UNI-2021.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-2021.cfg
index 827d33e0..827d33e0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/UNI-2021.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-2021.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/UNI-21730.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-21730.cfg
index 5443f32f..5443f32f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/UNI-21730.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-21730.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/UNI-2684.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-2684.cfg
index c048c827..c048c827 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/UNI-2684.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-2684.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/UNI-2685.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-2685.cfg
index 3f25a1fa..3f25a1fa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/UNI-2685.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-2685.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/UNI-29933.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-29933.cfg
index 2f136516..2f136516 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/UNI-29933.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-29933.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/UNI-30498_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-30498_2.cfg
index 8f635e72..8f635e72 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/UNI-30498_2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-30498_2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/UNI-3083.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-3083.cfg
index 80528dc6..80528dc6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/UNI-3083.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-3083.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/UNI-32658.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-32658.cfg
index 9333a9c5..45ff959d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/UNI-32658.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-32658.cfg
@@ -38,8 +38,8 @@ indent_col1_comment=false
 indent_label=-4
 indent_access_spec=-4
 indent_paren_nl=false
-indent_comma_paren=false
-indent_bool_paren=false
+indent_comma_paren=0
+indent_bool_paren=0
 indent_first_bool_expr=false
 indent_square_nl=false
 indent_preserve_sql=false
@@ -223,7 +223,7 @@ nl_property_brace=force
 eat_blanks_after_open_brace=true
 eat_blanks_before_close_brace=true
 nl_after_return=false
-mod_full_brace_if_chain=false
+mod_full_brace_if_chain=0
 mod_paren_on_return=ignore
 mod_pawn_semicolon=false
 mod_full_paren_if_bool=false
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/UNI-37241.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-37241.cfg
index ad1ac1cc..693b9a86 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/UNI-37241.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-37241.cfg
@@ -38,8 +38,8 @@ indent_col1_comment=false                           # { False, True }
 indent_label=-4                                     # Number
 indent_access_spec=-4                               # Number
 indent_paren_nl=false                               # { False, True }
-indent_comma_paren=false                            # { False, True }
-indent_bool_paren=false                             # { False, True }
+indent_comma_paren=0                                # Number
+indent_bool_paren=0                                 # Number
 indent_first_bool_expr=false                        # { False, True }
 indent_square_nl=false                              # { False, True }
 indent_preserve_sql=false                           # { False, True }
@@ -223,7 +223,7 @@ nl_property_brace=force                             # { Ignore, Add, Remove, For
 eat_blanks_after_open_brace=true                    # { False, True }
 eat_blanks_before_close_brace=true                  # { False, True }
 nl_after_return=false                               # { False, True }
-mod_full_brace_if_chain=false                       # { False, True }
+mod_full_brace_if_chain=0                           # Number
 mod_paren_on_return=ignore                          # { Ignore, Add, Remove, Force }
 mod_pawn_semicolon=false                            # { False, True }
 mod_full_paren_if_bool=false                        # { False, True }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/UNI-9917.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-9917.cfg
index f1fd0af3..f1fd0af3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/UNI-9917.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/UNI-9917.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/ben_032.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/ben_032.cfg
index e99f12ab..e99f12ab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/ben_032.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/ben_032.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/ben_033.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/ben_033.cfg
index 3f1ffc6c..3f1ffc6c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/ben_033.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/ben_033.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/ben_034.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/ben_034.cfg
index 0681b1b8..0681b1b8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/ben_034.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/ben_034.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/ben_036.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/ben_036.cfg
index 5a5f216b..5a5f216b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/ben_036.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/ben_036.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/ben_037.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/ben_037.cfg
index 97daab41..97daab41 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/ben_037.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/ben_037.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/ben_038.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/ben_038.cfg
index 4384cfbd..4384cfbd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/ben_038.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/ben_038.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/ben_043.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/ben_043.cfg
index fcbc9ddc..fcbc9ddc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/ben_043.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/ben_043.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/ben_044.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/ben_044.cfg
index 6815087d..6815087d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/ben_044.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/ben_044.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/ben_045.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/ben_045.cfg
index 3ff68ef5..3ff68ef5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/ben_045.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/ben_045.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/bug_1620.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/bug_1620.cfg
index 6b14154d..278e249b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/bug_1620.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/bug_1620.cfg
@@ -38,8 +38,8 @@ indent_col1_comment=false
 indent_label=-4

 indent_access_spec=-4

 indent_paren_nl=false

-indent_comma_paren=false

-indent_bool_paren=false

+indent_comma_paren=0

+indent_bool_paren=0

 indent_first_bool_expr=false

 indent_square_nl=false

 indent_preserve_sql=false

@@ -223,7 +223,7 @@ nl_property_brace=force
 eat_blanks_after_open_brace=true

 eat_blanks_before_close_brace=true

 nl_after_return=false

-mod_full_brace_if_chain=false

+mod_full_brace_if_chain=0

 mod_paren_on_return=ignore

 mod_pawn_semicolon=false

 mod_full_paren_if_bool=false

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/bug_1637.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/bug_1637.cfg
index d083d613..cf23e802 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/bug_1637.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/bug_1637.cfg
@@ -38,8 +38,8 @@ indent_col1_comment=false
 indent_label=-4
 indent_access_spec=-4
 indent_paren_nl=false
-indent_comma_paren=false
-indent_bool_paren=false
+indent_comma_paren=0
+indent_bool_paren=0
 indent_first_bool_expr=false
 indent_square_nl=false
 indent_preserve_sql=false
@@ -223,7 +223,7 @@ nl_property_brace=force
 eat_blanks_after_open_brace=true
 eat_blanks_before_close_brace=true
 nl_after_return=false
-mod_full_brace_if_chain=false
+mod_full_brace_if_chain=0
 mod_pawn_semicolon=false
 mod_full_paren_if_bool=false
 mod_remove_extra_semicolon=true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/bug_1650.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/bug_1650.cfg
index 730c4250..a3321b6b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/bug_1650.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/bug_1650.cfg
@@ -37,8 +37,8 @@ indent_col1_comment=false
 indent_label=-4

 indent_access_spec=-4

 indent_paren_nl=false

-indent_comma_paren=false

-indent_bool_paren=false

+indent_comma_paren=0

+indent_bool_paren=0

 indent_first_bool_expr=false

 indent_square_nl=false

 indent_preserve_sql=false

@@ -221,7 +221,7 @@ nl_property_brace=force
 eat_blanks_after_open_brace=true

 eat_blanks_before_close_brace=true

 nl_after_return=false

-mod_full_brace_if_chain=false

+mod_full_brace_if_chain=0

 mod_paren_on_return=ignore

 mod_pawn_semicolon=false

 mod_full_paren_if_bool=false

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/bug_600.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/bug_600.cfg
new file mode 100644
index 00000000..5c47913d
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/bug_600.cfg
@@ -0,0 +1 @@
+sp_before_ptr_star = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/bug_620.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/bug_620.cfg
index 4486cd45..4486cd45 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/bug_620.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/bug_620.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/comma-cs-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/comma-cs-f.cfg
index 6ea5a2af..6ea5a2af 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/comma-cs-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/comma-cs-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/comma-cs-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/comma-cs-i.cfg
index f78c61b3..f78c61b3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/comma-cs-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/comma-cs-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/comma-cs-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/comma-cs-r.cfg
index 626b6ff1..626b6ff1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/comma-cs-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/comma-cs-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/cs_generics.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/cs_generics.cfg
index e4320a80..e4320a80 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/cs_generics.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/cs_generics.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/getset.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/getset.cfg
index 1e1ab8e9..1e1ab8e9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/getset.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/getset.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/indent-multistring-coulmn1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/indent-multistring-coulmn1.cfg
index 8ce9a4ff..8ce9a4ff 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/indent-multistring-coulmn1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/indent-multistring-coulmn1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/indent_cs_delegate_brace-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/indent_cs_delegate_brace-t.cfg
index 9a4e6382..9a4e6382 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/indent_cs_delegate_brace-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/indent_cs_delegate_brace-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/indent_using_block-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/indent_using_block-f.cfg
index 2bfca802..2bfca802 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/indent_using_block-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/indent_using_block-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/mda_space_a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/mda_space_a.cfg
index b05558b7..b05558b7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/mda_space_a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/mda_space_a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/mda_space_c.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/mda_space_c.cfg
index 9bfcef37..9bfcef37 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/mda_space_c.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/mda_space_c.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/misc-failures.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/misc-failures.cfg
index 36b9e694..36b9e694 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/misc-failures.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/misc-failures.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/mod_full_brace_nl_block_rem_mlcond-0.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/mod_full_brace_nl_block_rem_mlcond-0.cfg
index c187d46a..c187d46a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/mod_full_brace_nl_block_rem_mlcond-0.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.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.75.0/tests/config/cs/mod_full_brace_nl_block_rem_mlcond-1.cfg
new file mode 100644
index 00000000..13ebbd4a
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/mod_full_brace_nl_block_rem_mlcond-1.cfg
@@ -0,0 +1,2 @@
+mod_full_brace_if_chain         = 1
+mod_full_brace_nl_block_rem_mlcond = true
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/mod_full_paren_if_bool.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/mod_full_paren_if_bool.cfg
index f75f8801..f75f8801 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/mod_full_paren_if_bool.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/mod_full_paren_if_bool.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/mod_sort_using-t.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/mod_sort_using-t.cfg
index 805fc734..805fc734 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/mod_sort_using-t.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/mod_sort_using-t.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/mono.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/mono.cfg
index 726b1eda..726b1eda 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/mono.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/mono.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/new-constraint-paren-space.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/new-constraint-paren-space.cfg
index f96e03b6..f96e03b6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/new-constraint-paren-space.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/new-constraint-paren-space.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/sf607.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/sf607.cfg
index ac5c0069..ac5c0069 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/sf607.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/sf607.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/sort_using_categ.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/sort_using_categ.cfg
index bf7f26e6..bf7f26e6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/sort_using_categ.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/sort_using_categ.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/sp_after_comma-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/sp_after_comma-a.cfg
index 3f67ae0e..3f67ae0e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/sp_after_comma-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/sp_after_comma-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/sp_assign-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/sp_assign-a.cfg
index 78ee09f5..78ee09f5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/sp_assign-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/sp_assign-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/sp_between_new_paren.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/sp_between_new_paren.cfg
index 0a338bd2..0a338bd2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/sp_between_new_paren.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/sp_between_new_paren.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/squeeze-paren-close-Option.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/squeeze-paren-close-Option.cfg
index 9d4a4f70..9d4a4f70 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/squeeze-paren-close-Option.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/squeeze-paren-close-Option.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/tcf.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/tcf.cfg
index dd7fa193..dd7fa193 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/tcf.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/tcf.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/verbatim_strings.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/verbatim_strings.cfg
index 65e1756d..65e1756d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/verbatim_strings.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/cs/verbatim_strings.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/d/1438.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/d/1438.cfg
index 6973c22f..6973c22f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/d/1438.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/d/1438.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/d/d-tst2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/d/d-tst2.cfg
index db15aa59..db15aa59 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/d/d-tst2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/d/d-tst2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/d/d2-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/d/d2-i.cfg
index b2f0f87a..b2f0f87a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/d/d2-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/d/d2-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/d/d2-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/d/d2-r.cfg
index 888247f8..888247f8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/d/d2-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/d/d2-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/d/d2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/d/d2.cfg
index e7a7bca1..e7a7bca1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/d/d2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/d/d2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/d/d3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/d/d3.cfg
index 53a311b0..53a311b0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/d/d3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/d/d3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/d/d3a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/d/d3a.cfg
index f3cf7bb8..f3cf7bb8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/d/d3a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/d/d3a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/d/d_sp_paren.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/d/d_sp_paren.cfg
index 5b3443e6..5b3443e6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/d/d_sp_paren.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/d/d_sp_paren.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/d/invariant.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/d/invariant.cfg
index a462b4d0..a462b4d0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/d/invariant.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/d/invariant.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/d/libd.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/d/libd.cfg
index a29c77a4..a29c77a4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/d/libd.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/d/libd.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/d/sp_after_type-a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/d/sp_after_type-a.cfg
index da7a3edb..da7a3edb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/d/sp_after_type-a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/d/sp_after_type-a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/ecma/ben_098.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/ecma/ben_098.cfg
index 9dddd073..9dddd073 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/ecma/ben_098.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/ecma/ben_098.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/Issue_1122.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/Issue_1122.cfg
index 8a152eda..8a152eda 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/Issue_1122.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/Issue_1122.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/Issue_1124-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/Issue_1124-f.cfg
index bec692b6..bec692b6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/Issue_1124-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/Issue_1124-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/Issue_1124-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/Issue_1124-r.cfg
index 1c610373..1c610373 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/Issue_1124-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/Issue_1124-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/Issue_1845.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/Issue_1845.cfg
index 5d339f68..5d339f68 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/Issue_1845.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/Issue_1845.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/Issue_670.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/Issue_670.cfg
index 504b1d7d..504b1d7d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/Issue_670.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/Issue_670.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/annotation.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/annotation.cfg
index 0d800a82..0d800a82 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/annotation.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/annotation.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/ben_099.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/ben_099.cfg
index 6cd10860..6cd10860 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/ben_099.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/ben_099.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/doxy-javadoc-alignment.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/doxy-javadoc-alignment.cfg
index 786a9ac7..786a9ac7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/doxy-javadoc-alignment.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/doxy-javadoc-alignment.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/java_foreach.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/java_foreach.cfg
index 56ec94cd..56ec94cd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/java_foreach.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/java_foreach.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/java_synchronized_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/java_synchronized_1.cfg
index e57bba91..e57bba91 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/java_synchronized_1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/java_synchronized_1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/java_synchronized_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/java_synchronized_2.cfg
index 3512cdc8..3512cdc8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/java_synchronized_2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/java_synchronized_2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/jdbi-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/jdbi-f.cfg
index fde00f38..fde00f38 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/jdbi-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/jdbi-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/jdbi-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/jdbi-r.cfg
index ed2a6942..ed2a6942 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/jdbi-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/jdbi-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/leading-tabs-for-java-lambda.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/leading-tabs-for-java-lambda.cfg
index ba1f063e..ba1f063e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/leading-tabs-for-java-lambda.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/leading-tabs-for-java-lambda.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/mod_add_long_class_closebrace_comment-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/mod_add_long_class_closebrace_comment-1.cfg
index c1e8e0ac..c1e8e0ac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/mod_add_long_class_closebrace_comment-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/mod_add_long_class_closebrace_comment-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/nl_after_annotation-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/nl_after_annotation-f.cfg
index 405f8ef4..405f8ef4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/nl_after_annotation-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/nl_after_annotation-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/nl_between_annotation-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/nl_between_annotation-f.cfg
index 6a67c354..6a67c354 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/nl_between_annotation-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/nl_between_annotation-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/reflow_fold_regex.txt b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/reflow_fold_regex.txt
index 9a24626f..9a24626f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/reflow_fold_regex.txt
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/reflow_fold_regex.txt
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/sp_after_for_colon.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/sp_after_for_colon.cfg
index 70b19e50..70b19e50 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/sp_after_for_colon.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/sp_after_for_colon.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/sp_this_paren.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/sp_this_paren.cfg
index fc80bb28..fc80bb28 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/sp_this_paren.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/sp_this_paren.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/template_angles.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/template_angles.cfg
index 14680e53..14680e53 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/java/template_angles.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/java/template_angles.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/1927.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/1927.cfg
index 3734f63d..3734f63d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/1927.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/1927.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/Issue_2172.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/Issue_2172.cfg
index a4da88d2..a4da88d2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/Issue_2172.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/Issue_2172.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/Issue_681.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/Issue_681.cfg
index 901b0c8e..901b0c8e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/Issue_681.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/Issue_681.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/U08-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/U08-Cpp.cfg
index 1a8d9ead..1a8d9ead 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/U08-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/U08-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/U09-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/U09-Cpp.cfg
index e8b4846a..e8b4846a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/U09-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/U09-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/U10-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/U10-Cpp.cfg
index 76c1c8c3..76c1c8c3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/U10-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/U10-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/U11-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/U11-Cpp.cfg
index 07ba9e26..07ba9e26 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/U11-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/U11-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/U12-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/U12-Cpp.cfg
index 581594ac..581594ac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/U12-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/U12-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/U13-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/U13-Cpp.cfg
index 162b13d4..162b13d4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/U13-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/U13-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/U14-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/U14-Cpp.cfg
index 967ea74d..967ea74d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/U14-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/U14-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/U15-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/U15-Cpp.cfg
index 0d78de45..0d78de45 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/U15-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/U15-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/U24-Cpp.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/U24-Cpp.cfg
index bc46ae54..bc46ae54 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/U24-Cpp.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/U24-Cpp.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/UNI-11095.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/UNI-11095.cfg
index f5cc4ceb..805f779e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/cs/UNI-11095.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/UNI-11095.cfg
@@ -37,8 +37,8 @@ indent_col1_comment=false
 indent_label=-4
 indent_access_spec=-4
 indent_paren_nl=false
-indent_comma_paren=false
-indent_bool_paren=false
+indent_comma_paren=0
+indent_bool_paren=0
 indent_first_bool_expr=false
 indent_square_nl=false
 indent_preserve_sql=false
@@ -222,7 +222,7 @@ nl_property_brace=force
 eat_blanks_after_open_brace=true
 eat_blanks_before_close_brace=true
 nl_after_return=false
-mod_full_brace_if_chain=false
+mod_full_brace_if_chain=0
 mod_paren_on_return=ignore
 mod_pawn_semicolon=false
 mod_full_paren_if_bool=false
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/align-objc-like-xcode.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/align-objc-like-xcode.cfg
index 3b321b11..3b321b11 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/align-objc-like-xcode.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/align-objc-like-xcode.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/align_oc_msg_colon_span-1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/align_oc_msg_colon_span-1.cfg
index 9681d152..9681d152 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/align_oc_msg_colon_span-1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/align_oc_msg_colon_span-1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/block_pointer.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/block_pointer.cfg
index 70c21bbd..70c21bbd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/block_pointer.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/block_pointer.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/blocks.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/blocks.cfg
index 74ed7e4f..74ed7e4f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/blocks.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/blocks.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/bug_167.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/bug_167.cfg
index 6ed02f2e..6ed02f2e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/bug_167.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/bug_167.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/bug_340.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/bug_340.cfg
index f56e7a43..f56e7a43 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/bug_340.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/bug_340.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/bug_841.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/bug_841.cfg
index 2ab54cc1..2ab54cc1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/bug_841.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/bug_841.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/bug_i_125-412.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/bug_i_125-412.cfg
index 2498ac1b..2498ac1b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/bug_i_125-412.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/bug_i_125-412.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/delete-space-oc.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/delete-space-oc.cfg
index 4d8a15cb..4d8a15cb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/delete-space-oc.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/delete-space-oc.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/double-indent-objc-dict.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/double-indent-objc-dict.cfg
index d4e9a1ae..d4e9a1ae 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/double-indent-objc-dict.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/double-indent-objc-dict.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/double_angle_space_1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/double_angle_space_1.cfg
index 73319da9..73319da9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/double_angle_space_1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/double_angle_space_1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/double_angle_space_2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/double_angle_space_2.cfg
index 8d12b193..8d12b193 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/double_angle_space_2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/double_angle_space_2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/double_angle_space_3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/double_angle_space_3.cfg
index da6a41c2..da6a41c2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/double_angle_space_3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/double_angle_space_3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/gh137.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/gh137.cfg
index 83da02ee..83da02ee 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/gh137.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/gh137.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/gh293.a.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/gh293.a.cfg
index e875a54b..e875a54b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/gh293.a.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/gh293.a.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/gh293.b.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/gh293.b.cfg
index 1dc357ae..1dc357ae 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/gh293.b.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/gh293.b.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/indent-objc-block.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/indent-objc-block.cfg
index aee5aace..aee5aace 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/indent-objc-block.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/indent-objc-block.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/indent_boxed.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/indent_boxed.cfg
index e20f0820..e20f0820 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/indent_boxed.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/indent_boxed.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/indent_oc_inside_msg_sel.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/indent_oc_inside_msg_sel.cfg
index b140f071..b140f071 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/indent_oc_inside_msg_sel.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/indent_oc_inside_msg_sel.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/indent_single_newline.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/indent_single_newline.cfg
index 1496b522..1496b522 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/indent_single_newline.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/indent_single_newline.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/issue_2643.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/issue_2643.cfg
index 7f188f21..7f188f21 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/issue_2643.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/issue_2643.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/issue_2656.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/issue_2656.cfg
index 3b020c33..3b020c33 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/issue_2656.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/issue_2656.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/issue_2675.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/issue_2675.cfg
index 0eab0244..0eab0244 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/issue_2675.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/issue_2675.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/issue_3031.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/issue_3031.cfg
index 8234c643..8234c643 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/issue_3031.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/issue_3031.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/mod_sort_incl_import_grouping_enabled.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/mod_sort_incl_import_grouping_enabled.cfg
index d88bf262..d88bf262 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/mod_sort_incl_import_grouping_enabled.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/mod_sort_incl_import_grouping_enabled.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/mod_sort_incl_import_ignore_extension.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/mod_sort_incl_import_ignore_extension.cfg
index d49491cb..d49491cb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/mod_sort_incl_import_ignore_extension.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/mod_sort_incl_import_ignore_extension.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/mod_sort_incl_import_prioritize_angle_over_quotes.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/mod_sort_incl_import_prioritize_angle_over_quotes.cfg
index 475ab734..475ab734 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/mod_sort_incl_import_prioritize_angle_over_quotes.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/mod_sort_incl_import_prioritize_angle_over_quotes.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/mod_sort_incl_import_prioritize_extensionless.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/mod_sort_incl_import_prioritize_extensionless.cfg
index aa9eb1db..aa9eb1db 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/mod_sort_incl_import_prioritize_extensionless.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/mod_sort_incl_import_prioritize_extensionless.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/mod_sort_incl_import_prioritize_filename.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/mod_sort_incl_import_prioritize_filename.cfg
index 2661a68a..2661a68a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/mod_sort_incl_import_prioritize_filename.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/mod_sort_incl_import_prioritize_filename.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/nl_after_func_body-3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/nl_after_func_body-3.cfg
index 65f1fa5a..65f1fa5a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/nl_after_func_body-3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/nl_after_func_body-3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/nl_brace_square.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/nl_brace_square.cfg
index e0f11f90..e0f11f90 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/nl_brace_square.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/nl_brace_square.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/nl_func_call_args_multi_line_ignore_closures.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/nl_func_call_args_multi_line_ignore_closures.cfg
index e480140e..e480140e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/nl_func_call_args_multi_line_ignore_closures.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/nl_func_call_args_multi_line_ignore_closures.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/nl_oc_block_brace-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/nl_oc_block_brace-f.cfg
index 824fc747..824fc747 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/nl_oc_block_brace-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/nl_oc_block_brace-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/obj-c-available.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/obj-c-available.cfg
index f77790fc..f77790fc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/obj-c-available.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/obj-c-available.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/obj-c-properties.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/obj-c-properties.cfg
index 98241779..98241779 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/obj-c-properties.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/obj-c-properties.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/objc_bug_497.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/objc_bug_497.cfg
index 0015f97d..0015f97d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/objc_bug_497.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/objc_bug_497.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/objc_complex_method.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/objc_complex_method.cfg
index 3e713117..3e713117 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/objc_complex_method.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/objc_complex_method.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/oc1.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/oc1.cfg
index 659131cf..659131cf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/oc1.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/oc1.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/oc10.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/oc10.cfg
index d50a20d8..d50a20d8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/oc10.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/oc10.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/oc11.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/oc11.cfg
index e355d765..e355d765 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/oc11.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/oc11.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/oc12.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/oc12.cfg
index 4f069fed..4f069fed 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/oc12.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/oc12.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/oc13.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/oc13.cfg
index 925a2739..925a2739 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/oc13.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/oc13.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/oc14.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/oc14.cfg
index a44950db..a44950db 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/oc14.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/oc14.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/oc16.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/oc16.cfg
index 5eec46e9..5eec46e9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/oc16.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/oc16.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/oc17.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/oc17.cfg
index 18b27823..18b27823 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/oc17.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/oc17.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/oc18.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/oc18.cfg
index 96003cf5..96003cf5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/oc18.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/oc18.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/oc19.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/oc19.cfg
index d68c95f0..d68c95f0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/oc19.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/oc19.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/oc2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/oc2.cfg
index 43d02a66..43d02a66 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/oc2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/oc2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/oc4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/oc4.cfg
index f2de050e..f2de050e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/oc4.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/oc4.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/oc5.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/oc5.cfg
index 77a7a7af..77a7a7af 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/oc5.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/oc5.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/oc6.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/oc6.cfg
index c1bcd8d4..c1bcd8d4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/oc6.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/oc6.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/oc7.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/oc7.cfg
index 972ab19a..972ab19a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/oc7.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/oc7.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/oc8.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/oc8.cfg
index 3f577ab8..3f577ab8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/oc8.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/oc8.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/oc9.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/oc9.cfg
index 92ed39d4..92ed39d4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/oc9.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/oc9.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/oc_bug_1674.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/oc_bug_1674.cfg
index 31e4537c..31e4537c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/oc_bug_1674.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/oc_bug_1674.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/oc_bug_1683.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/oc_bug_1683.cfg
index b5d4249d..b5d4249d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/oc_bug_1683.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/oc_bug_1683.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/oc_cond_colon.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/oc_cond_colon.cfg
index b86516e0..b86516e0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/oc_cond_colon.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/oc_cond_colon.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_after_oc_at_sel_add.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_after_oc_at_sel_add.cfg
index 817ec7c5..817ec7c5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_after_oc_at_sel_add.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_after_oc_at_sel_add.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_after_oc_at_sel_force.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_after_oc_at_sel_force.cfg
index b2a79b8f..b2a79b8f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_after_oc_at_sel_force.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_after_oc_at_sel_force.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_after_oc_at_sel_remove.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_after_oc_at_sel_remove.cfg
index 98b6de42..98b6de42 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_after_oc_at_sel_remove.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_after_oc_at_sel_remove.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_after_oc_block_caret_add.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_after_oc_block_caret_add.cfg
index 56e22330..56e22330 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_after_oc_block_caret_add.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_after_oc_block_caret_add.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_after_oc_block_caret_force.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_after_oc_block_caret_force.cfg
index 516271f1..516271f1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_after_oc_block_caret_force.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_after_oc_block_caret_force.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_after_oc_return_type_add.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_after_oc_return_type_add.cfg
index b321b9aa..b321b9aa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_after_oc_return_type_add.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_after_oc_return_type_add.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_after_oc_return_type_force.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_after_oc_return_type_force.cfg
index fb8b9a1b..fb8b9a1b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_after_oc_return_type_force.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_after_oc_return_type_force.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_after_oc_return_type_remove.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_after_oc_return_type_remove.cfg
index 1110a1eb..1110a1eb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_after_oc_return_type_remove.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_after_oc_return_type_remove.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_after_send_oc_colon-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_after_send_oc_colon-f.cfg
index 2a54dd6f..2a54dd6f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_after_send_oc_colon-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_after_send_oc_colon-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_after_throw_remove.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_after_throw_remove.cfg
index 6b6bc0ac..6b6bc0ac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_after_throw_remove.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_after_throw_remove.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_before_oc_block_caret_force.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_before_oc_block_caret_force.cfg
index 727fcf06..727fcf06 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_before_oc_block_caret_force.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_before_oc_block_caret_force.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_before_oc_block_caret_remove.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_before_oc_block_caret_remove.cfg
index 37c6104a..37c6104a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_before_oc_block_caret_remove.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_before_oc_block_caret_remove.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_before_oc_proto_list_add.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_before_oc_proto_list_add.cfg
index 3374e228..3374e228 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_before_oc_proto_list_add.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_before_oc_proto_list_add.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_before_oc_proto_list_force.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_before_oc_proto_list_force.cfg
index 5be78fac..5be78fac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_before_oc_proto_list_force.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_before_oc_proto_list_force.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_before_oc_proto_list_remove.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_before_oc_proto_list_remove.cfg
index 9f93f4a5..9f93f4a5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_before_oc_proto_list_remove.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_before_oc_proto_list_remove.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_block_as_argument.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_block_as_argument.cfg
index 60c651fb..60c651fb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_block_as_argument.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_block_as_argument.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_block_as_argument2.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_block_as_argument2.cfg
index 8f297d7d..8f297d7d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_block_as_argument2.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_block_as_argument2.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_block_as_argument3.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_block_as_argument3.cfg
index 17059e47..17059e47 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_block_as_argument3.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_block_as_argument3.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_block_as_argument4.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_block_as_argument4.cfg
index 8caf60bc..8caf60bc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_block_as_argument4.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_block_as_argument4.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_block_as_argument5.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_block_as_argument5.cfg
index 42e8c380..42e8c380 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_block_as_argument5.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_block_as_argument5.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_cond_ternary_short.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_cond_ternary_short.cfg
index 564b2dcf..564b2dcf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_cond_ternary_short.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_cond_ternary_short.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_enum_paren-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_enum_paren-i.cfg
index 5bb98ec2..5bb98ec2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_enum_paren-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_enum_paren-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_enum_paren-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_enum_paren-r.cfg
index f155e201..f155e201 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_enum_paren-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_enum_paren-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_oc_boxed.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_oc_boxed.cfg
index 73939de1..73939de1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_oc_boxed.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_oc_boxed.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_oc_catch-i.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_oc_catch-i.cfg
index 98e8f829..98e8f829 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_oc_catch-i.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_oc_catch-i.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_oc_catch-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_oc_catch-r.cfg
index 789e2872..789e2872 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_oc_catch-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_oc_catch-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_oc_catch.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_oc_catch.cfg
index 7367541a..7367541a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_oc_catch.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_oc_catch.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_oc_classname_paren-r.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_oc_classname_paren-r.cfg
index ba92279e..ba92279e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_oc_classname_paren-r.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_oc_classname_paren-r.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_oc_synchronized.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_oc_synchronized.cfg
index 5056f70f..5056f70f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/sp_oc_synchronized.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/sp_oc_synchronized.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/ternary_short.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/ternary_short.cfg
index 55e708cf..55e708cf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/oc/ternary_short.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/oc/ternary_short.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/pawn/Issue_2586.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/pawn/Issue_2586.cfg
index ff46f80d..ff46f80d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/pawn/Issue_2586.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/pawn/Issue_2586.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/pawn/Issue_2665.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/pawn/Issue_2665.cfg
index 763864c0..763864c0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/pawn/Issue_2665.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/pawn/Issue_2665.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/pawn/amxmodx.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/pawn/amxmodx.cfg
index 2c87c362..2c87c362 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/pawn/amxmodx.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/pawn/amxmodx.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/pawn/mod_full_brace_function-f.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/pawn/mod_full_brace_function-f.cfg
index 8d44cc3b..8d44cc3b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/pawn/mod_full_brace_function-f.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/pawn/mod_full_brace_function-f.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/pawn/pawn-escape.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/pawn/pawn-escape.cfg
index 8d10ec23..8d10ec23 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/pawn/pawn-escape.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/pawn/pawn-escape.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/pawn/pawn.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/pawn/pawn.cfg
index 7859328a..7859328a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/pawn/pawn.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/pawn/pawn.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/staging/UNI-58354.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/staging/UNI-58354.cfg
index fb9ca61b..fb9ca61b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/staging/UNI-58354.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/staging/UNI-58354.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/staging/UNI-64325.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/staging/UNI-64325.cfg
index 44ee8b48..44ee8b48 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/staging/UNI-64325.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.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.75.0/tests/config/vala/Issue_2090.cfg
new file mode 100644
index 00000000..154cff70
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/vala/Issue_2090.cfg
@@ -0,0 +1,2 @@
+sp_before_ptr_star = force
+sp_cond_question = add
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/vala/Issue_2270.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/vala/Issue_2270.cfg
index 43cc3757..43cc3757 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/vala/Issue_2270.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/vala/Issue_2270.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/vala/ben_100.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/vala/ben_100.cfg
index 81cd4430..81cd4430 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/vala/ben_100.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/vala/ben_100.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/vala/ben_101.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/vala/ben_101.cfg
index 50078f96..50078f96 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/vala/ben_101.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/vala/ben_101.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/vala/ben_102.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/vala/ben_102.cfg
index 82fa033c..82fa033c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/vala/ben_102.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/vala/ben_102.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/vala/ben_103.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/vala/ben_103.cfg
index 3d212ad4..3d212ad4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/vala/ben_103.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/vala/ben_103.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/vala/ben_104.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/vala/ben_104.cfg
index 80870cfe..80870cfe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/vala/ben_104.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/vala/ben_104.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/vala/ben_105.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/vala/ben_105.cfg
index 23452bfd..23452bfd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/config/vala/ben_105.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/vala/ben_105.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/vala/nullable.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/vala/nullable.cfg
new file mode 100644
index 00000000..5c47913d
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/config/vala/nullable.cfg
@@ -0,0 +1 @@
+sp_before_ptr_star = remove
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cpp.test b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cpp.test
index 87620719..e096efed 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/cpp.test
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/cpp.test
@@ -152,6 +152,12 @@
 30131  cpp/Issue_3010.cfg                                   cpp/Issue_3010.cpp
 30132  cpp/sp_brace_catch.cfg                               cpp/sp_brace_catch.cpp
 30133  cpp/Issue_3252.cfg                                   cpp/Issue_3252.cpp
+30134  cpp/Issue_3357.cfg                                   cpp/Issue_3357.cpp
+30135  cpp/Issue_3448.cfg                                   cpp/Issue_3448.cpp
+30136  cpp/Issue_3413.cfg                                   cpp/Issue_3413.cpp
+30137  cpp/Issue_3513.cfg                                   cpp/Issue_3513-0.cpp
+30138  cpp/Issue_3513.cfg                                   cpp/Issue_3513-1.cpp
+30139  cpp/Issue_3604.cfg                                   cpp/Issue_3604.cpp
 
 30200  cpp/bug_1862.cfg                                     cpp/bug_1862.cpp
 30201  cpp/cmt_indent-1.cfg                                 cpp/cmt_indent.cpp
@@ -172,12 +178,9 @@
 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/sp_trailing_return-f.cfg                         cpp/trailing_return.cpp
-30219  cpp/sp_trailing_return-r.cfg                         cpp/trailing_return.cpp
 
 30220  cpp/bug_1340.cfg                                     cpp/bug_1340.cpp
 30221  cpp/Issue_2914.cfg                                   cpp/Issue_2914.cpp
-30222  cpp/sp_assign_default.cfg                            cpp/trailing_return.cpp
 30223  cpp/sp_enum_colon.cfg                                cpp/sp_enum_colon.cpp
 30224  cpp/sp_enum_colon-r.cfg                              cpp/sp_enum_colon.cpp
 30225  common/empty.cfg                                     cpp/Issue_3176.cpp
@@ -192,6 +195,7 @@
 30233  cpp/sp_type_func-2.cfg                               cpp/sp_type_func.cpp
 30234  cpp/functype_param-r.cfg                             cpp/functype_param.cpp
 30235  cpp/functype_param-f.cfg                             cpp/functype_param.cpp
+30236  cpp/Issue_750.cfg                                    cpp/Issue_750.cpp
 
 30240  cpp/align_func_params-t.cfg                          cpp/align_func_params.cpp
 30241  cpp/align_func_params_span-1.cfg                     cpp/align_func_params.cpp
@@ -237,6 +241,8 @@
 30281  cpp/Issue_2478.cfg                                   cpp/Issue_2478.cpp
 30282  cpp/Issue_2703.cfg                                   cpp/Issue_2703.cpp
 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
 
 30290  cpp/indent_shift.cfg                                 cpp/align_left_shift.cpp
 30291  cpp/indent_shift.cfg                                 cpp/indent_shift.cpp
@@ -317,10 +323,12 @@
 30753  cpp/lambda3.cfg                                      cpp/lambda2.cpp
 30754  cpp/indent_with_tabs-0.cfg                           cpp/bug_i_682.h
 30755  common/empty.cfg                                     cpp/bug_i_938.h
-30756  cpp/bug_1296.cfg                                     cpp/bug_1296.cpp
+30756  cpp/bug_1296-T.cfg                                   cpp/bug_1296.cpp
 30757  cpp/Issue_3054.cfg                                   cpp/Issue_3054.cpp
 30758  cpp/Issue_3054-2.cfg                                 cpp/Issue_3054-2.cpp
+30759  cpp/lambda4.cfg                                      cpp/lambda2.cpp
 
+30760  cpp/bug_1296-F.cfg                                   cpp/bug_1296.cpp
 30761  cpp/out-668-F.cfg                                    cpp/out-668.cpp
 30762  cpp/out-668-T.cfg                                    cpp/out-668.cpp
 30763  cpp/Issue_2166.cfg                                   cpp/Issue_2166.cpp
@@ -493,6 +501,16 @@
 31103  cpp/nl_before_brace_open_2.cfg                       cpp/nl_before_brace_open_test.cpp
 31104  cpp/nl_before_brace_open_3.cfg                       cpp/nl_before_brace_open_test.cpp
 
+31400  cpp/sp_trailing_return-f.cfg                         cpp/trailing_return.cpp
+31401  cpp/sp_trailing_return-r.cfg                         cpp/trailing_return.cpp
+31402  cpp/sp_assign_default.cfg                            cpp/trailing_return.cpp
+31403  cpp/sp_trailing_return_byref_ptr-left.cfg            cpp/trailing_return_byref_ptr.cpp
+31404  cpp/sp_trailing_return_byref_ptr-right.cfg           cpp/trailing_return_byref_ptr.cpp
+
+31450  cpp/indent_paren_close_0.cfg                         cpp/indent_func_alias_prototype.cpp
+31451  cpp/indent_paren_close_1.cfg                         cpp/indent_func_alias_prototype.cpp
+31452  cpp/indent_paren_close_2.cfg                         cpp/indent_func_alias_prototype.cpp
+
 31562  cpp/space_indent_class-t_columns-4.cfg               cpp/sf562.cpp
 31567  common/align_same_func_call_params-t.cfg             cpp/sf567.cpp
 31568  cpp/Issue_2368.cfg                                   cpp/Issue_2368.cpp
@@ -543,6 +561,7 @@
 31634  cpp/sp_after_decltype-r.cfg                          cpp/sp_after_decltype.cpp
 31635  common/empty.cfg                                     cpp/sp_decltype.cpp
 31636  cpp/Issue_1923.cfg                                   cpp/Issue_1923.cpp
+31637  cpp/Issue_3446.cfg                                   cpp/Issue_3446.cpp
 
 31660  cpp/nl_func_var_def_blk-1.cfg                        cpp/issue_1919.cpp
 31661  cpp/Issue_3097.cfg                                   cpp/Issue_3097.cpp
@@ -571,6 +590,8 @@
 32006  common/space_indent_columns-4.cfg                    cpp/bug_i_687.cpp
 32007  cpp/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
 
 32100  cpp/cpp17.cfg                                        cpp/cpp17.cpp
 32105  cpp/I2103.cfg                                        cpp/I2103.cpp
@@ -645,9 +666,13 @@
 
 33060  common/empty.cfg                                     cpp/if_constexpr.cpp
 33061  common/empty.cfg                                     cpp/if_chain_braces.cpp
-33062  cpp/mod_full_brace_if_chain-t.cfg                    cpp/if_chain_braces.cpp
+33062  cpp/mod_full_brace_if_chain-1.cfg                    cpp/if_chain_braces.cpp
 33063  common/mod_full_brace_if_chain_only-t.cfg            cpp/if_chain_braces.cpp
 33064  cpp/if_chain_braces_2.cfg                            cpp/if_chain_braces.cpp
+33065  cpp/Issue_3316.cfg                                   cpp/Issue_3316.cpp
+33066  cpp/mod_full_brace_if_chain-2.cfg                    cpp/if_chain_braces.cpp
+33067  cpp/mod_full_brace_if_chain-3.cfg                    cpp/if_chain_braces.cpp
+
 33069  cpp/Issue_2195.cfg                                   cpp/Issue_2195.cpp
 
 33070  cpp/code_width-70.cfg                                cpp/multi_line.cpp
@@ -703,6 +728,7 @@
 
 33160  common/sp_before_byref-r.cfg                         cpp/bug_1112.cpp
 33161  common/sp_before_byref-r.cfg                         cpp/byref-3.cpp
+33162  cpp/sp_not_not.cfg                                   cpp/sp_not_not.cpp
 
 33180  cpp/pp_multi_comment.cfg                             cpp/pp_multi_comment.cpp
 33181  cpp/Issue_2759.cfg                                   cpp/Issue_2759.cpp
@@ -800,6 +826,7 @@
 34176  cpp/align_assign_span-1.cfg                          cpp/i1509_bug_1112_correction.cpp
 34177  cpp/sp_func_call_paren.cfg                           cpp/sp_func_call_paren.cpp
 34178  cpp/Issue_3237.cfg                                   cpp/Issue_3237.cpp
+34179  cpp/arith-vs-byref.cfg                               cpp/arith_vs_byref.cpp
 
 34180  cpp/bug_1402.cfg                                     cpp/bug_1402.cpp
 
@@ -944,6 +971,11 @@
 34535  cpp/template_sp-ignore.cfg                           cpp/sp_after_angle.cpp
 34536  cpp/template_sp-remove.cfg                           cpp/sp_after_angle.cpp
 
+34540  cpp/sp_byref_paren-i.cfg                             cpp/byref-4.cpp
+34541  cpp/sp_byref_paren-a.cfg                             cpp/byref-4.cpp
+34542  cpp/sp_byref_paren-r.cfg                             cpp/byref-4.cpp
+34543  cpp/sp_byref_paren-f.cfg                             cpp/byref-4.cpp
+
 # Adopt some UT tests
 10000  common/empty.cfg                                     cpp/621_this-spacing.cpp
 10001  common/empty.cfg                                     cpp/622_ifdef-indentation.cpp
@@ -1029,7 +1061,6 @@
 60048  cpp/bug_2322.cfg                                     cpp/bug_2322.cpp
 60049  cpp/bug_2402.cfg                                     cpp/bug_2402.cpp
 
-60050  cpp/mod_remove_extra_semicolon-t.cfg                 cpp/semicolon-removal-after-ternary-operator.cpp
 60051  cpp/bug_2371.cfg                                     cpp/bug_2371.cpp
 60052  cpp/bug_2433_1.cfg                                   cpp/bug_2433_1.cpp
 60053  cpp/bug_2433_2.cfg                                   cpp/bug_2433_2.cpp
@@ -1039,9 +1070,33 @@
 60057  cpp/issue_3116-2.cfg                                 cpp/issue_3116.cpp
 60058  cpp/sp_constr_colon-i.cfg                            cpp/issue_3330.cpp
 60059  cpp/indent_ctor_init_leading.cfg                     cpp/indent_ctor_init.cpp
+
 60060  cpp/sp_return-a.cfg                                  cpp/returns.cpp
 60061  cpp/sp_return-f.cfg                                  cpp/returns.cpp
 60062  cpp/sp_return-i.cfg                                  cpp/returns.cpp
 60063  cpp/sp_return-r.cfg                                  cpp/returns.cpp
 60064  cpp/sp_constr_colon-i.cfg                            cpp/issue_3368.cpp
 60065  cpp/issue_3378.cfg                                   cpp/issue_3378.cpp
+60066  cpp/Issue_3409.cfg                                   cpp/Issue_3409.cpp
+60067  common/empty.cfg                                     cpp/Issue_3283.cpp
+60068  cpp/Issue_3428.cfg                                   cpp/Issue_3428.cpp
+60069  cpp/Issue_3428_2.cfg                                 cpp/Issue_3428.cpp
+
+60070  cpp/Issue_3428_3.cfg                                 cpp/Issue_3428.cpp
+60071  cpp/Issue_3428_4.cfg                                 cpp/Issue_3428.cpp
+60072  cpp/Issue_3428_5.cfg                                 cpp/Issue_3428.cpp
+60073  cpp/Issue_3428_6.cfg                                 cpp/Issue_3428.cpp
+60074  cpp/Issue_3284.cfg                                   cpp/Issue_3284.cpp
+60075  cpp/Issue_3294.cfg                                   cpp/Issue_3294.cpp
+60076  cpp/indent_ignore_before_class_colon-t.cfg           cpp/indent_ctor_init.cpp
+60077  cpp/indent_ignore_before_constr_colon-t.cfg          cpp/indent_ctor_init.cpp
+60078  cpp/indent_func_proto_param-t.cfg                    cpp/Issue_3505.cpp
+60079  common/empty.cfg                                     cpp/Issue_3536.cpp
+
+60080  common/empty.cfg                                     cpp/Issue_3538.cpp
+60081  cpp/Issue_3546.cfg                                   cpp/Issue_3546.cpp
+60082  cpp/Issue_3552.cfg                                   cpp/Issue_3552.cpp
+60083  cpp/Issue_3570.cfg                                   cpp/Issue_3570.h
+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
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/d.test b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/d.test
index 520a8c3a..520a8c3a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/d.test
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/d.test
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/difftest.sh b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/difftest.sh
index 053cae17..053cae17 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/difftest.sh
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/difftest.sh
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/ecma.test b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/ecma.test
index 632f3015..632f3015 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/ecma.test
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/ecma.test
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00000-comment-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00000-comment-indent.c
index b59ab389..b59ab389 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00000-comment-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00000-comment-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00001-comment-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00001-comment-indent.c
index e4ba53de..e4ba53de 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00001-comment-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00001-comment-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00002-comment-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00002-comment-indent.c
index 09ca01ac..09ca01ac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00002-comment-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00002-comment-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00003-comment-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00003-comment-indent.c
index 0f906f2f..0f906f2f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00003-comment-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00003-comment-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00004-switch.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00004-switch.c
index ffb54327..ffb54327 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00004-switch.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00004-switch.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00005-cmt-align.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00005-cmt-align.c
index 5e773be1..5e773be1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00005-cmt-align.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00005-cmt-align.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00006-comment-convert.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00006-comment-convert.c
index c7a019f7..c7a019f7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00006-comment-convert.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00006-comment-convert.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00007-comment-convert.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00007-comment-convert.c
index 886d7698..886d7698 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00007-comment-convert.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00007-comment-convert.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00008-comment-convert.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00008-comment-convert.c
index c2af0f8b..c2af0f8b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00008-comment-convert.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00008-comment-convert.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00009-comment-convert.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00009-comment-convert.c
index 0d3f218a..0d3f218a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00009-comment-convert.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00009-comment-convert.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00010-braces.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00010-braces.c
index c4dc5faf..c4dc5faf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00010-braces.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00010-braces.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00011-braces.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00011-braces.c
index 893a32f6..893a32f6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00011-braces.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00011-braces.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00012-braces.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00012-braces.c
index 851f4df9..851f4df9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00012-braces.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00012-braces.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00013-braces.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00013-braces.c
index 2adcab76..2adcab76 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00013-braces.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00013-braces.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00014-braces.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00014-braces.c
index 1966a0c7..1966a0c7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00014-braces.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00014-braces.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00015-braces.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00015-braces.c
index c29cdecd..c29cdecd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00015-braces.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00015-braces.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00016-braces.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00016-braces.c
index ce7df756..ce7df756 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00016-braces.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00016-braces.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00020-define-if-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00020-define-if-indent.c
index f7efd78c..f7efd78c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00020-define-if-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00020-define-if-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00050-brace-remove.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00050-brace-remove.c
index 857e4031..857e4031 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00050-brace-remove.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00050-brace-remove.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00051-brace-remove.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00051-brace-remove.c
index bef3e64d..bef3e64d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00051-brace-remove.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00051-brace-remove.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00052-brace-remove2.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00052-brace-remove2.c
index 30f352c6..30f352c6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00052-brace-remove2.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00052-brace-remove2.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00053-brace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00053-brace.c
index 55c45a57..55c45a57 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00053-brace.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00053-brace.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00054-if_chain.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00054-if_chain.c
index a6e0c561..a6e0c561 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00054-if_chain.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00054-if_chain.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00055-braces-2.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00055-braces-2.c
index 38447f86..38447f86 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00055-braces-2.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00055-braces-2.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00056-brace-remove3.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00056-brace-remove3.c
index 258ca555..258ca555 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00056-brace-remove3.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00056-brace-remove3.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00057-brace-remove3.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00057-brace-remove3.c
index 26b22e2c..26b22e2c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00057-brace-remove3.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00057-brace-remove3.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00058-if_chain.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00058-if_chain.c
index ba15dc8e..ba15dc8e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00058-if_chain.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00058-if_chain.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00060-braces-2.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00060-braces-2.c
index 38447f86..38447f86 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00060-braces-2.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00060-braces-2.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00061-braces-3.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00061-braces-3.c
index 18784b82..18784b82 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00061-braces-3.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00061-braces-3.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00062-braces-4.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00062-braces-4.c
index 05c0d9b5..05c0d9b5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00062-braces-4.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00062-braces-4.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00065-braces-5.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00065-braces-5.c
index 6e1e6cab..6e1e6cab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00065-braces-5.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00065-braces-5.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00066-vb-while.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00066-vb-while.c
index c189b7b7..c189b7b7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00066-vb-while.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00066-vb-while.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00067-vb-do.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00067-vb-do.c
index 79c6dedf..79c6dedf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00067-vb-do.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00067-vb-do.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00068-bsnl.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00068-bsnl.c
index 310e0eb2..310e0eb2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00068-bsnl.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00068-bsnl.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00069-vb-pp.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00069-vb-pp.c
index 9fb79a06..9fb79a06 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00069-vb-pp.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00069-vb-pp.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00070-return-multi.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00070-return-multi.c
index d351cdb0..d351cdb0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00070-return-multi.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00070-return-multi.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00071-include_define.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00071-include_define.h
index 89f11e5a..89f11e5a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00071-include_define.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00071-include_define.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00072-align-proto.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00072-align-proto.c
index 15746cd9..15746cd9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00072-align-proto.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00072-align-proto.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00073-nl_proto_endif.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00073-nl_proto_endif.c
index f50766b8..f50766b8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00073-nl_proto_endif.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00073-nl_proto_endif.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00074-clang-has_include.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00074-clang-has_include.h
index 976de29d..976de29d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00074-clang-has_include.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00074-clang-has_include.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00076-1225.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00076-1225.c
index 5b51cf3c..5b51cf3c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00076-1225.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00076-1225.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00081-else-if.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00081-else-if.c
index ff5f5b21..ff5f5b21 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00081-else-if.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00081-else-if.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00082-else-if.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00082-else-if.c
index 06cc37f2..06cc37f2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00082-else-if.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.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.75.0/tests/expected/c/00083-Issue_3601.c
new file mode 100644
index 00000000..a2b92fa0
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00083-Issue_3601.c
@@ -0,0 +1 @@
+struct cage cages[MAX_CAGES * sizeof(struct cage)];
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00091-cond.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00091-cond.c
index 840d4a6c..840d4a6c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00091-cond.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00091-cond.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00092-cond.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00092-cond.c
index a718a48b..a718a48b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00092-cond.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00092-cond.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00093-cond.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00093-cond.c
index 8d55652a..8d55652a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00093-cond.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00093-cond.c
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
new file mode 100644
index 00000000..d8baf3c9
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.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.74.0/tests/expected/c/00101-bugs-1.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00101-bugs-1.c
index abc2e08e..abc2e08e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00101-bugs-1.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00101-bugs-1.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00102-bugs-2.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00102-bugs-2.c
index 42bed259..42bed259 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00102-bugs-2.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00102-bugs-2.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00103-bugs-3.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00103-bugs-3.c
index 07d410b1..07d410b1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00103-bugs-3.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00103-bugs-3.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00104-bugs-4.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00104-bugs-4.c
index 61885443..61885443 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00104-bugs-4.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00104-bugs-4.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00105-bugs-5.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00105-bugs-5.c
index 72bfbe4d..72bfbe4d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00105-bugs-5.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00105-bugs-5.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00106-bugs-6.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00106-bugs-6.c
index 302c2328..302c2328 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00106-bugs-6.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00106-bugs-6.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00107-bugs-7.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00107-bugs-7.c
index 34fc146e..34fc146e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00107-bugs-7.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00107-bugs-7.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00108-bugs-8.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00108-bugs-8.c
index 0eae4dff..0eae4dff 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00108-bugs-8.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00108-bugs-8.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00110-misc.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00110-misc.c
index fdca271b..fdca271b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00110-misc.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00110-misc.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00111-misc.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00111-misc.c
index ad40a4ea..ad40a4ea 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00111-misc.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00111-misc.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00120-sp_cmt_cpp_start.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00120-sp_cmt_cpp_start.c
index 74a333c5..74a333c5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00120-sp_cmt_cpp_start.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00120-sp_cmt_cpp_start.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00121-sp_cmt_cpp_start.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00121-sp_cmt_cpp_start.c
index 3160a288..3160a288 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00121-sp_cmt_cpp_start.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00121-sp_cmt_cpp_start.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00122-sp_cmt_cpp_start.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00122-sp_cmt_cpp_start.c
index fe237c5a..fe237c5a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00122-sp_cmt_cpp_start.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00122-sp_cmt_cpp_start.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00123-cmt_reflow.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00123-cmt_reflow.c
index 44e0cf34..44e0cf34 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00123-cmt_reflow.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00123-cmt_reflow.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00130-minus-minus.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00130-minus-minus.c
index debe70a8..debe70a8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00130-minus-minus.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00130-minus-minus.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00135-br_cmt.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00135-br_cmt.c
index 9e6c6de9..9e6c6de9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00135-br_cmt.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00135-br_cmt.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00140-global-vars.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00140-global-vars.c
index 0df79336..0df79336 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00140-global-vars.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00140-global-vars.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00141-deref.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00141-deref.c
index a7ad3f5e..a7ad3f5e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00141-deref.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00141-deref.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00142-type-cast.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00142-type-cast.c
index 93076825..93076825 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00142-type-cast.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00142-type-cast.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00143-t3.in.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00143-t3.in.c
index b40fbd17..b40fbd17 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00143-t3.in.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00143-t3.in.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00144-align-proto-vars.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00144-align-proto-vars.c
index c7bf6081..c7bf6081 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00144-align-proto-vars.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00144-align-proto-vars.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00145-vardefcol.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00145-vardefcol.c
index 1238be0d..1238be0d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00145-vardefcol.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.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.75.0/tests/expected/c/00146-Issue_3516.c
new file mode 100644
index 00000000..828d2611
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00146-Issue_3516.c
@@ -0,0 +1,12 @@
+void g () {
+	h();
+	int x;
+
+	return;
+	{
+		h();
+		int x;
+
+		return;
+	}
+}
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.75.0/tests/expected/c/00147-Issue_3516.c
new file mode 100644
index 00000000..63b9a440
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00147-Issue_3516.c
@@ -0,0 +1,12 @@
+void g () {
+	h();
+
+	int x;
+	return;
+	{
+		h();
+
+		int x;
+		return;
+	}
+}
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.75.0/tests/expected/c/00148-Issue_3518.c
new file mode 100644
index 00000000..cf8d0c95
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00148-Issue_3518.c
@@ -0,0 +1,10 @@
+void g () {
+	h();
+	int x;
+	return;
+	{
+		h();
+		int x;
+		return;
+	}
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00150-casts.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00150-casts.c
index d89ad598..d89ad598 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00150-casts.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00150-casts.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00151-casts.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00151-casts.c
index 9f2a13de..9f2a13de 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00151-casts.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00151-casts.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00152-casts.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00152-casts.c
index acc2ebe4..acc2ebe4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00152-casts.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00152-casts.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00153-casts.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00153-casts.c
index 8bf710b6..8bf710b6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00153-casts.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00153-casts.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00154-casts.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00154-casts.c
index fca4010b..fca4010b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00154-casts.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00154-casts.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00155-cast_brace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00155-cast_brace.c
index 6e8f12b2..6e8f12b2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00155-cast_brace.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00155-cast_brace.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00160-fcn_indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00160-fcn_indent.c
index 23c173c2..23c173c2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00160-fcn_indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00160-fcn_indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00161-fcn_indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00161-fcn_indent.c
index 90342554..90342554 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00161-fcn_indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00161-fcn_indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00162-fcn_indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00162-fcn_indent.c
index c8f152d3..c8f152d3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00162-fcn_indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00162-fcn_indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00163-fcn_indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00163-fcn_indent.c
index bbf36763..bbf36763 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00163-fcn_indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00163-fcn_indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00164-fcn_indent_func_def_col1.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00164-fcn_indent_func_def_col1.c
index c029669a..c029669a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00164-fcn_indent_func_def_col1.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00164-fcn_indent_func_def_col1.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00165-sp_func_call_user_inside_fparen.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00165-sp_func_call_user_inside_fparen.c
index af30d708..af30d708 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00165-sp_func_call_user_inside_fparen.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00165-sp_func_call_user_inside_fparen.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00170-beautifier-off.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00170-beautifier-off.c
index 351d76ff..351d76ff 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00170-beautifier-off.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00170-beautifier-off.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00180-lvalue.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00180-lvalue.c
index a8121da4..a8121da4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00180-lvalue.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00180-lvalue.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00201-case.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00201-case.c
index 0d004c19..0d004c19 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00201-case.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00201-case.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00202-case.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00202-case.c
index d5175084..d5175084 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00202-case.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00202-case.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00203-case.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00203-case.c
index 548a2a64..548a2a64 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00203-case.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00203-case.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00204-bug_1718.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00204-bug_1718.c
index eaddc974..eaddc974 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00204-bug_1718.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00204-bug_1718.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00205-case-nl_before_return.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00205-case-nl_before_return.c
index b650d7ab..b650d7ab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00205-case-nl_before_return.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00205-case-nl_before_return.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00206-case-nl_before_return.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00206-case-nl_before_return.c
index d0b6bbbb..d0b6bbbb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00206-case-nl_before_return.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00206-case-nl_before_return.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00207-nl_before_ignore_after_case.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00207-nl_before_ignore_after_case.c
index 4c361605..4c361605 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00207-nl_before_ignore_after_case.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00207-nl_before_ignore_after_case.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00301-align-struct-init.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00301-align-struct-init.c
index cfa44035..cfa44035 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00301-align-struct-init.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00301-align-struct-init.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00302-one-liner-init.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00302-one-liner-init.c
index 63c86afe..63c86afe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00302-one-liner-init.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00302-one-liner-init.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00303-one-liner-init.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00303-one-liner-init.c
index 503eedfb..503eedfb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00303-one-liner-init.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00303-one-liner-init.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00304-one-liner-init.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00304-one-liner-init.c
index 471aaa2d..471aaa2d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00304-one-liner-init.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00304-one-liner-init.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00305-one-liner-define.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00305-one-liner-define.c
index 99f24f5a..99f24f5a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00305-one-liner-define.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00305-one-liner-define.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00310-sp_embed_comment.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00310-sp_embed_comment.c
index 3dc105aa..3dc105aa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00310-sp_embed_comment.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00310-sp_embed_comment.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00320-indent_first_bool_expr.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00320-indent_first_bool_expr.c
index 0dcaa413..0dcaa413 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00320-indent_first_bool_expr.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00320-indent_first_bool_expr.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00401-align-equ.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00401-align-equ.c
index 9b213f96..9b213f96 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00401-align-equ.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00401-align-equ.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00402-align-var.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00402-align-var.c
index d7396d46..d7396d46 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00402-align-var.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00402-align-var.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00403-align-var.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00403-align-var.c
index cb62295e..cb62295e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00403-align-var.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00403-align-var.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00404-align-var.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00404-align-var.c
index 48af3d3c..48af3d3c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00404-align-var.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00404-align-var.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00405-bits.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00405-bits.c
index 9a5a6ceb..9a5a6ceb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00405-bits.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00405-bits.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00406-bug_i_771.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00406-bug_i_771.c
index 9c2b1cc2..9c2b1cc2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00406-bug_i_771.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00406-bug_i_771.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00411-align-typedef.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00411-align-typedef.c
index 001e4a52..001e4a52 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00411-align-typedef.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00411-align-typedef.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00412-align-typedef.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00412-align-typedef.c
index 001e4a52..001e4a52 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00412-align-typedef.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00412-align-typedef.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00413-align-typedef.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00413-align-typedef.c
index d5f826e5..d5f826e5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00413-align-typedef.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00413-align-typedef.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00414-align-typedef.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00414-align-typedef.c
index 8e63e499..8e63e499 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00414-align-typedef.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00414-align-typedef.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00415-align_stack.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00415-align_stack.c
index 507d6da2..507d6da2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00415-align_stack.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00415-align_stack.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00416-align_sf_call_thresh_416.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00416-align_sf_call_thresh_416.c
index 36fbca84..36fbca84 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00416-align_sf_call_thresh_416.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00416-align_sf_call_thresh_416.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00417-align_sf_call_thresh_417.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00417-align_sf_call_thresh_417.c
index 3047b932..3047b932 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00417-align_sf_call_thresh_417.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00417-align_sf_call_thresh_417.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00418-align_sf_call_span_418.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00418-align_sf_call_span_418.c
index 82444a2b..82444a2b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00418-align_sf_call_span_418.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00418-align_sf_call_span_418.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00419-align_sf_call_span_419.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00419-align_sf_call_span_419.c
index 20b9705a..20b9705a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00419-align_sf_call_span_419.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00419-align_sf_call_span_419.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00420-Issue-2278.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00420-Issue-2278.c
index 2bab88ab..2bab88ab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00420-Issue-2278.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00420-Issue-2278.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00421-nl_ds_struct_enum.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00421-nl_ds_struct_enum.c
index ec5bcc31..ec5bcc31 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00421-nl_ds_struct_enum.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00421-nl_ds_struct_enum.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00422-nl_ds_struct_enum.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00422-nl_ds_struct_enum.c
index d45b2add..d45b2add 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00422-nl_ds_struct_enum.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00422-nl_ds_struct_enum.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00423-bug_1702.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00423-bug_1702.c
index bf74c8bd..bf74c8bd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00423-bug_1702.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00423-bug_1702.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00430-paren-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00430-paren-indent.c
index f6b148ce..f6b148ce 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00430-paren-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00430-paren-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00431-paren-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00431-paren-indent.c
index 51a80854..51a80854 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00431-paren-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00431-paren-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00432-paren-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00432-paren-indent.c
index 9ab77831..9ab77831 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00432-paren-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00432-paren-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00440-bug_489.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00440-bug_489.c
index 47a5da06..47a5da06 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00440-bug_489.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00440-bug_489.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00451-enum_gallery.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00451-enum_gallery.c
index 3cb8db3c..3cb8db3c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00451-enum_gallery.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00451-enum_gallery.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00452-enum_gallery.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00452-enum_gallery.c
index cb235c3d..cb235c3d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00452-enum_gallery.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00452-enum_gallery.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00453-enum_gallery.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00453-enum_gallery.c
index af537d1d..af537d1d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00453-enum_gallery.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00453-enum_gallery.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00453-enum_gallery.rerun.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00453-enum_gallery.rerun.c
index 148f1970..148f1970 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00453-enum_gallery.rerun.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00453-enum_gallery.rerun.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00454-enum_gallery.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00454-enum_gallery.c
index 8d00cbce..8d00cbce 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00454-enum_gallery.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00454-enum_gallery.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00461-align_func_proto_star_amp.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00461-align_func_proto_star_amp.h
index 5b0490c8..5b0490c8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00461-align_func_proto_star_amp.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00461-align_func_proto_star_amp.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00462-align_func_proto_star_amp.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00462-align_func_proto_star_amp.h
index c05fc454..c05fc454 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00462-align_func_proto_star_amp.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00462-align_func_proto_star_amp.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00463-align_func_proto_star_amp.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00463-align_func_proto_star_amp.h
index 702b9396..702b9396 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00463-align_func_proto_star_amp.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00463-align_func_proto_star_amp.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00464-align_func_proto_star_amp.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00464-align_func_proto_star_amp.h
index f1f927dc..f1f927dc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00464-align_func_proto_star_amp.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00464-align_func_proto_star_amp.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00465-align_func_proto_star_amp.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00465-align_func_proto_star_amp.h
index 9bd55a23..9bd55a23 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00465-align_func_proto_star_amp.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00465-align_func_proto_star_amp.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00466-align_func_proto_star_amp.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00466-align_func_proto_star_amp.h
index b91044f7..b91044f7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00466-align_func_proto_star_amp.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00466-align_func_proto_star_amp.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00467-align_func_proto_star_amp.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00467-align_func_proto_star_amp.h
index e87c4cd8..e87c4cd8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00467-align_func_proto_star_amp.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00467-align_func_proto_star_amp.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00468-align_func_proto_star_amp.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00468-align_func_proto_star_amp.h
index 0fb8eacb..0fb8eacb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00468-align_func_proto_star_amp.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00468-align_func_proto_star_amp.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00469-align_func_proto_star_amp.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00469-align_func_proto_star_amp.h
index 5f776985..5f776985 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00469-align_func_proto_star_amp.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00469-align_func_proto_star_amp.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00501-bool-pos.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00501-bool-pos.c
index b9d537a1..b9d537a1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00501-bool-pos.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00501-bool-pos.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00502-bool-pos.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00502-bool-pos.c
index 7890fcd7..7890fcd7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00502-bool-pos.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00502-bool-pos.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00503-pos_compare.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00503-pos_compare.c
index cc809a09..cc809a09 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00503-pos_compare.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00503-pos_compare.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00504-pos_compare.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00504-pos_compare.c
index fe16e10e..fe16e10e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00504-pos_compare.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00504-pos_compare.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00505-pos_conditional.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00505-pos_conditional.c
index 91f17d57..91f17d57 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00505-pos_conditional.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00505-pos_conditional.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00506-pos_conditional.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00506-pos_conditional.c
index 23945656..23945656 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00506-pos_conditional.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00506-pos_conditional.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00510-bool-pos.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00510-bool-pos.c
index 5958e3c5..5958e3c5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00510-bool-pos.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00510-bool-pos.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00511-bool-pos.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00511-bool-pos.c
index 8f6effd8..8f6effd8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00511-bool-pos.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00511-bool-pos.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00512-bool-pos.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00512-bool-pos.c
index 2e82b7ef..2e82b7ef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00512-bool-pos.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00512-bool-pos.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00513-bool-pos.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00513-bool-pos.c
index cad844c5..cad844c5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00513-bool-pos.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00513-bool-pos.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00514-my_infile.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00514-my_infile.c
index 3f4c76fb..3f4c76fb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00514-my_infile.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00514-my_infile.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00600-dos.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00600-dos.c
index a0482ba3..a0482ba3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00600-dos.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00600-dos.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00601-mac.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00601-mac.c
index 2be04c61..2be04c61 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00601-mac.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00601-mac.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00611-pp-space.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00611-pp-space.c
index 217fc89a..217fc89a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00611-pp-space.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00611-pp-space.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00612-pp-space.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00612-pp-space.c
index 7c19bf1e..7c19bf1e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00612-pp-space.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00612-pp-space.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00613-pp-space.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00613-pp-space.c
index 7092a193..7092a193 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00613-pp-space.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00613-pp-space.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00614-pp-space.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00614-pp-space.c
index 103c2ca4..103c2ca4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00614-pp-space.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00614-pp-space.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00615-pp-nest.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00615-pp-nest.c
index 5e99a1d0..5e99a1d0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00615-pp-nest.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00615-pp-nest.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00616-pp-if-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00616-pp-if-indent.c
index dc2dea10..dc2dea10 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00616-pp-if-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00616-pp-if-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00617-pp-if-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00617-pp-if-indent.c
index 2caf73d2..2caf73d2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00617-pp-if-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00617-pp-if-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00618-pp-if-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00618-pp-if-indent.c
index f7b3d270..f7b3d270 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00618-pp-if-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00618-pp-if-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00619-Issue_3169.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00619-Issue_3169.c
index 848e451e..848e451e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00619-Issue_3169.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00619-Issue_3169.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00620-indent-assign.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00620-indent-assign.c
index c01e146a..c01e146a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00620-indent-assign.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00620-indent-assign.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00621-nl_endif.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00621-nl_endif.c
index bae6272c..bae6272c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00621-nl_endif.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00621-nl_endif.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00622-indent-off-after-assign.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00622-indent-off-after-assign.c
index eb083f7b..eb083f7b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00622-indent-off-after-assign.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00622-indent-off-after-assign.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00631-nl_assign.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00631-nl_assign.c
index 7319d498..7319d498 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00631-nl_assign.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00631-nl_assign.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00632-nl_assign.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00632-nl_assign.c
index 2452e773..2452e773 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00632-nl_assign.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00632-nl_assign.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00633-bug_3156.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00633-bug_3156.c
index 508a0098..508a0098 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00633-bug_3156.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00633-bug_3156.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00701-function-def.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00701-function-def.c
index 6f0133e8..6f0133e8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00701-function-def.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00701-function-def.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00702-function-def.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00702-function-def.c
index eaa568da..eaa568da 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00702-function-def.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00702-function-def.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00703-function-def.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00703-function-def.c
index 76cf664f..76cf664f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00703-function-def.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00703-function-def.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00710-add_long_comment.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00710-add_long_comment.c
index 82bf680e..82bf680e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00710-add_long_comment.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00710-add_long_comment.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00721-nl-semicolon.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00721-nl-semicolon.c
index 441091b5..441091b5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00721-nl-semicolon.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00721-nl-semicolon.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00801-fcn_type.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00801-fcn_type.c
index 72af3fa3..72af3fa3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00801-fcn_type.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00801-fcn_type.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00802-funcfunc.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00802-funcfunc.c
index 4d0f0432..4d0f0432 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00802-funcfunc.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00802-funcfunc.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00803-fcn_type.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00803-fcn_type.c
index 9e1e5c55..9e1e5c55 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00803-fcn_type.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00803-fcn_type.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00901-code_width.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00901-code_width.c
index 672f9153..6c2a99c7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00901-code_width.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00901-code_width.c
@@ -66,12 +66,12 @@ static void some_really_long_function_name(
     {
     }
 
-    for (a = get_first(); a != NULL; a = get_next(a))
+    for (a = get_first(); a != NULL; a = GetNext(a))
     {
     }
 
     for (a_ptr = get_first(); a_ptr != NULL;
-         a_ptr = get_next(a))
+         a_ptr = GetNext(a))
     {
     }
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00902-code_width.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00902-code_width.c
index 9c5a4cec..be2e42f4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00902-code_width.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00902-code_width.c
@@ -58,13 +58,13 @@ static void some_really_long_function_name(
     {
     }
 
-    for (a = get_first(); a != NULL; a = get_next(a))
+    for (a = get_first(); a != NULL; a = GetNext(a))
     {
     }
 
     for (a_ptr = get_first();
          a_ptr != NULL;
-         a_ptr = get_next(a))
+         a_ptr = GetNext(a))
     {
     }
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00903-code_width.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00903-code_width.c
index 049e952d..70b3a113 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00903-code_width.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00903-code_width.c
@@ -55,11 +55,11 @@ static void some_really_long_function_name(struct device *dev,
     {
     }
 
-    for (a = get_first(); a != NULL; a = get_next(a))
+    for (a = get_first(); a != NULL; a = GetNext(a))
     {
     }
 
-    for (a_ptr = get_first(); a_ptr != NULL; a_ptr = get_next(a))
+    for (a_ptr = get_first(); a_ptr != NULL; a_ptr = GetNext(a))
     {
     }
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00910-pascal_ptr.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00910-pascal_ptr.c
index 27a9cdef..27a9cdef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00910-pascal_ptr.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00910-pascal_ptr.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00911-pascal_ptr.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00911-pascal_ptr.c
index 4c0d0dde..4c0d0dde 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/00911-pascal_ptr.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/00911-pascal_ptr.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/01000-mod-paren.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01000-mod-paren.c
index ca919f77..ca919f77 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/01000-mod-paren.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01000-mod-paren.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/01001-nl-comment.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01001-nl-comment.c
index ecac3e2a..ecac3e2a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/01001-nl-comment.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01001-nl-comment.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/01002-mod-paren.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01002-mod-paren.c
index 2537330f..2537330f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/01002-mod-paren.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01002-mod-paren.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/01005-mod_case_brace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01005-mod_case_brace.c
index caeae178..caeae178 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/01005-mod_case_brace.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01005-mod_case_brace.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/01006-mod_case_brace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01006-mod_case_brace.c
index 371bd5cb..371bd5cb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/01006-mod_case_brace.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01006-mod_case_brace.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/01007-mod_case_brace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01007-mod_case_brace.c
index 2ea3dea5..2ea3dea5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/01007-mod_case_brace.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01007-mod_case_brace.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/01008-Issue_3366.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01008-Issue_3366.c
index 75a95e36..75a95e36 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/01008-Issue_3366.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.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.75.0/tests/expected/c/01009-mod_move_case_return.c
new file mode 100644
index 00000000..484b4c33
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01009-mod_move_case_return.c
@@ -0,0 +1,41 @@
+static int ConvertEndian(void *ptr, int bytes)
+{
+	switch(bytes)
+	{
+	case 2:
+	{
+		uint16_t *value = (uint16_t *) ptr;
+
+		*value = bswap_16(*value);
+		return 1;
+	}
+	case 4:
+	{
+		uint32_t *value = (uint32_t *) ptr;
+
+		*value = bswap_32(*value);
+		return 1+
+		       2+3;
+	}
+
+	case 8:
+	{
+		uint64_t *value = (uint64_t *) ptr;
+
+		*value = bswap_64(*value);
+		return 1+
+
+		       2
+
+		       +fn(
+
+			x
+
+			);
+	}
+	// comment
+	default:
+		break;
+	}
+	return 0;
+}
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.75.0/tests/expected/c/01010-mod_move_case_return_bad.c
new file mode 100644
index 00000000..c6fa63e8
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01010-mod_move_case_return_bad.c
@@ -0,0 +1,52 @@
+static int ConvertEndian(void *ptr, int bytes)
+{
+	switch(bytes)
+	{
+	case 2:
+	{
+		uint16_t *value = (uint16_t *) ptr;
+
+		*value = bswap_16(*value);
+		return 1;
+	}
+	case 4:
+	{
+		uint32_t *value = (uint32_t *) ptr;
+
+		*value = bswap_32(*value);
+	}
+		return 1+
+		       2+3
+
+		       case 8:
+		       {
+			       uint64_t *value = (uint64_t *) ptr;
+
+			       *value = bswap_64(*value);
+		       }
+
+			       return 1+
+
+			              2
+
+			              +fn(
+
+				       x
+				       )
+				      // comment
+				      default:
+					      break;
+
+				      case 16:
+				      {
+					      {
+						      uint32_t *value = (uint32_t *) ptr;
+
+						      *value = bswap_32(*value);
+					      }
+					      return 1+
+					             2+3
+				      };
+	}
+	return 0;
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/01011-semicolons.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01011-semicolons.c
index 962ec588..962ec588 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/01011-semicolons.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01011-semicolons.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/01012-semicolons.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01012-semicolons.c
index 54d895e7..54d895e7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/01012-semicolons.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01012-semicolons.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/01015-paren_indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01015-paren_indent.c
index d993315c..d993315c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/01015-paren_indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01015-paren_indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/01016-align_attr.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01016-align_attr.c
index 012217e4..012217e4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/01016-align_attr.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01016-align_attr.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/01020-kw_subst.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01020-kw_subst.c
index 61b43c3f..61b43c3f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/01020-kw_subst.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01020-kw_subst.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/01021-hello.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01021-hello.c
index 6ba46ef7..6ba46ef7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/01021-hello.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01021-hello.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/01022-kw_subst.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01022-kw_subst.c
index 6cba8370..6cba8370 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/01022-kw_subst.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01022-kw_subst.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/01030-multi.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01030-multi.h
index 14a599c7..14a599c7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/01030-multi.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01030-multi.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/01035-func_wrap.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01035-func_wrap.c
index b2f86805..b2f86805 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/01035-func_wrap.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01035-func_wrap.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/01036-func_wrap.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01036-func_wrap.c
index 24e932ed..24e932ed 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/01036-func_wrap.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01036-func_wrap.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/01037-type_wrap.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01037-type_wrap.c
index c3c23569..c3c23569 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/01037-type_wrap.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01037-type_wrap.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/01040-newline_after_endif.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01040-newline_after_endif.c
index 2a0cbe62..2a0cbe62 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/01040-newline_after_endif.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01040-newline_after_endif.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/01050-func_call_user.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01050-func_call_user.c
index 82eba7cb..82eba7cb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/01050-func_call_user.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01050-func_call_user.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/01060-backslash-newline-lex.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01060-backslash-newline-lex.c
index f5000b82..f5000b82 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/01060-backslash-newline-lex.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01060-backslash-newline-lex.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/01070-various_colons.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01070-various_colons.c
index 0850b17e..0850b17e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/01070-various_colons.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01070-various_colons.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/01071-various_colons.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01071-various_colons.c
index e25134ab..e25134ab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/01071-various_colons.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01071-various_colons.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/01080-bug_1196.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01080-bug_1196.c
index 9fdabca6..9fdabca6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/01080-bug_1196.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/01080-bug_1196.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02000-i2c-core.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02000-i2c-core.c
index 528a6161..528a6161 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02000-i2c-core.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02000-i2c-core.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02001-directfb.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02001-directfb.h
index 3c7ffc18..3c7ffc18 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02001-directfb.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02001-directfb.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02002-i2c-core.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02002-i2c-core.c
index 698df2a6..698df2a6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02002-i2c-core.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.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.75.0/tests/expected/c/02003-Issue_3353.h
new file mode 100644
index 00000000..f189ebfa
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02003-Issue_3353.h
@@ -0,0 +1,6 @@
+struct A {
+    void (*in)(
+        void);
+    void (*out)(
+        void);
+};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02100-i2c-core.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02100-i2c-core.c
index df01ad5b..df01ad5b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02100-i2c-core.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02100-i2c-core.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02101-comment-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02101-comment-indent.c
index 7c5f0f0c..7c5f0f0c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02101-comment-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02101-comment-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02200-xml.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02200-xml.c
index 62bd81d0..62bd81d0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02200-xml.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02200-xml.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02201-align-string.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02201-align-string.c
index 0b2cf25a..0b2cf25a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02201-align-string.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02201-align-string.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02300-preproc-if.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02300-preproc-if.c
index 8e20a744..8e20a744 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02300-preproc-if.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02300-preproc-if.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02301-preproc-if.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02301-preproc-if.c
index 0130e1f5..0130e1f5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02301-preproc-if.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02301-preproc-if.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02302-nl-cont.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02302-nl-cont.c
index dfbb0c2d..dfbb0c2d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02302-nl-cont.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02302-nl-cont.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02303-nl-cont2.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02303-nl-cont2.c
index a0129423..a0129423 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02303-nl-cont2.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02303-nl-cont2.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02310-empty-for.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02310-empty-for.c
index 4bd43b09..4bd43b09 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02310-empty-for.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02310-empty-for.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02311-pragma.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02311-pragma.c
index ec944697..ec944697 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02311-pragma.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02311-pragma.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02315-pp_ret.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02315-pp_ret.c
index 18a3d5cb..18a3d5cb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02315-pp_ret.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02315-pp_ret.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02320-nl_create_one_liner.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02320-nl_create_one_liner.c
index 55974c3c..55974c3c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02320-nl_create_one_liner.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02320-nl_create_one_liner.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02325-sort_include.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02325-sort_include.c
index 4f2b20bf..4f2b20bf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02325-sort_include.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02325-sort_include.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02330-one_liners.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02330-one_liners.c
index 57d8ba44..57d8ba44 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02330-one_liners.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02330-one_liners.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02410-ifdef-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02410-ifdef-indent.c
index e71d8cf3..e71d8cf3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02410-ifdef-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02410-ifdef-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02411-ifdef-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02411-ifdef-indent.c
index bf39a98c..bf39a98c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02411-ifdef-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02411-ifdef-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02412-ifdef-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02412-ifdef-indent.c
index 23b4dd37..23b4dd37 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02412-ifdef-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02412-ifdef-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02413-ifdef-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02413-ifdef-indent.c
index 8738bbf7..8738bbf7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02413-ifdef-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02413-ifdef-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02414-whole_file_ifdef.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02414-whole_file_ifdef.c
index c767bbf7..c767bbf7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02414-whole_file_ifdef.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02414-whole_file_ifdef.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02415-endif.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02415-endif.c
index c8b99a6a..c8b99a6a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02415-endif.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02415-endif.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02416-cmt_nl_end.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02416-cmt_nl_end.c
index 56de21ec..56de21ec 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02416-cmt_nl_end.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02416-cmt_nl_end.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02421-cmt_multi.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02421-cmt_multi.c
index 61faac36..61faac36 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02421-cmt_multi.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02421-cmt_multi.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02422-cmt_multi.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02422-cmt_multi.c
index bbdd79cd..bbdd79cd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02422-cmt_multi.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02422-cmt_multi.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02423-cmt_multi_utf8.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02423-cmt_multi_utf8.c
index 05b01f84..05b01f84 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02423-cmt_multi_utf8.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02423-cmt_multi_utf8.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02431-cmt_right_align.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02431-cmt_right_align.c
index 315e5010..315e5010 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02431-cmt_right_align.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02431-cmt_right_align.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02432-cmt_right_align.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02432-cmt_right_align.c
index eef43777..eef43777 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02432-cmt_right_align.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02432-cmt_right_align.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02440-string_utf8.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02440-string_utf8.c
index a473e1bf..a473e1bf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02440-string_utf8.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02440-string_utf8.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02441-utf8-identifiers.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02441-utf8-identifiers.c
index 1dc39e9c..1dc39e9c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02441-utf8-identifiers.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02441-utf8-identifiers.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02451-nl_return_expr.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02451-nl_return_expr.c
index bf8621d5..bf8621d5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02451-nl_return_expr.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02451-nl_return_expr.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02452-nl_return_expr.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02452-nl_return_expr.c
index 4dc23adf..4dc23adf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02452-nl_return_expr.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02452-nl_return_expr.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02453-nl_return_expr.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02453-nl_return_expr.c
index c917fb17..c917fb17 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02453-nl_return_expr.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02453-nl_return_expr.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02454-nl_return_expr.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02454-nl_return_expr.c
index 2e33d2b0..2e33d2b0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02454-nl_return_expr.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02454-nl_return_expr.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02455-macro-returns.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02455-macro-returns.c
index dba84c56..dba84c56 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02455-macro-returns.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02455-macro-returns.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02456-macro-returns.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02456-macro-returns.c
index 7cd29044..7cd29044 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02456-macro-returns.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02456-macro-returns.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02457-nl_before_return.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02457-nl_before_return.c
index a396202f..a396202f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02457-nl_before_return.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02457-nl_before_return.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02460-freebsd.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02460-freebsd.c
index 804c5ec7..804c5ec7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02460-freebsd.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02460-freebsd.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02486-doxy-comment.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02486-doxy-comment.c
index e2a6c2c4..e2a6c2c4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02486-doxy-comment.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02486-doxy-comment.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02487-doxy-comment.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02487-doxy-comment.c
index 4abad3c8..5049dada 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02487-doxy-comment.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02487-doxy-comment.c
@@ -3,9 +3,9 @@
 
 
 
-int             a;                                              // a
-int             a;                                              /// a
-int             a;                                              ///< a
-int             a;                                              //! a
-int             a;                                              //!< a
+int             a;                                              /* a */
+int             a;                                              /* /a */
+int             a;                                              /* /<a */
+int             a;                                              /* !a */
+int             a;                                              /* !<a */
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02501-custom_types_ssl.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02501-custom_types_ssl.c
index 3e28d2e3..3e28d2e3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02501-custom_types_ssl.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02501-custom_types_ssl.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02502-custom_types_ssl.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02502-custom_types_ssl.c
index 0df5ddad..0df5ddad 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02502-custom_types_ssl.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02502-custom_types_ssl.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02504-align_keep_extra.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02504-align_keep_extra.c
index 985f428c..985f428c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02504-align_keep_extra.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02504-align_keep_extra.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02510-asm.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02510-asm.c
index 6609bf9b..6609bf9b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/02510-asm.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/02510-asm.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/07630-indent-vbrace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/07630-indent-vbrace.c
index a1344348..a1344348 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/07630-indent-vbrace.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/07630-indent-vbrace.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/08399-gh399.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/08399-gh399.c
index 780234ab..780234ab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/08399-gh399.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/08399-gh399.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/09588-sf588.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09588-sf588.c
index d1c5f1cc..d1c5f1cc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/09588-sf588.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09588-sf588.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/09594-sf594.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09594-sf594.c
index 94a1973c..94a1973c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/09594-sf594.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09594-sf594.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/09601-sp_after_sparen.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09601-sp_after_sparen.c
index 93cbfea2..93cbfea2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/09601-sp_after_sparen.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09601-sp_after_sparen.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/09602-bug_671.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09602-bug_671.c
index a9d54ee8..a9d54ee8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/09602-bug_671.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09602-bug_671.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/09603-indent_ternary-1.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09603-indent_ternary-1.c
index f9200886..f9200886 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/09603-indent_ternary-1.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09603-indent_ternary-1.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/09604-indent_ternary-2.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09604-indent_ternary-2.c
index e6d3576c..e6d3576c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/09604-indent_ternary-2.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09604-indent_ternary-2.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/09605-negative_value.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09605-negative_value.c
index 6399fbef..6399fbef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/09605-negative_value.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09605-negative_value.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/09606-extern.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09606-extern.c
index d43131fe..d43131fe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/09606-extern.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09606-extern.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/09607-attribute.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09607-attribute.c
index 19e3a057..19e3a057 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/09607-attribute.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09607-attribute.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/09608-func_call_user2.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09608-func_call_user2.c
index ee4e24d4..ee4e24d4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/09608-func_call_user2.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09608-func_call_user2.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/09609-Issue_2279.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09609-Issue_2279.c
index 88c0ae84..88c0ae84 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/09609-Issue_2279.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09609-Issue_2279.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/09610-bug_i_876.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09610-bug_i_876.c
index e1afece6..e1afece6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/09610-bug_i_876.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09610-bug_i_876.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/09611-bug_i_222.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09611-bug_i_222.c
index 4f0ded31..4f0ded31 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/09611-bug_i_222.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09611-bug_i_222.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/09612-bug_1041.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09612-bug_1041.c
index 7c07615b..7c07615b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/09612-bug_1041.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09612-bug_1041.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/09613-i1413.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09613-i1413.c
index 4287ca86..4287ca86 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/09613-i1413.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09613-i1413.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/09614-string_prefixes.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09614-string_prefixes.c
index e901c9ac..e901c9ac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/09614-string_prefixes.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09614-string_prefixes.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/09615-i1564.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09615-i1564.c
index 2b37b25c..2b37b25c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/09615-i1564.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09615-i1564.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/09616-enum_comma_ifdef.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09616-enum_comma_ifdef.c
index 95637aae..95637aae 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/09616-enum_comma_ifdef.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09616-enum_comma_ifdef.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/09617-Issue_2360.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09617-Issue_2360.c
index 0489b0f9..0489b0f9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/09617-Issue_2360.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09617-Issue_2360.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/09618-Issue_2360.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09618-Issue_2360.c
index 898c64e6..898c64e6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/09618-Issue_2360.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09618-Issue_2360.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/09619-Issue_2411.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09619-Issue_2411.c
index 40244488..40244488 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/09619-Issue_2411.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09619-Issue_2411.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/09620-Issue_2640.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09620-Issue_2640.c
index ba25bcbe..ba25bcbe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/09620-Issue_2640.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09620-Issue_2640.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/09621-pp-before-func-def.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09621-pp-before-func-def.c
index 948ce135..948ce135 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/09621-pp-before-func-def.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09621-pp-before-func-def.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/09622-Issue_3356.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09622-Issue_3356.c
index 7f1e0282..7f1e0282 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/09622-Issue_3356.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/09622-Issue_3356.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10004-pragma_asm.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10004-pragma_asm.c
index 0e6b48d6..0e6b48d6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10004-pragma_asm.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10004-pragma_asm.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10005-i1270.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10005-i1270.c
index 4831a47a..4831a47a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10005-i1270.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10005-i1270.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10006-bug_2331.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10006-bug_2331.c
index 67088d94..67088d94 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10006-bug_2331.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10006-bug_2331.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10007-indent-macro-brace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10007-indent-macro-brace.c
index 192a399f..192a399f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10007-indent-macro-brace.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10007-indent-macro-brace.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10008-indent-macro-brace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10008-indent-macro-brace.c
index a54cd504..a54cd504 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10008-indent-macro-brace.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10008-indent-macro-brace.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10009-return-compound-literal.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10009-return-compound-literal.c
index fad9a3f2..fad9a3f2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10009-return-compound-literal.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10009-return-compound-literal.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10010-return-compound-literal.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10010-return-compound-literal.c
index da33e2fd..da33e2fd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10010-return-compound-literal.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10010-return-compound-literal.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10011-return-compound-literal.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10011-return-compound-literal.c
index fad9a3f2..fad9a3f2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10011-return-compound-literal.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10011-return-compound-literal.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10012-sparen-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10012-sparen-indent.c
index d9ddbe06..d9ddbe06 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10012-sparen-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10012-sparen-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10013-sparen-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10013-sparen-indent.c
index b09a3102..b09a3102 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10013-sparen-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10013-sparen-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10014-sparen-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10014-sparen-indent.c
index bf0ba8cf..bf0ba8cf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10014-sparen-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10014-sparen-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10015-Issue_2845.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10015-Issue_2845.h
index 9f34b1dc..9f34b1dc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10015-Issue_2845.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10015-Issue_2845.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10016-Issue_3233.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10016-Issue_3233.c
index ccb53151..ccb53151 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10016-Issue_3233.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10016-Issue_3233.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10017-double-sparen.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10017-double-sparen.c
index 6633006e..6633006e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10017-double-sparen.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10017-double-sparen.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10018-double-sparen.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10018-double-sparen.c
index f77262fe..f77262fe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10018-double-sparen.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10018-double-sparen.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10019-include-guard.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10019-include-guard.h
index e742dd4c..e742dd4c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10019-include-guard.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10019-include-guard.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10020-single_line_comment_after.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10020-single_line_comment_after.c
index 527b3e80..527b3e80 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10020-single_line_comment_after.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10020-single_line_comment_after.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10021-parenthesized_indirect_call.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10021-parenthesized_indirect_call.c
index 7fd4d573..7fd4d573 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10021-parenthesized_indirect_call.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10021-parenthesized_indirect_call.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10022-Issue_3269.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10022-Issue_3269.c
index 6baef61c..6baef61c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10022-Issue_3269.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10022-Issue_3269.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10023-Issue_3272.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10023-Issue_3272.h
index 673c5a91..673c5a91 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10023-Issue_3272.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10023-Issue_3272.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10024-Issue_3274.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10024-Issue_3274.c
index f8b9f789..f8b9f789 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10024-Issue_3274.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10024-Issue_3274.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10025-forever.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10025-forever.c
index fc14ccf1..fc14ccf1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10025-forever.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10025-forever.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10026-forever.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10026-forever.c
index 94dc8ce1..94dc8ce1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10026-forever.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10026-forever.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10027-Issue_3327.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10027-Issue_3327.c
index 92ec0779..92ec0779 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10027-Issue_3327.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10027-Issue_3327.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10028-Issue_3339.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10028-Issue_3339.c
index fa6872e4..fa6872e4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10028-Issue_3339.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10028-Issue_3339.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10029-Issue_3339.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10029-Issue_3339.c
index 0b9b50e1..0b9b50e1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10029-Issue_3339.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10029-Issue_3339.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10030-Issue_3339.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10030-Issue_3339.c
index fb71b266..fb71b266 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10030-Issue_3339.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10030-Issue_3339.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10031-Issue_3342.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10031-Issue_3342.c
index 986aab70..986aab70 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10031-Issue_3342.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10031-Issue_3342.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10032-Issue_3345.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10032-Issue_3345.c
index eec63b28..eec63b28 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10032-Issue_3345.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10032-Issue_3345.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10033-Issue_3343.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10033-Issue_3343.c
index 6acdb70e..6acdb70e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10033-Issue_3343.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10033-Issue_3343.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10034-Issue_3343.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10034-Issue_3343.c
index 31eddc22..31eddc22 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10034-Issue_3343.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10034-Issue_3343.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10035-comment-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10035-comment-indent.c
index 4486816e..4486816e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10035-comment-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10035-comment-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10036-comment-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10036-comment-indent.c
index 9ac0677f..9ac0677f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10036-comment-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10036-comment-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10037-Issue_3362.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10037-Issue_3362.c
index abff8de4..abff8de4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10037-Issue_3362.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10037-Issue_3362.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10038-Issue_3362.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10038-Issue_3362.c
index 7a8c08f3..7a8c08f3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10038-Issue_3362.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10038-Issue_3362.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10039-Issue_3370.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10039-Issue_3370.c
index 2586a3b4..2586a3b4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10039-Issue_3370.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10039-Issue_3370.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10040-Issue_3377.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10040-Issue_3377.c
index fc4aa694..fc4aa694 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10040-Issue_3377.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10040-Issue_3377.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10041-Issue_3351.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10041-Issue_3351.c
index 592fc511..592fc511 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10041-Issue_3351.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10041-Issue_3351.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10042-Issue_3376.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10042-Issue_3376.c
index 084e9c7d..084e9c7d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10042-Issue_3376.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10042-Issue_3376.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10043-Issue_3376.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10043-Issue_3376.c
index 6874a984..6874a984 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10043-Issue_3376.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10043-Issue_3376.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10044-Issue_3376.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10044-Issue_3376.c
index b6ea490d..b6ea490d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10044-Issue_3376.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10044-Issue_3376.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10045-Issue_3376.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10045-Issue_3376.c
index fa3776db..fa3776db 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/c/10045-Issue_3376.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.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.75.0/tests/expected/c/10046-Issue_3402.c
new file mode 100644
index 00000000..03f5b5bb
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10046-Issue_3402.c
@@ -0,0 +1,3 @@
+int *    variable;
+int (* function)(void);
+typedef int (*function_type)(void);
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.75.0/tests/expected/c/10047-Issue_3421.h
new file mode 100644
index 00000000..cdc3b4f0
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10047-Issue_3421.h
@@ -0,0 +1,9 @@
+#ifdef __cplusplus
+	extern "C" {
+#endif
+
+int foobar(void);
+
+#ifdef __cplusplus
+	}
+#endif
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.75.0/tests/expected/c/10048-Issue_3431.c
new file mode 100644
index 00000000..1af6603e
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10048-Issue_3431.c
@@ -0,0 +1,15 @@
+int add(
+	int a,
+	int b
+#define HAVE_C
+	#ifdef HAVE_C
+		, int c
+	#endif
+       )
+{
+	int sum = a + b;
+	#ifdef HAVE_C
+		sum += c;
+	#endif
+	return sum;
+}
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.75.0/tests/expected/c/10049-Issue_3436.c
new file mode 100644
index 00000000..d921d9ed
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10049-Issue_3436.c
@@ -0,0 +1,15 @@
+#include <stdio.h>
+
+int main(void)
+{
+	puts("");
+	puts(""
+	       );
+	puts(""
+	     );
+	puts(""
+	    );
+	puts(""
+	);
+	return 0;
+}
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.75.0/tests/expected/c/10050-Issue_3192.c
new file mode 100644
index 00000000..a6ff66a2
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10050-Issue_3192.c
@@ -0,0 +1,4 @@
+struct a *
+myfunc()
+{
+}
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.75.0/tests/expected/c/10051-Issue_3454.c
new file mode 100644
index 00000000..8be230dd
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10051-Issue_3454.c
@@ -0,0 +1,99 @@
+int array1[] = { 1
+    , 2
+    , 3 };
+
+int array2[] = {1
+              , 2
+              , 3};
+
+int array3[] = { 1
+               , 2
+               , 3 };
+
+int array4[] = {  1
+                , 2
+                , 3 };
+
+int array5[] = {   1
+                 , 2
+                 , 3 };
+
+int function1( int a
+    , int b
+    , int c );
+
+int function2(int a
+            , int b
+            , int c);
+
+int function3( int a
+             , int b
+             , int c );
+
+int function4(  int a
+              , int b
+              , int c );
+
+int function5(   int a
+               , int b
+               , int c );
+
+int function1( int a
+    , int b
+    , int c )
+{
+    return a + b + c;
+}
+
+int function2(int a
+            , int b
+            , int c)
+{
+    return a + b + c;
+}
+
+int function3( int a
+             , int b
+             , int c )
+{
+    return a + b + c;
+}
+
+int function4(  int a
+              , int b
+              , int c )
+{
+    return a + b + c;
+}
+
+int function5(   int a
+               , int b
+               , int c )
+{
+    return a + b + c;
+}
+
+int main(void)
+{
+    function1( 1
+        , 2
+        , 3 );
+
+    function2(1
+            , 2
+            , 3);
+
+    function3( 1
+             , 2
+             , 3 );
+
+    function4(  1
+              , 2
+              , 3 );
+
+    function5(   1
+               , 2
+               , 3 );
+
+    return 0;
+}
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.75.0/tests/expected/c/10052-Issue_3472.c
new file mode 100644
index 00000000..d180a700
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10052-Issue_3472.c
@@ -0,0 +1,30 @@
+int a, b;
+
+int main()
+{
+    if (a
+     && b)
+    {
+        return 1;
+    }
+
+    if (  a
+       && b)
+    {
+        return 2;
+    }
+
+    if (   a
+        && b)
+    {
+        return 3;
+    }
+
+    if (    a
+         && b)
+    {
+        return 4;
+    }
+
+    return 0;
+}
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.75.0/tests/expected/c/10053-Issue_3476.c
new file mode 100644
index 00000000..92a7b0c0
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10053-Issue_3476.c
@@ -0,0 +1,38 @@
+int a;
+int b;
+int c;
+
+int main()
+{
+    if (a
+      & b)
+    {
+        return 1;
+    }
+
+    if ( a
+       | b )
+    {
+        return 2;
+    }
+
+    if (  a
+        ^ b)
+    {
+        return 3;
+    }
+
+    c = a
+     + b;
+
+    c = a
+     - b;
+
+    c =  a
+       * b;
+
+    c =   a
+        / b;
+
+    return 0;
+}
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.75.0/tests/expected/c/10054-Issue_3480.c
new file mode 100644
index 00000000..6a25879a
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10054-Issue_3480.c
@@ -0,0 +1,26 @@
+int a;
+int b;
+int c;
+
+int main()
+{
+    if (a
+     << b)
+    {
+        return 1;
+    }
+
+    if ( a
+      >> b )
+    {
+        return 2;
+    }
+
+    c = a
+    << b;
+
+    c = a
+     >> b;
+
+    return 0;
+}
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.75.0/tests/expected/c/10055-Issue_3493.c
new file mode 100644
index 00000000..66554d57
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10055-Issue_3493.c
@@ -0,0 +1,20 @@
+int main(void)
+{
+    int a = 1 +
+            2
+            ;
+
+    int b = 3 +
+            4
+          ;
+
+    int c = 5 +
+            6
+        ;
+
+    int d = 7 +
+            8
+    ;
+
+    return 0;
+}
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.75.0/tests/expected/c/10056-Issue_3496.h
new file mode 100644
index 00000000..b0509bd5
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10056-Issue_3496.h
@@ -0,0 +1,3 @@
+enum{ A = 0 };
+
+enum  { B = 1 };
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.75.0/tests/expected/c/10057-Issue_3496.h
new file mode 100644
index 00000000..23fbf3b8
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10057-Issue_3496.h
@@ -0,0 +1,3 @@
+enum { A = 0 };
+
+enum  { B = 1 };
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.75.0/tests/expected/c/10058-Issue_3496.h
new file mode 100644
index 00000000..3f056c45
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10058-Issue_3496.h
@@ -0,0 +1,3 @@
+enum{ A = 0 };
+
+enum{ B = 1 };
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.75.0/tests/expected/c/10059-Issue_3496.h
new file mode 100644
index 00000000..f914f255
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10059-Issue_3496.h
@@ -0,0 +1,3 @@
+enum { A = 0 };
+
+enum { B = 1 };
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.75.0/tests/expected/c/10060-Issue_3548.c
new file mode 100644
index 00000000..71824adc
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10060-Issue_3548.c
@@ -0,0 +1,21 @@
+bool is_inside(int num)
+{
+	bool inside;
+
+	inside = num >= 3
+	   && num <= 10;
+
+	return num <= 3
+	   && num >= 10;
+}
+
+bool is_outside(int num)
+{
+	bool outside;
+
+	outside = num < 3
+	   || num > 10;
+
+	return num < 3
+	   || num > 10;
+}
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.75.0/tests/expected/c/10061-Issue_3556.c
new file mode 100644
index 00000000..423e07f0
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10061-Issue_3556.c
@@ -0,0 +1,33 @@
+int main(void)
+{
+    int a
+   = -1;
+    int b
+     = 0;
+    int c
+      = 1;
+    a
+   = -1;
+    b
+     = 0;
+    c
+      = 1;
+    if (a
+   = -1)
+    {
+        return a
+       = -1;
+    }
+    if (b
+     = 0)
+    {
+        return b
+         = 0;
+    }
+    if (c
+      = 1)
+    {
+        return c
+          = 1;
+    }
+}
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.75.0/tests/expected/c/10062-Issue_3561.c
new file mode 100644
index 00000000..db5c5afc
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10062-Issue_3561.c
@@ -0,0 +1,8 @@
+#include <math.h>
+
+int main(void)
+{
+    int x = abs
+               (-1);
+    return 0;
+}
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.75.0/tests/expected/c/10063-Issue_3565.c
new file mode 100644
index 00000000..267e25bd
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10063-Issue_3565.c
@@ -0,0 +1,3 @@
+#define RETURN_ON_ERROR(error) \
+    if (error /* zero means no error */) \
+        return;
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.75.0/tests/expected/c/10064-Issue_3567.c
new file mode 100644
index 00000000..a56a513c
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10064-Issue_3567.c
@@ -0,0 +1,10 @@
+int main
+        (void);
+int main
+        (void)
+{
+	int x = main
+	        ();
+	main
+	        ();
+}
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.75.0/tests/expected/c/10065-Issue_3567.c
new file mode 100644
index 00000000..3538b0f6
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10065-Issue_3567.c
@@ -0,0 +1,10 @@
+int main
+        (void);
+int main
+        (void)
+{
+	int x = main
+	                ();
+	main
+	        ();
+}
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.75.0/tests/expected/c/10066-Issue_3580.c
new file mode 100644
index 00000000..c2baeb12
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10066-Issue_3580.c
@@ -0,0 +1,35 @@
+#include <stdio.h>
+
+int main(int argc, char **argv)
+{
+    switch (argc)
+    {
+    case -1:
+  {
+      printf("Negative args shouldn't be possible\n");
+      break;
+  }
+    case 0:
+    {
+        printf("Zero args can happen but shouldn't\n");
+        break;
+    }
+    case 1:
+      {
+          printf("One arg\n");
+          break;
+      }
+    case 2:
+        {
+            printf("Two args\n");
+            break;
+        }
+    default:
+          {
+              printf("%i args\n", argc);
+              break;
+          }
+    }
+
+    return 0;
+}
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.75.0/tests/expected/c/10077-Issue_3582.c
new file mode 100644
index 00000000..65cd5354
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10077-Issue_3582.c
@@ -0,0 +1,48 @@
+#include <stdio.h>
+
+int main(void)
+{
+    #if A
+  {
+      printf("A enabled\n");
+  }
+    #endif
+    #if B
+    {
+        printf("B enabled\n");
+    }
+    #endif
+    #if C
+      {
+          printf("C enabled\n");
+      }
+    #endif
+    #if D
+        {
+            printf("D enabled\n");
+        }
+    #endif
+    #if E
+          {
+              printf("E enabled\n");
+          }
+    #endif
+
+    #if A
+        printf("A enabled\n");
+    #endif
+    #if B
+        printf("B enabled\n");
+    #endif
+    #if C
+        printf("C enabled\n");
+    #endif
+    #if D
+        printf("D enabled\n");
+    #endif
+    #if E
+        printf("E enabled\n");
+    #endif
+
+    return 0;
+}
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.75.0/tests/expected/c/10078-Issue_3587.h
new file mode 100644
index 00000000..3744884f
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/c/10078-Issue_3587.h
@@ -0,0 +1,9 @@
+#ifdef __cplusplus
+    extern "C" {
+#endif
+
+int foo(void);
+
+#ifdef __cplusplus
+    }
+#endif
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/02102-indent-c.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/02102-indent-c.cpp
index 70648397..6828d1c5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/02102-indent-c.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/02102-indent-c.cpp
@@ -5,7 +5,7 @@
  * $Id: indent.cpp 548 2006-10-21 02:31:55Z bengardner $
  */
 #include "uncrustify_types.h"
-#include "chunk_list.h"
+#include "chunk.h"
 #include "prototypes.h"
 #include <cstdio>
 #include <cstdlib>
@@ -115,10 +115,10 @@
  *    thatreallyannoysme.whenIhavetomaintain[thecode] = 3;
  */
 
-static void indent_comment(chunk_t *pc, int col);
+static void indent_comment(Chunk *pc, int col);
 
 
-void indent_to_column(chunk_t *pc, int column)
+void indent_to_column(Chunk *pc, int column)
   {
   if (column < pc->column)
     column = pc->column;
@@ -132,7 +132,7 @@ void indent_to_column(chunk_t *pc, int column)
  * @param pc      The chunk at the start of the line
  * @param column  The desired column
  */
-void reindent_line(chunk_t *pc, int column)
+void reindent_line(Chunk *pc, int column)
   {
   int col_delta;
   int min_col;
@@ -151,7 +151,7 @@ void reindent_line(chunk_t *pc, int column)
   do
     {
     min_col += pc->len;
-    pc       = chunk_get_next(pc);
+    pc       = pc->GetNext();
 
     if (pc != NULL)
       {
@@ -183,7 +183,7 @@ void reindent_line(chunk_t *pc, int column)
  * @param frm  The parse frame
  * @param pc   The chunk causing the push
  */
-static void indent_pse_push(struct parse_frame& frm, chunk_t *pc)
+static void indent_pse_push(struct parse_frame& frm, Chunk *pc)
   {
   static int ref = 0;
 
@@ -211,7 +211,7 @@ static void indent_pse_push(struct parse_frame& frm, chunk_t *pc)
  * @param frm  The parse frame
  * @param pc   The chunk causing the push
  */
-static void indent_pse_pop(struct parse_frame& frm, chunk_t *pc)
+static void indent_pse_pop(struct parse_frame& frm, Chunk *pc)
   {
     /* Bump up the index and initialize it */
   if (frm.pse_tos > 0)
@@ -237,7 +237,7 @@ static void indent_pse_pop(struct parse_frame& frm, chunk_t *pc)
     }
   }
 
-static int token_indent(c_token_t type)
+static int token_indent(E_Token type)
   {
   switch (type)
     {
@@ -270,9 +270,9 @@ static int token_indent(c_token_t type)
  */
 void indent_text(void)
   {
-  chunk_t            *pc;
-  chunk_t            *next;
-  chunk_t            *prev       = NULL;
+  Chunk            *pc;
+  Chunk            *next;
+  Chunk            *prev       = NULL;
   bool did_newline = true;
   int idx;
   int vardefcol   = 0;
@@ -292,7 +292,7 @@ void indent_text(void)
   frm.pse[0].indent_tmp = 1;
   frm.pse[0].type       = CT_EOF;
 
-  pc = chunk_get_head();
+  pc = Chunk::GetHead();
 
   while (pc != NULL)
     {
@@ -358,7 +358,7 @@ void indent_text(void)
           {
           indent_pse_pop(frm, pc);
           frm.level--;
-          pc = chunk_get_next(pc);
+          pc = pc->GetNext();
           }
 
           /* End any assign operations with a semicolon on the same level */
@@ -518,7 +518,7 @@ void indent_text(void)
          * { a++;
          *   b--; };
          */
-        next = chunk_get_next_ncnnl(pc);
+        next = pc->GetNextNcNnl();
 
         if (!chunk_is_newline_between(pc, next))
           frm.pse[frm.pse_tos].indent = next->column;
@@ -565,7 +565,7 @@ void indent_text(void)
 
       if (cpd.settings[UO_indent_class_colon].b)
         {
-        prev = chunk_get_prev(pc);
+        prev = pc->GetPrev();
 
         if (chunk_is_newline(prev))
           {
@@ -592,7 +592,7 @@ void indent_text(void)
       if ((chunk_is_str(pc, "(", 1) && !cpd.settings[UO_indent_paren_nl].b) ||
           (chunk_is_str(pc, "[", 1) && !cpd.settings[UO_indent_square_nl].b))
         {
-        next = chunk_get_next_nc(pc);
+        next = pc->GetNextNc();
 
         if (chunk_is_newline(next))
           {
@@ -615,7 +615,7 @@ void indent_text(void)
        * otherwise align on the '='.
        * Never update indent_column.
        */
-      next = chunk_get_next(pc);
+      next = pc->GetNext();
 
       if (next != NULL)
         {
@@ -663,7 +663,7 @@ void indent_text(void)
        * everything else
        */
 
-      prev = chunk_get_prev_ncnnl(pc);
+      prev = pc->GetPrevNcNnl();
 
       if ((pc->type == CT_MEMBER) ||
           (pc->type == CT_DC_MEMBER) ||
@@ -757,7 +757,7 @@ void indent_text(void)
     if (!chunk_is_comment(pc) && !chunk_is_newline(pc))
       prev = pc;
 
-    pc = chunk_get_next(pc);
+    pc = pc->GetNext();
     }
 
     /* Throw out any stuff inside a preprocessor - no need to warn */
@@ -780,16 +780,16 @@ void indent_text(void)
  */
 
 
-static bool single_line_comment_indent_rule_applies(chunk_t *start)
+static bool single_line_comment_indent_rule_applies(Chunk *start)
   {
-  chunk_t *pc      = start;
+  Chunk *pc      = start;
   int nl_count = 0;
 
   if (!chunk_is_single_line_comment(pc))
     return false;
 
     /* scan forward, if only single newlines and comments before next line of code, we want to apply */
-  while ((pc = chunk_get_next(pc)) != NULL)
+  while ((pc = pc->GetNext()) != NULL)
     {
     if (chunk_is_newline(pc))
       {
@@ -846,10 +846,10 @@ static bool single_line_comment_indent_rule_applies(chunk_t *start)
  * @param pc   The comment, which is the first item on a line
  * @param col  The column if this is to be put at indent level
  */
-static void indent_comment(chunk_t *pc, int col)
+static void indent_comment(Chunk *pc, int col)
   {
-  chunk_t *nl;
-  chunk_t *prev;
+  Chunk *nl;
+  Chunk *prev;
 
   LOG_FMT(LCMTIND, "%s: line %d, col %d, level %d: ", __func__,
           pc->orig_line, pc->orig_col, pc->level);
@@ -862,7 +862,7 @@ static void indent_comment(chunk_t *pc, int col)
     return;
     }
 
-  nl = chunk_get_prev(pc);
+  nl = pc->GetPrev();
 
     /* outside of any expression or statement? */
   if (pc->level == 0)
@@ -875,7 +875,7 @@ static void indent_comment(chunk_t *pc, int col)
       }
     }
 
-  prev = chunk_get_prev(nl);
+  prev = nl->GetPrev();
 
   if (chunk_is_comment(prev) && (nl->nl_count == 1))
     {
@@ -910,8 +910,8 @@ static void indent_comment(chunk_t *pc, int col)
  */
 void indent_preproc(void)
   {
-  chunk_t *pc;
-  chunk_t *next;
+  Chunk *pc;
+  Chunk *next;
   int pp_level;
   int pp_level_sub = 0;
   int tmp;
@@ -923,7 +923,7 @@ void indent_preproc(void)
     /* Scan to see if the whole file is covered by one #ifdef */
   int stage = 0;
 
-  for (pc = chunk_get_head(); pc != NULL; pc = chunk_get_next(pc))
+  for (pc = Chunk::GetHead(); pc != NULL; pc = pc->GetNext())
     {
     if (chunk_is_comment(pc) || chunk_is_newline(pc))
       continue;
@@ -934,7 +934,7 @@ void indent_preproc(void)
       if (pc->type != CT_PREPROC)
         break;
 
-      next = chunk_get_next(pc);
+      next = pc->GetNext();
 
       if ((next == NULL) || (next->type != CT_PP_IF))
         break;
@@ -968,7 +968,7 @@ void indent_preproc(void)
     pp_level_sub = 1;
     }
 
-  for (pc = chunk_get_head(); pc != NULL; pc = chunk_get_next(pc))
+  for (pc = Chunk::GetHead(); pc != NULL; pc = pc->GetNext())
     {
     if (pc->type != CT_PREPROC)
       continue;
@@ -1013,7 +1013,7 @@ void indent_preproc(void)
     if ((cpd.settings[UO_pp_space].a & AV_ADD) != 0)
       pc->len += pp_level;
 
-    next = chunk_get_next(pc);
+    next = pc->GetNext();
 
     if (next != NULL)
       reindent_line(next, pc->len + 1);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/02103-output.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/02103-output.cpp
index ca003784..3df1cd07 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/02103-output.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/02103-output.cpp
@@ -7,7 +7,7 @@
 
 #include "uncrustify_types.h"
 #include "prototypes.h"
-#include "chunk_list.h"
+#include "chunk.h"
 #include <cstring>
 #include <cstdlib>
 
@@ -98,7 +98,7 @@ void output_indent(int column, int brace_col)
 
 void output_parsed(FILE *pfile)
   {
-  chunk_t *pc;
+  Chunk *pc;
   int cnt;
 
   output_options(pfile);
@@ -108,7 +108,7 @@ void output_parsed(FILE *pfile)
   fprintf(pfile, "-=====-\n");
   fprintf(pfile, "Line      Tag          Parent     Columns  Br/Lvl/pp Flg Nl  Text");
 
-  for (pc = chunk_get_head(); pc != NULL; pc = chunk_get_next(pc))
+  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),
@@ -178,15 +178,15 @@ void output_options(FILE *pfile)
  */
 void output_text(FILE *pfile)
   {
-  chunk_t *pc;
-  chunk_t *prev;
+  Chunk *pc;
+  Chunk *prev;
   int cnt;
   int lvlcol;
   bool allow_tabs;
 
   cpd.fout = pfile;
 
-  for (pc = chunk_get_head(); pc != NULL; pc = chunk_get_next(pc))
+  for (pc = Chunk::GetHead(); pc != NULL; pc = pc->GetNext())
     {
     if (pc->type == CT_NEWLINE)
       {
@@ -230,7 +230,7 @@ void output_text(FILE *pfile)
           allow_tabs = pc->after_tab;
         else
           {
-          prev       = chunk_get_prev(pc);
+          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) &&
@@ -355,7 +355,7 @@ static int calculate_comment_body_indent(const char *str, int len, int start_col
  *
  * @return the last chunk output'd
  */
-chunk_t *output_comment_cpp(chunk_t *first)
+Chunk *output_comment_cpp(Chunk *first)
   {
   int col    = first->column;
   int col_br = 1 + (first->brace_level * cpd.settings[UO_indent_columns].n);
@@ -363,7 +363,7 @@ chunk_t *output_comment_cpp(chunk_t *first)
     /* Make sure we have at least one space past the last token */
   if (first->parent_type == CT_COMMENT_END)
     {
-    chunk_t *prev = chunk_get_prev(first);
+    Chunk *prev = first->GetPrev();
 
     if (prev != NULL)
       {
@@ -389,11 +389,11 @@ chunk_t *output_comment_cpp(chunk_t *first)
   if (cpd.settings[UO_cmt_cpp_group].b)
     {
       /* next is a newline by definition */
-    chunk_t *next = chunk_get_next(first);
+    Chunk *next = first->GetNext();
 
     if ((next != NULL) && (next->nl_count == 1))
       {
-      next = chunk_get_next(next);
+      next = next->GetNext();
 
       /**
        * Only combine the next comment if they are both at indent level or
@@ -424,8 +424,8 @@ chunk_t *output_comment_cpp(chunk_t *first)
     return first;
     }
 
-  chunk_t *pc   = first;
-  chunk_t *last = first;
+  Chunk *pc   = first;
+  Chunk *last = first;
 
     /* Output the first line */
   add_text_len("/*", 2);
@@ -439,7 +439,7 @@ chunk_t *output_comment_cpp(chunk_t *first)
   goto cpp_addline;
 
     /* Output combined lines */
-  while ((pc = chunk_get_next(pc)) != NULL)
+  while ((pc = pc->GetNext()) != NULL)
     {
     if ((pc->type == CT_NEWLINE) && (pc->nl_count == 1))
       continue;
@@ -476,13 +476,13 @@ cpp_addline:
   return last;
   }
 
-void output_comment_multi(chunk_t *pc)
+void output_comment_multi(Chunk *pc)
   {
   int cmt_col = pc->column;
   const char *cmt_str;
   int remaining;
   char ch;
-  chunk_t    *prev;
+  Chunk    *prev;
   char line[1024];
   int line_len;
   int line_count = 0;
@@ -490,7 +490,7 @@ void output_comment_multi(chunk_t *pc)
   int col_diff = 0;
   int xtra     = 1;
 
-  prev = chunk_get_prev(pc);
+  prev = pc->GetPrev();
 
   if ((prev != NULL) && (prev->type != CT_NEWLINE))
     cmt_col = pc->orig_col;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10000-621_this-spacing.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10000-621_this-spacing.cpp
index bd28a5e8..bd28a5e8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10000-621_this-spacing.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10000-621_this-spacing.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10001-622_ifdef-indentation.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10001-622_ifdef-indentation.cpp
index c466b45c..c466b45c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10001-622_ifdef-indentation.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10001-622_ifdef-indentation.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10002-623_caret-spacing.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10002-623_caret-spacing.cpp
index 5058ea4b..5058ea4b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10002-623_caret-spacing.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10002-623_caret-spacing.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10003-633_decl-in-func-typedef.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10003-633_decl-in-func-typedef.cpp
index 4160ecca..4160ecca 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10003-633_decl-in-func-typedef.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10003-633_decl-in-func-typedef.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10004-634_extern-c-no-block.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10004-634_extern-c-no-block.cpp
index bb6b14fb..bb6b14fb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10004-634_extern-c-no-block.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10004-634_extern-c-no-block.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10005-define-indentation.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10005-define-indentation.cpp
index 24370df9..24370df9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10005-define-indentation.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10005-define-indentation.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10006-dont-detab-strings.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10006-dont-detab-strings.cpp
index 11352d82..11352d82 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10006-dont-detab-strings.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10006-dont-detab-strings.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10007-dont-process-defines.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10007-dont-process-defines.cpp
index 56f6852e..10ac8d5b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10007-dont-process-defines.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10007-dont-process-defines.cpp
@@ -1,6 +1,6 @@
 #define inline_2 __forceinline

 #define inline(i) inline_##i

 #define foo(x) inline(2) x()

-#define PLD(reg,offset)    pld    [reg, offset] \

+#define PLD(reg,offset)    pld    [reg, offset]  \

     pld    [reg, offset] \

     pld     [reg, offset]

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10008-PR326_invalid-backslash-eol-csharp.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10008-PR326_invalid-backslash-eol-csharp.cpp
index dfd33ac7..dfd33ac7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10008-PR326_invalid-backslash-eol-csharp.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10008-PR326_invalid-backslash-eol-csharp.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10009-STUCK_macro-difficulties.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10009-STUCK_macro-difficulties.cpp
index ea1c724e..ea1c724e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10009-STUCK_macro-difficulties.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10009-STUCK_macro-difficulties.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10020-macro_spaces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10020-macro_spaces.cpp
index 55a50766..55a50766 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10020-macro_spaces.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10020-macro_spaces.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10021-braces_align.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10021-braces_align.cpp
index 40d966f5..40d966f5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10021-braces_align.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10021-braces_align.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10022-foreach.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10022-foreach.cpp
index 2862e6ef..2862e6ef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10022-foreach.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10022-foreach.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10023-for_auto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10023-for_auto.cpp
index 775031a5..775031a5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10023-for_auto.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10023-for_auto.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10024-ifcomment.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10024-ifcomment.cpp
index b41c5c6f..b41c5c6f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10024-ifcomment.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10024-ifcomment.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10025-qtargs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10025-qtargs.cpp
index 01d94543..01d94543 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10025-qtargs.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10025-qtargs.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10026-gcc_case_ellipsis.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10026-gcc_case_ellipsis.cpp
index 852360a4..852360a4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10026-gcc_case_ellipsis.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10026-gcc_case_ellipsis.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10027-Issue_3058.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10027-Issue_3058.cpp
index 09e1dc92..09e1dc92 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10027-Issue_3058.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10027-Issue_3058.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10028-gcc_case_ellipsis.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10028-gcc_case_ellipsis.cpp
index 852360a4..852360a4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10028-gcc_case_ellipsis.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10028-gcc_case_ellipsis.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10029-gcc_case_ellipsis.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10029-gcc_case_ellipsis.cpp
index e2d8ef8a..e2d8ef8a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10029-gcc_case_ellipsis.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10029-gcc_case_ellipsis.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10047-UNI-1334.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10047-UNI-1334.cpp
index 9a856f91..9a856f91 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10047-UNI-1334.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10047-UNI-1334.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10048-UNI-1335.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10048-UNI-1335.cpp
index 891b945a..891b945a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10048-UNI-1335.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10048-UNI-1335.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10050-UNI-1337.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10050-UNI-1337.cpp
index 59635c19..59635c19 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10050-UNI-1337.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10050-UNI-1337.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10052-UNI-1339.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10052-UNI-1339.cpp
index 255db223..255db223 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10052-UNI-1339.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10052-UNI-1339.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10053-UNI-1340.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10053-UNI-1340.cpp
index 2a96aa31..2a96aa31 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10053-UNI-1340.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10053-UNI-1340.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10054-UNI-1344.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10054-UNI-1344.cpp
index 43c4429e..43c4429e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10054-UNI-1344.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10054-UNI-1344.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10056-UNI-1346.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10056-UNI-1346.cpp
index af875c3e..af875c3e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10056-UNI-1346.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10056-UNI-1346.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10057-UNI-1347.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10057-UNI-1347.cpp
index ec8f350b..ec8f350b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10057-UNI-1347.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10057-UNI-1347.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10060-UNI-1350.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10060-UNI-1350.cpp
index 7353e915..7353e915 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10060-UNI-1350.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10060-UNI-1350.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10062-UNI-1356.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10062-UNI-1356.cpp
index c70ca61d..c70ca61d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10062-UNI-1356.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10062-UNI-1356.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10063-UNI-1358.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10063-UNI-1358.cpp
index 120aa9c4..120aa9c4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10063-UNI-1358.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10063-UNI-1358.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10069-UNI-1980.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10069-UNI-1980.cpp
index 97940716..97940716 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10069-UNI-1980.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10069-UNI-1980.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10070-UNI-1981.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10070-UNI-1981.cpp
index d4f74dc3..d4f74dc3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10070-UNI-1981.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10070-UNI-1981.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10071-UNI-1983.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10071-UNI-1983.cpp
index e7d9de6d..e7d9de6d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10071-UNI-1983.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10071-UNI-1983.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10079-UNI-9650.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10079-UNI-9650.cpp
index 0d6cdb46..0d6cdb46 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10079-UNI-9650.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10079-UNI-9650.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10080-UNI-10496.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10080-UNI-10496.cpp
index 81122be8..81122be8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10080-UNI-10496.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10080-UNI-10496.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10100-issue_564.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10100-issue_564.cpp
index ac5fbef3..ac5fbef3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10100-issue_564.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10100-issue_564.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10101-issue_574.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10101-issue_574.cpp
index 6621d455..6621d455 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10101-issue_574.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10101-issue_574.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10102-issue_574.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10102-issue_574.cpp
index 0f3b7da3..0f3b7da3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10102-issue_574.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10102-issue_574.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10103-issue_574.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10103-issue_574.cpp
index b87e76fe..b87e76fe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10103-issue_574.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10103-issue_574.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10566-issue_1752.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10566-issue_1752.cpp
index 8e16cfa3..8e16cfa3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/10566-issue_1752.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/10566-issue_1752.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/11000-UNI-12046.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/11000-UNI-12046.cpp
index 5ffc0da9..5ffc0da9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/11000-UNI-12046.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/11000-UNI-12046.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/20002-UNI-32657.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/20002-UNI-32657.cpp
index eb7655da..eb7655da 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/20002-UNI-32657.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/20002-UNI-32657.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/20011-UNI-38381.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/20011-UNI-38381.cpp
index 701b55b2..701b55b2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/20011-UNI-38381.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/20011-UNI-38381.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30000-cout.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30000-cout.cpp
index f099751f..f099751f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30000-cout.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30000-cout.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30001-alt_tokens.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30001-alt_tokens.cpp
index 02083b88..02083b88 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30001-alt_tokens.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30001-alt_tokens.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30002-constructor.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30002-constructor.cpp
index f7cbb30d..f7cbb30d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30002-constructor.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30002-constructor.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30003-strings.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30003-strings.cpp
index acef8744..acef8744 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30003-strings.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30003-strings.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30010-class.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30010-class.h
index 2293d9c8..2293d9c8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30010-class.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30010-class.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30011-misc.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30011-misc.cpp
index 9e3b8c5b..9e3b8c5b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30011-misc.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30011-misc.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30012-misc2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30012-misc2.cpp
index c5febbac..62a51621 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30012-misc2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30012-misc2.cpp
@@ -30,7 +30,7 @@ void foo(void)
   List<byte> bob = new List<byte>();
 
   /* Align assignments */
-  align_assign(chunk_get_head(),
+  align_assign(Chunk::GetHead(),
                cpd.settings [UO_align_assign_span].n,
                cpd.settings [UO_align_assign_thresh].n);
 }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30013-sim.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30013-sim.h
index 835ae666..835ae666 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30013-sim.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30013-sim.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30014-ctor-var.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30014-ctor-var.cpp
index 2551d8bd..2551d8bd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30014-ctor-var.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30014-ctor-var.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30015-exception.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30015-exception.cpp
index 75a4f97e..75a4f97e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30015-exception.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30015-exception.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30016-custom-open.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30016-custom-open.cpp
index 234f5591..234f5591 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30016-custom-open.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30016-custom-open.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30017-custom-open.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30017-custom-open.cpp
index 6acd92e5..6acd92e5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30017-custom-open.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30017-custom-open.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30018-class-addr.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30018-class-addr.h
index 042579dc..042579dc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30018-class-addr.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30018-class-addr.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30019-wacky-template.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30019-wacky-template.cpp
index cf6e5c87..cf6e5c87 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30019-wacky-template.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30019-wacky-template.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30020-bool.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30020-bool.cpp
index 9f9e55b2..9f9e55b2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30020-bool.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30020-bool.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30021-byref.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30021-byref.cpp
index 87f6c44a..87f6c44a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30021-byref.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30021-byref.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30022-extern_c.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30022-extern_c.h
index a97d93b8..a97d93b8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30022-extern_c.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30022-extern_c.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30023-templates.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30023-templates.cpp
index 960e0b82..960e0b82 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30023-templates.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30023-templates.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30024-class-init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30024-class-init.cpp
index 884d5c71..884d5c71 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30024-class-init.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30024-class-init.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30025-class-init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30025-class-init.cpp
index 703686ac..703686ac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30025-class-init.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30025-class-init.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30026-byref.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30026-byref.cpp
index 2534aa05..2534aa05 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30026-byref.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30026-byref.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30027-byref.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30027-byref.cpp
index d0598697..d0598697 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30027-byref.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30027-byref.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30028-byref.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30028-byref.cpp
index 7a97856d..7a97856d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30028-byref.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30028-byref.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30029-init_align.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30029-init_align.h
index 085f838b..085f838b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30029-init_align.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30029-init_align.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30030-Timestamp.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30030-Timestamp.h
index 998b7d6f..998b7d6f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30030-Timestamp.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30030-Timestamp.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30031-operator.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30031-operator.cpp
index f17b865d..f17b865d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30031-operator.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30031-operator.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30032-operator.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30032-operator.cpp
index cfa98ca1..cfa98ca1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30032-operator.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30032-operator.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30033-operator.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30033-operator.cpp
index 976d919f..976d919f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30033-operator.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30033-operator.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30034-operator_proto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30034-operator_proto.cpp
index 3e5af195..3e5af195 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30034-operator_proto.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30034-operator_proto.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30035-operator_proto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30035-operator_proto.cpp
index 3824798c..3824798c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30035-operator_proto.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30035-operator_proto.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30036-operator.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30036-operator.cpp
index b1468795..b1468795 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30036-operator.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30036-operator.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30037-operator_proto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30037-operator_proto.cpp
index d5c7e8fc..d5c7e8fc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30037-operator_proto.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30037-operator_proto.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30038-operator.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30038-operator.cpp
index a1bfafe3..a1bfafe3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30038-operator.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30038-operator.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30039-operator_proto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30039-operator_proto.cpp
index 4ec0acf1..4ec0acf1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30039-operator_proto.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30039-operator_proto.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30040-nl-class.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30040-nl-class.h
index 9ccbcf75..9ccbcf75 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30040-nl-class.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30040-nl-class.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30041-nl-class.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30041-nl-class.h
index 57e47625..57e47625 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30041-nl-class.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30041-nl-class.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30042-Issue_2020.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30042-Issue_2020.cpp
index d618f922..d618f922 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30042-Issue_2020.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30042-Issue_2020.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30043-nl_func_call_empty.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30043-nl_func_call_empty.cpp
index fbf89d16..fbf89d16 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30043-nl_func_call_empty.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30043-nl_func_call_empty.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30044-nl_func_call_paren_empty.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30044-nl_func_call_paren_empty.cpp
index 4495d667..4495d667 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30044-nl_func_call_paren_empty.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30044-nl_func_call_paren_empty.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30045-nl_func_decl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30045-nl_func_decl.cpp
index 81d0a00e..81d0a00e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30045-nl_func_decl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30045-nl_func_decl.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30046-nl_func_decl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30046-nl_func_decl.cpp
index 17aa59f0..17aa59f0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30046-nl_func_decl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30046-nl_func_decl.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30047-nl_func_paren_empty.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30047-nl_func_paren_empty.cpp
index e8a947c9..e8a947c9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30047-nl_func_paren_empty.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30047-nl_func_paren_empty.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30048-nl_func_def_paren_empty.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30048-nl_func_def_paren_empty.cpp
index 22f3c700..22f3c700 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30048-nl_func_def_paren_empty.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30048-nl_func_def_paren_empty.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30049-nl_func_call_paren.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30049-nl_func_call_paren.cpp
index 847b7037..847b7037 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30049-nl_func_call_paren.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30049-nl_func_call_paren.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30050-nl-namespace.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30050-nl-namespace.h
index e515b479..e515b479 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30050-nl-namespace.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30050-nl-namespace.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30051-nl-namespace.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30051-nl-namespace.h
index c51d75be..c51d75be 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30051-nl-namespace.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30051-nl-namespace.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30052-try-catch-nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30052-try-catch-nl.cpp
index 410a735e..410a735e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30052-try-catch-nl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30052-try-catch-nl.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30053-exception.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30053-exception.cpp
index 2c41efbf..2c41efbf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30053-exception.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30053-exception.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30054-Issue_2091.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30054-Issue_2091.cpp
index 6e32d683..6e32d683 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30054-Issue_2091.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30054-Issue_2091.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30055-nl_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30055-nl_func.cpp
index 142e6895..142e6895 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30055-nl_func.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30055-nl_func.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30056-nl_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30056-nl_func.cpp
index f930b703..f930b703 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30056-nl_func.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30056-nl_func.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30057-nl_inside_namespace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30057-nl_inside_namespace.cpp
index 01486ebe..01486ebe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30057-nl_inside_namespace.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30057-nl_inside_namespace.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30058-nl_inside_namespace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30058-nl_inside_namespace.cpp
index 01486ebe..01486ebe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30058-nl_inside_namespace.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30058-nl_inside_namespace.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30059-Issue_2186.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30059-Issue_2186.cpp
index 2c3081ea..2c3081ea 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30059-Issue_2186.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30059-Issue_2186.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30060-Issue_1734.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30060-Issue_1734.cpp
index 31d08c29..31d08c29 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30060-Issue_1734.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30060-Issue_1734.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30061-class-init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30061-class-init.cpp
index 7ce41d09..7ce41d09 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30061-class-init.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30061-class-init.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30062-class-init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30062-class-init.cpp
index 53ce4a31..53ce4a31 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30062-class-init.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30062-class-init.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30063-class-init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30063-class-init.cpp
index ad278c90..ad278c90 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30063-class-init.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30063-class-init.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30064-class-init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30064-class-init.cpp
index c44bdfd3..c44bdfd3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30064-class-init.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30064-class-init.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30065-Example.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30065-Example.h
index 1a868d10..1a868d10 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30065-Example.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30065-Example.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30066-class-init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30066-class-init.cpp
index 1fc8bb57..1fc8bb57 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30066-class-init.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30066-class-init.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30067-nl_func_type_name.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30067-nl_func_type_name.cpp
index a30a08e9..a30a08e9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30067-nl_func_type_name.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30067-nl_func_type_name.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30068-nl_func_scope_name.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30068-nl_func_scope_name.cpp
index 1e4caa86..1e4caa86 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30068-nl_func_scope_name.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30068-nl_func_scope_name.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30069-class-implementation.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30069-class-implementation.cpp
index 18481338..18481338 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30069-class-implementation.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30069-class-implementation.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30070-nl_func_scope_name.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30070-nl_func_scope_name.cpp
index c14a06ed..c14a06ed 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30070-nl_func_scope_name.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30070-nl_func_scope_name.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30071-lineEndings-Mac.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30071-lineEndings-Mac.cpp
index 20fa083a..20fa083a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30071-lineEndings-Mac.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30071-lineEndings-Mac.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30072-lineEndings-Win.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30072-lineEndings-Win.cpp
index cdbf7653..cdbf7653 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30072-lineEndings-Win.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30072-lineEndings-Win.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30073-lineEndings-Unix.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30073-lineEndings-Unix.cpp
index 608952c0..608952c0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30073-lineEndings-Unix.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30073-lineEndings-Unix.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30074-bom.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30074-bom.cpp
index 7ee7e7e6..7ee7e7e6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30074-bom.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30074-bom.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30075-goto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30075-goto.cpp
index 4cccfe2c..4cccfe2c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30075-goto.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30075-goto.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30076-Issue_2594.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30076-Issue_2594.cpp
index 240e19db..240e19db 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30076-Issue_2594.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30076-Issue_2594.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30077-Issue_2596.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30077-Issue_2596.cpp
index d2517e8b..d2517e8b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30077-Issue_2596.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30077-Issue_2596.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30078-Issue_2672-a.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30078-Issue_2672-a.cpp
index d29d2c47..d29d2c47 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30078-Issue_2672-a.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30078-Issue_2672-a.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30079-Issue_2672-b.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30079-Issue_2672-b.cpp
index f484d4ff..f484d4ff 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30079-Issue_2672-b.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30079-Issue_2672-b.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30080-nl_brace_brace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30080-nl_brace_brace.cpp
index a9783697..a9783697 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30080-nl_brace_brace.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30080-nl_brace_brace.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30081-Issue_2383.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30081-Issue_2383.cpp
index 356fd9af..356fd9af 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30081-Issue_2383.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30081-Issue_2383.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30082-Issue_931.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30082-Issue_931.cpp
index 76a6b856..76a6b856 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30082-Issue_931.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30082-Issue_931.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30083-Issue_995-do.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30083-Issue_995-do.cpp
index 2e84d7ce..2e84d7ce 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30083-Issue_995-do.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30083-Issue_995-do.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30084-Issue_1184.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30084-Issue_1184.cpp
index 848b1e03..848b1e03 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30084-Issue_1184.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30084-Issue_1184.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30085-align_class.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30085-align_class.cpp
index 552d6947..552d6947 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30085-align_class.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30085-align_class.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30086-align_class-constr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30086-align_class-constr.cpp
index f6082028..f6082028 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30086-align_class-constr.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30086-align_class-constr.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30087-Issue_1511.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30087-Issue_1511.cpp
index 2583c0e3..2583c0e3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30087-Issue_1511.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30087-Issue_1511.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30088-Issue_2561.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30088-Issue_2561.cpp
index aa566966..aa566966 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30088-Issue_2561.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30088-Issue_2561.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30089-Issue_2281.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30089-Issue_2281.cpp
index e0d8727d..e0d8727d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30089-Issue_2281.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30089-Issue_2281.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30090-bug_488.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30090-bug_488.cpp
index 268d5ba4..268d5ba4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30090-bug_488.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30090-bug_488.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30091-bug_472.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30091-bug_472.cpp
index e48251fe..e48251fe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30091-bug_472.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30091-bug_472.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30092-bug_481.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30092-bug_481.cpp
index 99d8c390..99d8c390 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30092-bug_481.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30092-bug_481.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30093-bug_484.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30093-bug_484.cpp
index 875ff3d2..875ff3d2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30093-bug_484.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30093-bug_484.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30094-bug_495.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30094-bug_495.cpp
index d7db1238..d7db1238 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30094-bug_495.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30094-bug_495.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30095-bug_485.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30095-bug_485.cpp
index b5e7842c..b5e7842c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30095-bug_485.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30095-bug_485.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30096-bug_1854.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30096-bug_1854.cpp
index 29cc2774..29cc2774 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30096-bug_1854.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30096-bug_1854.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30097-issue_1946.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30097-issue_1946.cpp
index 9682da68..9682da68 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30097-issue_1946.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30097-issue_1946.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30098-Issue_2692.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30098-Issue_2692.cpp
index 4173ad5d..4173ad5d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30098-Issue_2692.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30098-Issue_2692.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30099-bug_1127.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30099-bug_1127.cpp
index 0109baaf..0109baaf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30099-bug_1127.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30099-bug_1127.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30100-templates.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30100-templates.cpp
index e4dd89e5..e4dd89e5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30100-templates.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30100-templates.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30101-templates.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30101-templates.cpp
index 78a60ebd..78a60ebd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30101-templates.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30101-templates.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30102-templates.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30102-templates.cpp
index 86bbfaf7..86bbfaf7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30102-templates.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30102-templates.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30103-templates.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30103-templates.cpp
index adadb882..adadb882 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30103-templates.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30103-templates.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30104-templ_class.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30104-templ_class.h
index 802f7e27..802f7e27 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30104-templ_class.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30104-templ_class.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30105-av.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30105-av.h
index 6efe8e9b..6efe8e9b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30105-av.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30105-av.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30106-templates2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30106-templates2.cpp
index 48f56d99..48f56d99 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30106-templates2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30106-templates2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30107-templates2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30107-templates2.cpp
index a49d4381..a49d4381 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30107-templates2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30107-templates2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30108-templates3.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30108-templates3.cpp
index a0e20d19..a0e20d19 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30108-templates3.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30108-templates3.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30109-templates4.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30109-templates4.cpp
index 781822e8..781822e8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30109-templates4.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30109-templates4.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30110-class-init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30110-class-init.cpp
index e1b1949c..e1b1949c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30110-class-init.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30110-class-init.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30111-bug_1346.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30111-bug_1346.h
index 2ca31e50..2ca31e50 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30111-bug_1346.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30111-bug_1346.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30112-bug_1432.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30112-bug_1432.cpp
index 575a21c8..575a21c8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30112-bug_1432.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30112-bug_1432.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30113-bug_1452.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30113-bug_1452.cpp
index 59a3babd..59a3babd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30113-bug_1452.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30113-bug_1452.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30114-bug_1462.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30114-bug_1462.cpp
index b6a33ceb..b6a33ceb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30114-bug_1462.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30114-bug_1462.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30115-Issue_1704.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30115-Issue_1704.cpp
index 90cb2049..90cb2049 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30115-Issue_1704.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30115-Issue_1704.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30116-Issue_1052.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30116-Issue_1052.cpp
index 0e21f136..0e21f136 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30116-Issue_1052.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30116-Issue_1052.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30117-Issue_2343.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30117-Issue_2343.cpp
index a82e1172..a82e1172 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30117-Issue_2343.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30117-Issue_2343.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30118-Issue_2758.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30118-Issue_2758.cpp
index 576b1bef..576b1bef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30118-Issue_2758.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30118-Issue_2758.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30119-Issue_2879.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30119-Issue_2879.cpp
index fbc323ae..fbc323ae 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30119-Issue_2879.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30119-Issue_2879.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30120-sp_after_angle.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30120-sp_after_angle.cpp
index 04af5289..04af5289 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30120-sp_after_angle.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30120-sp_after_angle.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30121-sp_after_angle.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30121-sp_after_angle.cpp
index 8764578e..8764578e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30121-sp_after_angle.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30121-sp_after_angle.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30122-sp_after_angle.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30122-sp_after_angle.cpp
index ee7acae0..ee7acae0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30122-sp_after_angle.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30122-sp_after_angle.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30123-sp_after_angle.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30123-sp_after_angle.cpp
index a791a8ef..a791a8ef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30123-sp_after_angle.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30123-sp_after_angle.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30124-sp_after_angle.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30124-sp_after_angle.cpp
index c29f3552..c29f3552 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30124-sp_after_angle.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30124-sp_after_angle.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30125-sp_after_angle.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30125-sp_after_angle.cpp
index a791a8ef..a791a8ef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30125-sp_after_angle.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30125-sp_after_angle.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30126-sp_after_angle.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30126-sp_after_angle.cpp
index 18788919..18788919 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30126-sp_after_angle.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30126-sp_after_angle.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30127-Issue_2565.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30127-Issue_2565.cpp
index 721d4d78..721d4d78 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30127-Issue_2565.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30127-Issue_2565.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30128-Issue_2873.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30128-Issue_2873.cpp
index 6803fd9a..6803fd9a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30128-Issue_2873.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30128-Issue_2873.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30129-Issue_2890.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30129-Issue_2890.cpp
index d03e4f62..d03e4f62 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30129-Issue_2890.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30129-Issue_2890.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30130-if-constexpr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30130-if-constexpr.cpp
index 483317be..483317be 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30130-if-constexpr.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30130-if-constexpr.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30131-Issue_3010.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30131-Issue_3010.cpp
index 93fd70db..93fd70db 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30131-Issue_3010.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30131-Issue_3010.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30132-sp_brace_catch.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30132-sp_brace_catch.cpp
index 04c1b9c1..04c1b9c1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30132-sp_brace_catch.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30132-sp_brace_catch.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30133-Issue_3252.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30133-Issue_3252.cpp
index 5dc0e67e..5dc0e67e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30133-Issue_3252.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.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.75.0/tests/expected/cpp/30134-Issue_3357.cpp
new file mode 100644
index 00000000..83dcc29a
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30134-Issue_3357.cpp
@@ -0,0 +1,7 @@
+/**
+ * @param[out]    dest The memory area to copy to.
+ * @param[in]     src  The memory area to copy from.
+ * @param[in]     n    The number of bytes to copy
+ * @param[in,out] t    The Test
+ */
+void memcpy(void *dest, const void *src, size_t n);
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.75.0/tests/expected/cpp/30135-Issue_3448.cpp
new file mode 100644
index 00000000..19160cf9
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30135-Issue_3448.cpp
@@ -0,0 +1,11 @@
+class Foo
+: public Bar
+, private Blarg
+, private Baz
+{
+    Foo()
+    : first()
+    , second()
+    , third()
+    { }
+};
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.75.0/tests/expected/cpp/30136-Issue_3413.cpp
new file mode 100644
index 00000000..d465f531
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30136-Issue_3413.cpp
@@ -0,0 +1,10 @@
+namespace
+{
+struct S { void f() {} };
+}
+
+void FuncCrash(int a =       {}) { }
+void FuncCrash(int b = int   {}) { }
+void FuncCrash(int b = int(0)) { }
+void FuncCrash(int b = double{0}) { }
+void FuncCrash(int b = 0) { }
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.75.0/tests/expected/cpp/30137-Issue_3513-0.cpp
new file mode 100644
index 00000000..c55df54a
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30137-Issue_3513-0.cpp
@@ -0,0 +1,8 @@
+struct S
+{
+	operator int() const
+	{
+		return get();
+	}
+
+};
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.75.0/tests/expected/cpp/30138-Issue_3513-1.cpp
new file mode 100644
index 00000000..560e6d51
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30138-Issue_3513-1.cpp
@@ -0,0 +1,8 @@
+struct S
+{
+	operator int()
+	{
+		return get();
+	}
+
+};
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.75.0/tests/expected/cpp/30139-Issue_3604.cpp
new file mode 100644
index 00000000..a96b3437
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30139-Issue_3604.cpp
@@ -0,0 +1,4 @@
+#define MY_DEF(Type, ...) \
+	enum Type {  \
+		__VA_ARGS__, \
+	};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30200-bug_1862.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30200-bug_1862.cpp
index c5357c86..c5357c86 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30200-bug_1862.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30200-bug_1862.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30201-cmt_indent.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30201-cmt_indent.cpp
index ed27ffca..ed27ffca 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30201-cmt_indent.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30201-cmt_indent.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30202-cmt_indent.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30202-cmt_indent.cpp
index 95c47d6e..95c47d6e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30202-cmt_indent.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30202-cmt_indent.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30203-cmt_indent.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30203-cmt_indent.cpp
index 05cc2df3..05cc2df3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30203-cmt_indent.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30203-cmt_indent.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30204-comment-align.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30204-comment-align.cpp
index afaaafef..afaaafef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30204-comment-align.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30204-comment-align.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30205-cmt_right.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30205-cmt_right.cpp
index bcca4e2e..bcca4e2e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30205-cmt_right.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30205-cmt_right.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30206-cmt_backslash_eol.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30206-cmt_backslash_eol.cpp
index d020e171..d020e171 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30206-cmt_backslash_eol.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30206-cmt_backslash_eol.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30207-cmt_indent_pp.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30207-cmt_indent_pp.h
index 50e35c8d..50e35c8d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30207-cmt_indent_pp.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30207-cmt_indent_pp.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30208-bug_1108.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30208-bug_1108.cpp
index 573a9810..573a9810 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30208-bug_1108.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30208-bug_1108.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30209-bug_1134.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30209-bug_1134.cpp
index 369b70f1..369b70f1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30209-bug_1134.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30209-bug_1134.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30210-bug_1338.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30210-bug_1338.cpp
index 04b4cd8a..04b4cd8a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30210-bug_1338.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30210-bug_1338.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30211-indent_comment_align_thresh.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30211-indent_comment_align_thresh.cpp
index 34c09203..34c09203 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30211-indent_comment_align_thresh.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30211-indent_comment_align_thresh.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30212-indent_comment_align_thresh.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30212-indent_comment_align_thresh.cpp
index f9316598..f9316598 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30212-indent_comment_align_thresh.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30212-indent_comment_align_thresh.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30213-align_right_comment.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30213-align_right_comment.cpp
index 43a2a70f..43a2a70f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30213-align_right_comment.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30213-align_right_comment.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30214-align_across_braces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30214-align_across_braces.cpp
index 199ede8d..199ede8d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30214-align_across_braces.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30214-align_across_braces.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30215-Issue_2099.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30215-Issue_2099.cpp
index 4726f44b..4726f44b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30215-Issue_2099.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30215-Issue_2099.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30216-Issue_2302.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30216-Issue_2302.cpp
index e2684ae6..e2684ae6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30216-Issue_2302.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30216-Issue_2302.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30217-2138.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30217-2138.cpp
index 8d1d7462..8d1d7462 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30217-2138.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30217-2138.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30220-bug_1340.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30220-bug_1340.cpp
index f64bc6a0..f64bc6a0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30220-bug_1340.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30220-bug_1340.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30221-Issue_2914.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30221-Issue_2914.cpp
index c2cd8b59..c2cd8b59 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30221-Issue_2914.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30221-Issue_2914.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30223-sp_enum_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30223-sp_enum_colon.cpp
index 11d7320b..11d7320b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30223-sp_enum_colon.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30223-sp_enum_colon.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30224-sp_enum_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30224-sp_enum_colon.cpp
index 804fe1ae..804fe1ae 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30224-sp_enum_colon.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30224-sp_enum_colon.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30225-Issue_3176.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30225-Issue_3176.cpp
index 2384027d..2384027d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30225-Issue_3176.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30225-Issue_3176.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30226-sp_enum_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30226-sp_enum_colon.cpp
index be23e687..be23e687 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30226-sp_enum_colon.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30226-sp_enum_colon.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30227-sp_inside_braces_enum.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30227-sp_inside_braces_enum.cpp
index 8386e215..8386e215 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30227-sp_inside_braces_enum.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30227-sp_inside_braces_enum.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30228-sp_inside_braces_enum.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30228-sp_inside_braces_enum.cpp
index 666f834c..666f834c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30228-sp_inside_braces_enum.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30228-sp_inside_braces_enum.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30229-sp_inside_braces_enum.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30229-sp_inside_braces_enum.cpp
index 98640667..98640667 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30229-sp_inside_braces_enum.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30229-sp_inside_braces_enum.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30230-sp_type_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30230-sp_type_func.cpp
index 0d17364f..0d17364f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30230-sp_type_func.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30230-sp_type_func.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30231-sp_type_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30231-sp_type_func.cpp
index d7d69cc8..d7d69cc8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30231-sp_type_func.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30231-sp_type_func.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30232-sp_type_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30232-sp_type_func.cpp
index fe2a3348..fe2a3348 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30232-sp_type_func.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30232-sp_type_func.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30233-sp_type_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30233-sp_type_func.cpp
index fe2a3348..fe2a3348 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30233-sp_type_func.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30233-sp_type_func.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30234-functype_param.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30234-functype_param.cpp
index 32419616..32419616 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30234-functype_param.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30234-functype_param.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30235-functype_param.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30235-functype_param.cpp
index 9e9f5ecc..9e9f5ecc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30235-functype_param.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.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.75.0/tests/expected/cpp/30236-Issue_750.cpp
new file mode 100644
index 00000000..bf7d1100
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30236-Issue_750.cpp
@@ -0,0 +1,15 @@
+class Greeks
+{
+	double _dRho         = 111.0;
+	int    _dTheoretical = 22222.0;
+	double _dTheta       = 3333333.0;
+	double _dTimeValue   = 0.0;
+	double _dVega       { 0.0 };
+	double _dVolatility { 0.0 };
+	double _dPvDiv = 0.0;
+}
+
+double sdf[6]  = { 5.0, 6, 6, 34, 324, 5 };
+int    fsaf[6] = { 5, 6, 6, 34, 324, 5 };
+char   msa[3]    { 6, 5, 3 };
+int    y[3]      { 6, 5, 3 };
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30240-align_func_params.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30240-align_func_params.cpp
index 923d274b..923d274b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30240-align_func_params.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30240-align_func_params.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30241-align_func_params.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30241-align_func_params.cpp
index 923d274b..923d274b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30241-align_func_params.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30241-align_func_params.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30242-align_func_params.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30242-align_func_params.cpp
index 512233cd..512233cd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30242-align_func_params.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30242-align_func_params.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30243-align_func_params.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30243-align_func_params.cpp
index 82434066..82434066 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30243-align_func_params.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30243-align_func_params.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30244-align_func_params.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30244-align_func_params.cpp
index 5efed666..5efed666 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30244-align_func_params.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30244-align_func_params.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30245-align_func_params.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30245-align_func_params.cpp
index a44170a9..a44170a9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30245-align_func_params.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30245-align_func_params.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30246-align_func_params.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30246-align_func_params.cpp
index 9def11e6..9def11e6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30246-align_func_params.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30246-align_func_params.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30247-Issue_2332.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30247-Issue_2332.cpp
index 0bc9cf8f..0bc9cf8f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30247-Issue_2332.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30247-Issue_2332.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30248-Issue_2831.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30248-Issue_2831.cpp
index c099567a..c099567a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30248-Issue_2831.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30248-Issue_2831.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30249-align-330.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30249-align-330.cpp
index a92e1545..a92e1545 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30249-align-330.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30249-align-330.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30250-align_fcall.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30250-align_fcall.cpp
index 055f0029..055f0029 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30250-align_fcall.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30250-align_fcall.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30251-align_fcall.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30251-align_fcall.cpp
index 055f0029..055f0029 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30251-align_fcall.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30251-align_fcall.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30253-align_left_shift.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30253-align_left_shift.cpp
index 7c98226d..7c98226d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30253-align_left_shift.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30253-align_left_shift.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30254-align_left_shift2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30254-align_left_shift2.cpp
index bfea744c..bfea744c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30254-align_left_shift2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30254-align_left_shift2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30255-align_constr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30255-align_constr.cpp
index 380f0c8b..380f0c8b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30255-align_constr.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30255-align_constr.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30256-func_call.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30256-func_call.cpp
index e3eff88c..e3eff88c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30256-func_call.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30256-func_call.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30257-func_call_chain.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30257-func_call_chain.cpp
index 7e2f3931..7e2f3931 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30257-func_call_chain.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30257-func_call_chain.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30258-casts.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30258-casts.cpp
index d8a496fb..d8a496fb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30258-casts.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30258-casts.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30259-sp_after_constr_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30259-sp_after_constr_colon.cpp
index 7b63b639..7b63b639 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30259-sp_after_constr_colon.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30259-sp_after_constr_colon.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30260-var_def_gap.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30260-var_def_gap.cpp
index 7333d292..7333d292 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30260-var_def_gap.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30260-var_def_gap.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30261-align_var_def_thresh.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30261-align_var_def_thresh.cpp
index 8512377e..8512377e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30261-align_var_def_thresh.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30261-align_var_def_thresh.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30262-align_var_def_thresh.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30262-align_var_def_thresh.cpp
index 4996a3d3..4996a3d3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30262-align_var_def_thresh.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30262-align_var_def_thresh.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30263-align_var_def_thresh.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30263-align_var_def_thresh.cpp
index 1e10f370..1e10f370 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30263-align_var_def_thresh.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30263-align_var_def_thresh.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30264-Issue_2668.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30264-Issue_2668.cpp
index da8e118f..da8e118f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30264-Issue_2668.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30264-Issue_2668.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30265-long_br_cmt.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30265-long_br_cmt.cpp
index 8ebdcec9..8ebdcec9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30265-long_br_cmt.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30265-long_br_cmt.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30266-Issue_2921.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30266-Issue_2921.cpp
index 53e3c495..53e3c495 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30266-Issue_2921.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30266-Issue_2921.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30267-Issue_2930.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30267-Issue_2930.cpp
index 00cff53b..00cff53b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30267-Issue_2930.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30267-Issue_2930.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30268-Issue_3018.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30268-Issue_3018.cpp
index ddbb473e..ddbb473e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30268-Issue_3018.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30268-Issue_3018.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30270-const_throw.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30270-const_throw.cpp
index 44f0ca68..44f0ca68 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30270-const_throw.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30270-const_throw.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30271-sp_throw_paren.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30271-sp_throw_paren.cpp
index 21ce9291..21ce9291 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30271-sp_throw_paren.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30271-sp_throw_paren.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30272-sp_throw_paren.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30272-sp_throw_paren.cpp
index ea851aff..ea851aff 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30272-sp_throw_paren.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30272-sp_throw_paren.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30273-sp_cparen_oparen.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30273-sp_cparen_oparen.cpp
index ee0d705b..ee0d705b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30273-sp_cparen_oparen.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30273-sp_cparen_oparen.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30274-sp_cparen_oparen.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30274-sp_cparen_oparen.cpp
index 93cc7f86..93cc7f86 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30274-sp_cparen_oparen.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30274-sp_cparen_oparen.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30275-bug_1321.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30275-bug_1321.cpp
index 5e708c11..5e708c11 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30275-bug_1321.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30275-bug_1321.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30278-bug_1439.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30278-bug_1439.cpp
index d560522b..d560522b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30278-bug_1439.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30278-bug_1439.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30279-indent-inside-ternary-operator.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30279-indent-inside-ternary-operator.cpp
index c8b92481..c8b92481 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30279-indent-inside-ternary-operator.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30279-indent-inside-ternary-operator.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30280-sf557.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30280-sf557.cpp
index 287bc9c1..287bc9c1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30280-sf557.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30280-sf557.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30281-Issue_2478.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30281-Issue_2478.cpp
index 40674590..40674590 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30281-Issue_2478.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30281-Issue_2478.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30282-Issue_2703.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30282-Issue_2703.cpp
index ec4554e9..ec4554e9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30282-Issue_2703.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30282-Issue_2703.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30283-Issue_3321.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30283-Issue_3321.h
index 9444d24c..9444d24c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30283-Issue_3321.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.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.75.0/tests/expected/cpp/30284-Issue_2957.cpp
new file mode 100644
index 00000000..bd52cb8c
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30284-Issue_2957.cpp
@@ -0,0 +1,7 @@
+bus_type i2c_bus_type =
+{
+	.name    = "i2c",
+	.match   = i2c_device_match,
+	.suspend = i2c_bus_suspend,
+	.resume  = i2c_bus_resume,
+};
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.75.0/tests/expected/cpp/30285-Issue_2971.cpp
new file mode 100644
index 00000000..52e7a253
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30285-Issue_2971.cpp
@@ -0,0 +1,11 @@
+#include <iostream>
+class X33
+{
+   int
+   f1(std::istream* c1)
+   {
+      int i;
+      *c1 >> i;
+      return i;
+   }
+};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30290-align_left_shift.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30290-align_left_shift.cpp
index 8591a642..8591a642 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30290-align_left_shift.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30290-align_left_shift.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30291-indent_shift.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30291-indent_shift.cpp
index bc1ae2e5..bc1ae2e5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30291-indent_shift.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30291-indent_shift.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30292-eigen.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30292-eigen.cpp
index aa43434a..aa43434a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30292-eigen.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30292-eigen.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30293-pos_shift.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30293-pos_shift.cpp
index d4a8f1ed..d4a8f1ed 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30293-pos_shift.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30293-pos_shift.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30294-pos_shift.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30294-pos_shift.cpp
index badc9798..badc9798 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30294-pos_shift.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30294-pos_shift.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30295-pos_shift.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30295-pos_shift.cpp
index efb19263..efb19263 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30295-pos_shift.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30295-pos_shift.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30300-enum_shr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30300-enum_shr.cpp
index 26e0d08e..26e0d08e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30300-enum_shr.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30300-enum_shr.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30301-enum_class.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30301-enum_class.h
index 7ad5e9ea..7ad5e9ea 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30301-enum_class.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30301-enum_class.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30302-bug_1315.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30302-bug_1315.cpp
index 584f9a00..584f9a00 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30302-bug_1315.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30302-bug_1315.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30303-Issue_2902.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30303-Issue_2902.cpp
index ae10d5a9..ae10d5a9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30303-Issue_2902.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30303-Issue_2902.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30310-braced_init_list.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30310-braced_init_list.cpp
index 116462c2..116462c2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30310-braced_init_list.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30310-braced_init_list.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30311-uniform_initialization.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30311-uniform_initialization.cpp
index 64da585d..64da585d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30311-uniform_initialization.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30311-uniform_initialization.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30312-return_init_list.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30312-return_init_list.cpp
index ef91c528..ef91c528 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30312-return_init_list.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30312-return_init_list.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30313-sp_brace_brace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30313-sp_brace_brace.cpp
index 2ae91737..2ae91737 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30313-sp_brace_brace.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30313-sp_brace_brace.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30314-sp_brace_brace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30314-sp_brace_brace.cpp
index b7ca9839..b7ca9839 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30314-sp_brace_brace.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30314-sp_brace_brace.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30315-return_braced_init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30315-return_braced_init.cpp
index cf86baeb..cf86baeb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30315-return_braced_init.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30315-return_braced_init.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30316-Issue_2428.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30316-Issue_2428.cpp
index b2a0a139..b2a0a139 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30316-Issue_2428.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30316-Issue_2428.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30317-braced_init_template_decltype.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30317-braced_init_template_decltype.cpp
index 3c22d790..3c22d790 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30317-braced_init_template_decltype.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30317-braced_init_template_decltype.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30318-Issue_2949.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30318-Issue_2949.cpp
index d37d7ac3..d37d7ac3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30318-Issue_2949.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30318-Issue_2949.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30319-Issue_2886.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30319-Issue_2886.cpp
index 0474c710..0474c710 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30319-Issue_2886.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30319-Issue_2886.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30320-returns.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30320-returns.cpp
index d1ac08c0..d1ac08c0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30320-returns.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30320-returns.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30321-returns.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30321-returns.cpp
index 1abe1e54..1abe1e54 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30321-returns.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30321-returns.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30322-returns.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30322-returns.cpp
index a61b0fcf..a61b0fcf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30322-returns.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30322-returns.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30323-returns.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30323-returns.cpp
index b12cd7eb..b12cd7eb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30323-returns.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30323-returns.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30324-returns.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30324-returns.cpp
index fede22db..fede22db 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30324-returns.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30324-returns.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30325-returns.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30325-returns.cpp
index d797f9c7..d797f9c7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30325-returns.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30325-returns.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30326-indent_off_after_return.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30326-indent_off_after_return.cpp
index 6cd6d8e4..6cd6d8e4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30326-indent_off_after_return.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30326-indent_off_after_return.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30327-indent_off_after_return.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30327-indent_off_after_return.cpp
index 6cd6d8e4..6cd6d8e4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30327-indent_off_after_return.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30327-indent_off_after_return.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30328-call_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30328-call_brace_init_lst.cpp
index b75c35b1..b75c35b1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30328-call_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30328-call_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30329-call_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30329-call_brace_init_lst.cpp
index 83837910..83837910 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30329-call_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30329-call_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30330-Issue_3080.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30330-Issue_3080.cpp
index 75c6072b..75c6072b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30330-Issue_3080.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30330-Issue_3080.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30400-attribute_specifier_seqs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30400-attribute_specifier_seqs.cpp
index 15cc6e3a..15cc6e3a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30400-attribute_specifier_seqs.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30400-attribute_specifier_seqs.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30401-Issue_2570.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30401-Issue_2570.cpp
index 44373e77..44373e77 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30401-Issue_2570.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30401-Issue_2570.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30701-function-def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30701-function-def.cpp
index 89261c8e..89261c8e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30701-function-def.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30701-function-def.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30702-function-def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30702-function-def.cpp
index c1fb4ed4..c1fb4ed4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30702-function-def.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30702-function-def.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30703-function-def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30703-function-def.cpp
index c604152d..c604152d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30703-function-def.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30703-function-def.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30705-func_param.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30705-func_param.cpp
index 8bdb0ce8..8bdb0ce8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30705-func_param.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30705-func_param.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30706-bug_1020.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30706-bug_1020.cpp
index f0e9e60d..f0e9e60d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30706-bug_1020.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30706-bug_1020.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30711-semicolons.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30711-semicolons.cpp
index de28deef..de28deef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30711-semicolons.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30711-semicolons.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30712-bug_1158.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30712-bug_1158.cpp
index 2a9ba76d..2a9ba76d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30712-bug_1158.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30712-bug_1158.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30713-fix_for_relational_operators.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30713-fix_for_relational_operators.cpp
index 890f2eba..890f2eba 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30713-fix_for_relational_operators.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30713-fix_for_relational_operators.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30714-Issue_1733.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30714-Issue_1733.cpp
index 10be5586..10be5586 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30714-Issue_1733.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30714-Issue_1733.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30715-Issue_2942.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30715-Issue_2942.cpp
index dbecc7f4..dbecc7f4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30715-Issue_2942.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30715-Issue_2942.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30720-custom-open-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30720-custom-open-2.cpp
index 4d05944a..4d05944a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30720-custom-open-2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30720-custom-open-2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30721-Issue_2386.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30721-Issue_2386.cpp
index ac0b1dd4..ac0b1dd4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30721-Issue_2386.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30721-Issue_2386.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30730-qt-1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30730-qt-1.cpp
index 5d0273e2..5d0273e2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30730-qt-1.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30730-qt-1.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30731-qt-1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30731-qt-1.cpp
index 55b2459b..55b2459b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30731-qt-1.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30731-qt-1.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30732-Issue_2734.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30732-Issue_2734.cpp
index 27dfdc70..27dfdc70 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30732-Issue_2734.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30732-Issue_2734.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30740-sef.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30740-sef.cpp
index 8730ba15..8730ba15 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30740-sef.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30740-sef.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30741-al.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30741-al.cpp
index 1c911bf2..1c911bf2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30741-al.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30741-al.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30742-delete.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30742-delete.cpp
index c33aa682..c33aa682 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30742-delete.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30742-delete.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30745-Issue_2170.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30745-Issue_2170.cpp
index f1edafd8..f1edafd8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30745-Issue_2170.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30745-Issue_2170.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30746-DefaultAndDelete.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30746-DefaultAndDelete.cpp
index 7dff7dd5..7dff7dd5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30746-DefaultAndDelete.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30746-DefaultAndDelete.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30747-DefaultAndDelete.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30747-DefaultAndDelete.cpp
index 30d315a7..30d315a7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30747-DefaultAndDelete.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30747-DefaultAndDelete.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30748-DefaultAndDelete.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30748-DefaultAndDelete.cpp
index 9b55a964..9b55a964 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30748-DefaultAndDelete.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30748-DefaultAndDelete.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30750-lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30750-lambda.cpp
index 5ba33b05..daa4bac4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30750-lambda.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30750-lambda.cpp
@@ -87,3 +87,29 @@ void g2()
       std::cout << "blah: " << *a;
    });
 }
+
+void h1()
+{
+   []() -> int
+   {
+      return(33);
+   }();
+
+   []() noexcept ->int
+   {
+      return(33);
+   }();
+}
+
+void h2()
+{
+   [](int a) -> int
+   {
+      return(a + 33);
+   }(21);
+
+   [](int a) noexcept ->int
+   {
+      return(a + 33);
+   }(21);
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30751-lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30751-lambda.cpp
index 13d35a5a..291610c5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30751-lambda.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30751-lambda.cpp
@@ -70,3 +70,25 @@ void g2()
    Invoke(a, b,
           [&one, two] (int *a, Something&b) { std::cout << "blah: " << *a; });
 }
+
+void h1()
+{
+   [] () -> int {
+      return(33);
+   }();
+
+   [] () noexcept ->int {
+      return(33);
+   }();
+}
+
+void h2()
+{
+   [] (int a) -> int {
+      return(a + 33);
+   }(21);
+
+   [] (int a) noexcept ->int {
+      return(a + 33);
+   }(21);
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30752-lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30752-lambda.cpp
index 84ca8b21..5c0f72b0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30752-lambda.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30752-lambda.cpp
@@ -100,3 +100,29 @@ void g2()
    }
           );
 }
+
+void h1()
+{
+   [] () -> int
+   {
+      return(33);
+   }();
+
+   [] () noexcept ->int
+   {
+      return(33);
+   }();
+}
+
+void h2()
+{
+   [] (int a) -> int
+   {
+      return(a + 33);
+   }(21);
+
+   [] (int a) noexcept ->int
+   {
+      return(a + 33);
+   }(21);
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30753-lambda2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30753-lambda2.cpp
index 2bcfff9f..d91798a6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30753-lambda2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30753-lambda2.cpp
@@ -74,3 +74,25 @@ void g2()
    Invoke(a, b,
           [&one, two] (int *a, Something&b){ std::cout << "blah: " << *a; });
 }
+
+void h1()
+{
+   [] () -> int {
+      return(33);
+   }();
+
+   [] () noexcept ->int {
+      return(33);
+   }();
+}
+
+void h2()
+{
+   [] (int a) -> int {
+      return(a + 33);
+   }(21);
+
+   [] (int a) noexcept ->int {
+      return(a + 33);
+   }(21);
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30754-bug_i_682.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30754-bug_i_682.h
index 51c58e23..51c58e23 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30754-bug_i_682.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30754-bug_i_682.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30755-bug_i_938.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30755-bug_i_938.h
index b13997a6..b13997a6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30755-bug_i_938.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30755-bug_i_938.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30756-bug_1296.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30756-bug_1296.cpp
index 482045df..7f7757c4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30756-bug_1296.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30756-bug_1296.cpp
@@ -1,6 +1,6 @@
 int main()
 {
-        auto lambda2 = [&]()
+        auto lambda2222222222222222222 = [&]()
         {
                 code();
         };
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30757-Issue_3054.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30757-Issue_3054.cpp
index 53edc388..53edc388 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30757-Issue_3054.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30757-Issue_3054.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30758-Issue_3054-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30758-Issue_3054-2.cpp
index e4c1c8da..e4c1c8da 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30758-Issue_3054-2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.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.75.0/tests/expected/cpp/30759-lambda2.cpp
new file mode 100644
index 00000000..09c779b5
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30759-lambda2.cpp
@@ -0,0 +1,98 @@
+void f1()
+{
+   auto a =
+       [=] (int *a, Something& b){
+          std::cout << "blah: " << *a;
+       };
+}
+
+void f1a()
+{
+   std::for_each(a, b,
+       [] (Something& b){
+          std::cout << "blah: " << *a;
+       }
+       );
+}
+
+void f1b()
+{
+   std::for_each(a, b,
+       [] (int& b) -> foo {
+          b += 3;
+          return(b);
+       }
+       );
+}
+
+void f2()
+{
+   Invoke(a, b,
+       [&one, two] (int *a, Something& b){
+          std::cout << "blah: " << *a;
+       }
+       );
+}
+
+void f3a()
+{
+   auto a = [] {};
+   auto b = []{ return(true); };
+}
+
+void f3b()
+{
+   Invoke(a, b,
+       [&one, two]{
+          std::cout << "blah: " << one << two;
+       }
+       );
+}
+
+void f3c()
+{
+   int a[]{};
+}
+
+void g1()
+{
+   auto a = [=] (int *a, Something&b) { std::cout << "blah: " << *a; };
+}
+
+void g1a()
+{
+   std::for_each(a, b, [] (Something& b){ std::cout << "blah: " << *a; });
+}
+
+void g1b()
+{
+   std::for_each(a, b, [] (int& b)->foo { b += 3; return(b); });
+}
+
+void g2()
+{
+   Invoke(a, b,
+       [&one, two] (int *a, Something&b){ std::cout << "blah: " << *a; });
+}
+
+void h1()
+{
+   [] () -> int {
+      return(33);
+   }();
+
+   [] () noexcept ->int {
+      return(33);
+   }();
+}
+
+void h2()
+{
+   [] (int a) -> int {
+      return(a + 33);
+   }(21);
+
+   [] (int a) noexcept ->int {
+      return(a + 33);
+   }(21);
+}
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.75.0/tests/expected/cpp/30760-bug_1296.cpp
new file mode 100644
index 00000000..a5535041
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30760-bug_1296.cpp
@@ -0,0 +1,7 @@
+int main()
+{
+        auto lambda2222222222222222222 = [&]()
+                                         {
+                                                 code();
+                                         };
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30761-out-668.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30761-out-668.cpp
index 8829c0ce..8829c0ce 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30761-out-668.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30761-out-668.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30762-out-668.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30762-out-668.cpp
index 0dac74c3..0dac74c3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30762-out-668.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30762-out-668.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30763-Issue_2166.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30763-Issue_2166.cpp
index d9ac55c7..d9ac55c7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30763-Issue_2166.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30763-Issue_2166.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30764-Issue_2591.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30764-Issue_2591.cpp
index 01ed232e..01ed232e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30764-Issue_2591.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30764-Issue_2591.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30765-lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30765-lambda.cpp
index 6f8c8e55..05e372e3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30765-lambda.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30765-lambda.cpp
@@ -86,3 +86,29 @@ void g2()
 		std::cout << "blah: " << *a;
 	});
 }
+
+void h1()
+{
+	[]() -> int
+	{
+		return 33;
+	}();
+
+	[]() noexcept ->int
+	{
+		return 33;
+	}();
+}
+
+void h2()
+{
+	[](int a) -> int
+	{
+		return a + 33;
+	}(21);
+
+	[](int a) noexcept ->int
+	{
+		return a + 33;
+	}(21);
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30766-lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30766-lambda.cpp
index 6f8c8e55..05e372e3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30766-lambda.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30766-lambda.cpp
@@ -86,3 +86,29 @@ void g2()
 		std::cout << "blah: " << *a;
 	});
 }
+
+void h1()
+{
+	[]() -> int
+	{
+		return 33;
+	}();
+
+	[]() noexcept ->int
+	{
+		return 33;
+	}();
+}
+
+void h2()
+{
+	[](int a) -> int
+	{
+		return a + 33;
+	}(21);
+
+	[](int a) noexcept ->int
+	{
+		return a + 33;
+	}(21);
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30767-lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30767-lambda.cpp
index 6f8c8e55..05e372e3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30767-lambda.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30767-lambda.cpp
@@ -86,3 +86,29 @@ void g2()
 		std::cout << "blah: " << *a;
 	});
 }
+
+void h1()
+{
+	[]() -> int
+	{
+		return 33;
+	}();
+
+	[]() noexcept ->int
+	{
+		return 33;
+	}();
+}
+
+void h2()
+{
+	[](int a) -> int
+	{
+		return a + 33;
+	}(21);
+
+	[](int a) noexcept ->int
+	{
+		return a + 33;
+	}(21);
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30768-sp_cpp_lambda_fparen.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30768-sp_cpp_lambda_fparen.cpp
index e25d0496..e25d0496 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30768-sp_cpp_lambda_fparen.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30768-sp_cpp_lambda_fparen.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30770-lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30770-lambda.cpp
index 25319dcc..5bce0d31 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30770-lambda.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30770-lambda.cpp
@@ -86,3 +86,29 @@ void g2()
 		std::cout << "blah: " << *a;
 	});
 }
+
+void h1()
+{
+	[]() -> int
+	{
+		return 33;
+	}();
+
+	[]() noexcept ->int
+	{
+		return 33;
+	}();
+}
+
+void h2()
+{
+	[](int a) -> int
+	{
+		return a + 33;
+	}(21);
+
+	[](int a) noexcept ->int
+	{
+		return a + 33;
+	}(21);
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30771-lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30771-lambda.cpp
index 1f091e6d..acc5b530 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30771-lambda.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30771-lambda.cpp
@@ -86,3 +86,29 @@ void g2()
 		std::cout << "blah: " << *a;
 	});
 }
+
+void h1()
+{
+	[] () -> int
+	{
+		return 33;
+	}();
+
+	[] () noexcept ->int
+	{
+		return 33;
+	}();
+}
+
+void h2()
+{
+	[] (int a) -> int
+	{
+		return a + 33;
+	}(21);
+
+	[] (int a) noexcept ->int
+	{
+		return a + 33;
+	}(21);
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30772-lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30772-lambda.cpp
index a5e5f3ee..304e4d10 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30772-lambda.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30772-lambda.cpp
@@ -86,3 +86,29 @@ void g2()
 		std::cout << "blah: " << *a;
 	});
 }
+
+void h1()
+{
+	[]() -> int
+	{
+		return 33;
+	}();
+
+	[]() noexcept ->int
+	{
+		return 33;
+	}();
+}
+
+void h2()
+{
+	[](int a) -> int
+	{
+		return a + 33;
+	}(21);
+
+	[](int a) noexcept ->int
+	{
+		return a + 33;
+	}(21);
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30773-lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30773-lambda.cpp
index 3e628450..f494244a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30773-lambda.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30773-lambda.cpp
@@ -86,3 +86,29 @@ void g2()
 		std::cout << "blah: " << *a;
 	});
 }
+
+void h1()
+{
+	[]() -> int
+	{
+		return 33;
+	}();
+
+	[]() noexcept ->int
+	{
+		return 33;
+	}();
+}
+
+void h2()
+{
+	[](int a) -> int
+	{
+		return a + 33;
+	}(21);
+
+	[](int a) noexcept ->int
+	{
+		return a + 33;
+	}(21);
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30774-lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30774-lambda.cpp
index 3e628450..f494244a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30774-lambda.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30774-lambda.cpp
@@ -86,3 +86,29 @@ void g2()
 		std::cout << "blah: " << *a;
 	});
 }
+
+void h1()
+{
+	[]() -> int
+	{
+		return 33;
+	}();
+
+	[]() noexcept ->int
+	{
+		return 33;
+	}();
+}
+
+void h2()
+{
+	[](int a) -> int
+	{
+		return a + 33;
+	}(21);
+
+	[](int a) noexcept ->int
+	{
+		return a + 33;
+	}(21);
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30775-lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30775-lambda.cpp
index d86e0d59..80e9c8f9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30775-lambda.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30775-lambda.cpp
@@ -86,3 +86,29 @@ void g2()
 		std::cout << "blah: " << *a;
 	});
 }
+
+void h1()
+{
+	[]() -> int
+	{
+		return 33;
+	}();
+
+	[]() noexcept ->int
+	{
+		return 33;
+	}();
+}
+
+void h2()
+{
+	[](int a) -> int
+	{
+		return a + 33;
+	}(21);
+
+	[](int a) noexcept ->int
+	{
+		return a + 33;
+	}(21);
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30776-sp_cpp_lambda_fparen.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30776-sp_cpp_lambda_fparen.cpp
index e0c1985d..e0c1985d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30776-sp_cpp_lambda_fparen.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30776-sp_cpp_lambda_fparen.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30777-sp_cpp_lambda_fparen.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30777-sp_cpp_lambda_fparen.cpp
index f882a211..f882a211 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30777-sp_cpp_lambda_fparen.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30777-sp_cpp_lambda_fparen.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30780-lambda_in_one_liner.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30780-lambda_in_one_liner.cpp
index c740c4bd..c740c4bd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30780-lambda_in_one_liner.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30780-lambda_in_one_liner.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30781-lambda_brace_list.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30781-lambda_brace_list.cpp
index 8626f5af..8626f5af 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30781-lambda_brace_list.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30781-lambda_brace_list.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30790-Issue_2795.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30790-Issue_2795.cpp
index 6cb7e112..6cb7e112 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30790-Issue_2795.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30790-Issue_2795.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30791-Issue_3203.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30791-Issue_3203.cpp
index 519d29dd..519d29dd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30791-Issue_3203.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30791-Issue_3203.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30800-align-star-amp-pos.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30800-align-star-amp-pos.cpp
index dc988ce1..dc988ce1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30800-align-star-amp-pos.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30800-align-star-amp-pos.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30801-align-star-amp-pos.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30801-align-star-amp-pos.cpp
index c23b0d4a..c23b0d4a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30801-align-star-amp-pos.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30801-align-star-amp-pos.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30802-align-star-amp-pos.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30802-align-star-amp-pos.cpp
index cf2bff2d..cf2bff2d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30802-align-star-amp-pos.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30802-align-star-amp-pos.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30803-bug_1403.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30803-bug_1403.cpp
index 209c0173..209c0173 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30803-bug_1403.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30803-bug_1403.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30805-ptr-star.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30805-ptr-star.cpp
index fcefa84f..fcefa84f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30805-ptr-star.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30805-ptr-star.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30806-ptr-star.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30806-ptr-star.cpp
index 76659df9..76659df9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30806-ptr-star.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30806-ptr-star.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30807-ptr-star.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30807-ptr-star.cpp
index 55478e3f..55478e3f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30807-ptr-star.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30807-ptr-star.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30808-ptr-star.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30808-ptr-star.cpp
index 68cb8151..68cb8151 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30808-ptr-star.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30808-ptr-star.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30809-bug_1289.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30809-bug_1289.cpp
index 42663477..42663477 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30809-bug_1289.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30809-bug_1289.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30810-ptr-star.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30810-ptr-star.cpp
index fa88b0bc..fa88b0bc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30810-ptr-star.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30810-ptr-star.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30811-misc3.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30811-misc3.cpp
index 9ca06c3c..9ca06c3c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30811-misc3.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30811-misc3.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30812-misc4.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30812-misc4.cpp
index 5ddaffb0..5ddaffb0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30812-misc4.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30812-misc4.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30813-misc5.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30813-misc5.cpp
index e8ffaf27..e8ffaf27 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30813-misc5.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30813-misc5.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30814-misc6.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30814-misc6.cpp
index 95cc0383..95cc0383 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30814-misc6.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30814-misc6.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30815-cmt-reflow.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30815-cmt-reflow.cpp
index 8bd50283..8bd50283 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30815-cmt-reflow.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30815-cmt-reflow.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30816-for_long.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30816-for_long.cpp
index 5483d4c8..5483d4c8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30816-for_long.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30816-for_long.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30817-cmt-cpp-cont.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30817-cmt-cpp-cont.cpp
index 9acbac58..9acbac58 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30817-cmt-cpp-cont.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30817-cmt-cpp-cont.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30818-bug_1169.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30818-bug_1169.cpp
index b1138a57..b1138a57 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30818-bug_1169.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30818-bug_1169.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30819-bug_1170.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30819-bug_1170.cpp
index 18e029cb..18e029cb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30819-bug_1170.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30819-bug_1170.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30820-pp-define-indent.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30820-pp-define-indent.cpp
index 0d7892a2..0d7892a2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30820-pp-define-indent.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30820-pp-define-indent.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30821-pp_indent_case.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30821-pp_indent_case.cpp
index 70b1b9c7..70b1b9c7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30821-pp_indent_case.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30821-pp_indent_case.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30822-pp_indent_brace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30822-pp_indent_brace.cpp
index 4900fa34..d1decdf6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30822-pp_indent_brace.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30822-pp_indent_brace.cpp
@@ -1,7 +1,7 @@
 // Example for preprocessor statement in a function definition

 // Config uses more than tested option, uses:

-// pp_if_indent_code  = true	  to enable preprocesser indent

-// pp_indent_brace	  = false	  to override preprocessor indent for braces

+// pp_if_indent_code  = 1	  to enable preprocesser indent

+// pp_indent_brace	  = 0	  to override preprocessor indent for braces

 MyClass::MyClass()

 {

 	if(isSomething)

@@ -21,4 +21,4 @@ MyClass::MyClass()
 		DoSomethingWithSix(mySix);

 	}

 #endif

-}
\ No newline at end of file
+}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30823-pp_indent_func_def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30823-pp_indent_func_def.cpp
index b01c6bbe..b01c6bbe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30823-pp_indent_func_def.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30823-pp_indent_func_def.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30824-pp_indent_extern.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30824-pp_indent_extern.cpp
index 995db611..995db611 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30824-pp_indent_extern.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30824-pp_indent_extern.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30825-Issue_1966.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30825-Issue_1966.cpp
index 12a8084b..12a8084b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30825-Issue_1966.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30825-Issue_1966.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30826-Issue_2319.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30826-Issue_2319.cpp
index 8c0ae3e9..8c0ae3e9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30826-Issue_2319.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30826-Issue_2319.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30827-Issue_1167.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30827-Issue_1167.cpp
index 6410326c..6410326c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30827-Issue_1167.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30827-Issue_1167.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30828-bug_1691.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30828-bug_1691.cpp
index e93f7f74..e93f7f74 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30828-bug_1691.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30828-bug_1691.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30829-Issue_2726.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30829-Issue_2726.cpp
index bb7f1d4b..bb7f1d4b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30829-Issue_2726.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30829-Issue_2726.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30830-kw_subst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30830-kw_subst.cpp
index 47084a7e..47084a7e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30830-kw_subst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30830-kw_subst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30831-kw_subst2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30831-kw_subst2.cpp
index b5e58eac..b5e58eac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30831-kw_subst2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30831-kw_subst2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30832-kw_subst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30832-kw_subst.cpp
index 47084a7e..47084a7e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30832-kw_subst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30832-kw_subst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30840-nl_func_type_name.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30840-nl_func_type_name.cpp
index a4302001..a4302001 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30840-nl_func_type_name.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30840-nl_func_type_name.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30841-nl_func_type_name.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30841-nl_func_type_name.cpp
index 5997a5c3..5997a5c3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30841-nl_func_type_name.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30841-nl_func_type_name.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30842-nl_func_type_name.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30842-nl_func_type_name.cpp
index a826af48..a826af48 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30842-nl_func_type_name.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30842-nl_func_type_name.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30843-nl_func_type_name.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30843-nl_func_type_name.cpp
index b1ead857..b1ead857 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30843-nl_func_type_name.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30843-nl_func_type_name.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30844-Issue_2771.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30844-Issue_2771.cpp
index ab7c285f..ab7c285f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30844-Issue_2771.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30844-Issue_2771.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30845-deref.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30845-deref.cpp
index 9705b51f..9705b51f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30845-deref.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30845-deref.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30846-Issue_3197.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30846-Issue_3197.h
index 76331aa3..76331aa3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30846-Issue_3197.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30846-Issue_3197.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30850-sp_cmt_cpp_start.cc b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30850-sp_cmt_cpp_start.cc
index 9cc04a18..9cc04a18 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30850-sp_cmt_cpp_start.cc
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30850-sp_cmt_cpp_start.cc
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30852-Issue_2138.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30852-Issue_2138.cpp
index 3a8fa83c..3a8fa83c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30852-Issue_2138.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30852-Issue_2138.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30853-noexcept.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30853-noexcept.cpp
index 60f2edd4..60f2edd4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30853-noexcept.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30853-noexcept.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30854-Issue_1703.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30854-Issue_1703.cpp
index af32d661..af32d661 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30854-Issue_1703.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30854-Issue_1703.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30855-cpp_move.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30855-cpp_move.cpp
index cec9beb8..cec9beb8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30855-cpp_move.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30855-cpp_move.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30856-sp_cmt_cpp_region.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30856-sp_cmt_cpp_region.cpp
index dc9e4160..dc9e4160 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30856-sp_cmt_cpp_region.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30856-sp_cmt_cpp_region.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30857-sp_cmt_cpp_region.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30857-sp_cmt_cpp_region.cpp
index 29f75936..29f75936 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30857-sp_cmt_cpp_region.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30857-sp_cmt_cpp_region.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30860-sf574.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30860-sf574.cpp
index 58810404..58810404 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30860-sf574.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30860-sf574.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30870-cmt_insert.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30870-cmt_insert.cpp
index cf5ac204..cf5ac204 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30870-cmt_insert.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30870-cmt_insert.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30871-cmt_insert.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30871-cmt_insert.cpp
index a169795a..a169795a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30871-cmt_insert.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30871-cmt_insert.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30872-Issue_2752.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30872-Issue_2752.cpp
index b305b50f..b305b50f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30872-Issue_2752.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30872-Issue_2752.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30880-bug_1758.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30880-bug_1758.cpp
index b0f35107..b0f35107 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30880-bug_1758.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30880-bug_1758.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30881-bug_1758-f.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30881-bug_1758-f.cpp
index 24bb563b..24bb563b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30881-bug_1758-f.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30881-bug_1758-f.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30900-region.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30900-region.cpp
index 27823ca6..27823ca6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30900-region.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30900-region.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30901-region.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30901-region.cpp
index b7bebae8..b7bebae8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30901-region.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30901-region.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30902-region.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30902-region.cpp
index 39b20ea6..39b20ea6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30902-region.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30902-region.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30903-region.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30903-region.cpp
index d6e3403a..d6e3403a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30903-region.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30903-region.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30907-Issue_1813.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30907-Issue_1813.cpp
index d5a3cc71..d5a3cc71 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30907-Issue_1813.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30907-Issue_1813.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30908-Issue_1813-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30908-Issue_1813-2.cpp
index 310de82f..310de82f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30908-Issue_1813-2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30908-Issue_1813-2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30909-Issue_1813-3.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30909-Issue_1813-3.cpp
index 08c8405d..08c8405d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30909-Issue_1813-3.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30909-Issue_1813-3.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30910-indent_namespace.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30910-indent_namespace.h
index d569a3ca..d569a3ca 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30910-indent_namespace.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30910-indent_namespace.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30911-indent_namespace.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30911-indent_namespace.h
index 6f80dc3b..6f80dc3b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30911-indent_namespace.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30911-indent_namespace.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30912-long_namespace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30912-long_namespace.cpp
index 80af6e83..80af6e83 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30912-long_namespace.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30912-long_namespace.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30913-indent_namespace2.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30913-indent_namespace2.h
index 196b2322..196b2322 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30913-indent_namespace2.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30913-indent_namespace2.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30914-indent_namespace_single_indent.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30914-indent_namespace_single_indent.h
index 24a9b935..24a9b935 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30914-indent_namespace_single_indent.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30914-indent_namespace_single_indent.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30915-bug_1235.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30915-bug_1235.cpp
index b9ff78a1..b9ff78a1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30915-bug_1235.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30915-bug_1235.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30916-Issue_1737.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30916-Issue_1737.cpp
index 06b0866b..06b0866b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30916-Issue_1737.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30916-Issue_1737.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30917-Issue_2345-3.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30917-Issue_2345-3.cpp
index 787ce29b..787ce29b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30917-Issue_2345-3.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30917-Issue_2345-3.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30918-Issue_2345-4.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30918-Issue_2345-4.cpp
index f82d757d..f82d757d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30918-Issue_2345-4.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30918-Issue_2345-4.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30919-Issue_2387.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30919-Issue_2387.cpp
index 526278d6..526278d6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30919-Issue_2387.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30919-Issue_2387.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30920-indent-off.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30920-indent-off.cpp
index f9eccdb8..f9eccdb8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30920-indent-off.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30920-indent-off.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30921-variadic-template.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30921-variadic-template.h
index f159e700..f159e700 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30921-variadic-template.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30921-variadic-template.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30922-variadic-template.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30922-variadic-template.h
index 0a1bd443..0a1bd443 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30922-variadic-template.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30922-variadic-template.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30923-sf.2886991.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30923-sf.2886991.cpp
index 61dc7c21..61dc7c21 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30923-sf.2886991.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30923-sf.2886991.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30924-sf.2886991.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30924-sf.2886991.cpp
index ce5e0b93..ce5e0b93 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30924-sf.2886991.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30924-sf.2886991.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30925-function-def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30925-function-def.cpp
index 2d6df544..2d6df544 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30925-function-def.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30925-function-def.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30926-function-def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30926-function-def.cpp
index 78b23a14..78b23a14 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30926-function-def.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30926-function-def.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30927-function-def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30927-function-def.cpp
index bceb00f6..bceb00f6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30927-function-def.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30927-function-def.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30928-function-def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30928-function-def.cpp
index b14ecb11..b14ecb11 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30928-function-def.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30928-function-def.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30929-bug_1324.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30929-bug_1324.cpp
index 1aca5762..1aca5762 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30929-bug_1324.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30929-bug_1324.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30930-indent_var_def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30930-indent_var_def.cpp
index 5b3ee4e2..5b3ee4e2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30930-indent_var_def.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30930-indent_var_def.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30931-indent_var_def_cont.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30931-indent_var_def_cont.cpp
index c505389f..c505389f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30931-indent_var_def_cont.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30931-indent_var_def_cont.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30932-indent_var_def_cont.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30932-indent_var_def_cont.cpp
index 70b7304e..70b7304e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30932-indent_var_def_cont.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30932-indent_var_def_cont.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30933-indent_paren_after_func_def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30933-indent_paren_after_func_def.cpp
index 8a775135..8a775135 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30933-indent_paren_after_func_def.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30933-indent_paren_after_func_def.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30934-indent_paren_after_func_decl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30934-indent_paren_after_func_decl.cpp
index 6af21978..6af21978 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30934-indent_paren_after_func_decl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30934-indent_paren_after_func_decl.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30935-indent-misc.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30935-indent-misc.cpp
index ad8de7b0..ad8de7b0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30935-indent-misc.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30935-indent-misc.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30936-indent_braces_no.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30936-indent_braces_no.h
index 725b0402..725b0402 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30936-indent_braces_no.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30936-indent_braces_no.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30937-indent_param.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30937-indent_param.cpp
index 31569ec1..31569ec1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30937-indent_param.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30937-indent_param.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30938-indent_switch_pp.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30938-indent_switch_pp.cpp
index dd910c56..dd910c56 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30938-indent_switch_pp.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30938-indent_switch_pp.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30939-indent_paren_after_func_call.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30939-indent_paren_after_func_call.cpp
index a1453862..a1453862 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30939-indent_paren_after_func_call.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30939-indent_paren_after_func_call.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30940-case-brace-remove.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30940-case-brace-remove.cpp
index cd163570..cd163570 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30940-case-brace-remove.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30940-case-brace-remove.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30941-Issue_2150.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30941-Issue_2150.cpp
index 1e4d6bf5..1e4d6bf5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30941-Issue_2150.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30941-Issue_2150.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30942-Issue_1692.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30942-Issue_1692.cpp
index 89de1d6a..89de1d6a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30942-Issue_1692.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30942-Issue_1692.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30943-Issue_2735.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30943-Issue_2735.cpp
index 3e292425..3e292425 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30943-Issue_2735.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30943-Issue_2735.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30945-sf.3266678.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30945-sf.3266678.cpp
index 810b5105..810b5105 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30945-sf.3266678.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30945-sf.3266678.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30946-sf.3315874.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30946-sf.3315874.h
index 05161496..05161496 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30946-sf.3315874.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30946-sf.3315874.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30947-bug_1689.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30947-bug_1689.cpp
index 40d34d61..40d34d61 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30947-bug_1689.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30947-bug_1689.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30948-sp_before_byref_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30948-sp_before_byref_func.cpp
index 4abfe954..4abfe954 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30948-sp_before_byref_func.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30948-sp_before_byref_func.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30949-Issue_2757.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30949-Issue_2757.cpp
index ba83c29e..ba83c29e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30949-Issue_2757.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30949-Issue_2757.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30950-sp_before_tr_emb_cmt_input.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30950-sp_before_tr_emb_cmt_input.cpp
index 943d303b..943d303b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30950-sp_before_tr_emb_cmt_input.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30950-sp_before_tr_emb_cmt_input.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30951-sp_before_tr_emb_cmt_input.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30951-sp_before_tr_emb_cmt_input.cpp
index c7e25f1c..c7e25f1c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30951-sp_before_tr_emb_cmt_input.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30951-sp_before_tr_emb_cmt_input.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30952-sp_before_constr_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30952-sp_before_constr_colon.cpp
index ad0e38d5..ad0e38d5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30952-sp_before_constr_colon.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30952-sp_before_constr_colon.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30953-constr_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30953-constr_colon.cpp
index 6c0706e5..6c0706e5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30953-constr_colon.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30953-constr_colon.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30954-Issue_2305.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30954-Issue_2305.cpp
index 7458b913..7458b913 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30954-Issue_2305.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30954-Issue_2305.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30955-indent_ctor_init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30955-indent_ctor_init.cpp
index 55982328..55982328 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30955-indent_ctor_init.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30955-indent_ctor_init.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30956-indent_ctor_init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30956-indent_ctor_init.cpp
index 29a146a9..29a146a9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30956-indent_ctor_init.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30956-indent_ctor_init.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30957-class-init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30957-class-init.cpp
index faa28873..faa28873 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30957-class-init.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30957-class-init.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30958-nl_for_leave_one_liners.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30958-nl_for_leave_one_liners.cpp
index 8ff2405f..8ff2405f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30958-nl_for_leave_one_liners.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30958-nl_for_leave_one_liners.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30959-nl_for_leave_one_liners.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30959-nl_for_leave_one_liners.cpp
index 382d2815..382d2815 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30959-nl_for_leave_one_liners.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30959-nl_for_leave_one_liners.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30960-Issue_2151.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30960-Issue_2151.cpp
index d0ee05d2..d0ee05d2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30960-Issue_2151.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30960-Issue_2151.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30961-Issue_2232.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30961-Issue_2232.cpp
index 7867820b..7867820b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30961-Issue_2232.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30961-Issue_2232.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30962-nl_assign_leave_one_liners.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30962-nl_assign_leave_one_liners.cpp
index cf3325f0..cf3325f0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30962-nl_assign_leave_one_liners.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30962-nl_assign_leave_one_liners.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30963-Issue_2907.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30963-Issue_2907.cpp
index c0192c4d..c0192c4d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30963-Issue_2907.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30963-Issue_2907.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30964-Issue_2823.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30964-Issue_2823.cpp
index c633398f..c633398f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30964-Issue_2823.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30964-Issue_2823.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30970-Issue_2219.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30970-Issue_2219.cpp
index e08cb889..e08cb889 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30970-Issue_2219.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30970-Issue_2219.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30971-Issue_2224.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30971-Issue_2224.cpp
index 0c454905..0c454905 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30971-Issue_2224.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30971-Issue_2224.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30972-Issue_2229.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30972-Issue_2229.cpp
index 0c44ed6a..0c44ed6a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30972-Issue_2229.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30972-Issue_2229.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30973-Issue_2236.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30973-Issue_2236.cpp
index 7f7f01f5..7f7f01f5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30973-Issue_2236.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30973-Issue_2236.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30974-using-alias-in-define.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30974-using-alias-in-define.cpp
index 1b4153d8..1b4153d8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/30974-using-alias-in-define.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/30974-using-alias-in-define.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31000-digraph.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31000-digraph.cpp
index e985dae6..e985dae6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31000-digraph.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31000-digraph.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31001-digraph.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31001-digraph.cpp
index 641390a6..641390a6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31001-digraph.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31001-digraph.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31050-pos_assign.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31050-pos_assign.cpp
index af55296b..af55296b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31050-pos_assign.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31050-pos_assign.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31051-pos_assign.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31051-pos_assign.cpp
index af55296b..af55296b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31051-pos_assign.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31051-pos_assign.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31101-nl_before_brace_open_test.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31101-nl_before_brace_open_test.cpp
index fdf9067a..fdf9067a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31101-nl_before_brace_open_test.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31101-nl_before_brace_open_test.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31102-nl_before_brace_open_test.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31102-nl_before_brace_open_test.cpp
index 59342e57..59342e57 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31102-nl_before_brace_open_test.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31102-nl_before_brace_open_test.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31103-nl_before_brace_open_test.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31103-nl_before_brace_open_test.cpp
index 5efbf20e..5efbf20e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31103-nl_before_brace_open_test.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31103-nl_before_brace_open_test.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31104-nl_before_brace_open_test.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31104-nl_before_brace_open_test.cpp
index a1b93406..a1b93406 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31104-nl_before_brace_open_test.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.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.75.0/tests/expected/cpp/31400-trailing_return.cpp
new file mode 100644
index 00000000..ef642eec
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31400-trailing_return.cpp
@@ -0,0 +1,99 @@
+auto f0(int a, int b) -> int;
+
+struct Foo
+{
+	auto f01() -> bool;
+	auto f02() noexcept -> bool;
+	auto f03() noexcept(true) -> bool;
+	auto f04() noexcept(false) -> bool;
+	auto f05() noexcept -> bool = delete;
+	auto f06() noexcept(true) -> bool = delete;
+	auto f07() noexcept(false) -> bool = delete;
+
+	auto f11() const -> bool;
+	auto f12() const noexcept -> bool;
+	auto f13() const noexcept(true) -> bool;
+	auto f14() const noexcept(false) -> bool;
+	auto f15() const noexcept -> bool = delete;
+	auto f16() const noexcept(true) -> bool = delete;
+	auto f17() const noexcept(false) -> bool = delete;
+
+	auto f21() throw() -> bool;
+	auto f22() throw() -> bool = delete;
+	auto f23() const throw() -> bool;
+	auto f24() const throw() -> bool = delete;
+
+	auto f25() const -> bool*;
+	auto f26() const -> bool* = delete;
+	auto f27() const -> bool&;
+	auto f28() const -> bool& = delete;
+
+	auto f29() -> bool*;
+	auto f30() -> bool* = delete;
+	auto f31() noexcept -> bool*;
+	auto f32() noexcept(true) -> bool*;
+	auto f33() noexcept(false) -> bool*;
+	auto f34() noexcept -> bool* = delete;
+	auto f35() noexcept(true) -> bool* = delete;
+	auto f36() noexcept(false) -> bool* = delete;
+	auto f37() throw() -> bool*;
+	auto f38() throw() -> bool* = delete;
+
+	auto f39() -> bool&;
+	auto f40() -> bool& = delete;
+	auto f41() noexcept -> bool&;
+	auto f42() noexcept(true) -> bool&;
+	auto f43() noexcept(false) -> bool&;
+	auto f44() noexcept -> bool& = delete;
+	auto f45() noexcept(true) -> bool& = delete;
+	auto f46() noexcept(false) -> bool& = delete;
+	auto f47() throw() -> bool&;
+	auto f48() throw() -> bool& = delete;
+
+	auto f49() const -> bool*;
+	auto f50() const -> bool* = delete;
+	auto f51() const noexcept -> bool*;
+	auto f52() const noexcept(true) -> bool*;
+	auto f53() const noexcept(false) -> bool*;
+	auto f54() const noexcept -> bool* = delete;
+	auto f55() const noexcept(true) -> bool* = delete;
+	auto f56() const noexcept(false) -> bool* = delete;
+	auto f57() const throw() -> bool*;
+	auto f58() const throw() -> bool* = delete;
+
+	auto f59() const -> bool&;
+	auto f60() const -> bool& = delete;
+	auto f61() const noexcept -> bool&;
+	auto f62() const noexcept(true) -> bool&;
+	auto f63() const noexcept(false) -> bool&;
+	auto f64() const noexcept -> bool& = delete;
+	auto f65() const noexcept(true) -> bool& = delete;
+	auto f66() const noexcept(false) -> bool& = delete;
+	auto f67() const throw() -> bool&;
+	auto f68() const throw() -> bool& = delete;
+};
+
+struct Bar
+{
+	Bar() : m_func([](void*) -> result_t {
+		return magic;
+	}) {}
+};
+
+void foo()
+{
+	auto l = [](int n) -> x_t {
+			 return n + 5;
+		 };
+	x([](int n) -> x_t {
+		return n + 5;
+	});
+}
+
+static auto f25() -> bool {
+	return true;
+}
+
+static auto f26() const noexcept(true) -> bool {
+	return true;
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31401-trailing_return.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31401-trailing_return.cpp
new file mode 100644
index 00000000..bfc09585
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31401-trailing_return.cpp
@@ -0,0 +1,99 @@
+auto f0(int a, int b)->int;
+
+struct Foo
+{
+	auto f01()->bool;
+	auto f02() noexcept->bool;
+	auto f03() noexcept(true)->bool;
+	auto f04() noexcept(false)->bool;
+	auto f05() noexcept->bool = delete;
+	auto f06() noexcept(true)->bool = delete;
+	auto f07() noexcept(false)->bool = delete;
+
+	auto f11() const->bool;
+	auto f12() const noexcept->bool;
+	auto f13() const noexcept(true)->bool;
+	auto f14() const noexcept(false)->bool;
+	auto f15() const noexcept->bool = delete;
+	auto f16() const noexcept(true)->bool = delete;
+	auto f17() const noexcept(false)->bool = delete;
+
+	auto f21() throw()->bool;
+	auto f22() throw()->bool = delete;
+	auto f23() const throw()->bool;
+	auto f24() const throw()->bool = delete;
+
+	auto f25() const->bool*;
+	auto f26() const->bool* = delete;
+	auto f27() const->bool&;
+	auto f28() const->bool& = delete;
+
+	auto f29()->bool*;
+	auto f30()->bool* = delete;
+	auto f31() noexcept->bool*;
+	auto f32() noexcept(true)->bool*;
+	auto f33() noexcept(false)->bool*;
+	auto f34() noexcept->bool* = delete;
+	auto f35() noexcept(true)->bool* = delete;
+	auto f36() noexcept(false)->bool* = delete;
+	auto f37() throw()->bool*;
+	auto f38() throw()->bool* = delete;
+
+	auto f39()->bool&;
+	auto f40()->bool& = delete;
+	auto f41() noexcept->bool&;
+	auto f42() noexcept(true)->bool&;
+	auto f43() noexcept(false)->bool&;
+	auto f44() noexcept->bool& = delete;
+	auto f45() noexcept(true)->bool& = delete;
+	auto f46() noexcept(false)->bool& = delete;
+	auto f47() throw()->bool&;
+	auto f48() throw()->bool& = delete;
+
+	auto f49() const->bool*;
+	auto f50() const->bool* = delete;
+	auto f51() const noexcept->bool*;
+	auto f52() const noexcept(true)->bool*;
+	auto f53() const noexcept(false)->bool*;
+	auto f54() const noexcept->bool* = delete;
+	auto f55() const noexcept(true)->bool* = delete;
+	auto f56() const noexcept(false)->bool* = delete;
+	auto f57() const throw()->bool*;
+	auto f58() const throw()->bool* = delete;
+
+	auto f59() const->bool&;
+	auto f60() const->bool& = delete;
+	auto f61() const noexcept->bool&;
+	auto f62() const noexcept(true)->bool&;
+	auto f63() const noexcept(false)->bool&;
+	auto f64() const noexcept->bool& = delete;
+	auto f65() const noexcept(true)->bool& = delete;
+	auto f66() const noexcept(false)->bool& = delete;
+	auto f67() const throw()->bool&;
+	auto f68() const throw()->bool& = delete;
+};
+
+struct Bar
+{
+	Bar() : m_func([](void*)->result_t {
+		return magic;
+	}) {}
+};
+
+void foo()
+{
+	auto l = [](int n)->x_t {
+			 return n + 5;
+		 };
+	x([](int n)->x_t {
+		return n + 5;
+	});
+}
+
+static auto f25()->bool {
+	return true;
+}
+
+static auto f26() const noexcept(true)->bool {
+	return true;
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31402-trailing_return.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31402-trailing_return.cpp
new file mode 100644
index 00000000..01adfc69
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31402-trailing_return.cpp
@@ -0,0 +1,99 @@
+auto f0(int a, int b)  ->  int;
+
+struct Foo
+{
+	auto f01()  ->  bool;
+	auto f02() noexcept  ->  bool;
+	auto f03() noexcept(true)  ->  bool;
+	auto f04() noexcept(false)  ->  bool;
+	auto f05() noexcept  ->  bool=delete;
+	auto f06() noexcept(true)  ->  bool=delete;
+	auto f07() noexcept(false)  ->  bool=delete;
+
+	auto f11() const  ->  bool;
+	auto f12() const noexcept  ->  bool;
+	auto f13() const noexcept(true)  ->  bool;
+	auto f14() const noexcept(false)  ->  bool;
+	auto f15() const noexcept  ->  bool=delete;
+	auto f16() const noexcept(true)  ->  bool=delete;
+	auto f17() const noexcept(false)  ->  bool=delete;
+
+	auto f21() throw()  ->  bool;
+	auto f22() throw()  ->  bool=delete;
+	auto f23() const throw()  ->  bool;
+	auto f24() const throw()  ->  bool=delete;
+
+	auto f25() const  ->  bool*;
+	auto f26() const  ->  bool* =delete;
+	auto f27() const  ->  bool&;
+	auto f28() const  ->  bool& =delete;
+
+	auto f29()  ->  bool*;
+	auto f30()  ->  bool* =delete;
+	auto f31() noexcept  ->  bool*;
+	auto f32() noexcept(true)  ->  bool*;
+	auto f33() noexcept(false)  ->  bool*;
+	auto f34() noexcept  ->  bool* =delete;
+	auto f35() noexcept(true)  ->  bool* =delete;
+	auto f36() noexcept(false)  ->  bool* =delete;
+	auto f37() throw()  ->  bool*;
+	auto f38() throw()  ->  bool* =delete;
+
+	auto f39()  ->  bool&;
+	auto f40()  ->  bool& =delete;
+	auto f41() noexcept  ->  bool&;
+	auto f42() noexcept(true)  ->  bool&;
+	auto f43() noexcept(false)  ->  bool&;
+	auto f44() noexcept  ->  bool& =delete;
+	auto f45() noexcept(true)  ->  bool& =delete;
+	auto f46() noexcept(false)  ->  bool& =delete;
+	auto f47() throw()  ->  bool&;
+	auto f48() throw()  ->  bool& =delete;
+
+	auto f49() const  ->  bool*;
+	auto f50() const  ->  bool* =delete;
+	auto f51() const noexcept  ->  bool*;
+	auto f52() const noexcept(true)  ->  bool*;
+	auto f53() const noexcept(false)  ->  bool*;
+	auto f54() const noexcept  ->  bool* =delete;
+	auto f55() const noexcept(true)  ->  bool* =delete;
+	auto f56() const noexcept(false)  ->  bool* =delete;
+	auto f57() const throw()  ->  bool*;
+	auto f58() const throw()  ->  bool* =delete;
+
+	auto f59() const  ->  bool&;
+	auto f60() const  ->  bool& =delete;
+	auto f61() const noexcept  ->  bool&;
+	auto f62() const noexcept(true)  ->  bool&;
+	auto f63() const noexcept(false)  ->  bool&;
+	auto f64() const noexcept  ->  bool& =delete;
+	auto f65() const noexcept(true)  ->  bool& =delete;
+	auto f66() const noexcept(false)  ->  bool& =delete;
+	auto f67() const throw()  ->  bool&;
+	auto f68() const throw()  ->  bool& =delete;
+};
+
+struct Bar
+{
+	Bar() : m_func([](void*)  ->  result_t {
+		return magic;
+	}) {}
+};
+
+void foo()
+{
+	auto l = [](int n)  ->  x_t {
+			 return n + 5;
+		 };
+	x([](int n)  ->  x_t {
+		return n + 5;
+	});
+}
+
+static auto f25()  ->  bool {
+	return true;
+}
+
+static auto f26() const noexcept(true)  ->  bool {
+	return true;
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31403-trailing_return_byref_ptr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31403-trailing_return_byref_ptr.cpp
new file mode 100644
index 00000000..9b7da565
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31403-trailing_return_byref_ptr.cpp
@@ -0,0 +1,84 @@
+struct Foo
+{
+	auto f01() -> bool;
+	auto f02() noexcept -> bool;
+	auto f03() noexcept(true) -> bool;
+	auto f04() noexcept(false) -> bool;
+	auto f05() noexcept -> bool = delete;
+	auto f06() noexcept(true) -> bool = delete;
+	auto f07() noexcept(false) -> bool = delete;
+
+	auto f11() const -> bool;
+	auto f12() const noexcept -> bool;
+	auto f13() const noexcept(true) -> bool;
+	auto f14() const noexcept(false) -> bool;
+	auto f15() const noexcept -> bool = delete;
+	auto f16() const noexcept(true) -> bool = delete;
+	auto f17() const noexcept(false) -> bool = delete;
+
+	auto f21() throw() -> bool;
+	auto f22() throw() -> bool = delete;
+	auto f23() const throw() -> bool;
+	auto f24() const throw() -> bool = delete;
+
+	auto f25() const -> bool*;
+	auto f26() const -> bool* = delete;
+	auto f27() const -> bool&;
+	auto f28() const -> bool& = delete;
+
+	auto f29() -> bool*;
+	auto f30() -> bool* = delete;
+	auto f31() noexcept -> bool*;
+	auto f32() noexcept(true) -> bool*;
+	auto f33() noexcept(false) -> bool*;
+	auto f34() noexcept -> bool* = delete;
+	auto f35() noexcept(true) -> bool* = delete;
+	auto f36() noexcept(false) -> bool* = delete;
+	auto f37() throw() -> bool*;
+	auto f38() throw() -> bool* = delete;
+
+	auto f39() -> bool&;
+	auto f40() -> bool& = delete;
+	auto f41() noexcept -> bool&;
+	auto f42() noexcept(true) -> bool&;
+	auto f43() noexcept(false) -> bool&;
+	auto f44() noexcept -> bool& = delete;
+	auto f45() noexcept(true) -> bool& = delete;
+	auto f46() noexcept(false) -> bool& = delete;
+	auto f47() throw() -> bool&;
+	auto f48() throw() -> bool& = delete;
+
+	auto f49() const -> bool*;
+	auto f50() const -> bool* = delete;
+	auto f51() const noexcept -> bool*;
+	auto f52() const noexcept(true) -> bool*;
+	auto f53() const noexcept(false) -> bool*;
+	auto f54() const noexcept -> bool* = delete;
+	auto f55() const noexcept(true) -> bool* = delete;
+	auto f56() const noexcept(false) -> bool* = delete;
+	auto f57() const throw() -> bool*;
+	auto f58() const throw() -> bool* = delete;
+
+	auto f59() const -> bool&;
+	auto f60() const -> bool& = delete;
+	auto f61() const noexcept -> bool&;
+	auto f62() const noexcept(true) -> bool&;
+	auto f63() const noexcept(false) -> bool&;
+	auto f64() const noexcept -> bool& = delete;
+	auto f65() const noexcept(true) -> bool& = delete;
+	auto f66() const noexcept(false) -> bool& = delete;
+	auto f67() const throw() -> bool&;
+	auto f68() const throw() -> bool& = delete;
+
+	class Foo
+	{
+	auto operator=(const Foo&) -> Foo&;
+	auto operator=(const Foo&) noexcept -> Foo&;
+
+	auto operator=(Foo const&) -> Foo&;
+	auto operator=(Foo const&) noexcept -> Foo&;
+
+	auto operator=(Foo&&) -> Foo&;
+	auto operator=(Foo&&) noexcept -> Foo&;
+	}
+};
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.75.0/tests/expected/cpp/31404-trailing_return_byref_ptr.cpp
new file mode 100644
index 00000000..7ecf920d
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31404-trailing_return_byref_ptr.cpp
@@ -0,0 +1,84 @@
+struct Foo
+{
+	auto f01() -> bool;
+	auto f02() noexcept -> bool;
+	auto f03() noexcept(true) -> bool;
+	auto f04() noexcept(false) -> bool;
+	auto f05() noexcept -> bool = delete;
+	auto f06() noexcept(true) -> bool = delete;
+	auto f07() noexcept(false) -> bool = delete;
+
+	auto f11() const -> bool;
+	auto f12() const noexcept -> bool;
+	auto f13() const noexcept(true) -> bool;
+	auto f14() const noexcept(false) -> bool;
+	auto f15() const noexcept -> bool = delete;
+	auto f16() const noexcept(true) -> bool = delete;
+	auto f17() const noexcept(false) -> bool = delete;
+
+	auto f21() throw() -> bool;
+	auto f22() throw() -> bool = delete;
+	auto f23() const throw() -> bool;
+	auto f24() const throw() -> bool = delete;
+
+	auto f25() const -> bool *;
+	auto f26() const -> bool * = delete;
+	auto f27() const -> bool &;
+	auto f28() const -> bool & = delete;
+
+	auto f29() -> bool *;
+	auto f30() -> bool * = delete;
+	auto f31() noexcept -> bool *;
+	auto f32() noexcept(true) -> bool *;
+	auto f33() noexcept(false) -> bool *;
+	auto f34() noexcept -> bool * = delete;
+	auto f35() noexcept(true) -> bool * = delete;
+	auto f36() noexcept(false) -> bool * = delete;
+	auto f37() throw() -> bool *;
+	auto f38() throw() -> bool * = delete;
+
+	auto f39() -> bool &;
+	auto f40() -> bool & = delete;
+	auto f41() noexcept -> bool &;
+	auto f42() noexcept(true) -> bool &;
+	auto f43() noexcept(false) -> bool &;
+	auto f44() noexcept -> bool & = delete;
+	auto f45() noexcept(true) -> bool & = delete;
+	auto f46() noexcept(false) -> bool & = delete;
+	auto f47() throw() -> bool &;
+	auto f48() throw() -> bool & = delete;
+
+	auto f49() const -> bool *;
+	auto f50() const -> bool * = delete;
+	auto f51() const noexcept -> bool *;
+	auto f52() const noexcept(true) -> bool *;
+	auto f53() const noexcept(false) -> bool *;
+	auto f54() const noexcept -> bool * = delete;
+	auto f55() const noexcept(true) -> bool * = delete;
+	auto f56() const noexcept(false) -> bool * = delete;
+	auto f57() const throw() -> bool *;
+	auto f58() const throw() -> bool * = delete;
+
+	auto f59() const -> bool &;
+	auto f60() const -> bool & = delete;
+	auto f61() const noexcept -> bool &;
+	auto f62() const noexcept(true) -> bool &;
+	auto f63() const noexcept(false) -> bool &;
+	auto f64() const noexcept -> bool & = delete;
+	auto f65() const noexcept(true) -> bool & = delete;
+	auto f66() const noexcept(false) -> bool & = delete;
+	auto f67() const throw() -> bool &;
+	auto f68() const throw() -> bool & = delete;
+
+	class Foo
+	{
+	auto operator=(const Foo &) -> Foo &;
+	auto operator=(const Foo &) noexcept -> Foo &;
+
+	auto operator=(Foo const &) -> Foo &;
+	auto operator=(Foo const &) noexcept -> Foo &;
+
+	auto operator=(Foo &&) -> Foo &;
+	auto operator=(Foo &&) noexcept -> Foo &;
+	}
+};
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.75.0/tests/expected/cpp/31450-indent_func_alias_prototype.cpp
new file mode 100644
index 00000000..472f66b3
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31450-indent_func_alias_prototype.cpp
@@ -0,0 +1,55 @@
+

+using Fun1 = void (  );

+using Fun2 = void (  )   noexcept;

+

+using Fun1a = void (

+	);

+

+using Fun2a = void (

+	)   noexcept;

+

+using Fun3a = void (

+	int a,

+	const char*

+	);

+

+using Fun4a = void (

+	int a,

+	const char*

+	) noexcept;

+

+using Fun5a = void (

+	int a,

+	const char*

+	);

+

+using Fun6a = void (

+	int a,

+	const char*

+	) noexcept;

+

+using Fun1b = auto (

+	)->int;

+

+using Fun2b = auto (

+	)   noexcept->int;

+

+using Fun3b = auto (

+	int a,

+	const char*

+	)->int;

+

+using Fun4b = auto (

+	int a,

+	const char*

+	) noexcept->int;

+

+using Fun5b = auto (

+	int a,

+	const char*

+	)->int;

+

+using Fun6b = auto (

+	int a,

+	const char*

+	) noexcept->int;

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.75.0/tests/expected/cpp/31451-indent_func_alias_prototype.cpp
new file mode 100644
index 00000000..2288f111
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31451-indent_func_alias_prototype.cpp
@@ -0,0 +1,55 @@
+

+using Fun1 = void (  );

+using Fun2 = void (  )   noexcept;

+

+using Fun1a = void (

+                   );

+

+using Fun2a = void (

+                   )   noexcept;

+

+using Fun3a = void (

+	int a,

+	const char*

+                   );

+

+using Fun4a = void (

+	int a,

+	const char*

+                   ) noexcept;

+

+using Fun5a = void (

+	int a,

+	const char*

+                   );

+

+using Fun6a = void (

+	int a,

+	const char*

+                   ) noexcept;

+

+using Fun1b = auto (

+                   )->int;

+

+using Fun2b = auto (

+                   )   noexcept->int;

+

+using Fun3b = auto (

+	int a,

+	const char*

+                   )->int;

+

+using Fun4b = auto (

+	int a,

+	const char*

+                   ) noexcept->int;

+

+using Fun5b = auto (

+	int a,

+	const char*

+                   )->int;

+

+using Fun6b = auto (

+	int a,

+	const char*

+                   ) noexcept->int;

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.75.0/tests/expected/cpp/31452-indent_func_alias_prototype.cpp
new file mode 100644
index 00000000..018b3dd6
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31452-indent_func_alias_prototype.cpp
@@ -0,0 +1,55 @@
+

+using Fun1 = void (  );

+using Fun2 = void (  )   noexcept;

+

+using Fun1a = void (

+);

+

+using Fun2a = void (

+)   noexcept;

+

+using Fun3a = void (

+	int a,

+	const char*

+);

+

+using Fun4a = void (

+	int a,

+	const char*

+) noexcept;

+

+using Fun5a = void (

+	int a,

+	const char*

+);

+

+using Fun6a = void (

+	int a,

+	const char*

+) noexcept;

+

+using Fun1b = auto (

+)->int;

+

+using Fun2b = auto (

+)   noexcept->int;

+

+using Fun3b = auto (

+	int a,

+	const char*

+)->int;

+

+using Fun4b = auto (

+	int a,

+	const char*

+) noexcept->int;

+

+using Fun5b = auto (

+	int a,

+	const char*

+)->int;

+

+using Fun6b = auto (

+	int a,

+	const char*

+) noexcept->int;

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31562-sf562.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31562-sf562.cpp
index 15ee8e79..15ee8e79 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31562-sf562.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31562-sf562.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31567-sf567.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31567-sf567.cpp
index 6d96731d..6d96731d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31567-sf567.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31567-sf567.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31568-Issue_2368.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31568-Issue_2368.cpp
index 82b8c59c..82b8c59c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31568-Issue_2368.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31568-Issue_2368.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31583-sf583.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31583-sf583.cpp
index 34fc0c21..34fc0c21 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31583-sf583.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31583-sf583.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31593-sf593.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31593-sf593.cpp
index 2d4499e6..2d4499e6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31593-sf593.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31593-sf593.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31594-issue_672.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31594-issue_672.cpp
index 499f3168..499f3168 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31594-issue_672.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31594-issue_672.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31595-issue_1778.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31595-issue_1778.cpp
index 4eea46e0..4eea46e0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31595-issue_1778.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31595-issue_1778.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31596-issue_1782.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31596-issue_1782.cpp
index 664ead7f..664ead7f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31596-issue_1782.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31596-issue_1782.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31597-issue_1804.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31597-issue_1804.cpp
index c98ecdef..c98ecdef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31597-issue_1804.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31597-issue_1804.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31598-Issue_1753.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31598-Issue_1753.cpp
index 9f7da399..9f7da399 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31598-Issue_1753.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31598-Issue_1753.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31599-parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31599-parameter-packs.cpp
index 4961aa2b..4961aa2b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31599-parameter-packs.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31599-parameter-packs.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31600-parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31600-parameter-packs.cpp
index 5d1cd8e8..5d1cd8e8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31600-parameter-packs.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31600-parameter-packs.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31601-parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31601-parameter-packs.cpp
index 0394fe8b..0394fe8b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31601-parameter-packs.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31601-parameter-packs.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31602-parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31602-parameter-packs.cpp
index 15d0a382..15d0a382 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31602-parameter-packs.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31602-parameter-packs.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31603-parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31603-parameter-packs.cpp
index 3a810b8a..3a810b8a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31603-parameter-packs.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31603-parameter-packs.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31604-parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31604-parameter-packs.cpp
index 2a180b34..2a180b34 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31604-parameter-packs.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31604-parameter-packs.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31605-parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31605-parameter-packs.cpp
index a08af3cf..a08af3cf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31605-parameter-packs.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31605-parameter-packs.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31606-parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31606-parameter-packs.cpp
index a73e2c43..a73e2c43 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31606-parameter-packs.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31606-parameter-packs.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31607-parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31607-parameter-packs.cpp
index 153fc615..153fc615 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31607-parameter-packs.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31607-parameter-packs.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31608-parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31608-parameter-packs.cpp
index 13ba49db..13ba49db 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31608-parameter-packs.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31608-parameter-packs.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31609-parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31609-parameter-packs.cpp
index e00841b4..e00841b4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31609-parameter-packs.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31609-parameter-packs.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31610-Issue_2085.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31610-Issue_2085.cpp
index 581f4db4..581f4db4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31610-Issue_2085.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31610-Issue_2085.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31611-parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31611-parameter-packs.cpp
index 4e89022d..4e89022d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31611-parameter-packs.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31611-parameter-packs.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31612-parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31612-parameter-packs.cpp
index 4e89022d..4e89022d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31612-parameter-packs.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31612-parameter-packs.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31613-parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31613-parameter-packs.cpp
index 4e89022d..4e89022d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31613-parameter-packs.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31613-parameter-packs.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31614-Issue_3309.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31614-Issue_3309.cpp
index d6dd1dac..d6dd1dac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31614-Issue_3309.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31614-Issue_3309.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31615-Issue_3309.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31615-Issue_3309.cpp
index 84ee58aa..84ee58aa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31615-Issue_3309.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31615-Issue_3309.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31616-Issue_3309.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31616-Issue_3309.cpp
index c269ddb0..c269ddb0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31616-Issue_3309.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31616-Issue_3309.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31620-sp_after_type.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31620-sp_after_type.cpp
index 460c0dc2..460c0dc2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31620-sp_after_type.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31620-sp_after_type.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31621-sp_after_type.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31621-sp_after_type.cpp
index b1ffd02b..b1ffd02b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31621-sp_after_type.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31621-sp_after_type.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31622-sp_after_type.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31622-sp_after_type.cpp
index a924423a..a924423a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31622-sp_after_type.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31622-sp_after_type.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31623-sp_after_type.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31623-sp_after_type.cpp
index 5d923c27..5d923c27 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31623-sp_after_type.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31623-sp_after_type.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31624-sp_after_type.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31624-sp_after_type.cpp
index b66aba0c..b66aba0c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31624-sp_after_type.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31624-sp_after_type.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31625-sp_after_type.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31625-sp_after_type.cpp
index add7b57e..add7b57e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31625-sp_after_type.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31625-sp_after_type.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31626-issue_1916.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31626-issue_1916.cpp
index 56ce6f4c..56ce6f4c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31626-issue_1916.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31626-issue_1916.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31627-issue_1916.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31627-issue_1916.cpp
index f84334a4..f84334a4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31627-issue_1916.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31627-issue_1916.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31628-issue_1916.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31628-issue_1916.cpp
index df2af994..df2af994 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31628-issue_1916.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31628-issue_1916.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31629-issue_1916.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31629-issue_1916.cpp
index 913f1e28..913f1e28 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31629-issue_1916.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31629-issue_1916.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31630-issue_1916.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31630-issue_1916.cpp
index df2af994..df2af994 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31630-issue_1916.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31630-issue_1916.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31631-issue_1916.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31631-issue_1916.cpp
index 913f1e28..913f1e28 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31631-issue_1916.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31631-issue_1916.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31632-issue_1916.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31632-issue_1916.cpp
index 292b6837..292b6837 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31632-issue_1916.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31632-issue_1916.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31633-sp_after_decltype.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31633-sp_after_decltype.cpp
index 6a62e6f2..6a62e6f2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31633-sp_after_decltype.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31633-sp_after_decltype.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31634-sp_after_decltype.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31634-sp_after_decltype.cpp
index c48543be..c48543be 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31634-sp_after_decltype.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31634-sp_after_decltype.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31635-sp_decltype.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31635-sp_decltype.cpp
index 84b157f1..84b157f1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31635-sp_decltype.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31635-sp_decltype.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31636-Issue_1923.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31636-Issue_1923.cpp
index 8c3ebe66..8c3ebe66 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31636-Issue_1923.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.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.75.0/tests/expected/cpp/31637-Issue_3446.cpp
new file mode 100644
index 00000000..9577cfa8
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31637-Issue_3446.cpp
@@ -0,0 +1,18 @@
+Foo::
+Foo() {
+}
+
+std::true_type blarg();
+template <typename T>
+decltype(std::declval<T &>().put(foo, bar), std::true_type())
+has_module_api_(T && t);
+
+void
+foo()
+{
+	using V = decltype(STD::declval<T &>().put(foo, bar), std::true_type());
+}
+
+template <typename T>
+decltype(std::declval<T &>()./* ((( */ put(foo, bar), std::true_type())
+has_module_api_(T && t);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31660-issue_1919.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31660-issue_1919.cpp
index 187065d6..187065d6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31660-issue_1919.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31660-issue_1919.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31661-Issue_3097.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31661-Issue_3097.cpp
index ede644ad..ede644ad 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31661-Issue_3097.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31661-Issue_3097.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31700-toggle_processing_cmt.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31700-toggle_processing_cmt.cpp
index 03615082..03615082 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31700-toggle_processing_cmt.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31700-toggle_processing_cmt.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31701-toggle_processing_cmt2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31701-toggle_processing_cmt2.cpp
index f67cb76b..f67cb76b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31701-toggle_processing_cmt2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31701-toggle_processing_cmt2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31702-toggle_processing_cmt.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31702-toggle_processing_cmt.cpp
index adf1b8be..adf1b8be 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31702-toggle_processing_cmt.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31702-toggle_processing_cmt.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31703-toggle_processing_cmt.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31703-toggle_processing_cmt.cpp
index e806e89e..e806e89e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31703-toggle_processing_cmt.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31703-toggle_processing_cmt.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31710-string_replace_tab_chars.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31710-string_replace_tab_chars.cpp
index 8350740b..8350740b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31710-string_replace_tab_chars.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31710-string_replace_tab_chars.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31711-string_replace_tab_chars.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31711-string_replace_tab_chars.cpp
index 56f16799..56f16799 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31711-string_replace_tab_chars.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31711-string_replace_tab_chars.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31720-bit-colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31720-bit-colon.cpp
index b8e7c4db..b8e7c4db 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31720-bit-colon.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31720-bit-colon.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31721-Issue_2689.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31721-Issue_2689.cpp
index e2b43674..e2b43674 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31721-Issue_2689.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31721-Issue_2689.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31730-ms-style-ref.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31730-ms-style-ref.cpp
index 826d4e90..826d4e90 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31730-ms-style-ref.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31730-ms-style-ref.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31740-I2102.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31740-I2102.cpp
index d8cf883a..d8cf883a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/31740-I2102.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/31740-I2102.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/32000-sp_skip_vbrace_tokens.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/32000-sp_skip_vbrace_tokens.cpp
index 99d403ef..99d403ef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/32000-sp_skip_vbrace_tokens.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/32000-sp_skip_vbrace_tokens.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/32001-issue_547_for_each.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/32001-issue_547_for_each.cpp
index cfbe7963..cfbe7963 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/32001-issue_547_for_each.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/32001-issue_547_for_each.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/32002-proto-wrap.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/32002-proto-wrap.cpp
index 35e8bea3..35e8bea3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/32002-proto-wrap.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/32002-proto-wrap.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/32003-issue_633_typename.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/32003-issue_633_typename.cpp
index 33b947f1..33b947f1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/32003-issue_633_typename.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/32003-issue_633_typename.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/32004-issue_624_angle.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/32004-issue_624_angle.cpp
index 255db223..255db223 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/32004-issue_624_angle.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/32004-issue_624_angle.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/32005-issue_633_typename.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/32005-issue_633_typename.cpp
index 33b947f1..33b947f1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/32005-issue_633_typename.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/32005-issue_633_typename.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/32006-bug_i_687.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/32006-bug_i_687.cpp
index 387eaa06..387eaa06 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/32006-bug_i_687.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/32006-bug_i_687.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/32007-Issue_3052.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/32007-Issue_3052.cpp
index cb468be3..cb468be3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/32007-Issue_3052.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/32007-Issue_3052.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/32008-Issue_3034.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/32008-Issue_3034.cpp
index 1a110ee8..1a110ee8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/32008-Issue_3034.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.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.75.0/tests/expected/cpp/32009-Issue_3422.cpp
new file mode 100644
index 00000000..66e5ddad
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/32009-Issue_3422.cpp
@@ -0,0 +1,14 @@
+voind main()
+{
+	unsigned long uncompressed_size = 0;
+	char *data_buffer               = NULL;
+
+	unsigned long uncompressed_size = 0, compressed_size = 0;
+	char *data_buffer = NULL;
+
+	unsigned long uncompressed_size, compressed_size = 0;
+	char *data_buffer = NULL;
+
+	unsigned long uncompressed_size, compressed_size;
+	char *data_buffer = NULL;
+}
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.75.0/tests/expected/cpp/32010-Issue_3422.cpp
new file mode 100644
index 00000000..7077eb71
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/32010-Issue_3422.cpp
@@ -0,0 +1,14 @@
+voind main()
+{
+	unsigned long uncompressed_size = 0;
+	char *data_buffer               = NULL;
+
+	unsigned long uncompressed_size = 0, compressed_size = 0;
+	char *data_buffer               = NULL;
+
+	unsigned long uncompressed_size, compressed_size = 0;
+	char *data_buffer                                = NULL;
+
+	unsigned long uncompressed_size, compressed_size;
+	char *data_buffer = NULL;
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/32100-cpp17.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/32100-cpp17.cpp
index cfccba03..cfccba03 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/32100-cpp17.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/32100-cpp17.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/32105-I2103.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/32105-I2103.cpp
index ba6386dd..c35fbe56 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/32105-I2103.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/32105-I2103.cpp
@@ -1,2 +1,3 @@
 int i1 = EEnumType::a & EEnumType::b;
 int i2 = a & b;
+int i3 = EEnumType::Enum1 & b;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/32115-2185.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/32115-2185.cpp
index 6f874926..6f874926 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/32115-2185.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/32115-2185.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33000-tab-0.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33000-tab-0.cpp
index d9ff0418..d9ff0418 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33000-tab-0.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33000-tab-0.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33001-tab-1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33001-tab-1.cpp
index 85d8abe2..85d8abe2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33001-tab-1.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33001-tab-1.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33002-cmt_convert_tab_to_spaces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33002-cmt_convert_tab_to_spaces.cpp
index 32ff32d3..32ff32d3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33002-cmt_convert_tab_to_spaces.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33002-cmt_convert_tab_to_spaces.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33003-cmt_convert_tab_to_spaces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33003-cmt_convert_tab_to_spaces.cpp
index db09e6fc..db09e6fc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33003-cmt_convert_tab_to_spaces.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33003-cmt_convert_tab_to_spaces.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33004-DoxygenComments.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33004-DoxygenComments.cpp
index df0b9680..df0b9680 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33004-DoxygenComments.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33004-DoxygenComments.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33005-DoxygenComments.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33005-DoxygenComments.cpp
index 533214f2..533214f2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33005-DoxygenComments.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33005-DoxygenComments.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33006-string_replace_tab_chars.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33006-string_replace_tab_chars.cpp
index 8350740b..8350740b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33006-string_replace_tab_chars.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33006-string_replace_tab_chars.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33007-NewLine.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33007-NewLine.cpp
index 9c7f1ee9..9c7f1ee9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33007-NewLine.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33007-NewLine.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33008-NewLine.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33008-NewLine.cpp
index b3cc1bed..b3cc1bed 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33008-NewLine.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33008-NewLine.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33009-NewLine0.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33009-NewLine0.cpp
index b5a714fa..b5a714fa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33009-NewLine0.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33009-NewLine0.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33010-Q_EMIT.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33010-Q_EMIT.cpp
index d3ef9396..d3ef9396 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33010-Q_EMIT.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33010-Q_EMIT.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33011-static.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33011-static.h
index 8121fef1..8121fef1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33011-static.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33011-static.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33012-Q_SIGNAL_SLOT.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33012-Q_SIGNAL_SLOT.cpp
index faf00903..faf00903 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33012-Q_SIGNAL_SLOT.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33012-Q_SIGNAL_SLOT.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33013-Q_2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33013-Q_2.cpp
index 7d0bb88a..7d0bb88a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33013-Q_2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33013-Q_2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33014-DB.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33014-DB.cpp
index 1b8f4bc8..1b8f4bc8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33014-DB.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33014-DB.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33015-Q_FOREACH.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33015-Q_FOREACH.cpp
index 02fd849d..02fd849d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33015-Q_FOREACH.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33015-Q_FOREACH.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33016-indent.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33016-indent.cpp
index 22d04a78..22d04a78 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33016-indent.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33016-indent.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33017-bug_1160.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33017-bug_1160.cpp
index 8dc7a9d1..8dc7a9d1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33017-bug_1160.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33017-bug_1160.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33019-bug_657.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33019-bug_657.cpp
index 3b5bb42a..3b5bb42a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33019-bug_657.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33019-bug_657.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33020-bug_662.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33020-bug_662.cpp
index 48b612ae..48b612ae 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33020-bug_662.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33020-bug_662.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33021-bug_633.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33021-bug_633.cpp
index 5b672b47..5b672b47 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33021-bug_633.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33021-bug_633.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33022-bug_634.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33022-bug_634.cpp
index febbf7b3..febbf7b3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33022-bug_634.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33022-bug_634.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33023-bug_651.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33023-bug_651.cpp
index f0236016..f0236016 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33023-bug_651.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33023-bug_651.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33024-bug_653.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33024-bug_653.cpp
index 1bf853d6..1bf853d6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33024-bug_653.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33024-bug_653.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33025-bug_654.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33025-bug_654.cpp
index 497e3372..497e3372 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33025-bug_654.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33025-bug_654.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33026-bug_631.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33026-bug_631.cpp
index e110d383..e110d383 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33026-bug_631.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33026-bug_631.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33027-bug_664.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33027-bug_664.cpp
index 6fa5beea..6fa5beea 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33027-bug_664.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33027-bug_664.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33028-braces_empty.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33028-braces_empty.cpp
index 8e46ab7c..8e46ab7c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33028-braces_empty.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.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.75.0/tests/expected/cpp/33029-cast.cpp
new file mode 100644
index 00000000..67e725ff
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33029-cast.cpp
@@ -0,0 +1,6 @@
+{
+	a = ( int ) 5.6;
+	b = int( 5.6 );
+	c = ( type<int> ) t;
+	d = ( type<int, int> ) t;
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33030-Q_FOREVER.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33030-Q_FOREVER.cpp
index 5dad4fa9..5dad4fa9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33030-Q_FOREVER.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33030-Q_FOREVER.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33031-bug_612.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33031-bug_612.cpp
index 4388ac75..4388ac75 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33031-bug_612.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33031-bug_612.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33032-bug_670.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33032-bug_670.cpp
index 0ede02f2..0ede02f2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33032-bug_670.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33032-bug_670.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33033-bug_670.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33033-bug_670.h
index cc6d46e3..cc6d46e3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33033-bug_670.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33033-bug_670.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33034-bug_671.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33034-bug_671.h
index 5ef3b5d9..5ef3b5d9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33034-bug_671.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33034-bug_671.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33035-patch_32.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33035-patch_32.cpp
index 8b414f00..8b414f00 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33035-patch_32.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33035-patch_32.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33036-bug_663.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33036-bug_663.cpp
index 7583d548..7583d548 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33036-bug_663.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33036-bug_663.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33037-func_class.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33037-func_class.cpp
index ea271c11..ea271c11 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33037-func_class.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33037-func_class.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33038-func_class.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33038-func_class.h
index 8b3ca218..8b3ca218 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33038-func_class.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33038-func_class.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33039-mod_remove_empty_return.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33039-mod_remove_empty_return.cpp
index 707c1c38..707c1c38 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33039-mod_remove_empty_return.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33039-mod_remove_empty_return.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33040-bug_i_411.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33040-bug_i_411.cpp
index 5a3f09aa..5a3f09aa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33040-bug_i_411.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33040-bug_i_411.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33041-bug_i_411.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33041-bug_i_411.cpp
index 4e89d68d..4e89d68d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33041-bug_i_411.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33041-bug_i_411.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33042-bug_i_411.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33042-bug_i_411.cpp
index 574f12ba..574f12ba 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33042-bug_i_411.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33042-bug_i_411.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33043-bug_i_478.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33043-bug_i_478.cpp
index 0f96e53c..868220bb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33043-bug_i_478.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33043-bug_i_478.cpp
@@ -1,6 +1,6 @@
 {
         QString fileName = QFileDialog::getOpenFileName(this,
-             tr("Choose Configuration File"), ui->leStrategyFile->text(),
+             tr("Choose Configuration File"), ui->leStrategyFile->Text(),
              tr("Configuration Files (*.cfg);; All Files (*.*)"), 0);
 
         pSettings = new QSettings(QCoreApplication::applicationDirPath() + "/" +
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33044-bug_i_481.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33044-bug_i_481.cpp
index e8470648..e8470648 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33044-bug_i_481.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33044-bug_i_481.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33045-bug_i_width.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33045-bug_i_width.cpp
index 08f7888e..08f7888e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33045-bug_i_width.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33045-bug_i_width.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33046-bug_i_409.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33046-bug_i_409.cpp
index 6946a562..6946a562 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33046-bug_i_409.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33046-bug_i_409.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33047-bug_i_409.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33047-bug_i_409.cpp
index 7bfdfd83..7bfdfd83 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33047-bug_i_409.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33047-bug_i_409.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33048-bug_i_405.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33048-bug_i_405.cpp
index eda9b0dd..eda9b0dd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33048-bug_i_405.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33048-bug_i_405.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33049-pp-pragma.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33049-pp-pragma.cpp
index 2c013b08..2c013b08 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33049-pp-pragma.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33049-pp-pragma.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33050-issue_523.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33050-issue_523.cpp
index d203e398..d203e398 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33050-issue_523.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33050-issue_523.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33051-bug_i_503.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33051-bug_i_503.cpp
index 31ca41a8..31ca41a8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33051-bug_i_503.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33051-bug_i_503.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33052-bug_i_512.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33052-bug_i_512.cpp
index 9b93cdf2..9b93cdf2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33052-bug_i_512.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33052-bug_i_512.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33053-for_auto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33053-for_auto.cpp
index 073556c9..073556c9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33053-for_auto.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33053-for_auto.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33054-bug_i_825.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33054-bug_i_825.cpp
index 242c4811..242c4811 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33054-bug_i_825.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33054-bug_i_825.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33056-bug_33056.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33056-bug_33056.cpp
index 1339ede1..1339ede1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33056-bug_33056.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33056-bug_33056.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33057-bug_1349.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33057-bug_1349.cpp
index fcc2e567..fcc2e567 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33057-bug_1349.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33057-bug_1349.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33058-Issue_3164.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33058-Issue_3164.cpp
index a1e426b0..a1e426b0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33058-Issue_3164.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33058-Issue_3164.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33059-mod_remove_empty_return-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33059-mod_remove_empty_return-2.cpp
index eb949c45..eb949c45 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33059-mod_remove_empty_return-2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33059-mod_remove_empty_return-2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33060-if_constexpr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33060-if_constexpr.cpp
index 032f74ec..032f74ec 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33060-if_constexpr.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33060-if_constexpr.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33061-if_chain_braces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33061-if_chain_braces.cpp
index b544f2bf..693efc63 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33061-if_chain_braces.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33061-if_chain_braces.cpp
@@ -28,6 +28,20 @@ int foo() {
 
 	if ( b ) {
 		{ b = 5; }
-		return 9;
+		return 10;
+	}
+
+	if ( a )
+		return 11;
+	else {
+		return 12;
+	}
+
+	if ( a ) {
+		return 13;
+	} else if ( b ) {
+		return 14;
+	} else {
+		return 15;
 	}
 }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33062-if_chain_braces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33062-if_chain_braces.cpp
index 1973042c..af36ed0e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33062-if_chain_braces.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33062-if_chain_braces.cpp
@@ -29,6 +29,18 @@ int foo() {
 
 	if ( b ) {
 		{ b = 5; }
-		return 9;
+		return 10;
 	}
+
+	if ( a )
+		return 11;
+	else
+		return 12;
+
+	if ( a )
+		return 13;
+	else if ( b )
+		return 14;
+	else
+		return 15;
 }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33063-if_chain_braces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33063-if_chain_braces.cpp
index 7a66eeec..00038700 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33063-if_chain_braces.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33063-if_chain_braces.cpp
@@ -34,6 +34,21 @@ int foo() {
 
 	if ( b ) {
 		{ b = 5; }
-		return 9;
+		return 10;
+	}
+
+	if ( a ) {
+		return 11;
+	}
+	else {
+		return 12;
+	}
+
+	if ( a ) {
+		return 13;
+	} else if ( b ) {
+		return 14;
+	} else {
+		return 15;
 	}
 }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33064-if_chain_braces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33064-if_chain_braces.cpp
index 2781fb26..c42ef73a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33064-if_chain_braces.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33064-if_chain_braces.cpp
@@ -33,6 +33,21 @@ int foo() {
 
 	if ( b ) {
 		{ b = 5; }
-		return 9;
+		return 10;
+	}
+
+	if ( a ) {
+		return 11;
+	}
+	else {
+		return 12;
+	}
+
+	if ( a ) {
+		return 13;
+	} else if ( b ) {
+		return 14;
+	} else {
+		return 15;
 	}
 }
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.75.0/tests/expected/cpp/33065-Issue_3316.cpp
new file mode 100644
index 00000000..91ec82f0
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33065-Issue_3316.cpp
@@ -0,0 +1,15 @@
+#include <iostream>
+
+bool
+foo()
+{
+	const int i = 3;
+
+	if ( (i == 2) || (i == 3) || (i == 5) ) {
+		std::cerr << "Very small prime!\n";
+	}
+
+	const auto isSmallPrime = (i == 2) || (i == 3) || (i == 5) || (i == 7) || (i == 11);
+
+	return isSmallPrime || (i == 13) || (i == 17) || (i == 19);
+}
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.75.0/tests/expected/cpp/33066-if_chain_braces.cpp
new file mode 100644
index 00000000..0ef6478b
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33066-if_chain_braces.cpp
@@ -0,0 +1,50 @@
+
+int foo() {
+	if ( a )
+		return 1;
+	else if ( b )
+		return 2;
+
+	if ( a ) {
+		return 3;
+	}
+	else if ( b ) {
+		return 4;
+	}
+	else {
+		a = 5;
+		return 5;
+	}
+
+	if ( a )
+		return 6;
+	else
+		return 7;
+
+	if ( a )
+		return 8;
+
+	if ( b ) {
+		return 9;
+	}
+
+	if ( b ) {
+		{ b = 5; }
+		return 10;
+	}
+
+	if ( a ) {
+		return 11;
+	}
+	else {
+		return 12;
+	}
+
+	if ( a ) {
+		return 13;
+	} else if ( b ) {
+		return 14;
+	} else {
+		return 15;
+	}
+}
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.75.0/tests/expected/cpp/33067-if_chain_braces.cpp
new file mode 100644
index 00000000..7df1c6e8
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33067-if_chain_braces.cpp
@@ -0,0 +1,48 @@
+
+int foo() {
+	if ( a )
+		return 1;
+	else if ( b )
+		return 2;
+
+	if ( a ) {
+		return 3;
+	}
+	else if ( b ) {
+		return 4;
+	}
+	else {
+		a = 5;
+		return 5;
+	}
+
+	if ( a )
+		return 6;
+	else
+		return 7;
+
+	if ( a )
+		return 8;
+
+	if ( b ) {
+		return 9;
+	}
+
+	if ( b ) {
+		{ b = 5; }
+		return 10;
+	}
+
+	if ( a )
+		return 11;
+	else
+		return 12;
+
+	if ( a ) {
+		return 13;
+	} else if ( b ) {
+		return 14;
+	} else {
+		return 15;
+	}
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33069-Issue_2195.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33069-Issue_2195.cpp
index fe3ec459..fe3ec459 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33069-Issue_2195.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33069-Issue_2195.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33070-multi_line.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33070-multi_line.cpp
index dcea4c00..dcea4c00 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33070-multi_line.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33070-multi_line.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33071-multi_line.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33071-multi_line.cpp
index 0f8503fc..0f8503fc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33071-multi_line.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33071-multi_line.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33072-multi_line.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33072-multi_line.cpp
index add93503..add93503 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33072-multi_line.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33072-multi_line.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33073-multi_line.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33073-multi_line.cpp
index c0016ff6..c0016ff6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33073-multi_line.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33073-multi_line.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33074-multi_line.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33074-multi_line.cpp
index c8f32960..c8f32960 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33074-multi_line.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33074-multi_line.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33075-multi_line.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33075-multi_line.cpp
index 66963f4e..66963f4e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33075-multi_line.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33075-multi_line.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33076-multi_line.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33076-multi_line.cpp
index 9d105267..9d105267 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33076-multi_line.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33076-multi_line.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33077-multi_line.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33077-multi_line.cpp
index d7cbafc8..d7cbafc8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33077-multi_line.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33077-multi_line.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33078-multi_line.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33078-multi_line.cpp
index 01fe4d10..01fe4d10 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33078-multi_line.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33078-multi_line.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33079-multi_line.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33079-multi_line.cpp
index 6a6490ab..6a6490ab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33079-multi_line.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33079-multi_line.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33080-multi_line.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33080-multi_line.cpp
index 8f44ce91..8f44ce91 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33080-multi_line.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33080-multi_line.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33081-bug_i_552.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33081-bug_i_552.cpp
index 5a0704de..5a0704de 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33081-bug_i_552.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33081-bug_i_552.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33082-namespace_namespace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33082-namespace_namespace.cpp
index cf6f921e..cf6f921e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33082-namespace_namespace.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33082-namespace_namespace.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33083-bug_i_359.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33083-bug_i_359.cpp
index 8081c1f9..8081c1f9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33083-bug_i_359.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33083-bug_i_359.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33084-op_sym_empty.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33084-op_sym_empty.cpp
index 3557e513..3557e513 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33084-op_sym_empty.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33084-op_sym_empty.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33085-bug_i_323.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33085-bug_i_323.cpp
index 6f622f6e..6f622f6e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33085-bug_i_323.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33085-bug_i_323.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33086-bug_i_568.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33086-bug_i_568.cpp
index 2e1a00d7..2e1a00d7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33086-bug_i_568.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33086-bug_i_568.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33087-bug_i_596.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33087-bug_i_596.cpp
index db3644a2..db3644a2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33087-bug_i_596.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33087-bug_i_596.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33088-bug_i_197.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33088-bug_i_197.cpp
index e86698fd..e86698fd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33088-bug_i_197.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33088-bug_i_197.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33089-bug_643.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33089-bug_643.cpp
index 55e3e309..55e3e309 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33089-bug_643.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33089-bug_643.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33090-gh555.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33090-gh555.cpp
index 32147190..32147190 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33090-gh555.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33090-gh555.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33091-squeeze_ifdef.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33091-squeeze_ifdef.cpp
index 7311c71e..7311c71e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33091-squeeze_ifdef.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33091-squeeze_ifdef.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33092-squeeze_ifdef.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33092-squeeze_ifdef.cpp
index 94b20d2e..94b20d2e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33092-squeeze_ifdef.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33092-squeeze_ifdef.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33093-sp_angle_paren.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33093-sp_angle_paren.cpp
index 7ed4f34e..7ed4f34e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33093-sp_angle_paren.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33093-sp_angle_paren.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33094-sp_angle_paren.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33094-sp_angle_paren.cpp
index c20305c3..c20305c3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33094-sp_angle_paren.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33094-sp_angle_paren.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33095-bug_i_322.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33095-bug_i_322.cpp
index 3904ec27..3904ec27 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33095-bug_i_322.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33095-bug_i_322.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33096-squeeze_ifdef.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33096-squeeze_ifdef.cpp
index df3d90ab..df3d90ab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33096-squeeze_ifdef.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33096-squeeze_ifdef.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33097-enum_comma.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33097-enum_comma.h
index bb93f4a9..bb93f4a9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33097-enum_comma.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33097-enum_comma.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33098-enum_comma.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33098-enum_comma.h
index 3ec29719..3ec29719 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33098-enum_comma.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33098-enum_comma.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33099-enum_comma.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33099-enum_comma.h
index 01a89059..01a89059 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33099-enum_comma.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33099-enum_comma.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33100-enum_comma.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33100-enum_comma.h
index 903a6849..903a6849 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33100-enum_comma.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33100-enum_comma.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33101-enum_comma.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33101-enum_comma.h
index 53c1a99e..53c1a99e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33101-enum_comma.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33101-enum_comma.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33102-enum_comma.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33102-enum_comma.h
index 6c11f2b3..6c11f2b3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33102-enum_comma.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33102-enum_comma.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33103-bug_858.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33103-bug_858.cpp
index 1085f7db..1085f7db 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33103-bug_858.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33103-bug_858.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33104-bug_858.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33104-bug_858.cpp
index c5ac560e..c5ac560e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33104-bug_858.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33104-bug_858.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33105-bug_1001.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33105-bug_1001.cpp
index d6104cd5..d6104cd5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33105-bug_1001.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33105-bug_1001.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33106-pos_bool_in_template.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33106-pos_bool_in_template.h
index f5fdb04e..f5fdb04e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33106-pos_bool_in_template.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33106-pos_bool_in_template.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33107-Issue_2688.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33107-Issue_2688.cpp
index ac97ff3a..ac97ff3a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33107-Issue_2688.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33107-Issue_2688.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33108-Issue_2045.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33108-Issue_2045.cpp
index a1670ffc..a1670ffc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33108-Issue_2045.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33108-Issue_2045.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33109-Issue_3205.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33109-Issue_3205.cpp
index 99767289..99767289 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33109-Issue_3205.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33109-Issue_3205.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33110-enum.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33110-enum.cpp
index 3872557e..a0ab57c8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33110-enum.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33110-enum.cpp
@@ -13,15 +13,15 @@ enum class comment_align_e : unsigned int
    ENDIF,
 };
 
-// chunk_list.h
-enum class scope_e : unsigned int
+// chunk.h
+enum class E_Scope : unsigned int
 {
    ALL,      /**< search in all kind of chunks */
    PREPROC,  /**< search only in preprocessor chunks */
 };
 
-// chunk_list.cpp
-enum class direction_e : unsigned int
+// chunk.cpp
+enum class E_Direction : unsigned int
 {
    FORWARD,
    BACKWARD
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33120-Issue_2149.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33120-Issue_2149.cpp
index 1266bd7b..1266bd7b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33120-Issue_2149.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33120-Issue_2149.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33150-bug_i_753.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33150-bug_i_753.cpp
index 9aa764a4..9aa764a4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33150-bug_i_753.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33150-bug_i_753.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33151-bug_i_752.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33151-bug_i_752.cpp
index da8fe9f5..da8fe9f5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33151-bug_i_752.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33151-bug_i_752.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33152-bug_1004.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33152-bug_1004.cpp
index f072a583..f072a583 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33152-bug_1004.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33152-bug_1004.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33160-bug_1112.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33160-bug_1112.cpp
index da95fcb6..da95fcb6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33160-bug_1112.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33160-bug_1112.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33161-byref-3.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33161-byref-3.cpp
index 8c51bf46..8c51bf46 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33161-byref-3.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.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.75.0/tests/expected/cpp/33162-sp_not_not.cpp
new file mode 100644
index 00000000..42306dad
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33162-sp_not_not.cpp
@@ -0,0 +1,3 @@
+if (! hello) { }
+if (!! hello) { }
+if (!!! hello) { }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33180-pp_multi_comment.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33180-pp_multi_comment.cpp
index bfe1e1d1..bfe1e1d1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33180-pp_multi_comment.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33180-pp_multi_comment.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33181-Issue_2759.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33181-Issue_2759.cpp
index cbe9c4a5..cbe9c4a5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33181-Issue_2759.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33181-Issue_2759.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33182-Issue_2794.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33182-Issue_2794.cpp
index 16de515b..16de515b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33182-Issue_2794.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33182-Issue_2794.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33200-first_len_minimum.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33200-first_len_minimum.cpp
index c33d9e03..c33d9e03 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33200-first_len_minimum.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33200-first_len_minimum.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33201-indent_ctor_members_twice.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33201-indent_ctor_members_twice.cpp
index 3b1bea1c..3b1bea1c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33201-indent_ctor_members_twice.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33201-indent_ctor_members_twice.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33202-initlist_leading_commas.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33202-initlist_leading_commas.cpp
index a3bc4a2a..a3bc4a2a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33202-initlist_leading_commas.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33202-initlist_leading_commas.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33203-Issue_2574.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33203-Issue_2574.cpp
index bd88347d..bd88347d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33203-Issue_2574.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33203-Issue_2574.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33204-Issue_2582.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33204-Issue_2582.cpp
index adf9bfe9..adf9bfe9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33204-Issue_2582.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33204-Issue_2582.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33205-Issue_3198.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33205-Issue_3198.cpp
index 8dd234b7..8dd234b7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33205-Issue_3198.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33205-Issue_3198.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33210-templates4.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33210-templates4.cpp
index 10b96e4a..10b96e4a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33210-templates4.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33210-templates4.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33211-pp_multi_comment.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33211-pp_multi_comment.cpp
index 5690e3a6..5690e3a6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33211-pp_multi_comment.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33211-pp_multi_comment.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33212-pp-define-indent.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33212-pp-define-indent.cpp
index 78dc4c98..78dc4c98 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33212-pp-define-indent.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33212-pp-define-indent.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33213-disable_macro.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33213-disable_macro.cpp
index 7e64f416..7e64f416 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33213-disable_macro.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33213-disable_macro.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33214-Issue_2742.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33214-Issue_2742.cpp
index 66d12fec..66d12fec 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33214-Issue_2742.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33214-Issue_2742.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33215-Issue_3055.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33215-Issue_3055.cpp
index d23a0d56..d23a0d56 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33215-Issue_3055.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33215-Issue_3055.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33216-Issue_3055-a.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33216-Issue_3055-a.cpp
index 21a5c35c..21a5c35c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33216-Issue_3055-a.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33216-Issue_3055-a.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33217-Issue_3113.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33217-Issue_3113.cpp
index 63090f4a..63090f4a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/33217-Issue_3113.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/33217-Issue_3113.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34001-nl_before_after.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34001-nl_before_after.h
index 8cdc7273..8cdc7273 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34001-nl_before_after.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34001-nl_before_after.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34002-bug_i_793.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34002-bug_i_793.cpp
index b6b6a7ab..b6b6a7ab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34002-bug_i_793.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34002-bug_i_793.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34003-nl_max_blank_in_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34003-nl_max_blank_in_func.cpp
index cd1083ee..cd1083ee 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34003-nl_max_blank_in_func.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34003-nl_max_blank_in_func.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34004-nl_max_blank_in_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34004-nl_max_blank_in_func.cpp
index c2f8dc36..c2f8dc36 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34004-nl_max_blank_in_func.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34004-nl_max_blank_in_func.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34005-nl_max_blank_in_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34005-nl_max_blank_in_func.cpp
index 738f3bf6..738f3bf6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34005-nl_max_blank_in_func.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34005-nl_max_blank_in_func.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34006-bug_i_575.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34006-bug_i_575.cpp
index 4c25fb75..4c25fb75 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34006-bug_i_575.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34006-bug_i_575.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34007-bug_i_928.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34007-bug_i_928.cpp
index 78b214bd..78b214bd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34007-bug_i_928.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34007-bug_i_928.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34100-bug_i_525.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34100-bug_i_525.cpp
index b810afe0..b810afe0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34100-bug_i_525.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34100-bug_i_525.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34101-bug_i_646.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34101-bug_i_646.cpp
index f89b6416..f89b6416 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34101-bug_i_646.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34101-bug_i_646.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34105-bug_i_663.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34105-bug_i_663.cpp
index 2a473bc7..2a473bc7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34105-bug_i_663.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34105-bug_i_663.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34108-bug_i_666.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34108-bug_i_666.cpp
index 212a8656..212a8656 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34108-bug_i_666.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34108-bug_i_666.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34112-bug_i_889.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34112-bug_i_889.cpp
index 5b803a0e..5b803a0e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34112-bug_i_889.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34112-bug_i_889.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34113-bug_902.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34113-bug_902.cpp
index ada480c0..ada480c0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34113-bug_902.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34113-bug_902.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34114-bug_902.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34114-bug_902.cpp
index af6bdb44..af6bdb44 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34114-bug_902.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34114-bug_902.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34115-nl_before_func_body_def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34115-nl_before_func_body_def.cpp
index ff76cb2b..ff76cb2b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34115-nl_before_func_body_def.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34115-nl_before_func_body_def.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34116-issue_2000.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34116-issue_2000.cpp
index f4f2c2bf..f4f2c2bf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34116-issue_2000.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34116-issue_2000.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34117-extern_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34117-extern_func.cpp
index 4de29e3c..4de29e3c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34117-extern_func.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34117-extern_func.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34118-Issue_2163.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34118-Issue_2163.cpp
index afd04eb0..afd04eb0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34118-Issue_2163.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34118-Issue_2163.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34120-bug_i_999.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34120-bug_i_999.cpp
index 2a5d64a4..2a5d64a4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34120-bug_i_999.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34120-bug_i_999.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34121-bug_1717.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34121-bug_1717.cpp
index 4116871f..4116871f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34121-bug_1717.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34121-bug_1717.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34122-Issue_2440.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34122-Issue_2440.cpp
index c52c30da..c52c30da 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34122-Issue_2440.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34122-Issue_2440.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34123-Issue_2440_nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34123-Issue_2440_nl.cpp
index c52c30da..c52c30da 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34123-Issue_2440_nl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34123-Issue_2440_nl.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34130-bug_i_1000.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34130-bug_i_1000.cpp
index 6e1e7a0e..6e1e7a0e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34130-bug_i_1000.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34130-bug_i_1000.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34131-bug_i_1000.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34131-bug_i_1000.cpp
index 149353e7..149353e7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34131-bug_i_1000.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34131-bug_i_1000.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34132-new_op.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34132-new_op.cpp
index 15386247..15386247 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34132-new_op.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34132-new_op.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34133-new_op.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34133-new_op.cpp
index ce690c94..ce690c94 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34133-new_op.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34133-new_op.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34134-new_op.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34134-new_op.cpp
index 67dfa187..67dfa187 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34134-new_op.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34134-new_op.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34135-new_op.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34135-new_op.cpp
index 044cd859..044cd859 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34135-new_op.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34135-new_op.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34136-sp_balance_nested_parens.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34136-sp_balance_nested_parens.cpp
index 0a6635d0..0a6635d0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34136-sp_balance_nested_parens.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34136-sp_balance_nested_parens.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34140-bug_1027.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34140-bug_1027.cpp
index 5ccafd2b..5ccafd2b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34140-bug_1027.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34140-bug_1027.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34141-bug_1005.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34141-bug_1005.cpp
index 01a457d0..01a457d0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34141-bug_1005.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34141-bug_1005.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34142-I1112-1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34142-I1112-1.cpp
index df27d1d6..df27d1d6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34142-I1112-1.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34142-I1112-1.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34143-I1112-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34143-I1112-2.cpp
index 28a4489d..28a4489d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34143-I1112-2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34143-I1112-2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34144-I1112-3.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34144-I1112-3.cpp
index c95a6c40..c95a6c40 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34144-I1112-3.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34144-I1112-3.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34145-i683.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34145-i683.cpp
index 255c6336..255c6336 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34145-i683.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34145-i683.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34146-bug_1002.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34146-bug_1002.cpp
index 0d72c80a..0d72c80a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34146-bug_1002.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34146-bug_1002.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34147-bug_1002.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34147-bug_1002.cpp
index 02b85396..02b85396 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34147-bug_1002.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34147-bug_1002.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34148-bug_1139.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34148-bug_1139.cpp
index d6d8a484..d6d8a484 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34148-bug_1139.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34148-bug_1139.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34149-bug_1139.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34149-bug_1139.cpp
index dd0a10dc..dd0a10dc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34149-bug_1139.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34149-bug_1139.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34150-bug_1032.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34150-bug_1032.cpp
index 80078efe..80078efe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34150-bug_1032.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34150-bug_1032.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34151-bug_666.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34151-bug_666.cpp
index 212a8656..212a8656 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34151-bug_666.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34151-bug_666.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34152-bug_1068.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34152-bug_1068.cpp
index 74fbc8e7..74fbc8e7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34152-bug_1068.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34152-bug_1068.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34153-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34153-type_brace_init_lst.cpp
index 356a7713..356a7713 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34153-type_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34153-type_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34154-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34154-type_brace_init_lst.cpp
index adc09173..adc09173 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34154-type_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34154-type_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34155-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34155-type_brace_init_lst.cpp
index 7d62eafb..7d62eafb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34155-type_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34155-type_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34156-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34156-type_brace_init_lst.cpp
index 6519b4b1..6519b4b1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34156-type_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34156-type_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34157-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34157-type_brace_init_lst.cpp
index 6751c0fa..6751c0fa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34157-type_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34157-type_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34158-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34158-type_brace_init_lst.cpp
index d5dcfdeb..d5dcfdeb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34158-type_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34158-type_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34159-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34159-type_brace_init_lst.cpp
index 0b9bf31c..0b9bf31c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34159-type_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34159-type_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34160-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34160-type_brace_init_lst.cpp
index 01c89132..01c89132 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34160-type_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34160-type_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34161-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34161-type_brace_init_lst.cpp
index cc79678f..cc79678f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34161-type_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34161-type_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34162-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34162-type_brace_init_lst.cpp
index 2d5dc62c..2d5dc62c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34162-type_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34162-type_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34163-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34163-type_brace_init_lst.cpp
index 9be7507a..9be7507a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34163-type_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34163-type_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34164-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34164-type_brace_init_lst.cpp
index 68565614..68565614 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34164-type_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34164-type_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34165-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34165-type_brace_init_lst.cpp
index 92fc0b0b..92fc0b0b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34165-type_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34165-type_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34166-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34166-type_brace_init_lst.cpp
index d7dfa908..d7dfa908 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34166-type_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34166-type_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34168-Issue_2910.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34168-Issue_2910.cpp
index 82c2bec9..82c2bec9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34168-Issue_2910.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34168-Issue_2910.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34169-init-list-call.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34169-init-list-call.cpp
index 95449eb1..95449eb1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34169-init-list-call.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34169-init-list-call.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34170-i1082.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34170-i1082.cpp
index 06680c0e..06680c0e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34170-i1082.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34170-i1082.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34171-i1181.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34171-i1181.cpp
index 1a959d34..1a959d34 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34171-i1181.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34171-i1181.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34172-i1165.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34172-i1165.cpp
index c3123b59..c3123b59 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34172-i1165.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.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.75.0/tests/expected/cpp/34173-i1464.cpp
new file mode 100644
index 00000000..179ecd5e
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34173-i1464.cpp
@@ -0,0 +1,3 @@
+auto p = std::make_pair(r * cos(a), r * sin(a));
+
+auto p2 = std::make_pari(r * 0x0000'1111, 0x0000'1111 * r);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34174-i1466.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34174-i1466.cpp
new file mode 100644
index 00000000..fe704d2a
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34174-i1466.cpp
@@ -0,0 +1,6 @@
+A a = {this->r * cos(b)};

+

+B b1 = {0x0000'1111 * this->r};

+B b3 = {this->r * 0x0000'1111};

+B b2 = {0x0000'1111 * value};

+B b4 = {value * 0x0000'1111};

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34175-i1509.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34175-i1509.cpp
index 419807fd..419807fd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34175-i1509.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34175-i1509.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34176-i1509_bug_1112_correction.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34176-i1509_bug_1112_correction.cpp
index b9a75cf6..b9a75cf6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34176-i1509_bug_1112_correction.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34176-i1509_bug_1112_correction.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34177-sp_func_call_paren.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34177-sp_func_call_paren.cpp
index 580e9bae..580e9bae 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34177-sp_func_call_paren.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34177-sp_func_call_paren.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34178-Issue_3237.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34178-Issue_3237.cpp
index 23b565a9..23b565a9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34178-Issue_3237.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.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.75.0/tests/expected/cpp/34179-arith_vs_byref.cpp
new file mode 100644
index 00000000..f459fdcc
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34179-arith_vs_byref.cpp
@@ -0,0 +1,10 @@
+A a = {this->r & cos(b)};

+

+B b1 = {0x0000'1111 & this->r};

+B b2 = {this->r & 0x0000'1111};

+B b3 = {0x0000'1111 & value};

+B b4 = {value & 0x0000'1111};

+

+auto p = std::make_pair(r & cos(a), r & sin(a));

+

+auto p2 = std::make_pair(r & 0x0000'1111, 0x0000'1111 & r);

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34180-bug_1402.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34180-bug_1402.cpp
index 09714c41..09714c41 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34180-bug_1402.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34180-bug_1402.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34190-bug_1003.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34190-bug_1003.cpp
index 7495b93d..7495b93d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34190-bug_1003.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34190-bug_1003.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34191-comment-align-multiline.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34191-comment-align-multiline.cpp
index db501481..db501481 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34191-comment-align-multiline.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34191-comment-align-multiline.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34192-i1207.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34192-i1207.cpp
index e02da8c9..e02da8c9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34192-i1207.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34192-i1207.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34193-i1218.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34193-i1218.cpp
index d4d05106..d4d05106 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34193-i1218.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34193-i1218.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34194-sp_arith_additive.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34194-sp_arith_additive.cpp
index 5ecb2ec8..5ecb2ec8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34194-sp_arith_additive.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34194-sp_arith_additive.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34195-sp_arith_additive.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34195-sp_arith_additive.cpp
index f419a3ed..f419a3ed 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34195-sp_arith_additive.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34195-sp_arith_additive.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34196-Issue_1460.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34196-Issue_1460.h
index 63787999..63787999 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34196-Issue_1460.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34196-Issue_1460.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34197-bug_1161.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34197-bug_1161.cpp
index 34740f5a..34740f5a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34197-bug_1161.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34197-bug_1161.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34198-bug_1249.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34198-bug_1249.cpp
index 65637efe..65637efe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34198-bug_1249.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34198-bug_1249.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34199-not_lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34199-not_lambda.cpp
index a9c65439..a9c65439 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34199-not_lambda.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34199-not_lambda.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34200-i1536.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34200-i1536.cpp
index 0eb7fc69..0eb7fc69 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34200-i1536.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34200-i1536.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34201-i1565.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34201-i1565.cpp
index d0bef508..d0bef508 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34201-i1565.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34201-i1565.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34202-i1617.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34202-i1617.cpp
index 98ede13b..98ede13b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34202-i1617.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34202-i1617.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34203-i1516.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34203-i1516.cpp
index d0612a2b..d0612a2b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34203-i1516.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34203-i1516.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34204-func_param_indent_leading_comma.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34204-func_param_indent_leading_comma.cpp
index e8790dbd..e8790dbd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34204-func_param_indent_leading_comma.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34204-func_param_indent_leading_comma.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34205-bug_1395.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34205-bug_1395.cpp
index 16e2fbba..16e2fbba 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34205-bug_1395.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34205-bug_1395.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34206-for_loop_head.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34206-for_loop_head.cpp
index 6cea550d..6cea550d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34206-for_loop_head.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34206-for_loop_head.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34207-for_loop_head.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34207-for_loop_head.cpp
index 2aa9bdc0..2aa9bdc0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34207-for_loop_head.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34207-for_loop_head.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34208-conversion_operator.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34208-conversion_operator.cpp
index 27b52dac..27b52dac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34208-conversion_operator.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34208-conversion_operator.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34209-lambda_selfcalling.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34209-lambda_selfcalling.cpp
index 8f0c819e..8f0c819e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34209-lambda_selfcalling.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34209-lambda_selfcalling.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34210-override_virtual.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34210-override_virtual.cpp
index 537454b1..537454b1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34210-override_virtual.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34210-override_virtual.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34211-anonymous_enum.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34211-anonymous_enum.cpp
index ef237a6e..ef237a6e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34211-anonymous_enum.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34211-anonymous_enum.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34250-bug_1607.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34250-bug_1607.cpp
index 9e4e47d3..9e4e47d3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34250-bug_1607.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34250-bug_1607.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34251-bug_1649.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34251-bug_1649.cpp
index 4b352c79..4b352c79 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34251-bug_1649.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34251-bug_1649.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34252-issue_2001.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34252-issue_2001.cpp
index 39b9446d..39b9446d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34252-issue_2001.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34252-issue_2001.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34253-friends.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34253-friends.cpp
index 58fd649a..58fd649a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34253-friends.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34253-friends.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34254-issue_1985.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34254-issue_1985.cpp
index ef9fc90a..ef9fc90a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34254-issue_1985.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34254-issue_1985.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34255-eat_blanks_after_codewidth.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34255-eat_blanks_after_codewidth.cpp
index 7005d86c..7005d86c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34255-eat_blanks_after_codewidth.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34255-eat_blanks_after_codewidth.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34256-Issue_2836.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34256-Issue_2836.cpp
index 4d2a648f..4d2a648f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34256-Issue_2836.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34256-Issue_2836.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34280-UNI-29935.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34280-UNI-29935.cpp
index 28d0b66d..28d0b66d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34280-UNI-29935.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34280-UNI-29935.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34290-brace_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34290-brace_brace_init_lst.cpp
index 19c4b962..19c4b962 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34290-brace_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34290-brace_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34291-brace_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34291-brace_brace_init_lst.cpp
index aed91c1b..aed91c1b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34291-brace_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34291-brace_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34292-brace_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34292-brace_brace_init_lst.cpp
index cc0ac847..cc0ac847 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34292-brace_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34292-brace_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34293-brace_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34293-brace_brace_init_lst.cpp
index c47119ab..c47119ab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34293-brace_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34293-brace_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34294-brace_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34294-brace_brace_init_lst.cpp
index afe3a0ec..afe3a0ec 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34294-brace_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34294-brace_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34295-brace_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34295-brace_brace_init_lst.cpp
index 9b8ea3c5..9b8ea3c5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34295-brace_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34295-brace_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34296-i1768.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34296-i1768.cpp
index 94327d9c..94327d9c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34296-i1768.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34296-i1768.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34297-align-assign-mixed.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34297-align-assign-mixed.cpp
index d8082600..d8082600 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34297-align-assign-mixed.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34297-align-assign-mixed.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34298-align-assign-mixed.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34298-align-assign-mixed.cpp
index 4f8dadde..4f8dadde 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34298-align-assign-mixed.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34298-align-assign-mixed.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34299-align-assign-mixed.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34299-align-assign-mixed.cpp
index ddae789b..ddae789b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34299-align-assign-mixed.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34299-align-assign-mixed.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34300-bug_1236.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34300-bug_1236.cpp
index 8acaaed2..8acaaed2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34300-bug_1236.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34300-bug_1236.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34301-nl_fdef_brace_cond-f.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34301-nl_fdef_brace_cond-f.cpp
index 05aaf7c8..05aaf7c8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34301-nl_fdef_brace_cond-f.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34301-nl_fdef_brace_cond-f.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34302-nl_fdef_brace_cond-r.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34302-nl_fdef_brace_cond-r.cpp
index 8a35c775..8a35c775 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34302-nl_fdef_brace_cond-r.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34302-nl_fdef_brace_cond-r.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34303-nl_fdef_brace_cond-fr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34303-nl_fdef_brace_cond-fr.cpp
index e498a669..e498a669 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34303-nl_fdef_brace_cond-fr.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34303-nl_fdef_brace_cond-fr.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34304-nl_fdef_brace_cond-rf.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34304-nl_fdef_brace_cond-rf.cpp
index 078e070a..078e070a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34304-nl_fdef_brace_cond-rf.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34304-nl_fdef_brace_cond-rf.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34305-issue_2124-1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34305-issue_2124-1.cpp
index bad0ea55..bad0ea55 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34305-issue_2124-1.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34305-issue_2124-1.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34306-issue_2124-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34306-issue_2124-2.cpp
index bad0ea55..bad0ea55 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34306-issue_2124-2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34306-issue_2124-2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34307-2203.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34307-2203.cpp
index 70a1f31a..70a1f31a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34307-2203.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34307-2203.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34308-enum_comment_wrap.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34308-enum_comment_wrap.cpp
index 736e6718..736e6718 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34308-enum_comment_wrap.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34308-enum_comment_wrap.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34309-issue_2209-1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34309-issue_2209-1.cpp
index 82ff67c6..82ff67c6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34309-issue_2209-1.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34309-issue_2209-1.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34310-issue_2209-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34310-issue_2209-2.cpp
index 26c579d3..26c579d3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34310-issue_2209-2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34310-issue_2209-2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34311-Issue_2250.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34311-Issue_2250.cpp
index 9268c2e3..9268c2e3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34311-Issue_2250.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34311-Issue_2250.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34312-Issue_2101.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34312-Issue_2101.cpp
index 3e07c686..3e07c686 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34312-Issue_2101.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34312-Issue_2101.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34313-Issue_2437.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34313-Issue_2437.cpp
index 77a273ef..77a273ef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34313-Issue_2437.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34313-Issue_2437.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34314-Issue_2604.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34314-Issue_2604.cpp
index eb87fc8a..eb87fc8a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34314-Issue_2604.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34314-Issue_2604.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34315-align_func_proto_thresh.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34315-align_func_proto_thresh.cpp
index c4f1a119..c4f1a119 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34315-align_func_proto_thresh.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34315-align_func_proto_thresh.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34316-align_func_proto_thresh.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34316-align_func_proto_thresh.cpp
index 1bbde49b..1bbde49b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34316-align_func_proto_thresh.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34316-align_func_proto_thresh.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34317-align_func_proto_thresh.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34317-align_func_proto_thresh.cpp
index e0d3488a..e0d3488a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34317-align_func_proto_thresh.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34317-align_func_proto_thresh.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34318-align_assign_func_proto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34318-align_assign_func_proto.cpp
index 1c003058..1c003058 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34318-align_assign_func_proto.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34318-align_assign_func_proto.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34319-align_func_proto_thresh2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34319-align_func_proto_thresh2.cpp
index 8a9df8b4..8a9df8b4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34319-align_func_proto_thresh2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34319-align_func_proto_thresh2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34320-align_func_proto_thresh2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34320-align_func_proto_thresh2.cpp
index 432a9e3e..432a9e3e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34320-align_func_proto_thresh2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34320-align_func_proto_thresh2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34321-bug_2285.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34321-bug_2285.cpp
index a456e9be..a456e9be 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34321-bug_2285.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34321-bug_2285.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34322-issue_2623.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34322-issue_2623.cpp
index a9566447..a9566447 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34322-issue_2623.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34322-issue_2623.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34323-issue_2623.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34323-issue_2623.cpp
index 72fd90e8..72fd90e8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34323-issue_2623.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34323-issue_2623.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34324-issue_2623.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34324-issue_2623.cpp
index 61961fa1..61961fa1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34324-issue_2623.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34324-issue_2623.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34325-Issue_3025.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34325-Issue_3025.cpp
index 9e64526e..9e64526e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34325-Issue_3025.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34325-Issue_3025.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34326-Issue_3040.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34326-Issue_3040.cpp
index f9e69333..f9e69333 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34326-Issue_3040.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34326-Issue_3040.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34327-Issue_3044.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34327-Issue_3044.cpp
index 799fd0a1..799fd0a1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34327-Issue_3044.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34327-Issue_3044.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34328-Issue_3048.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34328-Issue_3048.cpp
index fb6b0d38..fb6b0d38 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34328-Issue_3048.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34328-Issue_3048.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34330-Issue_3061_0nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34330-Issue_3061_0nl.cpp
index d46f2655..d46f2655 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34330-Issue_3061_0nl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34330-Issue_3061_0nl.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34331-Issue_3061_1nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34331-Issue_3061_1nl.cpp
index d46f2655..d46f2655 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34331-Issue_3061_1nl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34331-Issue_3061_1nl.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34332-Issue_3061_2nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34332-Issue_3061_2nl.cpp
index d46f2655..d46f2655 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34332-Issue_3061_2nl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34332-Issue_3061_2nl.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34333-Issue_3061_0nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34333-Issue_3061_0nl.cpp
index ef73253e..ef73253e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34333-Issue_3061_0nl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34333-Issue_3061_0nl.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34334-Issue_3061_1nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34334-Issue_3061_1nl.cpp
index ef73253e..ef73253e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34334-Issue_3061_1nl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34334-Issue_3061_1nl.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34335-Issue_3061_2nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34335-Issue_3061_2nl.cpp
index ef73253e..ef73253e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34335-Issue_3061_2nl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34335-Issue_3061_2nl.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34336-Issue_3061_0nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34336-Issue_3061_0nl.cpp
index c228ce46..c228ce46 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34336-Issue_3061_0nl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34336-Issue_3061_0nl.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34337-Issue_3061_1nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34337-Issue_3061_1nl.cpp
index c228ce46..c228ce46 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34337-Issue_3061_1nl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34337-Issue_3061_1nl.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34338-Issue_3061_2nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34338-Issue_3061_2nl.cpp
index c228ce46..c228ce46 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34338-Issue_3061_2nl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34338-Issue_3061_2nl.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34339-Issue_3061_0nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34339-Issue_3061_0nl.cpp
index 7188f0d0..7188f0d0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34339-Issue_3061_0nl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34339-Issue_3061_0nl.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34340-Issue_3061_1nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34340-Issue_3061_1nl.cpp
index 7188f0d0..7188f0d0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34340-Issue_3061_1nl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34340-Issue_3061_1nl.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34341-Issue_3061_2nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34341-Issue_3061_2nl.cpp
index 7188f0d0..7188f0d0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34341-Issue_3061_2nl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34341-Issue_3061_2nl.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34350-indent_comma_brace_glob.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34350-indent_comma_brace_glob.cpp
index 0e475aa4..0e475aa4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34350-indent_comma_brace_glob.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34350-indent_comma_brace_glob.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34351-indent_comma_brace_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34351-indent_comma_brace_func.cpp
index 59b5b996..59b5b996 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34351-indent_comma_brace_func.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34351-indent_comma_brace_func.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34360-nl_before_struct_struct.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34360-nl_before_struct_struct.cpp
index 032a0dfc..032a0dfc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34360-nl_before_struct_struct.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34360-nl_before_struct_struct.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34361-nl_before_struct_scoped_enum.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34361-nl_before_struct_scoped_enum.cpp
index 02ce38f1..02ce38f1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34361-nl_before_struct_scoped_enum.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34361-nl_before_struct_scoped_enum.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34500-sp_before_case_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34500-sp_before_case_colon.cpp
index 54507d64..54507d64 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34500-sp_before_case_colon.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34500-sp_before_case_colon.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34501-sp_endif_cmt.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34501-sp_endif_cmt.cpp
index 9e5b2db8..9e5b2db8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34501-sp_endif_cmt.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34501-sp_endif_cmt.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34502-sp_enum_assign.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34502-sp_enum_assign.cpp
index 62a271a3..62a271a3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34502-sp_enum_assign.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34502-sp_enum_assign.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34503-sp_enum_assign.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34503-sp_enum_assign.cpp
index 2ebab438..2ebab438 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34503-sp_enum_assign.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34503-sp_enum_assign.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34504-issue_574-i.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34504-issue_574-i.cpp
index 3366cc79..3366cc79 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34504-issue_574-i.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34504-issue_574-i.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34505-Issue_3220.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34505-Issue_3220.cpp
index fae042d7..fae042d7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34505-Issue_3220.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34505-Issue_3220.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34506-Issue_3220.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34506-Issue_3220.cpp
index ba42b013..ba42b013 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34506-Issue_3220.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34506-Issue_3220.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34507-Issue_3220.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34507-Issue_3220.cpp
index f9f684b8..f9f684b8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34507-Issue_3220.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34507-Issue_3220.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34508-Issue_3220.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34508-Issue_3220.cpp
index aba03416..aba03416 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34508-Issue_3220.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34508-Issue_3220.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34509-byref-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34509-byref-2.cpp
index ab1b3a6e..ab1b3a6e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34509-byref-2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34509-byref-2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34510-byref-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34510-byref-2.cpp
index 0ef61cde..0ef61cde 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34510-byref-2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34510-byref-2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34511-byref-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34511-byref-2.cpp
index db510335..db510335 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34511-byref-2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34511-byref-2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34512-byref-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34512-byref-2.cpp
index 099e3c2b..099e3c2b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34512-byref-2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34512-byref-2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34513-sp_cond_question.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34513-sp_cond_question.cpp
index 5f5a9e14..5f5a9e14 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34513-sp_cond_question.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34513-sp_cond_question.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34514-sp_cond_question.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34514-sp_cond_question.cpp
index cec6c827..cec6c827 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34514-sp_cond_question.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34514-sp_cond_question.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34515-sp_cond_question.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34515-sp_cond_question.cpp
index 39997b4a..39997b4a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34515-sp_cond_question.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34515-sp_cond_question.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34516-sp_cond_question.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34516-sp_cond_question.cpp
index c7d79ab9..c7d79ab9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34516-sp_cond_question.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34516-sp_cond_question.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34517-semi.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34517-semi.cpp
index 6c42948f..6c42948f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34517-semi.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34517-semi.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34518-semi.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34518-semi.cpp
index 7c8a711e..7c8a711e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34518-semi.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34518-semi.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34519-semi.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34519-semi.cpp
index 56af135e..56af135e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34519-semi.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34519-semi.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34520-comma.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34520-comma.cpp
index e9b0c428..e9b0c428 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34520-comma.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34520-comma.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34521-comma.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34521-comma.cpp
index e101145a..e101145a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34521-comma.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34521-comma.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34522-comma.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34522-comma.cpp
index bc8ebd4f..bc8ebd4f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34522-comma.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34522-comma.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34523-gcc_case_ellipsis.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34523-gcc_case_ellipsis.cpp
index 1b0b4088..1b0b4088 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34523-gcc_case_ellipsis.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34523-gcc_case_ellipsis.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34524-bug_1002.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34524-bug_1002.cpp
index 713018e4..713018e4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34524-bug_1002.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34524-bug_1002.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34525-sp_paren_brace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34525-sp_paren_brace.cpp
index febfb72d..febfb72d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34525-sp_paren_brace.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34525-sp_paren_brace.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34526-sp_paren_brace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34526-sp_paren_brace.cpp
index 4ac73f87..4ac73f87 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34526-sp_paren_brace.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34526-sp_paren_brace.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34527-sp_paren_brace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34527-sp_paren_brace.cpp
index aa65f644..aa65f644 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34527-sp_paren_brace.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34527-sp_paren_brace.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34528-cmt_trailing_single_line_c_to_cpp.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34528-cmt_trailing_single_line_c_to_cpp.cpp
index 946409b2..946409b2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34528-cmt_trailing_single_line_c_to_cpp.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34528-cmt_trailing_single_line_c_to_cpp.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34529-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34529-type_brace_init_lst.cpp
index cc79678f..cc79678f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34529-type_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34529-type_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34530-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34530-type_brace_init_lst.cpp
index b99238b8..b99238b8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34530-type_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34530-type_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34531-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34531-type_brace_init_lst.cpp
index cc79678f..cc79678f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34531-type_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34531-type_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34532-type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34532-type_brace_init_lst.cpp
index 53e74de2..53e74de2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34532-type_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34532-type_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34533-templates.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34533-templates.cpp
index 5f3d6f90..5f3d6f90 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34533-templates.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34533-templates.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34534-templates.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34534-templates.cpp
index 9e3f463d..9e3f463d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34534-templates.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34534-templates.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34535-sp_after_angle.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34535-sp_after_angle.cpp
index 18788919..18788919 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34535-sp_after_angle.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34535-sp_after_angle.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34536-sp_after_angle.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34536-sp_after_angle.cpp
index 8764578e..8764578e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/34536-sp_after_angle.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.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.75.0/tests/expected/cpp/34540-byref-4.cpp
new file mode 100644
index 00000000..0fe49c7b
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34540-byref-4.cpp
@@ -0,0 +1,5 @@
+int&(*fn)(int, struct sockaddr&);
+int& (*fn)(int, struct sockaddr&);
+int &(*fn)(int, struct sockaddr&);
+int & (*fn)(int, struct sockaddr&);
+int &  (*fn)(int, struct sockaddr&);
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.75.0/tests/expected/cpp/34541-byref-4.cpp
new file mode 100644
index 00000000..779da86b
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34541-byref-4.cpp
@@ -0,0 +1,5 @@
+int& (*fn)(int, struct sockaddr&);
+int& (*fn)(int, struct sockaddr&);
+int & (*fn)(int, struct sockaddr&);
+int & (*fn)(int, struct sockaddr&);
+int &  (*fn)(int, struct sockaddr&);
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.75.0/tests/expected/cpp/34542-byref-4.cpp
new file mode 100644
index 00000000..16a7ba9b
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34542-byref-4.cpp
@@ -0,0 +1,5 @@
+int&(*fn)(int, struct sockaddr&);
+int&(*fn)(int, struct sockaddr&);
+int &(*fn)(int, struct sockaddr&);
+int &(*fn)(int, struct sockaddr&);
+int &(*fn)(int, struct sockaddr&);
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.75.0/tests/expected/cpp/34543-byref-4.cpp
new file mode 100644
index 00000000..6bd2e9be
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/34543-byref-4.cpp
@@ -0,0 +1,5 @@
+int& (*fn)(int, struct sockaddr&);
+int& (*fn)(int, struct sockaddr&);
+int & (*fn)(int, struct sockaddr&);
+int & (*fn)(int, struct sockaddr&);
+int & (*fn)(int, struct sockaddr&);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/39000-UNI-64325.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/39000-UNI-64325.cpp
index c4005d7c..c4005d7c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/39000-UNI-64325.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/39000-UNI-64325.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60001-UNI-2650.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60001-UNI-2650.cpp
index b9ced773..b9ced773 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60001-UNI-2650.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60001-UNI-2650.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60002-UNI-16283.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60002-UNI-16283.cpp
index 7f042642..7f042642 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60002-UNI-16283.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60002-UNI-16283.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60003-UNI-1288.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60003-UNI-1288.cpp
index aece270a..aece270a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60003-UNI-1288.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60003-UNI-1288.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60006-UNI-2049.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60006-UNI-2049.cpp
index 7e47d927..7e47d927 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60006-UNI-2049.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60006-UNI-2049.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60017-UNI-2683.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60017-UNI-2683.cpp
index 734e3999..734e3999 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60017-UNI-2683.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60017-UNI-2683.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60022-UNI-18439.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60022-UNI-18439.cpp
index 8d467c67..8d467c67 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60022-UNI-18439.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60022-UNI-18439.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60025-UNI-19894.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60025-UNI-19894.cpp
index 2d7e481e..2d7e481e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60025-UNI-19894.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60025-UNI-19894.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60027-UNI-21506.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60027-UNI-21506.cpp
index a8c5f2df..a8c5f2df 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60027-UNI-21506.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60027-UNI-21506.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60028-UNI-21509.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60028-UNI-21509.cpp
index bde48ee7..bde48ee7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60028-UNI-21509.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60028-UNI-21509.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60029-UNI-21510.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60029-UNI-21510.cpp
index ea406fbe..ea406fbe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60029-UNI-21510.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60029-UNI-21510.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60030-UNI-21727.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60030-UNI-21727.cpp
index 991d2631..991d2631 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60030-UNI-21727.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60030-UNI-21727.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60031-UNI-21728.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60031-UNI-21728.cpp
index 658fba68..658fba68 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60031-UNI-21728.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60031-UNI-21728.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60032-UNI-21729.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60032-UNI-21729.cpp
index 4b8d1d59..4b8d1d59 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60032-UNI-21729.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60032-UNI-21729.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60036-UNI-2680.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60036-UNI-2680.cpp
index b6aa5bd7..b6aa5bd7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60036-UNI-2680.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60036-UNI-2680.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60038-UNI-30088.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60038-UNI-30088.cpp
index 1fd5c1fe..1fd5c1fe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60038-UNI-30088.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60038-UNI-30088.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60039-UNI-30628.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60039-UNI-30628.cpp
index ffa60026..ffa60026 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60039-UNI-30628.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60039-UNI-30628.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60042-UNI-18777.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60042-UNI-18777.cpp
index 0f177fdc..0f177fdc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60042-UNI-18777.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60042-UNI-18777.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60043-i2033.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60043-i2033.cpp
index fd27cf6d..fd27cf6d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60043-i2033.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60043-i2033.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60044-i2116.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60044-i2116.cpp
index af664cd9..af664cd9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60044-i2116.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60044-i2116.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60045-align_asterisk_after_type_cast.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60045-align_asterisk_after_type_cast.cpp
index 364b2a6b..364b2a6b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60045-align_asterisk_after_type_cast.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60045-align_asterisk_after_type_cast.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60046-align_continuation_left_shift.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60046-align_continuation_left_shift.cpp
index c0c066b8..c0c066b8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60046-align_continuation_left_shift.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60046-align_continuation_left_shift.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60047-align_default_after_override.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60047-align_default_after_override.cpp
index 43db090f..43db090f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60047-align_default_after_override.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60047-align_default_after_override.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60048-bug_2322.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60048-bug_2322.cpp
index 50454903..50454903 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60048-bug_2322.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60048-bug_2322.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60049-bug_2402.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60049-bug_2402.cpp
index e483fdc9..e483fdc9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60049-bug_2402.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60049-bug_2402.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60051-bug_2371.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60051-bug_2371.cpp
index f17cec62..f17cec62 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60051-bug_2371.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60051-bug_2371.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60052-bug_2433_1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60052-bug_2433_1.cpp
index d011d5a1..d011d5a1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60052-bug_2433_1.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60052-bug_2433_1.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60053-bug_2433_2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60053-bug_2433_2.cpp
index 600efc82..600efc82 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60053-bug_2433_2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60053-bug_2433_2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60054-interface-keyword-in-cpp.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60054-interface-keyword-in-cpp.cpp
index ed92e698..ed92e698 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60054-interface-keyword-in-cpp.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60054-interface-keyword-in-cpp.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60055-issue_3116.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60055-issue_3116.cpp
index 44ec3a5f..44ec3a5f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60055-issue_3116.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60055-issue_3116.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60056-issue_3116-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60056-issue_3116-2.cpp
index dded453c..dded453c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60056-issue_3116-2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60056-issue_3116-2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60057-issue_3116.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60057-issue_3116.cpp
index 991c46bd..991c46bd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60057-issue_3116.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60057-issue_3116.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60058-issue_3330.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60058-issue_3330.cpp
index 37062480..37062480 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60058-issue_3330.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60058-issue_3330.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60059-indent_ctor_init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60059-indent_ctor_init.cpp
index f1b32d0e..f1b32d0e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60059-indent_ctor_init.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60059-indent_ctor_init.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60060-returns.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60060-returns.cpp
index 21013963..21013963 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60060-returns.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60060-returns.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60061-returns.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60061-returns.cpp
index bd199ba8..bd199ba8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60061-returns.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60061-returns.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60062-returns.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60062-returns.cpp
index 1085bd72..1085bd72 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60062-returns.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60062-returns.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60063-returns.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60063-returns.cpp
index bd199ba8..bd199ba8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60063-returns.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60063-returns.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60064-issue_3368.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60064-issue_3368.cpp
index 2158086c..2158086c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60064-issue_3368.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60064-issue_3368.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60065-issue_3378.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60065-issue_3378.cpp
index 8da9261d..8da9261d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cpp/60065-issue_3378.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.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.75.0/tests/expected/cpp/60066-Issue_3409.cpp
new file mode 100644
index 00000000..969275dc
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60066-Issue_3409.cpp
@@ -0,0 +1,8 @@
+namespace ns1 {

+namespace ns2 {

+const auto lamb = []() -> int

+{

+    return 42;

+};

+}

+}

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.75.0/tests/expected/cpp/60067-Issue_3283.cpp
new file mode 100644
index 00000000..9357b3b3
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60067-Issue_3283.cpp
@@ -0,0 +1,3 @@
+#define MACRO(a) if(!x) x=a;
+#define MACRO(a) {if(!x) {x=a;}}
+#define MACRO(a) {if(!x) x=a;}
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.75.0/tests/expected/cpp/60068-Issue_3428.cpp
new file mode 100644
index 00000000..bf1dc20b
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60068-Issue_3428.cpp
@@ -0,0 +1,57 @@
+void main()

+{

+    if(aaaa)

+    {

+        it = std::find_if(

+            bbbb.begin(),

+            bbbb.end(),

+            [&cccc](const auto& dddd)

+            {

+                return (eeee.ffff == iiii && !jjjj.kkkk);

+            }

+        );

+    }

+}

+

+namespace ns1 {

+

+void one()

+{

+    if(aaaa)

+    {

+        it = std::find_if(

+            bbbb.begin(),

+            bbbb.end(),

+            [&cccc](const auto& dddd)

+            {

+                return (eeee.ffff == iiii && !jjjj.kkkk);

+            }

+        );

+    }

+}

+

+namespace ns2 {

+namespace ns3 {

+const auto lamb = []() -> int

+{

+    return 42;

+};

+

+void two()

+{

+    if(aaaa)

+    {

+        it = std::find_if(

+            bbbb.begin(),

+            bbbb.end(),

+            [&cccc](const auto& dddd)

+            {

+                return (eeee.ffff == iiii && !jjjj.kkkk);

+            }

+        );

+    }

+}

+

+}

+}

+}

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.75.0/tests/expected/cpp/60069-Issue_3428.cpp
new file mode 100644
index 00000000..9b95f451
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60069-Issue_3428.cpp
@@ -0,0 +1,57 @@
+void main()

+{

+    if(aaaa)

+    {

+        it = std::find_if(

+            bbbb.begin(),

+            bbbb.end(),

+            [&cccc](const auto& dddd)

+            {

+                return (eeee.ffff == iiii && !jjjj.kkkk);

+            }

+        );

+    }

+}

+

+namespace ns1 {

+

+    void one()

+    {

+        if(aaaa)

+        {

+            it = std::find_if(

+                bbbb.begin(),

+                bbbb.end(),

+                [&cccc](const auto& dddd)

+                {

+                    return (eeee.ffff == iiii && !jjjj.kkkk);

+                }

+            );

+        }

+    }

+

+    namespace ns2 {

+        namespace ns3 {

+            const auto lamb = []() -> int

+            {

+                return 42;

+            };

+

+            void two()

+            {

+                if(aaaa)

+                {

+                    it = std::find_if(

+                        bbbb.begin(),

+                        bbbb.end(),

+                        [&cccc](const auto& dddd)

+                        {

+                            return (eeee.ffff == iiii && !jjjj.kkkk);

+                        }

+                    );

+                }

+            }

+

+        }

+    }

+}

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.75.0/tests/expected/cpp/60070-Issue_3428.cpp
new file mode 100644
index 00000000..fbd35533
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60070-Issue_3428.cpp
@@ -0,0 +1,57 @@
+void main()

+{

+    if(aaaa)

+    {

+        it = std::find_if(

+            bbbb.begin(),

+            bbbb.end(),

+            [&cccc](const auto& dddd)

+            {

+                return (eeee.ffff == iiii && !jjjj.kkkk);

+            }

+        );

+    }

+}

+

+namespace ns1 {

+

+    void one()

+    {

+        if(aaaa)

+        {

+            it = std::find_if(

+                bbbb.begin(),

+                bbbb.end(),

+                [&cccc](const auto& dddd)

+                {

+                    return (eeee.ffff == iiii && !jjjj.kkkk);

+                }

+            );

+        }

+    }

+

+namespace ns2 {

+namespace ns3 {

+    const auto lamb = []() -> int

+    {

+        return 42;

+    };

+

+    void two()

+    {

+        if(aaaa)

+        {

+            it = std::find_if(

+                bbbb.begin(),

+                bbbb.end(),

+                [&cccc](const auto& dddd)

+                {

+                    return (eeee.ffff == iiii && !jjjj.kkkk);

+                }

+            );

+        }

+    }

+

+}

+}

+}

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.75.0/tests/expected/cpp/60071-Issue_3428.cpp
new file mode 100644
index 00000000..bf1dc20b
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60071-Issue_3428.cpp
@@ -0,0 +1,57 @@
+void main()

+{

+    if(aaaa)

+    {

+        it = std::find_if(

+            bbbb.begin(),

+            bbbb.end(),

+            [&cccc](const auto& dddd)

+            {

+                return (eeee.ffff == iiii && !jjjj.kkkk);

+            }

+        );

+    }

+}

+

+namespace ns1 {

+

+void one()

+{

+    if(aaaa)

+    {

+        it = std::find_if(

+            bbbb.begin(),

+            bbbb.end(),

+            [&cccc](const auto& dddd)

+            {

+                return (eeee.ffff == iiii && !jjjj.kkkk);

+            }

+        );

+    }

+}

+

+namespace ns2 {

+namespace ns3 {

+const auto lamb = []() -> int

+{

+    return 42;

+};

+

+void two()

+{

+    if(aaaa)

+    {

+        it = std::find_if(

+            bbbb.begin(),

+            bbbb.end(),

+            [&cccc](const auto& dddd)

+            {

+                return (eeee.ffff == iiii && !jjjj.kkkk);

+            }

+        );

+    }

+}

+

+}

+}

+}

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.75.0/tests/expected/cpp/60072-Issue_3428.cpp
new file mode 100644
index 00000000..9b95f451
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60072-Issue_3428.cpp
@@ -0,0 +1,57 @@
+void main()

+{

+    if(aaaa)

+    {

+        it = std::find_if(

+            bbbb.begin(),

+            bbbb.end(),

+            [&cccc](const auto& dddd)

+            {

+                return (eeee.ffff == iiii && !jjjj.kkkk);

+            }

+        );

+    }

+}

+

+namespace ns1 {

+

+    void one()

+    {

+        if(aaaa)

+        {

+            it = std::find_if(

+                bbbb.begin(),

+                bbbb.end(),

+                [&cccc](const auto& dddd)

+                {

+                    return (eeee.ffff == iiii && !jjjj.kkkk);

+                }

+            );

+        }

+    }

+

+    namespace ns2 {

+        namespace ns3 {

+            const auto lamb = []() -> int

+            {

+                return 42;

+            };

+

+            void two()

+            {

+                if(aaaa)

+                {

+                    it = std::find_if(

+                        bbbb.begin(),

+                        bbbb.end(),

+                        [&cccc](const auto& dddd)

+                        {

+                            return (eeee.ffff == iiii && !jjjj.kkkk);

+                        }

+                    );

+                }

+            }

+

+        }

+    }

+}

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.75.0/tests/expected/cpp/60073-Issue_3428.cpp
new file mode 100644
index 00000000..fbd35533
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60073-Issue_3428.cpp
@@ -0,0 +1,57 @@
+void main()

+{

+    if(aaaa)

+    {

+        it = std::find_if(

+            bbbb.begin(),

+            bbbb.end(),

+            [&cccc](const auto& dddd)

+            {

+                return (eeee.ffff == iiii && !jjjj.kkkk);

+            }

+        );

+    }

+}

+

+namespace ns1 {

+

+    void one()

+    {

+        if(aaaa)

+        {

+            it = std::find_if(

+                bbbb.begin(),

+                bbbb.end(),

+                [&cccc](const auto& dddd)

+                {

+                    return (eeee.ffff == iiii && !jjjj.kkkk);

+                }

+            );

+        }

+    }

+

+namespace ns2 {

+namespace ns3 {

+    const auto lamb = []() -> int

+    {

+        return 42;

+    };

+

+    void two()

+    {

+        if(aaaa)

+        {

+            it = std::find_if(

+                bbbb.begin(),

+                bbbb.end(),

+                [&cccc](const auto& dddd)

+                {

+                    return (eeee.ffff == iiii && !jjjj.kkkk);

+                }

+            );

+        }

+    }

+

+}

+}

+}

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.75.0/tests/expected/cpp/60074-Issue_3284.cpp
new file mode 100644
index 00000000..cea9091e
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60074-Issue_3284.cpp
@@ -0,0 +1,5 @@
+Node( const Node &rhs ) = delete;
+Node &operator=( const Node &rhs ) = delete;
+
+Node( Node &&rhs ) noexcept = delete;
+Node &operator=( Node &&rhs ) noexcept = delete;
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.75.0/tests/expected/cpp/60075-Issue_3294.cpp
new file mode 100644
index 00000000..4f0718cc
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60075-Issue_3294.cpp
@@ -0,0 +1,17 @@
+#include <vector>
+
+std::vector<int> x;
+
+void f1()
+{
+        int v = x.empty()
+                /**/ ? x.size()
+                /**/ : x.size();
+}
+
+void f2()
+{
+        int v = x.empty()
+         ? x.size()
+         : x.size();
+}
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.75.0/tests/expected/cpp/60076-indent_ctor_init.cpp
new file mode 100644
index 00000000..872961ce
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60076-indent_ctor_init.cpp
@@ -0,0 +1,13 @@
+struct MyClass : public Foo,
+	private Bar {
+	MyClass(int a, int b, int c)
+		: m_a(a), m_b(b),
+		m_c(c) {
+	}
+private:
+	int m_a, m_b, m_c;
+};
+
+struct TheirClass
+: public Foo,
+	private Bar {};
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.75.0/tests/expected/cpp/60077-indent_ctor_init.cpp
new file mode 100644
index 00000000..acf8c268
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60077-indent_ctor_init.cpp
@@ -0,0 +1,13 @@
+struct MyClass : public Foo,
+	private Bar {
+	MyClass(int a, int b, int c)
+	 : m_a(a), m_b(b),
+		m_c(c) {
+	}
+private:
+	int m_a, m_b, m_c;
+};
+
+struct TheirClass
+	: public Foo,
+	private Bar {};
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.75.0/tests/expected/cpp/60078-Issue_3505.cpp
new file mode 100644
index 00000000..f3225f96
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60078-Issue_3505.cpp
@@ -0,0 +1,7 @@
+class Spaceship
+{
+Spaceship(int a,
+          int b);
+void init(int a,
+	int b);
+};
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.75.0/tests/expected/cpp/60079-Issue_3536.cpp
new file mode 100644
index 00000000..83f3e7d6
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60079-Issue_3536.cpp
@@ -0,0 +1,32 @@
+struct S {};
+class C {};
+
+void processStruct0(
+	struct S s,
+	int i
+	);
+
+void processClass0(
+	class C c,
+	int i
+	);
+
+void processStruct1(
+	struct S s,
+	int i
+	);
+
+void processClass1(
+	class C c,
+	int i
+	);
+
+void processStruct2(
+	struct S s,
+	int i
+	);
+
+void processClass2(
+	class C c,
+	int i
+	);
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.75.0/tests/expected/cpp/60080-Issue_3538.cpp
new file mode 100644
index 00000000..bd60ace7
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60080-Issue_3538.cpp
@@ -0,0 +1,13 @@
+class Alpha {};
+
+class Beta
+{
+public:
+Beta(class Alpha alpha) : _alpha(alpha) {
+}
+
+void init();
+
+private:
+class Alpha _alpha;
+};
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.75.0/tests/expected/cpp/60081-Issue_3546.cpp
new file mode 100644
index 00000000..40131205
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60081-Issue_3546.cpp
@@ -0,0 +1,28 @@
+#include <stdio.h>
+
+class
+      alignas(32)
+      Foobar;
+
+int main()
+{
+    typedef
+            int
+            int32;
+    int foo,
+             bar,
+             baz;
+    foo = 5
+            + 6
+            + 7;
+    if (printf("%d %d",
+                        5
+                        + 6,
+                        7)
+                                  < 0)
+    {
+        return 1;
+    }
+
+    return 0;
+}
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.75.0/tests/expected/cpp/60082-Issue_3552.cpp
new file mode 100644
index 00000000..73c2e77e
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60082-Issue_3552.cpp
@@ -0,0 +1,9 @@
+namespace Salads
+{
+    class
+      Waldorf
+    {
+    public:
+        int size;
+    };
+}
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.75.0/tests/expected/cpp/60083-Issue_3570.h
new file mode 100644
index 00000000..a1a2fb26
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60083-Issue_3570.h
@@ -0,0 +1,25 @@
+class Foo
+{
+public:
+	Foo
+	        (
+	        )
+	{
+	}
+
+	Foo
+	        (
+	        int x
+	        );
+
+	void init
+	        (
+	        )
+	{
+	}
+
+	void init
+	        (
+	        int x
+	        );
+};
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.75.0/tests/expected/cpp/60084-Issue_3576.h
new file mode 100644
index 00000000..9fceffe8
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60084-Issue_3576.h
@@ -0,0 +1,9 @@
+class Foo : public Bar
+{
+public:
+void doIt
+        (
+        )
+{
+}
+};
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.75.0/tests/expected/cpp/60085-Issue_3576.h
new file mode 100644
index 00000000..9fceffe8
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60085-Issue_3576.h
@@ -0,0 +1,9 @@
+class Foo : public Bar
+{
+public:
+void doIt
+        (
+        )
+{
+}
+};
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.75.0/tests/expected/cpp/60086-indent_namespace_inner_only.h
new file mode 100644
index 00000000..32668ed3
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cpp/60086-indent_namespace_inner_only.h
@@ -0,0 +1,8 @@
+namespace out
+{
+int i;
+namespace in
+{
+	int i;
+}
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10000-simple.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10000-simple.cs
index 36cedfa2..36cedfa2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10000-simple.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10000-simple.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10001-getset.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10001-getset.cs
index 756170b6..756170b6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10001-getset.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10001-getset.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10002-simple.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10002-simple.cs
index f8344b26..f8344b26 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10002-simple.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10002-simple.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10003-region.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10003-region.cs
index 2ada63e7..2ada63e7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10003-region.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10003-region.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10010-var-member.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10010-var-member.cs
index 0da0b9f5..0da0b9f5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10010-var-member.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10010-var-member.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10011-strings.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10011-strings.cs
index 6794e762..6794e762 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10011-strings.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10011-strings.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10012-621_this-spacing.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10012-621_this-spacing.cs
index bd28a5e8..bd28a5e8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10012-621_this-spacing.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10012-621_this-spacing.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10013-625_where-constraints.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10013-625_where-constraints.cs
index 123109b0..123109b0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10013-625_where-constraints.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10013-625_where-constraints.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10014-630_bad-new-init-semicolon-removal.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10014-630_bad-new-init-semicolon-removal.cs
index 2e6d5a98..2e6d5a98 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10014-630_bad-new-init-semicolon-removal.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10014-630_bad-new-init-semicolon-removal.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10015-misc-failures.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10015-misc-failures.cs
index e7022083..e7022083 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10015-misc-failures.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10015-misc-failures.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10016-new-constraint-paren-space.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10016-new-constraint-paren-space.cs
index a337a447..a337a447 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10016-new-constraint-paren-space.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10016-new-constraint-paren-space.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10020-region.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10020-region.cs
index b2f57ece..b2f57ece 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10020-region.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10020-region.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10021-region.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10021-region.cs
index 926e467d..926e467d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10021-region.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10021-region.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10022-region.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10022-region.cs
index 9628d4fd..9628d4fd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10022-region.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10022-region.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10023-region.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10023-region.cs
index e21c467c..e21c467c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10023-region.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10023-region.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10027-oneline_property.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10027-oneline_property.cs
index e4470be2..e4470be2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10027-oneline_property.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10027-oneline_property.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10028-ifcolalign.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10028-ifcolalign.cs
index 13df0440..13df0440 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10028-ifcolalign.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10028-ifcolalign.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10029-when.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10029-when.cs
index 4480f618..4480f618 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10029-when.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10029-when.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10030-sort_using.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10030-sort_using.cs
index 99e802c1..99e802c1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10030-sort_using.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10030-sort_using.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10031-bug_i_935.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10031-bug_i_935.cs
index c45eb79d..c45eb79d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10031-bug_i_935.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10031-bug_i_935.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10032-sort_using_categ.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10032-sort_using_categ.cs
index ec997fc9..ec997fc9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10032-sort_using_categ.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10032-sort_using_categ.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10039-615_nested-usings.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10039-615_nested-usings.cs
index d46108bd..d46108bd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10039-615_nested-usings.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10039-615_nested-usings.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10040-tcf.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10040-tcf.cs
index 009f269e..009f269e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10040-tcf.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10040-tcf.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10041-gs.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10041-gs.cs
index ba9f873e..ba9f873e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10041-gs.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10041-gs.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10042-exception-filters.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10042-exception-filters.cs
index d638d9a8..d638d9a8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10042-exception-filters.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10042-exception-filters.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10044-ifcomment.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10044-ifcomment.cs
index 2c3ab0fc..2c3ab0fc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10044-ifcomment.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10044-ifcomment.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10045-UNI-1288.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10045-UNI-1288.cs
index 03d60f5b..03d60f5b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10045-UNI-1288.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10045-UNI-1288.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10050-generics.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10050-generics.cs
index 74e49ecd..74e49ecd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10050-generics.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10050-generics.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10051-UNI-1338.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10051-UNI-1338.cs
index 3f3d9d06..3f3d9d06 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10051-UNI-1338.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10051-UNI-1338.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10055-UNI-1345.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10055-UNI-1345.cs
index 13f61127..13f61127 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10055-UNI-1345.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10055-UNI-1345.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10060-unsafe.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10060-unsafe.cs
index fdfdd67b..fdfdd67b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10060-unsafe.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10060-unsafe.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10065-UNI-1975.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10065-UNI-1975.cs
index 1d2f2659..1d2f2659 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10065-UNI-1975.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10065-UNI-1975.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10066-UNI-1977.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10066-UNI-1977.cs
index 94b929c4..94b929c4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10066-UNI-1977.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10066-UNI-1977.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10067-UNI-1978.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10067-UNI-1978.cs
index 5f55cb2f..5f55cb2f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10067-UNI-1978.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10067-UNI-1978.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10070-utf16le.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10070-utf16le.cs
index c017f6c3..c017f6c3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10070-utf16le.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10070-utf16le.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10071-utf16be.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10071-utf16be.cs
index d9f54e37..d9f54e37 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10071-utf16be.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10071-utf16be.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10072-utf16le_no_bom.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10072-utf16le_no_bom.cs
index c017f6c3..c017f6c3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10072-utf16le_no_bom.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10072-utf16le_no_bom.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10073-utf16be_no_bom.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10073-utf16be_no_bom.cs
index d9f54e37..d9f54e37 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10073-utf16be_no_bom.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10073-utf16be_no_bom.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10074-UNI-2020.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10074-UNI-2020.cs
index 854a3655..854a3655 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10074-UNI-2020.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10074-UNI-2020.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10075-UNI-2021.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10075-UNI-2021.cs
index b0ec0414..b0ec0414 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10075-UNI-2021.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10075-UNI-2021.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10076-UNI-1343.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10076-UNI-1343.cs
index 076e338d..076e338d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10076-UNI-1343.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10076-UNI-1343.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10077-UNI-1919.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10077-UNI-1919.cs
index cc8e8420..cc8e8420 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10077-UNI-1919.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10077-UNI-1919.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10078-UNI-3484.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10078-UNI-3484.cs
index d7e4f26a..d7e4f26a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10078-UNI-3484.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10078-UNI-3484.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10080-property.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10080-property.cs
index 98d3c21c..98d3c21c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10080-property.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10080-property.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10090-string_multi.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10090-string_multi.cs
index 7d006dce..7d006dce 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10090-string_multi.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10090-string_multi.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10100-bug_600.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10100-bug_600.cs
index 54c24643..54c24643 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10100-bug_600.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10100-bug_600.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10101-sf607.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10101-sf607.cs
index 3207e6c5..3207e6c5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10101-sf607.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10101-sf607.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10103-UNI-2506.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10103-UNI-2506.cs
index 8cd07962..8cd07962 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10103-UNI-2506.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10103-UNI-2506.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10104-UNI-2505.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10104-UNI-2505.cs
index a17e6a5e..a17e6a5e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10104-UNI-2505.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10104-UNI-2505.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10110-mdarray_space.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10110-mdarray_space.cs
index 8c328f5e..8c328f5e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10110-mdarray_space.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10110-mdarray_space.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10111-mdarray_space.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10111-mdarray_space.cs
index 56aa58ce..56aa58ce 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10111-mdarray_space.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10111-mdarray_space.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10112-mdarray_space.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10112-mdarray_space.cs
index ab877b8e..ab877b8e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10112-mdarray_space.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10112-mdarray_space.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10119-preserveTabs.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10119-preserveTabs.cs
index c9583dcd..c9583dcd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10119-preserveTabs.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10119-preserveTabs.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10120-cmt_backslash_eol.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10120-cmt_backslash_eol.cs
index e56aec25..e56aec25 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10120-cmt_backslash_eol.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10120-cmt_backslash_eol.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10130-sp_between_new_paren.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10130-sp_between_new_paren.cs
index fd706ffa..fd706ffa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10130-sp_between_new_paren.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10130-sp_between_new_paren.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10140-remove_semi.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10140-remove_semi.cs
index 3ee1926e..3ee1926e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10140-remove_semi.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10140-remove_semi.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10150-operator-null-conditional.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10150-operator-null-conditional.cs
index 61ac6d74..61ac6d74 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10150-operator-null-conditional.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10150-operator-null-conditional.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10151-operator_null-coalescing-assignment.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10151-operator_null-coalescing-assignment.cs
index 416e6afc..416e6afc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10151-operator_null-coalescing-assignment.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10151-operator_null-coalescing-assignment.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10160-delegate.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10160-delegate.cs
index 6296ad80..6296ad80 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10160-delegate.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10160-delegate.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10161-delegate.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10161-delegate.cs
index 152fba2b..152fba2b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10161-delegate.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10161-delegate.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10200-logger.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10200-logger.cs
index defede8a..defede8a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10200-logger.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10200-logger.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10300-1822.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10300-1822.cs
index 92b5fd5b..92b5fd5b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10300-1822.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10300-1822.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10628-sf628.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10628-sf628.cs
index 54d3c52c..54d3c52c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10628-sf628.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/10628-sf628.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/11011-620_getset-brace.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/11011-620_getset-brace.cs
index d4652c5f..d4652c5f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/11011-620_getset-brace.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/11011-620_getset-brace.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/11072-UNI-2007.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/11072-UNI-2007.cs
index 29e53f26..29e53f26 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/11072-UNI-2007.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/11072-UNI-2007.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/11073-UNI-2008.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/11073-UNI-2008.cs
index a4de3475..a4de3475 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/11073-UNI-2008.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/11073-UNI-2008.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/12001-bug_620.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/12001-bug_620.cs
index 56e9b8bc..56e9b8bc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/12001-bug_620.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/12001-bug_620.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/12002-nullable_prop.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/12002-nullable_prop.cs
index 21c4f7b0..21c4f7b0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/12002-nullable_prop.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/12002-nullable_prop.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/12003-fncall_as_ctor_in_attr.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/12003-fncall_as_ctor_in_attr.cs
index 3dab10f6..3dab10f6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/12003-fncall_as_ctor_in_attr.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/12003-fncall_as_ctor_in_attr.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/12004-verbatim_strings.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/12004-verbatim_strings.cs
index 73fa1bf0..73fa1bf0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/12004-verbatim_strings.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/12004-verbatim_strings.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/12005-bug_1591.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/12005-bug_1591.cs
index ac62df9e..ac62df9e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/12005-bug_1591.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/12005-bug_1591.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/12101-bug_i_679.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/12101-bug_i_679.cs
index 199ad7e6..199ad7e6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/12101-bug_i_679.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/12101-bug_i_679.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/12102-mod_full_brace_nl_block_rem_mlcond.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/12102-mod_full_brace_nl_block_rem_mlcond.cs
index e6e0eede..e6e0eede 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/12102-mod_full_brace_nl_block_rem_mlcond.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/12102-mod_full_brace_nl_block_rem_mlcond.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/12103-mod_full_brace_nl_block_rem_mlcond.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/12103-mod_full_brace_nl_block_rem_mlcond.cs
index 8ecd4051..8ecd4051 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/12103-mod_full_brace_nl_block_rem_mlcond.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/12103-mod_full_brace_nl_block_rem_mlcond.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/12104-bug_1637.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/12104-bug_1637.cs
index 9ffe19e7..9ffe19e7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/12104-bug_1637.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/12104-bug_1637.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/12105-bug_1650.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/12105-bug_1650.cs
index 869a9d0f..869a9d0f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/12105-bug_1650.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/12105-bug_1650.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/12106-UNI-40685.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/12106-UNI-40685.cs
index 9b70920e..9b70920e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/12106-UNI-40685.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/12106-UNI-40685.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/12107-mod_full_paren_if_bool.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/12107-mod_full_paren_if_bool.cs
index 6bcd9201..6bcd9201 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/12107-mod_full_paren_if_bool.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/12107-mod_full_paren_if_bool.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/12108-Issue_2705.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/12108-Issue_2705.cs
index 08619bb1..08619bb1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/12108-Issue_2705.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/12108-Issue_2705.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/12200-comma.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/12200-comma.cs
index 34ccfdd8..34ccfdd8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/12200-comma.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/12200-comma.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/12201-comma.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/12201-comma.cs
index 794410f0..794410f0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/12201-comma.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/12201-comma.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/12202-comma.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/12202-comma.cs
index 29ab2c3e..29ab2c3e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/12202-comma.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/12202-comma.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/19000-UNI-58354.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/19000-UNI-58354.cs
index 6c77de40..6c77de40 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/19000-UNI-58354.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/19000-UNI-58354.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/20010-UNI-32658.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/20010-UNI-32658.cs
index 145da65f..145da65f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/20010-UNI-32658.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/20010-UNI-32658.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/20011-bug_1620.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/20011-bug_1620.cs
index 3b837292..3b837292 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/20011-bug_1620.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/20011-bug_1620.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/60004-UNI-2684.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60004-UNI-2684.cs
index ff0b31f1..ff0b31f1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/60004-UNI-2684.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60004-UNI-2684.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/60005-UNI-2685.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60005-UNI-2685.cs
index ec671dd4..ec671dd4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/60005-UNI-2685.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60005-UNI-2685.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/60007-UNI-3083.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60007-UNI-3083.cs
index 5209dc72..5209dc72 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/60007-UNI-3083.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60007-UNI-3083.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/60008-UNI-17253.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60008-UNI-17253.cs
index 9021a372..9021a372 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/60008-UNI-17253.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60008-UNI-17253.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/60009-UNI-9917.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60009-UNI-9917.cs
index 5e352d10..5e352d10 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/60009-UNI-9917.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60009-UNI-9917.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/60012-UNI-12303.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60012-UNI-12303.cs
index 01be8291..01be8291 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/60012-UNI-12303.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60012-UNI-12303.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/60013-UNI-13955.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60013-UNI-13955.cs
index 940aa89b..940aa89b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/60013-UNI-13955.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60013-UNI-13955.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/60015-UNI-14131.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60015-UNI-14131.cs
index 9656bee8..9656bee8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/60015-UNI-14131.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60015-UNI-14131.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/60016-UNI-11662.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60016-UNI-11662.cs
index 9a49fdba..9a49fdba 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/60016-UNI-11662.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60016-UNI-11662.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/60018-UNI-18777.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60018-UNI-18777.cs
index 198d5be3..198d5be3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/60018-UNI-18777.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60018-UNI-18777.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/60019-UNI-18780.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60019-UNI-18780.cs
index 0eea713e..0eea713e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/60019-UNI-18780.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60019-UNI-18780.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/60020-UNI-18829.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60020-UNI-18829.cs
index a72ca87b..a72ca87b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/60020-UNI-18829.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60020-UNI-18829.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/60023-UNI-18437.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60023-UNI-18437.cs
index d8178e73..d8178e73 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/60023-UNI-18437.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60023-UNI-18437.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/60024-UNI-19644.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60024-UNI-19644.cs
index eb0d4c9c..eb0d4c9c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/60024-UNI-19644.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60024-UNI-19644.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/60026-UNI-19895.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60026-UNI-19895.cs
index 1fedd580..1fedd580 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/60026-UNI-19895.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60026-UNI-19895.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/60033-UNI-21730.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60033-UNI-21730.cs
index 6fcb8c16..6fcb8c16 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/60033-UNI-21730.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60033-UNI-21730.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/60036-UNI-11993.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60036-UNI-11993.cs
index bf703537..bf703537 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/60036-UNI-11993.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60036-UNI-11993.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/60037-UNI-29933.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60037-UNI-29933.cs
index 943cbf35..943cbf35 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/60037-UNI-29933.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60037-UNI-29933.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/60040-UNI-30498_2.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60040-UNI-30498_2.cs
index 445a7c97..445a7c97 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/60040-UNI-30498_2.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60040-UNI-30498_2.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/60041-squeeze-paren-close-Option.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60041-squeeze-paren-close-Option.cs
index 2fc371c3..2fc371c3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/60041-squeeze-paren-close-Option.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60041-squeeze-paren-close-Option.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/60042-indent-multistring-coulmn1.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60042-indent-multistring-coulmn1.cs
index 4f66d541..4f66d541 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/60042-indent-multistring-coulmn1.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60042-indent-multistring-coulmn1.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/60044-UNI-37241.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60044-UNI-37241.cs
index 57d4ffeb..57d4ffeb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/60044-UNI-37241.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60044-UNI-37241.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/60045-add-nl-before-namespace.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60045-add-nl-before-namespace.cs
index d9840704..d9840704 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/60045-add-nl-before-namespace.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.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.75.0/tests/expected/cs/60046-cast.cs
new file mode 100644
index 00000000..6c5d11db
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/cs/60046-cast.cs
@@ -0,0 +1,7 @@
+foo = (Type) bar;
+
+foo = (Ns.Type) bar;
+
+foo = (Type<int>) bar;
+
+foo = (Type<int, int>) bar;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40000-HashMap.d b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40000-HashMap.d
index 74d0614b..80b26e1d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40000-HashMap.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40000-HashMap.d
@@ -475,11 +475,13 @@ class HashMap
             if (c)
             {
                 HashEntry e = getFirst(hash);
+
                 while (e)
                 {
                     if (hash == e.hash && matchKey(key, e.key))
                     {
                         V v;
+
                         volatile v = e.value;
                         if (v)
                             return v;
@@ -503,6 +505,7 @@ class HashMap
             if (c)
             {
                 HashEntry e = getFirst(hash);
+
                 while (e)
                 {
                     if (e.hash == hash && matchKey(key, e.key))
@@ -619,9 +622,11 @@ class HashMap
                         // Reuse trailing consecutive sequence at same slot
                         HashEntry lastRun = e;
                         int       lastIdx = idx;
+
                         for (HashEntry last = next; last; last = last.next)
                         {
                             uint k = last.hash & sizeMask;
+
                             if (k != lastIdx)
                             {
                                 lastIdx = k;
@@ -635,6 +640,7 @@ class HashMap
                         {
                             uint      k = p.hash & sizeMask;
                             HashEntry n = newTable[k];
+
                             newTable[k] = new HashEntry(p.key, p.hash, n, p.value);
                         }
                     }
@@ -667,6 +673,7 @@ class HashMap
             if (e)
             {
                 V v;
+
                 volatile v = e.value;
                 if (value is null || value == v)
                 {
@@ -676,6 +683,7 @@ class HashMap
                     // in list, but all preceding ones need to be
                     // cloned.
                     HashEntry newFirst = e.next;
+
                     for (HashEntry p = first; p !is e; p = p.next)
                         newFirst = new HashEntry(p.key, p.hash, newFirst, p.value);
                     tab[index] = newFirst;
@@ -999,6 +1007,7 @@ class HashMap
         while (iterator.hasNext)
         {
             HashEntry he = iterator.nextElement;
+
             char[]    ca = cast(char[])he.key;
             if ((result = dg(ca, he.value)) != 0)
                 break;
@@ -1013,6 +1022,7 @@ class HashMap
     {
         int         nextSegmentIndex;
         int         nextTableIndex;
+
         HashEntry[] currentTable;
         HashEntry   nextEntry;
         HashEntry   lastReturned;
@@ -1040,6 +1050,7 @@ class HashMap
             while (nextSegmentIndex >= 0)
             {
                 Segment seg = map.segments[nextSegmentIndex--];
+
                 volatile if (seg.count)
                     {
                         currentTable = seg.table;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40001-imports.d b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40001-imports.d
index 9f12a88e..9f12a88e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40001-imports.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40001-imports.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40002-volatile.d b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40002-volatile.d
index 4dbd66dc..73cdf4ac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40002-volatile.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40002-volatile.d
@@ -3,6 +3,7 @@ void foo(void)
     while (nextSegmentIndex >= 0)
     {
         Segment seg = map.segments[nextSegmentIndex--];
+
         volatile if (seg.count)
             {
                 currentTable = seg.table;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40003-volatile-1.d b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40003-volatile-1.d
index 2ef2634d..2ef2634d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40003-volatile-1.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40003-volatile-1.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40004-volatile-2.d b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40004-volatile-2.d
index bc5a0de4..bc5a0de4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40004-volatile-2.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40004-volatile-2.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40005-volatile-3.d b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40005-volatile-3.d
index 039f788a..039f788a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40005-volatile-3.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40005-volatile-3.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40006-Lexer.d b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40006-Lexer.d
index 86e1144a..bc218701 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40006-Lexer.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40006-Lexer.d
@@ -37,6 +37,7 @@ int errno = 0;
 // from \dm\src\include\setlocal.h

 //extern "C" char * __cdecl __locale_decpoint;

 char *__locale_decpoint;

+

 //#endif

 //const uint LS = 0x2028;	// UTF line separator

 //const uint PS = 0x2029;	// UTF paragraph separator

@@ -88,6 +89,7 @@ class Lexer
             while (true)

             {

                 ubyte c = *p;

+

                 switch (c)

                 {

                 case '\n':

@@ -108,6 +110,7 @@ class Lexer
                     if (c & 0x80)

                     {

                         uint u = decodeUTF();

+

                         if (u == PS || u == LS)

                             break;

                     }

@@ -243,6 +246,7 @@ class Lexer
         if (token.next)

         {

             Token *t = token.next;

+

             memcpy(&token, t, Token.sizeof);

 //			t.next = freelist;

 //			freelist = t;

@@ -386,6 +390,7 @@ class Lexer
             case '\\':                                  // escaped string literal

 //					debug writefln( "    escaped string literal" );

                 uint c;

+

                 stringbuffer.offset = 0;

                 do

                 {

@@ -458,6 +463,7 @@ class Lexer
                 {

 //					debug writefln( "    identifier" );

                     ubyte c;

+

                     do

                     {

                         c = *++p;

@@ -469,6 +475,7 @@ class Lexer
                     memcpy(tmp.ptr, t.ptr, p - t.ptr);

                     Identifier id;

                     Identifier *pid = tmp in stringtable;

+

                     if (pid)

                     {

                         id = *pid;

@@ -563,6 +570,7 @@ class Lexer
                         while (true)

                         {

                             ubyte c = *p;

+

                             switch (c)

                             {

                             case '/':

@@ -590,6 +598,7 @@ class Lexer
                                 if (c & 0x80)

                                 {

                                     uint u = decodeUTF();

+

                                     if (u == PS || u == LS)

                                         loc.linnum++;

                                 }

@@ -618,6 +627,7 @@ class Lexer
                     while (1)

                     {

                         ubyte c = *++p;

+

                         switch (c)

                         {

                         case '\n':

@@ -646,6 +656,7 @@ class Lexer
                             if (c & 0x80)

                             {

                                 uint u = decodeUTF();

+

                                 if (u == PS || u == LS)

                                     break;

                             }

@@ -671,12 +682,14 @@ class Lexer
                 case '+':

                     {

                         int nest;

+

                         linnum = loc.linnum;

                         p++;

                         nest = 1;

                         while (1)

                         {

                             ubyte c = *p;

+

                             switch (c)

                             {

                             case '/':

@@ -720,6 +733,7 @@ class Lexer
                                 if (c & 0x80)

                                 {

                                     uint u = decodeUTF();

+

                                     if (u == PS || u == LS)

                                         loc.linnum++;

                                 }

@@ -1043,9 +1057,11 @@ class Lexer
                 {

                     debug writefln("    default char");

                     ubyte c = *p;

+

                     if (c & 0x80)

                     {

                         uint u = decodeUTF();

+

                         // Check for start of unicode identifier

                         if (isUniAlpha(u))

                             goto case_identifier;

@@ -1118,6 +1134,7 @@ class Lexer
             if (ishex(c))

             {

                 uint v;

+

                 n = 0;

                 v = 0;

                 while (1)

@@ -1184,6 +1201,7 @@ class Lexer
             if (isoctal(c))

             {

                 ubyte v;

+

                 n = 0;

                 do

                 {

@@ -1251,6 +1269,7 @@ class Lexer
                 {

                     p--;

                     uint u = decodeUTF();

+

                     p++;

                     if (u == PS || u == LS)

                         loc.linnum++;

@@ -1329,6 +1348,7 @@ class Lexer
                 {

                     p--;

                     uint u = decodeUTF();

+

                     p++;

                     if (u == PS || u == LS)

                         loc.linnum++;

@@ -1615,6 +1635,7 @@ class Lexer
         while (true)

         {

             char c = cast(char)*p;

+

             switch (state)

             {

             case STATE.STATE_initial:                           // opening state

@@ -1843,6 +1864,7 @@ class Lexer
             char *p = cast(char *)stringbuffer.data.ptr;

             int  r  = 10;

             int  d;

+

             if (*p == '0')

             {

                 if (p[1] == 'x' || p[1] == 'X')

@@ -1899,6 +1921,7 @@ class Lexer
         while (true)

         {

             ubyte f;

+

             switch (*p)

             {

             case 'U':

@@ -2216,6 +2239,7 @@ class Lexer
                 while (1)

                 {

                     uint c;

+

                     c = *p;

                     switch (c)

                     {

@@ -2236,6 +2260,7 @@ class Lexer
                         if (c & 0x80)

                         {

                             uint u = decodeUTF();

+

                             if (u == PS || u == LS)

                                 goto Lerr;

                         }

@@ -2251,6 +2276,7 @@ class Lexer
                 if (*p & 0x80)

                 {

                     uint u = decodeUTF();

+

                     if (u == PS || u == LS)

                         goto Lnewline;

                 }

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40007-Lexer.d b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40007-Lexer.d
index 50f40a49..50f40a49 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40007-Lexer.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40007-Lexer.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40010-template.d b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40010-template.d
index eaad2b5d..eaad2b5d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40010-template.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40010-template.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40011-template.d b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40011-template.d
index 5c106063..5c106063 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40011-template.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40011-template.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40012-template.d b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40012-template.d
index dbe1fb85..dbe1fb85 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40012-template.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40012-template.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40013-template.d b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40013-template.d
index ec69b8bf..ec69b8bf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40013-template.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40013-template.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40020-funcfunc.d b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40020-funcfunc.d
index de673e78..de673e78 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40020-funcfunc.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40020-funcfunc.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40021-tst01.d b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40021-tst01.d
index e19c7c8e..a2f63fc0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40021-tst01.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40021-tst01.d
@@ -5,11 +5,13 @@ in
     assert(aRegisterOffset < IMAGE_SIZE);
 }
 body {
-    int  idx = aRegisterOffset / 2;
+    int idx = aRegisterOffset / 2;
+
     mMemCache[idx] = aValue;
     uint readback;
     uint st;
     uint st2;
+
     volatile {
         mMemImage[idx] = aValue;
         //readback = (cast(uint*)mMemImage.ptr)[ idx/2 ];
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40022-tst02.d b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40022-tst02.d
index aa138a86..aa138a86 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40022-tst02.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40022-tst02.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40023-bug-indent.d b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40023-bug-indent.d
index 6071604d..6071604d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40023-bug-indent.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40023-bug-indent.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40024-tst03.d b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40024-tst03.d
index 2344510d..2344510d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40024-tst03.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40024-tst03.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40025-tst03.d b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40025-tst03.d
index 15811ebc..15811ebc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40025-tst03.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40025-tst03.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40026-wysiwyg_strings.d b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40026-wysiwyg_strings.d
index cfdec32a..cfdec32a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40026-wysiwyg_strings.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40026-wysiwyg_strings.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40027-static_if_in_struct.d b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40027-static_if_in_struct.d
index be936335..be936335 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40027-static_if_in_struct.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40027-static_if_in_struct.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40030-delegate.d b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40030-delegate.d
index 5f7beceb..d06dfd05 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40030-delegate.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40030-delegate.d
@@ -6,6 +6,7 @@ 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.74.0/tests/expected/d/40035-enum.d b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40035-enum.d
index 24d0ef63..24d0ef63 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40035-enum.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40035-enum.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40040-sort_import.d b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40040-sort_import.d
index db26c1e4..db26c1e4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40040-sort_import.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40040-sort_import.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40050-strings.d b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40050-strings.d
index 4964ad7a..4964ad7a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40050-strings.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40050-strings.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40051-numbers.d b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40051-numbers.d
index 72d55727..72d55727 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40051-numbers.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40051-numbers.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40052-numbers.d b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40052-numbers.d
index 8cf51f29..8cf51f29 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40052-numbers.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40052-numbers.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40060-casts.d b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40060-casts.d
index b1d6b50b..b1d6b50b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40060-casts.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40060-casts.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40061-const.d b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40061-const.d
index 8277f0c1..8277f0c1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40061-const.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40061-const.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40070-d_sp_paren.d b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40070-d_sp_paren.d
index cc38daae..cc38daae 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40070-d_sp_paren.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40070-d_sp_paren.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40080-static_if.d b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40080-static_if.d
index 0eb3a1a8..0eb3a1a8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40080-static_if.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40080-static_if.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40090-square_indent_tab.d b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40090-square_indent_tab.d
index e9657860..e9657860 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40090-square_indent_tab.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40090-square_indent_tab.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40100-1438.d b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40100-1438.d
index 66c47d3a..66c47d3a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40100-1438.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40100-1438.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40201-invariant.d b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40201-invariant.d
index 3da6240f..3da6240f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40201-invariant.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40201-invariant.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40300-extern_.d b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40300-extern_.d
index 40131d6d..40131d6d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40300-extern_.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40300-extern_.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40400-vbraces000.d b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40400-vbraces000.d
index 616bb259..616bb259 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40400-vbraces000.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40400-vbraces000.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40401-vbraces001.d b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40401-vbraces001.d
index 6d7e96f6..6d7e96f6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40401-vbraces001.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40401-vbraces001.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40402-vbraces002.d b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40402-vbraces002.d
index c966d140..c966d140 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40402-vbraces002.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40402-vbraces002.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40403-template_use.d b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40403-template_use.d
index 94cdbf6b..94cdbf6b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40403-template_use.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40403-template_use.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40500-template_spacing000.d b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40500-template_spacing000.d
index 627ca266..627ca266 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40500-template_spacing000.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40500-template_spacing000.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40501-template_spacing001.d b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40501-template_spacing001.d
index dc3242ff..dc3242ff 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40501-template_spacing001.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40501-template_spacing001.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40502-template_spacing001.d b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40502-template_spacing001.d
index 3c238a1f..3c238a1f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40502-template_spacing001.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40502-template_spacing001.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40503-template_spacing001.d b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40503-template_spacing001.d
index 010cbe07..010cbe07 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40503-template_spacing001.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40503-template_spacing001.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40504-type_spacing000.d b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40504-type_spacing000.d
index 1e47f131..1e47f131 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40504-type_spacing000.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40504-type_spacing000.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40505-type_spacing000.d b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40505-type_spacing000.d
index 1e47f131..1e47f131 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40505-type_spacing000.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40505-type_spacing000.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40506-type_spacing000.d b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40506-type_spacing000.d
index e11e545b..e11e545b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/d/40506-type_spacing000.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/d/40506-type_spacing000.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/ecma/90000-example-1.es b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/ecma/90000-example-1.es
index 45f9b6cb..45f9b6cb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/ecma/90000-example-1.es
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/ecma/90000-example-1.es
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80000-assert.java b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80000-assert.java
index fbc20ba7..fbc20ba7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80000-assert.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80000-assert.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80010-annotation1.java b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80010-annotation1.java
index 314a0b91..314a0b91 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80010-annotation1.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80010-annotation1.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80011-annotation2.java b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80011-annotation2.java
index 1acc459f..1acc459f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80011-annotation2.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80011-annotation2.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80012-annotation2.java b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80012-annotation2.java
index 1acc459f..1acc459f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80012-annotation2.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80012-annotation2.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80013-annotation2.java b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80013-annotation2.java
index 42f5a1df..42f5a1df 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80013-annotation2.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80013-annotation2.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80014-annotation2.java b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80014-annotation2.java
index 42f5a1df..42f5a1df 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80014-annotation2.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80014-annotation2.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80020-foreach.java b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80020-foreach.java
index 69967517..69967517 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80020-foreach.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80020-foreach.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80030-variable_aligns.java b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80030-variable_aligns.java
index c73b62d3..c73b62d3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80030-variable_aligns.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80030-variable_aligns.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80040-try.java b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80040-try.java
index 78a55849..78a55849 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80040-try.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80040-try.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80050-double_brace.java b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80050-double_brace.java
index e00246e1..e00246e1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80050-double_brace.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80050-double_brace.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80051-double_brace.java b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80051-double_brace.java
index 66183ada..66183ada 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80051-double_brace.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80051-double_brace.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80060-synchronized.java b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80060-synchronized.java
index b8b70a6b..b8b70a6b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80060-synchronized.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80060-synchronized.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80061-synchronized.java b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80061-synchronized.java
index 73fc9b1d..73fc9b1d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80061-synchronized.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80061-synchronized.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80062-sp_this_paren.java b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80062-sp_this_paren.java
index 1c189223..1c189223 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80062-sp_this_paren.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80062-sp_this_paren.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80063-i1121.java b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80063-i1121.java
index 18567ec3..18567ec3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80063-i1121.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80063-i1121.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80064-long_cl_cmt.java b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80064-long_cl_cmt.java
index af7a1c7e..af7a1c7e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80064-long_cl_cmt.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80064-long_cl_cmt.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80065-Java8DoubleColon.java b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80065-Java8DoubleColon.java
index ec594909..ec594909 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80065-Java8DoubleColon.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80065-Java8DoubleColon.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80066-sp_after_for_colon.java b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80066-sp_after_for_colon.java
index 38515aed..38515aed 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80066-sp_after_for_colon.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80066-sp_after_for_colon.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80067-doxy-javadoc-alignment.java b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80067-doxy-javadoc-alignment.java
index 6b9f748b..6b9f748b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80067-doxy-javadoc-alignment.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80067-doxy-javadoc-alignment.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80068-nl_before_ignore_after_case.java b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80068-nl_before_ignore_after_case.java
index 50bfc274..50bfc274 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80068-nl_before_ignore_after_case.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80068-nl_before_ignore_after_case.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80100-sf567.java b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80100-sf567.java
index 9fc644b8..9fc644b8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80100-sf567.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80100-sf567.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80200-sp_before_byref.java b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80200-sp_before_byref.java
index 7927ee89..7927ee89 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80200-sp_before_byref.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80200-sp_before_byref.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80201-generics.java b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80201-generics.java
index 086786c0..086786c0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80201-generics.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80201-generics.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80202-generics_wildcard.java b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80202-generics_wildcard.java
index 358e333b..358e333b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80202-generics_wildcard.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80202-generics_wildcard.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80203-generics_return_type.java b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80203-generics_return_type.java
index 1f2aa340..1f2aa340 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80203-generics_return_type.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80203-generics_return_type.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80204-cast.java b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80204-cast.java
index 30d0dcc4..30d0dcc4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80204-cast.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80204-cast.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80205-sp_after_angle.java b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80205-sp_after_angle.java
index bd654485..bd654485 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80205-sp_after_angle.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80205-sp_after_angle.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80206-annotation3.java b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80206-annotation3.java
index 3d84c04c..3d84c04c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80206-annotation3.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80206-annotation3.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80300-Issue_670.java b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80300-Issue_670.java
index b0aa2cf0..b0aa2cf0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80300-Issue_670.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80300-Issue_670.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80301-issue_672.java b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80301-issue_672.java
index 16a077a4..16a077a4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80301-issue_672.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80301-issue_672.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80302-Issue_1845.java b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80302-Issue_1845.java
index 062c89d1..062c89d1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80302-Issue_1845.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80302-Issue_1845.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80303-Issue_1122.java b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80303-Issue_1122.java
index 111ee739..111ee739 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80303-Issue_1122.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80303-Issue_1122.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80304-Issue_1124.java b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80304-Issue_1124.java
index bca3cb33..bca3cb33 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80304-Issue_1124.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80304-Issue_1124.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80305-Issue_1124.java b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80305-Issue_1124.java
index 0469fed1..0469fed1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80305-Issue_1124.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80305-Issue_1124.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80306-leading-tabs-for-java-lambda.java b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80306-leading-tabs-for-java-lambda.java
index 19b6df0f..19b6df0f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/java/80306-leading-tabs-for-java-lambda.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/java/80306-leading-tabs-for-java-lambda.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/10018-delete-space-oc.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/10018-delete-space-oc.mm
index 8760241b..8760241b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/10018-delete-space-oc.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/10018-delete-space-oc.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/10019-func-param-wrap-oc.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/10019-func-param-wrap-oc.mm
index 45601228..45601228 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/10019-func-param-wrap-oc.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/10019-func-param-wrap-oc.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/10020-align-objc-like-xcode.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/10020-align-objc-like-xcode.m
index 93066246..93066246 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/10020-align-objc-like-xcode.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/10020-align-objc-like-xcode.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/10021-double-indent-objc-dict.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/10021-double-indent-objc-dict.m
index a93bd81e..a93bd81e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/10021-double-indent-objc-dict.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/10021-double-indent-objc-dict.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/10022-indent-objc-block.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/10022-indent-objc-block.m
index 4aab0fc0..4aab0fc0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/10022-indent-objc-block.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/10022-indent-objc-block.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10033-objc.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/10033-objc.mm
index 07ede276..07ede276 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10033-objc.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/10033-objc.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10034-asm.h.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/10034-asm.h.mm
index 84a5efa8..84a5efa8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10034-asm.h.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/10034-asm.h.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10035-definesalign.h.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/10035-definesalign.h.mm
index 9ad29954..9ad29954 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10035-definesalign.h.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/10035-definesalign.h.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10036-inttypes.h.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/10036-inttypes.h.mm
index 4ac13417..4ac13417 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10036-inttypes.h.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/10036-inttypes.h.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-1333.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/10046-UNI-1333.mm
index 5c91693c..5c91693c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-1333.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/10046-UNI-1333.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10102-pp-ignore.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/10102-pp-ignore.mm
index f26232c9..f26232c9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10102-pp-ignore.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/10102-pp-ignore.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/11030-argtypes.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/11030-argtypes.mm
index 1afeb694..1afeb694 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/11030-argtypes.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/11030-argtypes.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/11031-casting.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/11031-casting.mm
index c73d6ef8..c73d6ef8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/11031-casting.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/11031-casting.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/11032-newlines.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/11032-newlines.mm
index 49a15913..45fd64f9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/11032-newlines.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/11032-newlines.mm
@@ -1,6 +1,6 @@
 NSString* GetXcodePath()

 {

-    return [[NSWorkspace sharedWorkspace] absolutePathForAppBundleWithIdentifier: kXCodeBundleId];

+    return [[NSWorkspace sharedWorkspace]absolutePathForAppBundleWithIdentifier: kXCodeBundleId];

 }

 

 extern "C" EXPORTDLL void LaunchXCode()

@@ -28,6 +28,6 @@ NSString* MakeNSString(const std::string& string)
 

 NSString* MakeNSString(const char* string)

 {

-    NSString* ret = string? [NSString stringWithUTF8String:string] : nil;

+    NSString* ret = string ? [NSString stringWithUTF8String: string] : nil;

     return ret ? ret : @"";

 }

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50001-Fraction.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50001-Fraction.h
index b1e373c2..b1e373c2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50001-Fraction.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50001-Fraction.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50002-Fraction.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50002-Fraction.m
index 4ad6dfc8..4ad6dfc8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50002-Fraction.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50002-Fraction.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50003-main.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50003-main.m
index ec082dc1..ec082dc1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50003-main.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50003-main.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50004-string.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50004-string.m
index bbfeb51e..bbfeb51e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50004-string.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50004-string.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50005-Declarations.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50005-Declarations.h
index 3b65c41c..3b65c41c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50005-Declarations.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50005-Declarations.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50006-exceptions.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50006-exceptions.m
index 609d2086..609d2086 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50006-exceptions.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50006-exceptions.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50007-misc.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50007-misc.m
index 4de222a1..4de222a1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50007-misc.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50007-misc.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50008-protocol.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50008-protocol.m
index 50c4314a..50c4314a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50008-protocol.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50008-protocol.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50009-literals.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50009-literals.mm
index 4bd99277..4bd99277 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50009-literals.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50009-literals.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50010-return_type.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50010-return_type.m
index 62275a52..62275a52 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50010-return_type.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50010-return_type.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50011-return_type.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50011-return_type.m
index 7cc95485..7cc95485 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50011-return_type.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50011-return_type.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50012-return_type.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50012-return_type.m
index 106c5466..106c5466 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50012-return_type.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50012-return_type.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50014-sp_oc_classname_paren-r.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50014-sp_oc_classname_paren-r.m
index 847e9dca..847e9dca 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50014-sp_oc_classname_paren-r.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50014-sp_oc_classname_paren-r.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50015-receiver.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50015-receiver.m
index dd6ee3d6..dd6ee3d6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50015-receiver.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50015-receiver.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50016-ternary.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50016-ternary.m
index 42a573f4..42a573f4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50016-ternary.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50016-ternary.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50017-ternary.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50017-ternary.m
index d53fc319..d53fc319 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50017-ternary.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50017-ternary.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50018-indent-inside-ternary-operator.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50018-indent-inside-ternary-operator.m
index 0b6e1fa3..0b6e1fa3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50018-indent-inside-ternary-operator.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50018-indent-inside-ternary-operator.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50020-selector.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50020-selector.m
index c53db6fb..c53db6fb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50020-selector.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50020-selector.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50021-selector.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50021-selector.m
index 3442f700..3442f700 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50021-selector.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50021-selector.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50022-selector.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50022-selector.m
index 1d790cc9..1d790cc9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50022-selector.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50022-selector.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50025-exceptions.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50025-exceptions.m
index 609d2086..609d2086 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50025-exceptions.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50025-exceptions.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50026-exceptions.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50026-exceptions.m
index 150de092..150de092 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50026-exceptions.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50026-exceptions.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50030-sort_import.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50030-sort_import.m
index e0cfcb88..e0cfcb88 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50030-sort_import.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50030-sort_import.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50031-sort_import.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50031-sort_import.m
index e0cfcb88..e0cfcb88 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50031-sort_import.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50031-sort_import.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50032-sort_import.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50032-sort_import.m
index 37b4d643..37b4d643 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50032-sort_import.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50032-sort_import.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50033-sort_import.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50033-sort_import.m
index 7c2ab21f..7c2ab21f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50033-sort_import.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50033-sort_import.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50034-sort_import.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50034-sort_import.m
index f8a42242..f8a42242 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50034-sort_import.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50034-sort_import.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50035-sort_import_group.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50035-sort_import_group.m
index 251829df..251829df 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50035-sort_import_group.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50035-sort_import_group.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50040-complex_method.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50040-complex_method.m
index 29467813..29467813 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50040-complex_method.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50040-complex_method.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50050-real_world_file.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50050-real_world_file.m
index 1f7370d7..a4bf639e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50050-real_world_file.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50050-real_world_file.m
@@ -167,7 +167,6 @@
     [self _selectColor:color];
     NSPoint origin = rect.origin;
     NSRect windowFrame = [_window frame];
-
     // The origin is the lower left; subtract the window's height
     origin.y -= NSHeight(windowFrame);
     // Center the popup window under the rect
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50060-oc-split.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50060-oc-split.m
index a7bcd4de..a7bcd4de 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50060-oc-split.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50060-oc-split.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50061-bug_167.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50061-bug_167.m
index 28087bb4..28087bb4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50061-bug_167.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50061-bug_167.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50062-issue_2631.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50062-issue_2631.m
index a4404650..a4404650 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50062-issue_2631.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50062-issue_2631.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50070-blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50070-blocks.m
index 8b77ccda..8b77ccda 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50070-blocks.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50070-blocks.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50071-blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50071-blocks.m
index 8b77ccda..8b77ccda 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50071-blocks.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50071-blocks.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50072-blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50072-blocks.m
index 8b77ccda..8b77ccda 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50072-blocks.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50072-blocks.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50073-blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50073-blocks.m
index 06a9cd78..06a9cd78 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50073-blocks.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50073-blocks.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50074-blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50074-blocks.m
index 467387b4..467387b4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50074-blocks.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50074-blocks.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50075-blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50075-blocks.m
index 8b77ccda..8b77ccda 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50075-blocks.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50075-blocks.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50076-blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50076-blocks.m
index 8b77ccda..8b77ccda 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50076-blocks.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50076-blocks.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50077-more_blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50077-more_blocks.m
index 75870d32..75870d32 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50077-more_blocks.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50077-more_blocks.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50078-more_blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50078-more_blocks.m
index 91d27d55..91d27d55 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50078-more_blocks.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50078-more_blocks.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50079-more_blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50079-more_blocks.m
index f6af5562..f6af5562 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50079-more_blocks.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50079-more_blocks.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50080-more_blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50080-more_blocks.m
index 1fbb7c34..1fbb7c34 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50080-more_blocks.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50080-more_blocks.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50081-more_blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50081-more_blocks.m
index 1fbb7c34..1fbb7c34 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50081-more_blocks.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50081-more_blocks.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50082-more_blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50082-more_blocks.m
index 75870d32..75870d32 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50082-more_blocks.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50082-more_blocks.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50083-more_blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50083-more_blocks.m
index f6af5562..f6af5562 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50083-more_blocks.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50083-more_blocks.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50084-more_blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50084-more_blocks.m
index 75870d32..75870d32 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50084-more_blocks.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50084-more_blocks.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50085-block_in_method.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50085-block_in_method.m
index 7a91d13e..7a91d13e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50085-block_in_method.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50085-block_in_method.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50086-block_in_method.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50086-block_in_method.m
index c5c9ae6b..c5c9ae6b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50086-block_in_method.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50086-block_in_method.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50087-indent_oc_inside_msg_sel.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50087-indent_oc_inside_msg_sel.m
index af5c2b7b..af5c2b7b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50087-indent_oc_inside_msg_sel.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50087-indent_oc_inside_msg_sel.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50090-kw.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50090-kw.m
index ef52dd8e..ef52dd8e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50090-kw.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50090-kw.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50091-block_in_method.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50091-block_in_method.m
index 705435d8..705435d8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50091-block_in_method.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50091-block_in_method.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50095-box.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50095-box.m
index 45b0de1b..45b0de1b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50095-box.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50095-box.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50100-bug_340.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50100-bug_340.m
index ec5135ab..ec5135ab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50100-bug_340.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50100-bug_340.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50110-msg_align.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50110-msg_align.m
index 041148c1..041148c1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50110-msg_align.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50110-msg_align.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50111-ns_enum.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50111-ns_enum.m
index 1b960272..1b960272 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50111-ns_enum.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50111-ns_enum.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50112-ns_enum.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50112-ns_enum.m
index 1b960272..1b960272 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50112-ns_enum.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50112-ns_enum.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50113-ns_enum.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50113-ns_enum.m
index 5c30d740..5c30d740 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50113-ns_enum.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50113-ns_enum.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50120-gh137.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50120-gh137.m
index ff41543a..ff41543a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50120-gh137.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50120-gh137.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50200-more_blocks_2.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50200-more_blocks_2.m
index 8835454f..8835454f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50200-more_blocks_2.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50200-more_blocks_2.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50201-blocks_align.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50201-blocks_align.m
index 505c9b99..505c9b99 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50201-blocks_align.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50201-blocks_align.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50202-blocks_align.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50202-blocks_align.m
index 439ac716..439ac716 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50202-blocks_align.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50202-blocks_align.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50203-blocks_align.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50203-blocks_align.m
index 07bd3cf3..07bd3cf3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50203-blocks_align.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50203-blocks_align.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50204-blocks_align.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50204-blocks_align.m
index a2cefc1f..a2cefc1f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50204-blocks_align.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50204-blocks_align.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50205-msg_align.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50205-msg_align.m
index f024b44c..f024b44c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50205-msg_align.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50205-msg_align.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50206-issue_2727.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50206-issue_2727.m
index 5639c298..5639c298 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50206-issue_2727.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50206-issue_2727.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50207-issue_3031.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50207-issue_3031.mm
index 75e6f5ea..75e6f5ea 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50207-issue_3031.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50207-issue_3031.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50300-msg.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50300-msg.m
index 79c1a60a..79c1a60a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50300-msg.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50300-msg.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50400-for.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50400-for.m
index 35c34bce..35c34bce 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50400-for.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50400-for.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50410-oc_cond_colon.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50410-oc_cond_colon.m
index 8059a3c6..8059a3c6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50410-oc_cond_colon.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50410-oc_cond_colon.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50411-attribute_specifier_seqs.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50411-attribute_specifier_seqs.mm
index 49dfaefa..49dfaefa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50411-attribute_specifier_seqs.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50411-attribute_specifier_seqs.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50500-code_placeholder.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50500-code_placeholder.m
index f6a745ed..f6a745ed 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50500-code_placeholder.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50500-code_placeholder.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50510-gh293.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50510-gh293.m
index a1dffc49..a1dffc49 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50510-gh293.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50510-gh293.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50511-gh293.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50511-gh293.m
index 6e4c180a..6e4c180a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50511-gh293.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50511-gh293.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50512-sp_oc_catch.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50512-sp_oc_catch.m
index 6040b071..6040b071 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50512-sp_oc_catch.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50512-sp_oc_catch.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50513-sp_oc_boxed.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50513-sp_oc_boxed.m
index 916e9330..916e9330 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50513-sp_oc_boxed.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50513-sp_oc_boxed.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50514-indent_boxed.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50514-indent_boxed.m
index 165ee244..165ee244 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50514-indent_boxed.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50514-indent_boxed.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50515-sp_oc_synchronized.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50515-sp_oc_synchronized.m
index ffff5618..ffff5618 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50515-sp_oc_synchronized.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50515-sp_oc_synchronized.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50600-bug_i_477.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50600-bug_i_477.m
index 0e7cbb78..0e7cbb78 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50600-bug_i_477.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50600-bug_i_477.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50601-bug_i_408.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50601-bug_i_408.m
index 700d159d..700d159d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50601-bug_i_408.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50601-bug_i_408.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50602-bug_i_125-412.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50602-bug_i_125-412.m
index 4beec2d5..4beec2d5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50602-bug_i_125-412.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50602-bug_i_125-412.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50603-gh511.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50603-gh511.m
index 2c86e32d..2c86e32d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50603-gh511.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50603-gh511.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50604-bug_497.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50604-bug_497.m
index 121503b4..121503b4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50604-bug_497.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50604-bug_497.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50605-bug_404.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50605-bug_404.m
index 8244ebd3..8244ebd3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50605-bug_404.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50605-bug_404.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50606-bug_1366.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50606-bug_1366.m
index f4058b1f..f4058b1f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50606-bug_1366.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50606-bug_1366.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50607-sp_after_oc_msg_receiver.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50607-sp_after_oc_msg_receiver.m
index 14eaed36..14eaed36 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50607-sp_after_oc_msg_receiver.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50607-sp_after_oc_msg_receiver.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50608-blocks_align2.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50608-blocks_align2.m
index b37c1b4b..b37c1b4b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50608-blocks_align2.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50608-blocks_align2.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50609-negative_value.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50609-negative_value.m
index 9aa4dc80..9aa4dc80 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50609-negative_value.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50609-negative_value.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50610-nelem.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50610-nelem.m
index d42ce3b6..d42ce3b6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50610-nelem.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50610-nelem.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50611-for2.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50611-for2.m
index 535bc50b..535bc50b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50611-for2.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50611-for2.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50612-chunk_ends_type1.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50612-chunk_ends_type1.m
index fb9bb4e1..fb9bb4e1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50612-chunk_ends_type1.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50612-chunk_ends_type1.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50613-chunk_ends_type2.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50613-chunk_ends_type2.m
index 64efc7e6..64efc7e6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50613-chunk_ends_type2.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50613-chunk_ends_type2.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50614-chunk_ends_type3.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50614-chunk_ends_type3.m
index 8f0ae62c..8f0ae62c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50614-chunk_ends_type3.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50614-chunk_ends_type3.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50615-block_literal_protocol.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50615-block_literal_protocol.m
index 35879a0e..35879a0e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50615-block_literal_protocol.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50615-block_literal_protocol.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50616-oc_msg_in_pp.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50616-oc_msg_in_pp.m
index 8496973b..8496973b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50616-oc_msg_in_pp.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50616-oc_msg_in_pp.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50617-boxed_receiver.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50617-boxed_receiver.m
index e4c247fd..e4c247fd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50617-boxed_receiver.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50617-boxed_receiver.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50618-func_def.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50618-func_def.mm
index 49de2fea..49de2fea 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50618-func_def.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50618-func_def.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50619-cast.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50619-cast.m
index 1e588579..1e588579 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50619-cast.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50619-cast.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50620-sp_after_angle.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50620-sp_after_angle.m
index 318071ba..318071ba 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50620-sp_after_angle.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50620-sp_after_angle.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50621-Fraction.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50621-Fraction.h
index 77403abd..77403abd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50621-Fraction.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50621-Fraction.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50622-c-cpp-oc-wrapper.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50622-c-cpp-oc-wrapper.c
index f17c10ed..f17c10ed 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50622-c-cpp-oc-wrapper.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50622-c-cpp-oc-wrapper.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50623-extern-c-attribute.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50623-extern-c-attribute.m
index 1c752682..1c752682 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50623-extern-c-attribute.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50623-extern-c-attribute.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50624-typeof.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50624-typeof.m
index 968aad5a..968aad5a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50624-typeof.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50624-typeof.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50625-sp_inside_braces_oc_dict.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50625-sp_inside_braces_oc_dict.m
index f98a27ea..f98a27ea 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50625-sp_inside_braces_oc_dict.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50625-sp_inside_braces_oc_dict.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50626-chunk_ends_type4.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50626-chunk_ends_type4.m
index dd4d55fe..dd4d55fe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50626-chunk_ends_type4.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50626-chunk_ends_type4.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50627-method_ends_semicolon.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50627-method_ends_semicolon.m
index b1ca36fa..b1ca36fa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50627-method_ends_semicolon.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50627-method_ends_semicolon.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50628-macro-close-brace.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50628-macro-close-brace.m
index 0eb3fa81..0eb3fa81 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50628-macro-close-brace.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50628-macro-close-brace.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50629-pp_bool.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50629-pp_bool.m
index b1bf896c..b1bf896c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50629-pp_bool.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50629-pp_bool.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50630-nl_func_call_args_multi_line_ignore_closures.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.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.74.0/tests/expected/oc/50630-nl_func_call_args_multi_line_ignore_closures.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50630-nl_func_call_args_multi_line_ignore_closures.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50700-cmt_insert.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50700-cmt_insert.m
index ec94c42b..ec94c42b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50700-cmt_insert.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50700-cmt_insert.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50701-cmt_insert2.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50701-cmt_insert2.m
index 7a90cc57..7a90cc57 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50701-cmt_insert2.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50701-cmt_insert2.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50800-properties.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50800-properties.m
index fa9ca930..fa9ca930 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50800-properties.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50800-properties.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50801-i1213.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50801-i1213.m
index f47e5964..f47e5964 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50801-i1213.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50801-i1213.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50802-available.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50802-available.m
index 5054043a..5054043a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50802-available.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50802-available.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50803-indent_single_newline.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50803-indent_single_newline.m
index a70184e5..a70184e5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50803-indent_single_newline.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50803-indent_single_newline.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50804-issue_2629.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50804-issue_2629.m
index 6d6cbf30..6d6cbf30 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50804-issue_2629.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50804-issue_2629.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50805-issue_2724.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50805-issue_2724.m
index 23241732..23241732 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50805-issue_2724.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50805-issue_2724.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50810-bug_841.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50810-bug_841.m
index 8e8a6713..8e8a6713 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50810-bug_841.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50810-bug_841.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50811-bug_1674.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50811-bug_1674.m
index 7d23b230..7d23b230 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50811-bug_1674.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50811-bug_1674.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50812-bug_1683.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50812-bug_1683.m
index 3ee562c0..3ee562c0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50812-bug_1683.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50812-bug_1683.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50813-sp_before_oc_proto_list.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50813-sp_before_oc_proto_list.m
index 65d13399..65d13399 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50813-sp_before_oc_proto_list.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50813-sp_before_oc_proto_list.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50814-sp_before_oc_proto_list.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50814-sp_before_oc_proto_list.m
index be1f49ed..be1f49ed 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50814-sp_before_oc_proto_list.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50814-sp_before_oc_proto_list.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50815-sp_before_oc_proto_list.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50815-sp_before_oc_proto_list.m
index 1fef0cc4..1fef0cc4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50815-sp_before_oc_proto_list.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50815-sp_before_oc_proto_list.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50816-issue_2675.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50816-issue_2675.m
index ccb80f6b..ccb80f6b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50816-issue_2675.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50816-issue_2675.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50817-issue_2722.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50817-issue_2722.m
index 8919895a..8919895a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50817-issue_2722.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50817-issue_2722.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50900-1927.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50900-1927.m
index 3ae39e47..3ae39e47 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50900-1927.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50900-1927.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50901-Issue_2172.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50901-Issue_2172.m
index efa73591..efa73591 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50901-Issue_2172.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50901-Issue_2172.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50902-Issue_2289.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50902-Issue_2289.m
index 19fe5cdf..19fe5cdf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50902-Issue_2289.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50902-Issue_2289.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50903-Issue_681.oc b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50903-Issue_681.oc
index 1e71cdaa..1e71cdaa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50903-Issue_681.oc
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50903-Issue_681.oc
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50904-double_angle_space.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50904-double_angle_space.m
index 0e6c0c0c..0e6c0c0c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50904-double_angle_space.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50904-double_angle_space.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50905-double_angle_space.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50905-double_angle_space.m
index 9636a38e..9636a38e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50905-double_angle_space.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50905-double_angle_space.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50906-double_angle_space.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50906-double_angle_space.m
index 5c16c25f..5c16c25f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/50906-double_angle_space.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/50906-double_angle_space.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/51000-sp_cond_ternary_short.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/51000-sp_cond_ternary_short.m
index 6c1ce050..6c1ce050 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/51000-sp_cond_ternary_short.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/51000-sp_cond_ternary_short.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/51001-ns_enum-i.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/51001-ns_enum-i.m
index e5caad06..e5caad06 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/51001-ns_enum-i.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/51001-ns_enum-i.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/51002-sp_oc_catch.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/51002-sp_oc_catch.m
index 391b8df8..391b8df8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/51002-sp_oc_catch.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/51002-sp_oc_catch.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/51003-sp_oc_catch.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/51003-sp_oc_catch.m
index c214c848..c214c848 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/51003-sp_oc_catch.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/51003-sp_oc_catch.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/51004-block_pointer.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/51004-block_pointer.m
index ab51e3d2..ab51e3d2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/oc/51004-block_pointer.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/51004-block_pointer.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/60011-UNI-11095.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/60011-UNI-11095.mm
index 4f88df51..4f88df51 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/60011-UNI-11095.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/oc/60011-UNI-11095.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/pawn/60000-functions.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/pawn/60000-functions.pawn
index 853c70ad..853c70ad 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/pawn/60000-functions.pawn
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/pawn/60000-functions.pawn
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/pawn/60001-comment.p b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/pawn/60001-comment.p
index f63deb62..f63deb62 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/pawn/60001-comment.p
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/pawn/60001-comment.p
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/pawn/60002-traffic.p b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/pawn/60002-traffic.p
index a902e497..a902e497 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/pawn/60002-traffic.p
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/pawn/60002-traffic.p
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/pawn/60003-tags.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/pawn/60003-tags.pawn
index b21f7679..b21f7679 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/pawn/60003-tags.pawn
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/pawn/60003-tags.pawn
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/pawn/60004-enum.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/pawn/60004-enum.pawn
index 7dd318f3..7dd318f3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/pawn/60004-enum.pawn
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/pawn/60004-enum.pawn
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/pawn/60005-unbraced.p b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/pawn/60005-unbraced.p
index 1a22a3af..1a22a3af 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/pawn/60005-unbraced.p
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/pawn/60005-unbraced.p
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/pawn/60010-str-escape.p b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/pawn/60010-str-escape.p
index 3aa54453..3aa54453 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/pawn/60010-str-escape.p
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/pawn/60010-str-escape.p
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/pawn/60020-switch-vsemi.sma b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/pawn/60020-switch-vsemi.sma
index a0c720f7..a0c720f7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/pawn/60020-switch-vsemi.sma
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/pawn/60020-switch-vsemi.sma
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/pawn/60030-crusty_ex-1.sma b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/pawn/60030-crusty_ex-1.sma
index 23e042dd..23e042dd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/pawn/60030-crusty_ex-1.sma
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/pawn/60030-crusty_ex-1.sma
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/pawn/60040-preproc.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/pawn/60040-preproc.pawn
index 6df8101f..6df8101f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/pawn/60040-preproc.pawn
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/pawn/60040-preproc.pawn
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/pawn/60050-gh419.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/pawn/60050-gh419.pawn
index 9db7b08f..9db7b08f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/pawn/60050-gh419.pawn
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/pawn/60050-gh419.pawn
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/pawn/60100-Issue_2586.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/pawn/60100-Issue_2586.pawn
index e3eed47c..e3eed47c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/pawn/60100-Issue_2586.pawn
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/pawn/60100-Issue_2586.pawn
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/pawn/60101-Issue_2665.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/pawn/60101-Issue_2665.pawn
index 90fcbd07..90fcbd07 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/pawn/60101-Issue_2665.pawn
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/pawn/60101-Issue_2665.pawn
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/sql/02400-mysql.sqc b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/sql/02400-mysql.sqc
index ec8ad604..ec8ad604 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/sql/02400-mysql.sqc
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/sql/02400-mysql.sqc
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/sql/02401-sta-select.sqc b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/sql/02401-sta-select.sqc
index 1142c3b9..1142c3b9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/sql/02401-sta-select.sqc
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/sql/02401-sta-select.sqc
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/sql/02402-issue_527.sqc b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/sql/02402-issue_527.sqc
index 17ccfa3b..17ccfa3b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/sql/02402-issue_527.sqc
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/sql/02402-issue_527.sqc
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/vala/70000-list.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/vala/70000-list.vala
index 1893dcb5..1893dcb5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/vala/70000-list.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/vala/70000-list.vala
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/vala/70001-advanced.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/vala/70001-advanced.vala
index ca88a821..ca88a821 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/vala/70001-advanced.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/vala/70001-advanced.vala
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/vala/70010-verbatim_str.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/vala/70010-verbatim_str.vala
index fb0824ae..fb0824ae 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/vala/70010-verbatim_str.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/vala/70010-verbatim_str.vala
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/vala/70011-verbatim_str2.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/vala/70011-verbatim_str2.vala
index c607d7b4..c607d7b4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/vala/70011-verbatim_str2.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/vala/70011-verbatim_str2.vala
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/vala/70012-verbatim_str2.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/vala/70012-verbatim_str2.vala
index c253b86b..c253b86b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/vala/70012-verbatim_str2.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/vala/70012-verbatim_str2.vala
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/vala/70020-preproc.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/vala/70020-preproc.vala
index 9cc1ba1a..9cc1ba1a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/vala/70020-preproc.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/vala/70020-preproc.vala
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/vala/70287-gh287.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/vala/70287-gh287.vala
index be39a9db..be39a9db 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/vala/70287-gh287.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/vala/70287-gh287.vala
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/vala/70300-Issue_2090.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/vala/70300-Issue_2090.vala
index 5b4e1716..5b4e1716 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/vala/70300-Issue_2090.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/vala/70300-Issue_2090.vala
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/vala/70301-Issue_2270.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/vala/70301-Issue_2270.vala
index 2202627c..2202627c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/vala/70301-Issue_2270.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.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.75.0/tests/expected/vala/70302-cast.vala
new file mode 100644
index 00000000..6c5d11db
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/vala/70302-cast.vala
@@ -0,0 +1,7 @@
+foo = (Type) bar;
+
+foo = (Ns.Type) bar;
+
+foo = (Type<int>) bar;
+
+foo = (Type<int, int>) bar;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/vala/70303-nullable.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/vala/70303-nullable.vala
new file mode 100644
index 00000000..54c24643
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/expected/vala/70303-nullable.vala
@@ -0,0 +1,14 @@
+Vector2? a;
+Vector2 b;
+
+void G()
+{
+	int? x = true ? null : (int?)2;
+	var q = x == null ? y : z;
+	var q2 = x == q ? y : z;
+	var q3 = x == null ? (y = new Y()) : z;
+	var q4 = x == q ? (y = new Y()) : z;
+
+	var q5 = x == null ? y = new Y() : z;
+	var q6 = x == q ? y = new Y() : z;
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/fixtest.sh b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/fixtest.sh
index 76fac4bf..76fac4bf 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/fixtest.sh
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/fixtest.sh
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/imported.test b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/imported.test
index b20f0247..b20f0247 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/imported.test
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/imported.test
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/1225.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/1225.c
index c6533cb1..c6533cb1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/1225.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/1225.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue-2278.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue-2278.c
index 1ecfecf5..1ecfecf5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue-2278.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue-2278.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_2279.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_2279.c
index 88c0ae84..88c0ae84 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_2279.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_2279.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_2360.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_2360.c
index dd4530c7..dd4530c7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_2360.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_2360.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_2411.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_2411.c
index 40244488..40244488 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_2411.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_2411.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_2640.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_2640.c
index ba25bcbe..ba25bcbe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_2640.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_2640.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_2845.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_2845.h
index 9f34b1dc..9f34b1dc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_2845.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_2845.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3169.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3169.c
index bf67ca55..bf67ca55 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3169.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.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.75.0/tests/input/c/Issue_3192.c
new file mode 100644
index 00000000..d8fde2a6
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3192.c
@@ -0,0 +1,3 @@
+struct a *
+myfunc()
+{}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3233.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3233.c
index 5cfdff8f..5cfdff8f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3233.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3233.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3269.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3269.c
index 5b7de8e6..5b7de8e6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3269.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3269.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3272.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3272.h
index 673c5a91..673c5a91 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3272.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3272.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3274.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3274.c
index f8b9f789..f8b9f789 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3274.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3274.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3327.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3327.c
index 883c5436..883c5436 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3327.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3327.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3339.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3339.c
index 9f445c1a..9f445c1a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3339.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3339.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3342.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3342.c
index 986aab70..986aab70 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3342.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3342.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3343.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3343.c
index 3c21608b..3c21608b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3343.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3343.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3345.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3345.c
index eec63b28..eec63b28 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3345.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3345.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3351.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3351.c
index 889d731a..889d731a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3351.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.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.75.0/tests/input/c/Issue_3353.h
new file mode 100644
index 00000000..f189ebfa
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3353.h
@@ -0,0 +1,6 @@
+struct A {
+    void (*in)(
+        void);
+    void (*out)(
+        void);
+};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3356.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3356.c
index de2dba21..de2dba21 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3356.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3356.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3362.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3362.c
index 7a8c08f3..7a8c08f3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3362.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3362.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3366.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3366.c
index 769c2f94..769c2f94 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3366.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3366.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3370.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3370.c
index 79081331..79081331 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3370.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3370.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3376.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3376.c
index 084e9c7d..084e9c7d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3376.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3376.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3377.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3377.c
index 99cb0d84..99cb0d84 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/Issue_3377.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.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.75.0/tests/input/c/Issue_3402.c
new file mode 100644
index 00000000..569d5e3a
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3402.c
@@ -0,0 +1,3 @@
+int *    variable;
+int (*    function)(void);
+typedef int (*    function_type)(void);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3421.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3421.h
new file mode 100644
index 00000000..b66478fb
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3421.h
@@ -0,0 +1,9 @@
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int foobar(void);
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3431.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3431.c
new file mode 100644
index 00000000..b0d9246d
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3431.c
@@ -0,0 +1,15 @@
+int add(
+int a,
+int b
+#define HAVE_C
+#ifdef HAVE_C
+, int c
+#endif
+)
+{
+int sum = a + b;
+#ifdef HAVE_C
+sum += c;
+#endif
+return sum;
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3436.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3436.c
new file mode 100644
index 00000000..d921d9ed
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3436.c
@@ -0,0 +1,15 @@
+#include <stdio.h>
+
+int main(void)
+{
+	puts("");
+	puts(""
+	       );
+	puts(""
+	     );
+	puts(""
+	    );
+	puts(""
+	);
+	return 0;
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3454.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3454.c
new file mode 100644
index 00000000..8be230dd
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3454.c
@@ -0,0 +1,99 @@
+int array1[] = { 1
+    , 2
+    , 3 };
+
+int array2[] = {1
+              , 2
+              , 3};
+
+int array3[] = { 1
+               , 2
+               , 3 };
+
+int array4[] = {  1
+                , 2
+                , 3 };
+
+int array5[] = {   1
+                 , 2
+                 , 3 };
+
+int function1( int a
+    , int b
+    , int c );
+
+int function2(int a
+            , int b
+            , int c);
+
+int function3( int a
+             , int b
+             , int c );
+
+int function4(  int a
+              , int b
+              , int c );
+
+int function5(   int a
+               , int b
+               , int c );
+
+int function1( int a
+    , int b
+    , int c )
+{
+    return a + b + c;
+}
+
+int function2(int a
+            , int b
+            , int c)
+{
+    return a + b + c;
+}
+
+int function3( int a
+             , int b
+             , int c )
+{
+    return a + b + c;
+}
+
+int function4(  int a
+              , int b
+              , int c )
+{
+    return a + b + c;
+}
+
+int function5(   int a
+               , int b
+               , int c )
+{
+    return a + b + c;
+}
+
+int main(void)
+{
+    function1( 1
+        , 2
+        , 3 );
+
+    function2(1
+            , 2
+            , 3);
+
+    function3( 1
+             , 2
+             , 3 );
+
+    function4(  1
+              , 2
+              , 3 );
+
+    function5(   1
+               , 2
+               , 3 );
+
+    return 0;
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3457.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3457.c
new file mode 100644
index 00000000..e76affa4
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/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/input/c/Issue_3472.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3472.c
new file mode 100644
index 00000000..d180a700
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3472.c
@@ -0,0 +1,30 @@
+int a, b;
+
+int main()
+{
+    if (a
+     && b)
+    {
+        return 1;
+    }
+
+    if (  a
+       && b)
+    {
+        return 2;
+    }
+
+    if (   a
+        && b)
+    {
+        return 3;
+    }
+
+    if (    a
+         && b)
+    {
+        return 4;
+    }
+
+    return 0;
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3476.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3476.c
new file mode 100644
index 00000000..92a7b0c0
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3476.c
@@ -0,0 +1,38 @@
+int a;
+int b;
+int c;
+
+int main()
+{
+    if (a
+      & b)
+    {
+        return 1;
+    }
+
+    if ( a
+       | b )
+    {
+        return 2;
+    }
+
+    if (  a
+        ^ b)
+    {
+        return 3;
+    }
+
+    c = a
+     + b;
+
+    c = a
+     - b;
+
+    c =  a
+       * b;
+
+    c =   a
+        / b;
+
+    return 0;
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3480.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3480.c
new file mode 100644
index 00000000..6a25879a
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3480.c
@@ -0,0 +1,26 @@
+int a;
+int b;
+int c;
+
+int main()
+{
+    if (a
+     << b)
+    {
+        return 1;
+    }
+
+    if ( a
+      >> b )
+    {
+        return 2;
+    }
+
+    c = a
+    << b;
+
+    c = a
+     >> b;
+
+    return 0;
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3493.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3493.c
new file mode 100644
index 00000000..66554d57
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3493.c
@@ -0,0 +1,20 @@
+int main(void)
+{
+    int a = 1 +
+            2
+            ;
+
+    int b = 3 +
+            4
+          ;
+
+    int c = 5 +
+            6
+        ;
+
+    int d = 7 +
+            8
+    ;
+
+    return 0;
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3496.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3496.h
new file mode 100644
index 00000000..b0509bd5
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3496.h
@@ -0,0 +1,3 @@
+enum{ A = 0 };
+
+enum  { B = 1 };
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3516.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3516.c
new file mode 100644
index 00000000..2f591b75
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3516.c
@@ -0,0 +1,10 @@
+void g () {
+  h();
+  int x;
+  return;
+  {
+    h();
+    int x;
+    return;
+  }
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3518.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3518.c
new file mode 100644
index 00000000..cf8d0c95
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3518.c
@@ -0,0 +1,10 @@
+void g () {
+	h();
+	int x;
+	return;
+	{
+		h();
+		int x;
+		return;
+	}
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3548.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3548.c
new file mode 100644
index 00000000..71824adc
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3548.c
@@ -0,0 +1,21 @@
+bool is_inside(int num)
+{
+	bool inside;
+
+	inside = num >= 3
+	   && num <= 10;
+
+	return num <= 3
+	   && num >= 10;
+}
+
+bool is_outside(int num)
+{
+	bool outside;
+
+	outside = num < 3
+	   || num > 10;
+
+	return num < 3
+	   || num > 10;
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3556.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3556.c
new file mode 100644
index 00000000..423e07f0
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3556.c
@@ -0,0 +1,33 @@
+int main(void)
+{
+    int a
+   = -1;
+    int b
+     = 0;
+    int c
+      = 1;
+    a
+   = -1;
+    b
+     = 0;
+    c
+      = 1;
+    if (a
+   = -1)
+    {
+        return a
+       = -1;
+    }
+    if (b
+     = 0)
+    {
+        return b
+         = 0;
+    }
+    if (c
+      = 1)
+    {
+        return c
+          = 1;
+    }
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3561.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3561.c
new file mode 100644
index 00000000..db5c5afc
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3561.c
@@ -0,0 +1,8 @@
+#include <math.h>
+
+int main(void)
+{
+    int x = abs
+               (-1);
+    return 0;
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3565.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3565.c
new file mode 100644
index 00000000..267e25bd
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3565.c
@@ -0,0 +1,3 @@
+#define RETURN_ON_ERROR(error) \
+    if (error /* zero means no error */) \
+        return;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3567.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3567.c
new file mode 100644
index 00000000..e81c7672
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3567.c
@@ -0,0 +1,10 @@
+int main
+(void);
+int main
+(void)
+{
+int x = main
+();
+main
+();
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3580.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3580.c
new file mode 100644
index 00000000..2b6b7e43
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3580.c
@@ -0,0 +1,35 @@
+#include <stdio.h>
+
+int main(int argc, char **argv)
+{
+    switch (argc)
+    {
+    case -1:
+  {
+  printf("Negative args shouldn't be possible\n");
+  break;
+  }
+    case 0:
+    {
+    printf("Zero args can happen but shouldn't\n");
+    break;
+    }
+    case 1:
+      {
+      printf("One arg\n");
+      break;
+      }
+    case 2:
+        {
+        printf("Two args\n");
+        break;
+        }
+    default:
+          {
+          printf("%i args\n", argc);
+          break;
+          }
+    }
+
+    return 0;
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3582.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3582.c
new file mode 100644
index 00000000..ebcc648b
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3582.c
@@ -0,0 +1,48 @@
+#include <stdio.h>
+
+int main(void)
+{
+  #if A
+  {
+  printf("A enabled\n");
+  }
+  #endif
+    #if B
+    {
+    printf("B enabled\n");
+    }
+    #endif
+      #if C
+      {
+      printf("C enabled\n");
+      }
+      #endif
+        #if D
+        {
+        printf("D enabled\n");
+        }
+        #endif
+          #if E
+          {
+          printf("E enabled\n");
+          }
+          #endif
+
+  #if A
+  printf("A enabled\n");
+  #endif
+    #if B
+    printf("B enabled\n");
+    #endif
+      #if C
+      printf("C enabled\n");
+      #endif
+        #if D
+        printf("D enabled\n");
+        #endif
+          #if E
+          printf("E enabled\n");
+          #endif
+
+    return 0;
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3587.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3587.h
new file mode 100644
index 00000000..3744884f
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3587.h
@@ -0,0 +1,9 @@
+#ifdef __cplusplus
+    extern "C" {
+#endif
+
+int foo(void);
+
+#ifdef __cplusplus
+    }
+#endif
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3601.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3601.c
new file mode 100644
index 00000000..a2b92fa0
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/Issue_3601.c
@@ -0,0 +1 @@
+struct cage cages[MAX_CAGES * sizeof(struct cage)];
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/add_long_comment.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/add_long_comment.c
index 5900de52..5900de52 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/add_long_comment.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/add_long_comment.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/align-equ.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/align-equ.c
index 374ccbfb..374ccbfb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/align-equ.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/align-equ.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/align-proto-vars.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/align-proto-vars.c
index e1dd71ff..e1dd71ff 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/align-proto-vars.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/align-proto-vars.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/align-proto.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/align-proto.c
index 64dfce00..64dfce00 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/align-proto.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/align-proto.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/align-string.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/align-string.c
index f652e88f..f652e88f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/align-string.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/align-string.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/align-struct-init.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/align-struct-init.c
index 084994ff..084994ff 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/align-struct-init.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/align-struct-init.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/align-typedef.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/align-typedef.c
index ae17eb4d..ae17eb4d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/align-typedef.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/align-typedef.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/align-var.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/align-var.c
index adbf8a98..adbf8a98 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/align-var.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/align-var.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/align_attr.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/align_attr.c
index 0f4cfee1..0f4cfee1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/align_attr.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/align_attr.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/align_func_proto_star_amp.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/align_func_proto_star_amp.h
index 17a7c5ce..17a7c5ce 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/align_func_proto_star_amp.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/align_func_proto_star_amp.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/align_keep_extra.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/align_keep_extra.c
index 2bc0f532..2bc0f532 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/align_keep_extra.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/align_keep_extra.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/align_sf_call_span_418.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/align_sf_call_span_418.c
index 421b9547..421b9547 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/align_sf_call_span_418.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/align_sf_call_span_418.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/align_sf_call_span_419.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/align_sf_call_span_419.c
index 421b9547..421b9547 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/align_sf_call_span_419.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/align_sf_call_span_419.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/align_sf_call_thresh_416.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/align_sf_call_thresh_416.c
index f4f6606e..f4f6606e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/align_sf_call_thresh_416.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/align_sf_call_thresh_416.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/align_sf_call_thresh_417.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/align_sf_call_thresh_417.c
index c3c881eb..c3c881eb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/align_sf_call_thresh_417.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/align_sf_call_thresh_417.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/align_stack.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/align_stack.c
index 0f88df06..0f88df06 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/align_stack.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/align_stack.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/asm.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/asm.c
index 1fb5015c..1fb5015c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/asm.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/asm.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/attribute.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/attribute.c
index babe229f..babe229f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/attribute.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/attribute.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/backslash-newline-lex.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/backslash-newline-lex.c
index 0f20388c..0f20388c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/backslash-newline-lex.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/backslash-newline-lex.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/beautifier-off.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/beautifier-off.c
index 033179cb..033179cb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/beautifier-off.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/beautifier-off.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/bits.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bits.c
index 9a12f484..9a12f484 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/bits.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bits.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/bool-pos.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bool-pos.c
index d6887223..d6887223 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/bool-pos.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bool-pos.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/br_cmt.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/br_cmt.c
index 4e57d2de..4e57d2de 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/br_cmt.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/br_cmt.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/brace-remove.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/brace-remove.c
index c62506e3..c62506e3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/brace-remove.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/brace-remove.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/brace-remove2.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/brace-remove2.c
index e5b73723..e5b73723 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/brace-remove2.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/brace-remove2.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/brace-remove3.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/brace-remove3.c
index 9cde8bbd..9cde8bbd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/brace-remove3.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/brace-remove3.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/brace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/brace.c
index 31f3b42b..31f3b42b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/brace.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/brace.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/braces-2.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/braces-2.c
index a34d73d8..a34d73d8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/braces-2.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/braces-2.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/braces-3.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/braces-3.c
index 1f1a2066..1f1a2066 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/braces-3.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/braces-3.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/braces-4.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/braces-4.c
index 385f4a8e..385f4a8e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/braces-4.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/braces-4.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/braces-5.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/braces-5.c
index c77cc912..c77cc912 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/braces-5.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/braces-5.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/braces.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/braces.c
index 20733afc..20733afc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/braces.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/braces.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/bsnl.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bsnl.c
index b2b38b8e..b2b38b8e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/bsnl.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bsnl.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/bug_1041.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bug_1041.c
index 193c750b..193c750b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/bug_1041.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bug_1041.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/bug_1196.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bug_1196.c
index 9fdabca6..9fdabca6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/bug_1196.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bug_1196.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/bug_1702.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bug_1702.c
index bf74c8bd..bf74c8bd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/bug_1702.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bug_1702.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/bug_1718.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bug_1718.c
index eaddc974..eaddc974 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/bug_1718.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bug_1718.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/bug_2331.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bug_2331.c
index f30c53d3..f30c53d3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/bug_2331.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bug_2331.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/bug_3156.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bug_3156.c
index 508a0098..508a0098 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/bug_3156.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bug_3156.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/bug_489.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bug_489.c
index e83d351b..e83d351b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/bug_489.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bug_489.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/bug_671.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bug_671.c
index 01a3b02b..01a3b02b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/bug_671.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bug_671.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/bug_i_222.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bug_i_222.c
index 4f0ded31..4f0ded31 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/bug_i_222.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bug_i_222.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/bug_i_771.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bug_i_771.c
index c933487d..c933487d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/bug_i_771.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bug_i_771.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/bug_i_876.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bug_i_876.c
index ab2a05db..ab2a05db 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/bug_i_876.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bug_i_876.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/bugs-1.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bugs-1.c
index 39050c07..39050c07 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/bugs-1.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bugs-1.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/bugs-2.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bugs-2.c
index 42bed259..42bed259 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/bugs-2.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bugs-2.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/bugs-3.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bugs-3.c
index 4f85044a..4f85044a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/bugs-3.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bugs-3.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/bugs-4.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bugs-4.c
index e01c2c32..e01c2c32 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/bugs-4.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bugs-4.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/bugs-5.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bugs-5.c
index 626eb7e6..626eb7e6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/bugs-5.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bugs-5.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/bugs-6.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bugs-6.c
index 99ebbdda..99ebbdda 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/bugs-6.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bugs-6.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/bugs-7.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bugs-7.c
index a879aa17..a879aa17 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/bugs-7.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bugs-7.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/bugs-8.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bugs-8.c
index 8870a663..8870a663 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/bugs-8.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bugs-8.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/bugs.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bugs.c
index d75a4782..d75a4782 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/bugs.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/bugs.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/case-nl_before_return.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/case-nl_before_return.c
index 67adaddd..67adaddd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/case-nl_before_return.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/case-nl_before_return.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/case.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/case.c
index ffceda0e..ffceda0e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/case.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/case.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/cast_brace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/cast_brace.c
index 7ec7f67a..7ec7f67a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/cast_brace.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/cast_brace.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/casts.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/casts.c
index f09f5c5e..f09f5c5e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/casts.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/casts.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/clang-has_include.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/clang-has_include.h
index d153e70a..d153e70a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/clang-has_include.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/clang-has_include.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/cmt-align.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/cmt-align.c
index 658bac4d..658bac4d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/cmt-align.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/cmt-align.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/cmt_multi.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/cmt_multi.c
index 8e01c5fc..8e01c5fc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/cmt_multi.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/cmt_multi.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/cmt_multi_utf8.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/cmt_multi_utf8.c
index 05b01f84..05b01f84 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/cmt_multi_utf8.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/cmt_multi_utf8.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/cmt_nl_end.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/cmt_nl_end.c
index 48929d07..48929d07 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/cmt_nl_end.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/cmt_nl_end.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/cmt_reflow.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/cmt_reflow.c
index 6c40e11b..6c40e11b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/cmt_reflow.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/cmt_reflow.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/cmt_right_align.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/cmt_right_align.c
index b707f0bb..b707f0bb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/cmt_right_align.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/cmt_right_align.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/code_width.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/code_width.c
index 1b2fbbaa..2262afe3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/code_width.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/code_width.c
@@ -36,11 +36,11 @@ static void some_really_long_function_name(struct device *dev, struct device_dri
    {
    }
 
-   for (a = get_first(); a != NULL; a = get_next(a))
+   for (a = get_first(); a != NULL; a = GetNext(a))
    {
    }
 
-   for (a_ptr = get_first(); a_ptr != NULL; a_ptr = get_next(a))
+   for (a_ptr = get_first(); a_ptr != NULL; a_ptr = GetNext(a))
    {
    }
 
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/colon-asm.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/colon-asm.c
index 5125af19..5125af19 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/colon-asm.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/colon-asm.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/comment-convert.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/comment-convert.c
index 4282ab0b..4282ab0b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/comment-convert.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/comment-convert.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/comment-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/comment-indent.c
index d5295d6e..d5295d6e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/comment-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/comment-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/cond.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/cond.c
index aec2f0a3..aec2f0a3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/cond.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/cond.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/custom_types_ssl.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/custom_types_ssl.c
index 0454f81d..0454f81d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/custom_types_ssl.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/custom_types_ssl.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/define-if-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/define-if-indent.c
index 1ef47273..1ef47273 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/define-if-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/define-if-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/deref.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/deref.c
index 100464fb..100464fb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/deref.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/deref.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/directfb.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/directfb.h
index 3531fa21..3531fa21 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/directfb.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/directfb.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/dos.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/dos.c
index 108c3b1c..108c3b1c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/dos.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/dos.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/double-sparen.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/double-sparen.c
index e76c3ea1..e76c3ea1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/double-sparen.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/double-sparen.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/doxy-comment.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/doxy-comment.c
index ef0414ac..ef0414ac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/doxy-comment.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/doxy-comment.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/else-if.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/else-if.c
index 06cc37f2..06cc37f2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/else-if.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/else-if.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/empty-for.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/empty-for.c
index d9fb686a..d9fb686a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/empty-for.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/empty-for.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/endif.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/endif.c
index fd621299..fd621299 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/endif.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/endif.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/enum-struct-init.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/enum-struct-init.c
index 6660e4a4..6660e4a4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/enum-struct-init.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/enum-struct-init.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/enum_comma_ifdef.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/enum_comma_ifdef.c
index aa80cf48..aa80cf48 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/enum_comma_ifdef.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/enum_comma_ifdef.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/enum_gallery.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/enum_gallery.c
index 2be93194..2be93194 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/enum_gallery.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/enum_gallery.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/extern.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/extern.c
index 3bcfcbe5..3bcfcbe5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/extern.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/extern.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/fcn_indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/fcn_indent.c
index ff9f812b..ff9f812b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/fcn_indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/fcn_indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/fcn_indent_func_def_col1.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/fcn_indent_func_def_col1.c
index 235731c2..235731c2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/fcn_indent_func_def_col1.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/fcn_indent_func_def_col1.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/fcn_type.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/fcn_type.c
index d49d381d..d49d381d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/fcn_type.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/fcn_type.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/for-space.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/for-space.c
index 1064d493..1064d493 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/for-space.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/for-space.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/forever.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/forever.c
index 94dc8ce1..94dc8ce1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/forever.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/forever.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/freebsd.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/freebsd.c
index c9ef164f..c9ef164f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/freebsd.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/freebsd.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/func_call_user.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/func_call_user.c
index 275d8c5e..275d8c5e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/func_call_user.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/func_call_user.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/func_call_user2.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/func_call_user2.c
index 38ecb232..38ecb232 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/func_call_user2.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/func_call_user2.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/func_wrap.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/func_wrap.c
index 7589d03b..7589d03b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/func_wrap.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/func_wrap.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/funcfunc.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/funcfunc.c
index ee717abc..ee717abc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/funcfunc.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/funcfunc.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/function-def.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/function-def.c
index 778d121f..778d121f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/function-def.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/function-def.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/gh399.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/gh399.c
index 00f868a3..00f868a3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/gh399.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/gh399.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/global-vars.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/global-vars.c
index 9576341b..9576341b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/global-vars.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/global-vars.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/hello.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/hello.c
index 5849783c..5849783c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/hello.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/hello.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/i1270.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/i1270.c
index 4831a47a..4831a47a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/i1270.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/i1270.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/i1413.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/i1413.c
index 4287ca86..4287ca86 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/i1413.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/i1413.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/i1564.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/i1564.c
index c906ef9b..c906ef9b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/i1564.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/i1564.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/i2c-core.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/i2c-core.c
index 29bdb584..29bdb584 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/i2c-core.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/i2c-core.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/if_chain.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/if_chain.c
index 948492dd..948492dd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/if_chain.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/if_chain.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/ifdef-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/ifdef-indent.c
index 5043c01f..5043c01f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/ifdef-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/ifdef-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/ifdef-nest.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/ifdef-nest.c
index 68baf1fc..68baf1fc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/ifdef-nest.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/ifdef-nest.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/include-guard.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/include-guard.h
index 03625573..03625573 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/include-guard.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/include-guard.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/include_define.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/include_define.h
index 13380cac..13380cac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/include_define.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/include_define.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/indent-assign.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/indent-assign.c
index 58ed9c52..58ed9c52 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/indent-assign.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/indent-assign.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/indent-macro-brace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/indent-macro-brace.c
index 8c3f9941..8c3f9941 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/indent-macro-brace.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/indent-macro-brace.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/indent-off-after-assign.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/indent-off-after-assign.c
index d01f58c0..d01f58c0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/indent-off-after-assign.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/indent-off-after-assign.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/indent-vbrace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/indent-vbrace.c
index 8b48e235..8b48e235 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/indent-vbrace.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/indent-vbrace.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/indent_first_bool_expr.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/indent_first_bool_expr.c
index ec68ac3a..ec68ac3a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/indent_first_bool_expr.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/indent_first_bool_expr.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/indent_ternary-1.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/indent_ternary-1.c
index b76e375b..b76e375b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/indent_ternary-1.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/indent_ternary-1.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/indent_ternary-2.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/indent_ternary-2.c
index 20f1df64..20f1df64 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/indent_ternary-2.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/indent_ternary-2.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/kw_subst.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/kw_subst.c
index 5d37f823..5d37f823 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/kw_subst.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/kw_subst.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/lvalue.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/lvalue.c
index 2f2cc17d..2f2cc17d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/lvalue.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/lvalue.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/mac.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/mac.c
index ce4e7937..ce4e7937 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/mac.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/mac.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/macro-returns.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/macro-returns.c
index 0febb263..0febb263 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/macro-returns.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/macro-returns.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/minus-minus.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/minus-minus.c
index 4eb69237..4eb69237 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/minus-minus.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/minus-minus.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/misc.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/misc.c
index cd948007..cd948007 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/misc.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/misc.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/mod-paren.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/mod-paren.c
index 14bb9836..14bb9836 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/mod-paren.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/mod-paren.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/mod_case_brace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/mod_case_brace.c
index 4bd9abde..4bd9abde 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/mod_case_brace.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.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.75.0/tests/input/c/mod_move_case_return.c
new file mode 100644
index 00000000..38dd6a62
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/mod_move_case_return.c
@@ -0,0 +1,41 @@
+static int ConvertEndian(void *ptr, int bytes)
+{
+	switch(bytes)
+	{
+		case 2:
+		{
+			uint16_t *value = (uint16_t *) ptr;
+			
+			*value = bswap_16(*value);
+		}
+		return 1;
+		case 4:
+		{
+			uint32_t *value = (uint32_t *) ptr;
+			
+			*value = bswap_32(*value);
+		}
+		return 1+
+			2+3;
+
+		case 8:
+		{
+			uint64_t *value = (uint64_t *) ptr;
+			
+			*value = bswap_64(*value);
+		}
+
+		return 1+
+
+			2
+
+			+fn(
+
+				x
+			);
+		// comment
+		default:
+			break;
+	}
+	return 0;
+}
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.75.0/tests/input/c/mod_move_case_return_bad.c
new file mode 100644
index 00000000..95d3fb09
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/mod_move_case_return_bad.c
@@ -0,0 +1,52 @@
+static int ConvertEndian(void *ptr, int bytes)
+{
+	switch(bytes)
+	{
+		case 2:
+		{
+			uint16_t *value = (uint16_t *) ptr;
+			
+			*value = bswap_16(*value);
+		}
+		return 1;
+		case 4:
+		{
+			uint32_t *value = (uint32_t *) ptr;
+			
+			*value = bswap_32(*value);
+		}
+		return 1+
+			2+3
+
+		case 8:
+		{
+			uint64_t *value = (uint64_t *) ptr;
+			
+			*value = bswap_64(*value);
+		}
+
+		return 1+
+
+			2
+
+			+fn(
+
+				x
+			)
+		// comment
+		default:
+			break;
+
+		case 16:
+		{
+			{
+				uint32_t *value = (uint32_t *) ptr;
+
+				*value = bswap_32(*value);
+			}
+			return 1+
+				2+3
+		};
+	}
+	return 0;
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/multi.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/multi.h
index 33acea34..33acea34 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/multi.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/multi.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/my_infile.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/my_infile.c
index 8b8cd113..8b8cd113 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/my_infile.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/my_infile.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/negative_value.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/negative_value.c
index 6399fbef..6399fbef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/negative_value.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/negative_value.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/newline_after_endif.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/newline_after_endif.c
index 2a0cbe62..2a0cbe62 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/newline_after_endif.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/newline_after_endif.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/nl-comment.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/nl-comment.c
index 70c49200..70c49200 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/nl-comment.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/nl-comment.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/nl-cont.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/nl-cont.c
index 9f87950f..9f87950f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/nl-cont.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/nl-cont.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/nl-cont2.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/nl-cont2.c
index b3f079e3..b3f079e3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/nl-cont2.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/nl-cont2.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/nl-semicolon.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/nl-semicolon.c
index 8e0f59d3..8e0f59d3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/nl-semicolon.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/nl-semicolon.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/nl-ver-def.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/nl-ver-def.c
index 9684ed27..9684ed27 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/nl-ver-def.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/nl-ver-def.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/nl_assign.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/nl_assign.c
index b2495c13..b2495c13 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/nl_assign.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/nl_assign.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/nl_before_ignore_after_case.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/nl_before_ignore_after_case.c
index 51866fe4..51866fe4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/nl_before_ignore_after_case.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/nl_before_ignore_after_case.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/nl_before_return.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/nl_before_return.c
index da5ed3eb..da5ed3eb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/nl_before_return.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/nl_before_return.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/nl_create_one_liner.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/nl_create_one_liner.c
index 16887eca..16887eca 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/nl_create_one_liner.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/nl_create_one_liner.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/nl_ds_struct_enum.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/nl_ds_struct_enum.c
index d19964ae..d19964ae 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/nl_ds_struct_enum.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/nl_ds_struct_enum.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/nl_endif.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/nl_endif.c
index d738d74a..d738d74a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/nl_endif.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/nl_endif.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/nl_proto_endif.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/nl_proto_endif.c
index f50766b8..f50766b8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/nl_proto_endif.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/nl_proto_endif.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/nl_return_expr.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/nl_return_expr.c
index e917e399..e917e399 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/nl_return_expr.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/nl_return_expr.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/one-liner-define.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/one-liner-define.c
index fdb02e31..fdb02e31 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/one-liner-define.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/one-liner-define.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/one-liner-init.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/one-liner-init.c
index 91d92d55..91d92d55 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/one-liner-init.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/one-liner-init.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/one_liners.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/one_liners.c
index 1f6e0d3e..1f6e0d3e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/one_liners.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/one_liners.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/paren-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/paren-indent.c
index df5b1c14..df5b1c14 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/paren-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/paren-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/paren_indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/paren_indent.c
index 4b0ff447..4b0ff447 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/paren_indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/paren_indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/parenthesized_indirect_call.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/parenthesized_indirect_call.c
index 3d5a6819..3d5a6819 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/parenthesized_indirect_call.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/parenthesized_indirect_call.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/pascal_ptr.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/pascal_ptr.c
index 5b0116ba..5b0116ba 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/pascal_ptr.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/pascal_ptr.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/pos_compare.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/pos_compare.c
index b0942de0..b0942de0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/pos_compare.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/pos_compare.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/pos_conditional.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/pos_conditional.c
index 100545e5..100545e5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/pos_conditional.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/pos_conditional.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/pp-before-func-def.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/pp-before-func-def.c
index 948ce135..948ce135 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/pp-before-func-def.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/pp-before-func-def.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/pp-if-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/pp-if-indent.c
index cd9d6c4d..cd9d6c4d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/pp-if-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/pp-if-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/pp-nest.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/pp-nest.c
index b602471b..b602471b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/pp-nest.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/pp-nest.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/pp-space.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/pp-space.c
index 67cf3e55..67cf3e55 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/pp-space.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/pp-space.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/pp_concat_asn1.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/pp_concat_asn1.h
index 9874cf04..9874cf04 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/pp_concat_asn1.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/pp_concat_asn1.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/pp_ret.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/pp_ret.c
index c35e4294..c35e4294 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/pp_ret.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/pp_ret.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/pragma.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/pragma.c
index a0dcd975..a0dcd975 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/pragma.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/pragma.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/pragma_asm.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/pragma_asm.c
index a7834613..a7834613 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/pragma_asm.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/pragma_asm.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/preproc-if.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/preproc-if.c
index 71fbf792..71fbf792 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/preproc-if.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/preproc-if.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/return-compound-literal.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/return-compound-literal.c
index 8547c3a7..8547c3a7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/return-compound-literal.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/return-compound-literal.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/return-multi.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/return-multi.c
index 846ca21c..846ca21c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/return-multi.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/return-multi.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/semicolons.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/semicolons.c
index d7e2379a..d7e2379a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/semicolons.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/semicolons.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/sf588.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/sf588.c
index d1c5f1cc..d1c5f1cc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/sf588.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/sf588.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/sf594.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/sf594.c
index cd08cce6..cd08cce6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/sf594.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/sf594.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/single_line_comment_after.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/single_line_comment_after.c
index 527b3e80..527b3e80 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/single_line_comment_after.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/single_line_comment_after.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/sort_include.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/sort_include.c
index 0f1956d2..0f1956d2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/sort_include.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/sort_include.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/sp_after_sparen.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/sp_after_sparen.c
index 8a86dd25..8a86dd25 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/sp_after_sparen.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/sp_after_sparen.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/sp_cmt_cpp_start.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/sp_cmt_cpp_start.c
index b9b07287..b9b07287 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/sp_cmt_cpp_start.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/sp_cmt_cpp_start.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/sp_embed_comment.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/sp_embed_comment.c
index 88a54dff..88a54dff 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/sp_embed_comment.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/sp_embed_comment.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/sp_func_call_user_inside_fparen.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/sp_func_call_user_inside_fparen.c
index ba921b9f..ba921b9f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/sp_func_call_user_inside_fparen.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/sp_func_call_user_inside_fparen.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/sparen-indent.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/sparen-indent.c
index fe770681..fe770681 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/sparen-indent.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/sparen-indent.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/string_prefixes.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/string_prefixes.c
index e901c9ac..e901c9ac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/string_prefixes.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/string_prefixes.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/string_utf8.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/string_utf8.c
index a473e1bf..a473e1bf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/string_utf8.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/string_utf8.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/struct-brace.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/struct-brace.c
index 7d08b4ca..7d08b4ca 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/struct-brace.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/struct-brace.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/switch-case.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/switch-case.c
index add9fcfa..add9fcfa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/switch-case.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/switch-case.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/switch.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/switch.c
index 5b760363..5b760363 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/switch.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/switch.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/t3.in.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/t3.in.c
index e352f736..e352f736 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/t3.in.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/t3.in.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/type-cast.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/type-cast.c
index 5760b466..5760b466 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/type-cast.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/type-cast.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/type_wrap.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/type_wrap.c
index 13b74455..13b74455 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/type_wrap.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/type_wrap.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/utf8-identifiers.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/utf8-identifiers.c
index e3281aac..e3281aac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/utf8-identifiers.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/utf8-identifiers.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/vardefcol.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/vardefcol.c
index bdb40e8f..bdb40e8f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/vardefcol.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/vardefcol.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/various_colons.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/various_colons.c
index 516a5a72..516a5a72 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/various_colons.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/various_colons.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/vb-do.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/vb-do.c
index 1cefd1df..1cefd1df 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/vb-do.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/vb-do.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/vb-pp.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/vb-pp.c
index 5ea209c5..5ea209c5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/vb-pp.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/vb-pp.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/vb-while.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/vb-while.c
index 22291748..22291748 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/vb-while.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/vb-while.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/whole_file_ifdef.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/whole_file_ifdef.c
index bb16e116..bb16e116 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/whole_file_ifdef.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/whole_file_ifdef.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/xml.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/xml.c
index fe7afdf4..fe7afdf4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/c/xml.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/c/xml.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/2138.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/2138.cpp
index e0379b43..e0379b43 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/2138.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/2138.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/2185.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/2185.cpp
index 6f874926..6f874926 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/2185.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/2185.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/2203.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/2203.cpp
index 4a2c05fa..4a2c05fa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/2203.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/2203.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/621_this-spacing.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/621_this-spacing.cpp
index bd28a5e8..bd28a5e8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/621_this-spacing.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/621_this-spacing.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/622_ifdef-indentation.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/622_ifdef-indentation.cpp
index a6aface7..a6aface7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/622_ifdef-indentation.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/622_ifdef-indentation.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/623_caret-spacing.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/623_caret-spacing.cpp
index ad1ed6f7..ad1ed6f7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/623_caret-spacing.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/623_caret-spacing.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/633_decl-in-func-typedef.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/633_decl-in-func-typedef.cpp
index 4e18c597..4e18c597 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/633_decl-in-func-typedef.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/633_decl-in-func-typedef.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/634_extern-c-no-block.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/634_extern-c-no-block.cpp
index bb6b14fb..bb6b14fb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/634_extern-c-no-block.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/634_extern-c-no-block.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/DB.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/DB.cpp
index 1b8f4bc8..1b8f4bc8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/DB.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/DB.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/DefaultAndDelete.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/DefaultAndDelete.cpp
index 3c4f3b9e..3c4f3b9e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/DefaultAndDelete.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/DefaultAndDelete.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/DoxygenComments.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/DoxygenComments.cpp
index dfa5a906..dfa5a906 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/DoxygenComments.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/DoxygenComments.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Example.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Example.h
index deede79a..deede79a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Example.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Example.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/I1112-1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/I1112-1.cpp
index 365df31f..365df31f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/I1112-1.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/I1112-1.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/I1112-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/I1112-2.cpp
index c3765ce4..c3765ce4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/I1112-2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/I1112-2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/I1112-3.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/I1112-3.cpp
index 6c48cb63..6c48cb63 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/I1112-3.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/I1112-3.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/I2102.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/I2102.cpp
index d8cf883a..d8cf883a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/I2102.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/I2102.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/I2103.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/I2103.cpp
index ba6386dd..c35fbe56 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/I2103.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/I2103.cpp
@@ -1,2 +1,3 @@
 int i1 = EEnumType::a & EEnumType::b;
 int i2 = a & b;
+int i3 = EEnumType::Enum1 & b;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_1052.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_1052.cpp
index 19461b71..19461b71 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_1052.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_1052.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_1167.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_1167.cpp
index 6a9042c2..6a9042c2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_1167.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_1167.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_1184.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_1184.cpp
index 7c69e7fb..7c69e7fb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_1184.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_1184.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_1460.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_1460.h
index 63787999..63787999 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_1460.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_1460.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_1511.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_1511.cpp
index 2583c0e3..2583c0e3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_1511.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_1511.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_1692.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_1692.cpp
index 4a2c97b5..4a2c97b5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_1692.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_1692.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_1703.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_1703.cpp
index bca40664..bca40664 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_1703.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_1703.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_1704.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_1704.cpp
index 90cb2049..90cb2049 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_1704.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_1704.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_1733.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_1733.cpp
index 10be5586..10be5586 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_1733.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_1733.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_1734.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_1734.cpp
index 31d08c29..31d08c29 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_1734.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_1734.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_1737.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_1737.cpp
index fd8b1384..fd8b1384 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_1737.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_1737.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_1753.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_1753.cpp
index bf5530c3..bf5530c3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_1753.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_1753.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_1813-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_1813-2.cpp
index 9c02605a..9c02605a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_1813-2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_1813-2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_1813-3.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_1813-3.cpp
index 93e0799c..93e0799c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_1813-3.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_1813-3.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_1813.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_1813.cpp
index 0c07555d..0c07555d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_1813.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_1813.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_1923.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_1923.cpp
index e5b3ceeb..e5b3ceeb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_1923.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_1923.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_1966.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_1966.cpp
index 80b7ddc7..80b7ddc7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_1966.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_1966.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2020.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2020.cpp
index 94d0aa28..94d0aa28 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2020.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2020.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2045.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2045.cpp
index 627eba3f..627eba3f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2045.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2045.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2085.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2085.cpp
index 581f4db4..581f4db4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2085.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2085.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2091.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2091.cpp
index 6e32d683..6e32d683 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2091.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2091.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2099.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2099.cpp
index 4726f44b..4726f44b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2099.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2099.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2101.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2101.cpp
index 3e07c686..3e07c686 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2101.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2101.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2138.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2138.cpp
index ad53fa57..ad53fa57 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2138.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2138.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2149.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2149.cpp
index 88fb2249..88fb2249 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2149.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2149.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2150.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2150.cpp
index 1e4d6bf5..1e4d6bf5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2150.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2150.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2151.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2151.cpp
index dce02df3..dce02df3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2151.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2151.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2163.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2163.cpp
index 543b9827..543b9827 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2163.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2163.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2166.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2166.cpp
index d9ac55c7..d9ac55c7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2166.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2166.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2170.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2170.cpp
index beeffc7e..beeffc7e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2170.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2170.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2186.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2186.cpp
index c9cbacda..c9cbacda 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2186.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2186.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2195.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2195.cpp
index 3573b20d..3573b20d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2195.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2195.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2219.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2219.cpp
index cb6e24bf..cb6e24bf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2219.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2219.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2224.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2224.cpp
index 65382eb9..65382eb9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2224.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2224.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2229.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2229.cpp
index 9f575dc1..9f575dc1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2229.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2229.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2232.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2232.cpp
index 7632ed27..7632ed27 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2232.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2232.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2236.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2236.cpp
index 5dbc4fbe..5dbc4fbe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2236.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2236.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2250.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2250.cpp
index 9268c2e3..9268c2e3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2250.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2250.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2281.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2281.cpp
index 44b9e75f..44b9e75f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2281.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2281.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2302.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2302.cpp
index 4763c574..4763c574 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2302.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2302.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2305.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2305.cpp
index 1b35ac11..1b35ac11 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2305.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2305.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2319.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2319.cpp
index 8c0ae3e9..8c0ae3e9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2319.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2319.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2332.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2332.cpp
index 0bc9cf8f..0bc9cf8f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2332.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2332.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2343.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2343.cfg
index 955a1f9a..955a1f9a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2343.cfg
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2343.cfg
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2343.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2343.cpp
index 837b0506..837b0506 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2343.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2343.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2345-3.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2345-3.cpp
index 787ce29b..787ce29b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2345-3.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2345-3.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2345-4.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2345-4.cpp
index 9478d63e..9478d63e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2345-4.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2345-4.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2368.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2368.cpp
index 08d0556b..08d0556b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2368.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2368.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2383.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2383.cpp
index 356fd9af..356fd9af 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2383.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2383.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2386.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2386.cpp
index ac0b1dd4..ac0b1dd4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2386.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2386.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2387.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2387.cpp
index af00e16e..af00e16e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2387.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2387.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2428.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2428.cpp
index c919d5a5..c919d5a5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2428.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2428.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2437.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2437.cpp
index 2a64bd8f..2a64bd8f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2437.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2437.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2440.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2440.cpp
index c52c30da..c52c30da 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2440.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2440.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2440_nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2440_nl.cpp
index c52c30da..c52c30da 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2440_nl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2440_nl.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2478.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2478.cpp
index fbcfec1f..fbcfec1f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2478.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2478.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2561.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2561.cpp
index 15232fc4..15232fc4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2561.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2561.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2565.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2565.cpp
index 721d4d78..721d4d78 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2565.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2565.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2570.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2570.cpp
index 44373e77..44373e77 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2570.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2570.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2574.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2574.cpp
index fc79cd0d..fc79cd0d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2574.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2574.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2582.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2582.cpp
index adf9bfe9..adf9bfe9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2582.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2582.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2591.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2591.cpp
index 01ed232e..01ed232e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2591.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2591.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2594.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2594.cpp
index 798a719a..798a719a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2594.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2594.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2596.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2596.cpp
index d2517e8b..d2517e8b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2596.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2596.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2604.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2604.cpp
index e73c67a8..e73c67a8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2604.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2604.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2668.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2668.cpp
index 1e2f5d02..1e2f5d02 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2668.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2668.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2672-a.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2672-a.cpp
index d29d2c47..d29d2c47 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2672-a.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2672-a.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2672-b.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2672-b.cpp
index f484d4ff..f484d4ff 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2672-b.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2672-b.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2688.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2688.cpp
index 0b394620..0b394620 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2688.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2688.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2689.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2689.cpp
index ef3b5a4b..ef3b5a4b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2689.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2689.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2692.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2692.cpp
index 4173ad5d..4173ad5d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2692.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2692.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2703.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2703.cpp
index ec4554e9..ec4554e9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2703.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2703.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2726.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2726.cpp
index 7b76eb43..7b76eb43 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2726.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2726.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2734.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2734.cpp
index 7b85c0ec..7b85c0ec 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2734.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2734.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2735.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2735.cpp
index f83e3536..f83e3536 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2735.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2735.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2742.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2742.cpp
index 9d76fe44..9d76fe44 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2742.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2742.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2752.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2752.cpp
index 237c8ce1..237c8ce1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2752.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2752.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2757.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2757.cpp
index 3c84969b..3c84969b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2757.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2757.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2758.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2758.cpp
index 1ac9a86e..1ac9a86e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2758.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2758.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2759.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2759.cpp
index cbe9c4a5..cbe9c4a5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2759.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2759.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2771.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2771.cpp
index ab7c285f..ab7c285f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2771.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2771.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2794.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2794.cpp
index 03f2ae4c..03f2ae4c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2794.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2794.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2795.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2795.cpp
index 6cb7e112..6cb7e112 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2795.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2795.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2823.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2823.cpp
index eb0228c9..eb0228c9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2823.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2823.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2831.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2831.cpp
index f2dc1717..f2dc1717 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2831.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2831.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2836.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2836.cpp
index 44272d56..44272d56 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2836.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2836.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2873.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2873.cpp
index af3020d3..af3020d3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2873.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2873.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2879.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2879.cpp
index 294c5e85..294c5e85 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2879.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2879.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2886.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2886.cpp
index 0474c710..0474c710 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2886.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2886.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2890.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2890.cpp
index cea47724..cea47724 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2890.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2890.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2902.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2902.cpp
index ae10d5a9..ae10d5a9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2902.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2902.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2907.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2907.cpp
index 9d42a72d..9d42a72d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2907.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2907.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2910.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2910.cpp
index 82c2bec9..82c2bec9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2910.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2910.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2914.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2914.cpp
index c2cd8b59..c2cd8b59 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2914.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2914.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2921.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2921.cpp
index 43e19e96..43e19e96 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2921.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2921.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2930.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2930.cpp
index 9b130982..9b130982 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2930.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2930.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2942.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2942.cpp
index e5bc781f..e5bc781f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2942.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2942.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2949.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2949.cpp
index d37d7ac3..d37d7ac3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_2949.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.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.75.0/tests/input/cpp/Issue_2957.cpp
new file mode 100644
index 00000000..abb52b72
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2957.cpp
@@ -0,0 +1,6 @@
+bus_type i2c_bus_type = {
+    .name    = "i2c",
+    .match   = i2c_device_match,
+    .suspend = i2c_bus_suspend,
+    .resume  = i2c_bus_resume,
+};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2971.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2971.cpp
new file mode 100644
index 00000000..52e7a253
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_2971.cpp
@@ -0,0 +1,11 @@
+#include <iostream>
+class X33
+{
+   int
+   f1(std::istream* c1)
+   {
+      int i;
+      *c1 >> i;
+      return i;
+   }
+};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3010.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3010.cpp
index b546e7be..b546e7be 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3010.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3010.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3018.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3018.cpp
index ddbb473e..ddbb473e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3018.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3018.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3025.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3025.cpp
index 9e64526e..9e64526e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3025.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3025.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3034.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3034.cpp
index b91f431d..b91f431d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3034.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3034.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3040.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3040.cpp
index fe9aed25..fe9aed25 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3040.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3040.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3044.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3044.cpp
index 739b1305..739b1305 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3044.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3044.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3048.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3048.cpp
index 678d6ce4..678d6ce4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3048.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3048.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3052.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3052.cpp
index cb468be3..cb468be3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3052.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3052.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3054-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3054-2.cpp
index 77d0d337..77d0d337 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3054-2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3054-2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3054.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3054.cpp
index 2d8b38d0..2d8b38d0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3054.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3054.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3055-a.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3055-a.cpp
index 85c9b7e8..85c9b7e8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3055-a.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3055-a.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3055.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3055.cpp
index 4d66bbf3..4d66bbf3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3055.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3055.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3058.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3058.cpp
index f94e88e7..f94e88e7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3058.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3058.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3061_0nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3061_0nl.cpp
index 2a76b5a3..2a76b5a3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3061_0nl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3061_0nl.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3061_1nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3061_1nl.cpp
index fd369e24..fd369e24 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3061_1nl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3061_1nl.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3061_2nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3061_2nl.cpp
index 25906e08..25906e08 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3061_2nl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3061_2nl.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3080.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3080.cpp
index 75c6072b..75c6072b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3080.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3080.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3097.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3097.cpp
index 3959e85a..3959e85a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3097.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3097.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3113.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3113.cpp
index 63090f4a..63090f4a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3113.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3113.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3164.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3164.cpp
index 79fd6508..79fd6508 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3164.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3164.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3176.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3176.cpp
index 2384027d..2384027d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3176.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3176.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3197.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3197.h
index f1ba44b5..f1ba44b5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3197.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3197.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3198.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3198.cpp
index 8dd234b7..8dd234b7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3198.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3198.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3203.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3203.cpp
index 47b37eee..47b37eee 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3203.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3203.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3205.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3205.cpp
index 99767289..99767289 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3205.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3205.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3220.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3220.cpp
index ba42b013..ba42b013 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3220.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3220.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3237.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3237.cpp
index 17e84d9c..17e84d9c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3237.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3237.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3252.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3252.cpp
index b435f4e2..b435f4e2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3252.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.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.75.0/tests/input/cpp/Issue_3283.cpp
new file mode 100644
index 00000000..9357b3b3
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3283.cpp
@@ -0,0 +1,3 @@
+#define MACRO(a) if(!x) x=a;
+#define MACRO(a) {if(!x) {x=a;}}
+#define MACRO(a) {if(!x) x=a;}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3284.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3284.cpp
new file mode 100644
index 00000000..cea9091e
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3284.cpp
@@ -0,0 +1,5 @@
+Node( const Node &rhs ) = delete;
+Node &operator=( const Node &rhs ) = delete;
+
+Node( Node &&rhs ) noexcept = delete;
+Node &operator=( Node &&rhs ) noexcept = delete;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3294.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3294.cpp
new file mode 100644
index 00000000..e1bf0e87
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3294.cpp
@@ -0,0 +1,17 @@
+#include <vector>
+
+std::vector<int> x;
+
+void f1()
+{
+   int v = x.empty()
+         /**/ ? x.size()
+         /**/ : x.size();
+}
+
+void f2()
+{
+   int v = x.empty()
+         ? x.size()
+         : x.size();
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3309.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3309.cpp
index d6dd1dac..d6dd1dac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3309.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.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.75.0/tests/input/cpp/Issue_3316.cpp
new file mode 100644
index 00000000..ee644d21
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3316.cpp
@@ -0,0 +1,15 @@
+#include <iostream>
+
+bool
+foo()
+{
+    const int i = 3;
+
+    if ( i == 2 || i == 3 || i == 5 ) {
+        std::cerr << "Very small prime!\n";
+    }
+
+    const auto isSmallPrime = i == 2 || i == 3 || i == 5 || i == 7 || i == 11;
+
+    return isSmallPrime || i == 13 || i == 17 || i == 19;
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3321.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3321.h
index 8e74beb2..8e74beb2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_3321.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.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.75.0/tests/input/cpp/Issue_3357.cpp
new file mode 100644
index 00000000..f94d17fe
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3357.cpp
@@ -0,0 +1,7 @@
+/**
+ * @param[out] dest The memory area to copy to.
+ * @param[in]  src  The memory area to copy from.
+ * @param[in]  n    The number of bytes to copy
+ * @param[in,out]  t    The Test
+ */
+void memcpy(void *dest, const void *src, size_t n);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3409.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3409.cpp
new file mode 100644
index 00000000..ac6e64bf
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3409.cpp
@@ -0,0 +1,8 @@
+namespace ns1 {

+    namespace ns2 {

+        const auto lamb = []() -> int

+        {

+            return 42;

+        };

+    }

+}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3413.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3413.cpp
new file mode 100644
index 00000000..80ec8cbc
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3413.cpp
@@ -0,0 +1,10 @@
+namespace
+{
+struct S { void f() {} };
+}
+
+void FuncCrash(int a = {}) { }
+void FuncCrash(int b = int{}) { }
+void FuncCrash(int b = int(0)) { }
+void FuncCrash(int b = double{0}) { }
+void FuncCrash(int b = 0) { }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3422.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3422.cpp
new file mode 100644
index 00000000..015d93f4
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3422.cpp
@@ -0,0 +1,14 @@
+voind main()
+{
+	unsigned long uncompressed_size = 0;
+	char *data_buffer = NULL;
+
+	unsigned long uncompressed_size = 0, compressed_size = 0;
+	char *data_buffer = NULL;
+
+	unsigned long uncompressed_size, compressed_size = 0;
+	char *data_buffer = NULL;
+
+	unsigned long uncompressed_size, compressed_size;
+	char *data_buffer = NULL;
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3428.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3428.cpp
new file mode 100644
index 00000000..e4f45a1c
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3428.cpp
@@ -0,0 +1,57 @@
+void main()

+{

+	if(aaaa)

+			{

+				it = std::find_if(

+					bbbb.begin(),

+					bbbb.end(),

+					[&cccc](const auto& dddd)

+				{

+					return (eeee.ffff == iiii && !jjjj.kkkk);

+				}

+				);

+			}

+}

+

+namespace ns1 {

+

+void one()

+{

+	if(aaaa)

+			{

+				it = std::find_if(

+					bbbb.begin(),

+					bbbb.end(),

+					[&cccc](const auto& dddd)

+				{

+					return (eeee.ffff == iiii && !jjjj.kkkk);

+				}

+				);

+			}

+}

+

+    namespace ns2 {

+		namespace ns3 {

+        const auto lamb = []() -> int

+        {

+            return 42;

+        };

+

+void two()

+{

+	if(aaaa)

+			{

+				it = std::find_if(

+					bbbb.begin(),

+					bbbb.end(),

+					[&cccc](const auto& dddd)

+				{

+					return (eeee.ffff == iiii && !jjjj.kkkk);

+				}

+				);

+			}

+}

+

+    }

+}

+}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3446.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3446.cpp
new file mode 100644
index 00000000..6332b0ad
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3446.cpp
@@ -0,0 +1,16 @@
+Foo::Foo() { }
+
+std::true_type blarg();
+template <typename T>
+decltype(std::declval<T &>().put(foo, bar), std::true_type())
+has_module_api_(T && t);
+
+void
+foo()
+{
+    using V = decltype(STD::declval<T &>().put(foo, bar), std::true_type());
+}
+
+template <typename T>
+decltype(std::declval<T &>()./* ((( */put(foo, bar), std::true_type())
+has_module_api_(T && t);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3448.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3448.cpp
new file mode 100644
index 00000000..8dc80497
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3448.cpp
@@ -0,0 +1,4 @@
+class Foo : public Bar, private Blarg, private Baz {
+Foo() : first(), second(), third()
+{ }
+};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3505.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3505.cpp
new file mode 100644
index 00000000..bb9bcee5
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3505.cpp
@@ -0,0 +1,7 @@
+class Spaceship
+{
+Spaceship(int a,
+int b);
+void init(int a,
+int b);
+};
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.75.0/tests/input/cpp/Issue_3513-0.cpp
new file mode 100644
index 00000000..51f07966
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3513-0.cpp
@@ -0,0 +1,5 @@
+struct S {
+  operator int() const {
+    return get();
+  }
+};
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.75.0/tests/input/cpp/Issue_3513-1.cpp
new file mode 100644
index 00000000..020cc496
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3513-1.cpp
@@ -0,0 +1,5 @@
+struct S {
+  operator int()       {
+    return get();
+  }
+};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3536.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3536.cpp
new file mode 100644
index 00000000..d068dd96
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3536.cpp
@@ -0,0 +1,32 @@
+struct S {};
+class C {};
+
+void processStruct0(
+struct S s,
+int i
+);
+
+void processClass0(
+class C c,
+int i
+);
+
+void processStruct1(
+	struct S s,
+	int i
+	);
+
+void processClass1(
+	class C c,
+	int i
+	);
+
+void processStruct2(
+		struct S s,
+		int i
+		);
+
+void processClass2(
+		class C c,
+		int i
+		);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3538.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3538.cpp
new file mode 100644
index 00000000..b965cb12
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3538.cpp
@@ -0,0 +1,12 @@
+class Alpha {};
+
+class Beta
+{
+public:
+    Beta(class Alpha alpha) : _alpha(alpha) {}
+
+    void init();
+
+private:
+    class Alpha _alpha;
+};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3546.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3546.cpp
new file mode 100644
index 00000000..617e849f
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3546.cpp
@@ -0,0 +1,28 @@
+#include <stdio.h>
+
+class
+      alignas(32)
+                  Foobar;
+
+int main()
+{
+    typedef
+            int
+                int32;
+    int foo,
+             bar,
+                  baz;
+    foo = 5
+            + 6
+                + 7;
+    if (printf("%d %d",
+                        5
+                          + 6,
+                               7)
+                                  < 0)
+    {
+        return 1;
+    }
+
+    return 0;
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3552.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3552.cpp
new file mode 100644
index 00000000..f3baae42
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3552.cpp
@@ -0,0 +1,9 @@
+namespace Salads
+{
+class
+Waldorf
+{
+public:
+int size;
+};
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3570.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3570.h
new file mode 100644
index 00000000..363447e7
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3570.h
@@ -0,0 +1,25 @@
+class Foo
+{
+public:
+Foo
+(
+)
+{
+}
+
+Foo
+(
+int x
+);
+
+void init
+(
+)
+{
+}
+
+void init
+(
+int x
+);
+};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3576.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3576.h
new file mode 100644
index 00000000..9f668b6d
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3576.h
@@ -0,0 +1,9 @@
+class Foo : public Bar
+{
+public:
+void doIt
+(
+)
+{
+}
+};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3604.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3604.cpp
new file mode 100644
index 00000000..a96b3437
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_3604.cpp
@@ -0,0 +1,4 @@
+#define MY_DEF(Type, ...) \
+	enum Type {  \
+		__VA_ARGS__, \
+	};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_750.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_750.cpp
new file mode 100644
index 00000000..461e79ac
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_750.cpp
@@ -0,0 +1,15 @@
+class Greeks
+{
+        double     _dRho            = 111.0;
+        int             _dTheoretical       = 22222.0;
+        double         _dTheta      = 3333333.0;
+        double           _dTimeValue         = 0.0;
+        double                  _dVega { 0.0 };
+        double                  _dVolatility { 0.0 };
+        double                  _dPvDiv             = 0.0;
+}
+
+    double         sdf[6]  = { 5.0, 6, 6, 34, 324, 5 };
+    int               fsaf[6] = { 5, 6, 6, 34, 324, 5 };
+    char        msa[3] { 6, 5, 3 };
+          int            y[3] { 6, 5, 3 };
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_931.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_931.cpp
index 90084874..90084874 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_931.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_931.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_995-do.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_995-do.cpp
index 05eca611..05eca611 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Issue_995-do.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Issue_995-do.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/NewLine.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/NewLine.cpp
index 9c7f1ee9..9c7f1ee9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/NewLine.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/NewLine.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/NewLine0.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/NewLine0.cpp
index 01e7cc97..01e7cc97 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/NewLine0.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/NewLine0.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/PR326_invalid-backslash-eol-csharp.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/PR326_invalid-backslash-eol-csharp.cpp
index b0e13d6a..b0e13d6a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/PR326_invalid-backslash-eol-csharp.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/PR326_invalid-backslash-eol-csharp.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Q_2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Q_2.cpp
index ee6239f9..ee6239f9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Q_2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Q_2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Q_EMIT.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Q_EMIT.cpp
index d3ef9396..d3ef9396 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Q_EMIT.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Q_EMIT.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Q_FOREACH.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Q_FOREACH.cpp
index 37156618..37156618 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Q_FOREACH.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Q_FOREACH.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Q_FOREVER.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Q_FOREVER.cpp
index a0fb07d5..a0fb07d5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Q_FOREVER.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Q_FOREVER.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Q_SIGNAL_SLOT.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Q_SIGNAL_SLOT.cpp
index 5a4c8e7d..5a4c8e7d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Q_SIGNAL_SLOT.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Q_SIGNAL_SLOT.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/STUCK_macro-difficulties.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/STUCK_macro-difficulties.cpp
index ea1c724e..ea1c724e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/STUCK_macro-difficulties.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/STUCK_macro-difficulties.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Timestamp.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Timestamp.h
index 60dc3791..60dc3791 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/Timestamp.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/Timestamp.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-10496.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-10496.cpp
index 3228cf2a..3228cf2a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-10496.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-10496.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-12046.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-12046.cpp
index 9cc7b13f..9cc7b13f 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-12046.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-12046.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-1288.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-1288.cpp
index 38ded76c..38ded76c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-1288.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-1288.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-1334.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-1334.cpp
index 278cd1a2..278cd1a2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-1334.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-1334.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-1335.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-1335.cpp
index 2f3ad2a2..2f3ad2a2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-1335.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-1335.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-1337.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-1337.cpp
index 59635c19..59635c19 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-1337.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-1337.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-1339.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-1339.cpp
index 255db223..255db223 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-1339.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-1339.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-1340.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-1340.cpp
index 2f743294..2f743294 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-1340.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-1340.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-1344.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-1344.cpp
index c898df76..c898df76 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-1344.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-1344.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-1346.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-1346.cpp
index 0261a306..0261a306 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-1346.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-1346.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-1347.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-1347.cpp
index ac2184f0..ac2184f0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-1347.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-1347.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-1350.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-1350.cpp
index 7353e915..7353e915 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-1350.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-1350.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-1356.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-1356.cpp
index 8a1aab54..8a1aab54 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-1356.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-1356.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-1358.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-1358.cpp
index 770bf0c1..770bf0c1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-1358.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-1358.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-16283.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-16283.cpp
index 7f042642..7f042642 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-16283.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-16283.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-18439.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-18439.cpp
index 0c40e831..0c40e831 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-18439.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-18439.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-18777.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-18777.cpp
index 0f177fdc..0f177fdc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-18777.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-18777.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-1980.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-1980.cpp
index 97940716..97940716 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-1980.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-1980.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-1981.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-1981.cpp
index a20f4c43..a20f4c43 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-1981.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-1981.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-1983.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-1983.cpp
index e7d9de6d..e7d9de6d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-1983.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-1983.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-19894.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-19894.cpp
index ef5fe7cf..ef5fe7cf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-19894.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-19894.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-2049.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-2049.cpp
index 7c64f76a..7c64f76a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-2049.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-2049.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-21506.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-21506.cpp
index a8c5f2df..a8c5f2df 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-21506.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-21506.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-21509.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-21509.cpp
index bde48ee7..bde48ee7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-21509.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-21509.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-21510.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-21510.cpp
index ea406fbe..ea406fbe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-21510.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-21510.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-21727.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-21727.cpp
index 991d2631..991d2631 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-21727.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-21727.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-21728.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-21728.cpp
index 658fba68..658fba68 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-21728.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-21728.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-21729.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-21729.cpp
index 4b8d1d59..4b8d1d59 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-21729.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-21729.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-2650.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-2650.cpp
index b9ced773..b9ced773 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-2650.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-2650.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-2680.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-2680.cpp
index b6aa5bd7..b6aa5bd7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-2680.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-2680.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-2683.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-2683.cpp
index 5da60d3f..5da60d3f 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-2683.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-2683.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-29935.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-29935.cpp
index a6cf3fc5..a6cf3fc5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-29935.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-29935.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-30088.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-30088.cpp
index 1fd5c1fe..1fd5c1fe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-30088.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-30088.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-30628.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-30628.cpp
index ffa60026..ffa60026 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-30628.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-30628.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-32657.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-32657.cpp
index 9151231a..9151231a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-32657.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-32657.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-38381.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-38381.cpp
index 701b55b2..701b55b2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-38381.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-38381.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-64325.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-64325.cpp
index c4005d7c..c4005d7c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-64325.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-64325.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-9650.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-9650.cpp
index f6dba01b..f6dba01b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/UNI-9650.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/UNI-9650.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/al.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/al.cpp
index 3c232dec..3c232dec 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/al.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/al.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/align-330.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/align-330.cpp
index 0ba91720..0ba91720 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/align-330.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/align-330.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/align-assign-mixed.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/align-assign-mixed.cpp
index 2e55d59d..2e55d59d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/align-assign-mixed.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/align-assign-mixed.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/align-star-amp-pos.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/align-star-amp-pos.cpp
index 29a7a23a..29a7a23a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/align-star-amp-pos.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/align-star-amp-pos.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/align_across_braces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/align_across_braces.cpp
index f47f0c80..f47f0c80 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/align_across_braces.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/align_across_braces.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/align_assign_func_proto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/align_assign_func_proto.cpp
index 0c816099..0c816099 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/align_assign_func_proto.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/align_assign_func_proto.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/align_asterisk_after_type_cast.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/align_asterisk_after_type_cast.cpp
index 4b325b1e..4b325b1e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/align_asterisk_after_type_cast.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/align_asterisk_after_type_cast.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/align_class-constr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/align_class-constr.cpp
index 2be3c8e8..2be3c8e8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/align_class-constr.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/align_class-constr.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/align_class.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/align_class.cpp
index d47e77bb..d47e77bb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/align_class.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/align_class.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/align_constr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/align_constr.cpp
index 1a22f6d9..1a22f6d9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/align_constr.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/align_constr.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/align_continuation_left_shift.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/align_continuation_left_shift.cpp
index c0c066b8..c0c066b8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/align_continuation_left_shift.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/align_continuation_left_shift.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/align_default_after_override.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/align_default_after_override.cpp
index de21686c..de21686c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/align_default_after_override.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/align_default_after_override.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/align_fcall.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/align_fcall.cpp
index c27ed9d1..c27ed9d1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/align_fcall.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/align_fcall.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/align_func_params.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/align_func_params.cpp
index a90155fd..a90155fd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/align_func_params.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/align_func_params.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/align_func_proto_thresh.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/align_func_proto_thresh.cpp
index df6b4dca..df6b4dca 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/align_func_proto_thresh.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/align_func_proto_thresh.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/align_func_proto_thresh2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/align_func_proto_thresh2.cpp
index b0960a11..b0960a11 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/align_func_proto_thresh2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/align_func_proto_thresh2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/align_left_shift.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/align_left_shift.cpp
index 3cf7a744..3cf7a744 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/align_left_shift.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/align_left_shift.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/align_left_shift2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/align_left_shift2.cpp
index c90ae71f..c90ae71f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/align_left_shift2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/align_left_shift2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/align_right_comment.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/align_right_comment.cpp
index 43a2a70f..43a2a70f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/align_right_comment.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/align_right_comment.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/align_var_def_thresh.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/align_var_def_thresh.cpp
index 3942f227..3942f227 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/align_var_def_thresh.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/align_var_def_thresh.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/alt_tokens.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/alt_tokens.cpp
index fcaf1392..fcaf1392 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/alt_tokens.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/alt_tokens.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/anonymous_enum.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/anonymous_enum.cpp
index 0cf8426d..0cf8426d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/anonymous_enum.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.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.75.0/tests/input/cpp/arith_vs_byref.cpp
new file mode 100644
index 00000000..f459fdcc
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/arith_vs_byref.cpp
@@ -0,0 +1,10 @@
+A a = {this->r & cos(b)};

+

+B b1 = {0x0000'1111 & this->r};

+B b2 = {this->r & 0x0000'1111};

+B b3 = {0x0000'1111 & value};

+B b4 = {value & 0x0000'1111};

+

+auto p = std::make_pair(r & cos(a), r & sin(a));

+

+auto p2 = std::make_pair(r & 0x0000'1111, 0x0000'1111 & r);

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/attribute_specifier_seqs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/attribute_specifier_seqs.cpp
index 744b3404..744b3404 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/attribute_specifier_seqs.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/attribute_specifier_seqs.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/av.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/av.h
index 7a90197c..7a90197c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/av.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/av.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bit-colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bit-colon.cpp
index b593255b..b593255b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bit-colon.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bit-colon.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bom.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bom.cpp
index 7ee7e7e6..7ee7e7e6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bom.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bom.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bool.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bool.cpp
index 30d4cb29..30d4cb29 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bool.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bool.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/brace_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/brace_brace_init_lst.cpp
index 2a5254f0..2a5254f0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/brace_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/brace_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/braced_init_list.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/braced_init_list.cpp
index e245f34c..e245f34c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/braced_init_list.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/braced_init_list.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/braced_init_template_decltype.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/braced_init_template_decltype.cpp
index bfd5ef86..bfd5ef86 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/braced_init_template_decltype.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/braced_init_template_decltype.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/braces_align.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/braces_align.cpp
index ca99edc6..ca99edc6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/braces_align.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/braces_align.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/braces_empty.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/braces_empty.cpp
index 583c7fa1..583c7fa1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/braces_empty.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/braces_empty.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1001.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1001.cpp
index b0ce9a06..b0ce9a06 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1001.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1001.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1002.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1002.cpp
index 713018e4..713018e4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1002.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1002.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1003.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1003.cpp
index 7495b93d..7495b93d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1003.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1003.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1004.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1004.cpp
index 3287be1c..3287be1c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1004.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1004.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1005.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1005.cpp
index 01a457d0..01a457d0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1005.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1005.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1020.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1020.cpp
index ec80e915..ec80e915 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1020.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1020.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1027.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1027.cpp
index 5ccafd2b..5ccafd2b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1027.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1027.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1032.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1032.cpp
index 80078efe..80078efe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1032.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1032.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1068.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1068.cpp
index 74fbc8e7..74fbc8e7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1068.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1068.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1108.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1108.cpp
index 573a9810..573a9810 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1108.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1108.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1112.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1112.cpp
index e6537641..e6537641 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1112.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1112.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1127.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1127.cpp
index 9ee98743..9ee98743 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1127.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1127.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1134.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1134.cpp
index 369b70f1..369b70f1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1134.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1134.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1139.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1139.cpp
index 47463232..47463232 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1139.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1139.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1158.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1158.cpp
index e92da160..e92da160 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1158.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1158.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1160.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1160.cpp
index 8dc7a9d1..8dc7a9d1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1160.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1160.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1161.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1161.cpp
index 535c3be7..535c3be7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1161.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1161.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1169.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1169.cpp
index aa56008a..aa56008a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1169.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1169.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1170.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1170.cpp
index 35dd772f..35dd772f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1170.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1170.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1235.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1235.cpp
index b9ff78a1..b9ff78a1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1235.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1235.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1236.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1236.cpp
index 8acaaed2..8acaaed2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1236.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1236.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1249.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1249.cpp
index 975dc82c..975dc82c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1249.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1249.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1288.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1288.cpp
index 94444cf9..94444cf9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1288.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1288.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1289.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1289.cpp
index 42663477..42663477 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1289.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1289.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1296.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1296.cpp
index 699025fc..e2cd65fb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1296.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1296.cpp
@@ -1,6 +1,6 @@
 int main()
 {
-  auto lambda2 = [&]()
+  auto lambda2222222222222222222 = [&]()
     {
         code();
     };
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1315.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1315.cpp
index 080c9233..080c9233 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1315.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1315.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1321.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1321.cpp
index c381f91c..c381f91c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1321.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1321.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1324.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1324.cpp
index 5df154f3..5df154f3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1324.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1324.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1338.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1338.cpp
index 04b4cd8a..04b4cd8a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1338.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1338.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1340.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1340.cpp
index 680d6d51..680d6d51 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1340.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1340.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1346.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1346.h
index 21fe1c44..21fe1c44 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1346.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1346.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1349.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1349.cpp
index aa1938e8..aa1938e8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1349.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1349.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1395.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1395.cpp
index 00694ce9..00694ce9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1395.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1395.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1402.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1402.cpp
index 9b001a44..9b001a44 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1402.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1402.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1403.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1403.cpp
index 71f67f75..71f67f75 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1403.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1403.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1432.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1432.cpp
index 575a21c8..575a21c8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1432.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1432.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1439.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1439.cpp
index d560522b..d560522b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1439.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1439.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1452.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1452.cpp
index d7fcf753..d7fcf753 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1452.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1452.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1462.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1462.cpp
index 5170b9a9..5170b9a9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1462.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1462.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1607.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1607.cpp
index 9e4e47d3..9e4e47d3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1607.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1607.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1649.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1649.cpp
index 4ab5eea8..4ab5eea8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1649.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1649.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1689.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1689.cpp
index 795bb572..795bb572 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1689.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1689.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1691.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1691.cpp
index 2d5d1204..2d5d1204 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1691.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1691.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1717.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1717.cpp
index a1adcf5f..a1adcf5f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1717.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1717.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1758-f.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1758-f.cpp
index b324fbda..b324fbda 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1758-f.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1758-f.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1758.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1758.cpp
index b0f35107..b0f35107 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1758.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1758.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1854.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1854.cpp
index 29cc2774..29cc2774 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1854.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1854.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1862.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1862.cpp
index 78958bb1..78958bb1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_1862.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_1862.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_2285.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_2285.cpp
index 14a85090..14a85090 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_2285.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_2285.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_2322.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_2322.cpp
index f9768c40..f9768c40 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_2322.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_2322.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_2371.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_2371.cpp
index 26444ad3..26444ad3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_2371.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_2371.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_2402.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_2402.cpp
index 92731c19..92731c19 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_2402.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_2402.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_2433_1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_2433_1.cpp
index d19718f5..d19718f5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_2433_1.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_2433_1.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_2433_2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_2433_2.cpp
index 9da12944..9da12944 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_2433_2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_2433_2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_33056.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_33056.cpp
index 1339ede1..1339ede1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_33056.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_33056.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_472.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_472.cpp
index 753d9519..753d9519 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_472.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_472.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_481.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_481.cpp
index 03c4a828..03c4a828 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_481.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_481.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_484.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_484.cpp
index 4c582e86..4c582e86 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_484.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_484.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_485.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_485.cpp
index 4865da64..4865da64 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_485.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_485.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_488.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_488.cpp
index 382beced..382beced 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_488.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_488.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_495.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_495.cpp
index f356c302..f356c302 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_495.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_495.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_612.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_612.cpp
index 38253f15..38253f15 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_612.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_612.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_631.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_631.cpp
index e110d383..e110d383 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_631.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_631.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_633.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_633.cpp
index 5b672b47..5b672b47 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_633.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_633.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_634.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_634.cpp
index febbf7b3..febbf7b3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_634.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_634.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_643.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_643.cpp
index 55e3e309..55e3e309 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_643.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_643.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_651.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_651.cpp
index b36e182a..b36e182a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_651.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_651.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_653.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_653.cpp
index 1bf853d6..1bf853d6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_653.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_653.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_654.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_654.cpp
index 8baaeb1c..8baaeb1c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_654.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_654.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_657.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_657.cpp
index 230b96b3..230b96b3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_657.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_657.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_662.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_662.cpp
index f8b0f8a8..f8b0f8a8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_662.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_662.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_663.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_663.cpp
index 869320c0..869320c0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_663.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_663.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_664.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_664.cpp
index 148201b0..148201b0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_664.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_664.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_666.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_666.cpp
index 00adec83..00adec83 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_666.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_666.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_670.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_670.cpp
index e9229a8e..e9229a8e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_670.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_670.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_670.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_670.h
index ea503b10..ea503b10 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_670.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_670.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_671.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_671.h
index 8ff7bfca..8ff7bfca 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_671.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_671.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_858.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_858.cpp
index 512d2e45..512d2e45 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_858.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_858.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_902.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_902.cpp
index eb51f587..eb51f587 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_902.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_902.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_1000.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_1000.cpp
index 06da6b3e..06da6b3e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_1000.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_1000.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_197.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_197.cpp
index e86698fd..e86698fd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_197.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_197.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_322.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_322.cpp
index bc7e687f..bc7e687f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_322.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_322.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_323.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_323.cpp
index ea141156..ea141156 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_323.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_323.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_359.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_359.cpp
index 294e3afb..294e3afb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_359.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_359.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_405.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_405.cpp
index eda9b0dd..eda9b0dd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_405.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_405.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_409.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_409.cpp
index b3b51488..b3b51488 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_409.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_409.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_411.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_411.cpp
index 647570f2..647570f2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_411.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_411.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_478.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_478.cpp
index 857d48f7..5a16eccc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_478.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_478.cpp
@@ -1,6 +1,6 @@
 {
 QString fileName = QFileDialog::getOpenFileName(this,
-tr("Choose Configuration File"), ui->leStrategyFile->text(),
+tr("Choose Configuration File"), ui->leStrategyFile->Text(),
 tr("Configuration Files (*.cfg);; All Files (*.*)"), 0);
 
 pSettings = new QSettings(QCoreApplication::applicationDirPath() + "/" +
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_481.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_481.cpp
index 2a4e6b8f..2a4e6b8f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_481.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_481.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_503.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_503.cpp
index 3c5951a8..3c5951a8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_503.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_503.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_512.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_512.cpp
index 3b4de434..3b4de434 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_512.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_512.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_525.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_525.cpp
index d0773475..d0773475 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_525.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_525.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_552.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_552.cpp
index 5a0704de..5a0704de 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_552.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_552.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_568.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_568.cpp
index 7b93e223..7b93e223 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_568.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_568.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_575.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_575.cpp
index 3ef21f1f..3ef21f1f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_575.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_575.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_596.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_596.cpp
index 88f77e34..88f77e34 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_596.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_596.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_646.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_646.cpp
index f89b6416..f89b6416 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_646.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_646.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_663.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_663.cpp
index 2a473bc7..2a473bc7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_663.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_663.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_666.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_666.cpp
index 00adec83..00adec83 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_666.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_666.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_682.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_682.h
index 8f1fc31f..8f1fc31f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_682.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_682.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_687.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_687.cpp
index 0f9e8155..0f9e8155 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_687.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_687.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_752.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_752.cpp
index b0b77452..b0b77452 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_752.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_752.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_753.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_753.cpp
index 07cc31fe..07cc31fe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_753.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_753.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_793.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_793.cpp
index 6777bfa5..6777bfa5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_793.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_793.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_825.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_825.cpp
index d3f89db7..d3f89db7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_825.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_825.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_889.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_889.cpp
index 270f0695..270f0695 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_889.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_889.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_928.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_928.cpp
index d2878656..d2878656 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_928.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_928.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_938.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_938.h
index b13997a6..b13997a6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_938.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_938.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_999.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_999.cpp
index 2a5d64a4..2a5d64a4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_999.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_999.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_width.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_width.cpp
index 08f7888e..08f7888e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/bug_i_width.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/bug_i_width.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/byref-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/byref-2.cpp
index 0ef61cde..0ef61cde 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/byref-2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/byref-2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/byref-3.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/byref-3.cpp
index 28da2d74..28da2d74 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/byref-3.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.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.75.0/tests/input/cpp/byref-4.cpp
new file mode 100644
index 00000000..0fe49c7b
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/byref-4.cpp
@@ -0,0 +1,5 @@
+int&(*fn)(int, struct sockaddr&);
+int& (*fn)(int, struct sockaddr&);
+int &(*fn)(int, struct sockaddr&);
+int & (*fn)(int, struct sockaddr&);
+int &  (*fn)(int, struct sockaddr&);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/byref.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/byref.cpp
index 85669bc6..85669bc6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/byref.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/byref.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/call_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/call_brace_init_lst.cpp
index 11f92ee3..11f92ee3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/call_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/call_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/case-brace-remove.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/case-brace-remove.cpp
index 421ff658..421ff658 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/case-brace-remove.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.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.75.0/tests/input/cpp/cast.cpp
new file mode 100644
index 00000000..7b29b06f
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/cast.cpp
@@ -0,0 +1,6 @@
+{
+    a = ( int)5.6;
+    b = int (5.6 );
+    c = (type<int>)t;
+    d = (type<int, int>)t;
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/casts.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/casts.cpp
index 0bcab0d9..0bcab0d9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/casts.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/casts.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/class-addr.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/class-addr.h
index ea539afa..ea539afa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/class-addr.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/class-addr.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/class-implementation.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/class-implementation.cpp
index 05eb69cf..05eb69cf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/class-implementation.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/class-implementation.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/class-init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/class-init.cpp
index af06e31a..af06e31a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/class-init.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/class-init.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/class.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/class.h
index 0048604d..0048604d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/class.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/class.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/cmt-cpp-cont.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/cmt-cpp-cont.cpp
index 8885e36b..8885e36b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/cmt-cpp-cont.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/cmt-cpp-cont.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/cmt-reflow.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/cmt-reflow.cpp
index adb5a6ab..adb5a6ab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/cmt-reflow.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/cmt-reflow.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/cmt_backslash_eol.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/cmt_backslash_eol.cpp
index e56aec25..e56aec25 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/cmt_backslash_eol.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/cmt_backslash_eol.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/cmt_convert_tab_to_spaces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/cmt_convert_tab_to_spaces.cpp
index 32ff32d3..32ff32d3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/cmt_convert_tab_to_spaces.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/cmt_convert_tab_to_spaces.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/cmt_indent.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/cmt_indent.cpp
index 542a0fd2..542a0fd2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/cmt_indent.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/cmt_indent.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/cmt_indent_pp.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/cmt_indent_pp.h
index 25253f09..25253f09 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/cmt_indent_pp.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/cmt_indent_pp.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/cmt_insert.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/cmt_insert.cpp
index a5ae87d5..a5ae87d5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/cmt_insert.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/cmt_insert.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/cmt_right.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/cmt_right.cpp
index 121ea044..121ea044 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/cmt_right.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/cmt_right.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/cmt_trailing_single_line_c_to_cpp.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/cmt_trailing_single_line_c_to_cpp.cpp
index 1f3cff49..1f3cff49 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/cmt_trailing_single_line_c_to_cpp.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/cmt_trailing_single_line_c_to_cpp.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/comma.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/comma.cpp
index e101145a..e101145a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/comma.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/comma.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/comment-align-multiline.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/comment-align-multiline.cpp
index 73dab5ec..73dab5ec 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/comment-align-multiline.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/comment-align-multiline.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/comment-align.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/comment-align.cpp
index 403bf773..403bf773 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/comment-align.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/comment-align.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/const_throw.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/const_throw.cpp
index f0d1773d..f0d1773d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/const_throw.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/const_throw.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/constr_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/constr_colon.cpp
index 6c0706e5..6c0706e5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/constr_colon.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/constr_colon.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/constructor.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/constructor.cpp
index 46abf36a..46abf36a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/constructor.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/constructor.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/conversion_operator.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/conversion_operator.cpp
index 27b52dac..27b52dac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/conversion_operator.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/conversion_operator.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/cout.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/cout.cpp
index c3c9366d..c3c9366d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/cout.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/cout.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/cpp17.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/cpp17.cpp
index ba463284..ba463284 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/cpp17.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/cpp17.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/cpp_move.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/cpp_move.cpp
index cec9beb8..cec9beb8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/cpp_move.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/cpp_move.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/ctor-var.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/ctor-var.cpp
index 2551d8bd..2551d8bd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/ctor-var.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/ctor-var.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/custom-open-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/custom-open-2.cpp
index 422cb1bf..422cb1bf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/custom-open-2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/custom-open-2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/custom-open.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/custom-open.cpp
index 1544fd74..1544fd74 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/custom-open.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/custom-open.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/define-indentation.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/define-indentation.cpp
index 69e924ee..69e924ee 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/define-indentation.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/define-indentation.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/delete.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/delete.cpp
index fff916e3..fff916e3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/delete.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/delete.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/deref.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/deref.cpp
index abfb70c7..abfb70c7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/deref.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/deref.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/digraph.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/digraph.cpp
index 57cfddf5..57cfddf5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/digraph.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/digraph.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/disable_macro.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/disable_macro.cpp
index cb9fc307..cb9fc307 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/disable_macro.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/disable_macro.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/dont-detab-strings.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/dont-detab-strings.cpp
index fd622c3c..fd622c3c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/dont-detab-strings.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/dont-detab-strings.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/dont-process-defines.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/dont-process-defines.cpp
index a0a58f85..a0a58f85 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/dont-process-defines.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/dont-process-defines.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/eat_blanks_after_codewidth.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/eat_blanks_after_codewidth.cpp
index 8753aee2..8753aee2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/eat_blanks_after_codewidth.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/eat_blanks_after_codewidth.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/eigen.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/eigen.cpp
index 4e228311..4e228311 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/eigen.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/eigen.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/enum.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/enum.cpp
index 7f87591e..524f1d4b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/enum.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/enum.cpp
@@ -16,15 +16,15 @@ enum class comment_align_e : unsigned int
    ENDIF,
 };
 
-// chunk_list.h
-enum class scope_e : unsigned int
+// chunk.h
+enum class E_Scope : unsigned int
 {
    ALL,      /**< search in all kind of chunks */
    PREPROC,  /**< search only in preprocessor chunks */
 };
 
-// chunk_list.cpp
-enum class direction_e : unsigned int
+// chunk.cpp
+enum class E_Direction : unsigned int
 {
    FORWARD,
    BACKWARD
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/enum_class.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/enum_class.h
index 2ba9933f..2ba9933f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/enum_class.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/enum_class.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/enum_comma.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/enum_comma.h
index 42ce2c53..42ce2c53 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/enum_comma.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/enum_comma.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/enum_comment_wrap.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/enum_comment_wrap.cpp
index 736e6718..736e6718 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/enum_comment_wrap.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/enum_comment_wrap.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/enum_shr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/enum_shr.cpp
index 8bde6273..8bde6273 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/enum_shr.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/enum_shr.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/exception.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/exception.cpp
index 7f29676e..7f29676e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/exception.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/exception.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/extern_c.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/extern_c.h
index e4943e50..e4943e50 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/extern_c.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/extern_c.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/extern_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/extern_func.cpp
index 24e90a37..24e90a37 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/extern_func.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/extern_func.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/first_len_minimum.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/first_len_minimum.cpp
index 0a729f01..0a729f01 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/first_len_minimum.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/first_len_minimum.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/fix_for_relational_operators.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/fix_for_relational_operators.cpp
index 0014b110..0014b110 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/fix_for_relational_operators.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/fix_for_relational_operators.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/for_auto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/for_auto.cpp
index c62548f8..c62548f8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/for_auto.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/for_auto.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/for_long.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/for_long.cpp
index 7685f614..7685f614 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/for_long.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/for_long.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/for_loop_head.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/for_loop_head.cpp
index cbfacf62..cbfacf62 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/for_loop_head.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/for_loop_head.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/foreach.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/foreach.cpp
index cfbe7963..cfbe7963 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/foreach.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/foreach.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/friends.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/friends.cpp
index 1b073b45..1b073b45 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/friends.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/friends.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/func-param-wrap-oc.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/func-param-wrap-oc.mm
index 16f98ce9..16f98ce9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/func-param-wrap-oc.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/func-param-wrap-oc.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/func_call.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/func_call.cpp
index 6467560f..6467560f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/func_call.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/func_call.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/func_call_chain.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/func_call_chain.cpp
index 7e2f3931..7e2f3931 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/func_call_chain.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/func_call_chain.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/func_class.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/func_class.cpp
index 64a11509..64a11509 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/func_class.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/func_class.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/func_class.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/func_class.h
index 168b0b3d..168b0b3d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/func_class.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/func_class.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/func_param.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/func_param.cpp
index 24b187c1..24b187c1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/func_param.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/func_param.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/func_param_indent_leading_comma.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/func_param_indent_leading_comma.cpp
index 8c62d49b..8c62d49b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/func_param_indent_leading_comma.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/func_param_indent_leading_comma.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/function-def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/function-def.cpp
index 7f5e05c4..7f5e05c4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/function-def.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/function-def.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/functype_param.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/functype_param.cpp
index 5d2ff4fe..5d2ff4fe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/functype_param.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/functype_param.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/gcc_case_ellipsis.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/gcc_case_ellipsis.cpp
index 1b0b4088..1b0b4088 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/gcc_case_ellipsis.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/gcc_case_ellipsis.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/gh555.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/gh555.cpp
index feb059d3..feb059d3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/gh555.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/gh555.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/goto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/goto.cpp
index 0f50d182..0f50d182 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/goto.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/goto.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/i1082.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/i1082.cpp
index 06680c0e..06680c0e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/i1082.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/i1082.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/i1165.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/i1165.cpp
index c3123b59..c3123b59 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/i1165.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/i1165.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/i1181.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/i1181.cpp
index 1a959d34..1a959d34 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/i1181.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/i1181.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/i1207.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/i1207.cpp
index 0c8e1c92..0c8e1c92 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/i1207.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/i1207.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/i1218.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/i1218.cpp
index d4d05106..d4d05106 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/i1218.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.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.75.0/tests/input/cpp/i1464.cpp
new file mode 100644
index 00000000..179ecd5e
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/i1464.cpp
@@ -0,0 +1,3 @@
+auto p = std::make_pair(r * cos(a), r * sin(a));
+
+auto p2 = std::make_pari(r * 0x0000'1111, 0x0000'1111 * r);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/i1466.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/i1466.cpp
new file mode 100644
index 00000000..fe704d2a
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/i1466.cpp
@@ -0,0 +1,6 @@
+A a = {this->r * cos(b)};

+

+B b1 = {0x0000'1111 * this->r};

+B b3 = {this->r * 0x0000'1111};

+B b2 = {0x0000'1111 * value};

+B b4 = {value * 0x0000'1111};

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/i1509.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/i1509.cpp
index d3e79ff6..d3e79ff6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/i1509.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/i1509.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/i1509_bug_1112_correction.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/i1509_bug_1112_correction.cpp
index 1470d613..1470d613 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/i1509_bug_1112_correction.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/i1509_bug_1112_correction.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/i1516.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/i1516.cpp
index e1fe3f77..e1fe3f77 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/i1516.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/i1516.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/i1536.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/i1536.cpp
index 2c33ec58..2c33ec58 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/i1536.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/i1536.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/i1565.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/i1565.cpp
index 5cb66589..5cb66589 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/i1565.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/i1565.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/i1617.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/i1617.cpp
index 1901e3db..1901e3db 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/i1617.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/i1617.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/i1768.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/i1768.cpp
index 7fa82285..7fa82285 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/i1768.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/i1768.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/i2033.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/i2033.cpp
index fd27cf6d..fd27cf6d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/i2033.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/i2033.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/i2116.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/i2116.cpp
index 8011f572..8011f572 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/i2116.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/i2116.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/i683.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/i683.cpp
index 4d95c7ce..4d95c7ce 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/i683.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/i683.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/if-constexpr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/if-constexpr.cpp
index 76f37f92..76f37f92 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/if-constexpr.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/if-constexpr.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/if_chain_braces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/if_chain_braces.cpp
index b544f2bf..693efc63 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/if_chain_braces.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/if_chain_braces.cpp
@@ -28,6 +28,20 @@ int foo() {
 
 	if ( b ) {
 		{ b = 5; }
-		return 9;
+		return 10;
+	}
+
+	if ( a )
+		return 11;
+	else {
+		return 12;
+	}
+
+	if ( a ) {
+		return 13;
+	} else if ( b ) {
+		return 14;
+	} else {
+		return 15;
 	}
 }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/if_constexpr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/if_constexpr.cpp
index 032f74ec..032f74ec 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/if_constexpr.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/if_constexpr.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/ifcomment.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/ifcomment.cpp
index 52f508f6..52f508f6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/ifcomment.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/ifcomment.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/indent-c.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent-c.cpp
index 56633d0e..e8f1ad51 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/indent-c.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent-c.cpp
@@ -5,7 +5,7 @@
  * $Id: indent.cpp 548 2006-10-21 02:31:55Z bengardner $
  */
 #include "uncrustify_types.h"
-#include "chunk_list.h"
+#include "chunk.h"
 #include "prototypes.h"
 #include <cstdio>
 #include <cstdlib>
@@ -115,10 +115,10 @@
  *    thatreallyannoysme.whenIhavetomaintain[thecode] = 3;
  */
 
-static void indent_comment(chunk_t *pc, int col);
+static void indent_comment(Chunk *pc, int col);
 
 
-void indent_to_column(chunk_t *pc, int column)
+void indent_to_column(Chunk *pc, int column)
 {
    if (column < pc->column)
    {
@@ -133,7 +133,7 @@ void indent_to_column(chunk_t *pc, int column)
  * @param pc      The chunk at the start of the line
  * @param column  The desired column
  */
-void reindent_line(chunk_t *pc, int column)
+void reindent_line(Chunk *pc, int column)
 {
    int col_delta;
    int min_col;
@@ -153,7 +153,7 @@ void reindent_line(chunk_t *pc, int column)
    do
    {
       min_col += pc->len;
-      pc       = chunk_get_next(pc);
+      pc       = pc->GetNext();
       if (pc != NULL)
       {
          if (chunk_is_comment(pc))
@@ -185,7 +185,7 @@ void reindent_line(chunk_t *pc, int column)
  * @param frm  The parse frame
  * @param pc   The chunk causing the push
  */
-static void indent_pse_push(struct parse_frame& frm, chunk_t *pc)
+static void indent_pse_push(struct parse_frame& frm, Chunk *pc)
 {
    static int ref = 0;
 
@@ -214,7 +214,7 @@ static void indent_pse_push(struct parse_frame& frm, chunk_t *pc)
  * @param frm  The parse frame
  * @param pc   The chunk causing the push
  */
-static void indent_pse_pop(struct parse_frame& frm, chunk_t *pc)
+static void indent_pse_pop(struct parse_frame& frm, Chunk *pc)
 {
    /* Bump up the index and initialize it */
    if (frm.pse_tos > 0)
@@ -240,7 +240,7 @@ static void indent_pse_pop(struct parse_frame& frm, chunk_t *pc)
 }
 
 
-static int token_indent(c_token_t type)
+static int token_indent(E_Token type)
 {
    switch (type)
    {
@@ -274,9 +274,9 @@ static int token_indent(c_token_t type)
  */
 void indent_text(void)
 {
-   chunk_t            *pc;
-   chunk_t            *next;
-   chunk_t            *prev       = NULL;
+   Chunk            *pc;
+   Chunk            *next;
+   Chunk            *prev       = NULL;
    bool               did_newline = true;
    int                idx;
    int                vardefcol   = 0;
@@ -296,7 +296,7 @@ void indent_text(void)
    frm.pse[0].indent_tmp = 1;
    frm.pse[0].type       = CT_EOF;
 
-   pc = chunk_get_head();
+   pc = Chunk::GetHead();
    while (pc != NULL)
    {
       /* Handle proprocessor transitions */
@@ -367,7 +367,7 @@ void indent_text(void)
             {
                indent_pse_pop(frm, pc);
                frm.level--;
-               pc = chunk_get_next(pc);
+               pc = pc->GetNext();
             }
 
             /* End any assign operations with a semicolon on the same level */
@@ -546,7 +546,7 @@ void indent_text(void)
              * { a++;
              *   b--; };
              */
-            next = chunk_get_next_ncnnl(pc);
+            next = pc->GetNextNcNnl();
             if (!chunk_is_newline_between(pc, next))
             {
                frm.pse[frm.pse_tos].indent = next->column;
@@ -599,7 +599,7 @@ void indent_text(void)
 
          if (cpd.settings[UO_indent_class_colon].b)
          {
-            prev = chunk_get_prev(pc);
+            prev = pc->GetPrev();
             if (chunk_is_newline(prev))
             {
                frm.pse[frm.pse_tos].indent += 2;
@@ -627,7 +627,7 @@ void indent_text(void)
          if ((chunk_is_str(pc, "(", 1) && !cpd.settings[UO_indent_paren_nl].b) ||
              (chunk_is_str(pc, "[", 1) && !cpd.settings[UO_indent_square_nl].b))
          {
-            next = chunk_get_next_nc(pc);
+            next = pc->GetNextNc();
             if (chunk_is_newline(next))
             {
                int sub = 1;
@@ -648,7 +648,7 @@ void indent_text(void)
           * otherwise align on the '='.
           * Never update indent_column.
           */
-         next = chunk_get_next(pc);
+         next = pc->GetNext();
          if (next != NULL)
          {
             indent_pse_push(frm, pc);
@@ -698,7 +698,7 @@ void indent_text(void)
           * everything else
           */
 
-         prev = chunk_get_prev_ncnnl(pc);
+         prev = pc->GetPrevNcNnl();
          if ((pc->type == CT_MEMBER) ||
              (pc->type == CT_DC_MEMBER) ||
              ((prev != NULL) &&
@@ -798,7 +798,7 @@ void indent_text(void)
       {
          prev = pc;
       }
-      pc = chunk_get_next(pc);
+      pc = pc->GetNext();
    }
 
    /* Throw out any stuff inside a preprocessor - no need to warn */
@@ -823,16 +823,16 @@ void indent_text(void)
  */
 
 
-static bool single_line_comment_indent_rule_applies(chunk_t *start)
+static bool single_line_comment_indent_rule_applies(Chunk *start)
 {
-   chunk_t *pc      = start;
+   Chunk *pc      = start;
    int     nl_count = 0;
    if (!chunk_is_single_line_comment(pc))
    {
       return(false);
    }
    /* scan forward, if only single newlines and comments before next line of code, we want to apply */
-   while ((pc = chunk_get_next(pc)) != NULL)
+   while ((pc = pc->GetNext()) != NULL)
    {
       if (chunk_is_newline(pc))
       {
@@ -892,10 +892,10 @@ static bool single_line_comment_indent_rule_applies(chunk_t *start)
  * @param pc   The comment, which is the first item on a line
  * @param col  The column if this is to be put at indent level
  */
-static void indent_comment(chunk_t *pc, int col)
+static void indent_comment(Chunk *pc, int col)
 {
-   chunk_t *nl;
-   chunk_t *prev;
+   Chunk *nl;
+   Chunk *prev;
 
    LOG_FMT(LCMTIND, "%s: line %d, col %d, level %d: ", __func__,
            pc->orig_line, pc->orig_col, pc->level);
@@ -908,7 +908,7 @@ static void indent_comment(chunk_t *pc, int col)
       return;
    }
 
-   nl = chunk_get_prev(pc);
+   nl = pc->GetPrev();
 
    /* outside of any expression or statement? */
    if (pc->level == 0)
@@ -921,7 +921,7 @@ static void indent_comment(chunk_t *pc, int col)
       }
    }
 
-   prev = chunk_get_prev(nl);
+   prev = nl->GetPrev();
    if (chunk_is_comment(prev) && (nl->nl_count == 1))
    {
       int coldiff = prev->orig_col - pc->orig_col;
@@ -954,8 +954,8 @@ static void indent_comment(chunk_t *pc, int col)
  */
 void indent_preproc(void)
 {
-   chunk_t *pc;
-   chunk_t *next;
+   Chunk *pc;
+   Chunk *next;
    int     pp_level;
    int     pp_level_sub = 0;
    int     tmp;
@@ -967,7 +967,7 @@ void indent_preproc(void)
    /* Scan to see if the whole file is covered by one #ifdef */
    int stage = 0;
 
-   for (pc = chunk_get_head(); pc != NULL; pc = chunk_get_next(pc))
+   for (pc = Chunk::GetHead(); pc != NULL; pc = pc->GetNext())
    {
       if (chunk_is_comment(pc) || chunk_is_newline(pc))
       {
@@ -981,7 +981,7 @@ void indent_preproc(void)
          {
             break;
          }
-         next = chunk_get_next(pc);
+         next = pc->GetNext();
          if ((next == NULL) || (next->type != CT_PP_IF))
          {
             break;
@@ -1016,7 +1016,7 @@ void indent_preproc(void)
       pp_level_sub = 1;
    }
 
-   for (pc = chunk_get_head(); pc != NULL; pc = chunk_get_next(pc))
+   for (pc = Chunk::GetHead(); pc != NULL; pc = pc->GetNext())
    {
       if (pc->type != CT_PREPROC)
       {
@@ -1072,7 +1072,7 @@ void indent_preproc(void)
          pc->len += pp_level;
       }
 
-      next = chunk_get_next(pc);
+      next = pc->GetNext();
       if (next != NULL)
       {
          reindent_line(next, pc->len + 1);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/indent-inside-ternary-operator.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent-inside-ternary-operator.cpp
index 6cd779a3..6cd779a3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/indent-inside-ternary-operator.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent-inside-ternary-operator.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/indent-misc.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent-misc.cpp
index 78a924f4..78a924f4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/indent-misc.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent-misc.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/indent-off.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent-off.cpp
index 79a7ad65..79a7ad65 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/indent-off.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent-off.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/indent.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent.cpp
index a8c4a514..a8c4a514 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/indent.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/indent_braces_no.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent_braces_no.h
index c5b39b37..c5b39b37 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/indent_braces_no.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent_braces_no.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/indent_comma_brace_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent_comma_brace_func.cpp
index d417b5be..d417b5be 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/indent_comma_brace_func.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent_comma_brace_func.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/indent_comma_brace_glob.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent_comma_brace_glob.cpp
index 8e01afc6..8e01afc6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/indent_comma_brace_glob.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent_comma_brace_glob.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/indent_comment_align_thresh.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent_comment_align_thresh.cpp
index 7ddfacbf..7ddfacbf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/indent_comment_align_thresh.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent_comment_align_thresh.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/indent_ctor_init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent_ctor_init.cpp
index d9fefe24..d9fefe24 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/indent_ctor_init.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent_ctor_init.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/indent_ctor_members_twice.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent_ctor_members_twice.cpp
index 4fbd1b4c..4fbd1b4c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/indent_ctor_members_twice.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.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.75.0/tests/input/cpp/indent_func_alias_prototype.cpp
new file mode 100644
index 00000000..7bd2afdc
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent_func_alias_prototype.cpp
@@ -0,0 +1,55 @@
+

+using Fun1 = void  (  )  ;

+using Fun2 = void  (  )   noexcept;

+

+using Fun1a = void  (

+ )  ;

+

+using Fun2a = void  (

+ )   noexcept;

+

+using Fun3a = void  (

+		int a,

+	const char*

+		);

+

+using Fun4a = void  (

+		int a,

+	const char*

+		) noexcept;

+

+using Fun5a = void  (

+		int a,

+	const char*

+		);

+

+using Fun6a = void  (

+		int a,

+	const char*

+		) noexcept;

+

+using Fun1b = auto  (

+)  ->  int;

+

+using Fun2b = auto  (

+)   noexcept  ->  int;

+

+using Fun3b = auto  (

+		int a,

+	const char*

+		)  ->  int;

+

+using Fun4b = auto  (

+		int a,

+	const char*

+		) noexcept  ->  int;

+

+using Fun5b = auto  (

+		int a,

+	const char*

+		)  ->  int;

+

+using Fun6b = auto  (

+		int a,

+	const char*

+		) noexcept  ->  int;

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/indent_namespace.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent_namespace.h
index f97bd324..f97bd324 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/indent_namespace.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent_namespace.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/indent_namespace2.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent_namespace2.h
index db2ce47d..db2ce47d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/indent_namespace2.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.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.75.0/tests/input/cpp/indent_namespace_inner_only.h
new file mode 100644
index 00000000..a73879a7
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent_namespace_inner_only.h
@@ -0,0 +1,8 @@
+namespace out
+{
+	int i;
+	namespace in
+	{
+		int i;
+	}
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/indent_namespace_single_indent.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent_namespace_single_indent.h
index 97d57444..97d57444 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/indent_namespace_single_indent.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent_namespace_single_indent.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/indent_off_after_return.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent_off_after_return.cpp
index 58e24797..58e24797 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/indent_off_after_return.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent_off_after_return.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/indent_param.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent_param.cpp
index c194141b..c194141b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/indent_param.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent_param.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/indent_paren_after_func_call.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent_paren_after_func_call.cpp
index 96b38fba..96b38fba 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/indent_paren_after_func_call.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent_paren_after_func_call.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/indent_paren_after_func_decl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent_paren_after_func_decl.cpp
index ff8c3e44..ff8c3e44 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/indent_paren_after_func_decl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent_paren_after_func_decl.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/indent_paren_after_func_def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent_paren_after_func_def.cpp
index 703e0422..703e0422 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/indent_paren_after_func_def.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent_paren_after_func_def.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/indent_shift.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent_shift.cpp
index 54684fa7..54684fa7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/indent_shift.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent_shift.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/indent_switch_pp.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent_switch_pp.cpp
index 1b76e218..1b76e218 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/indent_switch_pp.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent_switch_pp.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/indent_var_def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent_var_def.cpp
index 394cfb63..394cfb63 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/indent_var_def.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent_var_def.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/indent_var_def_cont.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent_var_def_cont.cpp
index d273ae52..d273ae52 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/indent_var_def_cont.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/indent_var_def_cont.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/init-list-call.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/init-list-call.cpp
index 70451ac4..70451ac4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/init-list-call.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/init-list-call.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/init_align.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/init_align.h
index ff1dcc9b..ff1dcc9b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/init_align.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/init_align.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/initlist_leading_commas.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/initlist_leading_commas.cpp
index 83188d77..83188d77 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/initlist_leading_commas.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/initlist_leading_commas.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/interface-keyword-in-cpp.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/interface-keyword-in-cpp.cpp
index bc039e18..bc039e18 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/interface-keyword-in-cpp.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/interface-keyword-in-cpp.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_1752.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_1752.cpp
index e3be4d50..e3be4d50 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_1752.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_1752.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_1778.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_1778.cpp
index 4eea46e0..4eea46e0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_1778.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_1778.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_1782.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_1782.cpp
index c12b83d0..c12b83d0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_1782.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_1782.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_1804.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_1804.cpp
index 2923a4a2..2923a4a2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_1804.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_1804.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_1916.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_1916.cpp
index 4c819605..4c819605 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_1916.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_1916.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_1919.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_1919.cpp
index 187065d6..187065d6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_1919.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_1919.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_1946.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_1946.cpp
index 9682da68..9682da68 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_1946.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_1946.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_1985.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_1985.cpp
index 4e5685a1..4e5685a1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_1985.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_1985.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_2000.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_2000.cpp
index aa324f2e..aa324f2e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_2000.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_2000.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_2001.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_2001.cpp
index 39b9446d..39b9446d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_2001.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_2001.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_2124-1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_2124-1.cpp
index 8c582cf9..8c582cf9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_2124-1.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_2124-1.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_2124-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_2124-2.cpp
index 8c582cf9..8c582cf9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_2124-2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_2124-2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_2209-1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_2209-1.cpp
index a1ebb1a7..a1ebb1a7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_2209-1.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_2209-1.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_2209-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_2209-2.cpp
index 5725d3d7..5725d3d7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_2209-2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_2209-2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_2623.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_2623.cpp
index 5834e4b3..5834e4b3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_2623.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_2623.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_3116-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_3116-2.cpp
index 6e007772..6e007772 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_3116-2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_3116-2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_3116.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_3116.cpp
index 96167df1..96167df1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_3116.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_3116.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_3330.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_3330.cpp
index 37062480..37062480 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_3330.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_3330.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_3368.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_3368.cpp
index 2158086c..2158086c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_3368.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_3368.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_3378.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_3378.cpp
index 319c3151..319c3151 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_3378.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_3378.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_523.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_523.cpp
index d203e398..d203e398 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_523.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_523.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_547_for_each.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_547_for_each.cpp
index cfbe7963..cfbe7963 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_547_for_each.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_547_for_each.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_564.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_564.cpp
index 0c289a8a..0c289a8a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_564.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_564.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_574-i.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_574-i.cpp
index c7730a54..c7730a54 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_574-i.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_574-i.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_574.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_574.cpp
index 96e910ca..96e910ca 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_574.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_574.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_624_angle.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_624_angle.cpp
index 255db223..255db223 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_624_angle.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_624_angle.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_633_typename.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_633_typename.cpp
index e99742ef..e99742ef 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_633_typename.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_633_typename.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_672.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_672.cpp
index 6d8dde90..6d8dde90 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/issue_672.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/issue_672.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/kw_subst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/kw_subst.cpp
index e57868e2..e57868e2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/kw_subst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/kw_subst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/kw_subst2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/kw_subst2.cpp
index d167cc1c..d167cc1c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/kw_subst2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/kw_subst2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/lambda.cpp
index 5262d00f..7bc50606 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/lambda.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/lambda.cpp
@@ -75,3 +75,29 @@ void g2()
    Invoke(a, b,
           [&one, two]  (int *a, Something&b){ std::cout << "blah: " << *a; });
 }
+
+void h1()
+{
+   []() -> int
+   {
+      return 33;
+   }();
+
+   []() noexcept -> int
+   {
+      return 33;
+   }();
+}
+
+void h2()
+{
+   [](int a) -> int
+   {
+      return a + 33;
+   }(21);
+
+   [](int a) noexcept -> int
+   {
+      return a + 33;
+   }(21);
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/lambda2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/lambda2.cpp
index d641c281..a4b8a8c6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/lambda2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/lambda2.cpp
@@ -80,3 +80,29 @@ void g2()
           [&one, two] (int *a, Something&b){ std::cout << "blah: " << *a; });
 
 }
+
+void h1()
+{
+   []() -> int
+   {
+      return 33;
+   }();
+
+   []() noexcept -> int
+   {
+      return 33;
+   }();
+}
+
+void h2()
+{
+   [](int a) -> int
+   {
+      return a + 33;
+   }(21);
+
+   [](int a) noexcept -> int
+   {
+      return a + 33;
+   }(21);
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/lambda_brace_list.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/lambda_brace_list.cpp
index da3db41f..da3db41f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/lambda_brace_list.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/lambda_brace_list.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/lambda_in_one_liner.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/lambda_in_one_liner.cpp
index c740c4bd..c740c4bd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/lambda_in_one_liner.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/lambda_in_one_liner.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/lambda_selfcalling.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/lambda_selfcalling.cpp
index 543290fa..543290fa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/lambda_selfcalling.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/lambda_selfcalling.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/lineEndings-Mac.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/lineEndings-Mac.cpp
index 608952c0..608952c0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/lineEndings-Mac.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/lineEndings-Mac.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/lineEndings-Unix.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/lineEndings-Unix.cpp
index cdbf7653..cdbf7653 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/lineEndings-Unix.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/lineEndings-Unix.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/lineEndings-Win.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/lineEndings-Win.cpp
index 20fa083a..20fa083a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/lineEndings-Win.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/lineEndings-Win.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/long_br_cmt.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/long_br_cmt.cpp
index a7638876..a7638876 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/long_br_cmt.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/long_br_cmt.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/long_namespace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/long_namespace.cpp
index 89fe4435..89fe4435 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/long_namespace.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/long_namespace.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/macro_spaces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/macro_spaces.cpp
index c27c6b5d..c27c6b5d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/macro_spaces.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/macro_spaces.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/misc.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/misc.cpp
index 8a73b431..8a73b431 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/misc.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/misc.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/misc2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/misc2.cpp
index f1be4478..b6ce3078 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/misc2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/misc2.cpp
@@ -29,7 +29,7 @@ void foo(void)
    List<byte>bob = new List<byte> ();
 
    /* Align assignments */
-   align_assign(chunk_get_head(),
+   align_assign(Chunk::GetHead(),
                 cpd.settings[UO_align_assign_span].n,
                 cpd.settings[UO_align_assign_thresh].n);
 }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/misc3.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/misc3.cpp
index c7c10d6c..c7c10d6c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/misc3.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/misc3.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/misc4.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/misc4.cpp
index 725fa160..725fa160 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/misc4.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/misc4.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/misc5.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/misc5.cpp
index 570a4a76..570a4a76 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/misc5.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/misc5.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/misc6.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/misc6.cpp
index 95cc0383..95cc0383 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/misc6.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/misc6.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/mod_remove_empty_return-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/mod_remove_empty_return-2.cpp
index eb949c45..eb949c45 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/mod_remove_empty_return-2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/mod_remove_empty_return-2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/mod_remove_empty_return.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/mod_remove_empty_return.cpp
index ca3105da..ca3105da 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/mod_remove_empty_return.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/mod_remove_empty_return.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/ms-style-ref.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/ms-style-ref.cpp
index 213393b9..213393b9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/ms-style-ref.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/ms-style-ref.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/multi_line.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/multi_line.cpp
index df5f3a84..df5f3a84 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/multi_line.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/multi_line.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/namespace_namespace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/namespace_namespace.cpp
index cf6f921e..cf6f921e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/namespace_namespace.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/namespace_namespace.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/new_op.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/new_op.cpp
index 828215e8..828215e8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/new_op.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/new_op.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl-class.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl-class.h
index 128974b7..128974b7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl-class.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl-class.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl-namespace.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl-namespace.h
index a436fcb7..a436fcb7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl-namespace.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl-namespace.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl_assign_leave_one_liners.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_assign_leave_one_liners.cpp
index cf3325f0..cf3325f0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl_assign_leave_one_liners.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_assign_leave_one_liners.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl_before_after.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_before_after.h
index fb77edf1..fb77edf1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl_before_after.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_before_after.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl_before_brace_open_test.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_before_brace_open_test.cpp
index 6e3daf66..6e3daf66 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl_before_brace_open_test.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_before_brace_open_test.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl_before_func_body_def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_before_func_body_def.cpp
index c7cab4c7..c7cab4c7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl_before_func_body_def.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_before_func_body_def.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl_before_struct_scoped_enum.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_before_struct_scoped_enum.cpp
index f4065b20..f4065b20 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl_before_struct_scoped_enum.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_before_struct_scoped_enum.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl_before_struct_struct.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_before_struct_struct.cpp
index edac027c..edac027c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl_before_struct_struct.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_before_struct_struct.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl_brace_brace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_brace_brace.cpp
index b698546a..b698546a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl_brace_brace.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_brace_brace.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl_fdef_brace_cond-f.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_fdef_brace_cond-f.cpp
index 6250d752..6250d752 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl_fdef_brace_cond-f.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_fdef_brace_cond-f.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl_fdef_brace_cond-fr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_fdef_brace_cond-fr.cpp
index 6250d752..6250d752 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl_fdef_brace_cond-fr.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_fdef_brace_cond-fr.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl_fdef_brace_cond-r.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_fdef_brace_cond-r.cpp
index 6250d752..6250d752 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl_fdef_brace_cond-r.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_fdef_brace_cond-r.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl_fdef_brace_cond-rf.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_fdef_brace_cond-rf.cpp
index 6250d752..6250d752 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl_fdef_brace_cond-rf.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_fdef_brace_cond-rf.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl_for_leave_one_liners.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_for_leave_one_liners.cpp
index 382d2815..382d2815 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl_for_leave_one_liners.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_for_leave_one_liners.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_func.cpp
index e27d7e55..e27d7e55 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl_func.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_func.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl_func_call_empty.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_func_call_empty.cpp
index 6678ee18..6678ee18 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl_func_call_empty.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_func_call_empty.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl_func_call_paren.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_func_call_paren.cpp
index 309a65a9..309a65a9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl_func_call_paren.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_func_call_paren.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl_func_call_paren_empty.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_func_call_paren_empty.cpp
index 6678ee18..6678ee18 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl_func_call_paren_empty.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_func_call_paren_empty.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl_func_decl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_func_decl.cpp
index 91a7184f..91a7184f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl_func_decl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_func_decl.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl_func_def_paren_empty.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_func_def_paren_empty.cpp
index f1ba8607..f1ba8607 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl_func_def_paren_empty.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_func_def_paren_empty.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl_func_paren_empty.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_func_paren_empty.cpp
index 19965aac..19965aac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl_func_paren_empty.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_func_paren_empty.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl_func_scope_name.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_func_scope_name.cpp
index d221e974..d221e974 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl_func_scope_name.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_func_scope_name.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl_func_type_name.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_func_type_name.cpp
index 26e49663..26e49663 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl_func_type_name.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_func_type_name.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl_inside_namespace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_inside_namespace.cpp
index 4bdcb394..4bdcb394 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl_inside_namespace.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_inside_namespace.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl_max_blank_in_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_max_blank_in_func.cpp
index c87e6e68..c87e6e68 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/nl_max_blank_in_func.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/nl_max_blank_in_func.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/noexcept.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/noexcept.cpp
index e6ea9116..e6ea9116 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/noexcept.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/noexcept.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/not_lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/not_lambda.cpp
index a9c65439..a9c65439 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/not_lambda.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/not_lambda.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/op_sym_empty.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/op_sym_empty.cpp
index 4b79ca9e..4b79ca9e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/op_sym_empty.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/op_sym_empty.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/operator.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/operator.cpp
index 6f2a7f03..6f2a7f03 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/operator.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/operator.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/operator_proto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/operator_proto.cpp
index b14935ee..b14935ee 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/operator_proto.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/operator_proto.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/out-668.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/out-668.cpp
index 0dac74c3..0dac74c3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/out-668.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/out-668.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/output.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/output.cpp
index 4563c43b..42c2582c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/output.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/output.cpp
@@ -7,7 +7,7 @@
 
 #include "uncrustify_types.h"
 #include "prototypes.h"
-#include "chunk_list.h"
+#include "chunk.h"
 #include <cstring>
 #include <cstdlib>
 
@@ -111,7 +111,7 @@ void output_indent(int column, int brace_col)
 
 void output_parsed(FILE *pfile)
 {
-   chunk_t *pc;
+   Chunk *pc;
    int     cnt;
 
    output_options(pfile);
@@ -120,7 +120,7 @@ void output_parsed(FILE *pfile)
 
    fprintf(pfile, "-=====-\n");
    fprintf(pfile, "Line      Tag          Parent     Columns  Br/Lvl/pp Flg Nl  Text");
-   for (pc = chunk_get_head(); pc != NULL; pc = chunk_get_next(pc))
+   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),
@@ -190,15 +190,15 @@ void output_options(FILE *pfile)
  */
 void output_text(FILE *pfile)
 {
-   chunk_t *pc;
-   chunk_t *prev;
+   Chunk *pc;
+   Chunk *prev;
    int     cnt;
    int     lvlcol;
    bool    allow_tabs;
 
    cpd.fout = pfile;
 
-   for (pc = chunk_get_head(); pc != NULL; pc = chunk_get_next(pc))
+   for (pc = Chunk::GetHead(); pc != NULL; pc = pc->GetNext())
    {
       if (pc->type == CT_NEWLINE)
       {
@@ -251,7 +251,7 @@ void output_text(FILE *pfile)
             }
             else
             {
-               prev       = chunk_get_prev(pc);
+               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) &&
@@ -385,7 +385,7 @@ static int calculate_comment_body_indent(const char *str, int len, int start_col
  *
  * @return the last chunk output'd
  */
-chunk_t *output_comment_cpp(chunk_t *first)
+Chunk *output_comment_cpp(Chunk *first)
 {
    int col    = first->column;
    int col_br = 1 + (first->brace_level * cpd.settings[UO_indent_columns].n);
@@ -393,7 +393,7 @@ chunk_t *output_comment_cpp(chunk_t *first)
    /* Make sure we have at least one space past the last token */
    if (first->parent_type == CT_COMMENT_END)
    {
-      chunk_t *prev = chunk_get_prev(first);
+      Chunk *prev = first->GetPrev();
       if (prev != NULL)
       {
          int col_min = prev->column + prev->len + 1;
@@ -418,10 +418,10 @@ chunk_t *output_comment_cpp(chunk_t *first)
    if (cpd.settings[UO_cmt_cpp_group].b)
    {
       /* next is a newline by definition */
-      chunk_t *next = chunk_get_next(first);
+      Chunk *next = first->GetNext();
       if ((next != NULL) && (next->nl_count == 1))
       {
-         next = chunk_get_next(next);
+         next = next->GetNext();
 
          /**
           * Only combine the next comment if they are both at indent level or
@@ -454,8 +454,8 @@ chunk_t *output_comment_cpp(chunk_t *first)
       return(first);
    }
 
-   chunk_t *pc   = first;
-   chunk_t *last = first;
+   Chunk *pc   = first;
+   Chunk *last = first;
 
    /* Output the first line */
    add_text_len("/*", 2);
@@ -469,7 +469,7 @@ chunk_t *output_comment_cpp(chunk_t *first)
    goto cpp_addline;
 
    /* Output combined lines */
-   while ((pc = chunk_get_next(pc)) != NULL)
+   while ((pc = pc->GetNext()) != NULL)
    {
       if ((pc->type == CT_NEWLINE) && (pc->nl_count == 1))
       {
@@ -507,13 +507,13 @@ cpp_addline:
    return(last);
 }
 
-void output_comment_multi(chunk_t *pc)
+void output_comment_multi(Chunk *pc)
 {
    int        cmt_col = pc->column;
    const char *cmt_str;
    int        remaining;
    char       ch;
-   chunk_t    *prev;
+   Chunk    *prev;
    char       line[1024];
    int        line_len;
    int        line_count = 0;
@@ -521,7 +521,7 @@ void output_comment_multi(chunk_t *pc)
    int        col_diff = 0;
    int        xtra     = 1;
 
-   prev = chunk_get_prev(pc);
+   prev = pc->GetPrev();
    if ((prev != NULL) && (prev->type != CT_NEWLINE))
    {
       cmt_col = pc->orig_col;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/override_virtual.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/override_virtual.cpp
index 537454b1..537454b1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/override_virtual.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/override_virtual.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/parameter-packs.cpp
index 6d734b1f..6d734b1f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/parameter-packs.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/parameter-packs.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/patch_32.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/patch_32.cpp
index 8d9e222e..8d9e222e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/patch_32.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/patch_32.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/pos_assign.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/pos_assign.cpp
index af55296b..af55296b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/pos_assign.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/pos_assign.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/pos_bool_in_template.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/pos_bool_in_template.h
index ef01470e..ef01470e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/pos_bool_in_template.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/pos_bool_in_template.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/pos_shift.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/pos_shift.cpp
index 4d55a541..4d55a541 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/pos_shift.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/pos_shift.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/pp-define-indent.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/pp-define-indent.cpp
index 8ec5657f..8ec5657f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/pp-define-indent.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/pp-define-indent.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/pp-pragma.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/pp-pragma.cpp
index 75b3c46d..75b3c46d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/pp-pragma.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/pp-pragma.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/pp_indent_brace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/pp_indent_brace.cpp
index 86ed0a8f..1e02efcb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/pp_indent_brace.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/pp_indent_brace.cpp
@@ -1,7 +1,7 @@
 // Example for preprocessor statement in a function definition

 // Config uses more than tested option, uses:

-// pp_if_indent_code  = true	  to enable preprocesser indent

-// pp_indent_brace	  = false	  to override preprocessor indent for braces

+// pp_if_indent_code  = 1	  to enable preprocesser indent

+// pp_indent_brace	  = 0	  to override preprocessor indent for braces

 MyClass::MyClass()

 {

 	if(isSomething)

@@ -21,4 +21,4 @@ MyClass::MyClass()
 			DoSomethingWithSix(mySix);

 		}

 #endif

-}
\ No newline at end of file
+}

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/pp_indent_case.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/pp_indent_case.cpp
index da61641a..da61641a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/pp_indent_case.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/pp_indent_case.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/pp_indent_extern.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/pp_indent_extern.cpp
index 76cfc4bf..76cfc4bf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/pp_indent_extern.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/pp_indent_extern.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/pp_indent_func_def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/pp_indent_func_def.cpp
index 7a0bcecf..7a0bcecf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/pp_indent_func_def.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/pp_indent_func_def.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/pp_multi_comment.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/pp_multi_comment.cpp
index 98418c46..98418c46 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/pp_multi_comment.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/pp_multi_comment.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/proto-wrap.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/proto-wrap.cpp
index 35e8bea3..35e8bea3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/proto-wrap.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/proto-wrap.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/ptr-star.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/ptr-star.cpp
index ff0ab369..ff0ab369 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/ptr-star.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/ptr-star.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/qt-1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/qt-1.cpp
index e318c1aa..e318c1aa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/qt-1.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/qt-1.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/qtargs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/qtargs.cpp
index 5037d792..5037d792 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/qtargs.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/qtargs.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/region.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/region.cpp
index 28447084..28447084 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/region.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/region.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/return_braced_init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/return_braced_init.cpp
index cf86baeb..cf86baeb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/return_braced_init.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/return_braced_init.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/return_init_list.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/return_init_list.cpp
index f58dfee5..f58dfee5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/return_init_list.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/return_init_list.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/returns.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/returns.cpp
index 1085bd72..1085bd72 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/returns.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/returns.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sef.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sef.cpp
index add2fc4a..add2fc4a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sef.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sef.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/semi.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/semi.cpp
index 9f7832cd..9f7832cd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/semi.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/semi.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/semicolons.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/semicolons.cpp
index 52796f75..52796f75 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/semicolons.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/semicolons.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sf.2886991.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sf.2886991.cpp
index 97dfe0cf..97dfe0cf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sf.2886991.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sf.2886991.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sf.3266678.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sf.3266678.cpp
index 69f877ed..69f877ed 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sf.3266678.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sf.3266678.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sf.3315874.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sf.3315874.h
index 58921bc5..58921bc5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sf.3315874.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sf.3315874.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sf557.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sf557.cpp
index c7ba93cc..c7ba93cc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sf557.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sf557.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sf562.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sf562.cpp
index 15ee8e79..15ee8e79 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sf562.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sf562.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sf567.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sf567.cpp
index 0c1d5fc9..0c1d5fc9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sf567.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sf567.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sf574.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sf574.cpp
index 3f5a98d4..3f5a98d4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sf574.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sf574.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sf583.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sf583.cpp
index 8eba4d1e..8eba4d1e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sf583.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sf583.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sf593.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sf593.cpp
index 1fc0ded8..1fc0ded8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sf593.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sf593.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sim.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sim.h
index 29c52879..29c52879 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sim.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sim.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_after_angle.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_after_angle.cpp
index 18788919..18788919 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_after_angle.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_after_angle.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_after_constr_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_after_constr_colon.cpp
index caea467a..caea467a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_after_constr_colon.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_after_constr_colon.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_after_decltype.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_after_decltype.cpp
index 18448555..18448555 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_after_decltype.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_after_decltype.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_after_type.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_after_type.cpp
index 6f235d22..6f235d22 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_after_type.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_after_type.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_angle_paren.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_angle_paren.cpp
index 911aa53b..911aa53b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_angle_paren.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_angle_paren.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_arith_additive.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_arith_additive.cpp
index ab2096c8..ab2096c8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_arith_additive.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_arith_additive.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_balance_nested_parens.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_balance_nested_parens.cpp
index dc5f5e8e..dc5f5e8e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_balance_nested_parens.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_balance_nested_parens.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_before_byref_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_before_byref_func.cpp
index 7dd9c14a..7dd9c14a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_before_byref_func.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_before_byref_func.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_before_case_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_before_case_colon.cpp
index 0c534fe0..0c534fe0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_before_case_colon.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_before_case_colon.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_before_constr_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_before_constr_colon.cpp
index 796522c7..796522c7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_before_constr_colon.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_before_constr_colon.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_before_tr_emb_cmt_input.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_before_tr_emb_cmt_input.cpp
index 45ffb335..45ffb335 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_before_tr_emb_cmt_input.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_before_tr_emb_cmt_input.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_brace_brace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_brace_brace.cpp
index bb730d61..bb730d61 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_brace_brace.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_brace_brace.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_brace_catch.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_brace_catch.cpp
index 7b4bdc5e..7b4bdc5e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_brace_catch.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_brace_catch.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_cmt_cpp_region.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_cmt_cpp_region.cpp
index b70ef6b1..b70ef6b1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_cmt_cpp_region.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_cmt_cpp_region.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_cmt_cpp_start.cc b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_cmt_cpp_start.cc
index 6a9b203b..6a9b203b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_cmt_cpp_start.cc
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_cmt_cpp_start.cc
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_cond_question.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_cond_question.cpp
index cec6c827..cec6c827 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_cond_question.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_cond_question.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_cparen_oparen.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_cparen_oparen.cpp
index 83c60dd4..83c60dd4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_cparen_oparen.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_cparen_oparen.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_cpp_lambda_fparen.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_cpp_lambda_fparen.cpp
index e25d0496..e25d0496 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_cpp_lambda_fparen.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_cpp_lambda_fparen.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_decltype.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_decltype.cpp
index 3e2f7e47..3e2f7e47 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_decltype.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_decltype.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_endif_cmt.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_endif_cmt.cpp
index 9e5b2db8..9e5b2db8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_endif_cmt.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_endif_cmt.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_enum_assign.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_enum_assign.cpp
index 2ebab438..2ebab438 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_enum_assign.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_enum_assign.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_enum_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_enum_colon.cpp
index a23c6afd..a23c6afd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_enum_colon.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_enum_colon.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_func_call_paren.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_func_call_paren.cpp
index 90798ef9..90798ef9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_func_call_paren.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_func_call_paren.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_inside_braces_enum.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_inside_braces_enum.cpp
index 8386e215..8386e215 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_inside_braces_enum.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.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.75.0/tests/input/cpp/sp_not_not.cpp
new file mode 100644
index 00000000..4ef7f777
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_not_not.cpp
@@ -0,0 +1,3 @@
+if (!hello) { }
+if (!!hello) { }
+if (!!!hello) { }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_paren_brace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_paren_brace.cpp
index 4ac73f87..4ac73f87 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_paren_brace.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_paren_brace.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_skip_vbrace_tokens.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_skip_vbrace_tokens.cpp
index fff4aff4..fff4aff4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_skip_vbrace_tokens.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_skip_vbrace_tokens.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_throw_paren.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_throw_paren.cpp
index f45f1a9a..f45f1a9a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_throw_paren.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_throw_paren.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_type_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_type_func.cpp
index 30e058e7..30e058e7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/sp_type_func.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/sp_type_func.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/squeeze_ifdef.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/squeeze_ifdef.cpp
index 42699d1d..42699d1d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/squeeze_ifdef.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/squeeze_ifdef.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/static.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/static.h
index 8121fef1..8121fef1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/static.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/static.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/stdcall.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/stdcall.cpp
index a2353599..a2353599 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/stdcall.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/stdcall.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/string_replace_tab_chars.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/string_replace_tab_chars.cpp
index 3534461b..3534461b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/string_replace_tab_chars.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/string_replace_tab_chars.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/strings.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/strings.cpp
index 1cfea449..1cfea449 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/strings.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/strings.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/tab-0.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/tab-0.cpp
index 474aba08..474aba08 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/tab-0.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/tab-0.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/tab-1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/tab-1.cpp
index dc7a65c4..dc7a65c4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/tab-1.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/tab-1.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/templ_class.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/templ_class.h
index 0f102244..0f102244 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/templ_class.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/templ_class.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/templates.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/templates.cpp
index 737599bf..737599bf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/templates.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/templates.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/templates2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/templates2.cpp
index 46d41560..46d41560 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/templates2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/templates2.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/templates3.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/templates3.cpp
index 55b11d26..55b11d26 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/templates3.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/templates3.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/templates4.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/templates4.cpp
index 10b96e4a..10b96e4a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/templates4.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/templates4.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/toggle_processing_cmt.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/toggle_processing_cmt.cpp
index 6f49594d..6f49594d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/toggle_processing_cmt.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/toggle_processing_cmt.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/toggle_processing_cmt2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/toggle_processing_cmt2.cpp
index 6b4a0a39..6b4a0a39 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/toggle_processing_cmt2.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.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.75.0/tests/input/cpp/trailing_return.cpp
new file mode 100644
index 00000000..b5903ce9
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/trailing_return.cpp
@@ -0,0 +1,93 @@
+auto f0(int a, int b)  ->  int;
+
+struct Foo
+{
+	auto f01()  ->  bool;
+	auto f02() noexcept  ->  bool;
+	auto f03() noexcept(true)  ->  bool;
+	auto f04() noexcept(false)  ->  bool;
+	auto f05() noexcept  ->  bool = delete;
+	auto f06() noexcept(true)  ->  bool = delete;
+	auto f07() noexcept(false)  ->  bool = delete;
+
+	auto f11() const  ->  bool;
+	auto f12() const noexcept  ->  bool;
+	auto f13() const noexcept(true)  ->  bool;
+	auto f14() const noexcept(false)  ->  bool;
+	auto f15() const noexcept  ->  bool = delete;
+	auto f16() const noexcept(true)  ->  bool = delete;
+	auto f17() const noexcept(false)  ->  bool = delete;
+
+	auto f21() throw()  ->  bool;
+	auto f22() throw()  ->  bool = delete;
+	auto f23() const throw()  ->  bool;
+	auto f24() const throw()  ->  bool = delete;
+
+	auto f25() const  ->  bool*;
+	auto f26() const  ->  bool* = delete;
+	auto f27() const  ->  bool&;
+	auto f28() const  ->  bool& = delete;
+
+	auto f29()  ->  bool*;
+	auto f30()  ->  bool* = delete;
+	auto f31() noexcept  ->  bool*;
+	auto f32() noexcept(true)  ->  bool*;
+	auto f33() noexcept(false)  ->  bool*;
+	auto f34() noexcept  ->  bool* = delete;
+	auto f35() noexcept(true)  ->  bool* = delete;
+	auto f36() noexcept(false)  ->  bool* = delete;
+	auto f37() throw()  ->  bool*;
+	auto f38() throw()  ->  bool* = delete;
+
+	auto f39()  ->  bool&;
+	auto f40()  ->  bool& = delete;
+	auto f41() noexcept  ->  bool&;
+	auto f42() noexcept(true)  ->  bool&;
+	auto f43() noexcept(false)  ->  bool&;
+	auto f44() noexcept  ->  bool& = delete;
+	auto f45() noexcept(true)  ->  bool& = delete;
+	auto f46() noexcept(false)  ->  bool& = delete;
+	auto f47() throw()  ->  bool&;
+	auto f48() throw()  ->  bool& = delete;
+
+	auto f49() const  ->  bool*;
+	auto f50() const  ->  bool* = delete;
+	auto f51() const noexcept  ->  bool*;
+	auto f52() const noexcept(true)  ->  bool*;
+	auto f53() const noexcept(false)  ->  bool*;
+	auto f54() const noexcept  ->  bool* = delete;
+	auto f55() const noexcept(true)  ->  bool* = delete;
+	auto f56() const noexcept(false)  ->  bool* = delete;
+	auto f57() const throw()  ->  bool*;
+	auto f58() const throw()  ->  bool* = delete;
+
+	auto f59() const  ->  bool&;
+	auto f60() const  ->  bool& = delete;
+	auto f61() const noexcept  ->  bool&;
+	auto f62() const noexcept(true)  ->  bool&;
+	auto f63() const noexcept(false)  ->  bool&;
+	auto f64() const noexcept  ->  bool& = delete;
+	auto f65() const noexcept(true)  ->  bool& = delete;
+	auto f66() const noexcept(false)  ->  bool& = delete;
+	auto f67() const throw()  ->  bool&;
+	auto f68() const throw()  ->  bool& = delete;
+};
+
+struct Bar
+{
+	Bar() : m_func([](void*)  ->  result_t{ return magic; }) {}
+};
+
+void foo()
+{
+	auto l = [](int n)  ->  x_t{ return n + 5; };
+	x([](int n)  ->  x_t{ return n + 5; });
+}
+
+static auto f25()  ->  bool {
+	return true;
+}
+
+static auto f26() const noexcept(true)  ->  bool {
+	return true;
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/trailing_return_byref_ptr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/trailing_return_byref_ptr.cpp
new file mode 100644
index 00000000..14cffd63
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/trailing_return_byref_ptr.cpp
@@ -0,0 +1,84 @@
+struct Foo
+{
+	auto f01()  ->  bool;
+	auto f02() noexcept  ->  bool;
+	auto f03() noexcept(true)  ->  bool;
+	auto f04() noexcept(false)  ->  bool;
+	auto f05() noexcept  ->  bool = delete;
+	auto f06() noexcept(true)  ->  bool = delete;
+	auto f07() noexcept(false)  ->  bool = delete;
+
+	auto f11() const  ->  bool;
+	auto f12() const noexcept  ->  bool;
+	auto f13() const noexcept(true)  ->  bool;
+	auto f14() const noexcept(false)  ->  bool;
+	auto f15() const noexcept  ->  bool = delete;
+	auto f16() const noexcept(true)  ->  bool = delete;
+	auto f17() const noexcept(false)  ->  bool = delete;
+
+	auto f21() throw()  ->  bool;
+	auto f22() throw()  ->  bool = delete;
+	auto f23() const throw()  ->  bool;
+	auto f24() const throw()  ->  bool = delete;
+
+	auto f25() const  ->  bool  *  ;
+	auto f26() const  ->  bool  *  = delete;
+	auto f27() const  ->  bool  &  ;
+	auto f28() const  ->  bool  &  = delete;
+
+	auto f29()  ->  bool  *  ;
+	auto f30()  ->  bool  *  = delete;
+	auto f31() noexcept  ->  bool  *  ;
+	auto f32() noexcept(true)  ->  bool  *  ;
+	auto f33() noexcept(false)  ->  bool  *  ;
+	auto f34() noexcept  ->  bool  *  = delete;
+	auto f35() noexcept(true)  ->  bool  *  = delete;
+	auto f36() noexcept(false)  ->  bool  *  = delete;
+	auto f37() throw()  ->  bool  *  ;
+	auto f38() throw()  ->  bool  *  = delete;
+
+	auto f39()  ->  bool  &;
+	auto f40()  ->  bool  &  = delete;
+	auto f41() noexcept  ->  bool  &  ;
+	auto f42() noexcept(true)  ->  bool  &  ;
+	auto f43() noexcept(false)  ->  bool  &  ;
+	auto f44() noexcept  ->  bool  &  = delete;
+	auto f45() noexcept(true)  ->  bool  &  = delete;
+	auto f46() noexcept(false)  ->  bool  &  = delete;
+	auto f47() throw()  ->  bool  &  ;
+	auto f48() throw()  ->  bool  &  = delete;
+
+	auto f49() const  ->  bool  *  ;
+	auto f50() const  ->  bool  *  = delete;
+	auto f51() const noexcept  ->  bool  *  ;
+	auto f52() const noexcept(true)  ->  bool  *  ;
+	auto f53() const noexcept(false)  ->  bool  *  ;
+	auto f54() const noexcept  ->  bool  *  = delete;
+	auto f55() const noexcept(true)  ->  bool  *  = delete;
+	auto f56() const noexcept(false)  ->  bool  *  = delete;
+	auto f57() const throw()  ->  bool  *  ;
+	auto f58() const throw()  ->  bool  *  = delete;
+
+	auto f59() const  ->  bool  &  ;
+	auto f60() const  ->  bool  &  = delete;
+	auto f61() const noexcept  ->  bool  &  ;
+	auto f62() const noexcept(true)  ->  bool  &  ;
+	auto f63() const noexcept(false)  ->  bool  &  ;
+	auto f64() const noexcept  ->  bool  &  = delete;
+	auto f65() const noexcept(true)  ->  bool  &  = delete;
+	auto f66() const noexcept(false)  ->  bool  &  = delete;
+	auto f67() const throw()  ->  bool  &  ;
+	auto f68() const throw()  ->  bool  &  = delete;
+
+	class Foo
+	{
+		auto operator=(const Foo  &) -> Foo  &  ;
+		auto operator=(const Foo  &) noexcept -> Foo  &  ;
+
+		auto operator=(Foo const  &) -> Foo  &  ;
+		auto operator=(Foo const  &) noexcept -> Foo  &  ;
+
+		auto operator=(Foo  &&) -> Foo  &  ;
+		auto operator=(Foo  &&) noexcept -> Foo  &  ;
+	}
+};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/try-catch-nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/try-catch-nl.cpp
index 447f3cbd..447f3cbd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/try-catch-nl.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/try-catch-nl.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/type_brace_init_lst.cpp
index 53e74de2..53e74de2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/type_brace_init_lst.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/type_brace_init_lst.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/uniform_initialization.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/uniform_initialization.cpp
index 37a131e0..37a131e0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/uniform_initialization.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/uniform_initialization.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/using-alias-in-define.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/using-alias-in-define.cpp
index 82854287..82854287 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/using-alias-in-define.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/using-alias-in-define.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/var_def_gap.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/var_def_gap.cpp
index 0cca962b..0cca962b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/var_def_gap.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/var_def_gap.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/variadic-template.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/variadic-template.h
index f522097c..f522097c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/variadic-template.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/variadic-template.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/wacky-template.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/wacky-template.cpp
index 99e01b6e..99e01b6e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cpp/wacky-template.cpp
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cpp/wacky-template.cpp
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/1822.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/1822.cs
index a4269bd9..a4269bd9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/1822.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/1822.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/615_nested-usings.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/615_nested-usings.cs
index 14a31507..14a31507 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/615_nested-usings.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/615_nested-usings.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/620_getset-brace.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/620_getset-brace.cs
index f6ee6342..f6ee6342 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/620_getset-brace.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/620_getset-brace.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/621_this-spacing.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/621_this-spacing.cs
index bd28a5e8..bd28a5e8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/621_this-spacing.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/621_this-spacing.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/625_where-constraints.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/625_where-constraints.cs
index 09274ab9..09274ab9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/625_where-constraints.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/625_where-constraints.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/630_bad-new-init-semicolon-removal.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/630_bad-new-init-semicolon-removal.cs
index 2e6d5a98..2e6d5a98 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/630_bad-new-init-semicolon-removal.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/630_bad-new-init-semicolon-removal.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/Issue_2705.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/Issue_2705.cs
index 9a1b3172..9a1b3172 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/Issue_2705.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/Issue_2705.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-11662.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-11662.cs
index 9a49fdba..9a49fdba 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-11662.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-11662.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-11993.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-11993.cs
index 6bc6529a..6bc6529a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-11993.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-11993.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-12303.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-12303.cs
index 01be8291..01be8291 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-12303.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-12303.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-1288.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-1288.cs
index 70554a02..70554a02 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-1288.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-1288.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-1338.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-1338.cs
index d10b4893..d10b4893 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-1338.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-1338.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-1343.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-1343.cs
index 852fe640..852fe640 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-1343.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-1343.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-1345.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-1345.cs
index e218e6a2..e218e6a2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-1345.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-1345.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-13955.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-13955.cs
index 940aa89b..940aa89b 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-13955.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-13955.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-14131.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-14131.cs
index c8c3c918..c8c3c918 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-14131.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-14131.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-17253.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-17253.cs
index 7342d82c..7342d82c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-17253.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-17253.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-18437.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-18437.cs
index aab6c498..aab6c498 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-18437.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-18437.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-18777.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-18777.cs
index 198d5be3..198d5be3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-18777.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-18777.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-18780.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-18780.cs
index 0eea713e..0eea713e 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-18780.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-18780.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-18829.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-18829.cs
index 62c9f8fb..62c9f8fb 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-18829.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-18829.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-1919.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-1919.cs
index 956fd0f8..956fd0f8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-1919.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-1919.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-19644.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-19644.cs
index da76bfbc..da76bfbc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-19644.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-19644.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-1975.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-1975.cs
index af678a93..af678a93 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-1975.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-1975.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-1977.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-1977.cs
index e4b1b375..e4b1b375 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-1977.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-1977.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-1978.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-1978.cs
index 14cbdc7d..14cbdc7d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-1978.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-1978.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-19895.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-19895.cs
index a22c6fa8..a22c6fa8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-19895.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-19895.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-2007.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-2007.cs
index 2e9f163a..2e9f163a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-2007.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-2007.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-2008.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-2008.cs
index eeb649dd..eeb649dd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-2008.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-2008.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-2020.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-2020.cs
index 37d9ef23..37d9ef23 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-2020.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-2020.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-2021.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-2021.cs
index 2b08fafe..2b08fafe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-2021.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-2021.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-21730.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-21730.cs
index 6fcb8c16..6fcb8c16 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-21730.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-21730.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-2505.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-2505.cs
index a17e6a5e..a17e6a5e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-2505.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-2505.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-2506.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-2506.cs
index 7bdbb81a..7bdbb81a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-2506.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-2506.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-2684.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-2684.cs
index 0c91b081..0c91b081 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-2684.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-2684.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-2685.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-2685.cs
index 4c11f20b..4c11f20b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-2685.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-2685.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-29933.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-29933.cs
index ed96bc87..ed96bc87 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-29933.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-29933.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-30498_2.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-30498_2.cs
index ba0d8515..ba0d8515 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-30498_2.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-30498_2.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-3083.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-3083.cs
index 5209dc72..5209dc72 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-3083.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-3083.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-32658.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-32658.cs
index 145da65f..145da65f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-32658.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-32658.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-3484.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-3484.cs
index 1235aa91..1235aa91 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-3484.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-3484.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-36862.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-36862.cs
index cb3cb448..cb3cb448 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-36862.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-36862.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-37241.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-37241.cs
index b2097c4f..b2097c4f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-37241.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-37241.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-40685.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-40685.cs
index a2f37547..a2f37547 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-40685.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-40685.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-58354.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-58354.cs
index 6c77de40..6c77de40 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-58354.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-58354.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-9917.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-9917.cs
index 5bd9dc64..5bd9dc64 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-9917.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/UNI-9917.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/add-nl-before-namespace.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/add-nl-before-namespace.cs
index 93a2cf04..93a2cf04 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/add-nl-before-namespace.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/add-nl-before-namespace.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/bug_1591.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/bug_1591.cs
index ac62df9e..ac62df9e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/bug_1591.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/bug_1591.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/bug_1620.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/bug_1620.cs
index 0c9d4eb9..0c9d4eb9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/bug_1620.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/bug_1620.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/bug_1637.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/bug_1637.cs
index 1f46d1bc..1f46d1bc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/bug_1637.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/bug_1637.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/bug_1650.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/bug_1650.cs
index 5c52aece..5c52aece 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/bug_1650.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/bug_1650.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/bug_600.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/bug_600.cs
index 3d93d861..3d93d861 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/bug_600.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/bug_600.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/bug_620.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/bug_620.cs
index f6ee6342..f6ee6342 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/bug_620.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/bug_620.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/bug_i_679.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/bug_i_679.cs
index 199ad7e6..199ad7e6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/bug_i_679.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/bug_i_679.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/bug_i_935.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/bug_i_935.cs
index d2c8ec95..d2c8ec95 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/bug_i_935.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.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.75.0/tests/input/cs/cast.cs
new file mode 100644
index 00000000..77761b89
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/cast.cs
@@ -0,0 +1,7 @@
+foo = ( Type ) bar;
+
+foo = ( Ns.Type ) bar;
+
+foo = ( Type<int> ) bar;
+
+foo = ( Type<int, int> ) bar;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/cmt_backslash_eol.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/cmt_backslash_eol.cs
index e56aec25..e56aec25 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/cmt_backslash_eol.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/cmt_backslash_eol.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/comma.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/comma.cs
index 794410f0..794410f0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/comma.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/comma.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/delegate.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/delegate.cs
index 3a4b103c..3a4b103c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/delegate.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/delegate.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/exception-filters.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/exception-filters.cs
index 1e3abca3..1e3abca3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/exception-filters.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/exception-filters.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/fncall_as_ctor_in_attr.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/fncall_as_ctor_in_attr.cs
index cf52b46f..cf52b46f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/fncall_as_ctor_in_attr.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/fncall_as_ctor_in_attr.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/generics.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/generics.cs
index 7bbe04c7..7bbe04c7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/generics.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/generics.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/getset.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/getset.cs
index 59aaa5bc..59aaa5bc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/getset.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/getset.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/gs.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/gs.cs
index 16adc604..16adc604 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/gs.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/gs.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/ifcolalign.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/ifcolalign.cs
index d2e40c78..d2e40c78 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/ifcolalign.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/ifcolalign.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/ifcomment.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/ifcomment.cs
index 6663a6ca..6663a6ca 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/ifcomment.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/ifcomment.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/indent-multistring-coulmn1.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/indent-multistring-coulmn1.cs
index 56bdf473..56bdf473 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/indent-multistring-coulmn1.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/indent-multistring-coulmn1.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/logger.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/logger.cs
index defede8a..defede8a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/logger.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/logger.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/mdarray_space.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/mdarray_space.cs
index e5338c11..e5338c11 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/mdarray_space.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/mdarray_space.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/misc-failures.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/misc-failures.cs
index 857c06f9..857c06f9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/misc-failures.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/misc-failures.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/mod_full_brace_nl_block_rem_mlcond.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/mod_full_brace_nl_block_rem_mlcond.cs
index f8db4f0b..f8db4f0b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/mod_full_brace_nl_block_rem_mlcond.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/mod_full_brace_nl_block_rem_mlcond.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/mod_full_paren_if_bool.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/mod_full_paren_if_bool.cs
index 6bcd9201..6bcd9201 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/mod_full_paren_if_bool.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/mod_full_paren_if_bool.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/new-constraint-paren-space.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/new-constraint-paren-space.cs
index 209f2721..209f2721 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/new-constraint-paren-space.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/new-constraint-paren-space.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/nullable_prop.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/nullable_prop.cs
index 21c4f7b0..21c4f7b0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/nullable_prop.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/nullable_prop.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/oneline_property.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/oneline_property.cs
index 1d7a2c26..1d7a2c26 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/oneline_property.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/oneline_property.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/operator-null-conditional.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/operator-null-conditional.cs
index 530bdd27..530bdd27 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/operator-null-conditional.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/operator-null-conditional.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/operator_null-coalescing-assignment.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/operator_null-coalescing-assignment.cs
index 416e6afc..416e6afc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/operator_null-coalescing-assignment.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/operator_null-coalescing-assignment.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/preserveTabs.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/preserveTabs.cs
index c9583dcd..c9583dcd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/preserveTabs.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/preserveTabs.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/property.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/property.cs
index 85e08bae..85e08bae 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/property.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/property.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/region.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/region.cs
index 4f8667f2..4f8667f2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/region.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/region.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/remove_semi.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/remove_semi.cs
index 2e6d5a98..2e6d5a98 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/remove_semi.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/remove_semi.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/sf607.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/sf607.cs
index f0617c19..f0617c19 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/sf607.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/sf607.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/sf628.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/sf628.cs
index 803c9962..803c9962 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/sf628.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/sf628.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/simple.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/simple.cs
index 30acd134..30acd134 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/simple.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/simple.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/sort_using.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/sort_using.cs
index 881b4d5b..881b4d5b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/sort_using.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/sort_using.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/sort_using_categ.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/sort_using_categ.cs
index 173e42bb..173e42bb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/sort_using_categ.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/sort_using_categ.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/sp_between_new_paren.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/sp_between_new_paren.cs
index f5d8381d..f5d8381d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/sp_between_new_paren.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/sp_between_new_paren.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/squeeze-paren-close-Option.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/squeeze-paren-close-Option.cs
index 37203f4a..37203f4a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/squeeze-paren-close-Option.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/squeeze-paren-close-Option.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/string_multi.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/string_multi.cs
index 9e715e51..9e715e51 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/string_multi.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/string_multi.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/strings.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/strings.cs
index 6794e762..6794e762 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/strings.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/strings.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/tcf.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/tcf.cs
index f3ac3664..f3ac3664 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/tcf.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/tcf.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/unsafe.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/unsafe.cs
index 5dc90cb4..5dc90cb4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/unsafe.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/unsafe.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/utf16be.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/utf16be.cs
index 13da3090..13da3090 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/utf16be.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/utf16be.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/utf16be_no_bom.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/utf16be_no_bom.cs
index 33587b97..33587b97 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/utf16be_no_bom.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/utf16be_no_bom.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/utf16le.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/utf16le.cs
index 3f16b9d0..3f16b9d0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/utf16le.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/utf16le.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/utf16le_no_bom.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/utf16le_no_bom.cs
index 4a7f9ccc..4a7f9ccc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/utf16le_no_bom.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/utf16le_no_bom.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/var-member.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/var-member.cs
index 0f7ffb23..0f7ffb23 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/var-member.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/var-member.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/verbatim_strings.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/verbatim_strings.cs
index 47c3ed4c..47c3ed4c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/verbatim_strings.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/verbatim_strings.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/when.cs b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/when.cs
index 2785b894..2785b894 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/when.cs
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/cs/when.cs
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/1438.d b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/1438.d
index 10a43753..10a43753 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/1438.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/1438.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/HashMap.d b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/HashMap.d
index 618b3e59..618b3e59 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/HashMap.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/HashMap.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/Lexer.d b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/Lexer.d
index 004d9d8a..004d9d8a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/Lexer.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/Lexer.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/bug-indent.d b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/bug-indent.d
index 321ab6f1..321ab6f1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/bug-indent.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/bug-indent.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/casts.d b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/casts.d
index 42d54916..42d54916 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/casts.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/casts.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/const.d b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/const.d
index 778957fd..778957fd 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/const.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/const.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/d_sp_paren.d b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/d_sp_paren.d
index 2b28a7f1..2b28a7f1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/d_sp_paren.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/d_sp_paren.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/delegate.d b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/delegate.d
index 0115ae00..0115ae00 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/delegate.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/delegate.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/enum.d b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/enum.d
index 804ef27c..804ef27c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/enum.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/enum.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/extern_.d b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/extern_.d
index a583b08e..a583b08e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/extern_.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/extern_.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/funcfunc.d b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/funcfunc.d
index ee717abc..ee717abc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/funcfunc.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/funcfunc.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/imports.d b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/imports.d
index 758fefb7..758fefb7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/imports.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/imports.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/invariant.d b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/invariant.d
index 46a8efdc..46a8efdc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/invariant.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/invariant.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/numbers.d b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/numbers.d
index e51bf8ac..e51bf8ac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/numbers.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/numbers.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/sort_import.d b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/sort_import.d
index d929f8e8..d929f8e8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/sort_import.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/sort_import.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/square_indent_tab.d b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/square_indent_tab.d
index 1dee3a17..1dee3a17 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/square_indent_tab.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/square_indent_tab.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/static_if.d b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/static_if.d
index 24e6eaba..24e6eaba 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/static_if.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/static_if.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/static_if_in_struct.d b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/static_if_in_struct.d
index be936335..be936335 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/static_if_in_struct.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/static_if_in_struct.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/strings.d b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/strings.d
index a62adec3..a62adec3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/strings.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/strings.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/template.d b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/template.d
index fe5a162c..fe5a162c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/template.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/template.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/template_spacing000.d b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/template_spacing000.d
index 627ca266..627ca266 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/template_spacing000.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/template_spacing000.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/template_spacing001.d b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/template_spacing001.d
index 745e5b36..745e5b36 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/template_spacing001.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/template_spacing001.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/template_use.d b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/template_use.d
index 94cdbf6b..94cdbf6b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/template_use.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/template_use.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/tst01.d b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/tst01.d
index 3a3728f2..3a3728f2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/tst01.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/tst01.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/tst02.d b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/tst02.d
index 0b428d60..0b428d60 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/tst02.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/tst02.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/tst03.d b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/tst03.d
index 611f12f9..611f12f9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/tst03.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/tst03.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/type_spacing000.d b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/type_spacing000.d
index e11e545b..e11e545b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/type_spacing000.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/type_spacing000.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/vbraces000.d b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/vbraces000.d
index d2f1b642..d2f1b642 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/vbraces000.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/vbraces000.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/vbraces001.d b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/vbraces001.d
index a59ab020..a59ab020 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/vbraces001.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/vbraces001.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/vbraces002.d b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/vbraces002.d
index 5e45e999..5e45e999 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/vbraces002.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/vbraces002.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/volatile-1.d b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/volatile-1.d
index c9f41d3f..c9f41d3f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/volatile-1.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/volatile-1.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/volatile-2.d b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/volatile-2.d
index bc5a0de4..bc5a0de4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/volatile-2.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/volatile-2.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/volatile-3.d b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/volatile-3.d
index 039f788a..039f788a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/volatile-3.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/volatile-3.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/volatile.d b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/volatile.d
index c42d1893..c42d1893 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/volatile.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/volatile.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/wysiwyg_strings.d b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/wysiwyg_strings.d
index cfdec32a..cfdec32a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/d/wysiwyg_strings.d
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/d/wysiwyg_strings.d
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/ecma/example-1.es b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/ecma/example-1.es
index 0bc9b775..0bc9b775 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/ecma/example-1.es
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/ecma/example-1.es
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/Issue_1122.java b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/Issue_1122.java
index 5712f9ee..5712f9ee 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/Issue_1122.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/Issue_1122.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/Issue_1124.java b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/Issue_1124.java
index dcea4172..dcea4172 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/Issue_1124.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/Issue_1124.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/Issue_1845.java b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/Issue_1845.java
index cc7656ba..cc7656ba 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/Issue_1845.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/Issue_1845.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/Issue_670.java b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/Issue_670.java
index 52d64f1e..52d64f1e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/Issue_670.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/Issue_670.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/Java8DoubleColon.java b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/Java8DoubleColon.java
index ec594909..ec594909 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/Java8DoubleColon.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/Java8DoubleColon.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/annotation1.java b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/annotation1.java
index d7417542..d7417542 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/annotation1.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/annotation1.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/annotation2.java b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/annotation2.java
index 596c2562..596c2562 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/annotation2.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/annotation2.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/annotation3.java b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/annotation3.java
index 3d84c04c..3d84c04c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/annotation3.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/annotation3.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/assert.java b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/assert.java
index 8076663b..8076663b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/assert.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/assert.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/cast.java b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/cast.java
index 8f2d983b..8f2d983b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/cast.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/cast.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/double_brace.java b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/double_brace.java
index 8ba15c47..8ba15c47 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/double_brace.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/double_brace.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/doxy-javadoc-alignment.java b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/doxy-javadoc-alignment.java
index 838d765c..838d765c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/doxy-javadoc-alignment.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/doxy-javadoc-alignment.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/foreach.java b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/foreach.java
index e475dc29..e475dc29 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/foreach.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/foreach.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/generics.java b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/generics.java
index 729013ce..729013ce 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/generics.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/generics.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/generics_return_type.java b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/generics_return_type.java
index 818ac721..818ac721 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/generics_return_type.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/generics_return_type.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/generics_wildcard.java b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/generics_wildcard.java
index 358e333b..358e333b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/generics_wildcard.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/generics_wildcard.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/i1121.java b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/i1121.java
index 18567ec3..18567ec3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/i1121.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/i1121.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/issue_672.java b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/issue_672.java
index 2f632625..2f632625 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/issue_672.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/issue_672.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/leading-tabs-for-java-lambda.java b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/leading-tabs-for-java-lambda.java
index 19b6df0f..19b6df0f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/leading-tabs-for-java-lambda.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/leading-tabs-for-java-lambda.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/long_cl_cmt.java b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/long_cl_cmt.java
index 45e5252b..45e5252b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/long_cl_cmt.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/long_cl_cmt.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/nl_before_ignore_after_case.java b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/nl_before_ignore_after_case.java
index a84e8847..a84e8847 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/nl_before_ignore_after_case.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/nl_before_ignore_after_case.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/sf567.java b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/sf567.java
index 68a63221..68a63221 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/sf567.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/sf567.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/sp_after_angle.java b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/sp_after_angle.java
index 1e11c4c9..1e11c4c9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/sp_after_angle.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/sp_after_angle.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/sp_after_for_colon.java b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/sp_after_for_colon.java
index fecd1833..fecd1833 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/sp_after_for_colon.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/sp_after_for_colon.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/sp_before_byref.java b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/sp_before_byref.java
index 7927ee89..7927ee89 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/sp_before_byref.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/sp_before_byref.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/sp_this_paren.java b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/sp_this_paren.java
index 628b327f..628b327f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/sp_this_paren.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/sp_this_paren.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/synchronized.java b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/synchronized.java
index 369394b8..369394b8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/synchronized.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/synchronized.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/try.java b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/try.java
index aea6a7f3..aea6a7f3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/try.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/try.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/variable_aligns.java b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/variable_aligns.java
index 76c6131c..76c6131c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/java/variable_aligns.java
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/java/variable_aligns.java
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/1927.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/1927.m
index 9f8d7a7b..9f8d7a7b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/1927.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/1927.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/Declarations.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/Declarations.h
index e1ad3c6b..e1ad3c6b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/Declarations.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/Declarations.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/Fraction.h b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/Fraction.h
index 364b1de8..364b1de8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/Fraction.h
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/Fraction.h
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/Fraction.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/Fraction.m
index 20994f34..20994f34 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/Fraction.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/Fraction.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/Issue_2172.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/Issue_2172.m
index 02584e91..02584e91 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/Issue_2172.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/Issue_2172.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/Issue_2289.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/Issue_2289.m
index c046cb1e..c046cb1e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/Issue_2289.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/Issue_2289.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/Issue_681.oc b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/Issue_681.oc
index fb4c6685..fb4c6685 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/Issue_681.oc
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/Issue_681.oc
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-11095.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/UNI-11095.mm
index 34ed4050..34ed4050 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/UNI-11095.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/UNI-11095.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10046-UNI-1333.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/UNI-1333.mm
index de887ad0..5c91693c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/expected/cs/10046-UNI-1333.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/UNI-1333.mm
@@ -3,7 +3,7 @@
 // In keywords.cpp there is no @synchronized keyword listed and from what I've seen synchronized is only regarded as a keyword in other languages

 // { "synchronized", CT_QUALIFIER, LANG_D | LANG_JAVA | LANG_ECMA },

 

--(void) foo

+- (void)foo

 {

     @synchronized(self)

     {

diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/align-objc-like-xcode.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/align-objc-like-xcode.m
index 6852ac12..6852ac12 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/align-objc-like-xcode.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/align-objc-like-xcode.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/argtypes.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/argtypes.mm
index fd2ff142..fd2ff142 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/argtypes.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/argtypes.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/asm.h.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/asm.h.mm
index 97c0edd3..97c0edd3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/asm.h.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/asm.h.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/attribute_specifier_seqs.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/attribute_specifier_seqs.mm
index c9b6f24d..c9b6f24d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/attribute_specifier_seqs.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/attribute_specifier_seqs.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/available.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/available.m
index 8216d17f..8216d17f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/available.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/available.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/block_in_method.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/block_in_method.m
index e0dfcd76..e0dfcd76 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/block_in_method.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/block_in_method.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/block_literal_protocol.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/block_literal_protocol.m
index 02d1cfca..02d1cfca 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/block_literal_protocol.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/block_literal_protocol.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/block_pointer.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/block_pointer.m
index 9c7ac70b..9c7ac70b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/block_pointer.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/block_pointer.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/blocks.m
index 617e0b78..617e0b78 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/blocks.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/blocks.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/blocks_align.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/blocks_align.m
index 2ddf75c6..2ddf75c6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/blocks_align.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/blocks_align.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/blocks_align2.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/blocks_align2.m
index f4e875c9..f4e875c9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/blocks_align2.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/blocks_align2.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/box.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/box.m
index 98a3516a..98a3516a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/box.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/box.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/boxed_receiver.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/boxed_receiver.m
index 3460b920..3460b920 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/boxed_receiver.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/boxed_receiver.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/bug_1366.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/bug_1366.m
index 5e81ed4a..5e81ed4a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/bug_1366.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/bug_1366.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/bug_167.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/bug_167.m
index e404e2aa..e404e2aa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/bug_167.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/bug_167.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/bug_1674.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/bug_1674.m
index 82c20161..82c20161 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/bug_1674.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/bug_1674.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/bug_1683.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/bug_1683.m
index 3ee562c0..3ee562c0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/bug_1683.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/bug_1683.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/bug_340.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/bug_340.m
index ea9f8201..ea9f8201 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/bug_340.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/bug_340.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/bug_404.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/bug_404.m
index 3ecb87f0..3ecb87f0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/bug_404.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/bug_404.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/bug_497.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/bug_497.m
index a976d43d..a976d43d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/bug_497.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/bug_497.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/bug_841.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/bug_841.m
index dea826d2..dea826d2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/bug_841.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/bug_841.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/bug_i_125-412.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/bug_i_125-412.m
index c92d2e66..c92d2e66 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/bug_i_125-412.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/bug_i_125-412.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/bug_i_408.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/bug_i_408.m
index c8a3a450..c8a3a450 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/bug_i_408.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/bug_i_408.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/bug_i_477.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/bug_i_477.m
index a1a81749..a1a81749 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/bug_i_477.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/bug_i_477.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/c-cpp-oc-wrapper.c b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/c-cpp-oc-wrapper.c
index 663a4cc8..663a4cc8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/c-cpp-oc-wrapper.c
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/c-cpp-oc-wrapper.c
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/cast.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/cast.m
index daa9cb6d..daa9cb6d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/cast.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/cast.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/casting.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/casting.mm
index c8022c7b..c8022c7b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/casting.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/casting.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/chunk_ends_type1.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/chunk_ends_type1.m
index fb9bb4e1..fb9bb4e1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/chunk_ends_type1.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/chunk_ends_type1.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/chunk_ends_type2.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/chunk_ends_type2.m
index 27e31cdc..27e31cdc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/chunk_ends_type2.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/chunk_ends_type2.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/chunk_ends_type3.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/chunk_ends_type3.m
index 8d8676c8..8d8676c8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/chunk_ends_type3.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/chunk_ends_type3.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/chunk_ends_type4.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/chunk_ends_type4.m
index dd4d55fe..dd4d55fe 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/chunk_ends_type4.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/chunk_ends_type4.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/cmt_insert.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/cmt_insert.m
index 58a4c894..58a4c894 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/cmt_insert.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/cmt_insert.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/cmt_insert2.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/cmt_insert2.m
index 4a31e975..4a31e975 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/cmt_insert2.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/cmt_insert2.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/code_placeholder.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/code_placeholder.m
index 6245bfa4..6245bfa4 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/code_placeholder.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/code_placeholder.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/complex_method.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/complex_method.m
index b22c34b6..b22c34b6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/complex_method.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/complex_method.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/definesalign.h.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/definesalign.h.mm
index a249d1aa..a249d1aa 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/definesalign.h.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/definesalign.h.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/delete-space-oc.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/delete-space-oc.mm
index 66e24dc8..66e24dc8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/delete-space-oc.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/delete-space-oc.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/double-indent-objc-dict.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/double-indent-objc-dict.m
index f94e5105..f94e5105 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/double-indent-objc-dict.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/double-indent-objc-dict.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/double_angle_space.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/double_angle_space.m
index f7164498..f7164498 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/double_angle_space.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/double_angle_space.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/exceptions.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/exceptions.m
index c8d6f6f2..c8d6f6f2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/exceptions.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/exceptions.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/extern-c-attribute.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/extern-c-attribute.m
index fb84ce73..fb84ce73 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/extern-c-attribute.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/extern-c-attribute.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/for.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/for.m
index fc159fc6..fc159fc6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/for.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/for.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/for2.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/for2.m
index 535bc50b..535bc50b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/for2.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/for2.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/func-param-wrap-oc.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/func-param-wrap-oc.mm
index 16f98ce9..16f98ce9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/func-param-wrap-oc.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/func-param-wrap-oc.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/func_def.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/func_def.mm
index b3655728..b3655728 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/func_def.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/func_def.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/gh137.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/gh137.m
index 779e0f2f..779e0f2f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/gh137.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/gh137.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/gh293.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/gh293.m
index bb4cb52c..bb4cb52c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/gh293.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/gh293.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/gh511.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/gh511.m
index cee32794..cee32794 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/gh511.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/gh511.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/i1213.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/i1213.m
index f47e5964..f47e5964 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/i1213.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/i1213.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/indent-inside-ternary-operator.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/indent-inside-ternary-operator.m
index ff979acf..ff979acf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/indent-inside-ternary-operator.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/indent-inside-ternary-operator.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/indent-objc-block.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/indent-objc-block.m
index b882abf5..b882abf5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/indent-objc-block.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/indent-objc-block.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/indent_boxed.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/indent_boxed.m
index c7df968f..c7df968f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/indent_boxed.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/indent_boxed.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/indent_oc_inside_msg_sel.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/indent_oc_inside_msg_sel.m
index f20cd048..f20cd048 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/indent_oc_inside_msg_sel.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/indent_oc_inside_msg_sel.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/indent_single_newline.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/indent_single_newline.m
index 27e79e8a..27e79e8a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/indent_single_newline.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/indent_single_newline.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/inttypes.h.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/inttypes.h.mm
index 6e093789..6e093789 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/inttypes.h.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/inttypes.h.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/issue_2629.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/issue_2629.m
index e690ea58..e690ea58 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/issue_2629.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/issue_2629.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/issue_2631.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/issue_2631.m
index 7989b020..7989b020 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/issue_2631.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/issue_2631.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/issue_2675.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/issue_2675.m
index 1d4cafe2..1d4cafe2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/issue_2675.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/issue_2675.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/issue_2722.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/issue_2722.m
index 65dcb131..65dcb131 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/issue_2722.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/issue_2722.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/issue_2724.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/issue_2724.m
index 51c90671..51c90671 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/issue_2724.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/issue_2724.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/issue_2727.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/issue_2727.m
index f15542f1..f15542f1 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/issue_2727.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/issue_2727.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/issue_3031.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/issue_3031.mm
index 028d55d9..028d55d9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/issue_3031.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/issue_3031.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/kw.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/kw.m
index a4d25624..a4d25624 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/kw.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/kw.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/literals.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/literals.mm
index 98522f3d..98522f3d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/literals.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/literals.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/macro-close-brace.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/macro-close-brace.m
index 0eb3fa81..0eb3fa81 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/macro-close-brace.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/macro-close-brace.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/main.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/main.m
index f2fdf16a..f2fdf16a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/main.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/main.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/method_ends_semicolon.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/method_ends_semicolon.m
index e3c5637e..e3c5637e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/method_ends_semicolon.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/method_ends_semicolon.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/misc.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/misc.m
index 5038a14c..5038a14c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/misc.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/misc.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/more_blocks.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/more_blocks.m
index eab01db0..eab01db0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/more_blocks.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/more_blocks.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/more_blocks_2.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/more_blocks_2.m
index 55636ae5..55636ae5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/more_blocks_2.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/more_blocks_2.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/msg.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/msg.m
index cca460f9..cca460f9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/msg.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/msg.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/msg_align.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/msg_align.m
index 3b61a051..3b61a051 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/msg_align.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/msg_align.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/negative_value.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/negative_value.m
index 9aa4dc80..9aa4dc80 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/negative_value.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/negative_value.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/nelem.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/nelem.m
index d42ce3b6..d42ce3b6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/nelem.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/nelem.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/newlines.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/newlines.mm
index 31a46376..31a46376 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/newlines.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/newlines.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/nl_func_call_args_multi_line_ignore_closures.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/nl_func_call_args_multi_line_ignore_closures.m
index ea132bab..ea132bab 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/nl_func_call_args_multi_line_ignore_closures.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/nl_func_call_args_multi_line_ignore_closures.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/ns_enum-i.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/ns_enum-i.m
index e5caad06..e5caad06 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/ns_enum-i.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/ns_enum-i.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/ns_enum.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/ns_enum.m
index cdd729d8..cdd729d8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/ns_enum.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/ns_enum.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/objc.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/objc.mm
index 7f0e706a..7f0e706a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/objc.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/objc.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/oc-split.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/oc-split.m
index 3b656bfc..3b656bfc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/oc-split.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/oc-split.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/oc_cond_colon.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/oc_cond_colon.m
index 50cf56b5..50cf56b5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/oc_cond_colon.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/oc_cond_colon.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/oc_msg_in_pp.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/oc_msg_in_pp.m
index 8496973b..8496973b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/oc_msg_in_pp.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/oc_msg_in_pp.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/pp-ignore.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/pp-ignore.mm
index 2673008c..2673008c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/cs/pp-ignore.mm
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/pp-ignore.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/pp_bool.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/pp_bool.m
index b1bf896c..b1bf896c 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/pp_bool.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/pp_bool.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/properties.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/properties.m
index 4de60057..4de60057 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/properties.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/properties.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/protocol.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/protocol.m
index 31a8b86f..31a8b86f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/protocol.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/protocol.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/react_native.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/react_native.m
index eadf314f..eadf314f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/react_native.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/react_native.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/real_world_file.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/real_world_file.m
index 26ec3cb2..26ec3cb2 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/real_world_file.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/real_world_file.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/receiver.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/receiver.m
index 274d4130..274d4130 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/receiver.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/receiver.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/return_type.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/return_type.m
index 62a5c246..62a5c246 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/return_type.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/return_type.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/selector.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/selector.m
index a5a89475..a5a89475 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/selector.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/selector.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/sort_import.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/sort_import.m
index 1a227b7e..1a227b7e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/sort_import.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/sort_import.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/sort_import_group.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/sort_import_group.m
index 9e14f0fc..9e14f0fc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/sort_import_group.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/sort_import_group.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/sp_after_angle.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/sp_after_angle.m
index 259d2011..259d2011 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/sp_after_angle.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/sp_after_angle.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/sp_after_oc_msg_receiver.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/sp_after_oc_msg_receiver.m
index aad36be5..aad36be5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/sp_after_oc_msg_receiver.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/sp_after_oc_msg_receiver.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/sp_before_oc_proto_list.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/sp_before_oc_proto_list.m
index c0d96bdb..c0d96bdb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/sp_before_oc_proto_list.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/sp_before_oc_proto_list.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/sp_cond_ternary_short.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/sp_cond_ternary_short.m
index 6c1ce050..6c1ce050 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/sp_cond_ternary_short.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/sp_cond_ternary_short.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/sp_inside_braces_oc_dict.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/sp_inside_braces_oc_dict.m
index 272a2f28..272a2f28 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/sp_inside_braces_oc_dict.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/sp_inside_braces_oc_dict.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/sp_oc_boxed.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/sp_oc_boxed.m
index 0c6948c0..0c6948c0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/sp_oc_boxed.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/sp_oc_boxed.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/sp_oc_catch.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/sp_oc_catch.m
index fe04844d..fe04844d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/sp_oc_catch.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/sp_oc_catch.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/sp_oc_classname_paren-r.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/sp_oc_classname_paren-r.m
index 1076bbb3..1076bbb3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/sp_oc_classname_paren-r.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/sp_oc_classname_paren-r.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/sp_oc_synchronized.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/sp_oc_synchronized.m
index e4de748b..e4de748b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/sp_oc_synchronized.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/sp_oc_synchronized.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/string.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/string.m
index f3fca80f..f3fca80f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/string.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/string.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/ternary.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/ternary.m
index 3fdddd93..3fdddd93 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/ternary.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/ternary.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/typeof.m b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/typeof.m
index d5183a1d..d5183a1d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/oc/typeof.m
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/oc/typeof.m
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/pawn/Issue_2586.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/pawn/Issue_2586.pawn
index 89558691..89558691 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/pawn/Issue_2586.pawn
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/pawn/Issue_2586.pawn
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/pawn/Issue_2665.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/pawn/Issue_2665.pawn
index ddcb045a..ddcb045a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/pawn/Issue_2665.pawn
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/pawn/Issue_2665.pawn
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/pawn/comment.p b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/pawn/comment.p
index 785521ac..785521ac 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/pawn/comment.p
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/pawn/comment.p
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/pawn/crusty_ex-1.sma b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/pawn/crusty_ex-1.sma
index 35ee0515..35ee0515 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/pawn/crusty_ex-1.sma
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/pawn/crusty_ex-1.sma
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/pawn/enum.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/pawn/enum.pawn
index 588efc35..588efc35 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/pawn/enum.pawn
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/pawn/enum.pawn
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/pawn/functions.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/pawn/functions.pawn
index cdda5e05..cdda5e05 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/pawn/functions.pawn
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/pawn/functions.pawn
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/pawn/gh419.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/pawn/gh419.pawn
index 9db7b08f..9db7b08f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/pawn/gh419.pawn
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/pawn/gh419.pawn
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/pawn/preproc.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/pawn/preproc.pawn
index e15d360e..e15d360e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/pawn/preproc.pawn
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/pawn/preproc.pawn
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/pawn/rpn_calc.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/pawn/rpn_calc.pawn
index 2965d9c7..2965d9c7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/pawn/rpn_calc.pawn
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/pawn/rpn_calc.pawn
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/pawn/str-escape.p b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/pawn/str-escape.p
index 5600eae3..5600eae3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/pawn/str-escape.p
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/pawn/str-escape.p
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/pawn/switch-vsemi.sma b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/pawn/switch-vsemi.sma
index c2efacfb..c2efacfb 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/pawn/switch-vsemi.sma
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/pawn/switch-vsemi.sma
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/pawn/tags.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/pawn/tags.pawn
index 56bdd2b9..56bdd2b9 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/pawn/tags.pawn
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/pawn/tags.pawn
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/pawn/test1.pawn b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/pawn/test1.pawn
index ecefe6e0..ecefe6e0 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/pawn/test1.pawn
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/pawn/test1.pawn
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/pawn/traffic.p b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/pawn/traffic.p
index f5cf0f7f..f5cf0f7f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/pawn/traffic.p
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/pawn/traffic.p
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/pawn/unbraced.p b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/pawn/unbraced.p
index 10c41663..10c41663 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/pawn/unbraced.p
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/pawn/unbraced.p
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/sql/issue_527.sqc b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/sql/issue_527.sqc
index 5514ff31..5514ff31 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/sql/issue_527.sqc
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/sql/issue_527.sqc
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/sql/mysql.sqc b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/sql/mysql.sqc
index 197c2847..197c2847 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/sql/mysql.sqc
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/sql/mysql.sqc
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/sql/sta-select.sqc b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/sql/sta-select.sqc
index 863edf5b..863edf5b 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/sql/sta-select.sqc
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/sql/sta-select.sqc
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/vala/Issue_2090.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/vala/Issue_2090.vala
index 22698792..22698792 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/vala/Issue_2090.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/vala/Issue_2090.vala
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/vala/Issue_2270.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/vala/Issue_2270.vala
index 7bb897d8..7bb897d8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/vala/Issue_2270.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/vala/Issue_2270.vala
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/vala/advanced.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/vala/advanced.vala
index 2b85c031..2b85c031 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/vala/advanced.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.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.75.0/tests/input/vala/cast.vala
new file mode 100644
index 00000000..77761b89
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/vala/cast.vala
@@ -0,0 +1,7 @@
+foo = ( Type ) bar;
+
+foo = ( Ns.Type ) bar;
+
+foo = ( Type<int> ) bar;
+
+foo = ( Type<int, int> ) bar;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/vala/gh287.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/vala/gh287.vala
index fcb6fca6..fcb6fca6 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/vala/gh287.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/vala/gh287.vala
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/vala/list.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/vala/list.vala
index e9b48acc..e9b48acc 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/vala/list.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/vala/list.vala
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/vala/nullable.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/vala/nullable.vala
new file mode 100644
index 00000000..3d93d861
--- /dev/null
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/vala/nullable.vala
@@ -0,0 +1,14 @@
+Vector2  ? a;
+Vector2 b;
+
+void G()
+{
+	int  ? x = true ? null : (int ?)2;
+	var q = x == null ? y : z;
+	var q2 = x == q ? y : z;
+	var q3 = x == null ? (y = new Y()) : z;
+	var q4 = x == q ? (y = new Y()) : z;
+
+	var q5 = x == null ? y = new Y() : z;
+	var q6 = x == q ? y = new Y() : z;
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/vala/preproc.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/vala/preproc.vala
index 3ab2ccc8..3ab2ccc8 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/vala/preproc.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/vala/preproc.vala
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/vala/verbatim_str.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/vala/verbatim_str.vala
index 11f19c01..11f19c01 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/vala/verbatim_str.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/vala/verbatim_str.vala
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/vala/verbatim_str2.vala b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/vala/verbatim_str2.vala
index 9d8798b7..9d8798b7 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/input/vala/verbatim_str2.vala
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/input/vala/verbatim_str2.vala
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/java.test b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/java.test
index 9085dc14..9085dc14 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/java.test
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/java.test
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/objective-c.test b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/objective-c.test
index f9d84477..ee33f87a 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/objective-c.test
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/objective-c.test
@@ -185,3 +185,13 @@
 10020  oc/align-objc-like-xcode.cfg             oc/align-objc-like-xcode.m
 10021  oc/double-indent-objc-dict.cfg           oc/double-indent-objc-dict.m
 10022  oc/indent-objc-block.cfg                 oc/indent-objc-block.m
+10033  oc/U11-Cpp.cfg                           oc/objc.mm
+10034  oc/U12-Cpp.cfg                           oc/asm.h.mm
+10035  oc/U13-Cpp.cfg                           oc/definesalign.h.mm
+10036  oc/U14-Cpp.cfg                           oc/inttypes.h.mm
+10046  oc/U15-Cpp.cfg                           oc/UNI-1333.mm
+10102  oc/U24-Cpp.cfg                           oc/pp-ignore.mm
+11030  oc/U08-Cpp.cfg                           oc/argtypes.mm
+11031  oc/U09-Cpp.cfg                           oc/casting.mm
+11032  oc/U10-Cpp.cfg                           oc/newlines.mm
+60011  oc/UNI-11095.cfg                         oc/UNI-11095.mm
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/pawn.test b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/pawn.test
index 7946465e..7946465e 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/pawn.test
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/pawn.test
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/run_format_tests.py b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/run_format_tests.py
index 671188c2..671188c2 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/run_format_tests.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/run_format_tests.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/run_sources_tests.py b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/run_sources_tests.py
index ebbc6623..ebbc6623 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/run_sources_tests.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/run_sources_tests.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/run_test.py b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/run_test.py
index 7b5a9d57..7b5a9d57 100755
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/run_test.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/run_test.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/staging.test b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/staging.test
index e71faddf..e71faddf 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/staging.test
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/staging.test
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/test_uncrustify/__init__.py b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/test_uncrustify/__init__.py
index bf83b667..bf83b667 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/test_uncrustify/__init__.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/test_uncrustify/__init__.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/test_uncrustify/ansicolor.py b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/test_uncrustify/ansicolor.py
index 44d6dbd5..44d6dbd5 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/test_uncrustify/ansicolor.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/test_uncrustify/ansicolor.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/test_uncrustify/config.py b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/test_uncrustify/config.py
index 4370816d..4370816d 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/test_uncrustify/config.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/test_uncrustify/config.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/test_uncrustify/failure.py b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/test_uncrustify/failure.py
index 0972930f..0972930f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/test_uncrustify/failure.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/test_uncrustify/failure.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/test_uncrustify/selector.py b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/test_uncrustify/selector.py
index 93646257..93646257 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/test_uncrustify/selector.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/test_uncrustify/selector.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/test_uncrustify/test.py b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/test_uncrustify/test.py
index f621f40f..f621f40f 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/test_uncrustify/test.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/test_uncrustify/test.py
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/test_uncrustify/utilities.py b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/test_uncrustify/utilities.py
index 2d930222..8570e6d3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/test_uncrustify/utilities.py
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/test_uncrustify/utilities.py
@@ -162,19 +162,19 @@ def report(counts):
     total = sum(counts.values())
     print('{passing} / {total} tests passed'.format(total=total, **counts))
     if counts['failing'] > 0:
-        printc('{failing} tests failed to execute'.format(**counts),
+        printc('{failing} tests failed to execute'.format(**counts), 'f',
                **FAIL_ATTRS)
     if counts['mismatch'] > 0:
         printc(
             '{mismatch} tests did not match the expected output'.format(
-                **counts),
+                **counts), 'm',
             **FAIL_ATTRS)
     if counts['unstable'] > 0:
-        printc('{unstable} tests were unstable'.format(**counts),
+        printc('{unstable} tests were unstable'.format(**counts), 'u',
                **FAIL_ATTRS)
     if counts['xpass'] > 0:
-        printc('{xpass} tests passed but were expected to fail'
-            .format(**counts), **FAIL_ATTRS)
+        printc('{xpass} tests passed but were expected to fail'.format(**counts),
+               'x', **FAIL_ATTRS)
 
 
 # -----------------------------------------------------------------------------
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/tests.vpj b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/tests.vpj
index a5ed4fd3..a5ed4fd3 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/tests.vpj
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/tests.vpj
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/vala.test b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/vala.test
index 56fbf00f..26659b18 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/tests/vala.test
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/tests/vala.test
@@ -13,3 +13,5 @@
 70287  vala/ben_105.cfg                     vala/gh287.vala
 70300  vala/Issue_2090.cfg                  vala/Issue_2090.vala
 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
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/uncrustify.vpj b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/uncrustify.vpj
index 97b2b50a..7f01a968 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/uncrustify.vpj
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/uncrustify.vpj
@@ -58,7 +58,7 @@
          <F N="src/backup.cpp"/>
          <F N="src/brace_cleanup.cpp"/>
          <F N="src/braces.cpp"/>
-         <F N="src/chunk_list.cpp"/>
+         <F N="src/chunk.cpp"/>
          <F N="src/ChunkStack.cpp"/>
          <F N="src/combine.cpp"/>
          <F N="src/compat_posix.cpp"/>
@@ -96,7 +96,7 @@
          <F N="src/backup.h"/>
          <F N="src/base_types.h"/>
          <F N="src/char_table.h"/>
-         <F N="src/chunk_list.h"/>
+         <F N="src/chunk.h"/>
          <F N="src/ChunkStack.h"/>
          <F N="src/config.h"/>
          <F N="src/ListManager.h"/>
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/uncrustify.vpw b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/uncrustify.vpw
index 245d8153..245d8153 100644
--- a/debian/uncrustify-trinity/uncrustify-trinity-0.74.0/uncrustify.vpw
+++ b/debian/uncrustify-trinity/uncrustify-trinity-0.75.0/uncrustify.vpw
diff --git a/debian/uncrustify-trinity/uncrustify-trinity_0.74.0.orig.tar.gz b/debian/uncrustify-trinity/uncrustify-trinity_0.74.0.orig.tar.gz
deleted file mode 100644
index defc012a..00000000
--- a/debian/uncrustify-trinity/uncrustify-trinity_0.74.0.orig.tar.gz
+++ /dev/null