diff options
Diffstat (limited to 'tests/scanner/Regress-1.0-Python-expected')
530 files changed, 4722 insertions, 5840 deletions
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.ANNOTATION_CALCULATED_DEFINE.page b/tests/scanner/Regress-1.0-Python-expected/Regress.ANNOTATION_CALCULATED_DEFINE.page new file mode 100644 index 00000000..55a4b6d6 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.ANNOTATION_CALCULATED_LARGE.page b/tests/scanner/Regress-1.0-Python-expected/Regress.ANNOTATION_CALCULATED_LARGE.page new file mode 100644 index 00000000..c8887ffb --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.ANNOTATION_CALCULATED_LARGE_DIV.page b/tests/scanner/Regress-1.0-Python-expected/Regress.ANNOTATION_CALCULATED_LARGE_DIV.page new file mode 100644 index 00000000..08eda319 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.ATestError.page b/tests/scanner/Regress-1.0-Python-expected/Regress.ATestError.page index 9ac6820d..f0b11e81 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.ATestError.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.ATestError.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="enum" type="guide"/> - + <link xref="index" group="enum" type="guide"/> </info> <title>Regress.ATestError</title> - - - - - - - - + + <terms> <item> <title><code>ATestError.CODE0</code></title> @@ -34,6 +26,4 @@ </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AliasedTestBoxed.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AliasedTestBoxed.page index 9490e4a3..097c37ba 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AliasedTestBoxed.page +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.AnAnonymousUnion-None.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnAnonymousUnion-None.page new file mode 100644 index 00000000..bc24e5dc --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.AnAnonymousUnion-x.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnAnonymousUnion-x.page new file mode 100644 index 00000000..458ce06e --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.AnAnonymousUnion.None-a.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnAnonymousUnion.None-a.page new file mode 100644 index 00000000..11f20db8 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.AnAnonymousUnion.None-padding.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnAnonymousUnion.None-padding.page new file mode 100644 index 00000000..631770e0 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.AnAnonymousUnion.None.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnAnonymousUnion.None.page index 6dc17b32..c21c1b74 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnAnonymousUnion.None.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnAnonymousUnion.None.page @@ -1,25 +1,40 @@ <?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> - - - - - - - - - - - + <synopsis><code> +from gi.repository import Regress + +anonymous_union = Regress.None() + </code></synopsis> + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + 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-Python-expected/Regress.AnAnonymousUnion.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnAnonymousUnion.page index 2556feda..86fafd9b 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnAnonymousUnion.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnAnonymousUnion.page @@ -1,25 +1,40 @@ <?xml version="1.0"?> <page id="Regress.AnAnonymousUnion" type="guide" - style="record" + 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> - - - - - - - - - - - + <synopsis><code> +from gi.repository import Regress + +an_anonymous_union = Regress.AnAnonymousUnion() + </code></synopsis> + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + 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-Python-expected/Regress.AnnotationBitfield.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationBitfield.page index 4e19ef92..e0e5b006 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationBitfield.page +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.AnnotationCallback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationCallback.page index 9a652d80..53ba013c 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationCallback.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationCallback.page @@ -1,25 +1,30 @@ <?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"/> - + <link xref="index" group="callback" type="guide"/> </info> <title>Regress.AnnotationCallback</title> - - - - <p>This is a callback.</p> - - - - - - - + <synopsis><code mime="text/x-python"> +@accepts(int) +@returns(int) +def on_AnnotationCallback(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-Python-expected/Regress.AnnotationFields-arr.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationFields-arr.page new file mode 100644 index 00000000..71a9afb5 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.AnnotationFields-field1.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationFields-field1.page new file mode 100644 index 00000000..36204ad1 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.AnnotationFields-len.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationFields-len.page new file mode 100644 index 00000000..e56ec4fb --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.AnnotationFields.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationFields.page index 53234545..c7d386b8 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationFields.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationFields.page @@ -1,25 +1,40 @@ <?xml version="1.0"?> <page id="Regress.AnnotationFields" type="guide" - style="record" + 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> - - - - - - - + <synopsis><code> +from gi.repository import Regress + +annotation_fields = Regress.AnnotationFields() + </code></synopsis> + <p>This is a struct for testing field documentation and annotations</p> + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + 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-Python-expected/Regress.AnnotationForeachFunc.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationForeachFunc.page index db77a117..5933656b 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationForeachFunc.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationForeachFunc.page @@ -1,25 +1,34 @@ <?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"/> - + <link xref="index" group="callback" type="guide"/> </info> <title>Regress.AnnotationForeachFunc</title> - - - - - - - - - - - + <synopsis><code mime="text/x-python"> +@accepts(Regress.AnnotationObject, unicode, gpointer) +@returns(none) +def on_AnnotationForeachFunc(object, item, 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> +</terms> + </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationListCallback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationListCallback.page index 79844c66..6d6b440e 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationListCallback.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationListCallback.page @@ -1,25 +1,30 @@ <?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"/> - + <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-python"> +@accepts([unicode]) +@returns([unicode]) +def on_AnnotationListCallback(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-Python-expected/Regress.AnnotationNotifyFunc.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationNotifyFunc.page index 17c80292..1e2be6c9 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationNotifyFunc.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationNotifyFunc.page @@ -1,26 +1,27 @@ <?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"/> - + <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-python"> +@accepts(gpointer) +@returns(none) +def on_AnnotationNotifyFunc(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> +</terms> + </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-attribute-signal.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-attribute-signal.page index 9ed31bc3..afeaab06 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-attribute-signal.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-attribute-signal.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">attribute-signal</title> - </info> <title>Regress.AnnotationObject::attribute-signal</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> def callback(annotation_object, arg1, arg2, user_param1, ...) -</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>annotation_object</code></title> @@ -30,11 +22,11 @@ def callback(annotation_object, arg1, arg2, user_param1, ...) </item> <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> <title><code>user_param1</code></title> <p>first user parameter (if any) specified with the connect() method</p> @@ -44,10 +36,8 @@ def callback(annotation_object, arg1, arg2, user_param1, ...) </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-Python-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page index 29eedcc1..9dc3aad9 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page +++ b/tests/scanner/Regress-1.0-Python-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-python"> + <synopsis><code mime="text/x-python"> def callback(annotation_object, arg1, user_param1, ...) -</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>annotation_object</code></title> @@ -40,6 +32,4 @@ def callback(annotation_object, arg1, user_param1, ...) </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-function-property.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-function-property.page index d9d8b55a..ebbf6919 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-function-property.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-function-property.page @@ -6,24 +6,13 @@ 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> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> "function-property" Regress.AnnotationCallback : Read / Write / Construct -</code></synopsis> + </code></synopsis> + - - - - - - - - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-list-signal.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-list-signal.page index fdfa65f7..62ade5ac 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-list-signal.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-list-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.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-python"> + <synopsis><code mime="text/x-python"> def callback(annotation_object, list, user_param1, ...) -</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>annotation_object</code></title> @@ -31,7 +23,7 @@ known by GObject as it's only marked as G_TYPE_POINTER</p> </item> <item> <title><code>list</code></title> -<p>a list of strings</p> + <p>a list of strings</p> </item> <title><code>user_param1</code></title> <p>first user parameter (if any) specified with the connect() method</p> @@ -41,6 +33,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-Python-expected/Regress.AnnotationObject-parent_instance.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-parent_instance.page new file mode 100644 index 00000000..97f17cd2 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.AnnotationObject-string-property.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-string-property.page index a3cb0456..f62c1983 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-string-property.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-string-property.page @@ -6,25 +6,13 @@ 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> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> "string-property" unicode : Read / Write / Construct -</code></synopsis> - - - <p>This is a property which is a string</p> - - - <p>Since 1.0</p> - - - - - + </code></synopsis> + <p>This is a property which is a string</p> + <p>Since 1.0</p> </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-string-signal.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-string-signal.page index 06e79aa3..d52eb3f9 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-string-signal.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-string-signal.page @@ -6,25 +6,16 @@ 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-python"> + <synopsis><code mime="text/x-python"> def callback(annotation_object, string, user_param1, ...) -</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>annotation_object</code></title> @@ -32,7 +23,7 @@ it says it's pointer but it's actually a string.</p> </item> <item> <title><code>string</code></title> -<p>a string</p> + <p>a string</p> </item> <title><code>user_param1</code></title> <p>first user parameter (if any) specified with the connect() method</p> @@ -42,6 +33,4 @@ it says it's pointer but it's actually a string.</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-tab-property.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-tab-property.page index c417d1ee..fc7cacd9 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-tab-property.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-tab-property.page @@ -6,26 +6,14 @@ 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> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> "tab-property" unicode : Read / Write / Construct -</code></synopsis> - - - <p>This is a property annotation intentionally indented with a mix + </code></synopsis> + <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-Python-expected/Regress.AnnotationObject.allow_none.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.allow_none.page index a04abd75..92add7ac 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.allow_none.page +++ b/tests/scanner/Regress-1.0-Python-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,27 +21,20 @@ <api:name>somearg</api:name> </api:arg> </api:function> - </info> <title>Regress.AnnotationObject.allow_none</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.AnnotationObject, unicode) @returns(GObject.Object) def allow_none(self, somearg): # Python wrapper for regress_annotation_object_allow_none() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>self</code></title> -<p>a <link xref="GObject.Object"/></p> + <p>a <link xref="GObject.Object"/></p> </item> <item> <title><code>somearg</code></title> @@ -54,6 +46,4 @@ def allow_none(self, somearg): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleeowns.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleeowns.page index bebf7737..f0e9b137 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleeowns.page +++ b/tests/scanner/Regress-1.0-Python-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,31 +21,24 @@ <api:name>toown</api:name> </api:arg> </api:function> - </info> <title>Regress.AnnotationObject.calleeowns</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.AnnotationObject, GObject.Object) @returns(int) def calleeowns(self, toown): # Python wrapper for regress_annotation_object_calleeowns() -</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>self</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> @@ -54,6 +46,4 @@ def calleeowns(self, toown): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleesowns.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleesowns.page index ef9361fd..5f313c72 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleesowns.page +++ b/tests/scanner/Regress-1.0-Python-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,35 +25,28 @@ <api:name>toown2</api:name> </api:arg> </api:function> - </info> <title>Regress.AnnotationObject.calleesowns</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.AnnotationObject, GObject.Object, GObject.Object) @returns(int) def calleesowns(self, toown1, toown2): # Python wrapper for regress_annotation_object_calleesowns() -</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>self</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> @@ -62,6 +54,4 @@ def calleesowns(self, toown1, toown2): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum.page index 4f58e6fb..5b692246 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum.page +++ b/tests/scanner/Regress-1.0-Python-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,34 +21,25 @@ <api:name>nums</api:name> </api:arg> </api:function> - </info> <title>Regress.AnnotationObject.compute_sum</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.AnnotationObject, [int]) @returns(none) def compute_sum(self, nums): # Python wrapper for regress_annotation_object_compute_sum() -</code></synopsis> + </code></synopsis> + <p>Test taking a zero-terminated array</p> - - <p>Test taking a zero-terminated array</p> - - - - <terms> <item> <title><code>self</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> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum_n.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum_n.page index 33463c4f..2384a879 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum_n.page +++ b/tests/scanner/Regress-1.0-Python-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,39 +25,30 @@ <api:name>n_nums</api:name> </api:arg> </api:function> - </info> <title>Regress.AnnotationObject.compute_sum_n</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.AnnotationObject, [int], int) @returns(none) def compute_sum_n(self, nums, n_nums): # Python wrapper for regress_annotation_object_compute_sum_n() -</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>self</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> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum_nz.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum_nz.page index b3beb695..8624f618 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum_nz.page +++ b/tests/scanner/Regress-1.0-Python-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,39 +25,30 @@ <api:name>n_nums</api:name> </api:arg> </api:function> - </info> <title>Regress.AnnotationObject.compute_sum_nz</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.AnnotationObject, [int], int) @returns(none) def compute_sum_nz(self, nums, n_nums): # Python wrapper for regress_annotation_object_compute_sum_nz() -</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>self</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> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.create_object.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.create_object.page index 6498ac29..d0e01a3c 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.create_object.page +++ b/tests/scanner/Regress-1.0-Python-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,27 +17,20 @@ <api:name>self</api:name> </api:arg> </api:function> - </info> <title>Regress.AnnotationObject.create_object</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.AnnotationObject) @returns(GObject.Object) def create_object(self): # Python wrapper for regress_annotation_object_create_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>self</code></title> -<p>a <link xref="GObject.Object"/></p> + <p>a <link xref="GObject.Object"/></p> </item> <item> <title><code>Returns</code></title> @@ -46,6 +38,4 @@ def create_object(self): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.do_not_use.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.do_not_use.page index fac9f167..d04b3bca 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.do_not_use.page +++ b/tests/scanner/Regress-1.0-Python-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,27 +17,20 @@ <api:name>self</api:name> </api:arg> </api:function> - </info> <title>Regress.AnnotationObject.do_not_use</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.AnnotationObject) @returns(GObject.Object) def do_not_use(self): # Python wrapper for regress_annotation_object_do_not_use() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>self</code></title> -<p>a <link xref="GObject.Object"/></p> + <p>a <link xref="GObject.Object"/></p> </item> <item> <title><code>Returns</code></title> @@ -46,6 +38,4 @@ def do_not_use(self): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.extra_annos.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.extra_annos.page index 7e032668..050d2920 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.extra_annos.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>self</api:name> </api:arg> </api:function> - </info> <title>Regress.AnnotationObject.extra_annos</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.AnnotationObject) @returns(none) def extra_annos(self): # Python wrapper for regress_annotation_object_extra_annos() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>self</code></title> @@ -42,6 +34,4 @@ def extra_annos(self): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.foreach.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.foreach.page index 1010a017..4f30a04f 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.foreach.page +++ b/tests/scanner/Regress-1.0-Python-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,38 +25,29 @@ <api:name>user_data</api:name> </api:arg> </api:function> - </info> <title>Regress.AnnotationObject.foreach</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.AnnotationObject, Regress.AnnotationForeachFunc, gpointer) @returns(none) def foreach(self, func, user_data): # Python wrapper for regress_annotation_object_foreach() -</code></synopsis> + </code></synopsis> + <p>Test taking a call-scoped callback</p> - - <p>Test taking a call-scoped callback</p> - - - - <terms> <item> <title><code>self</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> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_hash.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_hash.page index 8d658f50..e4418038 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_hash.page +++ b/tests/scanner/Regress-1.0-Python-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,28 +17,21 @@ <api:name>self</api:name> </api:arg> </api:function> - </info> <title>Regress.AnnotationObject.get_hash</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.AnnotationObject) @returns({unicode: GObject.Object}) def get_hash(self): # Python wrapper for regress_annotation_object_get_hash() -</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>self</code></title> -<p>a <link xref="GObject.Object"/></p> + <p>a <link xref="GObject.Object"/></p> </item> <item> <title><code>Returns</code></title> @@ -47,6 +39,4 @@ objects.</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_objects.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_objects.page index ef231f5c..20bb511b 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_objects.page +++ b/tests/scanner/Regress-1.0-Python-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,29 +17,22 @@ <api:name>self</api:name> </api:arg> </api:function> - </info> <title>Regress.AnnotationObject.get_objects</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.AnnotationObject) @returns([Regress.AnnotationObject]) def get_objects(self): # Python wrapper for regress_annotation_object_get_objects() -</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>self</code></title> -<p>a <link xref="GObject.Object"/></p> + <p>a <link xref="GObject.Object"/></p> </item> <item> <title><code>Returns</code></title> @@ -48,6 +40,4 @@ intentionally similar example to gtk_container_get_children</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_strings.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_strings.page index 13570b66..ba3f1b19 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_strings.page +++ b/tests/scanner/Regress-1.0-Python-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,28 +17,21 @@ <api:name>self</api:name> </api:arg> </api:function> - </info> <title>Regress.AnnotationObject.get_strings</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.AnnotationObject) @returns([unicode]) def get_strings(self): # Python wrapper for regress_annotation_object_get_strings() -</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>self</code></title> -<p>a <link xref="GObject.Object"/></p> + <p>a <link xref="GObject.Object"/></p> </item> <item> <title><code>Returns</code></title> @@ -47,6 +39,4 @@ each string needs to be freed.</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.hidden_self.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.hidden_self.page index ce1111fd..0e7df1b1 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.hidden_self.page +++ b/tests/scanner/Regress-1.0-Python-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,30 +17,21 @@ <api:name>self</api:name> </api:arg> </api:function> - </info> <title>Regress.AnnotationObject.hidden_self</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.AnnotationObject) @returns(none) def hidden_self(self): # Python wrapper for regress_annotation_object_hidden_self() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>self</code></title> -<p>A <link xref="Regress.AnnotationObject"/></p> + <p>A <link xref="Regress.AnnotationObject"/></p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.in.page index 0e77f853..51c19ead 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.in.page +++ b/tests/scanner/Regress-1.0-Python-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,31 +21,24 @@ <api:name>inarg</api:name> </api:arg> </api:function> - </info> <title>Regress.AnnotationObject.in</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.AnnotationObject, int) @returns(int) def in(self, inarg): # Python wrapper for regress_annotation_object_in() -</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>self</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> @@ -54,6 +46,4 @@ def in(self, inarg): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout.page index 6816eaf4..9dadcb5a 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout.page +++ b/tests/scanner/Regress-1.0-Python-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,31 +21,24 @@ <api:name>inoutarg</api:name> </api:arg> </api:function> - </info> <title>Regress.AnnotationObject.inout</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.AnnotationObject, int) @returns(int) def inout(self, inoutarg): # Python wrapper for regress_annotation_object_inout() -</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>self</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> @@ -54,6 +46,4 @@ def inout(self, inoutarg): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout2.page index aef9deca..769850e8 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout2.page +++ b/tests/scanner/Regress-1.0-Python-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,31 +21,24 @@ <api:name>inoutarg</api:name> </api:arg> </api:function> - </info> <title>Regress.AnnotationObject.inout2</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.AnnotationObject, int) @returns(int) def inout2(self, inoutarg): # Python wrapper for regress_annotation_object_inout2() -</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>self</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> @@ -54,6 +46,4 @@ def inout2(self, inoutarg): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout3.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout3.page index 4ba4bf67..5eb148b2 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout3.page +++ b/tests/scanner/Regress-1.0-Python-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,31 +21,24 @@ <api:name>inoutarg</api:name> </api:arg> </api:function> - </info> <title>Regress.AnnotationObject.inout3</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.AnnotationObject, int) @returns(int) def inout3(self, inoutarg): # Python wrapper for regress_annotation_object_inout3() -</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>self</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> @@ -54,6 +46,4 @@ def inout3(self, inoutarg): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.method.page index b6badcfe..e47158cb 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.method.page +++ b/tests/scanner/Regress-1.0-Python-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,27 +17,20 @@ <api:name>self</api:name> </api:arg> </api:function> - </info> <title>Regress.AnnotationObject.method</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.AnnotationObject) @returns(int) def method(self): # Python wrapper for regress_annotation_object_method() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>self</code></title> -<p>a <link xref="GObject.Object"/></p> + <p>a <link xref="GObject.Object"/></p> </item> <item> <title><code>Returns</code></title> @@ -46,6 +38,4 @@ def method(self): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.notrans.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.notrans.page index aa50a26e..db56005e 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.notrans.page +++ b/tests/scanner/Regress-1.0-Python-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,27 +17,20 @@ <api:name>self</api:name> </api:arg> </api:function> - </info> <title>Regress.AnnotationObject.notrans</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.AnnotationObject) @returns(GObject.Object) def notrans(self): # Python wrapper for regress_annotation_object_notrans() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>self</code></title> -<p>a <link xref="GObject.Object"/></p> + <p>a <link xref="GObject.Object"/></p> </item> <item> <title><code>Returns</code></title> @@ -46,6 +38,4 @@ def notrans(self): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.out.page index 606b4a12..23636478 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.out.page +++ b/tests/scanner/Regress-1.0-Python-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,31 +21,24 @@ <api:name>outarg</api:name> </api:arg> </api:function> - </info> <title>Regress.AnnotationObject.out</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.AnnotationObject, int) @returns(int) def out(self, outarg): # Python wrapper for regress_annotation_object_out() -</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>self</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> @@ -54,6 +46,4 @@ def out(self, outarg): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.page index 006766fc..6c1c5641 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.page @@ -6,23 +6,16 @@ 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> - <synopsis><code> from gi.repository import Regress -annotation_object = Regress.AnnotationObject(<link xref='Regress.AnnotationObject-function-property'>function_property</link>=value, <link xref='Regress.AnnotationObject-string-property'>string_property</link>=value, <link xref='Regress.AnnotationObject-tab-property'>tab_property</link>=value) </code></synopsis> +annotation_object = Regress.AnnotationObject(<link xref='Regress.AnnotationObject-function-property'>function_property</link>=value, <link xref='Regress.AnnotationObject-string-property'>string_property</link>=value, <link xref='Regress.AnnotationObject-tab-property'>tab_property</link>=value) + </code></synopsis> + <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> @@ -34,8 +27,11 @@ annotation_object = Regress.AnnotationObject(<link xref='Regress.AnnotationObjec </item> </tree> </synopsis> - - + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> <links type="topic" ui:expanded="true" api:type="function" api:mime="text/python" groups="method" style="linklist"> @@ -44,7 +40,7 @@ annotation_object = Regress.AnnotationObject(<link xref='Regress.AnnotationObjec <links type="topic" ui:expanded="true" api:type="function" api:mime="text/python" 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> @@ -55,8 +51,10 @@ annotation_object = Regress.AnnotationObject(<link xref='Regress.AnnotationObjec <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-Python-expected/Regress.AnnotationObject.parse_args.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.parse_args.page index 760e0be7..c06014fb 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.parse_args.page +++ b/tests/scanner/Regress-1.0-Python-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,38 +25,29 @@ <api:name>argv</api:name> </api:arg> </api:function> - </info> <title>Regress.AnnotationObject.parse_args</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.AnnotationObject, int, [unicode]) @returns(none) def parse_args(self, argc, argv): # Python wrapper for regress_annotation_object_parse_args() -</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>self</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> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data.page index 7cd52364..42a98dfe 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data.page +++ b/tests/scanner/Regress-1.0-Python-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,38 +25,29 @@ <api:name>length</api:name> </api:arg> </api:function> - </info> <title>Regress.AnnotationObject.set_data</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.AnnotationObject, [guint8], gsize) @returns(none) def set_data(self, data, length): # Python wrapper for regress_annotation_object_set_data() -</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>self</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> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data2.page index cd47036a..23003a15 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data2.page +++ b/tests/scanner/Regress-1.0-Python-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,38 +25,29 @@ <api:name>length</api:name> </api:arg> </api:function> - </info> <title>Regress.AnnotationObject.set_data2</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.AnnotationObject, [gint8], gsize) @returns(none) def set_data2(self, data, length): # Python wrapper for regress_annotation_object_set_data2() -</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>self</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> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data3.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data3.page index b9016e87..9870962a 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data3.page +++ b/tests/scanner/Regress-1.0-Python-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,39 +25,30 @@ <api:name>length</api:name> </api:arg> </api:function> - </info> <title>Regress.AnnotationObject.set_data3</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.AnnotationObject, [guint8], gsize) @returns(none) def set_data3(self, data, length): # Python wrapper for regress_annotation_object_set_data3() -</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>self</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> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.string_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.string_out.page index c1d085aa..9d5007e2 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.string_out.page +++ b/tests/scanner/Regress-1.0-Python-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,31 +21,24 @@ <api:name>str_out</api:name> </api:arg> </api:function> - </info> <title>Regress.AnnotationObject.string_out</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.AnnotationObject, unicode) @returns(bool) def string_out(self, str_out): # Python wrapper for regress_annotation_object_string_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>self</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> @@ -54,6 +46,4 @@ def string_out(self, str_out): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.use_buffer.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.use_buffer.page index 385fe89f..7b8e8b91 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.use_buffer.page +++ b/tests/scanner/Regress-1.0-Python-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,27 +21,20 @@ <api:name>bytes</api:name> </api:arg> </api:function> - </info> <title>Regress.AnnotationObject.use_buffer</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.AnnotationObject, guint8) @returns(none) def use_buffer(self, bytes): # Python wrapper for regress_annotation_object_use_buffer() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>self</code></title> -<p>a <link xref="GObject.Object"/></p> + <p>a <link xref="GObject.Object"/></p> </item> <item> <title><code>bytes</code></title> @@ -50,6 +42,4 @@ def use_buffer(self, bytes): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.watch_full.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.watch_full.page index 66a53d54..6d3ec7e8 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.watch_full.page +++ b/tests/scanner/Regress-1.0-Python-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,42 +29,33 @@ <api:name>destroy</api:name> </api:arg> </api:function> - </info> <title>Regress.AnnotationObject.watch_full</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.AnnotationObject, Regress.AnnotationForeachFunc, gpointer, GLib.DestroyNotify) @returns(none) def watch_full(self, func, user_data, destroy): # Python wrapper for regress_annotation_object_watch_full() -</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>self</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> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.with_voidp.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.with_voidp.page index bda3e9a0..05fbe14a 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.with_voidp.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +21,16 @@ <api:name>data</api:name> </api:arg> </api:function> - </info> <title>Regress.AnnotationObject.with_voidp</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.AnnotationObject, gpointer) @returns(none) def with_voidp(self, data): # Python wrapper for regress_annotation_object_with_voidp() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>self</code></title> @@ -46,10 +38,8 @@ def with_voidp(self, data): </item> <item> <title><code>data</code></title> -<p>Opaque pointer handle</p> + <p>Opaque pointer handle</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationStruct-objects.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationStruct-objects.page new file mode 100644 index 00000000..f1498fc4 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.AnnotationStruct.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationStruct.page index e2100429..177e0382 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationStruct.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationStruct.page @@ -1,25 +1,40 @@ <?xml version="1.0"?> <page id="Regress.AnnotationStruct" type="guide" - style="record" + 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> - - - - - - - + <synopsis><code> +from gi.repository import Regress + +annotation_struct = Regress.AnnotationStruct() + </code></synopsis> + <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/python" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + 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-Python-expected/Regress.BOOL_CONSTANT.page b/tests/scanner/Regress-1.0-Python-expected/Regress.BOOL_CONSTANT.page new file mode 100644 index 00000000..e65594f6 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.DOUBLE_CONSTANT.page b/tests/scanner/Regress-1.0-Python-expected/Regress.DOUBLE_CONSTANT.page new file mode 100644 index 00000000..bbc2a038 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.FOO_DEFINE_SHOULD_BE_EXPOSED.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FOO_DEFINE_SHOULD_BE_EXPOSED.page new file mode 100644 index 00000000..09b1561c --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.FOO_PIE_IS_TASTY.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FOO_PIE_IS_TASTY.page new file mode 100644 index 00000000..132f5083 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.FOO_SUCCESS_INT.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FOO_SUCCESS_INT.page new file mode 100644 index 00000000..58650ec5 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.FooASingle.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooASingle.page index 09cd98fd..2af7b9e4 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooASingle.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooASingle.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="enum" type="guide"/> - + <link xref="index" group="enum" type="guide"/> </info> <title>Regress.FooASingle</title> - - - - - - - - + + <terms> <item> <title><code>FooASingle.FOO_SOME_SINGLE_ENUM</code></title> @@ -26,6 +18,4 @@ </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooAddressType.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooAddressType.page index 008a8f36..a4b82a3e 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooAddressType.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooAddressType.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="enum" type="guide"/> - + <link xref="index" group="enum" type="guide"/> </info> <title>Regress.FooAddressType</title> - - - - - - - - + + <terms> <item> <title><code>FooAddressType.INVALID</code></title> @@ -34,6 +26,4 @@ </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooBRect-x.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBRect-x.page new file mode 100644 index 00000000..b444125d --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.FooBRect-y.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBRect-y.page new file mode 100644 index 00000000..8d7b0f12 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.FooBRect.add.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBRect.add.page index c7e03ace..bfd2b6f0 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooBRect.add.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +21,16 @@ <api:name>b2</api:name> </api:arg> </api:function> - </info> <title>Regress.FooBRect.add</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.FooBRect, Regress.FooBRect) @returns(none) def add(self, b2): # Python wrapper for regress_foo_brect_add() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>self</code></title> @@ -50,6 +42,4 @@ def add(self, b2): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooBRect.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBRect.page index fd1e9d6e..f1b11556 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooBRect.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBRect.page @@ -1,25 +1,40 @@ <?xml version="1.0"?> <page id="Regress.FooBRect" type="guide" - style="record" + 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> - - - - - - - - - - - + <synopsis><code> +from gi.repository import Regress + +foo_brect = Regress.FooBRect() + </code></synopsis> + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + 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-Python-expected/Regress.FooBUnion-rect.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBUnion-rect.page new file mode 100644 index 00000000..1c7ceadb --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.FooBUnion-type.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBUnion-type.page new file mode 100644 index 00000000..6fdd4893 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.FooBUnion-v.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBUnion-v.page new file mode 100644 index 00000000..0a390625 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.FooBUnion.get_contained_type.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBUnion.get_contained_type.page index 4052ec56..364d844b 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooBUnion.get_contained_type.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>self</api:name> </api:arg> </api:function> - </info> <title>Regress.FooBUnion.get_contained_type</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.FooBUnion) @returns(int) def get_contained_type(self): # Python wrapper for regress_foo_bunion_get_contained_type() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>self</code></title> @@ -46,6 +38,4 @@ def get_contained_type(self): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooBUnion.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBUnion.page index 8644d96e..d39a74a8 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooBUnion.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBUnion.page @@ -1,25 +1,40 @@ <?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> - - - - - - - - - - - + <synopsis><code> +from gi.repository import Regress + +foo_bunion = Regress.FooBUnion() + </code></synopsis> + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + 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-Python-expected/Regress.FooBoxed.method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBoxed.method.page index 95f06fbb..249d74ab 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooBoxed.method.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>self</api:name> </api:arg> </api:function> - </info> <title>Regress.FooBoxed.method</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.FooBoxed) @returns(none) def method(self): # Python wrapper for regress_foo_boxed_method() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>self</code></title> @@ -42,6 +34,4 @@ def method(self): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooBoxed.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBoxed.page index bca1f99a..1d8f8188 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooBoxed.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBoxed.page @@ -1,25 +1,40 @@ <?xml version="1.0"?> <page id="Regress.FooBoxed" type="guide" - style="record" + 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> - - - - - - - - - - - + <synopsis><code> +from gi.repository import Regress + +foo_boxed = Regress.FooBoxed() + </code></synopsis> + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + 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-Python-expected/Regress.FooBuffer.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBuffer.page index 1a515428..84867133 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooBuffer.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBuffer.page @@ -6,23 +6,16 @@ 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><code> from gi.repository import Regress -foo_buffer = Regress.FooBuffer() </code></synopsis> +foo_buffer = Regress.FooBuffer() + </code></synopsis> + - - - - - - <synopsis> <title>Hierarchy</title> <tree> @@ -37,8 +30,11 @@ foo_buffer = Regress.FooBuffer() </code></synopsis> </item> </tree> </synopsis> - - + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> <links type="topic" ui:expanded="true" api:type="function" api:mime="text/python" groups="method" style="linklist"> @@ -47,7 +43,7 @@ foo_buffer = Regress.FooBuffer() </code></synopsis> <links type="topic" ui:expanded="true" api:type="function" api:mime="text/python" 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> @@ -58,8 +54,10 @@ foo_buffer = Regress.FooBuffer() </code></synopsis> <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-Python-expected/Regress.FooBuffer.some_method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBuffer.some_method.page index e971b2d6..bc4588e4 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooBuffer.some_method.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>self</api:name> </api:arg> </api:function> - </info> <title>Regress.FooBuffer.some_method</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.FooBuffer) @returns(none) def some_method(self): # Python wrapper for regress_foo_buffer_some_method() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>self</code></title> @@ -42,6 +34,4 @@ def some_method(self): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooCallback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooCallback.page index 52feda29..91c12cb0 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooCallback.page +++ b/tests/scanner/Regress-1.0-Python-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"/> - + <link xref="index" group="callback" type="guide"/> </info> <title>Regress.FooCallback</title> - - - - - - - - - - - + <synopsis><code mime="text/x-python"> +@accepts(Regress.FooObject, bool, gpointer) +@returns(bool) +def on_FooCallback(regress_foo, b, 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-Python-expected/Regress.FooDBusData.method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooDBusData.method.page index fe1b6472..9e8a0df7 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooDBusData.method.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>self</api:name> </api:arg> </api:function> - </info> <title>Regress.FooDBusData.method</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.FooDBusData) @returns(none) def method(self): # Python wrapper for regress_foo_dbus_data_method() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>self</code></title> @@ -42,6 +34,4 @@ def method(self): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooDBusData.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooDBusData.page index b4eaeade..8b23b4d8 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooDBusData.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooDBusData.page @@ -1,25 +1,40 @@ <?xml version="1.0"?> <page id="Regress.FooDBusData" type="guide" - style="record" + 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> - - - - - - - - - - - + <synopsis><code> +from gi.repository import Regress + +foo_dbus_data = Regress.FooDBusData() + </code></synopsis> + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + 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-Python-expected/Regress.FooEnumFullname.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumFullname.page index 00169aaf..61843918 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumFullname.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumFullname.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="enum" type="guide"/> - + <link xref="index" group="enum" type="guide"/> </info> <title>Regress.FooEnumFullname</title> - - - - - - - - + + <terms> <item> <title><code>FooEnumFullname.ONE</code></title> @@ -34,6 +26,4 @@ </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumNoType.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumNoType.page index d2b41e61..44c091a9 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumNoType.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumNoType.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="enum" type="guide"/> - + <link xref="index" group="enum" type="guide"/> </info> <title>Regress.FooEnumNoType</title> - - - - - - - - + + <terms> <item> <title><code>FooEnumNoType.UN</code></title> @@ -38,6 +30,4 @@ </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumType.method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumType.method.page index a802f265..948cc806 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumType.method.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>regress_foo_enum</api:name> </api:arg> </api:function> - </info> - <title>Index.method</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.method</title> + <synopsis><code mime="text/x-python"> @accepts(Regress.FooEnumType) @returns(int) def method(regress_foo_enum): # Python wrapper for regress_foo_enum_type_method() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>regress_foo_enum</code></title> @@ -46,6 +38,4 @@ def method(regress_foo_enum): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumType.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumType.page index c3ff89b3..5827bd60 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumType.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumType.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="enum" type="guide"/> - + <link xref="index" group="enum" type="guide"/> </info> <title>Regress.FooEnumType</title> - - - - - - - - + + <terms> <item> <title><code>FooEnumType.ALPHA</code></title> @@ -34,6 +26,4 @@ </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumType.returnv.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumType.returnv.page index 149cc4fe..7b5c4e9b 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumType.returnv.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>x</api:name> </api:arg> </api:function> - </info> - <title>Index.returnv</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.returnv</title> + <synopsis><code mime="text/x-python"> @accepts(int) @returns(Regress.FooEnumType) def returnv(x): # Python wrapper for regress_foo_enum_type_returnv() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>x</code></title> @@ -46,6 +38,4 @@ def returnv(x): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooError.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooError.page index 8c0b6a23..873701b0 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooError.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooError.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="enum" type="guide"/> - + <link xref="index" group="enum" type="guide"/> </info> <title>Regress.FooError</title> - - - - - - - - + + <terms> <item> <title><code>FooError.GOOD</code></title> @@ -34,6 +26,4 @@ </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooError.quark.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooError.quark.page index 81f81a7d..3acb8451 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooError.quark.page +++ b/tests/scanner/Regress-1.0-Python-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,22 +13,15 @@ </api:returns> <api:name>regress_foo_error_quark</api:name> </api:function> - </info> - <title>Index.quark</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.quark</title> + <synopsis><code mime="text/x-python"> @returns(GLib.Quark) def quark(): # Python wrapper for regress_foo_error_quark() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ def quark(): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooEvent-any.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEvent-any.page new file mode 100644 index 00000000..aab09bda --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.FooEvent-expose.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEvent-expose.page new file mode 100644 index 00000000..58dc6746 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.FooEvent-type.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEvent-type.page new file mode 100644 index 00000000..d9ea3325 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.FooEvent.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEvent.page index ce368302..a4cbcac2 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooEvent.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEvent.page @@ -1,25 +1,40 @@ <?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> - - - - - - - - - - - + <synopsis><code> +from gi.repository import Regress + +foo_event = Regress.FooEvent() + </code></synopsis> + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + 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-Python-expected/Regress.FooEventAny-send_event.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEventAny-send_event.page new file mode 100644 index 00000000..045be537 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.FooEventAny.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEventAny.page index 562ec03c..dca4dc0f 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooEventAny.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEventAny.page @@ -1,25 +1,40 @@ <?xml version="1.0"?> <page id="Regress.FooEventAny" type="guide" - style="record" + 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> - - - - - - - - - - - + <synopsis><code> +from gi.repository import Regress + +foo_event_any = Regress.FooEventAny() + </code></synopsis> + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + 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-Python-expected/Regress.FooEventExpose-count.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEventExpose-count.page new file mode 100644 index 00000000..f9e410ca --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.FooEventExpose-send_event.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEventExpose-send_event.page new file mode 100644 index 00000000..d06c23ae --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.FooEventExpose.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEventExpose.page index 0000add5..3569c0ba 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooEventExpose.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEventExpose.page @@ -1,25 +1,40 @@ <?xml version="1.0"?> <page id="Regress.FooEventExpose" type="guide" - style="record" + 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> - - - - - - - - - - - + <synopsis><code> +from gi.repository import Regress + +foo_event_expose = Regress.FooEventExpose() + </code></synopsis> + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + 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-Python-expected/Regress.FooFlagsNoType.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooFlagsNoType.page index 53539d49..930b6d0c 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooFlagsNoType.page +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.FooFlagsType.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooFlagsType.page index 2b4afeb5..96e97592 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooFlagsType.page +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.FooForeignStruct-regress_foo.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooForeignStruct-regress_foo.page new file mode 100644 index 00000000..07c098ce --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.FooForeignStruct.copy.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooForeignStruct.copy.page index 1dbb5dc0..2de9139e 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooForeignStruct.copy.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>self</api:name> </api:arg> </api:function> - </info> <title>Regress.FooForeignStruct.copy</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.FooForeignStruct) @returns(Regress.FooForeignStruct) def copy(self): # Python wrapper for regress_foo_foreign_struct_copy() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>self</code></title> @@ -46,6 +38,4 @@ def copy(self): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooForeignStruct.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooForeignStruct.page index 312994a9..03395eb2 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooForeignStruct.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooForeignStruct.page @@ -1,25 +1,40 @@ <?xml version="1.0"?> <page id="Regress.FooForeignStruct" type="guide" - style="record" + 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> - - - - - - - - - - - + <synopsis><code> +from gi.repository import Regress + +foo_foreign_struct = Regress.FooForeignStruct() + </code></synopsis> + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + 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-Python-expected/Regress.FooInterface-do_regress_foo.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface-do_regress_foo.page index d0be1eb5..e7e94781 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface-do_regress_foo.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface-do_regress_foo.page @@ -6,24 +6,16 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="Regress.FooInterface" group="vfunc" type="guide"/> - + <link xref="Regress.FooInterface" group="vfunc" type="guide"/> </info> <title>Regress.FooInterface::do_regress_foo</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.FooInterface, int) @returns(none) def do_do_regress_foo(self, x): -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>self</code></title> @@ -35,6 +27,4 @@ def do_do_regress_foo(self, x): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.do_regress_foo.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.do_regress_foo.page index 3b2f26d6..75f7addd 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.do_regress_foo.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +21,16 @@ <api:name>x</api:name> </api:arg> </api:function> - </info> <title>Regress.FooInterface.do_regress_foo</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.FooInterface, int) @returns(none) def do_regress_foo(self, x): # Python wrapper for regress_foo_interface_do_regress_foo() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>self</code></title> @@ -50,6 +42,4 @@ def do_regress_foo(self, x): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.page index d2a482f7..9bb64e74 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.page @@ -1,38 +1,33 @@ <?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><code> from gi.repository import Regress foo_interface = Regress.FooInterface() </code></synopsis> - - - - - - + <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/python" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> <links type="topic" ui:expanded="true" api:type="function" api:mime="text/python" groups="method" style="linklist"> @@ -41,7 +36,7 @@ foo_interface = Regress.FooInterface() </code></synopsis> <links type="topic" ui:expanded="true" api:type="function" api:mime="text/python" 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> @@ -52,8 +47,10 @@ foo_interface = Regress.FooInterface() </code></synopsis> <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-Python-expected/Regress.FooInterface.static_method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.static_method.page index 1c6c1660..1fd47136 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.static_method.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>x</api:name> </api:arg> </api:function> - </info> <title>Regress.FooInterface.static_method</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(int) @returns(none) def static_method(x): # Python wrapper for regress_foo_interface_static_method() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>x</code></title> @@ -42,6 +34,4 @@ def static_method(x): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-parent_instance.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-parent_instance.page new file mode 100644 index 00000000..d9cf9b87 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.FooObject-read_fn.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-read_fn.page index 6cf532b8..54ca4a09 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-read_fn.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-read_fn.page @@ -6,39 +6,29 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="Regress.FooObject" group="vfunc" type="guide"/> - + <link xref="Regress.FooObject" group="vfunc" type="guide"/> </info> <title>Regress.FooObject::read_fn</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.FooObject, int, int) @returns(none) def do_read_fn(object, offset, 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> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-signal.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-signal.page index ee6c20c5..3ef5897d 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-signal.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-signal.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="signal" type="guide"/> <title type="link" role="topic">signal</title> - </info> <title>Regress.FooObject::signal</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> def callback(foo_object, object, p0, user_param1, ...) -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>foo_object</code></title> @@ -48,6 +40,4 @@ def callback(foo_object, object, p0, user_param1, ...) </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-some_int.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-some_int.page new file mode 100644 index 00000000..b45dca82 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.FooObject-string.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-string.page index 9d61f3ab..2e4ce74b 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-string.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-string.page @@ -6,24 +6,13 @@ 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> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> "string" unicode : Read / Write / Construct -</code></synopsis> + </code></synopsis> + - - - - - - - - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-virtual_method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-virtual_method.page index 01cf6dba..b049bd1c 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-virtual_method.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-virtual_method.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="vfunc" type="guide"/> - + <link xref="Regress.FooObject" group="vfunc" type="guide"/> </info> <title>Regress.FooObject::virtual_method</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.FooObject, int) @returns(bool) def do_virtual_method(object, first_param): -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>object</code></title> @@ -39,6 +31,4 @@ def do_virtual_method(object, first_param): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.a_global_method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.a_global_method.page index 87645bcf..47cbe310 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.a_global_method.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>obj</api:name> </api:arg> </api:function> - </info> <title>Regress.FooObject.a_global_method</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Utility.Object) @returns(none) def a_global_method(obj): # Python wrapper for regress_foo_object_a_global_method() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>obj</code></title> @@ -42,6 +34,4 @@ def a_global_method(obj): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.append_new_stack_layer.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.append_new_stack_layer.page index 23ba26b8..940f4a1f 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.append_new_stack_layer.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +21,16 @@ <api:name>x</api:name> </api:arg> </api:function> - </info> <title>Regress.FooObject.append_new_stack_layer</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.FooObject, int) @returns(Regress.FooOtherObject) def append_new_stack_layer(self, x): # Python wrapper for regress_foo_object_append_new_stack_layer() -</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>self</code></title> @@ -54,6 +46,4 @@ def append_new_stack_layer(self, x): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.dup_name.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.dup_name.page index dcc20f6c..a711dd3b 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.dup_name.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>self</api:name> </api:arg> </api:function> - </info> <title>Regress.FooObject.dup_name</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.FooObject) @returns(unicode) def dup_name(self): # Python wrapper for regress_foo_object_dup_name() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>self</code></title> @@ -46,6 +38,4 @@ def dup_name(self): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.external_type.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.external_type.page index 0b32befd..fc41e2b8 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.external_type.page +++ b/tests/scanner/Regress-1.0-Python-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,27 +17,20 @@ <api:name>self</api:name> </api:arg> </api:function> - </info> <title>Regress.FooObject.external_type</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.FooObject) @returns(Utility.Object) def external_type(self): # Python wrapper for regress_foo_object_external_type() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>self</code></title> -<p>a <link xref="Regress.FooObject"/></p> + <p>a <link xref="Regress.FooObject"/></p> </item> <item> <title><code>Returns</code></title> @@ -46,6 +38,4 @@ def external_type(self): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.get_default.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.get_default.page index 826efd85..38761362 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.get_default.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +13,16 @@ </api:returns> <api:name>regress_foo_object_get_default</api:name> </api:function> - </info> <title>Regress.FooObject.get_default</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @returns(Regress.FooSubobject) def get_default(): # Python wrapper for regress_foo_object_get_default() -</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> @@ -38,6 +30,4 @@ uses a C sugar return type.</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.get_name.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.get_name.page index e66d4932..64575f2f 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.get_name.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>self</api:name> </api:arg> </api:function> - </info> <title>Regress.FooObject.get_name</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.FooObject) @returns(unicode) def get_name(self): # Python wrapper for regress_foo_object_get_name() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>self</code></title> @@ -46,6 +38,4 @@ def get_name(self): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.handle_glyph.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.handle_glyph.page index e171f820..236aeb60 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.handle_glyph.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +21,16 @@ <api:name>glyph</api:name> </api:arg> </api:function> - </info> <title>Regress.FooObject.handle_glyph</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.FooObject, Utility.Glyph) @returns(none) def handle_glyph(self, glyph): # Python wrapper for regress_foo_object_handle_glyph() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>self</code></title> @@ -50,6 +42,4 @@ def handle_glyph(self, glyph): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.is_it_time_yet.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.is_it_time_yet.page index 1781562f..62cc7f45 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.is_it_time_yet.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +21,16 @@ <api:name>time</api:name> </api:arg> </api:function> - </info> <title>Regress.FooObject.is_it_time_yet</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.FooObject, int) @returns(none) def is_it_time_yet(self, time): # Python wrapper for regress_foo_object_is_it_time_yet() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>self</code></title> @@ -50,6 +42,4 @@ def is_it_time_yet(self, time): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.page index 3265e6b5..2670dd2f 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.page @@ -6,23 +6,16 @@ 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><code> from gi.repository import Regress -foo_object = Regress.FooObject(<link xref='Regress.FooObject-hidden'>hidden</link>=value, <link xref='Regress.FooObject-string'>string</link>=value) </code></synopsis> +foo_object = Regress.FooObject(<link xref='Regress.FooObject-hidden'>hidden</link>=value, <link xref='Regress.FooObject-string'>string</link>=value) + </code></synopsis> + - - - - - - <synopsis> <title>Hierarchy</title> <tree> @@ -34,8 +27,11 @@ foo_object = Regress.FooObject(<link xref='Regress.FooObject-hidden'>hidden</lin </item> </tree> </synopsis> - - + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> <links type="topic" ui:expanded="true" api:type="function" api:mime="text/python" groups="method" style="linklist"> @@ -44,7 +40,7 @@ foo_object = Regress.FooObject(<link xref='Regress.FooObject-hidden'>hidden</lin <links type="topic" ui:expanded="true" api:type="function" api:mime="text/python" 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> @@ -55,8 +51,10 @@ foo_object = Regress.FooObject(<link xref='Regress.FooObject-hidden'>hidden</lin <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-Python-expected/Regress.FooObject.read.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.read.page index 88dee520..d33dff9f 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.read.page +++ b/tests/scanner/Regress-1.0-Python-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,38 +25,29 @@ <api:name>length</api:name> </api:arg> </api:function> - </info> <title>Regress.FooObject.read</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.FooObject, int, int) @returns(none) def read(self, offset, length): # Python wrapper for regress_foo_object_read() -</code></synopsis> + </code></synopsis> + <p>Read some stuff.</p> - - <p>Read some stuff.</p> - - - - <terms> <item> <title><code>self</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> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.static_meth.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.static_meth.page index c652a104..462e4b26 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.static_meth.page +++ b/tests/scanner/Regress-1.0-Python-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,22 +13,15 @@ </api:returns> <api:name>regress_foo_object_static_meth</api:name> </api:function> - </info> <title>Regress.FooObject.static_meth</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @returns(int) def static_meth(): # Python wrapper for regress_foo_object_static_meth() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ def static_meth(): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.various.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.various.page index efdc5c45..50a7da6b 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.various.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +25,16 @@ <api:name>some_type</api:name> </api:arg> </api:function> - </info> <title>Regress.FooObject.various</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.FooObject, gpointer, GType) @returns(none) def various(self, data, some_type): # Python wrapper for regress_foo_object_various() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>self</code></title> @@ -58,6 +50,4 @@ def various(self, data, some_type): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.virtual_method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.virtual_method.page index f4920bed..fb771072 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.virtual_method.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +21,16 @@ <api:name>first_param</api:name> </api:arg> </api:function> - </info> <title>Regress.FooObject.virtual_method</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.FooObject, int) @returns(bool) def virtual_method(self, first_param): # Python wrapper for regress_foo_object_virtual_method() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>self</code></title> @@ -54,6 +46,4 @@ def virtual_method(self, first_param): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObjectCookie.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObjectCookie.page index 44a63ab1..fecc5544 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObjectCookie.page +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.FooOtherObject.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooOtherObject.page index dadf5236..69a2798a 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooOtherObject.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooOtherObject.page @@ -6,23 +6,16 @@ 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><code> from gi.repository import Regress -foo_other_object = Regress.FooOtherObject() </code></synopsis> +foo_other_object = Regress.FooOtherObject() + </code></synopsis> + - - - - - - <synopsis> <title>Hierarchy</title> <tree> @@ -34,8 +27,11 @@ foo_other_object = Regress.FooOtherObject() </code></synopsis> </item> </tree> </synopsis> - - + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> <links type="topic" ui:expanded="true" api:type="function" api:mime="text/python" groups="method" style="linklist"> @@ -44,7 +40,7 @@ foo_other_object = Regress.FooOtherObject() </code></synopsis> <links type="topic" ui:expanded="true" api:type="function" api:mime="text/python" 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> @@ -55,8 +51,10 @@ foo_other_object = Regress.FooOtherObject() </code></synopsis> <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-Python-expected/Regress.FooRectangle-height.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle-height.page new file mode 100644 index 00000000..f1da68f0 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.FooRectangle-width.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle-width.page new file mode 100644 index 00000000..dd55384b --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.FooRectangle-x.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle-x.page new file mode 100644 index 00000000..2c4377bb --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.FooRectangle-y.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle-y.page new file mode 100644 index 00000000..8b4a9a30 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.FooRectangle.add.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle.add.page index fe924f40..3dce1cb9 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle.add.page +++ b/tests/scanner/Regress-1.0-Python-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,34 +21,25 @@ <api:name>r2</api:name> </api:arg> </api:function> - </info> <title>Regress.FooRectangle.add</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.FooRectangle, Regress.FooRectangle) @returns(none) def add(self, r2): # Python wrapper for regress_foo_rectangle_add() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>self</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> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle.page index 0cfef622..35554804 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle.page @@ -1,25 +1,40 @@ <?xml version="1.0"?> <page id="Regress.FooRectangle" type="guide" - style="record" + 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> - - - - - - - - - - - + <synopsis><code> +from gi.repository import Regress + +foo_rectangle = Regress.FooRectangle() + </code></synopsis> + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + 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-Python-expected/Regress.FooStackLayer.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooStackLayer.page index 8a08c9ae..bb6bc51d 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooStackLayer.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooStackLayer.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="enum" type="guide"/> - + <link xref="index" group="enum" type="guide"/> </info> <title>Regress.FooStackLayer</title> - - - - - - - - + + <terms> <item> <title><code>FooStackLayer.DESKTOP</code></title> @@ -58,6 +50,4 @@ </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooStruct-member.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooStruct-member.page new file mode 100644 index 00000000..655d65d3 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.FooStruct-priv.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooStruct-priv.page new file mode 100644 index 00000000..a0d98911 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.FooStruct.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooStruct.page index 84f5d192..9e4a5762 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooStruct.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooStruct.page @@ -1,25 +1,40 @@ <?xml version="1.0"?> <page id="Regress.FooStruct" type="guide" - style="record" + 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> - - - - - - - - - - - + <synopsis><code> +from gi.repository import Regress + +foo_struct = Regress.FooStruct() + </code></synopsis> + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + 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-Python-expected/Regress.FooSubInterface-destroy-event.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-destroy-event.page index a42bb176..3b323e12 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-destroy-event.page +++ b/tests/scanner/Regress-1.0-Python-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-python"> + <synopsis><code mime="text/x-python"> def callback(foo_sub_interface, user_param1, ...) -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>foo_sub_interface</code></title> @@ -36,6 +28,4 @@ def callback(foo_sub_interface, user_param1, ...) </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-destroy_event.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-destroy_event.page index 82dbc622..dad48532 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-destroy_event.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-destroy_event.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"/> - + <link xref="Regress.FooSubInterface" group="vfunc" type="guide"/> </info> <title>Regress.FooSubInterface::destroy_event</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.FooSubInterface) @returns(none) def do_destroy_event(self): -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>self</code></title> @@ -31,6 +23,4 @@ def do_destroy_event(self): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-do_bar.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-do_bar.page index a035189a..1ed2e3bf 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-do_bar.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-do_bar.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"/> - + <link xref="Regress.FooSubInterface" group="vfunc" type="guide"/> </info> <title>Regress.FooSubInterface::do_bar</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.FooSubInterface) @returns(none) def do_do_bar(self): -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>self</code></title> @@ -31,6 +23,4 @@ def do_do_bar(self): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-do_baz.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-do_baz.page index 3b0404fa..aa5a402d 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-do_baz.page +++ b/tests/scanner/Regress-1.0-Python-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"/> - + <link xref="Regress.FooSubInterface" group="vfunc" type="guide"/> </info> <title>Regress.FooSubInterface::do_baz</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.FooSubInterface, GObject.Callback, gpointer) @returns(none) def do_do_baz(self, callback, user_data): -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>self</code></title> @@ -39,6 +31,4 @@ def do_do_baz(self, callback, user_data): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.do_bar.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.do_bar.page index 1ecac0d2..495168ae 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.do_bar.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>self</api:name> </api:arg> </api:function> - </info> <title>Regress.FooSubInterface.do_bar</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.FooSubInterface) @returns(none) def do_bar(self): # Python wrapper for regress_foo_sub_interface_do_bar() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>self</code></title> @@ -42,6 +34,4 @@ def do_bar(self): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.do_baz.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.do_baz.page index 071fb0d5..5b76e3fa 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.do_baz.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +25,16 @@ <api:name>user_data</api:name> </api:arg> </api:function> - </info> <title>Regress.FooSubInterface.do_baz</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.FooSubInterface, GObject.Callback, gpointer) @returns(none) def do_baz(self, callback, user_data): # Python wrapper for regress_foo_sub_interface_do_baz() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>self</code></title> @@ -58,6 +50,4 @@ def do_baz(self, callback, user_data): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.page index 81593d32..611edb12 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.page @@ -1,38 +1,33 @@ <?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><code> from gi.repository import Regress foo_sub_interface = Regress.FooSubInterface() </code></synopsis> - - - - - - + <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/python" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> <links type="topic" ui:expanded="true" api:type="function" api:mime="text/python" groups="method" style="linklist"> @@ -41,7 +36,7 @@ foo_sub_interface = Regress.FooSubInterface() </code></synopsis> <links type="topic" ui:expanded="true" api:type="function" api:mime="text/python" 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> @@ -52,8 +47,10 @@ foo_sub_interface = Regress.FooSubInterface() </code></synopsis> <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-Python-expected/Regress.FooSubobject-parent_instance.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubobject-parent_instance.page new file mode 100644 index 00000000..33994c72 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.FooSubobject.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubobject.page index fc7b5ad1..9cc4d6b5 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubobject.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubobject.page @@ -6,23 +6,16 @@ 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><code> from gi.repository import Regress -foo_subobject = Regress.FooSubobject() </code></synopsis> +foo_subobject = Regress.FooSubobject() + </code></synopsis> + - - - - - - <synopsis> <title>Hierarchy</title> <tree> @@ -37,8 +30,11 @@ foo_subobject = Regress.FooSubobject() </code></synopsis> </item> </tree> </synopsis> - - + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> <links type="topic" ui:expanded="true" api:type="function" api:mime="text/python" groups="method" style="linklist"> @@ -47,7 +43,7 @@ foo_subobject = Regress.FooSubobject() </code></synopsis> <links type="topic" ui:expanded="true" api:type="function" api:mime="text/python" 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> @@ -58,8 +54,10 @@ foo_subobject = Regress.FooSubobject() </code></synopsis> <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-Python-expected/Regress.FooThingWithArray-data.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooThingWithArray-data.page new file mode 100644 index 00000000..cc40f8f4 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.FooThingWithArray-lines.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooThingWithArray-lines.page new file mode 100644 index 00000000..6db4319f --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.FooThingWithArray-x.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooThingWithArray-x.page new file mode 100644 index 00000000..c13779f6 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.FooThingWithArray-y.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooThingWithArray-y.page new file mode 100644 index 00000000..df8f251c --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.FooThingWithArray.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooThingWithArray.page index 430dce7c..b5224c3f 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooThingWithArray.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooThingWithArray.page @@ -1,25 +1,40 @@ <?xml version="1.0"?> <page id="Regress.FooThingWithArray" type="guide" - style="record" + 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> - - - - - - - - - - - + <synopsis><code> +from gi.repository import Regress + +foo_thing_with_array = Regress.FooThingWithArray() + </code></synopsis> + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + 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-Python-expected/Regress.FooUnion-regress_foo.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooUnion-regress_foo.page new file mode 100644 index 00000000..6c180ddc --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.FooUnion.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooUnion.page index 9746f17e..84a0b44c 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooUnion.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooUnion.page @@ -1,25 +1,40 @@ <?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> - - - - - - - - - - - + <synopsis><code> +from gi.repository import Regress + +foo_union = Regress.FooUnion() + </code></synopsis> + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + 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-Python-expected/Regress.FooUtilityStruct-bar.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooUtilityStruct-bar.page new file mode 100644 index 00000000..26d131c2 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.FooUtilityStruct.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooUtilityStruct.page index 2b94f691..7c2d3e64 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooUtilityStruct.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooUtilityStruct.page @@ -1,25 +1,40 @@ <?xml version="1.0"?> <page id="Regress.FooUtilityStruct" type="guide" - style="record" + 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> - - - - - - - - - - - + <synopsis><code> +from gi.repository import Regress + +foo_utility_struct = Regress.FooUtilityStruct() + </code></synopsis> + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + 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-Python-expected/Regress.FooXEvent.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooXEvent.page index c389ef05..19bee422 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooXEvent.page +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.GI_SCANNER_ELSE.page b/tests/scanner/Regress-1.0-Python-expected/Regress.GI_SCANNER_ELSE.page new file mode 100644 index 00000000..e9876e07 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.GI_SCANNER_IFDEF.page b/tests/scanner/Regress-1.0-Python-expected/Regress.GI_SCANNER_IFDEF.page new file mode 100644 index 00000000..bfef183a --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.GUINT64_CONSTANT.page b/tests/scanner/Regress-1.0-Python-expected/Regress.GUINT64_CONSTANT.page new file mode 100644 index 00000000..8c16dd2f --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.GUINT64_CONSTANTA.page b/tests/scanner/Regress-1.0-Python-expected/Regress.GUINT64_CONSTANTA.page new file mode 100644 index 00000000..3b0d6f14 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.G_GINT64_CONSTANT.page b/tests/scanner/Regress-1.0-Python-expected/Regress.G_GINT64_CONSTANT.page new file mode 100644 index 00000000..cdce6076 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.INT_CONSTANT.page b/tests/scanner/Regress-1.0-Python-expected/Regress.INT_CONSTANT.page new file mode 100644 index 00000000..e0512abe --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.LONG_STRING_CONSTANT.page b/tests/scanner/Regress-1.0-Python-expected/Regress.LONG_STRING_CONSTANT.page new file mode 100644 index 00000000..85fe96ed --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.LikeGnomeKeyringPasswordSchema-attributes.page b/tests/scanner/Regress-1.0-Python-expected/Regress.LikeGnomeKeyringPasswordSchema-attributes.page new file mode 100644 index 00000000..db515008 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.LikeGnomeKeyringPasswordSchema-dummy.page b/tests/scanner/Regress-1.0-Python-expected/Regress.LikeGnomeKeyringPasswordSchema-dummy.page new file mode 100644 index 00000000..3bfbac14 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.LikeGnomeKeyringPasswordSchema-dummy2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.LikeGnomeKeyringPasswordSchema-dummy2.page new file mode 100644 index 00000000..408ab290 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.LikeGnomeKeyringPasswordSchema.page b/tests/scanner/Regress-1.0-Python-expected/Regress.LikeGnomeKeyringPasswordSchema.page index 44a946ee..94945b88 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.LikeGnomeKeyringPasswordSchema.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.LikeGnomeKeyringPasswordSchema.page @@ -1,25 +1,40 @@ <?xml version="1.0"?> <page id="Regress.LikeGnomeKeyringPasswordSchema" type="guide" - style="record" + 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> - - - - - - - - - - - + <synopsis><code> +from gi.repository import Regress + +like_gnome_keyring_password_schema = Regress.LikeGnomeKeyringPasswordSchema() + </code></synopsis> + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + 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-Python-expected/Regress.LikeXklConfigItem-name.page b/tests/scanner/Regress-1.0-Python-expected/Regress.LikeXklConfigItem-name.page new file mode 100644 index 00000000..dbc89981 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.LikeXklConfigItem.page b/tests/scanner/Regress-1.0-Python-expected/Regress.LikeXklConfigItem.page index fb4831f5..7e9839ed 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.LikeXklConfigItem.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.LikeXklConfigItem.page @@ -1,25 +1,40 @@ <?xml version="1.0"?> <page id="Regress.LikeXklConfigItem" type="guide" - style="record" + 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> - - - - - - - - - - - + <synopsis><code> +from gi.repository import Regress + +like_xkl_config_item = Regress.LikeXklConfigItem() + </code></synopsis> + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + 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-Python-expected/Regress.LikeXklConfigItem.set_name.page b/tests/scanner/Regress-1.0-Python-expected/Regress.LikeXklConfigItem.set_name.page index a6815c8b..f84c257b 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.LikeXklConfigItem.set_name.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +21,16 @@ <api:name>name</api:name> </api:arg> </api:function> - </info> <title>Regress.LikeXklConfigItem.set_name</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.LikeXklConfigItem, unicode) @returns(none) def set_name(self, name): # Python wrapper for regress_like_xkl_config_item_set_name() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>self</code></title> @@ -50,6 +42,4 @@ def set_name(self, name): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.MAXUINT64.page b/tests/scanner/Regress-1.0-Python-expected/Regress.MAXUINT64.page new file mode 100644 index 00000000..91d7ce51 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.MININT64.page b/tests/scanner/Regress-1.0-Python-expected/Regress.MININT64.page new file mode 100644 index 00000000..1531540e --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.Mixed_Case_Constant.page b/tests/scanner/Regress-1.0-Python-expected/Regress.Mixed_Case_Constant.page new file mode 100644 index 00000000..29e7314b --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.NEGATIVE_INT_CONSTANT.page b/tests/scanner/Regress-1.0-Python-expected/Regress.NEGATIVE_INT_CONSTANT.page new file mode 100644 index 00000000..a0aad769 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.PtrArrayAlias.page b/tests/scanner/Regress-1.0-Python-expected/Regress.PtrArrayAlias.page index f66aee44..1acd4d22 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.PtrArrayAlias.page +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.STRING_CONSTANT.page b/tests/scanner/Regress-1.0-Python-expected/Regress.STRING_CONSTANT.page new file mode 100644 index 00000000..be1d6e16 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.TestABCError.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestABCError.page index f31b58ec..9ab21894 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestABCError.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestABCError.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="enum" type="guide"/> - + <link xref="index" group="enum" type="guide"/> </info> <title>Regress.TestABCError</title> - - - - - - - - + + <terms> <item> <title><code>TestABCError.CODE1</code></title> @@ -34,6 +26,4 @@ </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestABCError.quark.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestABCError.quark.page index 8a8114df..d47bc9ac 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestABCError.quark.page +++ b/tests/scanner/Regress-1.0-Python-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,22 +13,15 @@ </api:returns> <api:name>regress_test_abc_error_quark</api:name> </api:function> - </info> - <title>Index.quark</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.quark</title> + <synopsis><code mime="text/x-python"> @returns(GLib.Quark) def quark(): # Python wrapper for regress_test_abc_error_quark() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ def quark(): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed-nested_a.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed-nested_a.page new file mode 100644 index 00000000..d394f4db --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.TestBoxed-priv.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed-priv.page new file mode 100644 index 00000000..3084c21d --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.TestBoxed-some_int8.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed-some_int8.page new file mode 100644 index 00000000..36f6632e --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.TestBoxed.copy.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.copy.page index 6e69b52e..2bbe4665 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.copy.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>self</api:name> </api:arg> </api:function> - </info> <title>Regress.TestBoxed.copy</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.TestBoxed) @returns(Regress.TestBoxed) def copy(self): # Python wrapper for regress_test_boxed_copy() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>self</code></title> @@ -46,6 +38,4 @@ def copy(self): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.equals.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.equals.page index b4e88aaf..e15ba35c 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.equals.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +21,16 @@ <api:name>other</api:name> </api:arg> </api:function> - </info> <title>Regress.TestBoxed.equals</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.TestBoxed, Regress.TestBoxed) @returns(bool) def equals(self, other): # Python wrapper for regress_test_boxed_equals() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>self</code></title> @@ -54,6 +46,4 @@ def equals(self, other): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.page index baa423f2..45b56f93 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.page @@ -1,25 +1,40 @@ <?xml version="1.0"?> <page id="Regress.TestBoxed" type="guide" - style="record" + 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> - - - - - - - - - - - + <synopsis><code> +from gi.repository import Regress + +test_boxed = Regress.TestBoxed() + </code></synopsis> + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + 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-Python-expected/Regress.TestBoxedB-some_int8.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedB-some_int8.page new file mode 100644 index 00000000..c7666c77 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.TestBoxedB-some_long.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedB-some_long.page new file mode 100644 index 00000000..a5f4a348 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.TestBoxedB.copy.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedB.copy.page index 2629154a..48850674 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedB.copy.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>self</api:name> </api:arg> </api:function> - </info> <title>Regress.TestBoxedB.copy</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.TestBoxedB) @returns(Regress.TestBoxedB) def copy(self): # Python wrapper for regress_test_boxed_b_copy() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>self</code></title> @@ -46,6 +38,4 @@ def copy(self): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedB.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedB.page index 0e39780b..835e8d6a 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedB.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedB.page @@ -1,25 +1,40 @@ <?xml version="1.0"?> <page id="Regress.TestBoxedB" type="guide" - style="record" + 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> - - - - - - - - - - - + <synopsis><code> +from gi.repository import Regress + +test_boxed_b = Regress.TestBoxedB() + </code></synopsis> + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + 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-Python-expected/Regress.TestBoxedC-another_thing.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedC-another_thing.page new file mode 100644 index 00000000..a5d7c2b1 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.TestBoxedC-refcount.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedC-refcount.page new file mode 100644 index 00000000..0f755ddc --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.TestBoxedC.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedC.page index 18b77d9f..adc2dc8a 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedC.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedC.page @@ -1,25 +1,40 @@ <?xml version="1.0"?> <page id="Regress.TestBoxedC" type="guide" - style="record" + 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> - - - - - - - - - - - + <synopsis><code> +from gi.repository import Regress + +test_boxed_c = Regress.TestBoxedC() + </code></synopsis> + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + 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-Python-expected/Regress.TestBoxedD.copy.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.copy.page index 9910236c..94c6fec9 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.copy.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>self</api:name> </api:arg> </api:function> - </info> <title>Regress.TestBoxedD.copy</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.TestBoxedD) @returns(Regress.TestBoxedD) def copy(self): # Python wrapper for regress_test_boxed_d_copy() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>self</code></title> @@ -46,6 +38,4 @@ def copy(self): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.free.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.free.page index 9750cc3f..377d8411 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.free.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>self</api:name> </api:arg> </api:function> - </info> <title>Regress.TestBoxedD.free</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.TestBoxedD) @returns(none) def free(self): # Python wrapper for regress_test_boxed_d_free() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>self</code></title> @@ -42,6 +34,4 @@ def free(self): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.get_magic.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.get_magic.page index f050eb66..d28544cb 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.get_magic.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>self</api:name> </api:arg> </api:function> - </info> <title>Regress.TestBoxedD.get_magic</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.TestBoxedD) @returns(int) def get_magic(self): # Python wrapper for regress_test_boxed_d_get_magic() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>self</code></title> @@ -46,6 +38,4 @@ def get_magic(self): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.page index 995e80dd..ea57619d 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.page @@ -1,25 +1,40 @@ <?xml version="1.0"?> <page id="Regress.TestBoxedD" type="guide" - style="record" + 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> - - - - - - - - - - - + <synopsis><code> +from gi.repository import Regress + +test_boxed_d = Regress.TestBoxedD() + </code></synopsis> + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + 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-Python-expected/Regress.TestCallback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallback.page index bed84d50..89bde372 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallback.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallback.page @@ -1,25 +1,25 @@ <?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"/> - + <link xref="index" group="callback" type="guide"/> </info> <title>Regress.TestCallback</title> - - - - - - - - - - - + <synopsis><code mime="text/x-python"> +@returns(int) +def on_TestCallback(): + </code></synopsis> + + +<terms> +<item> +<title><code>Returns</code></title> + +</item> +</terms> + </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackArray.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackArray.page index 7d3f7b83..aa45b05a 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackArray.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackArray.page @@ -1,25 +1,42 @@ <?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"/> - + <link xref="index" group="callback" type="guide"/> </info> <title>Regress.TestCallbackArray</title> - - - - - - - - - - - + <synopsis><code mime="text/x-python"> +@accepts([int], gsize, [unicode], int) +@returns(int) +def on_TestCallbackArray(one, one_length, two, 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-Python-expected/Regress.TestCallbackFull.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackFull.page index 0b8fca1d..73a59926 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackFull.page +++ b/tests/scanner/Regress-1.0-Python-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"/> - + <link xref="index" group="callback" type="guide"/> </info> <title>Regress.TestCallbackFull</title> - - - - - - - - - - - + <synopsis><code mime="text/x-python"> +@accepts(int, float, filename) +@returns(int) +def on_TestCallbackFull(foo, bar, 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-Python-expected/Regress.TestCallbackGError.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackGError.page index 804382f5..e5da462f 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackGError.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackGError.page @@ -1,25 +1,26 @@ <?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"/> - + <link xref="index" group="callback" type="guide"/> </info> <title>Regress.TestCallbackGError</title> - - - - - - - - - - - + <synopsis><code mime="text/x-python"> +@accepts(GLib.Error) +@returns(none) +def on_TestCallbackGError(error): + </code></synopsis> + + +<terms> +<item> +<title><code>error</code></title> + +</item> +</terms> + </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackHashtable.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackHashtable.page index 06ebb706..27918f67 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackHashtable.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackHashtable.page @@ -1,25 +1,26 @@ <?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"/> - + <link xref="index" group="callback" type="guide"/> </info> <title>Regress.TestCallbackHashtable</title> - - - - - - - - - - - + <synopsis><code mime="text/x-python"> +@accepts({unicode: int}) +@returns(none) +def on_TestCallbackHashtable(data): + </code></synopsis> + + +<terms> +<item> +<title><code>data</code></title> + <p>a hash table; will be modified</p> +</item> +</terms> + </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackOwnedGError.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackOwnedGError.page index 28b21ea4..e45a3f41 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackOwnedGError.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackOwnedGError.page @@ -1,25 +1,26 @@ <?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"/> - + <link xref="index" group="callback" type="guide"/> </info> <title>Regress.TestCallbackOwnedGError</title> - - - - - - - - - - - + <synopsis><code mime="text/x-python"> +@accepts(GLib.Error) +@returns(none) +def on_TestCallbackOwnedGError(error): + </code></synopsis> + + +<terms> +<item> +<title><code>error</code></title> + <p>GError instance; must be freed by the callback</p> +</item> +</terms> + </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackUserData.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackUserData.page index 286c830a..b34f92af 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackUserData.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackUserData.page @@ -1,25 +1,30 @@ <?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"/> - + <link xref="index" group="callback" type="guide"/> </info> <title>Regress.TestCallbackUserData</title> - - - - - - - - - - - + <synopsis><code mime="text/x-python"> +@accepts(gpointer) +@returns(int) +def on_TestCallbackUserData(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-Python-expected/Regress.TestDEFError.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestDEFError.page index 589059d5..4ee86378 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestDEFError.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestDEFError.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="enum" type="guide"/> - + <link xref="index" group="enum" type="guide"/> </info> <title>Regress.TestDEFError</title> - - - - - - - - + + <terms> <item> <title><code>TestDEFError.CODE0</code></title> @@ -34,6 +26,4 @@ </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnum.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnum.page index 814b474b..10a6897d 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnum.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnum.page @@ -6,27 +6,19 @@ 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> + <terms> <item> <title><code>TestEnum.VALUE1</code></title> -<p>value 1</p> + <p>value 1</p> </item> <item> <title><code>TestEnum.VALUE2</code></title> -<p>value 2</p> + <p>value 2</p> </item> <item> <title><code>TestEnum.VALUE3</code></title> @@ -38,6 +30,4 @@ </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnum.param.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnum.param.page index 24684786..162276ed 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnum.param.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>e</api:name> </api:arg> </api:function> - </info> - <title>Index.param</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.param</title> + <synopsis><code mime="text/x-python"> @accepts(Regress.TestEnum) @returns(unicode) def param(e): # Python wrapper for regress_test_enum_param() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>e</code></title> @@ -46,6 +38,4 @@ def param(e): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnumNoGEnum.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnumNoGEnum.page index 5c0c5594..34de1b89 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnumNoGEnum.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnumNoGEnum.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="enum" type="guide"/> - + <link xref="index" group="enum" type="guide"/> </info> <title>Regress.TestEnumNoGEnum</title> - - - - - - - - + + <terms> <item> <title><code>TestEnumNoGEnum.EVALUE1</code></title> @@ -34,6 +26,4 @@ </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnumUnsigned.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnumUnsigned.page index df3cfa1e..e6976c87 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnumUnsigned.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnumUnsigned.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="enum" type="guide"/> - + <link xref="index" group="enum" type="guide"/> </info> <title>Regress.TestEnumUnsigned</title> - - - - - - - - + + <terms> <item> <title><code>TestEnumUnsigned.VALUE1</code></title> @@ -30,6 +22,4 @@ </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestError.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestError.page index d6a6ebb2..15f5583e 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestError.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestError.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="enum" type="guide"/> - + <link xref="index" group="enum" type="guide"/> </info> <title>Regress.TestError</title> - - - - - - - - + + <terms> <item> <title><code>TestError.CODE1</code></title> @@ -34,6 +26,4 @@ </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestError.quark.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestError.quark.page index 07a91a37..747f149a 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestError.quark.page +++ b/tests/scanner/Regress-1.0-Python-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,22 +13,15 @@ </api:returns> <api:name>regress_test_error_quark</api:name> </api:function> - </info> - <title>Index.quark</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.quark</title> + <synopsis><code mime="text/x-python"> @returns(GLib.Quark) def quark(): # Python wrapper for regress_test_error_quark() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ def quark(): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFlags.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFlags.page index d5bfeeb4..efab1a05 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFlags.page +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.TestFloating-parent_instance.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFloating-parent_instance.page new file mode 100644 index 00000000..c546875c --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.TestFloating.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFloating.page index a2b80e1d..e61af14a 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFloating.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFloating.page @@ -6,23 +6,16 @@ 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><code> from gi.repository import Regress -test_floating = Regress.TestFloating() </code></synopsis> +test_floating = Regress.TestFloating() + </code></synopsis> + - - - - - - <synopsis> <title>Hierarchy</title> <tree> @@ -37,8 +30,11 @@ test_floating = Regress.TestFloating() </code></synopsis> </item> </tree> </synopsis> - - + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> <links type="topic" ui:expanded="true" api:type="function" api:mime="text/python" groups="method" style="linklist"> @@ -47,7 +43,7 @@ test_floating = Regress.TestFloating() </code></synopsis> <links type="topic" ui:expanded="true" api:type="function" api:mime="text/python" 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> @@ -58,8 +54,10 @@ test_floating = Regress.TestFloating() </code></synopsis> <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-Python-expected/Regress.TestFundamentalObject-flags.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject-flags.page new file mode 100644 index 00000000..875ba302 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.TestFundamentalObject-instance.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject-instance.page new file mode 100644 index 00000000..693df033 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.TestFundamentalObject-refcount.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject-refcount.page new file mode 100644 index 00000000..3413765d --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.TestFundamentalObject.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.page index 7035407d..fe54afd5 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.page @@ -6,23 +6,16 @@ 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><code> from gi.repository import Regress -test_fundamental_object = Regress.TestFundamentalObject() </code></synopsis> +test_fundamental_object = Regress.TestFundamentalObject() + </code></synopsis> + - - - - - - <synopsis> <title>Hierarchy</title> <tree> @@ -31,8 +24,11 @@ test_fundamental_object = Regress.TestFundamentalObject() </code></synopsis> </item> </tree> </synopsis> - - + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> <links type="topic" ui:expanded="true" api:type="function" api:mime="text/python" groups="method" style="linklist"> @@ -41,7 +37,7 @@ test_fundamental_object = Regress.TestFundamentalObject() </code></synopsis> <links type="topic" ui:expanded="true" api:type="function" api:mime="text/python" 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> @@ -52,8 +48,10 @@ test_fundamental_object = Regress.TestFundamentalObject() </code></synopsis> <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-Python-expected/Regress.TestFundamentalObject.ref.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.ref.page index ed3159d0..cbd364bb 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.ref.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>self</api:name> </api:arg> </api:function> - </info> <title>Regress.TestFundamentalObject.ref</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.TestFundamentalObject) @returns(Regress.TestFundamentalObject) def ref(self): # Python wrapper for regress_test_fundamental_object_ref() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>self</code></title> @@ -46,6 +38,4 @@ def ref(self): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.unref.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.unref.page index 1ecf6c1e..a3562383 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.unref.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>self</api:name> </api:arg> </api:function> - </info> <title>Regress.TestFundamentalObject.unref</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.TestFundamentalObject) @returns(none) def unref(self): # Python wrapper for regress_test_fundamental_object_unref() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>self</code></title> @@ -42,6 +34,4 @@ def unref(self): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObjectCopyFunction.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObjectCopyFunction.page index 73a33285..d776e83a 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObjectCopyFunction.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObjectCopyFunction.page @@ -1,25 +1,30 @@ <?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"/> - + <link xref="index" group="callback" type="guide"/> </info> <title>Regress.TestFundamentalObjectCopyFunction</title> - - - - - - - - - - - + <synopsis><code mime="text/x-python"> +@accepts(Regress.TestFundamentalObject) +@returns(Regress.TestFundamentalObject) +def on_TestFundamentalObjectCopyFunction(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-Python-expected/Regress.TestFundamentalObjectFinalizeFunction.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObjectFinalizeFunction.page index df0e8fba..beaa9fd2 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObjectFinalizeFunction.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObjectFinalizeFunction.page @@ -1,25 +1,26 @@ <?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"/> - + <link xref="index" group="callback" type="guide"/> </info> <title>Regress.TestFundamentalObjectFinalizeFunction</title> - - - - - - - - - - - + <synopsis><code mime="text/x-python"> +@accepts(Regress.TestFundamentalObject) +@returns(none) +def on_TestFundamentalObjectFinalizeFunction(obj): + </code></synopsis> + + +<terms> +<item> +<title><code>obj</code></title> + +</item> +</terms> + </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalSubObject-data.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalSubObject-data.page new file mode 100644 index 00000000..02269eb2 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.TestFundamentalSubObject-fundamental_object.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalSubObject-fundamental_object.page new file mode 100644 index 00000000..27c5cf4d --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.TestFundamentalSubObject.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalSubObject.page index 6b1e810a..8a454a6b 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalSubObject.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalSubObject.page @@ -6,23 +6,16 @@ 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><code> from gi.repository import Regress -test_fundamental_sub_object = Regress.TestFundamentalSubObject() </code></synopsis> +test_fundamental_sub_object = Regress.TestFundamentalSubObject() + </code></synopsis> + - - - - - - <synopsis> <title>Hierarchy</title> <tree> @@ -34,8 +27,11 @@ test_fundamental_sub_object = Regress.TestFundamentalSubObject() </code></synop </item> </tree> </synopsis> - - + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> <links type="topic" ui:expanded="true" api:type="function" api:mime="text/python" groups="method" style="linklist"> @@ -44,7 +40,7 @@ test_fundamental_sub_object = Regress.TestFundamentalSubObject() </code></synop <links type="topic" ui:expanded="true" api:type="function" api:mime="text/python" 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> @@ -55,8 +51,10 @@ test_fundamental_sub_object = Regress.TestFundamentalSubObject() </code></synop <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-Python-expected/Regress.TestInheritDrawable-parent_instance.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable-parent_instance.page new file mode 100644 index 00000000..2295febc --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.TestInheritDrawable.do_foo.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.do_foo.page index 1cfcfdcb..c472c32a 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.do_foo.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +21,16 @@ <api:name>x</api:name> </api:arg> </api:function> - </info> <title>Regress.TestInheritDrawable.do_foo</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.TestInheritDrawable, int) @returns(none) def do_foo(self, x): # Python wrapper for regress_test_inherit_drawable_do_foo() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>self</code></title> @@ -50,6 +42,4 @@ def do_foo(self, x): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page index e00b489c..97ccc2be 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +21,16 @@ <api:name>x</api:name> </api:arg> </api:function> - </info> <title>Regress.TestInheritDrawable.do_foo_maybe_throw</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.TestInheritDrawable, int) @returns(none) def do_foo_maybe_throw(self, x): # Python wrapper for regress_test_inherit_drawable_do_foo_maybe_throw() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>self</code></title> @@ -50,6 +42,4 @@ def do_foo_maybe_throw(self, x): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.get_origin.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.get_origin.page index 357d0694..08044b39 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.get_origin.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +25,16 @@ <api:name>y</api:name> </api:arg> </api:function> - </info> <title>Regress.TestInheritDrawable.get_origin</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.TestInheritDrawable, int, int) @returns(none) def get_origin(self, x, y): # Python wrapper for regress_test_inherit_drawable_get_origin() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>self</code></title> @@ -58,6 +50,4 @@ def get_origin(self, x, y): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.get_size.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.get_size.page index 3bbdfed1..95ecf367 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.get_size.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +25,16 @@ <api:name>height</api:name> </api:arg> </api:function> - </info> <title>Regress.TestInheritDrawable.get_size</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.TestInheritDrawable, int, int) @returns(none) def get_size(self, width, height): # Python wrapper for regress_test_inherit_drawable_get_size() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>self</code></title> @@ -58,6 +50,4 @@ def get_size(self, width, height): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.page index 1fdd2c89..7322be06 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.page @@ -6,23 +6,16 @@ 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><code> from gi.repository import Regress -test_inherit_drawable = Regress.TestInheritDrawable() </code></synopsis> +test_inherit_drawable = Regress.TestInheritDrawable() + </code></synopsis> + - - - - - - <synopsis> <title>Hierarchy</title> <tree> @@ -34,8 +27,11 @@ test_inherit_drawable = Regress.TestInheritDrawable() </code></synopsis> </item> </tree> </synopsis> - - + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> <links type="topic" ui:expanded="true" api:type="function" api:mime="text/python" groups="method" style="linklist"> @@ -44,7 +40,7 @@ test_inherit_drawable = Regress.TestInheritDrawable() </code></synopsis> <links type="topic" ui:expanded="true" api:type="function" api:mime="text/python" 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> @@ -55,8 +51,10 @@ test_inherit_drawable = Regress.TestInheritDrawable() </code></synopsis> <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-Python-expected/Regress.TestInheritPixmapObjectClass-parent_class.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritPixmapObjectClass-parent_class.page new file mode 100644 index 00000000..bf056d8d --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.TestInheritPixmapObjectClass.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritPixmapObjectClass.page index 0df0396b..14b0ab68 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritPixmapObjectClass.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritPixmapObjectClass.page @@ -1,25 +1,40 @@ <?xml version="1.0"?> <page id="Regress.TestInheritPixmapObjectClass" type="guide" - style="record" + 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> - - - - - - - - - - - + <synopsis><code> +from gi.repository import Regress + +test_inherit_pixmap_object_class = Regress.TestInheritPixmapObjectClass() + </code></synopsis> + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + 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-Python-expected/Regress.TestInterface.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInterface.page index 807e18ae..7fb4c88c 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInterface.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInterface.page @@ -1,38 +1,33 @@ <?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><code> from gi.repository import Regress test_interface = Regress.TestInterface() </code></synopsis> - - - - - - + <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/python" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> <links type="topic" ui:expanded="true" api:type="function" api:mime="text/python" groups="method" style="linklist"> @@ -41,7 +36,7 @@ test_interface = Regress.TestInterface() </code></synopsis> <links type="topic" ui:expanded="true" api:type="function" api:mime="text/python" 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> @@ -52,8 +47,10 @@ test_interface = Regress.TestInterface() </code></synopsis> <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-Python-expected/Regress.TestObj-all.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-all.page index f8fb4a1c..bf42080d 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-all.page +++ b/tests/scanner/Regress-1.0-Python-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-python"> + <synopsis><code mime="text/x-python"> def callback(test_obj, user_param1, ...) -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>test_obj</code></title> @@ -36,6 +28,4 @@ def callback(test_obj, user_param1, ...) </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-allow_none_vfunc.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-allow_none_vfunc.page index 7a3b9c91..adae8c0d 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-allow_none_vfunc.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-allow_none_vfunc.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="vfunc" type="guide"/> - + <link xref="Regress.TestObj" group="vfunc" type="guide"/> </info> <title>Regress.TestObj::allow_none_vfunc</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.TestObj, Regress.TestObj) @returns(none) def do_allow_none_vfunc(obj, two): -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>obj</code></title> @@ -31,10 +23,8 @@ def do_allow_none_vfunc(obj, two): </item> <item> <title><code>two</code></title> -<p>Another object</p> + <p>Another object</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-bare.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-bare.page index f1f1b520..cb3eaf3b 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-bare.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-bare.page @@ -6,24 +6,13 @@ 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> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> "bare" GObject.Object : Read / Write -</code></synopsis> + </code></synopsis> + - - - - - - - - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-boxed.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-boxed.page index a392a771..8e976156 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-boxed.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-boxed.page @@ -6,24 +6,13 @@ 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> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> "boxed" Regress.TestBoxed : Read / Write -</code></synopsis> + </code></synopsis> + - - - - - - - - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-cleanup.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-cleanup.page index f35c0314..1ef90a98 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-cleanup.page +++ b/tests/scanner/Regress-1.0-Python-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-python"> + <synopsis><code mime="text/x-python"> def callback(test_obj, user_param1, ...) -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>test_obj</code></title> @@ -36,6 +28,4 @@ def callback(test_obj, user_param1, ...) </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-double.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-double.page index 70fd579b..1641a854 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-double.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-double.page @@ -6,24 +6,13 @@ 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> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> "double" float : Read / Write -</code></synopsis> + </code></synopsis> + - - - - - - - - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-first.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-first.page index b5bcd2c0..e7515c90 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-first.page +++ b/tests/scanner/Regress-1.0-Python-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-python"> + <synopsis><code mime="text/x-python"> def callback(test_obj, user_param1, ...) -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>test_obj</code></title> @@ -36,6 +28,4 @@ def callback(test_obj, user_param1, ...) </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-float.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-float.page index 87be50fe..7d056950 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-float.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-float.page @@ -6,24 +6,13 @@ 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> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> "float" float : Read / Write -</code></synopsis> + </code></synopsis> + - - - - - - - - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-gtype.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-gtype.page index 6b222e4e..e1da1267 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-gtype.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-gtype.page @@ -6,24 +6,13 @@ 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> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> "gtype" GType : Read / Write -</code></synopsis> + </code></synopsis> + - - - - - - - - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-hash-table-old.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-hash-table-old.page index c796f365..41371137 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-hash-table-old.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-hash-table-old.page @@ -6,24 +6,13 @@ 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> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> "hash-table-old" {unicode: gint8} : Read / Write -</code></synopsis> + </code></synopsis> + - - - - - - - - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-hash-table.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-hash-table.page index c5d426cf..5567b586 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-hash-table.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-hash-table.page @@ -6,24 +6,13 @@ 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> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> "hash-table" {unicode: gint8} : Read / Write -</code></synopsis> + </code></synopsis> + - - - - - - - - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-hash_table.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-hash_table.page new file mode 100644 index 00000000..40653a90 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.TestObj-int.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-int.page index db7a89e1..38302048 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-int.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-int.page @@ -6,24 +6,13 @@ 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> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> "int" int : Read / Write -</code></synopsis> + </code></synopsis> + - - - - - - - - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-list-old.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-list-old.page index 95367ec2..eee06b8d 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-list-old.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-list-old.page @@ -6,24 +6,13 @@ 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> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> "list-old" [unicode] : Read / Write -</code></synopsis> + </code></synopsis> + - - - - - - - - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-list.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-list.page index aca148d8..e23acdbb 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-list.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-list.page @@ -6,24 +6,13 @@ 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> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> "list" [unicode] : Read / Write -</code></synopsis> + </code></synopsis> + - - - - - - - - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-matrix.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-matrix.page index 742e6da4..857ddb7b 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-matrix.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-matrix.page @@ -6,34 +6,26 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/1.0/ui/"> <info> - - <link xref="Regress.TestObj" group="vfunc" type="guide"/> - + <link xref="Regress.TestObj" group="vfunc" type="guide"/> </info> <title>Regress.TestObj::matrix</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.TestObj, unicode) @returns(int) def do_matrix(obj, 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> @@ -41,6 +33,4 @@ case.</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-parent_instance.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-parent_instance.page new file mode 100644 index 00000000..52b356b4 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.TestObj-sig-with-array-len-prop.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-array-len-prop.page index a228de1f..2b38065c 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-array-len-prop.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-array-len-prop.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">sig-with-array-len-prop</title> - </info> <title>Regress.TestObj::sig-with-array-len-prop</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> def callback(test_obj, arr, len, user_param1, ...) -</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>test_obj</code></title> @@ -30,11 +22,11 @@ def callback(test_obj, arr, len, user_param1, ...) </item> <item> <title><code>arr</code></title> -<p>numbers, or <code>None</code></p> + <p>numbers, or <code>None</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> <title><code>user_param1</code></title> <p>first user parameter (if any) specified with the connect() method</p> @@ -44,6 +36,4 @@ def callback(test_obj, arr, len, user_param1, ...) </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-array-prop.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-array-prop.page index eb1b99ff..e0a8849a 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-array-prop.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-array-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-array-prop</title> - </info> <title>Regress.TestObj::sig-with-array-prop</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> def callback(test_obj, arr, user_param1, ...) -</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>test_obj</code></title> @@ -31,7 +23,7 @@ def callback(test_obj, arr, user_param1, ...) </item> <item> <title><code>arr</code></title> -<p>numbers</p> + <p>numbers</p> </item> <title><code>user_param1</code></title> <p>first user parameter (if any) specified with the connect() method</p> @@ -41,6 +33,4 @@ def callback(test_obj, arr, user_param1, ...) </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-foreign-struct.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-foreign-struct.page index 36a30d7e..e4f05e69 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-foreign-struct.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-foreign-struct.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">sig-with-foreign-struct</title> - </info> <title>Regress.TestObj::sig-with-foreign-struct</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> def callback(test_obj, cr, user_param1, ...) -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>test_obj</code></title> @@ -30,7 +22,7 @@ def callback(test_obj, cr, user_param1, ...) </item> <item> <title><code>cr</code></title> -<p>A cairo context.</p> + <p>A cairo context.</p> </item> <title><code>user_param1</code></title> <p>first user parameter (if any) specified with the connect() method</p> @@ -40,6 +32,4 @@ def callback(test_obj, cr, user_param1, ...) </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-hash-prop.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-hash-prop.page index 2048ad2c..93084157 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-hash-prop.page +++ b/tests/scanner/Regress-1.0-Python-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-python"> + <synopsis><code mime="text/x-python"> def callback(test_obj, hash, user_param1, ...) -</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>test_obj</code></title> @@ -41,6 +33,4 @@ def callback(test_obj, hash, user_param1, ...) </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-int64-prop.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-int64-prop.page index a782484b..d1e87185 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-int64-prop.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-int64-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-int64-prop</title> - </info> <title>Regress.TestObj::sig-with-int64-prop</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> def callback(test_obj, i, user_param1, ...) -</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>test_obj</code></title> @@ -31,7 +23,7 @@ the introspection client langage.</p> </item> <item> <title><code>i</code></title> -<p>an integer</p> + <p>an integer</p> </item> <title><code>user_param1</code></title> <p>first user parameter (if any) specified with the connect() method</p> @@ -45,6 +37,4 @@ the introspection client langage.</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-intarray-ret.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-intarray-ret.page index d070f179..45964c94 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-intarray-ret.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-intarray-ret.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">sig-with-intarray-ret</title> - </info> <title>Regress.TestObj::sig-with-intarray-ret</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> def callback(test_obj, i, user_param1, ...) -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>test_obj</code></title> @@ -30,7 +22,7 @@ def callback(test_obj, i, user_param1, ...) </item> <item> <title><code>i</code></title> -<p>an integer</p> + <p>an integer</p> </item> <title><code>user_param1</code></title> <p>first user parameter (if any) specified with the connect() method</p> @@ -40,6 +32,4 @@ def callback(test_obj, i, user_param1, ...) </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-obj.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-obj.page index d4814a83..0f21e17c 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-obj.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-obj.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-obj</title> - </info> <title>Regress.TestObj::sig-with-obj</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> def callback(test_obj, obj, user_param1, ...) -</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>test_obj</code></title> @@ -31,7 +23,7 @@ Use with regress_test_obj_emit_sig_with_obj</p> </item> <item> <title><code>obj</code></title> -<p>A newly created RegressTestObj</p> + <p>A newly created RegressTestObj</p> </item> <title><code>user_param1</code></title> <p>first user parameter (if any) specified with the connect() method</p> @@ -41,6 +33,4 @@ Use with regress_test_obj_emit_sig_with_obj</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-strv.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-strv.page index a7037a49..ae04a858 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-strv.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-strv.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">sig-with-strv</title> - </info> <title>Regress.TestObj::sig-with-strv</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> def callback(test_obj, strs, user_param1, ...) -</code></synopsis> + </code></synopsis> + <p>Test GStrv as a param.</p> - - <p>Test GStrv as a param.</p> - - - - <terms> <item> <title><code>test_obj</code></title> @@ -30,7 +22,7 @@ def callback(test_obj, strs, user_param1, ...) </item> <item> <title><code>strs</code></title> -<p>strings</p> + <p>strings</p> </item> <title><code>user_param1</code></title> <p>first user parameter (if any) specified with the connect() method</p> @@ -40,6 +32,4 @@ def callback(test_obj, strs, user_param1, ...) </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-uint64-prop.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-uint64-prop.page index c89d1d16..045bd4bc 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-uint64-prop.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-uint64-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-uint64-prop</title> - </info> <title>Regress.TestObj::sig-with-uint64-prop</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> def callback(test_obj, i, user_param1, ...) -</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>test_obj</code></title> @@ -31,7 +23,7 @@ the introspection client langage.</p> </item> <item> <title><code>i</code></title> -<p>an integer</p> + <p>an integer</p> </item> <title><code>user_param1</code></title> <p>first user parameter (if any) specified with the connect() method</p> @@ -45,6 +37,4 @@ the introspection client langage.</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-some_double.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-some_double.page new file mode 100644 index 00000000..ffd77f1b --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.TestObj-some_float.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-some_float.page new file mode 100644 index 00000000..0c22a207 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.TestObj-some_int8.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-some_int8.page new file mode 100644 index 00000000..88368896 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.TestObj-string.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-string.page index fa499937..7d3a8195 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-string.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-string.page @@ -6,24 +6,13 @@ 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> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> "string" unicode : Read / Write -</code></synopsis> + </code></synopsis> + - - - - - - - - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-test-with-static-scope-arg.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-test-with-static-scope-arg.page index 736814c7..bbf8c291 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-test-with-static-scope-arg.page +++ b/tests/scanner/Regress-1.0-Python-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-python"> + <synopsis><code mime="text/x-python"> def callback(test_obj, object, user_param1, ...) -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>test_obj</code></title> @@ -40,6 +32,4 @@ def callback(test_obj, object, user_param1, ...) </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-test.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-test.page index e09f531e..c2dbf6e5 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-test.page +++ b/tests/scanner/Regress-1.0-Python-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-python"> + <synopsis><code mime="text/x-python"> def callback(test_obj, user_param1, ...) -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>test_obj</code></title> @@ -36,6 +28,4 @@ def callback(test_obj, user_param1, ...) </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.do_matrix.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.do_matrix.page index 07eaa505..994c3a53 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.do_matrix.page +++ b/tests/scanner/Regress-1.0-Python-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,33 +21,26 @@ <api:name>somestr</api:name> </api:arg> </api:function> - </info> <title>Regress.TestObj.do_matrix</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.TestObj, unicode) @returns(int) def do_matrix(self, somestr): # Python wrapper for regress_test_obj_do_matrix() -</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>self</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> @@ -56,6 +48,4 @@ case.</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_foreign_struct.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_foreign_struct.page index 065d7456..2400bc62 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_foreign_struct.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>self</api:name> </api:arg> </api:function> - </info> <title>Regress.TestObj.emit_sig_with_foreign_struct</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.TestObj) @returns(none) def emit_sig_with_foreign_struct(self): # Python wrapper for regress_test_obj_emit_sig_with_foreign_struct() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>self</code></title> @@ -42,6 +34,4 @@ def emit_sig_with_foreign_struct(self): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_int64.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_int64.page index fb0679af..5760c645 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_int64.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>self</api:name> </api:arg> </api:function> - </info> <title>Regress.TestObj.emit_sig_with_int64</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.TestObj) @returns(none) def emit_sig_with_int64(self): # Python wrapper for regress_test_obj_emit_sig_with_int64() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>self</code></title> @@ -42,6 +34,4 @@ def emit_sig_with_int64(self): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_obj.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_obj.page index 25154985..eb961afc 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_obj.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>self</api:name> </api:arg> </api:function> - </info> <title>Regress.TestObj.emit_sig_with_obj</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.TestObj) @returns(none) def emit_sig_with_obj(self): # Python wrapper for regress_test_obj_emit_sig_with_obj() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>self</code></title> @@ -42,6 +34,4 @@ def emit_sig_with_obj(self): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_uint64.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_uint64.page index 34fbfe39..659b8826 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_uint64.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>self</api:name> </api:arg> </api:function> - </info> <title>Regress.TestObj.emit_sig_with_uint64</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.TestObj) @returns(none) def emit_sig_with_uint64(self): # Python wrapper for regress_test_obj_emit_sig_with_uint64() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>self</code></title> @@ -42,6 +34,4 @@ def emit_sig_with_uint64(self): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.forced_method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.forced_method.page index e4770525..a8dbc9a8 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.forced_method.page +++ b/tests/scanner/Regress-1.0-Python-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,30 +17,21 @@ <api:name>self</api:name> </api:arg> </api:function> - </info> <title>Regress.TestObj.forced_method</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.TestObj) @returns(none) def forced_method(self): # Python wrapper for regress_forced_method() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>self</code></title> -<p>A <link xref="Regress.TestObj"/></p> + <p>A <link xref="Regress.TestObj"/></p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method.page index 58c58e31..cd73b235 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>self</api:name> </api:arg> </api:function> - </info> <title>Regress.TestObj.instance_method</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.TestObj) @returns(int) def instance_method(self): # Python wrapper for regress_test_obj_instance_method() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>self</code></title> @@ -46,6 +38,4 @@ def instance_method(self): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method_callback.page index d491fa61..15402e60 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method_callback.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +21,16 @@ <api:name>callback</api:name> </api:arg> </api:function> - </info> <title>Regress.TestObj.instance_method_callback</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.TestObj, Regress.TestCallback) @returns(none) def instance_method_callback(self, callback): # Python wrapper for regress_test_obj_instance_method_callback() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>self</code></title> @@ -50,6 +42,4 @@ def instance_method_callback(self, callback): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.null_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.null_out.page index a1c06605..3c6146be 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.null_out.page +++ b/tests/scanner/Regress-1.0-Python-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,30 +17,21 @@ <api:name>obj</api:name> </api:arg> </api:function> - </info> <title>Regress.TestObj.null_out</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.TestObj) @returns(none) def null_out(obj): # Python wrapper for regress_test_obj_null_out() -</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> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.page index 1ded23c7..56033fd0 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.page @@ -6,23 +6,16 @@ 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><code> from gi.repository import Regress -test_obj = Regress.TestObj(<link xref='Regress.TestObj-bare'>bare</link>=value, <link xref='Regress.TestObj-boxed'>boxed</link>=value, <link xref='Regress.TestObj-double'>double</link>=value, <link xref='Regress.TestObj-float'>float</link>=value, <link xref='Regress.TestObj-gtype'>gtype</link>=value, <link xref='Regress.TestObj-hash-table'>hash_table</link>=value, <link xref='Regress.TestObj-hash-table-old'>hash_table_old</link>=value, <link xref='Regress.TestObj-int'>int</link>=value, <link xref='Regress.TestObj-list'>list</link>=value, <link xref='Regress.TestObj-list-old'>list_old</link>=value, <link xref='Regress.TestObj-string'>string</link>=value) </code></synopsis> +test_obj = Regress.TestObj(<link xref='Regress.TestObj-bare'>bare</link>=value, <link xref='Regress.TestObj-boxed'>boxed</link>=value, <link xref='Regress.TestObj-double'>double</link>=value, <link xref='Regress.TestObj-float'>float</link>=value, <link xref='Regress.TestObj-gtype'>gtype</link>=value, <link xref='Regress.TestObj-hash-table'>hash_table</link>=value, <link xref='Regress.TestObj-hash-table-old'>hash_table_old</link>=value, <link xref='Regress.TestObj-int'>int</link>=value, <link xref='Regress.TestObj-list'>list</link>=value, <link xref='Regress.TestObj-list-old'>list_old</link>=value, <link xref='Regress.TestObj-string'>string</link>=value) + </code></synopsis> + - - - - - - <synopsis> <title>Hierarchy</title> <tree> @@ -34,8 +27,11 @@ test_obj = Regress.TestObj(<link xref='Regress.TestObj-bare'>bare</link>=value, </item> </tree> </synopsis> - - + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> <links type="topic" ui:expanded="true" api:type="function" api:mime="text/python" groups="method" style="linklist"> @@ -44,7 +40,7 @@ test_obj = Regress.TestObj(<link xref='Regress.TestObj-bare'>bare</link>=value, <links type="topic" ui:expanded="true" api:type="function" api:mime="text/python" 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> @@ -55,8 +51,10 @@ test_obj = Regress.TestObj(<link xref='Regress.TestObj-bare'>bare</link>=value, <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-Python-expected/Regress.TestObj.set_bare.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.set_bare.page index 63acc894..2d405e93 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.set_bare.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +21,16 @@ <api:name>bare</api:name> </api:arg> </api:function> - </info> <title>Regress.TestObj.set_bare</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.TestObj, GObject.Object) @returns(none) def set_bare(self, bare): # Python wrapper for regress_test_obj_set_bare() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>self</code></title> @@ -50,6 +42,4 @@ def set_bare(self, bare): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_inout_param.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_inout_param.page index 3d32ba0b..e3ba881e 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_inout_param.page +++ b/tests/scanner/Regress-1.0-Python-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,55 +45,48 @@ <api:name>num2</api:name> </api:arg> </api:function> - </info> <title>Regress.TestObj.skip_inout_param</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.TestObj, int, int, float, int, int, int, int) @returns(bool) def skip_inout_param(self, a, out_b, c, inout_d, out_sum, num1, num2): # Python wrapper for regress_test_obj_skip_inout_param() -</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>self</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> @@ -102,6 +94,4 @@ def skip_inout_param(self, a, out_b, c, inout_d, out_sum, num1, num2): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_out_param.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_out_param.page index 58c5268b..e0551309 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_out_param.page +++ b/tests/scanner/Regress-1.0-Python-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,55 +45,48 @@ <api:name>num2</api:name> </api:arg> </api:function> - </info> <title>Regress.TestObj.skip_out_param</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.TestObj, int, int, float, int, int, int, int) @returns(bool) def skip_out_param(self, a, out_b, c, inout_d, out_sum, num1, num2): # Python wrapper for regress_test_obj_skip_out_param() -</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>self</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> @@ -102,6 +94,4 @@ def skip_out_param(self, a, out_b, c, inout_d, out_sum, num1, num2): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_param.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_param.page index c02f3b95..77fc43db 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_param.page +++ b/tests/scanner/Regress-1.0-Python-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,55 +45,48 @@ <api:name>num2</api:name> </api:arg> </api:function> - </info> <title>Regress.TestObj.skip_param</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.TestObj, int, int, float, int, int, int, int) @returns(bool) def skip_param(self, a, out_b, c, inout_d, out_sum, num1, num2): # Python wrapper for regress_test_obj_skip_param() -</code></synopsis> + </code></synopsis> + <p>Check that a parameter is skipped</p> - - <p>Check that a parameter is skipped</p> - - - - <terms> <item> <title><code>self</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> @@ -102,6 +94,4 @@ def skip_param(self, a, out_b, c, inout_d, out_sum, num1, num2): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_return_val.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_return_val.page index 2aadb427..dc4e915d 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_return_val.page +++ b/tests/scanner/Regress-1.0-Python-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,55 +45,48 @@ <api:name>num2</api:name> </api:arg> </api:function> - </info> <title>Regress.TestObj.skip_return_val</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.TestObj, int, int, float, int, int, int, int) @returns(bool) def skip_return_val(self, a, out_b, c, inout_d, out_sum, num1, num2): # Python wrapper for regress_test_obj_skip_return_val() -</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>self</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> @@ -102,6 +94,4 @@ def skip_return_val(self, a, out_b, c, inout_d, out_sum, num1, num2): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_return_val_no_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_return_val_no_out.page index f0c50f5f..77b925e4 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_return_val_no_out.page +++ b/tests/scanner/Regress-1.0-Python-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,32 +21,25 @@ <api:name>a</api:name> </api:arg> </api:function> - </info> <title>Regress.TestObj.skip_return_val_no_out</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.TestObj, int) @returns(bool) def skip_return_val_no_out(self, a): # Python wrapper for regress_test_obj_skip_return_val_no_out() -</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>self</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> @@ -55,6 +47,4 @@ raise an error.</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.static_method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.static_method.page index 67510263..a3cbb876 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.static_method.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>x</api:name> </api:arg> </api:function> - </info> <title>Regress.TestObj.static_method</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(int) @returns(float) def static_method(x): # Python wrapper for regress_test_obj_static_method() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>x</code></title> @@ -46,6 +38,4 @@ def static_method(x): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.static_method_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.static_method_callback.page index 4d97f31f..e28dfaef 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.static_method_callback.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>callback</api:name> </api:arg> </api:function> - </info> <title>Regress.TestObj.static_method_callback</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.TestCallback) @returns(none) def static_method_callback(callback): # Python wrapper for regress_test_obj_static_method_callback() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>callback</code></title> @@ -42,6 +34,4 @@ def static_method_callback(callback): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.torture_signature_0.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.torture_signature_0.page index 4cc806d4..d1c75960 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.torture_signature_0.page +++ b/tests/scanner/Regress-1.0-Python-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,27 +41,20 @@ <api:name>m</api:name> </api:arg> </api:function> - </info> <title>Regress.TestObj.torture_signature_0</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.TestObj, int, float, int, unicode, int, int) @returns(none) def torture_signature_0(self, x, y, z, foo, q, m): # Python wrapper for regress_test_obj_torture_signature_0() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>self</code></title> -<p>A <link xref="Regress.TestObj"/></p> + <p>A <link xref="Regress.TestObj"/></p> </item> <item> <title><code>x</code></title> @@ -90,6 +82,4 @@ def torture_signature_0(self, x, y, z, foo, q, m): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.torture_signature_1.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.torture_signature_1.page index 7ccc1327..2ab1ed78 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.torture_signature_1.page +++ b/tests/scanner/Regress-1.0-Python-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,27 +41,20 @@ <api:name>m</api:name> </api:arg> </api:function> - </info> <title>Regress.TestObj.torture_signature_1</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.TestObj, int, float, int, unicode, int, int) @returns(bool) def torture_signature_1(self, x, y, z, foo, q, m): # Python wrapper for regress_test_obj_torture_signature_1() -</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>self</code></title> -<p>A <link xref="Regress.TestObj"/></p> + <p>A <link xref="Regress.TestObj"/></p> </item> <item> <title><code>x</code></title> @@ -94,6 +86,4 @@ def torture_signature_1(self, x, y, z, foo, q, m): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestOtherError.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestOtherError.page index 858e58a8..f968c9ce 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestOtherError.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestOtherError.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="enum" type="guide"/> - + <link xref="index" group="enum" type="guide"/> </info> <title>Regress.TestOtherError</title> - - - - - - - - + + <terms> <item> <title><code>TestOtherError.CODE1</code></title> @@ -34,6 +26,4 @@ </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestOtherError.quark.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestOtherError.quark.page index 341e774e..6982f70c 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestOtherError.quark.page +++ b/tests/scanner/Regress-1.0-Python-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,22 +13,15 @@ </api:returns> <api:name>regress_test_unconventional_error_quark</api:name> </api:function> - </info> - <title>Index.quark</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.quark</title> + <synopsis><code mime="text/x-python"> @returns(GLib.Quark) def quark(): # Python wrapper for regress_test_unconventional_error_quark() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ def quark(): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestPrivateEnum.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestPrivateEnum.page index 66b477d2..0cf17c13 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestPrivateEnum.page +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.TestPrivateStruct-this_is_public_after.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestPrivateStruct-this_is_public_after.page new file mode 100644 index 00000000..843ed306 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.TestPrivateStruct-this_is_public_before.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestPrivateStruct-this_is_public_before.page new file mode 100644 index 00000000..84a6ecaa --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.TestPrivateStruct.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestPrivateStruct.page index 7b1309da..d5ea6d0f 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestPrivateStruct.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestPrivateStruct.page @@ -1,25 +1,40 @@ <?xml version="1.0"?> <page id="Regress.TestPrivateStruct" type="guide" - style="record" + 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> - - - - - - - - - - - + <synopsis><code> +from gi.repository import Regress + +test_private_struct = Regress.TestPrivateStruct() + </code></synopsis> + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + 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-Python-expected/Regress.TestReferenceEnum.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestReferenceEnum.page index 2c8b1abb..afda5f30 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestReferenceEnum.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestReferenceEnum.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="enum" type="guide"/> - + <link xref="index" group="enum" type="guide"/> </info> <title>Regress.TestReferenceEnum</title> - - - - - - - - + + <terms> <item> <title><code>TestReferenceEnum.0</code></title> @@ -46,6 +38,4 @@ </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA-some_double.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA-some_double.page new file mode 100644 index 00000000..61e43036 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.TestSimpleBoxedA-some_enum.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA-some_enum.page new file mode 100644 index 00000000..c31c20db --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.TestSimpleBoxedA-some_int.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA-some_int.page new file mode 100644 index 00000000..aad211d6 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.TestSimpleBoxedA-some_int8.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA-some_int8.page new file mode 100644 index 00000000..349c0afa --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.TestSimpleBoxedA.const_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.const_return.page index 499a0475..2b7ee6a0 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.const_return.page +++ b/tests/scanner/Regress-1.0-Python-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,22 +13,15 @@ </api:returns> <api:name>regress_test_simple_boxed_a_const_return</api:name> </api:function> - </info> <title>Regress.TestSimpleBoxedA.const_return</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @returns(Regress.TestSimpleBoxedA) def const_return(): # Python wrapper for regress_test_simple_boxed_a_const_return() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ def const_return(): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.copy.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.copy.page index 5e3fc24d..62a3467c 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.copy.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>self</api:name> </api:arg> </api:function> - </info> <title>Regress.TestSimpleBoxedA.copy</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.TestSimpleBoxedA) @returns(Regress.TestSimpleBoxedA) def copy(self): # Python wrapper for regress_test_simple_boxed_a_copy() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>self</code></title> @@ -46,6 +38,4 @@ def copy(self): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.equals.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.equals.page index a9ae5b2f..caebbf8d 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.equals.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +21,16 @@ <api:name>other_a</api:name> </api:arg> </api:function> - </info> <title>Regress.TestSimpleBoxedA.equals</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.TestSimpleBoxedA, Regress.TestSimpleBoxedA) @returns(bool) def equals(self, other_a): # Python wrapper for regress_test_simple_boxed_a_equals() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>self</code></title> @@ -54,6 +46,4 @@ def equals(self, other_a): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.page index 9117ddb9..a758ab61 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.page @@ -1,25 +1,40 @@ <?xml version="1.0"?> <page id="Regress.TestSimpleBoxedA" type="guide" - style="record" + 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> - - - - - - - - - - - + <synopsis><code> +from gi.repository import Regress + +test_simple_boxed_a = Regress.TestSimpleBoxedA() + </code></synopsis> + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + 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-Python-expected/Regress.TestSimpleBoxedB-nested_a.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedB-nested_a.page new file mode 100644 index 00000000..60142795 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.TestSimpleBoxedB-some_int8.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedB-some_int8.page new file mode 100644 index 00000000..8c8b86db --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.TestSimpleBoxedB.copy.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedB.copy.page index 999c8500..feae1ab9 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedB.copy.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>self</api:name> </api:arg> </api:function> - </info> <title>Regress.TestSimpleBoxedB.copy</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.TestSimpleBoxedB) @returns(Regress.TestSimpleBoxedB) def copy(self): # Python wrapper for regress_test_simple_boxed_b_copy() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>self</code></title> @@ -46,6 +38,4 @@ def copy(self): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedB.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedB.page index 7ecc623e..5201ea68 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedB.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedB.page @@ -1,25 +1,40 @@ <?xml version="1.0"?> <page id="Regress.TestSimpleBoxedB" type="guide" - style="record" + 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> - - - - - - - - - - - + <synopsis><code> +from gi.repository import Regress + +test_simple_boxed_b = Regress.TestSimpleBoxedB() + </code></synopsis> + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + 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-Python-expected/Regress.TestSimpleCallback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleCallback.page index f8157820..da812bbe 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleCallback.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleCallback.page @@ -1,25 +1,21 @@ <?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"/> - + <link xref="index" group="callback" type="guide"/> </info> <title>Regress.TestSimpleCallback</title> - - - - - - - - - - - + <synopsis><code mime="text/x-python"> +@returns(none) +def on_TestSimpleCallback(): + </code></synopsis> + + +<terms> +</terms> + </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA-some_double.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA-some_double.page new file mode 100644 index 00000000..6cc61103 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.TestStructA-some_enum.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA-some_enum.page new file mode 100644 index 00000000..1fc8f312 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.TestStructA-some_int.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA-some_int.page new file mode 100644 index 00000000..b3e1d840 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.TestStructA-some_int8.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA-some_int8.page new file mode 100644 index 00000000..cdfd2a9d --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.TestStructA.clone.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.clone.page index cb2ea92f..a849bfbf 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.clone.page +++ b/tests/scanner/Regress-1.0-Python-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,34 +21,25 @@ <api:name>a_out</api:name> </api:arg> </api:function> - </info> <title>Regress.TestStructA.clone</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.TestStructA, Regress.TestStructA) @returns(none) def clone(self, a_out): # Python wrapper for regress_test_struct_a_clone() -</code></synopsis> + </code></synopsis> + <p>Make a copy of a RegressTestStructA</p> - - <p>Make a copy of a RegressTestStructA</p> - - - - <terms> <item> <title><code>self</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> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.page index a6a98173..09740177 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.page @@ -1,25 +1,40 @@ <?xml version="1.0"?> <page id="Regress.TestStructA" type="guide" - style="record" + 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> - - - - - - - - - - - + <synopsis><code> +from gi.repository import Regress + +test_struct_a = Regress.TestStructA() + </code></synopsis> + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + 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-Python-expected/Regress.TestStructA.parse.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.parse.page index bfd3189d..42bade9a 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.parse.page +++ b/tests/scanner/Regress-1.0-Python-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,34 +21,25 @@ <api:name>string</api:name> </api:arg> </api:function> - </info> <title>Regress.TestStructA.parse</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.TestStructA, unicode) @returns(none) def parse(a_out, string): # Python wrapper for regress_test_struct_a_parse() -</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> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructB-nested_a.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructB-nested_a.page new file mode 100644 index 00000000..58645889 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.TestStructB-some_int8.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructB-some_int8.page new file mode 100644 index 00000000..d7e90d7e --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.TestStructB.clone.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructB.clone.page index ea78efdb..3ddabd66 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructB.clone.page +++ b/tests/scanner/Regress-1.0-Python-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,34 +21,25 @@ <api:name>b_out</api:name> </api:arg> </api:function> - </info> <title>Regress.TestStructB.clone</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.TestStructB, Regress.TestStructB) @returns(none) def clone(self, b_out): # Python wrapper for regress_test_struct_b_clone() -</code></synopsis> + </code></synopsis> + <p>Make a copy of a RegressTestStructB</p> - - <p>Make a copy of a RegressTestStructB</p> - - - - <terms> <item> <title><code>self</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> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructB.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructB.page index 21d86261..df4a2879 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructB.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructB.page @@ -1,25 +1,40 @@ <?xml version="1.0"?> <page id="Regress.TestStructB" type="guide" - style="record" + 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> - - - - - - - - - - - + <synopsis><code> +from gi.repository import Regress + +test_struct_b = Regress.TestStructB() + </code></synopsis> + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + 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-Python-expected/Regress.TestStructC-another_int.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructC-another_int.page new file mode 100644 index 00000000..9d3e2229 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.TestStructC-obj.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructC-obj.page new file mode 100644 index 00000000..ecf3c25a --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.TestStructC.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructC.page index 6bd58122..89036d2e 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructC.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructC.page @@ -1,25 +1,40 @@ <?xml version="1.0"?> <page id="Regress.TestStructC" type="guide" - style="record" + 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> - - - - - - - - - - - + <synopsis><code> +from gi.repository import Regress + +test_struct_c = Regress.TestStructC() + </code></synopsis> + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + 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-Python-expected/Regress.TestStructD-array1.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructD-array1.page new file mode 100644 index 00000000..6e8cf239 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.TestStructD-array2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructD-array2.page new file mode 100644 index 00000000..93995fe3 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.TestStructD-field.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructD-field.page new file mode 100644 index 00000000..e46d5da4 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.TestStructD-garray.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructD-garray.page new file mode 100644 index 00000000..39adf11b --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.TestStructD-list.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructD-list.page new file mode 100644 index 00000000..26010515 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.TestStructD.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructD.page index aa9f131c..64c8105f 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructD.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructD.page @@ -1,25 +1,40 @@ <?xml version="1.0"?> <page id="Regress.TestStructD" type="guide" - style="record" + 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> - - - - - - - - - - - + <synopsis><code> +from gi.repository import Regress + +test_struct_d = Regress.TestStructD() + </code></synopsis> + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + 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-Python-expected/Regress.TestStructE-some_type.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE-some_type.page new file mode 100644 index 00000000..ea61037e --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.TestStructE-some_union.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE-some_union.page new file mode 100644 index 00000000..fda8d2af --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.TestStructE.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE.page index b931c367..8726b95f 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE.page @@ -1,25 +1,40 @@ <?xml version="1.0"?> <page id="Regress.TestStructE" type="guide" - style="record" + 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> - - - - - - - - - - - + <synopsis><code> +from gi.repository import Regress + +test_struct_e = Regress.TestStructE() + </code></synopsis> + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + 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-Python-expected/Regress.TestStructE__some_union__union-v_double.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union-v_double.page new file mode 100644 index 00000000..d80e7792 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.TestStructE__some_union__union-v_float.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union-v_float.page new file mode 100644 index 00000000..30d61262 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.TestStructE__some_union__union-v_int.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union-v_int.page new file mode 100644 index 00000000..487a6c59 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.TestStructE__some_union__union-v_int64.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union-v_int64.page new file mode 100644 index 00000000..fbe75bfd --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.TestStructE__some_union__union-v_long.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union-v_long.page new file mode 100644 index 00000000..a909fa86 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.TestStructE__some_union__union-v_pointer.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union-v_pointer.page new file mode 100644 index 00000000..8dca96cf --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.TestStructE__some_union__union-v_uint.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union-v_uint.page new file mode 100644 index 00000000..61d30a22 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.TestStructE__some_union__union-v_uint64.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union-v_uint64.page new file mode 100644 index 00000000..360e1e9d --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.TestStructE__some_union__union-v_ulong.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union-v_ulong.page new file mode 100644 index 00000000..117b95f2 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.TestStructE__some_union__union.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union.page index 3b81e621..f2d50b0a 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union.page @@ -1,25 +1,40 @@ <?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> - - - - - - - - - - - + <synopsis><code> +from gi.repository import Regress + +test_struct_e__some_union__union = Regress.TestStructE__some_union__union() + </code></synopsis> + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + 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-Python-expected/Regress.TestStructF-data1.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF-data1.page new file mode 100644 index 00000000..5d424ad9 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.TestStructF-data2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF-data2.page new file mode 100644 index 00000000..b03800ee --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.TestStructF-data3.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF-data3.page new file mode 100644 index 00000000..e25e7122 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.TestStructF-data4.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF-data4.page new file mode 100644 index 00000000..ceedf9d2 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.TestStructF-data5.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF-data5.page new file mode 100644 index 00000000..d239488e --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.TestStructF-data6.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF-data6.page new file mode 100644 index 00000000..09d72151 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.TestStructF-ref_count.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF-ref_count.page new file mode 100644 index 00000000..98fad0be --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.TestStructF.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF.page index cfb434b4..42be286c 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF.page @@ -1,25 +1,40 @@ <?xml version="1.0"?> <page id="Regress.TestStructF" type="guide" - style="record" + 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> - - - - - - - - - - - + <synopsis><code> +from gi.repository import Regress + +test_struct_f = Regress.TestStructF() + </code></synopsis> + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + 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-Python-expected/Regress.TestStructFixedArray-array.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructFixedArray-array.page new file mode 100644 index 00000000..fb214ce6 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.TestStructFixedArray-just_int.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructFixedArray-just_int.page new file mode 100644 index 00000000..0c8a5943 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.TestStructFixedArray.frob.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructFixedArray.frob.page index 8f9e2888..ed2f4602 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructFixedArray.frob.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>self</api:name> </api:arg> </api:function> - </info> <title>Regress.TestStructFixedArray.frob</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.TestStructFixedArray) @returns(none) def frob(self): # Python wrapper for regress_test_struct_fixed_array_frob() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>self</code></title> @@ -42,6 +34,4 @@ def frob(self): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructFixedArray.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructFixedArray.page index db6e7893..61dcf2cf 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructFixedArray.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructFixedArray.page @@ -1,25 +1,40 @@ <?xml version="1.0"?> <page id="Regress.TestStructFixedArray" type="guide" - style="record" + 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> - - - - - - - - - - - + <synopsis><code> +from gi.repository import Regress + +test_struct_fixed_array = Regress.TestStructFixedArray() + </code></synopsis> + + + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="method" style="linklist"> + <title>Methods</title> + </links> + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + 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-Python-expected/Regress.TestSubObj-parent_instance.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj-parent_instance.page new file mode 100644 index 00000000..15b87da0 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.TestSubObj.instance_method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.instance_method.page index 9806d282..09872dc2 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.instance_method.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>self</api:name> </api:arg> </api:function> - </info> <title>Regress.TestSubObj.instance_method</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.TestSubObj) @returns(int) def instance_method(self): # Python wrapper for regress_test_sub_obj_instance_method() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>self</code></title> @@ -46,6 +38,4 @@ def instance_method(self): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.page index b1dc19b1..da1c0db4 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.page @@ -6,23 +6,16 @@ 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><code> from gi.repository import Regress -test_sub_obj = Regress.TestSubObj() </code></synopsis> +test_sub_obj = Regress.TestSubObj() + </code></synopsis> + - - - - - - <synopsis> <title>Hierarchy</title> <tree> @@ -37,8 +30,11 @@ test_sub_obj = Regress.TestSubObj() </code></synopsis> </item> </tree> </synopsis> - - + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> <links type="topic" ui:expanded="true" api:type="function" api:mime="text/python" groups="method" style="linklist"> @@ -47,7 +43,7 @@ test_sub_obj = Regress.TestSubObj() </code></synopsis> <links type="topic" ui:expanded="true" api:type="function" api:mime="text/python" 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> @@ -58,8 +54,10 @@ test_sub_obj = Regress.TestSubObj() </code></synopsis> <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-Python-expected/Regress.TestSubObj.unset_bare.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.unset_bare.page index 2b548390..c5c1a131 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.unset_bare.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>self</api:name> </api:arg> </api:function> - </info> <title>Regress.TestSubObj.unset_bare</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.TestSubObj) @returns(none) def unset_bare(self): # Python wrapper for regress_test_sub_obj_unset_bare() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>self</code></title> @@ -42,6 +34,4 @@ def unset_bare(self): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestTypeGUInt64.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestTypeGUInt64.page index e0a7bc09..fcb2f3b4 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestTypeGUInt64.page +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.TestWi8021x-parent_instance.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x-parent_instance.page new file mode 100644 index 00000000..7bdb8c1d --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.TestWi8021x-testbool.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x-testbool.page index 00c168bc..8f9603da 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x-testbool.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x-testbool.page @@ -6,24 +6,13 @@ 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> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> "testbool" bool : Read / Write -</code></synopsis> + </code></synopsis> + - - - - - - - - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.get_testbool.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.get_testbool.page index cd83b9da..17049bc5 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.get_testbool.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>self</api:name> </api:arg> </api:function> - </info> <title>Regress.TestWi8021x.get_testbool</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.TestWi8021x) @returns(bool) def get_testbool(self): # Python wrapper for regress_test_wi_802_1x_get_testbool() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>self</code></title> @@ -46,6 +38,4 @@ def get_testbool(self): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.page index aef03874..8b8bf05a 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.page @@ -6,23 +6,16 @@ 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><code> from gi.repository import Regress -test_wi8021x = Regress.TestWi8021x(<link xref='Regress.TestWi8021x-testbool'>testbool</link>=value) </code></synopsis> +test_wi8021x = Regress.TestWi8021x(<link xref='Regress.TestWi8021x-testbool'>testbool</link>=value) + </code></synopsis> + - - - - - - <synopsis> <title>Hierarchy</title> <tree> @@ -34,8 +27,11 @@ test_wi8021x = Regress.TestWi8021x(<link xref='Regress.TestWi8021x-testbool'>tes </item> </tree> </synopsis> - - + <links type="topic" ui:expanded="true" + api:type="function" api:mime="text/python" + groups="constructor" style="linklist"> + <title>Constructors</title> + </links> <links type="topic" ui:expanded="true" api:type="function" api:mime="text/python" groups="method" style="linklist"> @@ -44,7 +40,7 @@ test_wi8021x = Regress.TestWi8021x(<link xref='Regress.TestWi8021x-testbool'>tes <links type="topic" ui:expanded="true" api:type="function" api:mime="text/python" 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> @@ -55,8 +51,10 @@ test_wi8021x = Regress.TestWi8021x(<link xref='Regress.TestWi8021x-testbool'>tes <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-Python-expected/Regress.TestWi8021x.set_testbool.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.set_testbool.page index 59dbbd94..19b2ec5d 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.set_testbool.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +21,16 @@ <api:name>v</api:name> </api:arg> </api:function> - </info> <title>Regress.TestWi8021x.set_testbool</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(Regress.TestWi8021x, bool) @returns(none) def set_testbool(self, v): # Python wrapper for regress_test_wi_802_1x_set_testbool() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>self</code></title> @@ -50,6 +42,4 @@ def set_testbool(self, v): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.static_method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.static_method.page index d2d83e36..635b57f5 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.static_method.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>x</api:name> </api:arg> </api:function> - </info> <title>Regress.TestWi8021x.static_method</title> - -<synopsis><code mime="text/x-python"> + <synopsis><code mime="text/x-python"> @accepts(int) @returns(int) def static_method(x): # Python wrapper for regress_test_wi_802_1x_static_method() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>x</code></title> @@ -46,6 +38,4 @@ def static_method(x): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.UTF8_CONSTANT.page b/tests/scanner/Regress-1.0-Python-expected/Regress.UTF8_CONSTANT.page new file mode 100644 index 00000000..343ad002 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-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-Python-expected/Regress.aliased_caller_alloc.page b/tests/scanner/Regress-1.0-Python-expected/Regress.aliased_caller_alloc.page index e210a976..046658d0 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.aliased_caller_alloc.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>boxed</api:name> </api:arg> </api:function> - </info> - <title>Index.aliased_caller_alloc</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.aliased_caller_alloc</title> + <synopsis><code mime="text/x-python"> @accepts(Regress.AliasedTestBoxed) @returns(none) def aliased_caller_alloc(boxed): # Python wrapper for regress_aliased_caller_alloc() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>boxed</code></title> @@ -42,6 +34,4 @@ def aliased_caller_alloc(boxed): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_attribute_func.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_attribute_func.page index edee18bf..d5b73370 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_attribute_func.page +++ b/tests/scanner/Regress-1.0-Python-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,31 +21,24 @@ <api:name>data</api:name> </api:arg> </api:function> - </info> - <title>Index.annotation_attribute_func</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.annotation_attribute_func</title> + <synopsis><code mime="text/x-python"> @accepts(Regress.AnnotationObject, unicode) @returns(int) def annotation_attribute_func(object, data): # Python wrapper for regress_annotation_attribute_func() -</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> @@ -54,6 +46,4 @@ def annotation_attribute_func(object, data): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_custom_destroy.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_custom_destroy.page index 860107f1..2883312e 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_custom_destroy.page +++ b/tests/scanner/Regress-1.0-Python-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,28 +25,21 @@ <api:name>data</api:name> </api:arg> </api:function> - </info> - <title>Index.annotation_custom_destroy</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.annotation_custom_destroy</title> + <synopsis><code mime="text/x-python"> @accepts(Regress.AnnotationCallback, Regress.AnnotationNotifyFunc, gpointer) @returns(none) def annotation_custom_destroy(callback, destroy, data): # Python wrapper for regress_annotation_custom_destroy() -</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> @@ -59,6 +51,4 @@ detection, and fixing it via annotations.</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_get_source_file.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_get_source_file.page index 51a2ce47..c3fced40 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_get_source_file.page +++ b/tests/scanner/Regress-1.0-Python-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,22 +13,15 @@ </api:returns> <api:name>regress_annotation_get_source_file</api:name> </api:function> - </info> - <title>Index.annotation_get_source_file</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.annotation_get_source_file</title> + <synopsis><code mime="text/x-python"> @returns(filename) def annotation_get_source_file(): # Python wrapper for regress_annotation_get_source_file() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ def annotation_get_source_file(): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_init.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_init.page index 16c7ebd8..b87747a1 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_init.page +++ b/tests/scanner/Regress-1.0-Python-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,34 +21,25 @@ <api:name>argv</api:name> </api:arg> </api:function> - </info> - <title>Index.annotation_init</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.annotation_init</title> + <synopsis><code mime="text/x-python"> @accepts(int, [unicode]) @returns(none) def annotation_init(argc, argv): # Python wrapper for regress_annotation_init() -</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> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_invalid_regress_annotation.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_invalid_regress_annotation.page index 58701043..e64d0ee3 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_invalid_regress_annotation.page +++ b/tests/scanner/Regress-1.0-Python-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,30 +17,21 @@ <api:name>foo</api:name> </api:arg> </api:function> - </info> - <title>Index.annotation_invalid_regress_annotation</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.annotation_invalid_regress_annotation</title> + <synopsis><code mime="text/x-python"> @accepts(int) @returns(none) def annotation_invalid_regress_annotation(foo): # Python wrapper for regress_annotation_invalid_regress_annotation() -</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> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_ptr_array.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_ptr_array.page index 62cfbf7b..2a09bdc5 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_ptr_array.page +++ b/tests/scanner/Regress-1.0-Python-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,30 +17,21 @@ <api:name>array</api:name> </api:arg> </api:function> - </info> - <title>Index.annotation_ptr_array</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.annotation_ptr_array</title> + <synopsis><code mime="text/x-python"> @accepts([GObject.Value]) @returns(none) def annotation_ptr_array(array): # Python wrapper for regress_annotation_ptr_array() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>array</code></title> -<p>the array</p> + <p>the array</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_return_array.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_return_array.page index fa1908d1..374b21bc 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_return_array.page +++ b/tests/scanner/Regress-1.0-Python-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,27 +17,20 @@ <api:name>length</api:name> </api:arg> </api:function> - </info> - <title>Index.annotation_return_array</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.annotation_return_array</title> + <synopsis><code mime="text/x-python"> @accepts(int) @returns([unicode]) def annotation_return_array(length): # Python wrapper for regress_annotation_return_array() -</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> @@ -46,6 +38,4 @@ def annotation_return_array(length): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_return_filename.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_return_filename.page index 4cbc4dbe..2cf6fef2 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_return_filename.page +++ b/tests/scanner/Regress-1.0-Python-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,22 +13,15 @@ </api:returns> <api:name>regress_annotation_return_filename</api:name> </api:function> - </info> - <title>Index.annotation_return_filename</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.annotation_return_filename</title> + <synopsis><code mime="text/x-python"> @returns(filename) def annotation_return_filename(): # Python wrapper for regress_annotation_return_filename() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ def annotation_return_filename(): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_set_source_file.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_set_source_file.page index 6eb6e853..7da10603 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_set_source_file.page +++ b/tests/scanner/Regress-1.0-Python-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,30 +17,21 @@ <api:name>fname</api:name> </api:arg> </api:function> - </info> - <title>Index.annotation_set_source_file</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.annotation_set_source_file</title> + <synopsis><code mime="text/x-python"> @accepts(filename) @returns(none) def annotation_set_source_file(fname): # Python wrapper for regress_annotation_set_source_file() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>fname</code></title> -<p>Source file</p> + <p>Source file</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_space_after_comment_bug631690.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_space_after_comment_bug631690.page index 00154848..86daca50 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_space_after_comment_bug631690.page +++ b/tests/scanner/Regress-1.0-Python-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,25 +13,16 @@ </api:returns> <api:name>regress_annotation_space_after_comment_bug631690</api:name> </api:function> - </info> - <title>Index.annotation_space_after_comment_bug631690</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.annotation_space_after_comment_bug631690</title> + <synopsis><code mime="text/x-python"> @returns(none) def annotation_space_after_comment_bug631690(): # Python wrapper for regress_annotation_space_after_comment_bug631690() -</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> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_array_length.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_array_length.page index c7d24096..9e3c8232 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_array_length.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +21,16 @@ <api:name>properties</api:name> </api:arg> </api:function> - </info> - <title>Index.annotation_string_array_length</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.annotation_string_array_length</title> + <synopsis><code mime="text/x-python"> @accepts(int, [unicode]) @returns(none) def annotation_string_array_length(n_properties, properties): # Python wrapper for regress_annotation_string_array_length() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>n_properties</code></title> @@ -50,6 +42,4 @@ def annotation_string_array_length(n_properties, properties): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_zero_terminated.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_zero_terminated.page index 765658c0..24ac475e 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_zero_terminated.page +++ b/tests/scanner/Regress-1.0-Python-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,22 +13,15 @@ </api:returns> <api:name>regress_annotation_string_zero_terminated</api:name> </api:function> - </info> - <title>Index.annotation_string_zero_terminated</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.annotation_string_zero_terminated</title> + <synopsis><code mime="text/x-python"> @returns([unicode]) def annotation_string_zero_terminated(): # Python wrapper for regress_annotation_string_zero_terminated() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ def annotation_string_zero_terminated(): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_zero_terminated_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_zero_terminated_out.page index 1a9e2a42..a5fcc99f 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_zero_terminated_out.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>out</api:name> </api:arg> </api:function> - </info> - <title>Index.annotation_string_zero_terminated_out</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.annotation_string_zero_terminated_out</title> + <synopsis><code mime="text/x-python"> @accepts([unicode]) @returns(none) def annotation_string_zero_terminated_out(out): # Python wrapper for regress_annotation_string_zero_terminated_out() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>out</code></title> @@ -42,6 +34,4 @@ def annotation_string_zero_terminated_out(out): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_test_parsing_bug630862.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_test_parsing_bug630862.page index 868c2d84..f247ad4a 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_test_parsing_bug630862.page +++ b/tests/scanner/Regress-1.0-Python-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,22 +13,15 @@ </api:returns> <api:name>regress_annotation_test_parsing_bug630862</api:name> </api:function> - </info> - <title>Index.annotation_test_parsing_bug630862</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.annotation_test_parsing_bug630862</title> + <synopsis><code mime="text/x-python"> @returns(GObject.Object) def annotation_test_parsing_bug630862(): # Python wrapper for regress_annotation_test_parsing_bug630862() -</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> @@ -37,6 +29,4 @@ def annotation_test_parsing_bug630862(): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_transfer_floating.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_transfer_floating.page index 223d1a2b..f8f68c11 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_transfer_floating.page +++ b/tests/scanner/Regress-1.0-Python-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,22 +13,15 @@ </api:returns> <api:name>regress_annotation_transfer_floating</api:name> </api:function> - </info> - <title>Index.annotation_transfer_floating</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.annotation_transfer_floating</title> + <synopsis><code mime="text/x-python"> @returns(GObject.Object) def annotation_transfer_floating(): # Python wrapper for regress_annotation_transfer_floating() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ def annotation_transfer_floating(): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_versioned.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_versioned.page index 51d53cd8..6132e915 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_versioned.page +++ b/tests/scanner/Regress-1.0-Python-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,26 +13,16 @@ </api:returns> <api:name>regress_annotation_versioned</api:name> </api:function> - </info> - <title>Index.annotation_versioned</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.annotation_versioned</title> + <synopsis><code mime="text/x-python"> @returns(none) def annotation_versioned(): # Python wrapper for regress_annotation_versioned() -</code></synopsis> + </code></synopsis> - - - - - <p>Since 0.6</p> - - + <p>Since 0.6</p> <terms> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.atest_error_quark.page b/tests/scanner/Regress-1.0-Python-expected/Regress.atest_error_quark.page index 9adb4a8b..af23bfbc 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.atest_error_quark.page +++ b/tests/scanner/Regress-1.0-Python-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,22 +13,15 @@ </api:returns> <api:name>regress_atest_error_quark</api:name> </api:function> - </info> - <title>Index.atest_error_quark</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.atest_error_quark</title> + <synopsis><code mime="text/x-python"> @returns(GLib.Quark) def atest_error_quark(): # Python wrapper for regress_atest_error_quark() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ def atest_error_quark(): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_async_ready_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_async_ready_callback.page index b2c0a69a..3827a9c4 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_async_ready_callback.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +25,16 @@ <api:name>user_data</api:name> </api:arg> </api:function> - </info> - <title>Index.foo_async_ready_callback</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.foo_async_ready_callback</title> + <synopsis><code mime="text/x-python"> @accepts(Gio.Cancellable, Gio.AsyncReadyCallback, gpointer) @returns(none) def foo_async_ready_callback(cancellable, callback, user_data): # Python wrapper for regress_foo_async_ready_callback() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>cancellable</code></title> @@ -58,6 +50,4 @@ def foo_async_ready_callback(cancellable, callback, user_data): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_destroy_notify_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_destroy_notify_callback.page index 873beb20..c9101809 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_destroy_notify_callback.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +25,16 @@ <api:name>destroy</api:name> </api:arg> </api:function> - </info> - <title>Index.foo_destroy_notify_callback</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.foo_destroy_notify_callback</title> + <synopsis><code mime="text/x-python"> @accepts(Regress.FooCallback, gpointer, GLib.DestroyNotify) @returns(none) def foo_destroy_notify_callback(callback, data, destroy): # Python wrapper for regress_foo_destroy_notify_callback() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>callback</code></title> @@ -58,6 +50,4 @@ def foo_destroy_notify_callback(callback, data, destroy): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_init.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_init.page index 6b62ac46..9af9201e 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_init.page +++ b/tests/scanner/Regress-1.0-Python-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,22 +13,15 @@ </api:returns> <api:name>regress_foo_init</api:name> </api:function> - </info> - <title>Index.foo_init</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.foo_init</title> + <synopsis><code mime="text/x-python"> @returns(int) def foo_init(): # Python wrapper for regress_foo_init() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ def foo_init(): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_method_external_references.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_method_external_references.page index 4be81792..bc6c91f8 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_method_external_references.page +++ b/tests/scanner/Regress-1.0-Python-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>Index.foo_method_external_references</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.foo_method_external_references</title> + <synopsis><code mime="text/x-python"> @accepts(Utility.Object, Utility.EnumType, Utility.FlagType, Utility.Struct) @returns(none) def foo_method_external_references(object, e, f, s): # Python wrapper for regress_foo_method_external_references() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>object</code></title> @@ -66,6 +58,4 @@ def foo_method_external_references(object, e, f, s): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_not_a_constructor_new.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_not_a_constructor_new.page index 0f9ba11a..7559bea4 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_not_a_constructor_new.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +13,16 @@ </api:returns> <api:name>regress_foo_not_a_constructor_new</api:name> </api:function> - </info> - <title>Index.foo_not_a_constructor_new</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.foo_not_a_constructor_new</title> + <synopsis><code mime="text/x-python"> @returns(Regress.FooObject) def foo_not_a_constructor_new(): # Python wrapper for regress_foo_not_a_constructor_new() -</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> @@ -38,6 +30,4 @@ a "Can't find matching type for constructor" warning.</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_array.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_array.page index d8cdbf50..102747c5 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_array.page +++ b/tests/scanner/Regress-1.0-Python-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,22 +13,15 @@ </api:returns> <api:name>regress_foo_test_array</api:name> </api:function> - </info> - <title>Index.foo_test_array</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.foo_test_array</title> + <synopsis><code mime="text/x-python"> @returns([unicode]) def foo_test_array(): # Python wrapper for regress_foo_test_array() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ def foo_test_array(): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_char_param.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_char_param.page index fa7bc2e8..73a82be9 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_char_param.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>param</api:name> </api:arg> </api:function> - </info> - <title>Index.foo_test_const_char_param</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.foo_test_const_char_param</title> + <synopsis><code mime="text/x-python"> @accepts(unicode) @returns(none) def foo_test_const_char_param(param): # Python wrapper for regress_foo_test_const_char_param() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>param</code></title> @@ -42,6 +34,4 @@ def foo_test_const_char_param(param): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_char_retval.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_char_retval.page index 34ae3f9c..e1c7f87e 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_char_retval.page +++ b/tests/scanner/Regress-1.0-Python-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,22 +13,15 @@ </api:returns> <api:name>regress_foo_test_const_char_retval</api:name> </api:function> - </info> - <title>Index.foo_test_const_char_retval</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.foo_test_const_char_retval</title> + <synopsis><code mime="text/x-python"> @returns(unicode) def foo_test_const_char_retval(): # Python wrapper for regress_foo_test_const_char_retval() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ def foo_test_const_char_retval(): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_struct_param.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_struct_param.page index f32ff39e..75c2cc8f 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_struct_param.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>param</api:name> </api:arg> </api:function> - </info> - <title>Index.foo_test_const_struct_param</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.foo_test_const_struct_param</title> + <synopsis><code mime="text/x-python"> @accepts(Regress.FooStruct) @returns(none) def foo_test_const_struct_param(param): # Python wrapper for regress_foo_test_const_struct_param() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>param</code></title> @@ -42,6 +34,4 @@ def foo_test_const_struct_param(param): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_struct_retval.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_struct_retval.page index 24337f06..35e246af 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_struct_retval.page +++ b/tests/scanner/Regress-1.0-Python-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,22 +13,15 @@ </api:returns> <api:name>regress_foo_test_const_struct_retval</api:name> </api:function> - </info> - <title>Index.foo_test_const_struct_retval</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.foo_test_const_struct_retval</title> + <synopsis><code mime="text/x-python"> @returns(Regress.FooStruct) def foo_test_const_struct_retval(): # Python wrapper for regress_foo_test_const_struct_retval() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ def foo_test_const_struct_retval(): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_string_array.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_string_array.page index 8e242c5a..16f72c25 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_string_array.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>array</api:name> </api:arg> </api:function> - </info> - <title>Index.foo_test_string_array</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.foo_test_string_array</title> + <synopsis><code mime="text/x-python"> @accepts([unicode]) @returns(none) def foo_test_string_array(array): # Python wrapper for regress_foo_test_string_array() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>array</code></title> @@ -42,6 +34,4 @@ def foo_test_string_array(array): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_string_array_with_g.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_string_array_with_g.page index 92752bf4..e2dfd8b9 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_string_array_with_g.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>array</api:name> </api:arg> </api:function> - </info> - <title>Index.foo_test_string_array_with_g</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.foo_test_string_array_with_g</title> + <synopsis><code mime="text/x-python"> @accepts([unicode]) @returns(none) def foo_test_string_array_with_g(array): # Python wrapper for regress_foo_test_string_array_with_g() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>array</code></title> @@ -42,6 +34,4 @@ def foo_test_string_array_with_g(array): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_unsigned_qualifier.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_unsigned_qualifier.page index 2006eaef..48559b9c 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_unsigned_qualifier.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>unsigned_param</api:name> </api:arg> </api:function> - </info> - <title>Index.foo_test_unsigned_qualifier</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.foo_test_unsigned_qualifier</title> + <synopsis><code mime="text/x-python"> @accepts(int) @returns(none) def foo_test_unsigned_qualifier(unsigned_param): # Python wrapper for regress_foo_test_unsigned_qualifier() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>unsigned_param</code></title> @@ -42,6 +34,4 @@ def foo_test_unsigned_qualifier(unsigned_param): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_unsigned_type.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_unsigned_type.page index c32efe88..c3eafeb9 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_unsigned_type.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>unsigned_param</api:name> </api:arg> </api:function> - </info> - <title>Index.foo_test_unsigned_type</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.foo_test_unsigned_type</title> + <synopsis><code mime="text/x-python"> @accepts(int) @returns(none) def foo_test_unsigned_type(unsigned_param): # Python wrapper for regress_foo_test_unsigned_type() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>unsigned_param</code></title> @@ -42,6 +34,4 @@ def foo_test_unsigned_type(unsigned_param): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.func_obj_null_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.func_obj_null_in.page index 1e737c0f..58571ed5 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.func_obj_null_in.page +++ b/tests/scanner/Regress-1.0-Python-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,30 +17,21 @@ <api:name>obj</api:name> </api:arg> </api:function> - </info> - <title>Index.func_obj_null_in</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.func_obj_null_in</title> + <synopsis><code mime="text/x-python"> @accepts(Regress.TestObj) @returns(none) def func_obj_null_in(obj): # Python wrapper for regress_func_obj_null_in() -</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> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.global_get_flags_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.global_get_flags_out.page index 825fe351..a01a0685 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.global_get_flags_out.page +++ b/tests/scanner/Regress-1.0-Python-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,30 +17,21 @@ <api:name>v</api:name> </api:arg> </api:function> - </info> - <title>Index.global_get_flags_out</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.global_get_flags_out</title> + <synopsis><code mime="text/x-python"> @accepts(Regress.TestFlags) @returns(none) def global_get_flags_out(v): # Python wrapper for regress_global_get_flags_out() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>v</code></title> -<p>A flags value</p> + <p>A flags value</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.has_parameter_named_attrs.page b/tests/scanner/Regress-1.0-Python-expected/Regress.has_parameter_named_attrs.page index 51ae15f7..bc4cd70c 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.has_parameter_named_attrs.page +++ b/tests/scanner/Regress-1.0-Python-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,35 +21,26 @@ <api:name>attributes</api:name> </api:arg> </api:function> - </info> - <title>Index.has_parameter_named_attrs</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.has_parameter_named_attrs</title> + <synopsis><code mime="text/x-python"> @accepts(int, [guint32]) @returns(none) def has_parameter_named_attrs(foo, attributes): # Python wrapper for regress_has_parameter_named_attrs() -</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> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.introspectable_via_alias.page b/tests/scanner/Regress-1.0-Python-expected/Regress.introspectable_via_alias.page index 9fc5a47c..121f4a38 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.introspectable_via_alias.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>data</api:name> </api:arg> </api:function> - </info> - <title>Index.introspectable_via_alias</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.introspectable_via_alias</title> + <synopsis><code mime="text/x-python"> @accepts(Regress.PtrArrayAlias) @returns(none) def introspectable_via_alias(data): # Python wrapper for regress_introspectable_via_alias() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>data</code></title> @@ -42,6 +34,4 @@ def introspectable_via_alias(data): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.set_abort_on_error.page b/tests/scanner/Regress-1.0-Python-expected/Regress.set_abort_on_error.page index ad81bff0..6e2d6e63 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.set_abort_on_error.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>abort_on_error</api:name> </api:arg> </api:function> - </info> - <title>Index.set_abort_on_error</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.set_abort_on_error</title> + <synopsis><code mime="text/x-python"> @accepts(bool) @returns(none) def set_abort_on_error(abort_on_error): # Python wrapper for regress_set_abort_on_error() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>abort_on_error</code></title> @@ -42,6 +34,4 @@ def set_abort_on_error(abort_on_error): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_callback.page index 536a02cd..c47120e0 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_callback.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>callback</api:name> </api:arg> </api:function> - </info> - <title>Index.test_array_callback</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_array_callback</title> + <synopsis><code mime="text/x-python"> @accepts(Regress.TestCallbackArray) @returns(int) def test_array_callback(callback): # Python wrapper for regress_test_array_callback() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>callback</code></title> @@ -46,6 +38,4 @@ def test_array_callback(callback): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_out_objects.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_out_objects.page index 26ddf0ca..f00d8a2e 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_out_objects.page +++ b/tests/scanner/Regress-1.0-Python-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,30 +17,21 @@ <api:name>objs</api:name> </api:arg> </api:function> - </info> - <title>Index.test_array_fixed_out_objects</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_array_fixed_out_objects</title> + <synopsis><code mime="text/x-python"> @accepts([Regress.TestObj]) @returns(none) def test_array_fixed_out_objects(objs): # Python wrapper for regress_test_array_fixed_out_objects() -</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> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_in.page index eb816b81..a1986cf7 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_in.page +++ b/tests/scanner/Regress-1.0-Python-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,27 +17,20 @@ <api:name>ints</api:name> </api:arg> </api:function> - </info> - <title>Index.test_array_fixed_size_int_in</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_array_fixed_size_int_in</title> + <synopsis><code mime="text/x-python"> @accepts([int]) @returns(int) def test_array_fixed_size_int_in(ints): # Python wrapper for regress_test_array_fixed_size_int_in() -</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> @@ -46,6 +38,4 @@ def test_array_fixed_size_int_in(ints): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_out.page index 39db1de3..768bcb7d 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_out.page +++ b/tests/scanner/Regress-1.0-Python-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,30 +17,21 @@ <api:name>ints</api:name> </api:arg> </api:function> - </info> - <title>Index.test_array_fixed_size_int_out</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_array_fixed_size_int_out</title> + <synopsis><code mime="text/x-python"> @accepts([int]) @returns(none) def test_array_fixed_size_int_out(ints): # Python wrapper for regress_test_array_fixed_size_int_out() -</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> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_return.page index 30cfee8d..afe87090 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_return.page +++ b/tests/scanner/Regress-1.0-Python-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,22 +13,15 @@ </api:returns> <api:name>regress_test_array_fixed_size_int_return</api:name> </api:function> - </info> - <title>Index.test_array_fixed_size_int_return</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_array_fixed_size_int_return</title> + <synopsis><code mime="text/x-python"> @returns([int]) def test_array_fixed_size_int_return(): # Python wrapper for regress_test_array_fixed_size_int_return() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ def test_array_fixed_size_int_return(): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint16_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint16_in.page index 62c1c4c5..b50f4610 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint16_in.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +21,16 @@ <api:name>ints</api:name> </api:arg> </api:function> - </info> - <title>Index.test_array_gint16_in</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_array_gint16_in</title> + <synopsis><code mime="text/x-python"> @accepts(int, [gint16]) @returns(int) def test_array_gint16_in(n_ints, ints): # Python wrapper for regress_test_array_gint16_in() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>n_ints</code></title> @@ -46,7 +38,7 @@ def test_array_gint16_in(n_ints, 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> @@ -54,6 +46,4 @@ def test_array_gint16_in(n_ints, ints): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint32_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint32_in.page index 948b271b..b259d7ab 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint32_in.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +21,16 @@ <api:name>ints</api:name> </api:arg> </api:function> - </info> - <title>Index.test_array_gint32_in</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_array_gint32_in</title> + <synopsis><code mime="text/x-python"> @accepts(int, [gint32]) @returns(gint32) def test_array_gint32_in(n_ints, ints): # Python wrapper for regress_test_array_gint32_in() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>n_ints</code></title> @@ -46,7 +38,7 @@ def test_array_gint32_in(n_ints, 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> @@ -54,6 +46,4 @@ def test_array_gint32_in(n_ints, ints): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint64_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint64_in.page index 6756e0d0..2e5e313c 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint64_in.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +21,16 @@ <api:name>ints</api:name> </api:arg> </api:function> - </info> - <title>Index.test_array_gint64_in</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_array_gint64_in</title> + <synopsis><code mime="text/x-python"> @accepts(int, [int]) @returns(int) def test_array_gint64_in(n_ints, ints): # Python wrapper for regress_test_array_gint64_in() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>n_ints</code></title> @@ -46,7 +38,7 @@ def test_array_gint64_in(n_ints, 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> @@ -54,6 +46,4 @@ def test_array_gint64_in(n_ints, ints): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint8_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint8_in.page index a7d70018..4900dbe6 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint8_in.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +21,16 @@ <api:name>ints</api:name> </api:arg> </api:function> - </info> - <title>Index.test_array_gint8_in</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_array_gint8_in</title> + <synopsis><code mime="text/x-python"> @accepts(int, [gint8]) @returns(int) def test_array_gint8_in(n_ints, ints): # Python wrapper for regress_test_array_gint8_in() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>n_ints</code></title> @@ -46,7 +38,7 @@ def test_array_gint8_in(n_ints, 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> @@ -54,6 +46,4 @@ def test_array_gint8_in(n_ints, ints): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gtype_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gtype_in.page index e56b5223..42c53325 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gtype_in.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +21,16 @@ <api:name>types</api:name> </api:arg> </api:function> - </info> - <title>Index.test_array_gtype_in</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_array_gtype_in</title> + <synopsis><code mime="text/x-python"> @accepts(int, [GType]) @returns(unicode) def test_array_gtype_in(n_types, types): # Python wrapper for regress_test_array_gtype_in() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>n_types</code></title> @@ -46,7 +38,7 @@ def test_array_gtype_in(n_types, 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> @@ -54,6 +46,4 @@ def test_array_gtype_in(n_types, types): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_full_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_full_out.page index 42cbb0f8..87eb1a34 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_full_out.page +++ b/tests/scanner/Regress-1.0-Python-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,27 +17,20 @@ <api:name>len</api:name> </api:arg> </api:function> - </info> - <title>Index.test_array_int_full_out</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_array_int_full_out</title> + <synopsis><code mime="text/x-python"> @accepts(int) @returns([int]) def test_array_int_full_out(len): # Python wrapper for regress_test_array_int_full_out() -</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> @@ -46,6 +38,4 @@ def test_array_int_full_out(len): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_in.page index 8e706e8f..f3e27099 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_in.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +21,16 @@ <api:name>ints</api:name> </api:arg> </api:function> - </info> - <title>Index.test_array_int_in</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_array_int_in</title> + <synopsis><code mime="text/x-python"> @accepts(int, [int]) @returns(int) def test_array_int_in(n_ints, ints): # Python wrapper for regress_test_array_int_in() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>n_ints</code></title> @@ -46,7 +38,7 @@ def test_array_int_in(n_ints, 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> @@ -54,6 +46,4 @@ def test_array_int_in(n_ints, ints): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_inout.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_inout.page index b3f4448b..f52febae 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_inout.page +++ b/tests/scanner/Regress-1.0-Python-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,34 +21,25 @@ <api:name>ints</api:name> </api:arg> </api:function> - </info> - <title>Index.test_array_int_inout</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_array_int_inout</title> + <synopsis><code mime="text/x-python"> @accepts(int, [int]) @returns(none) def test_array_int_inout(n_ints, ints): # Python wrapper for regress_test_array_int_inout() -</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> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_none_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_none_out.page index 21e5bac0..7d47b82f 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_none_out.page +++ b/tests/scanner/Regress-1.0-Python-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,27 +17,20 @@ <api:name>len</api:name> </api:arg> </api:function> - </info> - <title>Index.test_array_int_none_out</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_array_int_none_out</title> + <synopsis><code mime="text/x-python"> @accepts(int) @returns([int]) def test_array_int_none_out(len): # Python wrapper for regress_test_array_int_none_out() -</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> @@ -46,6 +38,4 @@ def test_array_int_none_out(len): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_null_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_null_in.page index 9b3fc8b0..2383f04b 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_null_in.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +21,16 @@ <api:name>len</api:name> </api:arg> </api:function> - </info> - <title>Index.test_array_int_null_in</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_array_int_null_in</title> + <synopsis><code mime="text/x-python"> @accepts([int], int) @returns(none) def test_array_int_null_in(arr, len): # Python wrapper for regress_test_array_int_null_in() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>arr</code></title> @@ -46,10 +38,8 @@ def test_array_int_null_in(arr, len): </item> <item> <title><code>len</code></title> -<p>length</p> + <p>length</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_null_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_null_out.page index 5b83b30a..0ecf204f 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_null_out.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +21,16 @@ <api:name>len</api:name> </api:arg> </api:function> - </info> - <title>Index.test_array_int_null_out</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_array_int_null_out</title> + <synopsis><code mime="text/x-python"> @accepts([int], int) @returns(none) def test_array_int_null_out(arr, len): # Python wrapper for regress_test_array_int_null_out() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>arr</code></title> @@ -46,10 +38,8 @@ def test_array_int_null_out(arr, len): </item> <item> <title><code>len</code></title> -<p>length</p> + <p>length</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_out.page index b8f44411..8a766cde 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_out.page +++ b/tests/scanner/Regress-1.0-Python-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,34 +21,25 @@ <api:name>ints</api:name> </api:arg> </api:function> - </info> - <title>Index.test_array_int_out</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_array_int_out</title> + <synopsis><code mime="text/x-python"> @accepts(int, [int]) @returns(none) def test_array_int_out(n_ints, ints): # Python wrapper for regress_test_array_int_out() -</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> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_async_ready_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_async_ready_callback.page index 1dcf46cd..8001c871 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_async_ready_callback.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>callback</api:name> </api:arg> </api:function> - </info> - <title>Index.test_async_ready_callback</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_async_ready_callback</title> + <synopsis><code mime="text/x-python"> @accepts(Gio.AsyncReadyCallback) @returns(none) def test_async_ready_callback(callback): # Python wrapper for regress_test_async_ready_callback() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>callback</code></title> @@ -42,6 +34,4 @@ def test_async_ready_callback(callback): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean.page index 22d2ebfa..a3e12a8a 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> - <title>Index.test_boolean</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_boolean</title> + <synopsis><code mime="text/x-python"> @accepts(bool) @returns(bool) def test_boolean(in): # Python wrapper for regress_test_boolean() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -46,6 +38,4 @@ def test_boolean(in): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean_false.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean_false.page index 877f5820..7a3d352d 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean_false.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> - <title>Index.test_boolean_false</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_boolean_false</title> + <synopsis><code mime="text/x-python"> @accepts(bool) @returns(bool) def test_boolean_false(in): # Python wrapper for regress_test_boolean_false() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -46,6 +38,4 @@ def test_boolean_false(in): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean_true.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean_true.page index 3a1fc20a..983517c7 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean_true.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> - <title>Index.test_boolean_true</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_boolean_true</title> + <synopsis><code mime="text/x-python"> @accepts(bool) @returns(bool) def test_boolean_true(in): # Python wrapper for regress_test_boolean_true() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -46,6 +38,4 @@ def test_boolean_true(in): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_context_full_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_context_full_return.page index 4bf83f02..ea38b4ca 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_context_full_return.page +++ b/tests/scanner/Regress-1.0-Python-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,22 +13,15 @@ </api:returns> <api:name>regress_test_cairo_context_full_return</api:name> </api:function> - </info> - <title>Index.test_cairo_context_full_return</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_cairo_context_full_return</title> + <synopsis><code mime="text/x-python"> @returns(cairo.Context) def test_cairo_context_full_return(): # Python wrapper for regress_test_cairo_context_full_return() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ def test_cairo_context_full_return(): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_context_none_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_context_none_in.page index a30b8d27..860d5b93 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_context_none_in.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>context</api:name> </api:arg> </api:function> - </info> - <title>Index.test_cairo_context_none_in</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_cairo_context_none_in</title> + <synopsis><code mime="text/x-python"> @accepts(cairo.Context) @returns(none) def test_cairo_context_none_in(context): # Python wrapper for regress_test_cairo_context_none_in() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>context</code></title> @@ -42,6 +34,4 @@ def test_cairo_context_none_in(context): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_full_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_full_out.page index cfda6fdf..a5b4753d 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_full_out.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>surface</api:name> </api:arg> </api:function> - </info> - <title>Index.test_cairo_surface_full_out</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_cairo_surface_full_out</title> + <synopsis><code mime="text/x-python"> @accepts(cairo.Surface) @returns(none) def test_cairo_surface_full_out(surface): # Python wrapper for regress_test_cairo_surface_full_out() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>surface</code></title> @@ -42,6 +34,4 @@ def test_cairo_surface_full_out(surface): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_full_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_full_return.page index 5de20a93..b86412f6 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_full_return.page +++ b/tests/scanner/Regress-1.0-Python-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,22 +13,15 @@ </api:returns> <api:name>regress_test_cairo_surface_full_return</api:name> </api:function> - </info> - <title>Index.test_cairo_surface_full_return</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_cairo_surface_full_return</title> + <synopsis><code mime="text/x-python"> @returns(cairo.Surface) def test_cairo_surface_full_return(): # Python wrapper for regress_test_cairo_surface_full_return() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ def test_cairo_surface_full_return(): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_none_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_none_in.page index af1b9489..f284ad34 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_none_in.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>surface</api:name> </api:arg> </api:function> - </info> - <title>Index.test_cairo_surface_none_in</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_cairo_surface_none_in</title> + <synopsis><code mime="text/x-python"> @accepts(cairo.Surface) @returns(none) def test_cairo_surface_none_in(surface): # Python wrapper for regress_test_cairo_surface_none_in() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>surface</code></title> @@ -42,6 +34,4 @@ def test_cairo_surface_none_in(surface): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_none_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_none_return.page index 98fa6eba..4ef29592 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_none_return.page +++ b/tests/scanner/Regress-1.0-Python-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,22 +13,15 @@ </api:returns> <api:name>regress_test_cairo_surface_none_return</api:name> </api:function> - </info> - <title>Index.test_cairo_surface_none_return</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_cairo_surface_none_return</title> + <synopsis><code mime="text/x-python"> @returns(cairo.Surface) def test_cairo_surface_none_return(): # Python wrapper for regress_test_cairo_surface_none_return() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ def test_cairo_surface_none_return(): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback.page index 3481fc13..a4a7c7a0 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>callback</api:name> </api:arg> </api:function> - </info> - <title>Index.test_callback</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_callback</title> + <synopsis><code mime="text/x-python"> @accepts(Regress.TestCallback) @returns(int) def test_callback(callback): # Python wrapper for regress_test_callback() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>callback</code></title> @@ -46,6 +38,4 @@ def test_callback(callback): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_async.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_async.page index 21dc7ee7..7de1412e 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_async.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +21,16 @@ <api:name>user_data</api:name> </api:arg> </api:function> - </info> - <title>Index.test_callback_async</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_callback_async</title> + <synopsis><code mime="text/x-python"> @accepts(Regress.TestCallbackUserData, gpointer) @returns(none) def test_callback_async(callback, user_data): # Python wrapper for regress_test_callback_async() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>callback</code></title> @@ -50,6 +42,4 @@ def test_callback_async(callback, user_data): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_destroy_notify.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_destroy_notify.page index 86df7941..7d9d27e3 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_destroy_notify.page +++ b/tests/scanner/Regress-1.0-Python-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,24 +25,17 @@ <api:name>notify</api:name> </api:arg> </api:function> - </info> - <title>Index.test_callback_destroy_notify</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_callback_destroy_notify</title> + <synopsis><code mime="text/x-python"> @accepts(Regress.TestCallbackUserData, gpointer, GLib.DestroyNotify) @returns(int) def test_callback_destroy_notify(callback, user_data, notify): # Python wrapper for regress_test_callback_destroy_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> @@ -63,6 +55,4 @@ is invoked.</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_destroy_notify_no_user_data.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_destroy_notify_no_user_data.page index 05883e8c..60f53b56 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_destroy_notify_no_user_data.page +++ b/tests/scanner/Regress-1.0-Python-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,24 +21,17 @@ <api:name>notify</api:name> </api:arg> </api:function> - </info> - <title>Index.test_callback_destroy_notify_no_user_data</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_callback_destroy_notify_no_user_data</title> + <synopsis><code mime="text/x-python"> @accepts(Regress.TestCallbackUserData, GLib.DestroyNotify) @returns(int) def test_callback_destroy_notify_no_user_data(callback, notify): # Python wrapper for regress_test_callback_destroy_notify_no_user_data() -</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> @@ -55,6 +47,4 @@ condition in bindings which needs to be tested.</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_thaw_async.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_thaw_async.page index d362cb86..0418eee1 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_thaw_async.page +++ b/tests/scanner/Regress-1.0-Python-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,22 +13,15 @@ </api:returns> <api:name>regress_test_callback_thaw_async</api:name> </api:function> - </info> - <title>Index.test_callback_thaw_async</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_callback_thaw_async</title> + <synopsis><code mime="text/x-python"> @returns(int) def test_callback_thaw_async(): # Python wrapper for regress_test_callback_thaw_async() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ def test_callback_thaw_async(): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_thaw_notifications.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_thaw_notifications.page index 485e69b8..6d57146b 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_thaw_notifications.page +++ b/tests/scanner/Regress-1.0-Python-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,24 +13,17 @@ </api:returns> <api:name>regress_test_callback_thaw_notifications</api:name> </api:function> - </info> - <title>Index.test_callback_thaw_notifications</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_callback_thaw_notifications</title> + <synopsis><code mime="text/x-python"> @returns(int) def test_callback_thaw_notifications(): # Python wrapper for regress_test_callback_thaw_notifications() -</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> @@ -39,6 +31,4 @@ corresponding destroy notfications.</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_user_data.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_user_data.page index 8ec83767..5245a42a 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_user_data.page +++ b/tests/scanner/Regress-1.0-Python-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,24 +21,17 @@ <api:name>user_data</api:name> </api:arg> </api:function> - </info> - <title>Index.test_callback_user_data</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_callback_user_data</title> + <synopsis><code mime="text/x-python"> @accepts(Regress.TestCallbackUserData, gpointer) @returns(int) def test_callback_user_data(callback, user_data): # Python wrapper for regress_test_callback_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> @@ -55,6 +47,4 @@ call and can be released on return.</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure.page index d11a8a08..aed56223 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>closure</api:name> </api:arg> </api:function> - </info> - <title>Index.test_closure</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_closure</title> + <synopsis><code mime="text/x-python"> @accepts(GObject.Closure) @returns(int) def test_closure(closure): # Python wrapper for regress_test_closure() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>closure</code></title> @@ -46,6 +38,4 @@ def test_closure(closure): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure_one_arg.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure_one_arg.page index f8d91f13..69c5c19a 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure_one_arg.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +21,16 @@ <api:name>arg</api:name> </api:arg> </api:function> - </info> - <title>Index.test_closure_one_arg</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_closure_one_arg</title> + <synopsis><code mime="text/x-python"> @accepts(GObject.Closure, int) @returns(int) def test_closure_one_arg(closure, arg): # Python wrapper for regress_test_closure_one_arg() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>closure</code></title> @@ -54,6 +46,4 @@ def test_closure_one_arg(closure, arg): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure_variant.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure_variant.page index 7d6a1ac3..ca362d71 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure_variant.page +++ b/tests/scanner/Regress-1.0-Python-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,31 +21,24 @@ <api:name>arg</api:name> </api:arg> </api:function> - </info> - <title>Index.test_closure_variant</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_closure_variant</title> + <synopsis><code mime="text/x-python"> @accepts(GObject.Closure, GLib.Variant) @returns(GLib.Variant) def test_closure_variant(closure, arg): # Python wrapper for regress_test_closure_variant() -</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> @@ -54,6 +46,4 @@ def test_closure_variant(closure, arg): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_date_in_gvalue.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_date_in_gvalue.page index 04289860..becfae63 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_date_in_gvalue.page +++ b/tests/scanner/Regress-1.0-Python-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,22 +13,15 @@ </api:returns> <api:name>regress_test_date_in_gvalue</api:name> </api:function> - </info> - <title>Index.test_date_in_gvalue</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_date_in_gvalue</title> + <synopsis><code mime="text/x-python"> @returns(GObject.Value) def test_date_in_gvalue(): # Python wrapper for regress_test_date_in_gvalue() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ def test_date_in_gvalue(): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_def_error_quark.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_def_error_quark.page index 95f40e3c..78665a08 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_def_error_quark.page +++ b/tests/scanner/Regress-1.0-Python-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,22 +13,15 @@ </api:returns> <api:name>regress_test_def_error_quark</api:name> </api:function> - </info> - <title>Index.test_def_error_quark</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_def_error_quark</title> + <synopsis><code mime="text/x-python"> @returns(GLib.Quark) def test_def_error_quark(): # Python wrapper for regress_test_def_error_quark() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ def test_def_error_quark(): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_double.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_double.page index 9a2b7866..47397f39 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_double.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> - <title>Index.test_double</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_double</title> + <synopsis><code mime="text/x-python"> @accepts(float) @returns(float) def test_double(in): # Python wrapper for regress_test_double() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -46,6 +38,4 @@ def test_double(in): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_filename_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_filename_return.page index d267b55a..14d6b3ac 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_filename_return.page +++ b/tests/scanner/Regress-1.0-Python-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,22 +13,15 @@ </api:returns> <api:name>regress_test_filename_return</api:name> </api:function> - </info> - <title>Index.test_filename_return</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_filename_return</title> + <synopsis><code mime="text/x-python"> @returns([filename]) def test_filename_return(): # Python wrapper for regress_test_filename_return() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ def test_filename_return(): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_float.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_float.page index 9d362f8d..dc9c3061 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_float.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> - <title>Index.test_float</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_float</title> + <synopsis><code mime="text/x-python"> @accepts(float) @returns(float) def test_float(in): # Python wrapper for regress_test_float() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -46,6 +38,4 @@ def test_float(in): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_garray_container_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_garray_container_return.page index 43990b2c..f8093f6b 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_garray_container_return.page +++ b/tests/scanner/Regress-1.0-Python-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,22 +13,15 @@ </api:returns> <api:name>regress_test_garray_container_return</api:name> </api:function> - </info> - <title>Index.test_garray_container_return</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_garray_container_return</title> + <synopsis><code mime="text/x-python"> @returns([unicode]) def test_garray_container_return(): # Python wrapper for regress_test_garray_container_return() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ def test_garray_container_return(): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_garray_full_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_garray_full_return.page index f0bfb6d3..8f146524 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_garray_full_return.page +++ b/tests/scanner/Regress-1.0-Python-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,22 +13,15 @@ </api:returns> <api:name>regress_test_garray_full_return</api:name> </api:function> - </info> - <title>Index.test_garray_full_return</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_garray_full_return</title> + <synopsis><code mime="text/x-python"> @returns([unicode]) def test_garray_full_return(): # Python wrapper for regress_test_garray_full_return() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ def test_garray_full_return(): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gerror_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gerror_callback.page index 5630526c..72d8bc4d 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gerror_callback.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>callback</api:name> </api:arg> </api:function> - </info> - <title>Index.test_gerror_callback</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_gerror_callback</title> + <synopsis><code mime="text/x-python"> @accepts(Regress.TestCallbackGError) @returns(none) def test_gerror_callback(callback): # Python wrapper for regress_test_gerror_callback() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>callback</code></title> @@ -42,6 +34,4 @@ def test_gerror_callback(callback): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_container_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_container_return.page index ec91c452..482d3e82 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_container_return.page +++ b/tests/scanner/Regress-1.0-Python-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,22 +13,15 @@ </api:returns> <api:name>regress_test_ghash_container_return</api:name> </api:function> - </info> - <title>Index.test_ghash_container_return</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_ghash_container_return</title> + <synopsis><code mime="text/x-python"> @returns({unicode: unicode}) def test_ghash_container_return(): # Python wrapper for regress_test_ghash_container_return() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ def test_ghash_container_return(): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_everything_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_everything_return.page index 5356c011..43feb5fd 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_everything_return.page +++ b/tests/scanner/Regress-1.0-Python-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,22 +13,15 @@ </api:returns> <api:name>regress_test_ghash_everything_return</api:name> </api:function> - </info> - <title>Index.test_ghash_everything_return</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_ghash_everything_return</title> + <synopsis><code mime="text/x-python"> @returns({unicode: unicode}) def test_ghash_everything_return(): # Python wrapper for regress_test_ghash_everything_return() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ def test_ghash_everything_return(): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_gvalue_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_gvalue_in.page index 8273602b..ab380d93 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_gvalue_in.page +++ b/tests/scanner/Regress-1.0-Python-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,31 +17,22 @@ <api:name>hash</api:name> </api:arg> </api:function> - </info> - <title>Index.test_ghash_gvalue_in</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_ghash_gvalue_in</title> + <synopsis><code mime="text/x-python"> @accepts({unicode: GObject.Value}) @returns(none) def test_ghash_gvalue_in(hash): # Python wrapper for regress_test_ghash_gvalue_in() -</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> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_gvalue_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_gvalue_return.page index 6d6a257f..81eac0e1 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_gvalue_return.page +++ b/tests/scanner/Regress-1.0-Python-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,22 +13,15 @@ </api:returns> <api:name>regress_test_ghash_gvalue_return</api:name> </api:function> - </info> - <title>Index.test_ghash_gvalue_return</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_ghash_gvalue_return</title> + <synopsis><code mime="text/x-python"> @returns({unicode: GObject.Value}) def test_ghash_gvalue_return(): # Python wrapper for regress_test_ghash_gvalue_return() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ def test_ghash_gvalue_return(): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nested_everything_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nested_everything_return.page index 6bc643fb..ef755d3e 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nested_everything_return.page +++ b/tests/scanner/Regress-1.0-Python-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,22 +13,15 @@ </api:returns> <api:name>regress_test_ghash_nested_everything_return</api:name> </api:function> - </info> - <title>Index.test_ghash_nested_everything_return</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_ghash_nested_everything_return</title> + <synopsis><code mime="text/x-python"> @returns({unicode: {unicode: unicode}}) def test_ghash_nested_everything_return(): # Python wrapper for regress_test_ghash_nested_everything_return() -</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> @@ -37,6 +29,4 @@ def test_ghash_nested_everything_return(): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nested_everything_return2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nested_everything_return2.page index 1cb34424..708363de 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nested_everything_return2.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +13,16 @@ </api:returns> <api:name>regress_test_ghash_nested_everything_return2</api:name> </api:function> - </info> - <title>Index.test_ghash_nested_everything_return2</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_ghash_nested_everything_return2</title> + <synopsis><code mime="text/x-python"> @returns({unicode: {unicode: unicode}}) def test_ghash_nested_everything_return2(): # Python wrapper for regress_test_ghash_nested_everything_return2() -</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> @@ -38,6 +30,4 @@ element-type annotation.</p> </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_in.page index b1d295cf..70cd4d4e 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_in.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> - <title>Index.test_ghash_nothing_in</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_ghash_nothing_in</title> + <synopsis><code mime="text/x-python"> @accepts({unicode: unicode}) @returns(none) def test_ghash_nothing_in(in): # Python wrapper for regress_test_ghash_nothing_in() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -42,6 +34,4 @@ def test_ghash_nothing_in(in): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_in2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_in2.page index df58bb6d..b83ff334 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_in2.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> - <title>Index.test_ghash_nothing_in2</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_ghash_nothing_in2</title> + <synopsis><code mime="text/x-python"> @accepts({unicode: unicode}) @returns(none) def test_ghash_nothing_in2(in): # Python wrapper for regress_test_ghash_nothing_in2() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -42,6 +34,4 @@ def test_ghash_nothing_in2(in): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_return.page index 072fed9b..817cde26 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_return.page +++ b/tests/scanner/Regress-1.0-Python-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,22 +13,15 @@ </api:returns> <api:name>regress_test_ghash_nothing_return</api:name> </api:function> - </info> - <title>Index.test_ghash_nothing_return</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_ghash_nothing_return</title> + <synopsis><code mime="text/x-python"> @returns({unicode: unicode}) def test_ghash_nothing_return(): # Python wrapper for regress_test_ghash_nothing_return() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ def test_ghash_nothing_return(): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_return2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_return2.page index 161d3f62..dac24002 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_return2.page +++ b/tests/scanner/Regress-1.0-Python-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,22 +13,15 @@ </api:returns> <api:name>regress_test_ghash_nothing_return2</api:name> </api:function> - </info> - <title>Index.test_ghash_nothing_return2</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_ghash_nothing_return2</title> + <synopsis><code mime="text/x-python"> @returns({unicode: unicode}) def test_ghash_nothing_return2(): # Python wrapper for regress_test_ghash_nothing_return2() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ def test_ghash_nothing_return2(): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_in.page index ee3ed32e..7349fddd 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_in.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> - <title>Index.test_ghash_null_in</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_ghash_null_in</title> + <synopsis><code mime="text/x-python"> @accepts({unicode: unicode}) @returns(none) def test_ghash_null_in(in): # Python wrapper for regress_test_ghash_null_in() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -42,6 +34,4 @@ def test_ghash_null_in(in): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_out.page index 683efc41..40f5540f 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_out.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>out</api:name> </api:arg> </api:function> - </info> - <title>Index.test_ghash_null_out</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_ghash_null_out</title> + <synopsis><code mime="text/x-python"> @accepts({unicode: unicode}) @returns(none) def test_ghash_null_out(out): # Python wrapper for regress_test_ghash_null_out() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>out</code></title> @@ -42,6 +34,4 @@ def test_ghash_null_out(out): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_return.page index ea516226..78f3d732 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_return.page +++ b/tests/scanner/Regress-1.0-Python-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,22 +13,15 @@ </api:returns> <api:name>regress_test_ghash_null_return</api:name> </api:function> - </info> - <title>Index.test_ghash_null_return</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_ghash_null_return</title> + <synopsis><code mime="text/x-python"> @returns({unicode: unicode}) def test_ghash_null_return(): # Python wrapper for regress_test_ghash_null_return() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ def test_ghash_null_return(): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_container_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_container_return.page index 9d098baa..e204db07 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_container_return.page +++ b/tests/scanner/Regress-1.0-Python-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,22 +13,15 @@ </api:returns> <api:name>regress_test_glist_container_return</api:name> </api:function> - </info> - <title>Index.test_glist_container_return</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_glist_container_return</title> + <synopsis><code mime="text/x-python"> @returns([unicode]) def test_glist_container_return(): # Python wrapper for regress_test_glist_container_return() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ def test_glist_container_return(): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_everything_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_everything_return.page index 6b2d3704..4b922a40 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_everything_return.page +++ b/tests/scanner/Regress-1.0-Python-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,22 +13,15 @@ </api:returns> <api:name>regress_test_glist_everything_return</api:name> </api:function> - </info> - <title>Index.test_glist_everything_return</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_glist_everything_return</title> + <synopsis><code mime="text/x-python"> @returns([unicode]) def test_glist_everything_return(): # Python wrapper for regress_test_glist_everything_return() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ def test_glist_everything_return(): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in.page index 4873a198..0210e0a8 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> - <title>Index.test_glist_nothing_in</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_glist_nothing_in</title> + <synopsis><code mime="text/x-python"> @accepts([unicode]) @returns(none) def test_glist_nothing_in(in): # Python wrapper for regress_test_glist_nothing_in() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -42,6 +34,4 @@ def test_glist_nothing_in(in): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in2.page index e28d3a89..02478759 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in2.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> - <title>Index.test_glist_nothing_in2</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_glist_nothing_in2</title> + <synopsis><code mime="text/x-python"> @accepts([unicode]) @returns(none) def test_glist_nothing_in2(in): # Python wrapper for regress_test_glist_nothing_in2() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -42,6 +34,4 @@ def test_glist_nothing_in2(in): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return.page index b4b12c81..99cd3048 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return.page +++ b/tests/scanner/Regress-1.0-Python-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,22 +13,15 @@ </api:returns> <api:name>regress_test_glist_nothing_return</api:name> </api:function> - </info> - <title>Index.test_glist_nothing_return</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_glist_nothing_return</title> + <synopsis><code mime="text/x-python"> @returns([unicode]) def test_glist_nothing_return(): # Python wrapper for regress_test_glist_nothing_return() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ def test_glist_nothing_return(): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return2.page index aab83e50..74264db4 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return2.page +++ b/tests/scanner/Regress-1.0-Python-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,22 +13,15 @@ </api:returns> <api:name>regress_test_glist_nothing_return2</api:name> </api:function> - </info> - <title>Index.test_glist_nothing_return2</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_glist_nothing_return2</title> + <synopsis><code mime="text/x-python"> @returns([unicode]) def test_glist_nothing_return2(): # Python wrapper for regress_test_glist_nothing_return2() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ def test_glist_nothing_return2(): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_in.page index ac3f3d62..f403de3e 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_in.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> - <title>Index.test_glist_null_in</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_glist_null_in</title> + <synopsis><code mime="text/x-python"> @accepts([unicode]) @returns(none) def test_glist_null_in(in): # Python wrapper for regress_test_glist_null_in() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -42,6 +34,4 @@ def test_glist_null_in(in): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_out.page index 335d1b21..86bf40db 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_out.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>out_list</api:name> </api:arg> </api:function> - </info> - <title>Index.test_glist_null_out</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_glist_null_out</title> + <synopsis><code mime="text/x-python"> @accepts([unicode]) @returns(none) def test_glist_null_out(out_list): # Python wrapper for regress_test_glist_null_out() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>out_list</code></title> @@ -42,6 +34,4 @@ def test_glist_null_out(out_list): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_container_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_container_return.page index 702c635c..89b98f47 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_container_return.page +++ b/tests/scanner/Regress-1.0-Python-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,22 +13,15 @@ </api:returns> <api:name>regress_test_gslist_container_return</api:name> </api:function> - </info> - <title>Index.test_gslist_container_return</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_gslist_container_return</title> + <synopsis><code mime="text/x-python"> @returns([unicode]) def test_gslist_container_return(): # Python wrapper for regress_test_gslist_container_return() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ def test_gslist_container_return(): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_everything_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_everything_return.page index 95fd40c8..49d81db3 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_everything_return.page +++ b/tests/scanner/Regress-1.0-Python-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,22 +13,15 @@ </api:returns> <api:name>regress_test_gslist_everything_return</api:name> </api:function> - </info> - <title>Index.test_gslist_everything_return</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_gslist_everything_return</title> + <synopsis><code mime="text/x-python"> @returns([unicode]) def test_gslist_everything_return(): # Python wrapper for regress_test_gslist_everything_return() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ def test_gslist_everything_return(): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in.page index 534ac13e..b72f0c53 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> - <title>Index.test_gslist_nothing_in</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_gslist_nothing_in</title> + <synopsis><code mime="text/x-python"> @accepts([unicode]) @returns(none) def test_gslist_nothing_in(in): # Python wrapper for regress_test_gslist_nothing_in() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -42,6 +34,4 @@ def test_gslist_nothing_in(in): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in2.page index a7e0635b..016ab04c 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in2.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> - <title>Index.test_gslist_nothing_in2</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_gslist_nothing_in2</title> + <synopsis><code mime="text/x-python"> @accepts([unicode]) @returns(none) def test_gslist_nothing_in2(in): # Python wrapper for regress_test_gslist_nothing_in2() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -42,6 +34,4 @@ def test_gslist_nothing_in2(in): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return.page index ff7d7e56..e2509948 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return.page +++ b/tests/scanner/Regress-1.0-Python-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,22 +13,15 @@ </api:returns> <api:name>regress_test_gslist_nothing_return</api:name> </api:function> - </info> - <title>Index.test_gslist_nothing_return</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_gslist_nothing_return</title> + <synopsis><code mime="text/x-python"> @returns([unicode]) def test_gslist_nothing_return(): # Python wrapper for regress_test_gslist_nothing_return() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ def test_gslist_nothing_return(): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return2.page index cf0f67ab..fe208c14 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return2.page +++ b/tests/scanner/Regress-1.0-Python-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,22 +13,15 @@ </api:returns> <api:name>regress_test_gslist_nothing_return2</api:name> </api:function> - </info> - <title>Index.test_gslist_nothing_return2</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_gslist_nothing_return2</title> + <synopsis><code mime="text/x-python"> @returns([unicode]) def test_gslist_nothing_return2(): # Python wrapper for regress_test_gslist_nothing_return2() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ def test_gslist_nothing_return2(): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_in.page index b0174663..d6872afb 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_in.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> - <title>Index.test_gslist_null_in</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_gslist_null_in</title> + <synopsis><code mime="text/x-python"> @accepts([unicode]) @returns(none) def test_gslist_null_in(in): # Python wrapper for regress_test_gslist_null_in() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -42,6 +34,4 @@ def test_gslist_null_in(in): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_out.page index 24ef27f1..2bdeb03a 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_out.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>out_list</api:name> </api:arg> </api:function> - </info> - <title>Index.test_gslist_null_out</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_gslist_null_out</title> + <synopsis><code mime="text/x-python"> @accepts([unicode]) @returns(none) def test_gslist_null_out(out_list): # Python wrapper for regress_test_gslist_null_out() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>out_list</code></title> @@ -42,6 +34,4 @@ def test_gslist_null_out(out_list): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gtype.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gtype.page index 38ffb442..3f936fd3 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gtype.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> - <title>Index.test_gtype</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_gtype</title> + <synopsis><code mime="text/x-python"> @accepts(GType) @returns(GType) def test_gtype(in): # Python wrapper for regress_test_gtype() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -46,6 +38,4 @@ def test_gtype(in): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_as.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_as.page index f4c4cd80..b2bd44b9 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_as.page +++ b/tests/scanner/Regress-1.0-Python-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,22 +13,15 @@ </api:returns> <api:name>regress_test_gvariant_as</api:name> </api:function> - </info> - <title>Index.test_gvariant_as</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_gvariant_as</title> + <synopsis><code mime="text/x-python"> @returns(GLib.Variant) def test_gvariant_as(): # Python wrapper for regress_test_gvariant_as() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ def test_gvariant_as(): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_asv.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_asv.page index 8357191f..dbb9c2bb 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_asv.page +++ b/tests/scanner/Regress-1.0-Python-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,22 +13,15 @@ </api:returns> <api:name>regress_test_gvariant_asv</api:name> </api:function> - </info> - <title>Index.test_gvariant_asv</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_gvariant_asv</title> + <synopsis><code mime="text/x-python"> @returns(GLib.Variant) def test_gvariant_asv(): # Python wrapper for regress_test_gvariant_asv() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ def test_gvariant_asv(): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_i.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_i.page index c0db4608..238b0020 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_i.page +++ b/tests/scanner/Regress-1.0-Python-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,22 +13,15 @@ </api:returns> <api:name>regress_test_gvariant_i</api:name> </api:function> - </info> - <title>Index.test_gvariant_i</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_gvariant_i</title> + <synopsis><code mime="text/x-python"> @returns(GLib.Variant) def test_gvariant_i(): # Python wrapper for regress_test_gvariant_i() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ def test_gvariant_i(): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_s.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_s.page index 454fc8a9..f3608495 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_s.page +++ b/tests/scanner/Regress-1.0-Python-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,22 +13,15 @@ </api:returns> <api:name>regress_test_gvariant_s</api:name> </api:function> - </info> - <title>Index.test_gvariant_s</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_gvariant_s</title> + <synopsis><code mime="text/x-python"> @returns(GLib.Variant) def test_gvariant_s(): # Python wrapper for regress_test_gvariant_s() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ def test_gvariant_s(): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_v.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_v.page index e8a6c00f..d13b7a19 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_v.page +++ b/tests/scanner/Regress-1.0-Python-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,22 +13,15 @@ </api:returns> <api:name>regress_test_gvariant_v</api:name> </api:function> - </info> - <title>Index.test_gvariant_v</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_gvariant_v</title> + <synopsis><code mime="text/x-python"> @returns(GLib.Variant) def test_gvariant_v(): # Python wrapper for regress_test_gvariant_v() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ def test_gvariant_v(): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_hash_table_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_hash_table_callback.page index 2f8ebcb6..1264f29c 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_hash_table_callback.page +++ b/tests/scanner/Regress-1.0-Python-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,27 +21,20 @@ <api:name>callback</api:name> </api:arg> </api:function> - </info> - <title>Index.test_hash_table_callback</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_hash_table_callback</title> + <synopsis><code mime="text/x-python"> @accepts({unicode: int}, Regress.TestCallbackHashtable) @returns(none) def test_hash_table_callback(data, callback): # Python wrapper for regress_test_hash_table_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> @@ -50,6 +42,4 @@ def test_hash_table_callback(data, callback): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int.page index d0398835..b695f1b3 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> - <title>Index.test_int</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_int</title> + <synopsis><code mime="text/x-python"> @accepts(int) @returns(int) def test_int(in): # Python wrapper for regress_test_int() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -46,6 +38,4 @@ def test_int(in): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int16.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int16.page index 7e995172..23cd04f7 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int16.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> - <title>Index.test_int16</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_int16</title> + <synopsis><code mime="text/x-python"> @accepts(gint16) @returns(gint16) def test_int16(in): # Python wrapper for regress_test_int16() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -46,6 +38,4 @@ def test_int16(in): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int32.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int32.page index 03e5c07c..7f69a514 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int32.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> - <title>Index.test_int32</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_int32</title> + <synopsis><code mime="text/x-python"> @accepts(gint32) @returns(gint32) def test_int32(in): # Python wrapper for regress_test_int32() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -46,6 +38,4 @@ def test_int32(in): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int64.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int64.page index 645792cf..94b67ed9 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int64.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> - <title>Index.test_int64</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_int64</title> + <synopsis><code mime="text/x-python"> @accepts(int) @returns(int) def test_int64(in): # Python wrapper for regress_test_int64() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -46,6 +38,4 @@ def test_int64(in): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int8.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int8.page index c733d1bd..80c27edc 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int8.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> - <title>Index.test_int8</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_int8</title> + <synopsis><code mime="text/x-python"> @accepts(gint8) @returns(gint8) def test_int8(in): # Python wrapper for regress_test_int8() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -46,6 +38,4 @@ def test_int8(in): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int_out_utf8.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int_out_utf8.page index f43f0bce..1123838c 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int_out_utf8.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +21,16 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> - <title>Index.test_int_out_utf8</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_int_out_utf8</title> + <synopsis><code mime="text/x-python"> @accepts(int, unicode) @returns(none) def test_int_out_utf8(length, in): # Python wrapper for regress_test_int_out_utf8() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>length</code></title> @@ -50,6 +42,4 @@ def test_int_out_utf8(length, in): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int_value_arg.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int_value_arg.page index d7210b5e..b7592404 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int_value_arg.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>v</api:name> </api:arg> </api:function> - </info> - <title>Index.test_int_value_arg</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_int_value_arg</title> + <synopsis><code mime="text/x-python"> @accepts(GObject.Value) @returns(int) def test_int_value_arg(v): # Python wrapper for regress_test_int_value_arg() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>v</code></title> @@ -46,6 +38,4 @@ def test_int_value_arg(v): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_long.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_long.page index 147cae22..bef24f90 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_long.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> - <title>Index.test_long</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_long</title> + <synopsis><code mime="text/x-python"> @accepts(int) @returns(int) def test_long(in): # Python wrapper for regress_test_long() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -46,6 +38,4 @@ def test_long(in): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_callback.page index c195b821..9f25f97c 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_callback.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_callback.page @@ -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,23 +17,16 @@ <api:name>callback</api:name> </api:arg> </api:function> - </info> - <title>Index.test_multi_callback</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_multi_callback</title> + <synopsis><code mime="text/x-python"> @accepts(Regress.TestCallback) @returns(int) def test_multi_callback(callback): # Python wrapper for regress_test_multi_callback() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>callback</code></title> @@ -46,6 +38,4 @@ def test_multi_callback(callback): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_double_args.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_double_args.page index 7946d576..ee94e27c 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_double_args.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +25,16 @@ <api:name>two</api:name> </api:arg> </api:function> - </info> - <title>Index.test_multi_double_args</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_multi_double_args</title> + <synopsis><code mime="text/x-python"> @accepts(float, float, float) @returns(none) def test_multi_double_args(in, one, two): # Python wrapper for regress_test_multi_double_args() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -58,6 +50,4 @@ def test_multi_double_args(in, one, two): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_multiline_doc_comments.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_multiline_doc_comments.page index 25161388..80ec8cd6 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_multiline_doc_comments.page +++ b/tests/scanner/Regress-1.0-Python-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,25 +13,16 @@ </api:returns> <api:name>regress_test_multiline_doc_comments</api:name> </api:function> - </info> - <title>Index.test_multiline_doc_comments</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_multiline_doc_comments</title> + <synopsis><code mime="text/x-python"> @returns(none) def test_multiline_doc_comments(): # Python wrapper for regress_test_multiline_doc_comments() -</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> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_nested_parameter.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_nested_parameter.page index 98c1fd3b..c386b910 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_nested_parameter.page +++ b/tests/scanner/Regress-1.0-Python-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,19 +17,15 @@ <api:name>a</api:name> </api:arg> </api:function> - </info> - <title>Index.test_nested_parameter</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_nested_parameter</title> + <synopsis><code mime="text/x-python"> @accepts(int) @returns(none) def test_nested_parameter(a): # Python wrapper for regress_test_nested_parameter() -</code></synopsis> - - - <p><informaltable> + </code></synopsis> + <p><informaltable> <tgroup cols="3"> <thead> <row> @@ -55,18 +50,13 @@ 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> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_null_gerror_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_null_gerror_callback.page index cdb1b928..5c71e871 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_null_gerror_callback.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>callback</api:name> </api:arg> </api:function> - </info> - <title>Index.test_null_gerror_callback</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_null_gerror_callback</title> + <synopsis><code mime="text/x-python"> @accepts(Regress.TestCallbackGError) @returns(none) def test_null_gerror_callback(callback): # Python wrapper for regress_test_null_gerror_callback() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>callback</code></title> @@ -42,6 +34,4 @@ def test_null_gerror_callback(callback): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_owned_gerror_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_owned_gerror_callback.page index f33b39ed..882083e3 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_owned_gerror_callback.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>callback</api:name> </api:arg> </api:function> - </info> - <title>Index.test_owned_gerror_callback</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_owned_gerror_callback</title> + <synopsis><code mime="text/x-python"> @accepts(Regress.TestCallbackOwnedGError) @returns(none) def test_owned_gerror_callback(callback): # Python wrapper for regress_test_owned_gerror_callback() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>callback</code></title> @@ -42,6 +34,4 @@ def test_owned_gerror_callback(callback): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_short.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_short.page index e2f45632..5deeb7d9 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_short.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> - <title>Index.test_short</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_short</title> + <synopsis><code mime="text/x-python"> @accepts(gshort) @returns(gshort) def test_short(in): # Python wrapper for regress_test_short() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -46,6 +38,4 @@ def test_short(in): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_simple_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_simple_callback.page index a9fa29c0..4a5da37b 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_simple_callback.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>callback</api:name> </api:arg> </api:function> - </info> - <title>Index.test_simple_callback</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_simple_callback</title> + <synopsis><code mime="text/x-python"> @accepts(Regress.TestSimpleCallback) @returns(none) def test_simple_callback(callback): # Python wrapper for regress_test_simple_callback() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>callback</code></title> @@ -42,6 +34,4 @@ def test_simple_callback(callback): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_size.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_size.page index 7935c215..fb761b31 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_size.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> - <title>Index.test_size</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_size</title> + <synopsis><code mime="text/x-python"> @accepts(gsize) @returns(gsize) def test_size(in): # Python wrapper for regress_test_size() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -46,6 +38,4 @@ def test_size(in): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ssize.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ssize.page index 47fe2cd3..a681b179 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ssize.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> - <title>Index.test_ssize</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_ssize</title> + <synopsis><code mime="text/x-python"> @accepts(gssize) @returns(gssize) def test_ssize(in): # Python wrapper for regress_test_ssize() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -46,6 +38,4 @@ def test_ssize(in): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_in.page index 1121a7da..f70904dc 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_in.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>arr</api:name> </api:arg> </api:function> - </info> - <title>Index.test_strv_in</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_strv_in</title> + <synopsis><code mime="text/x-python"> @accepts([unicode]) @returns(bool) def test_strv_in(arr): # Python wrapper for regress_test_strv_in() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>arr</code></title> @@ -46,6 +38,4 @@ def test_strv_in(arr): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_in_gvalue.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_in_gvalue.page index fcffe1bb..6481456c 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_in_gvalue.page +++ b/tests/scanner/Regress-1.0-Python-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,22 +13,15 @@ </api:returns> <api:name>regress_test_strv_in_gvalue</api:name> </api:function> - </info> - <title>Index.test_strv_in_gvalue</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_strv_in_gvalue</title> + <synopsis><code mime="text/x-python"> @returns(GObject.Value) def test_strv_in_gvalue(): # Python wrapper for regress_test_strv_in_gvalue() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ def test_strv_in_gvalue(): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out.page index eea084cb..0c698752 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out.page +++ b/tests/scanner/Regress-1.0-Python-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,22 +13,15 @@ </api:returns> <api:name>regress_test_strv_out</api:name> </api:function> - </info> - <title>Index.test_strv_out</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_strv_out</title> + <synopsis><code mime="text/x-python"> @returns([unicode]) def test_strv_out(): # Python wrapper for regress_test_strv_out() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ def test_strv_out(): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out_c.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out_c.page index c800fa0a..bce768ab 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out_c.page +++ b/tests/scanner/Regress-1.0-Python-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,22 +13,15 @@ </api:returns> <api:name>regress_test_strv_out_c</api:name> </api:function> - </info> - <title>Index.test_strv_out_c</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_strv_out_c</title> + <synopsis><code mime="text/x-python"> @returns([unicode]) def test_strv_out_c(): # Python wrapper for regress_test_strv_out_c() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ def test_strv_out_c(): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out_container.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out_container.page index 69f6c56f..4f8a9063 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out_container.page +++ b/tests/scanner/Regress-1.0-Python-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,22 +13,15 @@ </api:returns> <api:name>regress_test_strv_out_container</api:name> </api:function> - </info> - <title>Index.test_strv_out_container</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_strv_out_container</title> + <synopsis><code mime="text/x-python"> @returns([unicode]) def test_strv_out_container(): # Python wrapper for regress_test_strv_out_container() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ def test_strv_out_container(): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_outarg.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_outarg.page index 3624f8a9..cf374896 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_outarg.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>retp</api:name> </api:arg> </api:function> - </info> - <title>Index.test_strv_outarg</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_strv_outarg</title> + <synopsis><code mime="text/x-python"> @accepts([unicode]) @returns(none) def test_strv_outarg(retp): # Python wrapper for regress_test_strv_outarg() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>retp</code></title> @@ -42,6 +34,4 @@ def test_strv_outarg(retp): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_timet.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_timet.page index 51698280..7ba8fe5c 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_timet.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> - <title>Index.test_timet</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_timet</title> + <synopsis><code mime="text/x-python"> @accepts(int) @returns(int) def test_timet(in): # Python wrapper for regress_test_timet() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -46,6 +38,4 @@ def test_timet(in): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_0.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_0.page index 7875a817..0f2413ff 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_0.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +37,16 @@ <api:name>m</api:name> </api:arg> </api:function> - </info> - <title>Index.test_torture_signature_0</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_torture_signature_0</title> + <synopsis><code mime="text/x-python"> @accepts(int, float, int, unicode, int, int) @returns(none) def test_torture_signature_0(x, y, z, foo, q, m): # Python wrapper for regress_test_torture_signature_0() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>x</code></title> @@ -82,6 +74,4 @@ def test_torture_signature_0(x, y, z, foo, q, m): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_1.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_1.page index 6a499a56..8a99c2c2 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_1.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +37,16 @@ <api:name>m</api:name> </api:arg> </api:function> - </info> - <title>Index.test_torture_signature_1</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_torture_signature_1</title> + <synopsis><code mime="text/x-python"> @accepts(int, float, int, unicode, int, int) @returns(bool) def test_torture_signature_1(x, y, z, foo, q, m): # Python wrapper for regress_test_torture_signature_1() -</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> @@ -86,6 +78,4 @@ def test_torture_signature_1(x, y, z, foo, q, m): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_2.page index 01f77785..f9828419 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_2.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +49,16 @@ <api:name>m</api:name> </api:arg> </api:function> - </info> - <title>Index.test_torture_signature_2</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_torture_signature_2</title> + <synopsis><code mime="text/x-python"> @accepts(int, Regress.TestCallbackUserData, gpointer, GLib.DestroyNotify, float, int, unicode, int, int) @returns(none) def test_torture_signature_2(x, callback, user_data, notify, y, z, foo, q, m): # Python wrapper for regress_test_torture_signature_2() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>x</code></title> @@ -106,6 +98,4 @@ def test_torture_signature_2(x, callback, user_data, notify, y, z, foo, q, m): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint.page index f6943c0a..d4bcf564 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> - <title>Index.test_uint</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_uint</title> + <synopsis><code mime="text/x-python"> @accepts(int) @returns(int) def test_uint(in): # Python wrapper for regress_test_uint() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -46,6 +38,4 @@ def test_uint(in): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint16.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint16.page index 5ace288d..181beae3 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint16.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> - <title>Index.test_uint16</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_uint16</title> + <synopsis><code mime="text/x-python"> @accepts(guint16) @returns(guint16) def test_uint16(in): # Python wrapper for regress_test_uint16() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -46,6 +38,4 @@ def test_uint16(in): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint32.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint32.page index 084d6192..ea052bc5 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint32.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> - <title>Index.test_uint32</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_uint32</title> + <synopsis><code mime="text/x-python"> @accepts(guint32) @returns(guint32) def test_uint32(in): # Python wrapper for regress_test_uint32() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -46,6 +38,4 @@ def test_uint32(in): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint64.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint64.page index b2234a3a..63841e4f 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint64.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> - <title>Index.test_uint64</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_uint64</title> + <synopsis><code mime="text/x-python"> @accepts(int) @returns(int) def test_uint64(in): # Python wrapper for regress_test_uint64() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -46,6 +38,4 @@ def test_uint64(in): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint8.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint8.page index 94e367b6..377cf5d1 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint8.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> - <title>Index.test_uint8</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_uint8</title> + <synopsis><code mime="text/x-python"> @accepts(guint8) @returns(guint8) def test_uint8(in): # Python wrapper for regress_test_uint8() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -46,6 +38,4 @@ def test_uint8(in): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ulong.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ulong.page index dc98e475..10e75d99 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ulong.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> - <title>Index.test_ulong</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_ulong</title> + <synopsis><code mime="text/x-python"> @accepts(int) @returns(int) def test_ulong(in): # Python wrapper for regress_test_ulong() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -46,6 +38,4 @@ def test_ulong(in): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_unichar.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_unichar.page index abc373ea..4fe338d9 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_unichar.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> - <title>Index.test_unichar</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_unichar</title> + <synopsis><code mime="text/x-python"> @accepts(unicode) @returns(unicode) def test_unichar(in): # Python wrapper for regress_test_unichar() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -46,6 +38,4 @@ def test_unichar(in): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_unsigned_enum_param.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_unsigned_enum_param.page index eb7ff64b..0a99c9a5 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_unsigned_enum_param.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>e</api:name> </api:arg> </api:function> - </info> - <title>Index.test_unsigned_enum_param</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_unsigned_enum_param</title> + <synopsis><code mime="text/x-python"> @accepts(Regress.TestEnumUnsigned) @returns(unicode) def test_unsigned_enum_param(e): # Python wrapper for regress_test_unsigned_enum_param() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>e</code></title> @@ -46,6 +38,4 @@ def test_unsigned_enum_param(e): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ushort.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ushort.page index 4bebadc3..383547a8 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ushort.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> - <title>Index.test_ushort</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_ushort</title> + <synopsis><code mime="text/x-python"> @accepts(gushort) @returns(gushort) def test_ushort(in): # Python wrapper for regress_test_ushort() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -46,6 +38,4 @@ def test_ushort(in): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_const_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_const_in.page index 4d4ff1af..05eb0d40 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_const_in.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> - <title>Index.test_utf8_const_in</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_utf8_const_in</title> + <synopsis><code mime="text/x-python"> @accepts(unicode) @returns(none) def test_utf8_const_in(in): # Python wrapper for regress_test_utf8_const_in() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -42,6 +34,4 @@ def test_utf8_const_in(in): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_const_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_const_return.page index 7149eac9..04c73257 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_const_return.page +++ b/tests/scanner/Regress-1.0-Python-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,22 +13,15 @@ </api:returns> <api:name>regress_test_utf8_const_return</api:name> </api:function> - </info> - <title>Index.test_utf8_const_return</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_utf8_const_return</title> + <synopsis><code mime="text/x-python"> @returns(unicode) def test_utf8_const_return(): # Python wrapper for regress_test_utf8_const_return() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ def test_utf8_const_return(): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_inout.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_inout.page index 28ecfc27..a47d745b 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_inout.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>inout</api:name> </api:arg> </api:function> - </info> - <title>Index.test_utf8_inout</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_utf8_inout</title> + <synopsis><code mime="text/x-python"> @accepts(unicode) @returns(none) def test_utf8_inout(inout): # Python wrapper for regress_test_utf8_inout() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>inout</code></title> @@ -42,6 +34,4 @@ def test_utf8_inout(inout): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_nonconst_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_nonconst_return.page index 1d1be7dd..82bc9030 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_nonconst_return.page +++ b/tests/scanner/Regress-1.0-Python-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,22 +13,15 @@ </api:returns> <api:name>regress_test_utf8_nonconst_return</api:name> </api:function> - </info> - <title>Index.test_utf8_nonconst_return</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_utf8_nonconst_return</title> + <synopsis><code mime="text/x-python"> @returns(unicode) def test_utf8_nonconst_return(): # Python wrapper for regress_test_utf8_nonconst_return() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>Returns</code></title> @@ -37,6 +29,4 @@ def test_utf8_nonconst_return(): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_null_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_null_in.page index 8074cafd..8f01c441 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_null_in.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>in</api:name> </api:arg> </api:function> - </info> - <title>Index.test_utf8_null_in</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_utf8_null_in</title> + <synopsis><code mime="text/x-python"> @accepts(unicode) @returns(none) def test_utf8_null_in(in): # Python wrapper for regress_test_utf8_null_in() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>in</code></title> @@ -42,6 +34,4 @@ def test_utf8_null_in(in): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_null_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_null_out.page index da98d744..0beedb3d 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_null_out.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>char_out</api:name> </api:arg> </api:function> - </info> - <title>Index.test_utf8_null_out</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_utf8_null_out</title> + <synopsis><code mime="text/x-python"> @accepts(unicode) @returns(none) def test_utf8_null_out(char_out): # Python wrapper for regress_test_utf8_null_out() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>char_out</code></title> @@ -42,6 +34,4 @@ def test_utf8_null_out(char_out): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out.page index 3aa56f02..9fbf938d 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out.page +++ b/tests/scanner/Regress-1.0-Python-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,23 +17,16 @@ <api:name>out</api:name> </api:arg> </api:function> - </info> - <title>Index.test_utf8_out</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_utf8_out</title> + <synopsis><code mime="text/x-python"> @accepts(unicode) @returns(none) def test_utf8_out(out): # Python wrapper for regress_test_utf8_out() -</code></synopsis> + </code></synopsis> + - - - - - - <terms> <item> <title><code>out</code></title> @@ -42,6 +34,4 @@ def test_utf8_out(out): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out_nonconst_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out_nonconst_return.page index 0b775cc3..127c7634 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out_nonconst_return.page +++ b/tests/scanner/Regress-1.0-Python-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,27 +17,20 @@ <api:name>out</api:name> </api:arg> </api:function> - </info> - <title>Index.test_utf8_out_nonconst_return</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_utf8_out_nonconst_return</title> + <synopsis><code mime="text/x-python"> @accepts(unicode) @returns(unicode) def test_utf8_out_nonconst_return(out): # Python wrapper for regress_test_utf8_out_nonconst_return() -</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> @@ -46,6 +38,4 @@ def test_utf8_out_nonconst_return(out): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out_out.page index 5a6bc2e6..a93227d7 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out_out.page +++ b/tests/scanner/Regress-1.0-Python-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,34 +21,25 @@ <api:name>out1</api:name> </api:arg> </api:function> - </info> - <title>Index.test_utf8_out_out</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_utf8_out_out</title> + <synopsis><code mime="text/x-python"> @accepts(unicode, unicode) @returns(none) def test_utf8_out_out(out0, out1): # Python wrapper for regress_test_utf8_out_out() -</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> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_value_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_value_return.page index ef9f97e3..d35a11af 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_value_return.page +++ b/tests/scanner/Regress-1.0-Python-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,27 +17,20 @@ <api:name>i</api:name> </api:arg> </api:function> - </info> - <title>Index.test_value_return</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_value_return</title> + <synopsis><code mime="text/x-python"> @accepts(int) @returns(GObject.Value) def test_value_return(i): # Python wrapper for regress_test_value_return() -</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> @@ -46,6 +38,4 @@ def test_value_return(i): </item> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_versioning.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_versioning.page index 847a5c33..de64f261 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_versioning.page +++ b/tests/scanner/Regress-1.0-Python-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,26 +13,16 @@ </api:returns> <api:name>regress_test_versioning</api:name> </api:function> - </info> - <title>Index.test_versioning</title> - -<synopsis><code mime="text/x-python"> + <title>Regress.test_versioning</title> + <synopsis><code mime="text/x-python"> @returns(none) def test_versioning(): # Python wrapper for regress_test_versioning() -</code></synopsis> + </code></synopsis> - - - - - <p>Since 1.32.1</p> - - + <p>Since 1.32.1</p> <terms> </terms> - - </page> diff --git a/tests/scanner/Regress-1.0-Python-expected/index.page b/tests/scanner/Regress-1.0-Python-expected/index.page index a5426d89..426ebedf 100644 --- a/tests/scanner/Regress-1.0-Python-expected/index.page +++ b/tests/scanner/Regress-1.0-Python-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"> |