Merge branch 'master' of github.com:doxygen/doxygen

15 files changed, 473 insertions, 431 deletions

diff --git a/README.md b/README.md
index 3e1c608..3cc6499 100644
--- a/README.md
+++ b/README.md
@@ -54,7 +54,7 @@ There are three mailing lists:
 * doxygen-users@lists.sourceforge.net        - for doxygen users
 * doxygen-develop@lists.sourceforge.net      - for doxygen developers
 * To subscribe follow the link to
-    * http://sourceforge.net/projects/doxygen
+    * https://sourceforge.net/projects/doxygen/
 
 Source Code
 ----------------------------------
diff --git a/doc/commands.doc b/doc/commands.doc
index 3711e29..ec207f1 100644
--- a/doc/commands.doc
+++ b/doc/commands.doc
@@ -2216,7 +2216,7 @@ Commands for displaying examples
   Where the example file \c include_test.cpp looks as follows:
   \include include_test.cpp
   \htmlonly
-  Click <a href="examples/include/html/example.html">here</a>
+  Click <a href="examples/include/html/pag_example.html">here</a>
   for the corresponding HTML documentation that is generated by doxygen.
   \endhtmlonly
   \latexonly
diff --git a/doc/faq.doc b/doc/faq.doc
index f48e109..88a1275 100644
--- a/doc/faq.doc
+++ b/doc/faq.doc
@@ -247,7 +247,7 @@ option \ref cfg_builtin_stl_support "BUILTIN_STL_SUPPORT" is turned on.
 
 \section faq_search I have problems getting the search engine to work with PHP5 and/or windows
 
-Please read <a href="http://www.doxygen.org/searchengine.html">this</a> for hints on where to look. 
+Please read <a href="searching.html">this</a> for hints on where to look. 
 
 \section faq_cmdline Can I configure doxygen from the command line?
 
diff --git a/src/htmldocvisitor.cpp b/src/htmldocvisitor.cpp
index 8c78f85..9f9e653 100644
--- a/src/htmldocvisitor.cpp
+++ b/src/htmldocvisitor.cpp
@@ -1584,7 +1584,7 @@ void HtmlDocVisitor::visitPre(DocHRef *href)
   else
   {
     QCString url = correctURL(href->url(),href->relPath());
-    m_t << "<a href=\"" << convertToXML(url)  << "\""
+    m_t << "<a href=\"" << convertToHtml(url)  << "\""
         << htmlAttribsToString(href->attribs()) << ">";
   }
 }
@@ -1668,7 +1668,7 @@ void HtmlDocVisitor::visitPre(DocImage *img)
     }
     else
     {
-      m_t << "<img src=\"" << src << "\" alt=\"" << alt << "\"" << sizeAttribs << attrs;
+      m_t << "<img src=\"" << convertToHtml(src) << "\" alt=\"" << alt << "\"" << sizeAttribs << attrs;
       if (inlineImage)
       {
         m_t << " class=\"inline\"";
diff --git a/src/latexdocvisitor.cpp b/src/latexdocvisitor.cpp
index 5be3fc9..98324e3 100644
--- a/src/latexdocvisitor.cpp
+++ b/src/latexdocvisitor.cpp
@@ -280,7 +280,7 @@ void LatexDocVisitor::visit(DocLineBreak *)
 void LatexDocVisitor::visit(DocHorRuler *)
 {
   if (m_hide) return;
-  m_t << "\n\n";
+  m_t << "\\DoxyHorRuler\n";
 }
 
 void LatexDocVisitor::visit(DocStyleChange *s)
diff --git a/src/util.cpp b/src/util.cpp
index 24e8898..f9c2492 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -5914,7 +5914,7 @@ QCString convertToId(const char *s)
 }
 
 /*! Converts a string to an XML-encoded string */
-QCString convertToXML(const char *s)
+QCString convertToXML(const char *s, bool keepEntities)
 {
   static GrowBuf growBuf;
   growBuf.clear();
@@ -5927,7 +5927,30 @@ QCString convertToXML(const char *s)
     {
       case '<':  growBuf.addStr("&lt;");   break;
       case '>':  growBuf.addStr("&gt;");   break;
-      case '&':  growBuf.addStr("&amp;");  break;
+      case '&':  if (keepEntities)
+                 {
+                   const char *e=p;
+                   char ce;
+                   while ((ce=*e++))
+                   {
+                     if (ce==';' || (!(isId(ce) || ce=='#'))) break;
+                   }
+                   if (ce==';') // found end of an entity
+                   {
+                     // copy entry verbatim
+                     growBuf.addChar(c);
+                     while (p<e) growBuf.addChar(*p++);
+                   }
+                   else
+                   {
+                     growBuf.addStr("&amp;");
+                   }
+                 }
+                 else
+                 {
+                   growBuf.addStr("&amp;");
+                 }
+                 break;
       case '\'': growBuf.addStr("&apos;"); break; 
       case '"':  growBuf.addStr("&quot;"); break;
       case  1: case  2: case  3: case  4: case  5: case  6: case  7: case  8:
diff --git a/src/util.h b/src/util.h
index 3305332..31691af 100644
--- a/src/util.h
+++ b/src/util.h
@@ -284,7 +284,7 @@ QCString convertToHtml(const char *s,bool keepEntities=TRUE);
 
 QCString convertToLaTeX(const QCString &s,bool insideTabbing=FALSE,bool keepSpaces=FALSE);
 
-QCString convertToXML(const char *s);
+QCString convertToXML(const char *s, bool keepEntities=FALSE);
 
 QCString convertToDocBook(const char *s);
 
diff --git a/src/xmldocvisitor.cpp b/src/xmldocvisitor.cpp
index e464088..01e0a6d 100644
--- a/src/xmldocvisitor.cpp
+++ b/src/xmldocvisitor.cpp
@@ -60,7 +60,7 @@ static void visitPreStart(FTextStream &t, const char *cmd, bool doCaption,
   }
   if (!name.isEmpty())
   {
-    t << " name=\"" << name << "\"";
+    t << " name=\"" << convertToXML(name, TRUE) << "\"";
   }
   if (!width.isEmpty())
   {
@@ -770,9 +770,7 @@ void XmlDocVisitor::visitPost(DocInternal *)
 void XmlDocVisitor::visitPre(DocHRef *href)
 {
   if (m_hide) return;
-  m_t << "<ulink url=\"";
-  filter(href->url());
-  m_t << "\">";
+  m_t << "<ulink url=\"" << convertToXML(href->url(), TRUE) << "\">";
 }
 
 void XmlDocVisitor::visitPost(DocHRef *) 
diff --git a/templates/latex/doxygen.sty b/templates/latex/doxygen.sty
index cf92712..e696837 100644
--- a/templates/latex/doxygen.sty
+++ b/templates/latex/doxygen.sty
@@ -35,6 +35,10 @@
   \endgroup%
 }
 
+\newcommand{\DoxyHorRuler}{%
+  \setlength{\parskip}{0ex plus 0ex minus 0ex}%
+  \hrule%
+}
 \newcommand{\DoxyLabelFont}{}
 \newcommand{\entrylabel}[1]{%
   {%
diff --git a/testing/031/indexpage.xml b/testing/031/indexpage.xml
index b6a7ed0..7e368f3 100644..100755
--- a/testing/031/indexpage.xml
+++ b/testing/031/indexpage.xml
@@ -1,47 +1,54 @@
-<?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>
-      <para>SVG image with caption:<linebreak/>
-<image type="html" name="license-MIT-brightgreen.svg">A caption</image>
-</para>
-      <para>PNG image with caption:<linebreak/>
-<image type="html" name="license-MIT-brightgreen.png">A caption</image>
-</para>
-      <para>SVG image without caption:<linebreak/>
-<image type="html" name="license-MIT-brightgreen.svg"/>
-</para>
-      <para>PNG image without caption:<linebreak/>
-<image type="html" name="license-MIT-brightgreen.png"/>
-</para>
-      <para>Inline SVG image with caption:<linebreak/>
-This image is inline <image type="html" name="license-MIT-brightgreen.svg" inline="yes">MIT license</image>
- within the text.</para>
-      <para>Inline PNG image with caption:<linebreak/>
-This image is inline <image type="html" name="license-MIT-brightgreen.png" inline="yes">MIT license</image>
- within the text.</para>
-      <para>Markdown style linked SVG image:<linebreak/>
-<ulink url="http://opensource.org/licenses/MIT"><image type="html" name="license-MIT-brightgreen.svg" inline="yes"/></ulink></para>
-      <para>Markdown style linked PNG image:<linebreak/>
-<ulink url="http://opensource.org/licenses/MIT"><image type="html" name="license-MIT-brightgreen.png" inline="yes"/></ulink></para>
-      <para>HTML style linked SVG image:<linebreak/>
-<ulink url="http://opensource.org/licenses/MIT"><image type="html" name="license-MIT-brightgreen.svg" inline="yes"/></ulink></para>
-      <para>HTML style linked PNG image:<linebreak/>
-<ulink url="http://opensource.org/licenses/MIT"><image type="html" name="license-MIT-brightgreen.png" inline="yes"/></ulink></para>
-      <para>HTML style unlinked SVG image:<linebreak/>
-<image type="html" name="license-MIT-brightgreen.svg" inline="yes"/>
-</para>
-      <para>HTML style unlined PNG image:<linebreak/>
-<image type="html" name="license-MIT-brightgreen.png" inline="yes"/>
- </para>
-    </detaileddescription>
-  </compounddef>
-</doxygen>
+<?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>

+      <para>SVG image with caption:<linebreak/>

+<image type="html" name="license-MIT-brightgreen.svg">A caption</image>

+</para>

+      <para>PNG image with caption:<linebreak/>

+<image type="html" name="license-MIT-brightgreen.png">A caption</image>

+</para>

+      <para>SVG image without caption:<linebreak/>

+<image type="html" name="license-MIT-brightgreen.svg"/>

+</para>

+      <para>PNG image without caption:<linebreak/>

+<image type="html" name="license-MIT-brightgreen.png"/>

+</para>

+      <para>Inline SVG image with caption:<linebreak/>

+This image is inline <image type="html" name="license-MIT-brightgreen.svg" inline="yes">MIT license</image>

+ within the text.</para>

+      <para>Inline PNG image with caption:<linebreak/>

+This image is inline <image type="html" name="license-MIT-brightgreen.png" inline="yes">MIT license</image>

+ within the text.</para>

+      <para>Markdown style linked SVG image:<linebreak/>

+<ulink url="http://opensource.org/licenses/MIT"><image type="html" name="license-MIT-brightgreen.svg" inline="yes"/></ulink></para>

+      <para>Markdown style linked PNG image:<linebreak/>

+<ulink url="http://opensource.org/licenses/MIT"><image type="html" name="license-MIT-brightgreen.png" inline="yes"/></ulink></para>

+      <para>HTML style linked SVG image:<linebreak/>

+<ulink url="http://opensource.org/licenses/MIT"><image type="html" name="license-MIT-brightgreen.svg" inline="yes"/></ulink></para>

+      <para>HTML style linked PNG image:<linebreak/>

+<ulink url="http://opensource.org/licenses/MIT"><image type="html" name="license-MIT-brightgreen.png" inline="yes"/></ulink></para>

+      <para>HTML style unlinked SVG image:<linebreak/>

+<image type="html" name="license-MIT-brightgreen.svg" inline="yes"/>

+</para>

+      <para>HTML style unlinked PNG image:<linebreak/>

+<image type="html" name="license-MIT-brightgreen.png" inline="yes"/>

+</para>

+      <para>Some markdown image tests<linebreak/>

+<image type="html" name="docs-Doxygen-blue.svg?foo&amp;bar" inline="yes"/>

+ <ulink url="http://www.doxygen.nl?foo&amp;bar">Some normal link</ulink></para>

+      <para>

+        <image type="html" name="docs-Doxygen-blue.svg?foo&amp;bar" inline="yes"/>

+        <ulink url="http://www.doxygen.nl?foo&amp;bar">Some normal link</ulink>

+      </para>

+    </detaileddescription>

+  </compounddef>

+</doxygen>

diff --git a/testing/031_image.dox b/testing/031_image.dox
index 61f5bba..e451592 100644
--- a/testing/031_image.dox
+++ b/testing/031_image.dox
@@ -47,7 +47,13 @@ HTML style linked PNG image:\n
 HTML style unlinked SVG image:\n
 <img src="http://img.shields.io/badge/license-MIT-brightgreen.svg" alt="MIT license"/>
 
-HTML style unlined PNG image:\n
+HTML style unlinked PNG image:\n
 <img src="http://img.shields.io/badge/license-MIT-brightgreen.png" alt="MIT license"/>
 
+Some markdown image tests\n
+![Some SVG image](https://img.shields.io/badge/docs-Doxygen-blue.svg?foo&bar)
+[Some normal link](http://www.doxygen.nl?foo&bar)
+
+![Some SVG image](https://img.shields.io/badge/docs-Doxygen-blue.svg?foo&amp;bar)
+[Some normal link](http://www.doxygen.nl?foo&amp;bar)
 */
diff --git a/testing/074/namespacens.xml b/testing/074/namespacens.xml
index 495e550..4eccf88 100644..100755
--- a/testing/074/namespacens.xml
+++ b/testing/074/namespacens.xml
@@ -1,81 +1,81 @@
-<?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="namespacens" kind="namespace" language="C++">
-    <compoundname>ns</compoundname>
-      <sectiondef kind="func">
-      <memberdef kind="function" id="namespacens_1afd2e8a8437eff630f52a452ea6dc6e82" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type>int</type>
-        <definition>int ns::operator""_op</definition>
-        <argsstring>(unsigned long long)</argsstring>
-        <name>operator""_op</name>
-        <param>
-          <type>unsigned long long</type>
-        </param>
-        <briefdescription>
-          <para>An operator. </para>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="074_ref.cpp" line="66" column="1"/>
-      </memberdef>
-      <memberdef kind="function" id="namespacens_1a47f70e51e66b81b8383a4e2da66f1e09" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type>int</type>
-        <definition>int ns::operator""_oq</definition>
-        <argsstring>(unsigned long long)</argsstring>
-        <name>operator""_oq</name>
-        <param>
-          <type>unsigned long long</type>
-        </param>
-        <briefdescription>
-          <para>Another operator. </para>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="074_ref.cpp" line="69" column="1"/>
-      </memberdef>
-      <memberdef kind="function" id="namespacens_1aaa9eb8a7b40d4ed0edbe5e163b4e6e8d" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type>void</type>
-        <definition>void ns::foo</definition>
-        <argsstring>(std::initializer_list&lt; int * &gt;)</argsstring>
-        <name>foo</name>
-        <param>
-          <type>std::initializer_list&lt; int * &gt;</type>
-        </param>
-        <briefdescription>
-          <para>Function. </para>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="074_ref.cpp" line="72" column="1"/>
-      </memberdef>
-      </sectiondef>
-    <briefdescription>
-<para>A namespace. </para>
-    </briefdescription>
-    <detaileddescription>
-      <para>
-        <itemizedlist>
-          <listitem>
-            <para>Link to an UDL w/o spaces: <ref refid="namespacens_1afd2e8a8437eff630f52a452ea6dc6e82" kindref="member">operator""_op</ref></para>
-          </listitem>
-          <listitem>
-            <para>Link to an UDL with spaces: <ref refid="namespacens_1a47f70e51e66b81b8383a4e2da66f1e09" kindref="member">operator""_oq</ref></para>
-          </listitem>
-          <listitem>
-            <para>Link to a function with spaces: <ref refid="namespacens_1aaa9eb8a7b40d4ed0edbe5e163b4e6e8d" kindref="member">foo(std::initializer_list&lt; int* &gt;)</ref></para>
-          </listitem>
-          <listitem>
-            <para>Link to a function w/o spaces: <ref refid="namespacens_1aaa9eb8a7b40d4ed0edbe5e163b4e6e8d" kindref="member">foo(std::initializer_list&lt;int*&gt;)</ref> </para>
-          </listitem>
-        </itemizedlist>
-      </para>
-    </detaileddescription>
-    <location file="074_ref.cpp" line="63" column="1"/>
-  </compounddef>
-</doxygen>
+<?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="namespacens" kind="namespace" language="C++">

+    <compoundname>ns</compoundname>

+    <sectiondef kind="func">

+      <memberdef kind="function" id="namespacens_1afd2e8a8437eff630f52a452ea6dc6e82" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">

+        <type>int</type>

+        <definition>int ns::operator""_op</definition>

+        <argsstring>(unsigned long long)</argsstring>

+        <name>operator""_op</name>

+        <param>

+          <type>unsigned long long</type>

+        </param>

+        <briefdescription>

+          <para>An operator. </para>

+        </briefdescription>

+        <detaileddescription>

+        </detaileddescription>

+        <inbodydescription>

+        </inbodydescription>

+        <location file="074_ref.cpp" line="67" column="1"/>

+      </memberdef>

+      <memberdef kind="function" id="namespacens_1a47f70e51e66b81b8383a4e2da66f1e09" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">

+        <type>int</type>

+        <definition>int ns::operator""_oq</definition>

+        <argsstring>(unsigned long long)</argsstring>

+        <name>operator""_oq</name>

+        <param>

+          <type>unsigned long long</type>

+        </param>

+        <briefdescription>

+          <para>Another operator. </para>

+        </briefdescription>

+        <detaileddescription>

+        </detaileddescription>

+        <inbodydescription>

+        </inbodydescription>

+        <location file="074_ref.cpp" line="70" column="1"/>

+      </memberdef>

+      <memberdef kind="function" id="namespacens_1aaa9eb8a7b40d4ed0edbe5e163b4e6e8d" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">

+        <type>void</type>

+        <definition>void ns::foo</definition>

+        <argsstring>(std::initializer_list&lt; int * &gt;)</argsstring>

+        <name>foo</name>

+        <param>

+          <type>std::initializer_list&lt; int * &gt;</type>

+        </param>

+        <briefdescription>

+          <para>Function. </para>

+        </briefdescription>

+        <detaileddescription>

+        </detaileddescription>

+        <inbodydescription>

+        </inbodydescription>

+        <location file="074_ref.cpp" line="73" column="1"/>

+      </memberdef>

+    </sectiondef>

+    <briefdescription>

+      <para>A namespace. </para>

+    </briefdescription>

+    <detaileddescription>

+      <para>

+        <itemizedlist>

+          <listitem>

+            <para>Link to an UDL w/o spaces: <ref refid="namespacens_1afd2e8a8437eff630f52a452ea6dc6e82" kindref="member">operator""_op</ref></para>

+          </listitem>

+          <listitem>

+            <para>Link to an UDL with spaces: <ref refid="namespacens_1a47f70e51e66b81b8383a4e2da66f1e09" kindref="member">operator""_oq</ref></para>

+          </listitem>

+          <listitem>

+            <para>Link to a function with spaces: <ref refid="namespacens_1aaa9eb8a7b40d4ed0edbe5e163b4e6e8d" kindref="member">foo(std::initializer_list&lt; int* &gt;)</ref></para>

+          </listitem>

+          <listitem>

+            <para>Link to a function w/o spaces: <ref refid="namespacens_1aaa9eb8a7b40d4ed0edbe5e163b4e6e8d" kindref="member">foo(std::initializer_list&lt;int*&gt;)</ref> </para>

+          </listitem>

+        </itemizedlist>

+      </para>

+    </detaileddescription>

+    <location file="074_ref.cpp" line="64" column="1"/>

+  </compounddef>

+</doxygen>

diff --git a/testing/074/struct_foo.xml b/testing/074/struct_foo.xml
index c49fbaa..7096238 100644..100755
--- a/testing/074/struct_foo.xml
+++ b/testing/074/struct_foo.xml
@@ -1,287 +1,290 @@
-<?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_foo" kind="struct" language="C++" prot="public">
-    <compoundname>Foo</compoundname>
-    <sectiondef kind="public-func">
-      <memberdef kind="function" id="struct_foo_1a5c036d1b3561a0e1beffe8c6799a4276" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>Foo::Foo</definition>
-        <argsstring>()</argsstring>
-        <name>Foo</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-          <para>Constructor </para>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="074_ref.cpp" line="20" column="1"/>
-      </memberdef>
-      <memberdef kind="function" id="struct_foo_1a279debd94d894223fa8468933e2d6188" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type><ref refid="struct_foo" kindref="compound">Foo</ref> &amp;</type>
-        <definition>Foo&amp; Foo::operator&lt;&lt;</definition>
-        <argsstring>(int i)</argsstring>
-        <name>operator&lt;&lt;</name>
-        <param>
-          <type>int</type>
-          <declname>i</declname>
-        </param>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-          <para>overloaded less than operator </para>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="074_ref.cpp" line="31" column="1"/>
-      </memberdef>
-      <memberdef kind="function" id="struct_foo_1a48bcc3de9b2f1ad09a3518a0c9f0da61" prot="public" static="no" const="yes" explicit="no" inline="no" virt="non-virtual">
-        <type>const <ref refid="struct_foo" kindref="compound">Foo</ref> &amp;</type>
-        <definition>const Foo&amp; Foo::operator&lt;&lt;</definition>
-        <argsstring>(int i) const</argsstring>
-        <name>operator&lt;&lt;</name>
-        <param>
-          <type>int</type>
-          <declname>i</declname>
-        </param>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-          <para>overloaded const less than operator </para>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="074_ref.cpp" line="34" column="1"/>
-      </memberdef>
-      <memberdef kind="function" id="struct_foo_1a3a41dcf8c53f777d50676ea28400a640" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type>int</type>
-        <definition>int Foo::operator()</definition>
-        <argsstring>(int i)</argsstring>
-        <name>operator()</name>
-        <param>
-          <type>int</type>
-          <declname>i</declname>
-        </param>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-          <para>overloaded call operator </para>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="074_ref.cpp" line="37" column="1"/>
-      </memberdef>
-      <memberdef kind="function" id="struct_foo_1ae3c9c1f33cdb8b932c6eb104660a262b" prot="public" static="no" const="yes" explicit="no" inline="no" virt="non-virtual">
-        <type>int</type>
-        <definition>int Foo::operator()</definition>
-        <argsstring>(int i) const</argsstring>
-        <name>operator()</name>
-        <param>
-          <type>int</type>
-          <declname>i</declname>
-        </param>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-          <para>overloaded call operator </para>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="074_ref.cpp" line="40" column="1"/>
-      </memberdef>
-      <memberdef kind="function" id="struct_foo_1aa20bd44b1bb87a652ac65170ddfa1a5a" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type><ref refid="struct_foo" kindref="compound">Foo</ref> &amp;</type>
-        <definition>Foo&amp; Foo::operator&amp;=</definition>
-        <argsstring>(const Foo &amp;rhs)</argsstring>
-        <name>operator&amp;=</name>
-        <param>
-          <type>const <ref refid="struct_foo" kindref="compound">Foo</ref> &amp;</type>
-          <declname>rhs</declname>
-        </param>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-          <para>and equal operator </para>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="074_ref.cpp" line="43" column="1"/>
-      </memberdef>
-      <memberdef kind="function" id="struct_foo_1aa20bd44b1bb87a652ac65170ddfa1a5a" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type><ref refid="struct_foo" kindref="compound">Foo</ref> &amp;</type>
-        <definition>Foo&amp; Foo::operator&amp;=</definition>
-        <argsstring>(const Foo &amp;rhs)</argsstring>
-        <name>operator&amp;=</name>
-        <param>
-          <type>const <ref refid="struct_foo" kindref="compound">Foo</ref> &amp;</type>
-          <declname>rhs</declname>
-        </param>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-          <para>and equal operator </para>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="074_ref.cpp" line="46" column="1"/>
-      </memberdef>
-      <memberdef kind="function" id="struct_foo_1a0514e1f5b30cbf77e1c39d7aba308656" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type>int *</type>
-        <definition>int* Foo::operator-&gt;*</definition>
-        <argsstring>(int *p)</argsstring>
-        <name>operator-&gt;*</name>
-        <param>
-          <type>int *</type>
-          <declname>p</declname>
-        </param>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-          <para>Member pointer operator </para>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="074_ref.cpp" line="49" column="1"/>
-      </memberdef>
-      <memberdef kind="function" id="struct_foo_1a978acd73e910ce56cc169ebec8736669" prot="public" static="no" const="yes" explicit="no" inline="no" virt="non-virtual">
-        <type>
-          <ref refid="struct_foo" kindref="compound">Foo</ref>
-        </type>
-        <definition>Foo Foo::fun</definition>
-        <argsstring>() const</argsstring>
-        <name>fun</name>
-        <briefdescription>
-          <para>Fun with itself. </para>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="074_ref.cpp" line="52" column="1"/>
-      </memberdef>
-    </sectiondef>
-    <sectiondef kind="public-static-func">
-      <memberdef kind="function" id="struct_foo_1abdf64a71706807b0f946265902c530ee" prot="public" static="yes" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type>
-          <ref refid="struct_foo" kindref="compound">Foo</ref>
-        </type>
-        <definition>static Foo Foo::fun</definition>
-        <argsstring>(Foo a, Foo b)</argsstring>
-        <name>fun</name>
-        <param>
-          <type>
-            <ref refid="struct_foo" kindref="compound">Foo</ref>
-          </type>
-          <declname>a</declname>
-        </param>
-        <param>
-          <type>
-            <ref refid="struct_foo" kindref="compound">Foo</ref>
-          </type>
-          <declname>b</declname>
-        </param>
-        <briefdescription>
-          <para>Fun of two. </para>
-        </briefdescription>
-        <detaileddescription>
-          <para>
-            <itemizedlist>
-              <listitem>
-                <para>
-                  <ref refid="struct_foo_1a978acd73e910ce56cc169ebec8736669" kindref="member">fun() const</ref>
-                </para>
-              </listitem>
-              <listitem>
-                <para>
-                  <ref refid="struct_foo_1a978acd73e910ce56cc169ebec8736669" kindref="member">fun() const</ref>
-                </para>
-              </listitem>
-              <listitem>
-                <para>
-                  <ref refid="struct_foo_1a978acd73e910ce56cc169ebec8736669" kindref="member">title</ref>
-                </para>
-              </listitem>
-            </itemizedlist>
-          </para>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="074_ref.cpp" line="28" column="1"/>
-      </memberdef>
-    </sectiondef>
-    <briefdescription>
-      <para><ref refid="struct_foo" kindref="compound">Foo</ref> class. </para>
-    </briefdescription>
-    <detaileddescription>
-      <para>
-        <simplesect kind="see">
-          <para><ref refid="struct_foo_1a5c036d1b3561a0e1beffe8c6799a4276" kindref="member">Foo::Foo()</ref> constructor for details. </para>
-        </simplesect>
-        <simplesect kind="see">
-          <para><ref refid="struct_foo" kindref="compound">Foo</ref> constant. </para>
-        </simplesect>
-        <simplesect kind="see">
-          <para><ref refid="struct_foo_1a279debd94d894223fa8468933e2d6188" kindref="member">less than operator</ref>. </para>
-        </simplesect>
-        <simplesect kind="see">
-          <para><ref refid="struct_foo_1a48bcc3de9b2f1ad09a3518a0c9f0da61" kindref="member">const less than operator</ref>. </para>
-        </simplesect>
-        <simplesect kind="see">
-          <para><ref refid="struct_foo_1a3a41dcf8c53f777d50676ea28400a640" kindref="member">call operator</ref>. </para>
-        </simplesect>
-        <simplesect kind="see">
-          <para><ref refid="struct_foo_1ae3c9c1f33cdb8b932c6eb104660a262b" kindref="member">const call operator</ref>. </para>
-        </simplesect>
-        <simplesect kind="see">
-          <para><ref refid="struct_foo_1aa20bd44b1bb87a652ac65170ddfa1a5a" kindref="member">and equal operator</ref>. </para>
-        </simplesect>
-        <simplesect kind="see">
-          <para><ref refid="struct_foo_1a0514e1f5b30cbf77e1c39d7aba308656" kindref="member">member pointer operator</ref>. </para>
-        </simplesect>
-      </para>
-    </detaileddescription>
-    <location file="074_ref.cpp" line="18" column="1" bodyfile="074_ref.cpp" bodystart="18" bodyend="53"/>
-    <listofallmembers>
-      <member refid="struct_foo_1a5c036d1b3561a0e1beffe8c6799a4276" prot="public" virt="non-virtual">
-        <scope>Foo</scope>
-        <name>Foo</name>
-      </member>
-      <member refid="struct_foo_1abdf64a71706807b0f946265902c530ee" prot="public" virt="non-virtual">
-        <scope>Foo</scope>
-        <name>fun</name>
-      </member>
-      <member refid="struct_foo_1a978acd73e910ce56cc169ebec8736669" prot="public" virt="non-virtual">
-        <scope>Foo</scope>
-        <name>fun</name>
-      </member>
-      <member refid="struct_foo_1aa20bd44b1bb87a652ac65170ddfa1a5a" prot="public" virt="non-virtual">
-        <scope>Foo</scope>
-        <name>operator&amp;=</name>
-      </member>
-      <member refid="struct_foo_1aa20bd44b1bb87a652ac65170ddfa1a5a" prot="public" virt="non-virtual">
-        <scope>Foo</scope>
-        <name>operator&amp;=</name>
-      </member>
-      <member refid="struct_foo_1a3a41dcf8c53f777d50676ea28400a640" prot="public" virt="non-virtual">
-        <scope>Foo</scope>
-        <name>operator()</name>
-      </member>
-      <member refid="struct_foo_1ae3c9c1f33cdb8b932c6eb104660a262b" prot="public" virt="non-virtual">
-        <scope>Foo</scope>
-        <name>operator()</name>
-      </member>
-      <member refid="struct_foo_1a0514e1f5b30cbf77e1c39d7aba308656" prot="public" virt="non-virtual">
-        <scope>Foo</scope>
-        <name>operator-&gt;*</name>
-      </member>
-      <member refid="struct_foo_1a279debd94d894223fa8468933e2d6188" prot="public" virt="non-virtual">
-        <scope>Foo</scope>
-        <name>operator&lt;&lt;</name>
-      </member>
-      <member refid="struct_foo_1a48bcc3de9b2f1ad09a3518a0c9f0da61" prot="public" virt="non-virtual">
-        <scope>Foo</scope>
-        <name>operator&lt;&lt;</name>
-      </member>
-    </listofallmembers>
-  </compounddef>
-</doxygen>
+<?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_foo" kind="struct" language="C++" prot="public">

+    <compoundname>Foo</compoundname>

+    <sectiondef kind="public-func">

+      <memberdef kind="function" id="struct_foo_1a5c036d1b3561a0e1beffe8c6799a4276" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">

+        <type/>

+        <definition>Foo::Foo</definition>

+        <argsstring>()</argsstring>

+        <name>Foo</name>

+        <briefdescription>

+        </briefdescription>

+        <detaileddescription>

+          <para>Constructor </para>

+        </detaileddescription>

+        <inbodydescription>

+        </inbodydescription>

+        <location file="074_ref.cpp" line="21" column="1"/>

+      </memberdef>

+      <memberdef kind="function" id="struct_foo_1a279debd94d894223fa8468933e2d6188" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">

+        <type><ref refid="struct_foo" kindref="compound">Foo</ref> &amp;</type>

+        <definition>Foo&amp; Foo::operator&lt;&lt;</definition>

+        <argsstring>(int i)</argsstring>

+        <name>operator&lt;&lt;</name>

+        <param>

+          <type>int</type>

+          <declname>i</declname>

+        </param>

+        <briefdescription>

+        </briefdescription>

+        <detaileddescription>

+          <para>overloaded less than operator </para>

+        </detaileddescription>

+        <inbodydescription>

+        </inbodydescription>

+        <location file="074_ref.cpp" line="32" column="1"/>

+      </memberdef>

+      <memberdef kind="function" id="struct_foo_1a48bcc3de9b2f1ad09a3518a0c9f0da61" prot="public" static="no" const="yes" explicit="no" inline="no" virt="non-virtual">

+        <type>const <ref refid="struct_foo" kindref="compound">Foo</ref> &amp;</type>

+        <definition>const Foo&amp; Foo::operator&lt;&lt;</definition>

+        <argsstring>(int i) const</argsstring>

+        <name>operator&lt;&lt;</name>

+        <param>

+          <type>int</type>

+          <declname>i</declname>

+        </param>

+        <briefdescription>

+        </briefdescription>

+        <detaileddescription>

+          <para>overloaded const less than operator </para>

+        </detaileddescription>

+        <inbodydescription>

+        </inbodydescription>

+        <location file="074_ref.cpp" line="35" column="1"/>

+      </memberdef>

+      <memberdef kind="function" id="struct_foo_1a3a41dcf8c53f777d50676ea28400a640" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">

+        <type>int</type>

+        <definition>int Foo::operator()</definition>

+        <argsstring>(int i)</argsstring>

+        <name>operator()</name>

+        <param>

+          <type>int</type>

+          <declname>i</declname>

+        </param>

+        <briefdescription>

+        </briefdescription>

+        <detaileddescription>

+          <para>overloaded call operator </para>

+        </detaileddescription>

+        <inbodydescription>

+        </inbodydescription>

+        <location file="074_ref.cpp" line="38" column="1"/>

+      </memberdef>

+      <memberdef kind="function" id="struct_foo_1ae3c9c1f33cdb8b932c6eb104660a262b" prot="public" static="no" const="yes" explicit="no" inline="no" virt="non-virtual">

+        <type>int</type>

+        <definition>int Foo::operator()</definition>

+        <argsstring>(int i) const</argsstring>

+        <name>operator()</name>

+        <param>

+          <type>int</type>

+          <declname>i</declname>

+        </param>

+        <briefdescription>

+        </briefdescription>

+        <detaileddescription>

+          <para>overloaded call operator </para>

+        </detaileddescription>

+        <inbodydescription>

+        </inbodydescription>

+        <location file="074_ref.cpp" line="41" column="1"/>

+      </memberdef>

+      <memberdef kind="function" id="struct_foo_1aa20bd44b1bb87a652ac65170ddfa1a5a" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">

+        <type><ref refid="struct_foo" kindref="compound">Foo</ref> &amp;</type>

+        <definition>Foo&amp; Foo::operator&amp;=</definition>

+        <argsstring>(const Foo &amp;rhs)</argsstring>

+        <name>operator&amp;=</name>

+        <param>

+          <type>const <ref refid="struct_foo" kindref="compound">Foo</ref> &amp;</type>

+          <declname>rhs</declname>

+        </param>

+        <briefdescription>

+        </briefdescription>

+        <detaileddescription>

+          <para>and equal operator </para>

+        </detaileddescription>

+        <inbodydescription>

+        </inbodydescription>

+        <location file="074_ref.cpp" line="44" column="1"/>

+      </memberdef>

+      <memberdef kind="function" id="struct_foo_1ab1a2a53ad5b2a0f97422630330c151fe" prot="public" static="no" const="yes" explicit="no" inline="no" virt="non-virtual">

+        <type>const <ref refid="struct_foo" kindref="compound">Foo</ref> &amp;</type>

+        <definition>const Foo&amp; Foo::operator&amp;=</definition>

+        <argsstring>(const Foo &amp;rhs) const</argsstring>

+        <name>operator&amp;=</name>

+        <param>

+          <type>const <ref refid="struct_foo" kindref="compound">Foo</ref> &amp;</type>

+          <declname>rhs</declname>

+        </param>

+        <briefdescription>

+        </briefdescription>

+        <detaileddescription>

+          <para>and equal operator </para>

+        </detaileddescription>

+        <inbodydescription>

+        </inbodydescription>

+        <location file="074_ref.cpp" line="47" column="1"/>

+      </memberdef>

+      <memberdef kind="function" id="struct_foo_1a0514e1f5b30cbf77e1c39d7aba308656" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">

+        <type>int *</type>

+        <definition>int* Foo::operator-&gt;*</definition>

+        <argsstring>(int *p)</argsstring>

+        <name>operator-&gt;*</name>

+        <param>

+          <type>int *</type>

+          <declname>p</declname>

+        </param>

+        <briefdescription>

+        </briefdescription>

+        <detaileddescription>

+          <para>Member pointer operator </para>

+        </detaileddescription>

+        <inbodydescription>

+        </inbodydescription>

+        <location file="074_ref.cpp" line="50" column="1"/>

+      </memberdef>

+      <memberdef kind="function" id="struct_foo_1a978acd73e910ce56cc169ebec8736669" prot="public" static="no" const="yes" explicit="no" inline="no" virt="non-virtual">

+        <type>

+          <ref refid="struct_foo" kindref="compound">Foo</ref>

+        </type>

+        <definition>Foo Foo::fun</definition>

+        <argsstring>() const</argsstring>

+        <name>fun</name>

+        <briefdescription>

+          <para>Fun with itself. </para>

+        </briefdescription>

+        <detaileddescription>

+        </detaileddescription>

+        <inbodydescription>

+        </inbodydescription>

+        <location file="074_ref.cpp" line="53" column="1"/>

+      </memberdef>

+    </sectiondef>

+    <sectiondef kind="public-static-func">

+      <memberdef kind="function" id="struct_foo_1abdf64a71706807b0f946265902c530ee" prot="public" static="yes" const="no" explicit="no" inline="no" virt="non-virtual">

+        <type>

+          <ref refid="struct_foo" kindref="compound">Foo</ref>

+        </type>

+        <definition>static Foo Foo::fun</definition>

+        <argsstring>(Foo a, Foo b)</argsstring>

+        <name>fun</name>

+        <param>

+          <type>

+            <ref refid="struct_foo" kindref="compound">Foo</ref>

+          </type>

+          <declname>a</declname>

+        </param>

+        <param>

+          <type>

+            <ref refid="struct_foo" kindref="compound">Foo</ref>

+          </type>

+          <declname>b</declname>

+        </param>

+        <briefdescription>

+          <para>Fun of two. </para>

+        </briefdescription>

+        <detaileddescription>

+          <para>

+            <itemizedlist>

+              <listitem>

+                <para>

+                  <ref refid="struct_foo_1a978acd73e910ce56cc169ebec8736669" kindref="member">fun() const</ref>

+                </para>

+              </listitem>

+              <listitem>

+                <para>

+                  <ref refid="struct_foo_1a978acd73e910ce56cc169ebec8736669" kindref="member">fun() const</ref>

+                </para>

+              </listitem>

+              <listitem>

+                <para>

+                  <ref refid="struct_foo_1a978acd73e910ce56cc169ebec8736669" kindref="member">title</ref>

+                </para>

+              </listitem>

+            </itemizedlist>

+          </para>

+        </detaileddescription>

+        <inbodydescription>

+        </inbodydescription>

+        <location file="074_ref.cpp" line="29" column="1"/>

+      </memberdef>

+    </sectiondef>

+    <briefdescription>

+      <para><ref refid="struct_foo" kindref="compound">Foo</ref> class. </para>

+    </briefdescription>

+    <detaileddescription>

+      <para>

+        <simplesect kind="see">

+          <para><ref refid="struct_foo_1a5c036d1b3561a0e1beffe8c6799a4276" kindref="member">Foo::Foo()</ref> constructor for details. </para>

+        </simplesect>

+        <simplesect kind="see">

+          <para><ref refid="struct_foo" kindref="compound">Foo</ref> constant. </para>

+        </simplesect>

+        <simplesect kind="see">

+          <para><ref refid="struct_foo_1a279debd94d894223fa8468933e2d6188" kindref="member">less than operator</ref>. </para>

+        </simplesect>

+        <simplesect kind="see">

+          <para><ref refid="struct_foo_1a48bcc3de9b2f1ad09a3518a0c9f0da61" kindref="member">const less than operator</ref>. </para>

+        </simplesect>

+        <simplesect kind="see">

+          <para><ref refid="struct_foo_1a3a41dcf8c53f777d50676ea28400a640" kindref="member">call operator</ref>. </para>

+        </simplesect>

+        <simplesect kind="see">

+          <para><ref refid="struct_foo_1ae3c9c1f33cdb8b932c6eb104660a262b" kindref="member">const call operator</ref>. </para>

+        </simplesect>

+        <simplesect kind="see">

+          <para><ref refid="struct_foo_1aa20bd44b1bb87a652ac65170ddfa1a5a" kindref="member">and equal operator</ref>. </para>

+        </simplesect>

+        <simplesect kind="see">

+          <para><ref refid="struct_foo_1ab1a2a53ad5b2a0f97422630330c151fe" kindref="member">const and equal operator</ref>. </para>

+        </simplesect>

+        <simplesect kind="see">

+          <para><ref refid="struct_foo_1a0514e1f5b30cbf77e1c39d7aba308656" kindref="member">member pointer operator</ref>. </para>

+        </simplesect>

+      </para>

+    </detaileddescription>

+    <location file="074_ref.cpp" line="19" column="1" bodyfile="074_ref.cpp" bodystart="19" bodyend="54"/>

+    <listofallmembers>

+      <member refid="struct_foo_1a5c036d1b3561a0e1beffe8c6799a4276" prot="public" virt="non-virtual">

+        <scope>Foo</scope>

+        <name>Foo</name>

+      </member>

+      <member refid="struct_foo_1abdf64a71706807b0f946265902c530ee" prot="public" virt="non-virtual">

+        <scope>Foo</scope>

+        <name>fun</name>

+      </member>

+      <member refid="struct_foo_1a978acd73e910ce56cc169ebec8736669" prot="public" virt="non-virtual">

+        <scope>Foo</scope>

+        <name>fun</name>

+      </member>

+      <member refid="struct_foo_1aa20bd44b1bb87a652ac65170ddfa1a5a" prot="public" virt="non-virtual">

+        <scope>Foo</scope>

+        <name>operator&amp;=</name>

+      </member>

+      <member refid="struct_foo_1ab1a2a53ad5b2a0f97422630330c151fe" prot="public" virt="non-virtual">

+        <scope>Foo</scope>

+        <name>operator&amp;=</name>

+      </member>

+      <member refid="struct_foo_1a3a41dcf8c53f777d50676ea28400a640" prot="public" virt="non-virtual">

+        <scope>Foo</scope>

+        <name>operator()</name>

+      </member>

+      <member refid="struct_foo_1ae3c9c1f33cdb8b932c6eb104660a262b" prot="public" virt="non-virtual">

+        <scope>Foo</scope>

+        <name>operator()</name>

+      </member>

+      <member refid="struct_foo_1a0514e1f5b30cbf77e1c39d7aba308656" prot="public" virt="non-virtual">

+        <scope>Foo</scope>

+        <name>operator-&gt;*</name>

+      </member>

+      <member refid="struct_foo_1a279debd94d894223fa8468933e2d6188" prot="public" virt="non-virtual">

+        <scope>Foo</scope>

+        <name>operator&lt;&lt;</name>

+      </member>

+      <member refid="struct_foo_1a48bcc3de9b2f1ad09a3518a0c9f0da61" prot="public" virt="non-virtual">

+        <scope>Foo</scope>

+        <name>operator&lt;&lt;</name>

+      </member>

+    </listofallmembers>

+  </compounddef>

+</doxygen>

diff --git a/testing/074_ref.cpp b/testing/074_ref.cpp
index d283907..cc9cf4a 100644
--- a/testing/074_ref.cpp
+++ b/testing/074_ref.cpp
@@ -13,6 +13,7 @@
  *  @see @ref operator()(int) "call operator".
  *  @see @ref operator()(int) const "const call operator".
  *  @see @ref operator&=(const Foo&) "and equal operator".
+ *  @see @ref operator&=(const Foo&) const "const and equal operator".
  *  @see @ref operator->*(int *) "member pointer operator".
  */
 struct Foo {
@@ -43,7 +44,7 @@ struct Foo {
   Foo& operator&=(const Foo& rhs);
 
   /** and equal operator */
-  Foo& operator&=(const Foo& rhs);
+  const Foo& operator&=(const Foo& rhs) const;
 
   /** Member pointer operator */
   int* operator->*(int *p);
diff --git a/testing/runtests.py b/testing/runtests.py
index aa03612..358fb91 100755
--- a/testing/runtests.py
+++ b/testing/runtests.py
@@ -412,7 +412,7 @@ def main():
 			tests.append(glob.glob('0%s_*'%id))
 			tests.append(glob.glob('00%s_*'%id))
 	if (not args.ids and not args.start_id):  # find all tests
-		tests = glob.glob('[0-9][0-9][0-9]_*')
+		tests = sorted(glob.glob('[0-9][0-9][0-9]_*'))
 	else:
 		tests = list(itertools.chain.from_iterable(tests))
 	os.chdir(starting_directory)