Added declfile, declline, and declcolumn attributes to the location element in the XML output

23 files changed, 563 insertions, 417 deletions

diff --git a/testing/016/016__copydoc_8c.xml b/testing/016/016__copydoc_8c.xml
index 992122d..b0e2246 100644
--- a/testing/016/016__copydoc_8c.xml
+++ b/testing/016/016__copydoc_8c.xml
@@ -20,7 +20,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="016_copydoc.c" line="11" column="1"/>
+        <location file="016_copydoc.c" line="11" column="1" declfile="016_copydoc.c" declline="11" declcolumn="1"/>
       </memberdef>
       <memberdef kind="function" id="016__copydoc_8c_1a119dbcf2f0bc3ec1fbf77fcd35dec6df" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
         <type>void</type>
@@ -34,7 +34,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="016_copydoc.c" line="14" column="1"/>
+        <location file="016_copydoc.c" line="14" column="1" declfile="016_copydoc.c" declline="14" declcolumn="1"/>
       </memberdef>
       <memberdef kind="function" id="016__copydoc_8c_1a3c1e44de2b412b5218b55e216cebb4ac" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
         <type>void</type>
@@ -48,7 +48,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="016_copydoc.c" line="17" column="1"/>
+        <location file="016_copydoc.c" line="17" column="1" declfile="016_copydoc.c" declline="17" declcolumn="1"/>
       </memberdef>
       <memberdef kind="function" id="016__copydoc_8c_1a2535f29ea009c3d7449264671e15afe9" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
         <type>void</type>
@@ -63,7 +63,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="016_copydoc.c" line="22" column="1"/>
+        <location file="016_copydoc.c" line="22" column="1" declfile="016_copydoc.c" declline="22" declcolumn="1"/>
       </memberdef>
     </sectiondef>
     <briefdescription>
diff --git a/testing/019/group__g1.xml b/testing/019/group__g1.xml
index 23d9c31..2d45709 100644
--- a/testing/019/group__g1.xml
+++ b/testing/019/group__g1.xml
@@ -16,7 +16,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="019_defgroup.c" line="13" column="1"/>
+        <location file="019_defgroup.c" line="13" column="1" declfile="019_defgroup.c" declline="13" declcolumn="1"/>
       </memberdef>
     </sectiondef>
     <briefdescription>
diff --git a/testing/019/group__g2.xml b/testing/019/group__g2.xml
index 51df509..3429ad9 100644
--- a/testing/019/group__g2.xml
+++ b/testing/019/group__g2.xml
@@ -17,7 +17,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="019_defgroup.c" line="23" column="1"/>
+        <location file="019_defgroup.c" line="23" column="1" declfile="019_defgroup.c" declline="23" declcolumn="1"/>
       </memberdef>
     </sectiondef>
     <briefdescription>
diff --git a/testing/019/group__g3.xml b/testing/019/group__g3.xml
index 1c2b33b..6ef7640 100644
--- a/testing/019/group__g3.xml
+++ b/testing/019/group__g3.xml
@@ -16,7 +16,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="019_defgroup.c" line="36" column="1"/>
+        <location file="019_defgroup.c" line="36" column="1" declfile="019_defgroup.c" declline="36" declcolumn="1"/>
       </memberdef>
       <memberdef kind="function" id="group__g3_1gaf32d23522a5d9c3e7fed3dd5710001f7" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
         <type>void</type>
@@ -30,7 +30,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="019_defgroup.c" line="45" column="1"/>
+        <location file="019_defgroup.c" line="45" column="1" declfile="019_defgroup.c" declline="45" declcolumn="1"/>
       </memberdef>
     </sectiondef>
     <briefdescription>
diff --git a/testing/027/struct_object.xml b/testing/027/struct_object.xml
index e14caa5..9d93be7 100644
--- a/testing/027/struct_object.xml
+++ b/testing/027/struct_object.xml
@@ -36,7 +36,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="027_extends.c" line="29" column="1"/>
+        <location file="027_extends.c" line="29" column="1" declfile="027_extends.c" declline="29" declcolumn="1"/>
       </memberdef>
       <memberdef kind="function" id="struct_object_1a924ee0cecc906d148022b3f0d6325cfb" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
         <type><ref refid="struct_object" kindref="compound">Object</ref> *</type>
@@ -54,7 +54,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="027_extends.c" line="36" column="1"/>
+        <location file="027_extends.c" line="36" column="1" declfile="027_extends.c" declline="36" declcolumn="1"/>
       </memberdef>
     </sectiondef>
     <briefdescription>
diff --git a/testing/027/struct_vehicle.xml b/testing/027/struct_vehicle.xml
index acf10a0..c217fc6 100644
--- a/testing/027/struct_vehicle.xml
+++ b/testing/027/struct_vehicle.xml
@@ -40,7 +40,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="027_extends.c" line="53" column="1"/>
+        <location file="027_extends.c" line="53" column="1" declfile="027_extends.c" declline="53" declcolumn="1"/>
       </memberdef>
       <memberdef kind="function" id="struct_vehicle_1a4dcbcba43792dcd673a552b14479ab77" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
         <type>void</type>
@@ -58,7 +58,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="027_extends.c" line="60" column="1"/>
+        <location file="027_extends.c" line="60" column="1" declfile="027_extends.c" declline="60" declcolumn="1"/>
       </memberdef>
     </sectiondef>
     <briefdescription>
diff --git a/testing/036/036__link_8c.xml b/testing/036/036__link_8c.xml
index c0dea58..aba069f 100644
--- a/testing/036/036__link_8c.xml
+++ b/testing/036/036__link_8c.xml
@@ -20,7 +20,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="036_link.c" line="11" column="1"/>
+        <location file="036_link.c" line="11" column="1" declfile="036_link.c" declline="11" declcolumn="1"/>
       </memberdef>
     </sectiondef>
     <briefdescription>
diff --git a/testing/046/046__related_8cpp.xml b/testing/046/046__related_8cpp.xml
index 9f5eab6..c36c6c5 100644
--- a/testing/046/046__related_8cpp.xml
+++ b/testing/046/046__related_8cpp.xml
@@ -16,7 +16,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="046_related.cpp" line="28" column="1"/>
+        <location file="046_related.cpp" line="28" column="1" declfile="046_related.cpp" declline="28" declcolumn="1"/>
       </memberdef>
     </sectiondef>
     <briefdescription>
diff --git a/testing/046/class_test.xml b/testing/046/class_test.xml
index 9a1bd9c..1445e35 100644
--- a/testing/046/class_test.xml
+++ b/testing/046/class_test.xml
@@ -38,7 +38,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="046_related.cpp" line="22" column="1"/>
+        <location file="046_related.cpp" line="22" column="1" declfile="046_related.cpp" declline="22" declcolumn="1"/>
       </memberdef>
       <memberdef kind="function" id="class_test_1a1283d836e0611ff772c1b06a31ecbbfe" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
         <type>void</type>
@@ -52,7 +52,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="046_related.cpp" line="28" column="1"/>
+        <location file="046_related.cpp" line="28" column="1" declfile="046_related.cpp" declline="28" declcolumn="1"/>
       </memberdef>
     </sectiondef>
     <briefdescription>
diff --git a/testing/047/047__return_8cpp.xml b/testing/047/047__return_8cpp.xml
index b57a0c3..a29062f 100644
--- a/testing/047/047__return_8cpp.xml
+++ b/testing/047/047__return_8cpp.xml
@@ -16,7 +16,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="047_return.cpp" line="9" column="1"/>
+        <location file="047_return.cpp" line="9" column="1" declfile="047_return.cpp" declline="9" declcolumn="1"/>
       </memberdef>
       <memberdef kind="function" id="047__return_8cpp_1aa1d4878589351db8276c79f98ed9fb7d" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
         <type>int</type>
@@ -31,7 +31,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="047_return.cpp" line="14" column="1"/>
+        <location file="047_return.cpp" line="14" column="1" declfile="047_return.cpp" declline="14" declcolumn="1"/>
       </memberdef>
       <memberdef kind="function" id="047__return_8cpp_1abee09dd9ed9ce93df5a931d16faac09a" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
         <type>int</type>
@@ -46,7 +46,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="047_return.cpp" line="19" column="1"/>
+        <location file="047_return.cpp" line="19" column="1" declfile="047_return.cpp" declline="19" declcolumn="1"/>
       </memberdef>
     </sectiondef>
     <briefdescription>
diff --git a/testing/054/054__parblock_8cpp.xml b/testing/054/054__parblock_8cpp.xml
index 5567908..e9aec90 100644
--- a/testing/054/054__parblock_8cpp.xml
+++ b/testing/054/054__parblock_8cpp.xml
@@ -91,7 +91,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="054_parblock.cpp" line="33" column="1"/>
+        <location file="054_parblock.cpp" line="33" column="1" declfile="054_parblock.cpp" declline="33" declcolumn="1"/>
       </memberdef>
       <memberdef kind="function" id="054__parblock_8cpp_1a5cded03ec9e6fd626da35ab05f624f39" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
         <type>void</type>
@@ -181,7 +181,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="054_parblock.cpp" line="60" column="1"/>
+        <location file="054_parblock.cpp" line="60" column="1" declfile="054_parblock.cpp" declline="60" declcolumn="1"/>
       </memberdef>
     </sectiondef>
     <briefdescription>
diff --git a/testing/067/067__link__varargs_8cpp.xml b/testing/067/067__link__varargs_8cpp.xml
index 76eb543..8bf0051 100644
--- a/testing/067/067__link__varargs_8cpp.xml
+++ b/testing/067/067__link__varargs_8cpp.xml
@@ -20,7 +20,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="067_link_varargs.cpp" line="11" column="1"/>
+        <location file="067_link_varargs.cpp" line="11" column="1" declfile="067_link_varargs.cpp" declline="11" declcolumn="1"/>
       </memberdef>
       <memberdef kind="function" id="067__link__varargs_8cpp_1a106e01084409028d1b41f5ad83fb82c1" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
         <type>void</type>
@@ -41,7 +41,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="067_link_varargs.cpp" line="15" column="1"/>
+        <location file="067_link_varargs.cpp" line="15" column="1" declfile="067_link_varargs.cpp" declline="15" declcolumn="1"/>
       </memberdef>
     </sectiondef>
     <briefdescription>
diff --git a/testing/068/068__ref__varargs_8cpp.xml b/testing/068/068__ref__varargs_8cpp.xml
index 8e0dc00..ae5f28f 100644
--- a/testing/068/068__ref__varargs_8cpp.xml
+++ b/testing/068/068__ref__varargs_8cpp.xml
@@ -20,7 +20,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="068_ref_varargs.cpp" line="11" column="1"/>
+        <location file="068_ref_varargs.cpp" line="11" column="1" declfile="068_ref_varargs.cpp" declline="11" declcolumn="1"/>
       </memberdef>
       <memberdef kind="function" id="068__ref__varargs_8cpp_1a106e01084409028d1b41f5ad83fb82c1" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
         <type>void</type>
@@ -41,7 +41,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="068_ref_varargs.cpp" line="15" column="1"/>
+        <location file="068_ref_varargs.cpp" line="15" column="1" declfile="068_ref_varargs.cpp" declline="15" declcolumn="1"/>
       </memberdef>
     </sectiondef>
     <briefdescription>
diff --git a/testing/069/069__link__variadic__template_8cpp.xml b/testing/069/069__link__variadic__template_8cpp.xml
index c93a732..00677f8 100644
--- a/testing/069/069__link__variadic__template_8cpp.xml
+++ b/testing/069/069__link__variadic__template_8cpp.xml
@@ -20,7 +20,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="069_link_variadic_template.cpp" line="40" column="1"/>
+        <location file="069_link_variadic_template.cpp" line="40" column="1" declfile="069_link_variadic_template.cpp" declline="40" declcolumn="1"/>
       </memberdef>
       <memberdef kind="function" id="069__link__variadic__template_8cpp_1aa7e4936a17759246bce60256cf224e16" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
         <templateparamlist>
@@ -49,7 +49,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="069_link_variadic_template.cpp" line="45" column="1"/>
+        <location file="069_link_variadic_template.cpp" line="45" column="1" declfile="069_link_variadic_template.cpp" declline="45" declcolumn="1"/>
       </memberdef>
       <memberdef kind="function" id="069__link__variadic__template_8cpp_1ad6fc2d2a6cb8980f3e0eaacbd2ae41fe" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
         <templateparamlist>
@@ -78,7 +78,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="069_link_variadic_template.cpp" line="50" column="1"/>
+        <location file="069_link_variadic_template.cpp" line="50" column="1" declfile="069_link_variadic_template.cpp" declline="50" declcolumn="1"/>
       </memberdef>
       <memberdef kind="function" id="069__link__variadic__template_8cpp_1a708a5bf22646ed7233fe61b83182811a" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
         <templateparamlist>
@@ -107,7 +107,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="069_link_variadic_template.cpp" line="55" column="1"/>
+        <location file="069_link_variadic_template.cpp" line="55" column="1" declfile="069_link_variadic_template.cpp" declline="55" declcolumn="1"/>
       </memberdef>
       <memberdef kind="function" id="069__link__variadic__template_8cpp_1aed64c596fea5f4f5e719006539922f7c" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
         <templateparamlist>
@@ -136,7 +136,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="069_link_variadic_template.cpp" line="60" column="1"/>
+        <location file="069_link_variadic_template.cpp" line="60" column="1" declfile="069_link_variadic_template.cpp" declline="60" declcolumn="1"/>
       </memberdef>
       <memberdef kind="function" id="069__link__variadic__template_8cpp_1a0ad18d95a1dc2dbacee657c43f719187" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
         <templateparamlist>
@@ -165,7 +165,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="069_link_variadic_template.cpp" line="65" column="1"/>
+        <location file="069_link_variadic_template.cpp" line="65" column="1" declfile="069_link_variadic_template.cpp" declline="65" declcolumn="1"/>
       </memberdef>
       <memberdef kind="function" id="069__link__variadic__template_8cpp_1a2331eedd0a1db9da5de0ad0faef78a4e" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
         <templateparamlist>
@@ -194,7 +194,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="069_link_variadic_template.cpp" line="70" column="1"/>
+        <location file="069_link_variadic_template.cpp" line="70" column="1" declfile="069_link_variadic_template.cpp" declline="70" declcolumn="1"/>
       </memberdef>
       <memberdef kind="function" id="069__link__variadic__template_8cpp_1a72bd94e61df947347f98a2a6214e9342" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
         <templateparamlist>
@@ -223,7 +223,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="069_link_variadic_template.cpp" line="75" column="1"/>
+        <location file="069_link_variadic_template.cpp" line="75" column="1" declfile="069_link_variadic_template.cpp" declline="75" declcolumn="1"/>
       </memberdef>
       <memberdef kind="function" id="069__link__variadic__template_8cpp_1a0bd03c39aa36ae51d2b8d87e04cf7eab" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
         <templateparamlist>
@@ -252,7 +252,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="069_link_variadic_template.cpp" line="80" column="1"/>
+        <location file="069_link_variadic_template.cpp" line="80" column="1" declfile="069_link_variadic_template.cpp" declline="80" declcolumn="1"/>
       </memberdef>
       <memberdef kind="function" id="069__link__variadic__template_8cpp_1abb1e0338f72ae46a1240ada65d6a397c" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
         <templateparamlist>
@@ -281,7 +281,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="069_link_variadic_template.cpp" line="85" column="1"/>
+        <location file="069_link_variadic_template.cpp" line="85" column="1" declfile="069_link_variadic_template.cpp" declline="85" declcolumn="1"/>
       </memberdef>
     </sectiondef>
     <briefdescription>
diff --git a/testing/070/070__ref__variadic__template_8cpp.xml b/testing/070/070__ref__variadic__template_8cpp.xml
index 0f581e5..54d385b 100644
--- a/testing/070/070__ref__variadic__template_8cpp.xml
+++ b/testing/070/070__ref__variadic__template_8cpp.xml
@@ -20,7 +20,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="070_ref_variadic_template.cpp" line="40" column="1"/>
+        <location file="070_ref_variadic_template.cpp" line="40" column="1" declfile="070_ref_variadic_template.cpp" declline="40" declcolumn="1"/>
       </memberdef>
       <memberdef kind="function" id="070__ref__variadic__template_8cpp_1aa7e4936a17759246bce60256cf224e16" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
         <templateparamlist>
@@ -49,7 +49,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="070_ref_variadic_template.cpp" line="45" column="1"/>
+        <location file="070_ref_variadic_template.cpp" line="45" column="1" declfile="070_ref_variadic_template.cpp" declline="45" declcolumn="1"/>
       </memberdef>
       <memberdef kind="function" id="070__ref__variadic__template_8cpp_1ad6fc2d2a6cb8980f3e0eaacbd2ae41fe" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
         <templateparamlist>
@@ -78,7 +78,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="070_ref_variadic_template.cpp" line="50" column="1"/>
+        <location file="070_ref_variadic_template.cpp" line="50" column="1" declfile="070_ref_variadic_template.cpp" declline="50" declcolumn="1"/>
       </memberdef>
       <memberdef kind="function" id="070__ref__variadic__template_8cpp_1a708a5bf22646ed7233fe61b83182811a" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
         <templateparamlist>
@@ -107,7 +107,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="070_ref_variadic_template.cpp" line="55" column="1"/>
+        <location file="070_ref_variadic_template.cpp" line="55" column="1" declfile="070_ref_variadic_template.cpp" declline="55" declcolumn="1"/>
       </memberdef>
       <memberdef kind="function" id="070__ref__variadic__template_8cpp_1aed64c596fea5f4f5e719006539922f7c" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
         <templateparamlist>
@@ -136,7 +136,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="070_ref_variadic_template.cpp" line="60" column="1"/>
+        <location file="070_ref_variadic_template.cpp" line="60" column="1" declfile="070_ref_variadic_template.cpp" declline="60" declcolumn="1"/>
       </memberdef>
       <memberdef kind="function" id="070__ref__variadic__template_8cpp_1a0ad18d95a1dc2dbacee657c43f719187" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
         <templateparamlist>
@@ -165,7 +165,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="070_ref_variadic_template.cpp" line="65" column="1"/>
+        <location file="070_ref_variadic_template.cpp" line="65" column="1" declfile="070_ref_variadic_template.cpp" declline="65" declcolumn="1"/>
       </memberdef>
       <memberdef kind="function" id="070__ref__variadic__template_8cpp_1a2331eedd0a1db9da5de0ad0faef78a4e" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
         <templateparamlist>
@@ -194,7 +194,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="070_ref_variadic_template.cpp" line="70" column="1"/>
+        <location file="070_ref_variadic_template.cpp" line="70" column="1" declfile="070_ref_variadic_template.cpp" declline="70" declcolumn="1"/>
       </memberdef>
       <memberdef kind="function" id="070__ref__variadic__template_8cpp_1a72bd94e61df947347f98a2a6214e9342" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
         <templateparamlist>
@@ -223,7 +223,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="070_ref_variadic_template.cpp" line="75" column="1"/>
+        <location file="070_ref_variadic_template.cpp" line="75" column="1" declfile="070_ref_variadic_template.cpp" declline="75" declcolumn="1"/>
       </memberdef>
       <memberdef kind="function" id="070__ref__variadic__template_8cpp_1a0bd03c39aa36ae51d2b8d87e04cf7eab" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
         <templateparamlist>
@@ -252,7 +252,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="070_ref_variadic_template.cpp" line="80" column="1"/>
+        <location file="070_ref_variadic_template.cpp" line="80" column="1" declfile="070_ref_variadic_template.cpp" declline="80" declcolumn="1"/>
       </memberdef>
       <memberdef kind="function" id="070__ref__variadic__template_8cpp_1abb1e0338f72ae46a1240ada65d6a397c" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
         <templateparamlist>
@@ -281,7 +281,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="070_ref_variadic_template.cpp" line="85" column="1"/>
+        <location file="070_ref_variadic_template.cpp" line="85" column="1" declfile="070_ref_variadic_template.cpp" declline="85" declcolumn="1"/>
       </memberdef>
     </sectiondef>
     <briefdescription>
diff --git a/testing/074/namespacens.xml b/testing/074/namespacens.xml
index 4eccf88..db46c7d 100755..100644
--- a/testing/074/namespacens.xml
+++ b/testing/074/namespacens.xml
@@ -1,81 +1,81 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="">

-  <compounddef id="namespacens" kind="namespace" language="C++">

-    <compoundname>ns</compoundname>

-    <sectiondef kind="func">

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

-        <type>int</type>

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

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

-        <name>operator""_op</name>

-        <param>

-          <type>unsigned long long</type>

-        </param>

-        <briefdescription>

-          <para>An operator. </para>

-        </briefdescription>

-        <detaileddescription>

-        </detaileddescription>

-        <inbodydescription>

-        </inbodydescription>

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

-      </memberdef>

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

-        <type>int</type>

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

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

-        <name>operator""_oq</name>

-        <param>

-          <type>unsigned long long</type>

-        </param>

-        <briefdescription>

-          <para>Another operator. </para>

-        </briefdescription>

-        <detaileddescription>

-        </detaileddescription>

-        <inbodydescription>

-        </inbodydescription>

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

-      </memberdef>

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

-        <type>void</type>

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

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

-        <name>foo</name>

-        <param>

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

-        </param>

-        <briefdescription>

-          <para>Function. </para>

-        </briefdescription>

-        <detaileddescription>

-        </detaileddescription>

-        <inbodydescription>

-        </inbodydescription>

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

-      </memberdef>

-    </sectiondef>

-    <briefdescription>

-      <para>A namespace. </para>

-    </briefdescription>

-    <detaileddescription>

-      <para>

-        <itemizedlist>

-          <listitem>

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

-          </listitem>

-          <listitem>

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

-          </listitem>

-          <listitem>

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

-          </listitem>

-          <listitem>

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

-          </listitem>

-        </itemizedlist>

-      </para>

-    </detaileddescription>

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

-  </compounddef>

-</doxygen>

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="">
+  <compounddef id="namespacens" kind="namespace" language="C++">
+    <compoundname>ns</compoundname>
+    <sectiondef kind="func">
+      <memberdef kind="function" id="namespacens_1afd2e8a8437eff630f52a452ea6dc6e82" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
+        <type>int</type>
+        <definition>int ns::operator""_op</definition>
+        <argsstring>(unsigned long long)</argsstring>
+        <name>operator""_op</name>
+        <param>
+          <type>unsigned long long</type>
+        </param>
+        <briefdescription>
+          <para>An operator. </para>
+        </briefdescription>
+        <detaileddescription>
+        </detaileddescription>
+        <inbodydescription>
+        </inbodydescription>
+        <location file="074_ref.cpp" line="67" column="1" declfile="074_ref.cpp" declline="67" declcolumn="1"/>
+      </memberdef>
+      <memberdef kind="function" id="namespacens_1a47f70e51e66b81b8383a4e2da66f1e09" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
+        <type>int</type>
+        <definition>int ns::operator""_oq</definition>
+        <argsstring>(unsigned long long)</argsstring>
+        <name>operator""_oq</name>
+        <param>
+          <type>unsigned long long</type>
+        </param>
+        <briefdescription>
+          <para>Another operator. </para>
+        </briefdescription>
+        <detaileddescription>
+        </detaileddescription>
+        <inbodydescription>
+        </inbodydescription>
+        <location file="074_ref.cpp" line="70" column="1" declfile="074_ref.cpp" declline="70" declcolumn="1"/>
+      </memberdef>
+      <memberdef kind="function" id="namespacens_1aaa9eb8a7b40d4ed0edbe5e163b4e6e8d" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
+        <type>void</type>
+        <definition>void ns::foo</definition>
+        <argsstring>(std::initializer_list&lt; int * &gt;)</argsstring>
+        <name>foo</name>
+        <param>
+          <type>std::initializer_list&lt; int * &gt;</type>
+        </param>
+        <briefdescription>
+          <para>Function. </para>
+        </briefdescription>
+        <detaileddescription>
+        </detaileddescription>
+        <inbodydescription>
+        </inbodydescription>
+        <location file="074_ref.cpp" line="73" column="1" declfile="074_ref.cpp" declline="73" declcolumn="1"/>
+      </memberdef>
+    </sectiondef>
+    <briefdescription>
+      <para>A namespace. </para>
+    </briefdescription>
+    <detaileddescription>
+      <para>
+        <itemizedlist>
+          <listitem>
+            <para>Link to an UDL w/o spaces: <ref refid="namespacens_1afd2e8a8437eff630f52a452ea6dc6e82" kindref="member">operator""_op</ref></para>
+          </listitem>
+          <listitem>
+            <para>Link to an UDL with spaces: <ref refid="namespacens_1a47f70e51e66b81b8383a4e2da66f1e09" kindref="member">operator""_oq</ref></para>
+          </listitem>
+          <listitem>
+            <para>Link to a function with spaces: <ref refid="namespacens_1aaa9eb8a7b40d4ed0edbe5e163b4e6e8d" kindref="member">foo(std::initializer_list&lt; int* &gt;)</ref></para>
+          </listitem>
+          <listitem>
+            <para>Link to a function w/o spaces: <ref refid="namespacens_1aaa9eb8a7b40d4ed0edbe5e163b4e6e8d" kindref="member">foo(std::initializer_list&lt;int*&gt;)</ref> </para>
+          </listitem>
+        </itemizedlist>
+      </para>
+    </detaileddescription>
+    <location file="074_ref.cpp" line="64" column="1"/>
+  </compounddef>
+</doxygen>
diff --git a/testing/074/struct_foo.xml b/testing/074/struct_foo.xml
index 7096238..e031314 100755..100644
--- a/testing/074/struct_foo.xml
+++ b/testing/074/struct_foo.xml
@@ -1,290 +1,290 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="">

-  <compounddef id="struct_foo" kind="struct" language="C++" prot="public">

-    <compoundname>Foo</compoundname>

-    <sectiondef kind="public-func">

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

-        <type/>

-        <definition>Foo::Foo</definition>

-        <argsstring>()</argsstring>

-        <name>Foo</name>

-        <briefdescription>

-        </briefdescription>

-        <detaileddescription>

-          <para>Constructor </para>

-        </detaileddescription>

-        <inbodydescription>

-        </inbodydescription>

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

-      </memberdef>

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

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

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

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

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

-        <param>

-          <type>int</type>

-          <declname>i</declname>

-        </param>

-        <briefdescription>

-        </briefdescription>

-        <detaileddescription>

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

-        </detaileddescription>

-        <inbodydescription>

-        </inbodydescription>

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

-      </memberdef>

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

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

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

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

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

-        <param>

-          <type>int</type>

-          <declname>i</declname>

-        </param>

-        <briefdescription>

-        </briefdescription>

-        <detaileddescription>

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

-        </detaileddescription>

-        <inbodydescription>

-        </inbodydescription>

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

-      </memberdef>

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

-        <type>int</type>

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

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

-        <name>operator()</name>

-        <param>

-          <type>int</type>

-          <declname>i</declname>

-        </param>

-        <briefdescription>

-        </briefdescription>

-        <detaileddescription>

-          <para>overloaded call operator </para>

-        </detaileddescription>

-        <inbodydescription>

-        </inbodydescription>

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

-      </memberdef>

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

-        <type>int</type>

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

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

-        <name>operator()</name>

-        <param>

-          <type>int</type>

-          <declname>i</declname>

-        </param>

-        <briefdescription>

-        </briefdescription>

-        <detaileddescription>

-          <para>overloaded call operator </para>

-        </detaileddescription>

-        <inbodydescription>

-        </inbodydescription>

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

-      </memberdef>

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

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

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

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

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

-        <param>

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

-          <declname>rhs</declname>

-        </param>

-        <briefdescription>

-        </briefdescription>

-        <detaileddescription>

-          <para>and equal operator </para>

-        </detaileddescription>

-        <inbodydescription>

-        </inbodydescription>

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

-      </memberdef>

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

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

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

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

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

-        <param>

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

-          <declname>rhs</declname>

-        </param>

-        <briefdescription>

-        </briefdescription>

-        <detaileddescription>

-          <para>and equal operator </para>

-        </detaileddescription>

-        <inbodydescription>

-        </inbodydescription>

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

-      </memberdef>

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

-        <type>int *</type>

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

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

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

-        <param>

-          <type>int *</type>

-          <declname>p</declname>

-        </param>

-        <briefdescription>

-        </briefdescription>

-        <detaileddescription>

-          <para>Member pointer operator </para>

-        </detaileddescription>

-        <inbodydescription>

-        </inbodydescription>

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

-      </memberdef>

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

-        <type>

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

-        </type>

-        <definition>Foo Foo::fun</definition>

-        <argsstring>() const</argsstring>

-        <name>fun</name>

-        <briefdescription>

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

-        </briefdescription>

-        <detaileddescription>

-        </detaileddescription>

-        <inbodydescription>

-        </inbodydescription>

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

-      </memberdef>

-    </sectiondef>

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

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

-        <type>

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

-        </type>

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

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

-        <name>fun</name>

-        <param>

-          <type>

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

-          </type>

-          <declname>a</declname>

-        </param>

-        <param>

-          <type>

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

-          </type>

-          <declname>b</declname>

-        </param>

-        <briefdescription>

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

-        </briefdescription>

-        <detaileddescription>

-          <para>

-            <itemizedlist>

-              <listitem>

-                <para>

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

-                </para>

-              </listitem>

-              <listitem>

-                <para>

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

-                </para>

-              </listitem>

-              <listitem>

-                <para>

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

-                </para>

-              </listitem>

-            </itemizedlist>

-          </para>

-        </detaileddescription>

-        <inbodydescription>

-        </inbodydescription>

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

-      </memberdef>

-    </sectiondef>

-    <briefdescription>

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

-    </briefdescription>

-    <detaileddescription>

-      <para>

-        <simplesect kind="see">

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

-        </simplesect>

-        <simplesect kind="see">

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

-        </simplesect>

-        <simplesect kind="see">

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

-        </simplesect>

-        <simplesect kind="see">

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

-        </simplesect>

-        <simplesect kind="see">

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

-        </simplesect>

-        <simplesect kind="see">

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

-        </simplesect>

-        <simplesect kind="see">

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

-        </simplesect>

-        <simplesect kind="see">

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

-        </simplesect>

-        <simplesect kind="see">

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

-        </simplesect>

-      </para>

-    </detaileddescription>

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

-    <listofallmembers>

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

-        <scope>Foo</scope>

-        <name>Foo</name>

-      </member>

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

-        <scope>Foo</scope>

-        <name>fun</name>

-      </member>

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

-        <scope>Foo</scope>

-        <name>fun</name>

-      </member>

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

-        <scope>Foo</scope>

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

-      </member>

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

-        <scope>Foo</scope>

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

-      </member>

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

-        <scope>Foo</scope>

-        <name>operator()</name>

-      </member>

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

-        <scope>Foo</scope>

-        <name>operator()</name>

-      </member>

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

-        <scope>Foo</scope>

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

-      </member>

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

-        <scope>Foo</scope>

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

-      </member>

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

-        <scope>Foo</scope>

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

-      </member>

-    </listofallmembers>

-  </compounddef>

-</doxygen>

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="">
+  <compounddef id="struct_foo" kind="struct" language="C++" prot="public">
+    <compoundname>Foo</compoundname>
+    <sectiondef kind="public-func">
+      <memberdef kind="function" id="struct_foo_1a5c036d1b3561a0e1beffe8c6799a4276" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
+        <type/>
+        <definition>Foo::Foo</definition>
+        <argsstring>()</argsstring>
+        <name>Foo</name>
+        <briefdescription>
+        </briefdescription>
+        <detaileddescription>
+          <para>Constructor </para>
+        </detaileddescription>
+        <inbodydescription>
+        </inbodydescription>
+        <location file="074_ref.cpp" line="21" column="1"/>
+      </memberdef>
+      <memberdef kind="function" id="struct_foo_1a279debd94d894223fa8468933e2d6188" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
+        <type><ref refid="struct_foo" kindref="compound">Foo</ref> &amp;</type>
+        <definition>Foo&amp; Foo::operator&lt;&lt;</definition>
+        <argsstring>(int i)</argsstring>
+        <name>operator&lt;&lt;</name>
+        <param>
+          <type>int</type>
+          <declname>i</declname>
+        </param>
+        <briefdescription>
+        </briefdescription>
+        <detaileddescription>
+          <para>overloaded less than operator </para>
+        </detaileddescription>
+        <inbodydescription>
+        </inbodydescription>
+        <location file="074_ref.cpp" line="32" column="1"/>
+      </memberdef>
+      <memberdef kind="function" id="struct_foo_1a48bcc3de9b2f1ad09a3518a0c9f0da61" prot="public" static="no" const="yes" explicit="no" inline="no" virt="non-virtual">
+        <type>const <ref refid="struct_foo" kindref="compound">Foo</ref> &amp;</type>
+        <definition>const Foo&amp; Foo::operator&lt;&lt;</definition>
+        <argsstring>(int i) const</argsstring>
+        <name>operator&lt;&lt;</name>
+        <param>
+          <type>int</type>
+          <declname>i</declname>
+        </param>
+        <briefdescription>
+        </briefdescription>
+        <detaileddescription>
+          <para>overloaded const less than operator </para>
+        </detaileddescription>
+        <inbodydescription>
+        </inbodydescription>
+        <location file="074_ref.cpp" line="35" column="1"/>
+      </memberdef>
+      <memberdef kind="function" id="struct_foo_1a3a41dcf8c53f777d50676ea28400a640" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
+        <type>int</type>
+        <definition>int Foo::operator()</definition>
+        <argsstring>(int i)</argsstring>
+        <name>operator()</name>
+        <param>
+          <type>int</type>
+          <declname>i</declname>
+        </param>
+        <briefdescription>
+        </briefdescription>
+        <detaileddescription>
+          <para>overloaded call operator </para>
+        </detaileddescription>
+        <inbodydescription>
+        </inbodydescription>
+        <location file="074_ref.cpp" line="38" column="1"/>
+      </memberdef>
+      <memberdef kind="function" id="struct_foo_1ae3c9c1f33cdb8b932c6eb104660a262b" prot="public" static="no" const="yes" explicit="no" inline="no" virt="non-virtual">
+        <type>int</type>
+        <definition>int Foo::operator()</definition>
+        <argsstring>(int i) const</argsstring>
+        <name>operator()</name>
+        <param>
+          <type>int</type>
+          <declname>i</declname>
+        </param>
+        <briefdescription>
+        </briefdescription>
+        <detaileddescription>
+          <para>overloaded call operator </para>
+        </detaileddescription>
+        <inbodydescription>
+        </inbodydescription>
+        <location file="074_ref.cpp" line="41" column="1"/>
+      </memberdef>
+      <memberdef kind="function" id="struct_foo_1aa20bd44b1bb87a652ac65170ddfa1a5a" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
+        <type><ref refid="struct_foo" kindref="compound">Foo</ref> &amp;</type>
+        <definition>Foo&amp; Foo::operator&amp;=</definition>
+        <argsstring>(const Foo &amp;rhs)</argsstring>
+        <name>operator&amp;=</name>
+        <param>
+          <type>const <ref refid="struct_foo" kindref="compound">Foo</ref> &amp;</type>
+          <declname>rhs</declname>
+        </param>
+        <briefdescription>
+        </briefdescription>
+        <detaileddescription>
+          <para>and equal operator </para>
+        </detaileddescription>
+        <inbodydescription>
+        </inbodydescription>
+        <location file="074_ref.cpp" line="44" column="1"/>
+      </memberdef>
+      <memberdef kind="function" id="struct_foo_1ab1a2a53ad5b2a0f97422630330c151fe" prot="public" static="no" const="yes" explicit="no" inline="no" virt="non-virtual">
+        <type>const <ref refid="struct_foo" kindref="compound">Foo</ref> &amp;</type>
+        <definition>const Foo&amp; Foo::operator&amp;=</definition>
+        <argsstring>(const Foo &amp;rhs) const</argsstring>
+        <name>operator&amp;=</name>
+        <param>
+          <type>const <ref refid="struct_foo" kindref="compound">Foo</ref> &amp;</type>
+          <declname>rhs</declname>
+        </param>
+        <briefdescription>
+        </briefdescription>
+        <detaileddescription>
+          <para>and equal operator </para>
+        </detaileddescription>
+        <inbodydescription>
+        </inbodydescription>
+        <location file="074_ref.cpp" line="47" column="1"/>
+      </memberdef>
+      <memberdef kind="function" id="struct_foo_1a0514e1f5b30cbf77e1c39d7aba308656" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
+        <type>int *</type>
+        <definition>int* Foo::operator-&gt;*</definition>
+        <argsstring>(int *p)</argsstring>
+        <name>operator-&gt;*</name>
+        <param>
+          <type>int *</type>
+          <declname>p</declname>
+        </param>
+        <briefdescription>
+        </briefdescription>
+        <detaileddescription>
+          <para>Member pointer operator </para>
+        </detaileddescription>
+        <inbodydescription>
+        </inbodydescription>
+        <location file="074_ref.cpp" line="50" column="1"/>
+      </memberdef>
+      <memberdef kind="function" id="struct_foo_1a978acd73e910ce56cc169ebec8736669" prot="public" static="no" const="yes" explicit="no" inline="no" virt="non-virtual">
+        <type>
+          <ref refid="struct_foo" kindref="compound">Foo</ref>
+        </type>
+        <definition>Foo Foo::fun</definition>
+        <argsstring>() const</argsstring>
+        <name>fun</name>
+        <briefdescription>
+          <para>Fun with itself. </para>
+        </briefdescription>
+        <detaileddescription>
+        </detaileddescription>
+        <inbodydescription>
+        </inbodydescription>
+        <location file="074_ref.cpp" line="53" column="1"/>
+      </memberdef>
+    </sectiondef>
+    <sectiondef kind="public-static-func">
+      <memberdef kind="function" id="struct_foo_1abdf64a71706807b0f946265902c530ee" prot="public" static="yes" const="no" explicit="no" inline="no" virt="non-virtual">
+        <type>
+          <ref refid="struct_foo" kindref="compound">Foo</ref>
+        </type>
+        <definition>static Foo Foo::fun</definition>
+        <argsstring>(Foo a, Foo b)</argsstring>
+        <name>fun</name>
+        <param>
+          <type>
+            <ref refid="struct_foo" kindref="compound">Foo</ref>
+          </type>
+          <declname>a</declname>
+        </param>
+        <param>
+          <type>
+            <ref refid="struct_foo" kindref="compound">Foo</ref>
+          </type>
+          <declname>b</declname>
+        </param>
+        <briefdescription>
+          <para>Fun of two. </para>
+        </briefdescription>
+        <detaileddescription>
+          <para>
+            <itemizedlist>
+              <listitem>
+                <para>
+                  <ref refid="struct_foo_1a978acd73e910ce56cc169ebec8736669" kindref="member">fun() const</ref>
+                </para>
+              </listitem>
+              <listitem>
+                <para>
+                  <ref refid="struct_foo_1a978acd73e910ce56cc169ebec8736669" kindref="member">fun() const</ref>
+                </para>
+              </listitem>
+              <listitem>
+                <para>
+                  <ref refid="struct_foo_1a978acd73e910ce56cc169ebec8736669" kindref="member">title</ref>
+                </para>
+              </listitem>
+            </itemizedlist>
+          </para>
+        </detaileddescription>
+        <inbodydescription>
+        </inbodydescription>
+        <location file="074_ref.cpp" line="29" column="1"/>
+      </memberdef>
+    </sectiondef>
+    <briefdescription>
+      <para><ref refid="struct_foo" kindref="compound">Foo</ref> class. </para>
+    </briefdescription>
+    <detaileddescription>
+      <para>
+        <simplesect kind="see">
+          <para><ref refid="struct_foo_1a5c036d1b3561a0e1beffe8c6799a4276" kindref="member">Foo::Foo()</ref> constructor for details. </para>
+        </simplesect>
+        <simplesect kind="see">
+          <para><ref refid="struct_foo" kindref="compound">Foo</ref> constant. </para>
+        </simplesect>
+        <simplesect kind="see">
+          <para><ref refid="struct_foo_1a279debd94d894223fa8468933e2d6188" kindref="member">less than operator</ref>. </para>
+        </simplesect>
+        <simplesect kind="see">
+          <para><ref refid="struct_foo_1a48bcc3de9b2f1ad09a3518a0c9f0da61" kindref="member">const less than operator</ref>. </para>
+        </simplesect>
+        <simplesect kind="see">
+          <para><ref refid="struct_foo_1a3a41dcf8c53f777d50676ea28400a640" kindref="member">call operator</ref>. </para>
+        </simplesect>
+        <simplesect kind="see">
+          <para><ref refid="struct_foo_1ae3c9c1f33cdb8b932c6eb104660a262b" kindref="member">const call operator</ref>. </para>
+        </simplesect>
+        <simplesect kind="see">
+          <para><ref refid="struct_foo_1aa20bd44b1bb87a652ac65170ddfa1a5a" kindref="member">and equal operator</ref>. </para>
+        </simplesect>
+        <simplesect kind="see">
+          <para><ref refid="struct_foo_1ab1a2a53ad5b2a0f97422630330c151fe" kindref="member">const and equal operator</ref>. </para>
+        </simplesect>
+        <simplesect kind="see">
+          <para><ref refid="struct_foo_1a0514e1f5b30cbf77e1c39d7aba308656" kindref="member">member pointer operator</ref>. </para>
+        </simplesect>
+      </para>
+    </detaileddescription>
+    <location file="074_ref.cpp" line="19" column="1" bodyfile="074_ref.cpp" bodystart="19" bodyend="54"/>
+    <listofallmembers>
+      <member refid="struct_foo_1a5c036d1b3561a0e1beffe8c6799a4276" prot="public" virt="non-virtual">
+        <scope>Foo</scope>
+        <name>Foo</name>
+      </member>
+      <member refid="struct_foo_1abdf64a71706807b0f946265902c530ee" prot="public" virt="non-virtual">
+        <scope>Foo</scope>
+        <name>fun</name>
+      </member>
+      <member refid="struct_foo_1a978acd73e910ce56cc169ebec8736669" prot="public" virt="non-virtual">
+        <scope>Foo</scope>
+        <name>fun</name>
+      </member>
+      <member refid="struct_foo_1aa20bd44b1bb87a652ac65170ddfa1a5a" prot="public" virt="non-virtual">
+        <scope>Foo</scope>
+        <name>operator&amp;=</name>
+      </member>
+      <member refid="struct_foo_1ab1a2a53ad5b2a0f97422630330c151fe" prot="public" virt="non-virtual">
+        <scope>Foo</scope>
+        <name>operator&amp;=</name>
+      </member>
+      <member refid="struct_foo_1a3a41dcf8c53f777d50676ea28400a640" prot="public" virt="non-virtual">
+        <scope>Foo</scope>
+        <name>operator()</name>
+      </member>
+      <member refid="struct_foo_1ae3c9c1f33cdb8b932c6eb104660a262b" prot="public" virt="non-virtual">
+        <scope>Foo</scope>
+        <name>operator()</name>
+      </member>
+      <member refid="struct_foo_1a0514e1f5b30cbf77e1c39d7aba308656" prot="public" virt="non-virtual">
+        <scope>Foo</scope>
+        <name>operator-&gt;*</name>
+      </member>
+      <member refid="struct_foo_1a279debd94d894223fa8468933e2d6188" prot="public" virt="non-virtual">
+        <scope>Foo</scope>
+        <name>operator&lt;&lt;</name>
+      </member>
+      <member refid="struct_foo_1a48bcc3de9b2f1ad09a3518a0c9f0da61" prot="public" virt="non-virtual">
+        <scope>Foo</scope>
+        <name>operator&lt;&lt;</name>
+      </member>
+    </listofallmembers>
+  </compounddef>
+</doxygen>
diff --git a/testing/078/078__xml__namespace__members__in__file__scope_8h.xml b/testing/078/078__xml__namespace__members__in__file__scope_8h.xml
index e0a0343..728054f 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
@@ -31,7 +31,7 @@
         </detaileddescription>
         <inbodydescription>
         </inbodydescription>
-        <location file="078_xml_namespace_members_in_file_scope.h" line="12" column="1"/>
+        <location file="078_xml_namespace_members_in_file_scope.h" line="12" column="1" declfile="078_xml_namespace_members_in_file_scope.h" declline="12" declcolumn="1"/>
       </memberdef>
     </sectiondef>
     <briefdescription>
diff --git a/testing/081/namespace_n.xml b/testing/081/namespace_n.xml
new file mode 100644
index 0000000..59d3a92
--- /dev/null
+++ b/testing/081/namespace_n.xml
@@ -0,0 +1,50 @@
+<?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="namespace_n" kind="namespace" language="C++">
+    <compoundname>N</compoundname>
+    <sectiondef kind="var">
+      <memberdef kind="variable" id="namespace_n_1a406e233433deabc7b1612470373d53e0" prot="public" static="no" mutable="no">
+        <type>int</type>
+        <definition>int N::var</definition>
+        <argsstring/>
+        <name>var</name>
+        <briefdescription>
+          <para>variable declaration </para>
+        </briefdescription>
+        <detaileddescription>
+          <para>Detailed docs. </para>
+        </detaileddescription>
+        <inbodydescription>
+        </inbodydescription>
+        <location file="081_decl_def.cpp" line="11" column="1" bodyfile="081_decl_def.cpp" bodystart="11" bodyend="-1" declfile="decl_def.h" declline="5" declcolumn="1"/>
+      </memberdef>
+    </sectiondef>
+    <sectiondef kind="func">
+      <memberdef kind="function" id="namespace_n_1a0c776dda1c868f653e020c9ee8dc83bb" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
+        <type>void</type>
+        <definition>void N::foo</definition>
+        <argsstring>(int param)</argsstring>
+        <name>foo</name>
+        <param>
+          <type>int</type>
+          <declname>param</declname>
+        </param>
+        <briefdescription>
+          <para>function declaration </para>
+        </briefdescription>
+        <detaileddescription>
+          <para>Detailed docs. </para>
+        </detaileddescription>
+        <inbodydescription>
+        </inbodydescription>
+        <location file="081_decl_def.cpp" line="14" column="1" bodyfile="081_decl_def.cpp" bodystart="14" bodyend="16" declfile="decl_def.h" declline="8" declcolumn="1"/>
+      </memberdef>
+    </sectiondef>
+    <briefdescription>
+    </briefdescription>
+    <detaileddescription>
+      <para>Namespace </para>
+    </detaileddescription>
+    <location file="decl_def.h" line="2" column="1"/>
+  </compounddef>
+</doxygen>
diff --git a/testing/081_decl_def.cpp b/testing/081_decl_def.cpp
new file mode 100644
index 0000000..5623828
--- /dev/null
+++ b/testing/081_decl_def.cpp
@@ -0,0 +1,18 @@
+// objective: test for declation and definition order independence: decl first
+// check: namespace_n.xml
+// config: INPUT = $INPUTDIR/decl_def.h $INPUTDIR/081_decl_def.cpp
+#include "test.h"
+
+/** Namespace */
+namespace N
+{
+
+/** Detailed docs. */
+int var;
+
+/** Detailed docs. */
+void foo(int param)
+{
+}
+
+}
diff --git a/testing/082/namespace_n.xml b/testing/082/namespace_n.xml
new file mode 100644
index 0000000..81867fe
--- /dev/null
+++ b/testing/082/namespace_n.xml
@@ -0,0 +1,50 @@
+<?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="namespace_n" kind="namespace" language="C++">
+    <compoundname>N</compoundname>
+    <sectiondef kind="var">
+      <memberdef kind="variable" id="namespace_n_1a406e233433deabc7b1612470373d53e0" prot="public" static="no" mutable="no">
+        <type>int</type>
+        <definition>int N::var</definition>
+        <argsstring/>
+        <name>var</name>
+        <briefdescription>
+          <para>variable declaration </para>
+        </briefdescription>
+        <detaileddescription>
+          <para>Detailed docs. </para>
+        </detaileddescription>
+        <inbodydescription>
+        </inbodydescription>
+        <location file="082_decl_def.cpp" line="11" column="1" bodyfile="082_decl_def.cpp" bodystart="11" bodyend="-1" declfile="decl_def.h" declline="5" declcolumn="1"/>
+      </memberdef>
+    </sectiondef>
+    <sectiondef kind="func">
+      <memberdef kind="function" id="namespace_n_1a0c776dda1c868f653e020c9ee8dc83bb" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
+        <type>void</type>
+        <definition>void N::foo</definition>
+        <argsstring>(int param)</argsstring>
+        <name>foo</name>
+        <param>
+          <type>int</type>
+          <declname>param</declname>
+        </param>
+        <briefdescription>
+          <para>function declaration </para>
+        </briefdescription>
+        <detaileddescription>
+          <para>Detailed docs. </para>
+        </detaileddescription>
+        <inbodydescription>
+        </inbodydescription>
+        <location file="082_decl_def.cpp" line="14" column="1" bodyfile="082_decl_def.cpp" bodystart="14" bodyend="16" declfile="decl_def.h" declline="8" declcolumn="1"/>
+      </memberdef>
+    </sectiondef>
+    <briefdescription>
+    </briefdescription>
+    <detaileddescription>
+      <para>Namespace </para>
+    </detaileddescription>
+    <location file="082_decl_def.cpp" line="8" column="1"/>
+  </compounddef>
+</doxygen>
diff --git a/testing/082_decl_def.cpp b/testing/082_decl_def.cpp
new file mode 100644
index 0000000..905f7f4
--- /dev/null
+++ b/testing/082_decl_def.cpp
@@ -0,0 +1,18 @@
+// objective: test for declation and definition order independence: def first
+// check: namespace_n.xml
+// config: INPUT = $INPUTDIR/082_decl_def.cpp $INPUTDIR/decl_def.h
+#include "test.h"
+
+/** Namespace */
+namespace N
+{
+
+/** Detailed docs. */
+int var;
+
+/** Detailed docs. */
+void foo(int param)
+{
+}
+
+}
diff --git a/testing/decl_def.h b/testing/decl_def.h
new file mode 100644
index 0000000..6e39335
--- /dev/null
+++ b/testing/decl_def.h
@@ -0,0 +1,10 @@
+namespace N
+{
+
+/** @brief variable declaration */
+extern int var;
+
+/** @brief function declaration */
+void foo(int param);
+
+}