RHEL 9.0.0 Alpha bootstrap

The content of this branch was automatically imported from Fedora ELN with the following as its source: https://src.fedoraproject.org/rpms/doxygen#6b0c5db74b337b843ad543bf84325b6e1ef5d040
2020-10-14 23:50:45 +02:00 · 2020-10-14 23:50:45 +02:00 · 32cf374a4b
parent abf3fcff81
commit 32cf374a4b
226 changed files with 16414 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1,53 @@
+doxygen-1.3.8.src.tar.gz
+doxygen-1.3.9.src.tar.gz
+doxygen-1.3.9.1.src.tar.gz
+doxygen-1.4.1.src.tar.gz
+doxygen-1.4.2.src.tar.gz
+doxygen-1.4.3.src.tar.gz
+doxygen-1.4.4.src.tar.gz
+doxygen-1.4.5.src.tar.gz
+doxygen-1.4.6.src.tar.gz
+doxygen-1.4.7.src.tar.gz
+doxygen-1.5.2.src.tar.gz
+doxygen-1.5.3.src.tar.gz
+doxygen-1.5.4.src.tar.gz
+doxygen-1.5.5.src.tar.gz
+doxygen-1.5.6.src.tar.gz
+doxygen-1.5.7.1.src.tar.gz
+doxygen-1.5.8.src.tar.gz
+doxygen-1.5.9.src.tar.gz
+doxygen-1.6.0.src.tar.gz
+doxygen-1.6.1.src.tar.gz
+doxygen-1.6.2.src.tar.gz
+doxygen-1.6.2-20100208.tar.gz
+doxygen-1.7.1.src.tar.gz
+/doxygen-1.7.2.src.tar.gz
+/doxygen-1.7.3.src.tar.gz
+/doxygen-1.7.4.src.tar.gz
+/doxygen-1.7.5.src.tar.gz
+/doxygen-1.7.5.1.src.tar.gz
+/doxygen-1.7.6.src.tar.gz
+/doxygen-1.7.6.1.src.tar.gz
+/doxywizard.png
+/doxygen-1.8.0.src.tar.gz
+/doxygen-1.8.1.src.tar.gz
+/doxygen-1.8.1.1.src.tar.gz
+/doxygen-1.8.1.2.src.tar.gz
+/doxygen-1.8.2.src.tar.gz
+/doxygen-1.8.3.src.tar.gz
+/doxygen-1.8.3.1.src.tar.gz
+/doxygen-1.8.4.src.tar.gz
+/doxygen-1.8.5.src.tar.gz
+/doxygen-1.8.6.src.tar.gz
+/doxygen-1.8.7.src.tar.gz
+/doxygen-1.8.8.src.tar.gz
+/doxygen-1.8.9.1.src.tar.gz
+/doxygen-1.8.10.src.tar.gz
+/doxygen-1.8.11.src.tar.gz
+/doxygen-1.8.12.src.tar.gz
+/doxygen-1.8.13.src.tar.gz
+/doxygen-1.8.14.src.tar.gz
+/doxygen-1.8.15.src.tar.gz
+/doxygen-1.8.16.src.tar.gz
+/doxygen-1.8.17.src.tar.gz
+/doxygen-1.8.18.src.tar.gz
--- a/doxygen-1.8.20-attribute-target-redefined-in-svg.patch
+++ b/doxygen-1.8.20-attribute-target-redefined-in-svg.patch
@ -0,0 +1,20 @@
+commit ff021223c89995bf2abc4f33befddb1c97cab1d8
+Author: albert-github <albert.tests@gmail.com>
+Date:   Thu Sep 24 19:12:10 2020 +0200
+
+    issue #8053 error: Attribute target redefined in SVG
+    
+    regression on #7706 (although it has nothing to do with double runs in my opinion as indicated in the title of that issue: " Md5 hash does not match for two different runs") looks like this statement should be present.
+
+diff --git a/src/dotfilepatcher.cpp b/src/dotfilepatcher.cpp
+index 099359d9..285c0bb8 100644
+--- a/src/dotfilepatcher.cpp
+++ b/src/dotfilepatcher.cpp
+@@ -174,6 +174,7 @@ static QCString replaceRef(const QCString &buf,const QCString relPath,
+         if (!ref.isEmpty())
+         {
+           result = externalLinkTarget(true);
+          if (!result.isEmpty())targetAlreadySet=true;
+         }
+         result+= href+"=\"";
+         result+=externalRef(relPath,ref,TRUE);
--- a/doxygen-1.8.20-broken-ref-for-enum-entry.patch
+++ b/doxygen-1.8.20-broken-ref-for-enum-entry.patch
@ -0,0 +1,49 @@
+commit 63dc5b9b1b3e8fb875304a954e4df934b249034b
+Author: Dimitri van Heesch <doxygen@gmail.com>
+Date:   Wed Aug 26 21:23:29 2020 +0200
+
+    issue #7977: Broken ref for enum entry (doxygen 1.8.18 -> 1.8.19)
+
+diff --git a/src/doxygen.cpp b/src/doxygen.cpp
+index 757e7831..d5512925 100644
+--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
+@@ -6946,7 +6946,14 @@ static void addEnumValuesToEnums(const Entry *root)
+       MemberName *mn = mnsd->find(name); // for all members with this name
+       if (mn)
+       {
+-        std::vector< std::unique_ptr<MemberDef> > extraMembers;
+        struct EnumValueInfo
+        {
+          EnumValueInfo(const QCString &n,std::unique_ptr<MemberDef> &md) :
+            name(n), member(std::move(md)) {}
+          QCString name;
+          std::unique_ptr<MemberDef> member;
+        };
+        std::vector< EnumValueInfo > extraMembers;
+         // for each enum in this list
+         for (const auto &md : *mn)
+         {
+@@ -7006,8 +7013,7 @@ static void addEnumValuesToEnums(const Entry *root)
+                   fmd->setAnchor();
+                   md->insertEnumField(fmd.get());
+                   fmd->setEnumScope(md.get(),TRUE);
+-                  mn=mnsd->add(e->name);
+-                  extraMembers.push_back(std::move(fmd));
+                  extraMembers.push_back(EnumValueInfo(e->name,fmd));
+                 }
+               }
+               else
+@@ -7071,9 +7077,10 @@ static void addEnumValuesToEnums(const Entry *root)
+           }
+         }
+         // move the newly added members into mn
+-        for (auto &md : extraMembers)
+        for (auto &e : extraMembers)
+         {
+-          mn->push_back(std::move(md));
+          MemberName *emn=mnsd->add(e.name);
+          emn->push_back(std::move(e.member));
+         }
+       }
+     }
--- a/doxygen-1.8.20-does-not-handle-simple-example-in-md-file.patch
+++ b/doxygen-1.8.20-does-not-handle-simple-example-in-md-file.patch
@ -0,0 +1,58 @@
+commit 7c429806b072dd8bf777d93035ffda817976adc0
+Author: albert-github <albert.tests@gmail.com>
+Date:   Wed Sep 2 11:32:42 2020 +0200
+
+    issue #7995 Doxygen doesn't handle very simple example in the .md file
+    
+    Besides "keep utf8 characters together..." as done for the C-type parser  in code.l (commit d3d9dd8540ec159de080859c8f34a2581c4147f0) this also has to be done for the Fortran, SQL and VHDL code lexers. The code lexers for python and xml already didn't give errors as they already handled these cases for the example.
+
+diff --git a/src/fortrancode.l b/src/fortrancode.l
+index 4951001c..5d036e8a 100644
+--- a/src/fortrancode.l
+++ b/src/fortrancode.l
+@@ -1272,6 +1272,17 @@ LANGUAGE_BIND_SPEC BIND{BS}"("{BS}C{BS}(,{BS}NAME{BS}"="{BS}"\""(.*)"\""{BS})?")
+   					}
+ <*>^{BS}"type"{BS}"="                   { g_code->codify(yytext); }
+ 
+<*>[\x80-\xFF]*                         { // keep utf8 characters together...
+                                          if (g_isFixedForm && yy_my_start > fixedCommentAfter)
+                                          {
+                                            startFontClass("comment");
+                                            codifyLines(yytext);
+                                          }
+                                          else
+                                          {
+                                            g_code->codify(yytext);
+                                          }
+                                        }
+ <*>.                                    {
+                                           if (g_isFixedForm && yy_my_start > fixedCommentAfter)
+                                           {
+diff --git a/src/sqlcode.l b/src/sqlcode.l
+index 58a2fce9..22a5e170 100644
+--- a/src/sqlcode.l
+++ b/src/sqlcode.l
+@@ -190,6 +190,9 @@ commentclose    "\*/"
+                         codifyLines(yytext,yyscanner);
+                     }
+ 
+[\x80-\xFF]*        { // keep utf8 characters together...
+                        codifyLines(yytext,yyscanner);
+                    }
+ .                   {
+                         codifyLines(yytext,yyscanner);
+                     }
+diff --git a/src/vhdlcode.l b/src/vhdlcode.l
+index 808e5a29..dcace05d 100644
+--- a/src/vhdlcode.l
+++ b/src/vhdlcode.l
+@@ -1497,6 +1497,9 @@ XILINX      "INST"|"NET"|"PIN"|"BLKNM"|"BUFG"|"COLLAPSE"|"CPLD"|"COMPGRP"|"CONFI
+ 			   BEGIN(Bases);
+                          }
+ 
+<*>[\x80-\xFF]*          { // keep utf8 characters together...
+                           g_code->codify(vhdlcodeYYtext);
+                         }
+ <*>.                     {
+                            g_code->codify(vhdlcodeYYtext);
+                          }
--- a/doxygen-1.8.20-enums-multiple-files.patch
+++ b/doxygen-1.8.20-enums-multiple-files.patch
@ -0,0 +1,86 @@
+From 9d9d08582ccea7ef90000acebfd09f8c8acc577a Mon Sep 17 00:00:00 2001
+From: Dimitri van Heesch <doxygen@gmail.com>
+Date: Fri, 28 Aug 2020 20:22:46 +0200
+Subject: [PATCH] issue #7979: C++ enums being defined in multiple files after
+ b265433 (multi-thread input processing)
+
+---
+ src/scanner.l | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/src/scanner.l b/src/scanner.l
+index 7c710fa4..70f15d65 100644
+--- a/src/scanner.l
+++ b/src/scanner.l
+@@ -60,6 +60,9 @@
+ 
+ #define USE_STATE2STRING 0
+ 
+static AtomicInt  anonCount;
+static AtomicInt  anonNSCount;
+
+ struct scannerYY_state
+ {
+   OutlineParserInterface *thisParser;
+@@ -105,8 +108,6 @@ struct scannerYY_state
+   int              yyBegLineNr  = 1 ;
+   int              yyColNr      = 1 ;
+   int              yyBegColNr   = 1 ;
+-  int              anonCount    = 0 ;
+-  int              anonNSCount  = 0 ;
+   QCString         yyFileName;
+   MethodTypes      mtype = Method;
+   bool             stat = false;
+@@ -3784,7 +3785,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
+   					  BEGIN(MemberSpecSkip); 
+   					}
+ <TypedefName>";"			{ /* typedef of anonymous type */
+-					  yyextra->current->name.sprintf("@%d",yyextra->anonCount++);
+					  yyextra->current->name.sprintf("@%d",anonCount++);
+ 					  if ((yyextra->current->section == Entry::ENUM_SEC) || (yyextra->current->spec&Entry::Enum))
+ 					  {
+ 					    yyextra->current->program+=','; // add field terminator
+@@ -3859,7 +3860,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
+ 						{
+ 						  // anonymous compound yyextra->inside -> insert dummy variable name
+ 						  //printf("Adding anonymous variable for scope %s\n",p->name.data());
+-						  yyextra->msName.sprintf("@%d",yyextra->anonCount++); 
+						  yyextra->msName.sprintf("@%d",anonCount++); 
+ 						  break;
+ 						}
+ 					      }
+@@ -5644,12 +5645,12 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
+ 					      }
+ 					      else // use invisible name
+ 					      {
+-					        yyextra->current->name.sprintf("@%d",yyextra->anonNSCount);
+					        yyextra->current->name.sprintf("@%d",anonNSCount.load());
+ 					      }
+ 					    }
+ 					    else
+ 					    {
+-					      yyextra->current->name.sprintf("@%d",yyextra->anonCount++);
+					      yyextra->current->name.sprintf("@%d",anonCount++);
+ 					    }
+ 					  }
+ 					  yyextra->curlyCount=0;
+@@ -7247,7 +7248,6 @@ static void parseMain(yyscan_t yyscanner,
+   yyextra->column = 0;
+   scannerYYrestart(0,yyscanner);
+ 
+-  //yyextra->anonCount     = 0;  // don't reset per file
+   //depthIf       = 0;
+   yyextra->protection    = Public;
+   yyextra->mtype         = Method;
+@@ -7301,7 +7301,7 @@ static void parseMain(yyscan_t yyscanner,
+ 
+   parseCompounds(yyscanner,rt);
+ 
+-  yyextra->anonNSCount++;
+  anonNSCount++;
+ 
+   // add additional entries that were created during processing
+   for (auto &kv: yyextra->outerScopeEntries)
+-- 
+2.26.2
+
--- a/doxygen-1.8.20-glibc-assert.patch
+++ b/doxygen-1.8.20-glibc-assert.patch
@ -0,0 +1,41 @@
+commit d067baf495d0415283ce724ad32cb9a08dc17c83
+Author: Dimitri van Heesch <doxygen@gmail.com>
+Date:   Thu Sep 17 20:14:39 2020 +0200
+
+    issue #8034: doxygen crashes
+
+diff --git a/src/definition.cpp b/src/definition.cpp
+index 7874a5e4..dc968399 100644
+--- a/src/definition.cpp
+++ b/src/definition.cpp
+@@ -176,14 +176,14 @@ static bool matchExcludedSymbols(const char *name)
+       QRegExp re(substitute(pattern,"*",".*"),TRUE);
+       int pl;
+       int i = re.match(symName,0,&pl);
+-      //printf("  %d = re.match(%s) pattern=%s\n",i,symName.data(),pattern.data());
+      //printf("  %d = re.match(%s) pattern=%s pl=%d len=%d\n",i,symName.data(),pattern.data(),pl,symName.length());
+       if (i!=-1) // wildcard match
+       {
+         uint ui=(uint)i;
+         uint sl=symName.length();
+         // check if it is a whole word match
+-        if ((ui==0     || pattern.at(0)=='*'     || (!isId(symName.at(ui-1))  && !forceStart)) &&
+-            (ui+pl==sl || pattern.at(ui+pl)=='*' || (!isId(symName.at(ui+pl)) && !forceEnd))
+        if ((ui==0     || pattern.at(0)=='*'                  || (!isId(symName.at(ui-1))  && !forceStart)) &&
+            (ui+pl==sl || pattern.at(pattern.length()-1)=='*' || (!isId(symName.at(ui+pl)) && !forceEnd))
+            )
+         {
+           //printf("--> name=%s pattern=%s match at %d\n",symName.data(),pattern.data(),i);
+diff --git a/src/util.cpp b/src/util.cpp
+index 0581b5fa..34df8d7b 100644
+--- a/src/util.cpp
+++ b/src/util.cpp
+@@ -5714,7 +5714,7 @@ QCString normalizeNonTemplateArgumentsInString(
+     result += name.mid(p,i-p);
+     QCString n = name.mid(i,l);
+     bool found=FALSE;
+-    for (const Argument formArg : formalArgs)
+    for (const Argument &formArg : formalArgs)
+     {
+       if (formArg.name == n)
+       {
--- a/doxygen-1.8.20-links-using-ref-stopp-working.patch
+++ b/doxygen-1.8.20-links-using-ref-stopp-working.patch
@ -0,0 +1,117 @@
+commit dfc82af001c56254c6fde0affd009f80e19b1548
+Author: Dimitri van Heesch <doxygen@gmail.com>
+Date:   Mon Sep 21 12:20:57 2020 +0200
+
+    issue #8037: Links using @ref stopped working in doxygen 1.8.19
+
+diff --git a/src/classdef.cpp b/src/classdef.cpp
+index c3cd3ee2..5e2b2fa1 100644
+--- a/src/classdef.cpp
+++ b/src/classdef.cpp
+@@ -1248,6 +1248,7 @@ void ClassDefImpl::distributeMemberGroupDocumentation()
+ 
+ void ClassDefImpl::findSectionsInDocumentation()
+ {
+  docFindSections(briefDescription(),this,docFile());
+   docFindSections(documentation(),this,docFile());
+   if (m_impl->memberGroupSDict)
+   {
+diff --git a/src/commentscan.l b/src/commentscan.l
+index c151294d..ce495a1c 100644
+--- a/src/commentscan.l
+++ b/src/commentscan.l
+@@ -666,6 +666,7 @@ RCSTAG    "$"{ID}":"[^\n$]+"$"
+                                             optList = QCStringList::split(',',optStr);
+                                           }
+                                           auto it = docCmdMap.find(cmdName.data());
+                                          //printf("lookup command '%s' found=%d\n",cmdName.data(),it!=docCmdMap.end());
+                                           if (it!=docCmdMap.end()) // special action is required
+                                           {
+                                             int i=0;
+diff --git a/src/docparser.cpp b/src/docparser.cpp
+index 73131f67..b79f8c82 100644
+--- a/src/docparser.cpp
+++ b/src/docparser.cpp
+@@ -2448,8 +2448,8 @@ DocRef::DocRef(DocNode *parent,const QCString &target,const QCString &context) :
+     }
+     m_isSubPage    = pd && pd->hasParentPage();
+     if (sec->type()!=SectionType::Page || m_isSubPage) m_anchor = sec->label();
+-    //printf("m_text=%s,m_ref=%s,m_file=%s,m_refToAnchor=%d type=%d\n",
+-    //    m_text.data(),m_ref.data(),m_file.data(),m_refToAnchor,sec->type);
+    //printf("m_text=%s,m_ref=%s,m_file=%s,type=%d\n",
+    //    m_text.data(),m_ref.data(),m_file.data(),m_refType);
+     return;
+   }
+   else if (resolveLink(context,target,TRUE,&compound,anchor))
+diff --git a/src/filedef.cpp b/src/filedef.cpp
+index f07201d4..b74fda9b 100644
+--- a/src/filedef.cpp
+++ b/src/filedef.cpp
+@@ -311,6 +311,7 @@ void FileDefImpl::distributeMemberGroupDocumentation()
+ 
+ void FileDefImpl::findSectionsInDocumentation()
+ {
+  docFindSections(briefDescription(),this,docFile());
+   docFindSections(documentation(),this,docFile());
+   if (m_memberGroupSDict)
+   {
+diff --git a/src/groupdef.cpp b/src/groupdef.cpp
+index 9b333567..7cd6cf26 100644
+--- a/src/groupdef.cpp
+++ b/src/groupdef.cpp
+@@ -228,6 +228,7 @@ void GroupDefImpl::distributeMemberGroupDocumentation()
+ 
+ void GroupDefImpl::findSectionsInDocumentation()
+ {
+  docFindSections(briefDescription(),this,docFile());
+   docFindSections(documentation(),this,docFile());
+   MemberGroupSDict::Iterator mgli(*m_memberGroupSDict);
+   MemberGroup *mg;
+diff --git a/src/markdown.cpp b/src/markdown.cpp
+index 3089b8e7..2e6ab3ea 100644
+--- a/src/markdown.cpp
+++ b/src/markdown.cpp
+@@ -2662,6 +2662,7 @@ QCString markdownFileNameToId(const QCString &fileName)
+   int i = baseFn.findRev('.');
+   if (i!=-1) baseFn = baseFn.left(i);
+   QCString baseName = substitute(substitute(substitute(baseFn," ","_"),"/","_"),":","_");
+  //printf("markdownFileNameToId(%s)=md_%s\n",qPrint(fileName),qPrint(baseName));
+   return "md_"+baseName;
+ }
+ 
+diff --git a/src/memberdef.cpp b/src/memberdef.cpp
+index 6d179c21..2f92ea01 100644
+--- a/src/memberdef.cpp
+++ b/src/memberdef.cpp
+@@ -4838,6 +4838,7 @@ ClassDef *MemberDefImpl::accessorClass() const
+ 
+ void MemberDefImpl::findSectionsInDocumentation()
+ {
+  docFindSections(briefDescription(),this,docFile());
+   docFindSections(documentation(),this,docFile());
+ }
+ 
+diff --git a/src/namespacedef.cpp b/src/namespacedef.cpp
+index 88eea5d2..65456ac0 100644
+--- a/src/namespacedef.cpp
+++ b/src/namespacedef.cpp
+@@ -349,6 +349,7 @@ void NamespaceDefImpl::distributeMemberGroupDocumentation()
+ 
+ void NamespaceDefImpl::findSectionsInDocumentation()
+ {
+  docFindSections(briefDescription(),this,docFile());
+   docFindSections(documentation(),this,docFile());
+   MemberGroupSDict::Iterator mgli(*memberGroupSDict);
+   MemberGroup *mg;
+diff --git a/src/pagedef.cpp b/src/pagedef.cpp
+index 09152def..75e50ed1 100644
+--- a/src/pagedef.cpp
+++ b/src/pagedef.cpp
+@@ -99,6 +99,7 @@ PageDefImpl::~PageDefImpl()
+ 
+ void PageDefImpl::findSectionsInDocumentation()
+ {
+  docFindSections(briefDescription(),this,docFile());
+   docFindSections(documentation(),this,docFile());
+ }
+ 
--- a/doxygen-1.8.20-python3.patch
+++ b/doxygen-1.8.20-python3.patch
@ -0,0 +1,56 @@
+commit 6383a72200df27b0515b6e3d09bfad8934eb5c76
+Author: albert-github <albert.tests@gmail.com>
+Date:   Tue Sep 8 13:31:15 2020 +0200
+
+    Make testsqlite3.py python script running with python 3
+    
+    The testsqlite3.py didn't run under python 3 (found by means of pylint).
+    Making it runnable under python 2 and python 3.
+
+diff --git a/testing/testsqlite3.py b/testing/testsqlite3.py
+index b4227b44..1d94f701 100755
+--- a/testing/testsqlite3.py
+++ b/testing/testsqlite3.py
+@@ -13,7 +13,7 @@ g_conn=None
+ val=[]
+ def print_unprocessed_attributes(node):
+     for key in node.attrib:
+-        print "WARNING: '%s' has unprocessed attr '%s'" % (node.tag,key)
+        print("WARNING: '%s' has unprocessed attr '%s'" % (node.tag,key))
+ 
+ def extract_attribute(node,attribute,pnl):
+     if not attribute in node.attrib:
+@@ -69,7 +69,7 @@ def process_memberdef(node):
+             extract_element(node,chld,q)
+ 
+     for chld in node.getchildren():
+-        print "WARNING: '%s' has unprocessed child elem '%s'" % (node.tag,chld.tag)
+        print("WARNING: '%s' has unprocessed child elem '%s'" % (node.tag,chld.tag))
+ 
+     extract_attribute(node,"kind",q)
+     extract_attribute(node,"prot",q)
+@@ -90,12 +90,12 @@ def process_memberdef(node):
+     r=[]
+     try:
+         r = g_conn.execute(query,val).fetchall()
+-    except sqlite3.OperationalError,e:
+-        print "SQL_ERROR:%s"%e
+    except(sqlite3.OperationalError,e):
+        print("SQL_ERROR:%s"%e)
+ 
+     del val[:]
+     if not len(r) > 0:
+-        print "TEST_ERROR: Member not found in SQL DB"
+        print("TEST_ERROR: Member not found in SQL DB")
+ 
+ 
+ def load_xml(name):
+@@ -104,7 +104,7 @@ def load_xml(name):
+     for event, elem in context:
+         if event == "end" and elem.tag == "memberdef":
+             process_memberdef(elem)
+-    print "\n== Unprocessed XML =="
+    print("\n== Unprocessed XML ==")
+ #    ET.dump(root)
+ 
+ 
--- a/doxygen-different-results-on-64-and-32-bit.patch
+++ b/doxygen-different-results-on-64-and-32-bit.patch
@ -0,0 +1,25 @@
+From 1fda77f54a2eacba32658001329bd9084f4df1e7 Mon Sep 17 00:00:00 2001
+From: Dimitri van Heesch <doxygen@gmail.com>
+Date: Fri, 11 Sep 2020 15:38:01 +0200
+Subject: [PATCH] issue #8022: Different results on 64 and 32 bit
+
+---
+ src/doxygen.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/doxygen.cpp b/src/doxygen.cpp
+index b218d382..0832e5c6 100644
+--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
+@@ -164,7 +164,7 @@ DefinesPerFileList Doxygen::macroDefinitions;
+ bool             Doxygen::clangAssistedParsing = FALSE;
+ 
+ // locally accessible globals
+-static std::unordered_map< std::string, const Entry* > g_classEntries;
+static std::map< std::string, const Entry* > g_classEntries;
+ static StringVector     g_inputFiles;
+ static QDict<void>      g_compoundKeywordDict(7);  // keywords recognised as compounds
+ static OutputList      *g_outputList = 0;          // list of output generating objects
+-- 
+2.26.2
+
--- a/doxygen.spec
+++ b/doxygen.spec
@ -0,0 +1,968 @@
+# doxygen is known not to work properly with LTO at this point.  Some of the issues
+# are being worked on upstream and disabling LTO should be re-evaluated as
+# we update this change.  Until such time...
+# Disable LTO
+%global _lto_cflags %{nil}
+
+%if 0%{?fedora}
+%global xapian_core_support ON
+%global clang_support ON
+%else
+%global xapian_core_support OFF
+%global clang_support OFF
+%endif
+
+Summary: A documentation system for C/C++
+Name:    doxygen
+Epoch:   1
+Version: 1.8.20
+Release: 5%{?dist}
+
+# No version is specified.
+License: GPL+
+Url: http://www.doxygen.nl
+Source0: http://doxygen.nl/files/%{name}-%{version}.src.tar.gz
+# this icon is part of kdesdk
+Source1: doxywizard.desktop
+# upstream patches
+Patch0: doxygen-1.8.20-enums-multiple-files.patch
+Patch1: doxygen-different-results-on-64-and-32-bit.patch
+Patch2: doxygen-1.8.20-glibc-assert.patch
+Patch3: doxygen-1.8.20-broken-ref-for-enum-entry.patch
+Patch4: doxygen-1.8.20-links-using-ref-stopp-working.patch
+Patch5: doxygen-1.8.20-python3.patch
+Patch6: doxygen-1.8.20-does-not-handle-simple-example-in-md-file.patch
+Patch7: doxygen-1.8.20-attribute-target-redefined-in-svg.patch
+
+BuildRequires: %{_bindir}/python3
+BuildRequires: ImageMagick
+BuildRequires: gcc-c++ gcc
+BuildRequires: perl-interpreter
+%if ! 0%{?_module_build}
+BuildRequires: tex(dvips)
+BuildRequires: tex(latex)
+# From doc/manual.sty
+BuildRequires: tex(helvet.sty)
+BuildRequires: tex(sectsty.sty)
+BuildRequires: tex(tocloft.sty)
+BuildRequires: tex(fontenc.sty)
+BuildRequires: tex(fancyhdr.sty)
+# From templates/latex/doxygen.sty
+BuildRequires: tex(alltt.sty)
+BuildRequires: tex(calc.sty)
+BuildRequires: tex(float.sty)
+BuildRequires: tex(verbatim.sty)
+BuildRequires: tex(xcolor.sty)
+BuildRequires: tex(fancyvrb.sty)
+BuildRequires: tex(tabularx.sty)
+BuildRequires: tex(multirow.sty)
+BuildRequires: tex(hanging.sty)
+BuildRequires: tex(ifpdf.sty)
+BuildRequires: tex(adjustbox.sty)
+BuildRequires: tex(amssymb.sty)
+BuildRequires: tex(stackengine.sty)
+BuildRequires: tex(ulem.sty)
+# From doc/doxygen_manual.tex
+BuildRequires: tex(ifthen.sty)
+BuildRequires: tex(array.sty)
+BuildRequires: tex(geometry.sty)
+BuildRequires: tex(makeidx.sty)
+BuildRequires: tex(natbib.sty)
+BuildRequires: tex(graphicx.sty)
+BuildRequires: tex(multicol.sty)
+BuildRequires: tex(float.sty)
+BuildRequires: tex(geometry.sty)
+BuildRequires: tex(listings.sty)
+BuildRequires: tex(color.sty)
+BuildRequires: tex(xcolor.sty)
+BuildRequires: tex(textcomp.sty)
+BuildRequires: tex(wasysym.sty)
+BuildRequires: tex(import.sty)
+BuildRequires: tex(appendix.sty)
+BuildRequires: tex(hyperref.sty)
+BuildRequires: tex(pspicture.sty)
+BuildRequires: tex(inputenc.sty)
+BuildRequires: tex(mathptmx.sty)
+BuildRequires: tex(courier.sty)
+# From src/latexgen.cpp
+BuildRequires: tex(fixltx2e.sty)
+BuildRequires: tex(ifxetex.sty)
+BuildRequires: tex(caption.sty)
+BuildRequires: tex(etoc.sty)
+# From src/util.cpp
+BuildRequires: tex(newunicodechar.sty)
+# From templates/latex/tabu_doxygen.sty
+BuildRequires: tex(varwidth.sty)
+BuildRequires: tex(xtab.sty)
+BuildRequires: tex(tabu.sty)
+BuildRequires: /usr/bin/epstopdf
+BuildRequires: texlive-epstopdf
+BuildRequires: ghostscript
+BuildRequires: gettext
+BuildRequires: desktop-file-utils
+BuildRequires: graphviz
+%else
+BuildRequires: zlib-devel
+%endif
+BuildRequires: flex
+BuildRequires: bison
+BuildRequires: cmake
+BuildRequires: git
+%if "x%{?xapian_core_support}" == "xON"
+BuildRequires: xapian-core-devel
+BuildRequires: zlib-devel
+%endif
+%if "x%{?clang_support}" == "xON"
+BuildRequires: llvm-devel
+BuildRequires: clang-devel
+%endif
+Requires: perl-interpreter
+Requires: graphviz
+
+%description
+Doxygen can generate an online class browser (in HTML) and/or a
+reference manual (in LaTeX) from a set of documented source files. The
+documentation is extracted directly from the sources. Doxygen can
+also be configured to extract the code structure from undocumented
+source files.
+
+%if ! 0%{?_module_build}
+%package doxywizard
+Summary: A GUI for creating and editing configuration files
+Requires: %{name} = %{epoch}:%{version}-%{release}
+BuildRequires: qt5-qtbase-devel
+
+%description doxywizard
+Doxywizard is a GUI for creating and editing configuration files that
+are used by doxygen.
+
+%package latex
+Summary: Support for producing latex/pdf output from doxygen
+Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: tex(latex)
+Requires: tex(dvips)
+%if 0%{?fedora} > 17 || 0%{?rhel} > 6
+# From doc/manual.sty
+Requires: tex(helvet.sty)
+Requires: tex(sectsty.sty)
+Requires: tex(tocloft.sty)
+Requires: tex(fontenc.sty)
+Requires: tex(fancyhdr.sty)
+# From templates/latex/doxygen.sty
+Requires: tex(alltt.sty)
+Requires: tex(calc.sty)
+Requires: tex(float.sty)
+Requires: tex(verbatim.sty)
+Requires: tex(xcolor.sty)
+Requires: tex(fancyvrb.sty)
+Requires: tex(tabularx.sty)
+Requires: tex(multirow.sty)
+Requires: tex(hanging.sty)
+Requires: tex(ifpdf.sty)
+Requires: tex(adjustbox.sty)
+Requires: tex(amssymb.sty)
+Requires: tex(stackengine.sty)
+Requires: tex(ulem.sty)
+# From doc/doxygen_manual.tex
+Requires: tex(ifthen.sty)
+Requires: tex(array.sty)
+Requires: tex(geometry.sty)
+Requires: tex(makeidx.sty)
+Requires: tex(natbib.sty)
+Requires: tex(graphicx.sty)
+Requires: tex(multicol.sty)
+Requires: tex(float.sty)
+Requires: tex(geometry.sty)
+Requires: tex(listings.sty)
+Requires: tex(color.sty)
+Requires: tex(xcolor.sty)
+Requires: tex(textcomp.sty)
+Requires: tex(wasysym.sty)
+Requires: tex(import.sty)
+Requires: tex(appendix.sty)
+Requires: tex(hyperref.sty)
+Requires: tex(pspicture.sty)
+Requires: tex(inputenc.sty)
+Requires: tex(mathptmx.sty)
+Requires: tex(courier.sty)
+# From src/latexgen.cpp
+Requires: tex(fixltx2e.sty)
+Requires: tex(ifxetex.sty)
+Requires: tex(caption.sty)
+Requires: tex(etoc.sty)
+# From src/util.cpp
+Requires: tex(newunicodechar.sty)
+# From templates/latex/tabu_doxygen.sty
+Requires: tex(varwidth.sty)
+# I'm 99% sure this isn't needed anymore since
+# doxygen has a local fork of tabu... but it doesn't seem to be hurting anything.
+Requires: tex(tabu.sty)
+# There also does not seem to be any references to xtab in the code... but eh.
+Requires: tex(xtab.sty)
+# Explicitly called binaries
+Requires: texlive-bibtex
+Requires: texlive-makeindex
+Requires: texlive-epstopdf
+%endif
+
+%description latex
+%{summary}.
+%endif
+
+
+%prep
+%autosetup -p1
+
+# convert into utf-8
+iconv --from=ISO-8859-1 --to=UTF-8 LANGUAGE.HOWTO > LANGUAGE.HOWTO.new
+touch -r LANGUAGE.HOWTO LANGUAGE.HOWTO.new
+mv LANGUAGE.HOWTO.new LANGUAGE.HOWTO
+
+
+%build
+%if ! 0%{?_module_build}
+%cmake \
+      -DPYTHON_EXECUTABLE=%{_bindir}/python3 \
+      -Duse_libclang=%{clang_support} \
+      -Dbuild_doc=OFF \
+      -Dbuild_wizard=ON \
+      -Dbuild_xmlparser=ON \
+      -Dbuild_search=%{xapian_core_support} \
+      -DMAN_INSTALL_DIR=%{_mandir}/man1 \
+      -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
+      -DBUILD_SHARED_LIBS=OFF \
+%else
+%cmake \
+      -DPYTHON_EXECUTABLE=%{_bindir}/python3 \
+      -Duse_libclang=%{clang_support} \
+      -Dbuild_doc=OFF \
+      -Dbuild_wizard=OFF \
+      -Dbuild_xmlparser=ON \
+      -Dbuild_search=OFF \
+      -DMAN_INSTALL_DIR=%{_mandir}/man1 \
+      -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
+      -DBUILD_SHARED_LIBS=OFF \
+%endif
+
+%cmake_build %{?_smp_mflags}
+
+%install
+%cmake_install
+
+# convert icons
+convert addon/doxywizard/doxywizard.ico doxywizard.png
+
+# install icons
+icondir=%{buildroot}%{_datadir}/icons/hicolor
+mkdir -m755 -p $icondir/{16x16,32x32,48x48,128x128}/apps
+install -m644 -p -D doxywizard-6.png $icondir/16x16/apps/doxywizard.png
+install -m644 -p -D doxywizard-5.png $icondir/32x32/apps/doxywizard.png
+install -m644 -p -D doxywizard-4.png $icondir/48x48/apps/doxywizard.png
+install -m644 -p -D doxywizard-3.png $icondir/128x128/apps/doxywizard.png
+
+# install man pages
+mkdir -p %{buildroot}/%{_mandir}/man1
+cp doc/*.1 %{buildroot}/%{_mandir}/man1/
+%if 0%{?_module_build}
+rm -f %{buildroot}/%{_mandir}/man1/doxywizard.1*
+%endif
+
+%if "x%{?xapian_core_support}" == "xOFF"
+rm -f %{buildroot}/%{_mandir}/man1/doxyindexer.1* %{buildroot}/%{_mandir}/man1/doxysearch.1*
+%endif
+
+# remove duplicate
+rm -rf %{buildroot}/%{_docdir}/packages
+
+%if ! 0%{?_module_build}
+desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
+%endif
+
+%check
+%ctest
+
+%files
+%doc LANGUAGE.HOWTO README.md
+%license LICENSE
+%if ! 0%{?_module_build}
+%if "x%{?xapian_core_support}" == "xON"
+%{_bindir}/doxyindexer
+%{_bindir}/doxysearch*
+%endif
+%endif
+%{_bindir}/doxygen
+%{_mandir}/man1/doxygen.1*
+%if "x%{?xapian_core_support}" == "xON"
+%{_mandir}/man1/doxyindexer.1*
+%{_mandir}/man1/doxysearch.1*
+%endif
+%if ! 0%{?_module_build}
+%files doxywizard
+%{_bindir}/doxywizard
+%{_mandir}/man1/doxywizard*
+%{_datadir}/applications/doxywizard.desktop
+%endif
+%{_datadir}/icons/hicolor/*/apps/doxywizard.png
+
+%if ! 0%{?_module_build}
+%files latex
+# intentionally left blank
+%endif
+
+%changelog
+* Tue Sep 29 2020 Than Ngo <than@redhat.com> - 1.8.20-5
+- backport upstream patches
+
+* Thu Sep 17 2020 Than Ngo <than@redhat.com> - 1.8.20-4
+- Fix doxygen crash
+
+* Tue Sep 15 2020 Mattias Ellert <mattias.ellert@physics.uu.se> - 1:1.8.20-3
+- Fix doxygen producing different results on 32 and 64 bit architectures
+
+* Fri Aug 28 2020 Scott Talbert <swt@techie.net> - 1:1.8.20-2
+- Fix issue with enums being defined in multiple files
+
+* Tue Aug 25 2020 Than Ngo <than@redhat.com> - 1.8.20-1
+- update to 1.8.20
+
+* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.8.18-6
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.8.18-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Wed Jul 08 2020 Than Ngo <than@redhat.com> - 1.8.18-4
+- fixed link issue against new clang
+
+* Thu Jun 18 2020 Than Ngo <than@redhat.com> - 1.8.18-3
+- fixed bz#1834591, enable clang support in fedora
+
+* Wed May 27 2020 Tom Callaway <spot@fedoraproject.org> - 1.8.18-2
+- update tex dependencies
+
+* Mon May 25 2020 Than Ngo <than@redhat.com> - 1.8.18-1
+- update to 1.8.18
+- backport fixes: buffer-overflow, memory leeks and md5 hash does not match for
+  2 diffferent runs
+
+* Thu Apr 02 2020 Björn Esser <besser82@fedoraproject.org> - 1:1.8.17-3
+- Fix string quoting for rpm >= 4.16
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.8.17-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Tue Jan 14 2020 Than Ngo <than@redhat.com> - 1:1.8.17-1
+- resolves #1786799, update to 1.8.17
+
+* Tue Dec 10 2019 Than Ngo <than@redhat.com> - 1:1.8.16-3
+- fixed covscan issues
+
+* Mon Sep 16 2019 Than Ngo <than@redhat.com> - 1:1.8.16-2
+- backpored upstream patch to fix #7248
+
+* Wed Sep 11 2019 Than Ngo <than@redhat.com> - 1:1.8.16-1
+- resolves #1742614, update to 1.8.16
+
+* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.8.15-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Tue Mar 19 2019 Christoph Junghans <junghans@votca.org> - 1:1.8.15-9
+- Incl. xml fix for c++11
+
+* Sat Mar 16 2019 Than Ngo <than@redhat.com> - 1:1.8.15-8
+- added license file
+
+* Wed Mar 13 2019 Than Ngo <than@redhat.com> - 1:1.8.15-7
+- added Requirement on dot
+
+* Thu Feb 14 2019 Than Ngo <than@redhat.com> - 1:1.8.15-6
+- fixed bz#1677000, fixed multilib issue
+
+* Tue Feb 12 2019 Than Ngo <than@redhat.com> - 1:1.8.15-5
+- fixed bz#1675288, doxygen 1.8.15 segfault
+
+* Fri Feb 08 2019 Than Ngo <than@redhat.com> - 1:1.8.15-4
+- fixed bz#673228 - operator whitespace changes cause wxpython FTBFS
+- fixed bz#1673230 - BR on tex(newunicodechar.sty) in doxygen-latex 
+
+* Tue Feb 05 2019 Than Ngo <than@redhat.com> - 1:1.8.15-3
+- fixed bz#1671999, backported from upstream
+- added test for XML output with an empty TOC
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.8.15-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Mon Jan 28 2019 Than Ngo <than@redhat.com> - 1:1.8.15-1
+- update to 1.8.15
+
+* Thu Dec 06 2018 Than Ngo <than@redhat.com> - 1:1.8.14-8
+- enable testing 
+
+* Mon Jul 23 2018 Than Ngo <than@redhat.com> - 1:1.8.14-7
+- add BR: gcc-c++ gcc
+
+* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.8.14-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Wed Jun 27 2018 Than Ngo <than@redhat.com> - 1:1.8.14-5
+- support Qt5
+
+* Wed Jun 20 2018 Than Ngo <than@redhat.com> - 1.8.14-4
+- enble search addon on fedora
+
+* Mon Apr 30 2018 Than Ngo <than@redhat.com> - 1.8.14-3
+- added missing BR on adjustbox.sty for refman
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.8.14-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Fri Dec 29 2017 Than Ngo <than@redhat.com> - 1:1.8.14-1
+- update to 1.8.14
+
+* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.8.13-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.8.13-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Thu Jul 13 2017 Petr Pisar <ppisar@redhat.com> - 1:1.8.13-10
+- perl dependency renamed to perl-interpreter
+  <https://fedoraproject.org/wiki/Changes/perl_Package_to_Install_Core_Modules>
+
+* Tue Jul 04 2017 Than Ngo <than@redhat.com> - 1:1.8.13-9
+- backport to fix C# property initializer parsing 
+- backport to fix non reachable links and redirected links in documentation
+
+* Tue May 30 2017 Than Ngo <than@redhat.com> - 1:1.8.13-8
+- backport to fix problem where automatic line breaking caused
+  missing vertical bars in the parameter table for Latex output
+
+* Sat Apr 22 2017 Karsten Hopp <karsten@redhat.com> - 1.8.13-7
+- fix _module_build macro
+
+* Fri Apr 21 2017 Karsten Hopp <karsten@redhat.com> - 1.8.13-6
+- use new _module_build macro to limit dependencies for Modularity
+
+* Mon Mar 13 2017 Than Ngo <than@redhat.com> - 1:1.8.13-5
+- backport to fix behavior of @ref const matching (#776988)
+
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.8.13-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Thu Jan 19 2017 Than Ngo <than@redhat.com> - 1:1.8.13-3
+- Bug 775493 - Usage of underscore's in parameter names
+
+* Tue Jan 17 2017 Björn Esser <besser82@fedoraproject.org> - 1:1.8.13-2
+- Add upstream patch to fix regression (rhbz#1413296)
+
+* Thu Dec 29 2016 Orion Poplawski <orion@cora.nwra.com> - 1:1.8.13-1
+- Update to 1.8.13
+- Drop upstream patches
+
+* Thu Dec 22 2016 Orion Poplawski <orion@cora.nwra.com> - 1:1.8.12-7
+- Rebuild for xapian soname bump
+- Add patch to build with python rc
+
+* Mon Dec 12 2016 Than Ngo <than@redhat.com> - 1:1.8.12-6
+- backport upstream patch to fix
+    Bug 707266 - C++/CLI indexed property not documented
+    Bug 774949 - Unknown reference in manual
+    Bug 775245 - referencing Python files via tagfile broken
+
+* Thu Dec 08 2016 Than Ngo <than@redhat.com> - 1:1.8.12-5
+- fixed bz#1402043 - runtime dependency on perl
+- backport upstream patch to fix Bug 774138 . add HTML classes to "Definition at..." & "Referenced by..." for CSS
+
+* Fri Nov 25 2016 Than Ngo <than@redhat.com> - - 1:1.8.12-4
+- Bug 774273 - INLINE_SIMPLE_STRUCTS with enums in classes does not work
+
+* Tue Nov 15 2016 Than Ngo <than@redhat.com> - 1:1.8.12-3
+- bz#1394456, add missing docs
+- fix build issue when build_doc=ON
+
+* Thu Oct 20 2016 Than Ngo <than@redhat.com> - 1:1.8.12-2
+- backport upstream fixes
+  Bug 771310 - French description for "Namespace Members" is wrong and causes fatal javascript error
+  Bug 771344 - Class name 'internal' breaks class hierarchy in C++
+
+* Tue Sep 06 2016 Than Ngo <than@redhat.com> - 1:1.8.12-1
+- 1.8.12
+- fixed bz#1373167 - doxygen ships bogus man pages 
+
+* Sun Mar 06 2016 Than Ngo <than@redhat.com> - 1:1.8.11-4
+- bz#1305739, Unescaped percent sign in doxygen
+
+* Mon Feb 22 2016 Than Ngo <than@redhat.com> - 1:1.8.11-3
+- fix bz#1305739, Unescaped percent sign in doxygen
+
+* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.8.11-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Wed Jan 13 2016 Than Ngo <than@redhat.com> - 1:1.8.11-1
+- 1.8.11
+
+* Fri Dec 04 2015 Than Ngo <than@redhat.com> - 1:1.8.10-7
+- backport to fix a couple of small memory leaks
+
+* Tue Nov 10 2015 Than Ngo <than@redhat.com> - 1:1.8.10-6
+- backport patches to fix follow issues:
+   angle brackets (< and >) not escaped in HTML formula alt text
+   don't support longer key in bibtex
+   math does not work in LaTeX with custom header and footer
+   writeMemberNavIndex template calls static fixSpaces
+   XML empty <argsstring/> in python
+   XML not documenting a class in python
+   add option to build latex without timestamps
+
+* Mon Nov 09 2015 Than Ngo <than@redhat.com> - 1:1.8.10-5
+- fix install issue
+
+* Thu Oct 08 2015 Marcin Juszkiewicz <mjuszkiewicz@redhat.com> - 1:1.8.10-4
+- Fix patch to apply
+
+* Thu Oct 08 2015 Marcin Juszkiewicz <mjuszkiewicz@redhat.com> - 1:1.8.10-3
+- drop QT_ARCH_X86_64 hardcoded definition to get doxygen built on aarch64
+  (it built by pure luck on other architectures)
+
+* Wed Sep 23 2015 Than Ngo <than@redhat.com> - 1.8.10-2
+- fix broken deps
+
+* Fri Aug 28 2015 Than Ngo <than@redhat.com> - 1.8.10-1
+- update to 1.8.10
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.8.9.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Thu May 28 2015 Than Ngo <than@redhat.com> - 1:1.8.9.1-3
+- rebuild
+
+* Wed Apr 29 2015 Than Ngo <than@redhat.com> - 1:1.8.9.1-2
+- Resolves: bz#1198355, doxygen generates \backmatter in article class
+
+* Wed Jan 21 2015 Than Ngo <than@redhat.com> 1:1.8.9.1-1
+- update to 1.8.9.1
+
+* Mon Aug 25 2014 Than Ngo <than@redhat.com> - 1:1.8.8-1
+- 1.8.8
+
+* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.8.7-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.8.7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Mon May 12 2014 Than Ngo <than@redhat.com> - 1:1.8.7-1
+- 1.8.7
+
+* Thu Dec 26 2013 Orion Poplawski <orion@cora.nwra.com> - 1:1.8.6-1
+- 1.8.6
+
+* Tue Oct 08 2013 Than Ngo <than@redhat.com> - 1:1.8.5-2
+- add exlive-epstopdf-bin in requirement
+
+* Mon Aug 26 2013 Than Ngo <than@redhat.com> - 1:1.8.5-1
+- 1.8.5
+
+* Sat Aug 03 2013 Robert Scheck <robert@fedoraproject.org> - 1:1.8.4-4
+- Work around strange dependencies in epstopdf packages (#991699)
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.8.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Mon Jun 24 2013 Than Ngo <than@redhat.com> - 1:1.8.4-2
+- backport upstream patch to fix endless loop
+
+* Tue May 21 2013 Than Ngo <than@redhat.com> - 1:1.8.4-1
+- 1.8.4
+
+* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.8.3.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Tue Jan 22 2013 Than Ngo <than@redhat.com> - 1.8.3.1-1
+- 1.8.3.1
+- fedora/rhel condition
+
+* Tue Jan 08 2013 Rex Dieter <rdieter@fedoraproject.org> - 1:1.8.3-3
+- -latex subpkg (#892288)
+- .spec cleanup
+
+* Thu Jan 03 2013 Rex Dieter <rdieter@fedoraproject.org> - 1:1.8.3-2
+- doxygen is missing dependencies for texlive update (#891452)
+- doxywizard: tighten dep on main pkg
+
+* Wed Jan 02 2013 Than Ngo <than@redhat.com> - 1:1.8.3-1
+- 1.8.3
+
+* Mon Aug 13 2012 Than Ngo <than@redhat.com> - 1:1.8.2-1
+- 1.8.2
+
+* Mon Jul 30 2012 Than Ngo <than@redhat.com> - 1:1.8.1.2-1
+- 1.8.1.2
+
+* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.8.1.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Wed Jun 20 2012 Than Ngo <than@redhat.com> - 1:1.8.1.1-3
+- bz#832525, fix multilib issue
+
+* Wed Jun 13 2012 Rex Dieter <rdieter@fedoraproject.org> 1:1.8.1.1-2
+- make HTML_TIMESTAMP default FALSE
+
+* Mon Jun 11 2012 Than Ngo <than@redhat.com> - 1:1.8.1.1-1
+- 1.8.1.1
+
+* Wed Jun 06 2012 Than Ngo <than@redhat.com> - 1:1.8.1-1
+- 1.8.1
+
+* Mon Feb 27 2012 Than Ngo <than@redhat.com> - 1:1.8.0-1
+- 1.8.0
+
+* Wed Jan 18 2012 Than Ngo <than@redhat.com> - 1:1.7.6.1-2
+- bz#772523, add desktop file
+
+* Fri Dec 16 2011 Than Ngo <than@redhat.com> - 1:1.7.6.1-1
+- 1.7.6.1
+
+* Tue Dec 06 2011 Than Ngo <than@redhat.com> - 1:1.7.6-1
+- 1.7.6
+
+* Tue Nov 08 2011 Than Ngo <than@redhat.com> - 1:1.7.5.1-1
+- 1.7.5.1
+
+* Tue Aug 23 2011 Than Ngo <than@redhat.com> - 1:1.7.5-1
+- 1.7.5
+
+* Mon Jun 27 2011 Than Ngo <than@redhat.com> - 1:1.7.4-2
+- bz#688684, apply patch to fix crash when not generating man format
+
+* Tue Mar 29 2011 Than Ngo <than@redhat.com> - 1.7.4-1
+- 1.7.4
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.7.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Mon Jan 17 2011 Than Ngo <than@redhat.com> - 1.7.3-1
+- 1.7.3
+- bz#661107
+
+* Fri Nov 12 2010 Rex Dieter <rdieter@fedoraproject.org> - 1.7.2-2
+- Wrong Buildrequire to qt-devel (#651064)
+
+* Mon Oct 11 2010 Than Ngo <than@redhat.com> - 1.7.2-1
+- 1.7.2
+
+* Wed Sep 08 2010 Than Ngo <than@redhat.com> - 1:1.7.1-2
+- bz#629286, apply patch to fix broken thread handling
+- bz#627553, #define in included file in different directory not handled properly
+- Inherited documentation doesn't work in case of multiple inheritance
+
+* Mon Jul 19 2010 Than Ngo <than@redhat.com> - 1.7.1-1
+- 1.7.1
+
+* Fri Feb 12 2010 Than Ngo <than@redhat.com> - 1.6.2-1.svn20100208
+- fix #555526, snapshot 1.6.2-20100208
+
+* Mon Jan 04 2010 Than Ngo <than@redhat.com> - 1:1.6.2-1
+- 1.6.2
+
+* Fri Dec 18 2009 Than Ngo <than@redhat.com> - 1:1.6.1-4
+- drop _default_patch_fuzz
+
+* Fri Dec 18 2009 Than Ngo <than@redhat.com> - 1:1.6.1-3
+- bz#225709, merged review
+
+* Fri Dec 11 2009 Than Ngo <than@redhat.com> - 1:1.6.1-2
+- bz#225709, merged review 
+
+* Tue Aug 25 2009 Than Ngo <than@redhat.com> - 1.6.1-1
+- 1.6.1
+
+* Mon Aug 24 2009 Than Ngo <than@redhat.com> - 1.6.0-2
+- fix #516339, allow to enable/disable timstamp to avoid the multilib issue
+  HTMP_TIMESTAMP is disable by default
+
+* Fri Aug 21 2009 Than Ngo <than@redhat.com> - 1.6.0-1
+- 1.6.0
+
+* Mon Aug 10 2009 Ville Skyttä <ville.skytta at iki.fi> - 1:1.5.9-3
+- Convert specfile to UTF-8.
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.5.9-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Fri Jul 03 2009 Than Ngo <than@redhat.com> - 1.5.9-1
+- 1.5.9
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.5.8-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Thu Feb 05 2009 Than Ngo <than@redhat.com> 1.5.8-1
+- 1.5.8
+
+* Mon Oct 06 2008 Than Ngo <than@redhat.com> 1.5.7.1-1
+- 1.5.7.1
+
+* Wed Jul 16 2008 Tom "spot" Callaway <tcallawa@redhat.com> 1.5.6-3
+- fix license tag
+
+* Wed May 21 2008 Than Ngo <than@redhat.com> 1.5.6-2
+- rebuild
+
+* Mon May 19 2008 Than Ngo <than@redhat.com> 1.5.6-1
+- 1.5.6
+
+* Fri Mar 14 2008 Than Ngo <than@redhat.com> 1.5.5-3
+- apply patch to not break partial include paths, thanks to Tim Niemueller
+
+* Wed Feb 20 2008 Than Ngo <than@redhat.com> 1.5.5-2
+- apply patch to make doxygen using system libpng/zlib
+
+* Fri Feb 15 2008 Than Ngo <than@redhat.com> 1.5.5-1
+- 1.5.5
+
+* Wed Nov 28 2007 Than Ngo <than@redhat.com> 1.5.4-1
+- 1.5.4
+
+* Fri Aug 10 2007 Than Ngo <than@redhat.com> - 1:1.5.3-1
+- 1.5.3
+
+* Thu Apr 12 2007 Than Ngo <than@redhat.com> - 1:1.5.2-1
+- 1.5.2
+
+* Fri Nov 03 2006 Than Ngo <than@redhat.com> 1:1.5.1-2
+- 1.5.1
+
+* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 1:1.4.7-1.1
+- rebuild
+
+* Mon Jun 12 2006 Than Ngo <than@redhat.com> 1:1.4.7-1
+- update to 1.4.7
+
+* Thu Jun 08 2006 Than Ngo <than@redhat.com> 1:1.4.6-5
+- fix build problem in mock #193358 
+
+* Fri May 12 2006 Than Ngo <than@redhat.com> 1:1.4.6-4
+- apply patch to fix Doxygen crash on empty file #191392 
+- html docs #187177 
+
+* Wed Mar 08 2006 Than Ngo <than@redhat.com> 1:1.4.6-3
+- fix typo bug #184400
+
+* Mon Mar 06 2006 Than Ngo <than@redhat.com> 1:1.4.6-2
+- fix build problem #184042
+
+* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 1:1.4.6-1.2
+- bump again for double-long bug on ppc(64)
+
+* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 1:1.4.6-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
+* Tue Jan 31 2006 Than Ngo <than@redhat.com> 1.4.6-1
+- 1.4.6
+
+* Mon Dec 19 2005 Than Ngo <than@redhat.com> 1.4.5-3
+- apply patch to fix build problem with gcc-4.1
+
+* Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
+- rebuilt
+
+* Fri Nov 18 2005 Bill Nottingham <notting@redhat.com>
+- fix references to /usr/X11R6
+
+* Sat Oct 15 2005 Florian La Roche <laroche@redhat.com>
+- 1.4.5
+
+* Mon Sep 19 2005 Than Ngo <than@redhat.com> 1:1.4.4-2
+- move doxywizard man page to subpackge doxywizard
+
+* Thu Jul 21 2005 Than Ngo <than@redhat.com> 1:1.4.4-1
+- update to 1.4.4
+
+* Tue Jun 14 2005 Than Ngo <than@redhat.com> 1.4.3-1
+- 1.4.3
+
+* Thu Mar 31 2005 Than Ngo <than@redhat.com> 1:1.4.2-1
+- 1.4.2
+
+* Fri Mar 04 2005 Than Ngo <than@redhat.com> 1:1.4.1-2
+- rebuilt against gcc-4
+
+* Wed Jan 19 2005 Than Ngo <than@redhat.com> 1:1.4.1-1
+- update to 1.4.1
+
+* Sun Oct 10 2004 Than Ngo <than@redhat.com> 1:1.3.9.1-1
+- update to 1.3.9.1
+
+* Wed Oct 06 2004 Than Ngo <than@redhat.com> 1:1.3.9-1
+- update to 1.3.9
+
+* Sun Jul 25 2004 Than Ngo <than@redhat.com> 1:1.3.8-1
+- update to 1.3.8
+
+* Tue Jun 15 2004 Elliot Lee <sopwith@redhat.com>
+- rebuilt
+
+* Tue May 11 2004 Than Ngo <than@redhat.com> 1.3.7-1
+- update to 1.3.7, bug #119340
+
+* Sun Apr 04 2004 Than Ngo <than@redhat.com> 1:1.3.6-2
+- fix qt-mt linking problem
+
+* Thu Feb 26 2004 Than Ngo <than@redhat.com> 1:1.3.6-1
+- update to 1.3.6
+- added more buildrequires, #110752
+
+* Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com>
+- rebuilt
+
+* Wed Dec 17 2003 Than Ngo <than@redhat.com> 1:1.3.5-1
+- 1.3.5 release
+
+* Fri Sep 26 2003 Harald Hoyer <harald@redhat.de> 1:1.3.4-1
+- update to 1.3.4
+- doxsearch was removed
+
+* Tue Sep 23 2003 Florian La Roche <Florian.LaRoche@redhat.de>
+- allow compiling without qt/doxywizard
+
+* Wed Jun 04 2003 Elliot Lee <sopwith@redhat.com>
+- rebuilt
+
+* Tue Jun  3 2003 Jeff Johnson <jbj@redhat.com>
+- add explicit epoch's where needed.
+
+* Tue May  6 2003 Than Ngo <than@redhat.com> 1.3-1
+- 1.3
+
+* Wed Jan 22 2003 Tim Powers <timp@redhat.com>
+- rebuilt
+
+* Fri Dec 27 2002 Than Ngo <than@redhat.com> 1.2.18-2
+- use gnu install
+
+* Sat Nov  9 2002 Than Ngo <than@redhat.com> 1.2.18-1.2
+- fix some build problem
+
+* Tue Oct 15 2002 Than Ngo <than@redhat.com> 1.2.18-1
+- 1.2.18
+
+* Wed Aug 28 2002 Than Ngo <than@redhat.com> 1.2.17-1
+- 1.2.17 fixes many major bugs
+
+* Sat Aug 10 2002 Elliot Lee <sopwith@redhat.com>
+- rebuilt with gcc-3.2 (we hope)
+
+* Mon Jul 22 2002 Tim Powers <timp@redhat.com>
+- rebuild using gcc-3.2-0.1
+
+* Fri Jun 21 2002 Tim Powers <timp@redhat.com>
+- automated rebuild
+
+* Thu May 23 2002 Tim Powers <timp@redhat.com>
+- automated rebuild
+
+* Tue Apr 16 2002 Bernhard Rosenkraenzer <bero@redhat.com> 1.2.13-5
+- rebuild against qt 3.0.3-10
+
+* Fri Mar  8 2002 Bernhard Rosenkraenzer <bero@redhat.com> 1.2.13-4
+- rebuild against qt 3.0.2
+
+* Tue Feb 26 2002 Than Ngo <than@redhat.com> 1.2.14-2
+- rebuild against qt 2.3.2
+
+* Tue Feb 19 2002 Bernhard Rosenkraenzer <bero@redhat.com> 1.2.14-1
+- 1.2.14
+
+* Wed Jan 09 2002 Tim Powers <timp@redhat.com>
+- automated rebuild
+
+* Sun Jan 06 2002 Than Ngo <than@redhat.com> 1.2.13.1-1
+- update to 1.2.13.1
+- fixed build doxywizard with qt3
+
+* Sun Dec 30 2001 Jeff Johnson <jbj@redhat.com> 1.2.13-1
+- update to 1.2.13
+
+* Sun Nov 18 2001 Than Ngo <than@redhat.com> 1.2.12-1
+- update to 1.2.12
+- s/Copyright/License
+
+* Wed Sep 12 2001 Tim Powers <timp@redhat.com>
+- rebuild with new gcc and binutils
+
+* Wed Jun 13 2001 Than Ngo <than@redhat.com>
+- update tp 1.2.8.1
+- make doxywizard as separat package
+- fix to use install as default
+
+* Tue Jun 05 2001 Than Ngo <than@redhat.com>
+- update to 1.2.8
+
+* Tue May 01 2001 Than Ngo <than@redhat.com>
+- update to 1.2.7
+- clean up specfile
+- patch to use RPM_OPT_FLAG
+
+* Wed Mar 14 2001 Jeff Johnson <jbj@redhat.com>
+- update to 1.2.6
+
+* Wed Feb 28 2001 Trond Eivind Glomsrød <teg@redhat.com>
+- rebuild
+
+* Tue Dec 26 2000 Than Ngo <than@redhat.com>
+- update to 1.2.4
+- remove excludearch ia64
+- bzip2 sources
+
+* Mon Dec 11 2000 Than Ngo <than@redhat.com>
+- rebuild with the fixed fileutils
+
+* Mon Oct 30 2000 Jeff Johnson <jbj@redhat.com>
+- update to 1.2.3.
+
+* Sun Oct  8 2000 Jeff Johnson <jbj@redhat.com>
+- update to 1.2.2.
+- enable doxywizard.
+
+* Sat Aug 19 2000 Preston Brown <pbrown@redhat.com>
+- 1.2.1 is latest stable, so we upgrade before Winston is released.
+
+* Wed Jul 12 2000 Prospector <bugzilla@redhat.com>
+- automatic rebuild
+
+* Tue Jul  4 2000 Jakub Jelinek <jakub@redhat.com>
+- Rebuild with new C++
+
+* Fri Jun 30 2000 Florian La Roche <laroche@redhat.de>
+- fix QTDIR detection
+
+* Fri Jun 09 2000 Preston Brown <pbrown@redhat.com>
+- compile on x86 w/o optimization, revert when compiler fixed!!
+
+* Wed Jun 07 2000 Preston Brown <pbrown@redhat.com>
+- use newer RPM macros
+
+* Tue Jun  6 2000 Jeff Johnson <jbj@redhat.com>
+- add to distro.
+
+* Tue May  9 2000 Tim Powers <timp@redhat.com>
+- rebuilt for 7.0
+
+* Wed Feb  2 2000 Bernhard Rosenkraenzer <bero@redhat.com>
+- recompile with current Qt (2.1.0/1.45)
+
+* Wed Jan  5 2000 Jeff Johnson <jbj@redhat.com>
+- update to 1.0.0.
+- recompile with qt-2.0.1 if available.
+- relocatable package.
+
+* Mon Nov  8 1999 Tim Powers <timp@redhat.com>
+-updated to 0.49-991106
+
+* Tue Jul 13 1999 Tim Powers <timp@redhat.com>
+- updated source
+- cleaned up some stuff in the spec file
+
+* Thu Apr 22 1999 Jeff Johnson <jbj@redhat.com>
+- Create Power Tools 6.0 package.
--- a/doxywizard.desktop
+++ b/doxywizard.desktop
@ -0,0 +1,6 @@
+[Desktop Entry]
+Type=Application
+Exec=doxywizard
+Name=Doxygen Wizard
+Icon=doxywizard
+Categories=Qt;Development;
--- a/gating.yaml
+++ b/gating.yaml
@ -0,0 +1,7 @@
+--- !Policy
+product_versions:
+  - fedora-*
+decision_context: bodhi_update_push_testing
+rules:
+  - !PassingTestCaseRule {test_case_name: dist.depcheck}
+  - !PassingTestCaseRule {test_case_name: dist.abicheck}
--- a/1
+++ b/1
@ -0,0 +1 @@
+SHA512 (doxygen-1.8.20.src.tar.gz) = 15dc95850440aed2a56971d8c04bf3bdfac861bcc38c60c7be22fd3b922b9fe2a750ea8877cb0716832bb6ad7901afcdf4950ba985b09890027030bdf828eee3
--- a/tests/tests.yml
+++ b/tests/tests.yml
@ -0,0 +1,12 @@
+---
+# Run tests in all contexts
+- hosts: localhost
+  tags:
+  - classic
+  roles:
+  - role: standard-test-beakerlib
+    tests:
+    - upstream-test-suite
+    required_packages:
+    - doxygen
+    - python3
--- a/tests/upstream-test-suite/001/indexpage.xml
+++ b/tests/upstream-test-suite/001/indexpage.xml
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="">
+  <compounddef id="indexpage" kind="page">
+    <compoundname>index</compoundname>
+    <title>My Project</title>
+    <briefdescription>
+    </briefdescription>
+    <detaileddescription>
+      <para>Text <emphasis>argument</emphasis> more text. </para>
+    </detaileddescription>
+  </compounddef>
+</doxygen>
--- a/tests/upstream-test-suite/001_a.dox
+++ b/tests/upstream-test-suite/001_a.dox
@ -0,0 +1,5 @@
+// objective: test the \a and \mainpage commands
+// check: indexpage.xml
+/** \mainpage
+ *  Text \a argument more text.
+ */
--- a/tests/upstream-test-suite/002/indexpage.xml
+++ b/tests/upstream-test-suite/002/indexpage.xml
@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="">
+  <compounddef id="indexpage" kind="page">
+    <compoundname>index</compoundname>
+    <title>My Project</title>
+    <briefdescription>
+    </briefdescription>
+    <detaileddescription>
+      <para>
+        <indexentry>
+          <primaryie>keyword</primaryie>
+          <secondaryie/>
+        </indexentry>
+      </para>
+    </detaileddescription>
+  </compounddef>
+</doxygen>
--- a/tests/upstream-test-suite/002_addindex.dox
+++ b/tests/upstream-test-suite/002_addindex.dox
@ -0,0 +1,5 @@
+// objective: test \addindex command
+// check: indexpage.xml
+/** \mainpage
+ *  \addindex keyword
+ */
--- a/tests/upstream-test-suite/003/indexpage.xml
+++ b/tests/upstream-test-suite/003/indexpage.xml
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="">
+  <compounddef id="indexpage" kind="page">
+    <compoundname>index</compoundname>
+    <title>My Project</title>
+    <briefdescription>
+    </briefdescription>
+    <detaileddescription>
+      <para><ref refid="index_1myanchor" kindref="member">See Anchor</ref> Some text. <anchor id="index_1myanchor"/>More text. </para>
+    </detaileddescription>
+  </compounddef>
+</doxygen>
--- a/tests/upstream-test-suite/003_anchor.dox
+++ b/tests/upstream-test-suite/003_anchor.dox
@ -0,0 +1,8 @@
+// objective: test \anchor command
+// check: indexpage.xml
+/** \mainpage
+ *  \ref myanchor "See Anchor"
+ *  Some text.
+ *  \anchor myanchor
+ *  More text.
+ */
--- a/tests/upstream-test-suite/004/indexpage.xml
+++ b/tests/upstream-test-suite/004/indexpage.xml
@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="">
+  <compounddef id="indexpage" kind="page">
+    <compoundname>index</compoundname>
+    <title>My Project</title>
+    <briefdescription>
+    </briefdescription>
+    <detaileddescription>
+      <para><itemizedlist><listitem><para><computeroutput>AlignLeft</computeroutput> left alignment. </para></listitem><listitem><para><computeroutput>AlignCenter</computeroutput> center alignment. </para></listitem><listitem><para><computeroutput>AlignRight</computeroutput> right alignment</para></listitem></itemizedlist>
+No other types of alignment are supported.</para>
+      <para><itemizedlist><listitem><para><computeroutput>AlignLeft</computeroutput> left alignment. </para></listitem><listitem><para><computeroutput>AlignCenter</computeroutput> center alignment. </para></listitem><listitem><para><computeroutput>AlignRight</computeroutput> right alignment</para></listitem></itemizedlist>
+No other types of alignment are supported. </para>
+    </detaileddescription>
+  </compounddef>
+</doxygen>
--- a/tests/upstream-test-suite/004_arg.dox
+++ b/tests/upstream-test-suite/004_arg.dox
@ -0,0 +1,15 @@
+// objective: test \arg and \li commands
+// check: indexpage.xml
+/** \mainpage
+  \arg \c AlignLeft left alignment.
+  \arg \c AlignCenter center alignment.
+  \arg \c AlignRight right alignment
+
+  No other types of alignment are supported.
+
+  \li \c AlignLeft left alignment.
+  \li \c AlignCenter center alignment.
+  \li \c AlignRight right alignment
+
+  No other types of alignment are supported.
+*/
--- a/tests/upstream-test-suite/005/indexpage.xml
+++ b/tests/upstream-test-suite/005/indexpage.xml
@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="">
+  <compounddef id="indexpage" kind="page">
+    <compoundname>index</compoundname>
+    <title>My Project</title>
+    <briefdescription>
+    </briefdescription>
+    <detaileddescription>
+      <para>
+        <simplesect kind="attention">
+          <para>Attention message. </para>
+        </simplesect>
+        <simplesect kind="note">
+          <para>Something to note. </para>
+        </simplesect>
+        <simplesect kind="remark">
+          <para>A remark. </para>
+        </simplesect>
+        <simplesect kind="warning">
+          <para>A warning message. </para>
+        </simplesect>
+        <simplesect kind="par">
+          <title/>
+          <para>Second paragraph </para>
+        </simplesect>
+        <simplesect kind="par">
+          <title>User defined paragraph.</title>
+          <para>Contents of paragraph. </para>
+        </simplesect>
+        <simplesect kind="par">
+          <title/>
+          <para>More text in a new paragraph. </para>
+        </simplesect>
+      </para>
+    </detaileddescription>
+  </compounddef>
+</doxygen>
--- a/tests/upstream-test-suite/005_attention.dox
+++ b/tests/upstream-test-suite/005_attention.dox
@ -0,0 +1,14 @@
+// objective: test \attention, \note, \remark, \warning, and \par commands
+// check: indexpage.xml
+/** \mainpage
+ *  \attention Attention message.
+ *  \note Something to note.
+ *  \remark A remark.
+ *  \warning A warning message.
+ *  \par 
+ *  Second paragraph
+ *  \par User defined paragraph.
+ *  Contents of paragraph.
+ *  \par
+ *  More text in a new paragraph.
+ */
--- a/tests/upstream-test-suite/006/indexpage.xml
+++ b/tests/upstream-test-suite/006/indexpage.xml
@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="">
+  <compounddef id="indexpage" kind="page">
+    <compoundname>index</compoundname>
+    <title>My Project</title>
+    <briefdescription>
+    </briefdescription>
+    <detaileddescription>
+      <para>
+        <simplesect kind="author">
+          <para>John Doe </para>
+        </simplesect>
+        <simplesect kind="author">
+          <para>Jane Doe </para>
+        </simplesect>
+        <simplesect kind="authors">
+          <para>David, Steven </para>
+        </simplesect>
+        <simplesect kind="since">
+          <para>version 1.2 </para>
+        </simplesect>
+        <simplesect kind="version">
+          <para>1.8-beta2 </para>
+        </simplesect>
+      </para>
+    </detaileddescription>
+  </compounddef>
+</doxygen>
--- a/tests/upstream-test-suite/006_author.dox
+++ b/tests/upstream-test-suite/006_author.dox
@ -0,0 +1,9 @@
+// objective: test the \author, \since, and \version command
+// check: indexpage.xml
+/** \mainpage
+ *  \author John Doe
+ *  \author Jane Doe
+ *  \authors David, Steven
+ *  \since version 1.2
+ *  \version 1.8-beta2
+ */
--- a/tests/upstream-test-suite/007/indexpage.xml
+++ b/tests/upstream-test-suite/007/indexpage.xml
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="">
+  <compounddef id="indexpage" kind="page">
+    <compoundname>index</compoundname>
+    <title>My Project</title>
+    <briefdescription>
+    </briefdescription>
+    <detaileddescription>
+      <para>Text <bold>bold</bold> normal text. </para>
+    </detaileddescription>
+  </compounddef>
+</doxygen>
--- a/tests/upstream-test-suite/007_b.dox
+++ b/tests/upstream-test-suite/007_b.dox
@ -0,0 +1,5 @@
+// objective: test the \b command
+// check: indexpage.xml
+/** \mainpage
+ *  Text \b bold normal text.
+ */
--- a/tests/upstream-test-suite/008/008__brief_8c.xml
+++ b/tests/upstream-test-suite/008/008__brief_8c.xml
@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="">
+  <compounddef id="008__brief_8c" kind="file" language="C++">
+    <compoundname>008_brief.c</compoundname>
+    <briefdescription>
+      <para>A brief description. </para>
+    </briefdescription>
+    <detaileddescription>
+      <para>More details. </para>
+    </detaileddescription>
+    <location file="008_brief.c"/>
+  </compounddef>
+</doxygen>
--- a/tests/upstream-test-suite/008_brief.c
+++ b/tests/upstream-test-suite/008_brief.c
@ -0,0 +1,7 @@
+// objective: test \brief and \file command
+// check: 008__brief_8c.xml
+/** \file
+ *  \brief A brief description.
+ * 
+ *  More details.
+ */
--- a/tests/upstream-test-suite/009/bug.xml
+++ b/tests/upstream-test-suite/009/bug.xml
@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="">
+  <compounddef id="bug" kind="page">
+    <compoundname>bug</compoundname>
+    <title>Bug List</title>
+    <briefdescription>
+    </briefdescription>
+    <detaileddescription>
+      <para>
+        <variablelist>
+          <varlistentry>
+            <term>Class <ref refid="class_bug" kindref="compound">Bug</ref></term>
+          </varlistentry>
+          <listitem>
+            <para><anchor id="bug_1_bug000001"/>Class bug.  </para>
+          </listitem>
+          <varlistentry>
+            <term>Member <ref refid="class_bug_1a1f720954dd97cd1203e80501a6eae74c" kindref="member">Bug::foo</ref>  ()</term>
+          </varlistentry>
+          <listitem>
+            <para><anchor id="bug_1_bug000002"/>Function bug<itemizedlist><listitem><para>list item 1 in bug</para></listitem><listitem><para>list item 2 in bug</para></listitem></itemizedlist></para>
+          </listitem>
+        </variablelist>
+      </para>
+    </detaileddescription>
+  </compounddef>
+</doxygen>
--- a/tests/upstream-test-suite/009/class_bug.xml
+++ b/tests/upstream-test-suite/009/class_bug.xml
@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="">
+  <compounddef id="class_bug" kind="class" language="C++" prot="public">
+    <compoundname>Bug</compoundname>
+    <sectiondef kind="public-func">
+      <memberdef kind="function" id="class_bug_1a1f720954dd97cd1203e80501a6eae74c" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
+        <type>void</type>
+        <definition>void Bug::foo</definition>
+        <argsstring>()</argsstring>
+        <name>foo</name>
+        <briefdescription>
+        </briefdescription>
+        <detaileddescription>
+          <para>Description <xrefsect id="bug_1_bug000002"><xreftitle>Bug</xreftitle><xrefdescription><para>Function bug<itemizedlist><listitem><para>list item 1 in bug</para></listitem><listitem><para>list item 2 in bug</para></listitem></itemizedlist>
+</para></xrefdescription></xrefsect></para>
+          <para>More text. </para>
+        </detaileddescription>
+        <inbodydescription>
+        </inbodydescription>
+        <location file="009_bug.cpp" line="25" column="1"/>
+      </memberdef>
+    </sectiondef>
+    <briefdescription>
+    </briefdescription>
+    <detaileddescription>
+      <para>
+        <xrefsect id="bug_1_bug000001">
+          <xreftitle>Bug</xreftitle>
+          <xrefdescription>
+            <para>Class bug. </para>
+          </xrefdescription>
+        </xrefsect>
+      </para>
+    </detaileddescription>
+    <location file="009_bug.cpp" line="16" column="1" bodyfile="009_bug.cpp" bodystart="15" bodyend="26"/>
+    <listofallmembers>
+      <member refid="class_bug_1a1f720954dd97cd1203e80501a6eae74c" prot="public" virt="non-virtual">
+        <scope>Bug</scope>
+        <name>foo</name>
+      </member>
+    </listofallmembers>
+  </compounddef>
+</doxygen>
--- a/tests/upstream-test-suite/009/class_deprecated.xml
+++ b/tests/upstream-test-suite/009/class_deprecated.xml
@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="">
+  <compounddef id="class_deprecated" kind="class" language="C++" prot="public">
+    <compoundname>Deprecated</compoundname>
+    <sectiondef kind="public-func">
+      <memberdef kind="function" id="class_deprecated_1a1d5f6803e72c625727e7083d1722dbf9" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
+        <type>void</type>
+        <definition>void Deprecated::deprecated</definition>
+        <argsstring>()</argsstring>
+        <name>deprecated</name>
+        <briefdescription>
+        </briefdescription>
+        <detaileddescription>
+          <para>Do deprecated things. <xrefsect id="deprecated_1_deprecated000002"><xreftitle>Deprecated</xreftitle><xrefdescription><para>No not use this function anymore. </para></xrefdescription></xrefsect></para>
+        </detaileddescription>
+        <inbodydescription>
+        </inbodydescription>
+        <location file="009_bug.cpp" line="35" column="1"/>
+      </memberdef>
+    </sectiondef>
+    <briefdescription>
+    </briefdescription>
+    <detaileddescription>
+      <para>
+        <xrefsect id="deprecated_1_deprecated000001">
+          <xreftitle>Deprecated</xreftitle>
+          <xrefdescription>
+            <para>This class is deprecated </para>
+          </xrefdescription>
+        </xrefsect>
+      </para>
+    </detaileddescription>
+    <location file="009_bug.cpp" line="30" column="1" bodyfile="009_bug.cpp" bodystart="29" bodyend="36"/>
+    <listofallmembers>
+      <member refid="class_deprecated_1a1d5f6803e72c625727e7083d1722dbf9" prot="public" virt="non-virtual">
+        <scope>Deprecated</scope>
+        <name>deprecated</name>
+      </member>
+    </listofallmembers>
+  </compounddef>
+</doxygen>
--- a/tests/upstream-test-suite/009/class_reminder.xml
+++ b/tests/upstream-test-suite/009/class_reminder.xml
@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="">
+  <compounddef id="class_reminder" kind="class" language="C++" prot="public">
+    <compoundname>Reminder</compoundname>
+    <sectiondef kind="public-func">
+      <memberdef kind="function" id="class_reminder_1a173b5218bb11287b0e86a550d9f0728d" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
+        <type>void</type>
+        <definition>void Reminder::reminder</definition>
+        <argsstring>()</argsstring>
+        <name>reminder</name>
+        <briefdescription>
+        </briefdescription>
+        <detaileddescription>
+          <para>
+            <xrefsect id="reminders_1_reminders000002">
+              <xreftitle>Reminder</xreftitle>
+              <xrefdescription>
+                <para>Need to rework this before the next release. </para>
+              </xrefdescription>
+            </xrefsect>
+          </para>
+        </detaileddescription>
+        <inbodydescription>
+        </inbodydescription>
+        <location file="009_bug.cpp" line="59" column="1"/>
+      </memberdef>
+    </sectiondef>
+    <briefdescription>
+    </briefdescription>
+    <detaileddescription>
+      <para>
+        <xrefsect id="reminders_1_reminders000001">
+          <xreftitle>Reminder</xreftitle>
+          <xrefdescription>
+            <para>A reminder </para>
+          </xrefdescription>
+        </xrefsect>
+      </para>
+    </detaileddescription>
+    <location file="009_bug.cpp" line="56" column="1" bodyfile="009_bug.cpp" bodystart="55" bodyend="60"/>
+    <listofallmembers>
+      <member refid="class_reminder_1a173b5218bb11287b0e86a550d9f0728d" prot="public" virt="non-virtual">
+        <scope>Reminder</scope>
+        <name>reminder</name>
+      </member>
+    </listofallmembers>
+  </compounddef>
+</doxygen>
--- a/tests/upstream-test-suite/009/class_test.xml
+++ b/tests/upstream-test-suite/009/class_test.xml
@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="">
+  <compounddef id="class_test" kind="class" language="C++" prot="public">
+    <compoundname>Test</compoundname>
+    <sectiondef kind="public-func">
+      <memberdef kind="function" id="class_test_1a9fc54b716f326514a4c5f434137f4fc0" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
+        <type>void</type>
+        <definition>void Test::test</definition>
+        <argsstring>()</argsstring>
+        <name>test</name>
+        <briefdescription>
+        </briefdescription>
+        <detaileddescription>
+          <para>
+            <xrefsect id="test_1_test000002">
+              <xreftitle>Test</xreftitle>
+              <xrefdescription>
+                <para>more things to test. </para>
+              </xrefdescription>
+            </xrefsect>
+          </para>
+        </detaileddescription>
+        <inbodydescription>
+        </inbodydescription>
+        <location file="009_bug.cpp" line="51" column="1"/>
+      </memberdef>
+    </sectiondef>
+    <briefdescription>
+    </briefdescription>
+    <detaileddescription>
+      <para>
+        <xrefsect id="test_1_test000001">
+          <xreftitle>Test</xreftitle>
+          <xrefdescription>
+            <para>This is part of testing </para>
+          </xrefdescription>
+        </xrefsect>
+      </para>
+    </detaileddescription>
+    <location file="009_bug.cpp" line="48" column="1" bodyfile="009_bug.cpp" bodystart="47" bodyend="52"/>
+    <listofallmembers>
+      <member refid="class_test_1a9fc54b716f326514a4c5f434137f4fc0" prot="public" virt="non-virtual">
+        <scope>Test</scope>
+        <name>test</name>
+      </member>
+    </listofallmembers>
+  </compounddef>
+</doxygen>
--- a/tests/upstream-test-suite/009/class_todo.xml
+++ b/tests/upstream-test-suite/009/class_todo.xml
@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="">
+  <compounddef id="class_todo" kind="class" language="C++" prot="public">
+    <compoundname>Todo</compoundname>
+    <sectiondef kind="public-func">
+      <memberdef kind="function" id="class_todo_1a9e70ec9176ac4c1b20e011b4daddc9d8" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
+        <type>void</type>
+        <definition>void Todo::todo</definition>
+        <argsstring>()</argsstring>
+        <name>todo</name>
+        <briefdescription>
+        </briefdescription>
+        <detaileddescription>
+          <para>
+            <xrefsect id="todo_1_todo000002">
+              <xreftitle>Todo</xreftitle>
+              <xrefdescription>
+                <para>more things to do here </para>
+              </xrefdescription>
+            </xrefsect>
+          </para>
+        </detaileddescription>
+        <inbodydescription>
+        </inbodydescription>
+        <location file="009_bug.cpp" line="43" column="1"/>
+      </memberdef>
+    </sectiondef>
+    <briefdescription>
+    </briefdescription>
+    <detaileddescription>
+      <para>
+        <xrefsect id="todo_1_todo000001">
+          <xreftitle>Todo</xreftitle>
+          <xrefdescription>
+            <para>This still needs to be done. </para>
+          </xrefdescription>
+        </xrefsect>
+      </para>
+    </detaileddescription>
+    <location file="009_bug.cpp" line="40" column="1" bodyfile="009_bug.cpp" bodystart="39" bodyend="44"/>
+    <listofallmembers>
+      <member refid="class_todo_1a9e70ec9176ac4c1b20e011b4daddc9d8" prot="public" virt="non-virtual">
+        <scope>Todo</scope>
+        <name>todo</name>
+      </member>
+    </listofallmembers>
+  </compounddef>
+</doxygen>
--- a/tests/upstream-test-suite/009/deprecated.xml
+++ b/tests/upstream-test-suite/009/deprecated.xml
@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="">
+  <compounddef id="deprecated" kind="page">
+    <compoundname>deprecated</compoundname>
+    <title>Deprecated List</title>
+    <briefdescription>
+    </briefdescription>
+    <detaileddescription>
+      <para>
+        <variablelist>
+          <varlistentry>
+            <term>Class <ref refid="class_deprecated" kindref="compound">Deprecated</ref></term>
+          </varlistentry>
+          <listitem>
+            <para><anchor id="deprecated_1_deprecated000001"/>This class is deprecated  </para>
+          </listitem>
+          <varlistentry>
+            <term>Member <ref refid="class_deprecated_1a1d5f6803e72c625727e7083d1722dbf9" kindref="member">Deprecated::deprecated</ref>  ()</term>
+          </varlistentry>
+          <listitem>
+            <para><anchor id="deprecated_1_deprecated000002"/>No not use this function anymore. </para>
+          </listitem>
+        </variablelist>
+      </para>
+    </detaileddescription>
+  </compounddef>
+</doxygen>
--- a/tests/upstream-test-suite/009/reminders.xml
+++ b/tests/upstream-test-suite/009/reminders.xml
@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="">
+  <compounddef id="reminders" kind="page">
+    <compoundname>reminders</compoundname>
+    <title>Reminders</title>
+    <briefdescription>
+    </briefdescription>
+    <detaileddescription>
+      <para>
+        <variablelist>
+          <varlistentry>
+            <term>Class <ref refid="class_reminder" kindref="compound">Reminder</ref></term>
+          </varlistentry>
+          <listitem>
+            <para><anchor id="reminders_1_reminders000001"/>A reminder  </para>
+          </listitem>
+          <varlistentry>
+            <term>Member <ref refid="class_reminder_1a173b5218bb11287b0e86a550d9f0728d" kindref="member">Reminder::reminder</ref>  ()</term>
+          </varlistentry>
+          <listitem>
+            <para><anchor id="reminders_1_reminders000002"/>Need to rework this before the next release. </para>
+          </listitem>
+        </variablelist>
+      </para>
+    </detaileddescription>
+  </compounddef>
+</doxygen>
--- a/tests/upstream-test-suite/009/test.xml
+++ b/tests/upstream-test-suite/009/test.xml
@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="">
+  <compounddef id="test" kind="page">
+    <compoundname>test</compoundname>
+    <title>Test List</title>
+    <briefdescription>
+    </briefdescription>
+    <detaileddescription>
+      <para>
+        <variablelist>
+          <varlistentry>
+            <term>Class <ref refid="class_test" kindref="compound">Test</ref></term>
+          </varlistentry>
+          <listitem>
+            <para><anchor id="test_1_test000001"/>This is part of testing  </para>
+          </listitem>
+          <varlistentry>
+            <term>Member <ref refid="class_test_1a9fc54b716f326514a4c5f434137f4fc0" kindref="member">Test::test</ref>  ()</term>
+          </varlistentry>
+          <listitem>
+            <para><anchor id="test_1_test000002"/>more things to test. </para>
+          </listitem>
+        </variablelist>
+      </para>
+    </detaileddescription>
+  </compounddef>
+</doxygen>
--- a/tests/upstream-test-suite/009/todo.xml
+++ b/tests/upstream-test-suite/009/todo.xml
@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="">
+  <compounddef id="todo" kind="page">
+    <compoundname>todo</compoundname>
+    <title>Todo List</title>
+    <briefdescription>
+    </briefdescription>
+    <detaileddescription>
+      <para>
+        <variablelist>
+          <varlistentry>
+            <term>Class <ref refid="class_todo" kindref="compound">Todo</ref></term>
+          </varlistentry>
+          <listitem>
+            <para><anchor id="todo_1_todo000001"/>This still needs to be done.  </para>
+          </listitem>
+          <varlistentry>
+            <term>Member <ref refid="class_todo_1a9e70ec9176ac4c1b20e011b4daddc9d8" kindref="member">Todo::todo</ref>  ()</term>
+          </varlistentry>
+          <listitem>
+            <para><anchor id="todo_1_todo000002"/>more things to do here </para>
+          </listitem>
+        </variablelist>
+      </para>
+    </detaileddescription>
+  </compounddef>
+</doxygen>
--- a/tests/upstream-test-suite/009_bug.cpp
+++ b/tests/upstream-test-suite/009_bug.cpp
@ -0,0 +1,62 @@
+// objective: test the \bug, \deprecated, \todo, \test, and \xrefitem commands
+// check: class_bug.xml
+// check: class_deprecated.xml
+// check: class_todo.xml
+// check: class_test.xml
+// check: class_reminder.xml
+// check: bug.xml
+// check: deprecated.xml
+// check: todo.xml
+// check: test.xml
+// check: reminders.xml
+// config: ALIASES = "reminder=\xrefitem reminders \"Reminder\" \"Reminders\""
+
+/** \bug Class bug. */
+class Bug
+{
+  public:
+    /** Description
+     *  \bug Function bug
+     *  - list item 1 in bug
+     *  - list item 2 in bug
+     *
+     *  More text.
+     */
+     void foo();
+};
+
+/** \deprecated This class is deprecated */
+class Deprecated
+{
+  public:
+    /** Do deprecated things.
+     *  \deprecated No not use this function anymore. 
+     */
+    void deprecated();
+};
+
+/** \todo This still needs to be done. */
+class Todo
+{
+  public:
+    /** \todo more things to do here */
+    void todo();
+};
+
+/** \test This is part of testing */
+class Test
+{
+  public:
+    /** \test more things to test. */
+    void test();
+};
+
+/** \reminder A reminder */
+class Reminder
+{
+  public:
+    /** \reminder Need to rework this before the next release. */
+    void reminder();
+};
+
+
--- a/tests/upstream-test-suite/010/indexpage.xml
+++ b/tests/upstream-test-suite/010/indexpage.xml
@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="">
+  <compounddef id="indexpage" kind="page">
+    <compoundname>index</compoundname>
+    <title>My Project</title>
+    <briefdescription>
+    </briefdescription>
+    <detaileddescription>
+      <para>Text <computeroutput>code</computeroutput> normal text.</para>
+      <para>Text <computeroutput>code</computeroutput> normal text. </para>
+    </detaileddescription>
+  </compounddef>
+</doxygen>
--- a/tests/upstream-test-suite/010_c.dox
+++ b/tests/upstream-test-suite/010_c.dox
@ -0,0 +1,7 @@
+// objective: test the \c and \p commands
+// check: indexpage.xml
+/** \mainpage
+ *  Text \c code normal text.
+ *
+ *  Text \p code normal text.
+ */
--- a/tests/upstream-test-suite/011/category_integer_07_arithmetic_08.xml
+++ b/tests/upstream-test-suite/011/category_integer_07_arithmetic_08.xml
@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="">
+  <compounddef id="category_integer_07_arithmetic_08" kind="category" language="Objective-C" prot="public">
+    <compoundname>Integer(Arithmetic)</compoundname>
+    <sectiondef kind="public-func">
+      <memberdef kind="function" id="category_integer_07_arithmetic_08_1a12f411c5872ba3bafb8ea7dd1826cf2a" prot="public" static="no" const="no" explicit="no" inline="no" virt="virtual">
+        <type>id</type>
+        <definition>id Integer(Arithmetic)::add:</definition>
+        <argsstring>(Integer *addend)</argsstring>
+        <name>add:</name>
+        <param>
+          <type><ref refid="interface_integer" kindref="compound">Integer</ref> *</type>
+          <declname>addend</declname>
+        </param>
+        <briefdescription>
+        </briefdescription>
+        <detaileddescription>
+          <para>add operation </para>
+        </detaileddescription>
+        <inbodydescription>
+        </inbodydescription>
+        <location file="011_category.m" line="8" column="1"/>
+      </memberdef>
+      <memberdef kind="function" id="category_integer_07_arithmetic_08_1ae4ff0b0c62b6809e8f5bcee9baa6e521" prot="public" static="no" const="no" explicit="no" inline="no" virt="virtual">
+        <type>id</type>
+        <definition>id Integer(Arithmetic)::sub:</definition>
+        <argsstring>(Integer *subtrahend)</argsstring>
+        <name>sub:</name>
+        <param>
+          <type><ref refid="interface_integer" kindref="compound">Integer</ref> *</type>
+          <declname>subtrahend</declname>
+        </param>
+        <briefdescription>
+        </briefdescription>
+        <detaileddescription>
+          <para>subtract operation </para>
+        </detaileddescription>
+        <inbodydescription>
+        </inbodydescription>
+        <location file="011_category.m" line="8" column="1"/>
+      </memberdef>
+    </sectiondef>
+    <briefdescription>
+    </briefdescription>
+    <detaileddescription>
+      <para>A category </para>
+    </detaileddescription>
+    <location file="011_category.m" line="17" column="1" bodyfile="011_category.m" bodystart="17" bodyend="-1"/>
+    <listofallmembers>
+      <member refid="category_integer_07_arithmetic_08_1a12f411c5872ba3bafb8ea7dd1826cf2a" prot="public" virt="virtual">
+        <scope>Integer(Arithmetic)</scope>
+        <name>add:</name>
+      </member>
+      <member refid="category_integer_07_arithmetic_08_1ae4ff0b0c62b6809e8f5bcee9baa6e521" prot="public" virt="virtual">
+        <scope>Integer(Arithmetic)</scope>
+        <name>sub:</name>
+      </member>
+    </listofallmembers>
+  </compounddef>
+</doxygen>
--- a/tests/upstream-test-suite/011/interface_integer.xml
+++ b/tests/upstream-test-suite/011/interface_integer.xml
@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="">
+  <compounddef id="interface_integer" kind="class" language="Objective-C" prot="public">
+    <compoundname>Integer</compoundname>
+    <basecompoundref prot="public" virt="non-virtual">Object</basecompoundref>
+    <sectiondef kind="protected-attrib">
+      <memberdef kind="variable" id="interface_integer_1a35e89216966d8179a1b77f14b8211fda" prot="protected" static="no" mutable="no">
+        <type>int</type>
+        <definition>int Integer::integer</definition>
+        <argsstring/>
+        <name>integer</name>
+        <briefdescription>
+        </briefdescription>
+        <detaileddescription>
+          <para>data member </para>
+        </detaileddescription>
+        <inbodydescription>
+        </inbodydescription>
+        <location file="011_category.m" line="8" column="1" bodyfile="011_category.m" bodystart="8" bodyend="-1"/>
+      </memberdef>
+    </sectiondef>
+    <sectiondef kind="public-func">
+      <memberdef kind="function" id="interface_integer_1a7b55035e1b0e8e7d4c8587f54a760819" prot="public" static="no" const="no" explicit="no" inline="no" virt="virtual">
+        <type>int</type>
+        <definition>int Integer::integer</definition>
+        <argsstring>()</argsstring>
+        <name>integer</name>
+        <briefdescription>
+        </briefdescription>
+        <detaileddescription>
+          <para>getter </para>
+        </detaileddescription>
+        <inbodydescription>
+        </inbodydescription>
+        <location file="011_category.m" line="8" column="1"/>
+      </memberdef>
+      <memberdef kind="function" id="interface_integer_1ad2f47761103b2442ff7b3fbfe33ec6c9" prot="public" static="no" const="no" explicit="no" inline="no" virt="virtual">
+        <type>id</type>
+        <definition>id Integer::integer:</definition>
+        <argsstring>(int _integer)</argsstring>
+        <name>integer:</name>
+        <param>
+          <type>int</type>
+          <declname>_integer</declname>
+        </param>
+        <briefdescription>
+        </briefdescription>
+        <detaileddescription>
+          <para>setter </para>
+        </detaileddescription>
+        <inbodydescription>
+        </inbodydescription>
+        <location file="011_category.m" line="8" column="1"/>
+      </memberdef>
+    </sectiondef>
+    <briefdescription>
+    </briefdescription>
+    <detaileddescription>
+      <para>An interface </para>
+    </detaileddescription>
+    <inheritancegraph>
+      <node id="1">
+        <label>Object</label>
+      </node>
+      <node id="0">
+        <label>Integer</label>
+        <link refid="interface_integer"/>
+        <childnode refid="1" relation="public-inheritance">
+        </childnode>
+      </node>
+    </inheritancegraph>
+    <collaborationgraph>
+      <node id="3">
+        <label>Object</label>
+      </node>
+      <node id="2">
+        <label>Integer</label>
+        <link refid="interface_integer"/>
+        <childnode refid="3" relation="public-inheritance">
+        </childnode>
+      </node>
+    </collaborationgraph>
+    <location file="011_category.m" line="6" column="1" bodyfile="011_category.m" bodystart="6" bodyend="-1"/>
+    <listofallmembers>
+      <member refid="interface_integer_1a35e89216966d8179a1b77f14b8211fda" prot="protected" virt="non-virtual">
+        <scope>Integer</scope>
+        <name>integer</name>
+      </member>
+      <member refid="interface_integer_1a7b55035e1b0e8e7d4c8587f54a760819" prot="public" virt="virtual">
+        <scope>Integer</scope>
+        <name>integer</name>
+      </member>
+      <member refid="interface_integer_1ad2f47761103b2442ff7b3fbfe33ec6c9" prot="public" virt="virtual">
+        <scope>Integer</scope>
+        <name>integer:</name>
+      </member>
+    </listofallmembers>
+  </compounddef>
+</doxygen>
--- a/tests/upstream-test-suite/011_category.m
+++ b/tests/upstream-test-suite/011_category.m
@ -0,0 +1,30 @@
+// objective: test the \interface and \category command
+// check: category_integer_07_arithmetic_08.xml
+// check: interface_integer.xml
+# import <objc/Object.h>
+ 
+@interface Integer : Object {
+ /** data member */
+ int integer;
+}
+ 
+/** getter */
+- (int) integer;
+/** setter */
+- (id) integer: (int) _integer;
+@end
+
+@interface Integer (Arithmetic)
+/** add operation */
+- (id) add: (Integer *) addend;
+/** subtract operation */
+- (id) sub: (Integer *) subtrahend;
+@end
+
+/** \interface Integer
+ *  An interface 
+ */
+
+/** \category Integer(Arithmetic)
+ *  A category
+ */
--- a/tests/upstream-test-suite/012/citelist.xml
+++ b/tests/upstream-test-suite/012/citelist.xml
@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="">
+  <compounddef id="citelist" kind="page">
+    <compoundname>citelist</compoundname>
+    <title>Bibliography</title>
+    <briefdescription>
+    </briefdescription>
+    <detaileddescription>
+      <para>
+        <variablelist>
+          <varlistentry>
+            <term><anchor id="citelist_1CITEREF_knuth79"/>[1]</term>
+          </varlistentry>
+          <listitem>
+            <para>Donald<nonbreakablespace/>E. Knuth. <emphasis>Tex and Metafont, New Directions in Typesetting</emphasis>. American Mathematical Society and Digital Press, Stanford, 1979.</para>
+            <para/>
+          </listitem>
+        </variablelist>
+      </para>
+    </detaileddescription>
+  </compounddef>
+</doxygen>
--- a/tests/upstream-test-suite/012/indexpage.xml
+++ b/tests/upstream-test-suite/012/indexpage.xml
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="">
+  <compounddef id="indexpage" kind="page">
+    <compoundname>index</compoundname>
+    <title>My Project</title>
+    <briefdescription>
+    </briefdescription>
+    <detaileddescription>
+      <para>See <ref refid="citelist_1CITEREF_knuth79" kindref="member">[1]</ref> for more info. </para>
+    </detaileddescription>
+  </compounddef>
+</doxygen>
--- a/tests/upstream-test-suite/012_cite.dox
+++ b/tests/upstream-test-suite/012_cite.dox
@ -0,0 +1,7 @@
+// objective: test the \cite command
+// check: indexpage.xml
+// check: citelist.xml
+// config: CITE_BIB_FILES = $INPUTDIR/sample.bib
+/** \mainpage
+ *  See \cite knuth79 for more info.
+ */
--- a/tests/upstream-test-suite/013/class_t1.xml
+++ b/tests/upstream-test-suite/013/class_t1.xml
@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="">
+  <compounddef id="class_t1" kind="class" language="C++" prot="public">
+    <compoundname>T1</compoundname>
+    <includes refid="013__class_8h" local="yes">inc/013_class.h</includes>
+    <briefdescription>
+    </briefdescription>
+    <detaileddescription>
+      <para>A class </para>
+    </detaileddescription>
+    <location file="013_class.h" line="11" column="1" bodyfile="013_class.h" bodystart="10" bodyend="12"/>
+    <listofallmembers>
+    </listofallmembers>
+  </compounddef>
+</doxygen>
--- a/tests/upstream-test-suite/013/class_t2.xml
+++ b/tests/upstream-test-suite/013/class_t2.xml
@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="">
+  <compounddef id="class_t2" kind="class" language="C++" prot="public">
+    <compoundname>T2</compoundname>
+    <includes refid="013__class_8h" local="no">013_class.h</includes>
+    <briefdescription>
+    </briefdescription>
+    <detaileddescription>
+      <para>class <ref refid="class_t2" kindref="compound">T2</ref> </para>
+    </detaileddescription>
+    <location file="013_class.h" line="15" column="1" bodyfile="013_class.h" bodystart="14" bodyend="16"/>
+    <listofallmembers>
+    </listofallmembers>
+  </compounddef>
+</doxygen>
--- a/tests/upstream-test-suite/013/class_t3.xml
+++ b/tests/upstream-test-suite/013/class_t3.xml
@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="">
+  <compounddef id="class_t3" kind="class" language="C++" prot="public">
+    <compoundname>T3</compoundname>
+    <includes refid="013__class_8h" local="no">013_class.h</includes>
+    <briefdescription>
+    </briefdescription>
+    <detaileddescription>
+      <para>class <ref refid="class_t3" kindref="compound">T3</ref> </para>
+    </detaileddescription>
+    <location file="013_class.h" line="19" column="1" bodyfile="013_class.h" bodystart="18" bodyend="20"/>
+    <listofallmembers>
+    </listofallmembers>
+  </compounddef>
+</doxygen>
--- a/tests/upstream-test-suite/013/class_t4.xml
+++ b/tests/upstream-test-suite/013/class_t4.xml
@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="">
+  <compounddef id="class_t4" kind="class" language="C++" prot="public">
+    <compoundname>T4</compoundname>
+    <includes refid="013__class_8h" local="yes">inc/013_class.h</includes>
+    <briefdescription>
+    </briefdescription>
+    <detaileddescription>
+      <para>class <ref refid="class_t4" kindref="compound">T4</ref> </para>
+    </detaileddescription>
+    <location file="013_class.h" line="23" column="1" bodyfile="013_class.h" bodystart="22" bodyend="24"/>
+    <listofallmembers>
+    </listofallmembers>
+  </compounddef>
+</doxygen>
--- a/tests/upstream-test-suite/013_class.h
+++ b/tests/upstream-test-suite/013_class.h
@ -0,0 +1,37 @@
+// objective: test the \class and \headerfile commands
+// check: class_t1.xml
+// check: class_t2.xml
+// check: class_t3.xml
+// check: class_t4.xml
+
+/** A class 
+ *  \headerfile 013_class.h "inc/013_class.h"
+ */
+class T1
+{
+};
+
+class T2
+{
+};
+
+class T3
+{
+};
+
+class T4
+{
+};
+
+/** \class T2
+ *  \headerfile <>
+ *  class T2
+ */
+
+/** \class T3 013_class.h
+ *  class T3
+ */
+
+/** \class T4 013_class.h "inc/013_class.h"
+ *  class T4
+ */
--- a/tests/upstream-test-suite/014/indexpage.xml
+++ b/tests/upstream-test-suite/014/indexpage.xml
@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="">
+  <compounddef id="indexpage" kind="page">
+    <compoundname>index</compoundname>
+    <title>My Project</title>
+    <briefdescription>
+    </briefdescription>
+    <detaileddescription>
+      <para>
+        <programlisting filename=".py">
+          <codeline>
+            <highlight class="comment">#<sp/>comment<sp/>in<sp/>Python</highlight>
+            <highlight class="normal"/>
+          </codeline>
+          <codeline>
+            <highlight class="normal"/>
+            <highlight class="keyword">class<sp/></highlight>
+            <highlight class="normal">Python:</highlight>
+          </codeline>
+          <codeline>
+            <highlight class="normal">
+              <sp/>
+              <sp/>
+            </highlight>
+            <highlight class="keywordflow">pass</highlight>
+          </codeline>
+        </programlisting>
+      </para>
+      <para>
+        <programlisting filename=".cpp">
+          <codeline>
+            <highlight class="comment">//<sp/>comment<sp/>in<sp/>a<sp/>code<sp/>block</highlight>
+            <highlight class="normal"/>
+          </codeline>
+          <codeline>
+            <highlight class="normal"/>
+            <highlight class="keyword">class<sp/></highlight>
+            <highlight class="normal">Cpp<sp/>{};</highlight>
+          </codeline>
+        </programlisting>
+      </para>
+      <para>
+        <programlisting>
+          <codeline>
+            <highlight class="normal">//<sp />implicit<sp />code<sp />language</highlight>
+          </codeline>
+        </programlisting>
+      </para>
+    </detaileddescription>
+  </compounddef>
+</doxygen>
--- a/tests/upstream-test-suite/014_code.dox
+++ b/tests/upstream-test-suite/014_code.dox
@ -0,0 +1,18 @@
+// objective: test the \code command
+// check: indexpage.xml
+/** \mainpage
+ * \code{.py}
+ * # comment in Python
+ * class Python:
+ *   pass
+ * \endcode
+ *
+ * \code{.cpp}
+ * // comment in a code block
+ * class Cpp {};
+ * \endcode
+ *
+ * \code
+ * // implicit code language
+ * \endcode
+ */
--- a/tests/upstream-test-suite/015/015__cond_8c.xml
+++ b/tests/upstream-test-suite/015/015__cond_8c.xml
@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="">
+  <compounddef id="015__cond_8c" kind="file" language="C++">
+    <compoundname>015_cond.c</compoundname>
+    <sectiondef kind="func">
+      <memberdef kind="function" id="015__cond_8c_1a2521dcda743ec66ad8e030113d6e0c63" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
+        <type>void</type>
+        <definition>void cond_enabled</definition>
+        <argsstring>()</argsstring>
+        <name>cond_enabled</name>
+        <briefdescription>
+        </briefdescription>
+        <detaileddescription>
+          <para>Function to be shown. </para>
+        </detaileddescription>
+        <inbodydescription>
+        </inbodydescription>
+        <location file="015_cond.c" line="21" column="1" bodyfile="015_cond.c" bodystart="21" bodyend="23"/>
+      </memberdef>
+    </sectiondef>
+    <briefdescription>
+    </briefdescription>
+    <detaileddescription>
+      <para>Text <emphasis>argument</emphasis> more text. </para>
+    </detaileddescription>
+    <location file="015_cond.c"/>
+  </compounddef>
+</doxygen>
--- a/tests/upstream-test-suite/015_cond.c
+++ b/tests/upstream-test-suite/015_cond.c
@ -0,0 +1,32 @@
+// objective: test the `cond` command
+// check: 015__cond_8c.xml
+// config: ENABLED_SECTIONS = COND_ENABLED
+
+/** \file
+ *  Text \a argument more text.
+ */
+
+/// \cond
+
+/** A function */
+void func();
+
+/** A macro */
+#define MACRO 42
+
+/// \endcond
+
+/// \cond COND_ENABLED
+/// Function to be shown.
+void cond_enabled()
+{
+}
+/// \endcond
+
+/** \cond COND_DISABLED */
+    Function not to be shown.
+void cond_disabled()
+{
+}
+/** \endcond */
+
--- a/tests/upstream-test-suite/016/016__copydoc_8c.xml
+++ b/tests/upstream-test-suite/016/016__copydoc_8c.xml
@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="">
+  <compounddef id="016__copydoc_8c" kind="file" language="C++">
+    <compoundname>016_copydoc.c</compoundname>
+    <sectiondef kind="func">
+      <memberdef kind="function" id="016__copydoc_8c_1af721a79655a3857b98d70fa6ada8a916" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
+        <type>void</type>
+        <definition>void func</definition>
+        <argsstring>(int i)</argsstring>
+        <name>func</name>
+        <param>
+          <type>int</type>
+          <declname>i</declname>
+        </param>
+        <briefdescription>
+          <para>Brief description. </para>
+        </briefdescription>
+        <detaileddescription>
+          <para>Detailed description. </para>
+        </detaileddescription>
+        <inbodydescription>
+        </inbodydescription>
+        <location file="016_copydoc.c" line="11" column="1"/>
+      </memberdef>
+      <memberdef kind="function" id="016__copydoc_8c_1a119dbcf2f0bc3ec1fbf77fcd35dec6df" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
+        <type>void</type>
+        <definition>void func_brief</definition>
+        <argsstring>()</argsstring>
+        <name>func_brief</name>
+        <briefdescription>
+          <para>Brief description. </para>
+        </briefdescription>
+        <detaileddescription>
+        </detaileddescription>
+        <inbodydescription>
+        </inbodydescription>
+        <location file="016_copydoc.c" line="14" column="1"/>
+      </memberdef>
+      <memberdef kind="function" id="016__copydoc_8c_1a3c1e44de2b412b5218b55e216cebb4ac" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
+        <type>void</type>
+        <definition>void func_details</definition>
+        <argsstring>()</argsstring>
+        <name>func_details</name>
+        <briefdescription>
+        </briefdescription>
+        <detaileddescription>
+          <para>Detailed description. </para>
+        </detaileddescription>
+        <inbodydescription>
+        </inbodydescription>
+        <location file="016_copydoc.c" line="17" column="1"/>
+      </memberdef>
+      <memberdef kind="function" id="016__copydoc_8c_1a2535f29ea009c3d7449264671e15afe9" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
+        <type>void</type>
+        <definition>void func_doc</definition>
+        <argsstring>()</argsstring>
+        <name>func_doc</name>
+        <briefdescription>
+          <para>Brief description. </para>
+        </briefdescription>
+        <detaileddescription>
+          <para>Detailed description. More text. </para>
+        </detaileddescription>
+        <inbodydescription>
+        </inbodydescription>
+        <location file="016_copydoc.c" line="22" column="1"/>
+      </memberdef>
+    </sectiondef>
+    <briefdescription>
+    </briefdescription>
+    <detaileddescription>
+      <para>Text <emphasis>argument</emphasis> more text. </para>
+    </detaileddescription>
+    <location file="016_copydoc.c"/>
+  </compounddef>
+</doxygen>
--- a/tests/upstream-test-suite/016_copydoc.c
+++ b/tests/upstream-test-suite/016_copydoc.c
@ -0,0 +1,23 @@
+// objective: test the \copydoc, \copybrief, \copydetails, and \details commands
+// check: 016__copydoc_8c.xml
+
+/** \file
+ *  Text \a argument more text.
+ */
+
+/** \brief Brief description.
+ *  \details Detailed description.
+ */
+void func(int i);
+
+/** \copybrief func(int) */
+void func_brief();
+
+/** \copydetails func(int) */
+void func_details();
+
+/** \copydoc func(int)
+ *  More text.
+ */
+void func_doc();
+
--- a/tests/upstream-test-suite/017/indexpage.xml
+++ b/tests/upstream-test-suite/017/indexpage.xml
@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="">
+  <compounddef id="indexpage" kind="page">
+    <compoundname>index</compoundname>
+    <title>My Project</title>
+    <briefdescription>
+    </briefdescription>
+    <detaileddescription>
+      <para>
+        <simplesect kind="copyright">
+          <para>Dimitri van Heesch </para>
+        </simplesect>
+        <simplesect kind="date">
+          <para>July 13 2013 </para>
+        </simplesect>
+      </para>
+    </detaileddescription>
+  </compounddef>
+</doxygen>
--- a/tests/upstream-test-suite/017_copyright.dox
+++ b/tests/upstream-test-suite/017_copyright.dox
@ -0,0 +1,6 @@
+// objective: test \copyright and \date commands
+// check: indexpage.xml
+/** \mainpage
+ *  \copyright Dimitri van Heesch
+ *  \date July 13 2013
+ */
--- a/tests/upstream-test-suite/018/018__def_8c.xml
+++ b/tests/upstream-test-suite/018/018__def_8c.xml
@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="">
+  <compounddef id="018__def_8c" kind="file" language="C++">
+    <compoundname>018_def.c</compoundname>
+    <sectiondef kind="define">
+      <memberdef kind="define" id="018__def_8c_1a824c99cb152a3c2e9111a2cb9c34891e" prot="public" static="no">
+        <name>MACRO</name>
+        <initializer>42</initializer>
+        <briefdescription>
+        </briefdescription>
+        <detaileddescription>
+          <para>A macro definition </para>
+        </detaileddescription>
+        <inbodydescription>
+        </inbodydescription>
+        <location file="018_def.c" line="8" column="9"/>
+      </memberdef>
+    </sectiondef>
+    <sectiondef kind="enum">
+      <memberdef kind="enum" id="018__def_8c_1aa57b8491d1d8fc1014dd54bcf83b130a" prot="public" static="no" strong="no">
+        <type/>
+        <name>E</name>
+        <enumvalue id="018__def_8c_1aa57b8491d1d8fc1014dd54bcf83b130aab1710e6a49014ba389d57c8753c530f4" prot="public">
+          <name>E1</name>
+          <briefdescription>
+          </briefdescription>
+          <detaileddescription>
+          </detaileddescription>
+        </enumvalue>
+        <enumvalue id="018__def_8c_1aa57b8491d1d8fc1014dd54bcf83b130aace9a5783f96994d28bc6ec5c9ece8c80" prot="public">
+          <name>E2</name>
+          <briefdescription>
+          </briefdescription>
+          <detaileddescription>
+          </detaileddescription>
+        </enumvalue>
+        <briefdescription>
+        </briefdescription>
+        <detaileddescription>
+          <para>An enum </para>
+        </detaileddescription>
+        <inbodydescription>
+        </inbodydescription>
+        <location file="018_def.c" line="13" column="1" bodyfile="018_def.c" bodystart="13" bodyend="13"/>
+      </memberdef>
+    </sectiondef>
+    <sectiondef kind="typedef">
+      <memberdef kind="typedef" id="018__def_8c_1a1d1cfd8ffb84e947f82999c682b666a7" prot="public" static="no">
+        <type>int</type>
+        <definition>Type</definition>
+        <argsstring/>
+        <name>Type</name>
+        <briefdescription>
+        </briefdescription>
+        <detaileddescription>
+          <para>A type definition. </para>
+        </detaileddescription>
+        <inbodydescription>
+        </inbodydescription>
+        <location file="018_def.c" line="12" column="1" bodyfile="018_def.c" bodystart="12" bodyend="-1"/>
+      </memberdef>
+    </sectiondef>
+    <sectiondef kind="var">
+      <memberdef kind="variable" id="018__def_8c_1a335628f2e9085305224b4f9cc6e95ed5" prot="public" static="no" mutable="no">
+        <type>int</type>
+        <definition>var</definition>
+        <argsstring/>
+        <name>var</name>
+        <initializer>= 10</initializer>
+        <briefdescription>
+        </briefdescription>
+        <detaileddescription>
+          <para>A variable </para>
+        </detaileddescription>
+        <inbodydescription>
+        </inbodydescription>
+        <location file="018_def.c" line="9" column="1" bodyfile="018_def.c" bodystart="9" bodyend="-1"/>
+      </memberdef>
+    </sectiondef>
+    <sectiondef kind="func">
+      <memberdef kind="function" id="018__def_8c_1aee50dbe7d43d2202b490a6977a325584" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
+        <type>void</type>
+        <definition>func</definition>
+        <argsstring>(int)</argsstring>
+        <name>func</name>
+        <param>
+          <type>int</type>
+        </param>
+        <briefdescription>
+        </briefdescription>
+        <detaileddescription>
+          <para>A function with one parameter. </para>
+        </detaileddescription>
+        <inbodydescription>
+        </inbodydescription>
+        <location file="018_def.c" line="10" column="1" bodyfile="018_def.c" bodystart="10" bodyend="10"/>
+      </memberdef>
+      <memberdef kind="function" id="018__def_8c_1a2652ccbfb85efa2df3c70ba6c4628f8d" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
+        <type>void</type>
+        <definition>func</definition>
+        <argsstring>(int, const char *)</argsstring>
+        <name>func</name>
+        <param>
+          <type>int</type>
+        </param>
+        <param>
+          <type>const char *</type>
+        </param>
+        <briefdescription>
+        </briefdescription>
+        <detaileddescription>
+          <para>A function with two parameters </para>
+        </detaileddescription>
+        <inbodydescription>
+        </inbodydescription>
+        <location file="018_def.c" line="11" column="1" bodyfile="018_def.c" bodystart="11" bodyend="11"/>
+      </memberdef>
+    </sectiondef>
+    <briefdescription>
+    </briefdescription>
+    <detaileddescription>
+      <para>Text <emphasis>argument</emphasis> more text. </para>
+    </detaileddescription>
+    <location file="018_def.c"/>
+  </compounddef>
+</doxygen>
--- a/tests/upstream-test-suite/018_def.c
+++ b/tests/upstream-test-suite/018_def.c
@ -0,0 +1,37 @@
+// objective: test the \def, \var, \fn, and \typedef commands
+// check: 018__def_8c.xml
+
+/** \file
+ *  Text \a argument more text.
+ */
+
+#define MACRO 42
+int var = 10;
+void func(int) {}
+void func(int,const char *) {}
+typedef int Type;
+enum E { E1, E2 };
+
+/** \def MACRO
+ *  A macro definition 
+ */
+
+/** \var var
+ *  A variable
+ */
+
+/** \fn func(int)
+ *  A function with one parameter.
+ */
+
+/** \fn func(int,const char *)
+ *  A function with two parameters
+ */
+
+/** \typedef Type
+ *  A type definition.
+ */
+
+/** \enum E
+ *  An enum
+ */
--- a/tests/upstream-test-suite/019/group__g1.xml
+++ b/tests/upstream-test-suite/019/group__g1.xml
@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="">
+  <compounddef id="group__g1" kind="group">
+    <compoundname>g1</compoundname>
+    <title>First Group</title>
+    <sectiondef kind="func">
+      <memberdef kind="function" id="group__g1_1gae84463e3941387a9da58279761e18d7e" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
+        <type>void</type>
+        <definition>void func_g1</definition>
+        <argsstring>()</argsstring>
+        <name>func_g1</name>
+        <briefdescription>
+        </briefdescription>
+        <detaileddescription>
+          <para>A function in the first group. </para>
+        </detaileddescription>
+        <inbodydescription>
+        </inbodydescription>
+        <location file="019_defgroup.c" line="13" column="1"/>
+      </memberdef>
+    </sectiondef>
+    <briefdescription>
+    </briefdescription>
+    <detaileddescription>
+      <para>Text for first group. </para>
+    </detaileddescription>
+  </compounddef>
+</doxygen>
--- a/tests/upstream-test-suite/019/group__g2.xml
+++ b/tests/upstream-test-suite/019/group__g2.xml
@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="">
+  <compounddef id="group__g2" kind="group">
+    <compoundname>g2</compoundname>
+    <title>Second Group</title>
+    <innergroup refid="group__g3">Third Group</innergroup>
+    <sectiondef kind="func">
+      <memberdef kind="function" id="group__g2_1gafd310bbec27993e80a5dbaf6c54d5e0b" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
+        <type>void</type>
+        <definition>void func_g2</definition>
+        <argsstring>()</argsstring>
+        <name>func_g2</name>
+        <briefdescription>
+        </briefdescription>
+        <detaileddescription>
+          <para>A function in the second group </para>
+        </detaileddescription>
+        <inbodydescription>
+        </inbodydescription>
+        <location file="019_defgroup.c" line="23" column="1"/>
+      </memberdef>
+    </sectiondef>
+    <briefdescription>
+    </briefdescription>
+    <detaileddescription>
+      <para>Text for second group. </para>
+    </detaileddescription>
+  </compounddef>
+</doxygen>
--- a/tests/upstream-test-suite/019/group__g3.xml
+++ b/tests/upstream-test-suite/019/group__g3.xml
@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="">
+  <compounddef id="group__g3" kind="group">
+    <compoundname>g3</compoundname>
+    <title>Third Group</title>
+    <sectiondef kind="func">
+      <memberdef kind="function" id="group__g3_1ga59de48fb40aec5ee2623cc453fe71643" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
+        <type>void</type>
+        <definition>void func_g3</definition>
+        <argsstring>()</argsstring>
+        <name>func_g3</name>
+        <briefdescription>
+        </briefdescription>
+        <detaileddescription>
+          <para>A function in the third group </para>
+        </detaileddescription>
+        <inbodydescription>
+        </inbodydescription>
+        <location file="019_defgroup.c" line="36" column="1"/>
+      </memberdef>
+      <memberdef kind="function" id="group__g3_1gaf32d23522a5d9c3e7fed3dd5710001f7" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
+        <type>void</type>
+        <definition>void func_g3_add</definition>
+        <argsstring>()</argsstring>
+        <name>func_g3_add</name>
+        <briefdescription>
+        </briefdescription>
+        <detaileddescription>
+          <para>Another function added to the third group </para>
+        </detaileddescription>
+        <inbodydescription>
+        </inbodydescription>
+        <location file="019_defgroup.c" line="45" column="1"/>
+      </memberdef>
+    </sectiondef>
+    <briefdescription>
+    </briefdescription>
+    <detaileddescription>
+      <para>Text for third group. </para>
+    </detaileddescription>
+  </compounddef>
+</doxygen>
--- a/tests/upstream-test-suite/019_defgroup.c
+++ b/tests/upstream-test-suite/019_defgroup.c
@ -0,0 +1,48 @@
+// objective: test the \defgroup, \addtogroup, and \ingroup command.
+// check: group__g1.xml
+// check: group__g2.xml
+// check: group__g3.xml
+
+/** \defgroup g1 First Group
+ *  Text for first group.
+ */
+
+/** A function in the first group.
+ *  \ingroup g1
+ */
+void func_g1();
+
+//--------------------------------
+
+/** \defgroup g2 Second Group
+ *  Text for second group.
+ */
+/// \{
+
+/** A function in the second group */
+void func_g2();
+
+/// \}
+
+/** \defgroup g3 Third Group
+ *  Text for third group.
+ *  \ingroup g2
+ *  \{
+ */
+
+//--------------------------------
+
+/** A function in the third group */
+void func_g3();
+
+/** \} */
+
+/** \addtogroup g3
+ *  \{ 
+ */
+
+/** Another function added to the third group */
+void func_g3_add();
+
+/** \} */
+
--- a/tests/upstream-test-suite/020/indexpage.xml
+++ b/tests/upstream-test-suite/020/indexpage.xml
@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="">
+  <compounddef id="indexpage" kind="page">
+    <compoundname>index</compoundname>
+    <title>My Project</title>
+    <briefdescription>
+    </briefdescription>
+    <detaileddescription>
+      <para>Text. 
+XML
+More text. </para>
+    </detaileddescription>
+  </compounddef>
+</doxygen>
--- a/tests/upstream-test-suite/020_only.dox
+++ b/tests/upstream-test-suite/020_only.dox
@ -0,0 +1,27 @@
+// objective: test the \*only and \*endonly commands
+// check: indexpage.xml
+/** \mainpage
+ * Text.
+ * \htmlonly
+ * HTML
+ * \endhtmlonly
+ * \htmlonly[block]
+ * HTML with block
+ * \endhtmlonly
+ * \rtfonly
+ * RTF
+ * \endrtfonly
+ * \manonly
+ * Man
+ * \endmanonly
+ * \latexonly
+ * LaTeX
+ * \endlatexonly
+ * \xmlonly
+ * XML
+ * \endxmlonly
+ * \docbookonly
+ * DocBook
+ * \enddocbookonly
+ * More text.
+ */
--- a/tests/upstream-test-suite/021/indexpage.xml
+++ b/tests/upstream-test-suite/021/indexpage.xml
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="">
+  <compounddef id="indexpage" kind="page">
+    <compoundname>index</compoundname>
+    <title>My Project</title>
+    <briefdescription>
+    </briefdescription>
+    <detaileddescription>
+      <para> Our main function starts like this: <programlisting filename="example_test.cpp"><codeline><highlight class="normal">void<sp/>main()</highlight></codeline><codeline><highlight class="normal">{</highlight></codeline></programlisting> First we create a object <computeroutput>t</computeroutput> of the <ref refid="class_test" kindref="compound">Test</ref> class. <programlisting filename="example_test.cpp"><codeline><highlight class="normal"><sp/><sp/>Test<sp/>t;</highlight></codeline></programlisting> Then we call the example member function <programlisting filename="example_test.cpp"><codeline><highlight class="normal"><sp/><sp/>t.example();</highlight></codeline></programlisting> After that our little test routine ends. <programlisting filename="example_test.cpp"><codeline><highlight class="normal">}</highlight></codeline></programlisting> </para>
+    </detaileddescription>
+  </compounddef>
+</doxygen>
--- a/tests/upstream-test-suite/021_dontinclude.cpp
+++ b/tests/upstream-test-suite/021_dontinclude.cpp
@ -0,0 +1,23 @@
+// objective: test the \dontinclude, \skip, \until, \skipline, \line commands
+// check: indexpage.xml
+/*! A test class. */
+
+class Test
+{
+  public:
+    /// a member function
+    void example();
+};
+
+/*! \mainpage
+ *  \dontinclude example_test.cpp
+ *  Our main function starts like this:
+ *  \skip main
+ *  \until {
+ *  First we create a object \c t of the Test class.
+ *  \skipline Test
+ *  Then we call the example member function 
+ *  \line example
+ *  After that our little test routine ends.
+ *  \line }
+ */
--- a/tests/upstream-test-suite/022/indexpage.xml
+++ b/tests/upstream-test-suite/022/indexpage.xml
@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="">
+  <compounddef id="indexpage" kind="page">
+    <compoundname>index</compoundname>
+    <title>My Project</title>
+    <briefdescription>
+    </briefdescription>
+    <detaileddescription>
+      <para>Class relations expressed via an inline dot graph: <dot>
+digraph example {
+  node [shape=record, fontname=Helvetica, fontsize=10];
+  b [ label="class B" URL="\ref B"];
+  c [ label="class C" URL="\ref C"];
+  b -&gt; c [ arrowhead="open", style="dashed" ];
+}
+</dot>
+ </para>
+    </detaileddescription>
+  </compounddef>
+</doxygen>
--- a/tests/upstream-test-suite/022_dot.cpp
+++ b/tests/upstream-test-suite/022_dot.cpp
@ -0,0 +1,22 @@
+// objective: test the \dot and \enddot commands
+// check: indexpage.xml
+// config: HAVE_DOT = YES
+// config: DOTFILE_DIRS = $INPUTDIR
+
+/*! class B */
+class B {};
+/*! class C */
+class C {};
+
+/*! \mainpage
+Class relations expressed via an inline dot graph:
+\dot
+digraph example {
+  node [shape=record, fontname=Helvetica, fontsize=10];
+  b [ label="class B" URL="\ref B"];
+  c [ label="class C" URL="\ref C"];
+  b -> c [ arrowhead="open", style="dashed" ];
+}
+\enddot
+*/
+
--- a/tests/upstream-test-suite/023/indexpage.xml
+++ b/tests/upstream-test-suite/023/indexpage.xml
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="">
+  <compounddef id="indexpage" kind="page">
+    <compoundname>index</compoundname>
+    <title>My Project</title>
+    <briefdescription>
+    </briefdescription>
+    <detaileddescription>
+      <para>Normal <emphasis>emphasis</emphasis> and more <emphasis>emphasis</emphasis> back to normal. </para>
+    </detaileddescription>
+  </compounddef>
+</doxygen>
--- a/tests/upstream-test-suite/023_e.dox
+++ b/tests/upstream-test-suite/023_e.dox
@ -0,0 +1,5 @@
+// objective: test the \e, \em commands
+// check: indexpage.xml
+/** \mainpage
+ *  Normal \e emphasis and more \em emphasis back to normal.
+ */
--- a/tests/upstream-test-suite/024/indexpage.xml
+++ b/tests/upstream-test-suite/024/indexpage.xml
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="">
+  <compounddef id="indexpage" kind="page">
+    <compoundname>index</compoundname>
+    <title>My Project</title>
+    <briefdescription>
+    </briefdescription>
+    <detaileddescription>
+      <para>Unconditional (start) Enabled (if). Enabled (else). Unconditional (middle) Enabled (else). Unconditional (end) </para>
+    </detaileddescription>
+  </compounddef>
+</doxygen>
--- a/tests/upstream-test-suite/024_if.dox
+++ b/tests/upstream-test-suite/024_if.dox
@ -0,0 +1,21 @@
+// objective: test the \if, \ifnot, \elsif, \else, and \endif commands
+// check: indexpage.xml
+// config: ENABLED_SECTIONS = GUARD_ENABLED
+/** \mainpage
+ *  Unconditional (start)
+ *  \if GUARD_ENABLED
+ *  Enabled (if).
+ *    \if (!GUARD_ENABLED)  Disabled (if).\else Enabled (else). \endif
+ *  \else
+ *  Disabled.
+ *  \endif
+ *  Unconditional (middle)
+ *  \ifnot GUARD_ENABLED
+ *  Disabled (ifnot).
+ *  \elseif GUARD_DISABLED
+ *  Disabled (elseif).
+ *  \else
+ *  Enabled (else).
+ *  \endif
+ *  Unconditional (end)
+ */
--- a/tests/upstream-test-suite/025/class_test.xml
+++ b/tests/upstream-test-suite/025/class_test.xml
@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="">
+  <compounddef id="class_test" kind="class" language="C++" prot="public">
+    <compoundname>Test</compoundname>
+    <sectiondef kind="public-func">
+      <memberdef kind="function" id="class_test_1a47b775f65718978f1ffcd96376f8ecfa" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
+        <type>void</type>
+        <definition>void Test::example</definition>
+        <argsstring>()</argsstring>
+        <name>example</name>
+        <briefdescription>
+          <para>An example member function. </para>
+        </briefdescription>
+        <detaileddescription>
+          <para>More details about this function. </para>
+        </detaileddescription>
+        <inbodydescription>
+        </inbodydescription>
+        <location file="025_example.cpp" line="17" column="1" bodyfile="025_example.cpp" bodystart="20" bodyend="20"/>
+      </memberdef>
+    </sectiondef>
+    <briefdescription>
+      <para>A <ref refid="class_test" kindref="compound">Test</ref> class. </para>
+    </briefdescription>
+    <detaileddescription>
+      <para>More details about this class. </para>
+    </detaileddescription>
+    <location file="025_example.cpp" line="11" column="1" bodyfile="025_example.cpp" bodystart="10" bodyend="18"/>
+    <listofallmembers>
+      <member refid="class_test_1a47b775f65718978f1ffcd96376f8ecfa" prot="public" virt="non-virtual">
+        <scope>Test</scope>
+        <name>example</name>
+      </member>
+    </listofallmembers>
+  </compounddef>
+</doxygen>
--- a/tests/upstream-test-suite/025/example_test_8cpp-example.xml
+++ b/tests/upstream-test-suite/025/example_test_8cpp-example.xml
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="">
+  <compounddef id="example_test_8cpp-example" kind="example">
+    <compoundname>example_test.cpp</compoundname>
+    <briefdescription>
+    </briefdescription>
+    <detaileddescription>
+      <para>This is an example of how to use the <ref refid="class_test" kindref="compound">Test</ref> class.</para>
+      <para>More details about this example. <programlisting filename="example_test.cpp"><codeline><highlight class="keywordtype">void</highlight><highlight class="normal"><sp/>main()</highlight></codeline><codeline><highlight class="normal">{</highlight></codeline><codeline><highlight class="normal"><sp/><sp/></highlight><highlight class="keyword">const</highlight><highlight class="normal"><sp/></highlight><highlight class="keywordtype">char</highlight><highlight class="normal">*<sp/>a<sp/>=<sp/></highlight><highlight class="stringliteral">"Some<sp/>special<sp/>character<sp/>here:<sp/><sp value="7"/><sp/>"</highlight><highlight class="normal">;</highlight></codeline><codeline><highlight class="normal"/></codeline><codeline><highlight class="normal"><sp/><sp/><ref refid="class_test" kindref="compound">Test</ref><sp/>t;</highlight></codeline><codeline><highlight class="normal"><sp/><sp/>t.<ref refid="class_test_1a47b775f65718978f1ffcd96376f8ecfa" kindref="member">example</ref>();</highlight></codeline><codeline><highlight class="normal">}</highlight></codeline><codeline><highlight class="normal"/></codeline></programlisting> </para>
+    </detaileddescription>
+  </compounddef>
+</doxygen>
--- a/tests/upstream-test-suite/025_example.cpp
+++ b/tests/upstream-test-suite/025_example.cpp
@ -0,0 +1,26 @@
+// objective: test the \example command
+// check: example_test_8cpp-example.xml
+// check: class_test.xml
+
+
+/** \brief A Test class.
+ *
+ *  More details about this class.
+ */
+class Test
+{
+  public:
+    /** \brief An example member function.
+     *
+     *  More details about this function.
+     */
+    void example();
+};
+
+void Test::example() {}
+
+/** \example example_test.cpp
+ * This is an example of how to use the Test class.
+ *
+ * More details about this example.
+ */
--- a/tests/upstream-test-suite/026/class_test.xml
+++ b/tests/upstream-test-suite/026/class_test.xml
@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="">
+  <compounddef id="class_test" kind="class" language="C++" prot="public">
+    <compoundname>Test</compoundname>
+    <templateparamlist>
+      <param>
+        <type>class T</type>
+      </param>
+    </templateparamlist>
+    <sectiondef kind="public-func">
+      <memberdef kind="function" id="class_test_1abf9d5fbdaa4c23d0a513ee9746060779" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
+        <type>int</type>
+        <definition>int Test&lt; T &gt;::example</definition>
+        <argsstring>(int p1, int p2)</argsstring>
+        <name>example</name>
+        <param>
+          <type>int</type>
+          <declname>p1</declname>
+        </param>
+        <param>
+          <type>int</type>
+          <declname>p2</declname>
+        </param>
+        <exceptions> throw (std::out_of_range)</exceptions>
+        <briefdescription>
+        </briefdescription>
+        <detaileddescription>
+          <para>An example member function. <parameterlist kind="param"><parameteritem><parameternamelist><parametername>p1</parametername></parameternamelist><parameterdescription><para>First parameter. </para></parameterdescription></parameteritem><parameteritem><parameternamelist><parametername>p2</parametername></parameternamelist><parameterdescription><para>Second parameter. </para></parameterdescription></parameteritem></parameterlist>
+<parameterlist kind="exception"><parameteritem><parameternamelist><parametername>std::out_of_range</parametername></parameternamelist><parameterdescription><para>parameter is out of range. </para></parameterdescription></parameteritem></parameterlist>
+<parameterlist kind="retval"><parameteritem><parameternamelist><parametername>0</parametername></parameternamelist><parameterdescription><para>if p1 and p2 are equal </para></parameterdescription></parameteritem><parameteritem><parameternamelist><parametername>-1</parametername></parameternamelist><parameterdescription><para>if p1 is smaller than p2 </para></parameterdescription></parameteritem><parameteritem><parameternamelist><parametername>1</parametername></parameternamelist><parameterdescription><para>if p1 is bigger than p2 </para></parameterdescription></parameteritem></parameterlist>
+</para>
+        </detaileddescription>
+        <inbodydescription>
+        </inbodydescription>
+        <location file="026_exception.cpp" line="19" column="1"/>
+      </memberdef>
+    </sectiondef>
+    <briefdescription>
+    </briefdescription>
+    <detaileddescription>
+      <para>A <ref refid="class_test" kindref="compound">Test</ref> class. More details about this class. <parameterlist kind="templateparam"><parameteritem><parameternamelist><parametername>T</parametername></parameternamelist><parameterdescription><para>A template parameter. </para></parameterdescription></parameteritem></parameterlist>
+</para>
+    </detaileddescription>
+    <location file="026_exception.cpp" line="9" column="1" bodyfile="026_exception.cpp" bodystart="8" bodyend="20"/>
+    <listofallmembers>
+      <member refid="class_test_1abf9d5fbdaa4c23d0a513ee9746060779" prot="public" virt="non-virtual">
+        <scope>Test</scope>
+        <name>example</name>
+      </member>
+    </listofallmembers>
+  </compounddef>
+</doxygen>
--- a/tests/upstream-test-suite/026_exception.cpp
+++ b/tests/upstream-test-suite/026_exception.cpp
@ -0,0 +1,21 @@
+// objective: test the \exception, \param, and \tparam commands
+// check: class_test.xml
+
+/** A Test class.
+ *  More details about this class.
+ *  @tparam T A template parameter.
+ */
+template<class T> class Test
+{
+  public:
+    /** An example member function.
+     *  \param p1 First parameter.
+     *  \param p2 Second parameter.
+     *  \exception std::out_of_range parameter is out of range. 
+     *  \retval  0 if p1 and p2 are equal
+     *  \retval -1 if p1 is smaller than p2
+     *  \retval  1 if p1 is bigger than p2
+     */
+    int example(int p1,int p2) throw(std::out_of_range);
+};
+
--- a/tests/upstream-test-suite/027/struct_car.xml
+++ b/tests/upstream-test-suite/027/struct_car.xml
@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="">
+  <compounddef id="struct_car" kind="struct" language="C++" prot="public">
+    <compoundname>Car</compoundname>
+    <basecompoundref refid="struct_vehicle" prot="public" virt="non-virtual">Vehicle</basecompoundref>
+    <sectiondef kind="protected-attrib">
+      <memberdef kind="variable" id="struct_car_1ab8ff28306286da5a8b14fa9bdccaafaa" prot="protected" static="no" mutable="no">
+        <type>
+          <ref refid="struct_vehicle" kindref="compound">Vehicle</ref>
+        </type>
+        <definition>Vehicle Car::base</definition>
+        <argsstring/>
+        <name>base</name>
+        <briefdescription>
+          <para>Base class. </para>
+        </briefdescription>
+        <detaileddescription>
+        </detaileddescription>
+        <inbodydescription>
+        </inbodydescription>
+        <location file="027_extends.c" line="69" column="1" bodyfile="027_extends.c" bodystart="69" bodyend="-1"/>
+      </memberdef>
+    </sectiondef>
+    <briefdescription>
+    </briefdescription>
+    <detaileddescription>
+      <para><ref refid="struct_car" kindref="compound">Car</ref> class. </para>
+    </detaileddescription>
+    <inheritancegraph>
+      <node id="1">
+        <label>Vehicle</label>
+        <link refid="struct_vehicle"/>
+        <childnode refid="2" relation="public-inheritance">
+        </childnode>
+      </node>
+      <node id="2">
+        <label>Object</label>
+        <link refid="struct_object"/>
+      </node>
+      <node id="0">
+        <label>Car</label>
+        <link refid="struct_car"/>
+        <childnode refid="1" relation="public-inheritance">
+        </childnode>
+      </node>
+    </inheritancegraph>
+    <collaborationgraph>
+      <node id="4">
+        <label>Vehicle</label>
+        <link refid="struct_vehicle"/>
+        <childnode refid="5" relation="public-inheritance">
+        </childnode>
+        <childnode refid="5" relation="usage">
+          <edgelabel>base</edgelabel>
+        </childnode>
+      </node>
+      <node id="5">
+        <label>Object</label>
+        <link refid="struct_object"/>
+      </node>
+      <node id="3">
+        <label>Car</label>
+        <link refid="struct_car"/>
+        <childnode refid="4" relation="public-inheritance">
+        </childnode>
+        <childnode refid="4" relation="usage">
+          <edgelabel>base</edgelabel>
+        </childnode>
+      </node>
+    </collaborationgraph>
+    <location file="027_extends.c" line="68" column="1" bodyfile="027_extends.c" bodystart="67" bodyend="70"/>
+    <listofallmembers>
+      <member refid="struct_car_1ab8ff28306286da5a8b14fa9bdccaafaa" prot="protected" virt="non-virtual">
+        <scope>Car</scope>
+        <name>base</name>
+      </member>
+      <member refid="struct_object_1a71225073d06a793b9a6ea9263ed37b12" prot="public" virt="non-virtual">
+        <scope>Car</scope>
+        <name>objRef</name>
+      </member>
+      <member refid="struct_object_1a924ee0cecc906d148022b3f0d6325cfb" prot="public" virt="non-virtual">
+        <scope>Car</scope>
+        <name>objUnref</name>
+      </member>
+      <member refid="struct_vehicle_1a6891d3d28853bc3fdd075596dc6de9f8" prot="public" virt="non-virtual">
+        <scope>Car</scope>
+        <name>vehicleStart</name>
+      </member>
+      <member refid="struct_vehicle_1a4dcbcba43792dcd673a552b14479ab77" prot="public" virt="non-virtual">
+        <scope>Car</scope>
+        <name>vehicleStop</name>
+      </member>
+    </listofallmembers>
+  </compounddef>
+</doxygen>
--- a/tests/upstream-test-suite/027/struct_object.xml
+++ b/tests/upstream-test-suite/027/struct_object.xml
@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="">
+  <compounddef id="struct_object" kind="struct" language="C++" prot="public">
+    <compoundname>Object</compoundname>
+    <derivedcompoundref refid="struct_vehicle" prot="public" virt="non-virtual">Vehicle</derivedcompoundref>
+    <sectiondef kind="private-attrib">
+      <memberdef kind="variable" id="struct_object_1a1b6037fba835e83243ababce426ff9af" prot="private" static="no" mutable="no">
+        <type>int</type>
+        <definition>int Object::ref</definition>
+        <argsstring/>
+        <name>ref</name>
+        <briefdescription>
+          <para>Reference count. </para>
+        </briefdescription>
+        <detaileddescription>
+        </detaileddescription>
+        <inbodydescription>
+        </inbodydescription>
+        <location file="027_extends.c" line="21" column="1" bodyfile="027_extends.c" bodystart="21" bodyend="-1"/>
+      </memberdef>
+    </sectiondef>
+    <sectiondef kind="public-func">
+      <memberdef kind="function" id="struct_object_1a71225073d06a793b9a6ea9263ed37b12" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
+        <type><ref refid="struct_object" kindref="compound">Object</ref> *</type>
+        <definition>static Object * objRef</definition>
+        <argsstring>(Object *obj)</argsstring>
+        <name>objRef</name>
+        <param>
+          <type><ref refid="struct_object" kindref="compound">Object</ref> *</type>
+          <declname>obj</declname>
+        </param>
+        <briefdescription>
+        </briefdescription>
+        <detaileddescription>
+          <para>Increments object reference count by one. </para>
+        </detaileddescription>
+        <inbodydescription>
+        </inbodydescription>
+        <location file="027_extends.c" line="29" column="1"/>
+      </memberdef>
+      <memberdef kind="function" id="struct_object_1a924ee0cecc906d148022b3f0d6325cfb" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
+        <type><ref refid="struct_object" kindref="compound">Object</ref> *</type>
+        <definition>static Object * objUnref</definition>
+        <argsstring>(Object *obj)</argsstring>
+        <name>objUnref</name>
+        <param>
+          <type><ref refid="struct_object" kindref="compound">Object</ref> *</type>
+          <declname>obj</declname>
+        </param>
+        <briefdescription>
+        </briefdescription>
+        <detaileddescription>
+          <para>Decrements object reference count by one. </para>
+        </detaileddescription>
+        <inbodydescription>
+        </inbodydescription>
+        <location file="027_extends.c" line="36" column="1"/>
+      </memberdef>
+    </sectiondef>
+    <briefdescription>
+    </briefdescription>
+    <detaileddescription>
+      <para>Base object class. </para>
+    </detaileddescription>
+    <inheritancegraph>
+      <node id="9">
+        <label>Truck</label>
+        <link refid="struct_truck"/>
+        <childnode refid="7" relation="public-inheritance">
+        </childnode>
+      </node>
+      <node id="7">
+        <label>Vehicle</label>
+        <link refid="struct_vehicle"/>
+        <childnode refid="6" relation="public-inheritance">
+        </childnode>
+      </node>
+      <node id="6">
+        <label>Object</label>
+        <link refid="struct_object"/>
+      </node>
+      <node id="8">
+        <label>Car</label>
+        <link refid="struct_car"/>
+        <childnode refid="7" relation="public-inheritance">
+        </childnode>
+      </node>
+    </inheritancegraph>
+    <location file="027_extends.c" line="20" column="1" bodyfile="027_extends.c" bodystart="19" bodyend="22"/>
+    <listofallmembers>
+      <member refid="struct_object_1a71225073d06a793b9a6ea9263ed37b12" prot="public" virt="non-virtual">
+        <scope>Object</scope>
+        <name>objRef</name>
+      </member>
+      <member refid="struct_object_1a924ee0cecc906d148022b3f0d6325cfb" prot="public" virt="non-virtual">
+        <scope>Object</scope>
+        <name>objUnref</name>
+      </member>
+      <member refid="struct_object_1a1b6037fba835e83243ababce426ff9af" prot="private" virt="non-virtual">
+        <scope>Object</scope>
+        <name>ref</name>
+      </member>
+    </listofallmembers>
+  </compounddef>
+</doxygen>
--- a/tests/upstream-test-suite/027/struct_truck.xml
+++ b/tests/upstream-test-suite/027/struct_truck.xml
@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="">
+  <compounddef id="struct_truck" kind="struct" language="C++" prot="public">
+    <compoundname>Truck</compoundname>
+    <basecompoundref refid="struct_vehicle" prot="public" virt="non-virtual">Vehicle</basecompoundref>
+    <sectiondef kind="protected-attrib">
+      <memberdef kind="variable" id="struct_truck_1ad0ac321609dda1a6c552488b05ec7ac8" prot="protected" static="no" mutable="no">
+        <type>
+          <ref refid="struct_vehicle" kindref="compound">Vehicle</ref>
+        </type>
+        <definition>Vehicle Truck::base</definition>
+        <argsstring/>
+        <name>base</name>
+        <briefdescription>
+          <para>Base class. </para>
+        </briefdescription>
+        <detaileddescription>
+        </detaileddescription>
+        <inbodydescription>
+        </inbodydescription>
+        <location file="027_extends.c" line="79" column="1" bodyfile="027_extends.c" bodystart="79" bodyend="-1"/>
+      </memberdef>
+    </sectiondef>
+    <briefdescription>
+    </briefdescription>
+    <detaileddescription>
+      <para><ref refid="struct_truck" kindref="compound">Truck</ref> class. </para>
+    </detaileddescription>
+    <inheritancegraph>
+      <node id="11">
+        <label>Truck</label>
+        <link refid="struct_truck"/>
+        <childnode refid="12" relation="public-inheritance">
+        </childnode>
+      </node>
+      <node id="12">
+        <label>Vehicle</label>
+        <link refid="struct_vehicle"/>
+        <childnode refid="13" relation="public-inheritance">
+        </childnode>
+      </node>
+      <node id="13">
+        <label>Object</label>
+        <link refid="struct_object"/>
+      </node>
+    </inheritancegraph>
+    <collaborationgraph>
+      <node id="14">
+        <label>Truck</label>
+        <link refid="struct_truck"/>
+        <childnode refid="15" relation="public-inheritance">
+        </childnode>
+        <childnode refid="15" relation="usage">
+          <edgelabel>base</edgelabel>
+        </childnode>
+      </node>
+      <node id="15">
+        <label>Vehicle</label>
+        <link refid="struct_vehicle"/>
+        <childnode refid="16" relation="public-inheritance">
+        </childnode>
+        <childnode refid="16" relation="usage">
+          <edgelabel>base</edgelabel>
+        </childnode>
+      </node>
+      <node id="16">
+        <label>Object</label>
+        <link refid="struct_object"/>
+      </node>
+    </collaborationgraph>
+    <location file="027_extends.c" line="78" column="1" bodyfile="027_extends.c" bodystart="77" bodyend="80"/>
+    <listofallmembers>
+      <member refid="struct_truck_1ad0ac321609dda1a6c552488b05ec7ac8" prot="protected" virt="non-virtual">
+        <scope>Truck</scope>
+        <name>base</name>
+      </member>
+      <member refid="struct_object_1a71225073d06a793b9a6ea9263ed37b12" prot="public" virt="non-virtual">
+        <scope>Truck</scope>
+        <name>objRef</name>
+      </member>
+      <member refid="struct_object_1a924ee0cecc906d148022b3f0d6325cfb" prot="public" virt="non-virtual">
+        <scope>Truck</scope>
+        <name>objUnref</name>
+      </member>
+      <member refid="struct_vehicle_1a6891d3d28853bc3fdd075596dc6de9f8" prot="public" virt="non-virtual">
+        <scope>Truck</scope>
+        <name>vehicleStart</name>
+      </member>
+      <member refid="struct_vehicle_1a4dcbcba43792dcd673a552b14479ab77" prot="public" virt="non-virtual">
+        <scope>Truck</scope>
+        <name>vehicleStop</name>
+      </member>
+    </listofallmembers>
+  </compounddef>
+</doxygen>
--- a/tests/upstream-test-suite/027/struct_vehicle.xml
+++ b/tests/upstream-test-suite/027/struct_vehicle.xml
@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="">
+  <compounddef id="struct_vehicle" kind="struct" language="C++" prot="public">
+    <compoundname>Vehicle</compoundname>
+    <basecompoundref refid="struct_object" prot="public" virt="non-virtual">Object</basecompoundref>
+    <derivedcompoundref refid="struct_car" prot="public" virt="non-virtual">Car</derivedcompoundref>
+    <derivedcompoundref refid="struct_truck" prot="public" virt="non-virtual">Truck</derivedcompoundref>
+    <sectiondef kind="protected-attrib">
+      <memberdef kind="variable" id="struct_vehicle_1ad7970f528d429f6fc1725173e93a77c2" prot="protected" static="no" mutable="no">
+        <type>
+          <ref refid="struct_object" kindref="compound">Object</ref>
+        </type>
+        <definition>Object Vehicle::base</definition>
+        <argsstring/>
+        <name>base</name>
+        <briefdescription>
+          <para>Base class. </para>
+        </briefdescription>
+        <detaileddescription>
+        </detaileddescription>
+        <inbodydescription>
+        </inbodydescription>
+        <location file="027_extends.c" line="45" column="1" bodyfile="027_extends.c" bodystart="45" bodyend="-1"/>
+      </memberdef>
+    </sectiondef>
+    <sectiondef kind="public-func">
+      <memberdef kind="function" id="struct_vehicle_1a6891d3d28853bc3fdd075596dc6de9f8" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
+        <type>void</type>
+        <definition>void vehicleStart</definition>
+        <argsstring>(Vehicle *obj)</argsstring>
+        <name>vehicleStart</name>
+        <param>
+          <type><ref refid="struct_vehicle" kindref="compound">Vehicle</ref> *</type>
+          <declname>obj</declname>
+        </param>
+        <briefdescription>
+        </briefdescription>
+        <detaileddescription>
+          <para>Starts the vehicle. </para>
+        </detaileddescription>
+        <inbodydescription>
+        </inbodydescription>
+        <location file="027_extends.c" line="53" column="1"/>
+      </memberdef>
+      <memberdef kind="function" id="struct_vehicle_1a4dcbcba43792dcd673a552b14479ab77" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
+        <type>void</type>
+        <definition>void vehicleStop</definition>
+        <argsstring>(Vehicle *obj)</argsstring>
+        <name>vehicleStop</name>
+        <param>
+          <type><ref refid="struct_vehicle" kindref="compound">Vehicle</ref> *</type>
+          <declname>obj</declname>
+        </param>
+        <briefdescription>
+        </briefdescription>
+        <detaileddescription>
+          <para>Stops the vehicle. </para>
+        </detaileddescription>
+        <inbodydescription>
+        </inbodydescription>
+        <location file="027_extends.c" line="60" column="1"/>
+      </memberdef>
+    </sectiondef>
+    <briefdescription>
+    </briefdescription>
+    <detaileddescription>
+      <para><ref refid="struct_vehicle" kindref="compound">Vehicle</ref> class. </para>
+    </detaileddescription>
+    <inheritancegraph>
+      <node id="20">
+        <label>Truck</label>
+        <link refid="struct_truck"/>
+        <childnode refid="17" relation="public-inheritance">
+        </childnode>
+      </node>
+      <node id="17">
+        <label>Vehicle</label>
+        <link refid="struct_vehicle"/>
+        <childnode refid="18" relation="public-inheritance">
+        </childnode>
+      </node>
+      <node id="18">
+        <label>Object</label>
+        <link refid="struct_object"/>
+      </node>
+      <node id="19">
+        <label>Car</label>
+        <link refid="struct_car"/>
+        <childnode refid="17" relation="public-inheritance">
+        </childnode>
+      </node>
+    </inheritancegraph>
+    <collaborationgraph>
+      <node id="21">
+        <label>Vehicle</label>
+        <link refid="struct_vehicle"/>
+        <childnode refid="22" relation="public-inheritance">
+        </childnode>
+        <childnode refid="22" relation="usage">
+          <edgelabel>base</edgelabel>
+        </childnode>
+      </node>
+      <node id="22">
+        <label>Object</label>
+        <link refid="struct_object"/>
+      </node>
+    </collaborationgraph>
+    <location file="027_extends.c" line="44" column="1" bodyfile="027_extends.c" bodystart="43" bodyend="46"/>
+    <listofallmembers>
+      <member refid="struct_vehicle_1ad7970f528d429f6fc1725173e93a77c2" prot="protected" virt="non-virtual">
+        <scope>Vehicle</scope>
+        <name>base</name>
+      </member>
+      <member refid="struct_object_1a71225073d06a793b9a6ea9263ed37b12" prot="public" virt="non-virtual">
+        <scope>Vehicle</scope>
+        <name>objRef</name>
+      </member>
+      <member refid="struct_object_1a924ee0cecc906d148022b3f0d6325cfb" prot="public" virt="non-virtual">
+        <scope>Vehicle</scope>
+        <name>objUnref</name>
+      </member>
+      <member refid="struct_vehicle_1a6891d3d28853bc3fdd075596dc6de9f8" prot="public" virt="non-virtual">
+        <scope>Vehicle</scope>
+        <name>vehicleStart</name>
+      </member>
+      <member refid="struct_vehicle_1a4dcbcba43792dcd673a552b14479ab77" prot="public" virt="non-virtual">
+        <scope>Vehicle</scope>
+        <name>vehicleStop</name>
+      </member>
+    </listofallmembers>
+  </compounddef>
+</doxygen>
--- a/tests/upstream-test-suite/027_extends.c
+++ b/tests/upstream-test-suite/027_extends.c
@ -0,0 +1,93 @@
+// objective: test the \extends, \implements, \memberof, \private, and \public commands
+// check: struct_object.xml
+// check: struct_vehicle.xml
+// check: struct_car.xml
+// check: struct_truck.xml
+
+/**
+ * \file 
+ */
+
+typedef struct Object Object;   //!< Object type
+typedef struct Vehicle Vehicle; //!< Vehicle type
+typedef struct Car Car;         //!< Car type
+typedef struct Truck Truck;     //!< Truck type
+
+/*!
+ * Base object class.
+ */
+struct Object
+{
+  int ref;    //!< \private Reference count.
+};
+
+
+/*!
+ * Increments object reference count by one.
+ * \public \memberof Object
+ */
+static Object * objRef(Object *obj);
+
+
+/*!
+ * Decrements object reference count by one.
+ * \public \memberof Object
+ */
+static Object * objUnref(Object *obj);
+
+
+/*!
+ * Vehicle class.
+ * \extends Object
+ */
+struct Vehicle
+{
+  Object base;    //!< \protected Base class.
+};
+
+
+/*!
+ * Starts the vehicle.
+ * \public \memberof Vehicle
+ */
+void vehicleStart(Vehicle *obj);
+
+
+/*!
+ * Stops the vehicle.
+ * \public \memberof Vehicle
+ */
+void vehicleStop(Vehicle *obj);
+
+
+/*!
+ * Car class.
+ * \implements Vehicle
+ */
+struct Car
+{
+  Vehicle base;    //!< \protected Base class.
+};
+
+
+/*!
+ * Truck class.
+ * \implements Vehicle
+ */
+struct Truck
+{
+  Vehicle base;    //!< \protected Base class.
+};
+
+
+/*!
+ * Main function.
+ *
+ * Ref vehicleStart(), objRef(), objUnref().
+ */
+int main(void)
+{
+  Car c;
+  vehicleStart((Vehicle*) &c);
+}
+
--- a/tests/upstream-test-suite/028/indexpage.xml
+++ b/tests/upstream-test-suite/028/indexpage.xml
@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="">
+  <compounddef id="indexpage" kind="page">
+    <compoundname>index</compoundname>
+    <title>My Project</title>
+    <briefdescription>
+    </briefdescription>
+    <detaileddescription>
+      <para>Here are some formulas:<orderedlist><listitem><para>The distance between <formula id="0">$(x_1,y_1)$</formula> and <formula id="1">$(x_2,y_2)$</formula> is <formula id="2">$\sqrt{(x_2-x_1)^2+(y_2-y_1)^2}$</formula>.</para></listitem><listitem><para>Unnumbered formula: <formula id="3">\[ |I_2|=\left| \int_{0}^T \psi(t) \left\{ u(a,t)- \int_{\gamma(t)}^a \frac{d\theta}{k(\theta,t)} \int_{a}^\theta c(\xi)u_t(\xi,t)\,d\xi \right\} dt \right| \]</formula></para></listitem><listitem><para>Formula in different environment <formula id="4">\begin{eqnarray*} g &amp;=&amp; \frac{Gm_2}{r^2} \\ &amp;=&amp; \frac{(6.673 \times 10^{-11}\,\mbox{m}^3\,\mbox{kg}^{-1}\, \mbox{s}^{-2})(5.9736 \times 10^{24}\,\mbox{kg})}{(6371.01\,\mbox{km})^2} \\ &amp;=&amp; 9.82066032\,\mbox{m/s}^2 \end{eqnarray*}</formula> </para></listitem></orderedlist>
+</para>
+    </detaileddescription>
+  </compounddef>
+</doxygen>
--- a/tests/upstream-test-suite/028_formula.c
+++ b/tests/upstream-test-suite/028_formula.c
@ -0,0 +1,17 @@
+// objective: test the \f$, \f[, \f], \f{, and \f} commands
+// check: indexpage.xml
+
+/** @mainpage
+Here are some formulas:
+-# The distance between \f$(x_1,y_1)\f$ and \f$(x_2,y_2)\f$ is 
+  \f$\sqrt{(x_2-x_1)^2+(y_2-y_1)^2}\f$.
+-# Unnumbered formula:
+   \f[ |I_2|=\left| \int_{0}^T \psi(t) \left\{ u(a,t)- \int_{\gamma(t)}^a 
+       \frac{d\theta}{k(\theta,t)} \int_{a}^\theta c(\xi)u_t(\xi,t)\,d\xi \right\} dt \right| \f]
+-# Formula in different environment
+  \f{eqnarray*}{ g &=& \frac{Gm_2}{r^2} \\ 
+                   &=& \frac{(6.673 \times 10^{-11}\,\mbox{m}^3\,\mbox{kg}^{-1}\,
+                       \mbox{s}^{-2})(5.9736 \times 10^{24}\,\mbox{kg})}{(6371.01\,\mbox{km})^2} \\ 
+                       &=& 9.82066032\,\mbox{m/s}^2
+ \f}
+*/
--- a/tests/upstream-test-suite/029/029__hideinit_8c.xml
+++ b/tests/upstream-test-suite/029/029__hideinit_8c.xml
@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="">
+  <compounddef id="029__hideinit_8c" kind="file" language="C++">
+    <compoundname>029_hideinit.c</compoundname>
+    <sectiondef kind="var">
+      <memberdef kind="variable" id="029__hideinit_8c_1a799f44203647e4c53bdb0386aa95680f" prot="public" static="no" mutable="no">
+        <type>int</type>
+        <definition>int var1</definition>
+        <argsstring/>
+        <name>var1</name>
+        <initializer>= 10</initializer>
+        <briefdescription>
+        </briefdescription>
+        <detaileddescription>
+          <para>a variable with initializer visible </para>
+        </detaileddescription>
+        <inbodydescription>
+        </inbodydescription>
+        <location file="029_hideinit.c" line="7" column="1" bodyfile="029_hideinit.c" bodystart="7" bodyend="-1"/>
+      </memberdef>
+      <memberdef kind="variable" id="029__hideinit_8c_1ac0da06d47d79ad4b9fb1c0eaf1118c3f" prot="public" static="no" mutable="no">
+        <type>int</type>
+        <definition>int var2</definition>
+        <argsstring/>
+        <name>var2</name>
+        <briefdescription>
+        </briefdescription>
+        <detaileddescription>
+          <para>a variable without initializer visible </para>
+        </detaileddescription>
+        <inbodydescription>
+        </inbodydescription>
+        <location file="029_hideinit.c" line="12" column="1" bodyfile="029_hideinit.c" bodystart="12" bodyend="-1"/>
+      </memberdef>
+    </sectiondef>
+    <briefdescription>
+    </briefdescription>
+    <detaileddescription>
+    </detaileddescription>
+    <location file="029_hideinit.c"/>
+  </compounddef>
+</doxygen>
--- a/tests/upstream-test-suite/029_hideinit.c
+++ b/tests/upstream-test-suite/029_hideinit.c
@ -0,0 +1,12 @@
+// objective: test the \hideinitializer command
+// check: 029__hideinit_8c.xml
+
+/** \file */
+
+/** a variable with initializer visible */
+int var1 = 10;
+
+/** a variable without initializer visible 
+ *  \hideinitializer
+ */
+int var2 = 20;
--- a/tests/upstream-test-suite/030/indexpage.xml
+++ b/tests/upstream-test-suite/030/indexpage.xml
@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="">
+  <compounddef id="indexpage" kind="page">
+    <compoundname>index</compoundname>
+    <title>My Project</title>
+    <briefdescription>
+    </briefdescription>
+    <detaileddescription>
+      <para>Some text. <htmlonly block="yes">&lt;h1&gt;Hello world&lt;/h1&gt;
+</htmlonly> More text. </para>
+    </detaileddescription>
+  </compounddef>
+</doxygen>
--- a/tests/upstream-test-suite/030_htmlinclude.dox
+++ b/tests/upstream-test-suite/030_htmlinclude.dox
@ -0,0 +1,7 @@
+// objective: test the \htmlinclude command
+// check: indexpage.xml
+/** \mainpage
+ * Some text.
+ * \htmlinclude[block] sample.html
+ * More text.
+ */
--- a/tests/upstream-test-suite/031/indexpage.xml
+++ b/tests/upstream-test-suite/031/indexpage.xml
@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="">
+  <compounddef id="indexpage" kind="page">
+    <compoundname>index</compoundname>
+    <title>My Project</title>
+    <briefdescription>
+    </briefdescription>
+    <detaileddescription>
+      <para>Some text. <image type="html" name="sample.png"/>
+ <image type="latex" name="sample.png" width="5cm">Doxygen logo</image>
+ <image type="docbook" name="sample.png"/>
+ More text. </para>
+    </detaileddescription>
+  </compounddef>
+</doxygen>
--- a/tests/upstream-test-suite/031_image.dox
+++ b/tests/upstream-test-suite/031_image.dox
@ -0,0 +1,10 @@
+// objective: test the \image command
+// check: indexpage.xml
+// config: IMAGE_PATH = $INPUTDIR
+/** \mainpage
+ * Some text.
+ * \image html sample.png
+ * \image latex sample.png "Doxygen logo" width=5cm
+ * \image docbook sample.png
+ * More text.
+ */
--- a/tests/upstream-test-suite/032/indexpage.xml
+++ b/tests/upstream-test-suite/032/indexpage.xml
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="">
+  <compounddef id="indexpage" kind="page">
+    <compoundname>index</compoundname>
+    <title>My Project</title>
+    <briefdescription>
+    </briefdescription>
+    <detaileddescription>
+      <para>Some text. <programlisting filename="example_test.cpp"><codeline><highlight class="keywordtype">void</highlight><highlight class="normal"><sp/>main()</highlight></codeline><codeline><highlight class="normal">{</highlight></codeline><codeline><highlight class="normal"><sp/><sp/></highlight><highlight class="keyword">const</highlight><highlight class="normal"><sp/></highlight><highlight class="keywordtype">char</highlight><highlight class="normal">*<sp/>a<sp/>=<sp/></highlight><highlight class="stringliteral">"Some<sp/>special<sp/>character<sp/>here:<sp/><sp value="7"/><sp/>"</highlight><highlight class="normal">;</highlight></codeline><codeline><highlight class="normal"/></codeline><codeline><highlight class="normal"><sp/><sp/>Test<sp/>t;</highlight></codeline><codeline><highlight class="normal"><sp/><sp/>t.example();</highlight></codeline><codeline><highlight class="normal">}</highlight></codeline><codeline><highlight class="normal"/></codeline></programlisting> More text. <programlisting filename="example_test.cpp"><codeline lineno="1"><highlight class="keywordtype">void</highlight><highlight class="normal"><sp/>main()</highlight></codeline><codeline lineno="2"><highlight class="normal">{</highlight></codeline><codeline lineno="3"><highlight class="normal"><sp/><sp/></highlight><highlight class="keyword">const</highlight><highlight class="normal"><sp/></highlight><highlight class="keywordtype">char</highlight><highlight class="normal">*<sp/>a<sp/>=<sp/></highlight><highlight class="stringliteral">"Some<sp/>special<sp/>character<sp/>here:<sp/><sp value="7"/><sp/>"</highlight><highlight class="normal">;</highlight></codeline><codeline lineno="4"><highlight class="normal"/></codeline><codeline lineno="5"><highlight class="normal"><sp/><sp/>Test<sp/>t;</highlight></codeline><codeline lineno="6"><highlight class="normal"><sp/><sp/>t.example();</highlight></codeline><codeline lineno="7"><highlight class="normal">}</highlight></codeline><codeline lineno="8"><highlight class="normal"/></codeline></programlisting> End. </para>
+    </detaileddescription>
+  </compounddef>
+</doxygen>
--- a/tests/upstream-test-suite/032_include.cpp
+++ b/tests/upstream-test-suite/032_include.cpp
@ -0,0 +1,10 @@
+// objective: test the \include and \includelineno commands
+// check: indexpage.xml
+
+/** \mainpage 
+ *  Some text.
+ *  \include example_test.cpp
+ *  More text.
+ *  \includelineno example_test.cpp
+ *  End.
+ */
--- a/tests/upstream-test-suite/033/indexpage.xml
+++ b/tests/upstream-test-suite/033/indexpage.xml
@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="">
+  <compounddef id="indexpage" kind="page">
+    <compoundname>index</compoundname>
+    <title>My Project</title>
+    <briefdescription>
+    </briefdescription>
+    <detaileddescription>
+      <para>Some text.</para>
+      <para>More visible text. </para>
+    </detaileddescription>
+  </compounddef>
+</doxygen>
--- a/tests/upstream-test-suite/033_internal.dox
+++ b/tests/upstream-test-suite/033_internal.dox
@ -0,0 +1,12 @@
+// objective: test the \internal and \endinternal commands (1)
+// check: indexpage.xml
+
+/** \mainpage 
+ *  Some text.
+ *  \internal
+ *  Internal text.
+ *  \endinternal
+ *  More visible text.
+ *  \internal
+ *  More internal text.
+ */
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				`SHA512 (doxygen-1.8.20.src.tar.gz) = 15dc95850440aed2a56971d8c04bf3bdfac861bcc38c60c7be22fd3b922b9fe2a750ea8877cb0716832bb6ad7901afcdf4950ba985b09890027030bdf828eee3`