diff options
author | Dimitri van Heesch <doxygen@gmail.com> | 2018-12-03 19:31:21 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-12-03 19:31:21 (GMT) |
commit | 7fa0f6968e5544039c8c7c5e74706ab3d0d5a3e5 (patch) | |
tree | 0bbefd96ba7647b590b23a5f6c8efe1476a23f0b /src/docparser.cpp | |
parent | 83216e860205fcef3251c9a374d2f526cd52417d (diff) | |
parent | 1c0a565a28582d0bc0776988ffef16565563e950 (diff) | |
download | Doxygen-7fa0f6968e5544039c8c7c5e74706ab3d0d5a3e5.zip Doxygen-7fa0f6968e5544039c8c7c5e74706ab3d0d5a3e5.tar.gz Doxygen-7fa0f6968e5544039c8c7c5e74706ab3d0d5a3e5.tar.bz2 |
Merge pull request #6643 from albert-github/feature/bug_xhtml_test_30
Incorrect number tag sequence for xhtml with htmlinclude command possible
Diffstat (limited to 'src/docparser.cpp')
-rw-r--r-- | src/docparser.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/docparser.cpp b/src/docparser.cpp index f20c22d..ec018b9 100644 --- a/src/docparser.cpp +++ b/src/docparser.cpp @@ -5238,6 +5238,7 @@ void DocPara::handleInclude(const QCString &cmdName,DocInclude::Type t) { DBG(("handleInclude(%s)\n",qPrint(cmdName))); int tok=doctokenizerYYlex(); + bool isBlock = false; if (tok==TK_WORD && g_token->name=="{") { doctokenizerYYsetStateOptions(); @@ -5262,6 +5263,14 @@ void DocPara::handleInclude(const QCString &cmdName,DocInclude::Type t) } tok=doctokenizerYYlex(); } + else if (tok==TK_WORD && g_token->name=="[") + { + doctokenizerYYsetStateBlock(); + tok=doctokenizerYYlex(); + isBlock = (g_token->name.stripWhiteSpace() == "block"); + doctokenizerYYsetStatePara(); + tok=doctokenizerYYlex(); + } else if (tok!=TK_WHITESPACE) { warn_doc_error(g_fileName,doctokenizerYYlineno,"expected whitespace after %s command", @@ -5320,7 +5329,7 @@ void DocPara::handleInclude(const QCString &cmdName,DocInclude::Type t) } else { - DocInclude *inc = new DocInclude(this,fileName,g_context,t,g_isExample,g_exampleName,blockId); + DocInclude *inc = new DocInclude(this,fileName,g_context,t,g_isExample,g_exampleName,blockId,isBlock); m_children.append(inc); inc->parse(); } |