From 8b1a04b01c858ef79cc0b0a08823073ebe464abc Mon Sep 17 00:00:00 2001 From: Laurent Saboret Date: Wed, 20 Feb 2008 11:46:58 +0000 Subject: [PATCH] Fixed \ccVariables support --- .../generate_reference_manual/copy_doxygen_latex_doc | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Manual_tools/scripts/generate_reference_manual/copy_doxygen_latex_doc b/Manual_tools/scripts/generate_reference_manual/copy_doxygen_latex_doc index 1303d2019a6..23cd9f1d0f1 100755 --- a/Manual_tools/scripts/generate_reference_manual/copy_doxygen_latex_doc +++ b/Manual_tools/scripts/generate_reference_manual/copy_doxygen_latex_doc @@ -22,7 +22,8 @@ use File::Copy; # The list order defines the default position when a section is inserted. my @section_titles = ('\ccDefinition', '\ccParameters', '\ccInheritsFrom', '\ccRefines', '\ccGeneralizes', '\ccIsModel', '\ccHeading{Design Pattern}', '\ccTypes', '\ccConstants', -'\ccCreation', '\ccOperations', '\ccHasModels', '\ccImplementation', '\ccExample', '\ccSeeAlso'); +'\ccHeading{Variables}', '\ccCreation', '\ccOperations', '\ccHasModels', '\ccImplementation', +'\ccExample', '\ccSeeAlso'); # List of placeholder lines generated by cc_ref_wizard. # They will be replaced by the generated documentation. @@ -368,7 +369,7 @@ sub format_curly_brace_pairs_expressions # - if class/struct... if ($item_type =~ m/class\/struct/) { - $buf =~ s/\\paragraph\{typedef.* (\w+)\}/\\ccNestedType\{$1\}\n\{/g; + $buf =~ s/\\paragraph\{typedef.* (\w+)((\[.*\])?)\}/\\ccNestedType\{$1$2\}\n\{/g; $buf =~ s/\\paragraph\{enum\s(.*)\}/\\ccEnum\{enum $1\}\n\{/g; $buf =~ s/\\item\[Enumerator/\\item\[Enumeration values/g; $buf =~ s/\\paragraph\{\Q$item_to_document\E\s+\((.*)\}/\\ccConstructor\{$item_to_document \($1;\}\n\{/g; @@ -382,7 +383,7 @@ sub format_curly_brace_pairs_expressions } # Move [static], [virtual], [protected] comments at the beginning of the expression's comment - $buf =~ s/(\[.*?\]);\}\n\{/;\}\n\{\n$1 \\\\/g; + $buf =~ s/(\[.*?\])(;?)\}\n\{/$2\}\n\{\n$1 \\\\/g; # Remove brackets in curly braces pairs (restored below): # - replace \begin{xxx}...\end{xxx} by \begin((xxx))...\end((xxx)) @@ -508,7 +509,9 @@ sub format_doxygen_class_struct_doc # Rename \ccConstants title $buf =~ s/\\subsubsection\{Member Enumeration Documentation\}/\n\n\\ccConstants\n/; - $buf =~ s/\\subsubsection\{Member Data Documentation\}/\n\n\\ccConstants\n/; + + # Rename \ccHeading{Variables} title + $buf =~ s/\\subsubsection\{Member Data Documentation\}/\n\n\\ccHeading\{Variables\}\n/; # Rename \ccCreation title unless ($buf =~ m/\\subsubsection\{Constructor & Destructor Documentation\}/) {