summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2015-08-31 18:40:42 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2015-08-31 18:40:42 (GMT)
commit5aa4ade86499ba615da48875a9e7292ddd22c22f (patch)
tree5d0ac233b53f00a0ee2f0fa9e5092283d5769267
parent15a87a623791bf407b3076960cdd1133c8973357 (diff)
parentaec9e82563f5feee99c1835c3d5bf7280feab503 (diff)
downloadDoxygen-5aa4ade86499ba615da48875a9e7292ddd22c22f.zip
Doxygen-5aa4ade86499ba615da48875a9e7292ddd22c22f.tar.gz
Doxygen-5aa4ade86499ba615da48875a9e7292ddd22c22f.tar.bz2
Merge branch 'master' of github.com:doxygen/doxygen
-rw-r--r--src/xmldocvisitor.cpp22
-rw-r--r--testing/020/indexpage.xml16
2 files changed, 4 insertions, 34 deletions
diff --git a/src/xmldocvisitor.cpp b/src/xmldocvisitor.cpp
index 27f7274..c5550f0 100644
--- a/src/xmldocvisitor.cpp
+++ b/src/xmldocvisitor.cpp
@@ -223,33 +223,15 @@ void XmlDocVisitor::visit(DocVerbatim *s)
m_t << "</verbatim>";
break;
case DocVerbatim::HtmlOnly:
- m_t << "<htmlonly>";
- filter(s->text());
- m_t << "</htmlonly>";
- break;
case DocVerbatim::RtfOnly:
- m_t << "<rtfonly>";
- filter(s->text());
- m_t << "</rtfonly>";
- break;
case DocVerbatim::ManOnly:
- m_t << "<manonly>";
- filter(s->text());
- m_t << "</manonly>";
- break;
case DocVerbatim::LatexOnly:
- m_t << "<latexonly>";
- filter(s->text());
- m_t << "</latexonly>";
+ case DocVerbatim::DocbookOnly:
+ /* nothing */
break;
case DocVerbatim::XmlOnly:
m_t << s->text();
break;
- case DocVerbatim::DocbookOnly:
- m_t << "<docbookonly>";
- filter(s->text());
- m_t << "</docbookonly>";
- break;
case DocVerbatim::Dot:
visitPreStart(m_t, "dot", s->hasCaption(), this, s->children(), QCString(""), FALSE, DocImage::Html, s->width(), s->height());
filter(s->text());
diff --git a/testing/020/indexpage.xml b/testing/020/indexpage.xml
index 87ceb53..f7cd444 100644
--- a/testing/020/indexpage.xml
+++ b/testing/020/indexpage.xml
@@ -4,21 +4,9 @@
<compoundname>index</compoundname>
<title>My Project</title>
<detaileddescription>
- <para>Text. <htmlonly>
-HTML
-</htmlonly> <htmlonly>
-HTML with block
-</htmlonly> <rtfonly>
-RTF
-</rtfonly> <manonly>
-Man
-</manonly> <latexonly>
-LaTeX
-</latexonly>
+ <para>Text.
XML
- <docbookonly>
-DocBook
-</docbookonly> More text. </para>
+More text. </para>
</detaileddescription>
</compounddef>
</doxygen>