summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomeu Vizoso <tomeu.vizoso@collabora.com>2012-02-20 17:35:08 +0100
committerTomeu Vizoso <tomeu.vizoso@collabora.com>2012-02-20 17:35:08 +0100
commit67d354dc97c107c490a555a5e9ff245dc0cae2cc (patch)
tree963df0c0c11622a5311366b60d04c9ac9ab93d05
parent5cb2864c612e06c430e81037a9ff58b30409bebe (diff)
downloadgobject-introspection-67d354dc97c107c490a555a5e9ff245dc0cae2cc.tar.gz
g-ir-doc-tool: Add some more stuff to Enum pages
-rw-r--r--giscanner/mallard-Python-enum.tmpl23
-rw-r--r--giscanner/mallardwriter.py3
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.ArrayType.page5
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.Direction.page5
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.InfoType.page5
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.RepositoryError.page5
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.ScopeType.page5
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.Transfer.page5
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.TypeTag.page5
-rw-r--r--tests/doctool/GIRepository-2.0-C-expected/GIRepository.nvokeError.page5
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.ArrayType.page27
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Direction.page23
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.InfoType.page91
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.RepositoryError.page25
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.ScopeType.page27
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Transfer.page23
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.TypeTag.page99
-rw-r--r--tests/doctool/GIRepository-2.0-Python-expected/GIRepository.nvokeError.page23
18 files changed, 365 insertions, 39 deletions
diff --git a/giscanner/mallard-Python-enum.tmpl b/giscanner/mallard-Python-enum.tmpl
new file mode 100644
index 00000000..fd6ca0fb
--- /dev/null
+++ b/giscanner/mallard-Python-enum.tmpl
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<page id="${node.namespace.name}.${node.name}"
+ type="guide"
+ style="enum"
+ xmlns="http://projectmallard.org/1.0/"
+ xmlns:ui="http://projectmallard.org/experimental/ui/">
+ <info>
+ <link type="guide" xref="index"/>
+ </info>
+ <title>${node.namespace.name}.${node.name}</title>
+ ${formatter.format(node.doc)}
+% if node.members:
+<table>
+% for member, ix in zip(node.members, range(len(node.members))):
+<tr>
+<td><p>${node.name}.${member.name.upper()} :</p></td>
+<td>${formatter.format(member.doc)}</td>
+</tr>
+% endfor
+</table>
+% endif
+
+</page>
diff --git a/giscanner/mallardwriter.py b/giscanner/mallardwriter.py
index 87b6f55c..5fd97048 100644
--- a/giscanner/mallardwriter.py
+++ b/giscanner/mallardwriter.py
@@ -210,6 +210,9 @@ class MallardWriter(object):
page_id = '%s.%s.%s' % (namespace.name, node.parent.name, node.name)
else:
page_id = '%s.%s' % (namespace.name, node.name)
+ elif isinstance(node, ast.Enum):
+ template_name = 'mallard-%s-enum.tmpl' % self._language
+ page_id = '%s.%s' % (namespace.name, node.name)
elif isinstance(node, ast.Property) and node.parent is not None:
template_name = 'mallard-%s-property.tmpl' % self._language
page_id = '%s.%s-%s' % (namespace.name, node.parent.name, node.name)
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ArrayType.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ArrayType.page
index 1a88368b..b169ec67 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ArrayType.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ArrayType.page
@@ -1,10 +1,11 @@
<?xml version="1.0"?>
<page id="GIRepository.ArrayType"
- type="topic"
- style=""
+ type="guide"
+ style="enum"
xmlns="http://projectmallard.org/1.0/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
+ <link type="guide" xref="index"/>
</info>
<title>GIRepository.ArrayType</title>
<p>The type of array in a <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link>.</p>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Direction.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Direction.page
index b010ba34..6378b774 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Direction.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Direction.page
@@ -1,10 +1,11 @@
<?xml version="1.0"?>
<page id="GIRepository.Direction"
- type="topic"
- style=""
+ type="guide"
+ style="enum"
xmlns="http://projectmallard.org/1.0/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
+ <link type="guide" xref="index"/>
</info>
<title>GIRepository.Direction</title>
<p>The direction of a <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link>.</p>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.InfoType.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.InfoType.page
index f9964f29..f447a0f8 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.InfoType.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.InfoType.page
@@ -1,10 +1,11 @@
<?xml version="1.0"?>
<page id="GIRepository.InfoType"
- type="topic"
- style=""
+ type="guide"
+ style="enum"
xmlns="http://projectmallard.org/1.0/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
+ <link type="guide" xref="index"/>
</info>
<title>GIRepository.InfoType</title>
<p>The type of a GIBaseInfo struct.</p>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.RepositoryError.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.RepositoryError.page
index 3f996c90..81fbd70f 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.RepositoryError.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.RepositoryError.page
@@ -1,10 +1,11 @@
<?xml version="1.0"?>
<page id="GIRepository.RepositoryError"
- type="topic"
- style=""
+ type="guide"
+ style="enum"
xmlns="http://projectmallard.org/1.0/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
+ <link type="guide" xref="index"/>
</info>
<title>GIRepository.RepositoryError</title>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ScopeType.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ScopeType.page
index 5f12828b..2d9360cc 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ScopeType.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ScopeType.page
@@ -1,10 +1,11 @@
<?xml version="1.0"?>
<page id="GIRepository.ScopeType"
- type="topic"
- style=""
+ type="guide"
+ style="enum"
xmlns="http://projectmallard.org/1.0/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
+ <link type="guide" xref="index"/>
</info>
<title>GIRepository.ScopeType</title>
<p>Scope type of a <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link> representing callback, determines how the
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Transfer.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Transfer.page
index 37319a50..86fbf348 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Transfer.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Transfer.page
@@ -1,10 +1,11 @@
<?xml version="1.0"?>
<page id="GIRepository.Transfer"
- type="topic"
- style=""
+ type="guide"
+ style="enum"
xmlns="http://projectmallard.org/1.0/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
+ <link type="guide" xref="index"/>
</info>
<title>GIRepository.Transfer</title>
<p>The transfer is the exchange of data between two parts, from the callee to
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.TypeTag.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.TypeTag.page
index 328d5fed..a2da1552 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.TypeTag.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.TypeTag.page
@@ -1,10 +1,11 @@
<?xml version="1.0"?>
<page id="GIRepository.TypeTag"
- type="topic"
- style=""
+ type="guide"
+ style="enum"
xmlns="http://projectmallard.org/1.0/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
+ <link type="guide" xref="index"/>
</info>
<title>GIRepository.TypeTag</title>
<p>The type tag of a <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link>.</p>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.nvokeError.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.nvokeError.page
index 3b3fec40..269351b6 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.nvokeError.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.nvokeError.page
@@ -1,10 +1,11 @@
<?xml version="1.0"?>
<page id="GIRepository.nvokeError"
- type="topic"
- style=""
+ type="guide"
+ style="enum"
xmlns="http://projectmallard.org/1.0/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
+ <link type="guide" xref="index"/>
</info>
<title>GIRepository.nvokeError</title>
<p>An error occuring while invoking a function via
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.ArrayType.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.ArrayType.page
index 1a88368b..77f9a655 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.ArrayType.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.ArrayType.page
@@ -1,11 +1,32 @@
<?xml version="1.0"?>
<page id="GIRepository.ArrayType"
- type="topic"
- style=""
+ type="guide"
+ style="enum"
xmlns="http://projectmallard.org/1.0/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
+ <link type="guide" xref="index"/>
</info>
<title>GIRepository.ArrayType</title>
-<p>The type of array in a <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link>.</p>
+ <p>The type of array in a <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link>.</p>
+
+<table>
+<tr>
+<td><p>ArrayType.C :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>ArrayType.ARRAY :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>ArrayType.PTR_ARRAY :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>ArrayType.BYTE_ARRAY :</p></td>
+<td></td>
+</tr>
+</table>
+
</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Direction.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Direction.page
index b010ba34..564e316e 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Direction.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Direction.page
@@ -1,11 +1,28 @@
<?xml version="1.0"?>
<page id="GIRepository.Direction"
- type="topic"
- style=""
+ type="guide"
+ style="enum"
xmlns="http://projectmallard.org/1.0/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
+ <link type="guide" xref="index"/>
</info>
<title>GIRepository.Direction</title>
-<p>The direction of a <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link>.</p>
+ <p>The direction of a <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link>.</p>
+
+<table>
+<tr>
+<td><p>Direction.IN :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>Direction.OUT :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>Direction.INOUT :</p></td>
+<td></td>
+</tr>
+</table>
+
</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.InfoType.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.InfoType.page
index f9964f29..da205239 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.InfoType.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.InfoType.page
@@ -1,11 +1,96 @@
<?xml version="1.0"?>
<page id="GIRepository.InfoType"
- type="topic"
- style=""
+ type="guide"
+ style="enum"
xmlns="http://projectmallard.org/1.0/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
+ <link type="guide" xref="index"/>
</info>
<title>GIRepository.InfoType</title>
-<p>The type of a GIBaseInfo struct.</p>
+ <p>The type of a GIBaseInfo struct.</p>
+
+<table>
+<tr>
+<td><p>InfoType.INVALID :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>InfoType.FUNCTION :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>InfoType.CALLBACK :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>InfoType.STRUCT :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>InfoType.BOXED :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>InfoType.ENUM :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>InfoType.FLAGS :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>InfoType.OBJECT :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>InfoType.INTERFACE :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>InfoType.CONSTANT :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>InfoType.INVALID_0 :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>InfoType.UNION :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>InfoType.VALUE :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>InfoType.SIGNAL :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>InfoType.VFUNC :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>InfoType.PROPERTY :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>InfoType.FIELD :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>InfoType.ARG :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>InfoType.TYPE :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>InfoType.UNRESOLVED :</p></td>
+<td></td>
+</tr>
+</table>
+
</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.RepositoryError.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.RepositoryError.page
index 3f996c90..9b09d1b8 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.RepositoryError.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.RepositoryError.page
@@ -1,11 +1,32 @@
<?xml version="1.0"?>
<page id="GIRepository.RepositoryError"
- type="topic"
- style=""
+ type="guide"
+ style="enum"
xmlns="http://projectmallard.org/1.0/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
+ <link type="guide" xref="index"/>
</info>
<title>GIRepository.RepositoryError</title>
+
+
+<table>
+<tr>
+<td><p>RepositoryError.TYPELIB_NOT_FOUND :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>RepositoryError.NAMESPACE_MISMATCH :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>RepositoryError.NAMESPACE_VERSION_CONFLICT :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>RepositoryError.LIBRARY_NOT_FOUND :</p></td>
+<td></td>
+</tr>
+</table>
</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.ScopeType.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.ScopeType.page
index 5f12828b..6125e4b2 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.ScopeType.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.ScopeType.page
@@ -1,13 +1,34 @@
<?xml version="1.0"?>
<page id="GIRepository.ScopeType"
- type="topic"
- style=""
+ type="guide"
+ style="enum"
xmlns="http://projectmallard.org/1.0/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
+ <link type="guide" xref="index"/>
</info>
<title>GIRepository.ScopeType</title>
-<p>Scope type of a <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link> representing callback, determines how the
+ <p>Scope type of a <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link> representing callback, determines how the
callback is invoked and is used to decided when the invoke structs
can be freed.</p>
+
+<table>
+<tr>
+<td><p>ScopeType.INVALID :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>ScopeType.CALL :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>ScopeType.ASYNC :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>ScopeType.NOTIFIED :</p></td>
+<td></td>
+</tr>
+</table>
+
</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Transfer.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Transfer.page
index 37319a50..3d392ab1 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Transfer.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Transfer.page
@@ -1,13 +1,14 @@
<?xml version="1.0"?>
<page id="GIRepository.Transfer"
- type="topic"
- style=""
+ type="guide"
+ style="enum"
xmlns="http://projectmallard.org/1.0/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
+ <link type="guide" xref="index"/>
</info>
<title>GIRepository.Transfer</title>
-<p>The transfer is the exchange of data between two parts, from the callee to
+ <p>The transfer is the exchange of data between two parts, from the callee to
the caller. The callee is either a function/method/signal or an
object/interface where a property is defined. The caller is the side
accessing a property or calling a function.
@@ -17,4 +18,20 @@ an array or a hash table the container itself is specified differently from
the items within the container itself. Each container is freed differently,
check the documentation for the types themselves for information on how to
free them.</p>
+
+<table>
+<tr>
+<td><p>Transfer.NOTHING :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>Transfer.CONTAINER :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>Transfer.EVERYTHING :</p></td>
+<td></td>
+</tr>
+</table>
+
</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.TypeTag.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.TypeTag.page
index 328d5fed..91a86b65 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.TypeTag.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.TypeTag.page
@@ -1,11 +1,104 @@
<?xml version="1.0"?>
<page id="GIRepository.TypeTag"
- type="topic"
- style=""
+ type="guide"
+ style="enum"
xmlns="http://projectmallard.org/1.0/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
+ <link type="guide" xref="index"/>
</info>
<title>GIRepository.TypeTag</title>
-<p>The type tag of a <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link>.</p>
+ <p>The type tag of a <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link>.</p>
+
+<table>
+<tr>
+<td><p>TypeTag.VOID :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>TypeTag.BOOLEAN :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>TypeTag.INT8 :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>TypeTag.UINT8 :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>TypeTag.INT16 :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>TypeTag.UINT16 :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>TypeTag.INT32 :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>TypeTag.UINT32 :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>TypeTag.INT64 :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>TypeTag.UINT64 :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>TypeTag.FLOAT :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>TypeTag.DOUBLE :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>TypeTag.GTYPE :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>TypeTag.UTF8 :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>TypeTag.FILENAME :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>TypeTag.ARRAY :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>TypeTag.INTERFACE :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>TypeTag.GLIST :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>TypeTag.GSLIST :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>TypeTag.GHASH :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>TypeTag.ERROR :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>TypeTag.UNICHAR :</p></td>
+<td></td>
+</tr>
+</table>
+
</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.nvokeError.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.nvokeError.page
index 3b3fec40..fe0c7327 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.nvokeError.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.nvokeError.page
@@ -1,12 +1,29 @@
<?xml version="1.0"?>
<page id="GIRepository.nvokeError"
- type="topic"
- style=""
+ type="guide"
+ style="enum"
xmlns="http://projectmallard.org/1.0/"
xmlns:ui="http://projectmallard.org/experimental/ui/">
<info>
+ <link type="guide" xref="index"/>
</info>
<title>GIRepository.nvokeError</title>
-<p>An error occuring while invoking a function via
+ <p>An error occuring while invoking a function via
g_function_info_invoke().</p>
+
+<table>
+<tr>
+<td><p>nvokeError.FAILED :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>nvokeError.SYMBOL_NOT_FOUND :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>nvokeError.ARGUMENT_MISMATCH :</p></td>
+<td></td>
+</tr>
+</table>
+
</page>