doctool: Use a base template for all pages

24 files changed, 230 insertions, 48 deletions

diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Callback.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Callback.page
index b79b93aa..c2c171b3 100644
--- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Callback.page
+++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Callback.page
@@ -3,9 +3,16 @@
       type="topic"
       style="default"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
+    
+      <link type="guide" xref="index"/>
+    
   </info>
   <title>DocExamples.Callback</title>
-
+  
+    
+  
+  
 </page>
diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Enum.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Enum.page
index 56ebc4bb..06fec31b 100644
--- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Enum.page
+++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Enum.page
@@ -3,10 +3,16 @@
       type="guide"
       style="enum"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
-    <link type="guide" xref="index"/>
+    
+      <link type="guide" xref="index"/>
+    
   </info>
   <title>DocExamples.Enum</title>
-<p>This is an example to document an enumeration.</p>
+  
+    <p>This is an example to document an enumeration.</p>
+  
+  
 </page>
diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-property-example.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-property-example.page
index fde0ffb4..465c018f 100644
--- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-property-example.page
+++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-property-example.page
@@ -1,13 +1,19 @@
 <?xml version="1.0"?>
-<page id="DocExamples.property-example"
+<page id="DocExamples.Obj-property-example"
       type="topic"
       style="property"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
+    
     <link type="guide" xref="DocExamples.Obj" group="property"/>
     <title type="link" role="topic">property-example</title>
+
   </info>
   <title>DocExamples.Obj:property-example</title>
-<p>This is an example of how to document a property.</p>
+  
+    <p>This is an example of how to document a property.</p>
+  
+  
 </page>
diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-signal-example.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-signal-example.page
index 7f63fa40..7d40713a 100644
--- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-signal-example.page
+++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-signal-example.page
@@ -1,13 +1,19 @@
 <?xml version="1.0"?>
-<page id="DocExamples.signal-example"
+<page id="DocExamples.Obj-signal-example"
       type="topic"
       style="signal"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
-    <link type="guide" xref="DocExamples.Obj" group="signal"/>
+    
+    <link type="guide" xref="DocExamples.Obj" group="property"/>
     <title type="link" role="topic">signal-example</title>
+
   </info>
   <title>DocExamples.Obj::signal-example</title>
-<p>This is an example of how to document a signal.</p>
+  
+    <p>This is an example of how to document a signal.</p>
+  
+  
 </page>
diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-vfunc.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-vfunc.page
index c9b47666..23a7c654 100644
--- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-vfunc.page
+++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-vfunc.page
@@ -6,13 +6,17 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
+    
     <link type="guide" xref="DocExamples.Obj" group="vfunc"/>
+
   </info>
   <title>DocExamples.Obj::vfunc</title>
+  
 <synopsis><code mime="text/x-csrc">
 </code></synopsis>
-<p>This is an example of how to document a vfunc.</p>
 
+    <p>This is an example of how to document a vfunc.</p>
+  
 <table>
 <tr>
 <td><p>first_arg :</p></td>
@@ -23,5 +27,9 @@
 <td></td>
 </tr>
 </table>
-<p>Since 0.99</p>
+
+    <p>Since 0.99</p>
+  
+
+  
 </page>
diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.method.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.method.page
index 2015098f..4d2f6cd3 100644
--- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.method.page
+++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.method.page
@@ -6,6 +6,7 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
+    
     <link type="guide" xref="DocExamples.Obj" group="method"/>
     <api:function>
       <api:returns>
@@ -37,8 +38,10 @@
         <api:name>string</api:name>
       </api:arg>
     </api:function>
+
   </info>
   <title>doc_examples_obj_method</title>
+  
 <synopsis><code mime="text/x-csrc">
 gboolean doc_examples_obj_method (DocExamplesObj *self,
 gint first_arg,
@@ -47,9 +50,10 @@ gint first_arg,
                                   gpointer pointer_arg,
                                   gchar* string);
 </code></synopsis>
-<p>This is an example of how to document a method.</p><p>You should call this on a <link xref="DocExamples.Obj">DocExamples.Obj</link> that was
-created with <link xref="DocExamples.Obj.new">doc_examples_obj_new</link>.</p><p>This should be a %FALSEALARM.</p>
 
+    <p>This is an example of how to document a method.</p><p>You should call this on a <link xref="DocExamples.Obj">DocExamples.Obj</link> that was
+created with <link xref="DocExamples.Obj.new">doc_examples_obj_new</link>.</p><p>This should be a %FALSEALARM.</p>
+  
 <table>
 <tr>
 <td><p>first_arg :</p></td>
@@ -76,5 +80,9 @@ created with <link xref="DocExamples.Obj.new">doc_examples_obj_new</link>.</p><p
 <td><p>Either <code>FALSE</code> or something <code>FALSE</code>-y.</p></td>
 </tr>
 </table>
-<p>Since 0.99</p>
+
+    <p>Since 0.99</p>
+  
+
+  
 </page>
diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.new.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.new.page
index 0e010cf3..0f8c297a 100644
--- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.new.page
+++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.new.page
@@ -6,6 +6,7 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
+    
     <link type="guide" xref="DocExamples.Obj" group="constructor"/>
     <api:function>
       <api:returns>
@@ -13,17 +14,24 @@
       </api:returns>
       <api:name>doc_examples_obj_new</api:name>
     </api:function>
+
   </info>
   <title>doc_examples_obj_new</title>
+  
 <synopsis><code mime="text/x-csrc">
 DocExamplesObj* doc_examples_obj_new (void);
 </code></synopsis>
 
-
+    
+  
 <table>
 <tr>
 <td><p>Returns :</p></td>
 <td></td>
 </tr>
 </table>
+
+  
+
+  
 </page>
diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.page
index 6014906c..9937b79b 100644
--- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.page
+++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.page
@@ -6,11 +6,18 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
-    <link type="guide" xref="index" group="class"/>
+    
+      <link type="guide" xref="index"/>
+    
   </info>
   <title>DocExamples.Obj</title>
-<p>This is an example of how to document a class</p><p>This class has a signal: <link xref="DocExamples.Obj-signal-example">DocExamples.Obj::signal-example</link>.</p><p>And also has a property: <link xref="DocExamples.Obj-property-example">DocExamples.Obj:property-example</link>.</p>
-<p>Since 0.99</p>
+  
+
+    <p>This is an example of how to document a class</p><p>This class has a signal: <link xref="DocExamples.Obj-signal-example">DocExamples.Obj::signal-example</link>.</p><p>And also has a property: <link xref="DocExamples.Obj-property-example">DocExamples.Obj:property-example</link>.</p>
+  
+
+    <p>Since 0.99</p>
+  
   <synopsis ui:expanded="no">
     <title>Hierarchy</title>
     <tree>
@@ -43,4 +50,6 @@
   <links type="topic" ui:expanded="yes" groups="#first #default #last" style="linklist">
     <title>Other</title>
   </links>
+
+  
 </page>
diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.static_method.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.static_method.page
index ebf23d55..358a220c 100644
--- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.static_method.page
+++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.static_method.page
@@ -6,6 +6,7 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
+    
     <link type="guide" xref="DocExamples.Obj" group="function"/>
     <api:function>
       <api:returns>
@@ -17,14 +18,17 @@
         <api:name>out_arg</api:name>
       </api:arg>
     </api:function>
+
   </info>
   <title>doc_examples_obj_static_method</title>
+  
 <synopsis><code mime="text/x-csrc">
 gboolean doc_examples_obj_static_method (gint* out_arg);
 </code></synopsis>
-<p>This is an example of a function with an out argument
-and a return value.</p>
 
+    <p>This is an example of a function with an out argument
+and a return value.</p>
+  
 <table>
 <tr>
 <td><p>out_arg :</p></td>
@@ -35,4 +39,8 @@ and a return value.</p>
 <td><p><code>TRUE</code> if <code>out_arg</code> is valid, <code>FALSE</code> otherwise</p></td>
 </tr>
 </table>
+
+  
+
+  
 </page>
diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.ObjClass.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.ObjClass.page
index c8e43755..cd8021ba 100644
--- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.ObjClass.page
+++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.ObjClass.page
@@ -1,12 +1,18 @@
 <?xml version="1.0"?>
 <page id="DocExamples.ObjClass"
-      type="guide"
+      type="topic"
       style="record"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
-    <link type="guide" xref="index"/>
+    
+      <link type="guide" xref="index"/>
+    
   </info>
   <title>DocExamples.ObjClass</title>
-
+  
+    
+  
+  
 </page>
diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.array_function.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.array_function.page
index 2b19e8d0..f24da60e 100644
--- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.array_function.page
+++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.array_function.page
@@ -6,6 +6,7 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
+    
     <link type="guide" xref="index" group="function"/>
     <api:function>
       <api:returns>
@@ -17,14 +18,17 @@
         <api:name>out_len</api:name>
       </api:arg>
     </api:function>
+
   </info>
   <title>doc_examples_array_function</title>
+  
 <synopsis><code mime="text/x-csrc">
 gint* doc_examples_array_function (gint* out_len);
 </code></synopsis>
-<p>This function returns an array with an explicit length,
-and the length should be invisible in most introspected bindings.</p>
 
+    <p>This function returns an array with an explicit length,
+and the length should be invisible in most introspected bindings.</p>
+  
 <table>
 <tr>
 <td><p>out_len :</p></td>
@@ -35,4 +39,8 @@ and the length should be invisible in most introspected bindings.</p>
 <td><p>an array of numbers.</p></td>
 </tr>
 </table>
+
+  
+
+  
 </page>
diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.callback_function.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.callback_function.page
index 89e00a65..2af93305 100644
--- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.callback_function.page
+++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.callback_function.page
@@ -6,6 +6,7 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
+    
     <link type="guide" xref="index" group="function"/>
     <api:function>
       <api:returns>
@@ -25,17 +26,20 @@
         <api:name>destroy_notify</api:name>
       </api:arg>
     </api:function>
+
   </info>
   <title>doc_examples_callback_function</title>
+  
 <synopsis><code mime="text/x-csrc">
 DocExamplesEnum doc_examples_callback_function (DocExamplesCallback callback,
                                                 gpointer user_data,
                                                 GDestroyNotify destroy_notify);
 </code></synopsis>
-<p>This is a function that takes a callback. Different languages
+
+    <p>This is a function that takes a callback. Different languages
 will expose this in different ways (e.g. Python keeps the
 <code>user_data</code> parameter, while JS doesn't)</p>
-
+  
 <table>
 <tr>
 <td><p>callback :</p></td>
@@ -54,4 +58,8 @@ will expose this in different ways (e.g. Python keeps the
 <td><p><link xref="DocExamples.Enum">DocExamples.Enum</link>.foo sometimes, <link xref="DocExamples.Enum">DocExamples.Enum</link>.bar other times.</p></td>
 </tr>
 </table>
+
+  
+
+  
 </page>
diff --git a/tests/doctool/DocExamples-1.0-C-expected/index.page b/tests/doctool/DocExamples-1.0-C-expected/index.page
index c87a104b..5143b432 100644
--- a/tests/doctool/DocExamples-1.0-C-expected/index.page
+++ b/tests/doctool/DocExamples-1.0-C-expected/index.page
@@ -3,10 +3,15 @@
       type="guide"
       style="namespace"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
+    
+      <link type="guide" xref="index"/>
+    
   </info>
   <title>Index</title>
+  
   <links type="topic" ui:expanded="yes" groups="class" style="linklist">
     <title>Classes</title>
   </links>
@@ -16,4 +21,6 @@
   <links type="topic" ui:expanded="yes" groups="#first #default #last" style="linklist">
     <title>Other</title>
   </links>
+
+  
 </page>
diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Callback.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Callback.page
index b79b93aa..c2c171b3 100644
--- a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Callback.page
+++ b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Callback.page
@@ -3,9 +3,16 @@
       type="topic"
       style="default"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
+    
+      <link type="guide" xref="index"/>
+    
   </info>
   <title>DocExamples.Callback</title>
-
+  
+    
+  
+  
 </page>
diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Enum.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Enum.page
index 0f496063..614b855e 100644
--- a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Enum.page
+++ b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Enum.page
@@ -1,13 +1,17 @@
 <?xml version="1.0"?>
 <page id="DocExamples.Enum"
-      type="guide"
+      type="topic"
       style="enum"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
-    <link type="guide" xref="index"/>
+    
+      <link type="guide" xref="index"/>
+    
   </info>
   <title>DocExamples.Enum</title>
+  
   <p>This is an example to document an enumeration.</p>
 <table>
 <tr>
@@ -20,4 +24,5 @@
 </tr>
 </table>
 
+  
 </page>
diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj-property-example.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj-property-example.page
index 43f4b560..3b791bd0 100644
--- a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj-property-example.page
+++ b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj-property-example.page
@@ -3,14 +3,22 @@
       type="topic"
       style="property"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
+    
     <link type="guide" xref="DocExamples.Obj" group="property"/>
     <title type="link" role="topic">property-example</title>
+
   </info>
   <title>DocExamples.Obj:property-example</title>
+  
 <synopsis><code mime="text/x-python">
 "property-example"             {unicode: gint8}                : Read / Write
 </code></synopsis>
-<p>This is an example of how to document a property.</p>
+
+    <p>This is an example of how to document a property.</p>
+  
+
+  
 </page>
diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj-signal-example.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj-signal-example.page
index 0304b135..8cac161f 100644
--- a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj-signal-example.page
+++ b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj-signal-example.page
@@ -3,12 +3,16 @@
       type="topic"
       style="signal"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
+    
     <link type="guide" xref="DocExamples.Obj" group="signal"/>
     <title type="link" role="topic">signal-example</title>
+
   </info>
   <title>DocExamples.Obj::signal-example</title>
+  
 <synopsis><code mime="text/x-python">
 def callback(obj, int_param, float_param, pointer_param, user_param1, ...)
 </code></synopsis>
@@ -40,5 +44,9 @@ def callback(obj, int_param, float_param, pointer_param, user_param1, ...)
 <td><p>additional user parameters (if any)</p></td>
 </tr>
 </table>
-<p>Since 0.99</p>
+
+    <p>Since 0.99</p>
+  
+
+  
 </page>
diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj-vfunc.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj-vfunc.page
index 8a02f616..11d693f3 100644
--- a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj-vfunc.page
+++ b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj-vfunc.page
@@ -6,16 +6,20 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
-    <link type="guide" xref="DocExamples.Obj" group="vfunc"/>
-    <title type="link" role="topic">vfunc</title>
+    
+      <link type="guide" xref="index"/>
+    
   </info>
   <title>DocExamples.Obj::vfunc</title>
+  
 <synopsis><code mime="text/x-python">
 @accepts(int)
 @returns(none)
 def do_vfunc(self, first_arg):
 </code></synopsis>
-<p>This is an example of how to document a vfunc.</p>
+
+    <p>This is an example of how to document a vfunc.</p>
+  
 
 <table>
 <tr>
@@ -23,5 +27,9 @@ def do_vfunc(self, first_arg):
 <td><p>first argument</p></td>
 </tr>
 </table>
-<p>Since 0.99</p>
+
+    <p>Since 0.99</p>
+  
+
+  
 </page>
diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.method.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.method.page
index 2477e451..89f73d08 100644
--- a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.method.page
+++ b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.method.page
@@ -6,6 +6,7 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
+    
     <link type="guide" xref="DocExamples.Obj" group="method"/>
     <api:function>
       <api:returns>
@@ -37,16 +38,20 @@
         <api:name>string</api:name>
       </api:arg>
     </api:function>
+
   </info>
   <title>Obj.method</title>
+  
 <synopsis><code mime="text/x-python">
 @accepts(int, float, bool, gpointer, unicode)
 @returns(bool)
 def method(self, first_arg, second_arg, boolean_arg, pointer_arg, string):
     # Python wrapper for doc_examples_obj_method()
 </code></synopsis>
-<p>This is an example of how to document a method.</p><p>You should call this on a <link xref="DocExamples.Obj">DocExamples.Obj</link> that was
+
+    <p>This is an example of how to document a method.</p><p>You should call this on a <link xref="DocExamples.Obj">DocExamples.Obj</link> that was
 created with <link xref="DocExamples.Obj.new">Obj.new</link>.</p><p>This should be a %FALSEALARM.</p>
+  
 
 <table>
 <tr>
@@ -74,5 +79,9 @@ created with <link xref="DocExamples.Obj.new">Obj.new</link>.</p><p>This should
 <td><p>Either <code>False</code> or something <code>False</code>-y.</p></td>
 </tr>
 </table>
-<p>Since 0.99</p>
+
+    <p>Since 0.99</p>
+  
+
+  
 </page>
diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.page
index 071abf1a..6278c649 100644
--- a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.page
+++ b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.page
@@ -1,22 +1,28 @@
 <?xml version="1.0"?>
 <page id="DocExamples.Obj"
-      type="guide"
+      type="topic"
       style="class"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
-    <link type="guide" xref="index" group="class"/>
+    
+      <link type="guide" xref="index"/>
+    
   </info>
   <title>DocExamples.Obj</title>
-<p>This is an example of how to document a class</p><p>This class has a signal: <link xref="DocExamples.Obj-signal-example">DocExamples.Obj::signal-example</link>.</p><p>And also has a property: <link xref="DocExamples.Obj-property-example">DocExamples.Obj:property-example</link>.</p>
-
+  
+  
+    <p>This is an example of how to document a class</p><p>This class has a signal: <link xref="DocExamples.Obj-signal-example">DocExamples.Obj::signal-example</link>.</p><p>And also has a property: <link xref="DocExamples.Obj-property-example">DocExamples.Obj:property-example</link>.</p>
+  
   <synopsis><code>
 from gi.repository import DocExamples
 
 obj = DocExamples.Obj(<link xref='DocExamples.Obj-property-example'>property_example</link>=value)  </code></synopsis>
 
-<p>Since 0.99</p>
+  
+    <p>Since 0.99</p>
+  
   <synopsis>
     <title>Hierarchy</title>
     <tree>
@@ -50,4 +56,6 @@ obj = DocExamples.Obj(<link xref='DocExamples.Obj-property-example'>property_exa
   <links type="topic" ui:expanded="yes" groups="#first #default #last" style="linklist">
     <title>Other</title>
   </links>
+
+  
 </page>
diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.static_method.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.static_method.page
index e040414f..3bc402b2 100644
--- a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.static_method.page
+++ b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.static_method.page
@@ -6,6 +6,7 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
+    
     <link type="guide" xref="DocExamples.Obj" group="function"/>
     <api:function>
       <api:returns>
@@ -17,16 +18,20 @@
         <api:name>out_arg</api:name>
       </api:arg>
     </api:function>
+
   </info>
   <title>Obj.static_method</title>
+  
 <synopsis><code mime="text/x-python">
 @accepts(int)
 @returns(bool)
 def static_method(out_arg):
     # Python wrapper for doc_examples_obj_static_method()
 </code></synopsis>
-<p>This is an example of a function with an out argument
+
+    <p>This is an example of a function with an out argument
 and a return value.</p>
+  
 
 <table>
 <tr>
@@ -38,4 +43,8 @@ and a return value.</p>
 <td><p><code>True</code> if <code>out_arg</code> is valid, <code>False</code> otherwise</p></td>
 </tr>
 </table>
+
+  
+
+  
 </page>
diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.array_function.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.array_function.page
index 3c8e86cd..6dd79093 100644
--- a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.array_function.page
+++ b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.array_function.page
@@ -6,6 +6,7 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
+    
     <link type="guide" xref="index" group="function"/>
     <api:function>
       <api:returns>
@@ -17,16 +18,20 @@
         <api:name>out_len</api:name>
       </api:arg>
     </api:function>
+
   </info>
   <title>array_function</title>
+  
 <synopsis><code mime="text/x-python">
 @accepts(int)
 @returns([int])
 def array_function(out_len):
     # Python wrapper for doc_examples_array_function()
 </code></synopsis>
-<p>This function returns an array with an explicit length,
+
+    <p>This function returns an array with an explicit length,
 and the length should be invisible in most introspected bindings.</p>
+  
 
 <table>
 <tr>
@@ -38,4 +43,8 @@ and the length should be invisible in most introspected bindings.</p>
 <td><p>an array of numbers.</p></td>
 </tr>
 </table>
+
+  
+
+  
 </page>
diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.callback_function.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.callback_function.page
index 58323eba..7c15a0c9 100644
--- a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.callback_function.page
+++ b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.callback_function.page
@@ -6,6 +6,7 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
+    
     <link type="guide" xref="index" group="function"/>
     <api:function>
       <api:returns>
@@ -25,17 +26,21 @@
         <api:name>destroy_notify</api:name>
       </api:arg>
     </api:function>
+
   </info>
   <title>callback_function</title>
+  
 <synopsis><code mime="text/x-python">
 @accepts(DocExamples.Callback, gpointer, GLib.DestroyNotify)
 @returns(DocExamples.Enum)
 def callback_function(callback, user_data, destroy_notify):
     # Python wrapper for doc_examples_callback_function()
 </code></synopsis>
-<p>This is a function that takes a callback. Different languages
+
+    <p>This is a function that takes a callback. Different languages
 will expose this in different ways (e.g. Python keeps the
 <code>user_data</code> parameter, while JS doesn't)</p>
+  
 
 <table>
 <tr>
@@ -55,4 +60,8 @@ will expose this in different ways (e.g. Python keeps the
 <td><p><link xref="DocExamples.Enum">DocExamples.Enum</link>.foo sometimes, <link xref="DocExamples.Enum">DocExamples.Enum</link>.bar other times.</p></td>
 </tr>
 </table>
+
+  
+
+  
 </page>
diff --git a/tests/doctool/DocExamples-1.0-Python-expected/index.page b/tests/doctool/DocExamples-1.0-Python-expected/index.page
index bbf9d2d7..5143b432 100644
--- a/tests/doctool/DocExamples-1.0-Python-expected/index.page
+++ b/tests/doctool/DocExamples-1.0-Python-expected/index.page
@@ -3,17 +3,24 @@
       type="guide"
       style="namespace"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
+    
+      <link type="guide" xref="index"/>
+    
   </info>
   <title>Index</title>
-  <links type="topic" ui:expanded="yes" groups="class">
+  
+  <links type="topic" ui:expanded="yes" groups="class" style="linklist">
     <title>Classes</title>
   </links>
-  <links type="topic" ui:expanded="yes" groups="function">
+  <links type="topic" ui:expanded="yes" groups="function" style="linklist">
     <title>Functions</title>
   </links>
-  <links type="topic" ui:expanded="yes" groups="#first #default #last">
+  <links type="topic" ui:expanded="yes" groups="#first #default #last" style="linklist">
     <title>Other</title>
   </links>
+
+  
 </page>