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.AnnotationObject-attribute-signal.page | 43 ++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-attribute-signal.page

(limited to 'tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-attribute-signal.page')

diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-attribute-signal.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-attribute-signal.page
new file mode 100644
index 00000000..73f9cde8
--- /dev/null
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-attribute-signal.page
@@ -0,0 +1,43 @@
+<?xml version="1.0"?>
+<page id="Regress.AnnotationObject-attribute-signal"
+      type="topic"
+      style="signal"
+      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="Regress.AnnotationObject" group="signal"/>
+    <title type="link" role="topic">attribute-signal</title>
+
+  </info>
+  <title>Regress.AnnotationObject::attribute-signal</title>
+  
+<synopsis><code mime="text/x-python">
+function callback(annotation_object, arg1:String, arg2:String, user_param1, ...):String;
+</code></synopsis>
+
+  
+    <p>This signal tests a signal with attributes.</p>
+  
+  
+  
+  
+<dl>
+<dt><p>annotation_object :</p></dt>
+<dd><p>instance of Regress.AnnotationObject that is emitting the signal</p></dd>
+<dt><p>arg1 :</p></dt>
+<dd><p>a value</p></dd>
+<dt><p>arg2 :</p></dt>
+<dd><p>another value</p></dd>
+<dt><p>user_param1 :</p></dt>
+<dd><p>first user parameter (if any) specified with the connect() method</p></dd>
+<dt><p>... :</p></dt>
+<dd><p>additional user parameters (if any)</p></dd>
+<dt><p>Returns :</p></dt>
+<dd>gchar* <p>the return value</p></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.AnnotationObject-attribute-signal.page | 40 ++++++++++++++--------
 1 file changed, 26 insertions(+), 14 deletions(-)

(limited to 'tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-attribute-signal.page')

diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-attribute-signal.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-attribute-signal.page
index 73f9cde8..713f2fa9 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-attribute-signal.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-attribute-signal.page
@@ -23,20 +23,32 @@ function callback(annotation_object, arg1:String, arg2:String, user_param1, ...)
   
   
   
-<dl>
-<dt><p>annotation_object :</p></dt>
-<dd><p>instance of Regress.AnnotationObject that is emitting the signal</p></dd>
-<dt><p>arg1 :</p></dt>
-<dd><p>a value</p></dd>
-<dt><p>arg2 :</p></dt>
-<dd><p>another value</p></dd>
-<dt><p>user_param1 :</p></dt>
-<dd><p>first user parameter (if any) specified with the connect() method</p></dd>
-<dt><p>... :</p></dt>
-<dd><p>additional user parameters (if any)</p></dd>
-<dt><p>Returns :</p></dt>
-<dd>gchar* <p>the return value</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>annotation_object</code></title>
+<p>instance of Regress.AnnotationObject that is emitting the signal</p>
+</item>
+<item>
+<title><code>arg1</code></title>
+<p>a value</p>
+</item>
+<item>
+<title><code>arg2</code></title>
+<p>another value</p>
+</item>
+<item>
+<title><code>user_param1</code></title>
+<p>first user parameter (if any) specified with the connect() method</p>
+</item>
+<item>
+<title><code>...</code></title>
+<p>additional user parameters (if any)</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+<p>gchar* <p>the return value</p></p>
+</item>
+</terms>
 
   
   
-- 
cgit v1.2.1


From 5a890b79fd720a9eec4d3b9eb1c9cdd6d7b24653 Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Thu, 14 Feb 2013 23:00:51 -0500
Subject: doctool: Gjs doesn't have extra signal parameters

---
 .../Regress.AnnotationObject-attribute-signal.page             | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-attribute-signal.page')

diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-attribute-signal.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-attribute-signal.page
index 713f2fa9..f3ab0917 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-attribute-signal.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-attribute-signal.page
@@ -14,7 +14,7 @@
   <title>Regress.AnnotationObject::attribute-signal</title>
   
 <synopsis><code mime="text/x-python">
-function callback(annotation_object, arg1:String, arg2:String, user_param1, ...):String;
+function callback(annotation_object, arg1:String, arg2:String, ):String;
 </code></synopsis>
 
   
@@ -37,14 +37,6 @@ function callback(annotation_object, arg1:String, arg2:String, user_param1, ...)
 <p>another value</p>
 </item>
 <item>
-<title><code>user_param1</code></title>
-<p>first user parameter (if any) specified with the connect() method</p>
-</item>
-<item>
-<title><code>...</code></title>
-<p>additional user parameters (if any)</p>
-</item>
-<item>
 <title><code>Returns</code></title>
 <p>gchar* <p>the return value</p></p>
 </item>
-- 
cgit v1.2.1


From 29c381b0a1f077ddf3f8ce9fc2f7ab11b4f3628e Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Thu, 14 Feb 2013 23:14:02 -0500
Subject: doctool: Add an link for signal methods

---
 .../Regress.AnnotationObject-attribute-signal.page                      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-attribute-signal.page')

diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-attribute-signal.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-attribute-signal.page
index f3ab0917..e4c0ca5c 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-attribute-signal.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-attribute-signal.page
@@ -26,7 +26,7 @@ function callback(annotation_object, arg1:String, arg2:String, ):String;
 <terms>
 <item>
 <title><code>annotation_object</code></title>
-<p>instance of Regress.AnnotationObject that is emitting the signal</p>
+<p>instance of <link xref="Regress.AnnotationObject"/> that is emitting the signal</p>
 </item>
 <item>
 <title><code>arg1</code></title>
-- 
cgit v1.2.1


From 31b6b6cb2630b19c7fb554e0e6eeda4eb2c323c7 Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Thu, 14 Feb 2013 23:14:56 -0500
Subject: doctool: Remove the ctype from the signal return value

WTF was this here for?
---
 .../Regress.AnnotationObject-attribute-signal.page                      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-attribute-signal.page')

diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-attribute-signal.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-attribute-signal.page
index e4c0ca5c..5ba5b290 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-attribute-signal.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-attribute-signal.page
@@ -38,7 +38,7 @@ function callback(annotation_object, arg1:String, arg2:String, ):String;
 </item>
 <item>
 <title><code>Returns</code></title>
-<p>gchar* <p>the return value</p></p>
+<p><p>the return value</p></p>
 </item>
 </terms>
 
-- 
cgit v1.2.1


From eab4582f2e3a90840d102f32e46d1d9b0645316a Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Fri, 15 Feb 2013 05:29:16 -0500
Subject: doctool: Remove an extra <p> in the signals

---
 .../Regress.AnnotationObject-attribute-signal.page                      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-attribute-signal.page')

diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-attribute-signal.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-attribute-signal.page
index 5ba5b290..713c6d67 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-attribute-signal.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-attribute-signal.page
@@ -38,7 +38,7 @@ function callback(annotation_object, arg1:String, arg2:String, ):String;
 </item>
 <item>
 <title><code>Returns</code></title>
-<p><p>the return value</p></p>
+<p>the return value</p>
 </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.AnnotationObject-attribute-signal.page                      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-attribute-signal.page')

diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-attribute-signal.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-attribute-signal.page
index 713c6d67..c30c3377 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-attribute-signal.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-attribute-signal.page
@@ -7,7 +7,7 @@
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
     
-    <link type="guide" xref="Regress.AnnotationObject" group="signal"/>
+    <link xref="Regress.AnnotationObject" group="signal" type="guide"/>
     <title type="link" role="topic">attribute-signal</title>
 
   </info>
-- 
cgit v1.2.1