clang-format: do not break @name lines

remove hack in scratch_data and add @name to the list of items not to
break automatically.

note: I hate having to fight clang-format.

diff --git a/.clang-format b/.clang-format
index dec771995a779181d256fac546edfc20c02c9324..0b7a604382460e8c7096d98ecbd0e2f139b8de85 100644 (file)
--- a/.clang-format
+++ b/.clang-format
@@ -147,7 +147,7 @@ PenaltyBreakBeforeFirstCallParameter: 90
 PointerAlignment: Right
 
 ReflowComments: true
-CommentPragmas: '( \| |\*--|<li>|@ref | @p | @param  |@returns |@warning |@ingroup |@author |@date |@related |@relates |@relatesalso |@deprecated |@image |@return |@brief |@attention |@copydoc |@addtogroup |@todo |@tparam |@see |@note |@skip |@skipline |@until |@line |@dontinclude |@include)'
+CommentPragmas: '( \| |\*--|<li>|@ref | @p |@param |@name |@returns |@warning |@ingroup |@author |@date |@related |@relates |@relatesalso |@deprecated |@image |@return |@brief |@attention |@copydoc |@addtogroup |@todo |@tparam |@see |@note |@skip |@skipline |@until |@line |@dontinclude |@include)'
 
 SortIncludes: true
 SortUsingDeclarations: true

diff --git a/include/deal.II/meshworker/scratch_data.h b/include/deal.II/meshworker/scratch_data.h
index 4b587fc64f8902472da4661aa633060ab6ed3620..6cec0cbe8e9a8494a718c8c2a4c13c15757d4404 100644 (file)
--- a/include/deal.II/meshworker/scratch_data.h
+++ b/include/deal.II/meshworker/scratch_data.h
@@ -501,12 +501,10 @@ namespace MeshWorker
     GeneralDataStorage &
     get_general_data_storage();
 
-    // clang-format off
     /**
      * @name Evaluation of finite element fields and their derivatives on the current cell
      */
     /** @{ */ // CurrentCellEvaluation
-    // clang-format on
 
     /**
      * Extract the local dof values associated with the internally initialized