Merge remote-tracking branch 'origin/master' into bindcostant

.clang-format

@@ -1,18 +1,48 @@
 ---
 BasedOnStyle:  LLVM
-AlignTrailingComments: false
-AllowShortIfStatementsOnASingleLine: true
-AllowShortLoopsOnASingleLine: true
-ColumnLimit:     0
-ConstructorInitializerAllOnOneLineOrOnePerLine: true
-BreakConstructorInitializersBeforeComma: false
+
 Standard:        Cpp11
 IndentWidth:     4
 TabWidth:        4
 UseTab:          Always
-BreakBeforeBraces: Attach
-#BreakBeforeBraces: Allman
-SpacesInParentheses: true
+ColumnLimit:     200
+MaxEmptyLinesToKeep: 4
+
+AlignTrailingComments: false
+AllowShortLoopsOnASingleLine: true
+
+# require clang-format v14+
+# PackConstructorInitializers: CurrentLine
+
+BreakBeforeBraces: Custom
+BraceWrapping:
+    AfterClass: true
+    AfterStruct: true
+    AfterFunction: true
+    BeforeElse: true
+
+
+SpaceBeforeParens: Never
+
+# require clang-format v14+
+# SpaceBeforeParens: Custom
+# SpaceBeforeParensOptions:
+#     AfterControlStatements: false
+
+
+SpacesInParentheses: false
+SpacesInConditionalStatement: true
 SpaceInEmptyParentheses: false
-...
+SpacesInAngles: Leave
+
+IndentAccessModifiers: false
+AccessModifierOffset: -4
 
+AllowShortFunctionsOnASingleLine: InlineOnly
+AllowShortIfStatementsOnASingleLine: AllIfsAndElse
+AllowShortBlocksOnASingleLine: Always
+
+#PointerAlignment: Middle
+#SpaceAroundPointerQualifiers: Both
+#ReferenceAlignment: Middle
+...