summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2013-07-13 21:06:35 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2013-07-13 21:06:35 (GMT)
commit63dedfa8d582995d363840ee2923bc66b0143a7a (patch)
tree3ecfc5da18638695edd60060a77a65e408ebfd7b
parent096c5944ec6f8ee0fa0733f53a8a87f0bbce0ee4 (diff)
downloadDoxygen-63dedfa8d582995d363840ee2923bc66b0143a7a.zip
Doxygen-63dedfa8d582995d363840ee2923bc66b0143a7a.tar.gz
Doxygen-63dedfa8d582995d363840ee2923bc66b0143a7a.tar.bz2
Fixed issue handling \docbookonly..\enddocbookonly section
-rw-r--r--src/docparser.cpp11
-rw-r--r--src/doctokenizer.l4
2 files changed, 14 insertions, 1 deletions
diff --git a/src/docparser.cpp b/src/docparser.cpp
index b1aba91..1860332 100644
--- a/src/docparser.cpp
+++ b/src/docparser.cpp
@@ -1352,7 +1352,7 @@ reparsetoken:
doctokenizerYYsetStateDbOnly();
tok = doctokenizerYYlex();
children.append(new DocVerbatim(parent,g_context,g_token->verb,DocVerbatim::DocbookOnly,g_isExample,g_exampleName));
- if (tok==0) warn_doc_error(g_fileName,doctokenizerYYlineno,"xmlonly section ended without end marker",doctokenizerYYlineno);
+ if (tok==0) warn_doc_error(g_fileName,doctokenizerYYlineno,"docbookonly section ended without end marker",doctokenizerYYlineno);
doctokenizerYYsetStatePara();
}
break;
@@ -5472,6 +5472,15 @@ int DocPara::handleCommand(const QCString &cmdName)
doctokenizerYYsetStatePara();
}
break;
+ case CMD_DBONLY:
+ {
+ doctokenizerYYsetStateDbOnly();
+ retval = doctokenizerYYlex();
+ m_children.append(new DocVerbatim(this,g_context,g_token->verb,DocVerbatim::DocbookOnly,g_isExample,g_exampleName));
+ if (retval==0) warn_doc_error(g_fileName,doctokenizerYYlineno,"docbookonly section ended without end marker",doctokenizerYYlineno);
+ doctokenizerYYsetStatePara();
+ }
+ break;
case CMD_VERBATIM:
{
doctokenizerYYsetStateVerbatim();
diff --git a/src/doctokenizer.l b/src/doctokenizer.l
index 0d491ca..9a2e4bf 100644
--- a/src/doctokenizer.l
+++ b/src/doctokenizer.l
@@ -1099,6 +1099,10 @@ REFWORD {LABELID}|{REFWORD2}|{REFWORD3}
g_endMarker="endxmlonly";
BEGIN(St_SecSkip);
}
+<St_Sections>{CMD}"docbookonly"/[^a-z_A-Z0-9] {
+ g_endMarker="enddocbookonly";
+ BEGIN(St_SecSkip);
+ }
<St_Sections>{CMD}"code"/[^a-z_A-Z0-9] {
g_endMarker="endcode";
BEGIN(St_SecSkip);