diff --git a/.clang-format b/.clang-format index 4b41897..ecaad8c 100644 --- a/.clang-format +++ b/.clang-format @@ -1,3 +1,4 @@ +# Basic style rules by Charles Lohr BasedOnStyle: Microsoft AccessModifierOffset: -4 AlwaysBreakTemplateDeclarations: 'Yes' @@ -21,4 +22,16 @@ SpacesInSquareBrackets: 'true' TabWidth: '4' UseTab: Always FixNamespaceComments: 'true' -IndentCaseLabels: 'true' \ No newline at end of file +IndentCaseLabels: 'true' + +# Additions by Sam Ellicott +ColumnLimit: 100 +AlignConsecutiveAssignments: true +AlignConsecutiveMacros: true +AlignTrailingComments: true +AlignEscapedNewlines: Left +AlignOperands: AlignAfterOperator +AllowShortBlocksOnASingleLine: Always +AllowShortIfStatementsOnASingleLine: WithoutElse +AllowShortCaseLabelsOnASingleLine: true +AllowShortLoopsOnASingleLine: true \ No newline at end of file