Skip to content

Commit 6f7ec9a

Browse files
committed
Remove conditionals from ALIASES in configuration file.
Make the texts for the different types of output identical. (Note: the sectioning has been kept so no difference occurs, i.e. properly retaining the new line, in the different output versions, doxyfile, documentation, doxywizard).
1 parent 8f0b951 commit 6f7ec9a

3 files changed

Lines changed: 6 additions & 9 deletions

File tree

addon/doxywizard/expert.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1053,6 +1053,9 @@ QString Expert::getDocsForNode(const QDomElement &child, const QString &mode) co
10531053
regexp.setPattern(SA("\\\\c[ ]+(@[{}])"));
10541054
docs.replace(regexp,SA("<code>\\1</code>"));
10551055

1056+
regexp.setPattern(SA("\\\\c[ ]+(@@[{}])"));
1057+
docs.replace(regexp,SA("<code>\\1</code>"));
1058+
10561059
// `word` -> <code>word</code>
10571060
docs.replace(SA("``"),SA(""));
10581061
regexp.setPattern(SA("`([^`]+)`"));
@@ -1101,6 +1104,7 @@ QString Expert::getDocsForNode(const QDomElement &child, const QString &mode) co
11011104
// \@ -> @
11021105
docs.replace(SA("\\\\"),SA("\\"));
11031106
docs.replace(SA("\\@"),SA("@"));
1107+
docs.replace(SA("@@"),SA("@"));
11041108
// \& -> &
11051109
// \$ -> $
11061110
docs.replace(SA("\\&"),SA("&"));

src/config.xml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -593,15 +593,7 @@ Go to the <a href="commands.html">next</a> section or return to the
593593
a physical newline was in the original file.
594594
]]>
595595
</docs>
596-
<docs filter="doxywizard,doxyfile">
597-
<![CDATA[
598-
When you need a literal `{` or `}` or `,` in the value part of an alias you have to
599-
escape them by means of a backslash (\c \\), this can lead to conflicts with the
600-
commands \c \\{ and \c \\} for these it is advised to use the version \c @{ and \c @} or
601-
use a double escape (\c \\\\{ and \c \\\\})
602-
]]>
603-
</docs>
604-
<docs filter="documentation">
596+
<docs>
605597
<![CDATA[
606598
When you need a literal `{` or `}` or `,` in the value part of an alias you have to
607599
escape them by means of a backslash (\c \\), this can lead to conflicts with the

src/configgen.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ def transformDocs(doc):
7171
doc = doc.replace("\\>", ">")
7272
doc = doc.replace("\\@", "@")
7373
doc = doc.replace("\\\\", "\\")
74+
doc = doc.replace("@@", "@")
7475
# \ref name "description" -> description
7576
doc = re.sub('\\\\ref +[^ ]* +"\\\\ref"', '\\\\REF', doc)
7677
doc = re.sub('\\\\ref +[^ ]* +"([^"]*)"', '\\1', doc)

0 commit comments

Comments
 (0)