summaryrefslogtreecommitdiffstats
path: root/src/docbookvisitor.cpp
diff options
context:
space:
mode:
authorDimitri van Heesch <doxygen@gmail.com>2021-05-02 09:26:43 (GMT)
committerDimitri van Heesch <doxygen@gmail.com>2021-05-02 09:26:43 (GMT)
commitc2e278d30d613de23f6ecb86be3a562d20e82fb1 (patch)
tree3b60d4d974b5a3059b56aa4ba5ea16375adb6aad /src/docbookvisitor.cpp
parent4784ecea4d15c34af41c1adaa188159b124a1ed0 (diff)
parent42790d151628fb9e0dd7974b29d6794b7ce98b38 (diff)
downloadDoxygen-c2e278d30d613de23f6ecb86be3a562d20e82fb1.zip
Doxygen-c2e278d30d613de23f6ecb86be3a562d20e82fb1.tar.gz
Doxygen-c2e278d30d613de23f6ecb86be3a562d20e82fb1.tar.bz2
Merge branch 'albert-github-feature/bug_code_lang'
Diffstat (limited to 'src/docbookvisitor.cpp')
-rw-r--r--src/docbookvisitor.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/docbookvisitor.cpp b/src/docbookvisitor.cpp
index e25c178..aa74e47 100644
--- a/src/docbookvisitor.cpp
+++ b/src/docbookvisitor.cpp
@@ -309,10 +309,15 @@ void DocbookDocVisitor::visit(DocVerbatim *s)
{
DB_VIS_C
if (m_hide) return;
- SrcLangExt langExt = getLanguageFromFileName(m_langExt);
+ QCString lang = m_langExt;
+ if (!s->language().isEmpty()) // explicit language setting
+ {
+ lang = s->language();
+ }
+ SrcLangExt langExt = getLanguageFromCodeLang(lang);
switch(s->type())
{
- case DocVerbatim::Code: // fall though
+ case DocVerbatim::Code:
m_t << "<literallayout><computeroutput>";
getCodeParser(m_langExt).parseCode(m_ci,s->context(),
s->text(),