From 8cbb50cebdbfe9adb985aeeff4335ebd07a66dc1 Mon Sep 17 00:00:00 2001
From: "Johan B. C. Engelen" <jbc.engelen@swissonline.ch>
Date: Thu, 5 Jun 2014 22:04:47 +0200
Subject: update clang format spec for latest clangformat version

(bzr r13341.1.48)
---
 _clang-format | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/_clang-format b/_clang-format
index 913819284..560efa208 100644
--- a/_clang-format
+++ b/_clang-format
@@ -5,11 +5,14 @@ ConstructorInitializerIndentWidth: 4
 AlignEscapedNewlinesLeft: false
 AlignTrailingComments: true
 AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortBlocksOnASingleLine: true
 AllowShortIfStatementsOnASingleLine: false
 AllowShortLoopsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: All
 AlwaysBreakTemplateDeclarations: true
 AlwaysBreakBeforeMultilineStrings: false
 BreakBeforeBinaryOperators: false
+BreakBeforeTernaryOperators: true
 BreakConstructorInitializersBeforeComma: true
 BinPackParameters: true
 ColumnLimit:     120
@@ -18,8 +21,11 @@ DerivePointerBinding: false
 ExperimentalAutoDetectBinPacking: false
 IndentCaseLabels: true
 MaxEmptyLinesToKeep: 3
+KeepEmptyLinesAtTheStartOfBlocks: true
 NamespaceIndentation: None
+ObjCSpaceAfterProperty: false
 ObjCSpaceBeforeProtocolList: true
+PenaltyBreakBeforeFirstCallParameter: 19
 PenaltyBreakComment: 60
 PenaltyBreakString: 1000
 PenaltyBreakFirstLessLess: 120
@@ -35,9 +41,12 @@ UseTab:          Never
 BreakBeforeBraces: Stroustrup
 IndentFunctionDeclarationAfterType: false
 SpacesInParentheses: false
+SpacesInAngles:  false
 SpaceInEmptyParentheses: false
 SpacesInCStyleCastParentheses: false
+SpacesInContainerLiterals: true
 SpaceAfterControlStatementKeyword: true
+ContinuationIndentWidth: 4
 SpaceBeforeAssignmentOperators: true
 ...
 
-- 
cgit v1.2.3