summaryrefslogtreecommitdiffstats
path: root/src/commentscan.l
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2013-02-09 19:18:25 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2013-02-09 19:18:25 (GMT)
commitaacd1557af129e2bff3514169e04168376a2431b (patch)
tree95ba82f21de02e4db4763daea53134c8e56fb1df /src/commentscan.l
parentdcd4714c4413348d02eb7224dafee5d06be43dfb (diff)
downloadDoxygen-aacd1557af129e2bff3514169e04168376a2431b.zip
Doxygen-aacd1557af129e2bff3514169e04168376a2431b.tar.gz
Doxygen-aacd1557af129e2bff3514169e04168376a2431b.tar.bz2
Release-1.8.3.1-20130209
Diffstat (limited to 'src/commentscan.l')
-rw-r--r--src/commentscan.l9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/commentscan.l b/src/commentscan.l
index 249fec8..b851d81 100644
--- a/src/commentscan.l
+++ b/src/commentscan.l
@@ -180,6 +180,7 @@ static DocCmdMap docCmdMap[] =
{ "latexonly", &handleFormatBlock, FALSE },
{ "htmlonly", &handleFormatBlock, FALSE },
{ "xmlonly", &handleFormatBlock, FALSE },
+ { "docbookonly", &handleFormatBlock, FALSE },
{ "rtfonly", &handleFormatBlock, FALSE },
{ "manonly", &handleFormatBlock, FALSE },
{ "dot", &handleFormatBlock, TRUE },
@@ -314,6 +315,7 @@ class DocCmdMapper
DocCmdMapper *DocCmdMapper::s_instance=0;
+bool inInternalDocs = FALSE;
#define YY_NEVER_INTERACTIVE 1
@@ -1018,9 +1020,11 @@ RCSTAG "$"{ID}":"[^\n$]+"$"
BEGIN(HtmlComment);
}
<Comment>{B}*{CMD}"endinternal"{B}* {
- warn(yyFileName,yyLineNr,
+ if (!inInternalDocs)
+ warn(yyFileName,yyLineNr,
"warning: found \\endinternal without matching \\internal"
);
+ inInternalDocs = FALSE;
}
<Comment>{B}*{CMD}[a-z_A-Z]+{B}* { // potentially interesting command
// the {B}* in the front was added for bug620924
@@ -1693,7 +1697,7 @@ RCSTAG "$"{ID}":"[^\n$]+"$"
/* ----- handle arguments of the preformatted block commands ------- */
-<FormatBlock>{CMD}("endverbatim"|"endlatexonly"|"endhtmlonly"|"endxmlonly"|"endrtfonly"|"endmanonly"|"enddot"|"endcode"|"endmsc"|"endvhdlflow")/{NW} { // possible ends
+<FormatBlock>{CMD}("endverbatim"|"endlatexonly"|"endhtmlonly"|"endxmlonly"|"enddocbookonly"|"endrtfonly"|"endmanonly"|"enddot"|"endcode"|"endmsc"|"endvhdlflow")/{NW} { // possible ends
addOutput(yytext);
if (&yytext[4]==blockName) // found end of the block
{
@@ -2569,6 +2573,7 @@ static bool handleInternal(const QCString &)
{
// re-enabled for bug640828
addOutput("\\internal ");
+ inInternalDocs = TRUE;
}
return FALSE;
}