Add spec-to-docbook.xsl for converting a telepathy spec to DocBook XML. Improve spec-to-introspect.xsl - no more extra spaces in type declarations.

4 files changed, 1305 insertions, 93 deletions

diff --git a/secret-service/org.freedesktop.Secrets.xml b/secret-service/org.freedesktop.Secrets.xml
index ac43135..b69f06d 100644
--- a/secret-service/org.freedesktop.Secrets.xml
+++ b/secret-service/org.freedesktop.Secrets.xml
@@ -48,7 +48,7 @@
     -->
 
     <tp:struct name="Secret">
-        <tp:docstring>The #Secret type holds a (possibly encoded) secret.</tp:docstring>
+        <tp:docstring>The Secret type holds a (possibly encoded) secret.</tp:docstring>
         <tp:member type="s" name="algorithm">
             <tp:docstring>Algorithm used to encode the secrets value.</tp:docstring>
         </tp:member>
@@ -65,7 +65,7 @@
         <tp:member type="o" name="Key">
             <tp:docstring>D-Bus object-path</tp:docstring>
         </tp:member>
-        <tp:member type="sayay" name="Value" tp:type="Secret">
+        <tp:member type="(sayay)" name="Value" tp:type="Secret">
             <tp:docstring>A secret</tp:docstring>
         </tp:member>
     </tp:mapping>
diff --git a/secret-service/tools/resolve-type.xsl b/secret-service/tools/resolve-type.xsl
new file mode 100644
index 0000000..a37f2af
--- /dev/null
+++ b/secret-service/tools/resolve-type.xsl
@@ -0,0 +1,122 @@
+<?xml version="1.0"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0"
+  xmlns:html="http://www.w3.org/1999/xhtml"
+  exclude-result-prefixes="tp html">
+
+<!--
+    Helper templates for Telepathy D-Bus Introspection conversion.
+
+    Copyright (C) 2009 Michael Leupold <lemma@confuego.org>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+-->
+
+    <!-- Resolve the type a node has. This will first look at tp:type and
+        - if not found - use the type attribute -->
+    <xsl:template name="ResolveType">
+        <xsl:param name="node"/>
+        <xsl:variable name="unstripped">
+            <xsl:choose>
+                <xsl:when test="$node//@tp:type">
+                    <xsl:call-template name="TpType">
+                        <xsl:with-param name="type" select="$node//@tp:type"/>
+                    </xsl:call-template>
+                </xsl:when>
+                <xsl:when test="$node//@type">
+                    <xsl:call-template name="DBusType">
+                        <xsl:with-param name="type" select="$node//@type"/>
+                    </xsl:call-template>
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:message terminate="yes">
+                        Node doesn't contain a type.
+                    </xsl:message>
+                </xsl:otherwise>
+            </xsl:choose>
+        </xsl:variable>
+        <xsl:value-of select="translate(translate($unstripped, ' ', ''), '&#xa;', '')"/>
+    </xsl:template>
+
+    <!-- Map a D-Bus type to its EggDBus counterpart -->
+    <xsl:template name="DBusType">
+        <xsl:param name="type"/>
+        <xsl:choose>
+            <xsl:when test="$type='o'">ObjectPath</xsl:when>
+            <xsl:when test="$type='s'">String</xsl:when>
+            <xsl:when test="$type='y'">Byte</xsl:when>
+            <xsl:when test="$type='b'">Boolean</xsl:when>
+            <xsl:when test="$type='n'">Int16</xsl:when>
+            <xsl:when test="$type='q'">UInt16</xsl:when>
+            <xsl:when test="$type='i'">Int32</xsl:when>
+            <xsl:when test="$type='u'">UInt32</xsl:when>
+            <xsl:when test="$type='x'">Int64</xsl:when>
+            <xsl:when test="$type='t'">UInt64</xsl:when>
+            <xsl:when test="$type='d'">Double</xsl:when>
+            <xsl:when test="$type='g'">Signature</xsl:when>
+            <xsl:when test="$type='v'">Variant</xsl:when>
+            <xsl:when test="starts-with($type, 'a{')">
+                Dict&lt;
+                <xsl:call-template name="DBusType">
+                    <xsl:with-param name="type" select="substring($type, 3, 1)"/>
+                </xsl:call-template>
+                ,
+                <xsl:call-template name="DBusType">
+                    <xsl:with-param name="type" select="substring($type, 4, 1)"/>
+                </xsl:call-template>
+                &gt;
+            </xsl:when>
+            <xsl:when test="starts-with($type, 'a')">
+                Array&lt;
+                <xsl:call-template name="DBusType">
+                    <xsl:with-param name="type" select="substring($type, 2)"/>
+                </xsl:call-template>
+                &gt;
+            </xsl:when>
+            <!-- TODO: doesn't implement dict-entries and structs -->
+            <xsl:otherwise>
+                <xsl:message terminate="yes">
+                    Unknown DBus Type <xsl:value-of select="$type"/>
+                </xsl:message>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
+
+    <!-- Resolve tp:type attributes by searching for matching tp:struct
+            and tp:mapping elements -->
+    <xsl:template name="TpType">
+        <xsl:param name="type"/>
+        <xsl:choose>
+            <xsl:when test="/tp:spec/tp:struct[@name=$type]">
+                <xsl:value-of select="$type"/>
+            </xsl:when>
+            <xsl:when test="/tp:spec/tp:mapping[@name=$type]">
+                Dict&lt;
+                <xsl:call-template name="ResolveType">
+                    <xsl:with-param name="node" select="/tp:spec/tp:mapping[@name=$type]/tp:member[@name='Key']"/>
+                </xsl:call-template>,
+                <xsl:call-template name="ResolveType">
+                    <xsl:with-param name="node" select="/tp:spec/tp:mapping[@name=$type]/tp:member[@name='Value']"/>
+                </xsl:call-template>
+                &gt;
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:message terminate="yes">
+                    Unspecified type <xsl:value-of select="$type"/>.
+                </xsl:message>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
+</xsl:stylesheet>
diff --git a/secret-service/tools/spec-to-docbook.xsl b/secret-service/tools/spec-to-docbook.xsl
new file mode 100644
index 0000000..33446a1
--- /dev/null
+++ b/secret-service/tools/spec-to-docbook.xsl
@@ -0,0 +1,1168 @@
+<?xml version="1.0"?>
+
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0"
+  xmlns:html="http://www.w3.org/1999/xhtml"
+  exclude-result-prefixes="tp html">
+
+<!--
+    Telepathy D-Bus Introspection to Docbook XML translator.
+    Based on Telepathy's doc-generator.xsl.
+
+    Copyright (C) 2006-2008 Collabora Limited
+    Copyright (C) 2009 Michael Leupold <lemma@confuego.org>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+-->
+
+  <xsl:output method="xml" indent="yes" encoding="ascii"
+    omit-xml-declaration="no"
+    doctype-system="docbookV4.5/docbookx.dtd"
+    doctype-public="-//OASIS//DTD DocBook XML V4.5//EN"/>
+
+  <xsl:include href="resolve-type.xsl"/>
+
+  <xsl:param name="allow-undefined-interfaces" select="false()"/>
+
+  <xsl:template match="html:* | @*">
+    <xsl:copy>
+      <xsl:apply-templates/>
+    </xsl:copy>
+  </xsl:template>
+
+  <xsl:template match="tp:type">
+    <xsl:call-template name="tp-type">
+      <xsl:with-param name="tp-type" select="string(.)"/>
+    </xsl:call-template>
+  </xsl:template>
+
+  <!-- tp:dbus-ref: reference a D-Bus interface, signal, method or property -->
+  <xsl:template match="tp:dbus-ref">
+    <xsl:variable name="name">
+      <xsl:choose>
+        <xsl:when test="@namespace">
+          <xsl:value-of select="@namespace"/>
+          <xsl:text>.</xsl:text>
+        </xsl:when>
+      </xsl:choose>
+      <xsl:value-of select="string(.)"/>
+    </xsl:variable>
+
+    <xsl:choose>
+      <xsl:when test="//interface[@name=$name]
+        or //interface/method[concat(../@name, '.', @name)=$name]
+        or //interface/signal[concat(../@name, '.', @name)=$name]
+        or //interface/property[concat(../@name, '.', @name)=$name]
+        or //interface[@name=concat($name, '.DRAFT')]
+        or //interface/method[
+          concat(../@name, '.', @name)=concat($name, '.DRAFT')]
+        or //interface/signal[
+          concat(../@name, '.', @name)=concat($name, '.DRAFT')]
+        or //interface/property[
+          concat(../@name, '.', @name)=concat($name, '.DRAFT')]
+        ">
+        <link linkend="{$name}">
+          <literal><xsl:value-of select="$name"/></literal>
+        </link>
+      </xsl:when>
+
+      <xsl:when test="$allow-undefined-interfaces">
+        <!-- TODO: Convert to docbook -->
+        <span xmlns="http://www.w3.org/1999/xhtml" title="defined elsewhere">
+          <xsl:value-of select="string(.)"/>
+        </span>
+      </xsl:when>
+
+      <xsl:otherwise>
+        <xsl:message terminate="yes">
+          <xsl:text>ERR: cannot find D-Bus interface, method, </xsl:text>
+          <xsl:text>signal or property called '</xsl:text>
+          <xsl:value-of select="$name"/>
+          <xsl:text>'&#10;</xsl:text>
+        </xsl:message>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+  <!-- tp:member-ref: reference a property of the current interface -->
+  <xsl:template match="tp:member-ref">
+    <xsl:variable name="prefix" select="concat(ancestor::interface/@name,
+      '.')"/>
+    <xsl:variable name="name" select="string(.)"/>
+
+    <xsl:if test="not(ancestor::interface)">
+      <xsl:message terminate="yes">
+        <xsl:text>ERR: Cannot use tp:member-ref when not in an</xsl:text>
+        <xsl:text> &lt;interface&gt;&#10;</xsl:text>
+      </xsl:message>
+    </xsl:if>
+
+    <xsl:choose>
+      <xsl:when test="ancestor::interface/signal[@name=$name]"/>
+      <xsl:when test="ancestor::interface/method[@name=$name]"/>
+      <xsl:when test="ancestor::interface/property[@name=$name]"/>
+      <xsl:otherwise>
+        <xsl:message terminate="yes">
+          <xsl:text>ERR: interface </xsl:text>
+          <xsl:value-of select="ancestor::interface/@name"/>
+          <xsl:text> has no signal/method/property called </xsl:text>
+          <xsl:value-of select="$name"/>
+          <xsl:text>&#10;</xsl:text>
+        </xsl:message>
+      </xsl:otherwise>
+    </xsl:choose>
+
+    <link linkend="{$prefix}{$name}">
+      <literal><xsl:value-of select="concat($prefix, $name)"/></literal>
+    </link>
+  </xsl:template>
+
+  <xsl:template match="*" mode="identity">
+    <xsl:copy>
+      <xsl:apply-templates mode="identity"/>
+    </xsl:copy>
+  </xsl:template>
+
+  <xsl:template match="tp:docstring">
+    <para><xsl:value-of select="text()"/></para>
+  </xsl:template>
+
+  <xsl:template match="tp:docstring" mode="nopara">
+    <xsl:value-of select="text()"/>
+  </xsl:template>
+
+  <xsl:template match="tp:added">
+    <para>
+      Added in version <xsl:value-of select="@version"/>.
+      <xsl:apply-templates select="node()"/>
+    </para>
+  </xsl:template>
+
+  <xsl:template match="tp:changed">
+    <xsl:choose>
+      <xsl:when test="node()">
+        <para>
+          Changed in version <xsl:value-of select="@version"/>:
+          <xsl:apply-templates select="node()"/></para>
+      </xsl:when>
+      <xsl:otherwise>
+        <para>Changed in version
+          <xsl:value-of select="@version"/></para>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+  <xsl:template match="tp:deprecated">
+    <para>
+      Deprecated since version <xsl:value-of select="@version"/>.
+      <xsl:apply-templates select="node()"/>
+    </para>
+  </xsl:template>
+
+  <xsl:template match="tp:rationale">
+    <!-- TODO: special? -->
+    <para>
+      <xsl:apply-templates select="node()"/>
+    </para>
+  </xsl:template>
+
+  <xsl:template match="tp:errors">
+    <title>Errors</title>
+    <xsl:apply-templates/>
+  </xsl:template>
+
+  <xsl:template name="generic-types">
+    <chapter>
+        <title>Types</title>
+        <xsl:call-template name="do-types"/>
+    </chapter>
+  </xsl:template>
+
+  <xsl:template name="do-types">
+    <xsl:if test="tp:simple-type">
+      <sect1>
+        <title>Simple types</title>
+        <xsl:apply-templates select="tp:simple-type"/>
+      </sect1>
+    </xsl:if>
+
+    <xsl:if test="tp:enum">
+      <sect1>
+        <title>Enumerated types</title>
+        <xsl:apply-templates select="tp:enum"/>
+      </sect1>
+    </xsl:if>
+
+    <xsl:if test="tp:flags">
+      <sect1>
+        <title>Sets of flags</title>
+        <xsl:apply-templates select="tp:flags"/>
+      </sect1>
+    </xsl:if>
+
+    <xsl:if test="tp:struct">
+      <sect1>
+        <title>Struct types</title>
+        <xsl:apply-templates select="tp:struct"/>
+      </sect1>
+    </xsl:if>
+
+    <xsl:if test="tp:mapping">
+      <sect1>
+        <title>Map types</title>
+        <xsl:apply-templates select="tp:mapping"/>
+      </sect1>
+    </xsl:if>
+
+    <xsl:if test="tp:external-type">
+      <sect1>
+        <title>Types defined elsewhere</title>
+        <glosslist>
+          <xsl:apply-templates select="tp:external-type"/>
+        </glosslist>
+      </sect1>
+    </xsl:if>
+  </xsl:template>
+
+  <xsl:template match="tp:error">
+    <simplesect>
+      <title id="{concat(../@namespace, '.', translate(@name, ' ', ''))}">
+        <literal><xsl:value-of select="concat(../@namespace, '.', translate(@name, ' ', ''))"/></literal>
+      </title>
+      <xsl:apply-templates select="tp:docstring"/>
+      <xsl:apply-templates select="tp:added"/>
+      <xsl:apply-templates select="tp:changed"/>
+      <xsl:apply-templates select="tp:deprecated"/>
+    </simplesect>
+  </xsl:template>
+
+  <xsl:template match="/tp:spec/tp:copyright">
+    <!-- TODO: use <copyright> -->
+    <para>
+      <xsl:apply-templates mode="text"/>
+    </para>
+  </xsl:template>
+  <xsl:template match="/tp:spec/tp:license">
+    <!-- TODO: right tag? -->
+    <legalnotice>
+      <para>
+        <xsl:apply-templates/>
+      </para>
+    </legalnotice>
+  </xsl:template>
+
+  <xsl:template match="tp:copyright"/>
+  <xsl:template match="tp:license"/>
+
+  <xsl:template match="interface"><sect1>
+    <title id="{@name}"><literal><xsl:value-of select="@name"/></literal></title>
+
+    <xsl:if test="@tp:causes-havoc">
+      <warning>
+        <para>
+          This interface is <xsl:value-of select="@tp:causes-havoc"/>
+          and is likely to cause havoc to your API/ABI if bindings are generated.
+          Don't include it in libraries that care about compatibility.
+        </para>
+      </warning>
+    </xsl:if>
+
+    <xsl:if test="tp:requires">
+      <tip>
+        <para>Implementations of this interface must also implement:</para>
+        <itemizedlist>
+          <xsl:for-each select="tp:requires">
+            <listitem>
+              <para>
+                <link linkend="{@interface}">
+                  <literal><xsl:value-of select="@interface"/></literal>
+                </link>
+              </para>
+            </listitem>
+          </xsl:for-each>
+        </itemizedlist>
+      </tip>
+    </xsl:if>
+
+    <xsl:apply-templates select="tp:docstring" />
+    <xsl:apply-templates select="tp:added"/>
+    <xsl:apply-templates select="tp:changed"/>
+    <xsl:apply-templates select="tp:deprecated"/>
+
+    <xsl:if test="method">
+      <sect2>
+        <title>Methods</title>
+        <xsl:apply-templates select="method"/>
+      </sect2>
+    </xsl:if>
+
+    <xsl:if test="signal">
+      <sect2>
+        <title>Signals</title>
+        <xsl:apply-templates select="signal"/>
+      </sect2>
+    </xsl:if>
+
+    <xsl:if test="tp:property">
+      <sect3>
+        <title>Telepathy Properties</title>
+        <para>
+          Accessed using the
+          <link linkend="org.freedesktop.Telepathy.Properties">
+            <literal>org.freedesktop.Telepathy.Properties</literal>
+          </link>
+        </para>
+        <glosslist>
+          <xsl:apply-templates select="tp:property"/>
+        </glosslist>
+      </sect3>
+    </xsl:if>
+
+    <xsl:if test="property">
+      <sect2>
+        <title>D-Bus Properties</title>
+        <para>
+          Accessed using the org.freedesktop.DBus.Properties interface.
+        </para>
+        <glosslist>
+          <xsl:apply-templates select="property"/>
+        </glosslist>
+      </sect2>
+    </xsl:if>
+
+    <xsl:call-template name="do-types"/>
+
+  </sect1></xsl:template>
+
+  <xsl:template match="tp:flags">
+
+    <xsl:if test="not(@name) or @name = ''">
+      <xsl:message terminate="yes">
+        <xsl:text>ERR: missing @name on a tp:flags type&#10;</xsl:text>
+      </xsl:message>
+    </xsl:if>
+
+    <xsl:if test="not(@type) or @type = ''">
+      <xsl:message terminate="yes">
+        <xsl:text>ERR: missing @type on tp:flags type</xsl:text>
+        <xsl:value-of select="@name"/>
+        <xsl:text>&#10;</xsl:text>
+      </xsl:message>
+    </xsl:if>
+
+    <sect3>
+      <title id="type-{@name}"><literal><xsl:value-of select="@name"/></literal></title>
+      <xsl:apply-templates select="tp:docstring" />
+      <xsl:apply-templates select="tp:added"/>
+      <xsl:apply-templates select="tp:changed"/>
+      <xsl:apply-templates select="tp:deprecated"/>
+      <glosslist>
+        <xsl:variable name="value-prefix">
+          <xsl:choose>
+            <xsl:when test="@value-prefix">
+              <xsl:value-of select="@value-prefix"/>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:value-of select="@name"/>
+            </xsl:otherwise>
+          </xsl:choose>
+        </xsl:variable>
+        <xsl:for-each select="tp:flag">
+          <glossentry>
+            <glossterm>
+              <xsl:value-of select="concat($value-prefix, '_', @suffix)"/> = <xsl:value-of select="@value"/>
+            </glossterm>
+            <glossdef>
+              <xsl:choose>
+                <xsl:when test="tp:docstring">
+                  <xsl:apply-templates select="tp:docstring" />
+                  <xsl:apply-templates select="tp:added"/>
+                  <xsl:apply-templates select="tp:changed"/>
+                  <xsl:apply-templates select="tp:deprecated"/>
+                </xsl:when>
+                <xsl:otherwise>
+                  (Undocumented)
+                </xsl:otherwise>
+              </xsl:choose>
+            </glossdef>
+          </glossentry>
+        </xsl:for-each>
+      </glosslist>
+    </sect3>
+  </xsl:template>
+
+  <xsl:template match="tp:enum">
+
+    <xsl:if test="not(@name) or @name = ''">
+      <xsl:message terminate="yes">
+        <xsl:text>ERR: missing @name on a tp:enum type&#10;</xsl:text>
+      </xsl:message>
+    </xsl:if>
+
+    <xsl:if test="not(@type) or @type = ''">
+      <xsl:message terminate="yes">
+        <xsl:text>ERR: missing @type on tp:enum type</xsl:text>
+        <xsl:value-of select="@name"/>
+        <xsl:text>&#10;</xsl:text>
+      </xsl:message>
+    </xsl:if>
+
+    <sect3>
+      <title id="type-{@name}"><literal><xsl:value-of select="@name"/></literal></title>
+      <xsl:apply-templates select="tp:docstring" />
+      <xsl:apply-templates select="tp:added"/>
+      <xsl:apply-templates select="tp:changed"/>
+      <xsl:apply-templates select="tp:deprecated"/>
+      <glosslist>
+        <xsl:variable name="value-prefix">
+          <xsl:choose>
+            <xsl:when test="@value-prefix">
+              <xsl:value-of select="@value-prefix"/>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:value-of select="@name"/>
+            </xsl:otherwise>
+          </xsl:choose>
+        </xsl:variable>
+        <xsl:for-each select="tp:enumvalue">
+          <glossentry>
+            <glossterm>
+              <xsl:value-of select="concat($value-prefix, '_', @suffix)"/> = <xsl:value-of select="@value"/>
+            </glossterm>
+            <glossdef>
+              <xsl:choose>
+                <xsl:when test="tp:docstring">
+                  <xsl:apply-templates select="tp:docstring" />
+                  <xsl:apply-templates select="tp:added"/>
+                  <xsl:apply-templates select="tp:changed"/>
+                  <xsl:apply-templates select="tp:deprecated"/>
+                </xsl:when>
+                <xsl:otherwise>
+                  (Undocumented)
+                </xsl:otherwise>
+              </xsl:choose>
+            </glossdef>
+          </glossentry>
+        </xsl:for-each>
+      </glosslist>
+    </sect3>
+  </xsl:template>
+
+  <xsl:template match="property">
+
+    <xsl:if test="not(parent::interface)">
+      <xsl:message terminate="yes">
+        <xsl:text>ERR: property </xsl:text>
+        <xsl:value-of select="@name"/>
+        <xsl:text> does not have an interface as parent&#10;</xsl:text>
+      </xsl:message>
+    </xsl:if>
+
+    <xsl:if test="not(@name) or @name = ''">
+      <xsl:message terminate="yes">
+        <xsl:text>ERR: missing @name on a property of </xsl:text>
+        <xsl:value-of select="../@name"/>
+        <xsl:text>&#10;</xsl:text>
+      </xsl:message>
+    </xsl:if>
+
+    <xsl:if test="not(@type) or @type = ''">
+      <xsl:message terminate="yes">
+        <xsl:text>ERR: missing @type on property </xsl:text>
+        <xsl:value-of select="concat(../@name, '.', @name)"/>
+        <xsl:text>: '</xsl:text>
+        <xsl:value-of select="@access"/>
+        <xsl:text>'&#10;</xsl:text>
+      </xsl:message>
+    </xsl:if>
+
+    <glossentry>
+      <glossterm id="{concat(../@name, '.', @name)}">
+        <xsl:value-of select="@name"/> -
+        <literal>
+          <xsl:call-template name="ResolveType">
+            <xsl:with-param name="node" select="."/>
+          </xsl:call-template>
+        </literal>
+        <xsl:text>, </xsl:text>
+        <xsl:choose>
+          <xsl:when test="@access = 'read'">
+            <xsl:text>read-only</xsl:text>
+          </xsl:when>
+          <xsl:when test="@access = 'write'">
+            <xsl:text>write-only</xsl:text>
+          </xsl:when>
+          <xsl:when test="@access = 'readwrite'">
+            <xsl:text>read/write</xsl:text>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:message terminate="yes">
+              <xsl:text>ERR: unknown or missing value for </xsl:text>
+              <xsl:text>@access on property </xsl:text>
+              <xsl:value-of select="concat(../@name, '.', @name)"/>
+              <xsl:text>: '</xsl:text>
+              <xsl:value-of select="@access"/>
+              <xsl:text>'&#10;</xsl:text>
+            </xsl:message>
+          </xsl:otherwise>
+        </xsl:choose>
+      </glossterm>
+      <glossdef>
+        <xsl:apply-templates select="tp:docstring"/>
+        <xsl:apply-templates select="tp:added"/>
+        <xsl:apply-templates select="tp:changed"/>
+        <xsl:apply-templates select="tp:deprecated"/>
+      </glossdef>
+    </glossentry>
+  </xsl:template>
+
+  <xsl:template match="tp:property">
+    <glossentry>
+      <glossterm>
+        <xsl:if test="@name">
+          <xsl:value-of select="@name"/> −
+        </xsl:if>
+        <xsl:value-of select="@type"/>
+      </glossterm>
+      <glossdef>
+        <xsl:apply-templates select="tp:docstring"/>
+        <xsl:apply-templates select="tp:added"/>
+        <xsl:apply-templates select="tp:changed"/>
+        <xsl:apply-templates select="tp:deprecated"/>
+      </glossdef>
+    </glossentry>
+  </xsl:template>
+
+  <xsl:template match="tp:mapping">
+    <sect2>
+      <title id="type-{@name}">
+        <literal><xsl:value-of select="@name"/></literal>
+      </title>
+      <xsl:apply-templates select="tp:docstring"/>
+      <xsl:if test="string(@array-name) != ''">
+        <para>
+          In bindings that need a separate name, arrays of
+          <xsl:value-of select="@name"/> should be called
+          <xsl:value-of select="@array-name"/>.
+        </para>
+      </xsl:if>
+      <sect3>
+        <title>Members</title>
+        <glosslist>
+          <xsl:apply-templates select="tp:member" mode="descriptionwithtype"/>
+        </glosslist>
+      </sect3>
+    </sect2>
+  </xsl:template>
+
+  <xsl:template match="tp:docstring" mode="in-index"/>
+
+  <xsl:template match="tp:simple-type | tp:enum | tp:flags | tp:external-type"
+    mode="in-index">
+    − <xsl:value-of select="@type"/>
+  </xsl:template>
+
+  <xsl:template match="tp:simple-type">
+
+    <xsl:if test="not(@name) or @name = ''">
+      <xsl:message terminate="yes">
+        <xsl:text>ERR: missing @name on a tp:simple-type&#10;</xsl:text>
+      </xsl:message>
+    </xsl:if>
+
+    <xsl:if test="not(@type) or @type = ''">
+      <xsl:message terminate="yes">
+        <xsl:text>ERR: missing @type on tp:simple-type</xsl:text>
+        <xsl:value-of select="@name"/>
+        <xsl:text>&#10;</xsl:text>
+      </xsl:message>
+    </xsl:if>
+
+    <sect3>
+      <title id="type-{@name}">
+        <literal><xsl:value-of select="@name"/> − <xsl:value-of select="@type"/></literal>
+      </title>
+      <para>
+        <xsl:apply-templates select="tp:docstring"/>
+        <xsl:apply-templates select="tp:added"/>
+        <xsl:apply-templates select="tp:changed"/>
+        <xsl:apply-templates select="tp:deprecated"/>
+      </para>
+    </sect3>
+  </xsl:template>
+
+  <xsl:template match="tp:external-type">
+
+    <xsl:if test="not(@name) or @name = ''">
+      <xsl:message terminate="yes">
+        <xsl:text>ERR: missing @name on a tp:external-type&#10;</xsl:text>
+      </xsl:message>
+    </xsl:if>
+
+    <xsl:if test="not(@type) or @type = ''">
+      <xsl:message terminate="yes">
+        <xsl:text>ERR: missing @type on tp:external-type</xsl:text>
+        <xsl:value-of select="@name"/>
+        <xsl:text>&#10;</xsl:text>
+      </xsl:message>
+    </xsl:if>
+
+    <glossentry>
+      <glossterm id="type-{@name}">
+          <xsl:value-of select="@name"/> − <xsl:value-of select="@type"/>
+      </glossterm>
+      <glossdef>Defined by: <xsl:value-of select="@from"/></glossdef>
+    </glossentry>
+  </xsl:template>
+
+  <xsl:template match="tp:struct" mode="in-index">
+    − ( <xsl:for-each select="tp:member">
+          <xsl:value-of select="@type"/>
+          <xsl:if test="position() != last()">, </xsl:if>
+        </xsl:for-each> )
+  </xsl:template>
+
+  <xsl:template match="tp:mapping" mode="in-index">
+    − a{ <xsl:for-each select="tp:member">
+          <xsl:value-of select="@type"/>
+          <xsl:if test="position() != last()"> &#x2192; </xsl:if>
+        </xsl:for-each> }
+  </xsl:template>
+
+  <xsl:template match="tp:struct">
+    <sect2>
+      <title id="type-{@name}">
+        <literal>
+          <xsl:value-of select="@name"/>
+        </literal>
+      </title>
+      <xsl:apply-templates select="tp:docstring"/>
+      <xsl:apply-templates select="tp:added"/>
+      <xsl:apply-templates select="tp:changed"/>
+      <xsl:apply-templates select="tp:deprecated"/>
+      <xsl:choose>
+        <xsl:when test="string(@array-name) != ''">
+          <para>In bindings that need a separate name, arrays of
+            <xsl:value-of select="@name"/> should be called
+            <xsl:value-of select="@array-name"/>.</para>
+        </xsl:when>
+        <xsl:otherwise>
+          <para>Arrays of <xsl:value-of select="@name"/> don't generally
+            make sense.</para>
+        </xsl:otherwise>
+      </xsl:choose>
+      <classsynopsis language="c">
+        <ooclass>
+          <modifier>struct</modifier>
+          <classname><xsl:value-of select="@name"/></classname>
+        </ooclass>
+        <xsl:apply-templates select="tp:member" mode="fieldsynopsis"/>
+      </classsynopsis>
+      <glosslist>
+        <xsl:apply-templates select="tp:member" mode="description"/>
+      </glosslist>
+    </sect2>
+  </xsl:template>
+
+  <xsl:template match="arg" mode="paramdef">
+    <paramdef>
+      <xsl:call-template name="ResolveType">
+        <xsl:with-param name="node" select="."/>
+      </xsl:call-template>
+      <xsl:text> </xsl:text>
+      <parameter><xsl:value-of select="@name"/></parameter>
+    </paramdef>
+  </xsl:template>
+  <xsl:template match="arg" mode="paramtable">
+    <row>
+      <entry><xsl:value-of select="@name"/></entry>
+      <entry>
+        <xsl:call-template name="ResolveType">
+            <xsl:with-param name="node" select="."/>
+        </xsl:call-template>
+      </entry>
+      <xsl:if test="not(parent::signal)">
+        <entry><xsl:value-of select="@direction"/></entry>
+      </xsl:if>
+      <entry><xsl:apply-templates select="tp:docstring" mode="nopara"/></entry>
+    </row>
+  </xsl:template>
+
+  <xsl:template match="method">
+
+    <xsl:if test="not(parent::interface)">
+      <xsl:message terminate="yes">
+        <xsl:text>ERR: method </xsl:text>
+        <xsl:value-of select="@name"/>
+        <xsl:text> does not have an interface as parent&#10;</xsl:text>
+      </xsl:message>
+    </xsl:if>
+
+    <xsl:if test="not(@name) or @name = ''">
+      <xsl:message terminate="yes">
+        <xsl:text>ERR: missing @name on a method of </xsl:text>
+        <xsl:value-of select="../@name"/>
+        <xsl:text>&#10;</xsl:text>
+      </xsl:message>
+    </xsl:if>
+
+    <xsl:for-each select="arg">
+      <xsl:if test="not(@type) or @type = ''">
+        <xsl:message terminate="yes">
+          <xsl:text>ERR: an arg of method </xsl:text>
+          <xsl:value-of select="concat(../../@name, '.', ../@name)"/>
+          <xsl:text> has no type</xsl:text>
+        </xsl:message>
+      </xsl:if>
+      <xsl:choose>
+        <xsl:when test="@direction='in'">
+          <xsl:if test="not(@name) or @name = ''">
+            <xsl:message terminate="yes">
+              <xsl:text>ERR: an 'in' arg of method </xsl:text>
+              <xsl:value-of select="concat(../../@name, '.', ../@name)"/>
+              <xsl:text> has no name</xsl:text>
+            </xsl:message>
+          </xsl:if>
+        </xsl:when>
+        <xsl:when test="@direction='out'">
+          <xsl:if test="not(@name) or @name = ''">
+            <xsl:message terminate="no">
+              <xsl:text>INFO: an 'out' arg of method </xsl:text>
+              <xsl:value-of select="concat(../../@name, '.', ../@name)"/>
+              <xsl:text> has no name</xsl:text>
+            </xsl:message>
+          </xsl:if>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:message terminate="yes">
+            <xsl:text>ERR: an arg of method </xsl:text>
+            <xsl:value-of select="concat(../../@name, '.', ../@name)"/>
+            <xsl:text> has direction neither 'in' nor 'out'</xsl:text>
+          </xsl:message>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:for-each>
+
+    <sect3>
+      <title id="{concat(../@name, concat('.', @name))}">
+        <literal><xsl:value-of select="concat(../@name, concat('.', @name))"/></literal>
+      </title>
+      <para>
+        <funcsynopsis>
+            <funcprototype>
+            <funcdef>
+                <function><xsl:value-of select="@name"/></function>
+            </funcdef>
+            <xsl:choose>
+                <xsl:when test="arg">
+                <xsl:apply-templates select="arg" mode="paramdef"/>
+                </xsl:when>
+                <xsl:otherwise>
+                <void/>
+                </xsl:otherwise>
+            </xsl:choose>
+            </funcprototype>
+        </funcsynopsis>
+      </para>
+      <xsl:apply-templates select="tp:docstring" />
+      <xsl:apply-templates select="tp:added"/>
+      <xsl:apply-templates select="tp:changed"/>
+      <xsl:apply-templates select="tp:deprecated"/>
+
+        <xsl:if test="arg">
+          <table>
+            <title>Parameters</title>
+            <tgroup cols="4">
+              <thead>
+                <row>
+                  <entry>Name</entry>
+                  <entry>Type</entry>
+                  <entry>Direction</entry>
+                  <entry>Description</entry>
+                </row>
+              </thead>
+              <tbody valign="top">
+                <xsl:apply-templates select="arg" mode="paramtable"/>
+              </tbody>
+            </tgroup>
+          </table>
+        </xsl:if>
+
+        <xsl:if test="tp:possible-errors">
+          <formalpara>
+            <title>Possible errors</title>
+            <para>
+              <glosslist>
+                <xsl:apply-templates select="tp:possible-errors/tp:error"/>
+              </glosslist>
+            </para>
+          </formalpara>
+        </xsl:if>
+    </sect3>
+  </xsl:template>
+
+  <xsl:template name="tp-type">
+    <xsl:param name="tp-type"/>
+    <xsl:param name="type"/>
+
+    <xsl:variable name="single-type">
+      <xsl:choose>
+        <xsl:when test="contains($tp-type, '[]')">
+          <xsl:value-of select="substring-before($tp-type, '[]')"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:value-of select="$tp-type"/>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+
+    <xsl:variable name="type-of-tp-type">
+      <xsl:if test="contains($tp-type, '[]')">
+        <!-- one 'a', plus one for each [ after the [], and delete all ] -->
+        <xsl:value-of select="concat('a',
+          translate(substring-after($tp-type, '[]'), '[]', 'a'))"/>
+      </xsl:if>
+
+      <xsl:choose>
+        <xsl:when test="//tp:simple-type[@name=$single-type]">
+          <xsl:value-of select="string(//tp:simple-type[@name=$single-type]/@type)"/>
+        </xsl:when>
+        <xsl:when test="//tp:struct[@name=$single-type]">
+          <xsl:text>(</xsl:text>
+          <xsl:for-each select="//tp:struct[@name=$single-type]/tp:member">
+            <xsl:value-of select="@type"/>
+          </xsl:for-each>
+          <xsl:text>)</xsl:text>
+        </xsl:when>
+        <xsl:when test="//tp:enum[@name=$single-type]">
+          <xsl:value-of select="string(//tp:enum[@name=$single-type]/@type)"/>
+        </xsl:when>
+        <xsl:when test="//tp:flags[@name=$single-type]">
+          <xsl:value-of select="string(//tp:flags[@name=$single-type]/@type)"/>
+        </xsl:when>
+        <xsl:when test="//tp:mapping[@name=$single-type]">
+          <xsl:text>a{</xsl:text>
+          <xsl:for-each select="//tp:mapping[@name=$single-type]/tp:member">
+            <xsl:value-of select="@type"/>
+          </xsl:for-each>
+          <xsl:text>}</xsl:text>
+        </xsl:when>
+        <xsl:when test="//tp:external-type[@name=$single-type]">
+          <xsl:value-of select="string(//tp:external-type[@name=$single-type]/@type)"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:message terminate="yes">
+            <xsl:text>ERR: Unable to find type '</xsl:text>
+            <xsl:value-of select="$tp-type"/>
+            <xsl:text>'&#10;</xsl:text>
+          </xsl:message>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+
+    <xsl:if test="string($type) != '' and
+      string($type-of-tp-type) != string($type)">
+      <xsl:message terminate="yes">
+        <xsl:text>ERR: tp:type '</xsl:text>
+        <xsl:value-of select="$tp-type"/>
+        <xsl:text>' has D-Bus type '</xsl:text>
+        <xsl:value-of select="$type-of-tp-type"/>
+        <xsl:text>' but has been used with type='</xsl:text>
+        <xsl:value-of select="$type"/>
+        <xsl:text>'&#10;</xsl:text>
+      </xsl:message>
+    </xsl:if>
+
+    <link linkend="type-{$single-type}">
+      <literal><xsl:value-of select="concat('type-', $single-type)"/></literal>
+    </link>
+
+  </xsl:template>
+
+  <xsl:template name="parenthesized-tp-type">
+    <xsl:if test="@tp:type">
+      <xsl:text> (</xsl:text>
+      <xsl:call-template name="tp-type">
+        <xsl:with-param name="tp-type" select="@tp:type"/>
+        <xsl:with-param name="type" select="@type"/>
+      </xsl:call-template>
+      <xsl:text>)</xsl:text>
+    </xsl:if>
+  </xsl:template>
+
+  <xsl:template match="tp:member" mode="fieldsynopsis">
+    <xsl:variable name="type">
+      <xsl:call-template name="ResolveType">
+        <xsl:with-param name="node" select="."/>
+      </xsl:call-template>
+    </xsl:variable>
+    <fieldsynopsis>
+      <type><xsl:value-of select="normalize-space($type)"/></type>
+      <varname><xsl:value-of select="@name"/></varname>
+    </fieldsynopsis>
+  </xsl:template>
+
+  <xsl:template match="tp:member" mode="description">
+    <glossentry>
+      <glossterm>
+        <xsl:value-of select="@name"/>
+      </glossterm>
+      <glossdef>
+        <xsl:choose>
+          <xsl:when test="tp:docstring">
+            <xsl:apply-templates select="tp:docstring" />
+          </xsl:when>
+          <xsl:otherwise>
+            <!-- emphasize -->
+            (undocumented)
+          </xsl:otherwise>
+        </xsl:choose>
+      </glossdef>
+    </glossentry>
+  </xsl:template>
+
+  <xsl:template match="tp:member" mode="descriptionwithtype">
+    <xsl:variable name="type">
+      <xsl:call-template name="ResolveType">
+        <xsl:with-param name="node" select="."/>
+      </xsl:call-template>
+    </xsl:variable>
+    <glossentry>
+      <glossterm>
+        <xsl:value-of select="@name"/> -
+        <literal><xsl:value-of select="normalize-space($type)"/></literal>
+      </glossterm>
+      <glossdef>
+        <xsl:choose>
+          <xsl:when test="tp:docstring">
+            <xsl:apply-templates select="tp:docstring" />
+          </xsl:when>
+          <xsl:otherwise>
+            <!-- emphasize -->
+            (undocumented)
+          </xsl:otherwise>
+        </xsl:choose>
+      </glossdef>
+    </glossentry>
+  </xsl:template>
+
+  <xsl:template match="tp:possible-errors/tp:error">
+    <glossentry>
+      <glossterm>
+        <xsl:value-of select="@name"/>
+      </glossterm>
+      <glossdef>
+        <xsl:variable name="name" select="@name"/>
+        <xsl:choose>
+          <xsl:when test="tp:docstring">
+            <xsl:apply-templates select="tp:docstring"/>
+          </xsl:when>
+          <xsl:when test="//tp:errors/tp:error[concat(../@namespace, '.', translate(@name, ' ', ''))=$name]/tp:docstring">
+            <xsl:apply-templates select="//tp:errors/tp:error[concat(../@namespace, '.', translate(@name, ' ', ''))=$name]/tp:docstring"/> <!-- TODO: emphasize -->(generic description)
+          </xsl:when>
+          <xsl:otherwise>
+            (Undocumented.)
+          </xsl:otherwise>
+        </xsl:choose>
+      </glossdef>
+    </glossentry>
+  </xsl:template>
+
+  <xsl:template match="signal">
+
+    <xsl:if test="not(parent::interface)">
+      <xsl:message terminate="yes">
+        <xsl:text>ERR: signal </xsl:text>
+        <xsl:value-of select="@name"/>
+        <xsl:text> does not have an interface as parent&#10;</xsl:text>
+      </xsl:message>
+    </xsl:if>
+
+    <xsl:if test="not(@name) or @name = ''">
+      <xsl:message terminate="yes">
+        <xsl:text>ERR: missing @name on a signal of </xsl:text>
+        <xsl:value-of select="../@name"/>
+        <xsl:text>&#10;</xsl:text>
+      </xsl:message>
+    </xsl:if>
+
+    <xsl:for-each select="arg">
+      <xsl:if test="not(@type) or @type = ''">
+        <xsl:message terminate="yes">
+          <xsl:text>ERR: an arg of signal </xsl:text>
+          <xsl:value-of select="concat(../../@name, '.', ../@name)"/>
+          <xsl:text> has no type</xsl:text>
+        </xsl:message>
+      </xsl:if>
+      <xsl:if test="not(@name) or @name = ''">
+        <xsl:message terminate="yes">
+          <xsl:text>ERR: an arg of signal </xsl:text>
+          <xsl:value-of select="concat(../../@name, '.', ../@name)"/>
+          <xsl:text> has no name</xsl:text>
+        </xsl:message>
+      </xsl:if>
+      <xsl:choose>
+        <xsl:when test="not(@direction)"/>
+        <xsl:when test="@direction='in'">
+          <xsl:message terminate="no">
+            <xsl:text>INFO: an arg of signal </xsl:text>
+            <xsl:value-of select="concat(../../@name, '.', ../@name)"/>
+            <xsl:text> has unnecessary direction 'in'</xsl:text>
+          </xsl:message>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:message terminate="yes">
+            <xsl:text>ERR: an arg of signal </xsl:text>
+            <xsl:value-of select="concat(../../@name, '.', ../@name)"/>
+            <xsl:text> has direction other than 'in'</xsl:text>
+          </xsl:message>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:for-each>
+
+    <sect3>
+      <title id="{concat(../@name, concat('.', @name))}">
+        <literal><xsl:value-of select="concat(../@name, concat('.', @name))"/></literal>
+      </title>
+      <funcsynopsis>
+        <funcprototype>
+          <funcdef>
+            <function><xsl:value-of select="@name"/></function>
+          </funcdef>
+          <xsl:apply-templates select="arg" mode="paramdef"/>
+        </funcprototype>
+      </funcsynopsis>
+      <xsl:apply-templates select="tp:docstring"/>
+      <xsl:apply-templates select="tp:added"/>
+      <xsl:apply-templates select="tp:changed"/>
+      <xsl:apply-templates select="tp:deprecated"/>
+
+      <xsl:if test="arg">
+        <table>
+          <title>Parameters</title>
+          <tgroup cols="3">
+            <thead>
+              <row>
+                <entry>Name</entry>
+                <entry>Type</entry>
+                <entry>Description</entry>
+              </row>
+            </thead>
+            <tbody valign="top">
+              <xsl:apply-templates select="arg" mode="paramtable"/>
+            </tbody>
+          </tgroup>
+        </table>
+      </xsl:if>
+    </sect3>
+  </xsl:template>
+
+  <xsl:template match="/tp:spec">
+    <book>
+      <bookinfo>
+        <title><xsl:value-of select="tp:title"/></title>
+        <xsl:apply-templates select="tp:copyright"/>
+        <xsl:apply-templates select="tp:license"/>
+        <xsl:if test="tp:docstring">
+          <abstract>
+            <xsl:apply-templates select="tp:docstring"/>
+          </abstract>
+        </xsl:if>
+        <!-- TODO: Version
+        <xsl:if test="tp:version">
+          <xsl:text> version </xsl:text>
+          <xsl:value-of select="tp:version"/>
+        </xsl:if> -->
+      </bookinfo>
+      <chapter>
+        <title>Interfaces</title>
+        <xsl:for-each select="//node/interface">
+          <itemizedlist>
+            <listitem>
+              <para>
+                <link linkend="{@name}">
+                  <literal><xsl:value-of select="@name"/></literal>
+                </link>
+              </para>
+            </listitem>
+          </itemizedlist>
+        </xsl:for-each>
+        <xsl:apply-templates select="//node"/>
+      </chapter>
+      <xsl:call-template name="generic-types"/>
+      <xsl:if test="tp:errors">
+        <chapter>
+            <xsl:apply-templates select="tp:errors"/>
+        </chapter>
+      </xsl:if>
+    </book>
+    <!-- TODO: index -->
+<!--        <h2>Interfaces</h2>
+        <ul>
+        </ul>
+
+
+
+        <h1>Index</h1>
+        <h2>Index of interfaces</h2>
+        <ul>
+          <xsl:for-each select="//node/interface">
+            <li><code><a href="#{@name}"><xsl:value-of select="@name"/></a></code></li>
+          </xsl:for-each>
+        </ul>
+        <h2>Index of types</h2>
+        <ul>
+          <xsl:for-each select="//tp:simple-type | //tp:enum | //tp:flags | //tp:mapping | //tp:struct | //tp:external-type">
+            <xsl:sort select="@name"/>
+            <li>
+              <code>
+                <a href="#type-{@name}">
+                  <xsl:value-of select="@name"/>
+                </a>
+              </code>
+              <xsl:apply-templates mode="in-index" select="."/>
+            </li>
+          </xsl:for-each>
+        </ul>
+      </body>
+    </html>-->
+  </xsl:template>
+
+  <xsl:template match="node">
+      <xsl:apply-templates />
+  </xsl:template>
+
+  <xsl:template match="text()">
+    <xsl:if test="normalize-space(.) != ''">
+      <xsl:message terminate="yes">
+        <xsl:text>Stray text: {{{</xsl:text>
+        <xsl:value-of select="." />
+        <xsl:text>}}}&#10;</xsl:text>
+      </xsl:message>
+    </xsl:if>
+  </xsl:template>
+
+  <xsl:template match="*">
+      <xsl:message terminate="yes">
+         <xsl:text>Unrecognised element: {</xsl:text>
+         <xsl:value-of select="namespace-uri(.)" />
+         <xsl:text>}</xsl:text>
+         <xsl:value-of select="local-name(.)" />
+         <xsl:text>&#10;</xsl:text>
+      </xsl:message>
+  </xsl:template>
+</xsl:stylesheet>
+
+<!-- vim:set sw=2 sts=2 et: -->
diff --git a/secret-service/tools/spec-to-introspect.xsl b/secret-service/tools/spec-to-introspect.xsl
index b2682b1..ca8b4b6 100644
--- a/secret-service/tools/spec-to-introspect.xsl
+++ b/secret-service/tools/spec-to-introspect.xsl
@@ -8,18 +8,19 @@
 
     Copyright 2009  Michael Leupold <lemma@confuego.org>
 
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License as
-    published by the Free Software Foundation; either version 2 of
-    the License, or (at your option) any later version.
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 -->
 
 <!--
@@ -30,6 +31,8 @@
      - tp:docstring may contain XHTML which this template doesn't handle
 -->
 
+    <xsl:include href="resolve-type.xsl"/>
+
     <!-- main template -->
     <xsl:template match="tp:spec">
         <node>
@@ -40,87 +43,6 @@
         </node>
     </xsl:template>
 
-    <!-- Resolve the type a node has. This will first look at tp:type and
-         - if not found - use the type attribute -->
-    <xsl:template name="ResolveType">
-        <xsl:param name="node"/>
-        <xsl:choose>
-            <xsl:when test="$node//@tp:type">
-                <xsl:call-template name="TpType">
-                    <xsl:with-param name="type" select="$node//@tp:type"/>
-                </xsl:call-template>
-            </xsl:when>
-            <xsl:when test="$node//@type">
-                <xsl:call-template name="DBusType">
-                    <xsl:with-param name="type" select="$node//@type"/>
-                </xsl:call-template>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:message terminate="yes">
-                    Node doesn't contain a type.
-                </xsl:message>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-
-    <!-- Map a D-Bus type to its EggDBus counterpart -->
-    <xsl:template name="DBusType">
-        <xsl:param name="type"/>
-        <xsl:choose>
-            <xsl:when test="$type='o'">ObjectPath</xsl:when>
-            <xsl:when test="$type='s'">String</xsl:when>
-            <xsl:when test="$type='y'">Byte</xsl:when>
-            <xsl:when test="$type='b'">Boolean</xsl:when>
-            <xsl:when test="$type='n'">Int16</xsl:when>
-            <xsl:when test="$type='q'">UInt16</xsl:when>
-            <xsl:when test="$type='i'">Int32</xsl:when>
-            <xsl:when test="$type='u'">UInt32</xsl:when>
-            <xsl:when test="$type='x'">Int64</xsl:when>
-            <xsl:when test="$type='t'">UInt64</xsl:when>
-            <xsl:when test="$type='d'">Double</xsl:when>
-            <xsl:when test="$type='g'">Signature</xsl:when>
-            <xsl:when test="starts-with($type, 'a')">
-                Array&lt;
-                <xsl:call-template name="DBusType">
-                    <xsl:with-param name="type" select="substring($type, 2)"/>
-                </xsl:call-template>
-                &gt;
-            </xsl:when>
-            <!-- TODO: doesn't implement dict-entries and structs -->
-            <xsl:otherwise>
-                <xsl:message terminate="yes">
-                    Unknown DBus Type <xsl:value-of select="$type"/>
-                </xsl:message>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-
-    <!-- Resolve tp:type attributes by searching for matching tp:struct
-         and tp:mapping elements -->
-    <xsl:template name="TpType">
-        <xsl:param name="type"/>
-        <xsl:choose>
-            <xsl:when test="/tp:spec/tp:struct[@name=$type]">
-                <xsl:value-of select="$type"/>
-            </xsl:when>
-            <xsl:when test="/tp:spec/tp:mapping[@name=$type]">
-                Dict&lt;
-                <xsl:call-template name="ResolveType">
-                    <xsl:with-param name="node" select="/tp:spec/tp:mapping[@name=$type]/tp:member[@name='Key']"/>
-                </xsl:call-template>,
-                <xsl:call-template name="ResolveType">
-                    <xsl:with-param name="node" select="/tp:spec/tp:mapping[@name=$type]/tp:member[@name='Value']"/>
-                </xsl:call-template>
-                &gt;
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:message terminate="yes">
-                    Unspecified type <xsl:value-of select="$type"/>.
-                </xsl:message>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-
     <!-- handle most of the D-Bus introspection elements -->
     <xsl:template match="interface|annotation|method|signal">
         <xsl:copy>
@@ -151,7 +73,7 @@
                         </xsl:variable>
                         <annotation name="org.gtk.EggDBus.Type">
                             <xsl:attribute name="value">
-                                <xsl:value-of select="normalize-space($type)"/>
+                                <xsl:value-of select="translate(translate($type, ' ', ''), '&#xa;', '')"/>
                             </xsl:attribute>
                         </annotation>
                     </xsl:when>