diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2015-08-31 14:56:03 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <dimitri@stack.nl> | 2015-08-31 14:56:03 (GMT) |
| commit | aec9e82563f5feee99c1835c3d5bf7280feab503 (patch) | |
| tree | 2d3d3a59609f019222ef418599e0d5a767ed68a1 | |
| parent | a5bb9430fdd79cb54605368e6315f265f6f358ad (diff) | |
| parent | 02ce4f0b2b58ef32dd783b359daf7cc01079462a (diff) | |
| download | Doxygen-aec9e82563f5feee99c1835c3d5bf7280feab503.zip Doxygen-aec9e82563f5feee99c1835c3d5bf7280feab503.tar.gz Doxygen-aec9e82563f5feee99c1835c3d5bf7280feab503.tar.bz2 | |
Merge pull request #381 from albert-github/feature/bug_646002
Bug 646002 - htmlonly content appears in generated XML output
| -rw-r--r-- | src/xmldocvisitor.cpp | 22 | ||||
| -rw-r--r-- | testing/020/indexpage.xml | 16 |
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> |