From 6004d659c1ca280acc6588351176be63b55faf70 Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Wed, 12 Aug 2015 12:48:48 +0200
Subject: Bug 646002 - htmlonly content appears in generated XML output

All the @*only comments appear in the xml document. In the other document formats only documentation of the relevant @*only (in HTML only @htmlonly) appears.
This patch corrects this so only the @xmlonly documentation appears.
---
 src/xmldocvisitor.cpp | 22 ++--------------------
 1 file changed, 2 insertions(+), 20 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());
-- 
cgit v0.12


From 02ce4f0b2b58ef32dd783b359daf7cc01079462a Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Wed, 12 Aug 2015 13:44:36 +0200
Subject: Bug 646002 - htmlonly content appears in generated XML output

Test has to be adjusted as well.
---
 testing/020/indexpage.xml | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

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>
-- 
cgit v0.12