Imported Upstream version 1.8.18upstream/1.8.18

79 files changed, 121 insertions, 2521 deletions

diff --git a/testing/009/bug.xml b/testing/009/bug.xml
index ca3a22a..dc7abaf 100644
--- a/testing/009/bug.xml
+++ b/testing/009/bug.xml
@@ -12,7 +12,7 @@
             <term>Class <ref refid="class_bug" kindref="compound">Bug</ref>  </term>
           </varlistentry>
           <listitem>
-            <para><anchor id="bug_1_bug000001"/>Class bug.  </para>
+            <para><anchor id="bug_1_bug000001"/>Class bug. </para>
           </listitem>
           <varlistentry>
             <term>Member <ref refid="class_bug_1a1f720954dd97cd1203e80501a6eae74c" kindref="member">Bug::foo</ref>  ()</term>
diff --git a/testing/009/class_bug.xml b/testing/009/class_bug.xml
index f972b4a..056b405 100644
--- a/testing/009/class_bug.xml
+++ b/testing/009/class_bug.xml
@@ -32,7 +32,7 @@
         </xrefsect>
       </para>
     </detaileddescription>
-    <location file="009_bug.cpp" line="16" column="1" bodyfile="009_bug.cpp" bodystart="15" bodyend="26"/>
+    <location file="009_bug.cpp" line="15" column="1" bodyfile="009_bug.cpp" bodystart="16" bodyend="26"/>
     <listofallmembers>
       <member refid="class_bug_1a1f720954dd97cd1203e80501a6eae74c" prot="public" virt="non-virtual">
         <scope>Bug</scope>
diff --git a/testing/009/class_deprecated.xml b/testing/009/class_deprecated.xml
index 061bb34..32c9ea6 100644
--- a/testing/009/class_deprecated.xml
+++ b/testing/009/class_deprecated.xml
@@ -30,7 +30,7 @@
         </xrefsect>
       </para>
     </detaileddescription>
-    <location file="009_bug.cpp" line="30" column="1" bodyfile="009_bug.cpp" bodystart="29" bodyend="36"/>
+    <location file="009_bug.cpp" line="29" column="1" bodyfile="009_bug.cpp" bodystart="30" bodyend="36"/>
     <listofallmembers>
       <member refid="class_deprecated_1a1d5f6803e72c625727e7083d1722dbf9" prot="public" virt="non-virtual">
         <scope>Deprecated</scope>
diff --git a/testing/009/class_reminder.xml b/testing/009/class_reminder.xml
index bdf2ee0..9bfb4fc 100644
--- a/testing/009/class_reminder.xml
+++ b/testing/009/class_reminder.xml
@@ -37,7 +37,7 @@
         </xrefsect>
       </para>
     </detaileddescription>
-    <location file="009_bug.cpp" line="56" column="1" bodyfile="009_bug.cpp" bodystart="55" bodyend="60"/>
+    <location file="009_bug.cpp" line="55" column="1" bodyfile="009_bug.cpp" bodystart="56" bodyend="60"/>
     <listofallmembers>
       <member refid="class_reminder_1a173b5218bb11287b0e86a550d9f0728d" prot="public" virt="non-virtual">
         <scope>Reminder</scope>
diff --git a/testing/009/class_test.xml b/testing/009/class_test.xml
index 64f287f..a3792a4 100644
--- a/testing/009/class_test.xml
+++ b/testing/009/class_test.xml
@@ -37,7 +37,7 @@
         </xrefsect>
       </para>
     </detaileddescription>
-    <location file="009_bug.cpp" line="48" column="1" bodyfile="009_bug.cpp" bodystart="47" bodyend="52"/>
+    <location file="009_bug.cpp" line="47" column="1" bodyfile="009_bug.cpp" bodystart="48" bodyend="52"/>
     <listofallmembers>
       <member refid="class_test_1a9fc54b716f326514a4c5f434137f4fc0" prot="public" virt="non-virtual">
         <scope>Test</scope>
diff --git a/testing/009/class_todo.xml b/testing/009/class_todo.xml
index a4fed63..adb8b91 100644
--- a/testing/009/class_todo.xml
+++ b/testing/009/class_todo.xml
@@ -37,7 +37,7 @@
         </xrefsect>
       </para>
     </detaileddescription>
-    <location file="009_bug.cpp" line="40" column="1" bodyfile="009_bug.cpp" bodystart="39" bodyend="44"/>
+    <location file="009_bug.cpp" line="39" column="1" bodyfile="009_bug.cpp" bodystart="40" bodyend="44"/>
     <listofallmembers>
       <member refid="class_todo_1a9e70ec9176ac4c1b20e011b4daddc9d8" prot="public" virt="non-virtual">
         <scope>Todo</scope>
diff --git a/testing/009/deprecated.xml b/testing/009/deprecated.xml
index c3fc2a2..e4c5877 100644
--- a/testing/009/deprecated.xml
+++ b/testing/009/deprecated.xml
@@ -12,7 +12,7 @@
             <term>Class <ref refid="class_deprecated" kindref="compound">Deprecated</ref>  </term>
           </varlistentry>
           <listitem>
-            <para><anchor id="deprecated_1_deprecated000001"/>This class is deprecated  </para>
+            <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>
diff --git a/testing/009/reminders.xml b/testing/009/reminders.xml
index 4818541..6bbe18b 100644
--- a/testing/009/reminders.xml
+++ b/testing/009/reminders.xml
@@ -12,7 +12,7 @@
             <term>Class <ref refid="class_reminder" kindref="compound">Reminder</ref>  </term>
           </varlistentry>
           <listitem>
-            <para><anchor id="reminders_1_reminders000001"/> A reminder  </para>
+            <para><anchor id="reminders_1_reminders000001"/> A reminder </para>
           </listitem>
           <varlistentry>
             <term>Member <ref refid="class_reminder_1a173b5218bb11287b0e86a550d9f0728d" kindref="member">Reminder::reminder</ref>  ()</term>
diff --git a/testing/009/test.xml b/testing/009/test.xml
index 665dc0e..c8f104d 100644
--- a/testing/009/test.xml
+++ b/testing/009/test.xml
@@ -12,7 +12,7 @@
             <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>
+            <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>
diff --git a/testing/009/todo.xml b/testing/009/todo.xml
index c3b160f..b31ecae 100644
--- a/testing/009/todo.xml
+++ b/testing/009/todo.xml
@@ -12,7 +12,7 @@
             <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>
+            <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>
diff --git a/testing/011/category_integer_07_arithmetic_08.xml b/testing/011/category_integer_07_arithmetic_08.xml
index 0705628..0d13751 100644
--- a/testing/011/category_integer_07_arithmetic_08.xml
+++ b/testing/011/category_integer_07_arithmetic_08.xml
@@ -45,7 +45,7 @@
     <detaileddescription>
       <para>A category </para>
     </detaileddescription>
-    <location file="011_category.m" line="17" column="19" bodyfile="011_category.m" bodystart="17" bodyend="-1"/>
+    <location file="011_category.m" line="17" column="12" 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>
diff --git a/testing/011/interface_integer.xml b/testing/011/interface_integer.xml
index 21d71fd..7c56077 100644
--- a/testing/011/interface_integer.xml
+++ b/testing/011/interface_integer.xml
@@ -80,7 +80,7 @@
         </childnode>
       </node>
     </collaborationgraph>
-    <location file="011_category.m" line="6" column="26" bodyfile="011_category.m" bodystart="6" bodyend="-1"/>
+    <location file="011_category.m" line="6" column="12" bodyfile="011_category.m" bodystart="6" bodyend="-1"/>
     <listofallmembers>
       <member refid="interface_integer_1a35e89216966d8179a1b77f14b8211fda" prot="protected" virt="non-virtual">
         <scope>Integer</scope>
diff --git a/testing/013/class_t1.xml b/testing/013/class_t1.xml
index ba91621..72fe36a 100644
--- a/testing/013/class_t1.xml
+++ b/testing/013/class_t1.xml
@@ -8,7 +8,7 @@
     <detaileddescription>
       <para>A class </para>
     </detaileddescription>
-    <location file="013_class.h" line="11" column="1" bodyfile="013_class.h" bodystart="10" bodyend="12"/>
+    <location file="013_class.h" line="10" column="1" bodyfile="013_class.h" bodystart="11" bodyend="12"/>
     <listofallmembers>
     </listofallmembers>
   </compounddef>
diff --git a/testing/013/class_t2.xml b/testing/013/class_t2.xml
index 9df47e2..3679110 100644
--- a/testing/013/class_t2.xml
+++ b/testing/013/class_t2.xml
@@ -8,7 +8,7 @@
     <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"/>
+    <location file="013_class.h" line="14" column="1" bodyfile="013_class.h" bodystart="15" bodyend="16"/>
     <listofallmembers>
     </listofallmembers>
   </compounddef>
diff --git a/testing/013/class_t3.xml b/testing/013/class_t3.xml
index dc0cd3f..21f3b86 100644
--- a/testing/013/class_t3.xml
+++ b/testing/013/class_t3.xml
@@ -8,7 +8,7 @@
     <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"/>
+    <location file="013_class.h" line="18" column="1" bodyfile="013_class.h" bodystart="19" bodyend="20"/>
     <listofallmembers>
     </listofallmembers>
   </compounddef>
diff --git a/testing/013/class_t4.xml b/testing/013/class_t4.xml
index 52955d2..3a1013e 100644
--- a/testing/013/class_t4.xml
+++ b/testing/013/class_t4.xml
@@ -8,7 +8,7 @@
     <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"/>
+    <location file="013_class.h" line="22" column="1" bodyfile="013_class.h" bodystart="23" bodyend="24"/>
     <listofallmembers>
     </listofallmembers>
   </compounddef>
diff --git a/testing/018/018__def_8c.xml b/testing/018/018__def_8c.xml
index 837a85a..1bd3d79 100644
--- a/testing/018/018__def_8c.xml
+++ b/testing/018/018__def_8c.xml
@@ -41,7 +41,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="018_def.c" line="13" column="7" bodyfile="018_def.c" bodystart="13" bodyend="13"/>
+        <location file="018_def.c" line="13" column="1" bodyfile="018_def.c" bodystart="13" bodyend="13"/>
       </memberdef>
     </sectiondef>
     <sectiondef kind="typedef">
diff --git a/testing/020/indexpage.xml b/testing/020/indexpage.xml
index 8bfb472..8820cf7 100644
--- a/testing/020/indexpage.xml
+++ b/testing/020/indexpage.xml
@@ -6,9 +6,21 @@
     <briefdescription>
     </briefdescription>
     <detaileddescription>
-      <para>Text.       
+      <para>Text. <htmlonly> 
+HTML
+</htmlonly> <htmlonly block="yes">
+HTML with block
+</htmlonly> <rtfonly> 
+RTF
+</rtfonly> <manonly> 
+Man
+</manonly> <latexonly> 
+LaTeX
+</latexonly>  
 XML
-  More text. </para>
+ <docbookonly> 
+DocBook
+</docbookonly> More text. </para>
     </detaileddescription>
   </compounddef>
 </doxygen>
diff --git a/testing/020_only.dox b/testing/020_only.dox
index f8e2ce1..fc5afc8 100644
--- a/testing/020_only.dox
+++ b/testing/020_only.dox
@@ -1,4 +1,4 @@
-// objective: test the \*only and \*endonly commands
+// objective: test the \*only and \end*only commands
 // check: indexpage.xml
 /** \mainpage
  * Text.
diff --git a/testing/021/indexpage.xml b/testing/021/indexpage.xml
index 3ecbd0a..0647eeb 100644
--- a/testing/021/indexpage.xml
+++ b/testing/021/indexpage.xml
@@ -6,7 +6,7 @@
     <briefdescription>
     </briefdescription>
     <detaileddescription>
-     <para> Our main function starts like this: <programlisting filename="example_test.cpp"><codeline><highlight class="keywordtype">void</highlight><highlight class="normal"><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/><ref refid="class_test" kindref="compound">Test</ref><sp/>t;</highlight></codeline></programlisting> Then we call the example member function <programlisting filename="example_test.cpp"><codeline><highlight class="normal"><sp/><sp/>t.<ref refid="class_test_1a47b775f65718978f1ffcd96376f8ecfa" kindref="member">example</ref>();</highlight></codeline></programlisting> After that our little test routine ends. <programlisting filename="example_test.cpp"><codeline><highlight class="normal">}</highlight></codeline></programlisting> </para>
+      <para> Our main function starts like this: <programlisting filename="example_test.cpp"><codeline><highlight class="keywordtype">void</highlight><highlight class="normal"><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/><ref refid="class_test" kindref="compound">Test</ref><sp/>t;</highlight></codeline></programlisting> Then we call the example member function <programlisting filename="example_test.cpp"><codeline><highlight class="normal"><sp/><sp/>t.<ref refid="class_test_1a47b775f65718978f1ffcd96376f8ecfa" kindref="member">example</ref>();</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>
diff --git a/testing/024/indexpage.xml b/testing/024/indexpage.xml
index 7396177..fd94e77 100644
--- a/testing/024/indexpage.xml
+++ b/testing/024/indexpage.xml
@@ -6,7 +6,21 @@
     <briefdescription>
     </briefdescription>
     <detaileddescription>
-      <para>Unconditional (start) Enabled (if). Enabled (else). Unconditional (middle) Enabled (else). Unconditional (end) </para>
+      <para>Unconditional (start) Enabled (if). Enabled (else). Unconditional (middle) Enabled (else). Unconditional (end)</para>
+      <sect1 id="index_1autotoc_md0">
+        <title>with spaces</title>
+        <para>test1 test3 test4.</para>
+        <para>test1 test2 test4.</para>
+        <para>test1 test2 test3.</para>
+        <para>test1 test3.</para>
+      </sect1>
+      <sect1 id="index_1autotoc_md1">
+        <title>without spaces</title>
+        <para>test1test3test4.</para>
+        <para>test1test2test4.</para>
+        <para>test1test2test3.</para>
+        <para>test1test3. </para>
+      </sect1>
     </detaileddescription>
   </compounddef>
 </doxygen>
diff --git a/testing/024_if.dox b/testing/024_if.dox
index f24be43..281ffe5 100644
--- a/testing/024_if.dox
+++ b/testing/024_if.dox
@@ -18,4 +18,24 @@
  *  Enabled (else).
  *  \endif
  *  Unconditional (end)
+ *
+ *  # with spaces
+ *
+ *  test1 \ifnot GUARD_ENABLED test2 \else test3 \endif test4.
+ *
+ *  test1 \if GUARD_ENABLED test2 \else test3 \endif test4.
+ *
+ *  test1 \if GUARD_ENABLED test2 \endif test3.
+ *
+ *  test1 \if NOT_ENABLED test2 \endif test3.
+ *
+ *  # without spaces
+ *
+ *  test1\ifnot GUARD_ENABLED test2\else test3\endif test4.
+ *
+ *  test1\if GUARD_ENABLED test2\else test3\endif test4.
+ *
+ *  test1\if GUARD_ENABLED test2\endif test3.
+ *
+ *  test1\if NOT_ENABLED test2\endif test3.
  */
diff --git a/testing/025/class_test.xml b/testing/025/class_test.xml
index 7438488..f7ab931 100644
--- a/testing/025/class_test.xml
+++ b/testing/025/class_test.xml
@@ -25,7 +25,7 @@
     <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"/>
+    <location file="025_example.cpp" line="10" column="1" bodyfile="025_example.cpp" bodystart="11" bodyend="18"/>
     <listofallmembers>
       <member refid="class_test_1a47b775f65718978f1ffcd96376f8ecfa" prot="public" virt="non-virtual">
         <scope>Test</scope>
diff --git a/testing/026/class_test.xml b/testing/026/class_test.xml
index 469ba7c..d9a0aba 100644
--- a/testing/026/class_test.xml
+++ b/testing/026/class_test.xml
@@ -41,7 +41,7 @@
       <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"/>
+    <location file="026_exception.cpp" line="8" column="11" bodyfile="026_exception.cpp" bodystart="9" bodyend="20"/>
     <listofallmembers>
       <member refid="class_test_1abf9d5fbdaa4c23d0a513ee9746060779" prot="public" virt="non-virtual">
         <scope>Test</scope>
diff --git a/testing/027/struct_car.xml b/testing/027/struct_car.xml
index b3d9894..c90017a 100644
--- a/testing/027/struct_car.xml
+++ b/testing/027/struct_car.xml
@@ -68,7 +68,7 @@
         </childnode>
       </node>
     </collaborationgraph>
-    <location file="027_extends.c" line="68" column="1" bodyfile="027_extends.c" bodystart="67" bodyend="70"/>
+    <location file="027_extends.c" line="67" column="1" bodyfile="027_extends.c" bodystart="68" bodyend="70"/>
     <listofallmembers>
       <member refid="struct_car_1ab8ff28306286da5a8b14fa9bdccaafaa" prot="protected" virt="non-virtual">
         <scope>Car</scope>
diff --git a/testing/027/struct_object.xml b/testing/027/struct_object.xml
index 754906e..807b0c1 100644
--- a/testing/027/struct_object.xml
+++ b/testing/027/struct_object.xml
@@ -86,7 +86,7 @@
         </childnode>
       </node>
     </inheritancegraph>
-    <location file="027_extends.c" line="20" column="1" bodyfile="027_extends.c" bodystart="19" bodyend="22"/>
+    <location file="027_extends.c" line="19" column="1" bodyfile="027_extends.c" bodystart="20" bodyend="22"/>
     <listofallmembers>
       <member refid="struct_object_1a71225073d06a793b9a6ea9263ed37b12" prot="public" virt="non-virtual">
         <scope>Object</scope>
diff --git a/testing/027/struct_truck.xml b/testing/027/struct_truck.xml
index 0da26dc..b25c20b 100644
--- a/testing/027/struct_truck.xml
+++ b/testing/027/struct_truck.xml
@@ -68,7 +68,7 @@
         <link refid="struct_object"/>
       </node>
     </collaborationgraph>
-    <location file="027_extends.c" line="78" column="1" bodyfile="027_extends.c" bodystart="77" bodyend="80"/>
+    <location file="027_extends.c" line="77" column="1" bodyfile="027_extends.c" bodystart="78" bodyend="80"/>
     <listofallmembers>
       <member refid="struct_truck_1ad0ac321609dda1a6c552488b05ec7ac8" prot="protected" virt="non-virtual">
         <scope>Truck</scope>
diff --git a/testing/027/struct_vehicle.xml b/testing/027/struct_vehicle.xml
index 40c2be2..bab901d 100644
--- a/testing/027/struct_vehicle.xml
+++ b/testing/027/struct_vehicle.xml
@@ -105,7 +105,7 @@
         <link refid="struct_object"/>
       </node>
     </collaborationgraph>
-    <location file="027_extends.c" line="44" column="1" bodyfile="027_extends.c" bodystart="43" bodyend="46"/>
+    <location file="027_extends.c" line="43" column="1" bodyfile="027_extends.c" bodystart="44" bodyend="46"/>
     <listofallmembers>
       <member refid="struct_vehicle_1ad7970f528d429f6fc1725173e93a77c2" prot="protected" virt="non-virtual">
         <scope>Vehicle</scope>
diff --git a/testing/031/indexpage.xml b/testing/031/indexpage.xml
index 2d74510..eaf374b 100644
--- a/testing/031/indexpage.xml
+++ b/testing/031/indexpage.xml
@@ -11,42 +11,42 @@
  <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>
+<image type="html" name="http://img.shields.io/badge/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>
+<image type="html" name="http://img.shields.io/badge/license-MIT-brightgreen.png">A caption</image>
 </para>
       <para>SVG image without caption:<linebreak/>
-<image type="html" name="license-MIT-brightgreen.svg"/>
+<image type="html" name="http://img.shields.io/badge/license-MIT-brightgreen.svg"/>
 </para>
       <para>PNG image without caption:<linebreak/>
-<image type="html" name="license-MIT-brightgreen.png"/>
+<image type="html" name="http://img.shields.io/badge/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>
+This image is inline <image type="html" name="http://img.shields.io/badge/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>
+This image is inline <image type="html" name="http://img.shields.io/badge/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>
+<ulink url="http://opensource.org/licenses/MIT"><image type="html" name="http://img.shields.io/badge/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>
+<ulink url="http://opensource.org/licenses/MIT"><image type="html" name="http://img.shields.io/badge/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>
+<ulink url="http://opensource.org/licenses/MIT"><image type="html" name="http://img.shields.io/badge/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>
+<ulink url="http://opensource.org/licenses/MIT"><image type="html" name="http://img.shields.io/badge/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"/>
+<image type="html" name="http://img.shields.io/badge/license-MIT-brightgreen.svg" inline="yes"/>
 </para>
       <para>HTML style unlinked PNG image:<linebreak/>
-<image type="html" name="license-MIT-brightgreen.png" inline="yes"/>
+<image type="html" name="http://img.shields.io/badge/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"/>
+<image type="html" name="https://img.shields.io/badge/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"/>
+        <image type="html" name="https://img.shields.io/badge/docs-Doxygen-blue.svg?foo&amp;bar" inline="yes"/>
         <ulink url="http://www.doxygen.nl?foo&amp;bar">Some normal link</ulink>
       </para>
     </detaileddescription>
diff --git a/testing/037/class_receiver.xml b/testing/037/class_receiver.xml
index 21156d7..24e82fd 100644
--- a/testing/037/class_receiver.xml
+++ b/testing/037/class_receiver.xml
@@ -32,7 +32,7 @@
 </msc>
  </para>
     </detaileddescription>
-    <location file="037_msc.cpp" line="29" column="1" bodyfile="037_msc.cpp" bodystart="28" bodyend="33"/>
+    <location file="037_msc.cpp" line="28" column="1" bodyfile="037_msc.cpp" bodystart="29" bodyend="33"/>
     <listofallmembers>
       <member refid="class_receiver_1a162099741e0324e6254c9bc570566e40" prot="public" virt="non-virtual">
         <scope>Receiver</scope>
diff --git a/testing/037/class_sender.xml b/testing/037/class_sender.xml
index 53ba04e..525ab0a 100644
--- a/testing/037/class_sender.xml
+++ b/testing/037/class_sender.xml
@@ -32,7 +32,7 @@
 </msc>
  </para>
     </detaileddescription>
-    <location file="037_msc.cpp" line="14" column="1" bodyfile="037_msc.cpp" bodystart="13" bodyend="18"/>
+    <location file="037_msc.cpp" line="13" column="1" bodyfile="037_msc.cpp" bodystart="14" bodyend="18"/>
     <listofallmembers>
       <member refid="class_sender_1a8ad2c6f9baa4e798868fe4a4d45f8fda" prot="public" virt="non-virtual">
         <scope>Sender</scope>
diff --git a/testing/039/class_test.xml b/testing/039/class_test.xml
index ca7ff62..aa409f5 100644
--- a/testing/039/class_test.xml
+++ b/testing/039/class_test.xml
@@ -55,7 +55,7 @@
     <detaileddescription>
       <para>More details about this class. </para>
     </detaileddescription>
-    <location file="039_name.cpp" line="9" column="1" bodyfile="039_name.cpp" bodystart="8" bodyend="24"/>
+    <location file="039_name.cpp" line="8" column="1" bodyfile="039_name.cpp" bodystart="9" bodyend="24"/>
     <listofallmembers>
       <member refid="class_test_1a78e37a450a276b60a5a2fa4a46c86f2e" prot="public" virt="non-virtual">
         <scope>Test</scope>
diff --git a/testing/040/namespace_n_s.xml b/testing/040/namespace_n_s.xml
index 64beb23..7e93ed0 100644
--- a/testing/040/namespace_n_s.xml
+++ b/testing/040/namespace_n_s.xml
@@ -7,6 +7,6 @@
     <detaileddescription>
       <para>A namespace </para>
     </detaileddescription>
-    <location file="040_namespace.cpp" line="5" column="1"/>
+    <location file="040_namespace.cpp" line="4" column="1"/>
   </compounddef>
 </doxygen>
diff --git a/testing/041/class_test.xml b/testing/041/class_test.xml
index c4c1d9c..568f4c3 100644
--- a/testing/041/class_test.xml
+++ b/testing/041/class_test.xml
@@ -81,7 +81,7 @@
     <detaileddescription>
       <para>More text. </para>
     </detaileddescription>
-    <location file="041_overload.cpp" line="5" column="1" bodyfile="041_overload.cpp" bodystart="4" bodyend="10"/>
+    <location file="041_overload.cpp" line="4" column="1" bodyfile="041_overload.cpp" bodystart="5" bodyend="10"/>
     <listofallmembers>
       <member refid="class_test_1a8e7b46ceaf7bd2ab94114b390b3288ca" prot="public" virt="non-virtual">
         <scope>Test</scope>
diff --git a/testing/044/struct_s.xml b/testing/044/struct_s.xml
index 7214f29..b661a85 100644
--- a/testing/044/struct_s.xml
+++ b/testing/044/struct_s.xml
@@ -98,7 +98,7 @@
     <detaileddescription>
       <para>A struct </para>
     </detaileddescription>
-    <location file="044_section.h" line="6" column="1" bodyfile="044_section.h" bodystart="5" bodyend="27"/>
+    <location file="044_section.h" line="5" column="1" bodyfile="044_section.h" bodystart="6" bodyend="27"/>
     <listofallmembers>
       <member refid="struct_s_1ab754fee7e3500035f644d0ac528cbfc3" prot="private" virt="non-virtual">
         <scope>S</scope>
diff --git a/testing/046/class_test.xml b/testing/046/class_test.xml
index 0a9f22c..4885fb1 100644
--- a/testing/046/class_test.xml
+++ b/testing/046/class_test.xml
@@ -61,7 +61,7 @@
       <para>A test class <simplesect kind="see"><para><ref refid="class_test_1a1683da699dc049d74101488d143c8e98" kindref="member">Test::method()</ref></para></simplesect>
 </para>
     </detaileddescription>
-    <location file="046_related.cpp" line="11" column="1" bodyfile="046_related.cpp" bodystart="10" bodyend="15"/>
+    <location file="046_related.cpp" line="10" column="1" bodyfile="046_related.cpp" bodystart="11" bodyend="15"/>
     <listofallmembers>
       <member refid="class_test_1a1283d836e0611ff772c1b06a31ecbbfe" prot="public" virt="non-virtual">
         <scope>Test</scope>
diff --git a/testing/057/057__caller__graphs_8tcl.xml b/testing/057/057__caller__graphs_8tcl.xml
deleted file mode 100644
index 1046e30..0000000
--- a/testing/057/057__caller__graphs_8tcl.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?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="057__caller__graphs_8tcl" kind="file" language="Tcl">
-    <compoundname>057_caller_graphs.tcl</compoundname>
-    <innernamespace refid="namespacebar">bar</innernamespace>
-    <innernamespace refid="namespacefoo">foo</innernamespace>
-    <innernamespace refid="namespace1_1_11_1_11">1::1::1</innernamespace>
-    <innernamespace refid="namespace1">1</innernamespace>
-    <innernamespace refid="namespace1_1_11">1::1</innernamespace>
-    <innernamespace refid="namespace2_1_12_1_12_1_12_1_12">2::2::2::2::2</innernamespace>
-    <innernamespace refid="namespace2">2</innernamespace>
-    <innernamespace refid="namespace2_1_12">2::2</innernamespace>
-    <innernamespace refid="namespace2_1_12_1_12">2::2::2</innernamespace>
-    <innernamespace refid="namespace2_1_12_1_12_1_12">2::2::2::2</innernamespace>
-    <sectiondef kind="func">
-      <memberdef kind="function" id="057__caller__graphs_8tcl_1a85c692c418fec91930cfc7b3e82857d7" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>baz</definition>
-        <argsstring>args</argsstring>
-        <name>baz</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="057_caller_graphs.tcl" line="59" column="1" bodyfile="057_caller_graphs.tcl" bodystart="59" bodyend="61"/>
-      </memberdef>
-      <memberdef kind="function" id="057__caller__graphs_8tcl_1ae4e1c2bb3adfdfbb71f52de84a8285b0" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>bar</definition>
-        <argsstring>args</argsstring>
-        <name>bar</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="057_caller_graphs.tcl" line="65" column="1" bodyfile="057_caller_graphs.tcl" bodystart="65" bodyend="67"/>
-        <referencedby refid="namespace1_1a9722420639306872cea2593b83028a45" compoundref="057__caller__graphs_8tcl" startline="85" endline="88">1::test3</referencedby>
-      </memberdef>
-      <memberdef kind="function" id="057__caller__graphs_8tcl_1a3f808a00e1b937978455d707851ab33a" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>next</definition>
-        <argsstring>args</argsstring>
-        <name>next</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="057_caller_graphs.tcl" line="102" column="1" bodyfile="057_caller_graphs.tcl" bodystart="102" bodyend="105"/>
-        <references refid="namespace2_1a2839d9dea7f0d08f48958c3fc0cd00d3" compoundref="057__caller__graphs_8tcl" startline="106" endline="114">2::next</references>
-      </memberdef>
-      <memberdef kind="function" id="057__caller__graphs_8tcl_1a12acb916374f925e7b7ba302a1ca4efb" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>master</definition>
-        <argsstring>args</argsstring>
-        <name>master</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="057_caller_graphs.tcl" line="136" column="1" bodyfile="057_caller_graphs.tcl" bodystart="136" bodyend="140"/>
-        <references refid="__057__caller__graphs_8tcl_1a7c3c8acee94bf61ba9e911dafe35adac" compoundref="__057__caller__graphs_8tcl" startline="1" endline="4">inFileB</references>
-      </memberdef>
-      <memberdef kind="function" id="057__caller__graphs_8tcl_1a7482c00c17357cf4846b0c1bd715979c" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>inFileA</definition>
-        <argsstring>args</argsstring>
-        <name>inFileA</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="057_caller_graphs.tcl" line="141" column="1" bodyfile="057_caller_graphs.tcl" bodystart="141" bodyend="144"/>
-        <referencedby refid="__057__caller__graphs_8tcl_1a7c3c8acee94bf61ba9e911dafe35adac" compoundref="__057__caller__graphs_8tcl" startline="1" endline="4">inFileB</referencedby>
-      </memberdef>
-    </sectiondef>
-    <briefdescription>
-    </briefdescription>
-    <detaileddescription>
-    </detaileddescription>
-    <location file="057_caller_graphs.tcl"/>
-  </compounddef>
-</doxygen>
diff --git a/testing/057/__057__caller__graphs_8tcl.xml b/testing/057/__057__caller__graphs_8tcl.xml
deleted file mode 100644
index a71e7b5..0000000
--- a/testing/057/__057__caller__graphs_8tcl.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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="__057__caller__graphs_8tcl" kind="file" language="Tcl">
-    <compoundname>_057_caller_graphs.tcl</compoundname>
-    <sectiondef kind="func">
-      <memberdef kind="function" id="__057__caller__graphs_8tcl_1a7c3c8acee94bf61ba9e911dafe35adac" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>inFileB</definition>
-        <argsstring>args</argsstring>
-        <name>inFileB</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="_057_caller_graphs.tcl" line="1" column="1" bodyfile="_057_caller_graphs.tcl" bodystart="1" bodyend="4"/>
-        <references refid="057__caller__graphs_8tcl_1a7482c00c17357cf4846b0c1bd715979c" compoundref="057__caller__graphs_8tcl" startline="141" endline="144">inFileA</references>
-        <referencedby refid="057__caller__graphs_8tcl_1a12acb916374f925e7b7ba302a1ca4efb" compoundref="057__caller__graphs_8tcl" startline="136" endline="140">master</referencedby>
-      </memberdef>
-    </sectiondef>
-    <briefdescription>
-    </briefdescription>
-    <detaileddescription>
-    </detaileddescription>
-    <location file="_057_caller_graphs.tcl"/>
-  </compounddef>
-</doxygen>
diff --git a/testing/057/namespace1.xml b/testing/057/namespace1.xml
deleted file mode 100644
index 33d073d..0000000
--- a/testing/057/namespace1.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?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="namespace1" kind="namespace" language="Tcl">
-    <compoundname>1</compoundname>
-    <innernamespace refid="namespace1_1_11">1::1</innernamespace>
-    <sectiondef kind="func">
-      <memberdef kind="function" id="namespace1_1a5024a7bc323958c7230615f2fcaeaef8" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>1::baz</definition>
-        <argsstring>args</argsstring>
-        <name>baz</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="057_caller_graphs.tcl" line="62" column="1" bodyfile="057_caller_graphs.tcl" bodystart="62" bodyend="64"/>
-        <referencedby refid="namespace1_1a4a8285288ee1994ac886e2039777339e" compoundref="057__caller__graphs_8tcl" startline="77" endline="80">test1</referencedby>
-        <referencedby refid="namespace1_1a11615154d3c207ed4106dd0bcb0639e8" compoundref="057__caller__graphs_8tcl" startline="93" endline="96">test5</referencedby>
-      </memberdef>
-      <memberdef kind="function" id="namespace1_1ad58c8f16ad5f12178c71ca988865bb58" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>1::bar</definition>
-        <argsstring>args</argsstring>
-        <name>bar</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="057_caller_graphs.tcl" line="68" column="1" bodyfile="057_caller_graphs.tcl" bodystart="68" bodyend="70"/>
-        <referencedby refid="namespace1_1ae1e88bb7ddd332348d7e29ac4a211b00" compoundref="057__caller__graphs_8tcl" startline="81" endline="84">test2</referencedby>
-      </memberdef>
-      <memberdef kind="function" id="namespace1_1a4a8285288ee1994ac886e2039777339e" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>1::test1</definition>
-        <argsstring>args</argsstring>
-        <name>test1</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="057_caller_graphs.tcl" line="77" column="1" bodyfile="057_caller_graphs.tcl" bodystart="77" bodyend="80"/>
-        <references refid="namespace1_1a5024a7bc323958c7230615f2fcaeaef8" compoundref="057__caller__graphs_8tcl" startline="62" endline="64">baz</references>
-      </memberdef>
-      <memberdef kind="function" id="namespace1_1ae1e88bb7ddd332348d7e29ac4a211b00" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>1::test2</definition>
-        <argsstring>args</argsstring>
-        <name>test2</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="057_caller_graphs.tcl" line="81" column="1" bodyfile="057_caller_graphs.tcl" bodystart="81" bodyend="84"/>
-        <references refid="namespace1_1ad58c8f16ad5f12178c71ca988865bb58" compoundref="057__caller__graphs_8tcl" startline="68" endline="70">bar</references>
-      </memberdef>
-      <memberdef kind="function" id="namespace1_1a9722420639306872cea2593b83028a45" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>1::test3</definition>
-        <argsstring>args</argsstring>
-        <name>test3</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="057_caller_graphs.tcl" line="85" column="1" bodyfile="057_caller_graphs.tcl" bodystart="85" bodyend="88"/>
-        <references refid="057__caller__graphs_8tcl_1ae4e1c2bb3adfdfbb71f52de84a8285b0" compoundref="057__caller__graphs_8tcl" startline="65" endline="67">bar</references>
-      </memberdef>
-      <memberdef kind="function" id="namespace1_1addc9b30656419de5e2651e27a013db29" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>1::test4</definition>
-        <argsstring>args</argsstring>
-        <name>test4</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="057_caller_graphs.tcl" line="89" column="1" bodyfile="057_caller_graphs.tcl" bodystart="89" bodyend="92"/>
-        <references refid="namespace1_1_11_1acebecc4cb718010d00c3c150158b75ab" compoundref="057__caller__graphs_8tcl" startline="71" endline="73">1::1::bar</references>
-      </memberdef>
-      <memberdef kind="function" id="namespace1_1a11615154d3c207ed4106dd0bcb0639e8" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>1::test5</definition>
-        <argsstring>args</argsstring>
-        <name>test5</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="057_caller_graphs.tcl" line="93" column="1" bodyfile="057_caller_graphs.tcl" bodystart="93" bodyend="96"/>
-        <references refid="namespace1_1a5024a7bc323958c7230615f2fcaeaef8" compoundref="057__caller__graphs_8tcl" startline="62" endline="64">baz</references>
-      </memberdef>
-    </sectiondef>
-    <briefdescription>
-    </briefdescription>
-    <detaileddescription>
-    </detaileddescription>
-    <location file="[generated]" line="1" column="1"/>
-  </compounddef>
-</doxygen>
diff --git a/testing/057/namespace1_1_11.xml b/testing/057/namespace1_1_11.xml
deleted file mode 100644
index e13e261..0000000
--- a/testing/057/namespace1_1_11.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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="namespace1_1_11" kind="namespace" language="Tcl">
-    <compoundname>1::1</compoundname>
-    <innernamespace refid="namespace1_1_11_1_11">1::1::1</innernamespace>
-    <sectiondef kind="func">
-      <memberdef kind="function" id="namespace1_1_11_1acebecc4cb718010d00c3c150158b75ab" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>1::1::bar</definition>
-        <argsstring>args</argsstring>
-        <name>bar</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="057_caller_graphs.tcl" line="71" column="1" bodyfile="057_caller_graphs.tcl" bodystart="71" bodyend="73"/>
-        <referencedby refid="namespace1_1addc9b30656419de5e2651e27a013db29" compoundref="057__caller__graphs_8tcl" startline="89" endline="92">1::test4</referencedby>
-      </memberdef>
-    </sectiondef>
-    <briefdescription>
-    </briefdescription>
-    <detaileddescription>
-    </detaileddescription>
-    <location file="[generated]" line="1" column="1"/>
-  </compounddef>
-</doxygen>
diff --git a/testing/057/namespace1_1_11_1_11.xml b/testing/057/namespace1_1_11_1_11.xml
deleted file mode 100644
index 55b7838..0000000
--- a/testing/057/namespace1_1_11_1_11.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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="namespace1_1_11_1_11" kind="namespace" language="Tcl">
-    <compoundname>1::1::1</compoundname>
-    <sectiondef kind="func">
-      <memberdef kind="function" id="namespace1_1_11_1_11_1aa604df053f7ebe36205d1a5675459b96" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>1::1::1::bar</definition>
-        <argsstring>args</argsstring>
-        <name>bar</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="057_caller_graphs.tcl" line="74" column="1" bodyfile="057_caller_graphs.tcl" bodystart="74" bodyend="76"/>
-      </memberdef>
-    </sectiondef>
-    <briefdescription>
-    </briefdescription>
-    <detaileddescription>
-    </detaileddescription>
-    <location file="057_caller_graphs.tcl" line="58" column="1"/>
-  </compounddef>
-</doxygen>
diff --git a/testing/057/namespace2.xml b/testing/057/namespace2.xml
deleted file mode 100644
index a8a9bc6..0000000
--- a/testing/057/namespace2.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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="namespace2" kind="namespace" language="Tcl">
-    <compoundname>2</compoundname>
-    <innernamespace refid="namespace2_1_12">2::2</innernamespace>
-    <sectiondef kind="func">
-      <memberdef kind="function" id="namespace2_1a2839d9dea7f0d08f48958c3fc0cd00d3" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>2::next</definition>
-        <argsstring>args</argsstring>
-        <name>next</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="057_caller_graphs.tcl" line="106" column="1" bodyfile="057_caller_graphs.tcl" bodystart="106" bodyend="114"/>
-        <references refid="namespace2_1_12_1aceefa876cf364f44da1f523d3f7b0649" compoundref="057__caller__graphs_8tcl" startline="115" endline="118">2::2::next</references>
-        <referencedby refid="057__caller__graphs_8tcl_1a3f808a00e1b937978455d707851ab33a" compoundref="057__caller__graphs_8tcl" startline="102" endline="105">next</referencedby>
-        <referencedby refid="namespace2_1_12_1_12_1_12_1_12_1ac07f64c62783fd8b44317389b4a711f8" compoundref="057__caller__graphs_8tcl" startline="127" endline="130">2::2::2::2::2::next</referencedby>
-      </memberdef>
-    </sectiondef>
-    <briefdescription>
-    </briefdescription>
-    <detaileddescription>
-    </detaileddescription>
-    <location file="[generated]" line="1" column="1"/>
-  </compounddef>
-</doxygen>
diff --git a/testing/057/namespace2_1_12.xml b/testing/057/namespace2_1_12.xml
deleted file mode 100644
index a188f00..0000000
--- a/testing/057/namespace2_1_12.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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="namespace2_1_12" kind="namespace" language="Tcl">
-    <compoundname>2::2</compoundname>
-    <innernamespace refid="namespace2_1_12_1_12">2::2::2</innernamespace>
-    <sectiondef kind="func">
-      <memberdef kind="function" id="namespace2_1_12_1aceefa876cf364f44da1f523d3f7b0649" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>2::2::next</definition>
-        <argsstring>args</argsstring>
-        <name>next</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="057_caller_graphs.tcl" line="115" column="1" bodyfile="057_caller_graphs.tcl" bodystart="115" bodyend="118"/>
-        <references refid="namespace2_1_12_1_12_1a85524e2015e377d433cd8384335c11d6" compoundref="057__caller__graphs_8tcl" startline="119" endline="122">2::2::2::next</references>
-        <referencedby refid="namespace2_1a2839d9dea7f0d08f48958c3fc0cd00d3" compoundref="057__caller__graphs_8tcl" startline="106" endline="114">2::next</referencedby>
-      </memberdef>
-    </sectiondef>
-    <briefdescription>
-    </briefdescription>
-    <detaileddescription>
-    </detaileddescription>
-    <location file="[generated]" line="1" column="1"/>
-  </compounddef>
-</doxygen>
diff --git a/testing/057/namespace2_1_12_1_12.xml b/testing/057/namespace2_1_12_1_12.xml
deleted file mode 100644
index e83b3fd..0000000
--- a/testing/057/namespace2_1_12_1_12.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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="namespace2_1_12_1_12" kind="namespace" language="Tcl">
-    <compoundname>2::2::2</compoundname>
-    <innernamespace refid="namespace2_1_12_1_12_1_12">2::2::2::2</innernamespace>
-    <sectiondef kind="func">
-      <memberdef kind="function" id="namespace2_1_12_1_12_1a85524e2015e377d433cd8384335c11d6" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>2::2::2::next</definition>
-        <argsstring>args</argsstring>
-        <name>next</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="057_caller_graphs.tcl" line="119" column="1" bodyfile="057_caller_graphs.tcl" bodystart="119" bodyend="122"/>
-        <references refid="namespace2_1_12_1_12_1_12_1a3ea6e2ce66f4a9c30009852e4c7da2fe" compoundref="057__caller__graphs_8tcl" startline="123" endline="126">2::2::2::2::next</references>
-        <referencedby refid="namespace2_1_12_1aceefa876cf364f44da1f523d3f7b0649" compoundref="057__caller__graphs_8tcl" startline="115" endline="118">2::2::next</referencedby>
-      </memberdef>
-    </sectiondef>
-    <briefdescription>
-    </briefdescription>
-    <detaileddescription>
-    </detaileddescription>
-    <location file="[generated]" line="1" column="1"/>
-  </compounddef>
-</doxygen>
diff --git a/testing/057/namespace2_1_12_1_12_1_12.xml b/testing/057/namespace2_1_12_1_12_1_12.xml
deleted file mode 100644
index 83c2a73..0000000
--- a/testing/057/namespace2_1_12_1_12_1_12.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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="namespace2_1_12_1_12_1_12" kind="namespace" language="Tcl">
-    <compoundname>2::2::2::2</compoundname>
-    <innernamespace refid="namespace2_1_12_1_12_1_12_1_12">2::2::2::2::2</innernamespace>
-    <sectiondef kind="func">
-      <memberdef kind="function" id="namespace2_1_12_1_12_1_12_1a3ea6e2ce66f4a9c30009852e4c7da2fe" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>2::2::2::2::next</definition>
-        <argsstring>args</argsstring>
-        <name>next</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="057_caller_graphs.tcl" line="123" column="1" bodyfile="057_caller_graphs.tcl" bodystart="123" bodyend="126"/>
-        <references refid="namespace2_1_12_1_12_1_12_1_12_1ac07f64c62783fd8b44317389b4a711f8" compoundref="057__caller__graphs_8tcl" startline="127" endline="130">2::2::2::2::2::next</references>
-        <referencedby refid="namespace2_1_12_1_12_1a85524e2015e377d433cd8384335c11d6" compoundref="057__caller__graphs_8tcl" startline="119" endline="122">2::2::2::next</referencedby>
-      </memberdef>
-    </sectiondef>
-    <briefdescription>
-    </briefdescription>
-    <detaileddescription>
-    </detaileddescription>
-    <location file="[generated]" line="1" column="1"/>
-  </compounddef>
-</doxygen>
diff --git a/testing/057/namespace2_1_12_1_12_1_12_1_12.xml b/testing/057/namespace2_1_12_1_12_1_12_1_12.xml
deleted file mode 100644
index 9222625..0000000
--- a/testing/057/namespace2_1_12_1_12_1_12_1_12.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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="namespace2_1_12_1_12_1_12_1_12" kind="namespace" language="Tcl">
-    <compoundname>2::2::2::2::2</compoundname>
-    <sectiondef kind="func">
-      <memberdef kind="function" id="namespace2_1_12_1_12_1_12_1_12_1ac07f64c62783fd8b44317389b4a711f8" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>2::2::2::2::2::next</definition>
-        <argsstring>args</argsstring>
-        <name>next</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="057_caller_graphs.tcl" line="127" column="1" bodyfile="057_caller_graphs.tcl" bodystart="127" bodyend="130"/>
-        <references refid="namespace2_1a2839d9dea7f0d08f48958c3fc0cd00d3" compoundref="057__caller__graphs_8tcl" startline="106" endline="114">2::next</references>
-        <referencedby refid="namespace2_1_12_1_12_1_12_1a3ea6e2ce66f4a9c30009852e4c7da2fe" compoundref="057__caller__graphs_8tcl" startline="123" endline="126">2::2::2::2::next</referencedby>
-      </memberdef>
-    </sectiondef>
-    <briefdescription>
-    </briefdescription>
-    <detaileddescription>
-    </detaileddescription>
-    <location file="057_caller_graphs.tcl" line="101" column="1"/>
-  </compounddef>
-</doxygen>
diff --git a/testing/057/namespacebar.xml b/testing/057/namespacebar.xml
deleted file mode 100644
index e16966e..0000000
--- a/testing/057/namespacebar.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?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="namespacebar" kind="namespace" language="Tcl">
-    <compoundname>bar</compoundname>
-    <sectiondef kind="func">
-      <memberdef kind="function" id="namespacebar_1aa1678a9adb588c0b91b118de7cc38ddb" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>bar::slave</definition>
-        <argsstring/>
-        <name>slave</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="057_caller_graphs.tcl" line="29" column="1" bodyfile="057_caller_graphs.tcl" bodystart="29" bodyend="35"/>
-        <references refid="namespacebar_1a3426cd3a2eebcffa0dc333bcf5e2fe5e" compoundref="057__caller__graphs_8tcl" startline="36" endline="39">baz</references>
-        <referencedby refid="namespacefoo_1a265acdcaea6da32c3bbd9afb5d0e32a4" compoundref="057__caller__graphs_8tcl" startline="44" endline="48">foo::master</referencedby>
-      </memberdef>
-      <memberdef kind="function" id="namespacebar_1a3426cd3a2eebcffa0dc333bcf5e2fe5e" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>bar::baz</definition>
-        <argsstring/>
-        <name>baz</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="057_caller_graphs.tcl" line="36" column="1" bodyfile="057_caller_graphs.tcl" bodystart="36" bodyend="39"/>
-        <references refid="namespacebar_1a88879545dee287d377e638b87cdf6dd7" compoundref="057__caller__graphs_8tcl" startline="40" endline="42">bazbaz</references>
-        <referencedby refid="namespacebar_1aa1678a9adb588c0b91b118de7cc38ddb" compoundref="057__caller__graphs_8tcl" startline="29" endline="35">slave</referencedby>
-      </memberdef>
-      <memberdef kind="function" id="namespacebar_1a88879545dee287d377e638b87cdf6dd7" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>bar::bazbaz</definition>
-        <argsstring/>
-        <name>bazbaz</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="057_caller_graphs.tcl" line="40" column="1" bodyfile="057_caller_graphs.tcl" bodystart="40" bodyend="42"/>
-        <referencedby refid="namespacebar_1a3426cd3a2eebcffa0dc333bcf5e2fe5e" compoundref="057__caller__graphs_8tcl" startline="36" endline="39">baz</referencedby>
-      </memberdef>
-    </sectiondef>
-    <briefdescription>
-    </briefdescription>
-    <detaileddescription>
-    </detaileddescription>
-    <location file="057_caller_graphs.tcl" line="28" column="1"/>
-  </compounddef>
-</doxygen>
diff --git a/testing/057/namespacefoo.xml b/testing/057/namespacefoo.xml
deleted file mode 100644
index 8d0ac75..0000000
--- a/testing/057/namespacefoo.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?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="namespacefoo" kind="namespace" language="Tcl">
-    <compoundname>foo</compoundname>
-    <sectiondef kind="func">
-      <memberdef kind="function" id="namespacefoo_1a265acdcaea6da32c3bbd9afb5d0e32a4" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>foo::master</definition>
-        <argsstring/>
-        <name>master</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="057_caller_graphs.tcl" line="44" column="1" bodyfile="057_caller_graphs.tcl" bodystart="44" bodyend="48"/>
-        <references refid="namespacebar_1aa1678a9adb588c0b91b118de7cc38ddb" compoundref="057__caller__graphs_8tcl" startline="29" endline="35">bar::slave</references>
-      </memberdef>
-    </sectiondef>
-    <briefdescription>
-    </briefdescription>
-    <detaileddescription>
-    </detaileddescription>
-    <location file="057_caller_graphs.tcl" line="43" column="1"/>
-  </compounddef>
-</doxygen>
diff --git a/testing/057_caller_graphs.tcl b/testing/057_caller_graphs.tcl
deleted file mode 100644
index 464d8aa..0000000
--- a/testing/057_caller_graphs.tcl
+++ /dev/null
@@ -1,155 +0,0 @@
-#// objective: test for completeness and correctness of references/referencedby relations 
-#// check: 057__caller__graphs_8tcl.xml
-#// check: __057__caller__graphs_8tcl.xml
-#// check: namespacebar.xml
-#// check: namespacefoo.xml
-#// check: namespace1.xml
-#// check: namespace1_1_11.xml
-#// check: namespace1_1_11_1_11.xml
-#// check: namespace2.xml
-#// check: namespace2_1_12.xml
-#// check: namespace2_1_12_1_12.xml
-#// check: namespace2_1_12_1_12_1_12.xml
-#// check: namespace2_1_12_1_12_1_12_1_12.xml
-#// config: EXTRACT_ALL = yes
-#// config: INLINE_SOURCES = no
-#// config: REFERENCED_BY_RELATION = yes
-#// config: REFERENCES_RELATION = yes
-#// config: INPUT = $INPUTDIR/057_caller_graphs.tcl $INPUTDIR/_057_caller_graphs.tcl
-# config: HAVE_DOT = yes
-# config: CALLER_GRAPH = yes
-# config: CALL_GRAPH = yes
-# config: GENERATE_HTML = yes
-
-# This is a stripped down example from my code.
-# Doxygen 1.8.7 generates the correct relations (xml)
-# but caller graphs will be incomplete.
-# It does not generate any relations at all if INLINE_SOURCES = no.
-namespace eval bar {}
-proc bar::slave { } {
-    array set info [info frame 0]; puts -nonewline ->$info(proc)
-    if {1} then {
-        bar::baz
-    }
-    return 
-}
-proc bar::baz {} {
-    array set info [info frame 0]; puts -nonewline ->$info(proc)
-    bar::bazbaz
-}
-proc bar::bazbaz {} {
-    array set info [info frame 0]; puts -nonewline ->$info(proc)
-}
-namespace eval foo {}
-proc foo::master {  } {
-    array set info [info frame 0]; puts -nonewline $info(proc)
-    bar::slave
-    return
-}
-#
-# now we check tcl's rules: from the help
-# NAME RESOLUTION
-#... Command names are also always resolved by looking in the current
-#namespace first. If not found there, they are searched for in every namespace on
-#the current namespace's command path (which is empty by default). If not found
-#there, command names are looked up in the global namespace (or, failing that,
-#are processed by the unknown command.) ...
-#
-namespace eval ::1::1::1 {}
-proc ::baz args {
-    array set info [info frame 0]; puts -nonewline ->$info(proc)
-}
-proc ::1::baz args {
-    array set info [info frame 0]; puts -nonewline ->$info(proc)
-}
-proc ::bar args {
-    array set info [info frame 0]; puts -nonewline ->$info(proc)
-}
-proc ::1::bar args {
-    array set info [info frame 0]; puts -nonewline ->$info(proc)
-}
-proc ::1::1::bar args {
-    array set info [info frame 0]; puts -nonewline ->$info(proc)
-}
-proc ::1::1::1::bar args {
-    array set info [info frame 0]; puts -nonewline ->$info(proc)
-}
-proc ::1::test1 args {
-    array set info [info frame 0]; puts -nonewline $info(proc)
-    baz
-}
-proc ::1::test2 args {
-    array set info [info frame 0]; puts -nonewline $info(proc)
-    bar
-}
-proc ::1::test3 args {
-    array set info [info frame 0]; puts -nonewline $info(proc)
-    ::bar
-}
-proc ::1::test4 args {
-    array set info [info frame 0]; puts -nonewline $info(proc)
-    1::bar
-}
-proc ::1::test5 args {
-    array set info [info frame 0]; puts -nonewline $info(proc)
-    1::baz
-}
-#
-# funny example, do you see the infinite loop?
-# we stop before the interpreter crashes
-set ::countdown 10
-namespace eval ::2::2::2::2::2 {}
-proc ::next args {
-    array set info [info frame 0]; puts $info(proc)
-    2::next
-}
-proc ::2::next args {
-    array set info [info frame 0]; puts $info(proc)
-    incr ::countdown -1
-    if {$::countdown>0} then {
-        2::next
-    } else {
-        puts "stop after 10 rounds."
-    }
-}
-proc ::2::2::next args {
-    array set info [info frame 0]; puts $info(proc)
-    2::next
-}
-proc ::2::2::2::next args {
-    array set info [info frame 0]; puts $info(proc)
-    2::next
-}
-proc ::2::2::2::2::next args {
-    array set info [info frame 0]; puts $info(proc)
-    2::next
-}
-proc ::2::2::2::2::2::next args {
-    array set info [info frame 0]; puts $info(proc)
-    2::next
-}
-#
-# cross check with two files
-# If doxygen did not do two passes, then xrefs would depend on file order
-# and would be incomplete.
-source _057_caller_graphs.tcl
-proc master args {
-    array set info [info frame 0]; puts -nonewline ->$info(proc)
-    inFileB
-    return
-}
-proc inFileA args {
-    array set info [info frame 0]; puts -nonewline ->$info(proc)
-    return
-}
-# now, check with tcl what is called
-foo::master
-puts ""
-foreach proc [lsort [info procs ::1::test?]] {
-    $proc
-    puts ""
-}
-::next
-master
-exit
-
diff --git a/testing/058/058__bracket__recursion_8tcl.xml b/testing/058/058__bracket__recursion_8tcl.xml
deleted file mode 100644
index 0381b83..0000000
--- a/testing/058/058__bracket__recursion_8tcl.xml
+++ /dev/null
@@ -1,384 +0,0 @@
-<?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="058__bracket__recursion_8tcl" kind="file" language="Tcl">
-    <compoundname>058_bracket_recursion.tcl</compoundname>
-    <sectiondef kind="func">
-      <memberdef kind="function" id="058__bracket__recursion_8tcl_1aa889853547f65a22ae133cd57ff89601" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>Invoked</definition>
-        <argsstring>args</argsstring>
-        <name>Invoked</name>
-        <briefdescription>
-          <para>should be reference by every proc below </para>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="058_bracket_recursion.tcl" line="10" column="1" bodyfile="058_bracket_recursion.tcl" bodystart="10" bodyend="13"/>
-        <referencedby refid="058__bracket__recursion_8tcl_1ab08ae027fc5777bc4f0629f1b60b35db" compoundref="058__bracket__recursion_8tcl" startline="22" endline="25">a</referencedby>
-        <referencedby refid="058__bracket__recursion_8tcl_1a68bdb74c144118d936931c46f75d4b3e" compoundref="058__bracket__recursion_8tcl" startline="28" endline="32">b</referencedby>
-        <referencedby refid="058__bracket__recursion_8tcl_1ab14f56bc3bd7680490ece4ad7815465f" compoundref="058__bracket__recursion_8tcl" startline="33" endline="37">c</referencedby>
-        <referencedby refid="058__bracket__recursion_8tcl_1af43f4b1f0064a33b2d662af9f06d3a00" compoundref="058__bracket__recursion_8tcl" startline="38" endline="42">d</referencedby>
-        <referencedby refid="058__bracket__recursion_8tcl_1aff65a51a703804e0ad1adbcfd76c86f8" compoundref="058__bracket__recursion_8tcl" startline="43" endline="46">e</referencedby>
-        <referencedby refid="058__bracket__recursion_8tcl_1af6830d2c644b45088ea8f1f74a46b778" compoundref="058__bracket__recursion_8tcl" startline="47" endline="50">f</referencedby>
-        <referencedby refid="058__bracket__recursion_8tcl_1af08b4b5bfa9edf0b0a7dee1c2b2c29e0" compoundref="058__bracket__recursion_8tcl" startline="51" endline="55">g</referencedby>
-        <referencedby refid="058__bracket__recursion_8tcl_1af96fd0966e32a310a0778d2e5c357700" compoundref="058__bracket__recursion_8tcl" startline="56" endline="59">h</referencedby>
-        <referencedby refid="058__bracket__recursion_8tcl_1a8c90afd4641b25be86bd09983c3cbee0" compoundref="058__bracket__recursion_8tcl" startline="64" endline="68">i</referencedby>
-        <referencedby refid="058__bracket__recursion_8tcl_1a2aaa92757686acea102cba3475f0c13b" compoundref="058__bracket__recursion_8tcl" startline="69" endline="73">j</referencedby>
-        <referencedby refid="058__bracket__recursion_8tcl_1a20363f854eb4098a446733d63d34dbc1" compoundref="058__bracket__recursion_8tcl" startline="74" endline="77">k</referencedby>
-        <referencedby refid="058__bracket__recursion_8tcl_1aff56f84b49947b84b2a304f51cf8e678" compoundref="058__bracket__recursion_8tcl" startline="78" endline="81">l</referencedby>
-        <referencedby refid="058__bracket__recursion_8tcl_1a78d127e8bda64d4471ac811ad512fbd9" compoundref="058__bracket__recursion_8tcl" startline="82" endline="85">m</referencedby>
-        <referencedby refid="058__bracket__recursion_8tcl_1acdde3cd86eb2421ce8dbb2e85227d368" compoundref="058__bracket__recursion_8tcl" startline="86" endline="89">n</referencedby>
-        <referencedby refid="058__bracket__recursion_8tcl_1a495e7a4ede0831107e9d435080a7c268" compoundref="058__bracket__recursion_8tcl" startline="90" endline="94">o</referencedby>
-        <referencedby refid="058__bracket__recursion_8tcl_1a15229b450f26d8fa1c10bea4f3279f4d" compoundref="058__bracket__recursion_8tcl" startline="102" endline="107">p</referencedby>
-        <referencedby refid="058__bracket__recursion_8tcl_1ab678a0a9a7e94bce5b17141f40220d88" compoundref="058__bracket__recursion_8tcl" startline="108" endline="114">q</referencedby>
-        <referencedby refid="058__bracket__recursion_8tcl_1a0a0bd3dc69dd06934c4e6362155e0ace" compoundref="058__bracket__recursion_8tcl" startline="115" endline="120">r</referencedby>
-        <referencedby refid="058__bracket__recursion_8tcl_1a011c73f2dbb87635a3b4206c72355f6e" compoundref="058__bracket__recursion_8tcl" startline="121" endline="126">s</referencedby>
-        <referencedby refid="058__bracket__recursion_8tcl_1a69e959f6901827e4d8271aeaa5fba0fc" compoundref="058__bracket__recursion_8tcl" startline="128" endline="131">t</referencedby>
-        <referencedby refid="058__bracket__recursion_8tcl_1a2fb1c5cf58867b5bbc9a1b145a86f3a0" compoundref="058__bracket__recursion_8tcl" startline="137" endline="142">y</referencedby>
-        <referencedby refid="058__bracket__recursion_8tcl_1a25ed1bcb423b0b7200f485fc5ff71c8e" compoundref="058__bracket__recursion_8tcl" startline="143" endline="148">z</referencedby>
-      </memberdef>
-      <memberdef kind="function" id="058__bracket__recursion_8tcl_1a3f55465410c57ed00ab28827a741b1c3" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>NotInvoked</definition>
-        <argsstring>args</argsstring>
-        <name>NotInvoked</name>
-        <briefdescription>
-          <para>must not be reference by every proc below </para>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="058_bracket_recursion.tcl" line="16" column="1" bodyfile="058_bracket_recursion.tcl" bodystart="16" bodyend="19"/>
-      </memberdef>
-      <memberdef kind="function" id="058__bracket__recursion_8tcl_1ab08ae027fc5777bc4f0629f1b60b35db" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>a</definition>
-        <argsstring>args</argsstring>
-        <name>a</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="058_bracket_recursion.tcl" line="22" column="1" bodyfile="058_bracket_recursion.tcl" bodystart="22" bodyend="25"/>
-        <references refid="058__bracket__recursion_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="058__bracket__recursion_8tcl" startline="10" endline="13">Invoked</references>
-      </memberdef>
-      <memberdef kind="function" id="058__bracket__recursion_8tcl_1a68bdb74c144118d936931c46f75d4b3e" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>b</definition>
-        <argsstring>args</argsstring>
-        <name>b</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="058_bracket_recursion.tcl" line="28" column="1" bodyfile="058_bracket_recursion.tcl" bodystart="28" bodyend="32"/>
-        <references refid="058__bracket__recursion_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="058__bracket__recursion_8tcl" startline="10" endline="13">Invoked</references>
-      </memberdef>
-      <memberdef kind="function" id="058__bracket__recursion_8tcl_1ab14f56bc3bd7680490ece4ad7815465f" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>c</definition>
-        <argsstring>args</argsstring>
-        <name>c</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="058_bracket_recursion.tcl" line="33" column="1" bodyfile="058_bracket_recursion.tcl" bodystart="33" bodyend="37"/>
-        <references refid="058__bracket__recursion_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="058__bracket__recursion_8tcl" startline="10" endline="13">Invoked</references>
-      </memberdef>
-      <memberdef kind="function" id="058__bracket__recursion_8tcl_1af43f4b1f0064a33b2d662af9f06d3a00" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>d</definition>
-        <argsstring>args</argsstring>
-        <name>d</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="058_bracket_recursion.tcl" line="38" column="1" bodyfile="058_bracket_recursion.tcl" bodystart="38" bodyend="42"/>
-        <references refid="058__bracket__recursion_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="058__bracket__recursion_8tcl" startline="10" endline="13">Invoked</references>
-      </memberdef>
-      <memberdef kind="function" id="058__bracket__recursion_8tcl_1aff65a51a703804e0ad1adbcfd76c86f8" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>e</definition>
-        <argsstring>args</argsstring>
-        <name>e</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="058_bracket_recursion.tcl" line="43" column="1" bodyfile="058_bracket_recursion.tcl" bodystart="43" bodyend="46"/>
-        <references refid="058__bracket__recursion_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="058__bracket__recursion_8tcl" startline="10" endline="13">Invoked</references>
-      </memberdef>
-      <memberdef kind="function" id="058__bracket__recursion_8tcl_1af6830d2c644b45088ea8f1f74a46b778" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>f</definition>
-        <argsstring>args</argsstring>
-        <name>f</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="058_bracket_recursion.tcl" line="47" column="1" bodyfile="058_bracket_recursion.tcl" bodystart="47" bodyend="50"/>
-        <references refid="058__bracket__recursion_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="058__bracket__recursion_8tcl" startline="10" endline="13">Invoked</references>
-      </memberdef>
-      <memberdef kind="function" id="058__bracket__recursion_8tcl_1af08b4b5bfa9edf0b0a7dee1c2b2c29e0" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>g</definition>
-        <argsstring>args</argsstring>
-        <name>g</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="058_bracket_recursion.tcl" line="51" column="1" bodyfile="058_bracket_recursion.tcl" bodystart="51" bodyend="55"/>
-        <references refid="058__bracket__recursion_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="058__bracket__recursion_8tcl" startline="10" endline="13">Invoked</references>
-      </memberdef>
-      <memberdef kind="function" id="058__bracket__recursion_8tcl_1af96fd0966e32a310a0778d2e5c357700" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>h</definition>
-        <argsstring>args</argsstring>
-        <name>h</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="058_bracket_recursion.tcl" line="56" column="1" bodyfile="058_bracket_recursion.tcl" bodystart="56" bodyend="59"/>
-        <references refid="058__bracket__recursion_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="058__bracket__recursion_8tcl" startline="10" endline="13">Invoked</references>
-      </memberdef>
-      <memberdef kind="function" id="058__bracket__recursion_8tcl_1a8c90afd4641b25be86bd09983c3cbee0" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>i</definition>
-        <argsstring>args</argsstring>
-        <name>i</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="058_bracket_recursion.tcl" line="64" column="1" bodyfile="058_bracket_recursion.tcl" bodystart="64" bodyend="68"/>
-        <references refid="058__bracket__recursion_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="058__bracket__recursion_8tcl" startline="10" endline="13">Invoked</references>
-      </memberdef>
-      <memberdef kind="function" id="058__bracket__recursion_8tcl_1a2aaa92757686acea102cba3475f0c13b" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>j</definition>
-        <argsstring>args</argsstring>
-        <name>j</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="058_bracket_recursion.tcl" line="69" column="1" bodyfile="058_bracket_recursion.tcl" bodystart="69" bodyend="73"/>
-        <references refid="058__bracket__recursion_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="058__bracket__recursion_8tcl" startline="10" endline="13">Invoked</references>
-      </memberdef>
-      <memberdef kind="function" id="058__bracket__recursion_8tcl_1a20363f854eb4098a446733d63d34dbc1" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>k</definition>
-        <argsstring>args</argsstring>
-        <name>k</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="058_bracket_recursion.tcl" line="74" column="1" bodyfile="058_bracket_recursion.tcl" bodystart="74" bodyend="77"/>
-        <references refid="058__bracket__recursion_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="058__bracket__recursion_8tcl" startline="10" endline="13">Invoked</references>
-      </memberdef>
-      <memberdef kind="function" id="058__bracket__recursion_8tcl_1aff56f84b49947b84b2a304f51cf8e678" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>l</definition>
-        <argsstring>args</argsstring>
-        <name>l</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="058_bracket_recursion.tcl" line="78" column="1" bodyfile="058_bracket_recursion.tcl" bodystart="78" bodyend="81"/>
-        <references refid="058__bracket__recursion_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="058__bracket__recursion_8tcl" startline="10" endline="13">Invoked</references>
-      </memberdef>
-      <memberdef kind="function" id="058__bracket__recursion_8tcl_1a78d127e8bda64d4471ac811ad512fbd9" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>m</definition>
-        <argsstring>args</argsstring>
-        <name>m</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="058_bracket_recursion.tcl" line="82" column="1" bodyfile="058_bracket_recursion.tcl" bodystart="82" bodyend="85"/>
-        <references refid="058__bracket__recursion_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="058__bracket__recursion_8tcl" startline="10" endline="13">Invoked</references>
-      </memberdef>
-      <memberdef kind="function" id="058__bracket__recursion_8tcl_1acdde3cd86eb2421ce8dbb2e85227d368" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>n</definition>
-        <argsstring>args</argsstring>
-        <name>n</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="058_bracket_recursion.tcl" line="86" column="1" bodyfile="058_bracket_recursion.tcl" bodystart="86" bodyend="89"/>
-        <references refid="058__bracket__recursion_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="058__bracket__recursion_8tcl" startline="10" endline="13">Invoked</references>
-      </memberdef>
-      <memberdef kind="function" id="058__bracket__recursion_8tcl_1a495e7a4ede0831107e9d435080a7c268" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>o</definition>
-        <argsstring>args</argsstring>
-        <name>o</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="058_bracket_recursion.tcl" line="90" column="1" bodyfile="058_bracket_recursion.tcl" bodystart="90" bodyend="94"/>
-        <references refid="058__bracket__recursion_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="058__bracket__recursion_8tcl" startline="10" endline="13">Invoked</references>
-      </memberdef>
-      <memberdef kind="function" id="058__bracket__recursion_8tcl_1a8a57650834f5708d404e9c386b2edf87" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>$NotInvoked</definition>
-        <argsstring>args</argsstring>
-        <name>$NotInvoked</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="058_bracket_recursion.tcl" line="98" column="1" bodyfile="058_bracket_recursion.tcl" bodystart="98" bodyend="101"/>
-      </memberdef>
-      <memberdef kind="function" id="058__bracket__recursion_8tcl_1a15229b450f26d8fa1c10bea4f3279f4d" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>p</definition>
-        <argsstring>args</argsstring>
-        <name>p</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="058_bracket_recursion.tcl" line="102" column="1" bodyfile="058_bracket_recursion.tcl" bodystart="102" bodyend="107"/>
-        <references refid="058__bracket__recursion_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="058__bracket__recursion_8tcl" startline="10" endline="13">Invoked</references>
-      </memberdef>
-      <memberdef kind="function" id="058__bracket__recursion_8tcl_1ab678a0a9a7e94bce5b17141f40220d88" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>q</definition>
-        <argsstring>args</argsstring>
-        <name>q</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="058_bracket_recursion.tcl" line="108" column="1" bodyfile="058_bracket_recursion.tcl" bodystart="108" bodyend="114"/>
-        <references refid="058__bracket__recursion_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="058__bracket__recursion_8tcl" startline="10" endline="13">Invoked</references>
-      </memberdef>
-      <memberdef kind="function" id="058__bracket__recursion_8tcl_1a0a0bd3dc69dd06934c4e6362155e0ace" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>r</definition>
-        <argsstring>args</argsstring>
-        <name>r</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="058_bracket_recursion.tcl" line="115" column="1" bodyfile="058_bracket_recursion.tcl" bodystart="115" bodyend="120"/>
-        <references refid="058__bracket__recursion_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="058__bracket__recursion_8tcl" startline="10" endline="13">Invoked</references>
-      </memberdef>
-      <memberdef kind="function" id="058__bracket__recursion_8tcl_1a011c73f2dbb87635a3b4206c72355f6e" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>s</definition>
-        <argsstring>args</argsstring>
-        <name>s</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="058_bracket_recursion.tcl" line="121" column="1" bodyfile="058_bracket_recursion.tcl" bodystart="121" bodyend="126"/>
-        <references refid="058__bracket__recursion_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="058__bracket__recursion_8tcl" startline="10" endline="13">Invoked</references>
-      </memberdef>
-      <memberdef kind="function" id="058__bracket__recursion_8tcl_1a69e959f6901827e4d8271aeaa5fba0fc" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>t</definition>
-        <argsstring>args</argsstring>
-        <name>t</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="058_bracket_recursion.tcl" line="128" column="1" bodyfile="058_bracket_recursion.tcl" bodystart="128" bodyend="131"/>
-        <references refid="058__bracket__recursion_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="058__bracket__recursion_8tcl" startline="10" endline="13">Invoked</references>
-      </memberdef>
-      <memberdef kind="function" id="058__bracket__recursion_8tcl_1a2fb1c5cf58867b5bbc9a1b145a86f3a0" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>y</definition>
-        <argsstring/>
-        <name>y</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="058_bracket_recursion.tcl" line="137" column="1" bodyfile="058_bracket_recursion.tcl" bodystart="137" bodyend="142"/>
-        <references refid="058__bracket__recursion_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="058__bracket__recursion_8tcl" startline="10" endline="13">Invoked</references>
-      </memberdef>
-      <memberdef kind="function" id="058__bracket__recursion_8tcl_1a25ed1bcb423b0b7200f485fc5ff71c8e" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>z</definition>
-        <argsstring/>
-        <name>z</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="058_bracket_recursion.tcl" line="143" column="1" bodyfile="058_bracket_recursion.tcl" bodystart="143" bodyend="148"/>
-        <references refid="058__bracket__recursion_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="058__bracket__recursion_8tcl" startline="10" endline="13">Invoked</references>
-      </memberdef>
-    </sectiondef>
-    <briefdescription>
-    </briefdescription>
-    <detaileddescription>
-    </detaileddescription>
-    <location file="058_bracket_recursion.tcl"/>
-  </compounddef>
-</doxygen>
diff --git a/testing/058_bracket_recursion.tcl b/testing/058_bracket_recursion.tcl
deleted file mode 100644
index 2ecd673..0000000
--- a/testing/058_bracket_recursion.tcl
+++ /dev/null
@@ -1,157 +0,0 @@
-#// objective: tests processing of commands inside brackets [], only references/referencedby relations are relevant
-#// check: 058__bracket__recursion_8tcl.xml
-#// config: REFERENCED_BY_RELATION = yes
-#// config: REFERENCES_RELATION = yes
-#// config: EXTRACT_ALL = yes
-#// config: INLINE_SOURCES = yes
-
-##
-# \brief should be reference by every proc below
-proc Invoked args {
-    puts "Procedure \"Invoked\" is invoked indeed. Ok."
-    return $args
-}
-##
-# \brief must not be reference by every proc below
-proc NotInvoked args {
-    puts "Procedure \"NotInvoked\" is invoked. Not Ok!"
-    return $args
-}
-#
-# check if call references work at all
-proc a args {
-    Invoked NotInvoked
-    return
-}
-#
-# check brackets with various quoting, bracing
-proc b args {
-    set r [Invoked]
-    set r [list \[NotInvoked \]]
-    return
-}
-proc c args {
-    set r \{[Invoked]\}
-    set r {[NotInvoked]}
-    return
-}
-proc d args {
-    set r "[Invoked]"
-    set r "\[NotInvoked \]"
-    return
-}
-proc e args {
-    set r [list \[NotInvoked [Invoked]\]]
-    return
-}
-proc f args {
-    set r [list [Invoked \[NotInvoked \]]]
-    return
-}
-proc g args {
-    set r "{[Invoked]}"
-    set r "{\[NotInvoked \]}"
-    return
-}
-proc h args {
-    [Invoked set] r {[NotInvoked]}
-    return
-}
-# check brackets in tcl commands containing script arguments
-#
-# example generated according to
-# https://groups.google.com/d/msg/comp.lang.tcl/G5-mc3GiIyY/e-AVD9t7xMkJ
-proc i args {
-    foreach item [Invoked] {
-    return
-    }
-}
-proc j args {
-    foreach [Invoked item] [list one two three] {
-    }
-    return
-}
-proc k args {
-    while {[Invoked 0]} {
-    }
-}
-proc l args {
-    for {} {[Invoked 0]} {} {
-    }
-}
-proc m args {
-    if {[Invoked 1]} {
-    }
-}
-proc n args {
-    if [Invoked 1] {
-    }
-}
-proc o args {
-    if {0} {
-    } elseif {[Invoked 0]} {
-    }
-}
-# these are really nasty examples
-# they shows, that the condition argument may not be parsed as a script
-set NotInvoked \$NotInvoked
-proc $NotInvoked args {
-    puts "Procedure \"\$NotInvoked\" is invoked. Not Ok!"
-    return $args
-}
-proc p args {
-    set NotInvoked \$NotInvoked
-    if {$NotInvoked eq [Invoked 1]} {
-    }
-    return
-}
-proc q args {
-    set NotInvoked \$NotInvoked
-    if {0} {
-    } elseif {$NotInvoked eq [Invoked 1]} {
-    }
-    return
-}
-proc r args {
-    set NotInvoked \$NotInvoked
-    while {$NotInvoked eq [Invoked 1]} {
-    }
-    return
-}
-proc s args {
-    set NotInvoked \$NotInvoked
-    for {} {$NotInvoked eq [Invoked 1]} {} {
-    }
-    return
-}
-# dangling open brackets should not confuse the scanner
-proc t args {
-    set foo ]]]][Invoked]
-    return
-}
-# Example according to
-# https://bugzilla.gnome.org/show_bug.cgi?id=729135
-#                                       |
-# Note the subtle difference in this    | whitespace
-#                                       V
-proc y {} {
-    set classifier_state {{bphy} }
-    if { ($classifier_state == {{bphy} }) } {
-        Invoked
-    }
-}
-proc z {} {
-    set classifier_state {{bphy} }
-    if { ($classifier_state == {{bphy} } ) } {
-        Invoked
-    }
-}
-#
-# call all single letter procs
-# let tcl check what is called and what is not called
-foreach p [info procs ?] {
-    puts "Check procedure \"$p\""
-    $p
-}
-exit
-
diff --git a/testing/059/059__command__catch_8tcl.xml b/testing/059/059__command__catch_8tcl.xml
deleted file mode 100644
index b5e5c96..0000000
--- a/testing/059/059__command__catch_8tcl.xml
+++ /dev/null
@@ -1,191 +0,0 @@
-<?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="059__command__catch_8tcl" kind="file" language="Tcl">
-    <compoundname>059_command_catch.tcl</compoundname>
-    <sectiondef kind="func">
-      <memberdef kind="function" id="059__command__catch_8tcl_1aa889853547f65a22ae133cd57ff89601" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>Invoked</definition>
-        <argsstring>args</argsstring>
-        <name>Invoked</name>
-        <briefdescription>
-          <para>should be reference by every proc below </para>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="059_command_catch.tcl" line="10" column="1" bodyfile="059_command_catch.tcl" bodystart="10" bodyend="13"/>
-        <referencedby refid="059__command__catch_8tcl_1ab08ae027fc5777bc4f0629f1b60b35db" compoundref="059__command__catch_8tcl" startline="22" endline="25">a</referencedby>
-        <referencedby refid="059__command__catch_8tcl_1a68bdb74c144118d936931c46f75d4b3e" compoundref="059__command__catch_8tcl" startline="29" endline="32">b</referencedby>
-        <referencedby refid="059__command__catch_8tcl_1ab14f56bc3bd7680490ece4ad7815465f" compoundref="059__command__catch_8tcl" startline="33" endline="36">c</referencedby>
-        <referencedby refid="059__command__catch_8tcl_1af43f4b1f0064a33b2d662af9f06d3a00" compoundref="059__command__catch_8tcl" startline="37" endline="40">d</referencedby>
-        <referencedby refid="059__command__catch_8tcl_1aff65a51a703804e0ad1adbcfd76c86f8" compoundref="059__command__catch_8tcl" startline="41" endline="44">e</referencedby>
-        <referencedby refid="059__command__catch_8tcl_1af6830d2c644b45088ea8f1f74a46b778" compoundref="059__command__catch_8tcl" startline="45" endline="48">f</referencedby>
-        <referencedby refid="059__command__catch_8tcl_1af08b4b5bfa9edf0b0a7dee1c2b2c29e0" compoundref="059__command__catch_8tcl" startline="49" endline="54">g</referencedby>
-        <referencedby refid="059__command__catch_8tcl_1af96fd0966e32a310a0778d2e5c357700" compoundref="059__command__catch_8tcl" startline="56" endline="59">h</referencedby>
-        <referencedby refid="059__command__catch_8tcl_1a8c90afd4641b25be86bd09983c3cbee0" compoundref="059__command__catch_8tcl" startline="60" endline="63">i</referencedby>
-        <referencedby refid="059__command__catch_8tcl_1a2aaa92757686acea102cba3475f0c13b" compoundref="059__command__catch_8tcl" startline="75" endline="78">j</referencedby>
-      </memberdef>
-      <memberdef kind="function" id="059__command__catch_8tcl_1a3f55465410c57ed00ab28827a741b1c3" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>NotInvoked</definition>
-        <argsstring>args</argsstring>
-        <name>NotInvoked</name>
-        <briefdescription>
-          <para>must not be reference by every proc below </para>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="059_command_catch.tcl" line="16" column="1" bodyfile="059_command_catch.tcl" bodystart="16" bodyend="19"/>
-      </memberdef>
-      <memberdef kind="function" id="059__command__catch_8tcl_1ab08ae027fc5777bc4f0629f1b60b35db" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>a</definition>
-        <argsstring>args</argsstring>
-        <name>a</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="059_command_catch.tcl" line="22" column="1" bodyfile="059_command_catch.tcl" bodystart="22" bodyend="25"/>
-        <references refid="059__command__catch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="059__command__catch_8tcl" startline="10" endline="13">Invoked</references>
-      </memberdef>
-      <memberdef kind="function" id="059__command__catch_8tcl_1a68bdb74c144118d936931c46f75d4b3e" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>b</definition>
-        <argsstring>args</argsstring>
-        <name>b</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="059_command_catch.tcl" line="29" column="1" bodyfile="059_command_catch.tcl" bodystart="29" bodyend="32"/>
-        <references refid="059__command__catch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="059__command__catch_8tcl" startline="10" endline="13">Invoked</references>
-      </memberdef>
-      <memberdef kind="function" id="059__command__catch_8tcl_1ab14f56bc3bd7680490ece4ad7815465f" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>c</definition>
-        <argsstring>args</argsstring>
-        <name>c</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="059_command_catch.tcl" line="33" column="1" bodyfile="059_command_catch.tcl" bodystart="33" bodyend="36"/>
-        <references refid="059__command__catch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="059__command__catch_8tcl" startline="10" endline="13">Invoked</references>
-      </memberdef>
-      <memberdef kind="function" id="059__command__catch_8tcl_1af43f4b1f0064a33b2d662af9f06d3a00" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>d</definition>
-        <argsstring>args</argsstring>
-        <name>d</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="059_command_catch.tcl" line="37" column="1" bodyfile="059_command_catch.tcl" bodystart="37" bodyend="40"/>
-        <references refid="059__command__catch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="059__command__catch_8tcl" startline="10" endline="13">Invoked</references>
-      </memberdef>
-      <memberdef kind="function" id="059__command__catch_8tcl_1aff65a51a703804e0ad1adbcfd76c86f8" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>e</definition>
-        <argsstring>args</argsstring>
-        <name>e</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="059_command_catch.tcl" line="41" column="1" bodyfile="059_command_catch.tcl" bodystart="41" bodyend="44"/>
-        <references refid="059__command__catch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="059__command__catch_8tcl" startline="10" endline="13">Invoked</references>
-      </memberdef>
-      <memberdef kind="function" id="059__command__catch_8tcl_1af6830d2c644b45088ea8f1f74a46b778" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>f</definition>
-        <argsstring>args</argsstring>
-        <name>f</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="059_command_catch.tcl" line="45" column="1" bodyfile="059_command_catch.tcl" bodystart="45" bodyend="48"/>
-        <references refid="059__command__catch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="059__command__catch_8tcl" startline="10" endline="13">Invoked</references>
-      </memberdef>
-      <memberdef kind="function" id="059__command__catch_8tcl_1af08b4b5bfa9edf0b0a7dee1c2b2c29e0" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>g</definition>
-        <argsstring>args</argsstring>
-        <name>g</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="059_command_catch.tcl" line="49" column="1" bodyfile="059_command_catch.tcl" bodystart="49" bodyend="54"/>
-        <references refid="059__command__catch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="059__command__catch_8tcl" startline="10" endline="13">Invoked</references>
-      </memberdef>
-      <memberdef kind="function" id="059__command__catch_8tcl_1af96fd0966e32a310a0778d2e5c357700" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>h</definition>
-        <argsstring>args</argsstring>
-        <name>h</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="059_command_catch.tcl" line="56" column="1" bodyfile="059_command_catch.tcl" bodystart="56" bodyend="59"/>
-        <references refid="059__command__catch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="059__command__catch_8tcl" startline="10" endline="13">Invoked</references>
-      </memberdef>
-      <memberdef kind="function" id="059__command__catch_8tcl_1a8c90afd4641b25be86bd09983c3cbee0" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>i</definition>
-        <argsstring>args</argsstring>
-        <name>i</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="059_command_catch.tcl" line="60" column="1" bodyfile="059_command_catch.tcl" bodystart="60" bodyend="63"/>
-        <references refid="059__command__catch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="059__command__catch_8tcl" startline="10" endline="13">Invoked</references>
-      </memberdef>
-      <memberdef kind="function" id="059__command__catch_8tcl_1a2aaa92757686acea102cba3475f0c13b" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>j</definition>
-        <argsstring>args</argsstring>
-        <name>j</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="059_command_catch.tcl" line="75" column="1" bodyfile="059_command_catch.tcl" bodystart="75" bodyend="78"/>
-        <references refid="059__command__catch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="059__command__catch_8tcl" startline="10" endline="13">Invoked</references>
-      </memberdef>
-    </sectiondef>
-    <briefdescription>
-    </briefdescription>
-    <detaileddescription>
-    </detaileddescription>
-    <location file="059_command_catch.tcl"/>
-  </compounddef>
-</doxygen>
diff --git a/testing/059_command_catch.tcl b/testing/059_command_catch.tcl
deleted file mode 100644
index 4227da7..0000000
--- a/testing/059_command_catch.tcl
+++ /dev/null
@@ -1,87 +0,0 @@
-#// objective: tests processing of catch/eval, only references/referencedby relations are relevant
-#// check: 059__command__catch_8tcl.xml
-#// config: REFERENCED_BY_RELATION = yes
-#// config: REFERENCES_RELATION = yes
-#// config: EXTRACT_ALL = yes
-#// config: INLINE_SOURCES = no
-
-##
-# \brief should be reference by every proc below
-proc Invoked args {
-    puts "Procedure \"Invoked\" is invoked indeed. Ok."
-    return $args
-}
-##
-# \brief must not be reference by every proc below
-proc NotInvoked args {
-    puts "Procedure \"NotInvoked\" is invoked. Not Ok!"
-    return $args
-}
-#
-# check if call references work at all
-proc a args {
-    Invoked NotInvoked
-    return
-}
-#
-# catch command
-# Tcl8.5: catch script ?resultVarName? ?optionsVarName?
-proc b args {
-    catch Invoked
-    return
-}
-proc c args {
-    catch Invoked NotInvoked
-    return
-}
-proc d args {
-    catch Invoked NotInvoked NotInvoked
-    return
-}
-proc e args {
-    set r [catch Invoked NotInvoked NotInvoked]
-    return
-}
-proc f args {
-    set r [catch {Invoked} NotInvoked NotInvoked]
-    return
-}
-proc g args {
-    set r [catch {
-        set x [Invoked]
-        } NotInvoked NotInvoked]
-    return
-}
-# eval arg ?arg ...?
-proc h args {
-    eval Invoked NotInvoked
-    return
-}
-proc i args {
-    eval set NotInvoked [Invoked NotInvoked]
-    return
-}
-# This is a striped down example. Original:
-#
-# jpeg.tcl --
-#
-#       Querying and modifying JPEG image files.
-#
-# Copyright (c) 2004    Aaron Faupell <afaupell@users.sourceforge.net>
-#
-# ...
-# eval [list addComment $file] [lreplace $com 0 0 $comment]
-# ...
-proc j args {
-    eval [list set] [list NotInvoked] [Invoked NotInvoked]
-    return
-}
-#
-# call all single letter procs
-# let tcl check what is called and what is not called
-foreach p [info procs ?] {
-    puts "Check procedure \"$p\""
-    $p
-}
-exit
-
diff --git a/testing/060/060__command__switch_8tcl.xml b/testing/060/060__command__switch_8tcl.xml
deleted file mode 100644
index 2def3fc..0000000
--- a/testing/060/060__command__switch_8tcl.xml
+++ /dev/null
@@ -1,326 +0,0 @@
-<?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="060__command__switch_8tcl" kind="file" language="Tcl">
-    <compoundname>060_command_switch.tcl</compoundname>
-    <sectiondef kind="func">
-      <memberdef kind="function" id="060__command__switch_8tcl_1aa889853547f65a22ae133cd57ff89601" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>Invoked</definition>
-        <argsstring>args</argsstring>
-        <name>Invoked</name>
-        <briefdescription>
-          <para>should be reference by every proc below </para>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="060_command_switch.tcl" line="10" column="1" bodyfile="060_command_switch.tcl" bodystart="10" bodyend="13"/>
-        <referencedby refid="060__command__switch_8tcl_1ab08ae027fc5777bc4f0629f1b60b35db" compoundref="060__command__switch_8tcl" startline="22" endline="25">a</referencedby>
-        <referencedby refid="060__command__switch_8tcl_1a68bdb74c144118d936931c46f75d4b3e" compoundref="060__command__switch_8tcl" startline="29" endline="36">b</referencedby>
-        <referencedby refid="060__command__switch_8tcl_1ab14f56bc3bd7680490ece4ad7815465f" compoundref="060__command__switch_8tcl" startline="37" endline="43">c</referencedby>
-        <referencedby refid="060__command__switch_8tcl_1af43f4b1f0064a33b2d662af9f06d3a00" compoundref="060__command__switch_8tcl" startline="44" endline="50">d</referencedby>
-        <referencedby refid="060__command__switch_8tcl_1aff65a51a703804e0ad1adbcfd76c86f8" compoundref="060__command__switch_8tcl" startline="51" endline="57">e</referencedby>
-        <referencedby refid="060__command__switch_8tcl_1af6830d2c644b45088ea8f1f74a46b778" compoundref="060__command__switch_8tcl" startline="58" endline="65">f</referencedby>
-        <referencedby refid="060__command__switch_8tcl_1af08b4b5bfa9edf0b0a7dee1c2b2c29e0" compoundref="060__command__switch_8tcl" startline="66" endline="73">g</referencedby>
-        <referencedby refid="060__command__switch_8tcl_1af96fd0966e32a310a0778d2e5c357700" compoundref="060__command__switch_8tcl" startline="74" endline="81">h</referencedby>
-        <referencedby refid="060__command__switch_8tcl_1a8c90afd4641b25be86bd09983c3cbee0" compoundref="060__command__switch_8tcl" startline="83" endline="94">i</referencedby>
-        <referencedby refid="060__command__switch_8tcl_1a2aaa92757686acea102cba3475f0c13b" compoundref="060__command__switch_8tcl" startline="95" endline="106">j</referencedby>
-        <referencedby refid="060__command__switch_8tcl_1a20363f854eb4098a446733d63d34dbc1" compoundref="060__command__switch_8tcl" startline="107" endline="118">k</referencedby>
-        <referencedby refid="060__command__switch_8tcl_1aff56f84b49947b84b2a304f51cf8e678" compoundref="060__command__switch_8tcl" startline="119" endline="129">l</referencedby>
-        <referencedby refid="060__command__switch_8tcl_1a78d127e8bda64d4471ac811ad512fbd9" compoundref="060__command__switch_8tcl" startline="130" endline="141">m</referencedby>
-        <referencedby refid="060__command__switch_8tcl_1acdde3cd86eb2421ce8dbb2e85227d368" compoundref="060__command__switch_8tcl" startline="142" endline="153">n</referencedby>
-        <referencedby refid="060__command__switch_8tcl_1a495e7a4ede0831107e9d435080a7c268" compoundref="060__command__switch_8tcl" startline="154" endline="165">o</referencedby>
-        <referencedby refid="060__command__switch_8tcl_1a15229b450f26d8fa1c10bea4f3279f4d" compoundref="060__command__switch_8tcl" startline="166" endline="175">p</referencedby>
-        <referencedby refid="060__command__switch_8tcl_1ab678a0a9a7e94bce5b17141f40220d88" compoundref="060__command__switch_8tcl" startline="176" endline="185">q</referencedby>
-        <referencedby refid="060__command__switch_8tcl_1a0a0bd3dc69dd06934c4e6362155e0ace" compoundref="060__command__switch_8tcl" startline="186" endline="195">r</referencedby>
-        <referencedby refid="060__command__switch_8tcl_1a011c73f2dbb87635a3b4206c72355f6e" compoundref="060__command__switch_8tcl" startline="196" endline="205">s</referencedby>
-      </memberdef>
-      <memberdef kind="function" id="060__command__switch_8tcl_1a3f55465410c57ed00ab28827a741b1c3" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>NotInvoked</definition>
-        <argsstring>args</argsstring>
-        <name>NotInvoked</name>
-        <briefdescription>
-          <para>must not be reference by every proc below </para>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="060_command_switch.tcl" line="16" column="1" bodyfile="060_command_switch.tcl" bodystart="16" bodyend="19"/>
-      </memberdef>
-      <memberdef kind="function" id="060__command__switch_8tcl_1ab08ae027fc5777bc4f0629f1b60b35db" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>a</definition>
-        <argsstring>args</argsstring>
-        <name>a</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="060_command_switch.tcl" line="22" column="1" bodyfile="060_command_switch.tcl" bodystart="22" bodyend="25"/>
-        <references refid="060__command__switch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="060__command__switch_8tcl" startline="10" endline="13">Invoked</references>
-      </memberdef>
-      <memberdef kind="function" id="060__command__switch_8tcl_1a68bdb74c144118d936931c46f75d4b3e" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>b</definition>
-        <argsstring>args</argsstring>
-        <name>b</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="060_command_switch.tcl" line="29" column="1" bodyfile="060_command_switch.tcl" bodystart="29" bodyend="36"/>
-        <references refid="060__command__switch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="060__command__switch_8tcl" startline="10" endline="13">Invoked</references>
-      </memberdef>
-      <memberdef kind="function" id="060__command__switch_8tcl_1ab14f56bc3bd7680490ece4ad7815465f" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>c</definition>
-        <argsstring>args</argsstring>
-        <name>c</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="060_command_switch.tcl" line="37" column="1" bodyfile="060_command_switch.tcl" bodystart="37" bodyend="43"/>
-        <references refid="060__command__switch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="060__command__switch_8tcl" startline="10" endline="13">Invoked</references>
-      </memberdef>
-      <memberdef kind="function" id="060__command__switch_8tcl_1af43f4b1f0064a33b2d662af9f06d3a00" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>d</definition>
-        <argsstring>args</argsstring>
-        <name>d</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="060_command_switch.tcl" line="44" column="1" bodyfile="060_command_switch.tcl" bodystart="44" bodyend="50"/>
-        <references refid="060__command__switch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="060__command__switch_8tcl" startline="10" endline="13">Invoked</references>
-      </memberdef>
-      <memberdef kind="function" id="060__command__switch_8tcl_1aff65a51a703804e0ad1adbcfd76c86f8" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>e</definition>
-        <argsstring>args</argsstring>
-        <name>e</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="060_command_switch.tcl" line="51" column="1" bodyfile="060_command_switch.tcl" bodystart="51" bodyend="57"/>
-        <references refid="060__command__switch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="060__command__switch_8tcl" startline="10" endline="13">Invoked</references>
-      </memberdef>
-      <memberdef kind="function" id="060__command__switch_8tcl_1af6830d2c644b45088ea8f1f74a46b778" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>f</definition>
-        <argsstring>args</argsstring>
-        <name>f</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="060_command_switch.tcl" line="58" column="1" bodyfile="060_command_switch.tcl" bodystart="58" bodyend="65"/>
-        <references refid="060__command__switch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="060__command__switch_8tcl" startline="10" endline="13">Invoked</references>
-      </memberdef>
-      <memberdef kind="function" id="060__command__switch_8tcl_1af08b4b5bfa9edf0b0a7dee1c2b2c29e0" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>g</definition>
-        <argsstring>args</argsstring>
-        <name>g</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="060_command_switch.tcl" line="66" column="1" bodyfile="060_command_switch.tcl" bodystart="66" bodyend="73"/>
-        <references refid="060__command__switch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="060__command__switch_8tcl" startline="10" endline="13">Invoked</references>
-      </memberdef>
-      <memberdef kind="function" id="060__command__switch_8tcl_1af96fd0966e32a310a0778d2e5c357700" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>h</definition>
-        <argsstring>args</argsstring>
-        <name>h</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="060_command_switch.tcl" line="74" column="1" bodyfile="060_command_switch.tcl" bodystart="74" bodyend="81"/>
-        <references refid="060__command__switch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="060__command__switch_8tcl" startline="10" endline="13">Invoked</references>
-      </memberdef>
-      <memberdef kind="function" id="060__command__switch_8tcl_1a8c90afd4641b25be86bd09983c3cbee0" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>i</definition>
-        <argsstring>args</argsstring>
-        <name>i</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="060_command_switch.tcl" line="83" column="1" bodyfile="060_command_switch.tcl" bodystart="83" bodyend="94"/>
-        <references refid="060__command__switch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="060__command__switch_8tcl" startline="10" endline="13">Invoked</references>
-      </memberdef>
-      <memberdef kind="function" id="060__command__switch_8tcl_1a2aaa92757686acea102cba3475f0c13b" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>j</definition>
-        <argsstring>args</argsstring>
-        <name>j</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="060_command_switch.tcl" line="95" column="1" bodyfile="060_command_switch.tcl" bodystart="95" bodyend="106"/>
-        <references refid="060__command__switch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="060__command__switch_8tcl" startline="10" endline="13">Invoked</references>
-      </memberdef>
-      <memberdef kind="function" id="060__command__switch_8tcl_1a20363f854eb4098a446733d63d34dbc1" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>k</definition>
-        <argsstring>args</argsstring>
-        <name>k</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="060_command_switch.tcl" line="107" column="1" bodyfile="060_command_switch.tcl" bodystart="107" bodyend="118"/>
-        <references refid="060__command__switch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="060__command__switch_8tcl" startline="10" endline="13">Invoked</references>
-      </memberdef>
-      <memberdef kind="function" id="060__command__switch_8tcl_1aff56f84b49947b84b2a304f51cf8e678" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>l</definition>
-        <argsstring>args</argsstring>
-        <name>l</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="060_command_switch.tcl" line="119" column="1" bodyfile="060_command_switch.tcl" bodystart="119" bodyend="129"/>
-        <references refid="060__command__switch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="060__command__switch_8tcl" startline="10" endline="13">Invoked</references>
-      </memberdef>
-      <memberdef kind="function" id="060__command__switch_8tcl_1a78d127e8bda64d4471ac811ad512fbd9" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>m</definition>
-        <argsstring>args</argsstring>
-        <name>m</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="060_command_switch.tcl" line="130" column="1" bodyfile="060_command_switch.tcl" bodystart="130" bodyend="141"/>
-        <references refid="060__command__switch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="060__command__switch_8tcl" startline="10" endline="13">Invoked</references>
-      </memberdef>
-      <memberdef kind="function" id="060__command__switch_8tcl_1acdde3cd86eb2421ce8dbb2e85227d368" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>n</definition>
-        <argsstring>args</argsstring>
-        <name>n</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="060_command_switch.tcl" line="142" column="1" bodyfile="060_command_switch.tcl" bodystart="142" bodyend="153"/>
-        <references refid="060__command__switch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="060__command__switch_8tcl" startline="10" endline="13">Invoked</references>
-      </memberdef>
-      <memberdef kind="function" id="060__command__switch_8tcl_1a495e7a4ede0831107e9d435080a7c268" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>o</definition>
-        <argsstring>args</argsstring>
-        <name>o</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="060_command_switch.tcl" line="154" column="1" bodyfile="060_command_switch.tcl" bodystart="154" bodyend="165"/>
-        <references refid="060__command__switch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="060__command__switch_8tcl" startline="10" endline="13">Invoked</references>
-      </memberdef>
-      <memberdef kind="function" id="060__command__switch_8tcl_1a15229b450f26d8fa1c10bea4f3279f4d" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>p</definition>
-        <argsstring>args</argsstring>
-        <name>p</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="060_command_switch.tcl" line="166" column="1" bodyfile="060_command_switch.tcl" bodystart="166" bodyend="175"/>
-        <references refid="060__command__switch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="060__command__switch_8tcl" startline="10" endline="13">Invoked</references>
-      </memberdef>
-      <memberdef kind="function" id="060__command__switch_8tcl_1ab678a0a9a7e94bce5b17141f40220d88" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>q</definition>
-        <argsstring>args</argsstring>
-        <name>q</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="060_command_switch.tcl" line="176" column="1" bodyfile="060_command_switch.tcl" bodystart="176" bodyend="185"/>
-        <references refid="060__command__switch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="060__command__switch_8tcl" startline="10" endline="13">Invoked</references>
-      </memberdef>
-      <memberdef kind="function" id="060__command__switch_8tcl_1a0a0bd3dc69dd06934c4e6362155e0ace" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>r</definition>
-        <argsstring>args</argsstring>
-        <name>r</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="060_command_switch.tcl" line="186" column="1" bodyfile="060_command_switch.tcl" bodystart="186" bodyend="195"/>
-        <references refid="060__command__switch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="060__command__switch_8tcl" startline="10" endline="13">Invoked</references>
-      </memberdef>
-      <memberdef kind="function" id="060__command__switch_8tcl_1a011c73f2dbb87635a3b4206c72355f6e" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>s</definition>
-        <argsstring>args</argsstring>
-        <name>s</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="060_command_switch.tcl" line="196" column="1" bodyfile="060_command_switch.tcl" bodystart="196" bodyend="205"/>
-        <references refid="060__command__switch_8tcl_1aa889853547f65a22ae133cd57ff89601" compoundref="060__command__switch_8tcl" startline="10" endline="13">Invoked</references>
-      </memberdef>
-    </sectiondef>
-    <briefdescription>
-    </briefdescription>
-    <detaileddescription>
-    </detaileddescription>
-    <location file="060_command_switch.tcl"/>
-  </compounddef>
-</doxygen>
diff --git a/testing/060_command_switch.tcl b/testing/060_command_switch.tcl
deleted file mode 100644
index 407f2e9..0000000
--- a/testing/060_command_switch.tcl
+++ /dev/null
@@ -1,238 +0,0 @@
-#// objective: tests processing of switch, only references/referencedby relations are relevant
-#// check: 060__command__switch_8tcl.xml
-#// config: REFERENCED_BY_RELATION = yes
-#// config: REFERENCES_RELATION = yes
-#// config: EXTRACT_ALL = yes
-#// config: INLINE_SOURCES = no
-
-##
-# \brief should be reference by every proc below
-proc Invoked args {
-    puts "Procedure \"Invoked\" is invoked indeed. Ok."
-    return $args
-}
-##
-# \brief must not be reference by every proc below
-proc NotInvoked args {
-    puts "Procedure \"NotInvoked\" is invoked. Not Ok!"
-    return $args
-}
-#
-# check if call references work at all
-proc a args {
-    Invoked NotInvoked
-    return
-}
-#
-# switch command
-# switch ?options? string pattern body ?pattern body ...? 
-proc b args {
-    switch value NotInvoked {
-        } NotInvoked {
-        } default {
-            Invoked
-        }
-    return
-}
-proc c args {
-    switch value NotInvoked {
-        } [Invoked] {
-        } default {
-        }
-    return
-}
-proc d args {
-    switch NotInvoked pattern {
-        } [Invoked] {
-        } default {
-        }
-    return
-}
-proc e args {
-    switch [Invoked] pattern {
-        } NotInvoked {
-        } default {
-        }
-    return
-}
-proc f args {
-    switch -exact value pattern {
-        } NotInvoked {
-        } default {
-            Invoked
-        }
-    return
-}
-proc g args {
-    switch -exact -- value pattern {
-        } NotInvoked {
-        } default {
-            Invoked
-        }
-    return
-}
-proc h args {
-    switch -exact -- -value pattern {
-        } NotInvoked {
-        } default {
-            Invoked
-        }
-    return
-}
-# switch ?options? string {pattern body ?pattern body ...?} 
-proc i args {
-    switch value {
-        NotInvoked {
-        }
-        NotInvoked {
-        }
-        default {
-            Invoked
-        }
-    }
-    return
-}
-proc j args {
-    switch vale {
-        NotInvoked {
-        }
-        [NotInvoked] {
-        }
-        default {
-            Invoked
-        }
-    }
-    return
-}
-proc k args {
-    switch NotInvoked {
-        [NotInvoked] {
-        }
-        NotInvoked {
-            Invoked
-        }
-        default {
-        }
-    }
-    return
-}
-proc l args {
-    switch [Invoked] {
-        pattern {
-        }
-        NotInvoked {
-        }
-        default {
-        }
-    }
-    return
-}
-proc m args {
-    switch -exact value {
-        pattern {
-        }
-        NotInvoked {
-        }
-        default {
-            Invoked
-        }
-    }
-    return
-}
-proc n args {
-    switch -exact -- value {
-        pattern {
-        }
-        NotInvoked {
-        }
-        default {
-            Invoked
-        }
-    }
-    return
-}
-proc o args {
-    switch -exact -- -value {
-        pattern {
-        }
-        NotInvoked {
-        }
-        default {
-            Invoked
-        }
-    }
-    return
-}
-proc p args {
-    switch -exact -- inquotes {
-        "inquotes" {
-            Invoked
-        }
-        default {
-        }
-    }
-    return
-}
-proc q args {
-    switch -exact -- "in quotes" {
-        "in quotes" {
-            Invoked
-        }
-        default {
-        }
-    }
-    return
-}
-proc r args {
-    switch -exact -- inbraces {
-        {inbraces} {
-            Invoked
-        }
-        default {
-        }
-    }
-    return
-}
-proc s args {
-    switch -exact -- {in braces} {
-        {in braces} {
-            Invoked
-        }
-        default {
-        }
-    }
-    return
-}
-# wrong syntax
-#proc x args {
-#    catch {switch -exact -- [Invoked] pattern1 NotInvoked pattern2}
-#    return
-#}
-# The current version does not check the last argument beforehand.
-# Therefore, all script elements are evaluated as scripts before
-# the parser detects the dangling pattern. It throws a warning, at the very least.
-# Anyway, for working code the documentation will be correct.
-#proc y args {
-#    catch {switch -exact -- [Invoked] {
-#        pattern {
-#            NotInvoked
-#        }
-#        NotInvoked {
-#            NotInvoked
-#        }
-#        default {
-#            NotInvoked
-#        }
-#        pattern
-#    }}
-#    return
-#}
-#
-# call all single letter procs
-# let tcl check what is called and what is not called
-foreach p [info procs ?] {
-    puts "Check procedure \"$p\""
-    $p
-}
-exit
-
diff --git a/testing/061/class_test.xml b/testing/061/class_test.xml
deleted file mode 100644
index 47e70ac..0000000
--- a/testing/061/class_test.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?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="Tcl" prot="public">
-    <compoundname>Test</compoundname>
-    <sectiondef kind="public-func">
-      <memberdef kind="function" id="class_test_1af863c78bca81b4e276dcbb30f12e8ec6" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>Test::testmethod_one</definition>
-        <argsstring>args</argsstring>
-        <name>testmethod_one</name>
-        <briefdescription>
-          <para><ref refid="class_test" kindref="compound">Test</ref> method 1. </para>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="061_bug_705503.tcl" line="12" column="1" bodyfile="061_bug_705503.tcl" bodystart="12" bodyend="12"/>
-      </memberdef>
-      <memberdef kind="function" id="class_test_1ac7148d2852b30d157e078fe0fe58a350" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>Test::constructor</definition>
-        <argsstring>args</argsstring>
-        <name>constructor</name>
-        <briefdescription>
-          <para>Construction of class. </para>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="061_bug_705503.tcl" line="16" column="1" bodyfile="061_bug_705503.tcl" bodystart="16" bodyend="16"/>
-      </memberdef>
-      <memberdef kind="function" id="class_test_1abdf3375950ec49e29f4bae947b7e3f26" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>Test::testmethod_two</definition>
-        <argsstring>args</argsstring>
-        <name>testmethod_two</name>
-        <briefdescription>
-          <para><ref refid="class_test" kindref="compound">Test</ref> method 2. </para>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="061_bug_705503.tcl" line="19" column="1" bodyfile="061_bug_705503.tcl" bodystart="19" bodyend="19"/>
-      </memberdef>
-    </sectiondef>
-    <briefdescription>
-      <para>Testclass. </para>
-    </briefdescription>
-    <detaileddescription>
-    </detaileddescription>
-    <location file="061_bug_705503.tcl" line="10" column="1" bodyfile="061_bug_705503.tcl" bodystart="10" bodyend="13"/>
-    <listofallmembers>
-      <member refid="class_test_1ac7148d2852b30d157e078fe0fe58a350" prot="public" virt="non-virtual">
-        <scope>Test</scope>
-        <name>constructor</name>
-      </member>
-      <member refid="class_test_1af863c78bca81b4e276dcbb30f12e8ec6" prot="public" virt="non-virtual">
-        <scope>Test</scope>
-        <name>testmethod_one</name>
-      </member>
-      <member refid="class_test_1abdf3375950ec49e29f4bae947b7e3f26" prot="public" virt="non-virtual">
-        <scope>Test</scope>
-        <name>testmethod_two</name>
-      </member>
-    </listofallmembers>
-  </compounddef>
-</doxygen>
diff --git a/testing/061_bug_705503.tcl b/testing/061_bug_705503.tcl
deleted file mode 100644
index ce25d6e..0000000
--- a/testing/061_bug_705503.tcl
+++ /dev/null
@@ -1,19 +0,0 @@
-#// objective: test for bug 705503 - TCL: Documentation of oo::define is not working
-#// check: class_test.xml
-#// config: EXTRACT_ALL = yes
-
-# taken from
-# https://bugzilla.gnome.org/show_bug.cgi?id=705503
-
-## @class Test
-# @brief Testclass
-oo::class create Test {
-	## @brief Test method 1.
-	method testmethod_one args {}
-}
-
-## @brief Construction of class
-oo::define Test constructor args {}
-
-## @brief Test method 2
-oo::define Test method testmethod_two args {}
diff --git a/testing/062/namespacen1.xml b/testing/062/namespacen1.xml
deleted file mode 100644
index 408ef87..0000000
--- a/testing/062/namespacen1.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?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="namespacen1" kind="namespace" language="Tcl">
-    <compoundname>n1</compoundname>
-    <innernamespace refid="namespacen1_1_1n1">n1::n1</innernamespace>
-    <sectiondef kind="func">
-      <memberdef kind="function" id="namespacen1_1a9f23d7a7f141915457e8e26023d70cb4" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>n1::p1</definition>
-        <argsstring>args</argsstring>
-        <name>p1</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="062_namespace_resolution.tcl" line="12" column="1" bodyfile="062_namespace_resolution.tcl" bodystart="12" bodyend="16"/>
-        <references refid="namespacen1_1a0bff29f718fa43e49b7ca79985afb5fa" compoundref="062__namespace__resolution_8tcl" startline="17" endline="20">p2</references>
-      </memberdef>
-      <memberdef kind="function" id="namespacen1_1a0bff29f718fa43e49b7ca79985afb5fa" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>n1::p2</definition>
-        <argsstring>args</argsstring>
-        <name>p2</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="062_namespace_resolution.tcl" line="17" column="1" bodyfile="062_namespace_resolution.tcl" bodystart="17" bodyend="20"/>
-        <referencedby refid="namespacen1_1a9f23d7a7f141915457e8e26023d70cb4" compoundref="062__namespace__resolution_8tcl" startline="12" endline="16">p1</referencedby>
-      </memberdef>
-    </sectiondef>
-    <briefdescription>
-    </briefdescription>
-    <detaileddescription>
-    </detaileddescription>
-    <location file="062_namespace_resolution.tcl" line="11" column="1"/>
-  </compounddef>
-</doxygen>
diff --git a/testing/062/namespacen2.xml b/testing/062/namespacen2.xml
deleted file mode 100644
index f545576..0000000
--- a/testing/062/namespacen2.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?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="namespacen2" kind="namespace" language="Tcl">
-    <compoundname>n2</compoundname>
-    <innernamespace refid="namespacen2_1_1n2">n2::n2</innernamespace>
-    <sectiondef kind="func">
-      <memberdef kind="function" id="namespacen2_1a74950c0185232e374220a0707b4903c6" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>n2::p1</definition>
-        <argsstring>args</argsstring>
-        <name>p1</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="062_namespace_resolution.tcl" line="31" column="1" bodyfile="062_namespace_resolution.tcl" bodystart="31" bodyend="35"/>
-        <references refid="namespacen2_1a49fadfbefa795204a3c566ec76ff632f" compoundref="062__namespace__resolution_8tcl" startline="36" endline="39">p2</references>
-      </memberdef>
-      <memberdef kind="function" id="namespacen2_1a49fadfbefa795204a3c566ec76ff632f" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>n2::p2</definition>
-        <argsstring>args</argsstring>
-        <name>p2</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="062_namespace_resolution.tcl" line="36" column="1" bodyfile="062_namespace_resolution.tcl" bodystart="36" bodyend="39"/>
-        <referencedby refid="namespacen2_1a74950c0185232e374220a0707b4903c6" compoundref="062__namespace__resolution_8tcl" startline="31" endline="35">p1</referencedby>
-      </memberdef>
-    </sectiondef>
-    <briefdescription>
-    </briefdescription>
-    <detaileddescription>
-    </detaileddescription>
-    <location file="062_namespace_resolution.tcl" line="29" column="1"/>
-  </compounddef>
-</doxygen>
diff --git a/testing/062/namespacen3.xml b/testing/062/namespacen3.xml
deleted file mode 100644
index f8c2fb5..0000000
--- a/testing/062/namespacen3.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?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="namespacen3" kind="namespace" language="Tcl">
-    <compoundname>n3</compoundname>
-    <innernamespace refid="namespacen3_1_1n3">n3::n3</innernamespace>
-    <sectiondef kind="func">
-      <memberdef kind="function" id="namespacen3_1ae7e87e49507bd56dad087cffecd35b29" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>n3::p1</definition>
-        <argsstring>args</argsstring>
-        <name>p1</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="062_namespace_resolution.tcl" line="47" column="1" bodyfile="062_namespace_resolution.tcl" bodystart="47" bodyend="51"/>
-        <references refid="namespacen3_1a14e9fe1b27a6d36db9ace2eef4509979" compoundref="062__namespace__resolution_8tcl" startline="52" endline="55">p2</references>
-      </memberdef>
-      <memberdef kind="function" id="namespacen3_1a14e9fe1b27a6d36db9ace2eef4509979" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>n3::p2</definition>
-        <argsstring>args</argsstring>
-        <name>p2</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="062_namespace_resolution.tcl" line="52" column="1" bodyfile="062_namespace_resolution.tcl" bodystart="52" bodyend="55"/>
-        <referencedby refid="namespacen3_1ae7e87e49507bd56dad087cffecd35b29" compoundref="062__namespace__resolution_8tcl" startline="47" endline="51">p1</referencedby>
-      </memberdef>
-    </sectiondef>
-    <briefdescription>
-    </briefdescription>
-    <detaileddescription>
-    </detaileddescription>
-    <location file="062_namespace_resolution.tcl" line="45" column="1"/>
-  </compounddef>
-</doxygen>
diff --git a/testing/062_namespace_resolution.tcl b/testing/062_namespace_resolution.tcl
deleted file mode 100644
index dcc6701..0000000
--- a/testing/062_namespace_resolution.tcl
+++ /dev/null
@@ -1,68 +0,0 @@
-#// objective: tests correct namespace resolution, only references/referencedby relations are relevant
-#// check: namespacen1.xml
-#// check: namespacen2.xml
-#// check: namespacen3.xml
-#// config: REFERENCED_BY_RELATION = yes
-#// config: REFERENCES_RELATION = yes
-#// config: EXTRACT_ALL = yes
-#// config: INLINE_SOURCES = yes
-
-# now: combine namespace eval and qualified names
-namespace eval n1 {
-    proc p1 args {
-        array set info [info frame 0]; puts -nonewline ->$info(proc)
-        p2
-        return
-    }
-    proc p2 args {
-        array set info [info frame 0]; puts -nonewline ->$info(proc)
-        return
-    }
-    namespace eval n1 {
-        proc p1 args {
-            array set info [info frame 0]; puts -nonewline ->$info(proc)
-            return
-        }
-    }
-}
-# same thing, but fully qualified proc names
-namespace eval ::n2 {}
-namespace eval ::n2::n2 {}
-proc ::n2::p1 args {
-    array set info [info frame 0]; puts -nonewline ->$info(proc)
-    p2
-    return
-}
-proc ::n2::p2 args {
-    array set info [info frame 0]; puts -nonewline ->$info(proc)
-    return
-}
-proc ::n2::n2::p2 args {
-    array set info [info frame 0]; puts -nonewline ->$info(proc)
-    return
-}
-# same thing, without leading ::
-namespace eval n3 {}
-namespace eval n3::n3 {}
-proc n3::p1 args {
-    array set info [info frame 0]; puts -nonewline ->$info(proc)
-    p2
-    return
-}
-proc n3::p2 args {
-    array set info [info frame 0]; puts -nonewline ->$info(proc)
-    return
-}
-proc n3::n3::p2 args {
-    array set info [info frame 0]; puts -nonewline ->$info(proc)
-    return
-}
-# now, check with tcl what is called
-n1::p1
-puts ""
-n2::p1
-puts ""
-n3::p1
-puts ""
-exit
-
diff --git a/testing/063/namespaceoo.xml b/testing/063/namespaceoo.xml
deleted file mode 100644
index 044c364..0000000
--- a/testing/063/namespaceoo.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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="namespaceoo" kind="namespace" language="Tcl">
-    <compoundname>oo</compoundname>
-    <innernamespace refid="namespaceoo_1_1define">oo::define</innernamespace>
-    <innernamespace refid="namespaceoo_1_1_helpers">oo::Helpers</innernamespace>
-    <briefdescription>
-    </briefdescription>
-    <detaileddescription>
-    </detaileddescription>
-    <location file="[generated]" line="1" column="1"/>
-  </compounddef>
-</doxygen>
diff --git a/testing/063/namespaceoo_1_1_helpers.xml b/testing/063/namespaceoo_1_1_helpers.xml
deleted file mode 100644
index e9083dc..0000000
--- a/testing/063/namespaceoo_1_1_helpers.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?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="namespaceoo_1_1_helpers" kind="namespace" language="Tcl">
-    <compoundname>oo::Helpers</compoundname>
-    <sectiondef kind="func">
-      <memberdef kind="function" id="namespaceoo_1_1_helpers_1a96c5b755588beb2e930cff23ce811d6c" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>oo::Helpers::classvar</definition>
-        <argsstring>args</argsstring>
-        <name>classvar</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-          <para>Extension to TclOO to add static variables. Defines variables on the class instead of on the object. Can be used to enforce a limited number of instantiations. </para>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="063_bug_729092.tcl" line="34" column="1" bodyfile="063_bug_729092.tcl" bodystart="34" bodyend="43"/>
-      </memberdef>
-    </sectiondef>
-    <briefdescription>
-    </briefdescription>
-    <detaileddescription>
-    </detaileddescription>
-    <location file="063_bug_729092.tcl" line="1" column="1"/>
-  </compounddef>
-</doxygen>
diff --git a/testing/063/namespaceoo_1_1define.xml b/testing/063/namespaceoo_1_1define.xml
deleted file mode 100644
index c8c8e85..0000000
--- a/testing/063/namespaceoo_1_1define.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?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="namespaceoo_1_1define" kind="namespace" language="Tcl">
-    <compoundname>oo::define</compoundname>
-    <sectiondef kind="func">
-      <memberdef kind="function" id="namespaceoo_1_1define_1a92656f535365dc915e04ca81bc8eb91b" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
-        <type/>
-        <definition>oo::define::classmethod</definition>
-        <argsstring>name ?args? ?body?</argsstring>
-        <name>classmethod</name>
-        <briefdescription>
-        </briefdescription>
-        <detaileddescription>
-          <para>Extension to TclOO to add static methods. Defines the method on the class instead of on the object. Can be used for the creation of megawidgets using TclOO by overriding the unknown method to detect if the user is trying to instantiate a widget (because the method will be unknown and start with a dot). </para>
-        </detaileddescription>
-        <inbodydescription>
-        </inbodydescription>
-        <location file="063_bug_729092.tcl" line="18" column="1" bodyfile="063_bug_729092.tcl" bodystart="18" bodyend="27"/>
-      </memberdef>
-    </sectiondef>
-    <briefdescription>
-    </briefdescription>
-    <detaileddescription>
-    </detaileddescription>
-    <location file="063_bug_729092.tcl" line="1" column="1"/>
-  </compounddef>
-</doxygen>
diff --git a/testing/063_bug_729092.tcl b/testing/063_bug_729092.tcl
deleted file mode 100644
index a6d3341..0000000
--- a/testing/063_bug_729092.tcl
+++ /dev/null
@@ -1,43 +0,0 @@
-#// objective: test for bug 729092 - TCL: Full documentation not shown for procs in namespaces.
-#// check: namespaceoo.xml
-#// check: namespaceoo_1_1_helpers.xml
-#// check: namespaceoo_1_1define.xml
-#// config: EXTRACT_ALL = yes
-#// config: GENERATE_HTML = yes
-
-# taken from
-# https://bugzilla.gnome.org/show_bug.cgi?id=729092
-
-##
-# Extension to TclOO to add static methods.
-# Defines the method on the class instead of on the object. Can be used for
-# the creation of megawidgets using TclOO by overriding the unknown method to
-# detect if the user is trying to instantiate a widget (because the method
-# will be unknown and start with a dot).
-#
-proc ::oo::define::classmethod {name {args ""} {body ""}} {
-    # Create the method on the class if the caller gave arguments and body.
-    if {[llength [info level 0]] == 4} {
-        uplevel 1 [list self method $name $args $body]
-    }
-    # Get the name of the class being defined.
-    set cls [lindex [info level -1] 1]
-    # Make connection to private class "my" command by forwarding.
-    uplevel forward $name [info object namespace $cls]::my $name
-}
-
-##
-# Extension to TclOO to add static variables.
-# Defines variables on the class instead of on the object. Can be used to
-# enforce a limited number of instantiations.
-#
-proc ::oo::Helpers::classvar {args} {
-    # Get reference to class's namespace.
-    set nsCl [info object namespace [uplevel 1 {self class}]]
-    set nsObj [uplevel 1 {namespace current}]
-    # Link variables into local (caller's) scope.
-    foreach v $args {
-        uplevel "my variable $v"
-        upvar #0 ${nsCl}::$v ${nsObj}::$v
-    }
-}
diff --git a/testing/064/struct_foo.xml b/testing/064/struct_foo.xml
index d9e2486..a1a5ba0 100644
--- a/testing/064/struct_foo.xml
+++ b/testing/064/struct_foo.xml
@@ -97,7 +97,7 @@
         </itemizedlist>
       </para>
     </detaileddescription>
-    <location file="064_castoperator.cpp" line="20" column="10" bodyfile="064_castoperator.cpp" bodystart="20" bodyend="25"/>
+    <location file="064_castoperator.cpp" line="20" column="1" bodyfile="064_castoperator.cpp" bodystart="20" bodyend="25"/>
     <listofallmembers>
       <member refid="struct_foo_1aab9774d892b6cd4a0fbebd034b4c1fad" prot="public" virt="non-virtual">
         <scope>Foo</scope>
diff --git a/testing/066/class_class1.xml b/testing/066/class_class1.xml
index ccc412e..9f01b20 100644
--- a/testing/066/class_class1.xml
+++ b/testing/066/class_class1.xml
@@ -38,7 +38,7 @@
     </briefdescription>
     <detaileddescription>
     </detaileddescription>
-    <location file="066_property_initializer.cs" line="6" column="1" bodyfile="066_property_initializer.cs" bodystart="5" bodyend="9"/>
+    <location file="066_property_initializer.cs" line="5" column="1" bodyfile="066_property_initializer.cs" bodystart="6" bodyend="9"/>
     <listofallmembers>
       <member refid="class_class1_1a6b0b2ab73516e37adb38b8ff33f97c40" prot="public" virt="non-virtual">
         <scope>Class1</scope>
diff --git a/testing/071/namespace_a_namespace_1_1_0d0.xml b/testing/071/namespace_a_namespace_1_1_0d0.xml
index d439723..1eca472 100644
--- a/testing/071/namespace_a_namespace_1_1_0d0.xml
+++ b/testing/071/namespace_a_namespace_1_1_0d0.xml
@@ -33,13 +33,13 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="071_enum_in_anon_ns.cpp" line="6" column="19" bodyfile="071_enum_in_anon_ns.cpp" bodystart="6" bodyend="10"/>
+        <location file="071_enum_in_anon_ns.cpp" line="6" column="1" bodyfile="071_enum_in_anon_ns.cpp" bodystart="6" bodyend="10"/>
       </memberdef>
     </sectiondef>
     <briefdescription>
     </briefdescription>
     <detaileddescription>
     </detaileddescription>
-    <location file="071_enum_in_anon_ns.cpp" line="4" column="30"/>
+    <location file="071_enum_in_anon_ns.cpp" line="4" column="20"/>
   </compounddef>
 </doxygen>
diff --git a/testing/073/073__typed__enum_8cpp.xml b/testing/073/073__typed__enum_8cpp.xml
index b0b2014..9dda417 100644
--- a/testing/073/073__typed__enum_8cpp.xml
+++ b/testing/073/073__typed__enum_8cpp.xml
@@ -13,7 +13,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="073_typed_enum.cpp" line="7" column="13" bodyfile="073_typed_enum.cpp" bodystart="7" bodyend="7"/>
+        <location file="073_typed_enum.cpp" line="7" column="1" bodyfile="073_typed_enum.cpp" bodystart="7" bodyend="7"/>
       </memberdef>
     </sectiondef>
     <briefdescription>
diff --git a/testing/074/namespacens.xml b/testing/074/namespacens.xml
index 0ee93fc..7b5d861 100644
--- a/testing/074/namespacens.xml
+++ b/testing/074/namespacens.xml
@@ -76,6 +76,6 @@
         </itemizedlist>
       </para>
     </detaileddescription>
-    <location file="074_ref.cpp" line="64" column="12"/>
+    <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 bf9c426..81499d9 100644
--- a/testing/074/struct_foo.xml
+++ b/testing/074/struct_foo.xml
@@ -243,7 +243,7 @@
         </simplesect>
       </para>
     </detaileddescription>
-    <location file="074_ref.cpp" line="19" column="10" bodyfile="074_ref.cpp" bodystart="19" bodyend="54"/>
+    <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>
diff --git a/testing/075/struct_foo.xml b/testing/075/struct_foo.xml
index 53ed0a8..9b859b5 100644
--- a/testing/075/struct_foo.xml
+++ b/testing/075/struct_foo.xml
@@ -117,7 +117,7 @@
     </briefdescription>
     <detaileddescription>
     </detaileddescription>
-    <location file="075_argmatch.cpp" line="4" column="10" bodyfile="075_argmatch.cpp" bodystart="4" bodyend="11"/>
+    <location file="075_argmatch.cpp" line="4" column="1" bodyfile="075_argmatch.cpp" bodystart="4" bodyend="11"/>
     <listofallmembers>
       <member refid="struct_foo_1a4f9767677227174b2a9684b92e36cba7" prot="public" virt="non-virtual">
         <scope>Foo</scope>
diff --git a/testing/078/078__xml__namespace__members__in__file__scope_8h.xml b/testing/078/078__xml__namespace__members__in__file__scope_8h.xml
index 1198549..263df18 100644
--- a/testing/078/078__xml__namespace__members__in__file__scope_8h.xml
+++ b/testing/078/078__xml__namespace__members__in__file__scope_8h.xml
@@ -14,7 +14,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="078_xml_namespace_members_in_file_scope.h" line="15" column="16" bodyfile="078_xml_namespace_members_in_file_scope.h" bodystart="15" bodyend="15"/>
+        <location file="078_xml_namespace_members_in_file_scope.h" line="15" column="1" bodyfile="078_xml_namespace_members_in_file_scope.h" bodystart="15" bodyend="15"/>
       </memberdef>
     </sectiondef>
     <sectiondef kind="func">
diff --git a/testing/080/class_interface.xml b/testing/080/class_interface.xml
index 2ee4379..5fdb043 100644
--- a/testing/080/class_interface.xml
+++ b/testing/080/class_interface.xml
@@ -83,7 +83,7 @@
     </briefdescription>
     <detaileddescription>
     </detaileddescription>
-    <location file="080_extract_private_virtual.cpp" line="6" column="16" bodyfile="080_extract_private_virtual.cpp" bodystart="6" bodyend="35"/>
+    <location file="080_extract_private_virtual.cpp" line="6" column="1" bodyfile="080_extract_private_virtual.cpp" bodystart="6" bodyend="35"/>
     <listofallmembers>
       <member refid="class_interface_1a328e0a16ccee5d796ca93801a055d27d" prot="private" virt="pure-virtual">
         <scope>Interface</scope>
diff --git a/testing/082/namespace_n.xml b/testing/082/namespace_n.xml
index 9f39bd1..9ceaeb9 100644
--- a/testing/082/namespace_n.xml
+++ b/testing/082/namespace_n.xml
@@ -45,6 +45,6 @@
     <detaileddescription>
       <para>Namespace </para>
     </detaileddescription>
-    <location file="decl_def.h" line="2" column="1"/>
+    <location file="decl_def.h" line="1" column="1"/>
   </compounddef>
 </doxygen>
diff --git a/testing/083/namespace_n.xml b/testing/083/namespace_n.xml
index 2b41072..a44864d 100644
--- a/testing/083/namespace_n.xml
+++ b/testing/083/namespace_n.xml
@@ -45,6 +45,6 @@
     <detaileddescription>
       <para>Namespace </para>
     </detaileddescription>
-    <location file="083_decl_def.cpp" line="8" column="1"/>
+    <location file="083_decl_def.cpp" line="7" column="1"/>
   </compounddef>
 </doxygen>
diff --git a/testing/085/085__tooltip_8cpp.xml b/testing/085/085__tooltip_8cpp.xml
index f9859d9..84f781d 100644
--- a/testing/085/085__tooltip_8cpp.xml
+++ b/testing/085/085__tooltip_8cpp.xml
@@ -11,7 +11,7 @@
         <param>
           <defname>mod</defname>
         </param>
-        <initializer>if ((<ref refid="085__tooltip_8cpp_1a5cccf7694b5d688466063895f39ee5d1" kindref="member">unit</ref> = fopen(fn, mod)) == NULL) \
+        <initializer>  if ((<ref refid="085__tooltip_8cpp_1a5cccf7694b5d688466063895f39ee5d1" kindref="member">unit</ref> = fopen(fn, mod)) == NULL) \
   {                                    \
     msg(OPEN_ERR,strerror(errno));     \
   }</initializer>
@@ -26,7 +26,7 @@
       </memberdef>
       <memberdef kind="define" id="085__tooltip_8cpp_1a11a2c0486e2bbd915f975a3517817de6" prot="public" static="no">
         <name>FCLOSE_MACRO</name>
-        <initializer>if (fclose(<ref refid="085__tooltip_8cpp_1a5cccf7694b5d688466063895f39ee5d1" kindref="member">unit</ref>) != 0)               \
+        <initializer>  if (fclose(<ref refid="085__tooltip_8cpp_1a5cccf7694b5d688466063895f39ee5d1" kindref="member">unit</ref>) != 0)               \
   {                                    \
     msg(CLOSE_ERR,strerror(errno));    \
   }</initializer>
diff --git a/testing/_057_caller_graphs.tcl b/testing/_057_caller_graphs.tcl
deleted file mode 100644
index 24b9c20..0000000
--- a/testing/_057_caller_graphs.tcl
+++ /dev/null
@@ -1,4 +0,0 @@
-proc inFileB args {
-    array set info [info frame 0]; puts -nonewline ->$info(proc)
-    inFileA
-}
diff --git a/testing/runtests.py b/testing/runtests.py
index a4118b8..10fe502 100755
--- a/testing/runtests.py
+++ b/testing/runtests.py
@@ -3,6 +3,7 @@
 from __future__ import print_function
 import argparse, glob, itertools, re, shutil, os, sys
 import subprocess
+import shlex
 
 config_reg = re.compile('.*\/\/\s*(?P<name>\S+):\s*(?P<value>.*)$')
 
@@ -28,10 +29,10 @@ def xpopen(cmd, cmd1="",encoding='utf-8-sig', getStderr=False):
 		return os.popen(cmd).read() # Python 2 without encoding
 	else:
 		if (getStderr):
-			proc = subprocess.run(cmd1,encoding=encoding,capture_output=True) # Python 3 with encoding
-			return proc.stderr
+			proc = subprocess.Popen(shlex.split(cmd1),stdout=subprocess.PIPE,stderr=subprocess.PIPE,encoding=encoding) # Python 3 with encoding
+			return proc.stderr.read()
 		else:
-			proc = subprocess.Popen(cmd,stdout=subprocess.PIPE,stderr=subprocess.PIPE,encoding=encoding) # Python 3 with encoding
+			proc = subprocess.Popen(shlex.split(cmd),stdout=subprocess.PIPE,stderr=subprocess.PIPE,encoding=encoding) # Python 3 with encoding
 			return proc.stdout.read()
 
 class Tester:
@@ -137,7 +138,7 @@ class Tester:
 				print('GENERATE_DOCBOOK=NO', file=f)
 			if (self.args.xhtml):
 				print('GENERATE_HTML=YES', file=f)
-			# HTML_OUTPUT can also be set locally
+			# HTML_OUTPUT can also have been set locally
 			print('HTML_OUTPUT=%s/html' % self.test_out, file=f)
 			print('HTML_FILE_EXTENSION=.xhtml', file=f)
 			if (self.args.pdf):
@@ -184,7 +185,7 @@ class Tester:
 					print('Non-existing file %s after \'check:\' statement' % check_file)
 					return
 				# convert output to canonical form
-				data = xpopen('%s --format --noblanks --nowarning %s' % (self.args.xmllint,check_file)).read()
+				data = xpopen('%s --format --noblanks --nowarning %s' % (self.args.xmllint,check_file))
 				if data:
 					# strip version
 					data = re.sub(r'xsd" version="[0-9.-]+"','xsd" version=""',data).rstrip('\n')
@@ -326,7 +327,7 @@ class Tester:
 			tests.append(glob.glob('%s/*.xml' % (docbook_output)))
 			tests.append(glob.glob('%s/*/*/*.xml' % (docbook_output)))
 			tests = ' '.join(list(itertools.chain.from_iterable(tests))).replace(self.args.outputdir +'/','').replace('\\','/')
-			exe_string = '%s --nonet --postvalid %s' % (self.args.xmllint,tests)
+			exe_string = '%s --noout --nonet --postvalid %s' % (self.args.xmllint,tests)
 			exe_string1 = exe_string
 			exe_string += ' %s' % (redirx)
 			exe_string += ' %s more "%s/temp"' % (separ,docbook_output)
@@ -346,7 +347,11 @@ class Tester:
 				redirx=' 2> %s/temp >nul:'%html_output
 			else:
 				redirx='2>%s/temp >/dev/null'%html_output
-			exe_string = '%s --path dtd --nonet --postvalid %s/*xhtml' % (self.args.xmllint,html_output)
+			check_file = []
+			check_file.append(glob.glob('%s/*.xhtml' % (html_output)))
+			check_file.append(glob.glob('%s/*/*/*.xhtml' % (html_output)))
+			check_file = ' '.join(list(itertools.chain.from_iterable(check_file))).replace(self.args.outputdir +'/','').replace('\\','/')
+			exe_string = '%s --noout --path dtd --nonet --postvalid %s' % (self.args.xmllint,check_file)
 			exe_string1 = exe_string
 			exe_string += ' %s' % (redirx)
 			exe_string += ' %s more "%s/temp"' % (separ,html_output)