Some style updates to clang-format

.clang-format

@@ -1,38 +1,27 @@
 Language:  Cpp
+
+BasedOnStyle:  LLVM
+AccessModifierOffset: -4
 AlignAfterOpenBracket: AlwaysBreak
 AlignConsecutiveAssignments: false
 AlignConsecutiveDeclarations: false
-AlignEscapedNewlines: Right
 AlignEscapedNewlinesLeft: false
+AlignEscapedNewlines: Right
 AlignOperands: false
 AlignTrailingComments: false
-AllowAllParametersOfDeclarationOnNextLine: true
 AllowAllArgumentsOnNextLine: true
 AllowAllConstructorInitializersOnNextLine: true
+AllowAllParametersOfDeclarationOnNextLine: true
 AllowShortBlocksOnASingleLine: false
 AllowShortCaseLabelsOnASingleLine: false
 AllowShortFunctionsOnASingleLine: None
 AllowShortIfStatementsOnASingleLine: false
-AllowShortLoopsOnASingleLine: false
 AllowShortLambdasOnASingleLine: true
-BasedOnStyle:  LLVM
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakBeforeMultilineStrings: true
+AlwaysBreakTemplateDeclarations:  true
 BinPackArguments: false
 BinPackParameters: false
-BreakBeforeBraces:  Custom
-BreakConstructorInitializers: BeforeComma
-BreakInheritanceList: AfterColon
-ConstructorInitializerIndentWidth:  4
-IndentWidth: 4
-ContinuationIndentWidth: 4
-AccessModifierOffset: -4
-AlwaysBreakTemplateDeclarations:  true
-CompactNamespaces: false
-ConstructorInitializerAllOnOneLineOrOnePerLine: true
-FixNamespaceComments: false
-Standard: Cpp11
-ColumnLimit: 80
-SortUsingDeclarations: false
-NamespaceIndentation: Inner
 BraceWrapping:
   AfterClass: true
   AfterControlStatement: true
@@ -48,16 +37,28 @@ BraceWrapping:
   SplitEmptyFunction: true
   SplitEmptyRecord: true
   SplitEmptyNamespace: false
-SpaceBeforeParens: Never
-SpacesInParentheses: true
-SpacesInSquareBrackets: true
-SpacesInAngles: true
-
+BreakBeforeBraces:  Custom
+BreakConstructorInitializers: BeforeComma
+BreakInheritanceList: AfterColon
+ColumnLimit: 80
+CompactNamespaces: false
+ConstructorInitializerAllOnOneLineOrOnePerLine: true
+ConstructorInitializerIndentWidth:  4
+ContinuationIndentWidth: 4
+FixNamespaceComments: false
+IndentWidth: 4
+NamespaceIndentation: Inner
+PointerAlignment: Right
+SortUsingDeclarations: false
 SpaceAfterCStyleCast: false
 SpaceAfterTemplateKeyword: false
 SpaceBeforeAssignmentOperators: true
+SpaceBeforeParens: ControlStatements
 SpaceInEmptyParentheses: false
-SpacesInContainerLiterals: true
-SpacesInCStyleCastParentheses: true
-PointerAlignment: Middle
-AlwaysBreakBeforeMultilineStrings: true
+SpacesInAngles: false
+SpacesInContainerLiterals: false
+SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+Standard: Cpp11
+StatementMacros: ["OPENPMD_private", "OPENPMD_protected"]