Merge dev branch

.clang-format

@@ -0,0 +1,122 @@
+BasedOnStyle: LLVM
+Language: Cpp
+Standard: c++20
+TabWidth: 4
+IndentWidth: 4
+UseTab: Never
+ColumnLimit: 160
+
+#LineEndingStyle: LF
+#MaxEmptyLinesToKeep: 3
+
+##-- Alignment
+AlignAfterOpenBracket: AlwaysBreak
+AlignConsecutiveAssignments: false
+AlignConsecutiveDeclarations: false
+#AlignEscapedNewlinesLeft: false
+AlignTrailingComments: true
+
+DerivePointerAlignment: false
+PointerAlignment: Right
+
+##-- Single line statements
+AllowShortBlocksOnASingleLine: false
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: None
+AllowShortIfStatementsOnASingleLine: Never
+AllowShortLambdasOnASingleLine: Inline
+AllowShortLoopsOnASingleLine: false
+
+##-- Braces
+BreakBeforeBraces: Custom #Allman
+BraceWrapping:
+  AfterCaseLabel: true
+  AfterClass: false
+  AfterControlStatement: Always
+  AfterEnum: true
+  AfterFunction: true
+  AfterNamespace: true
+  AfterStruct: true
+  AfterUnion: true
+  BeforeCatch: true
+  BeforeElse: true
+  BeforeLambdaBody: true
+  IndentBraces: false
+  SplitEmptyFunction: false
+  SplitEmptyRecord: false
+  SplitEmptyNamespace: false
+Cpp11BracedListStyle: false
+
+##-- Line breaks
+AlwaysBreakAfterDefinitionReturnType: None
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: true
+AlwaysBreakTemplateDeclarations: true
+BreakAfterJavaFieldAnnotations: false
+BreakBeforeBinaryOperators: None
+BreakConstructorInitializers: AfterColon
+#BreakInheritanceList: AfterColon
+BreakBeforeTernaryOperators: false
+BreakConstructorInitializersBeforeComma: true
+BreakStringLiterals: false
+
+##-- Indentation
+IndentCaseBlocks: false
+IndentCaseLabels: true
+IndentGotoLabels: true
+IndentPPDirectives: AfterHash
+LambdaBodyIndentation: Signature
+NamespaceIndentation: Inner
+
+##-- Spaces in/between statements/etc
+SpaceAfterCStyleCast: false
+SpaceAfterTemplateKeyword: false
+#SpaceAroundPointerQualifiers: Left
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeCpp11BracedList: true
+SpaceBeforeCtorInitializerColon: true
+SpaceBeforeInheritanceColon: true
+SpaceBeforeParens: ControlStatements
+SpaceInEmptyParentheses: false
+SpacesInAngles: false
+SpacesInCStyleCastParentheses: false
+SpacesInContainerLiterals: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+
+##-- Misc
+AllowAllParametersOfDeclarationOnNextLine: true
+AccessModifierOffset: -4
+BinPackArguments: false
+BinPackParameters: false
+BreakAfterAttributes: Always
+ExperimentalAutoDetectBinPacking: false
+ConstructorInitializerAllOnOneLineOrOnePerLine: false
+DisableFormat: false
+InsertNewlineAtEOF: true
+KeepEmptyLinesAtTheStartOfBlocks: false
+ReflowComments: false
+SeparateDefinitionBlocks: Always
+
+#-- Include order
+#IncludeIsMainRegex: '$?'
+#IncludeBlocks: Regroup
+IncludeCategories:
+#TODO: main include!
+    # Headers in "" with .h extension.
+    - Regex: '"([A-Za-z0-9\/-_])+\.h"'
+      Priority: 1
+    # Headers in "" with .hpp extension.
+    - Regex: '"([A-Za-z0-9\/-_])+\.hpp"'
+      Priority: 2
+
+    # Headers in <> with .h extension.
+    - Regex: '<([A-Za-z0-9\/-_])+\.h>'
+      Priority: 10
+    # Headers in <> with .hpp extension.
+    - Regex: '<([A-Za-z0-9\/-_])+\.hpp>'
+      Priority: 20
+    # Headers in <> without extension.
+    - Regex: '<([A-Za-z0-9\/-_])+>'
+      Priority: 30
+SortIncludes: false #CaseSensitive

.cmake-format

@@ -0,0 +1,16 @@
+# https://cmake-format.readthedocs.io/en/latest/
+#https://github.com/bouncmpe/cpp-project-template/blob/main/.cmake-format
+format:
+  line_width: 80
+  tab_size: 2
+  max_subgroups_hwrap: 2
+  max_pargs_hwrap: 6
+  max_rows_cmdline: 2
+  dangle_parens: true
+  dangle_align: 'prefix'
+  min_prefix_chars: 8
+  max_prefix_chars: 8
+  max_lines_hwrap: 2
+  command_case: 'lower'
+markup:
+  enable_markup: false

.editorconfig

@@ -4,56 +4,75 @@ root = true
 # Unix-style newlines with a newline ending every file
 [*]
 charset = utf-8
-end_of_line = lf
 trim_trailing_whitespace = true
 insert_final_newline = true
 
-# Tab indentation (no size specified)
+# Optional: git will commit as lf, this will only affect local files
+end_of_line = lf
+
+[*.md]
+trim_trailing_whitespace = false
+
 [Makefile]
 indent_style = tab
 
+[*.{py,yml,sh,cmake}]
+indent_style = space
+indent_size = 2
+
+[*.{py,yml,sh,cmake}.in]
+indent_style = space
+indent_size = 2
+
+[CMakeLists.txt]
+indent_style = space
+indent_size = 2
+
 [*.{c,h,cpp,cxx,hpp}]
 charset = utf-8
 indent_size = 4
 indent_style = space
 trim_trailing_whitespace = true
 insert_final_newline = true
 end_of_line = lf
-cpp_new_line_before_open_brace_namespace = new_line
-cpp_indent_preserve_comments = true
-cpp_indent_namespace_contents = false
-cpp_indent_case_labels = true
-cpp_indent_case_contents = false
-cpp_indent_case_contents_when_block = false
-cpp_allow_comment_after_lbrace = true
-cpp_simple_block_style = do_not_change
-cpp_space_before_function_open_parenthesis = remove
-cpp_space_within_parameter_list_parentheses = false
-cpp_space_between_empty_parameter_list_parentheses = false
-cpp_space_after_keywords_in_control_flow_statements = true
-cpp_space_within_control_flow_statement_parentheses = false
-cpp_space_before_lambda_open_parenthesis = false
-cpp_space_within_cast_parentheses = false
-cpp_space_after_cast_close_parenthesis = false
-cpp_space_within_expression_parentheses = false
-cpp_space_before_initializer_list_open_brace = false
-cpp_space_within_initializer_list_braces = true
-cpp_space_before_open_square_bracket = false
-cpp_space_within_square_brackets = false
-cpp_space_before_empty_square_brackets = false
-cpp_space_between_empty_square_brackets = false
-cpp_space_group_square_brackets = true
-cpp_space_within_lambda_brackets = false
-cpp_space_between_empty_lambda_brackets = false
-cpp_space_before_comma = false
-cpp_space_after_comma = true
-cpp_space_remove_around_member_operators = false
-cpp_space_before_inheritance_colon = true
-cpp_space_before_constructor_colon = true
-cpp_space_remove_before_semicolon = true
-cpp_space_after_semicolon = false
-cpp_space_remove_around_unary_operator = false
-cpp_space_around_binary_operator = ignore
-cpp_space_around_assignment_operator = insert
-cpp_space_pointer_reference_alignment = ignore
-cpp_space_around_ternary_operator = insert
+
+# Already handled by .cmake-format
+#cpp_new_line_before_open_brace_namespace = new_line
+#cpp_indent_preserve_comments = true
+#cpp_indent_namespace_contents = false
+#cpp_indent_case_labels = true
+#cpp_indent_case_contents = false
+#cpp_indent_case_contents_when_block = false
+#cpp_allow_comment_after_lbrace = true
+#cpp_simple_block_style = do_not_change
+#cpp_space_before_function_open_parenthesis = remove
+#cpp_space_within_parameter_list_parentheses = false
+#cpp_space_between_empty_parameter_list_parentheses = false
+#cpp_space_after_keywords_in_control_flow_statements = true
+#cpp_space_within_control_flow_statement_parentheses = false
+#cpp_space_before_lambda_open_parenthesis = false
+#cpp_space_within_cast_parentheses = false
+#cpp_space_after_cast_close_parenthesis = false
+#cpp_space_within_expression_parentheses = false
+#cpp_space_before_initializer_list_open_brace = false
+#cpp_space_within_initializer_list_braces = true
+#cpp_space_before_open_square_bracket = false
+#cpp_space_within_square_brackets = false
+#cpp_space_before_empty_square_brackets = false
+#cpp_space_between_empty_square_brackets = false
+#cpp_space_group_square_brackets = true
+#cpp_space_within_lambda_brackets = false
+#cpp_space_between_empty_lambda_brackets = false
+#cpp_space_before_comma = false
+#cpp_space_after_comma = true
+#cpp_space_remove_around_member_operators = false
+#cpp_space_before_inheritance_colon = true
+#cpp_space_before_constructor_colon = true
+#cpp_space_remove_before_semicolon = true
+#cpp_space_after_semicolon = false
+#cpp_space_remove_around_unary_operator = false
+#cpp_space_around_binary_operator = ignore
+#cpp_space_around_assignment_operator = insert
+#cpp_space_pointer_reference_alignment = ignore
+#cpp_space_around_ternary_operator = insert
+

.gitattributes

@@ -2,16 +2,20 @@
 
 # Set the default behavior for all files.
 *       text=auto
-
-# Normalize and convert to native line endings on checkout.
-*.c     text
-*.cpp   text
-*.h     text
-*.hpp   text
-
 # Ignore all differences in line endings.
 *       -crlf
 
+# Normalize and convert to native line endings on checkout.
+*.c     text eol=lf
+*.cpp   text eol=lf
+*.h     text eol=lf
+*.hpp   text eol=lf
+*.txt	text eol=lf
+
 # Convert to LF line endings on checkout.
 #*      text eol=lf
 
+# CMake template files
+*.h.in linguist-language=C++
+#*.cpp.in linguist-language=C++
+#*.c.in linguist-language=C