summaryrefslogtreecommitdiffstats
path: root/src/docparser.cpp
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2014-06-20 18:53:53 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2014-06-20 18:53:53 (GMT)
commit12f5ee8a8c3a287f6bcfe81f79ff4332b3987c7e (patch)
tree678956eeee36083508d67cc4003e63ca60d3f0b4 /src/docparser.cpp
parent21178ab40160abf011fa084a10892b5b7821e44c (diff)
downloadDoxygen-12f5ee8a8c3a287f6bcfe81f79ff4332b3987c7e.zip
Doxygen-12f5ee8a8c3a287f6bcfe81f79ff4332b3987c7e.tar.gz
Doxygen-12f5ee8a8c3a287f6bcfe81f79ff4332b3987c7e.tar.bz2
Docbook output improvements
1. New Feature: Adapted Class Graph generation for DOCBOOK 2. Fixed DOCBOOK Code documentation formatting 3. Fixed Doxygen to handle FULL_PATH_NAMES for DOCBOOK generation
Diffstat (limited to 'src/docparser.cpp')
-rw-r--r--src/docparser.cpp15
1 files changed, 10 insertions, 5 deletions
diff --git a/src/docparser.cpp b/src/docparser.cpp
index 66a890f..13d333f 100644
--- a/src/docparser.cpp
+++ b/src/docparser.cpp
@@ -257,14 +257,18 @@ static QCString findAndCopyImage(const char *fileName,DocImage::Type type)
QCString outputDir;
switch(type)
{
- case DocImage::Html:
+ case DocImage::Html:
if (!Config_getBool("GENERATE_HTML")) return result;
outputDir = Config_getString("HTML_OUTPUT");
break;
- case DocImage::Latex:
+ case DocImage::Latex:
if (!Config_getBool("GENERATE_LATEX")) return result;
outputDir = Config_getString("LATEX_OUTPUT");
break;
+ case DocImage::DocBook:
+ if (!Config_getBool("GENERATE_DOCBOOK")) return result;
+ outputDir = Config_getString("DOCBOOK_OUTPUT");
+ break;
case DocImage::Rtf:
if (!Config_getBool("GENERATE_RTF")) return result;
outputDir = Config_getString("RTF_OUTPUT");
@@ -5025,9 +5029,10 @@ void DocPara::handleImage(const QCString &cmdName)
}
DocImage::Type t;
QCString imgType = g_token->name.lower();
- if (imgType=="html") t=DocImage::Html;
- else if (imgType=="latex") t=DocImage::Latex;
- else if (imgType=="rtf") t=DocImage::Rtf;
+ if (imgType=="html") t=DocImage::Html;
+ else if (imgType=="latex") t=DocImage::Latex;
+ else if (imgType=="docbook") t=DocImage::DocBook;
+ else if (imgType=="rtf") t=DocImage::Rtf;
else
{
warn_doc_error(g_fileName,doctokenizerYYlineno,"image type %s specified as the first argument of "