diff options
| author | Giovanni Campagna <gcampagna@src.gnome.org> | 2014-02-19 17:15:34 +0100 |
|---|---|---|
| committer | Giovanni Campagna <gcampagna@src.gnome.org> | 2014-02-20 02:07:49 +0100 |
| commit | e70abadf0dd7d5312311926ec5b5130e1933d83b (patch) | |
| tree | dce2137a70088f9183a485f4694d5cfc9cb0f372 /tests/scanner/Regress-1.0-C-expected | |
| parent | 75d25b7f47542aa003c92ce576b6e82bae66aec9 (diff) | |
| download | gobject-introspection-e70abadf0dd7d5312311926ec5b5130e1933d83b.tar.gz | |
doctool: update reference tests
https://bugzilla.gnome.org/show_bug.cgi?id=724735
Diffstat (limited to 'tests/scanner/Regress-1.0-C-expected')
627 files changed, 5606 insertions, 6712 deletions
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.ANNOTATION_CALCULATED_DEFINE.page b/tests/scanner/Regress-1.0-C-expected/Regress.ANNOTATION_CALCULATED_DEFINE.page new file mode 100644 index 00000000..55a4b6d6 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.ANNOTATION_CALCULATED_DEFINE.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.ANNOTATION_CALCULATED_DEFINE" + type="topic" + style="default" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="index" group="default" type="guide"/> + </info> + <title>Regress.ANNOTATION_CALCULATED_DEFINE</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.ANNOTATION_CALCULATED_LARGE.page b/tests/scanner/Regress-1.0-C-expected/Regress.ANNOTATION_CALCULATED_LARGE.page new file mode 100644 index 00000000..c8887ffb --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.ANNOTATION_CALCULATED_LARGE.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.ANNOTATION_CALCULATED_LARGE" + type="topic" + style="default" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="index" group="default" type="guide"/> + </info> + <title>Regress.ANNOTATION_CALCULATED_LARGE</title> + <p>Constant to define a calculated large value</p> + <p>Since 1.4</p> +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.ANNOTATION_CALCULATED_LARGE_DIV.page b/tests/scanner/Regress-1.0-C-expected/Regress.ANNOTATION_CALCULATED_LARGE_DIV.page new file mode 100644 index 00000000..08eda319 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.ANNOTATION_CALCULATED_LARGE_DIV.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.ANNOTATION_CALCULATED_LARGE_DIV" + type="topic" + style="default" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="index" group="default" type="guide"/> + </info> + <title>Regress.ANNOTATION_CALCULATED_LARGE_DIV</title> + <p>Constant to define a calculated large value</p> + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.ATestError.page b/tests/scanner/Regress-1.0-C-expected/Regress.ATestError.page index e131f6f0..f9a50a17 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.ATestError.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.ATestError.page @@ -6,20 +6,9 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="enum" type="guide"/> - + <link xref="index" group="enum" type="guide"/> </info> <title>Regress.ATestError</title> - - - - - - - - - - - + + </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AliasedTestBoxed.page b/tests/scanner/Regress-1.0-C-expected/Regress.AliasedTestBoxed.page index 9490e4a3..097c37ba 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AliasedTestBoxed.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AliasedTestBoxed.page @@ -6,20 +6,9 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="default" type="guide"/> - + <link xref="index" group="default" type="guide"/> </info> <title>Regress.AliasedTestBoxed</title> - - - - <p>Typedef TestBoxed to test caller-allocates correctness</p> - - - - - - - + <p>Typedef TestBoxed to test caller-allocates correctness</p> + </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnAnonymousUnion-None.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnAnonymousUnion-None.page new file mode 100644 index 00000000..bc24e5dc --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnAnonymousUnion-None.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.AnAnonymousUnion-None" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.AnAnonymousUnion" group="field" type="guide"/> + </info> + <title>Regress.AnAnonymousUnion->None</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnAnonymousUnion-x.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnAnonymousUnion-x.page new file mode 100644 index 00000000..458ce06e --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnAnonymousUnion-x.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.AnAnonymousUnion-x" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.AnAnonymousUnion" group="field" type="guide"/> + </info> + <title>Regress.AnAnonymousUnion->x</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnAnonymousUnion.None-a.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnAnonymousUnion.None-a.page new file mode 100644 index 00000000..11f20db8 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnAnonymousUnion.None-a.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.AnAnonymousUnion.None-a" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.AnAnonymousUnion.None" group="field" type="guide"/> + </info> + <title>Regress.AnAnonymousUnion.None->a</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnAnonymousUnion.None-padding.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnAnonymousUnion.None-padding.page new file mode 100644 index 00000000..631770e0 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnAnonymousUnion.None-padding.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.AnAnonymousUnion.None-padding" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.AnAnonymousUnion.None" group="field" type="guide"/> + </info> + <title>Regress.AnAnonymousUnion.None->padding</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnAnonymousUnion.None.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnAnonymousUnion.None.page index 6dc17b32..c9db2dd9 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnAnonymousUnion.None.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnAnonymousUnion.None.page @@ -1,25 +1,35 @@ <?xml version="1.0"?> <page id="Regress.AnAnonymousUnion.None" - type="topic" - style="default" + type="guide" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="default" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.AnAnonymousUnion.None</title> - - - - - - - - - - - + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnAnonymousUnion.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnAnonymousUnion.page index f9323c69..aa4ed243 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnAnonymousUnion.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnAnonymousUnion.page @@ -1,25 +1,35 @@ <?xml version="1.0"?> <page id="Regress.AnAnonymousUnion" - type="topic" - style="record" + type="guide" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="record" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.AnAnonymousUnion</title> - - - - - - - - - - - + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationBitfield.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationBitfield.page index 4e19ef92..e0e5b006 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationBitfield.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationBitfield.page @@ -6,20 +6,9 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="default" type="guide"/> - + <link xref="index" group="default" type="guide"/> </info> <title>Regress.AnnotationBitfield</title> - - - - - - - - - - - + + </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationCallback.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationCallback.page index 9a652d80..d1f7d106 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationCallback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationCallback.page @@ -1,25 +1,28 @@ <?xml version="1.0"?> <page id="Regress.AnnotationCallback" type="topic" - style="default" + style="callback" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="default" type="guide"/> - - </info> + <link xref="index" group="callback" type="guide"/> + </info> <title>Regress.AnnotationCallback</title> - - - - <p>This is a callback.</p> - - - - - - - + <synopsis><code mime="text/x-csrc"> +const gint* AnnotationCallback (const gint* in); + </code></synopsis> + <p>This is a callback.</p> + +<terms> +<item> +<title><code>in</code></title> + <p>array of ints</p> +</item> +<item> +<title><code>Returns</code></title> + <p>array of ints</p> +</item> +</terms> + </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationFields-arr.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationFields-arr.page new file mode 100644 index 00000000..71a9afb5 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationFields-arr.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.AnnotationFields-arr" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.AnnotationFields" group="field" type="guide"/> + </info> + <title>Regress.AnnotationFields->arr</title> + <p>an array of length @len</p> + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationFields-field1.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationFields-field1.page new file mode 100644 index 00000000..36204ad1 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationFields-field1.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.AnnotationFields-field1" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.AnnotationFields" group="field" type="guide"/> + </info> + <title>Regress.AnnotationFields->field1</title> + <p>Some documentation</p> + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationFields-len.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationFields-len.page new file mode 100644 index 00000000..e56ec4fb --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationFields-len.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.AnnotationFields-len" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.AnnotationFields" group="field" type="guide"/> + </info> + <title>Regress.AnnotationFields->len</title> + <p>the length of array</p> + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationFields.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationFields.page index 74c6eab8..50f9bc61 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationFields.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationFields.page @@ -1,25 +1,35 @@ <?xml version="1.0"?> <page id="Regress.AnnotationFields" - type="topic" - style="record" + type="guide" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="record" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.AnnotationFields</title> - - - - <p>This is a struct for testing field documentation and annotations</p> - - - - - - - + <p>This is a struct for testing field documentation and annotations</p> + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationForeachFunc.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationForeachFunc.page index db77a117..3feafad2 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationForeachFunc.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationForeachFunc.page @@ -1,25 +1,38 @@ <?xml version="1.0"?> <page id="Regress.AnnotationForeachFunc" type="topic" - style="default" + style="callback" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="default" type="guide"/> - - </info> + <link xref="index" group="callback" type="guide"/> + </info> <title>Regress.AnnotationForeachFunc</title> - - - - - - - - - - - + <synopsis><code mime="text/x-csrc"> +void AnnotationForeachFunc (RegressAnnotationObject* object, + const char* item, + gpointer user_data); + </code></synopsis> + + +<terms> +<item> +<title><code>object</code></title> + +</item> +<item> +<title><code>item</code></title> + +</item> +<item> +<title><code>user_data</code></title> + +</item> +<item> +<title><code>Returns</code></title> + +</item> +</terms> + </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationListCallback.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationListCallback.page index 79844c66..275feff7 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationListCallback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationListCallback.page @@ -1,25 +1,28 @@ <?xml version="1.0"?> <page id="Regress.AnnotationListCallback" type="topic" - style="default" + style="callback" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="default" type="guide"/> - - </info> + <link xref="index" group="callback" type="guide"/> + </info> <title>Regress.AnnotationListCallback</title> - - - - <p>This is a callback taking a list.</p> - - - - - - - + <synopsis><code mime="text/x-csrc"> +GList* AnnotationListCallback (GList* in); + </code></synopsis> + <p>This is a callback taking a list.</p> + +<terms> +<item> +<title><code>in</code></title> + <p>list of strings</p> +</item> +<item> +<title><code>Returns</code></title> + <p>list of strings</p> +</item> +</terms> + </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationNotifyFunc.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationNotifyFunc.page index 17c80292..e2e58805 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationNotifyFunc.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationNotifyFunc.page @@ -1,26 +1,29 @@ <?xml version="1.0"?> <page id="Regress.AnnotationNotifyFunc" type="topic" - style="default" + style="callback" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="default" type="guide"/> - - </info> + <link xref="index" group="callback" type="guide"/> + </info> <title>Regress.AnnotationNotifyFunc</title> - - - - <p>This is a callback with a 'closure' argument that is not named + <synopsis><code mime="text/x-csrc"> +void AnnotationNotifyFunc (gpointer data); + </code></synopsis> + <p>This is a callback with a 'closure' argument that is not named 'user_data' and hence has to be annotated.</p> - - - - - - - + +<terms> +<item> +<title><code>data</code></title> + <p>The user data</p> +</item> +<item> +<title><code>Returns</code></title> + +</item> +</terms> + </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-attribute-signal.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-attribute-signal.page index 64e30a6c..8f63763a 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-attribute-signal.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-attribute-signal.page @@ -6,39 +6,29 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.AnnotationObject" group="signal" type="guide"/> <title type="link" role="topic">attribute-signal</title> - </info> <title>Regress.AnnotationObject::attribute-signal</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> gchar* attribute-signal (gchar* arg1, gchar* arg2); -</code></synopsis> + </code></synopsis> + <p>This signal tests a signal with attributes.</p> - - <p>This signal tests a signal with attributes.</p> - - - - <terms> <item> <title><code>arg1</code></title> -<p>a value</p> + <p>a value</p> </item> <item> <title><code>arg2</code></title> -<p>another value</p> + <p>another value</p> </item> <item> <title><code>Returns</code></title> -<p>the return value</p> + <p>the return value</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page index 48acac58..f42b7d3d 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page @@ -6,23 +6,15 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.AnnotationObject" group="signal" type="guide"/> <title type="link" role="topic">doc-empty-arg-parsing</title> - </info> <title>Regress.AnnotationObject::doc-empty-arg-parsing</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void doc-empty-arg-parsing (gpointer arg1); -</code></synopsis> + </code></synopsis> + <p>This signal tests an empty document argument (<code>arg1</code>)</p> - - <p>This signal tests an empty document argument (<code>arg1</code>)</p> - - - - <terms> <item> <title><code>arg1</code></title> @@ -34,6 +26,4 @@ void doc-empty-arg-parsing (gpointer arg1); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-function-property.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-function-property.page index bd640b5c..075d072e 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-function-property.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-function-property.page @@ -6,21 +6,10 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.AnnotationObject" group="property" type="guide"/> <title type="link" role="topic">function-property</title> - </info> <title>Regress.AnnotationObject:function-property</title> - - - - - - - - - - - + + </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-list-signal.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-list-signal.page index 29ad5842..28933854 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-list-signal.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-list-signal.page @@ -6,28 +6,20 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.AnnotationObject" group="signal" type="guide"/> <title type="link" role="topic">list-signal</title> - </info> <title>Regress.AnnotationObject::list-signal</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void list-signal (gpointer list); -</code></synopsis> - - - <p>This is a signal which takes a list of strings, but it's not + </code></synopsis> + <p>This is a signal which takes a list of strings, but it's not known by GObject as it's only marked as G_TYPE_POINTER</p> - - - - + <terms> <item> <title><code>list</code></title> -<p>a list of strings</p> + <p>a list of strings</p> </item> <item> <title><code>Returns</code></title> @@ -35,6 +27,4 @@ known by GObject as it's only marked as G_TYPE_POINTER</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-parent_instance.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-parent_instance.page new file mode 100644 index 00000000..97f17cd2 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-parent_instance.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.AnnotationObject-parent_instance" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.AnnotationObject" group="field" type="guide"/> + </info> + <title>Regress.AnnotationObject->parent_instance</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-string-property.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-string-property.page index 70b80ae2..23ae4888 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-string-property.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-string-property.page @@ -6,22 +6,10 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.AnnotationObject" group="property" type="guide"/> <title type="link" role="topic">string-property</title> - </info> <title>Regress.AnnotationObject:string-property</title> - - - - <p>This is a property which is a string</p> - - - <p>Since 1.0</p> - - - - - + <p>This is a property which is a string</p> + <p>Since 1.0</p> </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-string-signal.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-string-signal.page index e25d2bb1..88317ee5 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-string-signal.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-string-signal.page @@ -6,29 +6,20 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.AnnotationObject" group="signal" type="guide"/> <title type="link" role="topic">string-signal</title> - </info> <title>Regress.AnnotationObject::string-signal</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void string-signal (gpointer string); -</code></synopsis> - - - <p>This is a signal which has a broken signal handler, + </code></synopsis> + <p>This is a signal which has a broken signal handler, it says it's pointer but it's actually a string.</p> - - - <p>Since 1.0</p> - - + <p>Since 1.0</p> <terms> <item> <title><code>string</code></title> -<p>a string</p> + <p>a string</p> </item> <item> <title><code>Returns</code></title> @@ -36,6 +27,4 @@ it says it's pointer but it's actually a string.</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-tab-property.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-tab-property.page index 446729b7..d4914db9 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-tab-property.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-tab-property.page @@ -6,23 +6,11 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.AnnotationObject" group="property" type="guide"/> <title type="link" role="topic">tab-property</title> - </info> <title>Regress.AnnotationObject:tab-property</title> - - - - <p>This is a property annotation intentionally indented with a mix + <p>This is a property annotation intentionally indented with a mix of tabs and strings to test the tab handling capabilities of the scanner.</p> - - - <p>Since 1.2</p> - - - - - + <p>Since 1.2</p> </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.allow_none.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.allow_none.page index 1d553fd7..eb2f134c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.allow_none.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.allow_none.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.AnnotationObject" group="method" type="guide"/> <api:function> <api:returns> @@ -22,25 +21,18 @@ <api:name>somearg</api:name> </api:arg> </api:function> - </info> <title>regress_annotation_object_allow_none</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> GObject* regress_annotation_object_allow_none (RegressAnnotationObject* object, const gchar* somearg); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>object</code></title> -<p>a <link xref="GObject.Object"/></p> + <p>a <link xref="GObject.Object"/></p> </item> <item> <title><code>somearg</code></title> @@ -48,10 +40,8 @@ GObject* regress_annotation_object_allow_none (RegressAnnotationObject* object, </item> <item> <title><code>Returns</code></title> -<p><code>NULL</code> always</p> + <p><code>NULL</code> always</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.calleeowns.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.calleeowns.page index fc1758be..7cafa4df 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.calleeowns.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.calleeowns.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.AnnotationObject" group="method" type="guide"/> <api:function> <api:returns> @@ -22,36 +21,27 @@ <api:name>toown</api:name> </api:arg> </api:function> - </info> <title>regress_annotation_object_calleeowns</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> gint regress_annotation_object_calleeowns (RegressAnnotationObject* object, GObject** toown); -</code></synopsis> + </code></synopsis> + <p>This is a test for out arguments; GObject defaults to transfer</p> - - <p>This is a test for out arguments; GObject defaults to transfer</p> - - - - <terms> <item> <title><code>object</code></title> -<p>a <link xref="GObject.Object"/></p> + <p>a <link xref="GObject.Object"/></p> </item> <item> <title><code>toown</code></title> -<p>a <link xref="GObject.Object"/></p> + <p>a <link xref="GObject.Object"/></p> </item> <item> <title><code>Returns</code></title> -<p>an int</p> + <p>an int</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.calleesowns.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.calleesowns.page index f168030a..6e5fdcc3 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.calleesowns.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.calleesowns.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.AnnotationObject" group="method" type="guide"/> <api:function> <api:returns> @@ -26,41 +25,32 @@ <api:name>toown2</api:name> </api:arg> </api:function> - </info> <title>regress_annotation_object_calleesowns</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> gint regress_annotation_object_calleesowns (RegressAnnotationObject* object, GObject** toown1, GObject** toown2); -</code></synopsis> + </code></synopsis> + <p>This is a test for out arguments, one transferred, other not</p> - - <p>This is a test for out arguments, one transferred, other not</p> - - - - <terms> <item> <title><code>object</code></title> -<p>a <link xref="GObject.Object"/></p> + <p>a <link xref="GObject.Object"/></p> </item> <item> <title><code>toown1</code></title> -<p>a <link xref="GObject.Object"/></p> + <p>a <link xref="GObject.Object"/></p> </item> <item> <title><code>toown2</code></title> -<p>a <link xref="GObject.Object"/></p> + <p>a <link xref="GObject.Object"/></p> </item> <item> <title><code>Returns</code></title> -<p>an int</p> + <p>an int</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum.page index eaf00407..106fdb9b 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.AnnotationObject" group="method" type="guide"/> <api:function> <api:returns> @@ -22,29 +21,22 @@ <api:name>nums</api:name> </api:arg> </api:function> - </info> <title>regress_annotation_object_compute_sum</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_annotation_object_compute_sum (RegressAnnotationObject* object, int* nums); -</code></synopsis> + </code></synopsis> + <p>Test taking a zero-terminated array</p> - - <p>Test taking a zero-terminated array</p> - - - - <terms> <item> <title><code>object</code></title> -<p>a <link xref="GObject.Object"/></p> + <p>a <link xref="GObject.Object"/></p> </item> <item> <title><code>nums</code></title> -<p>Sequence of numbers</p> + <p>Sequence of numbers</p> </item> <item> <title><code>Returns</code></title> @@ -52,6 +44,4 @@ void regress_annotation_object_compute_sum (RegressAnnotationObject* object, </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum_n.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum_n.page index 91ebe4b6..cde8be69 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum_n.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum_n.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.AnnotationObject" group="method" type="guide"/> <api:function> <api:returns> @@ -26,35 +25,28 @@ <api:name>n_nums</api:name> </api:arg> </api:function> - </info> <title>regress_annotation_object_compute_sum_n</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_annotation_object_compute_sum_n (RegressAnnotationObject* object, int* nums, int n_nums); -</code></synopsis> + </code></synopsis> + <p>Test taking an array with length parameter</p> - - <p>Test taking an array with length parameter</p> - - - - <terms> <item> <title><code>object</code></title> -<p>a <link xref="GObject.Object"/></p> + <p>a <link xref="GObject.Object"/></p> </item> <item> <title><code>nums</code></title> -<p>Sequence of + <p>Sequence of numbers that are zero-terminated</p> </item> <item> <title><code>n_nums</code></title> -<p>Length of number array</p> + <p>Length of number array</p> </item> <item> <title><code>Returns</code></title> @@ -62,6 +54,4 @@ void regress_annotation_object_compute_sum_n (RegressAnnotationObject* object, </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum_nz.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum_nz.page index 7f5b0cf2..09be2a02 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum_nz.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum_nz.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.AnnotationObject" group="method" type="guide"/> <api:function> <api:returns> @@ -26,35 +25,28 @@ <api:name>n_nums</api:name> </api:arg> </api:function> - </info> <title>regress_annotation_object_compute_sum_nz</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_annotation_object_compute_sum_nz (RegressAnnotationObject* object, int* nums, int n_nums); -</code></synopsis> + </code></synopsis> + <p>Test taking a zero-terminated array with length parameter</p> - - <p>Test taking a zero-terminated array with length parameter</p> - - - - <terms> <item> <title><code>object</code></title> -<p>a <link xref="Regress.AnnotationObject"/></p> + <p>a <link xref="Regress.AnnotationObject"/></p> </item> <item> <title><code>nums</code></title> -<p>Sequence of numbers that + <p>Sequence of numbers that are zero-terminated</p> </item> <item> <title><code>n_nums</code></title> -<p>Length of number array</p> + <p>Length of number array</p> </item> <item> <title><code>Returns</code></title> @@ -62,6 +54,4 @@ are zero-terminated</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.create_object.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.create_object.page index 6ad744b9..d7e9b9e9 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.create_object.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.create_object.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.AnnotationObject" group="method" type="guide"/> <api:function> <api:returns> @@ -18,31 +17,22 @@ <api:name>object</api:name> </api:arg> </api:function> - </info> <title>regress_annotation_object_create_object</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> GObject* regress_annotation_object_create_object (RegressAnnotationObject* object); -</code></synopsis> + </code></synopsis> + <p>Test returning a caller-owned object</p> - - <p>Test returning a caller-owned object</p> - - - - <terms> <item> <title><code>object</code></title> -<p>a <link xref="GObject.Object"/></p> + <p>a <link xref="GObject.Object"/></p> </item> <item> <title><code>Returns</code></title> -<p>The object</p> + <p>The object</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.do_not_use.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.do_not_use.page index 4d651ca7..ca159039 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.do_not_use.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.do_not_use.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.AnnotationObject" group="method" type="guide"/> <api:function> <api:returns> @@ -18,31 +17,22 @@ <api:name>object</api:name> </api:arg> </api:function> - </info> <title>regress_annotation_object_do_not_use</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> GObject* regress_annotation_object_do_not_use (RegressAnnotationObject* object); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>object</code></title> -<p>a <link xref="GObject.Object"/></p> + <p>a <link xref="GObject.Object"/></p> </item> <item> <title><code>Returns</code></title> -<p><code>NULL</code> always</p> + <p><code>NULL</code> always</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.extra_annos.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.extra_annos.page index 809ebd2b..a21e3237 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.extra_annos.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.extra_annos.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.AnnotationObject" group="method" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>object</api:name> </api:arg> </api:function> - </info> <title>regress_annotation_object_extra_annos</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_annotation_object_extra_annos (RegressAnnotationObject* object); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>object</code></title> @@ -43,6 +35,4 @@ void regress_annotation_object_extra_annos (RegressAnnotationObject* object); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.foreach.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.foreach.page index f74ca97b..4dd79672 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.foreach.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.foreach.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.AnnotationObject" group="method" type="guide"/> <api:function> <api:returns> @@ -26,34 +25,27 @@ <api:name>user_data</api:name> </api:arg> </api:function> - </info> <title>regress_annotation_object_foreach</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_annotation_object_foreach (RegressAnnotationObject* object, RegressAnnotationForeachFunc func, gpointer user_data); -</code></synopsis> + </code></synopsis> + <p>Test taking a call-scoped callback</p> - - <p>Test taking a call-scoped callback</p> - - - - <terms> <item> <title><code>object</code></title> -<p>a <link xref="Regress.AnnotationObject"/></p> + <p>a <link xref="Regress.AnnotationObject"/></p> </item> <item> <title><code>func</code></title> -<p>Callback to invoke</p> + <p>Callback to invoke</p> </item> <item> <title><code>user_data</code></title> -<p>Callback user data</p> + <p>Callback user data</p> </item> <item> <title><code>Returns</code></title> @@ -61,6 +53,4 @@ void regress_annotation_object_foreach (RegressAnnotationObject* object, </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_hash.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_hash.page index 6cc123b3..fa9f22df 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_hash.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_hash.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.AnnotationObject" group="method" type="guide"/> <api:function> <api:returns> @@ -18,32 +17,23 @@ <api:name>object</api:name> </api:arg> </api:function> - </info> <title>regress_annotation_object_get_hash</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> GHashTable* regress_annotation_object_get_hash (RegressAnnotationObject* object); -</code></synopsis> - - - <p>This is a test for returning a hash table mapping strings to + </code></synopsis> + <p>This is a test for returning a hash table mapping strings to objects.</p> - - - - + <terms> <item> <title><code>object</code></title> -<p>a <link xref="GObject.Object"/></p> + <p>a <link xref="GObject.Object"/></p> </item> <item> <title><code>Returns</code></title> -<p>hash table</p> + <p>hash table</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_objects.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_objects.page index 3021ce53..628c8147 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_objects.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_objects.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.AnnotationObject" group="method" type="guide"/> <api:function> <api:returns> @@ -18,33 +17,24 @@ <api:name>object</api:name> </api:arg> </api:function> - </info> <title>regress_annotation_object_get_objects</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> GSList* regress_annotation_object_get_objects (RegressAnnotationObject* object); -</code></synopsis> - - - <p>This is a test for returning a list of objects. + </code></synopsis> + <p>This is a test for returning a list of objects. The list itself should be freed, but not the internal objects, intentionally similar example to gtk_container_get_children</p> - - - - + <terms> <item> <title><code>object</code></title> -<p>a <link xref="GObject.Object"/></p> + <p>a <link xref="GObject.Object"/></p> </item> <item> <title><code>Returns</code></title> -<p>list of objects</p> + <p>list of objects</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_strings.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_strings.page index 62087b04..c1911c90 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_strings.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_strings.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.AnnotationObject" group="method" type="guide"/> <api:function> <api:returns> @@ -18,32 +17,23 @@ <api:name>object</api:name> </api:arg> </api:function> - </info> <title>regress_annotation_object_get_strings</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> GList* regress_annotation_object_get_strings (RegressAnnotationObject* object); -</code></synopsis> - - - <p>This is a test for returning a list of strings, where + </code></synopsis> + <p>This is a test for returning a list of strings, where each string needs to be freed.</p> - - - - + <terms> <item> <title><code>object</code></title> -<p>a <link xref="GObject.Object"/></p> + <p>a <link xref="GObject.Object"/></p> </item> <item> <title><code>Returns</code></title> -<p>list of strings</p> + <p>list of strings</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.hidden_self.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.hidden_self.page index f1696c03..dae414e1 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.hidden_self.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.hidden_self.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.AnnotationObject" group="method" type="guide"/> <api:function> <api:returns> @@ -18,24 +17,17 @@ <api:name>object</api:name> </api:arg> </api:function> - </info> <title>regress_annotation_object_hidden_self</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_annotation_object_hidden_self (gpointer object); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>object</code></title> -<p>A <link xref="Regress.AnnotationObject"/></p> + <p>A <link xref="Regress.AnnotationObject"/></p> </item> <item> <title><code>Returns</code></title> @@ -43,6 +35,4 @@ void regress_annotation_object_hidden_self (gpointer object); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.in.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.in.page index ef1f430a..e871ff59 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.AnnotationObject" group="method" type="guide"/> <api:function> <api:returns> @@ -22,36 +21,27 @@ <api:name>inarg</api:name> </api:arg> </api:function> - </info> <title>regress_annotation_object_in</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> gint regress_annotation_object_in (RegressAnnotationObject* object, int* inarg); -</code></synopsis> + </code></synopsis> + <p>This is a test for in arguments</p> - - <p>This is a test for in arguments</p> - - - - <terms> <item> <title><code>object</code></title> -<p>a <link xref="GObject.Object"/></p> + <p>a <link xref="GObject.Object"/></p> </item> <item> <title><code>inarg</code></title> -<p>This is an argument test</p> + <p>This is an argument test</p> </item> <item> <title><code>Returns</code></title> -<p>an int</p> + <p>an int</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout.page index 0e958294..160aceaa 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.AnnotationObject" group="method" type="guide"/> <api:function> <api:returns> @@ -22,36 +21,27 @@ <api:name>inoutarg</api:name> </api:arg> </api:function> - </info> <title>regress_annotation_object_inout</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> gint regress_annotation_object_inout (RegressAnnotationObject* object, int* inoutarg); -</code></synopsis> + </code></synopsis> + <p>This is a test for out arguments</p> - - <p>This is a test for out arguments</p> - - - - <terms> <item> <title><code>object</code></title> -<p>a <link xref="GObject.Object"/></p> + <p>a <link xref="GObject.Object"/></p> </item> <item> <title><code>inoutarg</code></title> -<p>This is an argument test</p> + <p>This is an argument test</p> </item> <item> <title><code>Returns</code></title> -<p>an int</p> + <p>an int</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout2.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout2.page index cae38e56..3c48561c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout2.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout2.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.AnnotationObject" group="method" type="guide"/> <api:function> <api:returns> @@ -22,36 +21,27 @@ <api:name>inoutarg</api:name> </api:arg> </api:function> - </info> <title>regress_annotation_object_inout2</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> gint regress_annotation_object_inout2 (RegressAnnotationObject* object, int* inoutarg); -</code></synopsis> + </code></synopsis> + <p>This is a second test for out arguments</p> - - <p>This is a second test for out arguments</p> - - - - <terms> <item> <title><code>object</code></title> -<p>a <link xref="GObject.Object"/></p> + <p>a <link xref="GObject.Object"/></p> </item> <item> <title><code>inoutarg</code></title> -<p>This is an argument test</p> + <p>This is an argument test</p> </item> <item> <title><code>Returns</code></title> -<p>an int</p> + <p>an int</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout3.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout3.page index 8ca35f33..c0870f29 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout3.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout3.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.AnnotationObject" group="method" type="guide"/> <api:function> <api:returns> @@ -22,36 +21,27 @@ <api:name>inoutarg</api:name> </api:arg> </api:function> - </info> <title>regress_annotation_object_inout3</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> gint regress_annotation_object_inout3 (RegressAnnotationObject* object, int* inoutarg); -</code></synopsis> + </code></synopsis> + <p>This is a 3th test for out arguments</p> - - <p>This is a 3th test for out arguments</p> - - - - <terms> <item> <title><code>object</code></title> -<p>a <link xref="GObject.Object"/></p> + <p>a <link xref="GObject.Object"/></p> </item> <item> <title><code>inoutarg</code></title> -<p>This is an argument test</p> + <p>This is an argument test</p> </item> <item> <title><code>Returns</code></title> -<p>an int</p> + <p>an int</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.method.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.method.page index 8f0e1873..c137afd6 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.method.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.method.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.AnnotationObject" group="method" type="guide"/> <api:function> <api:returns> @@ -18,31 +17,22 @@ <api:name>object</api:name> </api:arg> </api:function> - </info> <title>regress_annotation_object_method</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> gint regress_annotation_object_method (RegressAnnotationObject* object); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>object</code></title> -<p>a <link xref="GObject.Object"/></p> + <p>a <link xref="GObject.Object"/></p> </item> <item> <title><code>Returns</code></title> -<p>an int</p> + <p>an int</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.notrans.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.notrans.page index de87deb0..a76fe813 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.notrans.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.notrans.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.AnnotationObject" group="method" type="guide"/> <api:function> <api:returns> @@ -18,31 +17,22 @@ <api:name>object</api:name> </api:arg> </api:function> - </info> <title>regress_annotation_object_notrans</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> GObject* regress_annotation_object_notrans (RegressAnnotationObject* object); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>object</code></title> -<p>a <link xref="GObject.Object"/></p> + <p>a <link xref="GObject.Object"/></p> </item> <item> <title><code>Returns</code></title> -<p>An object, not referenced</p> + <p>An object, not referenced</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.out.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.out.page index d244433f..169e040a 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.out.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.out.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.AnnotationObject" group="method" type="guide"/> <api:function> <api:returns> @@ -22,36 +21,27 @@ <api:name>outarg</api:name> </api:arg> </api:function> - </info> <title>regress_annotation_object_out</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> gint regress_annotation_object_out (RegressAnnotationObject* object, int* outarg); -</code></synopsis> + </code></synopsis> + <p>This is a test for out arguments</p> - - <p>This is a test for out arguments</p> - - - - <terms> <item> <title><code>object</code></title> -<p>a <link xref="GObject.Object"/></p> + <p>a <link xref="GObject.Object"/></p> </item> <item> <title><code>outarg</code></title> -<p>This is an argument test</p> + <p>This is an argument test</p> </item> <item> <title><code>Returns</code></title> -<p>an int</p> + <p>an int</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.page index 80d4339e..2851d7e5 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.page @@ -6,19 +6,11 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="class" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.AnnotationObject</title> - - - - <p>This is an object used to test annotations.</p> - - - - + <p>This is an object used to test annotations.</p> + <synopsis> <title>Hierarchy</title> <tree> @@ -30,8 +22,11 @@ </item> </tree> </synopsis> - - + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> <links type="topic" ui:expanded="true" api:type="function" api:mime="text/x-csrc" groups="method" style="linklist"> @@ -40,7 +35,7 @@ <links type="topic" ui:expanded="true" api:type="function" api:mime="text/x-csrc" groups="function" style="linklist"> - <title>Functions</title> + <title>Static Functions</title> </links> <links type="topic" ui:expanded="true" groups="property" style="linklist"> <title>Properties</title> @@ -51,8 +46,10 @@ <links type="topic" ui:expanded="true" groups="vfunc" style="linklist"> <title>Virtual functions</title> </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> <title>Other</title> </links> - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.parse_args.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.parse_args.page index 2fa9f09f..928e9802 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.parse_args.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.parse_args.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.AnnotationObject" group="method" type="guide"/> <api:function> <api:returns> @@ -26,34 +25,27 @@ <api:name>argv</api:name> </api:arg> </api:function> - </info> <title>regress_annotation_object_parse_args</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_annotation_object_parse_args (RegressAnnotationObject* object, int* argc, char*** argv); -</code></synopsis> + </code></synopsis> + <p>Test taking a zero-terminated array with length parameter</p> - - <p>Test taking a zero-terminated array with length parameter</p> - - - - <terms> <item> <title><code>object</code></title> -<p>a <link xref="Regress.AnnotationObject"/></p> + <p>a <link xref="Regress.AnnotationObject"/></p> </item> <item> <title><code>argc</code></title> -<p>Length of the argument vector</p> + <p>Length of the argument vector</p> </item> <item> <title><code>argv</code></title> -<p>Argument vector</p> + <p>Argument vector</p> </item> <item> <title><code>Returns</code></title> @@ -61,6 +53,4 @@ void regress_annotation_object_parse_args (RegressAnnotationObject* object, </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.set_data.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.set_data.page index a52c0ff0..dd49cf0c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.set_data.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.set_data.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.AnnotationObject" group="method" type="guide"/> <api:function> <api:returns> @@ -26,34 +25,27 @@ <api:name>length</api:name> </api:arg> </api:function> - </info> <title>regress_annotation_object_set_data</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_annotation_object_set_data (RegressAnnotationObject* object, guchar* data, gsize length); -</code></synopsis> + </code></synopsis> + <p>Test taking a guchar * with a length.</p> - - <p>Test taking a guchar * with a length.</p> - - - - <terms> <item> <title><code>object</code></title> -<p>a <link xref="Regress.AnnotationObject"/></p> + <p>a <link xref="Regress.AnnotationObject"/></p> </item> <item> <title><code>data</code></title> -<p>The data</p> + <p>The data</p> </item> <item> <title><code>length</code></title> -<p>Length of the data</p> + <p>Length of the data</p> </item> <item> <title><code>Returns</code></title> @@ -61,6 +53,4 @@ void regress_annotation_object_set_data (RegressAnnotationObject* object, </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.set_data2.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.set_data2.page index dd724207..345be7ff 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.set_data2.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.set_data2.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.AnnotationObject" group="method" type="guide"/> <api:function> <api:returns> @@ -26,34 +25,27 @@ <api:name>length</api:name> </api:arg> </api:function> - </info> <title>regress_annotation_object_set_data2</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_annotation_object_set_data2 (RegressAnnotationObject* object, gint8* data, gsize length); -</code></synopsis> + </code></synopsis> + <p>Test taking a gchar * with a length.</p> - - <p>Test taking a gchar * with a length.</p> - - - - <terms> <item> <title><code>object</code></title> -<p>a <link xref="Regress.AnnotationObject"/></p> + <p>a <link xref="Regress.AnnotationObject"/></p> </item> <item> <title><code>data</code></title> -<p>The data</p> + <p>The data</p> </item> <item> <title><code>length</code></title> -<p>Length of the data</p> + <p>Length of the data</p> </item> <item> <title><code>Returns</code></title> @@ -61,6 +53,4 @@ void regress_annotation_object_set_data2 (RegressAnnotationObject* object, </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.set_data3.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.set_data3.page index 86666ef6..ce904c6b 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.set_data3.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.set_data3.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.AnnotationObject" group="method" type="guide"/> <api:function> <api:returns> @@ -26,35 +25,28 @@ <api:name>length</api:name> </api:arg> </api:function> - </info> <title>regress_annotation_object_set_data3</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_annotation_object_set_data3 (RegressAnnotationObject* object, guint8* data, gsize length); -</code></synopsis> - - - <p>Test taking a gchar * with a length, overriding the array element + </code></synopsis> + <p>Test taking a gchar * with a length, overriding the array element type.</p> - - - - + <terms> <item> <title><code>object</code></title> -<p>a <link xref="Regress.AnnotationObject"/></p> + <p>a <link xref="Regress.AnnotationObject"/></p> </item> <item> <title><code>data</code></title> -<p>The data</p> + <p>The data</p> </item> <item> <title><code>length</code></title> -<p>Length of the data</p> + <p>Length of the data</p> </item> <item> <title><code>Returns</code></title> @@ -62,6 +54,4 @@ type.</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.string_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.string_out.page index a70d4771..6fec0d74 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.string_out.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.string_out.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.AnnotationObject" group="method" type="guide"/> <api:function> <api:returns> @@ -22,36 +21,27 @@ <api:name>str_out</api:name> </api:arg> </api:function> - </info> <title>regress_annotation_object_string_out</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> gboolean regress_annotation_object_string_out (RegressAnnotationObject* object, char** str_out); -</code></synopsis> + </code></synopsis> + <p>Test returning a string as an out parameter</p> - - <p>Test returning a string as an out parameter</p> - - - - <terms> <item> <title><code>object</code></title> -<p>a <link xref="Regress.AnnotationObject"/></p> + <p>a <link xref="Regress.AnnotationObject"/></p> </item> <item> <title><code>str_out</code></title> -<p>string return value</p> + <p>string return value</p> </item> <item> <title><code>Returns</code></title> -<p>some boolean</p> + <p>some boolean</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.use_buffer.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.use_buffer.page index 3228007b..a5385dc6 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.use_buffer.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.use_buffer.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.AnnotationObject" group="method" type="guide"/> <api:function> <api:returns> @@ -22,25 +21,18 @@ <api:name>bytes</api:name> </api:arg> </api:function> - </info> <title>regress_annotation_object_use_buffer</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_annotation_object_use_buffer (RegressAnnotationObject* object, guchar* bytes); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>object</code></title> -<p>a <link xref="GObject.Object"/></p> + <p>a <link xref="GObject.Object"/></p> </item> <item> <title><code>bytes</code></title> @@ -52,6 +44,4 @@ void regress_annotation_object_use_buffer (RegressAnnotationObject* object, </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.watch.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.watch.page index 76402aab..219a773d 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.watch.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.watch.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.AnnotationObject" group="method" type="guide"/> <api:function> <api:returns> @@ -26,35 +25,28 @@ <api:name>user_data</api:name> </api:arg> </api:function> - </info> <title>regress_annotation_object_watch</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_annotation_object_watch (RegressAnnotationObject* object, RegressAnnotationForeachFunc func, gpointer user_data); -</code></synopsis> - - - <p>This is here just for the sake of being overriden by its + </code></synopsis> + <p>This is here just for the sake of being overriden by its <link xref="Regress.watch_full"/>.</p> - - - - + <terms> <item> <title><code>object</code></title> -<p>A <link xref="Regress.AnnotationObject"/></p> + <p>A <link xref="Regress.AnnotationObject"/></p> </item> <item> <title><code>func</code></title> -<p>The callback</p> + <p>The callback</p> </item> <item> <title><code>user_data</code></title> -<p>The callback data</p> + <p>The callback data</p> </item> <item> <title><code>Returns</code></title> @@ -62,6 +54,4 @@ void regress_annotation_object_watch (RegressAnnotationObject* object, </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.watch_full.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.watch_full.page index 1fe2080c..5c2acdb9 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.watch_full.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.watch_full.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.AnnotationObject" group="method" type="guide"/> <api:function> <api:returns> @@ -30,39 +29,32 @@ <api:name>destroy</api:name> </api:arg> </api:function> - </info> <title>regress_annotation_object_watch_full</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_annotation_object_watch_full (RegressAnnotationObject* object, RegressAnnotationForeachFunc func, gpointer user_data, GDestroyNotify destroy); -</code></synopsis> + </code></synopsis> + <p>Test overriding via the "Rename To" annotation.</p> - - <p>Test overriding via the "Rename To" annotation.</p> - - - - <terms> <item> <title><code>object</code></title> -<p>A <link xref="Regress.AnnotationObject"/></p> + <p>A <link xref="Regress.AnnotationObject"/></p> </item> <item> <title><code>func</code></title> -<p>The callback</p> + <p>The callback</p> </item> <item> <title><code>user_data</code></title> -<p>The callback data</p> + <p>The callback data</p> </item> <item> <title><code>destroy</code></title> -<p>Destroy notification</p> + <p>Destroy notification</p> </item> <item> <title><code>Returns</code></title> @@ -70,6 +62,4 @@ void regress_annotation_object_watch_full (RegressAnnotationObject* object, </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.with_voidp.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.with_voidp.page index ef9436eb..5b21eadf 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.with_voidp.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.with_voidp.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.AnnotationObject" group="method" type="guide"/> <api:function> <api:returns> @@ -22,21 +21,14 @@ <api:name>data</api:name> </api:arg> </api:function> - </info> <title>regress_annotation_object_with_voidp</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_annotation_object_with_voidp (RegressAnnotationObject* object, void* data); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>object</code></title> @@ -44,7 +36,7 @@ void regress_annotation_object_with_voidp (RegressAnnotationObject* object, </item> <item> <title><code>data</code></title> -<p>Opaque pointer handle</p> + <p>Opaque pointer handle</p> </item> <item> <title><code>Returns</code></title> @@ -52,6 +44,4 @@ void regress_annotation_object_with_voidp (RegressAnnotationObject* object, </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObjectClass-parent_class.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObjectClass-parent_class.page new file mode 100644 index 00000000..2b521225 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObjectClass-parent_class.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.AnnotationObjectClass-parent_class" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.AnnotationObjectClass" group="field" type="guide"/> + </info> + <title>Regress.AnnotationObjectClass->parent_class</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObjectClass.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObjectClass.page index 28b8a71b..faa43dc6 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObjectClass.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObjectClass.page @@ -1,25 +1,35 @@ <?xml version="1.0"?> <page id="Regress.AnnotationObjectClass" - type="topic" - style="record" + type="guide" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="record" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.AnnotationObjectClass</title> - - - - - - - - - - - + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationStruct-objects.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationStruct-objects.page new file mode 100644 index 00000000..f1498fc4 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationStruct-objects.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.AnnotationStruct-objects" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.AnnotationStruct" group="field" type="guide"/> + </info> + <title>Regress.AnnotationStruct->objects</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationStruct.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationStruct.page index 341362a9..d3af4646 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationStruct.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationStruct.page @@ -1,25 +1,35 @@ <?xml version="1.0"?> <page id="Regress.AnnotationStruct" - type="topic" - style="record" + type="guide" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="record" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.AnnotationStruct</title> - - - - <p>This is a test of an array of object in an field of a struct.</p> - - - - - - - + <p>This is a test of an array of object in an field of a struct.</p> + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.BOOL_CONSTANT.page b/tests/scanner/Regress-1.0-C-expected/Regress.BOOL_CONSTANT.page new file mode 100644 index 00000000..e65594f6 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.BOOL_CONSTANT.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.BOOL_CONSTANT" + type="topic" + style="default" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="index" group="default" type="guide"/> + </info> + <title>Regress.BOOL_CONSTANT</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.DOUBLE_CONSTANT.page b/tests/scanner/Regress-1.0-C-expected/Regress.DOUBLE_CONSTANT.page new file mode 100644 index 00000000..bbc2a038 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.DOUBLE_CONSTANT.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.DOUBLE_CONSTANT" + type="topic" + style="default" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="index" group="default" type="guide"/> + </info> + <title>Regress.DOUBLE_CONSTANT</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FOO_DEFINE_SHOULD_BE_EXPOSED.page b/tests/scanner/Regress-1.0-C-expected/Regress.FOO_DEFINE_SHOULD_BE_EXPOSED.page new file mode 100644 index 00000000..09b1561c --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FOO_DEFINE_SHOULD_BE_EXPOSED.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.FOO_DEFINE_SHOULD_BE_EXPOSED" + type="topic" + style="default" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="index" group="default" type="guide"/> + </info> + <title>Regress.FOO_DEFINE_SHOULD_BE_EXPOSED</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FOO_PIE_IS_TASTY.page b/tests/scanner/Regress-1.0-C-expected/Regress.FOO_PIE_IS_TASTY.page new file mode 100644 index 00000000..132f5083 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FOO_PIE_IS_TASTY.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.FOO_PIE_IS_TASTY" + type="topic" + style="default" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="index" group="default" type="guide"/> + </info> + <title>Regress.FOO_PIE_IS_TASTY</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FOO_SUCCESS_INT.page b/tests/scanner/Regress-1.0-C-expected/Regress.FOO_SUCCESS_INT.page new file mode 100644 index 00000000..58650ec5 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FOO_SUCCESS_INT.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.FOO_SUCCESS_INT" + type="topic" + style="default" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="index" group="default" type="guide"/> + </info> + <title>Regress.FOO_SUCCESS_INT</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooASingle.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooASingle.page index 39ebf9cc..adc4f20e 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooASingle.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooASingle.page @@ -6,20 +6,9 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="enum" type="guide"/> - + <link xref="index" group="enum" type="guide"/> </info> <title>Regress.FooASingle</title> - - - - - - - - - - - + + </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooAddressType.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooAddressType.page index 717b5011..98056a53 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooAddressType.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooAddressType.page @@ -6,20 +6,9 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="enum" type="guide"/> - + <link xref="index" group="enum" type="guide"/> </info> <title>Regress.FooAddressType</title> - - - - - - - - - - - + + </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooBRect-x.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooBRect-x.page new file mode 100644 index 00000000..b444125d --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooBRect-x.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.FooBRect-x" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.FooBRect" group="field" type="guide"/> + </info> + <title>Regress.FooBRect->x</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooBRect-y.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooBRect-y.page new file mode 100644 index 00000000..8d7b0f12 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooBRect-y.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.FooBRect-y" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.FooBRect" group="field" type="guide"/> + </info> + <title>Regress.FooBRect->y</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooBRect.add.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooBRect.add.page index 38eae39b..854ef78a 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooBRect.add.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooBRect.add.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.FooBRect" group="method" type="guide"/> <api:function> <api:returns> @@ -22,21 +21,14 @@ <api:name>b2</api:name> </api:arg> </api:function> - </info> <title>regress_foo_brect_add</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_foo_brect_add (RegressFooBRect* b1, RegressFooBRect* b2); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>b1</code></title> @@ -52,6 +44,4 @@ void regress_foo_brect_add (RegressFooBRect* b1, </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooBRect.new.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooBRect.new.page index 3ca2281d..0a7caf08 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooBRect.new.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooBRect.new.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.FooBRect" group="constructor" type="guide"/> <api:function> <api:returns> @@ -22,21 +21,14 @@ <api:name>y</api:name> </api:arg> </api:function> - </info> <title>regress_foo_brect_new</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> RegressFooBRect* regress_foo_brect_new (double x, double y); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>x</code></title> @@ -52,6 +44,4 @@ RegressFooBRect* regress_foo_brect_new (double x, </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooBRect.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooBRect.page index abd6b039..2f6a48d1 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooBRect.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooBRect.page @@ -1,25 +1,35 @@ <?xml version="1.0"?> <page id="Regress.FooBRect" - type="topic" - style="record" + type="guide" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="record" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.FooBRect</title> - - - - - - - - - - - + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooBUnion-rect.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooBUnion-rect.page new file mode 100644 index 00000000..1c7ceadb --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooBUnion-rect.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.FooBUnion-rect" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.FooBUnion" group="field" type="guide"/> + </info> + <title>Regress.FooBUnion->rect</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooBUnion-type.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooBUnion-type.page new file mode 100644 index 00000000..6fdd4893 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooBUnion-type.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.FooBUnion-type" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.FooBUnion" group="field" type="guide"/> + </info> + <title>Regress.FooBUnion->type</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooBUnion-v.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooBUnion-v.page new file mode 100644 index 00000000..0a390625 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooBUnion-v.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.FooBUnion-v" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.FooBUnion" group="field" type="guide"/> + </info> + <title>Regress.FooBUnion->v</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooBUnion.get_contained_type.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooBUnion.get_contained_type.page index 1ee353fd..3ff48f75 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooBUnion.get_contained_type.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooBUnion.get_contained_type.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.FooBUnion" group="method" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>bunion</api:name> </api:arg> </api:function> - </info> <title>regress_foo_bunion_get_contained_type</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> int regress_foo_bunion_get_contained_type (RegressFooBUnion* bunion); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>bunion</code></title> @@ -43,6 +35,4 @@ int regress_foo_bunion_get_contained_type (RegressFooBUnion* bunion); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooBUnion.new.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooBUnion.new.page index b760f204..ca979f7d 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooBUnion.new.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooBUnion.new.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.FooBUnion" group="constructor" type="guide"/> <api:function> <api:returns> @@ -14,20 +13,13 @@ </api:returns> <api:name>regress_foo_bunion_new</api:name> </api:function> - </info> <title>regress_foo_bunion_new</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> RegressFooBUnion* regress_foo_bunion_new (void); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -35,6 +27,4 @@ RegressFooBUnion* regress_foo_bunion_new (void); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooBUnion.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooBUnion.page index 8644d96e..2398703e 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooBUnion.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooBUnion.page @@ -1,25 +1,35 @@ <?xml version="1.0"?> <page id="Regress.FooBUnion" - type="topic" - style="default" + type="guide" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="default" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.FooBUnion</title> - - - - - - - - - - - + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooBoxed.method.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooBoxed.method.page index 7483641f..b9999622 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooBoxed.method.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooBoxed.method.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.FooBoxed" group="method" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>boxed</api:name> </api:arg> </api:function> - </info> <title>regress_foo_boxed_method</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_foo_boxed_method (RegressFooBoxed* boxed); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>boxed</code></title> @@ -43,6 +35,4 @@ void regress_foo_boxed_method (RegressFooBoxed* boxed); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooBoxed.new.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooBoxed.new.page index 3e3e4f91..7a929636 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooBoxed.new.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooBoxed.new.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.FooBoxed" group="constructor" type="guide"/> <api:function> <api:returns> @@ -14,20 +13,13 @@ </api:returns> <api:name>regress_foo_boxed_new</api:name> </api:function> - </info> <title>regress_foo_boxed_new</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> RegressFooBoxed* regress_foo_boxed_new (void); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -35,6 +27,4 @@ RegressFooBoxed* regress_foo_boxed_new (void); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooBoxed.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooBoxed.page index e711c3ec..82b56c85 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooBoxed.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooBoxed.page @@ -1,25 +1,35 @@ <?xml version="1.0"?> <page id="Regress.FooBoxed" - type="topic" - style="record" + type="guide" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="record" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.FooBoxed</title> - - - - - - - - - - - + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooBuffer.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooBuffer.page index 267ddcba..4eb0b4db 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooBuffer.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooBuffer.page @@ -6,19 +6,11 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="class" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.FooBuffer</title> - - - - - - - - + + <synopsis> <title>Hierarchy</title> <tree> @@ -33,8 +25,11 @@ </item> </tree> </synopsis> - - + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> <links type="topic" ui:expanded="true" api:type="function" api:mime="text/x-csrc" groups="method" style="linklist"> @@ -43,7 +38,7 @@ <links type="topic" ui:expanded="true" api:type="function" api:mime="text/x-csrc" groups="function" style="linklist"> - <title>Functions</title> + <title>Static Functions</title> </links> <links type="topic" ui:expanded="true" groups="property" style="linklist"> <title>Properties</title> @@ -54,8 +49,10 @@ <links type="topic" ui:expanded="true" groups="vfunc" style="linklist"> <title>Virtual functions</title> </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> <title>Other</title> </links> - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooBuffer.some_method.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooBuffer.some_method.page index 6f6469d2..594c5641 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooBuffer.some_method.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooBuffer.some_method.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.FooBuffer" group="method" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>buffer</api:name> </api:arg> </api:function> - </info> <title>regress_foo_buffer_some_method</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_foo_buffer_some_method (RegressFooBuffer* buffer); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>buffer</code></title> @@ -43,6 +35,4 @@ void regress_foo_buffer_some_method (RegressFooBuffer* buffer); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooCallback.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooCallback.page index 52feda29..67ea9392 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooCallback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooCallback.page @@ -1,25 +1,38 @@ <?xml version="1.0"?> <page id="Regress.FooCallback" type="topic" - style="default" + style="callback" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="default" type="guide"/> - - </info> + <link xref="index" group="callback" type="guide"/> + </info> <title>Regress.FooCallback</title> - - - - - - - - - - - + <synopsis><code mime="text/x-csrc"> +gboolean FooCallback (RegressFooObject* regress_foo, + gboolean b, + gpointer data); + </code></synopsis> + + +<terms> +<item> +<title><code>regress_foo</code></title> + +</item> +<item> +<title><code>b</code></title> + +</item> +<item> +<title><code>data</code></title> + +</item> +<item> +<title><code>Returns</code></title> + +</item> +</terms> + </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooDBusData.method.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooDBusData.method.page index 8694337d..3335ed5a 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooDBusData.method.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooDBusData.method.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.FooDBusData" group="method" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>dbusdata</api:name> </api:arg> </api:function> - </info> <title>regress_foo_dbus_data_method</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_foo_dbus_data_method (RegressFooDBusData* dbusdata); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>dbusdata</code></title> @@ -43,6 +35,4 @@ void regress_foo_dbus_data_method (RegressFooDBusData* dbusdata); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooDBusData.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooDBusData.page index 09050e7d..8c8016ae 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooDBusData.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooDBusData.page @@ -1,25 +1,35 @@ <?xml version="1.0"?> <page id="Regress.FooDBusData" - type="topic" - style="record" + type="guide" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="record" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.FooDBusData</title> - - - - - - - - - - - + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooEnumFullname.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooEnumFullname.page index 80f6c3b1..0427ba6d 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooEnumFullname.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooEnumFullname.page @@ -6,20 +6,9 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="enum" type="guide"/> - + <link xref="index" group="enum" type="guide"/> </info> <title>Regress.FooEnumFullname</title> - - - - - - - - - - - + + </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooEnumNoType.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooEnumNoType.page index b3c71a6f..803a5e72 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooEnumNoType.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooEnumNoType.page @@ -6,20 +6,9 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="enum" type="guide"/> - + <link xref="index" group="enum" type="guide"/> </info> <title>Regress.FooEnumNoType</title> - - - - - - - - - - - + + </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooEnumType.method.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooEnumType.method.page index 6ecf2dd9..bcf81f2f 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooEnumType.method.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooEnumType.method.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>regress_foo_enum</api:name> </api:arg> </api:function> - </info> <title>regress_foo_enum_type_method</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> int regress_foo_enum_type_method (RegressFooEnumType regress_foo_enum); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>regress_foo_enum</code></title> @@ -43,6 +35,4 @@ int regress_foo_enum_type_method (RegressFooEnumType regress_foo_enum); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooEnumType.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooEnumType.page index 6dd3491a..52aaf309 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooEnumType.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooEnumType.page @@ -6,20 +6,9 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="enum" type="guide"/> - + <link xref="index" group="enum" type="guide"/> </info> <title>Regress.FooEnumType</title> - - - - - - - - - - - + + </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooEnumType.returnv.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooEnumType.returnv.page index aa0c6c1b..85335dac 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooEnumType.returnv.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooEnumType.returnv.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>x</api:name> </api:arg> </api:function> - </info> <title>regress_foo_enum_type_returnv</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> RegressFooEnumType regress_foo_enum_type_returnv (int x); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>x</code></title> @@ -43,6 +35,4 @@ RegressFooEnumType regress_foo_enum_type_returnv (int x); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooError.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooError.page index 79bb9d29..6848fb21 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooError.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooError.page @@ -6,20 +6,9 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="enum" type="guide"/> - + <link xref="index" group="enum" type="guide"/> </info> <title>Regress.FooError</title> - - - - - - - - - - - + + </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooError.quark.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooError.quark.page index dde46fb0..aa715354 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooError.quark.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooError.quark.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,20 +13,13 @@ </api:returns> <api:name>regress_foo_error_quark</api:name> </api:function> - </info> <title>regress_foo_error_quark</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> GQuark regress_foo_error_quark (void); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -35,6 +27,4 @@ GQuark regress_foo_error_quark (void); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooEvent-any.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooEvent-any.page new file mode 100644 index 00000000..aab09bda --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooEvent-any.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.FooEvent-any" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.FooEvent" group="field" type="guide"/> + </info> + <title>Regress.FooEvent->any</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooEvent-expose.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooEvent-expose.page new file mode 100644 index 00000000..58dc6746 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooEvent-expose.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.FooEvent-expose" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.FooEvent" group="field" type="guide"/> + </info> + <title>Regress.FooEvent->expose</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooEvent-type.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooEvent-type.page new file mode 100644 index 00000000..d9ea3325 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooEvent-type.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.FooEvent-type" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.FooEvent" group="field" type="guide"/> + </info> + <title>Regress.FooEvent->type</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooEvent.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooEvent.page index ce368302..98f2344a 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooEvent.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooEvent.page @@ -1,25 +1,35 @@ <?xml version="1.0"?> <page id="Regress.FooEvent" - type="topic" - style="default" + type="guide" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="default" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.FooEvent</title> - - - - - - - - - - - + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooEventAny-send_event.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooEventAny-send_event.page new file mode 100644 index 00000000..045be537 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooEventAny-send_event.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.FooEventAny-send_event" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.FooEventAny" group="field" type="guide"/> + </info> + <title>Regress.FooEventAny->send_event</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooEventAny.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooEventAny.page index 0e3a5555..d98a36d7 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooEventAny.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooEventAny.page @@ -1,25 +1,35 @@ <?xml version="1.0"?> <page id="Regress.FooEventAny" - type="topic" - style="record" + type="guide" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="record" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.FooEventAny</title> - - - - - - - - - - - + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooEventExpose-count.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooEventExpose-count.page new file mode 100644 index 00000000..f9e410ca --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooEventExpose-count.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.FooEventExpose-count" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.FooEventExpose" group="field" type="guide"/> + </info> + <title>Regress.FooEventExpose->count</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooEventExpose-send_event.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooEventExpose-send_event.page new file mode 100644 index 00000000..d06c23ae --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooEventExpose-send_event.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.FooEventExpose-send_event" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.FooEventExpose" group="field" type="guide"/> + </info> + <title>Regress.FooEventExpose->send_event</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooEventExpose.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooEventExpose.page index 27c4c4a7..e538b2be 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooEventExpose.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooEventExpose.page @@ -1,25 +1,35 @@ <?xml version="1.0"?> <page id="Regress.FooEventExpose" - type="topic" - style="record" + type="guide" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="record" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.FooEventExpose</title> - - - - - - - - - - - + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooFlagsNoType.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooFlagsNoType.page index 53539d49..930b6d0c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooFlagsNoType.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooFlagsNoType.page @@ -6,20 +6,9 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="default" type="guide"/> - + <link xref="index" group="default" type="guide"/> </info> <title>Regress.FooFlagsNoType</title> - - - - - - - - - - - + + </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooFlagsType.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooFlagsType.page index 2b4afeb5..96e97592 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooFlagsType.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooFlagsType.page @@ -6,20 +6,9 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="default" type="guide"/> - + <link xref="index" group="default" type="guide"/> </info> <title>Regress.FooFlagsType</title> - - - - - - - - - - - + + </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooForeignStruct-regress_foo.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooForeignStruct-regress_foo.page new file mode 100644 index 00000000..07c098ce --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooForeignStruct-regress_foo.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.FooForeignStruct-regress_foo" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.FooForeignStruct" group="field" type="guide"/> + </info> + <title>Regress.FooForeignStruct->regress_foo</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooForeignStruct.copy.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooForeignStruct.copy.page index 217a983b..582e019b 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooForeignStruct.copy.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooForeignStruct.copy.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.FooForeignStruct" group="method" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>original</api:name> </api:arg> </api:function> - </info> <title>regress_foo_foreign_struct_copy</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> RegressFooForeignStruct* regress_foo_foreign_struct_copy (RegressFooForeignStruct* original); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>original</code></title> @@ -43,6 +35,4 @@ RegressFooForeignStruct* regress_foo_foreign_struct_copy (RegressFooForeignStruc </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooForeignStruct.new.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooForeignStruct.new.page index 7314c1d3..5bb3d933 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooForeignStruct.new.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooForeignStruct.new.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.FooForeignStruct" group="constructor" type="guide"/> <api:function> <api:returns> @@ -14,20 +13,13 @@ </api:returns> <api:name>regress_foo_foreign_struct_new</api:name> </api:function> - </info> <title>regress_foo_foreign_struct_new</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> RegressFooForeignStruct* regress_foo_foreign_struct_new (void); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -35,6 +27,4 @@ RegressFooForeignStruct* regress_foo_foreign_struct_new (void); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooForeignStruct.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooForeignStruct.page index ee3e5e72..357ca22d 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooForeignStruct.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooForeignStruct.page @@ -1,25 +1,35 @@ <?xml version="1.0"?> <page id="Regress.FooForeignStruct" - type="topic" - style="record" + type="guide" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="record" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.FooForeignStruct</title> - - - - - - - - - - - + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface-do_regress_foo.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface-do_regress_foo.page index b3faca67..61f16817 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface-do_regress_foo.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface-do_regress_foo.page @@ -6,23 +6,15 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.FooInterface" group="vfunc" type="guide"/> - </info> <title>Regress.FooInterface::do_regress_foo</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void do_regress_foo (RegressFooInterface* self, int x); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>self</code></title> @@ -38,6 +30,4 @@ void do_regress_foo (RegressFooInterface* self, </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface.do_regress_foo.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface.do_regress_foo.page index 7c44fd47..ef3ca53b 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface.do_regress_foo.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface.do_regress_foo.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.FooInterface" group="method" type="guide"/> <api:function> <api:returns> @@ -22,21 +21,14 @@ <api:name>x</api:name> </api:arg> </api:function> - </info> <title>regress_foo_interface_do_regress_foo</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_foo_interface_do_regress_foo (RegressFooInterface* iface, int x); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>iface</code></title> @@ -52,6 +44,4 @@ void regress_foo_interface_do_regress_foo (RegressFooInterface* iface, </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface.page index 7ec29fee..266aac91 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface.page @@ -1,34 +1,29 @@ <?xml version="1.0"?> <page id="Regress.FooInterface" type="guide" - style="class" + style="interface" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="class" type="guide"/> - + <link xref="index" group="interface" type="guide"/> </info> <title>Regress.FooInterface</title> - - - - - - - - + + <synopsis> - <title>Hierarchy</title> - <tree> - <item> - <code>Regress.FooInterface</code> - </item> - </tree> + <title>Prerequisites</title> + <p>FooInterface requires GObject.Object</p> + </synopsis> + <synopsis> + <title>Known Implementations</title> + <p>FooInterface is implemented by FooBuffer, FooObject and FooSubobject</p> </synopsis> - - + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> <links type="topic" ui:expanded="true" api:type="function" api:mime="text/x-csrc" groups="method" style="linklist"> @@ -37,7 +32,7 @@ <links type="topic" ui:expanded="true" api:type="function" api:mime="text/x-csrc" groups="function" style="linklist"> - <title>Functions</title> + <title>Static Functions</title> </links> <links type="topic" ui:expanded="true" groups="property" style="linklist"> <title>Properties</title> @@ -48,8 +43,10 @@ <links type="topic" ui:expanded="true" groups="vfunc" style="linklist"> <title>Virtual functions</title> </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> <title>Other</title> </links> - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface.static_method.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface.static_method.page index a3ad69af..b6fc598b 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface.static_method.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface.static_method.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.FooInterface" group="function" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>x</api:name> </api:arg> </api:function> - </info> <title>regress_foo_interface_static_method</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_foo_interface_static_method (int x); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>x</code></title> @@ -43,6 +35,4 @@ void regress_foo_interface_static_method (int x); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooInterfaceIface-do_regress_foo.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooInterfaceIface-do_regress_foo.page new file mode 100644 index 00000000..e105b4ea --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooInterfaceIface-do_regress_foo.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.FooInterfaceIface-do_regress_foo" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.FooInterfaceIface" group="field" type="guide"/> + </info> + <title>Regress.FooInterfaceIface->do_regress_foo</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooInterfaceIface-parent_iface.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooInterfaceIface-parent_iface.page new file mode 100644 index 00000000..e7a7e3e8 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooInterfaceIface-parent_iface.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.FooInterfaceIface-parent_iface" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.FooInterfaceIface" group="field" type="guide"/> + </info> + <title>Regress.FooInterfaceIface->parent_iface</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooInterfaceIface.do_regress_foo.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooInterfaceIface.do_regress_foo.page index 0b900420..3c8b8813 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooInterfaceIface.do_regress_foo.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooInterfaceIface.do_regress_foo.page @@ -1,25 +1,33 @@ <?xml version="1.0"?> <page id="Regress.FooInterfaceIface.do_regress_foo" type="topic" - style="default" + style="callback" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="default" type="guide"/> - - </info> + <link xref="index" group="callback" type="guide"/> + </info> <title>Regress.FooInterfaceIface.do_regress_foo</title> - - - - - - - - - - - + <synopsis><code mime="text/x-csrc"> +void do_regress_foo (RegressFooInterface* self, + int x); + </code></synopsis> + + +<terms> +<item> +<title><code>self</code></title> + +</item> +<item> +<title><code>x</code></title> + +</item> +<item> +<title><code>Returns</code></title> + +</item> +</terms> + </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooInterfaceIface.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooInterfaceIface.page index 53b09b41..26a98b5c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooInterfaceIface.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooInterfaceIface.page @@ -1,25 +1,35 @@ <?xml version="1.0"?> <page id="Regress.FooInterfaceIface" - type="topic" - style="record" + type="guide" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="record" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.FooInterfaceIface</title> - - - - - - - - - - - + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-hidden.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-hidden.page index ccfbcfa6..f34361e8 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-hidden.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-hidden.page @@ -6,21 +6,10 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.FooObject" group="property" type="guide"/> <title type="link" role="topic">hidden</title> - </info> <title>Regress.FooObject:hidden</title> - - - - - - - - - - - + + </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-parent_instance.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-parent_instance.page new file mode 100644 index 00000000..d9cf9b87 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-parent_instance.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.FooObject-parent_instance" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.FooObject" group="field" type="guide"/> + </info> + <title>Regress.FooObject->parent_instance</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-read_fn.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-read_fn.page index f99f3c0d..e390f395 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-read_fn.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-read_fn.page @@ -6,36 +6,28 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.FooObject" group="vfunc" type="guide"/> - </info> <title>Regress.FooObject::read_fn</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void read_fn (RegressFooObject* object, int offset, int length); -</code></synopsis> + </code></synopsis> + <p>Read some stuff.</p> - - <p>Read some stuff.</p> - - - - <terms> <item> <title><code>object</code></title> -<p>obj</p> + <p>obj</p> </item> <item> <title><code>offset</code></title> -<p>offset</p> + <p>offset</p> </item> <item> <title><code>length</code></title> -<p>length</p> + <p>length</p> </item> <item> <title><code>Returns</code></title> @@ -43,6 +35,4 @@ void read_fn (RegressFooObject* object, </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-signal.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-signal.page index 3a8c1315..d718206b 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-signal.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-signal.page @@ -6,24 +6,16 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.FooObject" group="signal" type="guide"/> <title type="link" role="topic">signal</title> - </info> <title>Regress.FooObject::signal</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> gchar* signal (GObject object, gpointer p0); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>object</code></title> @@ -39,6 +31,4 @@ gchar* signal (GObject object, </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-some_int.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-some_int.page new file mode 100644 index 00000000..b45dca82 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-some_int.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.FooObject-some_int" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.FooObject" group="field" type="guide"/> + </info> + <title>Regress.FooObject->some_int</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-string.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-string.page index b0ed3c72..49bf07c8 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-string.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-string.page @@ -6,21 +6,10 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.FooObject" group="property" type="guide"/> <title type="link" role="topic">string</title> - </info> <title>Regress.FooObject:string</title> - - - - - - - - - - - + + </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-virtual_method.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-virtual_method.page index 3e3f04ef..133178db 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-virtual_method.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-virtual_method.page @@ -6,23 +6,15 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.FooObject" group="vfunc" type="guide"/> - </info> <title>Regress.FooObject::virtual_method</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> gboolean virtual_method (RegressFooObject* object, int first_param); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>object</code></title> @@ -38,6 +30,4 @@ gboolean virtual_method (RegressFooObject* object, </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.a_global_method.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.a_global_method.page index 801f59ac..b9f46af3 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.a_global_method.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.a_global_method.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.FooObject" group="function" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>obj</api:name> </api:arg> </api:function> - </info> <title>regress_foo_object_a_global_method</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_foo_object_a_global_method (UtilityObject* obj); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>obj</code></title> @@ -43,6 +35,4 @@ void regress_foo_object_a_global_method (UtilityObject* obj); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.append_new_stack_layer.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.append_new_stack_layer.page index 82bbc269..99efa0f9 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.append_new_stack_layer.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.append_new_stack_layer.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.FooObject" group="method" type="guide"/> <api:function> <api:returns> @@ -22,21 +21,14 @@ <api:name>x</api:name> </api:arg> </api:function> - </info> <title>regress_foo_object_append_new_stack_layer</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> RegressFooOtherObject* regress_foo_object_append_new_stack_layer (RegressFooObject* obj, int x); -</code></synopsis> + </code></synopsis> + <p>This shouldn't be scanned as a constructor.</p> - - <p>This shouldn't be scanned as a constructor.</p> - - - - <terms> <item> <title><code>obj</code></title> @@ -52,6 +44,4 @@ RegressFooOtherObject* regress_foo_object_append_new_stack_layer (RegressFooObje </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.dup_name.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.dup_name.page index 6419ed73..e279ca8c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.dup_name.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.dup_name.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.FooObject" group="method" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>object</api:name> </api:arg> </api:function> - </info> <title>regress_foo_object_dup_name</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> char* regress_foo_object_dup_name (RegressFooObject* object); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>object</code></title> @@ -43,6 +35,4 @@ char* regress_foo_object_dup_name (RegressFooObject* object); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.external_type.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.external_type.page index 77c8dc8f..b3f3a8e5 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.external_type.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.external_type.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.FooObject" group="method" type="guide"/> <api:function> <api:returns> @@ -18,31 +17,22 @@ <api:name>object</api:name> </api:arg> </api:function> - </info> <title>regress_foo_object_external_type</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> UtilityObject* regress_foo_object_external_type (RegressFooObject* object); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>object</code></title> -<p>a <link xref="Regress.FooObject"/></p> + <p>a <link xref="Regress.FooObject"/></p> </item> <item> <title><code>Returns</code></title> -<p><code>NULL</code> always</p> + <p><code>NULL</code> always</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.get_default.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.get_default.page index 04c38a20..7e7a8094 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.get_default.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.get_default.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.FooObject" group="function" type="guide"/> <api:function> <api:returns> @@ -14,28 +13,19 @@ </api:returns> <api:name>regress_foo_object_get_default</api:name> </api:function> - </info> <title>regress_foo_object_get_default</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> RegressFooObject* regress_foo_object_get_default (void); -</code></synopsis> - - - <p>This function is intended to match clutter_stage_get_default which + </code></synopsis> + <p>This function is intended to match clutter_stage_get_default which uses a C sugar return type.</p> - - - - + <terms> <item> <title><code>Returns</code></title> -<p>The global <link xref="Regress.FooSubobject"/></p> + <p>The global <link xref="Regress.FooSubobject"/></p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.get_name.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.get_name.page index 68b305bf..e5b9827f 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.get_name.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.get_name.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.FooObject" group="method" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>object</api:name> </api:arg> </api:function> - </info> <title>regress_foo_object_get_name</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> const char* regress_foo_object_get_name (RegressFooObject* object); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>object</code></title> @@ -43,6 +35,4 @@ const char* regress_foo_object_get_name (RegressFooObject* object); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.handle_glyph.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.handle_glyph.page index 0cb58ae3..0bfa3385 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.handle_glyph.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.handle_glyph.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.FooObject" group="method" type="guide"/> <api:function> <api:returns> @@ -22,21 +21,14 @@ <api:name>glyph</api:name> </api:arg> </api:function> - </info> <title>regress_foo_object_handle_glyph</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_foo_object_handle_glyph (RegressFooObject* object, UtilityGlyph glyph); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>object</code></title> @@ -52,6 +44,4 @@ void regress_foo_object_handle_glyph (RegressFooObject* object, </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.is_it_time_yet.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.is_it_time_yet.page index f643665a..fa62ffd1 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.is_it_time_yet.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.is_it_time_yet.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.FooObject" group="method" type="guide"/> <api:function> <api:returns> @@ -22,21 +21,14 @@ <api:name>time</api:name> </api:arg> </api:function> - </info> <title>regress_foo_object_is_it_time_yet</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_foo_object_is_it_time_yet (RegressFooObject* object, time_t time); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>object</code></title> @@ -52,6 +44,4 @@ void regress_foo_object_is_it_time_yet (RegressFooObject* object, </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.new.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.new.page index 75b0e074..e5b6329d 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.new.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.new.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.FooObject" group="constructor" type="guide"/> <api:function> <api:returns> @@ -14,20 +13,13 @@ </api:returns> <api:name>regress_foo_object_new</api:name> </api:function> - </info> <title>regress_foo_object_new</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> RegressFooObject* regress_foo_object_new (void); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -35,6 +27,4 @@ RegressFooObject* regress_foo_object_new (void); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.new_as_super.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.new_as_super.page index 069a4213..e733fb81 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.new_as_super.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.new_as_super.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.FooObject" group="constructor" type="guide"/> <api:function> <api:returns> @@ -14,20 +13,13 @@ </api:returns> <api:name>regress_foo_object_new_as_super</api:name> </api:function> - </info> <title>regress_foo_object_new_as_super</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> GObject* regress_foo_object_new_as_super (void); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -35,6 +27,4 @@ GObject* regress_foo_object_new_as_super (void); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.new_cookie.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.new_cookie.page index 312e93c6..364ad357 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.new_cookie.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.new_cookie.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.FooObject" group="method" type="guide"/> <api:function> <api:returns> @@ -22,21 +21,14 @@ <api:name>target</api:name> </api:arg> </api:function> - </info> <title>regress_foo_object_new_cookie</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> RegressFooObjectCookie regress_foo_object_new_cookie (RegressFooObject* object, const char* target); -</code></synopsis> + </code></synopsis> + <p>Not sure why this test is here...</p> - - <p>Not sure why this test is here...</p> - - - - <terms> <item> <title><code>object</code></title> @@ -52,6 +44,4 @@ RegressFooObjectCookie regress_foo_object_new_cookie (RegressFooObject* object, </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.page index fff026c7..0fae891c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.page @@ -6,19 +6,11 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="class" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.FooObject</title> - - - - - - - - + + <synopsis> <title>Hierarchy</title> <tree> @@ -30,8 +22,11 @@ </item> </tree> </synopsis> - - + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> <links type="topic" ui:expanded="true" api:type="function" api:mime="text/x-csrc" groups="method" style="linklist"> @@ -40,7 +35,7 @@ <links type="topic" ui:expanded="true" api:type="function" api:mime="text/x-csrc" groups="function" style="linklist"> - <title>Functions</title> + <title>Static Functions</title> </links> <links type="topic" ui:expanded="true" groups="property" style="linklist"> <title>Properties</title> @@ -51,8 +46,10 @@ <links type="topic" ui:expanded="true" groups="vfunc" style="linklist"> <title>Virtual functions</title> </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> <title>Other</title> </links> - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.read.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.read.page index d6415021..6336041d 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.read.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.read.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.FooObject" group="method" type="guide"/> <api:function> <api:returns> @@ -26,34 +25,27 @@ <api:name>length</api:name> </api:arg> </api:function> - </info> <title>regress_foo_object_read</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_foo_object_read (RegressFooObject* object, int offset, int length); -</code></synopsis> + </code></synopsis> + <p>Read some stuff.</p> - - <p>Read some stuff.</p> - - - - <terms> <item> <title><code>object</code></title> -<p>obj</p> + <p>obj</p> </item> <item> <title><code>offset</code></title> -<p>offset</p> + <p>offset</p> </item> <item> <title><code>length</code></title> -<p>length</p> + <p>length</p> </item> <item> <title><code>Returns</code></title> @@ -61,6 +53,4 @@ void regress_foo_object_read (RegressFooObject* object, </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.skipped_method.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.skipped_method.page index aea1afdc..413631f9 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.skipped_method.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.skipped_method.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.FooObject" group="method" type="guide"/> <api:function> <api:returns> @@ -18,24 +17,17 @@ <api:name>object</api:name> </api:arg> </api:function> - </info> <title>regress_foo_object_skipped_method</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_foo_object_skipped_method (RegressFooObject* object); -</code></synopsis> + </code></synopsis> + <p>This is only useful from C.</p> - - <p>This is only useful from C.</p> - - - - <terms> <item> <title><code>object</code></title> -<p>obj</p> + <p>obj</p> </item> <item> <title><code>Returns</code></title> @@ -43,6 +35,4 @@ void regress_foo_object_skipped_method (RegressFooObject* object); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.static_meth.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.static_meth.page index 9b157bb0..bdd23ba5 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.static_meth.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.static_meth.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.FooObject" group="function" type="guide"/> <api:function> <api:returns> @@ -14,20 +13,13 @@ </api:returns> <api:name>regress_foo_object_static_meth</api:name> </api:function> - </info> <title>regress_foo_object_static_meth</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> int regress_foo_object_static_meth (void); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -35,6 +27,4 @@ int regress_foo_object_static_meth (void); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.take_all.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.take_all.page index 92d75431..b8f88f8f 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.take_all.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.take_all.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.FooObject" group="method" type="guide"/> <api:function> <api:returns> @@ -23,22 +22,15 @@ </api:arg> <api:varargs/> </api:function> - </info> <title>regress_foo_object_take_all</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_foo_object_take_all (RegressFooObject* object, int x, ...); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>object</code></title> @@ -58,6 +50,4 @@ void regress_foo_object_take_all (RegressFooObject* object, </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.various.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.various.page index eea3c15c..dc00f08b 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.various.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.various.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.FooObject" group="method" type="guide"/> <api:function> <api:returns> @@ -26,22 +25,15 @@ <api:name>some_type</api:name> </api:arg> </api:function> - </info> <title>regress_foo_object_various</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_foo_object_various (RegressFooObject* object, void* data, GType some_type); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>object</code></title> @@ -61,6 +53,4 @@ void regress_foo_object_various (RegressFooObject* object, </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.virtual_method.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.virtual_method.page index 3f04cb4a..2d4e41cf 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.virtual_method.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.virtual_method.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.FooObject" group="method" type="guide"/> <api:function> <api:returns> @@ -22,21 +21,14 @@ <api:name>first_param</api:name> </api:arg> </api:function> - </info> <title>regress_foo_object_virtual_method</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> gboolean regress_foo_object_virtual_method (RegressFooObject* object, int first_param); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>object</code></title> @@ -52,6 +44,4 @@ gboolean regress_foo_object_virtual_method (RegressFooObject* object, </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass-_reserved.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass-_reserved.page new file mode 100644 index 00000000..34d688e0 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass-_reserved.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.FooObjectClass-_reserved" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.FooObjectClass" group="field" type="guide"/> + </info> + <title>Regress.FooObjectClass->_reserved</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass-parent_class.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass-parent_class.page new file mode 100644 index 00000000..03388494 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass-parent_class.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.FooObjectClass-parent_class" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.FooObjectClass" group="field" type="guide"/> + </info> + <title>Regress.FooObjectClass->parent_class</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass-read_fn.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass-read_fn.page new file mode 100644 index 00000000..52ff58a4 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass-read_fn.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.FooObjectClass-read_fn" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.FooObjectClass" group="field" type="guide"/> + </info> + <title>Regress.FooObjectClass->read_fn</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass-virtual_method.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass-virtual_method.page new file mode 100644 index 00000000..6edab473 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass-virtual_method.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.FooObjectClass-virtual_method" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.FooObjectClass" group="field" type="guide"/> + </info> + <title>Regress.FooObjectClass->virtual_method</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass.page index 9d528385..ea57e84e 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass.page @@ -1,25 +1,35 @@ <?xml version="1.0"?> <page id="Regress.FooObjectClass" - type="topic" - style="record" + type="guide" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="record" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.FooObjectClass</title> - - - - - - - - - - - + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass.read_fn.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass.read_fn.page index 39078bfc..05f3ffc7 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass.read_fn.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass.read_fn.page @@ -1,25 +1,38 @@ <?xml version="1.0"?> <page id="Regress.FooObjectClass.read_fn" type="topic" - style="default" + style="callback" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="default" type="guide"/> - - </info> + <link xref="index" group="callback" type="guide"/> + </info> <title>Regress.FooObjectClass.read_fn</title> - - - - - - - - - - - + <synopsis><code mime="text/x-csrc"> +void read_fn (RegressFooObject* object, + int offset, + int length); + </code></synopsis> + + +<terms> +<item> +<title><code>object</code></title> + <p>obj</p> +</item> +<item> +<title><code>offset</code></title> + <p>offset</p> +</item> +<item> +<title><code>length</code></title> + <p>length</p> +</item> +<item> +<title><code>Returns</code></title> + +</item> +</terms> + </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass.virtual_method.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass.virtual_method.page index 2882c6d7..9c05faab 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass.virtual_method.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass.virtual_method.page @@ -1,25 +1,33 @@ <?xml version="1.0"?> <page id="Regress.FooObjectClass.virtual_method" type="topic" - style="default" + style="callback" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="default" type="guide"/> - - </info> + <link xref="index" group="callback" type="guide"/> + </info> <title>Regress.FooObjectClass.virtual_method</title> - - - - - - - - - - - + <synopsis><code mime="text/x-csrc"> +gboolean virtual_method (RegressFooObject* object, + int first_param); + </code></synopsis> + + +<terms> +<item> +<title><code>object</code></title> + +</item> +<item> +<title><code>first_param</code></title> + +</item> +<item> +<title><code>Returns</code></title> + +</item> +</terms> + </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectCookie.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectCookie.page index 44a63ab1..fecc5544 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectCookie.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectCookie.page @@ -6,20 +6,9 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="default" type="guide"/> - + <link xref="index" group="default" type="guide"/> </info> <title>Regress.FooObjectCookie</title> - - - - - - - - - - - + + </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooOtherObject.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooOtherObject.page index 491d0230..b61c3fe6 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooOtherObject.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooOtherObject.page @@ -6,19 +6,11 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="class" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.FooOtherObject</title> - - - - - - - - + + <synopsis> <title>Hierarchy</title> <tree> @@ -30,8 +22,11 @@ </item> </tree> </synopsis> - - + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> <links type="topic" ui:expanded="true" api:type="function" api:mime="text/x-csrc" groups="method" style="linklist"> @@ -40,7 +35,7 @@ <links type="topic" ui:expanded="true" api:type="function" api:mime="text/x-csrc" groups="function" style="linklist"> - <title>Functions</title> + <title>Static Functions</title> </links> <links type="topic" ui:expanded="true" groups="property" style="linklist"> <title>Properties</title> @@ -51,8 +46,10 @@ <links type="topic" ui:expanded="true" groups="vfunc" style="linklist"> <title>Virtual functions</title> </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> <title>Other</title> </links> - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle-height.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle-height.page new file mode 100644 index 00000000..f1da68f0 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle-height.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.FooRectangle-height" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.FooRectangle" group="field" type="guide"/> + </info> + <title>Regress.FooRectangle->height</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle-width.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle-width.page new file mode 100644 index 00000000..dd55384b --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle-width.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.FooRectangle-width" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.FooRectangle" group="field" type="guide"/> + </info> + <title>Regress.FooRectangle->width</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle-x.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle-x.page new file mode 100644 index 00000000..2c4377bb --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle-x.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.FooRectangle-x" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.FooRectangle" group="field" type="guide"/> + </info> + <title>Regress.FooRectangle->x</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle-y.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle-y.page new file mode 100644 index 00000000..8b4a9a30 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle-y.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.FooRectangle-y" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.FooRectangle" group="field" type="guide"/> + </info> + <title>Regress.FooRectangle->y</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle.add.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle.add.page index 84a46bb7..df8fee56 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle.add.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle.add.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.FooRectangle" group="method" type="guide"/> <api:function> <api:returns> @@ -22,29 +21,22 @@ <api:name>r2</api:name> </api:arg> </api:function> - </info> <title>regress_foo_rectangle_add</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_foo_rectangle_add (RegressFooRectangle* r1, const RegressFooRectangle* r2); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>r1</code></title> -<p>add to this rect</p> + <p>add to this rect</p> </item> <item> <title><code>r2</code></title> -<p>source rectangle</p> + <p>source rectangle</p> </item> <item> <title><code>Returns</code></title> @@ -52,6 +44,4 @@ void regress_foo_rectangle_add (RegressFooRectangle* r1, </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle.new.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle.new.page index b9f16eac..b296c406 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle.new.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle.new.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.FooRectangle" group="function" type="guide"/> <api:function> <api:returns> @@ -30,24 +29,17 @@ <api:name>height</api:name> </api:arg> </api:function> - </info> <title>regress_foo_rectangle_new</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> RegressFooRectangle* regress_foo_rectangle_new (int x, int y, int width, int height); -</code></synopsis> - - - <p>This is a C convenience constructor; we have to (skip) + </code></synopsis> + <p>This is a C convenience constructor; we have to (skip) it because it's not a boxed type.</p> - - - - + <terms> <item> <title><code>x</code></title> @@ -71,6 +63,4 @@ it because it's not a boxed type.</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle.page index d485de0b..7562ec62 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle.page @@ -1,25 +1,35 @@ <?xml version="1.0"?> <page id="Regress.FooRectangle" - type="topic" - style="record" + type="guide" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="record" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.FooRectangle</title> - - - - - - - - - - - + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSkippable.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSkippable.page index 0d50e702..bc86268a 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooSkippable.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSkippable.page @@ -6,21 +6,10 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="enum" type="guide"/> - + <link xref="index" group="enum" type="guide"/> </info> <title>Regress.FooSkippable</title> - - - - <p>Some type that is only interesting from C and should not be + <p>Some type that is only interesting from C and should not be exposed to language bindings.</p> - - - - - - - + </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooStackLayer.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooStackLayer.page index 961d19c8..83cae472 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooStackLayer.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooStackLayer.page @@ -6,20 +6,9 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="enum" type="guide"/> - + <link xref="index" group="enum" type="guide"/> </info> <title>Regress.FooStackLayer</title> - - - - - - - - - - - + + </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooStruct-member.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooStruct-member.page new file mode 100644 index 00000000..655d65d3 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooStruct-member.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.FooStruct-member" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.FooStruct" group="field" type="guide"/> + </info> + <title>Regress.FooStruct->member</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooStruct-priv.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooStruct-priv.page new file mode 100644 index 00000000..a0d98911 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooStruct-priv.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.FooStruct-priv" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.FooStruct" group="field" type="guide"/> + </info> + <title>Regress.FooStruct->priv</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooStruct.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooStruct.page index 65b4f265..a0e9b546 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooStruct.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooStruct.page @@ -1,25 +1,35 @@ <?xml version="1.0"?> <page id="Regress.FooStruct" - type="topic" - style="record" + type="guide" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="record" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.FooStruct</title> - - - - - - - - - - - + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-destroy-event.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-destroy-event.page index 6af09fd2..b5a6e788 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-destroy-event.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-destroy-event.page @@ -6,23 +6,15 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.FooSubInterface" group="signal" type="guide"/> <title type="link" role="topic">destroy-event</title> - </info> <title>Regress.FooSubInterface::destroy-event</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void destroy-event (void); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -30,6 +22,4 @@ void destroy-event (void); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-destroy_event.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-destroy_event.page index eb08ec77..04b51dee 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-destroy_event.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-destroy_event.page @@ -6,22 +6,14 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.FooSubInterface" group="vfunc" type="guide"/> - </info> <title>Regress.FooSubInterface::destroy_event</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void destroy_event (RegressFooSubInterface* self); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>self</code></title> @@ -33,6 +25,4 @@ void destroy_event (RegressFooSubInterface* self); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-do_bar.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-do_bar.page index 56bdfed6..c268c83b 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-do_bar.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-do_bar.page @@ -6,22 +6,14 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.FooSubInterface" group="vfunc" type="guide"/> - </info> <title>Regress.FooSubInterface::do_bar</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void do_bar (RegressFooSubInterface* self); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>self</code></title> @@ -33,6 +25,4 @@ void do_bar (RegressFooSubInterface* self); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-do_baz.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-do_baz.page index ac59643a..7324fde5 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-do_baz.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-do_baz.page @@ -6,24 +6,16 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.FooSubInterface" group="vfunc" type="guide"/> - </info> <title>Regress.FooSubInterface::do_baz</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void do_baz (RegressFooSubInterface* self, GCallback callback, gpointer user_data); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>self</code></title> @@ -43,6 +35,4 @@ void do_baz (RegressFooSubInterface* self, </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface.do_bar.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface.do_bar.page index 6d7d970c..bb7ec6e4 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface.do_bar.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface.do_bar.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.FooSubInterface" group="method" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>self</api:name> </api:arg> </api:function> - </info> <title>regress_foo_sub_interface_do_bar</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_foo_sub_interface_do_bar (RegressFooSubInterface* self); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>self</code></title> @@ -43,6 +35,4 @@ void regress_foo_sub_interface_do_bar (RegressFooSubInterface* self); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface.do_baz.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface.do_baz.page index bab0d68e..f4c4d214 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface.do_baz.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface.do_baz.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.FooSubInterface" group="method" type="guide"/> <api:function> <api:returns> @@ -26,22 +25,15 @@ <api:name>user_data</api:name> </api:arg> </api:function> - </info> <title>regress_foo_sub_interface_do_baz</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_foo_sub_interface_do_baz (RegressFooSubInterface* self, GCallback callback, gpointer user_data); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>self</code></title> @@ -61,6 +53,4 @@ void regress_foo_sub_interface_do_baz (RegressFooSubInterface* self, </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface.page index 9b25845a..e91decbf 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface.page @@ -1,34 +1,29 @@ <?xml version="1.0"?> <page id="Regress.FooSubInterface" type="guide" - style="class" + style="interface" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="class" type="guide"/> - + <link xref="index" group="interface" type="guide"/> </info> <title>Regress.FooSubInterface</title> - - - - - - - - + + <synopsis> - <title>Hierarchy</title> - <tree> - <item> - <code>Regress.FooSubInterface</code> - </item> - </tree> + <title>Prerequisites</title> + <p>FooSubInterface requires Regress.FooInterface</p> + </synopsis> + <synopsis> + <title>Known Implementations</title> + <p>None</p> </synopsis> - - + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> <links type="topic" ui:expanded="true" api:type="function" api:mime="text/x-csrc" groups="method" style="linklist"> @@ -37,7 +32,7 @@ <links type="topic" ui:expanded="true" api:type="function" api:mime="text/x-csrc" groups="function" style="linklist"> - <title>Functions</title> + <title>Static Functions</title> </links> <links type="topic" ui:expanded="true" groups="property" style="linklist"> <title>Properties</title> @@ -48,8 +43,10 @@ <links type="topic" ui:expanded="true" groups="vfunc" style="linklist"> <title>Virtual functions</title> </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> <title>Other</title> </links> - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface-destroy_event.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface-destroy_event.page new file mode 100644 index 00000000..37a09bad --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface-destroy_event.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.FooSubInterfaceIface-destroy_event" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.FooSubInterfaceIface" group="field" type="guide"/> + </info> + <title>Regress.FooSubInterfaceIface->destroy_event</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface-do_bar.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface-do_bar.page new file mode 100644 index 00000000..2e00c95d --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface-do_bar.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.FooSubInterfaceIface-do_bar" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.FooSubInterfaceIface" group="field" type="guide"/> + </info> + <title>Regress.FooSubInterfaceIface->do_bar</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface-do_baz.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface-do_baz.page new file mode 100644 index 00000000..98644fbd --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface-do_baz.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.FooSubInterfaceIface-do_baz" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.FooSubInterfaceIface" group="field" type="guide"/> + </info> + <title>Regress.FooSubInterfaceIface->do_baz</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface-parent_iface.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface-parent_iface.page new file mode 100644 index 00000000..d7626b69 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface-parent_iface.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.FooSubInterfaceIface-parent_iface" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.FooSubInterfaceIface" group="field" type="guide"/> + </info> + <title>Regress.FooSubInterfaceIface->parent_iface</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface.destroy_event.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface.destroy_event.page index 95136833..416cacff 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface.destroy_event.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface.destroy_event.page @@ -1,25 +1,28 @@ <?xml version="1.0"?> <page id="Regress.FooSubInterfaceIface.destroy_event" type="topic" - style="default" + style="callback" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="default" type="guide"/> - - </info> + <link xref="index" group="callback" type="guide"/> + </info> <title>Regress.FooSubInterfaceIface.destroy_event</title> - - - - - - - - - - - + <synopsis><code mime="text/x-csrc"> +void destroy_event (RegressFooSubInterface* self); + </code></synopsis> + + +<terms> +<item> +<title><code>self</code></title> + +</item> +<item> +<title><code>Returns</code></title> + +</item> +</terms> + </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface.do_bar.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface.do_bar.page index ec46cdde..5dd05daa 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface.do_bar.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface.do_bar.page @@ -1,25 +1,28 @@ <?xml version="1.0"?> <page id="Regress.FooSubInterfaceIface.do_bar" type="topic" - style="default" + style="callback" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="default" type="guide"/> - - </info> + <link xref="index" group="callback" type="guide"/> + </info> <title>Regress.FooSubInterfaceIface.do_bar</title> - - - - - - - - - - - + <synopsis><code mime="text/x-csrc"> +void do_bar (RegressFooSubInterface* self); + </code></synopsis> + + +<terms> +<item> +<title><code>self</code></title> + +</item> +<item> +<title><code>Returns</code></title> + +</item> +</terms> + </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface.do_baz.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface.do_baz.page index d0f58041..5ad8c569 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface.do_baz.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface.do_baz.page @@ -1,25 +1,38 @@ <?xml version="1.0"?> <page id="Regress.FooSubInterfaceIface.do_baz" type="topic" - style="default" + style="callback" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="default" type="guide"/> - - </info> + <link xref="index" group="callback" type="guide"/> + </info> <title>Regress.FooSubInterfaceIface.do_baz</title> - - - - - - - - - - - + <synopsis><code mime="text/x-csrc"> +void do_baz (RegressFooSubInterface* self, + GCallback callback, + gpointer user_data); + </code></synopsis> + + +<terms> +<item> +<title><code>self</code></title> + +</item> +<item> +<title><code>callback</code></title> + +</item> +<item> +<title><code>user_data</code></title> + +</item> +<item> +<title><code>Returns</code></title> + +</item> +</terms> + </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface.page index f8643cf3..50b4d12b 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface.page @@ -1,25 +1,35 @@ <?xml version="1.0"?> <page id="Regress.FooSubInterfaceIface" - type="topic" - style="record" + type="guide" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="record" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.FooSubInterfaceIface</title> - - - - - - - - - - - + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubobject-parent_instance.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubobject-parent_instance.page new file mode 100644 index 00000000..33994c72 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubobject-parent_instance.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.FooSubobject-parent_instance" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.FooSubobject" group="field" type="guide"/> + </info> + <title>Regress.FooSubobject->parent_instance</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubobject.new.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubobject.new.page index c4adff6d..6d13005d 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubobject.new.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubobject.new.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.FooSubobject" group="constructor" type="guide"/> <api:function> <api:returns> @@ -14,20 +13,13 @@ </api:returns> <api:name>regress_foo_subobject_new</api:name> </api:function> - </info> <title>regress_foo_subobject_new</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> RegressFooSubobject* regress_foo_subobject_new (void); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -35,6 +27,4 @@ RegressFooSubobject* regress_foo_subobject_new (void); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubobject.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubobject.page index 6a70ef71..951f11c0 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubobject.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubobject.page @@ -6,19 +6,11 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="class" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.FooSubobject</title> - - - - - - - - + + <synopsis> <title>Hierarchy</title> <tree> @@ -33,8 +25,11 @@ </item> </tree> </synopsis> - - + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> <links type="topic" ui:expanded="true" api:type="function" api:mime="text/x-csrc" groups="method" style="linklist"> @@ -43,7 +38,7 @@ <links type="topic" ui:expanded="true" api:type="function" api:mime="text/x-csrc" groups="function" style="linklist"> - <title>Functions</title> + <title>Static Functions</title> </links> <links type="topic" ui:expanded="true" groups="property" style="linklist"> <title>Properties</title> @@ -54,8 +49,10 @@ <links type="topic" ui:expanded="true" groups="vfunc" style="linklist"> <title>Virtual functions</title> </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> <title>Other</title> </links> - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubobjectClass-parent_class.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubobjectClass-parent_class.page new file mode 100644 index 00000000..cf86502b --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubobjectClass-parent_class.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.FooSubobjectClass-parent_class" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.FooSubobjectClass" group="field" type="guide"/> + </info> + <title>Regress.FooSubobjectClass->parent_class</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubobjectClass.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubobjectClass.page index 499599c8..426fe2f5 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubobjectClass.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubobjectClass.page @@ -1,25 +1,35 @@ <?xml version="1.0"?> <page id="Regress.FooSubobjectClass" - type="topic" - style="record" + type="guide" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="record" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.FooSubobjectClass</title> - - - - - - - - - - - + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooThingWithArray-data.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooThingWithArray-data.page new file mode 100644 index 00000000..cc40f8f4 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooThingWithArray-data.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.FooThingWithArray-data" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.FooThingWithArray" group="field" type="guide"/> + </info> + <title>Regress.FooThingWithArray->data</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooThingWithArray-lines.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooThingWithArray-lines.page new file mode 100644 index 00000000..6db4319f --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooThingWithArray-lines.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.FooThingWithArray-lines" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.FooThingWithArray" group="field" type="guide"/> + </info> + <title>Regress.FooThingWithArray->lines</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooThingWithArray-x.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooThingWithArray-x.page new file mode 100644 index 00000000..c13779f6 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooThingWithArray-x.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.FooThingWithArray-x" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.FooThingWithArray" group="field" type="guide"/> + </info> + <title>Regress.FooThingWithArray->x</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooThingWithArray-y.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooThingWithArray-y.page new file mode 100644 index 00000000..df8f251c --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooThingWithArray-y.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.FooThingWithArray-y" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.FooThingWithArray" group="field" type="guide"/> + </info> + <title>Regress.FooThingWithArray->y</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooThingWithArray.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooThingWithArray.page index 6033817f..22f3d649 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooThingWithArray.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooThingWithArray.page @@ -1,25 +1,35 @@ <?xml version="1.0"?> <page id="Regress.FooThingWithArray" - type="topic" - style="record" + type="guide" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="record" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.FooThingWithArray</title> - - - - - - - - - - - + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooUnion-regress_foo.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooUnion-regress_foo.page new file mode 100644 index 00000000..6c180ddc --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooUnion-regress_foo.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.FooUnion-regress_foo" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.FooUnion" group="field" type="guide"/> + </info> + <title>Regress.FooUnion->regress_foo</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooUnion.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooUnion.page index 9746f17e..ebb0b1c6 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooUnion.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooUnion.page @@ -1,25 +1,35 @@ <?xml version="1.0"?> <page id="Regress.FooUnion" - type="topic" - style="default" + type="guide" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="default" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.FooUnion</title> - - - - - - - - - - - + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooUtilityStruct-bar.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooUtilityStruct-bar.page new file mode 100644 index 00000000..26d131c2 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooUtilityStruct-bar.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.FooUtilityStruct-bar" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.FooUtilityStruct" group="field" type="guide"/> + </info> + <title>Regress.FooUtilityStruct->bar</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooUtilityStruct.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooUtilityStruct.page index d281ffb1..d956c4d7 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooUtilityStruct.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooUtilityStruct.page @@ -1,25 +1,35 @@ <?xml version="1.0"?> <page id="Regress.FooUtilityStruct" - type="topic" - style="record" + type="guide" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="record" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.FooUtilityStruct</title> - - - - - - - - - - - + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooVarargsCallback.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooVarargsCallback.page index a57ea4dd..083a99f7 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooVarargsCallback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooVarargsCallback.page @@ -1,25 +1,33 @@ <?xml version="1.0"?> <page id="Regress.FooVarargsCallback" type="topic" - style="default" + style="callback" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="default" type="guide"/> - - </info> + <link xref="index" group="callback" type="guide"/> + </info> <title>Regress.FooVarargsCallback</title> - - - - - - - - - - - + <synopsis><code mime="text/x-csrc"> +void FooVarargsCallback (const char* param, + ...); + </code></synopsis> + + +<terms> +<item> +<title><code>param</code></title> + +</item> +<item> +<title><code>...</code></title> + +</item> +<item> +<title><code>Returns</code></title> + +</item> +</terms> + </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooXEvent.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooXEvent.page index c389ef05..19bee422 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooXEvent.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooXEvent.page @@ -6,20 +6,9 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="default" type="guide"/> - + <link xref="index" group="default" type="guide"/> </info> <title>Regress.FooXEvent</title> - - - - - - - - - - - + + </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.GI_SCANNER_ELSE.page b/tests/scanner/Regress-1.0-C-expected/Regress.GI_SCANNER_ELSE.page new file mode 100644 index 00000000..e9876e07 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.GI_SCANNER_ELSE.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.GI_SCANNER_ELSE" + type="topic" + style="default" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="index" group="default" type="guide"/> + </info> + <title>Regress.GI_SCANNER_ELSE</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.GI_SCANNER_IFDEF.page b/tests/scanner/Regress-1.0-C-expected/Regress.GI_SCANNER_IFDEF.page new file mode 100644 index 00000000..bfef183a --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.GI_SCANNER_IFDEF.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.GI_SCANNER_IFDEF" + type="topic" + style="default" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="index" group="default" type="guide"/> + </info> + <title>Regress.GI_SCANNER_IFDEF</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.GUINT64_CONSTANT.page b/tests/scanner/Regress-1.0-C-expected/Regress.GUINT64_CONSTANT.page new file mode 100644 index 00000000..8c16dd2f --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.GUINT64_CONSTANT.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.GUINT64_CONSTANT" + type="topic" + style="default" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="index" group="default" type="guide"/> + </info> + <title>Regress.GUINT64_CONSTANT</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.GUINT64_CONSTANTA.page b/tests/scanner/Regress-1.0-C-expected/Regress.GUINT64_CONSTANTA.page new file mode 100644 index 00000000..3b0d6f14 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.GUINT64_CONSTANTA.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.GUINT64_CONSTANTA" + type="topic" + style="default" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="index" group="default" type="guide"/> + </info> + <title>Regress.GUINT64_CONSTANTA</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.G_GINT64_CONSTANT.page b/tests/scanner/Regress-1.0-C-expected/Regress.G_GINT64_CONSTANT.page new file mode 100644 index 00000000..cdce6076 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.G_GINT64_CONSTANT.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.G_GINT64_CONSTANT" + type="topic" + style="default" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="index" group="default" type="guide"/> + </info> + <title>Regress.G_GINT64_CONSTANT</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.INT_CONSTANT.page b/tests/scanner/Regress-1.0-C-expected/Regress.INT_CONSTANT.page new file mode 100644 index 00000000..e0512abe --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.INT_CONSTANT.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.INT_CONSTANT" + type="topic" + style="default" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="index" group="default" type="guide"/> + </info> + <title>Regress.INT_CONSTANT</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.IntSet.page b/tests/scanner/Regress-1.0-C-expected/Regress.IntSet.page index b8710cf1..b8324f86 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.IntSet.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.IntSet.page @@ -6,20 +6,9 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="default" type="guide"/> - + <link xref="index" group="default" type="guide"/> </info> <title>Regress.IntSet</title> - - - - <p>Compatibility typedef, like telepathy-glib's TpIntSet</p> - - - - - - - + <p>Compatibility typedef, like telepathy-glib's TpIntSet</p> + </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.LONG_STRING_CONSTANT.page b/tests/scanner/Regress-1.0-C-expected/Regress.LONG_STRING_CONSTANT.page new file mode 100644 index 00000000..85fe96ed --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.LONG_STRING_CONSTANT.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.LONG_STRING_CONSTANT" + type="topic" + style="default" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="index" group="default" type="guide"/> + </info> + <title>Regress.LONG_STRING_CONSTANT</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.LikeGnomeKeyringPasswordSchema-attributes.page b/tests/scanner/Regress-1.0-C-expected/Regress.LikeGnomeKeyringPasswordSchema-attributes.page new file mode 100644 index 00000000..db515008 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.LikeGnomeKeyringPasswordSchema-attributes.page @@ -0,0 +1,16 @@ +<?xml version="1.0"?> +<page id="Regress.LikeGnomeKeyringPasswordSchema-attributes" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.LikeGnomeKeyringPasswordSchema" + group="field" + type="guide"/> + </info> + <title>Regress.LikeGnomeKeyringPasswordSchema->attributes</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.LikeGnomeKeyringPasswordSchema-dummy.page b/tests/scanner/Regress-1.0-C-expected/Regress.LikeGnomeKeyringPasswordSchema-dummy.page new file mode 100644 index 00000000..3bfbac14 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.LikeGnomeKeyringPasswordSchema-dummy.page @@ -0,0 +1,16 @@ +<?xml version="1.0"?> +<page id="Regress.LikeGnomeKeyringPasswordSchema-dummy" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.LikeGnomeKeyringPasswordSchema" + group="field" + type="guide"/> + </info> + <title>Regress.LikeGnomeKeyringPasswordSchema->dummy</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.LikeGnomeKeyringPasswordSchema-dummy2.page b/tests/scanner/Regress-1.0-C-expected/Regress.LikeGnomeKeyringPasswordSchema-dummy2.page new file mode 100644 index 00000000..408ab290 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.LikeGnomeKeyringPasswordSchema-dummy2.page @@ -0,0 +1,16 @@ +<?xml version="1.0"?> +<page id="Regress.LikeGnomeKeyringPasswordSchema-dummy2" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.LikeGnomeKeyringPasswordSchema" + group="field" + type="guide"/> + </info> + <title>Regress.LikeGnomeKeyringPasswordSchema->dummy2</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.LikeGnomeKeyringPasswordSchema.page b/tests/scanner/Regress-1.0-C-expected/Regress.LikeGnomeKeyringPasswordSchema.page index 242fad03..33b117cd 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.LikeGnomeKeyringPasswordSchema.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.LikeGnomeKeyringPasswordSchema.page @@ -1,25 +1,35 @@ <?xml version="1.0"?> <page id="Regress.LikeGnomeKeyringPasswordSchema" - type="topic" - style="record" + type="guide" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="record" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.LikeGnomeKeyringPasswordSchema</title> - - - - - - - - - - - + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.LikeXklConfigItem-name.page b/tests/scanner/Regress-1.0-C-expected/Regress.LikeXklConfigItem-name.page new file mode 100644 index 00000000..dbc89981 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.LikeXklConfigItem-name.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.LikeXklConfigItem-name" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.LikeXklConfigItem" group="field" type="guide"/> + </info> + <title>Regress.LikeXklConfigItem->name</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.LikeXklConfigItem.page b/tests/scanner/Regress-1.0-C-expected/Regress.LikeXklConfigItem.page index 3b14aae6..e073de03 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.LikeXklConfigItem.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.LikeXklConfigItem.page @@ -1,25 +1,35 @@ <?xml version="1.0"?> <page id="Regress.LikeXklConfigItem" - type="topic" - style="record" + type="guide" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="record" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.LikeXklConfigItem</title> - - - - - - - - - - - + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.LikeXklConfigItem.set_name.page b/tests/scanner/Regress-1.0-C-expected/Regress.LikeXklConfigItem.set_name.page index 0a4aecb6..e5137c45 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.LikeXklConfigItem.set_name.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.LikeXklConfigItem.set_name.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.LikeXklConfigItem" group="method" type="guide"/> <api:function> <api:returns> @@ -22,21 +21,14 @@ <api:name>name</api:name> </api:arg> </api:function> - </info> <title>regress_like_xkl_config_item_set_name</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_like_xkl_config_item_set_name (RegressLikeXklConfigItem* self, const char* name); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>self</code></title> @@ -52,6 +44,4 @@ void regress_like_xkl_config_item_set_name (RegressLikeXklConfigItem* self, </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.MAXUINT64.page b/tests/scanner/Regress-1.0-C-expected/Regress.MAXUINT64.page new file mode 100644 index 00000000..91d7ce51 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.MAXUINT64.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.MAXUINT64" + type="topic" + style="default" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="index" group="default" type="guide"/> + </info> + <title>Regress.MAXUINT64</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.MININT64.page b/tests/scanner/Regress-1.0-C-expected/Regress.MININT64.page new file mode 100644 index 00000000..1531540e --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.MININT64.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.MININT64" + type="topic" + style="default" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="index" group="default" type="guide"/> + </info> + <title>Regress.MININT64</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.Mixed_Case_Constant.page b/tests/scanner/Regress-1.0-C-expected/Regress.Mixed_Case_Constant.page new file mode 100644 index 00000000..29e7314b --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.Mixed_Case_Constant.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.Mixed_Case_Constant" + type="topic" + style="default" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="index" group="default" type="guide"/> + </info> + <title>Regress.Mixed_Case_Constant</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.NEGATIVE_INT_CONSTANT.page b/tests/scanner/Regress-1.0-C-expected/Regress.NEGATIVE_INT_CONSTANT.page new file mode 100644 index 00000000..a0aad769 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.NEGATIVE_INT_CONSTANT.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.NEGATIVE_INT_CONSTANT" + type="topic" + style="default" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="index" group="default" type="guide"/> + </info> + <title>Regress.NEGATIVE_INT_CONSTANT</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.PtrArrayAlias.page b/tests/scanner/Regress-1.0-C-expected/Regress.PtrArrayAlias.page index f66aee44..1acd4d22 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.PtrArrayAlias.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.PtrArrayAlias.page @@ -6,20 +6,9 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="default" type="guide"/> - + <link xref="index" group="default" type="guide"/> </info> <title>Regress.PtrArrayAlias</title> - - - - <p>Typedef'd GPtrArray for some reason</p> - - - - - - - + <p>Typedef'd GPtrArray for some reason</p> + </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.STRING_CONSTANT.page b/tests/scanner/Regress-1.0-C-expected/Regress.STRING_CONSTANT.page new file mode 100644 index 00000000..be1d6e16 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.STRING_CONSTANT.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.STRING_CONSTANT" + type="topic" + style="default" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="index" group="default" type="guide"/> + </info> + <title>Regress.STRING_CONSTANT</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.SkippedStructure-v.page b/tests/scanner/Regress-1.0-C-expected/Regress.SkippedStructure-v.page new file mode 100644 index 00000000..3b55d6c6 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.SkippedStructure-v.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.SkippedStructure-v" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.SkippedStructure" group="field" type="guide"/> + </info> + <title>Regress.SkippedStructure->v</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.SkippedStructure-x.page b/tests/scanner/Regress-1.0-C-expected/Regress.SkippedStructure-x.page new file mode 100644 index 00000000..a7b5ac9e --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.SkippedStructure-x.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.SkippedStructure-x" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.SkippedStructure" group="field" type="guide"/> + </info> + <title>Regress.SkippedStructure->x</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.SkippedStructure.page b/tests/scanner/Regress-1.0-C-expected/Regress.SkippedStructure.page index ad13eea6..1ff59e16 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.SkippedStructure.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.SkippedStructure.page @@ -1,26 +1,36 @@ <?xml version="1.0"?> <page id="Regress.SkippedStructure" - type="topic" - style="record" + type="guide" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="record" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.SkippedStructure</title> - - - - <p>This should be skipped, and moreover, all function which + <p>This should be skipped, and moreover, all function which use it should be.</p> - - - - - - - + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestABCError.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestABCError.page index 384ffb87..a504645a 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestABCError.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestABCError.page @@ -6,20 +6,9 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="enum" type="guide"/> - + <link xref="index" group="enum" type="guide"/> </info> <title>Regress.TestABCError</title> - - - - - - - - - - - + + </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestABCError.quark.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestABCError.quark.page index 7ed5152f..fd90ef34 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestABCError.quark.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestABCError.quark.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,20 +13,13 @@ </api:returns> <api:name>regress_test_abc_error_quark</api:name> </api:function> - </info> <title>regress_test_abc_error_quark</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> GQuark regress_test_abc_error_quark (void); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -35,6 +27,4 @@ GQuark regress_test_abc_error_quark (void); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed-nested_a.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed-nested_a.page new file mode 100644 index 00000000..d394f4db --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed-nested_a.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.TestBoxed-nested_a" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestBoxed" group="field" type="guide"/> + </info> + <title>Regress.TestBoxed->nested_a</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed-priv.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed-priv.page new file mode 100644 index 00000000..3084c21d --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed-priv.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.TestBoxed-priv" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestBoxed" group="field" type="guide"/> + </info> + <title>Regress.TestBoxed->priv</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed-some_int8.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed-some_int8.page new file mode 100644 index 00000000..36f6632e --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed-some_int8.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.TestBoxed-some_int8" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestBoxed" group="field" type="guide"/> + </info> + <title>Regress.TestBoxed->some_int8</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.copy.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.copy.page index 40273913..53d2074c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.copy.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.copy.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestBoxed" group="method" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>boxed</api:name> </api:arg> </api:function> - </info> <title>regress_test_boxed_copy</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> RegressTestBoxed* regress_test_boxed_copy (RegressTestBoxed* boxed); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>boxed</code></title> @@ -43,6 +35,4 @@ RegressTestBoxed* regress_test_boxed_copy (RegressTestBoxed* boxed); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.equals.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.equals.page index 26206b63..0af199b4 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.equals.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.equals.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestBoxed" group="method" type="guide"/> <api:function> <api:returns> @@ -22,21 +21,14 @@ <api:name>other</api:name> </api:arg> </api:function> - </info> <title>regress_test_boxed_equals</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> gboolean regress_test_boxed_equals (RegressTestBoxed* boxed, RegressTestBoxed* other); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>boxed</code></title> @@ -52,6 +44,4 @@ gboolean regress_test_boxed_equals (RegressTestBoxed* boxed, </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new.page index 5e05794e..f9f57ea6 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestBoxed" group="constructor" type="guide"/> <api:function> <api:returns> @@ -14,20 +13,13 @@ </api:returns> <api:name>regress_test_boxed_new</api:name> </api:function> - </info> <title>regress_test_boxed_new</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> RegressTestBoxed* regress_test_boxed_new (void); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -35,6 +27,4 @@ RegressTestBoxed* regress_test_boxed_new (void); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new_alternative_constructor1.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new_alternative_constructor1.page index 2bc81924..9341856c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new_alternative_constructor1.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new_alternative_constructor1.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestBoxed" group="constructor" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>i</api:name> </api:arg> </api:function> - </info> <title>regress_test_boxed_new_alternative_constructor1</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> RegressTestBoxed* regress_test_boxed_new_alternative_constructor1 (int i); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>i</code></title> @@ -43,6 +35,4 @@ RegressTestBoxed* regress_test_boxed_new_alternative_constructor1 (int i); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new_alternative_constructor2.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new_alternative_constructor2.page index e43127e7..39ea62b1 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new_alternative_constructor2.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new_alternative_constructor2.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestBoxed" group="constructor" type="guide"/> <api:function> <api:returns> @@ -22,21 +21,14 @@ <api:name>j</api:name> </api:arg> </api:function> - </info> <title>regress_test_boxed_new_alternative_constructor2</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> RegressTestBoxed* regress_test_boxed_new_alternative_constructor2 (int i, int j); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>i</code></title> @@ -52,6 +44,4 @@ RegressTestBoxed* regress_test_boxed_new_alternative_constructor2 (int i, </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new_alternative_constructor3.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new_alternative_constructor3.page index ac75d2c2..6cd80848 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new_alternative_constructor3.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new_alternative_constructor3.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestBoxed" group="constructor" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>s</api:name> </api:arg> </api:function> - </info> <title>regress_test_boxed_new_alternative_constructor3</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> RegressTestBoxed* regress_test_boxed_new_alternative_constructor3 (char* s); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>s</code></title> @@ -43,6 +35,4 @@ RegressTestBoxed* regress_test_boxed_new_alternative_constructor3 (char* s); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.page index d6675327..1805f5ac 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.page @@ -1,25 +1,35 @@ <?xml version="1.0"?> <page id="Regress.TestBoxed" - type="topic" - style="record" + type="guide" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="record" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.TestBoxed</title> - - - - - - - - - - - + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB-some_int8.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB-some_int8.page new file mode 100644 index 00000000..c7666c77 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB-some_int8.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.TestBoxedB-some_int8" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestBoxedB" group="field" type="guide"/> + </info> + <title>Regress.TestBoxedB->some_int8</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB-some_long.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB-some_long.page new file mode 100644 index 00000000..a5f4a348 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB-some_long.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.TestBoxedB-some_long" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestBoxedB" group="field" type="guide"/> + </info> + <title>Regress.TestBoxedB->some_long</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB.copy.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB.copy.page index df0da11c..bc33c57a 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB.copy.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB.copy.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestBoxedB" group="method" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>boxed</api:name> </api:arg> </api:function> - </info> <title>regress_test_boxed_b_copy</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> RegressTestBoxedB* regress_test_boxed_b_copy (RegressTestBoxedB* boxed); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>boxed</code></title> @@ -43,6 +35,4 @@ RegressTestBoxedB* regress_test_boxed_b_copy (RegressTestBoxedB* boxed); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB.new.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB.new.page index 7a0bc2bc..f5d2210e 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB.new.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB.new.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestBoxedB" group="constructor" type="guide"/> <api:function> <api:returns> @@ -22,21 +21,14 @@ <api:name>some_long</api:name> </api:arg> </api:function> - </info> <title>regress_test_boxed_b_new</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> RegressTestBoxedB* regress_test_boxed_b_new (gint8 some_int8, glong some_long); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>some_int8</code></title> @@ -52,6 +44,4 @@ RegressTestBoxedB* regress_test_boxed_b_new (gint8 some_int8, </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB.page index 856d7da4..fe1a6d6c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB.page @@ -1,25 +1,35 @@ <?xml version="1.0"?> <page id="Regress.TestBoxedB" - type="topic" - style="record" + type="guide" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="record" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.TestBoxedB</title> - - - - - - - - - - - + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedC-another_thing.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedC-another_thing.page new file mode 100644 index 00000000..a5d7c2b1 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedC-another_thing.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.TestBoxedC-another_thing" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestBoxedC" group="field" type="guide"/> + </info> + <title>Regress.TestBoxedC->another_thing</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedC-refcount.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedC-refcount.page new file mode 100644 index 00000000..0f755ddc --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedC-refcount.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.TestBoxedC-refcount" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestBoxedC" group="field" type="guide"/> + </info> + <title>Regress.TestBoxedC->refcount</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedC.new.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedC.new.page index 4657b526..4b8e3003 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedC.new.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedC.new.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestBoxedC" group="constructor" type="guide"/> <api:function> <api:returns> @@ -14,20 +13,13 @@ </api:returns> <api:name>regress_test_boxed_c_new</api:name> </api:function> - </info> <title>regress_test_boxed_c_new</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> RegressTestBoxedC* regress_test_boxed_c_new (void); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -35,6 +27,4 @@ RegressTestBoxedC* regress_test_boxed_c_new (void); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedC.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedC.page index c890545d..aabd9b27 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedC.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedC.page @@ -1,25 +1,35 @@ <?xml version="1.0"?> <page id="Regress.TestBoxedC" - type="topic" - style="record" + type="guide" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="record" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.TestBoxedC</title> - - - - - - - - - - - + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.copy.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.copy.page index ed99996a..ac9e71b4 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.copy.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.copy.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestBoxedD" group="method" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>boxed</api:name> </api:arg> </api:function> - </info> <title>regress_test_boxed_d_copy</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> RegressTestBoxedD* regress_test_boxed_d_copy (RegressTestBoxedD* boxed); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>boxed</code></title> @@ -43,6 +35,4 @@ RegressTestBoxedD* regress_test_boxed_d_copy (RegressTestBoxedD* boxed); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.free.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.free.page index 4622fcdc..4aa4e44e 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.free.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.free.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestBoxedD" group="method" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>boxed</api:name> </api:arg> </api:function> - </info> <title>regress_test_boxed_d_free</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_test_boxed_d_free (RegressTestBoxedD* boxed); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>boxed</code></title> @@ -43,6 +35,4 @@ void regress_test_boxed_d_free (RegressTestBoxedD* boxed); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.get_magic.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.get_magic.page index bbd78ab2..dc98da24 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.get_magic.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.get_magic.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestBoxedD" group="method" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>boxed</api:name> </api:arg> </api:function> - </info> <title>regress_test_boxed_d_get_magic</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> int regress_test_boxed_d_get_magic (RegressTestBoxedD* boxed); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>boxed</code></title> @@ -43,6 +35,4 @@ int regress_test_boxed_d_get_magic (RegressTestBoxedD* boxed); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.new.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.new.page index 50345623..2a5bd4b6 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.new.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.new.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestBoxedD" group="constructor" type="guide"/> <api:function> <api:returns> @@ -22,21 +21,14 @@ <api:name>a_int</api:name> </api:arg> </api:function> - </info> <title>regress_test_boxed_d_new</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> RegressTestBoxedD* regress_test_boxed_d_new (const char* a_string, int a_int); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>a_string</code></title> @@ -52,6 +44,4 @@ RegressTestBoxedD* regress_test_boxed_d_new (const char* a_string, </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.page index b5110c2c..c194f35b 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.page @@ -1,25 +1,35 @@ <?xml version="1.0"?> <page id="Regress.TestBoxedD" - type="topic" - style="record" + type="guide" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="record" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.TestBoxedD</title> - - - - - - - - - - - + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestCallback.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestCallback.page index bed84d50..d75adc9c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestCallback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestCallback.page @@ -1,25 +1,24 @@ <?xml version="1.0"?> <page id="Regress.TestCallback" type="topic" - style="default" + style="callback" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="default" type="guide"/> - - </info> + <link xref="index" group="callback" type="guide"/> + </info> <title>Regress.TestCallback</title> - - - - - - - - - - - + <synopsis><code mime="text/x-csrc"> +int TestCallback (void); + </code></synopsis> + + +<terms> +<item> +<title><code>Returns</code></title> + +</item> +</terms> + </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackArray.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackArray.page index 7d3f7b83..ef49dd2d 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackArray.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackArray.page @@ -1,25 +1,43 @@ <?xml version="1.0"?> <page id="Regress.TestCallbackArray" type="topic" - style="default" + style="callback" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="default" type="guide"/> - - </info> + <link xref="index" group="callback" type="guide"/> + </info> <title>Regress.TestCallbackArray</title> - - - - - - - - - - - + <synopsis><code mime="text/x-csrc"> +int TestCallbackArray (int* one, + gsize one_length, + utf8* two, + int two_length); + </code></synopsis> + + +<terms> +<item> +<title><code>one</code></title> + +</item> +<item> +<title><code>one_length</code></title> + +</item> +<item> +<title><code>two</code></title> + +</item> +<item> +<title><code>two_length</code></title> + +</item> +<item> +<title><code>Returns</code></title> + +</item> +</terms> + </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackFull.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackFull.page index 0b8fca1d..013755e7 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackFull.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackFull.page @@ -1,25 +1,38 @@ <?xml version="1.0"?> <page id="Regress.TestCallbackFull" type="topic" - style="default" + style="callback" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="default" type="guide"/> - - </info> + <link xref="index" group="callback" type="guide"/> + </info> <title>Regress.TestCallbackFull</title> - - - - - - - - - - - + <synopsis><code mime="text/x-csrc"> +int TestCallbackFull (int foo, + double bar, + char* path); + </code></synopsis> + + +<terms> +<item> +<title><code>foo</code></title> + <p>the investment rate</p> +</item> +<item> +<title><code>bar</code></title> + <p>how much money</p> +</item> +<item> +<title><code>path</code></title> + <p>Path to file</p> +</item> +<item> +<title><code>Returns</code></title> + +</item> +</terms> + </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackGError.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackGError.page index 804382f5..e05c8763 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackGError.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackGError.page @@ -1,25 +1,28 @@ <?xml version="1.0"?> <page id="Regress.TestCallbackGError" type="topic" - style="default" + style="callback" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="default" type="guide"/> - - </info> + <link xref="index" group="callback" type="guide"/> + </info> <title>Regress.TestCallbackGError</title> - - - - - - - - - - - + <synopsis><code mime="text/x-csrc"> +void TestCallbackGError (const GError* error); + </code></synopsis> + + +<terms> +<item> +<title><code>error</code></title> + +</item> +<item> +<title><code>Returns</code></title> + +</item> +</terms> + </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackHashtable.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackHashtable.page index 06ebb706..b0140aca 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackHashtable.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackHashtable.page @@ -1,25 +1,28 @@ <?xml version="1.0"?> <page id="Regress.TestCallbackHashtable" type="topic" - style="default" + style="callback" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="default" type="guide"/> - - </info> + <link xref="index" group="callback" type="guide"/> + </info> <title>Regress.TestCallbackHashtable</title> - - - - - - - - - - - + <synopsis><code mime="text/x-csrc"> +void TestCallbackHashtable (GHashTable* data); + </code></synopsis> + + +<terms> +<item> +<title><code>data</code></title> + <p>a hash table; will be modified</p> +</item> +<item> +<title><code>Returns</code></title> + +</item> +</terms> + </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackOwnedGError.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackOwnedGError.page index 28b21ea4..2599a8a5 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackOwnedGError.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackOwnedGError.page @@ -1,25 +1,28 @@ <?xml version="1.0"?> <page id="Regress.TestCallbackOwnedGError" type="topic" - style="default" + style="callback" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="default" type="guide"/> - - </info> + <link xref="index" group="callback" type="guide"/> + </info> <title>Regress.TestCallbackOwnedGError</title> - - - - - - - - - - - + <synopsis><code mime="text/x-csrc"> +void TestCallbackOwnedGError (GError* error); + </code></synopsis> + + +<terms> +<item> +<title><code>error</code></title> + <p>GError instance; must be freed by the callback</p> +</item> +<item> +<title><code>Returns</code></title> + +</item> +</terms> + </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackUserData.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackUserData.page index 286c830a..c646ae8c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackUserData.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackUserData.page @@ -1,25 +1,28 @@ <?xml version="1.0"?> <page id="Regress.TestCallbackUserData" type="topic" - style="default" + style="callback" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="default" type="guide"/> - - </info> + <link xref="index" group="callback" type="guide"/> + </info> <title>Regress.TestCallbackUserData</title> - - - - - - - - - - - + <synopsis><code mime="text/x-csrc"> +int TestCallbackUserData (gpointer user_data); + </code></synopsis> + + +<terms> +<item> +<title><code>user_data</code></title> + +</item> +<item> +<title><code>Returns</code></title> + +</item> +</terms> + </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestDEFError.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestDEFError.page index b485450d..734dc793 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestDEFError.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestDEFError.page @@ -6,20 +6,9 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="enum" type="guide"/> - + <link xref="index" group="enum" type="guide"/> </info> <title>Regress.TestDEFError</title> - - - - - - - - - - - + + </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestEnum.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestEnum.page index a672d7ee..38be2b33 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestEnum.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestEnum.page @@ -6,20 +6,9 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="enum" type="guide"/> - + <link xref="index" group="enum" type="guide"/> </info> <title>Regress.TestEnum</title> - - - - <p>By purpose, not all members have documentation</p> - - - - - - - + <p>By purpose, not all members have documentation</p> + </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestEnum.param.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestEnum.param.page index 542ba60c..815a1567 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestEnum.param.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestEnum.param.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>e</api:name> </api:arg> </api:function> - </info> <title>regress_test_enum_param</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> const gchar* regress_test_enum_param (RegressTestEnum e); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>e</code></title> @@ -43,6 +35,4 @@ const gchar* regress_test_enum_param (RegressTestEnum e); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestEnumNoGEnum.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestEnumNoGEnum.page index cffae730..12942428 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestEnumNoGEnum.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestEnumNoGEnum.page @@ -6,20 +6,9 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="enum" type="guide"/> - + <link xref="index" group="enum" type="guide"/> </info> <title>Regress.TestEnumNoGEnum</title> - - - - - - - - - - - + + </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestEnumUnsigned.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestEnumUnsigned.page index 81a9aa9a..c5e7ccfc 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestEnumUnsigned.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestEnumUnsigned.page @@ -6,20 +6,9 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="enum" type="guide"/> - + <link xref="index" group="enum" type="guide"/> </info> <title>Regress.TestEnumUnsigned</title> - - - - - - - - - - - + + </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestError.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestError.page index 97f829b2..0b513654 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestError.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestError.page @@ -6,20 +6,9 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="enum" type="guide"/> - + <link xref="index" group="enum" type="guide"/> </info> <title>Regress.TestError</title> - - - - - - - - - - - + + </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestError.quark.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestError.quark.page index 9140ac56..bab90dab 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestError.quark.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestError.quark.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,20 +13,13 @@ </api:returns> <api:name>regress_test_error_quark</api:name> </api:function> - </info> <title>regress_test_error_quark</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> GQuark regress_test_error_quark (void); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -35,6 +27,4 @@ GQuark regress_test_error_quark (void); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFlags.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFlags.page index d5bfeeb4..efab1a05 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestFlags.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFlags.page @@ -6,20 +6,9 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="default" type="guide"/> - + <link xref="index" group="default" type="guide"/> </info> <title>Regress.TestFlags</title> - - - - - - - - - - - + + </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFloating-parent_instance.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFloating-parent_instance.page new file mode 100644 index 00000000..c546875c --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFloating-parent_instance.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.TestFloating-parent_instance" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestFloating" group="field" type="guide"/> + </info> + <title>Regress.TestFloating->parent_instance</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFloating.new.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFloating.new.page index 5f4a3a5e..400e34a8 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestFloating.new.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFloating.new.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestFloating" group="constructor" type="guide"/> <api:function> <api:returns> @@ -14,27 +13,18 @@ </api:returns> <api:name>regress_test_floating_new</api:name> </api:function> - </info> <title>regress_test_floating_new</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> RegressTestFloating* regress_test_floating_new (void); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> -<p>A new floating <link xref="Regress.TestFloating"/></p> + <p>A new floating <link xref="Regress.TestFloating"/></p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFloating.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFloating.page index 11899127..3f8b267d 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestFloating.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFloating.page @@ -6,19 +6,11 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="class" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.TestFloating</title> - - - - - - - - + + <synopsis> <title>Hierarchy</title> <tree> @@ -33,8 +25,11 @@ </item> </tree> </synopsis> - - + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> <links type="topic" ui:expanded="true" api:type="function" api:mime="text/x-csrc" groups="method" style="linklist"> @@ -43,7 +38,7 @@ <links type="topic" ui:expanded="true" api:type="function" api:mime="text/x-csrc" groups="function" style="linklist"> - <title>Functions</title> + <title>Static Functions</title> </links> <links type="topic" ui:expanded="true" groups="property" style="linklist"> <title>Properties</title> @@ -54,8 +49,10 @@ <links type="topic" ui:expanded="true" groups="vfunc" style="linklist"> <title>Virtual functions</title> </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> <title>Other</title> </links> - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFloatingClass-parent_class.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFloatingClass-parent_class.page new file mode 100644 index 00000000..9196604d --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFloatingClass-parent_class.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.TestFloatingClass-parent_class" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestFloatingClass" group="field" type="guide"/> + </info> + <title>Regress.TestFloatingClass->parent_class</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFloatingClass.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFloatingClass.page index e7d5236c..234bf1f2 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestFloatingClass.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFloatingClass.page @@ -1,25 +1,35 @@ <?xml version="1.0"?> <page id="Regress.TestFloatingClass" - type="topic" - style="record" + type="guide" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="record" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.TestFloatingClass</title> - - - - - - - - - - - + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject-flags.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject-flags.page new file mode 100644 index 00000000..875ba302 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject-flags.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.TestFundamentalObject-flags" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestFundamentalObject" group="field" type="guide"/> + </info> + <title>Regress.TestFundamentalObject->flags</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject-instance.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject-instance.page new file mode 100644 index 00000000..693df033 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject-instance.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.TestFundamentalObject-instance" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestFundamentalObject" group="field" type="guide"/> + </info> + <title>Regress.TestFundamentalObject->instance</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject-refcount.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject-refcount.page new file mode 100644 index 00000000..3413765d --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject-refcount.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.TestFundamentalObject-refcount" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestFundamentalObject" group="field" type="guide"/> + </info> + <title>Regress.TestFundamentalObject->refcount</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject.page index 473f1afe..4289f4f0 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject.page @@ -6,19 +6,11 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="class" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.TestFundamentalObject</title> - - - - - - - - + + <synopsis> <title>Hierarchy</title> <tree> @@ -27,8 +19,11 @@ </item> </tree> </synopsis> - - + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> <links type="topic" ui:expanded="true" api:type="function" api:mime="text/x-csrc" groups="method" style="linklist"> @@ -37,7 +32,7 @@ <links type="topic" ui:expanded="true" api:type="function" api:mime="text/x-csrc" groups="function" style="linklist"> - <title>Functions</title> + <title>Static Functions</title> </links> <links type="topic" ui:expanded="true" groups="property" style="linklist"> <title>Properties</title> @@ -48,8 +43,10 @@ <links type="topic" ui:expanded="true" groups="vfunc" style="linklist"> <title>Virtual functions</title> </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> <title>Other</title> </links> - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject.ref.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject.ref.page index 3e63b1e6..fada7381 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject.ref.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject.ref.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestFundamentalObject" group="method" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>fundamental_object</api:name> </api:arg> </api:function> - </info> <title>regress_test_fundamental_object_ref</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> RegressTestFundamentalObject* regress_test_fundamental_object_ref (RegressTestFundamentalObject* fundamental_object); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>fundamental_object</code></title> @@ -39,10 +31,8 @@ RegressTestFundamentalObject* regress_test_fundamental_object_ref (RegressTestFu </item> <item> <title><code>Returns</code></title> -<p>A new <link xref="Regress.TestFundamentalObject"/></p> + <p>A new <link xref="Regress.TestFundamentalObject"/></p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject.unref.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject.unref.page index 6f5c16b4..726b1d58 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject.unref.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject.unref.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestFundamentalObject" group="method" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>fundamental_object</api:name> </api:arg> </api:function> - </info> <title>regress_test_fundamental_object_unref</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_test_fundamental_object_unref (RegressTestFundamentalObject* fundamental_object); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>fundamental_object</code></title> @@ -43,6 +35,4 @@ void regress_test_fundamental_object_unref (RegressTestFundamentalObject* fundam </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectClass-copy.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectClass-copy.page new file mode 100644 index 00000000..6b5178a6 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectClass-copy.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.TestFundamentalObjectClass-copy" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestFundamentalObjectClass" group="field" type="guide"/> + </info> + <title>Regress.TestFundamentalObjectClass->copy</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectClass-finalize.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectClass-finalize.page new file mode 100644 index 00000000..a7fdff42 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectClass-finalize.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.TestFundamentalObjectClass-finalize" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestFundamentalObjectClass" group="field" type="guide"/> + </info> + <title>Regress.TestFundamentalObjectClass->finalize</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectClass-type_class.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectClass-type_class.page new file mode 100644 index 00000000..57e088ca --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectClass-type_class.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.TestFundamentalObjectClass-type_class" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestFundamentalObjectClass" group="field" type="guide"/> + </info> + <title>Regress.TestFundamentalObjectClass->type_class</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectClass.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectClass.page index 443ce70f..38aea874 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectClass.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectClass.page @@ -1,25 +1,35 @@ <?xml version="1.0"?> <page id="Regress.TestFundamentalObjectClass" - type="topic" - style="record" + type="guide" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="record" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.TestFundamentalObjectClass</title> - - - - - - - - - - - + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectCopyFunction.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectCopyFunction.page index 73a33285..c6acc8fc 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectCopyFunction.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectCopyFunction.page @@ -1,25 +1,28 @@ <?xml version="1.0"?> <page id="Regress.TestFundamentalObjectCopyFunction" type="topic" - style="default" + style="callback" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="default" type="guide"/> - - </info> + <link xref="index" group="callback" type="guide"/> + </info> <title>Regress.TestFundamentalObjectCopyFunction</title> - - - - - - - - - - - + <synopsis><code mime="text/x-csrc"> +RegressTestFundamentalObject* TestFundamentalObjectCopyFunction (const RegressTestFundamentalObject* obj); + </code></synopsis> + + +<terms> +<item> +<title><code>obj</code></title> + +</item> +<item> +<title><code>Returns</code></title> + +</item> +</terms> + </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectFinalizeFunction.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectFinalizeFunction.page index df0e8fba..ee150dfa 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectFinalizeFunction.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectFinalizeFunction.page @@ -1,25 +1,28 @@ <?xml version="1.0"?> <page id="Regress.TestFundamentalObjectFinalizeFunction" type="topic" - style="default" + style="callback" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="default" type="guide"/> - - </info> + <link xref="index" group="callback" type="guide"/> + </info> <title>Regress.TestFundamentalObjectFinalizeFunction</title> - - - - - - - - - - - + <synopsis><code mime="text/x-csrc"> +void TestFundamentalObjectFinalizeFunction (RegressTestFundamentalObject* obj); + </code></synopsis> + + +<terms> +<item> +<title><code>obj</code></title> + +</item> +<item> +<title><code>Returns</code></title> + +</item> +</terms> + </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObject-data.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObject-data.page new file mode 100644 index 00000000..02269eb2 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObject-data.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.TestFundamentalSubObject-data" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestFundamentalSubObject" group="field" type="guide"/> + </info> + <title>Regress.TestFundamentalSubObject->data</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObject-fundamental_object.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObject-fundamental_object.page new file mode 100644 index 00000000..27c5cf4d --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObject-fundamental_object.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.TestFundamentalSubObject-fundamental_object" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestFundamentalSubObject" group="field" type="guide"/> + </info> + <title>Regress.TestFundamentalSubObject->fundamental_object</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObject.new.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObject.new.page index a4495401..13a41276 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObject.new.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObject.new.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestFundamentalSubObject" group="constructor" type="guide"/> @@ -20,20 +19,13 @@ <api:name>data</api:name> </api:arg> </api:function> - </info> <title>regress_test_fundamental_sub_object_new</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> RegressTestFundamentalSubObject* regress_test_fundamental_sub_object_new (const char* data); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>data</code></title> @@ -45,6 +37,4 @@ RegressTestFundamentalSubObject* regress_test_fundamental_sub_object_new (const </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObject.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObject.page index 6ed36089..d0a09c24 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObject.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObject.page @@ -6,19 +6,11 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="class" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.TestFundamentalSubObject</title> - - - - - - - - + + <synopsis> <title>Hierarchy</title> <tree> @@ -30,8 +22,11 @@ </item> </tree> </synopsis> - - + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> <links type="topic" ui:expanded="true" api:type="function" api:mime="text/x-csrc" groups="method" style="linklist"> @@ -40,7 +35,7 @@ <links type="topic" ui:expanded="true" api:type="function" api:mime="text/x-csrc" groups="function" style="linklist"> - <title>Functions</title> + <title>Static Functions</title> </links> <links type="topic" ui:expanded="true" groups="property" style="linklist"> <title>Properties</title> @@ -51,8 +46,10 @@ <links type="topic" ui:expanded="true" groups="vfunc" style="linklist"> <title>Virtual functions</title> </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> <title>Other</title> </links> - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObjectClass-fundamental_object_class.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObjectClass-fundamental_object_class.page new file mode 100644 index 00000000..a9faf9aa --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObjectClass-fundamental_object_class.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.TestFundamentalSubObjectClass-fundamental_object_class" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestFundamentalSubObjectClass" group="field" type="guide"/> + </info> + <title>Regress.TestFundamentalSubObjectClass->fundamental_object_class</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObjectClass.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObjectClass.page index 79e14d5a..1947fa4c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObjectClass.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObjectClass.page @@ -1,25 +1,35 @@ <?xml version="1.0"?> <page id="Regress.TestFundamentalSubObjectClass" - type="topic" - style="record" + type="guide" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="record" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.TestFundamentalSubObjectClass</title> - - - - - - - - - - - + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable-parent_instance.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable-parent_instance.page new file mode 100644 index 00000000..2295febc --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable-parent_instance.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.TestInheritDrawable-parent_instance" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestInheritDrawable" group="field" type="guide"/> + </info> + <title>Regress.TestInheritDrawable->parent_instance</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.do_foo.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.do_foo.page index 24bd9c4a..7d6bcde6 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.do_foo.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.do_foo.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestInheritDrawable" group="method" type="guide"/> <api:function> <api:returns> @@ -22,21 +21,14 @@ <api:name>x</api:name> </api:arg> </api:function> - </info> <title>regress_test_inherit_drawable_do_foo</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_test_inherit_drawable_do_foo (RegressTestInheritDrawable* drawable, int x); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>drawable</code></title> @@ -52,6 +44,4 @@ void regress_test_inherit_drawable_do_foo (RegressTestInheritDrawable* drawable, </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page index e90dcd18..1a62b790 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestInheritDrawable" group="method" type="guide"/> <api:function> <api:returns> @@ -22,21 +21,14 @@ <api:name>x</api:name> </api:arg> </api:function> - </info> <title>regress_test_inherit_drawable_do_foo_maybe_throw</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_test_inherit_drawable_do_foo_maybe_throw (RegressTestInheritDrawable* drawable, int x); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>drawable</code></title> @@ -52,6 +44,4 @@ void regress_test_inherit_drawable_do_foo_maybe_throw (RegressTestInheritDrawabl </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.get_origin.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.get_origin.page index 9ab00c6e..7a330194 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.get_origin.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.get_origin.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestInheritDrawable" group="method" type="guide"/> <api:function> <api:returns> @@ -26,22 +25,15 @@ <api:name>y</api:name> </api:arg> </api:function> - </info> <title>regress_test_inherit_drawable_get_origin</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_test_inherit_drawable_get_origin (RegressTestInheritDrawable* drawable, int* x, int* y); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>drawable</code></title> @@ -61,6 +53,4 @@ void regress_test_inherit_drawable_get_origin (RegressTestInheritDrawable* drawa </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.get_size.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.get_size.page index c9c778e8..2e74a298 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.get_size.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.get_size.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestInheritDrawable" group="method" type="guide"/> <api:function> <api:returns> @@ -26,22 +25,15 @@ <api:name>height</api:name> </api:arg> </api:function> - </info> <title>regress_test_inherit_drawable_get_size</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_test_inherit_drawable_get_size (RegressTestInheritDrawable* drawable, guint* width, guint* height); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>drawable</code></title> @@ -61,6 +53,4 @@ void regress_test_inherit_drawable_get_size (RegressTestInheritDrawable* drawabl </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.page index 20ef3ff7..fae72642 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.page @@ -6,19 +6,11 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="class" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.TestInheritDrawable</title> - - - - - - - - + + <synopsis> <title>Hierarchy</title> <tree> @@ -30,8 +22,11 @@ </item> </tree> </synopsis> - - + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> <links type="topic" ui:expanded="true" api:type="function" api:mime="text/x-csrc" groups="method" style="linklist"> @@ -40,7 +35,7 @@ <links type="topic" ui:expanded="true" api:type="function" api:mime="text/x-csrc" groups="function" style="linklist"> - <title>Functions</title> + <title>Static Functions</title> </links> <links type="topic" ui:expanded="true" groups="property" style="linklist"> <title>Properties</title> @@ -51,8 +46,10 @@ <links type="topic" ui:expanded="true" groups="vfunc" style="linklist"> <title>Virtual functions</title> </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> <title>Other</title> </links> - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawableClass-parent_class.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawableClass-parent_class.page new file mode 100644 index 00000000..b14538c9 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawableClass-parent_class.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.TestInheritDrawableClass-parent_class" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestInheritDrawableClass" group="field" type="guide"/> + </info> + <title>Regress.TestInheritDrawableClass->parent_class</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawableClass.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawableClass.page index 2579f564..58369c48 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawableClass.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawableClass.page @@ -1,25 +1,35 @@ <?xml version="1.0"?> <page id="Regress.TestInheritDrawableClass" - type="topic" - style="record" + type="guide" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="record" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.TestInheritDrawableClass</title> - - - - - - - - - - - + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritPixmapObjectClass-parent_class.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritPixmapObjectClass-parent_class.page new file mode 100644 index 00000000..bf056d8d --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritPixmapObjectClass-parent_class.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.TestInheritPixmapObjectClass-parent_class" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestInheritPixmapObjectClass" group="field" type="guide"/> + </info> + <title>Regress.TestInheritPixmapObjectClass->parent_class</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritPixmapObjectClass.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritPixmapObjectClass.page index 3cf69e80..b5e07b40 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritPixmapObjectClass.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritPixmapObjectClass.page @@ -1,25 +1,35 @@ <?xml version="1.0"?> <page id="Regress.TestInheritPixmapObjectClass" - type="topic" - style="record" + type="guide" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="record" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.TestInheritPixmapObjectClass</title> - - - - - - - - - - - + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestInterface.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestInterface.page index 1c53fd47..19e45215 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestInterface.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestInterface.page @@ -1,34 +1,29 @@ <?xml version="1.0"?> <page id="Regress.TestInterface" type="guide" - style="class" + style="interface" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="class" type="guide"/> - + <link xref="index" group="interface" type="guide"/> </info> <title>Regress.TestInterface</title> - - - - - - - - + + <synopsis> - <title>Hierarchy</title> - <tree> - <item> - <code>Regress.TestInterface</code> - </item> - </tree> + <title>Prerequisites</title> + <p>TestInterface requires GObject.Object</p> + </synopsis> + <synopsis> + <title>Known Implementations</title> + <p>None</p> </synopsis> - - + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> <links type="topic" ui:expanded="true" api:type="function" api:mime="text/x-csrc" groups="method" style="linklist"> @@ -37,7 +32,7 @@ <links type="topic" ui:expanded="true" api:type="function" api:mime="text/x-csrc" groups="function" style="linklist"> - <title>Functions</title> + <title>Static Functions</title> </links> <links type="topic" ui:expanded="true" groups="property" style="linklist"> <title>Properties</title> @@ -48,8 +43,10 @@ <links type="topic" ui:expanded="true" groups="vfunc" style="linklist"> <title>Virtual functions</title> </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> <title>Other</title> </links> - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestInterfaceIface-base_iface.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestInterfaceIface-base_iface.page new file mode 100644 index 00000000..f9454e11 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestInterfaceIface-base_iface.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.TestInterfaceIface-base_iface" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestInterfaceIface" group="field" type="guide"/> + </info> + <title>Regress.TestInterfaceIface->base_iface</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestInterfaceIface.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestInterfaceIface.page index a643e5dc..ced653c5 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestInterfaceIface.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestInterfaceIface.page @@ -1,25 +1,35 @@ <?xml version="1.0"?> <page id="Regress.TestInterfaceIface" - type="topic" - style="record" + type="guide" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="record" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.TestInterfaceIface</title> - - - - - - - - - - - + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-all.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-all.page index 37b5dd32..936be816 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-all.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-all.page @@ -6,23 +6,15 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestObj" group="signal" type="guide"/> <title type="link" role="topic">all</title> - </info> <title>Regress.TestObj::all</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void all (void); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -30,6 +22,4 @@ void all (void); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-allow_none_vfunc.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-allow_none_vfunc.page index f3447b5a..fa78f228 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-allow_none_vfunc.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-allow_none_vfunc.page @@ -6,23 +6,15 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestObj" group="vfunc" type="guide"/> - </info> <title>Regress.TestObj::allow_none_vfunc</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void allow_none_vfunc (RegressTestObj* obj, RegressTestObj* two); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>obj</code></title> @@ -30,7 +22,7 @@ void allow_none_vfunc (RegressTestObj* obj, </item> <item> <title><code>two</code></title> -<p>Another object</p> + <p>Another object</p> </item> <item> <title><code>Returns</code></title> @@ -38,6 +30,4 @@ void allow_none_vfunc (RegressTestObj* obj, </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-bare.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-bare.page index 4873a1c5..c4ea79a1 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-bare.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-bare.page @@ -6,21 +6,10 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestObj" group="property" type="guide"/> <title type="link" role="topic">bare</title> - </info> <title>Regress.TestObj:bare</title> - - - - - - - - - - - + + </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-boxed.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-boxed.page index 460104bf..61597b99 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-boxed.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-boxed.page @@ -6,21 +6,10 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestObj" group="property" type="guide"/> <title type="link" role="topic">boxed</title> - </info> <title>Regress.TestObj:boxed</title> - - - - - - - - - - - + + </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-cleanup.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-cleanup.page index bef9537e..bf23ce2f 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-cleanup.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-cleanup.page @@ -6,23 +6,15 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestObj" group="signal" type="guide"/> <title type="link" role="topic">cleanup</title> - </info> <title>Regress.TestObj::cleanup</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void cleanup (void); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -30,6 +22,4 @@ void cleanup (void); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-double.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-double.page index bb907ab8..0115614b 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-double.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-double.page @@ -6,21 +6,10 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestObj" group="property" type="guide"/> <title type="link" role="topic">double</title> - </info> <title>Regress.TestObj:double</title> - - - - - - - - - - - + + </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-first.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-first.page index 5600be6f..e9e31d35 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-first.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-first.page @@ -6,23 +6,15 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestObj" group="signal" type="guide"/> <title type="link" role="topic">first</title> - </info> <title>Regress.TestObj::first</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void first (void); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -30,6 +22,4 @@ void first (void); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-float.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-float.page index a981cf86..64ad436f 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-float.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-float.page @@ -6,21 +6,10 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestObj" group="property" type="guide"/> <title type="link" role="topic">float</title> - </info> <title>Regress.TestObj:float</title> - - - - - - - - - - - + + </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-gtype.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-gtype.page index 2fbf9d93..2b8adb7b 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-gtype.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-gtype.page @@ -6,21 +6,10 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestObj" group="property" type="guide"/> <title type="link" role="topic">gtype</title> - </info> <title>Regress.TestObj:gtype</title> - - - - - - - - - - - + + </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-hash-table-old.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-hash-table-old.page index 003425bb..46c5046a 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-hash-table-old.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-hash-table-old.page @@ -6,21 +6,10 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestObj" group="property" type="guide"/> <title type="link" role="topic">hash-table-old</title> - </info> <title>Regress.TestObj:hash-table-old</title> - - - - - - - - - - - + + </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-hash-table.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-hash-table.page index f11e4657..c90c44d7 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-hash-table.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-hash-table.page @@ -6,21 +6,10 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestObj" group="property" type="guide"/> <title type="link" role="topic">hash-table</title> - </info> <title>Regress.TestObj:hash-table</title> - - - - - - - - - - - + + </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-hash_table.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-hash_table.page new file mode 100644 index 00000000..40653a90 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-hash_table.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.TestObj-hash_table" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestObj" group="field" type="guide"/> + </info> + <title>Regress.TestObj->hash_table</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-int.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-int.page index 95a4902c..3ba1d112 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-int.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-int.page @@ -6,21 +6,10 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestObj" group="property" type="guide"/> <title type="link" role="topic">int</title> - </info> <title>Regress.TestObj:int</title> - - - - - - - - - - - + + </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-list-old.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-list-old.page index 680636d2..29708fe9 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-list-old.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-list-old.page @@ -6,21 +6,10 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestObj" group="property" type="guide"/> <title type="link" role="topic">list-old</title> - </info> <title>Regress.TestObj:list-old</title> - - - - - - - - - - - + + </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-list.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-list.page index 7ea5130b..4e1abc86 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-list.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-list.page @@ -6,21 +6,10 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestObj" group="property" type="guide"/> <title type="link" role="topic">list</title> - </info> <title>Regress.TestObj:list</title> - - - - - - - - - - - + + </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-matrix.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-matrix.page index 43203655..7fb7eca3 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-matrix.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-matrix.page @@ -6,33 +6,25 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestObj" group="vfunc" type="guide"/> - </info> <title>Regress.TestObj::matrix</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> int matrix (RegressTestObj* obj, const char* somestr); -</code></synopsis> - - - <p>This method is virtual. Notably its name differs from the virtual + </code></synopsis> + <p>This method is virtual. Notably its name differs from the virtual slot name, which makes it useful for testing bindings handle this case.</p> - - - - + <terms> <item> <title><code>obj</code></title> -<p>A <link xref="Regress.TestObj"/></p> + <p>A <link xref="Regress.TestObj"/></p> </item> <item> <title><code>somestr</code></title> -<p>Meaningless string</p> + <p>Meaningless string</p> </item> <item> <title><code>Returns</code></title> @@ -40,6 +32,4 @@ case.</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-parent_instance.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-parent_instance.page new file mode 100644 index 00000000..52b356b4 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-parent_instance.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.TestObj-parent_instance" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestObj" group="field" type="guide"/> + </info> + <title>Regress.TestObj->parent_instance</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-array-len-prop.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-array-len-prop.page index 9ec983b1..dcb254b1 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-array-len-prop.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-array-len-prop.page @@ -6,32 +6,24 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestObj" group="signal" type="guide"/> <title type="link" role="topic">sig-with-array-len-prop</title> - </info> <title>Regress.TestObj::sig-with-array-len-prop</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void sig-with-array-len-prop (guint* arr, gint len); -</code></synopsis> + </code></synopsis> + <p>This test signal similar to GSettings::change-event</p> - - <p>This test signal similar to GSettings::change-event</p> - - - - <terms> <item> <title><code>arr</code></title> -<p>numbers, or <code>NULL</code></p> + <p>numbers, or <code>NULL</code></p> </item> <item> <title><code>len</code></title> -<p>length of <code>arr</code>, or 0</p> + <p>length of <code>arr</code>, or 0</p> </item> <item> <title><code>Returns</code></title> @@ -39,6 +31,4 @@ void sig-with-array-len-prop (guint* arr, </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-array-prop.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-array-prop.page index 05b911c2..190a191f 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-array-prop.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-array-prop.page @@ -6,28 +6,20 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestObj" group="signal" type="guide"/> <title type="link" role="topic">sig-with-array-prop</title> - </info> <title>Regress.TestObj::sig-with-array-prop</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void sig-with-array-prop (guint* arr); -</code></synopsis> - - - <p>This test signal is like TelepathyGlib's + </code></synopsis> + <p>This test signal is like TelepathyGlib's TpChannel:: group-members-changed-detailed:</p> - - - - + <terms> <item> <title><code>arr</code></title> -<p>numbers</p> + <p>numbers</p> </item> <item> <title><code>Returns</code></title> @@ -35,6 +27,4 @@ void sig-with-array-prop (guint* arr); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-foreign-struct.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-foreign-struct.page index c2cb8822..cf6147f5 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-foreign-struct.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-foreign-struct.page @@ -6,27 +6,19 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestObj" group="signal" type="guide"/> <title type="link" role="topic">sig-with-foreign-struct</title> - </info> <title>Regress.TestObj::sig-with-foreign-struct</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void sig-with-foreign-struct (cairo_t cr); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>cr</code></title> -<p>A cairo context.</p> + <p>A cairo context.</p> </item> <item> <title><code>Returns</code></title> @@ -34,6 +26,4 @@ void sig-with-foreign-struct (cairo_t cr); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-hash-prop.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-hash-prop.page index 9ddd536c..c3cce66e 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-hash-prop.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-hash-prop.page @@ -6,24 +6,16 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestObj" group="signal" type="guide"/> <title type="link" role="topic">sig-with-hash-prop</title> - </info> <title>Regress.TestObj::sig-with-hash-prop</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void sig-with-hash-prop (<map> hash); -</code></synopsis> - - - <p>This test signal is like TelepathyGlib's + </code></synopsis> + <p>This test signal is like TelepathyGlib's TpAccount::status-changed</p> - - - - + <terms> <item> <title><code>hash</code></title> @@ -35,6 +27,4 @@ void sig-with-hash-prop (<map> hash); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-int64-prop.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-int64-prop.page index d8a90378..900d7ea0 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-int64-prop.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-int64-prop.page @@ -6,28 +6,20 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestObj" group="signal" type="guide"/> <title type="link" role="topic">sig-with-int64-prop</title> - </info> <title>Regress.TestObj::sig-with-int64-prop</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> gint64 sig-with-int64-prop (gint64 i); -</code></synopsis> - - - <p>You can use this with regress_test_obj_emit_sig_with_int64, or raise from + </code></synopsis> + <p>You can use this with regress_test_obj_emit_sig_with_int64, or raise from the introspection client langage.</p> - - - - + <terms> <item> <title><code>i</code></title> -<p>an integer</p> + <p>an integer</p> </item> <item> <title><code>Returns</code></title> @@ -35,6 +27,4 @@ the introspection client langage.</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-intarray-ret.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-intarray-ret.page index 7f041e23..b9be7d5c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-intarray-ret.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-intarray-ret.page @@ -6,27 +6,19 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestObj" group="signal" type="guide"/> <title type="link" role="topic">sig-with-intarray-ret</title> - </info> <title>Regress.TestObj::sig-with-intarray-ret</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> None sig-with-intarray-ret (gint i); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>i</code></title> -<p>an integer</p> + <p>an integer</p> </item> <item> <title><code>Returns</code></title> @@ -34,6 +26,4 @@ None sig-with-intarray-ret (gint i); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-obj.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-obj.page index 9d69a6fe..d8e9d5f8 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-obj.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-obj.page @@ -6,28 +6,20 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestObj" group="signal" type="guide"/> <title type="link" role="topic">sig-with-obj</title> - </info> <title>Regress.TestObj::sig-with-obj</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void sig-with-obj (GObject obj); -</code></synopsis> - - - <p>Test transfer none GObject as a param (tests refcounting). + </code></synopsis> + <p>Test transfer none GObject as a param (tests refcounting). Use with regress_test_obj_emit_sig_with_obj</p> - - - - + <terms> <item> <title><code>obj</code></title> -<p>A newly created RegressTestObj</p> + <p>A newly created RegressTestObj</p> </item> <item> <title><code>Returns</code></title> @@ -35,6 +27,4 @@ Use with regress_test_obj_emit_sig_with_obj</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-strv.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-strv.page index 919d38f6..f2b29116 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-strv.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-strv.page @@ -6,27 +6,19 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestObj" group="signal" type="guide"/> <title type="link" role="topic">sig-with-strv</title> - </info> <title>Regress.TestObj::sig-with-strv</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void sig-with-strv (utf8* strs); -</code></synopsis> + </code></synopsis> + <p>Test GStrv as a param.</p> - - <p>Test GStrv as a param.</p> - - - - <terms> <item> <title><code>strs</code></title> -<p>strings</p> + <p>strings</p> </item> <item> <title><code>Returns</code></title> @@ -34,6 +26,4 @@ void sig-with-strv (utf8* strs); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-uint64-prop.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-uint64-prop.page index 6ee6bda3..3bb5b5e7 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-uint64-prop.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-uint64-prop.page @@ -6,28 +6,20 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestObj" group="signal" type="guide"/> <title type="link" role="topic">sig-with-uint64-prop</title> - </info> <title>Regress.TestObj::sig-with-uint64-prop</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> guint64 sig-with-uint64-prop (guint64 i); -</code></synopsis> - - - <p>You can use this with regress_test_obj_emit_sig_with_uint64, or raise from + </code></synopsis> + <p>You can use this with regress_test_obj_emit_sig_with_uint64, or raise from the introspection client langage.</p> - - - - + <terms> <item> <title><code>i</code></title> -<p>an integer</p> + <p>an integer</p> </item> <item> <title><code>Returns</code></title> @@ -35,6 +27,4 @@ the introspection client langage.</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-some_double.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-some_double.page new file mode 100644 index 00000000..ffd77f1b --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-some_double.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.TestObj-some_double" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestObj" group="field" type="guide"/> + </info> + <title>Regress.TestObj->some_double</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-some_float.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-some_float.page new file mode 100644 index 00000000..0c22a207 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-some_float.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.TestObj-some_float" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestObj" group="field" type="guide"/> + </info> + <title>Regress.TestObj->some_float</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-some_int8.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-some_int8.page new file mode 100644 index 00000000..88368896 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-some_int8.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.TestObj-some_int8" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestObj" group="field" type="guide"/> + </info> + <title>Regress.TestObj->some_int8</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-string.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-string.page index 1ae48038..d548cb9a 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-string.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-string.page @@ -6,21 +6,10 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestObj" group="property" type="guide"/> <title type="link" role="topic">string</title> - </info> <title>Regress.TestObj:string</title> - - - - - - - - - - - + + </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-test-with-static-scope-arg.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-test-with-static-scope-arg.page index 1ffe66e4..f4bf0abb 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-test-with-static-scope-arg.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-test-with-static-scope-arg.page @@ -6,23 +6,15 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestObj" group="signal" type="guide"/> <title type="link" role="topic">test-with-static-scope-arg</title> - </info> <title>Regress.TestObj::test-with-static-scope-arg</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void test-with-static-scope-arg (RegressTestSimpleBoxedA object); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>object</code></title> @@ -34,6 +26,4 @@ void test-with-static-scope-arg (RegressTestSimpleBoxedA object); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-test.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-test.page index 15599c6d..5ac080ea 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-test.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-test.page @@ -6,23 +6,15 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestObj" group="signal" type="guide"/> <title type="link" role="topic">test</title> - </info> <title>Regress.TestObj::test</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void test (void); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -30,6 +22,4 @@ void test (void); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.constructor.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.constructor.page index 8efd1619..bf3b58ae 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.constructor.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.constructor.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestObj" group="constructor" type="guide"/> <api:function> <api:returns> @@ -14,20 +13,13 @@ </api:returns> <api:name>regress_constructor</api:name> </api:function> - </info> <title>regress_constructor</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> RegressTestObj* regress_constructor (void); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -35,6 +27,4 @@ RegressTestObj* regress_constructor (void); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.do_matrix.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.do_matrix.page index bc4e7627..da367ee7 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.do_matrix.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.do_matrix.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestObj" group="method" type="guide"/> <api:function> <api:returns> @@ -22,31 +21,24 @@ <api:name>somestr</api:name> </api:arg> </api:function> - </info> <title>regress_test_obj_do_matrix</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> int regress_test_obj_do_matrix (RegressTestObj* obj, const char* somestr); -</code></synopsis> - - - <p>This method is virtual. Notably its name differs from the virtual + </code></synopsis> + <p>This method is virtual. Notably its name differs from the virtual slot name, which makes it useful for testing bindings handle this case.</p> - - - - + <terms> <item> <title><code>obj</code></title> -<p>A <link xref="Regress.TestObj"/></p> + <p>A <link xref="Regress.TestObj"/></p> </item> <item> <title><code>somestr</code></title> -<p>Meaningless string</p> + <p>Meaningless string</p> </item> <item> <title><code>Returns</code></title> @@ -54,6 +46,4 @@ case.</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_foreign_struct.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_foreign_struct.page index 1ba84366..38fa1856 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_foreign_struct.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_foreign_struct.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestObj" group="method" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>obj</api:name> </api:arg> </api:function> - </info> <title>regress_test_obj_emit_sig_with_foreign_struct</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_test_obj_emit_sig_with_foreign_struct (RegressTestObj* obj); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>obj</code></title> @@ -43,6 +35,4 @@ void regress_test_obj_emit_sig_with_foreign_struct (RegressTestObj* obj); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_int64.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_int64.page index 24f58265..97e1c9f0 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_int64.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_int64.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestObj" group="method" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>obj</api:name> </api:arg> </api:function> - </info> <title>regress_test_obj_emit_sig_with_int64</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_test_obj_emit_sig_with_int64 (RegressTestObj* obj); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>obj</code></title> @@ -43,6 +35,4 @@ void regress_test_obj_emit_sig_with_int64 (RegressTestObj* obj); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_obj.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_obj.page index e0d123e1..195f4a08 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_obj.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_obj.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestObj" group="method" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>obj</api:name> </api:arg> </api:function> - </info> <title>regress_test_obj_emit_sig_with_obj</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_test_obj_emit_sig_with_obj (RegressTestObj* obj); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>obj</code></title> @@ -43,6 +35,4 @@ void regress_test_obj_emit_sig_with_obj (RegressTestObj* obj); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_uint64.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_uint64.page index 0c2c68c2..b5ed20da 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_uint64.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_uint64.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestObj" group="method" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>obj</api:name> </api:arg> </api:function> - </info> <title>regress_test_obj_emit_sig_with_uint64</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_test_obj_emit_sig_with_uint64 (RegressTestObj* obj); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>obj</code></title> @@ -43,6 +35,4 @@ void regress_test_obj_emit_sig_with_uint64 (RegressTestObj* obj); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.forced_method.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.forced_method.page index 92bfa2db..3c59d28a 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.forced_method.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.forced_method.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestObj" group="method" type="guide"/> <api:function> <api:returns> @@ -18,24 +17,17 @@ <api:name>obj</api:name> </api:arg> </api:function> - </info> <title>regress_forced_method</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_forced_method (RegressTestObj* obj); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>obj</code></title> -<p>A <link xref="Regress.TestObj"/></p> + <p>A <link xref="Regress.TestObj"/></p> </item> <item> <title><code>Returns</code></title> @@ -43,6 +35,4 @@ void regress_forced_method (RegressTestObj* obj); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.instance_method.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.instance_method.page index 74692389..673e7e05 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.instance_method.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.instance_method.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestObj" group="method" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>obj</api:name> </api:arg> </api:function> - </info> <title>regress_test_obj_instance_method</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> int regress_test_obj_instance_method (RegressTestObj* obj); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>obj</code></title> @@ -43,6 +35,4 @@ int regress_test_obj_instance_method (RegressTestObj* obj); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.instance_method_callback.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.instance_method_callback.page index 668096a2..ecf8e54e 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.instance_method_callback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.instance_method_callback.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestObj" group="method" type="guide"/> <api:function> <api:returns> @@ -22,21 +21,14 @@ <api:name>callback</api:name> </api:arg> </api:function> - </info> <title>regress_test_obj_instance_method_callback</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_test_obj_instance_method_callback (RegressTestObj* obj, RegressTestCallback callback); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>obj</code></title> @@ -52,6 +44,4 @@ void regress_test_obj_instance_method_callback (RegressTestObj* obj, </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.new.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.new.page index e931f7da..1144f602 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.new.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.new.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestObj" group="constructor" type="guide"/> <api:function> <api:returns> @@ -18,24 +17,17 @@ <api:name>obj</api:name> </api:arg> </api:function> - </info> <title>regress_test_obj_new</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> RegressTestObj* regress_test_obj_new (RegressTestObj* obj); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>obj</code></title> -<p>A <link xref="Regress.TestObj"/></p> + <p>A <link xref="Regress.TestObj"/></p> </item> <item> <title><code>Returns</code></title> @@ -43,6 +35,4 @@ RegressTestObj* regress_test_obj_new (RegressTestObj* obj); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.new_callback.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.new_callback.page index d2ec5f63..0fdb54c6 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.new_callback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.new_callback.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestObj" group="constructor" type="guide"/> <api:function> <api:returns> @@ -26,22 +25,15 @@ <api:name>notify</api:name> </api:arg> </api:function> - </info> <title>regress_test_obj_new_callback</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> RegressTestObj* regress_test_obj_new_callback (RegressTestCallbackUserData callback, gpointer user_data, GDestroyNotify notify); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>callback</code></title> @@ -61,6 +53,4 @@ RegressTestObj* regress_test_obj_new_callback (RegressTestCallbackUserData callb </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.new_from_file.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.new_from_file.page index a77e915a..21dc2b4b 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.new_from_file.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.new_from_file.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestObj" group="constructor" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>x</api:name> </api:arg> </api:function> - </info> <title>regress_test_obj_new_from_file</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> RegressTestObj* regress_test_obj_new_from_file (const char* x); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>x</code></title> @@ -43,6 +35,4 @@ RegressTestObj* regress_test_obj_new_from_file (const char* x); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.null_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.null_out.page index c86b4b21..c79e3049 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.null_out.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.null_out.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestObj" group="function" type="guide"/> <api:function> <api:returns> @@ -18,24 +17,17 @@ <api:name>obj</api:name> </api:arg> </api:function> - </info> <title>regress_test_obj_null_out</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_test_obj_null_out (RegressTestObj** obj); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>obj</code></title> -<p>A <link xref="Regress.TestObj"/></p> + <p>A <link xref="Regress.TestObj"/></p> </item> <item> <title><code>Returns</code></title> @@ -43,6 +35,4 @@ void regress_test_obj_null_out (RegressTestObj** obj); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.page index 42f26db1..89508582 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.page @@ -6,19 +6,11 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="class" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.TestObj</title> - - - - - - - - + + <synopsis> <title>Hierarchy</title> <tree> @@ -30,8 +22,11 @@ </item> </tree> </synopsis> - - + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> <links type="topic" ui:expanded="true" api:type="function" api:mime="text/x-csrc" groups="method" style="linklist"> @@ -40,7 +35,7 @@ <links type="topic" ui:expanded="true" api:type="function" api:mime="text/x-csrc" groups="function" style="linklist"> - <title>Functions</title> + <title>Static Functions</title> </links> <links type="topic" ui:expanded="true" groups="property" style="linklist"> <title>Properties</title> @@ -51,8 +46,10 @@ <links type="topic" ui:expanded="true" groups="vfunc" style="linklist"> <title>Virtual functions</title> </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> <title>Other</title> </links> - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.set_bare.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.set_bare.page index 160b8d2b..cfcdd657 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.set_bare.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.set_bare.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestObj" group="method" type="guide"/> <api:function> <api:returns> @@ -22,21 +21,14 @@ <api:name>bare</api:name> </api:arg> </api:function> - </info> <title>regress_test_obj_set_bare</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_test_obj_set_bare (RegressTestObj* obj, GObject* bare); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>obj</code></title> @@ -52,6 +44,4 @@ void regress_test_obj_set_bare (RegressTestObj* obj, </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_inout_param.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_inout_param.page index 333d170a..b8d64c74 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_inout_param.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_inout_param.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestObj" group="method" type="guide"/> <api:function> <api:returns> @@ -46,11 +45,9 @@ <api:name>num2</api:name> </api:arg> </api:function> - </info> <title>regress_test_obj_skip_inout_param</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> gboolean regress_test_obj_skip_inout_param (RegressTestObj* obj, gint a, gint* out_b, @@ -59,53 +56,46 @@ gboolean regress_test_obj_skip_inout_param (RegressTestObj* obj, gint* out_sum, gint num1, gint num2); -</code></synopsis> + </code></synopsis> + <p>Check that the out value is skipped</p> - - <p>Check that the out value is skipped</p> - - - - <terms> <item> <title><code>obj</code></title> -<p>A <link xref="Regress.TestObj"/>.</p> + <p>A <link xref="Regress.TestObj"/>.</p> </item> <item> <title><code>a</code></title> -<p>Parameter.</p> + <p>Parameter.</p> </item> <item> <title><code>out_b</code></title> -<p>Return value.</p> + <p>Return value.</p> </item> <item> <title><code>c</code></title> -<p>Other parameter.</p> + <p>Other parameter.</p> </item> <item> <title><code>inout_d</code></title> -<p>Will be incremented.</p> + <p>Will be incremented.</p> </item> <item> <title><code>out_sum</code></title> -<p>Return value.</p> + <p>Return value.</p> </item> <item> <title><code>num1</code></title> -<p>Number.</p> + <p>Number.</p> </item> <item> <title><code>num2</code></title> -<p>Number.</p> + <p>Number.</p> </item> <item> <title><code>Returns</code></title> -<p><code>TRUE</code> if the call succeeds, <code>FALSE</code> if @error is set.</p> + <p><code>TRUE</code> if the call succeeds, <code>FALSE</code> if @error is set.</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_out_param.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_out_param.page index 1df6c18e..fc4cdd50 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_out_param.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_out_param.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestObj" group="method" type="guide"/> <api:function> <api:returns> @@ -46,11 +45,9 @@ <api:name>num2</api:name> </api:arg> </api:function> - </info> <title>regress_test_obj_skip_out_param</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> gboolean regress_test_obj_skip_out_param (RegressTestObj* obj, gint a, gint* out_b, @@ -59,53 +56,46 @@ gboolean regress_test_obj_skip_out_param (RegressTestObj* obj, gint* out_sum, gint num1, gint num2); -</code></synopsis> + </code></synopsis> + <p>Check that the out value is skipped</p> - - <p>Check that the out value is skipped</p> - - - - <terms> <item> <title><code>obj</code></title> -<p>A <link xref="Regress.TestObj"/>.</p> + <p>A <link xref="Regress.TestObj"/>.</p> </item> <item> <title><code>a</code></title> -<p>Parameter.</p> + <p>Parameter.</p> </item> <item> <title><code>out_b</code></title> -<p>Return value.</p> + <p>Return value.</p> </item> <item> <title><code>c</code></title> -<p>Other parameter.</p> + <p>Other parameter.</p> </item> <item> <title><code>inout_d</code></title> -<p>Will be incremented.</p> + <p>Will be incremented.</p> </item> <item> <title><code>out_sum</code></title> -<p>Return value.</p> + <p>Return value.</p> </item> <item> <title><code>num1</code></title> -<p>Number.</p> + <p>Number.</p> </item> <item> <title><code>num2</code></title> -<p>Number.</p> + <p>Number.</p> </item> <item> <title><code>Returns</code></title> -<p><code>TRUE</code> if the call succeeds, <code>FALSE</code> if @error is set.</p> + <p><code>TRUE</code> if the call succeeds, <code>FALSE</code> if @error is set.</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_param.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_param.page index deca81bd..a9a3448d 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_param.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_param.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestObj" group="method" type="guide"/> <api:function> <api:returns> @@ -46,11 +45,9 @@ <api:name>num2</api:name> </api:arg> </api:function> - </info> <title>regress_test_obj_skip_param</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> gboolean regress_test_obj_skip_param (RegressTestObj* obj, gint a, gint* out_b, @@ -59,53 +56,46 @@ gboolean regress_test_obj_skip_param (RegressTestObj* obj, gint* out_sum, gint num1, gint num2); -</code></synopsis> + </code></synopsis> + <p>Check that a parameter is skipped</p> - - <p>Check that a parameter is skipped</p> - - - - <terms> <item> <title><code>obj</code></title> -<p>A <link xref="Regress.TestObj"/>.</p> + <p>A <link xref="Regress.TestObj"/>.</p> </item> <item> <title><code>a</code></title> -<p>Parameter.</p> + <p>Parameter.</p> </item> <item> <title><code>out_b</code></title> -<p>Return value.</p> + <p>Return value.</p> </item> <item> <title><code>c</code></title> -<p>Other parameter.</p> + <p>Other parameter.</p> </item> <item> <title><code>inout_d</code></title> -<p>Will be incremented.</p> + <p>Will be incremented.</p> </item> <item> <title><code>out_sum</code></title> -<p>Return value.</p> + <p>Return value.</p> </item> <item> <title><code>num1</code></title> -<p>Number.</p> + <p>Number.</p> </item> <item> <title><code>num2</code></title> -<p>Number.</p> + <p>Number.</p> </item> <item> <title><code>Returns</code></title> -<p><code>TRUE</code> if the call succeeds, <code>FALSE</code> if @error is set.</p> + <p><code>TRUE</code> if the call succeeds, <code>FALSE</code> if @error is set.</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_return_val.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_return_val.page index 47402c99..6f69b9bb 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_return_val.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_return_val.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestObj" group="method" type="guide"/> <api:function> <api:returns> @@ -46,11 +45,9 @@ <api:name>num2</api:name> </api:arg> </api:function> - </info> <title>regress_test_obj_skip_return_val</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> gboolean regress_test_obj_skip_return_val (RegressTestObj* obj, gint a, gint* out_b, @@ -59,53 +56,46 @@ gboolean regress_test_obj_skip_return_val (RegressTestObj* obj, gint* out_sum, gint num1, gint num2); -</code></synopsis> + </code></synopsis> + <p>Check that the return value is skipped</p> - - <p>Check that the return value is skipped</p> - - - - <terms> <item> <title><code>obj</code></title> -<p>a <link xref="Regress.TestObj"/></p> + <p>a <link xref="Regress.TestObj"/></p> </item> <item> <title><code>a</code></title> -<p>Parameter.</p> + <p>Parameter.</p> </item> <item> <title><code>out_b</code></title> -<p>A return value.</p> + <p>A return value.</p> </item> <item> <title><code>c</code></title> -<p>Other parameter.</p> + <p>Other parameter.</p> </item> <item> <title><code>inout_d</code></title> -<p>Will be incremented.</p> + <p>Will be incremented.</p> </item> <item> <title><code>out_sum</code></title> -<p>Return value.</p> + <p>Return value.</p> </item> <item> <title><code>num1</code></title> -<p>Number.</p> + <p>Number.</p> </item> <item> <title><code>num2</code></title> -<p>Number.</p> + <p>Number.</p> </item> <item> <title><code>Returns</code></title> -<p><code>TRUE</code> if the call succeeds, <code>FALSE</code> if @error is set.</p> + <p><code>TRUE</code> if the call succeeds, <code>FALSE</code> if @error is set.</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_return_val_no_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_return_val_no_out.page index b590de21..2961ec8f 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_return_val_no_out.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_return_val_no_out.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestObj" group="method" type="guide"/> <api:function> <api:returns> @@ -22,37 +21,28 @@ <api:name>a</api:name> </api:arg> </api:function> - </info> <title>regress_test_obj_skip_return_val_no_out</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> gboolean regress_test_obj_skip_return_val_no_out (RegressTestObj* obj, gint a); -</code></synopsis> - - - <p>Check that the return value is skipped. Succeed if a is nonzero, otherwise + </code></synopsis> + <p>Check that the return value is skipped. Succeed if a is nonzero, otherwise raise an error.</p> - - - - + <terms> <item> <title><code>obj</code></title> -<p>a <link xref="Regress.TestObj"/></p> + <p>a <link xref="Regress.TestObj"/></p> </item> <item> <title><code>a</code></title> -<p>Parameter.</p> + <p>Parameter.</p> </item> <item> <title><code>Returns</code></title> -<p><code>TRUE</code> if the call succeeds, <code>FALSE</code> if @error is set.</p> + <p><code>TRUE</code> if the call succeeds, <code>FALSE</code> if @error is set.</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.static_method.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.static_method.page index 8e5c9b1e..0f7a2bfe 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.static_method.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.static_method.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestObj" group="function" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>x</api:name> </api:arg> </api:function> - </info> <title>regress_test_obj_static_method</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> double regress_test_obj_static_method (int x); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>x</code></title> @@ -43,6 +35,4 @@ double regress_test_obj_static_method (int x); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.static_method_callback.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.static_method_callback.page index 8058ac01..d9a2beac 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.static_method_callback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.static_method_callback.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestObj" group="function" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>callback</api:name> </api:arg> </api:function> - </info> <title>regress_test_obj_static_method_callback</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_test_obj_static_method_callback (RegressTestCallback callback); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>callback</code></title> @@ -43,6 +35,4 @@ void regress_test_obj_static_method_callback (RegressTestCallback callback); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.torture_signature_0.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.torture_signature_0.page index 3e2fb61f..61ae71c5 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.torture_signature_0.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.torture_signature_0.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestObj" group="method" type="guide"/> <api:function> <api:returns> @@ -42,11 +41,9 @@ <api:name>m</api:name> </api:arg> </api:function> - </info> <title>regress_test_obj_torture_signature_0</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_test_obj_torture_signature_0 (RegressTestObj* obj, int x, double* y, @@ -54,18 +51,13 @@ void regress_test_obj_torture_signature_0 (RegressTestObj* obj, const char* foo, int* q, guint m); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>obj</code></title> -<p>A <link xref="Regress.TestObj"/></p> + <p>A <link xref="Regress.TestObj"/></p> </item> <item> <title><code>x</code></title> @@ -97,6 +89,4 @@ void regress_test_obj_torture_signature_0 (RegressTestObj* obj, </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.torture_signature_1.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.torture_signature_1.page index 37e1ad21..c3d85fa0 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.torture_signature_1.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.torture_signature_1.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestObj" group="method" type="guide"/> <api:function> <api:returns> @@ -42,11 +41,9 @@ <api:name>m</api:name> </api:arg> </api:function> - </info> <title>regress_test_obj_torture_signature_1</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> gboolean regress_test_obj_torture_signature_1 (RegressTestObj* obj, int x, double* y, @@ -54,18 +51,13 @@ gboolean regress_test_obj_torture_signature_1 (RegressTestObj* obj, const char* foo, int* q, guint m); -</code></synopsis> + </code></synopsis> + <p>This function throws an error if m is odd.</p> - - <p>This function throws an error if m is odd.</p> - - - - <terms> <item> <title><code>obj</code></title> -<p>A <link xref="Regress.TestObj"/></p> + <p>A <link xref="Regress.TestObj"/></p> </item> <item> <title><code>x</code></title> @@ -97,6 +89,4 @@ gboolean regress_test_obj_torture_signature_1 (RegressTestObj* obj, </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass-_regress_reserved1.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass-_regress_reserved1.page new file mode 100644 index 00000000..724610ed --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass-_regress_reserved1.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.TestObjClass-_regress_reserved1" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestObjClass" group="field" type="guide"/> + </info> + <title>Regress.TestObjClass->_regress_reserved1</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass-_regress_reserved2.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass-_regress_reserved2.page new file mode 100644 index 00000000..b8651024 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass-_regress_reserved2.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.TestObjClass-_regress_reserved2" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestObjClass" group="field" type="guide"/> + </info> + <title>Regress.TestObjClass->_regress_reserved2</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass-allow_none_vfunc.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass-allow_none_vfunc.page new file mode 100644 index 00000000..5f5d3750 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass-allow_none_vfunc.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.TestObjClass-allow_none_vfunc" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestObjClass" group="field" type="guide"/> + </info> + <title>Regress.TestObjClass->allow_none_vfunc</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass-matrix.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass-matrix.page new file mode 100644 index 00000000..d50f3d70 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass-matrix.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.TestObjClass-matrix" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestObjClass" group="field" type="guide"/> + </info> + <title>Regress.TestObjClass->matrix</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass-parent_class.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass-parent_class.page new file mode 100644 index 00000000..905a7673 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass-parent_class.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.TestObjClass-parent_class" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestObjClass" group="field" type="guide"/> + </info> + <title>Regress.TestObjClass->parent_class</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass-test_signal.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass-test_signal.page new file mode 100644 index 00000000..c8da9dc9 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass-test_signal.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.TestObjClass-test_signal" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestObjClass" group="field" type="guide"/> + </info> + <title>Regress.TestObjClass->test_signal</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass-test_signal_with_static_scope_arg.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass-test_signal_with_static_scope_arg.page new file mode 100644 index 00000000..fdbc6a25 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass-test_signal_with_static_scope_arg.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.TestObjClass-test_signal_with_static_scope_arg" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestObjClass" group="field" type="guide"/> + </info> + <title>Regress.TestObjClass->test_signal_with_static_scope_arg</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass._regress_reserved1.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass._regress_reserved1.page index 3aec1433..466f8463 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass._regress_reserved1.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass._regress_reserved1.page @@ -1,25 +1,24 @@ <?xml version="1.0"?> <page id="Regress.TestObjClass._regress_reserved1" type="topic" - style="default" + style="callback" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="default" type="guide"/> - - </info> + <link xref="index" group="callback" type="guide"/> + </info> <title>Regress.TestObjClass._regress_reserved1</title> - - - - - - - - - - - + <synopsis><code mime="text/x-csrc"> +void _regress_reserved1 (void); + </code></synopsis> + + +<terms> +<item> +<title><code>Returns</code></title> + +</item> +</terms> + </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass._regress_reserved2.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass._regress_reserved2.page index 8bfc4d19..9b6aa753 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass._regress_reserved2.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass._regress_reserved2.page @@ -1,25 +1,24 @@ <?xml version="1.0"?> <page id="Regress.TestObjClass._regress_reserved2" type="topic" - style="default" + style="callback" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="default" type="guide"/> - - </info> + <link xref="index" group="callback" type="guide"/> + </info> <title>Regress.TestObjClass._regress_reserved2</title> - - - - - - - - - - - + <synopsis><code mime="text/x-csrc"> +void _regress_reserved2 (void); + </code></synopsis> + + +<terms> +<item> +<title><code>Returns</code></title> + +</item> +</terms> + </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass.allow_none_vfunc.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass.allow_none_vfunc.page index b45f05d2..e93242ac 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass.allow_none_vfunc.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass.allow_none_vfunc.page @@ -1,25 +1,33 @@ <?xml version="1.0"?> <page id="Regress.TestObjClass.allow_none_vfunc" type="topic" - style="default" + style="callback" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="default" type="guide"/> - - </info> + <link xref="index" group="callback" type="guide"/> + </info> <title>Regress.TestObjClass.allow_none_vfunc</title> - - - - - - - - - - - + <synopsis><code mime="text/x-csrc"> +void allow_none_vfunc (RegressTestObj* obj, + RegressTestObj* two); + </code></synopsis> + + +<terms> +<item> +<title><code>obj</code></title> + +</item> +<item> +<title><code>two</code></title> + <p>Another object</p> +</item> +<item> +<title><code>Returns</code></title> + +</item> +</terms> + </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass.matrix.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass.matrix.page index 312b198e..4f4b0a8b 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass.matrix.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass.matrix.page @@ -1,25 +1,33 @@ <?xml version="1.0"?> <page id="Regress.TestObjClass.matrix" type="topic" - style="default" + style="callback" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="default" type="guide"/> - - </info> + <link xref="index" group="callback" type="guide"/> + </info> <title>Regress.TestObjClass.matrix</title> - - - - - - - - - - - + <synopsis><code mime="text/x-csrc"> +int matrix (RegressTestObj* obj, + const char* somestr); + </code></synopsis> + + +<terms> +<item> +<title><code>obj</code></title> + <p>A <link xref="Regress.TestObj"/></p> +</item> +<item> +<title><code>somestr</code></title> + <p>Meaningless string</p> +</item> +<item> +<title><code>Returns</code></title> + +</item> +</terms> + </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass.page index 86db7488..5a6da18d 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass.page @@ -1,25 +1,35 @@ <?xml version="1.0"?> <page id="Regress.TestObjClass" - type="topic" - style="record" + type="guide" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="record" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.TestObjClass</title> - - - - - - - - - - - + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestOtherError.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestOtherError.page index 7d2d53ba..98eba50a 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestOtherError.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestOtherError.page @@ -6,20 +6,9 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="enum" type="guide"/> - + <link xref="index" group="enum" type="guide"/> </info> <title>Regress.TestOtherError</title> - - - - - - - - - - - + + </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestOtherError.quark.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestOtherError.quark.page index 4ed8d539..5a07ab53 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestOtherError.quark.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestOtherError.quark.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,20 +13,13 @@ </api:returns> <api:name>regress_test_unconventional_error_quark</api:name> </api:function> - </info> <title>regress_test_unconventional_error_quark</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> GQuark regress_test_unconventional_error_quark (void); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -35,6 +27,4 @@ GQuark regress_test_unconventional_error_quark (void); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestPrivateEnum.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestPrivateEnum.page index 66b477d2..0cf17c13 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestPrivateEnum.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestPrivateEnum.page @@ -6,20 +6,9 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="default" type="guide"/> - + <link xref="index" group="default" type="guide"/> </info> <title>Regress.TestPrivateEnum</title> - - - - - - - - - - - + + </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestPrivateStruct-this_is_public_after.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestPrivateStruct-this_is_public_after.page new file mode 100644 index 00000000..843ed306 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestPrivateStruct-this_is_public_after.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.TestPrivateStruct-this_is_public_after" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestPrivateStruct" group="field" type="guide"/> + </info> + <title>Regress.TestPrivateStruct->this_is_public_after</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestPrivateStruct-this_is_public_before.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestPrivateStruct-this_is_public_before.page new file mode 100644 index 00000000..84a6ecaa --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestPrivateStruct-this_is_public_before.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.TestPrivateStruct-this_is_public_before" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestPrivateStruct" group="field" type="guide"/> + </info> + <title>Regress.TestPrivateStruct->this_is_public_before</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestPrivateStruct.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestPrivateStruct.page index 5d55c80e..c8eea18e 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestPrivateStruct.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestPrivateStruct.page @@ -1,25 +1,35 @@ <?xml version="1.0"?> <page id="Regress.TestPrivateStruct" - type="topic" - style="record" + type="guide" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="record" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.TestPrivateStruct</title> - - - - - - - - - - - + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestReferenceEnum.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestReferenceEnum.page index 44c3cadb..85923d32 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestReferenceEnum.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestReferenceEnum.page @@ -6,20 +6,9 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="enum" type="guide"/> - + <link xref="index" group="enum" type="guide"/> </info> <title>Regress.TestReferenceEnum</title> - - - - - - - - - - - + + </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA-some_double.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA-some_double.page new file mode 100644 index 00000000..61e43036 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA-some_double.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.TestSimpleBoxedA-some_double" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestSimpleBoxedA" group="field" type="guide"/> + </info> + <title>Regress.TestSimpleBoxedA->some_double</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA-some_enum.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA-some_enum.page new file mode 100644 index 00000000..c31c20db --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA-some_enum.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.TestSimpleBoxedA-some_enum" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestSimpleBoxedA" group="field" type="guide"/> + </info> + <title>Regress.TestSimpleBoxedA->some_enum</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA-some_int.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA-some_int.page new file mode 100644 index 00000000..aad211d6 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA-some_int.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.TestSimpleBoxedA-some_int" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestSimpleBoxedA" group="field" type="guide"/> + </info> + <title>Regress.TestSimpleBoxedA->some_int</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA-some_int8.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA-some_int8.page new file mode 100644 index 00000000..349c0afa --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA-some_int8.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.TestSimpleBoxedA-some_int8" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestSimpleBoxedA" group="field" type="guide"/> + </info> + <title>Regress.TestSimpleBoxedA->some_int8</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.const_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.const_return.page index 628186a0..4910e4d8 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.const_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.const_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestSimpleBoxedA" group="function" type="guide"/> <api:function> <api:returns> @@ -14,20 +13,13 @@ </api:returns> <api:name>regress_test_simple_boxed_a_const_return</api:name> </api:function> - </info> <title>regress_test_simple_boxed_a_const_return</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> const RegressTestSimpleBoxedA* regress_test_simple_boxed_a_const_return (void); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -35,6 +27,4 @@ const RegressTestSimpleBoxedA* regress_test_simple_boxed_a_const_return (void); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.copy.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.copy.page index 4e7cf0e8..e711958f 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.copy.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.copy.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestSimpleBoxedA" group="method" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>a</api:name> </api:arg> </api:function> - </info> <title>regress_test_simple_boxed_a_copy</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> RegressTestSimpleBoxedA* regress_test_simple_boxed_a_copy (RegressTestSimpleBoxedA* a); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>a</code></title> @@ -43,6 +35,4 @@ RegressTestSimpleBoxedA* regress_test_simple_boxed_a_copy (RegressTestSimpleBoxe </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.equals.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.equals.page index 5e5dcbda..43f8cbaa 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.equals.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.equals.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestSimpleBoxedA" group="method" type="guide"/> <api:function> <api:returns> @@ -22,21 +21,14 @@ <api:name>other_a</api:name> </api:arg> </api:function> - </info> <title>regress_test_simple_boxed_a_equals</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> gboolean regress_test_simple_boxed_a_equals (RegressTestSimpleBoxedA* a, RegressTestSimpleBoxedA* other_a); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>a</code></title> @@ -52,6 +44,4 @@ gboolean regress_test_simple_boxed_a_equals (RegressTestSimpleBoxedA* a, </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.page index 08f968fe..54570ae1 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.page @@ -1,25 +1,35 @@ <?xml version="1.0"?> <page id="Regress.TestSimpleBoxedA" - type="topic" - style="record" + type="guide" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="record" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.TestSimpleBoxedA</title> - - - - - - - - - - - + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedB-nested_a.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedB-nested_a.page new file mode 100644 index 00000000..60142795 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedB-nested_a.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.TestSimpleBoxedB-nested_a" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestSimpleBoxedB" group="field" type="guide"/> + </info> + <title>Regress.TestSimpleBoxedB->nested_a</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedB-some_int8.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedB-some_int8.page new file mode 100644 index 00000000..8c8b86db --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedB-some_int8.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.TestSimpleBoxedB-some_int8" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestSimpleBoxedB" group="field" type="guide"/> + </info> + <title>Regress.TestSimpleBoxedB->some_int8</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedB.copy.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedB.copy.page index fd593150..3664cdaa 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedB.copy.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedB.copy.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestSimpleBoxedB" group="method" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>b</api:name> </api:arg> </api:function> - </info> <title>regress_test_simple_boxed_b_copy</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> RegressTestSimpleBoxedB* regress_test_simple_boxed_b_copy (RegressTestSimpleBoxedB* b); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>b</code></title> @@ -43,6 +35,4 @@ RegressTestSimpleBoxedB* regress_test_simple_boxed_b_copy (RegressTestSimpleBoxe </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedB.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedB.page index 2ed2304d..170c1769 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedB.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedB.page @@ -1,25 +1,35 @@ <?xml version="1.0"?> <page id="Regress.TestSimpleBoxedB" - type="topic" - style="record" + type="guide" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="record" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.TestSimpleBoxedB</title> - - - - - - - - - - - + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleCallback.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleCallback.page index f8157820..322d4975 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleCallback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleCallback.page @@ -1,25 +1,24 @@ <?xml version="1.0"?> <page id="Regress.TestSimpleCallback" type="topic" - style="default" + style="callback" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="default" type="guide"/> - - </info> + <link xref="index" group="callback" type="guide"/> + </info> <title>Regress.TestSimpleCallback</title> - - - - - - - - - - - + <synopsis><code mime="text/x-csrc"> +void TestSimpleCallback (void); + </code></synopsis> + + +<terms> +<item> +<title><code>Returns</code></title> + +</item> +</terms> + </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA-some_double.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA-some_double.page new file mode 100644 index 00000000..6cc61103 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA-some_double.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.TestStructA-some_double" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestStructA" group="field" type="guide"/> + </info> + <title>Regress.TestStructA->some_double</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA-some_enum.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA-some_enum.page new file mode 100644 index 00000000..1fc8f312 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA-some_enum.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.TestStructA-some_enum" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestStructA" group="field" type="guide"/> + </info> + <title>Regress.TestStructA->some_enum</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA-some_int.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA-some_int.page new file mode 100644 index 00000000..b3e1d840 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA-some_int.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.TestStructA-some_int" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestStructA" group="field" type="guide"/> + </info> + <title>Regress.TestStructA->some_int</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA-some_int8.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA-some_int8.page new file mode 100644 index 00000000..cdfd2a9d --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA-some_int8.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.TestStructA-some_int8" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestStructA" group="field" type="guide"/> + </info> + <title>Regress.TestStructA->some_int8</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA.clone.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA.clone.page index 9b4d353b..e9280837 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA.clone.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA.clone.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestStructA" group="method" type="guide"/> <api:function> <api:returns> @@ -22,29 +21,22 @@ <api:name>a_out</api:name> </api:arg> </api:function> - </info> <title>regress_test_struct_a_clone</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_test_struct_a_clone (RegressTestStructA* a, RegressTestStructA* a_out); -</code></synopsis> + </code></synopsis> + <p>Make a copy of a RegressTestStructA</p> - - <p>Make a copy of a RegressTestStructA</p> - - - - <terms> <item> <title><code>a</code></title> -<p>the structure</p> + <p>the structure</p> </item> <item> <title><code>a_out</code></title> -<p>the cloned structure</p> + <p>the cloned structure</p> </item> <item> <title><code>Returns</code></title> @@ -52,6 +44,4 @@ void regress_test_struct_a_clone (RegressTestStructA* a, </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA.page index 22a1e907..b7f81f3e 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA.page @@ -1,25 +1,35 @@ <?xml version="1.0"?> <page id="Regress.TestStructA" - type="topic" - style="record" + type="guide" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="record" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.TestStructA</title> - - - - - - - - - - - + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA.parse.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA.parse.page index befbd7ce..4ac3686f 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA.parse.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA.parse.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestStructA" group="function" type="guide"/> <api:function> <api:returns> @@ -22,29 +21,22 @@ <api:name>string</api:name> </api:arg> </api:function> - </info> <title>regress_test_struct_a_parse</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_test_struct_a_parse (RegressTestStructA* a_out, const gchar* string); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>a_out</code></title> -<p>the structure that is to be filled</p> + <p>the structure that is to be filled</p> </item> <item> <title><code>string</code></title> -<p>ignored</p> + <p>ignored</p> </item> <item> <title><code>Returns</code></title> @@ -52,6 +44,4 @@ void regress_test_struct_a_parse (RegressTestStructA* a_out, </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructB-nested_a.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructB-nested_a.page new file mode 100644 index 00000000..58645889 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructB-nested_a.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.TestStructB-nested_a" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestStructB" group="field" type="guide"/> + </info> + <title>Regress.TestStructB->nested_a</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructB-some_int8.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructB-some_int8.page new file mode 100644 index 00000000..d7e90d7e --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructB-some_int8.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.TestStructB-some_int8" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestStructB" group="field" type="guide"/> + </info> + <title>Regress.TestStructB->some_int8</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructB.clone.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructB.clone.page index b3a9f993..c87287ee 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructB.clone.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructB.clone.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestStructB" group="method" type="guide"/> <api:function> <api:returns> @@ -22,29 +21,22 @@ <api:name>b_out</api:name> </api:arg> </api:function> - </info> <title>regress_test_struct_b_clone</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_test_struct_b_clone (RegressTestStructB* b, RegressTestStructB* b_out); -</code></synopsis> + </code></synopsis> + <p>Make a copy of a RegressTestStructB</p> - - <p>Make a copy of a RegressTestStructB</p> - - - - <terms> <item> <title><code>b</code></title> -<p>the structure</p> + <p>the structure</p> </item> <item> <title><code>b_out</code></title> -<p>the cloned structure</p> + <p>the cloned structure</p> </item> <item> <title><code>Returns</code></title> @@ -52,6 +44,4 @@ void regress_test_struct_b_clone (RegressTestStructB* b, </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructB.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructB.page index 4ed2b54c..36e26294 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructB.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructB.page @@ -1,25 +1,35 @@ <?xml version="1.0"?> <page id="Regress.TestStructB" - type="topic" - style="record" + type="guide" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="record" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.TestStructB</title> - - - - - - - - - - - + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructC-another_int.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructC-another_int.page new file mode 100644 index 00000000..9d3e2229 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructC-another_int.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.TestStructC-another_int" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestStructC" group="field" type="guide"/> + </info> + <title>Regress.TestStructC->another_int</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructC-obj.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructC-obj.page new file mode 100644 index 00000000..ecf3c25a --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructC-obj.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.TestStructC-obj" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestStructC" group="field" type="guide"/> + </info> + <title>Regress.TestStructC->obj</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructC.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructC.page index f208fcd8..c14639ea 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructC.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructC.page @@ -1,25 +1,35 @@ <?xml version="1.0"?> <page id="Regress.TestStructC" - type="topic" - style="record" + type="guide" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="record" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.TestStructC</title> - - - - - - - - - - - + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructD-array1.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructD-array1.page new file mode 100644 index 00000000..6e8cf239 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructD-array1.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.TestStructD-array1" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestStructD" group="field" type="guide"/> + </info> + <title>Regress.TestStructD->array1</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructD-array2.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructD-array2.page new file mode 100644 index 00000000..93995fe3 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructD-array2.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.TestStructD-array2" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestStructD" group="field" type="guide"/> + </info> + <title>Regress.TestStructD->array2</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructD-field.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructD-field.page new file mode 100644 index 00000000..e46d5da4 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructD-field.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.TestStructD-field" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestStructD" group="field" type="guide"/> + </info> + <title>Regress.TestStructD->field</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructD-garray.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructD-garray.page new file mode 100644 index 00000000..39adf11b --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructD-garray.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.TestStructD-garray" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestStructD" group="field" type="guide"/> + </info> + <title>Regress.TestStructD->garray</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructD-list.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructD-list.page new file mode 100644 index 00000000..26010515 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructD-list.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.TestStructD-list" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestStructD" group="field" type="guide"/> + </info> + <title>Regress.TestStructD->list</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructD.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructD.page index f791d70b..01951132 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructD.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructD.page @@ -1,25 +1,35 @@ <?xml version="1.0"?> <page id="Regress.TestStructD" - type="topic" - style="record" + type="guide" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="record" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.TestStructD</title> - - - - - - - - - - - + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE-some_type.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE-some_type.page new file mode 100644 index 00000000..ea61037e --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE-some_type.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.TestStructE-some_type" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestStructE" group="field" type="guide"/> + </info> + <title>Regress.TestStructE->some_type</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE-some_union.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE-some_union.page new file mode 100644 index 00000000..fda8d2af --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE-some_union.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.TestStructE-some_union" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestStructE" group="field" type="guide"/> + </info> + <title>Regress.TestStructE->some_union</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE.page index ccc8bbd8..0520f3c5 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE.page @@ -1,25 +1,35 @@ <?xml version="1.0"?> <page id="Regress.TestStructE" - type="topic" - style="record" + type="guide" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="record" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.TestStructE</title> - - - - - - - - - - - + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_double.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_double.page new file mode 100644 index 00000000..d80e7792 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_double.page @@ -0,0 +1,16 @@ +<?xml version="1.0"?> +<page id="Regress.TestStructE__some_union__union-v_double" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestStructE__some_union__union" + group="field" + type="guide"/> + </info> + <title>Regress.TestStructE__some_union__union->v_double</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_float.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_float.page new file mode 100644 index 00000000..30d61262 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_float.page @@ -0,0 +1,16 @@ +<?xml version="1.0"?> +<page id="Regress.TestStructE__some_union__union-v_float" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestStructE__some_union__union" + group="field" + type="guide"/> + </info> + <title>Regress.TestStructE__some_union__union->v_float</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_int.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_int.page new file mode 100644 index 00000000..487a6c59 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_int.page @@ -0,0 +1,16 @@ +<?xml version="1.0"?> +<page id="Regress.TestStructE__some_union__union-v_int" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestStructE__some_union__union" + group="field" + type="guide"/> + </info> + <title>Regress.TestStructE__some_union__union->v_int</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_int64.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_int64.page new file mode 100644 index 00000000..fbe75bfd --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_int64.page @@ -0,0 +1,16 @@ +<?xml version="1.0"?> +<page id="Regress.TestStructE__some_union__union-v_int64" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestStructE__some_union__union" + group="field" + type="guide"/> + </info> + <title>Regress.TestStructE__some_union__union->v_int64</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_long.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_long.page new file mode 100644 index 00000000..a909fa86 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_long.page @@ -0,0 +1,16 @@ +<?xml version="1.0"?> +<page id="Regress.TestStructE__some_union__union-v_long" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestStructE__some_union__union" + group="field" + type="guide"/> + </info> + <title>Regress.TestStructE__some_union__union->v_long</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_pointer.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_pointer.page new file mode 100644 index 00000000..8dca96cf --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_pointer.page @@ -0,0 +1,16 @@ +<?xml version="1.0"?> +<page id="Regress.TestStructE__some_union__union-v_pointer" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestStructE__some_union__union" + group="field" + type="guide"/> + </info> + <title>Regress.TestStructE__some_union__union->v_pointer</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_uint.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_uint.page new file mode 100644 index 00000000..61d30a22 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_uint.page @@ -0,0 +1,16 @@ +<?xml version="1.0"?> +<page id="Regress.TestStructE__some_union__union-v_uint" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestStructE__some_union__union" + group="field" + type="guide"/> + </info> + <title>Regress.TestStructE__some_union__union->v_uint</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_uint64.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_uint64.page new file mode 100644 index 00000000..360e1e9d --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_uint64.page @@ -0,0 +1,16 @@ +<?xml version="1.0"?> +<page id="Regress.TestStructE__some_union__union-v_uint64" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestStructE__some_union__union" + group="field" + type="guide"/> + </info> + <title>Regress.TestStructE__some_union__union->v_uint64</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_ulong.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_ulong.page new file mode 100644 index 00000000..117b95f2 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union-v_ulong.page @@ -0,0 +1,16 @@ +<?xml version="1.0"?> +<page id="Regress.TestStructE__some_union__union-v_ulong" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestStructE__some_union__union" + group="field" + type="guide"/> + </info> + <title>Regress.TestStructE__some_union__union->v_ulong</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union.page index 3b81e621..e9b94f4d 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union.page @@ -1,25 +1,35 @@ <?xml version="1.0"?> <page id="Regress.TestStructE__some_union__union" - type="topic" - style="default" + type="guide" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="default" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.TestStructE__some_union__union</title> - - - - - - - - - - - + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructF-data1.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructF-data1.page new file mode 100644 index 00000000..5d424ad9 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructF-data1.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.TestStructF-data1" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestStructF" group="field" type="guide"/> + </info> + <title>Regress.TestStructF->data1</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructF-data2.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructF-data2.page new file mode 100644 index 00000000..b03800ee --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructF-data2.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.TestStructF-data2" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestStructF" group="field" type="guide"/> + </info> + <title>Regress.TestStructF->data2</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructF-data3.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructF-data3.page new file mode 100644 index 00000000..e25e7122 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructF-data3.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.TestStructF-data3" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestStructF" group="field" type="guide"/> + </info> + <title>Regress.TestStructF->data3</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructF-data4.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructF-data4.page new file mode 100644 index 00000000..ceedf9d2 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructF-data4.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.TestStructF-data4" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestStructF" group="field" type="guide"/> + </info> + <title>Regress.TestStructF->data4</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructF-data5.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructF-data5.page new file mode 100644 index 00000000..d239488e --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructF-data5.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.TestStructF-data5" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestStructF" group="field" type="guide"/> + </info> + <title>Regress.TestStructF->data5</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructF-data6.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructF-data6.page new file mode 100644 index 00000000..09d72151 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructF-data6.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.TestStructF-data6" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestStructF" group="field" type="guide"/> + </info> + <title>Regress.TestStructF->data6</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructF-ref_count.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructF-ref_count.page new file mode 100644 index 00000000..98fad0be --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructF-ref_count.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.TestStructF-ref_count" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestStructF" group="field" type="guide"/> + </info> + <title>Regress.TestStructF->ref_count</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructF.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructF.page index 74e8483f..860d608c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructF.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructF.page @@ -1,25 +1,35 @@ <?xml version="1.0"?> <page id="Regress.TestStructF" - type="topic" - style="record" + type="guide" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="record" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.TestStructF</title> - - - - - - - - - - - + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructFixedArray-array.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructFixedArray-array.page new file mode 100644 index 00000000..fb214ce6 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructFixedArray-array.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.TestStructFixedArray-array" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestStructFixedArray" group="field" type="guide"/> + </info> + <title>Regress.TestStructFixedArray->array</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructFixedArray-just_int.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructFixedArray-just_int.page new file mode 100644 index 00000000..0c8a5943 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructFixedArray-just_int.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.TestStructFixedArray-just_int" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestStructFixedArray" group="field" type="guide"/> + </info> + <title>Regress.TestStructFixedArray->just_int</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructFixedArray.frob.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructFixedArray.frob.page index 7d5ed650..ad525713 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructFixedArray.frob.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructFixedArray.frob.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestStructFixedArray" group="method" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>str</api:name> </api:arg> </api:function> - </info> <title>regress_test_struct_fixed_array_frob</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_test_struct_fixed_array_frob (RegressTestStructFixedArray* str); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>str</code></title> @@ -43,6 +35,4 @@ void regress_test_struct_fixed_array_frob (RegressTestStructFixedArray* str); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructFixedArray.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructFixedArray.page index f33eed98..6b6ea3a1 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructFixedArray.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructFixedArray.page @@ -1,25 +1,35 @@ <?xml version="1.0"?> <page id="Regress.TestStructFixedArray" - type="topic" - style="record" + type="guide" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="record" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.TestStructFixedArray</title> - - - - - - - - - - - + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj-parent_instance.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj-parent_instance.page new file mode 100644 index 00000000..15b87da0 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj-parent_instance.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.TestSubObj-parent_instance" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestSubObj" group="field" type="guide"/> + </info> + <title>Regress.TestSubObj->parent_instance</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.instance_method.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.instance_method.page index fa401f55..3a16280f 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.instance_method.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.instance_method.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestSubObj" group="method" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>obj</api:name> </api:arg> </api:function> - </info> <title>regress_test_sub_obj_instance_method</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> int regress_test_sub_obj_instance_method (RegressTestSubObj* obj); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>obj</code></title> @@ -43,6 +35,4 @@ int regress_test_sub_obj_instance_method (RegressTestSubObj* obj); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.new.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.new.page index fbff9d9f..ffada79e 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.new.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.new.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestSubObj" group="constructor" type="guide"/> <api:function> <api:returns> @@ -14,20 +13,13 @@ </api:returns> <api:name>regress_test_sub_obj_new</api:name> </api:function> - </info> <title>regress_test_sub_obj_new</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> RegressTestObj* regress_test_sub_obj_new (void); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -35,6 +27,4 @@ RegressTestObj* regress_test_sub_obj_new (void); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.page index 7c6cb98d..240e1550 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.page @@ -6,19 +6,11 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="class" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.TestSubObj</title> - - - - - - - - + + <synopsis> <title>Hierarchy</title> <tree> @@ -33,8 +25,11 @@ </item> </tree> </synopsis> - - + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> <links type="topic" ui:expanded="true" api:type="function" api:mime="text/x-csrc" groups="method" style="linklist"> @@ -43,7 +38,7 @@ <links type="topic" ui:expanded="true" api:type="function" api:mime="text/x-csrc" groups="function" style="linklist"> - <title>Functions</title> + <title>Static Functions</title> </links> <links type="topic" ui:expanded="true" groups="property" style="linklist"> <title>Properties</title> @@ -54,8 +49,10 @@ <links type="topic" ui:expanded="true" groups="vfunc" style="linklist"> <title>Virtual functions</title> </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> <title>Other</title> </links> - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.unset_bare.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.unset_bare.page index 5497c250..c33ed67f 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.unset_bare.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.unset_bare.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestSubObj" group="method" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>obj</api:name> </api:arg> </api:function> - </info> <title>regress_test_sub_obj_unset_bare</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_test_sub_obj_unset_bare (RegressTestSubObj* obj); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>obj</code></title> @@ -43,6 +35,4 @@ void regress_test_sub_obj_unset_bare (RegressTestSubObj* obj); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObjClass-parent_class.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObjClass-parent_class.page new file mode 100644 index 00000000..618b8f34 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObjClass-parent_class.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.TestSubObjClass-parent_class" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestSubObjClass" group="field" type="guide"/> + </info> + <title>Regress.TestSubObjClass->parent_class</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObjClass.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObjClass.page index 89543341..ab00f641 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObjClass.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObjClass.page @@ -1,25 +1,35 @@ <?xml version="1.0"?> <page id="Regress.TestSubObjClass" - type="topic" - style="record" + type="guide" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="record" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.TestSubObjClass</title> - - - - - - - - - - - + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestTypeGUInt64.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestTypeGUInt64.page index e0a7bc09..fcb2f3b4 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestTypeGUInt64.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestTypeGUInt64.page @@ -6,20 +6,9 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="default" type="guide"/> - + <link xref="index" group="default" type="guide"/> </info> <title>Regress.TestTypeGUInt64</title> - - - - - - - - - - - + + </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x-parent_instance.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x-parent_instance.page new file mode 100644 index 00000000..7bdb8c1d --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x-parent_instance.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.TestWi8021x-parent_instance" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestWi8021x" group="field" type="guide"/> + </info> + <title>Regress.TestWi8021x->parent_instance</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x-testbool.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x-testbool.page index 47ad7bed..ab6862c7 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x-testbool.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x-testbool.page @@ -6,21 +6,10 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestWi8021x" group="property" type="guide"/> <title type="link" role="topic">testbool</title> - </info> <title>Regress.TestWi8021x:testbool</title> - - - - - - - - - - - + + </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.get_testbool.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.get_testbool.page index 9153172c..208e2141 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.get_testbool.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.get_testbool.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestWi8021x" group="method" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>obj</api:name> </api:arg> </api:function> - </info> <title>regress_test_wi_802_1x_get_testbool</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> gboolean regress_test_wi_802_1x_get_testbool (RegressTestWi8021x* obj); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>obj</code></title> @@ -43,6 +35,4 @@ gboolean regress_test_wi_802_1x_get_testbool (RegressTestWi8021x* obj); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.new.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.new.page index 7afe8b1b..e136adca 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.new.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.new.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestWi8021x" group="constructor" type="guide"/> <api:function> <api:returns> @@ -14,20 +13,13 @@ </api:returns> <api:name>regress_test_wi_802_1x_new</api:name> </api:function> - </info> <title>regress_test_wi_802_1x_new</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> RegressTestWi8021x* regress_test_wi_802_1x_new (void); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -35,6 +27,4 @@ RegressTestWi8021x* regress_test_wi_802_1x_new (void); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.page index 29658734..8346e899 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.page @@ -6,19 +6,11 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="class" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.TestWi8021x</title> - - - - - - - - + + <synopsis> <title>Hierarchy</title> <tree> @@ -30,8 +22,11 @@ </item> </tree> </synopsis> - - + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> <links type="topic" ui:expanded="true" api:type="function" api:mime="text/x-csrc" groups="method" style="linklist"> @@ -40,7 +35,7 @@ <links type="topic" ui:expanded="true" api:type="function" api:mime="text/x-csrc" groups="function" style="linklist"> - <title>Functions</title> + <title>Static Functions</title> </links> <links type="topic" ui:expanded="true" groups="property" style="linklist"> <title>Properties</title> @@ -51,8 +46,10 @@ <links type="topic" ui:expanded="true" groups="vfunc" style="linklist"> <title>Virtual functions</title> </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> <title>Other</title> </links> - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.set_testbool.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.set_testbool.page index bad3b1d0..170fd5c6 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.set_testbool.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.set_testbool.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestWi8021x" group="method" type="guide"/> <api:function> <api:returns> @@ -22,21 +21,14 @@ <api:name>v</api:name> </api:arg> </api:function> - </info> <title>regress_test_wi_802_1x_set_testbool</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_test_wi_802_1x_set_testbool (RegressTestWi8021x* obj, gboolean v); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>obj</code></title> @@ -52,6 +44,4 @@ void regress_test_wi_802_1x_set_testbool (RegressTestWi8021x* obj, </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.static_method.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.static_method.page index c0e98dfb..ef11560c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.static_method.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.static_method.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="Regress.TestWi8021x" group="function" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>x</api:name> </api:arg> </api:function> - </info> <title>regress_test_wi_802_1x_static_method</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> int regress_test_wi_802_1x_static_method (int x); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>x</code></title> @@ -43,6 +35,4 @@ int regress_test_wi_802_1x_static_method (int x); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021xClass-parent_class.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021xClass-parent_class.page new file mode 100644 index 00000000..f3dba050 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021xClass-parent_class.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.TestWi8021xClass-parent_class" + type="topic" + style="field" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="Regress.TestWi8021xClass" group="field" type="guide"/> + </info> + <title>Regress.TestWi8021xClass->parent_class</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021xClass.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021xClass.page index 59593031..5fe3d2c7 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021xClass.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021xClass.page @@ -1,25 +1,35 @@ <?xml version="1.0"?> <page id="Regress.TestWi8021xClass" - type="topic" - style="record" + type="guide" + style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="record" type="guide"/> - + <link xref="index" group="class" type="guide"/> </info> <title>Regress.TestWi8021xClass</title> - - - - - - - - - - - + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/x-csrc" + groups="function" style="linklist"> + <title>Static Functions</title> + </links> + <links type="topic" ui:expanded="true" groups="field" style="linklist"> + <title>Fields</title> + </links> + <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist"> + <title>Other</title> + </links> </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.UTF8_CONSTANT.page b/tests/scanner/Regress-1.0-C-expected/Regress.UTF8_CONSTANT.page new file mode 100644 index 00000000..343ad002 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.UTF8_CONSTANT.page @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<page id="Regress.UTF8_CONSTANT" + type="topic" + style="default" + xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" + xmlns:ui="http://projectmallard.org/1.0/ui/"> + <info> + <link xref="index" group="default" type="guide"/> + </info> + <title>Regress.UTF8_CONSTANT</title> + + +</page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.VaListAlias.page b/tests/scanner/Regress-1.0-C-expected/Regress.VaListAlias.page index 6b7d031c..7df012a6 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.VaListAlias.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.VaListAlias.page @@ -6,20 +6,9 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="index" group="default" type="guide"/> - + <link xref="index" group="default" type="guide"/> </info> <title>Regress.VaListAlias</title> - - - - <p>Typedef'd va_list for additional reasons</p> - - - - - - - + <p>Typedef'd va_list for additional reasons</p> + </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.aliased_caller_alloc.page b/tests/scanner/Regress-1.0-C-expected/Regress.aliased_caller_alloc.page index 769da09a..6e4065a8 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.aliased_caller_alloc.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.aliased_caller_alloc.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>boxed</api:name> </api:arg> </api:function> - </info> <title>regress_aliased_caller_alloc</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_aliased_caller_alloc (RegressAliasedTestBoxed* boxed); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>boxed</code></title> @@ -43,6 +35,4 @@ void regress_aliased_caller_alloc (RegressAliasedTestBoxed* boxed); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_attribute_func.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_attribute_func.page index dbf8b828..f57817b6 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_attribute_func.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_attribute_func.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -22,36 +21,27 @@ <api:name>data</api:name> </api:arg> </api:function> - </info> <title>regress_annotation_attribute_func</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> gint regress_annotation_attribute_func (RegressAnnotationObject* object, const gchar* data); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>object</code></title> -<p>A <link xref="Regress.AnnotationObject"/>.</p> + <p>A <link xref="Regress.AnnotationObject"/>.</p> </item> <item> <title><code>data</code></title> -<p>Some data.</p> + <p>Some data.</p> </item> <item> <title><code>Returns</code></title> -<p>The return value.</p> + <p>The return value.</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_custom_destroy.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_custom_destroy.page index 2a474a5e..72f910a6 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_custom_destroy.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_custom_destroy.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -26,27 +25,20 @@ <api:name>data</api:name> </api:arg> </api:function> - </info> <title>regress_annotation_custom_destroy</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_annotation_custom_destroy (RegressAnnotationCallback callback, RegressAnnotationNotifyFunc destroy, gpointer data); -</code></synopsis> - - - <p>Test messing up the heuristic of closure/destroy-notification + </code></synopsis> + <p>Test messing up the heuristic of closure/destroy-notification detection, and fixing it via annotations.</p> - - - - + <terms> <item> <title><code>callback</code></title> -<p>Destroy notification</p> + <p>Destroy notification</p> </item> <item> <title><code>destroy</code></title> @@ -62,6 +54,4 @@ detection, and fixing it via annotations.</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_get_source_file.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_get_source_file.page index a76bade1..c05e6784 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_get_source_file.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_get_source_file.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,27 +13,18 @@ </api:returns> <api:name>regress_annotation_get_source_file</api:name> </api:function> - </info> <title>regress_annotation_get_source_file</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> char* regress_annotation_get_source_file (void); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> -<p>Source file</p> + <p>Source file</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_init.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_init.page index d2f479a1..7e143434 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_init.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_init.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -22,29 +21,22 @@ <api:name>argv</api:name> </api:arg> </api:function> - </info> <title>regress_annotation_init</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_annotation_init (int* argc, char*** argv); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>argc</code></title> -<p>The number of args.</p> + <p>The number of args.</p> </item> <item> <title><code>argv</code></title> -<p>The arguments.</p> + <p>The arguments.</p> </item> <item> <title><code>Returns</code></title> @@ -52,6 +44,4 @@ void regress_annotation_init (int* argc, </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_invalid_regress_annotation.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_invalid_regress_annotation.page index e0399cd0..acec228c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_invalid_regress_annotation.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_invalid_regress_annotation.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,24 +17,17 @@ <api:name>foo</api:name> </api:arg> </api:function> - </info> <title>regress_annotation_invalid_regress_annotation</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_annotation_invalid_regress_annotation (int foo); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>foo</code></title> -<p>some text (e.g. example) or else</p> + <p>some text (e.g. example) or else</p> </item> <item> <title><code>Returns</code></title> @@ -43,6 +35,4 @@ void regress_annotation_invalid_regress_annotation (int foo); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_ptr_array.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_ptr_array.page index 3b83de9a..e88f535a 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_ptr_array.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_ptr_array.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,24 +17,17 @@ <api:name>array</api:name> </api:arg> </api:function> - </info> <title>regress_annotation_ptr_array</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_annotation_ptr_array (GValue* array); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>array</code></title> -<p>the array</p> + <p>the array</p> </item> <item> <title><code>Returns</code></title> @@ -43,6 +35,4 @@ void regress_annotation_ptr_array (GValue* array); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_return_array.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_return_array.page index d13fee56..1048c61c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_return_array.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_return_array.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,31 +17,22 @@ <api:name>length</api:name> </api:arg> </api:function> - </info> <title>regress_annotation_return_array</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> char** regress_annotation_return_array (int* length); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>length</code></title> -<p>Number of return values</p> + <p>Number of return values</p> </item> <item> <title><code>Returns</code></title> -<p>The return value</p> + <p>The return value</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_return_filename.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_return_filename.page index 2e484581..0afdf09a 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_return_filename.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_return_filename.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,27 +13,18 @@ </api:returns> <api:name>regress_annotation_return_filename</api:name> </api:function> - </info> <title>regress_annotation_return_filename</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> gchar* regress_annotation_return_filename (void); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> -<p>An annotated filename</p> + <p>An annotated filename</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_set_source_file.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_set_source_file.page index 84c616f9..2f7fb864 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_set_source_file.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_set_source_file.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,24 +17,17 @@ <api:name>fname</api:name> </api:arg> </api:function> - </info> <title>regress_annotation_set_source_file</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_annotation_set_source_file (char* fname); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>fname</code></title> -<p>Source file</p> + <p>Source file</p> </item> <item> <title><code>Returns</code></title> @@ -43,6 +35,4 @@ void regress_annotation_set_source_file (char* fname); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_space_after_comment_bug631690.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_space_after_comment_bug631690.page index 39cd529d..1453f0e5 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_space_after_comment_bug631690.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_space_after_comment_bug631690.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,20 +13,13 @@ </api:returns> <api:name>regress_annotation_space_after_comment_bug631690</api:name> </api:function> - </info> <title>regress_annotation_space_after_comment_bug631690</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_annotation_space_after_comment_bug631690 (void); -</code></synopsis> + </code></synopsis> + <p>Explicitly test having a space after the ** here.</p> - - <p>Explicitly test having a space after the ** here.</p> - - - - <terms> <item> <title><code>Returns</code></title> @@ -35,6 +27,4 @@ void regress_annotation_space_after_comment_bug631690 (void); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_string_array_length.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_string_array_length.page index 5d3813d7..d37326ce 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_string_array_length.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_string_array_length.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -22,21 +21,14 @@ <api:name>properties</api:name> </api:arg> </api:function> - </info> <title>regress_annotation_string_array_length</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_annotation_string_array_length (guint n_properties, utf8* properties); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>n_properties</code></title> @@ -52,6 +44,4 @@ void regress_annotation_string_array_length (guint n_properties, </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_string_zero_terminated.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_string_zero_terminated.page index 8c685547..48c812ed 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_string_zero_terminated.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_string_zero_terminated.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,27 +13,18 @@ </api:returns> <api:name>regress_annotation_string_zero_terminated</api:name> </api:function> - </info> <title>regress_annotation_string_zero_terminated</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> char** regress_annotation_string_zero_terminated (void); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> -<p>The return value</p> + <p>The return value</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_string_zero_terminated_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_string_zero_terminated_out.page index 13eb1ca1..ac9964d4 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_string_zero_terminated_out.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_string_zero_terminated_out.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>out</api:name> </api:arg> </api:function> - </info> <title>regress_annotation_string_zero_terminated_out</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_annotation_string_zero_terminated_out (char*** out); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>out</code></title> @@ -43,6 +35,4 @@ void regress_annotation_string_zero_terminated_out (char*** out); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_test_parsing_bug630862.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_test_parsing_bug630862.page index 6fc0ad4b..b9dba0ab 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_test_parsing_bug630862.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_test_parsing_bug630862.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,27 +13,18 @@ </api:returns> <api:name>regress_annotation_test_parsing_bug630862</api:name> </api:function> - </info> <title>regress_annotation_test_parsing_bug630862</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> GObject* regress_annotation_test_parsing_bug630862 (void); -</code></synopsis> + </code></synopsis> + <p>See https://bugzilla.gnome.org/show_bug.cgi?id=630862</p> - - <p>See https://bugzilla.gnome.org/show_bug.cgi?id=630862</p> - - - - <terms> <item> <title><code>Returns</code></title> -<p>An object, note the colon:in here</p> + <p>An object, note the colon:in here</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_transfer_floating.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_transfer_floating.page index 4db50ca2..78684c87 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_transfer_floating.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_transfer_floating.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,27 +13,18 @@ </api:returns> <api:name>regress_annotation_transfer_floating</api:name> </api:function> - </info> <title>regress_annotation_transfer_floating</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> GObject* regress_annotation_transfer_floating (void); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> -<p>A floating object</p> + <p>A floating object</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_versioned.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_versioned.page index f12a3cf8..2d36790a 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_versioned.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_versioned.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,21 +13,13 @@ </api:returns> <api:name>regress_annotation_versioned</api:name> </api:function> - </info> <title>regress_annotation_versioned</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_annotation_versioned (void); -</code></synopsis> + </code></synopsis> - - - - - <p>Since 0.6</p> - - + <p>Since 0.6</p> <terms> <item> <title><code>Returns</code></title> @@ -36,6 +27,4 @@ void regress_annotation_versioned (void); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.atest_error_quark.page b/tests/scanner/Regress-1.0-C-expected/Regress.atest_error_quark.page index 75bc68c6..6d9968b5 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.atest_error_quark.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.atest_error_quark.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,20 +13,13 @@ </api:returns> <api:name>regress_atest_error_quark</api:name> </api:function> - </info> <title>regress_atest_error_quark</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> GQuark regress_atest_error_quark (void); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -35,6 +27,4 @@ GQuark regress_atest_error_quark (void); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_async_ready_callback.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_async_ready_callback.page index eadb6136..f667df6a 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_async_ready_callback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_async_ready_callback.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -26,22 +25,15 @@ <api:name>user_data</api:name> </api:arg> </api:function> - </info> <title>regress_foo_async_ready_callback</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_foo_async_ready_callback (GCancellable* cancellable, GAsyncReadyCallback callback, gpointer user_data); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>cancellable</code></title> @@ -61,6 +53,4 @@ void regress_foo_async_ready_callback (GCancellable* cancellable, </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_destroy_notify_callback.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_destroy_notify_callback.page index b37a287c..58a7e411 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_destroy_notify_callback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_destroy_notify_callback.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -26,22 +25,15 @@ <api:name>destroy</api:name> </api:arg> </api:function> - </info> <title>regress_foo_destroy_notify_callback</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_foo_destroy_notify_callback (RegressFooCallback callback, gpointer data, GDestroyNotify destroy); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>callback</code></title> @@ -61,6 +53,4 @@ void regress_foo_destroy_notify_callback (RegressFooCallback callback, </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_init.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_init.page index f035be53..e6277591 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_init.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_init.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,20 +13,13 @@ </api:returns> <api:name>regress_foo_init</api:name> </api:function> - </info> <title>regress_foo_init</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> gint regress_foo_init (void); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -35,6 +27,4 @@ gint regress_foo_init (void); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_method_external_references.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_method_external_references.page index 5eef0df9..2a77e2c8 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_method_external_references.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_method_external_references.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -30,23 +29,16 @@ <api:name>s</api:name> </api:arg> </api:function> - </info> <title>regress_foo_method_external_references</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_foo_method_external_references (UtilityObject* object, UtilityEnumType e, UtilityFlagType f, UtilityStruct s); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>object</code></title> @@ -70,6 +62,4 @@ void regress_foo_method_external_references (UtilityObject* object, </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_not_a_constructor_new.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_not_a_constructor_new.page index 63d57662..01bbafe2 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_not_a_constructor_new.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_not_a_constructor_new.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,21 +13,14 @@ </api:returns> <api:name>regress_foo_not_a_constructor_new</api:name> </api:function> - </info> <title>regress_foo_not_a_constructor_new</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> RegressFooObject* regress_foo_not_a_constructor_new (void); -</code></synopsis> - - - <p>This should be scanned as a top-level function, and shouldn't cause + </code></synopsis> + <p>This should be scanned as a top-level function, and shouldn't cause a "Can't find matching type for constructor" warning.</p> - - - - + <terms> <item> <title><code>Returns</code></title> @@ -36,6 +28,4 @@ a "Can't find matching type for constructor" warning.</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_skip_me.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_skip_me.page index 96773b38..df4d2e7a 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_skip_me.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_skip_me.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,25 +17,18 @@ <api:name>fs</api:name> </api:arg> </api:function> - </info> <title>regress_foo_skip_me</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_foo_skip_me (RegressFooSkippable fs); -</code></synopsis> - - - <p>Does something that's only interesting from C and should not be + </code></synopsis> + <p>Does something that's only interesting from C and should not be exposed to language bindings.</p> - - - - + <terms> <item> <title><code>fs</code></title> -<p>a <link xref="Regress.FooSkippable"/></p> + <p>a <link xref="Regress.FooSkippable"/></p> </item> <item> <title><code>Returns</code></title> @@ -44,6 +36,4 @@ exposed to language bindings.</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_some_variant.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_some_variant.page index 41e570ff..ca7cd1e6 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_some_variant.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_some_variant.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -22,21 +21,14 @@ <api:name>args</api:name> </api:arg> </api:function> - </info> <title>regress_foo_some_variant</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_foo_some_variant (guint x, va_list args); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>x</code></title> @@ -52,6 +44,4 @@ void regress_foo_some_variant (guint x, </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_some_variant_ptr.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_some_variant_ptr.page index 81483f1a..a292f009 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_some_variant_ptr.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_some_variant_ptr.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -22,21 +21,14 @@ <api:name>args</api:name> </api:arg> </api:function> - </info> <title>regress_foo_some_variant_ptr</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_foo_some_variant_ptr (guint x, va_list* args); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>x</code></title> @@ -52,6 +44,4 @@ void regress_foo_some_variant_ptr (guint x, </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_array.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_array.page index 810eba9a..d04ec86e 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_array.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_array.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,20 +13,13 @@ </api:returns> <api:name>regress_foo_test_array</api:name> </api:function> - </info> <title>regress_foo_test_array</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> GArray* regress_foo_test_array (void); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -35,6 +27,4 @@ GArray* regress_foo_test_array (void); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_char_param.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_char_param.page index 57ca7b34..9368b46e 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_char_param.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_char_param.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>param</api:name> </api:arg> </api:function> - </info> <title>regress_foo_test_const_char_param</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_foo_test_const_char_param (const char* param); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>param</code></title> @@ -43,6 +35,4 @@ void regress_foo_test_const_char_param (const char* param); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_char_retval.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_char_retval.page index 839bee2c..bc5b9b59 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_char_retval.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_char_retval.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,20 +13,13 @@ </api:returns> <api:name>regress_foo_test_const_char_retval</api:name> </api:function> - </info> <title>regress_foo_test_const_char_retval</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> const char* regress_foo_test_const_char_retval (void); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -35,6 +27,4 @@ const char* regress_foo_test_const_char_retval (void); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_struct_param.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_struct_param.page index 00a1e075..414a2866 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_struct_param.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_struct_param.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>param</api:name> </api:arg> </api:function> - </info> <title>regress_foo_test_const_struct_param</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_foo_test_const_struct_param (const RegressFooStruct* param); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>param</code></title> @@ -43,6 +35,4 @@ void regress_foo_test_const_struct_param (const RegressFooStruct* param); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_struct_retval.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_struct_retval.page index 527b8ea1..72c58a01 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_struct_retval.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_struct_retval.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,20 +13,13 @@ </api:returns> <api:name>regress_foo_test_const_struct_retval</api:name> </api:function> - </info> <title>regress_foo_test_const_struct_retval</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> const RegressFooStruct* regress_foo_test_const_struct_retval (void); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -35,6 +27,4 @@ const RegressFooStruct* regress_foo_test_const_struct_retval (void); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_string_array.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_string_array.page index 17bf08a5..d6bc02b3 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_string_array.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_string_array.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>array</api:name> </api:arg> </api:function> - </info> <title>regress_foo_test_string_array</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_foo_test_string_array (char** array); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>array</code></title> @@ -43,6 +35,4 @@ void regress_foo_test_string_array (char** array); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_string_array_with_g.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_string_array_with_g.page index 91d5824c..22d26350 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_string_array_with_g.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_string_array_with_g.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>array</api:name> </api:arg> </api:function> - </info> <title>regress_foo_test_string_array_with_g</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_foo_test_string_array_with_g (gchar** array); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>array</code></title> @@ -43,6 +35,4 @@ void regress_foo_test_string_array_with_g (gchar** array); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_unsigned_qualifier.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_unsigned_qualifier.page index 8e023665..7019d51b 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_unsigned_qualifier.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_unsigned_qualifier.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>unsigned_param</api:name> </api:arg> </api:function> - </info> <title>regress_foo_test_unsigned_qualifier</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_foo_test_unsigned_qualifier (unsigned int unsigned_param); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>unsigned_param</code></title> @@ -43,6 +35,4 @@ void regress_foo_test_unsigned_qualifier (unsigned int unsigned_param); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_unsigned_type.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_unsigned_type.page index 04eec058..56870b42 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_unsigned_type.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_unsigned_type.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>unsigned_param</api:name> </api:arg> </api:function> - </info> <title>regress_foo_test_unsigned_type</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_foo_test_unsigned_type (unsigned unsigned_param); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>unsigned_param</code></title> @@ -43,6 +35,4 @@ void regress_foo_test_unsigned_type (unsigned unsigned_param); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_varargs_callback.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_varargs_callback.page index 210f53ca..edc60f11 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_varargs_callback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_varargs_callback.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -22,21 +21,14 @@ <api:name>callback</api:name> </api:arg> </api:function> - </info> <title>regress_foo_test_varargs_callback</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_foo_test_varargs_callback (gint i, RegressFooVarargsCallback callback); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>i</code></title> @@ -52,6 +44,4 @@ void regress_foo_test_varargs_callback (gint i, </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_varargs_callback2.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_varargs_callback2.page index 1d49d318..ef371fcd 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_varargs_callback2.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_varargs_callback2.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>callback</api:name> </api:arg> </api:function> - </info> <title>regress_foo_test_varargs_callback2</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_foo_test_varargs_callback2 (RegressFooVarargsCallback callback); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>callback</code></title> @@ -43,6 +35,4 @@ void regress_foo_test_varargs_callback2 (RegressFooVarargsCallback callback); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_varargs_callback3.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_varargs_callback3.page index 19c19326..0453e646 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_varargs_callback3.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_varargs_callback3.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -22,21 +21,14 @@ <api:name>callback2</api:name> </api:arg> </api:function> - </info> <title>regress_foo_test_varargs_callback3</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_foo_test_varargs_callback3 (RegressFooVarargsCallback callback, RegressFooVarargsCallback callback2); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>callback</code></title> @@ -52,6 +44,4 @@ void regress_foo_test_varargs_callback3 (RegressFooVarargsCallback callback, </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.func_obj_null_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.func_obj_null_in.page index 40093e2c..7507bb7f 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.func_obj_null_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.func_obj_null_in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,24 +17,17 @@ <api:name>obj</api:name> </api:arg> </api:function> - </info> <title>regress_func_obj_null_in</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_func_obj_null_in (RegressTestObj* obj); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>obj</code></title> -<p>A <link xref="Regress.TestObj"/></p> + <p>A <link xref="Regress.TestObj"/></p> </item> <item> <title><code>Returns</code></title> @@ -43,6 +35,4 @@ void regress_func_obj_null_in (RegressTestObj* obj); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.global_get_flags_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.global_get_flags_out.page index a43baa0c..d174ecce 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.global_get_flags_out.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.global_get_flags_out.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,24 +17,17 @@ <api:name>v</api:name> </api:arg> </api:function> - </info> <title>regress_global_get_flags_out</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_global_get_flags_out (RegressTestFlags* v); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>v</code></title> -<p>A flags value</p> + <p>A flags value</p> </item> <item> <title><code>Returns</code></title> @@ -43,6 +35,4 @@ void regress_global_get_flags_out (RegressTestFlags* v); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.has_parameter_named_attrs.page b/tests/scanner/Regress-1.0-C-expected/Regress.has_parameter_named_attrs.page index 6fd4e6b9..05505a75 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.has_parameter_named_attrs.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.has_parameter_named_attrs.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -22,30 +21,23 @@ <api:name>attributes</api:name> </api:arg> </api:function> - </info> <title>regress_has_parameter_named_attrs</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_has_parameter_named_attrs (int foo, gpointer* attributes); -</code></synopsis> - - - <p>This test case mirrors GnomeKeyringPasswordSchema from + </code></synopsis> + <p>This test case mirrors GnomeKeyringPasswordSchema from libgnome-keyring.</p> - - - - + <terms> <item> <title><code>foo</code></title> -<p>some int</p> + <p>some int</p> </item> <item> <title><code>attributes</code></title> -<p>list of attributes</p> + <p>list of attributes</p> </item> <item> <title><code>Returns</code></title> @@ -53,6 +45,4 @@ libgnome-keyring.</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.introspectable_via_alias.page b/tests/scanner/Regress-1.0-C-expected/Regress.introspectable_via_alias.page index 4d30ec54..dc6b5736 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.introspectable_via_alias.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.introspectable_via_alias.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>data</api:name> </api:arg> </api:function> - </info> <title>regress_introspectable_via_alias</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_introspectable_via_alias (RegressPtrArrayAlias* data); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>data</code></title> @@ -43,6 +35,4 @@ void regress_introspectable_via_alias (RegressPtrArrayAlias* data); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.not_introspectable_via_alias.page b/tests/scanner/Regress-1.0-C-expected/Regress.not_introspectable_via_alias.page index 6158db44..a9f494ca 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.not_introspectable_via_alias.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.not_introspectable_via_alias.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>ok</api:name> </api:arg> </api:function> - </info> <title>regress_not_introspectable_via_alias</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_not_introspectable_via_alias (RegressVaListAlias ok); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>ok</code></title> @@ -43,6 +35,4 @@ void regress_not_introspectable_via_alias (RegressVaListAlias ok); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.random_function_with_skipped_structure.page b/tests/scanner/Regress-1.0-C-expected/Regress.random_function_with_skipped_structure.page index 33049796..e6fb0a6a 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.random_function_with_skipped_structure.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.random_function_with_skipped_structure.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -26,22 +25,15 @@ <api:name>v</api:name> </api:arg> </api:function> - </info> <title>regress_random_function_with_skipped_structure</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_random_function_with_skipped_structure (int x, RegressSkippedStructure* foo, double v); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>x</code></title> @@ -61,6 +53,4 @@ void regress_random_function_with_skipped_structure (int x, </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.set_abort_on_error.page b/tests/scanner/Regress-1.0-C-expected/Regress.set_abort_on_error.page index 2853609a..0d02fd1f 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.set_abort_on_error.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.set_abort_on_error.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>abort_on_error</api:name> </api:arg> </api:function> - </info> <title>regress_set_abort_on_error</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_set_abort_on_error (gboolean abort_on_error); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>abort_on_error</code></title> @@ -43,6 +35,4 @@ void regress_set_abort_on_error (gboolean abort_on_error); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_callback.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_callback.page index ee1afcd3..ea616e3d 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_callback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_callback.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>callback</api:name> </api:arg> </api:function> - </info> <title>regress_test_array_callback</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> int regress_test_array_callback (RegressTestCallbackArray callback); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>callback</code></title> @@ -43,6 +35,4 @@ int regress_test_array_callback (RegressTestCallbackArray callback); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_out_objects.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_out_objects.page index 81109158..c759e09a 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_out_objects.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_out_objects.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,24 +17,17 @@ <api:name>objs</api:name> </api:arg> </api:function> - </info> <title>regress_test_array_fixed_out_objects</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_test_array_fixed_out_objects (RegressTestObj*** objs); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>objs</code></title> -<p>An array of <link xref="Regress.TestObj"/></p> + <p>An array of <link xref="Regress.TestObj"/></p> </item> <item> <title><code>Returns</code></title> @@ -43,6 +35,4 @@ void regress_test_array_fixed_out_objects (RegressTestObj*** objs); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_size_int_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_size_int_in.page index 21c6d9f3..d5d7d80c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_size_int_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_size_int_in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,31 +17,22 @@ <api:name>ints</api:name> </api:arg> </api:function> - </info> <title>regress_test_array_fixed_size_int_in</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> int regress_test_array_fixed_size_int_in (int* ints); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>ints</code></title> -<p>a list of 5 integers</p> + <p>a list of 5 integers</p> </item> <item> <title><code>Returns</code></title> -<p>the sum of the items in <code>ints</code></p> + <p>the sum of the items in <code>ints</code></p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_size_int_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_size_int_out.page index 3fa5c4e7..414bb64b 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_size_int_out.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_size_int_out.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,24 +17,17 @@ <api:name>ints</api:name> </api:arg> </api:function> - </info> <title>regress_test_array_fixed_size_int_out</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_test_array_fixed_size_int_out (int** ints); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>ints</code></title> -<p>a list of 5 integers ranging from 0 to 4</p> + <p>a list of 5 integers ranging from 0 to 4</p> </item> <item> <title><code>Returns</code></title> @@ -43,6 +35,4 @@ void regress_test_array_fixed_size_int_out (int** ints); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_size_int_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_size_int_return.page index 913dc0d6..5b70e082 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_size_int_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_size_int_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,27 +13,18 @@ </api:returns> <api:name>regress_test_array_fixed_size_int_return</api:name> </api:function> - </info> <title>regress_test_array_fixed_size_int_return</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> int* regress_test_array_fixed_size_int_return (void); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> -<p>a list of 5 integers ranging from 0 to 4</p> + <p>a list of 5 integers ranging from 0 to 4</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint16_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint16_in.page index 7d05b00c..6325a594 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint16_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint16_in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -22,21 +21,14 @@ <api:name>ints</api:name> </api:arg> </api:function> - </info> <title>regress_test_array_gint16_in</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> int regress_test_array_gint16_in (int n_ints, gint16* ints); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>n_ints</code></title> @@ -44,7 +36,7 @@ int regress_test_array_gint16_in (int n_ints, </item> <item> <title><code>ints</code></title> -<p>List of ints</p> + <p>List of ints</p> </item> <item> <title><code>Returns</code></title> @@ -52,6 +44,4 @@ int regress_test_array_gint16_in (int n_ints, </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint32_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint32_in.page index c5eee2de..36f0e64d 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint32_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint32_in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -22,21 +21,14 @@ <api:name>ints</api:name> </api:arg> </api:function> - </info> <title>regress_test_array_gint32_in</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> gint32 regress_test_array_gint32_in (int n_ints, gint32* ints); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>n_ints</code></title> @@ -44,7 +36,7 @@ gint32 regress_test_array_gint32_in (int n_ints, </item> <item> <title><code>ints</code></title> -<p>List of ints</p> + <p>List of ints</p> </item> <item> <title><code>Returns</code></title> @@ -52,6 +44,4 @@ gint32 regress_test_array_gint32_in (int n_ints, </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint64_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint64_in.page index 7a7701d6..96f37c85 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint64_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint64_in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -22,21 +21,14 @@ <api:name>ints</api:name> </api:arg> </api:function> - </info> <title>regress_test_array_gint64_in</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> gint64 regress_test_array_gint64_in (int n_ints, gint64* ints); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>n_ints</code></title> @@ -44,7 +36,7 @@ gint64 regress_test_array_gint64_in (int n_ints, </item> <item> <title><code>ints</code></title> -<p>List of ints</p> + <p>List of ints</p> </item> <item> <title><code>Returns</code></title> @@ -52,6 +44,4 @@ gint64 regress_test_array_gint64_in (int n_ints, </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint8_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint8_in.page index 8e685793..6b6fd245 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint8_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint8_in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -22,21 +21,14 @@ <api:name>ints</api:name> </api:arg> </api:function> - </info> <title>regress_test_array_gint8_in</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> int regress_test_array_gint8_in (int n_ints, gint8* ints); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>n_ints</code></title> @@ -44,7 +36,7 @@ int regress_test_array_gint8_in (int n_ints, </item> <item> <title><code>ints</code></title> -<p>List of ints</p> + <p>List of ints</p> </item> <item> <title><code>Returns</code></title> @@ -52,6 +44,4 @@ int regress_test_array_gint8_in (int n_ints, </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gtype_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gtype_in.page index 0eab274d..51545e35 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gtype_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gtype_in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -22,21 +21,14 @@ <api:name>types</api:name> </api:arg> </api:function> - </info> <title>regress_test_array_gtype_in</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> char* regress_test_array_gtype_in (int n_types, GType* types); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>n_types</code></title> @@ -44,14 +36,12 @@ char* regress_test_array_gtype_in (int n_types, </item> <item> <title><code>types</code></title> -<p>List of types</p> + <p>List of types</p> </item> <item> <title><code>Returns</code></title> -<p>string representation of provided types</p> + <p>string representation of provided types</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_full_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_full_out.page index 5eb26d6b..54fdd14e 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_full_out.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_full_out.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,31 +17,22 @@ <api:name>len</api:name> </api:arg> </api:function> - </info> <title>regress_test_array_int_full_out</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> int* regress_test_array_int_full_out (int* len); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>len</code></title> -<p>length of the returned array.</p> + <p>length of the returned array.</p> </item> <item> <title><code>Returns</code></title> -<p>a new array of integers.</p> + <p>a new array of integers.</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_in.page index 0caeee19..97a25eb3 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -22,21 +21,14 @@ <api:name>ints</api:name> </api:arg> </api:function> - </info> <title>regress_test_array_int_in</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> int regress_test_array_int_in (int n_ints, int* ints); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>n_ints</code></title> @@ -44,7 +36,7 @@ int regress_test_array_int_in (int n_ints, </item> <item> <title><code>ints</code></title> -<p>List of ints</p> + <p>List of ints</p> </item> <item> <title><code>Returns</code></title> @@ -52,6 +44,4 @@ int regress_test_array_int_in (int n_ints, </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_inout.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_inout.page index 75d142a0..1fc3d1b5 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_inout.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_inout.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -22,29 +21,22 @@ <api:name>ints</api:name> </api:arg> </api:function> - </info> <title>regress_test_array_int_inout</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_test_array_int_inout (int* n_ints, int** ints); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>n_ints</code></title> -<p>the length of <code>ints</code></p> + <p>the length of <code>ints</code></p> </item> <item> <title><code>ints</code></title> -<p>a list of integers whose items will be increased by 1, except the first that will be dropped</p> + <p>a list of integers whose items will be increased by 1, except the first that will be dropped</p> </item> <item> <title><code>Returns</code></title> @@ -52,6 +44,4 @@ void regress_test_array_int_inout (int* n_ints, </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_none_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_none_out.page index c4698cef..91bef749 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_none_out.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_none_out.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,31 +17,22 @@ <api:name>len</api:name> </api:arg> </api:function> - </info> <title>regress_test_array_int_none_out</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> int* regress_test_array_int_none_out (int* len); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>len</code></title> -<p>length of the returned array.</p> + <p>length of the returned array.</p> </item> <item> <title><code>Returns</code></title> -<p>a static array of integers.</p> + <p>a static array of integers.</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_null_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_null_in.page index bab17416..824fc94f 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_null_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_null_in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -22,21 +21,14 @@ <api:name>len</api:name> </api:arg> </api:function> - </info> <title>regress_test_array_int_null_in</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_test_array_int_null_in (int* arr, int len); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>arr</code></title> @@ -44,7 +36,7 @@ void regress_test_array_int_null_in (int* arr, </item> <item> <title><code>len</code></title> -<p>length</p> + <p>length</p> </item> <item> <title><code>Returns</code></title> @@ -52,6 +44,4 @@ void regress_test_array_int_null_in (int* arr, </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_null_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_null_out.page index cdf6bdaa..c3645c99 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_null_out.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_null_out.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -22,21 +21,14 @@ <api:name>len</api:name> </api:arg> </api:function> - </info> <title>regress_test_array_int_null_out</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_test_array_int_null_out (int** arr, int* len); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>arr</code></title> @@ -44,7 +36,7 @@ void regress_test_array_int_null_out (int** arr, </item> <item> <title><code>len</code></title> -<p>length</p> + <p>length</p> </item> <item> <title><code>Returns</code></title> @@ -52,6 +44,4 @@ void regress_test_array_int_null_out (int** arr, </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_out.page index b88feb22..c7f3407b 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_out.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_out.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -22,29 +21,22 @@ <api:name>ints</api:name> </api:arg> </api:function> - </info> <title>regress_test_array_int_out</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_test_array_int_out (int* n_ints, int** ints); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>n_ints</code></title> -<p>the length of <code>ints</code></p> + <p>the length of <code>ints</code></p> </item> <item> <title><code>ints</code></title> -<p>a list of 5 integers, from 0 to 4 in consecutive order</p> + <p>a list of 5 integers, from 0 to 4 in consecutive order</p> </item> <item> <title><code>Returns</code></title> @@ -52,6 +44,4 @@ void regress_test_array_int_out (int* n_ints, </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_async_ready_callback.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_async_ready_callback.page index bd65df08..0d893adf 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_async_ready_callback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_async_ready_callback.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>callback</api:name> </api:arg> </api:function> - </info> <title>regress_test_async_ready_callback</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_test_async_ready_callback (GAsyncReadyCallback callback); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>callback</code></title> @@ -43,6 +35,4 @@ void regress_test_async_ready_callback (GAsyncReadyCallback callback); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_boolean.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_boolean.page index a444eb2a..576763e3 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_boolean.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_boolean.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> <title>regress_test_boolean</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> gboolean regress_test_boolean (gboolean in); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -43,6 +35,4 @@ gboolean regress_test_boolean (gboolean in); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_boolean_false.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_boolean_false.page index c96a2f9d..2743a492 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_boolean_false.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_boolean_false.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> <title>regress_test_boolean_false</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> gboolean regress_test_boolean_false (gboolean in); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -43,6 +35,4 @@ gboolean regress_test_boolean_false (gboolean in); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_boolean_true.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_boolean_true.page index 1fb64c17..4eb35971 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_boolean_true.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_boolean_true.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> <title>regress_test_boolean_true</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> gboolean regress_test_boolean_true (gboolean in); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -43,6 +35,4 @@ gboolean regress_test_boolean_true (gboolean in); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_context_full_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_context_full_return.page index 8ada9d2c..ac5bb551 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_context_full_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_context_full_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,20 +13,13 @@ </api:returns> <api:name>regress_test_cairo_context_full_return</api:name> </api:function> - </info> <title>regress_test_cairo_context_full_return</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> cairo_t* regress_test_cairo_context_full_return (void); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -35,6 +27,4 @@ cairo_t* regress_test_cairo_context_full_return (void); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_context_none_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_context_none_in.page index 059afd52..42abbee3 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_context_none_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_context_none_in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>context</api:name> </api:arg> </api:function> - </info> <title>regress_test_cairo_context_none_in</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_test_cairo_context_none_in (cairo_t* context); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>context</code></title> @@ -43,6 +35,4 @@ void regress_test_cairo_context_none_in (cairo_t* context); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_full_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_full_out.page index c04a3454..3ce52390 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_full_out.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_full_out.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>surface</api:name> </api:arg> </api:function> - </info> <title>regress_test_cairo_surface_full_out</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_test_cairo_surface_full_out (cairo_surface_t** surface); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>surface</code></title> @@ -43,6 +35,4 @@ void regress_test_cairo_surface_full_out (cairo_surface_t** surface); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_full_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_full_return.page index 7d77ae66..d2110e31 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_full_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_full_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,20 +13,13 @@ </api:returns> <api:name>regress_test_cairo_surface_full_return</api:name> </api:function> - </info> <title>regress_test_cairo_surface_full_return</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> cairo_surface_t* regress_test_cairo_surface_full_return (void); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -35,6 +27,4 @@ cairo_surface_t* regress_test_cairo_surface_full_return (void); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_none_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_none_in.page index 67302474..ee9d5d70 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_none_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_none_in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>surface</api:name> </api:arg> </api:function> - </info> <title>regress_test_cairo_surface_none_in</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_test_cairo_surface_none_in (cairo_surface_t* surface); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>surface</code></title> @@ -43,6 +35,4 @@ void regress_test_cairo_surface_none_in (cairo_surface_t* surface); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_none_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_none_return.page index a5ac661c..c5f471c0 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_none_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_none_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,20 +13,13 @@ </api:returns> <api:name>regress_test_cairo_surface_none_return</api:name> </api:function> - </info> <title>regress_test_cairo_surface_none_return</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> cairo_surface_t* regress_test_cairo_surface_none_return (void); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -35,6 +27,4 @@ cairo_surface_t* regress_test_cairo_surface_none_return (void); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_callback.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback.page index 7d2f2c8d..a70aecb9 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_callback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>callback</api:name> </api:arg> </api:function> - </info> <title>regress_test_callback</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> int regress_test_callback (RegressTestCallback callback); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>callback</code></title> @@ -43,6 +35,4 @@ int regress_test_callback (RegressTestCallback callback); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_async.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_async.page index 8c0a62e8..69885df5 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_async.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_async.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -22,21 +21,14 @@ <api:name>user_data</api:name> </api:arg> </api:function> - </info> <title>regress_test_callback_async</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_test_callback_async (RegressTestCallbackUserData callback, gpointer user_data); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>callback</code></title> @@ -52,6 +44,4 @@ void regress_test_callback_async (RegressTestCallbackUserData callback, </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_destroy_notify.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_destroy_notify.page index f7a5e56c..484bdae9 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_destroy_notify.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_destroy_notify.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -26,23 +25,16 @@ <api:name>notify</api:name> </api:arg> </api:function> - </info> <title>regress_test_callback_destroy_notify</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> int regress_test_callback_destroy_notify (RegressTestCallbackUserData callback, gpointer user_data, GDestroyNotify notify); -</code></synopsis> - - - <p>Notified - callback persists until a DestroyNotify delegate + </code></synopsis> + <p>Notified - callback persists until a DestroyNotify delegate is invoked.</p> - - - - + <terms> <item> <title><code>callback</code></title> @@ -62,6 +54,4 @@ is invoked.</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_destroy_notify_no_user_data.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_destroy_notify_no_user_data.page index 3b162e28..44933c69 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_destroy_notify_no_user_data.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_destroy_notify_no_user_data.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -22,22 +21,15 @@ <api:name>notify</api:name> </api:arg> </api:function> - </info> <title>regress_test_callback_destroy_notify_no_user_data</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> int regress_test_callback_destroy_notify_no_user_data (RegressTestCallbackUserData callback, GDestroyNotify notify); -</code></synopsis> - - - <p>Adds a scope notified callback with no user data. This can invoke an error + </code></synopsis> + <p>Adds a scope notified callback with no user data. This can invoke an error condition in bindings which needs to be tested.</p> - - - - + <terms> <item> <title><code>callback</code></title> @@ -53,6 +45,4 @@ condition in bindings which needs to be tested.</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_thaw_async.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_thaw_async.page index 5cc15570..7babbdfa 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_thaw_async.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_thaw_async.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,20 +13,13 @@ </api:returns> <api:name>regress_test_callback_thaw_async</api:name> </api:function> - </info> <title>regress_test_callback_thaw_async</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> int regress_test_callback_thaw_async (void); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -35,6 +27,4 @@ int regress_test_callback_thaw_async (void); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_thaw_notifications.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_thaw_notifications.page index bb0ed81a..3ff8aaaf 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_thaw_notifications.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_thaw_notifications.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,29 +13,20 @@ </api:returns> <api:name>regress_test_callback_thaw_notifications</api:name> </api:function> - </info> <title>regress_test_callback_thaw_notifications</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> int regress_test_callback_thaw_notifications (void); -</code></synopsis> - - - <p>Invokes all callbacks installed by #test_callback_destroy_notify(), + </code></synopsis> + <p>Invokes all callbacks installed by #test_callback_destroy_notify(), adding up their return values, and removes them, invoking the corresponding destroy notfications.</p> - - - - + <terms> <item> <title><code>Returns</code></title> -<p>Sum of the return values of the invoked callbacks.</p> + <p>Sum of the return values of the invoked callbacks.</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_user_data.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_user_data.page index 3a98a475..1f120a92 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_user_data.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_user_data.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -22,22 +21,15 @@ <api:name>user_data</api:name> </api:arg> </api:function> - </info> <title>regress_test_callback_user_data</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> int regress_test_callback_user_data (RegressTestCallbackUserData callback, gpointer user_data); -</code></synopsis> - - - <p>Call - callback parameter persists for the duration of the method + </code></synopsis> + <p>Call - callback parameter persists for the duration of the method call and can be released on return.</p> - - - - + <terms> <item> <title><code>callback</code></title> @@ -53,6 +45,4 @@ call and can be released on return.</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_closure.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_closure.page index 0fdad912..59795234 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_closure.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_closure.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>closure</api:name> </api:arg> </api:function> - </info> <title>regress_test_closure</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> int regress_test_closure (GClosure* closure); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>closure</code></title> @@ -43,6 +35,4 @@ int regress_test_closure (GClosure* closure); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_closure_one_arg.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_closure_one_arg.page index 0708b5c8..c772776e 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_closure_one_arg.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_closure_one_arg.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -22,21 +21,14 @@ <api:name>arg</api:name> </api:arg> </api:function> - </info> <title>regress_test_closure_one_arg</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> int regress_test_closure_one_arg (GClosure* closure, int arg); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>closure</code></title> @@ -52,6 +44,4 @@ int regress_test_closure_one_arg (GClosure* closure, </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_closure_variant.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_closure_variant.page index 681b37ae..ec22a9e2 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_closure_variant.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_closure_variant.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -22,36 +21,27 @@ <api:name>arg</api:name> </api:arg> </api:function> - </info> <title>regress_test_closure_variant</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> GVariant* regress_test_closure_variant (GClosure* closure, GVariant* arg); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>closure</code></title> -<p>GClosure which takes one GVariant and returns a GVariant</p> + <p>GClosure which takes one GVariant and returns a GVariant</p> </item> <item> <title><code>arg</code></title> -<p>a GVariant passed as argument to <code>closure</code></p> + <p>a GVariant passed as argument to <code>closure</code></p> </item> <item> <title><code>Returns</code></title> -<p>the return value of <code>closure</code></p> + <p>the return value of <code>closure</code></p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_date_in_gvalue.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_date_in_gvalue.page index adb21f28..caca59c2 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_date_in_gvalue.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_date_in_gvalue.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,20 +13,13 @@ </api:returns> <api:name>regress_test_date_in_gvalue</api:name> </api:function> - </info> <title>regress_test_date_in_gvalue</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> GValue* regress_test_date_in_gvalue (void); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -35,6 +27,4 @@ GValue* regress_test_date_in_gvalue (void); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_def_error_quark.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_def_error_quark.page index 7ad7eb06..1990677c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_def_error_quark.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_def_error_quark.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,20 +13,13 @@ </api:returns> <api:name>regress_test_def_error_quark</api:name> </api:function> - </info> <title>regress_test_def_error_quark</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> GQuark regress_test_def_error_quark (void); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -35,6 +27,4 @@ GQuark regress_test_def_error_quark (void); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_double.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_double.page index f954fe83..ad2a0399 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_double.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_double.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> <title>regress_test_double</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> gdouble regress_test_double (gdouble in); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -43,6 +35,4 @@ gdouble regress_test_double (gdouble in); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_filename_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_filename_return.page index 857e4da0..43e5aabe 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_filename_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_filename_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,27 +13,18 @@ </api:returns> <api:name>regress_test_filename_return</api:name> </api:function> - </info> <title>regress_test_filename_return</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> GSList* regress_test_filename_return (void); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> -<p>list of strings</p> + <p>list of strings</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_float.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_float.page index c395b048..3e703943 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_float.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_float.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> <title>regress_test_float</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> gfloat regress_test_float (gfloat in); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -43,6 +35,4 @@ gfloat regress_test_float (gfloat in); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_garray_container_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_garray_container_return.page index f17cdd94..ccee90d5 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_garray_container_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_garray_container_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,20 +13,13 @@ </api:returns> <api:name>regress_test_garray_container_return</api:name> </api:function> - </info> <title>regress_test_garray_container_return</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> GPtrArray* regress_test_garray_container_return (void); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -35,6 +27,4 @@ GPtrArray* regress_test_garray_container_return (void); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_garray_full_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_garray_full_return.page index b127ed7f..64b18176 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_garray_full_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_garray_full_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,20 +13,13 @@ </api:returns> <api:name>regress_test_garray_full_return</api:name> </api:function> - </info> <title>regress_test_garray_full_return</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> GPtrArray* regress_test_garray_full_return (void); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -35,6 +27,4 @@ GPtrArray* regress_test_garray_full_return (void); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gerror_callback.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_gerror_callback.page index 1a5f54cc..7a2080cc 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_gerror_callback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gerror_callback.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>callback</api:name> </api:arg> </api:function> - </info> <title>regress_test_gerror_callback</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_test_gerror_callback (RegressTestCallbackGError callback); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>callback</code></title> @@ -43,6 +35,4 @@ void regress_test_gerror_callback (RegressTestCallbackGError callback); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_container_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_container_return.page index d465113e..539d7ebf 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_container_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_container_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,20 +13,13 @@ </api:returns> <api:name>regress_test_ghash_container_return</api:name> </api:function> - </info> <title>regress_test_ghash_container_return</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> GHashTable* regress_test_ghash_container_return (void); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -35,6 +27,4 @@ GHashTable* regress_test_ghash_container_return (void); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_everything_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_everything_return.page index 616432ae..a4ca1cf6 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_everything_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_everything_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,20 +13,13 @@ </api:returns> <api:name>regress_test_ghash_everything_return</api:name> </api:function> - </info> <title>regress_test_ghash_everything_return</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> GHashTable* regress_test_ghash_everything_return (void); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -35,6 +27,4 @@ GHashTable* regress_test_ghash_everything_return (void); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_gvalue_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_gvalue_in.page index 7603f2aa..e7d8ba8b 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_gvalue_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_gvalue_in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,24 +17,17 @@ <api:name>hash</api:name> </api:arg> </api:function> - </info> <title>regress_test_ghash_gvalue_in</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_test_ghash_gvalue_in (GHashTable* hash); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>hash</code></title> -<p>the hash table returned by + <p>the hash table returned by <link xref="Regress.test_ghash_gvalue_return"/>.</p> </item> <item> @@ -44,6 +36,4 @@ void regress_test_ghash_gvalue_in (GHashTable* hash); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_gvalue_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_gvalue_return.page index 2e739c81..726f6747 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_gvalue_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_gvalue_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,20 +13,13 @@ </api:returns> <api:name>regress_test_ghash_gvalue_return</api:name> </api:function> - </info> <title>regress_test_ghash_gvalue_return</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> GHashTable* regress_test_ghash_gvalue_return (void); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -35,6 +27,4 @@ GHashTable* regress_test_ghash_gvalue_return (void); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nested_everything_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nested_everything_return.page index 6b53197b..f721d1bb 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nested_everything_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nested_everything_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,20 +13,13 @@ </api:returns> <api:name>regress_test_ghash_nested_everything_return</api:name> </api:function> - </info> <title>regress_test_ghash_nested_everything_return</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> GHashTable* regress_test_ghash_nested_everything_return (void); -</code></synopsis> + </code></synopsis> + <p>Specify nested parameterized types directly with the (type ) annotation.</p> - - <p>Specify nested parameterized types directly with the (type ) annotation.</p> - - - - <terms> <item> <title><code>Returns</code></title> @@ -35,6 +27,4 @@ GHashTable* regress_test_ghash_nested_everything_return (void); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nested_everything_return2.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nested_everything_return2.page index 0c780b5e..4b145bd2 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nested_everything_return2.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nested_everything_return2.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,21 +13,14 @@ </api:returns> <api:name>regress_test_ghash_nested_everything_return2</api:name> </api:function> - </info> <title>regress_test_ghash_nested_everything_return2</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> GHashTable* regress_test_ghash_nested_everything_return2 (void); -</code></synopsis> - - - <p>Another way of specifying nested parameterized types: using the + </code></synopsis> + <p>Another way of specifying nested parameterized types: using the element-type annotation.</p> - - - - + <terms> <item> <title><code>Returns</code></title> @@ -36,6 +28,4 @@ element-type annotation.</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_in.page index 8c457ad2..ebda10b9 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> <title>regress_test_ghash_nothing_in</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_test_ghash_nothing_in (const GHashTable* in); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -43,6 +35,4 @@ void regress_test_ghash_nothing_in (const GHashTable* in); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_in2.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_in2.page index a56ad65b..6a6c95cc 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_in2.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_in2.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> <title>regress_test_ghash_nothing_in2</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_test_ghash_nothing_in2 (GHashTable* in); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -43,6 +35,4 @@ void regress_test_ghash_nothing_in2 (GHashTable* in); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_return.page index c258ee02..d291e15d 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,20 +13,13 @@ </api:returns> <api:name>regress_test_ghash_nothing_return</api:name> </api:function> - </info> <title>regress_test_ghash_nothing_return</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> const GHashTable* regress_test_ghash_nothing_return (void); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -35,6 +27,4 @@ const GHashTable* regress_test_ghash_nothing_return (void); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_return2.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_return2.page index d2217447..1c2eced1 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_return2.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_return2.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,20 +13,13 @@ </api:returns> <api:name>regress_test_ghash_nothing_return2</api:name> </api:function> - </info> <title>regress_test_ghash_nothing_return2</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> GHashTable* regress_test_ghash_nothing_return2 (void); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -35,6 +27,4 @@ GHashTable* regress_test_ghash_nothing_return2 (void); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_null_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_null_in.page index a538b442..e8a6d681 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_null_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_null_in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> <title>regress_test_ghash_null_in</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_test_ghash_null_in (const GHashTable* in); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -43,6 +35,4 @@ void regress_test_ghash_null_in (const GHashTable* in); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_null_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_null_out.page index 323469c6..9acbfa97 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_null_out.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_null_out.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>out</api:name> </api:arg> </api:function> - </info> <title>regress_test_ghash_null_out</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_test_ghash_null_out (const GHashTable** out); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>out</code></title> @@ -43,6 +35,4 @@ void regress_test_ghash_null_out (const GHashTable** out); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_null_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_null_return.page index 03461fd9..aa97efbb 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_null_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_null_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,20 +13,13 @@ </api:returns> <api:name>regress_test_ghash_null_return</api:name> </api:function> - </info> <title>regress_test_ghash_null_return</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> const GHashTable* regress_test_ghash_null_return (void); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -35,6 +27,4 @@ const GHashTable* regress_test_ghash_null_return (void); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_container_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_container_return.page index 32a3c3a6..ee98b287 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_container_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_container_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,20 +13,13 @@ </api:returns> <api:name>regress_test_glist_container_return</api:name> </api:function> - </info> <title>regress_test_glist_container_return</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> GList* regress_test_glist_container_return (void); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -35,6 +27,4 @@ GList* regress_test_glist_container_return (void); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_everything_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_everything_return.page index 6de1a9c8..96f79851 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_everything_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_everything_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,20 +13,13 @@ </api:returns> <api:name>regress_test_glist_everything_return</api:name> </api:function> - </info> <title>regress_test_glist_everything_return</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> GList* regress_test_glist_everything_return (void); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -35,6 +27,4 @@ GList* regress_test_glist_everything_return (void); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_in.page index d88487f0..c14e0a19 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> <title>regress_test_glist_nothing_in</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_test_glist_nothing_in (const GList* in); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -43,6 +35,4 @@ void regress_test_glist_nothing_in (const GList* in); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_in2.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_in2.page index 7cba8517..310643b4 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_in2.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_in2.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> <title>regress_test_glist_nothing_in2</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_test_glist_nothing_in2 (GList* in); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -43,6 +35,4 @@ void regress_test_glist_nothing_in2 (GList* in); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_return.page index af54aead..7e87fcab 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,20 +13,13 @@ </api:returns> <api:name>regress_test_glist_nothing_return</api:name> </api:function> - </info> <title>regress_test_glist_nothing_return</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> const GList* regress_test_glist_nothing_return (void); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -35,6 +27,4 @@ const GList* regress_test_glist_nothing_return (void); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_return2.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_return2.page index 2901e41d..c59cb8d1 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_return2.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_return2.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,20 +13,13 @@ </api:returns> <api:name>regress_test_glist_nothing_return2</api:name> </api:function> - </info> <title>regress_test_glist_nothing_return2</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> GList* regress_test_glist_nothing_return2 (void); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -35,6 +27,4 @@ GList* regress_test_glist_nothing_return2 (void); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_null_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_null_in.page index b6ca3ab3..db711424 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_null_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_null_in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> <title>regress_test_glist_null_in</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_test_glist_null_in (GSList* in); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -43,6 +35,4 @@ void regress_test_glist_null_in (GSList* in); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_null_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_null_out.page index 13e421db..ac03e1a2 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_null_out.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_null_out.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>out_list</api:name> </api:arg> </api:function> - </info> <title>regress_test_glist_null_out</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_test_glist_null_out (GSList** out_list); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>out_list</code></title> @@ -43,6 +35,4 @@ void regress_test_glist_null_out (GSList** out_list); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_container_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_container_return.page index 05587fcb..4920cfb6 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_container_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_container_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,20 +13,13 @@ </api:returns> <api:name>regress_test_gslist_container_return</api:name> </api:function> - </info> <title>regress_test_gslist_container_return</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> GSList* regress_test_gslist_container_return (void); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -35,6 +27,4 @@ GSList* regress_test_gslist_container_return (void); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_everything_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_everything_return.page index a03f4d89..4939dd19 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_everything_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_everything_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,20 +13,13 @@ </api:returns> <api:name>regress_test_gslist_everything_return</api:name> </api:function> - </info> <title>regress_test_gslist_everything_return</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> GSList* regress_test_gslist_everything_return (void); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -35,6 +27,4 @@ GSList* regress_test_gslist_everything_return (void); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_in.page index 61a14b1c..76ddec5c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> <title>regress_test_gslist_nothing_in</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_test_gslist_nothing_in (const GSList* in); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -43,6 +35,4 @@ void regress_test_gslist_nothing_in (const GSList* in); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_in2.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_in2.page index 0703ec00..bc93886c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_in2.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_in2.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> <title>regress_test_gslist_nothing_in2</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_test_gslist_nothing_in2 (GSList* in); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -43,6 +35,4 @@ void regress_test_gslist_nothing_in2 (GSList* in); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_return.page index 8df79aa5..1b18f67a 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,20 +13,13 @@ </api:returns> <api:name>regress_test_gslist_nothing_return</api:name> </api:function> - </info> <title>regress_test_gslist_nothing_return</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> const GSList* regress_test_gslist_nothing_return (void); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -35,6 +27,4 @@ const GSList* regress_test_gslist_nothing_return (void); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_return2.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_return2.page index aeb9a672..3d8caef7 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_return2.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_return2.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,20 +13,13 @@ </api:returns> <api:name>regress_test_gslist_nothing_return2</api:name> </api:function> - </info> <title>regress_test_gslist_nothing_return2</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> GSList* regress_test_gslist_nothing_return2 (void); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -35,6 +27,4 @@ GSList* regress_test_gslist_nothing_return2 (void); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_null_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_null_in.page index 21d8d5c1..2dd93e8c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_null_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_null_in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> <title>regress_test_gslist_null_in</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_test_gslist_null_in (GSList* in); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -43,6 +35,4 @@ void regress_test_gslist_null_in (GSList* in); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_null_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_null_out.page index d7635199..8448b51b 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_null_out.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_null_out.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>out_list</api:name> </api:arg> </api:function> - </info> <title>regress_test_gslist_null_out</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_test_gslist_null_out (GSList** out_list); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>out_list</code></title> @@ -43,6 +35,4 @@ void regress_test_gslist_null_out (GSList** out_list); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gtype.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_gtype.page index 76e678bd..bd800b5f 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_gtype.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gtype.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> <title>regress_test_gtype</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> GType regress_test_gtype (GType in); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -43,6 +35,4 @@ GType regress_test_gtype (GType in); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_as.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_as.page index df9d988a..e0e1f801 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_as.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_as.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,27 +13,18 @@ </api:returns> <api:name>regress_test_gvariant_as</api:name> </api:function> - </info> <title>regress_test_gvariant_as</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> GVariant* regress_test_gvariant_as (void); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> -<p>New variant</p> + <p>New variant</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_asv.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_asv.page index 2d64ab24..c23f3b28 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_asv.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_asv.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,27 +13,18 @@ </api:returns> <api:name>regress_test_gvariant_asv</api:name> </api:function> - </info> <title>regress_test_gvariant_asv</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> GVariant* regress_test_gvariant_asv (void); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> -<p>New variant</p> + <p>New variant</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_i.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_i.page index 2eec9944..1d5ed1f4 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_i.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_i.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,27 +13,18 @@ </api:returns> <api:name>regress_test_gvariant_i</api:name> </api:function> - </info> <title>regress_test_gvariant_i</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> GVariant* regress_test_gvariant_i (void); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> -<p>New variant</p> + <p>New variant</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_s.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_s.page index 9ef9d9f7..2ba1a2ca 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_s.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_s.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,27 +13,18 @@ </api:returns> <api:name>regress_test_gvariant_s</api:name> </api:function> - </info> <title>regress_test_gvariant_s</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> GVariant* regress_test_gvariant_s (void); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> -<p>New variant</p> + <p>New variant</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_v.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_v.page index c07b2ac8..d47e28c9 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_v.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_v.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,27 +13,18 @@ </api:returns> <api:name>regress_test_gvariant_v</api:name> </api:function> - </info> <title>regress_test_gvariant_v</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> GVariant* regress_test_gvariant_v (void); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> -<p>New variant</p> + <p>New variant</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_hash_table_callback.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_hash_table_callback.page index 24862b10..a6234541 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_hash_table_callback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_hash_table_callback.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -22,25 +21,18 @@ <api:name>callback</api:name> </api:arg> </api:function> - </info> <title>regress_test_hash_table_callback</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_test_hash_table_callback (GHashTable* data, RegressTestCallbackHashtable callback); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>data</code></title> -<p>GHashTable that gets passed to callback</p> + <p>GHashTable that gets passed to callback</p> </item> <item> <title><code>callback</code></title> @@ -52,6 +44,4 @@ void regress_test_hash_table_callback (GHashTable* data, </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_int.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_int.page index 430af30e..747b2cdb 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_int.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_int.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> <title>regress_test_int</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> gint regress_test_int (gint in); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -43,6 +35,4 @@ gint regress_test_int (gint in); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_int16.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_int16.page index d5be61d9..ff49f2ea 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_int16.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_int16.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> <title>regress_test_int16</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> gint16 regress_test_int16 (gint16 in); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -43,6 +35,4 @@ gint16 regress_test_int16 (gint16 in); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_int32.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_int32.page index be90ac6d..96962ba9 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_int32.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_int32.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> <title>regress_test_int32</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> gint32 regress_test_int32 (gint32 in); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -43,6 +35,4 @@ gint32 regress_test_int32 (gint32 in); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_int64.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_int64.page index d864702f..f2f73f72 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_int64.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_int64.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> <title>regress_test_int64</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> gint64 regress_test_int64 (gint64 in); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -43,6 +35,4 @@ gint64 regress_test_int64 (gint64 in); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_int8.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_int8.page index 1cfb4319..67746b36 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_int8.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_int8.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> <title>regress_test_int8</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> gint8 regress_test_int8 (gint8 in); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -43,6 +35,4 @@ gint8 regress_test_int8 (gint8 in); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_int_out_utf8.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_int_out_utf8.page index 80276c00..60892283 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_int_out_utf8.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_int_out_utf8.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -22,21 +21,14 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> <title>regress_test_int_out_utf8</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_test_int_out_utf8 (int* length, const char* in); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>length</code></title> @@ -52,6 +44,4 @@ void regress_test_int_out_utf8 (int* length, </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_int_value_arg.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_int_value_arg.page index a61c91cd..51735d18 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_int_value_arg.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_int_value_arg.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>v</api:name> </api:arg> </api:function> - </info> <title>regress_test_int_value_arg</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> int regress_test_int_value_arg (const GValue* v); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>v</code></title> @@ -43,6 +35,4 @@ int regress_test_int_value_arg (const GValue* v); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_long.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_long.page index 30bf3afb..840b0b8b 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_long.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_long.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> <title>regress_test_long</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> glong regress_test_long (glong in); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -43,6 +35,4 @@ glong regress_test_long (glong in); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_multi_callback.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_multi_callback.page index 152c9166..dfa77f27 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_multi_callback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_multi_callback.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>callback</api:name> </api:arg> </api:function> - </info> <title>regress_test_multi_callback</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> int regress_test_multi_callback (RegressTestCallback callback); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>callback</code></title> @@ -43,6 +35,4 @@ int regress_test_multi_callback (RegressTestCallback callback); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_multi_double_args.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_multi_double_args.page index 5135297f..693a2c84 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_multi_double_args.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_multi_double_args.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -26,22 +25,15 @@ <api:name>two</api:name> </api:arg> </api:function> - </info> <title>regress_test_multi_double_args</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_test_multi_double_args (gdouble in, gdouble* one, gdouble* two); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -61,6 +53,4 @@ void regress_test_multi_double_args (gdouble in, </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_multiline_doc_comments.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_multiline_doc_comments.page index d660bd83..9c4c6851 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_multiline_doc_comments.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_multiline_doc_comments.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,20 +13,13 @@ </api:returns> <api:name>regress_test_multiline_doc_comments</api:name> </api:function> - </info> <title>regress_test_multiline_doc_comments</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_test_multiline_doc_comments (void); -</code></synopsis> + </code></synopsis> + <p>This is a function.</p> <p>It has multiple lines in the documentation.</p> <p>The sky is blue.</p> <p>You will give me your credit card number.</p> - - <p>This is a function.</p><p>It has multiple lines in the documentation.</p><p>The sky is blue.</p><p>You will give me your credit card number.</p> - - - - <terms> <item> <title><code>Returns</code></title> @@ -35,6 +27,4 @@ void regress_test_multiline_doc_comments (void); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_nested_parameter.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_nested_parameter.page index c28cc8fa..c04055c0 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_nested_parameter.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_nested_parameter.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,16 +17,12 @@ <api:name>a</api:name> </api:arg> </api:function> - </info> <title>regress_test_nested_parameter</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_test_nested_parameter (int a); -</code></synopsis> - - - <p><informaltable> + </code></synopsis> + <p><informaltable> <tgroup cols="3"> <thead> <row> @@ -52,15 +47,12 @@ rgb(20%, 30%, 0%)</literallayout></entry> </row> </tbody> </tgroup> -</informaltable></p><p>What we're testing here is that the scanner ignores the <code>a</code> nested inside XML.</p> - - - - +</informaltable></p> <p>What we're testing here is that the scanner ignores the <code>a</code> nested inside XML.</p> + <terms> <item> <title><code>a</code></title> -<p>An integer</p> + <p>An integer</p> </item> <item> <title><code>Returns</code></title> @@ -68,6 +60,4 @@ rgb(20%, 30%, 0%)</literallayout></entry> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_null_gerror_callback.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_null_gerror_callback.page index bdcc152d..c6ed1f9b 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_null_gerror_callback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_null_gerror_callback.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>callback</api:name> </api:arg> </api:function> - </info> <title>regress_test_null_gerror_callback</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_test_null_gerror_callback (RegressTestCallbackGError callback); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>callback</code></title> @@ -43,6 +35,4 @@ void regress_test_null_gerror_callback (RegressTestCallbackGError callback); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_owned_gerror_callback.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_owned_gerror_callback.page index 49f1b360..3e12c1dc 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_owned_gerror_callback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_owned_gerror_callback.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>callback</api:name> </api:arg> </api:function> - </info> <title>regress_test_owned_gerror_callback</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_test_owned_gerror_callback (RegressTestCallbackOwnedGError callback); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>callback</code></title> @@ -43,6 +35,4 @@ void regress_test_owned_gerror_callback (RegressTestCallbackOwnedGError callback </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_short.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_short.page index 53d3b1bd..fd172900 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_short.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_short.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> <title>regress_test_short</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> gshort regress_test_short (gshort in); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -43,6 +35,4 @@ gshort regress_test_short (gshort in); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_simple_callback.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_simple_callback.page index 514fbfaa..fa5974d5 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_simple_callback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_simple_callback.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>callback</api:name> </api:arg> </api:function> - </info> <title>regress_test_simple_callback</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_test_simple_callback (RegressTestSimpleCallback callback); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>callback</code></title> @@ -43,6 +35,4 @@ void regress_test_simple_callback (RegressTestSimpleCallback callback); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_size.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_size.page index 3b67a00a..d6fdd175 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_size.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_size.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> <title>regress_test_size</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> gsize regress_test_size (gsize in); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -43,6 +35,4 @@ gsize regress_test_size (gsize in); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_skip_unannotated_callback.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_skip_unannotated_callback.page index 321d087a..ad415bc1 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_skip_unannotated_callback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_skip_unannotated_callback.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,25 +17,18 @@ <api:name>callback</api:name> </api:arg> </api:function> - </info> <title>regress_test_skip_unannotated_callback</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_test_skip_unannotated_callback (RegressTestCallback callback); -</code></synopsis> - - - <p>Should not emit a warning: + </code></synopsis> + <p>Should not emit a warning: https://bugzilla.gnome.org/show_bug.cgi?id=685399</p> - - - - + <terms> <item> <title><code>callback</code></title> -<p>No annotation here</p> + <p>No annotation here</p> </item> <item> <title><code>Returns</code></title> @@ -44,6 +36,4 @@ https://bugzilla.gnome.org/show_bug.cgi?id=685399</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ssize.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_ssize.page index d11446ef..6afb6bec 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_ssize.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ssize.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> <title>regress_test_ssize</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> gssize regress_test_ssize (gssize in); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -43,6 +35,4 @@ gssize regress_test_ssize (gssize in); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_in.page index 3f9ca2a6..bbaae445 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>arr</api:name> </api:arg> </api:function> - </info> <title>regress_test_strv_in</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> gboolean regress_test_strv_in (char** arr); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>arr</code></title> @@ -43,6 +35,4 @@ gboolean regress_test_strv_in (char** arr); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_in_gvalue.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_in_gvalue.page index 44b0c6ce..3cdc304e 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_in_gvalue.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_in_gvalue.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,20 +13,13 @@ </api:returns> <api:name>regress_test_strv_in_gvalue</api:name> </api:function> - </info> <title>regress_test_strv_in_gvalue</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> GValue* regress_test_strv_in_gvalue (void); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -35,6 +27,4 @@ GValue* regress_test_strv_in_gvalue (void); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out.page index 207e69fe..f884be53 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,20 +13,13 @@ </api:returns> <api:name>regress_test_strv_out</api:name> </api:function> - </info> <title>regress_test_strv_out</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> char** regress_test_strv_out (void); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -35,6 +27,4 @@ char** regress_test_strv_out (void); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out_c.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out_c.page index 582ab10b..28c1efe5 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out_c.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out_c.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,20 +13,13 @@ </api:returns> <api:name>regress_test_strv_out_c</api:name> </api:function> - </info> <title>regress_test_strv_out_c</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> const char* const* regress_test_strv_out_c (void); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -35,6 +27,4 @@ const char* const* regress_test_strv_out_c (void); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out_container.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out_container.page index 0515bce7..3e27a2ea 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out_container.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out_container.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,20 +13,13 @@ </api:returns> <api:name>regress_test_strv_out_container</api:name> </api:function> - </info> <title>regress_test_strv_out_container</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> char** regress_test_strv_out_container (void); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -35,6 +27,4 @@ char** regress_test_strv_out_container (void); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_outarg.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_outarg.page index a105b5b2..07c00b1a 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_outarg.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_outarg.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>retp</api:name> </api:arg> </api:function> - </info> <title>regress_test_strv_outarg</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_test_strv_outarg (char*** retp); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>retp</code></title> @@ -43,6 +35,4 @@ void regress_test_strv_outarg (char*** retp); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_timet.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_timet.page index acada719..fdf552cb 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_timet.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_timet.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> <title>regress_test_timet</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> time_t regress_test_timet (time_t in); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -43,6 +35,4 @@ time_t regress_test_timet (time_t in); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_torture_signature_0.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_torture_signature_0.page index 3d4c18c2..bf164c1d 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_torture_signature_0.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_torture_signature_0.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -38,25 +37,18 @@ <api:name>m</api:name> </api:arg> </api:function> - </info> <title>regress_test_torture_signature_0</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_test_torture_signature_0 (int x, double* y, int* z, const char* foo, int* q, guint m); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>x</code></title> @@ -88,6 +80,4 @@ void regress_test_torture_signature_0 (int x, </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_torture_signature_1.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_torture_signature_1.page index 7568989d..6f5a9256 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_torture_signature_1.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_torture_signature_1.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -38,25 +37,18 @@ <api:name>m</api:name> </api:arg> </api:function> - </info> <title>regress_test_torture_signature_1</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> gboolean regress_test_torture_signature_1 (int x, double* y, int* z, const char* foo, int* q, guint m); -</code></synopsis> + </code></synopsis> + <p>This function throws an error if m is odd.</p> - - <p>This function throws an error if m is odd.</p> - - - - <terms> <item> <title><code>x</code></title> @@ -88,6 +80,4 @@ gboolean regress_test_torture_signature_1 (int x, </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_torture_signature_2.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_torture_signature_2.page index eb615c39..3339a625 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_torture_signature_2.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_torture_signature_2.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -50,11 +49,9 @@ <api:name>m</api:name> </api:arg> </api:function> - </info> <title>regress_test_torture_signature_2</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_test_torture_signature_2 (int x, RegressTestCallbackUserData callback, gpointer user_data, @@ -64,14 +61,9 @@ void regress_test_torture_signature_2 (int x, const char* foo, int* q, guint m); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>x</code></title> @@ -115,6 +107,4 @@ void regress_test_torture_signature_2 (int x, </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_uint.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_uint.page index 1651512e..dc8aea48 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_uint.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_uint.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> <title>regress_test_uint</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> guint regress_test_uint (guint in); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -43,6 +35,4 @@ guint regress_test_uint (guint in); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_uint16.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_uint16.page index 2af7ee49..02662953 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_uint16.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_uint16.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> <title>regress_test_uint16</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> guint16 regress_test_uint16 (guint16 in); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -43,6 +35,4 @@ guint16 regress_test_uint16 (guint16 in); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_uint32.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_uint32.page index 7ccdde70..50b6a2e7 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_uint32.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_uint32.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> <title>regress_test_uint32</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> guint32 regress_test_uint32 (guint32 in); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -43,6 +35,4 @@ guint32 regress_test_uint32 (guint32 in); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_uint64.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_uint64.page index 24a9256a..84aa11d3 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_uint64.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_uint64.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> <title>regress_test_uint64</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> guint64 regress_test_uint64 (guint64 in); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -43,6 +35,4 @@ guint64 regress_test_uint64 (guint64 in); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_uint8.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_uint8.page index 7222e742..d6bc24d3 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_uint8.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_uint8.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> <title>regress_test_uint8</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> guint8 regress_test_uint8 (guint8 in); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -43,6 +35,4 @@ guint8 regress_test_uint8 (guint8 in); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ulong.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_ulong.page index 80953700..011bfd3f 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_ulong.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ulong.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> <title>regress_test_ulong</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> gulong regress_test_ulong (gulong in); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -43,6 +35,4 @@ gulong regress_test_ulong (gulong in); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_unichar.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_unichar.page index 0349472e..4ee1c443 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_unichar.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_unichar.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> <title>regress_test_unichar</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> gunichar regress_test_unichar (gunichar in); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -43,6 +35,4 @@ gunichar regress_test_unichar (gunichar in); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_unsigned_enum_param.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_unsigned_enum_param.page index 642e75ac..81c8e167 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_unsigned_enum_param.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_unsigned_enum_param.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>e</api:name> </api:arg> </api:function> - </info> <title>regress_test_unsigned_enum_param</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> const gchar* regress_test_unsigned_enum_param (RegressTestEnumUnsigned e); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>e</code></title> @@ -43,6 +35,4 @@ const gchar* regress_test_unsigned_enum_param (RegressTestEnumUnsigned e); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ushort.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_ushort.page index 2b50e72a..d06bb4e3 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_ushort.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ushort.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> <title>regress_test_ushort</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> gushort regress_test_ushort (gushort in); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -43,6 +35,4 @@ gushort regress_test_ushort (gushort in); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_const_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_const_in.page index eaafeae5..af18ce28 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_const_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_const_in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> <title>regress_test_utf8_const_in</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_test_utf8_const_in (const char* in); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -43,6 +35,4 @@ void regress_test_utf8_const_in (const char* in); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_const_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_const_return.page index 6bcb7861..8f70ef67 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_const_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_const_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,27 +13,18 @@ </api:returns> <api:name>regress_test_utf8_const_return</api:name> </api:function> - </info> <title>regress_test_utf8_const_return</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> const char* regress_test_utf8_const_return (void); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> -<p>UTF-8 string</p> + <p>UTF-8 string</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_inout.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_inout.page index ce0a884b..7e047038 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_inout.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_inout.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>inout</api:name> </api:arg> </api:function> - </info> <title>regress_test_utf8_inout</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_test_utf8_inout (char** inout); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>inout</code></title> @@ -43,6 +35,4 @@ void regress_test_utf8_inout (char** inout); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_nonconst_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_nonconst_return.page index aa921b00..6cd2b2d1 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_nonconst_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_nonconst_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,27 +13,18 @@ </api:returns> <api:name>regress_test_utf8_nonconst_return</api:name> </api:function> - </info> <title>regress_test_utf8_nonconst_return</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> char* regress_test_utf8_nonconst_return (void); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> -<p>UTF-8 string</p> + <p>UTF-8 string</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_null_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_null_in.page index 9b196371..2a7dd030 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_null_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_null_in.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> <title>regress_test_utf8_null_in</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_test_utf8_null_in (char* in); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -43,6 +35,4 @@ void regress_test_utf8_null_in (char* in); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_null_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_null_out.page index 6d4c4551..66df917d 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_null_out.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_null_out.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>char_out</api:name> </api:arg> </api:function> - </info> <title>regress_test_utf8_null_out</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_test_utf8_null_out (char** char_out); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>char_out</code></title> @@ -43,6 +35,4 @@ void regress_test_utf8_null_out (char** char_out); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_out.page index 5084da31..57666379 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_out.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_out.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>out</api:name> </api:arg> </api:function> - </info> <title>regress_test_utf8_out</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_test_utf8_out (char** out); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>out</code></title> @@ -43,6 +35,4 @@ void regress_test_utf8_out (char** out); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_out_nonconst_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_out_nonconst_return.page index 65b2a8a0..15b0d3ac 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_out_nonconst_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_out_nonconst_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,31 +17,22 @@ <api:name>out</api:name> </api:arg> </api:function> - </info> <title>regress_test_utf8_out_nonconst_return</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> char* regress_test_utf8_out_nonconst_return (char** out); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>out</code></title> -<p>a copy of "second"</p> + <p>a copy of "second"</p> </item> <item> <title><code>Returns</code></title> -<p>a copy of "first"</p> + <p>a copy of "first"</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_out_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_out_out.page index e3771997..30388709 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_out_out.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_out_out.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -22,29 +21,22 @@ <api:name>out1</api:name> </api:arg> </api:function> - </info> <title>regress_test_utf8_out_out</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_test_utf8_out_out (char** out0, char** out1); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>out0</code></title> -<p>a copy of "first"</p> + <p>a copy of "first"</p> </item> <item> <title><code>out1</code></title> -<p>a copy of "second"</p> + <p>a copy of "second"</p> </item> <item> <title><code>Returns</code></title> @@ -52,6 +44,4 @@ void regress_test_utf8_out_out (char** out0, </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_value_get_fundamental_object.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_value_get_fundamental_object.page index 3435610c..6259abf5 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_value_get_fundamental_object.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_value_get_fundamental_object.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,20 +17,13 @@ <api:name>value</api:name> </api:arg> </api:function> - </info> <title>regress_test_value_get_fundamental_object</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> RegressTestFundamentalObject* regress_test_value_get_fundamental_object (const GValue* value); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>value</code></title> @@ -43,6 +35,4 @@ RegressTestFundamentalObject* regress_test_value_get_fundamental_object (const G </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_value_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_value_return.page index 2edb30a3..25d1f71c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_value_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_value_return.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -18,31 +17,22 @@ <api:name>i</api:name> </api:arg> </api:function> - </info> <title>regress_test_value_return</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> const GValue* regress_test_value_return (int i); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>i</code></title> -<p>an int</p> + <p>an int</p> </item> <item> <title><code>Returns</code></title> -<p>the int wrapped in a GValue.</p> + <p>the int wrapped in a GValue.</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_value_set_fundamental_object.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_value_set_fundamental_object.page index ba1822ed..db1b3274 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_value_set_fundamental_object.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_value_set_fundamental_object.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -22,21 +21,14 @@ <api:name>fundamental_object</api:name> </api:arg> </api:function> - </info> <title>regress_test_value_set_fundamental_object</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_test_value_set_fundamental_object (GValue* value, RegressTestFundamentalObject* fundamental_object); -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>value</code></title> @@ -52,6 +44,4 @@ void regress_test_value_set_fundamental_object (GValue* value, </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_versioning.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_versioning.page index a389bda5..cc5ef0e7 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_versioning.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_versioning.page @@ -6,7 +6,6 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - <link xref="index" group="function" type="guide"/> <api:function> <api:returns> @@ -14,21 +13,13 @@ </api:returns> <api:name>regress_test_versioning</api:name> </api:function> - </info> <title>regress_test_versioning</title> - -<synopsis><code mime="text/x-csrc"> + <synopsis><code mime="text/x-csrc"> void regress_test_versioning (void); -</code></synopsis> + </code></synopsis> - - - - - <p>Since 1.32.1</p> - - + <p>Since 1.32.1</p> <terms> <item> <title><code>Returns</code></title> @@ -36,6 +27,4 @@ void regress_test_versioning (void); </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-C-expected/index.page b/tests/scanner/Regress-1.0-C-expected/index.page index a5426d89..426ebedf 100644 --- a/tests/scanner/Regress-1.0-C-expected/index.page +++ b/tests/scanner/Regress-1.0-C-expected/index.page @@ -5,21 +5,9 @@ xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> - <info> - - - </info> - <title>Index</title> - - - - - - - - - - <links type="topic" ui:expanded="true" groups="class" style="linklist"> + <info> </info> + <title>Regress</title> + <links type="topic" ui:expanded="true" groups="class interface" style="linklist"> <title>Classes</title> </links> <links type="topic" ui:expanded="true" groups="function" style="linklist"> |