summaryrefslogtreecommitdiffstats
path: root/src/htmldocvisitor.cpp
diff options
context:
space:
mode:
authorDimitri van Heesch <doxygen@gmail.com>2019-06-22 10:44:09 (GMT)
committerGitHub <noreply@github.com>2019-06-22 10:44:09 (GMT)
commit8e19ed1c20261572d305503236a6d4299beee34a (patch)
treea2132fe3f1a3074977347069dc39e29b168999fa /src/htmldocvisitor.cpp
parente0937f32cab960bf91f489360825b0eff297383a (diff)
parent313cc456d52ccf41f7b32adc3d0400cb7992549d (diff)
downloadDoxygen-8e19ed1c20261572d305503236a6d4299beee34a.zip
Doxygen-8e19ed1c20261572d305503236a6d4299beee34a.tar.gz
Doxygen-8e19ed1c20261572d305503236a6d4299beee34a.tar.bz2
Merge pull request #7034 from albert-github/feature/issue_7033
issue #7033 Syntax highlighting doesn't work when calling \dontinclude from Markdown files
Diffstat (limited to 'src/htmldocvisitor.cpp')
-rw-r--r--src/htmldocvisitor.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/htmldocvisitor.cpp b/src/htmldocvisitor.cpp
index e7d9d57..29298a1 100644
--- a/src/htmldocvisitor.cpp
+++ b/src/htmldocvisitor.cpp
@@ -784,7 +784,9 @@ void HtmlDocVisitor::visit(DocIncOperator *op)
pushEnabled();
m_hide=TRUE;
}
- SrcLangExt langExt = getLanguageFromFileName(m_langExt);
+ QCString locLangExt = getFileNameExtension(op->includeFileName());
+ if (locLangExt.isEmpty()) locLangExt = m_langExt;
+ SrcLangExt langExt = getLanguageFromFileName(locLangExt);
if (op->type()!=DocIncOperator::Skip)
{
popEnabled();
@@ -796,7 +798,7 @@ void HtmlDocVisitor::visit(DocIncOperator *op)
QFileInfo cfi( op->includeFileName() );
fd = createFileDef( cfi.dirPath().utf8(), cfi.fileName().utf8() );
}
- Doxygen::parserManager->getParser(m_langExt)
+ Doxygen::parserManager->getParser(locLangExt)
->parseCode(
m_ci,
op->context(),