giscanner: refactor GTK-Doc comment block serialization

13 files changed, 991 insertions, 87 deletions

diff --git a/tests/scanner/annotationparser/gtkdoc/annotations/tester.c.xml b/tests/scanner/annotationparser/gtkdoc/annotations/tester.c.xml
index 9fda10b5..bf94edba 100644
--- a/tests/scanner/annotationparser/gtkdoc/annotations/tester.c.xml
+++ b/tests/scanner/annotationparser/gtkdoc/annotations/tester.c.xml
@@ -23,6 +23,12 @@
       <description>This file contains non-sense code for the sole purpose of testing the docs.</description>
     </docblock>
   </parser>
+  <output>/**
+ * SECTION:tester
+ * @short_description: module for gtk-doc unit test
+ *
+ * This file contains non-sense code for the sole purpose of testing the docs.
+ */</output>
 </test>
 
 <test>
@@ -67,6 +73,14 @@
       <description>Document parameter relation for array length.</description>
     </docblock>
   </parser>
+  <output>/**
+ * annotation_array_length:
+ * @list: a #GtkListStore
+ * @n_columns: number of columns
+ * @types: (array length=n_columns): list of types
+ *
+ * Document parameter relation for array length.
+ */</output>
 </test>
 
 <test>
@@ -125,6 +139,17 @@
       </tags>
     </docblock>
   </parser>
+  <output>/**
+ * annotation_nullable:
+ * @uri: a uri
+ * @label: (allow-none): an optional string, which is used in ways too
+ *  complicated to describe in a single line, making it necessary to wrap it
+ *
+ * Document optional parameters.
+ *
+ * Returns: (transfer full) (allow-none): Returns stuff which you have to
+ *  free after use, whose description is also rather long
+ */</output>
 </test>
 
 <test>
@@ -166,6 +191,14 @@
       </tags>
     </docblock>
   </parser>
+  <output>/**
+ * annotation_elementtype:
+ * @list: (element-type GObject): list of #GObject instances to search
+ *
+ * Document optional parameters.
+ *
+ * Returns: %TRUE for success
+ */</output>
 </test>
 
 <test>
@@ -215,6 +248,14 @@
       </tags>
     </docblock>
   </parser>
+  <output>/**
+ * annotation_elementtype_transfer:
+ * @list: (element-type utf8) (transfer full): list of #GObject instances to search
+ *
+ * Document optional parameters.
+ *
+ * Returns: %TRUE for success
+ */</output>
 </test>
 
 <test>
@@ -249,6 +290,13 @@
       </tags>
     </docblock>
   </parser>
+  <output>/**
+ * annotation_elementtype_returns:
+ *
+ * Document optional parameters.
+ *
+ * Returns: (element-type GObject): A list of #GObject instances.
+ */</output>
 </test>
 
 <test>
@@ -293,6 +341,14 @@
       </tags>
     </docblock>
   </parser>
+  <output>/**
+ * annotation_outparams:
+ * @list: (out) (transfer none): a pointer to take a list
+ *
+ * Document optional parameters.
+ *
+ * Returns: %TRUE for success
+ */</output>
 </test>
 
 <test>
@@ -321,6 +377,12 @@
       <description>Documentation for this function.</description>
     </docblock>
   </parser>
+  <output>/**
+ * annotation_skip: (skip)
+ * @list: a pointer to take a list
+ *
+ * Documentation for this function.
+ */</output>
 </test>
 
 <test>
@@ -359,6 +421,13 @@
       <description>Documentation for this function.</description>
     </docblock>
   </parser>
+  <output>/**
+ * annotation_scope:
+ * @callback: (scope async): a callback
+ * @user_data: data to pass to callback
+ *
+ * Documentation for this function.
+ */</output>
 </test>
 
 </tests>
diff --git a/tests/scanner/annotationparser/gtkdoc/annotations/tester.h.xml b/tests/scanner/annotationparser/gtkdoc/annotations/tester.h.xml
index 6d00aa36..0917cd95 100644
--- a/tests/scanner/annotationparser/gtkdoc/annotations/tester.h.xml
+++ b/tests/scanner/annotationparser/gtkdoc/annotations/tester.h.xml
@@ -28,6 +28,12 @@
       <description>small struct</description>
     </docblock>
   </parser>
+  <output>/**
+ * GtkdocAnnotation:
+ * @that: (allow-none): eventualy points to something
+ *
+ * small struct
+ */</output>
 </test>
 
 </tests>
diff --git a/tests/scanner/annotationparser/gtkdoc/bugs/tester.c.xml b/tests/scanner/annotationparser/gtkdoc/bugs/tester.c.xml
index 1197c9b7..7d766c68 100644
--- a/tests/scanner/annotationparser/gtkdoc/bugs/tester.c.xml
+++ b/tests/scanner/annotationparser/gtkdoc/bugs/tester.c.xml
@@ -49,6 +49,25 @@ Second paragraph inside subsection.
 </refsect2>]]></description>
     </docblock>
   </parser>
+  <output><![CDATA[/**
+ * SECTION:tester
+ * @short_description: module for gtk-doc unit test
+ *
+ * This file contains non-sense code for the sole purpose of testing the docs.
+ *
+ * As described in http://bugzilla.gnome.org/show_bug.cgi?id=457077 it
+ * returns nothing.
+ *
+ * Some special characters need escaping. The tests should pass 100\%.
+ * Try a <ulink url="http://www.gtk.org/gtk-doc/#Top">link containing a # char</ulink>.
+ *
+ * <refsect2 id="dummy-id">
+ * <title>more details</title>
+ * <para>
+ * Second paragraph inside subsection.
+ * </para>
+ * </refsect2>
+ */]]></output>
 </test>
 
 <test>
@@ -72,6 +91,12 @@ Second paragraph inside subsection.
       <description>http://bugzilla.gnome.org/show_bug.cgi?id=141869</description>
     </docblock>
   </parser>
+  <output>/**
+ * bug_141869_a:
+ * @pid: arg
+ *
+ * http://bugzilla.gnome.org/show_bug.cgi?id=141869
+ */</output>
 </test>
 
 <test>
@@ -95,6 +120,12 @@ Second paragraph inside subsection.
       <description>http://bugzilla.gnome.org/show_bug.cgi?id=141869</description>
     </docblock>
   </parser>
+  <output>/**
+ * bug_141869_b:
+ * @pid: arg
+ *
+ * http://bugzilla.gnome.org/show_bug.cgi?id=141869
+ */</output>
 </test>
 
 <test>
@@ -118,6 +149,12 @@ Second paragraph inside subsection.
       <description>http://bugzilla.gnome.org/show_bug.cgi?id=379466</description>
     </docblock>
   </parser>
+  <output>/**
+ * bug_379466:
+ * @pid: arg
+ *
+ * http://bugzilla.gnome.org/show_bug.cgi?id=379466
+ */</output>
 </test>
 
 <test>
@@ -157,6 +194,16 @@ http://bugzilla.gnome.org/show_bug.cgi?id=380824</description>
       </tags>
     </docblock>
   </parser>
+  <output>/**
+ * bug_380824:
+ * @arg: arg
+ *
+ * Returns a value.
+ * http://bugzilla.gnome.org/show_bug.cgi?id=380824
+ *
+ * Since: 0.1
+ * Returns: result
+ */</output>
 </test>
 
 <test>
@@ -181,6 +228,13 @@ http://bugzilla.gnome.org/show_bug.cgi?id=380824</description>
       </tags>
     </docblock>
   </parser>
+  <output>/**
+ * bug_411739:
+ *
+ * http://bugzilla.gnome.org/show_bug.cgi?id=411739
+ *
+ * Returns: result
+ */</output>
 </test>
 
 <test>
@@ -204,6 +258,12 @@ http://bugzilla.gnome.org/show_bug.cgi?id=380824</description>
       <description>http://bugzilla.gnome.org/show_bug.cgi?id=419997</description>
     </docblock>
   </parser>
+  <output>/**
+ * bug_419997:
+ * @const_values: arg
+ *
+ * http://bugzilla.gnome.org/show_bug.cgi?id=419997
+ */</output>
 </test>
 
 <test>
@@ -227,6 +287,12 @@ http://bugzilla.gnome.org/show_bug.cgi?id=380824</description>
       <description>http://bugzilla.gnome.org/show_bug.cgi?id=445693</description>
     </docblock>
   </parser>
+  <output>/**
+ * bug_445693:
+ * @pid: arg
+ *
+ * http://bugzilla.gnome.org/show_bug.cgi?id=445693
+ */</output>
 </test>
 
 <test>
@@ -251,6 +317,13 @@ http://bugzilla.gnome.org/show_bug.cgi?id=380824</description>
       </tags>
     </docblock>
   </parser>
+  <output>/**
+ * bug_471014:
+ *
+ * http://bugzilla.gnome.org/show_bug.cgi?id=471014
+ *
+ * Returns: result
+ */</output>
 </test>
 
 <test>
@@ -274,6 +347,12 @@ http://bugzilla.gnome.org/show_bug.cgi?id=380824</description>
       <description>http://bugzilla.gnome.org/show_bug.cgi?id=446648</description>
     </docblock>
   </parser>
+  <output>/**
+ * Bug446648:
+ * @BUG_446648_FOO: foo
+ *
+ * http://bugzilla.gnome.org/show_bug.cgi?id=446648
+ */</output>
 </test>
 
 <test>
@@ -298,6 +377,13 @@ http://bugzilla.gnome.org/show_bug.cgi?id=380824</description>
       </tags>
     </docblock>
   </parser>
+  <output>/**
+ * bug_552602:
+ *
+ * http://bugzilla.gnome.org/show_bug.cgi?id=552602
+ *
+ * Returns: result
+ */</output>
 </test>
 
 <test>
@@ -322,6 +408,13 @@ http://bugzilla.gnome.org/show_bug.cgi?id=380824</description>
       </tags>
     </docblock>
   </parser>
+  <output>/**
+ * bug_574654a:
+ *
+ * http://bugzilla.gnome.org/show_bug.cgi?id=574654
+ *
+ * Returns: result
+ */</output>
 </test>
 
 <test>
@@ -345,6 +438,12 @@ http://bugzilla.gnome.org/show_bug.cgi?id=380824</description>
       <description>http://bugzilla.gnome.org/show_bug.cgi?id=574654</description>
     </docblock>
   </parser>
+  <output>/**
+ * bug_574654b:
+ * @offset: skip this many items
+ *
+ * http://bugzilla.gnome.org/show_bug.cgi?id=574654
+ */</output>
 </test>
 
 <test>
@@ -361,6 +460,11 @@ http://bugzilla.gnome.org/show_bug.cgi?id=380824</description>
       <description>http://bugzilla.gnome.org/show_bug.cgi?id=580300</description>
     </docblock>
   </parser>
+  <output>/**
+ * bug_580300a_get_type:
+ *
+ * http://bugzilla.gnome.org/show_bug.cgi?id=580300
+ */</output>
 </test>
 
 <test>
@@ -384,6 +488,12 @@ http://bugzilla.gnome.org/show_bug.cgi?id=380824</description>
       <description>http://bugzilla.gnome.org/show_bug.cgi?id=580300</description>
     </docblock>
   </parser>
+  <output>/**
+ * bug_580300b_get_type:
+ * @a: value
+ *
+ * http://bugzilla.gnome.org/show_bug.cgi?id=580300
+ */</output>
 </test>
 
 <test>
@@ -400,6 +510,11 @@ http://bugzilla.gnome.org/show_bug.cgi?id=380824</description>
       <description>http://bugzilla.gnome.org/show_bug.cgi?id=580300</description>
     </docblock>
   </parser>
+  <output>/**
+ * bug_580300c_get_type:
+ *
+ * http://bugzilla.gnome.org/show_bug.cgi?id=580300
+ */</output>
 </test>
 
 <test>
@@ -424,6 +539,13 @@ http://bugzilla.gnome.org/show_bug.cgi?id=380824</description>
       </tags>
     </docblock>
   </parser>
+  <output>/**
+ * bug_580300d_get_type:
+ *
+ * http://bugzilla.gnome.org/show_bug.cgi?id=580300
+ *
+ * Returns: result
+ */</output>
 </test>
 
 <test>
@@ -447,6 +569,12 @@ http://bugzilla.gnome.org/show_bug.cgi?id=380824</description>
       <description>http://bugzilla.gnome.org/show_bug.cgi?id=597937</description>
     </docblock>
   </parser>
+  <output>/**
+ * bug_597937:
+ * @function_arg: value
+ *
+ * http://bugzilla.gnome.org/show_bug.cgi?id=597937
+ */</output>
 </test>
 
 <test>
@@ -471,6 +599,13 @@ http://bugzilla.gnome.org/show_bug.cgi?id=380824</description>
       </tags>
     </docblock>
   </parser>
+  <output>/**
+ * bug_602518a:
+ *
+ * http://bugzilla.gnome.org/show_bug.cgi?id=602518
+ *
+ * Returns: result
+ */</output>
 </test>
 
 <test>
@@ -495,6 +630,13 @@ http://bugzilla.gnome.org/show_bug.cgi?id=380824</description>
       </tags>
     </docblock>
   </parser>
+  <output>/**
+ * bug_602518b:
+ *
+ * http://bugzilla.gnome.org/show_bug.cgi?id=602518
+ *
+ * Returns: result
+ */</output>
 </test>
 
 <test>
@@ -519,6 +661,13 @@ http://bugzilla.gnome.org/show_bug.cgi?id=380824</description>
       </tags>
     </docblock>
   </parser>
+  <output>/**
+ * bug_602518c:
+ *
+ * http://bugzilla.gnome.org/show_bug.cgi?id=602518
+ *
+ * Returns: result
+ */</output>
 </test>
 
 <test>
@@ -547,6 +696,13 @@ http://bugzilla.gnome.org/show_bug.cgi?id=380824</description>
       <description>http://bugzilla.gnome.org/show_bug.cgi?id=607445</description>
     </docblock>
   </parser>
+  <output>/**
+ * bug_607445:
+ * @a: parameter
+ * @n: parameter
+ *
+ * http://bugzilla.gnome.org/show_bug.cgi?id=607445
+ */</output>
 </test>
 
 <test>
@@ -575,6 +731,13 @@ http://bugzilla.gnome.org/show_bug.cgi?id=380824</description>
       <description>http://bugzilla.gnome.org/show_bug.cgi?id=610257</description>
     </docblock>
   </parser>
+  <output>/**
+ * bug_610257:
+ * @der: parameter
+ * @len: parameter
+ *
+ * http://bugzilla.gnome.org/show_bug.cgi?id=610257
+ */</output>
 </test>
 
 <test>
@@ -599,6 +762,15 @@ http://bugzilla.gnome.org/show_bug.cgi?id=380824</description>
 </refsect3>]]></description>
     </docblock>
   </parser>
+  <output><![CDATA[/**
+ * bug_623968a:
+ *
+ * <para>test</para>
+ * <refsect3>
+ *   <title>subsect</title>
+ *   <para>test</para>
+ * </refsect3>
+ */]]></output>
 </test>
 
 <test>
@@ -625,6 +797,16 @@ http://bugzilla.gnome.org/show_bug.cgi?id=380824</description>
 </refsect3>]]></description>
     </docblock>
   </parser>
+  <output><![CDATA[/**
+ * bug_623968b:
+ *
+ * test
+ *
+ * <refsect3>
+ *   <title>subsect</title>
+ *   <para>test</para>
+ * </refsect3>
+ */]]></output>
 </test>
 
 <test>
@@ -641,6 +823,11 @@ http://bugzilla.gnome.org/show_bug.cgi?id=380824</description>
       <description><![CDATA[<para>test</para>]]></description>
     </docblock>
   </parser>
+  <output><![CDATA[/**
+ * bug_623968c:
+ *
+ * <para>test</para>
+ */]]></output>
 </test>
 
 <test>
@@ -665,6 +852,13 @@ http://bugzilla.gnome.org/show_bug.cgi?id=380824</description>
       </tags>
     </docblock>
   </parser>
+  <output>/**
+ * bug_624200a:
+ *
+ * http://bugzilla.gnome.org/show_bug.cgi?id=624200
+ *
+ * Returns: result
+ */</output>
 </test>
 
 <test>
@@ -689,6 +883,13 @@ http://bugzilla.gnome.org/show_bug.cgi?id=380824</description>
       </tags>
     </docblock>
   </parser>
+  <output>/**
+ * bug_624200b:
+ *
+ * http://bugzilla.gnome.org/show_bug.cgi?id=624200
+ *
+ * Returns: result
+ */</output>
 </test>
 
 <test>
@@ -722,6 +923,14 @@ http://bugzilla.gnome.org/show_bug.cgi?id=380824</description>
       <description>http://bugzilla.gnome.org/show_bug.cgi?id=638330</description>
     </docblock>
   </parser>
+  <output>/**
+ * bug_638330:
+ * @arg1: arg1
+ * @data: data
+ * @length: length
+ *
+ * http://bugzilla.gnome.org/show_bug.cgi?id=638330
+ */</output>
 </test>
 
 <test>
@@ -750,6 +959,13 @@ http://bugzilla.gnome.org/show_bug.cgi?id=380824</description>
       <description>Outputs a message.</description>
     </docblock>
   </parser>
+  <output>/**
+ * bug_000000_va1:
+ * @name: a name
+ * @...: A printf-style message to output
+ *
+ * Outputs a message.
+ */</output>
 </test>
 
 <test>
@@ -766,6 +982,11 @@ http://bugzilla.gnome.org/show_bug.cgi?id=380824</description>
       <description>http://bugzilla.gnome.org/show_bug.cgi?id=624001</description>
     </docblock>
   </parser>
+  <output>/**
+ * bug_624001a:
+ *
+ * http://bugzilla.gnome.org/show_bug.cgi?id=624001
+ */</output>
 </test>
 
 <test>
@@ -782,6 +1003,11 @@ http://bugzilla.gnome.org/show_bug.cgi?id=380824</description>
       <description>http://bugzilla.gnome.org/show_bug.cgi?id=624001</description>
     </docblock>
   </parser>
+  <output>/**
+ * bug_624001b:
+ *
+ * http://bugzilla.gnome.org/show_bug.cgi?id=624001
+ */</output>
 </test>
 
 <test>
@@ -798,6 +1024,11 @@ http://bugzilla.gnome.org/show_bug.cgi?id=380824</description>
       <description>http://bugzilla.gnome.org/show_bug.cgi?id=624001</description>
     </docblock>
   </parser>
+  <output>/**
+ * bug_624001c:
+ *
+ * http://bugzilla.gnome.org/show_bug.cgi?id=624001
+ */</output>
 </test>
 
 <test>
@@ -814,6 +1045,11 @@ http://bugzilla.gnome.org/show_bug.cgi?id=380824</description>
       <description>http://bugzilla.gnome.org/show_bug.cgi?id=624001</description>
     </docblock>
   </parser>
+  <output>/**
+ * bug_624001d:
+ *
+ * http://bugzilla.gnome.org/show_bug.cgi?id=624001
+ */</output>
 </test>
 
 <test>
@@ -830,6 +1066,11 @@ http://bugzilla.gnome.org/show_bug.cgi?id=380824</description>
       <description>http://bugzilla.gnome.org/show_bug.cgi?id=624001</description>
     </docblock>
   </parser>
+  <output>/**
+ * bug_624001e:
+ *
+ * http://bugzilla.gnome.org/show_bug.cgi?id=624001
+ */</output>
 </test>
 
 </tests>
diff --git a/tests/scanner/annotationparser/gtkdoc/bugs/tester.h.xml b/tests/scanner/annotationparser/gtkdoc/bugs/tester.h.xml
index 39fe878d..5dad3cb8 100644
--- a/tests/scanner/annotationparser/gtkdoc/bugs/tester.h.xml
+++ b/tests/scanner/annotationparser/gtkdoc/bugs/tester.h.xml
@@ -33,6 +33,14 @@
       <description>http://bugzilla.gnome.org/show_bug.cgi?id=324535</description>
     </docblock>
   </parser>
+  <output>/**
+ * Bug324535:
+ * @BUG_324535_A: enum 1
+ * @BUG_324535_B: enum 2
+ * @BUG_324535_C: enum 3
+ *
+ * http://bugzilla.gnome.org/show_bug.cgi?id=324535
+ */</output>
 </test>
 
 <test>
@@ -56,6 +64,12 @@
       <description>http://bugzilla.gnome.org/show_bug.cgi?id=481811</description>
     </docblock>
   </parser>
+  <output>/**
+ * bug_481811:
+ * @x: argument
+ *
+ * http://bugzilla.gnome.org/show_bug.cgi?id=481811
+ */</output>
 </test>
 
 <test>
@@ -89,6 +103,14 @@
       <description>http://bugzilla.gnome.org/show_bug.cgi?id=501038</description>
     </docblock>
   </parser>
+  <output>/**
+ * bug_501038:
+ * @a: value
+ * @b: deprecated value
+ * @_b: scrambled deprecated value
+ *
+ * http://bugzilla.gnome.org/show_bug.cgi?id=501038
+ */</output>
 </test>
 
 <test>
@@ -112,6 +134,12 @@
       <description>http://bugzilla.gnome.org/show_bug.cgi?id=460127</description>
     </docblock>
   </parser>
+  <output>/**
+ * bug_460127:
+ * @a: field
+ *
+ * http://bugzilla.gnome.org/show_bug.cgi?id=460127
+ */</output>
 </test>
 
 <test>
@@ -128,6 +156,11 @@
       <description>http://bugzilla.gnome.org/show_bug.cgi?id=477532</description>
     </docblock>
   </parser>
+  <output>/**
+ * bug_477532:
+ *
+ * http://bugzilla.gnome.org/show_bug.cgi?id=477532
+ */</output>
 </test>
 
 <test>
@@ -151,6 +184,12 @@
       <description>http://bugzilla.gnome.org/show_bug.cgi?id=446648</description>
     </docblock>
   </parser>
+  <output>/**
+ * Bug446648:
+ * @BUG_446648_FOO: field
+ *
+ * http://bugzilla.gnome.org/show_bug.cgi?id=446648
+ */</output>
 </test>
 
 <test>
@@ -174,6 +213,12 @@
       <description>http://bugzilla.gnome.org/show_bug.cgi?id=512154</description>
     </docblock>
   </parser>
+  <output>/**
+ * Bug512154:
+ * @index: field
+ *
+ * http://bugzilla.gnome.org/show_bug.cgi?id=512154
+ */</output>
 </test>
 
 <test>
@@ -207,6 +252,14 @@
       <description>http://bugzilla.gnome.org/show_bug.cgi?id=512155</description>
     </docblock>
   </parser>
+  <output>/**
+ * bug_512155a_function_pointer_t:
+ * @arg1: param 1
+ * @arg2: param 1
+ * @arg3: param 1
+ *
+ * http://bugzilla.gnome.org/show_bug.cgi?id=512155
+ */</output>
 </test>
 
 <test>
@@ -240,6 +293,14 @@
       <description>http://bugzilla.gnome.org/show_bug.cgi?id=512155</description>
     </docblock>
   </parser>
+  <output>/**
+ * bug_512155b_function_pointer_t:
+ * @arg1: param 1
+ * @arg2: param 1
+ * @arg3: param 1
+ *
+ * http://bugzilla.gnome.org/show_bug.cgi?id=512155
+ */</output>
 </test>
 
 <test>
@@ -273,6 +334,14 @@
       <description>http://bugzilla.gnome.org/show_bug.cgi?id=512155</description>
     </docblock>
   </parser>
+  <output>/**
+ * bug_512155c_function_pointer_t:
+ * @arg1: param 1
+ * @arg2: param 1
+ * @arg3: param 1
+ *
+ * http://bugzilla.gnome.org/show_bug.cgi?id=512155
+ */</output>
 </test>
 
 <test>
@@ -293,6 +362,13 @@
 <ulink url="http://bugzilla.gnome.org/show_bug.cgi?id=530758#c1">Test</ulink>]]></description>
     </docblock>
   </parser>
+  <output><![CDATA[/**
+ * BUG_530758:
+ *
+ * {{![CDATA[http://bugzilla.gnome.org/show_bug.cgi?id=530758#c1]]!}}
+ *
+ * <ulink url="http://bugzilla.gnome.org/show_bug.cgi?id=530758#c1">Test</ulink>
+ */]]></output>
 </test>
 
 <test>
@@ -324,6 +400,14 @@
       </tags>
     </docblock>
   </parser>
+  <output>/**
+ * bug_532395a:
+ * @number: a number
+ *
+ * http://bugzilla.gnome.org/show_bug.cgi?id=532395
+ *
+ * Returns: number
+ */</output>
 </test>
 
 <test>
@@ -340,6 +424,11 @@
       <description>http://bugzilla.gnome.org/show_bug.cgi?id=532395</description>
     </docblock>
   </parser>
+  <output>/**
+ * bug_532395b:
+ *
+ * http://bugzilla.gnome.org/show_bug.cgi?id=532395
+ */</output>
 </test>
 
 <test>
@@ -371,6 +460,14 @@
       </tags>
     </docblock>
   </parser>
+  <output>/**
+ * bug_544172:
+ * @self: object pointer.
+ *
+ * http://bugzilla.gnome.org/show_bug.cgi?id=544172
+ *
+ * Returns: result or %NULL.
+ */</output>
 </test>
 
 <test>
@@ -394,6 +491,12 @@
       <description>http://bugzilla.gnome.org/show_bug.cgi?id=554833</description>
     </docblock>
   </parser>
+  <output>/**
+ * bug_554833:
+ * @i: value;
+ *
+ * http://bugzilla.gnome.org/show_bug.cgi?id=554833
+ */</output>
 </test>
 
 <test>
@@ -418,6 +521,13 @@
       </tags>
     </docblock>
   </parser>
+  <output>/**
+ * bug_554833_new:
+ *
+ * http://bugzilla.gnome.org/show_bug.cgi?id=554833
+ *
+ * Returns: result
+ */</output>
 </test>
 
 <test>
@@ -446,6 +556,13 @@
       <description>http://bugzilla.gnome.org/show_bug.cgi?id=165425</description>
     </docblock>
   </parser>
+  <output>/**
+ * Bug165425a:
+ * @i: data as int
+ * @f: data as float
+ *
+ * http://bugzilla.gnome.org/show_bug.cgi?id=165425
+ */</output>
 </test>
 
 <test>
@@ -474,6 +591,13 @@
       <description>http://bugzilla.gnome.org/show_bug.cgi?id=165425</description>
     </docblock>
   </parser>
+  <output>/**
+ * Bug165425b:
+ * @i: data as int
+ * @f: data as float
+ *
+ * http://bugzilla.gnome.org/show_bug.cgi?id=165425
+ */</output>
 </test>
 
 <test>
@@ -507,6 +631,14 @@
       <description>https://bugzilla.gnome.org/show_bug.cgi?id=642998</description>
     </docblock>
   </parser>
+  <output>/**
+ * Bug642998:
+ * @red: red color intensity, from 0–255
+ * @green: green color intensity, from 0–255
+ * @blue: blue color intensity, from 0–255
+ *
+ * https://bugzilla.gnome.org/show_bug.cgi?id=642998
+ */</output>
 </test>
 
 <test>
@@ -555,6 +687,17 @@
       <description>https://bugzilla.gnome.org/show_bug.cgi?id=644291</description>
     </docblock>
   </parser>
+  <output>/**
+ * Bug644291:
+ * @BUG_644291_START: foo
+ * @BUG_644291_TEXT: bar
+ * @BUG_644291_END: milk
+ * @BUG_644291_ATTRIBUTE: comes
+ * @BUG_644291_XMLNS: from
+ * @BUG_644291_ASSIGN_TO: cows
+ *
+ * https://bugzilla.gnome.org/show_bug.cgi?id=644291
+ */</output>
 </test>
 
 <test>
@@ -583,6 +726,13 @@
       <description>Outputs a message.</description>
     </docblock>
   </parser>
+  <output>/**
+ * BUG_000000_VA2:
+ * @name: a name
+ * @...: A printf-style message to output
+ *
+ * Outputs a message.
+ */</output>
 </test>
 
 <test>
@@ -611,6 +761,13 @@
       <description>Outputs a message.</description>
     </docblock>
   </parser>
+  <output>/**
+ * BUG_000000_VA3:
+ * @name: a name
+ * @...: A printf-style message to output
+ *
+ * Outputs a message.
+ */</output>
 </test>
 
 <test>
@@ -631,6 +788,13 @@
 but not if we remove the blank line before "int b";</description>
     </docblock>
   </parser>
+  <output>/**
+ * Bug000000Scope:
+ *
+ * Opaque structure.
+ * "warning: Field descriptions for Bug000000Scope are missing in source code comment block."
+ * but not if we remove the blank line before "int b";
+ */</output>
 </test>
 
 <test>
@@ -664,6 +828,14 @@ but not if we remove the blank line before "int b";</description>
       <description>test.</description>
     </docblock>
   </parser>
+  <output>/**
+ * gst_play_marshal_BUFFER__BOXED:
+ * @closure: test
+ * @return_value: test
+ * @marshal_data: test
+ *
+ * test.
+ */</output>
 </test>
 
 <test>
@@ -680,6 +852,11 @@ but not if we remove the blank line before "int b";</description>
       <description>https://bugzilla.gnome.org/show_bug.cgi?id=656773</description>
     </docblock>
   </parser>
+  <output>/**
+ * BUG_656773a:
+ *
+ * https://bugzilla.gnome.org/show_bug.cgi?id=656773
+ */</output>
 </test>
 
 <test>
@@ -696,6 +873,11 @@ but not if we remove the blank line before "int b";</description>
       <description>https://bugzilla.gnome.org/show_bug.cgi?id=656773</description>
     </docblock>
   </parser>
+  <output>/**
+ * BUG_656773b:
+ *
+ * https://bugzilla.gnome.org/show_bug.cgi?id=656773
+ */</output>
 </test>
 
 <test>
@@ -712,6 +894,11 @@ but not if we remove the blank line before "int b";</description>
       <description>https://bugzilla.gnome.org/show_bug.cgi?id=656773</description>
     </docblock>
   </parser>
+  <output>/**
+ * BUG_656773c:
+ *
+ * https://bugzilla.gnome.org/show_bug.cgi?id=656773
+ */</output>
 </test>
 
 <test>
@@ -728,6 +915,11 @@ but not if we remove the blank line before "int b";</description>
       <description>https://bugzilla.gnome.org/show_bug.cgi?id=656946</description>
     </docblock>
   </parser>
+  <output>/**
+ * BUG_656946:
+ *
+ * https://bugzilla.gnome.org/show_bug.cgi?id=656946
+ */</output>
 </test>
 
 </tests>
diff --git a/tests/scanner/annotationparser/gtkdoc/empty/tester.c.xml b/tests/scanner/annotationparser/gtkdoc/empty/tester.c.xml
index 6419370a..65bda61f 100644
--- a/tests/scanner/annotationparser/gtkdoc/empty/tester.c.xml
+++ b/tests/scanner/annotationparser/gtkdoc/empty/tester.c.xml
@@ -29,6 +29,15 @@ As described in http://bugzilla.gnome.org/show_bug.cgi?id=457077 it
 returns nothing.]]></description>
     </docblock>
   </parser>
+  <output><![CDATA[/**
+ * SECTION:tester
+ * @short_description: module for gtk-doc unit test
+ *
+ * This file contains non-sense code for the sole purpose of testing the docs.
+ *
+ * As described in http://bugzilla.gnome.org/show_bug.cgi?id=457077 it
+ * returns nothing.
+ */]]></output>
 </test>
 
 <test>
@@ -52,6 +61,12 @@ returns nothing.]]></description>
       <description>lonely function</description>
     </docblock>
   </parser>
- </test>
+  <output>/**
+ * test:
+ * @a: arg
+ *
+ * lonely function
+ */</output>
+</test>
 
 </tests>
diff --git a/tests/scanner/annotationparser/gtkdoc/fail/tester.c.xml b/tests/scanner/annotationparser/gtkdoc/fail/tester.c.xml
index f76efdda..40fbbff5 100644
--- a/tests/scanner/annotationparser/gtkdoc/fail/tester.c.xml
+++ b/tests/scanner/annotationparser/gtkdoc/fail/tester.c.xml
@@ -19,22 +19,27 @@
  * @title: GtkdocTesterNoLongDesc
  */</input>
   <parser>
-   <docblock>
-     <identifier>
-       <name>SECTION:tester_nolongdesc</name>
-     </identifier>
-     <parameters>
-       <parameter>
-         <name>short_description</name>
-         <description>module for gtk-doc unit test</description>
-       </parameter>
-       <parameter>
-         <name>title</name>
-         <description>GtkdocTesterNoLongDesc</description>
-       </parameter>
-     </parameters>
-   </docblock>
+    <docblock>
+      <identifier>
+        <name>SECTION:tester_nolongdesc</name>
+      </identifier>
+      <parameters>
+        <parameter>
+          <name>short_description</name>
+          <description>module for gtk-doc unit test</description>
+        </parameter>
+        <parameter>
+          <name>title</name>
+          <description>GtkdocTesterNoLongDesc</description>
+        </parameter>
+      </parameters>
+    </docblock>
   </parser>
+  <output>/**
+ * SECTION:tester_nolongdesc
+ * @short_description: module for gtk-doc unit test
+ * @title: GtkdocTesterNoLongDesc
+ */</output>
 </test>
 
 <test>
@@ -45,19 +50,25 @@
  * This file contains non-sense code for the sole purpose of testing the docs.
  */</input>
   <parser>
-   <docblock>
-     <identifier>
-       <name>SECTION:tester_noshortdesc</name>
-     </identifier>
-     <parameters>
-       <parameter>
-         <name>title</name>
-         <description>GtkdocTesterNoShortDesc</description>
-       </parameter>
-     </parameters>
-     <description>This file contains non-sense code for the sole purpose of testing the docs.</description>
-   </docblock>
+    <docblock>
+      <identifier>
+        <name>SECTION:tester_noshortdesc</name>
+      </identifier>
+      <parameters>
+        <parameter>
+          <name>title</name>
+          <description>GtkdocTesterNoShortDesc</description>
+        </parameter>
+      </parameters>
+      <description>This file contains non-sense code for the sole purpose of testing the docs.</description>
+    </docblock>
   </parser>
+  <output>/**
+ * SECTION:tester_noshortdesc
+ * @title: GtkdocTesterNoShortDesc
+ *
+ * This file contains non-sense code for the sole purpose of testing the docs.
+ */</output>
 </test>
 
 <test>
@@ -69,23 +80,30 @@
  * This file contains non-sense code for the sole purpose of testing the docs.
  */</input>
   <parser>
-   <docblock>
-     <identifier>
-       <name>SECTION:tester_brokendocs</name>
-     </identifier>
-     <parameters>
-       <parameter>
-         <name>short_description</name>
-         <description>module for gtk-doc unit test</description>
-       </parameter>
-       <parameter>
-         <name>title</name>
-         <description>GtkdocTesterBrokenDocs</description>
-       </parameter>
-     </parameters>
-     <description>This file contains non-sense code for the sole purpose of testing the docs.</description>
-   </docblock>
+    <docblock>
+      <identifier>
+        <name>SECTION:tester_brokendocs</name>
+      </identifier>
+      <parameters>
+        <parameter>
+          <name>short_description</name>
+          <description>module for gtk-doc unit test</description>
+        </parameter>
+        <parameter>
+          <name>title</name>
+          <description>GtkdocTesterBrokenDocs</description>
+        </parameter>
+      </parameters>
+      <description>This file contains non-sense code for the sole purpose of testing the docs.</description>
+    </docblock>
   </parser>
+  <output>/**
+ * SECTION:tester_brokendocs
+ * @short_description: module for gtk-doc unit test
+ * @title: GtkdocTesterBrokenDocs
+ *
+ * This file contains non-sense code for the sole purpose of testing the docs.
+ */</output>
 </test>
 
 <test>
@@ -93,12 +111,15 @@
  * func_no_docs:
  */</input>
   <parser>
-   <docblock>
-     <identifier>
-       <name>func_no_docs</name>
-     </identifier>
-   </docblock>
+    <docblock>
+      <identifier>
+        <name>func_no_docs</name>
+      </identifier>
+    </docblock>
   </parser>
+  <output>/**
+ * func_no_docs:
+ */</output>
 </test>
 
 <test>
@@ -108,13 +129,18 @@
  * Here we document the function but not the parameters.
  */</input>
   <parser>
-   <docblock>
-     <identifier>
-       <name>func_no_item_docs</name>
-     </identifier>
-     <description>Here we document the function but not the parameters.</description>
-   </docblock>
+    <docblock>
+      <identifier>
+        <name>func_no_item_docs</name>
+      </identifier>
+      <description>Here we document the function but not the parameters.</description>
+    </docblock>
   </parser>
+  <output>/**
+ * func_no_item_docs:
+ *
+ * Here we document the function but not the parameters.
+ */</output>
 </test>
 
 <test>
@@ -125,19 +151,25 @@
  * Here we document the function but not all the parameters.
  */</input>
   <parser>
-   <docblock>
-     <identifier>
-       <name>func_incomplete_docs</name>
-     </identifier>
-     <parameters>
-       <parameter>
-         <name>a</name>
-         <description>a value</description>
-       </parameter>
-     </parameters>
-     <description>Here we document the function but not all the parameters.</description>
-   </docblock>
+    <docblock>
+      <identifier>
+        <name>func_incomplete_docs</name>
+      </identifier>
+      <parameters>
+        <parameter>
+          <name>a</name>
+          <description>a value</description>
+        </parameter>
+      </parameters>
+      <description>Here we document the function but not all the parameters.</description>
+    </docblock>
   </parser>
+  <output>/**
+ * func_incomplete_docs:
+ * @a: a value
+ *
+ * Here we document the function but not all the parameters.
+ */</output>
 </test>
 
 <test>
@@ -150,27 +182,35 @@
  * Here we document the function and more than the actual parameters.
  */</input>
   <parser>
-   <docblock>
-     <identifier>
-       <name>func_unused_docs</name>
-     </identifier>
-     <parameters>
-       <parameter>
-         <name>a</name>
-         <description>a value</description>
-       </parameter>
-       <parameter>
-         <name>b</name>
-         <description>a value</description>
-       </parameter>
-       <parameter>
-         <name>c</name>
-         <description>an unexisting value</description>
-       </parameter>
-     </parameters>
-     <description>Here we document the function and more than the actual parameters.</description>
-   </docblock>
+    <docblock>
+      <identifier>
+        <name>func_unused_docs</name>
+      </identifier>
+      <parameters>
+        <parameter>
+          <name>a</name>
+          <description>a value</description>
+        </parameter>
+        <parameter>
+          <name>b</name>
+          <description>a value</description>
+        </parameter>
+        <parameter>
+          <name>c</name>
+          <description>an unexisting value</description>
+        </parameter>
+      </parameters>
+      <description>Here we document the function and more than the actual parameters.</description>
+    </docblock>
   </parser>
+  <output>/**
+ * func_unused_docs:
+ * @a: a value
+ * @b: a value
+ * @c: an unexisting value
+ *
+ * Here we document the function and more than the actual parameters.
+ */</output>
 </test>
 
 </tests>
diff --git a/tests/scanner/annotationparser/gtkdoc/fail/tester.h.xml b/tests/scanner/annotationparser/gtkdoc/fail/tester.h.xml
index 2076e526..069ae71a 100644
--- a/tests/scanner/annotationparser/gtkdoc/fail/tester.h.xml
+++ b/tests/scanner/annotationparser/gtkdoc/fail/tester.h.xml
@@ -16,6 +16,11 @@
       <description>Here we document the macro but not the parameters.</description>
     </docblock>
   </parser>
+  <output>/**
+ * MACRO_NO_ITEM_DOCS:
+ *
+ * Here we document the macro but not the parameters.
+ */</output>
 </test>
 
 <test>
@@ -39,6 +44,12 @@
       <description>Here we document the macro but not all the parameters.</description>
     </docblock>
   </parser>
+  <output>/**
+ * MACRO_INCOMPLETE_DOCS:
+ * @a: a value
+ *
+ * Here we document the macro but not all the parameters.
+ */</output>
 </test>
 
 <test>
@@ -72,6 +83,14 @@
       <description>Here we document the macro and more than the actual parameters.</description>
     </docblock>
   </parser>
+  <output>/**
+ * MACRO_UNUSED_DOCS:
+ * @a: a value
+ * @b: a value
+ * @c: an unexisting value
+ *
+ * Here we document the macro and more than the actual parameters.
+ */</output>
 </test>
 
 <test>
@@ -90,6 +109,12 @@
 http://bugzilla.gnome.org/show_bug.cgi?id=568711</description>
     </docblock>
   </parser>
+  <output>/**
+ * EnumNoItemDocs:
+ *
+ * Here we document the enum but not the values.
+ * http://bugzilla.gnome.org/show_bug.cgi?id=568711
+ */</output>
 </test>
 
 <test>
@@ -113,6 +138,12 @@ http://bugzilla.gnome.org/show_bug.cgi?id=568711</description>
       <description>Here we document the enum but not all the values.</description>
     </docblock>
   </parser>
+  <output>/**
+ * EnumIncompleteDocs:
+ * @ENUM_INCOMPLETE_DOCS_1: a value
+ *
+ * Here we document the enum but not all the values.
+ */</output>
 </test>
 
 <test>
@@ -146,6 +177,14 @@ http://bugzilla.gnome.org/show_bug.cgi?id=568711</description>
       <description>Here we document the enum and more than the actual values.</description>
     </docblock>
   </parser>
+  <output>/**
+ * EnumUnusedDocs:
+ * @ENUM_UNUSED_DOCS_1: a value
+ * @ENUM_UNUSED_DOCS_2: a value
+ * @ENUM_UNUSED_DOCS_3: an unexisting value
+ *
+ * Here we document the enum and more than the actual values.
+ */</output>
 </test>
 
 <test>
@@ -162,6 +201,11 @@ http://bugzilla.gnome.org/show_bug.cgi?id=568711</description>
       <description>Here we document the struct but not the values.</description>
     </docblock>
   </parser>
+  <output>/**
+ * StructNoItemDocs:
+ *
+ * Here we document the struct but not the values.
+ */</output>
 </test>
 
 <test>
@@ -185,6 +229,12 @@ http://bugzilla.gnome.org/show_bug.cgi?id=568711</description>
       <description>Here we document the struct but not all the values.</description>
     </docblock>
   </parser>
+  <output>/**
+ * StructIncompleteDocs:
+ * @a: a value
+ *
+ * Here we document the struct but not all the values.
+ */</output>
 </test>
 
 <test>
@@ -218,6 +268,14 @@ http://bugzilla.gnome.org/show_bug.cgi?id=568711</description>
       <description>Here we document the struct and more than the actual values.</description>
     </docblock>
   </parser>
+  <output>/**
+ * StructUnusedDocs:
+ * @a: a value
+ * @b: a value
+ * @c: an unexisting value
+ *
+ * Here we document the struct and more than the actual values.
+ */</output>
 </test>
 
 </tests>
diff --git a/tests/scanner/annotationparser/gtkdoc/gobject/giface.c.xml b/tests/scanner/annotationparser/gtkdoc/gobject/giface.c.xml
index dc9ae531..c295edbc 100644
--- a/tests/scanner/annotationparser/gtkdoc/gobject/giface.c.xml
+++ b/tests/scanner/annotationparser/gtkdoc/gobject/giface.c.xml
@@ -57,6 +57,26 @@ Just incase you wonder, special caracters can be escaped with a \ like in \%
 or \# or even \@.]]></description>
     </docblock>
   </parser>
+  <output><![CDATA[/**
+ * SECTION:iface
+ * @title: GtkdocIface
+ * @short_description: interface for gtk-doc unit test
+ * @see_also: #GtkdocObject
+ *
+ * This file contains non-sense code for the sole purpose of testing the docs.
+ * We can link to the #GtkdocIface:itest property and the #GtkdocIface::itest
+ * signal.
+ * An instance can be configured using the gtkdoc_iface_configure() function.
+ *
+ * I can haz pictures too!
+ * <mediaobject>
+ *   <imageobject><imagedata fileref="home.png" format="PNG"/></imageobject>
+ *   <caption><para>Home sweet home.</para></caption>
+ * </mediaobject>
+ *
+ * Just incase you wonder, special caracters can be escaped with a \ like in \%
+ * or \# or even \@.
+ */]]></output>
 </test>
 
 <test>
@@ -90,6 +110,14 @@ or \# or even \@.]]></description>
       <description>This file contains non-sense code for the sole purpose of testing the docs.</description>
     </docblock>
   </parser>
+  <output>/**
+ * SECTION:iface2
+ * @title: GtkdocIface2
+ * @short_description: interface with a prerequisite for gtk-doc unit test
+ * @see_also: #GtkdocObject, #GtkdocIface
+ *
+ * This file contains non-sense code for the sole purpose of testing the docs.
+ */</output>
 </test>
 
 <test>
@@ -126,6 +154,15 @@ or \# or even \@.]]></description>
       </tags>
     </docblock>
   </parser>
+  <output>/**
+ * gtkdoc_iface_configure:
+ * @config: settings
+ *
+ * Configure a new instance
+ *
+ * Returns: %TRUE for sucess or %FALSE in case of an error
+ * Since: 0.1
+ */</output>
 </test>
 
 <test>
@@ -149,6 +186,12 @@ or \# or even \@.]]></description>
       <description>The event has been triggered.</description>
     </docblock>
   </parser>
+  <output>    /**
+     * GtkdocIface::itest:
+     * @self: myself
+     *
+     * The event has been triggered.
+     */</output>
 </test>
 
 </tests>
diff --git a/tests/scanner/annotationparser/gtkdoc/gobject/giface.h.xml b/tests/scanner/annotationparser/gtkdoc/gobject/giface.h.xml
index 58c22857..e3ed09ca 100644
--- a/tests/scanner/annotationparser/gtkdoc/gobject/giface.h.xml
+++ b/tests/scanner/annotationparser/gtkdoc/gobject/giface.h.xml
@@ -16,6 +16,11 @@
       <description>opaque instance of gtk-doc unit test interface</description>
     </docblock>
   </parser>
+  <output>/**
+ * GtkdocIface:
+ *
+ * opaque instance of gtk-doc unit test interface
+ */</output>
 </test>
 
 <test>
@@ -32,6 +37,11 @@
       <description>opaque instance of gtk-doc unit test interface</description>
     </docblock>
   </parser>
+  <output>/**
+ * GtkdocIface2:
+ *
+ * opaque instance of gtk-doc unit test interface
+ */</output>
 </test>
 
 <test>
@@ -60,6 +70,13 @@
       <description>class data of gtk-doc unit test interface</description>
     </docblock>
   </parser>
+  <output>/**
+ * GtkdocIfaceInterface:
+ * @parent: this is a bug :/
+ * @test: overideable method
+ *
+ * class data of gtk-doc unit test interface
+ */</output>
 </test>
 
 <test>
@@ -88,6 +105,13 @@
       <description>This macro does nothing.</description>
     </docblock>
   </parser>
+  <output>/**
+ * GTKDOC_IFACE_MACRO_DUMMY:
+ * @parameter_1: first arg
+ * @parameter_2: second arg
+ *
+ * This macro does nothing.
+ */</output>
 </test>
 
 <test>
@@ -124,6 +148,15 @@
       </tags>
     </docblock>
   </parser>
+  <output>/**
+ * GTKDOC_IFACE_MACRO_SUM:
+ * @parameter_1: first arg
+ * @parameter_2: second arg
+ *
+ * This macro adds its args.
+ *
+ * Returns: the sum of @parameter_1 and @parameter_2
+ */</output>
 </test>
 
 </tests>
diff --git a/tests/scanner/annotationparser/gtkdoc/gobject/gobject.c.xml b/tests/scanner/annotationparser/gtkdoc/gobject/gobject.c.xml
index 111b5d67..6b8b34fd 100644
--- a/tests/scanner/annotationparser/gtkdoc/gobject/gobject.c.xml
+++ b/tests/scanner/annotationparser/gtkdoc/gobject/gobject.c.xml
@@ -100,6 +100,46 @@ This example serves two main purposes:
 Nothing more to say.]]></description>
     </docblock>
   </parser>
+  <output><![CDATA[/**
+ * SECTION:object
+ * @title: GtkdocObject
+ * @short_description: class for gtk-doc unit test
+ * @see_also: #GtkdocIface
+ * @Image: object.png
+ *
+ * This file contains non-sense code for the sole purpose of testing the docs.
+ * We can link to the #GtkdocObject:otest property and the #GtkdocObject::otest
+ * signal.
+ *
+ * When subclassing it is useful to override the #GtkdocObjectClass.test()
+ * method. The #GtkdocObjectClass.foo_bar() vmethod lets you refine your
+ * frobnicator.
+ *
+ * A new instance can be created using the gtkdoc_object_new() function. The
+ * whole lifecycle usualy looks like shown in this example:
+ * |[{{!-- language="C" --!}}
+ * GObject *myobj;
+ *
+ * myobj = gtkdoc_object_new();
+ * // do somehing
+ * g_object_unref (myobj);
+ * ]|
+ *
+ * # Examples #
+ *
+ * You can also change parameters:
+ * <informalexample>
+ * <programlisting language="c"><xi:include xmlns:xi="http://www.w3.org/2003/XInclude" parse="text" href="../../examples/gobject.c" /></programlisting>
+ * </informalexample>
+ *
+ * This example serves two main purposes:
+ * - testing conversion (long description
+ *   follows here)
+ * - catching bugs
+ * - having an example
+ *
+ * Nothing more to say.
+ */]]></output>
 </test>
 
 <test>
@@ -145,6 +185,20 @@ All the internal details go here or not:
 - single item list</description>
     </docblock>
   </parser>
+  <output>/**
+ * SECTION:object2
+ * @title: GtkdocObject2
+ * @short_description: class with interface for gtk-doc unit test
+ * @see_also: #GtkdocIface
+ *
+ * This file contains non-sense code for the sole purpose of testing the docs.
+ *
+ * Internals
+ * =========
+ *
+ * All the internal details go here or not:
+ * - single item list
+ */</output>
 </test>
 
 <test>
@@ -180,6 +234,17 @@ All the internal details go here or not:
       </tags>
     </docblock>
   </parser>
+  <output><![CDATA[/**
+ * gtkdoc_object_new:
+ *
+ * Create a new instance
+ * <note><para>
+ *   This will only work if you have called g_type_init() before.
+ * </para></note>
+ *
+ * Returns: the instance or %NULL in case of an error
+ * Since: 0.1
+ */]]></output>
 </test>
 
 <test>
@@ -224,6 +289,17 @@ All the internal details go here or not:
       </tags>
     </docblock>
   </parser>
+  <output><![CDATA[/**
+ * gtkdoc_object_set_otest:
+ * @self: the object
+ * @value: the new otest value, whose description extends further than one
+ *  line will allow
+ *
+ * Set the #GtkdocObject:otest property.
+ *
+ * Deprecated: Use g_object_set(obj,&quot;otest&quot;,value,NULL); instead.
+ * Since: 0.5
+ */]]></output>
 </test>
 
 <test>
@@ -272,6 +348,21 @@ complex algorithm (http://en.wikipedia.org/wiki/Algorithm).
       </tags>
     </docblock>
   </parser>
+  <output><![CDATA[/**
+ * gtkdoc_object_frobnicate:
+ * @self: the object
+ * @n: number of iterations
+ *
+ * Frobnicate the content of @self @n times. This implements a
+ * complex algorithm (http://en.wikipedia.org/wiki/Algorithm).
+ * <footnote>
+ *  <para>
+ *    Negative frobnication can lead to unexpected behaviour.
+ *  </para>
+ * </footnote>
+ *
+ * Since: 0.5
+ */]]></output>
 </test>
 
 <test>
@@ -308,6 +399,15 @@ complex algorithm (http://en.wikipedia.org/wiki/Algorithm).
       </tags>
     </docblock>
   </parser>
+  <output>/**
+ * gtkdoc_object_fooify:
+ * @self: the object
+ * @...: a NULL terminated list of arguments
+ *
+ * Fooify the content of @self.
+ *
+ * Returns: %TRUE for success
+ */</output>
 </test>
 
 <test>
@@ -331,6 +431,12 @@ complex algorithm (http://en.wikipedia.org/wiki/Algorithm).
       <description>The event has been triggered.</description>
     </docblock>
   </parser>
+  <output>  /**
+   * GtkdocObject::otest:
+   * @self: myself
+   *
+   * The event has been triggered.
+   */</output>
 </test>
 
 <test>
@@ -362,6 +468,14 @@ complex algorithm (http://en.wikipedia.org/wiki/Algorithm).
       </tags>
     </docblock>
   </parser>
+  <output>  /**
+   * GtkdocObject::dep-otest:
+   * @self: myself
+   *
+   * The event has been triggered.
+   *
+   * Deprecated: Use the #GtkdocObject::otest signal instead.
+   */</output>
 </test>
 
 <test>
@@ -378,6 +492,11 @@ complex algorithm (http://en.wikipedia.org/wiki/Algorithm).
       <description>Something has happened.</description>
     </docblock>
   </parser>
+  <output>  /**
+   * GtkdocObject::strings-changed:
+   *
+   * Something has happened.
+   */</output>
 </test>
 
 <test>
@@ -394,6 +513,11 @@ complex algorithm (http://en.wikipedia.org/wiki/Algorithm).
       <description>Something has happened.</description>
     </docblock>
   </parser>
+  <output>  /**
+   * GtkdocObject::variant-changed:
+   *
+   * Something has happened.
+   */</output>
 </test>
 
 <test>
@@ -415,6 +539,11 @@ complex algorithm (http://en.wikipedia.org/wiki/Algorithm).
       </tags>
     </docblock>
   </parser>
+  <output>  /**
+   * GtkdocObject:otest:
+   *
+   * Since: 0.1
+   */</output>
 </test>
 
 <test>
@@ -436,6 +565,11 @@ complex algorithm (http://en.wikipedia.org/wiki/Algorithm).
       </tags>
     </docblock>
   </parser>
+  <output>  /**
+   * GtkdocObject:dep-otest:
+   *
+   * Deprecated: use #GtkdocObject:otest property
+   */</output>
 </test>
 
 </tests>
diff --git a/tests/scanner/annotationparser/gtkdoc/gobject/gobject.h.xml b/tests/scanner/annotationparser/gtkdoc/gobject/gobject.h.xml
index 2fb9696d..ec68a7f0 100644
--- a/tests/scanner/annotationparser/gtkdoc/gobject/gobject.h.xml
+++ b/tests/scanner/annotationparser/gtkdoc/gobject/gobject.h.xml
@@ -16,6 +16,11 @@
       <description>instance data of gtk-doc unit test class</description>
     </docblock>
   </parser>
+  <output>/**
+ * GtkdocObject:
+ *
+ * instance data of gtk-doc unit test class
+ */</output>
 </test>
 
 <test>
@@ -54,6 +59,15 @@
       <description>class data of gtk-doc unit test class</description>
     </docblock>
   </parser>
+  <output>/**
+ * GtkdocObjectClass:
+ * @parent: this is a bug :/
+ * @test: overideable method
+ * @ping: can be used before calling the @test() function
+ * @foo_bar: lets you refine your frobnicator
+ *
+ * class data of gtk-doc unit test class
+ */</output>
 </test>
 
 <test>
@@ -70,6 +84,11 @@
       <description>instance data of gtk-doc unit test class</description>
     </docblock>
   </parser>
+  <output>/**
+ * GtkdocObject2:
+ *
+ * instance data of gtk-doc unit test class
+ */</output>
 </test>
 
 <test>
@@ -93,6 +112,12 @@
       <description>class data of gtk-doc unit test class</description>
     </docblock>
   </parser>
+  <output>/**
+ * GtkdocObject2Class:
+ * @parent: this is a bug :/
+ *
+ * class data of gtk-doc unit test class
+ */</output>
 </test>
 
 <test>
@@ -129,6 +154,15 @@
       </tags>
     </docblock>
   </parser>
+  <output>/**
+ * GTKDOC_OBJECT_MACRO_DUMMY:
+ * @parameter_1: first arg
+ * @parameter_2: second arg
+ *
+ * This macro does nothing.
+ *
+ * Since: 0.1
+ */</output>
 </test>
 
 <test>
@@ -165,6 +199,15 @@
       </tags>
     </docblock>
   </parser>
+  <output>/**
+ * GTKDOC_OBJECT_MACRO_SUM:
+ * @parameter_1: first arg
+ * @parameter_2: second arg
+ *
+ * This macro adds its args.
+ *
+ * Returns: the sum of @parameter_1 and @parameter_2
+ */</output>
 </test>
 
 </tests>
diff --git a/tests/scanner/annotationparser/gtkdoc/gobject/gtypes.c.xml b/tests/scanner/annotationparser/gtkdoc/gobject/gtypes.c.xml
index 78f11b27..17d23562 100644
--- a/tests/scanner/annotationparser/gtkdoc/gobject/gtypes.c.xml
+++ b/tests/scanner/annotationparser/gtkdoc/gobject/gtypes.c.xml
@@ -33,6 +33,14 @@
       <description>This file contains non-sense code for the sole purpose of testing the docs.</description>
     </docblock>
   </parser>
+  <output>/**
+ * SECTION:types
+ * @title: GtkdocTypes
+ * @short_description: other gobject types for gtk-doc unit test
+ * @see_also: #GtkdocObject, #GtkdocIface
+ *
+ * This file contains non-sense code for the sole purpose of testing the docs.
+ */</output>
 </test>
 
 </tests>
diff --git a/tests/scanner/annotationparser/gtkdoc/gobject/gtypes.h.xml b/tests/scanner/annotationparser/gtkdoc/gobject/gtypes.h.xml
index 644d5946..7331a556 100644
--- a/tests/scanner/annotationparser/gtkdoc/gobject/gtypes.h.xml
+++ b/tests/scanner/annotationparser/gtkdoc/gobject/gtypes.h.xml
@@ -30,6 +30,14 @@
       <description>Enum values for the #GtkdocEnum type.</description>
     </docblock>
   </parser>
+  <output>/**
+ * GtkdocEnum:
+ * @GTKDOC_ENUM_V1: first
+ * @GTKDOC_ENUM_V2: second
+ *    Since: 0.10
+ *
+ * Enum values for the #GtkdocEnum type.
+ */</output>
 </test>
 
 <test>
@@ -58,6 +66,13 @@
       <description>Unboxed plain old data that should default to public members.</description>
     </docblock>
   </parser>
+  <output>/**
+ * GtkdocPlainOldData:
+ * @n: Some integer member.
+ * @x: Some floating point member.
+ *
+ * Unboxed plain old data that should default to public members.
+ */</output>
 </test>
 
 <test>
@@ -86,6 +101,13 @@
       <description>Boxed plain old data that should default to public members.</description>
     </docblock>
   </parser>
+  <output>/**
+ * GtkdocBoxedPlainOldData:
+ * @n: Some integer member.
+ * @x: Some floating point member.
+ *
+ * Boxed plain old data that should default to public members.
+ */</output>
 </test>
 
 </tests>