From 86f7acf0f139a917e460db26872b5a4306fca8d2 Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Sun, 3 Feb 2013 06:58:53 -0500
Subject: tests: Use Regress GIR for doctool

This makes us test a lot more functionality in the doc tool, and
removes the need to have a lot of different test libraries, and
different test infrastructure.
---
 .../Regress.test_multi_callback.page               | 47 ++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_callback.page

(limited to 'tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_callback.page')

diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_callback.page
new file mode 100644
index 00000000..ed15aba2
--- /dev/null
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_callback.page
@@ -0,0 +1,47 @@
+<?xml version="1.0"?>
+<page id="Regress.test_multi_callback"
+      type="topic"
+      style="function"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    
+    <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>int</api:type>
+      </api:returns>
+      <api:name>regress_test_multi_callback</api:name>
+      <api:arg>
+        <api:type>Regress.TestCallback</api:type>
+        <api:name>callback</api:name>
+      </api:arg>
+    </api:function>
+
+  </info>
+  <title>test_multi_callback</title>
+  
+<synopsis><code mime="text/x-python">
+@accepts(Regress.TestCallback)
+@returns(int)
+def test_multi_callback(callback):
+    # Python wrapper for regress_test_multi_callback()
+</code></synopsis>
+
+  
+    
+  
+  
+  
+  
+<dl>
+<dt><p>callback :</p></dt>
+<dd></dd>
+<dt><p>Returns :</p></dt>
+<dd></dd>
+</dl>
+
+  
+  
+</page>
-- 
cgit v1.2.1


From 3b64a2e808ae25b437c30bec237ada89dc4bcfb3 Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Thu, 14 Feb 2013 22:47:10 -0500
Subject: doctool: Fix use of <dl> tag in templates

This isn't legal Mallard
---
 .../Regress.test_multi_callback.page                     | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_callback.page')

diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_callback.page
index ed15aba2..530f763e 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_callback.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_callback.page
@@ -35,12 +35,16 @@ def test_multi_callback(callback):
   
   
   
-<dl>
-<dt><p>callback :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>callback</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
 
   
   
-- 
cgit v1.2.1


From d05e20a61d3e381e46fcb306f806566bbbd76312 Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Fri, 15 Feb 2013 06:04:11 -0500
Subject: doctool: Use format_xref to format some links to pages

We don't do a full 100% conversion for all link tags, yet,
because I don't want to break too much here. This may come
later.
---
 .../Regress-1.0-Python-expected/Regress.test_multi_callback.page      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_callback.page')

diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_callback.page
index 530f763e..c7dac3f1 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_callback.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_callback.page
@@ -7,7 +7,7 @@
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
     
-    <link type="guide" xref="index" group="function"/>
+    <link xref="index" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:type>int</api:type>
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>test_multi_callback</title>
+  <title>Regress.test_multi_callback</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.TestCallback)
-- 
cgit v1.2.1


From 3dba3c40da7bc026bfa83109dc46ceb67471dd9d Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Fri, 15 Feb 2013 08:23:10 -0500
Subject: docwriter: Use the fully-qualified name for functions and methods

---
 .../Regress-1.0-Python-expected/Regress.test_multi_callback.page        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_callback.page')

diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_callback.page
index c7dac3f1..c195b821 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_callback.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_callback.page
@@ -20,7 +20,7 @@
     </api:function>
 
   </info>
-  <title>Regress.test_multi_callback</title>
+  <title>Index.test_multi_callback</title>
   
 <synopsis><code mime="text/x-python">
 @accepts(Regress.TestCallback)
-- 
cgit v1.2.1