summaryrefslogtreecommitdiffstats
path: root/src/docbookvisitor.cpp
diff options
context:
space:
mode:
authorPetr Prikryl <prikryl@atlas.cz>2013-06-18 06:39:12 (GMT)
committerPetr Prikryl <prikryl@atlas.cz>2013-06-18 06:39:12 (GMT)
commite3d21b2da50edbca18087608207c41a4d805a946 (patch)
tree278830874f914495ef184f7fa14873b42cadf1fe /src/docbookvisitor.cpp
parent775978d39fdc6bd3c3427499f0fe72d1a1a5f43e (diff)
parent0e1e9f73e1f85380ace3de21692f110b96322c0d (diff)
downloadDoxygen-e3d21b2da50edbca18087608207c41a4d805a946.zip
Doxygen-e3d21b2da50edbca18087608207c41a4d805a946.tar.gz
Doxygen-e3d21b2da50edbca18087608207c41a4d805a946.tar.bz2
Merge branch 'master' of https://github.com/doxygen/doxygen.git
Diffstat (limited to 'src/docbookvisitor.cpp')
-rw-r--r--src/docbookvisitor.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/docbookvisitor.cpp b/src/docbookvisitor.cpp
index aa750db..ad5965d 100644
--- a/src/docbookvisitor.cpp
+++ b/src/docbookvisitor.cpp
@@ -249,12 +249,13 @@ void DocbookDocVisitor::visit(DocStyleChange *s)
void DocbookDocVisitor::visit(DocVerbatim *s)
{
if (m_hide) return;
+ SrcLangExt langExt = getLanguageFromFileName(m_langExt);
switch(s->type())
{
case DocVerbatim::Code: // fall though
m_t << "<programlisting>";
Doxygen::parserManager->getParser(m_langExt)
- ->parseCode(m_ci,s->context(),s->text(),
+ ->parseCode(m_ci,s->context(),s->text(),langExt,
s->isExample(),s->exampleFile());
m_t << "</programlisting>";
break;
@@ -346,6 +347,7 @@ void DocbookDocVisitor::visit(DocAnchor *anc)
void DocbookDocVisitor::visit(DocInclude *inc)
{
if (m_hide) return;
+ SrcLangExt langExt = getLanguageFromFileName(inc->extension());
switch(inc->type())
{
case DocInclude::IncWithLines:
@@ -356,6 +358,7 @@ void DocbookDocVisitor::visit(DocInclude *inc)
Doxygen::parserManager->getParser(inc->extension())
->parseCode(m_ci,inc->context(),
inc->text(),
+ langExt,
inc->isExample(),
inc->exampleFile(), &fd);
m_t << "</programlisting>";
@@ -366,6 +369,7 @@ void DocbookDocVisitor::visit(DocInclude *inc)
Doxygen::parserManager->getParser(inc->extension())
->parseCode(m_ci,inc->context(),
inc->text(),
+ langExt,
inc->isExample(),
inc->exampleFile());
m_t << "</programlisting>";
@@ -385,6 +389,7 @@ void DocbookDocVisitor::visit(DocInclude *inc)
->parseCode(m_ci,
inc->context(),
extractBlock(inc->text(),inc->blockId()),
+ langExt,
inc->isExample(),
inc->exampleFile()
);
@@ -404,6 +409,7 @@ void DocbookDocVisitor::visit(DocIncOperator *op)
pushEnabled();
m_hide = TRUE;
}
+ SrcLangExt langExt = getLanguageFromFileName(m_langExt);
if (op->type()!=DocIncOperator::Skip)
{
popEnabled();
@@ -411,7 +417,7 @@ void DocbookDocVisitor::visit(DocIncOperator *op)
{
Doxygen::parserManager->getParser(m_langExt)
->parseCode(m_ci,op->context(),
- op->text(),op->isExample(),
+ op->text(),langExt,op->isExample(),
op->exampleFile());
}
pushEnabled();