diff --git a/src/documentation/xsl/annotation.xsl b/src/documentation/xsl/annotation.xsl
deleted file mode 100644
index dfc5f128c8..0000000000
--- a/src/documentation/xsl/annotation.xsl
+++ /dev/null
@@ -1,362 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="1.0">
-  <xsl:key name="classes" match="class|struct|union" use="@name"/>
-  <xsl:key name="methods" match="method|overloaded-method" use="@name"/>
-  <xsl:key name="functions" match="function|overloaded-function" use="@name"/>
-  <xsl:key name="enums" match="enum" use="@name"/>
-  <xsl:key name="libraries" match="library" use="@name"/>
-  <xsl:key name="macros" match="macro" use="@name"/>
-  <xsl:key name="headers" match="header" use="@name"/>
-  <xsl:key name="named-entities" match="class|struct|union|function|overloaded-function|macro|library|*[attribute::id]" use="@name|@id"/>
-
-  <xsl:template match="function|overloaded-function" mode="generate.id">
-    <xsl:variable name="name" select="normalize-space(@name)"/>
-    <xsl:variable name="translated-name"
-                  select="translate($name, 
-                                    '~!%^&amp;*()[].,&lt;&gt;|/ +-=', 
-                                    'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX')"/>
-                      
-    <xsl:choose>
-      <xsl:when test="count(key('named-entities', $name))=1
-                      and ($translated-name=$name)">
-        <xsl:value-of select="$name"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="generate-id(.)"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <xsl:template match="classname" mode="annotation">
-    <!-- Determine the (possibly qualified) class name we are looking for -->
-    <xsl:variable name="fullname">
-      <xsl:choose>
-        <xsl:when test="@alt">
-          <xsl:value-of select="@alt"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="string(.)"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-
-    <!-- Strip off any instantiation -->
-    <xsl:variable name="name">
-      <xsl:choose>
-        <xsl:when test="contains($fullname, '&lt;')">
-          <xsl:value-of select="substring-before($fullname, '&lt;')"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="$fullname"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-
-    <!-- Determine the unqualified name -->
-    <xsl:variable name="unqualified-name">
-      <xsl:call-template name="strip-qualifiers">
-        <xsl:with-param name="name" select="$name"/>
-      </xsl:call-template>
-    </xsl:variable>
-
-    <xsl:call-template name="cxx-link-name">
-      <xsl:with-param name="lookup" select="."/>
-      <xsl:with-param name="type" select="'class'"/>
-      <xsl:with-param name="name" select="$name"/>
-      <xsl:with-param name="display-name" select="string(.)"/>
-      <xsl:with-param name="unqualified-name" select="$unqualified-name"/>
-      <xsl:with-param name="nodes" select="key('classes', $unqualified-name)"/>
-    </xsl:call-template>
-  </xsl:template>
-
-  <xsl:template match="methodname" mode="annotation">
-    <!-- Determine the (possibly qualified) method name we are looking for -->
-    <xsl:variable name="fullname">
-      <xsl:choose>
-        <xsl:when test="@alt">
-          <xsl:value-of select="@alt"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="string(.)"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-
-    <!-- Strip off any call -->
-    <xsl:variable name="name">
-      <xsl:choose>
-        <xsl:when test="contains($fullname, '(')">
-          <xsl:value-of select="substring-before($fullname, '(')"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="$fullname"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-
-    <!-- Determine the unqualified name -->
-    <xsl:variable name="unqualified-name">
-      <xsl:call-template name="strip-qualifiers">
-        <xsl:with-param name="name" select="$name"/>
-      </xsl:call-template>
-    </xsl:variable>
-
-    <xsl:call-template name="cxx-link-name">
-      <xsl:with-param name="lookup" select="."/>
-      <xsl:with-param name="type" select="'method'"/>
-      <xsl:with-param name="name" select="$name"/>
-      <xsl:with-param name="display-name" select="string(.)"/>
-      <xsl:with-param name="unqualified-name" select="$unqualified-name"/>
-      <xsl:with-param name="nodes" select="key('methods', $unqualified-name)"/>
-    </xsl:call-template>
-  </xsl:template>
-
-  <xsl:template match="functionname" mode="annotation">
-    <!-- Determine the (possibly qualified) function name we are
-         looking for -->
-    <xsl:variable name="fullname">
-      <xsl:choose>
-        <xsl:when test="@alt">
-          <xsl:value-of select="@alt"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="string(.)"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-
-    <!-- Strip off any call -->
-    <xsl:variable name="name">
-      <xsl:choose>
-        <xsl:when test="contains($fullname, '(')">
-          <xsl:value-of select="substring-before($fullname, '(')"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="$fullname"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-
-    <!-- Determine the unqualified name -->
-    <xsl:variable name="unqualified-name">
-      <xsl:call-template name="strip-qualifiers">
-        <xsl:with-param name="name" select="$name"/>
-      </xsl:call-template>
-    </xsl:variable>
-
-    <xsl:call-template name="cxx-link-name">
-      <xsl:with-param name="lookup" select="."/>
-      <xsl:with-param name="type" select="'function'"/>
-      <xsl:with-param name="name" select="$name"/>
-      <xsl:with-param name="display-name" select="string(.)"/>
-      <xsl:with-param name="unqualified-name" select="$unqualified-name"/>
-      <xsl:with-param name="nodes" 
-        select="key('functions', $unqualified-name)"/>
-    </xsl:call-template>
-  </xsl:template>
-
-  <xsl:template match="enumname" mode="annotation">
-    <!-- Determine the (possibly qualified) enum name we are
-         looking for -->
-    <xsl:variable name="fullname">
-      <xsl:choose>
-        <xsl:when test="@alt">
-          <xsl:value-of select="@alt"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="string(.)"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-
-    <!-- Strip off any call -->
-    <xsl:variable name="name">
-      <xsl:choose>
-        <xsl:when test="contains($fullname, '(')">
-          <xsl:value-of select="substring-before($fullname, '(')"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="$fullname"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-
-    <!-- Determine the unqualified name -->
-    <xsl:variable name="unqualified-name">
-      <xsl:call-template name="strip-qualifiers">
-        <xsl:with-param name="name" select="$name"/>
-      </xsl:call-template>
-    </xsl:variable>
-
-    <xsl:call-template name="cxx-link-name">
-      <xsl:with-param name="lookup" select="."/>
-      <xsl:with-param name="type" select="'enum'"/>
-      <xsl:with-param name="name" select="$name"/>
-      <xsl:with-param name="display-name" select="string(.)"/>
-      <xsl:with-param name="unqualified-name" select="$unqualified-name"/>
-      <xsl:with-param name="nodes" 
-        select="key('enums', $unqualified-name)"/>
-    </xsl:call-template>
-  </xsl:template>
-
-  <xsl:template match="libraryname" mode="annotation">
-    <xsl:variable name="name">
-      <xsl:choose>
-        <xsl:when test="@alt">
-          <xsl:value-of select="@alt"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="text()"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-
-    <xsl:variable name="node" select="key('libraries', $name)"/>
-    
-    <xsl:choose>
-      <xsl:when test="count($node)=0">
-        <xsl:message>
-          <xsl:text>warning: Cannot find library '</xsl:text>
-          <xsl:value-of select="$name"/>
-          <xsl:text>'</xsl:text>
-        </xsl:message>
-        <xsl:value-of select="$name"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="library.link">
-          <xsl:with-param name="node" select="$node"/>
-          <xsl:with-param name="name" select="text()"/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <xsl:template match="conceptname" mode="annotation">
-    <xsl:param name="name" select="text()"/>
-
-    <xsl:call-template name="concept.link">
-      <xsl:with-param name="name" select="$name"/>
-    </xsl:call-template>
-  </xsl:template>
-
-  <xsl:template match="macroname" mode="annotation">
-    <xsl:param name="name" select="text()"/>
-    
-    <xsl:variable name="node" select="key('macros', $name)"/>
-    <xsl:choose>
-      <xsl:when test="count($node) = 0">
-        <xsl:message>
-          <xsl:text>warning: cannot find macro `</xsl:text>
-          <xsl:value-of select="$name"/>
-          <xsl:text>'</xsl:text>
-        </xsl:message>
-        <xsl:value-of select="$name"/>
-      </xsl:when>
-
-      <xsl:when test="count($node) = 1">
-        <xsl:call-template name="internal-link">
-          <xsl:with-param name="to">
-            <xsl:call-template name="generate.id">
-              <xsl:with-param name="node" select="$node"/>
-            </xsl:call-template>
-          </xsl:with-param>
-          <xsl:with-param name="text" select="$name"/>
-        </xsl:call-template>
-      </xsl:when>
-
-      <xsl:otherwise>
-        <xsl:message>
-          <xsl:text>error: macro `</xsl:text>
-          <xsl:value-of select="$name"/>
-          <xsl:text>' is multiply defined.</xsl:text>
-        </xsl:message>
-        <xsl:value-of select="$node"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <xsl:template match="headername" mode="annotation">
-    <xsl:param name="name" select="text()"/>
-    
-    <xsl:variable name="node" select="key('headers', $name)"/>
-    <xsl:choose>
-      <xsl:when test="count($node) = 0">
-        <xsl:message>
-          <xsl:text>warning: cannot find header `</xsl:text>
-          <xsl:value-of select="$name"/>
-          <xsl:text>'</xsl:text>
-        </xsl:message>
-        <xsl:value-of select="$name"/>
-      </xsl:when>
-
-      <xsl:when test="count($node) = 1">
-        <xsl:call-template name="internal-link">
-          <xsl:with-param name="to">
-            <xsl:call-template name="generate.id">
-              <xsl:with-param name="node" select="$node"/>
-            </xsl:call-template>
-          </xsl:with-param>
-          <xsl:with-param name="text" select="$name"/>
-        </xsl:call-template>
-      </xsl:when>
-
-      <xsl:otherwise>
-        <xsl:message>
-          <xsl:text>error: header `</xsl:text>
-          <xsl:value-of select="$name"/>
-          <xsl:text>' is multiply defined.</xsl:text>
-        </xsl:message>
-        <xsl:value-of select="$node"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <xsl:template match="text()" mode="annotation">
-    <xsl:param name="highlight" select="false()"/>
-    <xsl:choose>
-      <xsl:when test="$highlight">
-        <xsl:call-template name="source-highlight">
-          <xsl:with-param name="text" select="."/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:copy-of select="."/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <xsl:template match="code" mode="annotation">
-    <computeroutput>
-      <xsl:apply-templates mode="annotation"/>
-    </computeroutput>
-  </xsl:template>
-
-  <xsl:template match="node()" mode="annotation">
-    <xsl:param name="highlight" select="false()"/>
-    <xsl:element name="{name(.)}">
-      <xsl:for-each select="./@*">
-        <xsl:attribute name="{name(.)}">
-          <xsl:value-of select="."/>
-        </xsl:attribute>
-      </xsl:for-each>
-      <xsl:apply-templates select="./*|./text()" mode="annotation">
-        <xsl:with-param name="highlight" select="$highlight"/>
-      </xsl:apply-templates>
-    </xsl:element>
-  </xsl:template>
-
-  <!-- The "purpose" mode strips simpara/para elements so that we can
-       place the resulting text into a comment in the synopsis. -->
-  <xsl:template match="para|simpara" mode="purpose">
-    <xsl:apply-templates mode="annotation"/>
-  </xsl:template>
-
-  <xsl:template match="*" mode="purpose">
-    <xsl:apply-templates select="." mode="annotation"/>
-  </xsl:template>
-
-  <xsl:template match="text()" mode="purpose">
-    <xsl:apply-templates select="." mode="annotation"/>
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/src/documentation/xsl/caramel/concept2docbook.xsl b/src/documentation/xsl/caramel/concept2docbook.xsl
deleted file mode 100644
index 21585dce56..0000000000
--- a/src/documentation/xsl/caramel/concept2docbook.xsl
+++ /dev/null
@@ -1,813 +0,0 @@
-<?xml version="1.0" ?>
-
-<!--
-Copyright (c) 2002-2003 The Trustees of Indiana University.
-                        All rights reserved.
-Copyright (c) 2000-2001 University of Notre Dame. All rights reserved.
-
-The software included in this source file is licensed under the terms and
-conditions of the Software License, version 1.0, in the file LICENSE at the
-top level of the Caramel distribution. -->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-  <xsl:strip-space elements="* xsl:*"/>
-
-  <xsl:include href="unparser.xsl"/>
-
-  <xsl:key name="concepts" match="concept" use="@name"/>
-
-  <!-- The layout type to use for concept descriptions. Can be one of:
-       sgi: simulate the SGI STL documentation
-       austern: simulate the documentation in Generic Programming and the STL,
-         by Matthew H. Austern
-       caramel: simulate the formatting from Caramel
-       -->
-  <xsl:param name="boost.concept.layout" select="'austern'"/>
-
-  <xsl:template match="concept">
-    <refentry>
-      <xsl:attribute name="id">
-        <xsl:call-template name="generate.id"/>
-      </xsl:attribute>
-
-      <refmeta>
-        <refentrytitle>Concept <xsl:value-of select="@name"/></refentrytitle>
-        <manvolnum>7</manvolnum>
-      </refmeta>
-
-      <refnamediv>
-        <refname><xsl:value-of select="@name"/></refname>
-        <xsl:if test="purpose">
-          <refpurpose>
-            <xsl:apply-templates select="purpose/*|purpose/text()"/>
-          </refpurpose>
-        </xsl:if>
-      </refnamediv>
-
-      <!--
-      <refentryinfo>
-        <xsl:for-each select="copyright | copyright-include | legalnotice">
-          <xsl:choose>
-            <xsl:when test="name(.)='copyright'">
-              <copyright><xsl:copy-of select="./node()"/></copyright>
-            </xsl:when>
-            <xsl:when test="name(.)='legalnotice'">
-              <legalnotice><xsl:copy-of select="./node()"/></legalnotice>
-            </xsl:when>
-            <xsl:when test="name(.)='copyright-include'">
-              <copyright><xsl:copy-of select="document(concat('../concepts/', @file))/copyright/node()"/></copyright>
-            </xsl:when>
-          </xsl:choose>
-	</xsl:for-each>
-      </refentryinfo>
--->
-
-    <xsl:if test="description">
-      <xsl:if test="description">
-        <refsect1>
-          <title>Description</title>
-          <xsl:for-each select="description">
-            <xsl:apply-templates/>
-          </xsl:for-each>
-        </refsect1>
-      </xsl:if>
-    </xsl:if>
-
-    <xsl:if test="refines | refines-when-mutable">
-      <refsect1>
-        <title>Refinement of</title>
-        <itemizedlist>
-          <xsl:if test="refines">
-            <xsl:for-each select="refines">
-              <listitem>
-                <para>
-                  <xsl:call-template name="concept.link">
-                    <xsl:with-param name="name" select="@concept"/>
-                  </xsl:call-template>
-                </para>
-              </listitem>
-            </xsl:for-each>
-          </xsl:if>
-          <xsl:if test="refines-when-mutable">
-            <xsl:for-each select="refines-when-mutable">
-              <listitem>
-                <para>
-                  <xsl:text>When mutable: </xsl:text>
-                  <xsl:call-template name="concept.link">
-                    <xsl:with-param name="name" select="@concept"/>
-                  </xsl:call-template>
-                </para>
-              </listitem>
-            </xsl:for-each>
-          </xsl:if>
-        </itemizedlist>
-      </refsect1>
-    </xsl:if>
-
-    <!-- This part must be run even if there are no associated types to print out, so the hidden type definitions can be found -->
-    <xsl:variable name="definition_list">
-      <xsl:call-template name="make-definition-list">
-	<xsl:with-param name="typedefs" select="define-type | associated-type"/>
-	<xsl:with-param name="definition_list">
-	  <xsl:for-each select="param/@name">
-	    @(@<xsl:value-of select="."/>=<xsl:value-of select="."/>@)@
-	  </xsl:for-each>
-	</xsl:with-param>
-      </xsl:call-template>
-    </xsl:variable>
-
-    <!-- <xsl:message>Definition list: <xsl:value-of select="$definition_list"/></xsl:message> -->
-
-    <xsl:call-template name="print-associated-types">
-      <xsl:with-param name="typedefs" select="associated-type"/>
-      <xsl:with-param name="definition_list" select="$definition_list"/>
-    </xsl:call-template>
-
-    <xsl:call-template name="concept.notation">
-      <xsl:with-param name="definition_list" select="$definition_list"/>
-    </xsl:call-template>
-
-    <xsl:variable name="notations">
-      <xsl:for-each select="notation">
-	@@(@@<xsl:call-template name="unparse-cpp">
-	  <xsl:with-param name="typeref" select="*[1]"/>
-	  <xsl:with-param name="definition_list" select="$definition_list"/>
-	  <xsl:with-param name="ignore-cv" select="true()"/>
-	  <xsl:with-param name="ignore-references" select="true()"/>
-	</xsl:call-template>@@=@@<xsl:value-of select="normalize-space(@variables)"/>@@)@@
-      </xsl:for-each>
-    </xsl:variable>
-
-    <!-- <xsl:message>Notations: <xsl:value-of select="normalize-space($notations)"/> End notations</xsl:message> -->
-
-    <xsl:if test="definition">
-      <refsect1>
-      <title>Definitions</title>
-	<xsl:for-each select="definition">
-	  <p><xsl:apply-templates/></p>
-	</xsl:for-each>
-      </refsect1>
-    </xsl:if>
-
-    <xsl:if test="valid-type-expression | models | models-when-mutable">
-      <refsect1>
-        <title>Type expressions</title>
-        <variablelist>
-          <xsl:for-each select="models">
-            <varlistentry>
-              <term/>
-              <listitem>
-                <para>
-                  <xsl:call-template name="unparse-operator-definition">
-                    <xsl:with-param name="typeref" select="."/>
-                    <xsl:with-param name="operator_nodeset" select="key('concepts', @concept)/models-sentence/node()"/>
-                    <xsl:with-param name="definition_list" select="$definition_list"/>
-                    <xsl:with-param name="notations" select="$notations"/>
-                    <xsl:with-param name="ignore-cv" select="false()"/>
-                    <xsl:with-param name="self" select="@concept"/>
-                    <xsl:with-param name="use-code-block" select="true()"/>
-                  </xsl:call-template>
-                </para>
-              </listitem>
-            </varlistentry>
-          </xsl:for-each>
-          <xsl:for-each select="models-when-mutable">
-            <varlistentry>
-              <term>Only when mutable</term>
-              <listitem>
-                <para>
-                  <xsl:call-template name="unparse-operator-definition">
-                    <xsl:with-param name="typeref" select="."/>
-                    <xsl:with-param name="operator_nodeset" select="key('concepts', @concept)/models-sentence/node()"/>
-                    <xsl:with-param name="definition_list" select="$definition_list"/>
-                    <xsl:with-param name="notations" select="$notations"/>
-                    <xsl:with-param name="ignore-cv" select="false()"/>
-                    <xsl:with-param name="self" select="@concept"/>
-                    <xsl:with-param name="use-code-block" select="true()"/>
-                  </xsl:call-template>
-                </para>
-              </listitem>
-            </varlistentry>
-          </xsl:for-each>
-          <xsl:for-each select="valid-type-expression">
-            <varlistentry>
-              <term><xsl:value-of select="@name"/></term>
-              <listitem>
-                <para>
-                  <type>
-                    <xsl:call-template name="unparse-cpp">
-                      <xsl:with-param name="typeref" select="*[2]"/>
-                      <xsl:with-param name="definition_list" select="$definition_list"/>
-                      <xsl:with-param name="notations" select="normalize-space($notations)"/>
-                    </xsl:call-template>
-                  </type>
-                  
-                  <xsl:comment/> must be 
-                  <xsl:for-each select="return-type/*">
-                    <xsl:if test="position()!=1 and last()!=2">, </xsl:if>
-                    <xsl:if test="position()=last() and last()!=1"> and </xsl:if>
-                    <xsl:call-template name="unparse-constraint">
-                      <xsl:with-param name="constraint" select="."/>
-                      <xsl:with-param name="definition_list" select="$definition_list"/>
-                      <xsl:with-param name="type-expr-mode" select="true()"/>
-                    </xsl:call-template>
-                  </xsl:for-each><xsl:comment/>.
-                </para>
-                
-                <xsl:if test="description">
-                  <xsl:for-each select="description">
-                    <xsl:apply-templates/>
-                  </xsl:for-each>
-                </xsl:if>
-              </listitem>
-            </varlistentry>
-          </xsl:for-each>
-        </variablelist>
-      </refsect1>
-    </xsl:if>
-
-    <xsl:if test="valid-expression">
-      <refsect1>
-      <title>Valid expressions</title>
-
-      <xsl:variable name="columns">
-        <xsl:if test="valid-expression/return-type">
-          <xsl:text>T</xsl:text>
-        </xsl:if>
-        <xsl:if test="valid-expression/precondition">
-          <xsl:text>P</xsl:text>
-        </xsl:if>
-        <xsl:if test="valid-expression/semantics">
-          <xsl:text>S</xsl:text>
-        </xsl:if>
-        <xsl:if test="valid-expression/postcondition">
-          <xsl:text>O</xsl:text>
-        </xsl:if>
-      </xsl:variable>
-
-      <informaltable>
-        <tgroup>
-          <xsl:attribute name="cols">
-            <xsl:value-of select="string-length($columns) + 2"/>
-          </xsl:attribute>
-          <thead>
-            <row>
-              <entry>Name</entry>
-              <entry>Expression</entry>
-              <xsl:if test="contains($columns, 'T')">
-                <entry>Type</entry>
-              </xsl:if>
-              <xsl:if test="contains($columns, 'P')">
-                <entry>Precondition</entry>
-              </xsl:if>
-              <xsl:if test="contains($columns, 'S')">
-                <entry>Semantics</entry>
-              </xsl:if>
-              <xsl:if test="contains($columns, 'O')">
-                <entry>Postcondition</entry>
-              </xsl:if>
-            </row>
-          </thead>
-          <tbody>
-            <xsl:apply-templates select="valid-expression">
-              <xsl:with-param name="definition_list" 
-                select="$definition_list"/>
-              <xsl:with-param name="notations" 
-                select="normalize-space($notations)"/>
-              <xsl:with-param name="columns" select="$columns"/>
-            </xsl:apply-templates>
-          </tbody>
-        </tgroup>
-      </informaltable>
-      <!-- Doug prefers the table
-      <variablelist>
-	<xsl:for-each select="valid-expression">
-	  <xsl:variable name="as-cxx-value">
-	    <xsl:call-template name="unparse-cpp">
-	      <xsl:with-param name="typeref" select="*[1]"/>
-	      <xsl:with-param name="definition_list" select="$definition_list"/>
-	      <xsl:with-param name="notations" select="normalize-space($notations)"/>
-	    </xsl:call-template>
-	  </xsl:variable>
-	  <varlistentry>
-	    <term><xsl:value-of select="@name"/>: <literal><xsl:value-of select="$as-cxx-value"/></literal></term>
-	    <listitem><variablelist>
-	      <xsl:if test="return-type/*">
-		<varlistentry><term>Return value</term><listitem><para>
-		  <xsl:for-each select="return-type/*">
-		    <xsl:if test="position()!=1 and last()!=2">, </xsl:if>
-		    <xsl:if test="position()=last() and last()!=1"> and </xsl:if>
-		    <xsl:call-template name="unparse-constraint">
-		      <xsl:with-param name="constraint" select="."/>
-		      <xsl:with-param name="definition_list" select="$definition_list"/>
-		      <xsl:with-param name="capitalize" select="position()=1"/>
-		    </xsl:call-template>
-		  </xsl:for-each>
-		</para></listitem></varlistentry>
-	      </xsl:if>
-
-	      <xsl:for-each select="precondition">
-		<varlistentry><term>Precondition</term><listitem><para>
-		  <xsl:apply-templates/>
-		</para></listitem></varlistentry>
-	      </xsl:for-each>
-
-	      <xsl:for-each select="semantics">
-		<varlistentry><term>Semantics</term><listitem><para>
-		  <xsl:apply-templates/>
-		</para></listitem></varlistentry>
-	      </xsl:for-each>
-
-	      <xsl:for-each select="postcondition">
-		<varlistentry><term>Postcondition</term><listitem><para>
-		  <xsl:apply-templates/>
-		</para></listitem></varlistentry>
-	      </xsl:for-each>
-
-	    </variablelist></listitem>
-	  </varlistentry>
-
-	</xsl:for-each>
-      </variablelist>
--->
-      </refsect1>
-    </xsl:if>
-
-    <xsl:if test="complexity">
-      <refsect1>
-      <title>Complexity</title>
-	<xsl:for-each select="complexity">
-	  <para><xsl:apply-templates/></para>
-	</xsl:for-each>
-      </refsect1>
-    </xsl:if>
-
-    <xsl:if test="invariant">
-      <refsect1>
-      <title>Invariants</title>
-      <variablelist>
-	<xsl:for-each select="invariant">
-	  <varlistentry>
-	    <term><xsl:value-of select="@name"/></term>
-	    <listitem>
-	      <para><xsl:apply-templates/></para>
-	    </listitem>
-	  </varlistentry>
-	</xsl:for-each>
-      </variablelist>
-      </refsect1>
-    </xsl:if>
-
-    <xsl:if test="example-model">
-      <refsect1>
-      <title>Models</title>
-	<itemizedlist>
-	<xsl:for-each select="example-model">
-	  <listitem>
-	    <simplelist type="inline">
-	    <xsl:for-each select="*">
-	      <xsl:variable name="example-value">
-		<xsl:call-template name="unparse-cpp">
-		  <xsl:with-param name="typeref" select="."/>
-		  <xsl:with-param name="definition_list" select="$definition_list"/>
-		</xsl:call-template>
-	      </xsl:variable>
-	      <member><type><xsl:value-of select="$example-value"/></type></member>
-	    </xsl:for-each>
-	    </simplelist>
-	  </listitem>
-	</xsl:for-each>
-	</itemizedlist>
-      </refsect1>
-    </xsl:if>
-
-    <xsl:variable name="see-also-list" select="concept-ref | see-also | refines | refines-when-mutable | models-as-first-arg | models | models-when-mutable"/>
-    <xsl:if test="$see-also-list">
-      <refsect1>
-      <title>See also</title>
-      <itemizedlist>
-	<xsl:for-each select="$see-also-list">
-	  <xsl:sort select="string(@name|@concept)" data-type="text"/>
-          <xsl:if test="string(@name|@concept) != string(../@name)">
-	    <xsl:if test="not(string(@name|@concept) = (preceding::*/@name | preceding::*/@concept | ancestor::*/@name | ancestor::*/@concept))">
-	      <listitem>
-                <para>
-                  <xsl:call-template name="concept.link">
-                    <xsl:with-param name="name" select="@name|@concept"/>
-                  </xsl:call-template>
-                </para>
-              </listitem>
-	    </xsl:if>
-	  </xsl:if>
-	</xsl:for-each>
-      </itemizedlist>
-      </refsect1>
-    </xsl:if>
-
-  </refentry>
-  </xsl:template>
-
-  <xsl:template name="unparse-constraint">
-    <xsl:param name="constraint"/>
-    <xsl:param name="definition_list"/>
-    <xsl:param name="type-expr-mode" select="false()"/>
-    <xsl:param name="capitalize" select="true()"/>
-
-    <xsl:choose>
-
-      <xsl:when test="name($constraint)='require-same-type'">
-	<xsl:if test="$type-expr-mode">identical to </xsl:if>
-	<type>
-	  <xsl:call-template name="unparse-cpp">
-	    <xsl:with-param name="typeref" select="$constraint/*[1]"/>
-	    <xsl:with-param name="definition_list" select="definition_list"/>
-	  </xsl:call-template>
-	</type>
-      </xsl:when>
-
-      <xsl:when test="name($constraint)='convertible-to'">
-	<xsl:choose>
-	  <xsl:when test="$type-expr-mode">convertible to </xsl:when>
-	  <xsl:when test="not($type-expr-mode) and $capitalize">Convertible to </xsl:when>
-	  <xsl:when test="not($type-expr-mode) and not($capitalize)">convertible to </xsl:when>
-	</xsl:choose>
-	<type>
-	  <xsl:call-template name="unparse-cpp">
-	    <xsl:with-param name="typeref" select="$constraint/*[1]"/>
-	    <xsl:with-param name="definition_list" select="definition_list"/>
-	  </xsl:call-template>
-	</type>
-      </xsl:when>
-
-      <xsl:when test="name($constraint)='derived-from'">
-	<xsl:choose>
-	  <xsl:when test="$type-expr-mode">derived from </xsl:when>
-	  <xsl:when test="not($type-expr-mode) and $capitalize">Derived from </xsl:when>
-	  <xsl:when test="not($type-expr-mode) and not($capitalize)">derived from </xsl:when>
-	</xsl:choose>
-	<type>
-	  <xsl:call-template name="unparse-cpp">
-	    <xsl:with-param name="typeref" select="$constraint/*[1]"/>
-	    <xsl:with-param name="definition_list" select="definition_list"/>
-	  </xsl:call-template>
-	</type>
-      </xsl:when>
-
-      <xsl:when test="name($constraint)='assignable-to'">
-	<xsl:choose>
-	  <xsl:when test="$type-expr-mode">assignable to </xsl:when>
-	  <xsl:when test="not($type-expr-mode) and $capitalize">Assignable to </xsl:when>
-	  <xsl:when test="not($type-expr-mode) and not($capitalize)">assignable to </xsl:when>
-	</xsl:choose>
-	<type>
-	  <xsl:call-template name="unparse-cpp">
-	    <xsl:with-param name="typeref" select="$constraint/*[1]"/>
-	    <xsl:with-param name="definition_list" select="definition_list"/>
-	  </xsl:call-template>
-	</type>
-      </xsl:when>
-
-      <xsl:when test="name($constraint)='models-as-first-arg'">
-	<xsl:choose>
-	  <xsl:when test="$type-expr-mode"> a model </xsl:when>
-	  <xsl:when test="not($type-expr-mode) and $capitalize"> Models </xsl:when>
-	  <xsl:when test="not($type-expr-mode) and not($capitalize)"> models </xsl:when>
-	</xsl:choose>
-	<xsl:if test="$constraint/*"><xsl:comment/>
-	  (along with <xsl:for-each select="$constraint/*"><type>
-	      <xsl:call-template name="unparse-cpp">
-		<xsl:with-param name="typeref" select="."/>
-		<xsl:with-param name="definition_list" select="definition_list"/>
-	      </xsl:call-template>
-	    </type>
-	    <xsl:choose>
-	      <xsl:when test="position()=last()"/>
-	      <xsl:when test="position()=last()-1 and last()=2"> and </xsl:when>
-	      <xsl:when test="position()=last()-1 and last()!=2">, and </xsl:when>
-	      <xsl:otherwise>, </xsl:otherwise>
-	    </xsl:choose><xsl:comment/>
-	  </xsl:for-each><xsl:comment/>) <xsl:comment/>
-	</xsl:if><xsl:comment/>
-	<xsl:if test="$type-expr-mode"> of </xsl:if>
-        <xsl:call-template name="concept.link">
-          <xsl:with-param name="name" select="$constraint/@concept"/>
-        </xsl:call-template>
-      </xsl:when>
-
-    </xsl:choose>
-  </xsl:template>
-
-  <xsl:template name="make-definition-list">
-    <xsl:param name="typedefs"/>
-    <xsl:param name="definition_list"/>
-
-    <xsl:choose>
-      <xsl:when test="$typedefs">
-	<xsl:variable name="type_definition">
-	  <xsl:if test="name($typedefs[1]/*[1])!='description'">
-	    <xsl:call-template name="unparse-cpp">
-	      <xsl:with-param name="typeref" select="$typedefs[1]/*[1]"/>
-	      <xsl:with-param name="definition_list" select="$definition_list"/>
-	    </xsl:call-template>
-	  </xsl:if>
-	</xsl:variable>
-
-	<xsl:variable name="new_type_definition">
-	  <xsl:choose>
-	    <xsl:when test="name($typedefs[1])='associated-type'">
-	      <xsl:value-of select="$typedefs[1]/@name"/>
-	    </xsl:when>
-	    <xsl:otherwise>
-	      <xsl:value-of select="$type_definition"/>
-	    </xsl:otherwise>
-	  </xsl:choose>
-	</xsl:variable>
-
-	<xsl:call-template name="make-definition-list">
-	  <xsl:with-param name="typedefs" select="$typedefs[position()!=1]"/>
-	  <xsl:with-param name="definition_list" select="concat($definition_list, ' @(@', $typedefs[1]/@name, '=', $new_type_definition, '@)@')"/>
-	</xsl:call-template>
-
-      </xsl:when>
-
-      <xsl:otherwise> <!-- End of expression list, emit the results that have accumulated -->
-	<xsl:value-of select="$definition_list"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <xsl:template name="print-associated-types">
-    <xsl:param name="typedefs"/>
-    <xsl:param name="definition_list"/>
-
-    <xsl:if test="$typedefs">
-      <refsect1>
-        <title>Associated types</title>
-
-        <xsl:choose>
-          <xsl:when test="$boost.concept.layout='sgi'">
-            <informaltable>
-              <tgroup cols="2">
-                <tbody>
-                  <xsl:apply-templates select="associated-type" mode="sgi">
-                    <xsl:with-param name="definition_list" 
-                      select="$definition_list"/>
-                  </xsl:apply-templates>
-                </tbody>
-              </tgroup>
-            </informaltable>
-          </xsl:when>
-          <xsl:when test="$boost.concept.layout='austern'">
-            <itemizedlist>
-              <xsl:apply-templates select="associated-type" mode="austern">
-                <xsl:with-param name="definition_list" 
-                  select="$definition_list"/>
-              </xsl:apply-templates>
-            </itemizedlist>
-          </xsl:when>
-          <xsl:when test="$boost.concept.layout='caramel'">
-            <segmentedlist>
-              <segtitle>Name</segtitle>
-              <segtitle>Code</segtitle>
-              <segtitle>Description</segtitle>
-              <xsl:for-each select="$typedefs">
-                <xsl:variable name="type_definition">
-                  <xsl:call-template name="unparse-cpp">
-                    <xsl:with-param name="typeref" select="*[1]"/>
-                    <xsl:with-param name="definition_list" select="$definition_list"/>
-                  </xsl:call-template>
-                </xsl:variable>
-                <seglistitem>
-                  <seg><xsl:value-of select="@name"/></seg>
-                  <seg><xsl:value-of select="$type_definition"/></seg>
-                  <seg>
-                    <xsl:for-each select="description">
-                      <xsl:call-template name="description"/>
-                    </xsl:for-each>
-                  </seg>
-                </seglistitem>
-              </xsl:for-each>
-            </segmentedlist>            
-          </xsl:when>
-        </xsl:choose>
-      </refsect1>
-    </xsl:if>
-  </xsl:template>
-
-  <xsl:template name="comma-list">
-    <xsl:param name="list"/>
-
-    <xsl:if test="$list!=''">
-      <term><varname>
-	<xsl:if test="substring-before($list,' ')=''"><xsl:value-of select="$list"/></xsl:if>
-	<xsl:value-of select="substring-before($list,' ')"/>
-      </varname></term>
-      <xsl:call-template name="comma-list">
-	<xsl:with-param name="list" select="substring-after($list,' ')"/>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:template>
-
-  <xsl:template match="associated-type" mode="sgi">
-    <row>
-      <entry><simpara><xsl:value-of select="@name"/></simpara></entry>
-
-      <entry>
-        <para>
-          <xsl:for-each select="description">
-            <xsl:apply-templates/>
-          </xsl:for-each>
-        </para>
-      </entry>
-    </row>
-  </xsl:template>
-
-  <xsl:template match="associated-type" mode="austern">
-    <xsl:param name="definition_list" select="''"/>
-
-    <listitem>
-      <para>
-        <emphasis role="bold"><xsl:value-of select="@name"/></emphasis>
-      
-        <xsl:call-template name="preformatted">
-          <xsl:with-param name="text">
-            <xsl:call-template name="unparse-cpp">
-              <xsl:with-param name="typeref" select="*[1]"/>
-              <xsl:with-param name="definition_list" select="$definition_list"/>
-            </xsl:call-template>
-          </xsl:with-param>
-        </xsl:call-template>
-        
-        <xsl:for-each select="description">
-          <xsl:apply-templates/>
-        </xsl:for-each>
-      </para>
-    </listitem>
-  </xsl:template>
-
-  <xsl:template match="valid-expression">
-    <xsl:param name="definition_list"/>
-    <xsl:param name="notations"/>
-    <xsl:param name="columns"/>
-
-    <row>
-      <entry><simpara><xsl:value-of select="@name"/></simpara></entry>
-
-      <entry>
-        <simpara>
-          <xsl:call-template name="unparse-cpp">
-            <xsl:with-param name="typeref" select="*[1]"/>
-            <xsl:with-param name="definition_list" select="$definition_list"/>
-            <xsl:with-param name="notations" select="$notations"/>
-          </xsl:call-template>
-        </simpara>
-      </entry>
-
-      <xsl:if test="contains($columns, 'T')">
-        <entry>
-          <simpara>
-            <xsl:for-each select="return-type/*">
-              <xsl:if test="position()!=1 and last()!=2">, </xsl:if>
-              <xsl:if test="position()=last() and last()!=1"> and </xsl:if>
-              <xsl:call-template name="unparse-constraint">
-                <xsl:with-param name="constraint" select="."/>
-                <xsl:with-param name="definition_list" 
-                  select="$definition_list"/>
-                <xsl:with-param name="capitalize" select="position()=1"/>
-              </xsl:call-template>
-            </xsl:for-each>          
-          </simpara>
-        </entry>
-      </xsl:if>
-
-      <xsl:if test="contains($columns, 'P')">
-        <entry>
-          <xsl:for-each select="precondition">
-            <simpara><xsl:apply-templates/></simpara>
-          </xsl:for-each>
-        </entry>
-      </xsl:if>
-
-      <xsl:if test="contains($columns, 'S')">
-        <entry>
-          <xsl:for-each select="semantics">
-            <simpara><xsl:apply-templates/></simpara>
-          </xsl:for-each>
-        </entry>
-      </xsl:if>
-
-      <xsl:if test="contains($columns, 'O')">
-        <entry>
-          <xsl:for-each select="postcondition">
-            <simpara><xsl:apply-templates/></simpara>
-          </xsl:for-each>
-        </entry>
-      </xsl:if>
-    </row>
-  </xsl:template>
-
-  <xsl:template name="concept.notation">
-    <xsl:param name="definition_list"/>
-
-    <refsect1>
-      <title>Notation</title>
-      <variablelist>
-        <xsl:for-each select="param">
-          <varlistentry>
-            <term><xsl:value-of select="@name"/></term>
-            <listitem>
-              <simpara>
-                <xsl:text>A type playing the role of </xsl:text>
-                <xsl:value-of select="@role"/>
-                <xsl:text> in the </xsl:text>
-                <xsl:call-template name="concept.link">
-                  <xsl:with-param name="name" select="../@name"/>
-                </xsl:call-template>
-                <xsl:text> concept.</xsl:text>
-              </simpara>
-            </listitem>
-          </varlistentry>
-        </xsl:for-each>
-        <xsl:for-each select="notation">
-          <xsl:variable name="notation_name">
-            <xsl:call-template name="comma-list">
-              <xsl:with-param name="list" 
-                select="normalize-space(@variables)"/>
-            </xsl:call-template>
-          </xsl:variable>
-
-          <varlistentry>
-            <xsl:copy-of select="$notation_name"/>
-            <listitem>
-              <simpara>
-                <xsl:variable name="output-plural" select="substring-before(normalize-space(@variables),' ')!=''"/>
-                <xsl:if test="name(*[1])='sample-value'">Object<xsl:if test="$output-plural">s</xsl:if> of type </xsl:if>
-                <xsl:variable name="typeref-to-print" select="*[name()!='sample-value'] | sample-value/*[name()!='sample-value']"/>
-                <xsl:call-template name="unparse-cpp">
-                  <xsl:with-param name="typeref" select="$typeref-to-print"/>
-                  <xsl:with-param name="definition_list" select="$definition_list"/>
-                  <xsl:with-param name="ignore-cv" select="true()"/>
-                  <xsl:with-param name="ignore-references" select="true()"/>
-                </xsl:call-template>
-              </simpara>
-            </listitem>
-          </varlistentry>
-        </xsl:for-each>
-      </variablelist>
-    </refsect1>    
-  </xsl:template>
-
-  <xsl:template name="concept.link">
-    <xsl:param name="name" select="text()"/>
-    <xsl:param name="warn" select="true()"/>
-    <xsl:param name="text" select="$name"/>
-    <xsl:variable name="node" select="key('concepts', $name)"/>
-    
-    <xsl:choose>
-      <xsl:when test="count($node)=0">
-        <xsl:if test="$warn">
-          <xsl:message>
-            <xsl:text>warning: cannot find concept '</xsl:text>
-            <xsl:value-of select="$name"/>
-            <xsl:text>'</xsl:text>
-          </xsl:message>
-        </xsl:if>
-        <xsl:value-of select="$text"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="internal-link">
-          <xsl:with-param name="to">
-            <xsl:call-template name="generate.id">
-              <xsl:with-param name="node" select="$node"/>
-            </xsl:call-template>
-          </xsl:with-param>
-          <xsl:with-param name="text" select="$text"/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>    
-  </xsl:template>
-
-  <xsl:template name="remove-whitespace">
-    <xsl:param name="text" select="text()"/>
-
-    <xsl:variable name="normalized" select="normalize-space($text)"/>
-    <xsl:choose>
-      <xsl:when test="contains($normalized, ' ')">
-        <xsl:value-of select="substring-before($normalized, ' ')"/>
-        <xsl:call-template name="remove-whitespace">
-          <xsl:with-param name="text" 
-            select="substring-after($normalized, ' ')"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$normalized"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <xsl:template match="concept" mode="generate.id">
-    <xsl:call-template name="remove-whitespace">
-      <xsl:with-param name="text" select="@name"/>
-    </xsl:call-template>
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/src/documentation/xsl/caramel/unparser.xsl b/src/documentation/xsl/caramel/unparser.xsl
deleted file mode 100644
index 3825f47245..0000000000
--- a/src/documentation/xsl/caramel/unparser.xsl
+++ /dev/null
@@ -1,497 +0,0 @@
-<?xml version="1.0" ?>
-
-<!--
-Copyright (c) 2002-2003 The Trustees of Indiana University.
-                        All rights reserved.
-Copyright (c) 2000-2001 University of Notre Dame. All rights reserved.
-
-The software included in this source file is licensed under the terms and
-conditions of the Software License, version 1.0, in the file LICENSE at the
-top level of the Caramel distribution. -->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-  <xsl:template name="unparse-cpp">
-    <xsl:param name="typeref"/>
-    <xsl:param name="definition_list"/>
-    <xsl:param name="priority">0</xsl:param>
-    <xsl:param name="ignore-cv" select="false()"/>
-    <xsl:param name="ignore-references" select="false()"/>
-    <xsl:param name="notations"/>
-    <xsl:param name="ignore-notation" select="false()"/>
-    <xsl:param name="print-updated-notation" select="false()"/>
-    <xsl:param name="use-typename" select="false()"/>
-    <xsl:param name="const-if-not-mutable-value" select="'const-if-not-mutable'"/>
-
-    <xsl:variable name="notation_check">
-      <xsl:if test="not($ignore-notation)"> <!-- Prevent infinite recursion -->
-	<xsl:call-template name="unparse-cpp">
-	  <xsl:with-param name="typeref" select="$typeref"/>
-	  <xsl:with-param name="definition_list" select="$definition_list"/>
-	  <xsl:with-param name="priority">0</xsl:with-param>
-	  <xsl:with-param name="ignore-cv" select="true()"/>
-	  <xsl:with-param name="ignore-references" select="true()"/>
-	  <xsl:with-param name="notations" select="$notations"/>
-	  <xsl:with-param name="ignore-notation" select="true()"/>
-	  <xsl:with-param name="const-if-not-mutable-value" select="$const-if-not-mutable-value"/>
-	</xsl:call-template>
-      </xsl:if>
-    </xsl:variable>
-
-    <!--
-    <xsl:message>Notation check: <xsl:value-of select="$notation_check"/>
-		 Notations: <xsl:value-of select="$notations"/>
-    </xsl:message> -->
-
-    <xsl:variable name="this_op_priority" select="document('cpp-operators.xml')/operator-list/op[@name=name($typeref)]/apply/@priority"/>
-
-    <xsl:variable name="result">
-
-      <xsl:variable name="subcall_priority">
-	<xsl:choose>
-	  <xsl:when test="true() or ($this_op_priority &gt; $priority)">
-	    <xsl:value-of select="$this_op_priority"/>
-	  </xsl:when>
-	  <!-- <xsl:otherwise>0</xsl:otherwise> -->
-	</xsl:choose>
-      </xsl:variable>
-
-      <xsl:if test="$this_op_priority &lt;= $priority">(</xsl:if>
-
-      <xsl:choose>
-
-	<xsl:when test="name($typeref)='sample-value'"
-	  >boost::sample_value &lt; <xsl:call-template name="unparse-cpp"><xsl:with-param name="typeref" select="$typeref/*[1]"/><xsl:with-param name="definition_list" select="$definition_list"/><xsl:with-param name="ignore-cv" select="$ignore-cv"/><xsl:with-param name="notations" select="$notations"/><xsl:with-param name="ignore-references" select="$ignore-references"/><xsl:with-param name="const-if-not-mutable-value" select="$const-if-not-mutable-value"/></xsl:call-template> &gt;()</xsl:when>
-
-	<xsl:when test="name($typeref)='reference-to'"
-	  ><xsl:call-template name="unparse-cpp"><xsl:with-param name="typeref" select="$typeref/*[1]"/><xsl:with-param name="definition_list" select="$definition_list"/><xsl:with-param name="priority" select="$subcall_priority"/><xsl:with-param name="ignore-cv" select="$ignore-cv"/><xsl:with-param name="notations" select="$notations"/><xsl:with-param name="const-if-not-mutable-value" select="$const-if-not-mutable-value"/></xsl:call-template><xsl:if test="not($ignore-references)"> &amp;</xsl:if></xsl:when>
-
-	<xsl:when test="name($typeref)='pointer-to'"
-	  ><xsl:call-template name="unparse-cpp"><xsl:with-param name="typeref" select="$typeref/*[1]"/><xsl:with-param name="definition_list" select="$definition_list"/><xsl:with-param name="priority" select="$subcall_priority"/><xsl:with-param name="ignore-cv" select="$ignore-cv"/><xsl:with-param name="notations" select="$notations"/></xsl:call-template> *</xsl:when>
-
-	<xsl:when test="name($typeref)='const'"
-	><xsl:if test="not($ignore-cv)">const </xsl:if><xsl:call-template name="unparse-cpp"><xsl:with-param name="typeref" select="$typeref/*[1]"/><xsl:with-param name="definition_list" select="$definition_list"/><xsl:with-param name="priority" select="$subcall_priority"/><xsl:with-param name="ignore-cv" select="$ignore-cv"/><xsl:with-param name="notations" select="$notations"/><xsl:with-param name="ignore-references" select="$ignore-references"/><xsl:with-param name="const-if-not-mutable-value" select="$const-if-not-mutable-value"/></xsl:call-template>
-	</xsl:when>
-
-	<xsl:when test="name($typeref)='const-if-not-mutable'"
-	><xsl:if test="not($ignore-cv)"><xsl:value-of select="$const-if-not-mutable-value"/><xsl:if test="$const-if-not-mutable-value"><xsl:text> </xsl:text></xsl:if></xsl:if><xsl:call-template name="unparse-cpp"><xsl:with-param name="typeref" select="$typeref/*[1]"/><xsl:with-param name="definition_list" select="$definition_list"/><xsl:with-param name="priority" select="$subcall_priority"/><xsl:with-param name="ignore-cv" select="$ignore-cv"/><xsl:with-param name="notations" select="$notations"/><xsl:with-param name="ignore-references" select="$ignore-references"/><xsl:with-param name="const-if-not-mutable-value" select="$const-if-not-mutable-value"/></xsl:call-template>
-	</xsl:when>
-
-	<xsl:when test="name($typeref)='volatile'"
-	><xsl:if test="not($ignore-cv)">volatile </xsl:if><xsl:call-template name="unparse-cpp"><xsl:with-param name="typeref" select="$typeref/*[1]"/><xsl:with-param name="definition_list" select="$definition_list"/><xsl:with-param name="priority" select="$subcall_priority"/><xsl:with-param name="ignore-cv" select="$ignore-cv"/><xsl:with-param name="notations" select="$notations"/><xsl:with-param name="ignore-references" select="$ignore-references"/><xsl:with-param name="const-if-not-mutable-value" select="$const-if-not-mutable-value"/></xsl:call-template>
-	</xsl:when>
-
-	<xsl:when test="name($typeref)='apply-template'">
-	  <xsl:value-of select="$typeref/@name"/>&lt;<xsl:for-each select="$typeref/*">
-	      <xsl:if test="position()!=1">, </xsl:if><xsl:comment/>
-	      <xsl:call-template name="unparse-cpp">
-		<xsl:with-param name="typeref" select="."/>
-		<xsl:with-param name="definition_list" select="$definition_list"/>
-		<xsl:with-param name="ignore-cv" select="$ignore-cv"/>
-		<xsl:with-param name="notations" select="$notations"/>
-		<xsl:with-param name="const-if-not-mutable-value" select="$const-if-not-mutable-value"/>
-	      </xsl:call-template></xsl:for-each
-	    ><xsl:comment/>&gt;</xsl:when>
-
-	<xsl:when test="name($typeref)='get-member-type'">
-	  <xsl:call-template name="unparse-cpp"><xsl:with-param name="typeref" select="$typeref/*[1]"/><xsl:with-param name="definition_list" select="$definition_list"/><xsl:with-param name="ignore-cv" select="$ignore-cv"/><xsl:with-param name="notations" select="$notations"/><xsl:with-param name="const-if-not-mutable-value" select="$const-if-not-mutable-value"/></xsl:call-template>::<xsl:value-of select="$typeref/@name"/>
-	</xsl:when>
-
-	<xsl:when test="name($typeref)='type'">
-	  <xsl:variable name="typeref_value" select="normalize-space(substring-before(substring-after($definition_list,concat('@(@',$typeref/@name,'=')),'@)@'))"/>
-	  <xsl:choose>
-	    <xsl:when test="$typeref_value=''">
-	      <xsl:value-of select="$typeref/@name"/><xsl:comment/>
-	    </xsl:when>
-	    <xsl:otherwise>
-	      <xsl:value-of select="$typeref_value"/><xsl:comment/>
-	    </xsl:otherwise>
-	  </xsl:choose>
-	</xsl:when>
-
-	<xsl:when test="name($typeref)='documentation'"/>
-
-	<xsl:when test="document('cpp-operators.xml')/operator-list/op[@name=name($typeref)]">
-	  <xsl:variable name="op_file" select="document('cpp-operators.xml')/operator-list"/>
-	  <xsl:variable name="op_info" select="$op_file/op[@name=name($typeref)]/apply/."/>
-
-	  <xsl:call-template name="unparse-operator-definition">
-	    <xsl:with-param name="typeref" select="$typeref"/>
-	    <xsl:with-param name="operator_nodeset" select="$op_info/child::node()"/>
-	    <xsl:with-param name="my_priority" select="$subcall_priority"/>
-	    <xsl:with-param name="definition_list" select="$definition_list"/>
-	    <xsl:with-param name="notations" select="$notations"/>
-	    <xsl:with-param name="ignore-cv" select="$ignore-cv"/>
-	    <xsl:with-param name="const-if-not-mutable-value" select="$const-if-not-mutable-value"/>
-	    <xsl:with-param name="print-updated-notation" select="$print-updated-notation"/>
-	  </xsl:call-template>
-
-	</xsl:when>
-
-	<xsl:otherwise>
-	  (Unrecognized tag <xsl:value-of select="name($typeref)"/>)
-	</xsl:otherwise>
-      </xsl:choose>
-
-      <!-- Close parenthesis code moved below -->
-
-    </xsl:variable>
-
-    <!-- <xsl:message>ignore-notation = <xsl:value-of select="$ignore-notation"/></xsl:message> -->
-    <!-- <xsl:message>notation_check = <xsl:value-of select="$notation_check"/></xsl:message> -->
-    <!-- <xsl:message>notations = <xsl:value-of select="$notations"/></xsl:message> -->
-    <!-- <xsl:message>result = <xsl:value-of select="$result"/></xsl:message> -->
-
-    <xsl:variable name="used_notation" select="boolean($notation_check) and boolean(substring-before(substring-after($notations, concat('@@(@@', $notation_check, '@@=@@')),'@@)@@'))"/>
-
-    <xsl:variable name="notations2">
-      <!-- Possibly replace from result of unparse-operator-definition -->
-      <xsl:choose>
-	<xsl:when test="contains($result, ' *@@@* ')">
-	  <xsl:value-of select="substring-after($result, ' *@@@* ')"/>
-	</xsl:when>
-	<xsl:otherwise>
-	  <xsl:value-of select="$notations"/>
-	</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-
-    <xsl:variable name="result2">
-      <!-- Possibly replace from result of unparse-operator-definition -->
-      <xsl:choose>
-	<xsl:when test="contains($result, ' *@@@* ')">
-	  <xsl:value-of select="substring-before($result, ' *@@@* ')"/>
-	</xsl:when>
-	<xsl:otherwise>
-	  <xsl:value-of select="$result"/>
-	</xsl:otherwise>
-      </xsl:choose>
-      <!-- Close parenthesis code -->
-      <xsl:if test="$this_op_priority &lt;= $priority">)</xsl:if>
-    </xsl:variable>
-
-    <xsl:variable name="notation_varlist">
-      <xsl:choose>
-	<xsl:when test="$used_notation">
-	  <xsl:value-of select="substring-before(substring-after($notations2, concat('@@(@@', $notation_check, '@@=@@')), '@@)@@')"/>
-	</xsl:when>
-	<xsl:otherwise>
-	  <xsl:value-of select="$result2"/>
-	</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-
-    <xsl:variable name="new_varlist" select="substring-after(normalize-space($notation_varlist), ' ')"/>
-
-    <xsl:variable name="notation_var">
-      <xsl:choose>
-	<xsl:when test="not($used_notation)">
-	  <xsl:value-of select="$result2"/>
-	</xsl:when>
-	<xsl:when test="$new_varlist=''">
-	  <xsl:value-of select="$notation_varlist"/>
-	</xsl:when>
-	<xsl:otherwise>
-	  <xsl:value-of select="substring-before(normalize-space($notation_varlist), ' ')"/>
-	</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-
-    <!-- Generate new notation list -->
-    <xsl:variable name="new_notations">
-      <xsl:choose>
-	<xsl:when test="$used_notation">
-	  <xsl:value-of select="normalize-space(concat('@@(@@', $notation_check, '@@=@@', $new_varlist, '@@)@@', $notations2))"/>
-	  <!-- Duplicate entries always use first occurrance, so I can optimize this -->
-	</xsl:when>
-	<xsl:otherwise><xsl:value-of select="$notations2"/></xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-
-    <!-- <xsl:message>final_result = <xsl:value-of select="normalize-space($final_result)"/></xsl:message> -->
-
-    <xsl:call-template name="add-typename"><xsl:with-param name="really-do-it" select="$use-typename"/><xsl:with-param name="type"><xsl:value-of select="normalize-space($notation_var)"/></xsl:with-param></xsl:call-template><xsl:if test="$print-updated-notation"> *@@@* <xsl:value-of select="$new_notations"/></xsl:if>
-
-  </xsl:template>
-
-  <xsl:template name="unparse-operator-definition">
-    <xsl:param name="typeref"/>
-    <xsl:param name="operator_nodeset"/>
-    <xsl:param name="current_start">1</xsl:param>
-    <xsl:param name="my_priority"/>
-    <xsl:param name="definition_list"/>
-    <xsl:param name="notations"/>
-    <xsl:param name="ignore-cv"/>
-    <xsl:param name="self"/>
-    <xsl:param name="use-code-block" select="false()"/>
-    <xsl:param name="print-updated-notation" select="false()"/>
-    <xsl:param name="const-if-not-mutable-value"/>
-
-    <xsl:variable name="op_current" select="$operator_nodeset[position()=1]"/>
-    <xsl:variable name="op_rest" select="$operator_nodeset[position()!=1]"/>
-
-    <xsl:choose>
-
-      <xsl:when test="count($operator_nodeset)=0">
-	<xsl:if test="$print-updated-notation"> *@@@* <xsl:value-of select="$notations"/></xsl:if>
-      </xsl:when>
-
-      <xsl:when test="$op_current != $op_current/../*"> <!-- If I am not an element -->
-	<xsl:value-of select="$op_current"/>
-	<xsl:call-template name="unparse-operator-definition">
-	  <xsl:with-param name="typeref" select="$typeref"/>
-	  <xsl:with-param name="operator_nodeset" select="$op_rest"/>
-	  <xsl:with-param name="my_priority" select="$my_priority"/>
-	  <xsl:with-param name="definition_list" select="$definition_list"/>
-	  <xsl:with-param name="notations" select="$notations"/>
-	  <xsl:with-param name="self" select="$self"/>
-	  <xsl:with-param name="use-code-block" select="$use-code-block"/>
-	  <xsl:with-param name="print-updated-notation" select="$print-updated-notation"/>
-	  <xsl:with-param name="const-if-not-mutable-value" select="$const-if-not-mutable-value"/>
-	</xsl:call-template>
-      </xsl:when>
-
-      <xsl:when test="name($op_current)='name'">
-	<xsl:value-of select="$typeref/@name"/>
-	<xsl:call-template name="unparse-operator-definition">
-	  <xsl:with-param name="typeref" select="$typeref"/>
-	  <xsl:with-param name="operator_nodeset" select="$op_rest"/>
-	  <xsl:with-param name="my_priority" select="$my_priority"/>
-	  <xsl:with-param name="definition_list" select="$definition_list"/>
-	  <xsl:with-param name="notations" select="$notations"/>
-	  <xsl:with-param name="ignore-cv" select="$ignore-cv"/>
-	  <xsl:with-param name="self" select="$self"/>
-	  <xsl:with-param name="use-code-block" select="$use-code-block"/>
-	  <xsl:with-param name="print-updated-notation" select="$print-updated-notation"/>
-	  <xsl:with-param name="const-if-not-mutable-value" select="$const-if-not-mutable-value"/>
-	</xsl:call-template>
-      </xsl:when>
-
-      <xsl:when test="name($op_current)='self'">
-        <xsl:call-template name="concept.link">
-          <xsl:with-param name="name" select="string($self)"/>
-        </xsl:call-template>
-	<xsl:call-template name="unparse-operator-definition">
-	  <xsl:with-param name="typeref" select="$typeref"/>
-	  <xsl:with-param name="operator_nodeset" select="$op_rest"/>
-	  <xsl:with-param name="my_priority" select="$my_priority"/>
-	  <xsl:with-param name="definition_list" select="$definition_list"/>
-	  <xsl:with-param name="notations" select="$notations"/>
-	  <xsl:with-param name="ignore-cv" select="$ignore-cv"/>
-	  <xsl:with-param name="self" select="$self"/>
-	  <xsl:with-param name="use-code-block" select="$use-code-block"/>
-	  <xsl:with-param name="print-updated-notation" select="$print-updated-notation"/>
-	  <xsl:with-param name="const-if-not-mutable-value" select="$const-if-not-mutable-value"/>
-	</xsl:call-template>
-      </xsl:when>
-
-      <xsl:when test="name($op_current)='arg'">
-	<xsl:variable name="num" select="$op_current/@num"/>
-	<xsl:variable name="assoc" select="$op_current/../@assoc"/>
-	<xsl:variable name="my_priority_before" select="$my_priority"/>
-	<xsl:variable name="my_priority">
-	  <xsl:choose>
-	    <xsl:when test="count($op_current/@priority)">
-	      <xsl:value-of select="$op_current/@priority"/>
-	    </xsl:when>
-	    <xsl:when test="$assoc and ($num = $assoc)">
-	      <xsl:value-of select="$my_priority_before - 1"/>
-	    </xsl:when>
-	    <xsl:otherwise>
-	      <xsl:value-of select="$my_priority"/>
-	    </xsl:otherwise>
-	  </xsl:choose>
-	</xsl:variable>
-	<xsl:variable name="typeref-result">
-	  <xsl:call-template name="unparse-cpp">
-	    <xsl:with-param name="typeref" select="$typeref/*[position()=$num]"/>
-	    <xsl:with-param name="definition_list" select="$definition_list"/>
-	    <xsl:with-param name="priority" select="$my_priority"/>
-	    <xsl:with-param name="ignore-cv" select="$ignore-cv"/>
-	    <xsl:with-param name="notations" select="$notations"/>
-	    <xsl:with-param name="print-updated-notation" select="true()"/>
-	    <xsl:with-param name="const-if-not-mutable-value" select="$const-if-not-mutable-value"/>
-	  </xsl:call-template>
-	</xsl:variable>
-	<xsl:variable name="typeref-print" select="normalize-space(substring-before($typeref-result, ' *@@@* '))"/>
-	<xsl:variable name="new_notations" select="normalize-space(substring-after($typeref-result, ' *@@@* '))"/>
-
-	<xsl:choose>
-	  <xsl:when test="$use-code-block">
-	    <type><xsl:value-of select="$typeref-print"/></type>
-	  </xsl:when>
-	  <xsl:otherwise>
-	    <xsl:value-of select="$typeref-print"/>
-	  </xsl:otherwise>
-	</xsl:choose>
-
-	<xsl:call-template name="unparse-operator-definition">
-	  <xsl:with-param name="typeref" select="$typeref"/>
-	  <xsl:with-param name="operator_nodeset" select="$op_rest"/>
-	  <xsl:with-param name="my_priority" select="$my_priority_before"/>
-	  <xsl:with-param name="definition_list" select="$definition_list"/>
-	  <xsl:with-param name="notations" select="$new_notations"/>
-	  <xsl:with-param name="ignore-cv" select="$ignore-cv"/>
-	  <xsl:with-param name="self" select="$self"/>
-	  <xsl:with-param name="use-code-block" select="$use-code-block"/>
-	  <xsl:with-param name="print-updated-notation" select="$print-updated-notation"/>
-	  <xsl:with-param name="const-if-not-mutable-value" select="$const-if-not-mutable-value"/>
-	</xsl:call-template>
-      </xsl:when>
-
-      <xsl:when test="name($op_current)='arg-list'">
-	<xsl:variable name="start" select="$op_current/@start"/>
-	<xsl:variable name="typeref-result">
-	  <xsl:choose>
-	    <xsl:when test="$current_start &gt;= $start">
-	      <xsl:call-template name="unparse-cpp">
-		<xsl:with-param name="typeref" select="$typeref/*[$current_start]"/>
-		<xsl:with-param name="definition_list" select="$definition_list"/>
-		<xsl:with-param name="priority" select="$my_priority"/>
-		<xsl:with-param name="ignore-cv" select="$ignore-cv"/>
-		<xsl:with-param name="notations" select="$notations"/>
-		<xsl:with-param name="print-updated-notation" select="true()"/>
-		<xsl:with-param name="const-if-not-mutable-value" select="$const-if-not-mutable-value"/>
-	      </xsl:call-template>
-	    </xsl:when>
-
-	    <xsl:otherwise>
-	       *@@@* <xsl:value-of select="$notations"/>
-	    </xsl:otherwise>
-	  </xsl:choose>
-	</xsl:variable>
-
-	<xsl:variable name="typeref-print" select="normalize-space(substring-before($typeref-result, ' *@@@* '))"/>
-	<xsl:variable name="new_notations" select="normalize-space(substring-after($typeref-result, ' *@@@* '))"/>
-
-	<xsl:choose>
-	  <xsl:when test="$use-code-block">
-	    <type><xsl:value-of select="$typeref-print"/></type>
-	  </xsl:when>
-	  <xsl:otherwise>
-	    <xsl:value-of select="$typeref-print"/>
-	  </xsl:otherwise>
-	</xsl:choose>
-
-	<xsl:if test="$current_start &gt;= $start">
-	  <xsl:if test="$current_start!=count($typeref/*)">, </xsl:if>
-	</xsl:if>
-
-	<xsl:choose>
-	  <xsl:when test="$current_start != count($typeref/*)">
-	    <xsl:call-template name="unparse-operator-definition">
-	      <xsl:with-param name="typeref" select="$typeref"/>
-	      <xsl:with-param name="operator_nodeset" select="$operator_nodeset"/>
-	      <xsl:with-param name="current_start" select="$current_start + 1"/>
-	      <xsl:with-param name="my_priority" select="$my_priority"/>
-	      <xsl:with-param name="definition_list" select="$definition_list"/>
-	      <xsl:with-param name="notations" select="$new_notations"/>
-	      <xsl:with-param name="ignore-cv" select="$ignore-cv"/>
-	      <xsl:with-param name="self" select="$self"/>
-	      <xsl:with-param name="use-code-block" select="$use-code-block"/>
-	      <xsl:with-param name="print-updated-notation" select="$print-updated-notation"/>
-	      <xsl:with-param name="const-if-not-mutable-value" select="$const-if-not-mutable-value"/>
-	    </xsl:call-template>
-	  </xsl:when>
-	  <xsl:otherwise>
-	    <xsl:call-template name="unparse-operator-definition">
-	      <xsl:with-param name="typeref" select="$typeref"/>
-	      <xsl:with-param name="operator_nodeset" select="$op_rest"/>
-	      <xsl:with-param name="my_priority" select="$my_priority"/>
-	      <xsl:with-param name="definition_list" select="$definition_list"/>
-	      <xsl:with-param name="notations" select="$new_notations"/>
-	      <xsl:with-param name="ignore-cv" select="$ignore-cv"/>
-	      <xsl:with-param name="self" select="$self"/>
-	      <xsl:with-param name="use-code-block" select="$use-code-block"/>
-	      <xsl:with-param name="const-if-not-mutable-value" select="$const-if-not-mutable-value"/>
-	    </xsl:call-template>
-	  </xsl:otherwise>
-	</xsl:choose>
-      </xsl:when>
-
-      <xsl:otherwise>Invalid tag in operator definition: <xsl:value-of select="name($op_current)"/></xsl:otherwise>
-
-    </xsl:choose>
-  </xsl:template>
-
-  <xsl:template name="add-typename">
-    <!-- Adds typename to the front of a string if it is necessary. -->
-    <xsl:param name="type"/> <!-- string to prepend to -->
-    <xsl:param name="params" select="/concept/param | /concept/define-type | /concept/associated-type"/>
-      <!-- nodeset of param tags for concept -->
-      <!-- associated types are assumed to be dependent -->
-    <xsl:param name="really-do-it"/> <!-- really change anything? -->
-
-    <xsl:variable name="type-after-last-scope">
-      <xsl:call-template name="substring-before-last">
-	<xsl:with-param name="string" select="$type"/>
-	<xsl:with-param name="to-find" select="'::'"/>
-      </xsl:call-template>
-    </xsl:variable>
-
-    <xsl:variable name="tokenized-type-after-last-scope">
-      <xsl:call-template name="rough-tokenize">
-	<xsl:with-param name="string" select="$type-after-last-scope"/>
-      </xsl:call-template>
-    </xsl:variable>
-
-    <xsl:choose>
-      <xsl:when test="$really-do-it and boolean($params[contains($tokenized-type-after-last-scope, concat(' ', @name, ' '))])">
-      <!-- If the tokenized string contains any of the param names in a
-      token by itself, return true.  Return false otherwise -->
-	<xsl:comment/>typename <xsl:value-of select="$type"/><xsl:comment/>
-      </xsl:when>
-      <xsl:otherwise><xsl:value-of select="$type"/></xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <xsl:template name="substring-before-last">
-    <xsl:param name="string"/>
-    <xsl:param name="to-find"/>
-    <xsl:param name="string-processed-so-far"/> <!-- internal -->
-    <!-- Find the substring of $string before the last occurrance of
-    $to-find, returning '' if it was not found. -->
-
-    <xsl:choose>
-      <xsl:when test="contains($string, $to-find)">
-	<xsl:call-template name="substring-before-last">
-	  <xsl:with-param name="string" select="substring-after($string, $to-find)"/>
-	  <xsl:with-param name="to-find" select="$to-find"/>
-	  <xsl:with-param name="string-processed-so-far" select="concat($string-processed-so-far, substring-before($string, $to-find), $to-find)"/>
-	</xsl:call-template>
-      </xsl:when>
-
-      <xsl:otherwise>
-	<xsl:value-of select="substring($string-processed-so-far, 1, string-length($string-processed-so-far)-(string-length($to-find)))"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <xsl:template name="substring-after-last">
-    <xsl:param name="string"/>
-    <xsl:param name="to-find"/>
-    <!-- Find the substring of $string after the last occurrance of
-    $to-find, returning the original string if it was not found. -->
-
-    <xsl:choose>
-      <xsl:when test="contains($string, $to-find)">
-	<xsl:call-template name="substring-after-last">
-	  <xsl:with-param name="string" select="substring-after($string, $to-find)"/>
-	  <xsl:with-param name="to-find" select="$to-find"/>
-	</xsl:call-template>
-      </xsl:when>
-
-      <xsl:otherwise>
-	<xsl:value-of select="$string"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <xsl:template name="rough-tokenize">
-    <xsl:param name="string"/>
-    <!-- Do a rough tokenization of the string.  Right now, just translate
-    all non-token-chars to spaces, normalize-space the result, and prepend
-    and append spaces. -->
-
-    <xsl:value-of select="concat(' ', normalize-space(translate($string, '&lt;&gt;,./?;:[]{}-=\\_+|!@#$%^&amp;*()', '                             ')), ' ')"/>
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/src/documentation/xsl/docbook.xsl b/src/documentation/xsl/docbook.xsl
deleted file mode 100644
index 89b942a957..0000000000
--- a/src/documentation/xsl/docbook.xsl
+++ /dev/null
@@ -1,408 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="1.0">
-  <xsl:include href="reference.xsl"/>
-
-  <xsl:output method="xml"
-    doctype-public="-//OASIS//DTD DocBook XML V4.2//EN"
-    doctype-system="http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"/>
-
-  <!-- The maximum number of columns allowed in preformatted text -->
-  <xsl:param name="max-columns" select="78"/>
-
-  <!-- The root of the Boost directory -->
-  <xsl:param name="boost.root" select="'../..'"/>
-
-  <!-- A space-separated list of libraries to include in the
-       output. If this list is empty, all libraries will be included. -->
-  <xsl:param name="boost.include.libraries" select="''"/>
-
-  <xsl:template match="library-reference">
-    <xsl:choose>
-      <xsl:when test="ancestor::library-reference">
-        <xsl:apply-templates/>
-      </xsl:when>
-      <xsl:otherwise>
-        <section>
-          <xsl:choose>
-            <xsl:when test="@id">
-              <xsl:attribute name="id">
-                <xsl:value-of select="@id"/>
-              </xsl:attribute>
-            </xsl:when>
-            <xsl:when test="ancestor::library/attribute::id">
-              <xsl:attribute name="id">
-                <xsl:value-of select="ancestor::library/attribute::id"/>
-                <xsl:text>.reference</xsl:text>
-              </xsl:attribute>
-            </xsl:when>
-          </xsl:choose>
-          <xsl:if test="not(title)">
-            <title>
-              <xsl:text>Reference</xsl:text>
-            </title>    
-          </xsl:if>
-
-          <xsl:if test="concept">
-            <section>
-              <title>Concepts</title>
-
-              <xsl:if test="ancestor::library/attribute::id">
-                <xsl:attribute name="id">
-                  <xsl:value-of select="ancestor::library/attribute::id"/>
-                  <xsl:text>.concepts</xsl:text>
-                </xsl:attribute>
-              </xsl:if>
-
-              <itemizedlist>
-                <xsl:for-each select="concept">
-                  <listitem>
-                    <xsl:call-template name="internal-link">
-                      <xsl:with-param name="to">
-                        <xsl:call-template name="generate.id"/>
-                      </xsl:with-param>
-                      <xsl:with-param name="text" select="@name"/>
-                    </xsl:call-template>
-                  </listitem>
-                </xsl:for-each>
-              </itemizedlist>
-            </section>
-          </xsl:if>
-
-          <xsl:apply-templates/>
-        </section>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <xsl:template match="header">
-    <xsl:if test="*">
-      <section>
-        <xsl:attribute name="id">
-          <xsl:call-template name="generate.id"/>
-        </xsl:attribute>
-
-        <title>
-          <xsl:text>Header &lt;</xsl:text>
-          <ulink>
-            <xsl:attribute name="url">
-              <xsl:value-of select="$boost.root"/>
-              <xsl:text>/</xsl:text>
-              <xsl:value-of select="@name"/>
-            </xsl:attribute>
-            <xsl:value-of select="@name"/>
-          </ulink>
-          <xsl:text>&gt;</xsl:text>
-        </title>
-
-        <xsl:apply-templates select="para|section" mode="annotation"/>
-        
-        <xsl:if test="macro">
-          <xsl:call-template name="synopsis">
-            <xsl:with-param name="text">
-              <xsl:apply-templates mode="synopsis" select="macro">
-                <xsl:with-param name="indentation" select="0"/>
-              </xsl:apply-templates>
-            </xsl:with-param>
-          </xsl:call-template>
-        </xsl:if>
-
-        <xsl:if test="namespace|class|struct|union">
-          <xsl:call-template name="synopsis">
-            <xsl:with-param name="text">
-              <xsl:apply-templates mode="synopsis" 
-                select="namespace|class|struct|union">
-                <xsl:with-param name="indentation" select="0"/>
-              </xsl:apply-templates>
-            </xsl:with-param>
-          </xsl:call-template>
-        </xsl:if>
-
-        <xsl:apply-templates mode="namespace-reference"/>
-      </section>
-    </xsl:if>
-  </xsl:template>
-
-  <xsl:template match="header" mode="generate.id">
-    <xsl:text>header.</xsl:text>
-    <xsl:value-of select="translate(@name, '/','.')"/>
-  </xsl:template>
-
-  <xsl:template match="*" mode="passthrough">
-    <xsl:copy-of select="."/>
-  </xsl:template>
-
-  <!-- Syntax highlighting -->
-  <xsl:template name="highlight-keyword">
-    <xsl:param name="keyword"/>
-    <xsl:choose>
-      <xsl:when test="$boost.syntax.highlight='1'">
-        <emphasis role="bold"><xsl:value-of select="$keyword"/></emphasis>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$keyword"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <xsl:template name="highlight-comment">
-    <xsl:param name="text"/>
-    <emphasis><xsl:copy-of select="$text"/></emphasis>
-  </xsl:template>
-
-  <xsl:template name="monospaced">
-    <xsl:param name="text"/>
-    <computeroutput><xsl:value-of select="$text"/></computeroutput>
-  </xsl:template>
-
-  <!-- Linking -->
-  <xsl:template name="internal-link">
-    <xsl:param name="to"/>
-    <xsl:param name="text"/>
-    <xsl:param name="highlight" select="false()"/>
-
-    <link linkend="{$to}">
-      <xsl:if test="$highlight">
-        <xsl:call-template name="source-highlight">
-          <xsl:with-param name="text" select="$text"/>
-        </xsl:call-template>
-      </xsl:if>
-      <xsl:if test="not($highlight)">
-        <xsl:value-of select="string($text)"/>
-      </xsl:if>
-    </link>
-  </xsl:template>
-
-  <xsl:template name="anchor">
-    <xsl:param name="to"/>
-    <xsl:param name="text"/>
-    <xsl:param name="highlight" select="false()"/>
-
-    <anchor id="{$to}"/>
-    <xsl:if test="$highlight">
-      <xsl:call-template name="source-highlight">
-        <xsl:with-param name="text" select="$text"/>
-      </xsl:call-template>
-    </xsl:if>
-    <xsl:if test="not($highlight)">
-      <xsl:value-of select="$text"/>
-    </xsl:if>
-  </xsl:template>
-
-  <xsl:template name="link-or-anchor">
-    <xsl:param name="to"/>
-    <xsl:param name="text"/>
-
-    <!-- True if we should create an anchor, otherwise we will create
-         a link. If you require more control (e.g., with the possibility of
-         having no link or anchor), set link-type instead: if present, it
-         takes precedence. -->
-    <xsl:param name="is-anchor"/>
-
-    <!-- 'anchor', 'link', or 'none' -->
-    <xsl:param name="link-type">
-      <xsl:choose>
-        <xsl:when test="$is-anchor">
-          <xsl:text>anchor</xsl:text>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:text>link</xsl:text>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:param>
-
-    <xsl:param name="highlight" select="false()"/>
-
-    <xsl:choose>
-      <xsl:when test="$link-type='anchor'">
-        <xsl:call-template name="anchor">
-          <xsl:with-param name="to" select="$to"/>
-          <xsl:with-param name="text" select="$text"/>
-          <xsl:with-param name="highlight" select="$highlight"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:when test="$link-type='link'">
-        <xsl:call-template name="internal-link">
-          <xsl:with-param name="to" select="$to"/>
-          <xsl:with-param name="text" select="$text"/>
-          <xsl:with-param name="highlight" select="$highlight"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:when test="$link-type='none'">
-        <xsl:if test="$highlight">
-          <xsl:call-template name="source-highlight">
-            <xsl:with-param name="text" select="$text"/>
-          </xsl:call-template>
-        </xsl:if>
-        <xsl:if test="not($highlight)">
-          <xsl:value-of select="$text"/>
-        </xsl:if>        
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:message>
-Error: XSL template 'link-or-anchor' called with invalid link-type '<xsl:value-of select="$link-type"/>'
-        </xsl:message>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <xsl:template name="separator"/>
-
-  <xsl:template name="reference-documentation">
-    <xsl:param name="name"/>
-    <xsl:param name="refname"/>
-    <xsl:param name="purpose"/>
-    <xsl:param name="anchor"/>
-    <xsl:param name="synopsis"/>
-    <xsl:param name="text"/>
-
-    <refentry id="{$anchor}">
-      <refmeta>
-        <refentrytitle><xsl:value-of select="$name"/></refentrytitle>
-        <manvolnum>3</manvolnum>
-      </refmeta>
-      <refnamediv>
-        <refname><xsl:value-of select="$refname"/></refname>
-        <refpurpose>
-		  <xsl:apply-templates mode="annotation" select="$purpose"/>
-		</refpurpose>
-      </refnamediv>
-      <refsynopsisdiv>
-        <synopsis>
-          <xsl:copy-of select="$synopsis"/>
-        </synopsis>
-      </refsynopsisdiv>
-      <xsl:if test="not(string($text)='')">
-        <refsect1>
-          <title>Description</title>
-          <xsl:copy-of select="$text"/>
-        </refsect1>
-      </xsl:if>
-    </refentry>
-  </xsl:template>
-
-  <xsl:template name="member-documentation">
-    <xsl:param name="name"/>
-    <xsl:param name="text"/>
-
-    <refsect2>
-      <title><xsl:copy-of select="$name"/></title>
-      <xsl:copy-of select="$text"/>
-    </refsect2>
-  </xsl:template>
-
-  <xsl:template name="preformatted">
-    <xsl:param name="text"/>
-
-    <literallayout class="monospaced">
-      <xsl:copy-of select="$text"/>
-    </literallayout>
-  </xsl:template>
-
-  <xsl:template name="synopsis">
-    <xsl:param name="text"/>
-
-    <synopsis>
-      <xsl:copy-of select="$text"/>
-    </synopsis>
-  </xsl:template>
-
-  <!-- Fallthrough for DocBook elements -->
-  <xsl:template match="*">
-    <xsl:element name="{name(.)}">
-      <xsl:for-each select="./@*">
-        <xsl:choose>
-          <xsl:when test="local-name(.)='last-revision'">
-            <xsl:attribute 
-              name="rev:last-revision"
-              namespace="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision">
-              <xsl:value-of select="."/>
-            </xsl:attribute>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:attribute name="{name(.)}">
-              <xsl:value-of select="."/>
-            </xsl:attribute>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:for-each>
-      <xsl:apply-templates/>
-    </xsl:element>
-  </xsl:template>
-
-  <xsl:template match="code">
-    <computeroutput>
-      <xsl:apply-templates mode="annotation"/>
-    </computeroutput>
-  </xsl:template>
-
-  <xsl:template match="library">
-    <xsl:if test="not(@html-only = 1) and
-                  ($boost.include.libraries='' or
-                   contains($boost.include.libraries, @id))">
-      <chapter>
-        <xsl:attribute name="id">
-          <xsl:choose>
-            <xsl:when test="@id">
-              <xsl:value-of select="@id"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:call-template name="generate.id"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:attribute>
-
-        <xsl:if test="@last-revision">
-          <xsl:attribute 
-            name="rev:last-revision"
-            namespace="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision">
-            <xsl:value-of select="@last-revision"/>
-          </xsl:attribute>
-        </xsl:if>
-        <xsl:apply-templates/>
-      </chapter>
-    </xsl:if>
-  </xsl:template>
-
-  <xsl:template match="chapter">
-    <xsl:if test="$boost.include.libraries=''">
-      <chapter>
-        <xsl:for-each select="./@*">
-          <xsl:attribute name="{name(.)}">
-            <xsl:value-of select="."/>
-          </xsl:attribute>
-        </xsl:for-each>
-
-        <xsl:apply-templates/>
-      </chapter>
-    </xsl:if>
-  </xsl:template>
-
-  <xsl:template match="boostbook">
-    <book><xsl:apply-templates/></book>
-  </xsl:template>
-
-  <xsl:template match="programlisting">
-    <programlisting><xsl:apply-templates/></programlisting>
-  </xsl:template>
-
-  <!-- These DocBook elements have special meaning. Use the annotation mode -->
-  <xsl:template match="classname|methodname|functionname|enumname|libraryname|
-                       conceptname|macroname|headername">
-    <xsl:apply-templates select="." mode="annotation"/>
-  </xsl:template>
-
-  <xsl:template match="description">
-    <xsl:apply-templates mode="annotation"/>
-  </xsl:template>
-
-  <!-- Swallow using-namespace and using-class directives along with
-       last-revised elements -->
-  <xsl:template match="using-namespace|using-class|last-revised"/>
-
-  <!-- If there is no "namespace-reference" mode, forward to
-       "reference" mode -->
-  <xsl:template match="*" mode="namespace-reference">
-    <xsl:apply-templates select="." mode="reference"/>
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/src/documentation/xsl/error.xsl b/src/documentation/xsl/error.xsl
deleted file mode 100644
index ee5ae889f1..0000000000
--- a/src/documentation/xsl/error.xsl
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="1.0">
-  <xsl:template name="print.warning.context">
-    <xsl:message>
-      <xsl:text>  In </xsl:text>
-      <xsl:call-template name="fully-qualified-name">
-        <xsl:with-param name="node" select="."/>
-      </xsl:call-template>
-    </xsl:message>
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/src/documentation/xsl/function.xsl b/src/documentation/xsl/function.xsl
deleted file mode 100644
index e24a9887c0..0000000000
--- a/src/documentation/xsl/function.xsl
+++ /dev/null
@@ -1,1199 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="1.0">
-
-  <xsl:strip-space elements="requires effects postconditions returns throws 
-                             complexity notes rationale purpose"/>
-
-  <!-- When true, the stylesheet will emit compact definitions of
-       functions when the function does not have any detailed
-       description. -->
-  <xsl:param name="boost.compact.function">1</xsl:param>
-
-  <!-- BoostBook documentation mode. Can be "compact" or
-       "standardese", for now -->
-  <xsl:param name="boost.generation.mode">compact</xsl:param>
-
-  <!-- The longest type length that is considered "short" for the
-       layout of function return types. When the length of the result type
-       and any storage specifiers is greater than this length, they will be
-       placed on a separate line from the function name and parameters
-       unless everything fits on a single line. -->
-  <xsl:param name="boost.short.result.type">12</xsl:param>
-
-  <!-- Display a function declaration -->
-  <xsl:template name="function">
-    <xsl:param name="indentation"/>
-    <xsl:param name="is-reference"/>
-
-    <!-- Whether or not we should include parameter names in the output -->
-    <xsl:param name="include-names" select="$is-reference"/>
-
-    <!-- What type of link the function name should have. This shall
-         be one of 'anchor' (the function output will be the target of
-         links), 'link' (the function output will link to a definition), or
-         'none' (the function output will not be either a link or a link
-         target) -->
-    <xsl:param name="link-type">
-      <xsl:choose>
-        <xsl:when test="$is-reference">
-          <xsl:text>anchor</xsl:text>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:text>link</xsl:text>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:param>
-
-    <!-- The id we should link to or anchor as -->
-    <xsl:param name="link-to">
-      <xsl:call-template name="generate.id"/>
-    </xsl:param>
-
-    <!-- If we are printing a constructor -->
-    <xsl:param name="constructor-for"/>
-
-    <!-- If we are printing a destructor -->
-    <xsl:param name="destructor-for"/>
-
-    <!-- If we are printing a copy assignment operator -->
-    <xsl:param name="copy-assign-for"/>
-
-    <!-- The name of this function -->
-    <xsl:param name="name" select="@name"/>
-
-    <!-- True if this is the function's separate documentation -->
-    <xsl:param name="standalone" select="false()"/>
-
-    <!-- True if we should suppress the template header -->
-    <xsl:param name="suppress-template" select="false()"/>
-
-    <!-- Calculate the specifiers -->
-    <xsl:variable name="specifiers">
-      <xsl:if test="@specifiers">
-        <xsl:value-of select="concat(@specifiers, ' ')"/>
-      </xsl:if>
-    </xsl:variable>
-
-    <!-- Calculate the type -->
-    <xsl:variable name="type">
-      <xsl:value-of select="$specifiers"/>
-
-      <xsl:choose>
-        <!-- Conversion operators have an empty type, because the return
-             type is part of the name -->
-        <xsl:when test="$name='conversion-operator'"/>
-
-        <!-- Constructors and destructors have no return type -->
-        <xsl:when test="$constructor-for or $destructor-for"/>
-
-        <!-- Copy assignment operators return a reference to the class
-             they are in, unless another type has been explicitly
-             provided in the element. -->
-        <xsl:when test="$copy-assign-for and not(type)">
-          <xsl:value-of select="concat($copy-assign-for, '&amp; ')"/>
-        </xsl:when>
-
-        <xsl:otherwise>
-          <xsl:apply-templates select="type" mode="annotation"/>
-          <xsl:text> </xsl:text>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-
-    <!-- Build the function name with return type -->
-    <xsl:variable name="function-name">
-      <xsl:choose>
-        <xsl:when test="$constructor-for">
-          <xsl:value-of select="$constructor-for"/>
-        </xsl:when>
-        <xsl:when test="$destructor-for">
-          <xsl:value-of select="concat('~',$destructor-for)"/>
-        </xsl:when>
-        <xsl:when test="$copy-assign-for">
-          <xsl:value-of select="'operator='"/>
-        </xsl:when>
-        <xsl:when test="$name='conversion-operator'">
-          <xsl:text>operator </xsl:text>
-          <xsl:apply-templates select="type" mode="annotation"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="$name"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-
-    <xsl:if test="not ($standalone) or 
-                  (local-name(.)='signature' and (position() &gt; 1))
-                  or $suppress-template">
-      <xsl:text>&#10;</xsl:text>
-    </xsl:if>
-
-    <!-- Indent this declaration -->
-    <xsl:call-template name="indent">
-      <xsl:with-param name="indentation" select="$indentation"/>
-    </xsl:call-template>
-    
-    <!-- Build the template header -->
-    <xsl:variable name="template-length">
-      <xsl:choose>
-        <xsl:when test="$suppress-template">
-          0
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="template.synopsis.length"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-        
-    <!-- Build a full parameter string (without line breaks) -->
-    <xsl:variable name="param-string">
-      <xsl:text>(</xsl:text>
-      <xsl:call-template name="function-parameters">
-        <xsl:with-param name="include-names" select="$include-names"/>
-        <xsl:with-param name="wrap" select="false()"/>
-      </xsl:call-template>
-      <xsl:text>)</xsl:text>
-    </xsl:variable>
-
-    <!-- Build the text that follows the declarator-->
-    <xsl:variable name="postdeclarator">
-      <xsl:if test="@cv">
-        <xsl:text> </xsl:text>
-        <xsl:value-of select="@cv"/>
-      </xsl:if>
-    </xsl:variable>
-
-    <!-- Build the full declaration text -->
-    <xsl:variable name="decl-string" 
-      select="concat($type, $function-name, $param-string, $postdeclarator)"/>
-    <xsl:variable name="end-column" 
-      select="$template-length + string-length($decl-string) + $indentation"/>
-    
-    <xsl:choose>
-      <!-- Check if we should put the template header on its own line to
-           save horizontal space. -->
-      <xsl:when test="($template-length &gt; 0) and 
-                      ($end-column &gt; $max-columns)">
-        <!-- Emit template header on its own line -->
-        <xsl:apply-templates select="template" mode="synopsis">
-          <xsl:with-param name="indentation" select="$indentation"/>
-        </xsl:apply-templates>
-        
-        <!-- Emit the rest of the function declaration (without the
-             template header) indented two extra spaces. -->
-        <xsl:call-template name="function">
-          <xsl:with-param name="indentation" select="$indentation + 2"/>
-          <xsl:with-param name="is-reference" select="$is-reference"/>
-          <xsl:with-param name="include-names" select="$include-names"/>
-          <xsl:with-param name="link-type" select="$link-type"/>
-          <xsl:with-param name="link-to" select="$link-to"/>
-          <xsl:with-param name="constructor-for" select="$constructor-for"/>
-          <xsl:with-param name="destructor-for" select="$destructor-for"/>
-          <xsl:with-param name="copy-assign-for" select="$copy-assign-for"/>
-          <xsl:with-param name="name" select="$name"/>
-          <xsl:with-param name="standalone" select="$standalone"/>
-          <xsl:with-param name="suppress-template" select="true()"/>
-        </xsl:call-template>
-      </xsl:when>
-
-      <!-- Check if we can put the entire declaration on a single
-           line. -->
-      <xsl:when test="not($end-column &gt; $max-columns)">
-        <!-- Emit template header, if not suppressed -->
-        <xsl:if test="not($suppress-template)">
-          <xsl:apply-templates select="template" mode="synopsis">
-            <xsl:with-param name="indentation" select="$indentation"/>
-            <xsl:with-param name="wrap" select="false()"/>
-            <xsl:with-param name="highlight" select="true()"/>
-          </xsl:apply-templates>
-        </xsl:if>
-
-        <!-- Emit specifiers -->
-        <xsl:call-template name="source-highlight">
-          <xsl:with-param name="text" select="$specifiers"/>
-        </xsl:call-template>
-
-        <!-- Emit type, if any -->
-        <xsl:choose>
-          <!-- Conversion operators have an empty type, because the return
-               type is part of the name -->
-          <xsl:when test="$name='conversion-operator'"/>
-
-          <!-- Constructors and destructors have no return type -->
-          <xsl:when test="$constructor-for or $destructor-for"/>
-
-          <!-- Copy assignment operators return a reference to the class
-               they are in, unless another type has been explicitly
-               provided in the element. -->
-          <xsl:when test="$copy-assign-for and not(type)">
-            <xsl:value-of select="concat($copy-assign-for, '&amp; ')"/>
-          </xsl:when>
-
-          <xsl:otherwise>
-            <xsl:apply-templates select="type" mode="highlight"/>
-            <xsl:text> </xsl:text>
-          </xsl:otherwise>
-        </xsl:choose>
-
-        <xsl:call-template name="link-or-anchor">
-          <xsl:with-param name="to" select="$link-to"/>
-          <xsl:with-param name="text" select="$function-name"/>
-          <xsl:with-param name="link-type" select="$link-type"/>
-          <xsl:with-param name="highlight" select="true()"/>
-        </xsl:call-template>
-
-        <xsl:text>(</xsl:text>
-        <xsl:call-template name="function-parameters">
-          <xsl:with-param name="include-names" select="$include-names"/>
-          <xsl:with-param name="indentation" 
-            select="$indentation + $template-length + string-length($type)
-                    + string-length($function-name) + 1"/>
-          <xsl:with-param name="final" select="true()"/>
-        </xsl:call-template>                
-        <xsl:text>)</xsl:text>
-
-        <xsl:call-template name="source-highlight">
-          <xsl:with-param name="text" select="$postdeclarator"/>
-        </xsl:call-template>
-        <xsl:text>;</xsl:text>    
-      </xsl:when>
-
-      <!-- This declaration will take multiple lines -->
-      <xsl:otherwise>
-        <!-- Emit specifiers -->
-        <xsl:call-template name="source-highlight">
-          <xsl:with-param name="text" select="$specifiers"/>
-        </xsl:call-template>
-
-        <!-- Emit type, if any -->
-        <xsl:choose>
-          <!-- Conversion operators have an empty type, because the return
-               type is part of the name -->
-          <xsl:when test="$name='conversion-operator'"/>
-
-          <!-- Constructors and destructors have no return type -->
-          <xsl:when test="$constructor-for or $destructor-for"/>
-
-          <!-- Copy assignment operators return a reference to the class
-               they are in, unless another type has been explicitly
-               provided in the element. -->
-          <xsl:when test="$copy-assign-for and not(type)">
-            <xsl:value-of select="concat($copy-assign-for, '&amp; ')"/>
-          </xsl:when>
-
-          <xsl:otherwise>
-            <xsl:apply-templates select="type" mode="highlight"/>
-            <xsl:text> </xsl:text>
-          </xsl:otherwise>
-        </xsl:choose>
-
-        <xsl:if test="string-length($type) &gt; $boost.short.result.type">
-          <xsl:text>&#10;</xsl:text>
-          <xsl:call-template name="indent">
-            <xsl:with-param name="indentation" select="$indentation"/>
-          </xsl:call-template>
-        </xsl:if>
-
-        <!-- Determine how many columns the type and storage
-             specifiers take on the same line as the function name. -->
-        <xsl:variable name="type-length">
-          <xsl:choose>
-            <xsl:when test="string-length($type) &gt; $boost.short.result.type">
-              0
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:value-of select="string-length($type)"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:variable>
-
-        <xsl:call-template name="link-or-anchor">
-          <xsl:with-param name="to" select="$link-to"/>
-          <xsl:with-param name="text" select="$function-name"/>
-          <xsl:with-param name="link-type" select="$link-type"/>
-          <xsl:with-param name="highlight" select="true()"/>
-        </xsl:call-template>
-        <xsl:text>(</xsl:text>
-        <xsl:call-template name="function-parameters">
-          <xsl:with-param name="include-names" select="$include-names"/>
-          <xsl:with-param name="indentation" 
-            select="$indentation + $type-length 
-                    + string-length($function-name) + 1"/>
-          <xsl:with-param name="final" select="true()"/>
-        </xsl:call-template>                
-        <xsl:text>)</xsl:text>
-        <xsl:call-template name="source-highlight">
-          <xsl:with-param name="text" select="$postdeclarator"/>
-        </xsl:call-template>
-        <xsl:text>;</xsl:text>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>    
-
-  <!-- Synopsis of function parameters, e.g., "(const T&, int x = 5)" -->
-  <xsl:template name="function-parameters">
-    <!-- Indentation level of this parameter list -->
-    <xsl:param name="indentation"/>
-
-    <!-- True if we should include parameter names -->
-    <xsl:param name="include-names" select="true()"/>
-
-    <!-- True if we should wrap function parameters to the next line -->
-    <xsl:param name="wrap" select="true()"/>
-
-    <!-- True if we are printing the final output -->
-    <xsl:param name="final" select="false()"/>
-
-    <!-- Internal: The prefix to emit before a parameter -->
-    <xsl:param name="prefix" select="''"/>
-
-    <!-- Internal: The list of parameters -->
-    <xsl:param name="parameters" select="parameter"/>
-
-    <!-- Internal: The column we are on -->
-    <xsl:param name="column" select="$indentation"/>
-
-    <!-- Internal: Whether this is the first parameter on this line or not -->
-    <xsl:param name="first-on-line" select="true()"/>
-
-    <xsl:if test="$parameters">
-      <!-- Information for this parameter -->
-      <xsl:variable name="parameter" select="$parameters[position()=1]"/>
-      <xsl:variable name="name">
-        <xsl:if test="$include-names">
-          <xsl:text> </xsl:text><xsl:value-of select="$parameter/@name"/>
-        </xsl:if>
-      </xsl:variable>
-
-      <xsl:variable name="type" select="string($parameter/paramtype)"/>
-
-      <xsl:variable name="default">
-        <xsl:choose>
-          <xsl:when test="$parameter/@default">
-            <xsl:text> = </xsl:text>
-            <xsl:value-of select="$parameter/@default"/>
-          </xsl:when>
-          <xsl:when test="$parameter/default">
-            <xsl:text> = </xsl:text>
-            <xsl:choose>
-              <xsl:when test="$final">
-                <xsl:apply-templates
-                  select="$parameter/default/*|$parameter/default/text()"
-                  mode="annotation"/>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:value-of select="string($parameter/default)"/>
-              </xsl:otherwise>
-            </xsl:choose>
-          </xsl:when>
-        </xsl:choose>
-      </xsl:variable>
-
-      <xsl:variable name="text" select="concat($type, $name, $default)"/>
-      
-      <xsl:variable name="end-column" 
-        select="$column + string-length($prefix) + string-length($text)"/>
-
-      <xsl:choose>
-        <!-- Parameter goes on this line -->
-        <xsl:when test="$first-on-line or ($end-column &lt; $max-columns) 
-                        or not($wrap)">
-          <xsl:choose>
-            <xsl:when test="$final">
-              <xsl:value-of select="$prefix"/>
-              <xsl:apply-templates 
-                select="$parameter/paramtype/*|$parameter/paramtype/text()"
-                mode="annotation">
-                <xsl:with-param name="highlight" select="true()"/>
-              </xsl:apply-templates>
-              <xsl:value-of select="$name"/>
-              <xsl:copy-of select="$default"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:value-of select="concat($prefix, $text)"/>
-            </xsl:otherwise>
-          </xsl:choose>
-
-          <xsl:call-template name="function-parameters">
-            <xsl:with-param name="indentation" select="$indentation"/>
-            <xsl:with-param name="include-names" select="$include-names"/>
-            <xsl:with-param name="wrap" select="$wrap"/>
-            <xsl:with-param name="final" select="$final"/>
-            <xsl:with-param name="parameters" 
-              select="$parameters[position()!=1]"/>
-            <xsl:with-param name="prefix" select="', '"/>
-            <xsl:with-param name="column" select="$end-column"/>
-            <xsl:with-param name="first-on-line" select="false()"/>
-          </xsl:call-template>
-        </xsl:when>
-        <!-- Parameter goes on next line -->
-        <xsl:otherwise>
-          <!-- The comma goes on this line -->
-          <xsl:value-of select="$prefix"/><xsl:text>&#10;</xsl:text>
-
-          <!-- Indent and print the parameter -->
-          <xsl:call-template name="indent">
-            <xsl:with-param name="indentation" select="$indentation"/>
-          </xsl:call-template>
-          <xsl:choose>
-            <xsl:when test="$final">
-              <xsl:apply-templates 
-                select="$parameter/paramtype/*|$parameter/paramtype/text()"
-                mode="annotation">
-                <xsl:with-param name="highlight" select="true()"/>
-              </xsl:apply-templates>
-              <xsl:value-of select="$name"/>
-              <xsl:value-of select="$default"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:value-of select="concat($prefix, $text)"/>
-            </xsl:otherwise>
-          </xsl:choose>
-
-          <!-- Emit next parameter -->
-          <xsl:call-template name="function-parameters">
-            <xsl:with-param name="indentation" select="$indentation"/>
-            <xsl:with-param name="include-names" select="$include-names"/>
-            <xsl:with-param name="wrap" select="$wrap"/>
-            <xsl:with-param name="final" select="$final"/>
-            <xsl:with-param name="parameters" 
-              select="$parameters[position()!=1]"/>
-            <xsl:with-param name="prefix" select="', '"/>
-            <xsl:with-param name="column" 
-              select="1 + string-length($text) + $indentation"/>
-            <xsl:with-param name="first-on-line" select="false()"/>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:if>
-  </xsl:template>
-
-  <!-- Function synopsis -->
-  <xsl:template match="function|method" mode="synopsis">
-    <xsl:param name="indentation"/>
-
-    <!-- True if we should compact this function -->
-    <xsl:variable name="compact"
-      select="not (para|description|requires|effects|postconditions|returns|
-                   throws|complexity|notes|rationale) and 
-              ($boost.compact.function='1') and
-              not (local-name(.)='method')"/>
-
-    <xsl:choose>
-      <xsl:when test="$compact">
-        <xsl:if test="purpose">
-          <!-- Compact display outputs the purpose as a comment (if
-               there is one) and the entire function declaration. -->
-          <xsl:text>&#10;&#10;</xsl:text>
-          <xsl:call-template name="indent">
-            <xsl:with-param name="indentation" select="$indentation"/>
-          </xsl:call-template>
-
-          <xsl:call-template name="highlight-comment">
-            <xsl:with-param name="text">
-              <xsl:text>// </xsl:text>
-              <xsl:apply-templates select="purpose/*|purpose/text()"
-                mode="purpose"/>
-            </xsl:with-param>
-          </xsl:call-template>
-        </xsl:if>
-
-        <xsl:call-template name="function">
-          <xsl:with-param name="indentation" select="$indentation"/>
-          <xsl:with-param name="is-reference" select="true()"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="function">
-          <xsl:with-param name="indentation" select="$indentation"/>
-          <xsl:with-param name="is-reference" select="false()"/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <xsl:template match="overloaded-function|overloaded-method" mode="synopsis">
-    <xsl:param name="indentation"/>
-
-    <xsl:variable name="name" select="@name"/>
-
-    <!-- True if we should compact this function -->
-    <xsl:variable name="compact"
-      select="not (para|description|requires|effects|postconditions|returns|
-                   throws|complexity|notes|rationale) and 
-              ($boost.compact.function='1') and
-              not (local-name(.)='overloaded-method')"/>
-
-    <xsl:choose>
-      <xsl:when test="$compact">
-        <xsl:if test="purpose">
-          <!-- Compact display outputs the purpose as a comment (if
-               there is one) and the entire function declaration. -->
-          <xsl:text>&#10;</xsl:text>
-          <xsl:call-template name="indent">
-            <xsl:with-param name="indentation" select="$indentation"/>
-          </xsl:call-template>
-          
-          <xsl:call-template name="highlight-comment">
-            <xsl:with-param name="text">
-              <xsl:text>// </xsl:text>
-              <xsl:apply-templates select="purpose" mode="annotation"/>
-            </xsl:with-param>
-          </xsl:call-template>
-        </xsl:if>
-
-        <xsl:for-each select="signature">
-          <xsl:call-template name="function">
-            <xsl:with-param name="indentation" select="$indentation"/>
-            <xsl:with-param name="is-reference" select="true()"/>
-            <xsl:with-param name="name" select="$name"/>
-          </xsl:call-template>
-        </xsl:for-each>
-      </xsl:when>
-      <xsl:when test="local-name(..)='namespace'">
-        <xsl:variable name="link-to">
-          <xsl:call-template name="generate.id"/>
-        </xsl:variable>
-
-        <xsl:for-each select="signature">
-          <xsl:call-template name="function">
-            <xsl:with-param name="indentation" select="$indentation"/>
-            <xsl:with-param name="is-reference" select="false()"/>
-            <xsl:with-param name="name" select="$name"/>
-            <xsl:with-param name="link-to" select="$link-to"/>
-          </xsl:call-template>
-        </xsl:for-each>        
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:for-each select="signature">
-          <xsl:call-template name="function">
-            <xsl:with-param name="indentation" select="$indentation"/>
-            <xsl:with-param name="is-reference" select="false()"/>
-            <xsl:with-param name="name" select="$name"/>
-          </xsl:call-template>
-        </xsl:for-each>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <!-- Group free functions together under a category name (header synopsis)-->
-  <xsl:template match="free-function-group" mode="header-synopsis">
-    <xsl:param name="class"/>
-    <xsl:param name="indentation"/>
-    <xsl:apply-templates select="function|overloaded-function" mode="synopsis">
-      <xsl:with-param name="indentation" select="$indentation"/>
-    </xsl:apply-templates>
-  </xsl:template>
-
-  <!-- Constructors, destructor, and assignment operators -->
-  <xsl:template name="construct-copy-destruct-synopsis">
-    <xsl:param name="indentation"/>
-    <xsl:if test="constructor|copy-assignment|destructor">
-      <xsl:if test="typedef|static-constant">
-        <xsl:text>&#10;</xsl:text>
-      </xsl:if>
-      <xsl:text>&#10;</xsl:text>
-      <xsl:call-template name="indent">
-        <xsl:with-param name="indentation" select="$indentation"/>      
-      </xsl:call-template>
-      <emphasis>
-        <xsl:text>// </xsl:text>
-        <xsl:call-template name="internal-link">
-          <xsl:with-param name="to">
-            <xsl:call-template name="generate.id"/>
-            <xsl:text>construct-copy-destruct</xsl:text>
-          </xsl:with-param>
-          <xsl:with-param name="text" select="'construct/copy/destruct'"/>
-        </xsl:call-template>
-      </emphasis>
-      <xsl:apply-templates select="constructor" mode="synopsis">
-        <xsl:with-param name="indentation" select="$indentation"/>
-      </xsl:apply-templates>
-      <xsl:apply-templates select="copy-assignment" mode="synopsis">
-        <xsl:with-param name="indentation" select="$indentation"/>
-      </xsl:apply-templates>
-      <xsl:apply-templates select="destructor" mode="synopsis">
-        <xsl:with-param name="indentation" select="$indentation"/>
-      </xsl:apply-templates>
-    </xsl:if>
-  </xsl:template>
-
-  <xsl:template name="construct-copy-destruct-reference">
-    <xsl:if test="constructor|copy-assignment|destructor">
-      <xsl:call-template name="member-documentation">
-        <xsl:with-param name="name">
-          <xsl:call-template name="anchor">
-            <xsl:with-param name="to">
-              <xsl:call-template name="generate.id"/>
-              <xsl:text>construct-copy-destruct</xsl:text>
-            </xsl:with-param>
-            <xsl:with-param name="text" select="''"/>
-          </xsl:call-template>
-          <xsl:call-template name="monospaced">
-            <xsl:with-param name="text" select="@name"/>
-          </xsl:call-template>
-          <xsl:text> construct/copy/destruct</xsl:text>
-        </xsl:with-param>
-        <xsl:with-param name="text">
-          <orderedlist>
-            <xsl:apply-templates select="constructor" mode="reference"/>
-            <xsl:apply-templates select="copy-assignment" mode="reference"/>
-            <xsl:apply-templates select="destructor" mode="reference"/>
-          </orderedlist>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:template>
-
-  <xsl:template match="constructor" mode="reference">
-    <xsl:call-template name="function.documentation">
-      <xsl:with-param name="text">
-        <para>
-          <xsl:call-template name="preformatted">
-            <xsl:with-param name="text">
-              <xsl:call-template name="function">
-                <xsl:with-param name="indentation" select="0"/>
-                <xsl:with-param name="is-reference" select="true()"/>
-                <xsl:with-param name="constructor-for" select="../@name"/>
-                <xsl:with-param name="standalone" select="true()"/>
-              </xsl:call-template>
-            </xsl:with-param>
-          </xsl:call-template>
-        </para>
-        <xsl:call-template name="function-requirements"/>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:template>
-  
-  <xsl:template match="copy-assignment" mode="reference">
-    <xsl:call-template name="function.documentation">
-      <xsl:with-param name="text">
-        <para>
-          <xsl:call-template name="preformatted">
-            <xsl:with-param name="text">
-              <xsl:call-template name="function">
-                <xsl:with-param name="indentation" select="0"/>
-                <xsl:with-param name="is-reference" select="true()"/>
-                <xsl:with-param name="copy-assign-for" select="../@name"/>
-                <xsl:with-param name="standalone" select="true()"/>
-              </xsl:call-template>
-            </xsl:with-param>
-          </xsl:call-template>
-        </para>
-        <xsl:call-template name="function-requirements"/>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:template>
-
-  <xsl:template match="destructor" mode="reference">
-    <xsl:call-template name="function.documentation">
-      <xsl:with-param name="text">
-        <para>
-          <xsl:call-template name="preformatted">
-            <xsl:with-param name="text">
-              <xsl:call-template name="function">
-                <xsl:with-param name="indentation" select="0"/>
-                <xsl:with-param name="is-reference" select="true()"/>
-                <xsl:with-param name="destructor-for" select="../@name"/>
-                <xsl:with-param name="standalone" select="true()"/>
-              </xsl:call-template>
-            </xsl:with-param>
-          </xsl:call-template>
-        </para>
-        <xsl:call-template name="function-requirements"/>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:template>
-
-  <!-- Templates for functions -->
-  <xsl:template name="function.documentation">
-    <xsl:param name="text"/>
-
-    <xsl:choose>
-      <xsl:when test="$boost.generation.mode='compact'">
-        <xsl:call-template name="function.documentation.compact">
-          <xsl:with-param name="text" select="$text"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:when test="$boost.generation.mode='standardese'">
-        <xsl:call-template name="function.documentation.standardese">
-          <xsl:with-param name="text" select="$text"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:text>Error: invalid value '</xsl:text>
-        <xsl:value-of select="$boost.generation.mode"/>
-        <xsl:text>' for stylesheet parameter boost.generation.mode.</xsl:text>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <xsl:template name="function.documentation.compact">
-    <xsl:param name="text"/>
-    
-    <xsl:choose>
-      <xsl:when test="count(ancestor::free-function-group) &gt; 0
-                      or count(ancestor::method-group) &gt; 0
-                      or local-name(.)='constructor'
-                      or local-name(.)='copy-assignment'
-                      or local-name(.)='destructor'">
-        <listitem><xsl:copy-of select="$text"/></listitem>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:copy-of select="$text"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <xsl:template name="function.documentation.standardese">
-    <xsl:param name="text"/>
-    <!--
-    <formalpara>
-      <title>
-        <xsl:call-template name="fully-qualified-name">
-          <xsl:with-param name="node" select="."/>
-        </xsl:call-template>
-      </title>
-      <xsl:copy-of select="$text"/>
-    </formalpara>
--->
-    <listitem><xsl:copy-of select="$text"/></listitem>
-  </xsl:template>
-
-  <!-- Semantic descriptions of functions -->
-  <xsl:template name="function-requirements">
-    <xsl:param name="namespace-reference" select="false()"/>
-
-    <xsl:if test="$namespace-reference=false()">
-      <xsl:apply-templates select="purpose/*"/>
-    </xsl:if>
-
-    <xsl:apply-templates select="description/*"/>
-
-    <!-- Document parameters -->
-    <xsl:if test="parameter/description|signature/parameter/description">
-      <variablelist spacing="compact">
-        <title>Parameters</title>
-        <xsl:for-each select="parameter|signature/parameter">
-		  <xsl:sort select="attribute::name"/>
-          <xsl:if test="description">
-            <varlistentry>
-              <term><xsl:value-of select="@name"/></term>
-              <listitem>
-                <xsl:apply-templates select="description/*"/>
-              </listitem>
-            </varlistentry>
-          </xsl:if>
-        </xsl:for-each>
-      </variablelist>
-    </xsl:if>
-
-    <xsl:if test="para">
-      <xsl:message>
-        <xsl:text>Warning: Use of 'para' elements in a function is deprecated.&#10;</xsl:text>
-        <xsl:text>  Wrap them in a 'description' element.</xsl:text>
-      </xsl:message>
-      <xsl:call-template name="print.warning.context"/>
-      <xsl:apply-templates select="para"/>
-    </xsl:if>
-
-    <xsl:if test="requires|effects|postconditions|returns|throws|complexity|
-                  notes|rationale">
-      <xsl:choose>
-        <xsl:when test="$boost.generation.mode='compact'">
-          <xsl:call-template name="function.requirements.compact"/>
-        </xsl:when>
-        <xsl:when test="$boost.generation.mode='standardese'">
-          <xsl:call-template name="function.requirements.standardese"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:text>Error: invalid value '</xsl:text>
-          <xsl:value-of select="$boost.generation.mode"/>
-          <xsl:text>' for stylesheet parameter boost.generation.mode.</xsl:text>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:if>
-  </xsl:template>
-
-  <xsl:template name="function.requirement.name">
-    <xsl:param name="node" select="."/>
-    <xsl:choose>
-      <xsl:when test="local-name($node)='requires'">Requires</xsl:when>
-      <xsl:when test="local-name($node)='effects'">Effects</xsl:when>
-      <xsl:when test="local-name($node)='postconditions'">
-        <xsl:text>Postconditions</xsl:text>
-      </xsl:when>
-      <xsl:when test="local-name($node)='returns'">Returns</xsl:when>
-      <xsl:when test="local-name($node)='throws'">Throws</xsl:when>
-      <xsl:when test="local-name($node)='complexity'">Complexity</xsl:when>
-      <xsl:when test="local-name($node)='notes'">Notes</xsl:when>
-      <xsl:when test="local-name($node)='rationale'">Rationale</xsl:when>
-      <xsl:otherwise>
-        <xsl:message>
-          <xsl:text>Error: unhandled node type `</xsl:text>
-          <xsl:value-of select="local-name($node)"/>
-          <xsl:text>' in template function.requirement.name.</xsl:text>
-        </xsl:message>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <!-- The "compact" function requirements mode uses variable lists -->
-  <xsl:template name="function.requirements.compact">
-    <variablelist spacing="boost">
-      <xsl:apply-templates 
-        select="requires|effects|postconditions|returns|throws|complexity|
-                notes|rationale"
-        mode="function.requirements.compact"/>
-    </variablelist>
-  </xsl:template>
-
-  <xsl:template match="*" mode="function.requirements.compact">
-    <varlistentry>
-      <term><xsl:call-template name="function.requirement.name"/></term>
-      <listitem>
-        <xsl:apply-templates select="./*|./text()" mode="annotation"/>
-      </listitem>
-    </varlistentry>
-  </xsl:template>
-
-  <!-- The "standardese" function requirements mode uses ordered lists -->
-  <xsl:template name="function.requirements.standardese">
-    <orderedlist spacing="compact" numeration="arabic">
-      <xsl:apply-templates 
-        select="requires|effects|postconditions|returns|throws|complexity|
-                notes|rationale"
-        mode="function.requirements.standardese"/>
-    </orderedlist>
-  </xsl:template>
-
-  <xsl:template match="*" mode="function.requirements.standardese">
-    <listitem>
-      <xsl:apply-templates select="./*|./text()" 
-        mode="function.requirements.injection">
-        <xsl:with-param name="requirement">
-          <xsl:call-template name="function.requirement.name"/>
-        </xsl:with-param>
-      </xsl:apply-templates>
-    </listitem>
-  </xsl:template>
-
-  <!-- Handle paragraphs in function requirement clauses -->
-  <xsl:template match="para|simpara" mode="function.requirements.injection">
-    <xsl:param name="requirement"/>
-
-    <xsl:element name="{local-name(.)}">
-      <xsl:for-each select="./@*">
-        <xsl:attribute name="{name(.)}">
-          <xsl:value-of select="."/>
-        </xsl:attribute>
-      </xsl:for-each>
-
-      <xsl:if test="position()=1">
-        <emphasis role="bold">
-          <xsl:copy-of select="$requirement"/>
-          <xsl:text>:&#160;</xsl:text>
-        </emphasis>
-      </xsl:if>
-      <xsl:apply-templates/>
-    </xsl:element>
-  </xsl:template>
-
-  <xsl:template match="text()" mode="function.requirements.injection">
-    <xsl:param name="requirement"/>
-
-    <simpara>
-      <xsl:if test="position()=1">
-        <emphasis role="bold">
-          <xsl:copy-of select="$requirement"/>
-          <xsl:text>:&#160;</xsl:text>
-        </emphasis>
-      </xsl:if>
-      <xsl:copy-of select="."/>
-      <xsl:apply-templates/>
-    </simpara>
-  </xsl:template>
-
-  <!-- Function reference -->
-  <xsl:template match="function|method" mode="reference">
-    <!-- True if we should compact this function -->
-    <xsl:variable name="compact"
-      select="not (para|description|requires|effects|postconditions|returns|
-                   throws|complexity|notes|rationale) and 
-              ($boost.compact.function='1') and
-              not (local-name(.)='method')"/>
-
-    <xsl:if test="not ($compact)">
-      <xsl:call-template name="function.documentation">
-        <xsl:with-param name="text">
-          <para>
-            <xsl:call-template name="preformatted">
-              <xsl:with-param name="text">
-                <xsl:call-template name="function">
-                  <xsl:with-param name="indentation" select="0"/>
-                  <xsl:with-param name="is-reference" select="true()"/>
-                  <xsl:with-param name="link-type" select="'anchor'"/>
-                  <xsl:with-param name="standalone" select="true()"/>
-                </xsl:call-template>
-              </xsl:with-param>
-            </xsl:call-template>
-          </para>
-          <xsl:call-template name="function-requirements"/>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:template>
-
-  <!-- Reference for functions at namespace level -->
-  <xsl:template match="function" mode="namespace-reference">
-    <!-- True if we should compact this function -->
-    <xsl:variable name="compact"
-      select="not (para|description|requires|effects|postconditions|returns|
-                   throws|complexity|notes|rationale) and 
-              ($boost.compact.function='1')"/>
-
-    <xsl:if test="not ($compact)">
-      <xsl:call-template name="reference-documentation">
-        <xsl:with-param name="name">
-          <xsl:text>Function </xsl:text>
-          <xsl:if test="template">
-            <xsl:text>template </xsl:text>
-          </xsl:if>
-          <xsl:call-template name="monospaced">
-            <xsl:with-param name="text" select="@name"/>
-          </xsl:call-template>
-        </xsl:with-param>
-        <xsl:with-param name="refname">
-          <xsl:call-template name="fully-qualified-name">
-            <xsl:with-param name="node" select="."/>
-          </xsl:call-template>
-        </xsl:with-param>
-        <xsl:with-param name="purpose" select="purpose/*|purpose/text()"/>
-        <xsl:with-param name="anchor">
-          <xsl:call-template name="generate.id"/>
-        </xsl:with-param>
-        <xsl:with-param name="synopsis">
-          <xsl:call-template name="function">
-            <xsl:with-param name="indentation" select="0"/>
-            <xsl:with-param name="is-reference" select="true()"/>
-            <xsl:with-param name="link-type" select="'none'"/>
-          </xsl:call-template>
-        </xsl:with-param>
-        <xsl:with-param name="text">
-          <xsl:call-template name="function-requirements">
-            <xsl:with-param name="namespace-reference" select="true()"/>
-          </xsl:call-template>
-        </xsl:with-param>
-      </xsl:call-template> 
-    </xsl:if>   
-  </xsl:template>
-
-  <xsl:template match="overloaded-function" mode="reference">
-    <xsl:variable name="name" select="@name"/>
-
-    <!-- True if we should compact this function -->
-    <xsl:variable name="compact"
-      select="not (para|description|requires|effects|postconditions|returns|
-                   throws|complexity|notes|rationale) and 
-              ($boost.compact.function='1')"/>
-    
-    <xsl:if test="not ($compact)">
-      <xsl:call-template name="function.documentation">
-        <xsl:with-param name="text">
-          <para>
-            <xsl:attribute name="id">
-              <xsl:call-template name="generate.id"/>
-            </xsl:attribute>
-            
-            <xsl:call-template name="preformatted">
-              <xsl:with-param name="text">
-                <xsl:for-each select="signature">
-                  <xsl:call-template name="function">
-                    <xsl:with-param name="indentation" select="0"/>
-                    <xsl:with-param name="is-reference" select="true()"/>
-                    <xsl:with-param name="name" select="$name"/>
-                    <xsl:with-param name="standalone" select="true()"/>
-                  </xsl:call-template>
-                </xsl:for-each>
-              </xsl:with-param>
-            </xsl:call-template>
-          </para>
-          <xsl:call-template name="function-requirements"/>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:template>
-
-  <xsl:template match="overloaded-function" mode="namespace-reference">
-    <!-- True if we should compact this function -->
-    <xsl:variable name="compact"
-      select="not (para|description|requires|effects|postconditions|returns|
-                   throws|complexity|notes|rationale) and 
-              ($boost.compact.function='1')"/>
-
-    <xsl:variable name="name" select="@name"/>
-
-    <xsl:if test="not ($compact)">
-      <xsl:call-template name="reference-documentation">
-        <xsl:with-param name="name">
-          <xsl:text>Function </xsl:text>
-          <xsl:if test="template">
-            <xsl:text>template </xsl:text>
-          </xsl:if>
-          <xsl:call-template name="monospaced">
-            <xsl:with-param name="text" select="@name"/>
-          </xsl:call-template>
-        </xsl:with-param>
-        <xsl:with-param name="refname">
-          <xsl:call-template name="fully-qualified-name">
-            <xsl:with-param name="node" select="."/>
-          </xsl:call-template>
-        </xsl:with-param>
-        <xsl:with-param name="purpose" select="purpose/*|purpose/text()"/>
-        <xsl:with-param name="anchor">
-          <xsl:call-template name="generate.id"/>
-        </xsl:with-param>
-        <xsl:with-param name="synopsis">
-          <xsl:for-each select="signature">
-            <xsl:call-template name="function">
-              <xsl:with-param name="indentation" select="0"/>
-              <xsl:with-param name="is-reference" select="true()"/>
-              <xsl:with-param name="link-type" select="'none'"/>
-              <xsl:with-param name="name" select="$name"/>
-            </xsl:call-template>
-          </xsl:for-each>
-        </xsl:with-param>
-        <xsl:with-param name="text">
-          <xsl:call-template name="function-requirements">
-            <xsl:with-param name="namespace-reference" select="true()"/>
-          </xsl:call-template>
-        </xsl:with-param>
-      </xsl:call-template> 
-    </xsl:if>   
-  </xsl:template>
-
-  <xsl:template match="overloaded-method" mode="reference">
-    <xsl:variable name="name" select="@name"/>
-
-    <xsl:call-template name="function.documentation">
-      <xsl:with-param name="text">
-        <para>
-          <xsl:attribute name="id">
-            <xsl:call-template name="generate.id"/>
-          </xsl:attribute>
-          
-          <xsl:call-template name="preformatted">
-            <xsl:with-param name="text">
-              <xsl:for-each select="signature">
-                <xsl:call-template name="function">
-                  <xsl:with-param name="indentation" select="0"/>
-                  <xsl:with-param name="is-reference" select="true()"/>
-                  <xsl:with-param name="name" select="$name"/>
-                  <xsl:with-param name="standalone" select="true()"/>
-                </xsl:call-template>
-              </xsl:for-each>
-            </xsl:with-param>
-          </xsl:call-template>
-        </para>
-        <xsl:call-template name="function-requirements"/>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:template>
-
-  <!-- Group member functions together under a category name (synopsis)-->
-  <xsl:template match="method-group" mode="synopsis">
-    <xsl:param name="indentation"/>
-    <xsl:text>&#10;</xsl:text>
-    <xsl:text>&#10;</xsl:text>
-    <xsl:call-template name="indent">
-      <xsl:with-param name="indentation" select="$indentation"/>
-    </xsl:call-template>
-    <emphasis>
-      <xsl:text>// </xsl:text>
-      <xsl:call-template name="internal-link">
-        <xsl:with-param name="to">
-          <xsl:call-template name="generate.id"/>
-        </xsl:with-param>
-        <xsl:with-param name="text" select="string(@name)"/>
-      </xsl:call-template>
-    </emphasis>
-    <xsl:apply-templates select="method|overloaded-method" 
-      mode="synopsis">
-      <xsl:with-param name="indentation" select="$indentation"/>
-    </xsl:apply-templates>
-  </xsl:template>
-
-  <!-- Group member functions together under a category name (reference)-->
-  <xsl:template match="method-group" mode="reference">
-    <xsl:call-template name="member-documentation">
-      <xsl:with-param name="name">
-        <xsl:call-template name="anchor">
-          <xsl:with-param name="to">
-            <xsl:call-template name="generate.id"/>
-          </xsl:with-param>
-          <xsl:with-param name="text" select="''"/>
-        </xsl:call-template>
-        <xsl:call-template name="monospaced">
-          <xsl:with-param name="text" select="../@name"/>
-        </xsl:call-template>
-        <xsl:text> </xsl:text>
-        <xsl:value-of select="@name"/>
-      </xsl:with-param>
-      <xsl:with-param name="text">
-        <orderedlist>
-          <xsl:apply-templates select="method|overloaded-method"
-            mode="reference"/>
-        </orderedlist>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:template> 
-
-  <!-- Group free functions together under a category name (synopsis)-->
-  <xsl:template match="free-function-group" mode="synopsis">
-    <xsl:param name="class"/>
-    <xsl:param name="indentation"/>
-    <xsl:text>&#10;</xsl:text>
-    <xsl:text>&#10;</xsl:text>
-    <xsl:call-template name="indent">
-      <xsl:with-param name="indentation" select="$indentation"/>
-    </xsl:call-template>
-    <emphasis>
-      <xsl:text>// </xsl:text>
-      <xsl:call-template name="internal-link">
-        <xsl:with-param name="to">
-          <xsl:call-template name="generate.id"/>
-        </xsl:with-param>
-        <xsl:with-param name="text" select="string(@name)"/>
-      </xsl:call-template>
-    </emphasis>
-    <xsl:apply-templates select="function|overloaded-function" mode="synopsis">
-      <xsl:with-param name="indentation" select="$indentation"/>
-    </xsl:apply-templates>
-  </xsl:template>
-
-  <!-- Group free functions together under a category name (reference)-->
-  <xsl:template match="free-function-group" mode="reference">
-    <xsl:param name="class"/>
-    <xsl:call-template name="member-documentation">
-      <xsl:with-param name="name">
-        <xsl:call-template name="anchor">
-          <xsl:with-param name="to">
-            <xsl:call-template name="generate.id"/>
-          </xsl:with-param>
-          <xsl:with-param name="text" select="''"/>
-        </xsl:call-template>
-        <xsl:call-template name="monospaced">
-          <xsl:with-param name="text" select="$class"/>
-        </xsl:call-template>
-        <xsl:value-of select="concat(' ',@name)"/>
-      </xsl:with-param>
-      <xsl:with-param name="text">
-        <orderedlist>
-          <xsl:apply-templates select="function|overloaded-function"
-            mode="reference"/>
-        </orderedlist>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:template>  
-</xsl:stylesheet>
diff --git a/src/documentation/xsl/index.xsl b/src/documentation/xsl/index.xsl
deleted file mode 100644
index 45ff3a90d1..0000000000
--- a/src/documentation/xsl/index.xsl
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="1.0">
-  <xsl:template match="class-index">
-    
-  </xsl:template>
-
-  <xsl:template match="function-index">
-    
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/src/documentation/xsl/library.xsl b/src/documentation/xsl/library.xsl
deleted file mode 100644
index 72fdff6c38..0000000000
--- a/src/documentation/xsl/library.xsl
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="1.0">
-  <xsl:key name="library-categories" match="library" 
-    use="libraryinfo/librarycategory/@name"/>
-
-  <xsl:template match="librarylist">
-    <itemizedlist spacing="compact">
-      <xsl:apply-templates select="//library"
-        mode="build-library-list">
-        <xsl:sort select="@name"/>
-      </xsl:apply-templates>
-    </itemizedlist>
-  </xsl:template>
-
-  <xsl:template name="library.link">
-    <xsl:param name="node" select="."/>
-    <xsl:param name="name" select="$node/attribute::name"/>
-
-    <xsl:choose>
-      <xsl:when test="$node/attribute::html-only = 1">
-        <xsl:variable name="url">
-          <xsl:choose>
-            <xsl:when test="$node/attribute::url">
-              <xsl:value-of select="$node/attribute::url"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:value-of select="concat($boost.root,
-                                           '/libs/', 
-                                           $node/attribute::dirname, 
-                                           '/index.html')"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:variable>
-        <ulink>
-          <xsl:attribute name="url">
-            <xsl:value-of select="$url"/>
-          </xsl:attribute>
-          <xsl:value-of select="$name"/>
-        </ulink>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="internal-link">
-          <xsl:with-param name="to">
-            <xsl:choose>
-              <xsl:when test="$node/attribute::id">
-                <xsl:value-of select="$node/attribute::id"/>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:call-template name="generate.id">
-                  <xsl:with-param name="node" select="$node"/>
-                </xsl:call-template>
-              </xsl:otherwise>
-            </xsl:choose>                 
-          </xsl:with-param>
-          <xsl:with-param name="text" select="$name"/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>    
-  </xsl:template>
-  
-  <xsl:template match="library" mode="build-library-list">
-    <listitem>
-      <simpara>
-        <xsl:call-template name="library.link"/>
-        <xsl:text> - </xsl:text>
-        <xsl:apply-templates select="libraryinfo/librarypurpose"
-          mode="build-library-list"/>
-      </simpara>
-    </listitem>
-  </xsl:template>
-
-  <xsl:template match="librarypurpose" mode="build-library-list">
-    <xsl:apply-templates/>
-    <xsl:text>, from </xsl:text>
-    <xsl:apply-templates select="../author" mode="display-author-list"/>
-  </xsl:template>
-
-  <xsl:template match="author" mode="display-author-list">
-    <xsl:if test="(position() &gt; 1) and (count(../author) &gt; 2)">
-      <xsl:text>, </xsl:text>
-    </xsl:if>
-    <xsl:if test="(position() = count(../author)) and (position() &gt; 1)">
-      <xsl:if test="position() &lt; 3">
-        <xsl:text> </xsl:text>
-      </xsl:if>
-      <xsl:text>and </xsl:text>
-    </xsl:if>
-    <xsl:apply-templates select="firstname/text()"/>
-    <xsl:text> </xsl:text>
-    <xsl:apply-templates select="surname/text()"/>
-    <xsl:if test="(position() = count(../author))">
-      <xsl:text>.</xsl:text>      
-    </xsl:if>
-  </xsl:template>
-
-  <xsl:template match="librarycategorylist">
-    <xsl:apply-templates/>
-  </xsl:template>
-
-  <xsl:template match="librarycategorydef">
-    <section>
-      <title><xsl:apply-templates/></title>
-      <xsl:variable name="name" select="@name"/>
-      <itemizedlist spacing="compact">
-        <xsl:apply-templates select="key('library-categories', $name)"
-          mode="build-library-list">
-          <xsl:sort select="@name"/>
-        </xsl:apply-templates>
-      </itemizedlist>
-    </section>
-  </xsl:template>
-
-  <xsl:template match="libraryinfo">
-    <chapterinfo>
-      <xsl:apply-templates select="author|copyright|legalnotice"/>
-    </chapterinfo>
-  </xsl:template>
-
-  <xsl:template match="librarypurpose|librarycategory"/>
-
-</xsl:stylesheet>
diff --git a/src/documentation/xsl/lookup.xsl b/src/documentation/xsl/lookup.xsl
deleted file mode 100644
index 733573b849..0000000000
--- a/src/documentation/xsl/lookup.xsl
+++ /dev/null
@@ -1,335 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="1.0">
-
-  <xsl:param name="boost.max.id.length">26</xsl:param>
-
-  <!-- Generate an ID for the entity referenced -->
-  <xsl:template name="generate.id">
-    <xsl:param name="node" select="."/>
-    <xsl:variable name="id">
-      <xsl:apply-templates select="$node" mode="generate.id"/>
-    </xsl:variable>
-    <xsl:choose>
-      <xsl:when test="string-length($id) &gt; $boost.max.id.length">
-        <xsl:value-of select="generate-id($node)"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="string($id)"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <xsl:template match="*" mode="generate.id">
-    <xsl:value-of select="generate-id(.)"/>
-    <xsl:text>-bb</xsl:text>
-  </xsl:template>
-
-  <!-- Strip the qualifiers off a qualified name and return the unqualified
-       name. For instance, "boost::python::function" would become just
-       "function". -->
-  <xsl:template name="strip-qualifiers">
-    <xsl:param name="name"/>
-    <xsl:choose>
-      <xsl:when test="contains($name, '::')">
-        <xsl:call-template name="strip-qualifiers">
-          <xsl:with-param name="name" select="substring-after($name, '::')"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$name"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <!-- Build the fully-qualified name of the given node -->
-  <xsl:template name="fully-qualified-name">
-    <xsl:param name="node"/>
-    <xsl:param name="separator" select="'::'"/>
-    <xsl:apply-templates select="$node" mode="fully-qualified-name">
-      <xsl:with-param name="separator" select="$separator"/>
-    </xsl:apply-templates>
-  </xsl:template>
-
-  <!-- Hack to make the node we are building the current node so that the
-       ancestor:: syntax will work -->
-  <xsl:template match="*" mode="fully-qualified-name">
-    <xsl:param name="separator" select="'::'"/>
-    <xsl:call-template name="build-fully-qualified-name">
-      <xsl:with-param name="separator" select="$separator"/>
-    </xsl:call-template>
-  </xsl:template>
-
-  <!-- The real routine that builds a fully-qualified name for the current
-       node. -->
-  <xsl:template name="build-fully-qualified-name">
-    <xsl:param name="separator" select="'::'"/>
-
-    <!-- The depth of qualified name element that we will print now-->
-    <xsl:param name="depth" select="1"/>
-
-    <!-- Determine the set of ancestor namespaces -->
-    <xsl:variable name="ancestors" 
-      select="ancestor::namespace|ancestor::class"/>
-
-    <xsl:choose>
-      <xsl:when test="$depth &gt; count($ancestors)">
-        <xsl:apply-templates select="." mode="print-name"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:if test="name($ancestors[$depth])='namespace' or
-                      count(ancestor::free-function-group)=0">
-          <xsl:apply-templates select="$ancestors[$depth]" mode="print-name"/>
-          <xsl:value-of select="$separator"/>
-        </xsl:if>
-        <xsl:call-template name="build-fully-qualified-name">
-          <xsl:with-param name="separator" select="$separator"/>
-          <xsl:with-param name="depth" select="$depth + 1"/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <!-- Print the name of the current node -->
-  <xsl:template match="*" mode="print-name">
-    <xsl:value-of select="@name"/>
-  </xsl:template>
-
-  <xsl:template name="name-matches-node">
-    <!-- The name we are looking for -->
-    <xsl:param name="name"/>
-
-    <!-- The name to display -->
-    <xsl:param name="display-name" select="$name"/>
-
-    <!-- The context in which this name occurs -->
-    <xsl:param name="context"/>
-
-    <!-- The node that we are checking against -->
-    <xsl:param name="node"/>
-
-    <!-- The mode we are in. Can be one of:
-           matches: emits the matches as they are found (for debugging)
-           link: link to the node that was found
-         -->
-    <xsl:param name="mode" select="'matches'"/>
-
-    <!-- The index into the list of using directives for the context node -->
-    <xsl:param name="index" select="1"/>
-
-    <!-- The prefix we should append to the name when checking this node -->
-    <xsl:param name="prefix" select="''"/>
-
-    <xsl:choose>
-      <xsl:when test="count($node) &gt; 1">
-        <xsl:variable name="matches">
-          <xsl:call-template name="count-matches">
-            <xsl:with-param name="name" select="$name"/>
-            <xsl:with-param name="context" select="$context"/>
-            <xsl:with-param name="nodes" select="$node[position() = 1]"/>
-          </xsl:call-template>
-        </xsl:variable>
-
-        <xsl:choose>
-          <xsl:when test="$matches = 0">
-            <xsl:call-template name="name-matches-node">
-              <xsl:with-param name="name" select="$name"/>
-              <xsl:with-param name="display-name" select="$display-name"/>
-              <xsl:with-param name="context" select="$context"/>
-              <xsl:with-param name="node" select="$node[position() &gt; 1]"/>
-              <xsl:with-param name="mode" select="$mode"/>
-            </xsl:call-template>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:call-template name="name-matches-node">
-              <xsl:with-param name="name" select="$name"/>
-              <xsl:with-param name="display-name" select="$display-name"/>
-              <xsl:with-param name="context" select="$context"/>
-              <xsl:with-param name="node" select="$node[position() = 1]"/>
-              <xsl:with-param name="mode" select="$mode"/>
-            </xsl:call-template>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:when>
-      <xsl:when test="count($node) = 1">
-        <!-- The fully-qualified name of the node we are checking against -->
-        <xsl:variable name="fully-qualified-name">
-          <xsl:call-template name="fully-qualified-name">
-            <xsl:with-param name="node" select="$node"/>
-          </xsl:call-template>
-        </xsl:variable>
-        
-        <!-- The set of using directives for this context node -->
-        <xsl:variable name="directives"
-          select="$context/ancestor::*/using-namespace |
-                  $context/ancestor::namespace |
-                  $context/ancestor::*/using-class |
-                  $context/ancestor::class"/>
-        
-        <!-- The name of the current directive -->
-        <xsl:variable name="this-context">
-          <xsl:apply-templates select="$directives[$index]" mode="print-name"/>
-        </xsl:variable>
-        
-        <!-- Check if we have a match -->
-        <xsl:variable name="have-match" 
-          select="$fully-qualified-name = concat($prefix, $name)"/>
-        
-        <xsl:if test="$have-match">
-          <xsl:choose>
-            <xsl:when test="$mode='matches'">
-              Match in namespace ::<xsl:value-of select="$prefix"/>
-            </xsl:when>
-            <xsl:when test="$mode='link'">
-              <xsl:call-template name="internal-link">
-                <xsl:with-param name="to">
-                  <xsl:call-template name="generate.id">
-                    <xsl:with-param name="node" select="$node"/>
-                  </xsl:call-template>
-                </xsl:with-param>
-                <xsl:with-param name="text" select="$display-name"/>
-              </xsl:call-template>
-            </xsl:when>
-          </xsl:choose>
-        </xsl:if>
-        
-        <xsl:if test="(not($index &gt; count($directives))) and
-                      (not($have-match) or ($mode = 'matches'))">
-          <xsl:variable name="first-branch">
-            <xsl:if test="not ($prefix = '')">
-              <!-- Recurse and append the current context node to the prefix -->
-              <xsl:call-template name="name-matches-node">
-                <xsl:with-param name="name" select="$name"/>
-                <xsl:with-param name="display-name" select="$display-name"/>
-                <xsl:with-param name="context" select="$context"/>
-                <xsl:with-param name="node" select="$node"/>
-                <xsl:with-param name="mode" select="$mode"/>
-                <xsl:with-param name="index" select="$index + 1"/>
-                <xsl:with-param name="prefix"
-                  select="concat($prefix, $this-context, '::')"/>
-              </xsl:call-template>
-            </xsl:if>
-          </xsl:variable>
-          
-          <xsl:choose>
-            <xsl:when test="string($first-branch) != ''">
-              <xsl:copy-of select="$first-branch"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <!-- Recurse with just the current context node -->
-              <xsl:call-template name="name-matches-node">
-                <xsl:with-param name="name" select="$name"/>
-                <xsl:with-param name="display-name" select="$display-name"/>
-                <xsl:with-param name="context" select="$context"/>
-                <xsl:with-param name="node" select="$node"/>
-                <xsl:with-param name="mode" select="$mode"/>
-                <xsl:with-param name="index" select="$index + 1"/>
-                <xsl:with-param name="prefix" 
-                  select="concat($this-context, '::')"/>
-              </xsl:call-template>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:if>        
-      </xsl:when>
-    </xsl:choose>
-  </xsl:template>
-
-  <!-- Count the number of nodes in the set that match the given name and
-       lookup context -->
-  <xsl:template name="count-matches">
-    <xsl:param name="name"/>
-    <xsl:param name="context"/>
-    <xsl:param name="nodes"/>
-
-    <xsl:variable name="match-string">
-      <xsl:for-each select="$nodes">
-        <xsl:variable name="does-match">
-          <xsl:call-template name="name-matches-node">
-            <xsl:with-param name="name" select="$name"/>
-            <xsl:with-param name="context" select="$context"/>
-            <xsl:with-param name="node" select="."/>
-          </xsl:call-template>
-        </xsl:variable>
-        <xsl:if test="not($does-match='')">X</xsl:if>
-      </xsl:for-each>
-    </xsl:variable>
-    <xsl:value-of select="string-length($match-string)"/>
-  </xsl:template>
-
-  <xsl:template name="cxx-link-name">
-    <!-- The actual lookup node -->
-    <xsl:param name="lookup"/> 
-
-    <!-- The type of name to lookup (e.g., class) -->
-    <xsl:param name="type"/> 
-
-    <!-- The name we are looking for -->
-    <xsl:param name="name"/> 
-
-    <!-- The name we will display  -->
-    <xsl:param name="display-name"/>
-
-    <!-- The name we are looking for (unqualified)-->
-    <xsl:param name="unqualified name"/> 
-
-    <!-- The list of nodes that match the lookup node in both name and type -->
-    <xsl:param name="nodes"/>
-
-    <!-- Count the number of nodes that match -->
-    <xsl:variable name="matches">
-      <xsl:call-template name="count-matches">
-        <xsl:with-param name="name" select="$name"/>
-        <xsl:with-param name="context" select="$lookup"/>
-        <xsl:with-param name="nodes" select="$nodes"/>
-      </xsl:call-template>
-    </xsl:variable>
-
-    <xsl:choose>
-      <xsl:when test="$matches = 0">
-        <xsl:message>
-          <xsl:text>Cannot find </xsl:text>
-          <xsl:value-of select="$type"/>
-          <xsl:text> named '</xsl:text>
-          <xsl:value-of select="$name"/>
-          <xsl:text>'</xsl:text>
-        </xsl:message>
-        <xsl:value-of select="$display-name"/>
-      </xsl:when>
-      <xsl:when test="$matches = 1">
-        <xsl:for-each select="$nodes">
-          <xsl:call-template name="name-matches-node">
-            <xsl:with-param name="name" select="$name"/>
-            <xsl:with-param name="display-name" select="$display-name"/>
-            <xsl:with-param name="context" select="$lookup"/>
-            <xsl:with-param name="node" select="."/>
-            <xsl:with-param name="mode" select="'link'"/>
-          </xsl:call-template>
-        </xsl:for-each>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:message>
-          <xsl:text>Reference to </xsl:text>
-          <xsl:value-of select="$type"/>
-          <xsl:text> '</xsl:text>
-          <xsl:value-of select="$name"/>
-          <xsl:text>' is ambiguous. Found:</xsl:text>
-          <xsl:for-each select="$nodes">
-            <xsl:call-template name="name-matches-node">
-              <xsl:with-param name="name" select="$name"/>
-              <xsl:with-param name="context" select="$lookup"/>
-              <xsl:with-param name="node" select="."/>
-              <xsl:with-param name="mode" select="'matches'"/>
-            </xsl:call-template>
-          </xsl:for-each>
-        </xsl:message>
-        <xsl:call-template name="name-matches-node">
-          <xsl:with-param name="name" select="$name"/>
-          <xsl:with-param name="display-name" select="$display-name"/>
-          <xsl:with-param name="context" select="$lookup"/>
-          <xsl:with-param name="node" select="$nodes"/>
-          <xsl:with-param name="mode" select="'link'"/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/src/documentation/xsl/macro.xsl b/src/documentation/xsl/macro.xsl
deleted file mode 100644
index 8c997eae1c..0000000000
--- a/src/documentation/xsl/macro.xsl
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="1.0">
-  <xsl:template match="macro" mode="synopsis">
-    <xsl:param name="indentation" select="0"/>
-
-    <xsl:text>&#10;</xsl:text>
-    <xsl:if 
-      test="not(local-name(preceding-sibling::*[position()=1])=local-name(.))">
-      <xsl:text>&#10;</xsl:text>
-    </xsl:if>
-    <xsl:call-template name="indent">
-      <xsl:with-param name="indentation" select="$indentation"/>
-    </xsl:call-template>
-    <xsl:call-template name="macro-synopsis">
-      <xsl:with-param name="link-type" select="'link'"/>
-    </xsl:call-template>
-  </xsl:template>
-
-  <xsl:template match="macro" mode="reference">
-    <xsl:call-template name="reference-documentation">
-      <xsl:with-param name="refname" select="@name"/>
-      <xsl:with-param name="purpose" select="purpose/*|purpose/text()"/>
-      <xsl:with-param name="anchor">
-        <xsl:call-template name="generate.id"/>
-      </xsl:with-param>
-      <xsl:with-param name="name">
-        <xsl:text>Macro </xsl:text>
-        <xsl:call-template name="monospaced">
-          <xsl:with-param name="text" select="@name"/>
-        </xsl:call-template>
-      </xsl:with-param>
-      <xsl:with-param name="synopsis">
-        <xsl:call-template name="macro-synopsis">
-          <xsl:with-param name="link-type" select="'none'"/>
-        </xsl:call-template>
-      </xsl:with-param>
-      <xsl:with-param name="text">
-        <xsl:apply-templates select="description"/>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:template>
-
-  <xsl:template name="macro-synopsis">
-    <xsl:param name="link-type"/>
-
-    <xsl:call-template name="link-or-anchor">
-      <xsl:with-param name="to">
-        <xsl:call-template name="generate.id" select="."/>
-      </xsl:with-param>
-      <xsl:with-param name="text" select="@name"/>
-      <xsl:with-param name="link-type" select="$link-type"/>
-    </xsl:call-template>
-
-    <xsl:if test="@kind='functionlike'">
-      <xsl:text>(</xsl:text>
-      <xsl:for-each select="macro-parameter">
-        <xsl:if test="position() &gt; 1">
-          <xsl:text>, </xsl:text>
-        </xsl:if>
-        <xsl:value-of select="@name"/>
-      </xsl:for-each>
-      <xsl:text>)</xsl:text>
-    </xsl:if>
-  </xsl:template>
-
-  <xsl:template match="macro" mode="generate.id">
-    <xsl:value-of select="@name"/>
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/src/documentation/xsl/reference.xsl b/src/documentation/xsl/reference.xsl
deleted file mode 100644
index c5b19133bd..0000000000
--- a/src/documentation/xsl/reference.xsl
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="1.0">
-  <xsl:include href="annotation.xsl"/>
-  <xsl:include href="template.xsl"/>
-  <xsl:include href="function.xsl"/>
-  <xsl:include href="type.xsl"/>
-  <xsl:include href="source-highlight.xsl"/>
-  <xsl:include href="utility.xsl"/>
-  <xsl:include href="lookup.xsl"/>
-  <xsl:include href="library.xsl"/>
-  <xsl:include href="index.xsl"/>
-  <xsl:include href="error.xsl"/>
-  <xsl:include href="macro.xsl"/>
-  <xsl:include href="testing/testsuite.xsl"/>
-  <xsl:include href="caramel/concept2docbook.xsl"/>
-  
-  <xsl:template name="namespace-synopsis">
-    <xsl:param name="indentation" select="0"/>
-    <!-- Open namespace-->
-    <xsl:call-template name="indent">
-      <xsl:with-param name="indentation" select="$indentation"/>
-    </xsl:call-template>
-    <xsl:call-template name="source-highlight">
-      <xsl:with-param name="text" select="concat('namespace ',@name)"/>
-    </xsl:call-template>
-    <xsl:text> {</xsl:text>
-    
-    <!-- Emit namespace types -->
-    <xsl:apply-templates select="class|class-specialization|
-                                 struct|struct-specialization|
-                                 union|union-specialization|
-                                 typedef|enum" mode="synopsis">
-      <xsl:with-param name="indentation" select="$indentation + 2"/>
-    </xsl:apply-templates>
-    
-    <!-- Emit namespace functions -->
-    <xsl:apply-templates 
-      select="free-function-group|function|overloaded-function" 
-      mode="synopsis">
-      <xsl:with-param name="indentation" select="$indentation + 2"/>
-    </xsl:apply-templates>
-    
-    <!-- Emit namespaces -->
-    <xsl:apply-templates select="namespace" mode="synopsis">
-      <xsl:with-param name="indentation" select="$indentation + 2"/>
-    </xsl:apply-templates>
-    
-    <!-- Close namespace -->
-    <xsl:text>&#10;</xsl:text>
-    <xsl:call-template name="indent">
-      <xsl:with-param name="indentation" select="$indentation"/>
-    </xsl:call-template>
-    <xsl:text>}</xsl:text>
-  </xsl:template>
-
-  <!-- Emit namespace synopsis -->
-  <xsl:template match="namespace" mode="synopsis">
-    <xsl:param name="indentation" select="0"/>
-
-    <xsl:choose>
-      <xsl:when test="count(ancestor::namespace)=0">
-        <xsl:call-template name="namespace-synopsis">
-          <xsl:with-param name="indentation" select="$indentation"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:text>&#10;</xsl:text>
-        <xsl:call-template name="namespace-synopsis">
-          <xsl:with-param name="indentation" select="$indentation"/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <!-- Emit namespace reference -->
-  <xsl:template match="namespace" mode="reference">
-    <xsl:apply-templates select="namespace|typedef|free-function-group"
-      mode="reference">
-      <xsl:with-param name="indentation" select="0"/>
-    </xsl:apply-templates>
-    <xsl:apply-templates select="class|class-specialization|
-                                 struct|struct-specialization|
-                                 union|union-specialization|enum|function|
-                                 overloaded-function"
-      mode="namespace-reference"/>
-  </xsl:template>
-
-  <!-- Eat extra documentation when in the synopsis or reference sections -->
-  <xsl:template match="para|section" mode="synopsis"/>
-  <xsl:template match="para|section" mode="reference"/>
-
-  <!-- Comment mode tries to wipe out any extra spacing in the output -->
-  <xsl:template match="purpose" mode="comment">
-    <xsl:apply-templates mode="comment"/>
-  </xsl:template>
-
-  <xsl:template match="simpara|para" mode="comment">
-    <xsl:apply-templates select="text()|*" mode="comment"/>
-  </xsl:template>
-
-  <xsl:template match="text()" mode="comment">
-    <xsl:value-of select="."/>
-  </xsl:template>
-
-  <xsl:template match="*" mode="comment">
-    <xsl:apply-templates select="." mode="annotation"/>
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/src/documentation/xsl/source-highlight.xsl b/src/documentation/xsl/source-highlight.xsl
deleted file mode 100644
index 70258be60a..0000000000
--- a/src/documentation/xsl/source-highlight.xsl
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="1.0">
-  <xsl:param name="boost.syntax.highlight">1</xsl:param>
-
-  <xsl:template name="source-highlight">
-    <xsl:param name="text" select="."/>
-    <xsl:choose>
-      <xsl:when test="$boost.syntax.highlight='1'">
-        <xsl:call-template name="highlight-text">
-          <xsl:with-param name="text" select="$text"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$text"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <!-- Perform C++ keyword highlighting on the given text -->
-  <xsl:template name="highlight-text">
-    <xsl:param name="text" select="."/>
-    <xsl:param name="keywords"
-      select="'asm auto bool break case catch char class const const_cast continue default delete do double dynamic_cast else enum explicit export extern false float for friend goto if inline int long mutable namespace new operator private protected public register reinterpret_cast return short signed sizeof static static_cast struct switch template this throw true try typedef typeid typename union unsigned using virtual void volatile wchar_t while'"/>
-    <xsl:param name="best-match" select="''"/>
-    
-    <!-- Determine the current keyword -->
-    <xsl:variable name="keyword">
-      <xsl:choose>
-        <xsl:when test="contains($keywords, ' ')">
-          <xsl:value-of select="substring-before($keywords, ' ')"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="$keywords"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-
-    <!-- Determine the set of keywords that are left -->
-    <xsl:variable name="keywords-left">
-      <xsl:if test="contains($keywords, ' ')">
-        <xsl:value-of select="substring-after($keywords, ' ')"/>
-      </xsl:if>
-    </xsl:variable>
-
-    <!-- The set of characters that can be identifiers -->
-    <xsl:variable name="id-chars" select="'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_'"/>
-
-    <xsl:variable name="X" select="'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'"/>
-
-    <xsl:choose>
-      <!-- Have we exhausted all keywords without finding any to highlight? -->
-      <xsl:when test="$keyword='' and $best-match=''">
-        <!-- Just copy the text -->
-        <xsl:copy-of select="$text"/>
-      </xsl:when>
-
-      <!-- Have we exhausted all keywords, but have one to highlight? If so,
-           make sure we didn't just find part of an identifier. -->
-      <xsl:when 
-        test="$keyword='' and
-              not (starts-with(translate(substring-after($text, $best-match), 
-                                         $id-chars, $X), 'X')) and
-              not (substring(translate(substring-before($text, $best-match),
-                                       $id-chars, $X),
-                             string-length(substring-before($text, 
-                                                            $best-match)),
-                             1) = 'X')">
-        <!-- Copy text before this keyword -->
-        <xsl:value-of select="substring-before($text, $best-match)"/>
-
-        <!-- Highlight the keyword -->
-        <xsl:call-template name="highlight-keyword">
-          <xsl:with-param name="keyword" select="$best-match"/>
-        </xsl:call-template>
-
-        <!-- Recurse on the rest of the text -->
-        <xsl:call-template name="highlight-text">
-          <xsl:with-param name="text" 
-            select="substring-after($text, $best-match)"/>
-        </xsl:call-template>
-      </xsl:when>
-
-      <!-- We thought we had a keyword to highlight, but it was part of an 
-           identifier. So output all of the text up to (but not including!)
-           the last letter of the identifier, and try again to
-           highlight. -->
-      <xsl:when test="$keyword=''">
-        <xsl:value-of select="substring-before($text, $best-match)"/>
-        <xsl:value-of 
-          select="substring($best-match, 1, string-length($best-match)-1)"/>
-        <xsl:call-template name="highlight-text">
-          <xsl:with-param name="text"
-            select="concat(substring($best-match, string-length($best-match), 
-                           1), substring-after($text, $best-match))"/>
-        </xsl:call-template>
-      </xsl:when>
-      
-      <!-- Does the text contain this keyword with a better match than we
-           previously had? -->
-      <xsl:when 
-        test="contains($text, $keyword) and
-              (($best-match = '') or 
-               (string-length(substring-before($text, $keyword)) &lt;
-                string-length(substring-before($text, $best-match))))">
-        <!-- Recurse with the current keyword as the new best match -->
-        <xsl:call-template name="highlight-text">
-          <xsl:with-param name="text" select="$text"/>
-          <xsl:with-param name="keywords" select="$keywords-left"/>
-          <xsl:with-param name="best-match" select="$keyword"/>
-        </xsl:call-template>
-      </xsl:when>
-
-      <!-- Text does not contain this keyword. Just recurse normally -->
-      <xsl:otherwise>
-        <xsl:call-template name="highlight-text">
-          <xsl:with-param name="text" select="$text"/>
-          <xsl:with-param name="keywords" select="$keywords-left"/>
-          <xsl:with-param name="best-match" select="$best-match"/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <xsl:template match="*" mode="highlight">
-    <xsl:element name="{name(.)}">
-      <xsl:for-each select="./@*">
-        <xsl:choose>
-          <xsl:when test="local-name(.)='last-revision'">
-            <xsl:attribute
-              name="rev:last-revision"
-              namespace="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision"
->
-              <xsl:value-of select="."/>
-            </xsl:attribute>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:attribute name="{name(.)}">
-              <xsl:value-of select="."/>
-            </xsl:attribute>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:for-each>
-      <xsl:apply-templates mode="highlight"/>
-    </xsl:element>
-  </xsl:template>
-
-  <xsl:template match="text()" mode="highlight">
-    <xsl:call-template name="source-highlight">
-      <xsl:with-param name="text" select="."/>
-    </xsl:call-template>
-  </xsl:template>
-
-  <xsl:template match="classname|methodname|functionname|libraryname|enumname|
-                       conceptname|macroname" mode="highlight">
-    <xsl:apply-templates select="." mode="annotation"/>
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/src/documentation/xsl/template.xsl b/src/documentation/xsl/template.xsl
deleted file mode 100644
index a4acdf3f0f..0000000000
--- a/src/documentation/xsl/template.xsl
+++ /dev/null
@@ -1,436 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="1.0">
-  <!-- Determine the length of a template header synopsis -->
-  <xsl:template name="template.synopsis.length">
-    <xsl:variable name="text">
-      <xsl:apply-templates select="template" mode="synopsis">
-        <xsl:with-param name="indentation" select="0"/>
-        <xsl:with-param name="wrap" select="false()"/>
-        <xsl:with-param name="highlight" select="false()"/>
-      </xsl:apply-templates>
-    </xsl:variable>
-    <xsl:value-of select="string-length($text)"/>
-  </xsl:template>
-
-  <!-- Determine the length of a template header reference -->
-  <xsl:template name="template.reference.length">
-    <xsl:choose>
-      <xsl:when test="not(template)">
-        0
-      </xsl:when>
-      <xsl:when test="template/*/purpose">
-        <!-- TBD: The resulting value need only be greater than the number of
-             columns. We chose to add 17 because it's funny for C++
-             programmers. :) -->
-        <xsl:value-of select="$max-columns + 17"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="template.synopsis.length"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <!-- Output a template header in synopsis mode -->
-  <xsl:template match="template" mode="synopsis">
-    <xsl:param name="indentation" select="0"/>
-    <xsl:param name="wrap" select="true()"/>
-    <xsl:param name="highlight" select="true()"/>
-
-    <xsl:call-template name="template.synopsis"> 
-      <xsl:with-param name="indentation" select="$indentation"/>
-      <xsl:with-param name="wrap" select="$wrap"/>
-      <xsl:with-param name="highlight" select="$highlight"/>
-    </xsl:call-template>
-  </xsl:template>
-
-  <!-- Output a template header in reference mode -->
-  <xsl:template match="template" mode="reference">
-    <xsl:param name="indentation" select="0"/>
-    <xsl:param name="highlight" select="true()"/>
-    <xsl:call-template name="template.reference">
-      <xsl:with-param name="indentation" select="$indentation"/>
-      <xsl:with-param name="highlight" select="$highlight"/>
-    </xsl:call-template>
-  </xsl:template>
-
-  <!-- Emit a template header synopsis -->
-  <xsl:template name="template.synopsis">
-    <xsl:param name="indentation" select="0"/>
-    <xsl:param name="wrap" select="true()"/>
-    <xsl:param name="highlight" select="true()"/>
-
-    <xsl:choose>
-      <xsl:when test="$highlight">
-        <xsl:call-template name="highlight-keyword">
-          <xsl:with-param name="keyword" select="'template'"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:text>template</xsl:text>
-      </xsl:otherwise>
-    </xsl:choose>
-    <xsl:text>&lt;</xsl:text>
-    <xsl:call-template name="template.synopsis.parameters">
-      <xsl:with-param name="indentation" select="$indentation + 9"/>
-      <xsl:with-param name="wrap" select="$wrap"/>
-      <xsl:with-param name="highlight" select="$highlight"/>
-    </xsl:call-template>
-    <xsl:text>&gt; </xsl:text>
-  </xsl:template>
-
-  <!-- Display a list of template parameters for a synopsis (no comments) -->
-  <xsl:template name="template.synopsis.parameters">
-    <xsl:param name="indentation"/>
-    <xsl:param name="wrap" select="true()"/>
-    <xsl:param name="highlight" select="true()"/>
-
-    <xsl:param name="column" select="$indentation"/>
-    <xsl:param name="prefix" select="''"/>
-    <xsl:param name="parameters" select="template-type-parameter|template-varargs|template-nontype-parameter"/>
-    <xsl:param name="first-on-line" select="true()"/>
-
-    <xsl:if test="$parameters">
-      <!-- Emit the prefix (either a comma-space, or empty if this is
-           the first parameter) -->
-      <xsl:value-of select="$prefix"/>
-
-      <!-- Get the actual parameter and its attributes -->
-      <xsl:variable name="parameter" select="$parameters[position()=1]"/>
-      <xsl:variable name="rest" select="$parameters[position()!=1]"/>
-
-      <!-- Compute the actual text of this parameter -->
-      <xsl:variable name="text">
-        <xsl:call-template name="template.parameter">
-          <xsl:with-param name="parameter" select="$parameter"/>
-          <xsl:with-param name="is-last" select="not(rest)"/>
-          <xsl:with-param name="highlight" select="false()"/>
-        </xsl:call-template>
-      </xsl:variable>
-
-      <!-- Where will this template parameter finish? -->
-      <xsl:variable name="end-column" 
-        select="$column + string-length($prefix) + string-length($text)"/>
-
-      <!-- Should the text go on this line or on the next? -->
-      <xsl:choose>
-        <xsl:when test="$first-on-line or ($end-column &lt; $max-columns) or
-                        not($wrap)">
-          <!-- Print on this line -->
-          <xsl:call-template name="template.parameter">
-            <xsl:with-param name="parameter" select="$parameter"/>
-            <xsl:with-param name="is-last" select="not($rest)"/>
-            <xsl:with-param name="highlight" select="$highlight"/>
-          </xsl:call-template>
-          
-          <!-- Recurse -->
-          <xsl:call-template name="template.synopsis.parameters">
-            <xsl:with-param name="indentation" select="$indentation"/>
-            <xsl:with-param name="wrap" select="$wrap"/>
-            <xsl:with-param name="highlight" select="$highlight"/>
-            <xsl:with-param name="column" select="$end-column"/>
-            <xsl:with-param name="prefix" select="', '"/>
-            <xsl:with-param name="parameters" select="$rest"/>
-            <xsl:with-param name="first-on-line" select="false()"/>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>
-          <!-- Print on next line -->
-          <xsl:text>&#10;</xsl:text>
-          <xsl:call-template name="indent">
-            <xsl:with-param name="indentation" select="$indentation"/>
-          </xsl:call-template>
-          <xsl:call-template name="template.parameter">
-            <xsl:with-param name="parameter" select="$parameter"/>
-            <xsl:with-param name="is-last" select="not($rest)"/>
-            <xsl:with-param name="highlight" select="$highlight"/>
-          </xsl:call-template>
-
-          <xsl:call-template name="template.synopsis.parameters">
-            <xsl:with-param name="indentation" select="$indentation"/>
-            <xsl:with-param name="wrap" select="$wrap"/>
-            <xsl:with-param name="highlight" select="$highlight"/>
-            <xsl:with-param name="column" 
-              select="$indentation + string-length($text)"/>
-            <xsl:with-param name="prefix" select="', '"/>
-            <xsl:with-param name="parameters" select="$rest"/>
-            <xsl:with-param name="first-on-line" select="false()"/>           
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:if>
-  </xsl:template>
-
-  <!-- Emit a template header reference -->
-  <xsl:template name="template.reference">
-    <xsl:param name="indentation" select="0"/>
-    <xsl:param name="highlight" select="true()"/>
-
-    <xsl:if test="template-type-parameter|template-varargs|template-nontype-parameter">
-      <xsl:choose>
-        <xsl:when test="$highlight">
-          <xsl:call-template name="highlight-keyword">
-            <xsl:with-param name="keyword" select="'template'"/>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:text>template</xsl:text>
-        </xsl:otherwise>
-      </xsl:choose>
-      <xsl:text>&lt;</xsl:text>
-      <xsl:call-template name="template.reference.parameters">
-        <xsl:with-param name="indentation" select="$indentation + 9"/>
-        <xsl:with-param name="highlight" select="$highlight"/>
-      </xsl:call-template>
-      <xsl:text>&gt; </xsl:text>
-    </xsl:if>
-  </xsl:template>
-
-  <!-- Display a set of template parameters for a reference -->
-  <xsl:template name="template.reference.parameters">
-    <xsl:param name="indentation"/>
-    <xsl:param name="highlight" select="true()"/>
-    <xsl:param name="parameters" select="template-type-parameter|template-varargs|template-nontype-parameter"/>
-
-    <xsl:choose>
-      <xsl:when test="$parameters/purpose">
-        <xsl:call-template name="template.reference.parameters.comments">
-          <xsl:with-param name="indentation" select="$indentation"/>
-          <xsl:with-param name="highlight" select="$highlight"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="template.synopsis.parameters">
-          <xsl:with-param name="indentation" select="$indentation"/>
-          <xsl:with-param name="wrap" select="true()"/>
-          <xsl:with-param name="highlight" select="$highlight"/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <!-- Output template parameters when there are comments with the parameters.
-       For clarity, we output each template parameter on a separate line. -->
-  <xsl:template name="template.reference.parameters.comments">
-    <xsl:param name="indentation"/>
-    <xsl:param name="highlight" select="true()"/>
-    <xsl:param name="parameters" select="template-type-parameter|template-varargs|template-nontype-parameter"/>
-
-    <xsl:if test="$parameters">
-      <!-- Get the actual parameter and its attributes -->
-      <xsl:variable name="parameter" select="$parameters[position()=1]"/>
-      <xsl:variable name="rest" select="$parameters[position()!=1]"/>
-
-      <!-- Display the parameter -->
-      <xsl:call-template name="template.parameter">
-        <xsl:with-param name="parameter" select="$parameter"/>
-        <xsl:with-param name="is-last" select="not($rest)"/>
-        <xsl:with-param name="highlight" select="$highlight"/>
-      </xsl:call-template>
-
-      <xsl:if test="$rest">
-        <xsl:text>, </xsl:text>
-      </xsl:if>
-
-      <!-- Display the comment -->
-      <xsl:if test="$parameter/purpose">
-        <xsl:call-template name="highlight-comment">
-          <xsl:with-param name="text">
-            <xsl:text>  // </xsl:text>
-            <xsl:apply-templates 
-              select="$parameter/purpose/*|$parameter/purpose/text()"/>
-          </xsl:with-param>
-        </xsl:call-template>
-      </xsl:if>
-
-      <!-- Indent the next line -->
-      <xsl:if test="$parameter/purpose or $rest">
-        <xsl:text>&#10;</xsl:text>
-        <xsl:call-template name="indent">
-          <xsl:with-param name="indentation" select="$indentation"/>
-        </xsl:call-template>
-      </xsl:if>
-
-      <!-- Recurse to print the rest of the parameters -->
-      <xsl:call-template name="template.reference.parameters.comments">
-        <xsl:with-param name="indentation" select="$indentation"/>
-        <xsl:with-param name="highlight" select="$highlight"/>
-        <xsl:with-param name="parameters" select="$rest"/>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:template>
-
-  <!-- Print a template parameter -->
-  <xsl:template name="template.parameter">
-    <xsl:param name="parameter"/>
-    <xsl:param name="is-last"/>
-    <xsl:param name="highlight" select="true()"/>
-    <xsl:apply-templates select="$parameter"
-      mode="print.parameter">
-      <xsl:with-param name="parameter" select="$parameter"/>
-      <xsl:with-param name="is-last" select="$is-last"/>
-      <xsl:with-param name="highlight" select="$highlight"/>
-    </xsl:apply-templates>
-  </xsl:template>
-
-  <xsl:template name="template.parameter.name">
-    <xsl:param name="name" select="@name"/>
-    <xsl:param name="highlight" select="true()"/>
-    
-    <xsl:choose>
-      <xsl:when test="$highlight">
-        <xsl:call-template name="concept.link">
-          <xsl:with-param name="name" 
-            select="translate($name, '0123456789', '')"/>
-          <xsl:with-param name="text" select="$name"/>
-          <xsl:with-param name="warn" select="false"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$name"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <xsl:template match="template-type-parameter" mode="print.parameter">
-    <xsl:param name="parameter"/>
-    <xsl:param name="is-last"/>
-    <xsl:param name="highlight"/>
-
-    <xsl:choose>
-      <xsl:when test="$highlight">
-        <xsl:call-template name="highlight-keyword">
-          <xsl:with-param name="keyword" select="'typename'"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:text>typename</xsl:text>
-      </xsl:otherwise>
-    </xsl:choose>
-    <xsl:text> </xsl:text>
-
-    <xsl:call-template name="template.parameter.name">
-      <xsl:with-param name="name" select="$parameter/@name"/>
-      <xsl:with-param name="highlight" select="$highlight"/>
-    </xsl:call-template>
-
-    <xsl:variable name="def">
-      <xsl:choose>
-        <xsl:when test="$parameter/@default">
-          <xsl:message>
-            <xsl:text>Warning: 'default' attribute of template parameter element is deprecated. Use 'default' element.</xsl:text>
-            <xsl:call-template name="print.warning.context"/>
-          </xsl:message>
-          <xsl:choose>
-            <xsl:when test="$highlight and false()">
-              <xsl:call-template name="source-highlight">
-                <xsl:with-param name="text">
-                  <xsl:value-of select="$parameter/@default"/>
-                </xsl:with-param>
-              </xsl:call-template>       
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:value-of select="$parameter/@default"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:when>
-        <xsl:when test="$parameter/default">
-          <xsl:choose>
-            <xsl:when test="$highlight">
-              <xsl:apply-templates 
-                select="$parameter/default/*|$parameter/default/text()" 
-                mode="highlight"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:value-of select="string($parameter/default)"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:when>
-      </xsl:choose>
-    </xsl:variable>
-
-    <xsl:if test="not($def='')">
-      <xsl:text> = </xsl:text>
-
-      <xsl:copy-of select="$def"/>
-
-      <!-- If this is the last parameter, add an extra space to
-           avoid printing >> -->
-      <xsl:if 
-        test="$is-last and (substring($def, string-length($def))='&gt;')">
-        <xsl:text> </xsl:text>
-      </xsl:if>
-    </xsl:if>    
-  </xsl:template>
-
-  <xsl:template match="template-nontype-parameter" mode="print.parameter">
-    <xsl:param name="parameter"/>
-    <xsl:param name="is-last"/>
-    <xsl:param name="highlight"/>
-
-    <xsl:choose>
-      <xsl:when test="$highlight">
-        <xsl:call-template name="source-highlight">
-          <xsl:with-param name="text">
-            <xsl:apply-templates 
-              select="$parameter/type/*|$parameter/type/text()"/>
-          </xsl:with-param>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$parameter/type/*|$parameter/type/text()"/>
-      </xsl:otherwise>
-    </xsl:choose>
-    <xsl:text> </xsl:text>
-
-    <xsl:call-template name="template.parameter.name">
-      <xsl:with-param name="name" select="$parameter/@name"/>
-      <xsl:with-param name="highlight" select="$highlight"/>
-    </xsl:call-template>
-
-    <xsl:variable name="def">
-      <xsl:value-of select="string($parameter/default)"/>
-    </xsl:variable>
-
-    <xsl:if test="not($def='')">
-      <xsl:text> = </xsl:text>
-
-      <xsl:choose>
-        <xsl:when test="$highlight">
-          <xsl:apply-templates select="$parameter/default/*" mode="highlight"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="$def"/>
-        </xsl:otherwise>
-      </xsl:choose>
-
-      <!-- If this is the last parameter, add an extra space to
-           avoid printing >> -->
-      <xsl:if 
-        test="$is-last and (substring($def, string-length($def))='&gt;')">
-        <xsl:text> </xsl:text>
-      </xsl:if>
-    </xsl:if>    
-  </xsl:template>
-
-  <xsl:template match="template-varargs" mode="print.parameter">
-    <xsl:text>...</xsl:text>
-  </xsl:template>
-
-  <xsl:template match="specialization">
-    <xsl:param name="highlight" select="true()"/>
-    <xsl:text>&lt;</xsl:text>
-    <xsl:apply-templates select="template-arg">
-      <xsl:with-param name="highlight" select="$highlight"/>
-    </xsl:apply-templates>
-    <xsl:text>&gt;</xsl:text>
-  </xsl:template>
-
-  <xsl:template match="template-arg">
-    <xsl:if test="position() &gt; 1">
-      <xsl:text>, </xsl:text>
-    </xsl:if>
-    <xsl:apply-templates mode="highlight"/>
-  </xsl:template>
-</xsl:stylesheet>
-
diff --git a/src/documentation/xsl/testing/testsuite.xsl b/src/documentation/xsl/testing/testsuite.xsl
deleted file mode 100644
index 930ef104c9..0000000000
--- a/src/documentation/xsl/testing/testsuite.xsl
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="1.0">
-  <xsl:template match="testsuite">
-    <section>
-      <xsl:choose>
-        <xsl:when test="@id">
-          <xsl:attribute name="id">
-            <xsl:value-of select="@id"/>
-          </xsl:attribute>
-        </xsl:when>
-        <xsl:when test="../@id">
-          <xsl:attribute name="id">
-            <xsl:value-of select="concat(../@id, '.tests')"/>
-          </xsl:attribute>
-        </xsl:when>
-      </xsl:choose>
-
-      <title>Testsuite</title>
-
-      <xsl:if test="compile-test|link-test|run-test">
-        <section>
-          <xsl:if test="@id">
-            <xsl:attribute name="id">
-              <xsl:value-of select="@id"/>
-              <xsl:text>.acceptance</xsl:text>
-            </xsl:attribute>
-          </xsl:if>
-
-          <title>Acceptance tests</title>
-          <informaltable>
-            <tgroup cols="3">
-              <colspec colnum="2" colwidth="1in"/>
-              <thead>
-                <row>
-                  <entry>Test</entry>
-                  <entry>Type</entry>
-                  <entry>Description</entry>
-                  <entry>If failing...</entry>
-                </row>
-              </thead>
-              <tbody>
-                <xsl:apply-templates select="compile-test|link-test|run-test"/>
-              </tbody>
-            </tgroup>
-          </informaltable>
-        </section>          
-      </xsl:if>
-      
-      <xsl:if test="compile-fail-test|link-fail-test|run-fail-test">
-        <section>
-          <xsl:if test="@id">
-            <xsl:attribute name="id">
-              <xsl:value-of select="@id"/>
-              <xsl:text>.negative</xsl:text>
-            </xsl:attribute>
-          </xsl:if>
-          <title>Negative tests</title>
-          <informaltable>
-            <tgroup cols="3">
-              <colspec colnum="2" colwidth="1in"/>
-              <thead>
-                <row>
-                  <entry>Test</entry>
-                  <entry>Type</entry>
-                  <entry>Description</entry>
-                  <entry>If failing...</entry>
-                </row>
-              </thead>
-              <tbody>
-                <xsl:apply-templates 
-                  select="compile-fail-test|link-fail-test|run-fail-test"/>
-              </tbody>
-            </tgroup>
-          </informaltable>
-        </section>
-      </xsl:if> 
-    </section>
-  </xsl:template>
-
-  <xsl:template match="compile-test|link-test|run-test|
-                       compile-fail-test|link-fail-test|run-fail-test">
-    <row>
-      <entry>
-        <simpara>
-          <ulink>
-            <xsl:attribute name="url">
-              <xsl:value-of 
-                select="concat('../../libs/',
-                               ancestor::library/attribute::dirname, '/test/',
-                               @filename)"/>
-            </xsl:attribute>
-            <xsl:value-of select="@filename"/>
-          </ulink>
-        </simpara>
-      </entry>
-      <entry>
-        <simpara>
-          <xsl:value-of select="substring-before(local-name(.), '-test')"/>
-        </simpara>
-      </entry>
-      <entry><xsl:apply-templates select="purpose/*"/></entry>
-      <entry><xsl:apply-templates select="if-fails/*"/></entry>
-    </row>
-  </xsl:template>
-
-  <xsl:template match="snippet">
-    <xsl:variable name="snippet-name" select="@name"/>
-    <xsl:apply-templates select="//programlisting[@name=$snippet-name]"/>
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/src/documentation/xsl/type.xsl b/src/documentation/xsl/type.xsl
deleted file mode 100644
index 217903056f..0000000000
--- a/src/documentation/xsl/type.xsl
+++ /dev/null
@@ -1,1098 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="1.0">
-
-  <xsl:strip-space elements="inherit purpose"/>
-
-  <!-- When true, the stylesheet will emit compact definitions of
-       enumerations when the enumeration does not have any detailed
-       description. A compact definition renders the enum definition along
-       with a comment for the purpose of the enum (if it exists) directly
-       within the synopsis. A non-compact definition will create a
-       separate refentry element for the enum. -->
-  <xsl:param name="boost.compact.enum">1</xsl:param>
-
-  <xsl:template match="class|struct|union" mode="generate.id">
-    <xsl:choose>
-      <xsl:when test="count(key('named-entities', @name))=1">
-        <xsl:value-of select="@name"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="fully-qualified-name">
-          <xsl:with-param name="node" select="."/>
-          <xsl:with-param name="separator" select="'.'"/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <xsl:template match="enum" mode="generate.id">
-    <xsl:text>enum.</xsl:text>
-    <xsl:call-template name="fully-qualified-name">
-      <xsl:with-param name="node" select="."/>
-      <xsl:with-param name="separator" select="'.'"/>
-    </xsl:call-template>
-  </xsl:template>
-
-  <!-- Display the full name of the current node, e.g., "Class
-       template function". -->
-  <xsl:template name="type.display.name">
-    <xsl:choose>
-      <xsl:when test="contains(local-name(.), 'class')">
-        <xsl:text>Class </xsl:text>        
-      </xsl:when>
-      <xsl:when test="contains(local-name(.), 'struct')">
-        <xsl:text>Struct </xsl:text>
-      </xsl:when>
-      <xsl:when test="contains(local-name(.), 'union')">
-        <xsl:text>Union </xsl:text>
-      </xsl:when>
-      <xsl:when test="local-name(.)='enum'">
-        <xsl:text>Type </xsl:text>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:message>
-Unknown type element "<xsl:value-of select="local-name(.)"/>" in type.display.name
-        </xsl:message>
-      </xsl:otherwise>
-    </xsl:choose>
-    <xsl:if test="template and count(template/*) &gt; 0">
-      <xsl:text>template </xsl:text>
-    </xsl:if>
-    <xsl:call-template name="monospaced">
-      <xsl:with-param name="text">
-        <xsl:value-of select="@name"/>
-        <xsl:apply-templates select="specialization"/>
-      </xsl:with-param>
-    </xsl:call-template>    
-  </xsl:template>
-
-  <!-- Determine the class key for the given node -->
-  <xsl:template name="type.class.key">
-    <xsl:param name="node" select="."/>
-    <xsl:choose>
-      <xsl:when test="contains(local-name($node), '-specialization')">
-        <xsl:value-of select="substring-before(local-name($node), '-')"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="local-name($node)"/>
-      </xsl:otherwise>
-    </xsl:choose>    
-  </xsl:template>
-
-  <!-- Emit class synopsis -->
-  <xsl:template match="class|class-specialization|
-                       struct|struct-specialization|
-                       union|union-specialization" mode="synopsis">
-    <xsl:param name="indentation"/>
-   
-    <!-- The keyword used to declare this class type, e.g., class,
-         struct, or union. -->
-    <xsl:variable name="class-key">
-      <xsl:call-template name="type.class.key"/>
-    </xsl:variable>
-
-    <!-- Spacing -->
-    <xsl:if test="not (local-name(preceding-sibling::*[position()=1])=local-name(.)) and (position() &gt; 1)">
-      <xsl:text>&#10;</xsl:text>
-    </xsl:if>
-
-    <xsl:text>&#10;</xsl:text>
-
-    <!-- Calculate how long this declaration would be if we put it all
-         on one line -->
-    <xsl:variable name="full-decl-string">
-      <xsl:apply-templates select="template" mode="synopsis">
-        <xsl:with-param name="indentation" select="$indentation"/>
-        <xsl:with-param name="wrap" select="false()"/>
-      </xsl:apply-templates>
-      <xsl:value-of select="$class-key"/>
-      <xsl:text> </xsl:text>
-      <xsl:value-of select="@name"/>
-      <xsl:apply-templates select="specialization"/>
-      <xsl:text>;</xsl:text>
-    </xsl:variable>
-
-    <xsl:choose>
-      <xsl:when test="(string-length($full-decl-string) + 
-                       string-length($indentation)) &lt; $max-columns">
-        <xsl:call-template name="indent">
-          <xsl:with-param name="indentation" select="$indentation"/>
-        </xsl:call-template>
-        <xsl:apply-templates select="template" mode="synopsis">
-          <xsl:with-param name="indentation" select="$indentation"/>
-        </xsl:apply-templates>
-
-        <xsl:call-template name="highlight-keyword">
-          <xsl:with-param name="keyword" select="$class-key"/>
-        </xsl:call-template>
-        <xsl:text> </xsl:text>
-        <xsl:call-template name="internal-link">
-          <xsl:with-param name="to">
-            <xsl:call-template name="generate.id"/>
-          </xsl:with-param>
-          <xsl:with-param name="text">
-            <xsl:value-of select="@name"/>
-          </xsl:with-param>
-        </xsl:call-template>
-        <xsl:apply-templates select="specialization"/>
-        <xsl:text>;</xsl:text>
-      </xsl:when>
-
-      <xsl:otherwise>
-        <!-- Template header -->
-        <xsl:if test="template">
-          <xsl:call-template name="indent">
-            <xsl:with-param name="indentation" select="$indentation"/>
-          </xsl:call-template>
-          <xsl:apply-templates select="template" mode="synopsis">
-            <xsl:with-param name="indentation" select="$indentation"/>
-          </xsl:apply-templates>
-          <xsl:text>&#10;</xsl:text>
-          
-          <!-- Indent class templates' names in the synopsis -->
-          <xsl:text>  </xsl:text>
-        </xsl:if>
-        
-        <!-- Class name -->
-        <xsl:call-template name="indent">
-          <xsl:with-param name="indentation" select="$indentation"/>
-        </xsl:call-template>
-        <xsl:call-template name="highlight-keyword">
-          <xsl:with-param name="keyword" select="$class-key"/>
-        </xsl:call-template>
-        <xsl:text> </xsl:text>
-        <xsl:call-template name="internal-link">
-          <xsl:with-param name="to">
-            <xsl:call-template name="generate.id">
-              <xsl:with-param name="node" select="."/>
-            </xsl:call-template>
-          </xsl:with-param>
-          <xsl:with-param name="text" select="string(@name)"/>
-        </xsl:call-template>
-        <xsl:apply-templates select="specialization"/>
-        <xsl:text>;</xsl:text>
-      </xsl:otherwise>
-    </xsl:choose>
-
-    <!-- Free functions associated with the class -->
-    <xsl:apply-templates select="free-function-group" mode="header-synopsis">
-      <xsl:with-param name="indentation" select="$indentation"/>
-      <xsl:with-param name="class" select="@name"/>
-    </xsl:apply-templates>
-  </xsl:template>
-
-  <!-- Emit a typedef synopsis -->
-  <xsl:template name="type.typedef.display.aligned">
-    <xsl:param name="indentation"/>
-    <xsl:param name="max-type-length"/>
-    <xsl:param name="max-name-length"/>
-
-    <!-- Padding for the typedef types -->
-    <xsl:variable name="type-padding">
-      <xsl:call-template name="indent">
-        <xsl:with-param name="indentation" select="$max-type-length"/>
-      </xsl:call-template>
-    </xsl:variable>
-
-    <!-- Padding for the typedef names -->
-    <xsl:variable name="name-padding">
-      <xsl:call-template name="indent">
-        <xsl:with-param name="indentation" select="$max-name-length"/>
-      </xsl:call-template>
-    </xsl:variable>
-
-    <xsl:text>&#10;</xsl:text>
-    <xsl:choose>
-      <!-- Create a vertical ellipsis -->
-      <xsl:when test="@name = '...'">
-        <xsl:call-template name="indent">
-          <xsl:with-param name="indentation" select="$indentation + 3"/>      
-        </xsl:call-template>        
-        <xsl:text>.&#10;</xsl:text>
-        <xsl:call-template name="indent">
-          <xsl:with-param name="indentation" select="$indentation + 3"/>      
-        </xsl:call-template>
-        <xsl:text>.&#10;</xsl:text>
-        <xsl:call-template name="indent">
-          <xsl:with-param name="indentation" select="$indentation + 3"/>      
-        </xsl:call-template>
-        <xsl:text>.</xsl:text>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="indent">
-          <xsl:with-param name="indentation" select="$indentation"/>      
-        </xsl:call-template>
-        <xsl:call-template name="highlight-keyword">
-          <xsl:with-param name="keyword" select="'typedef'"/>
-        </xsl:call-template>
-        <xsl:text> </xsl:text>
-
-        <!-- Length of the type -->
-        <xsl:variable name="type-length">
-          <xsl:choose>
-            <xsl:when test="@type">
-              <xsl:message>
-                <xsl:text>Warning: `type' attribute of `typedef' element is deprecated. Use 'type' element instead.</xsl:text>
-              </xsl:message>
-              <xsl:call-template name="print.warning.context"/>
-              <xsl:value-of select="string-length(@type)"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:value-of select="string-length(type)"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:variable>
-
-        <!-- Emit the type -->
-        <xsl:choose>
-          <xsl:when test="@type">
-            <xsl:value-of select="@type"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:apply-templates select="type/*|type/text()" 
-              mode="highlight"/>
-            <!--
-            <xsl:call-template name="source-highlight">
-              <xsl:with-param name="text">
-                <xsl:apply-templates select="type/*|type/text()"/>
-              </xsl:with-param>
-            </xsl:call-template> 
-            -->
-          </xsl:otherwise>
-        </xsl:choose>
-
-        <xsl:choose>
-          <xsl:when test="$max-type-length &gt; 0">
-            <xsl:value-of select="substring($type-padding, 1, 
-                                            $max-type-length - $type-length)"/>
-            <xsl:text> </xsl:text>
-            <xsl:value-of select="substring(concat(@name, ';', $name-padding), 
-                                            1, $max-name-length)"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="concat(' ',@name,';')"/>
-          </xsl:otherwise>
-        </xsl:choose>
-
-        <xsl:if test="purpose">
-          <xsl:text>  </xsl:text>
-          <xsl:call-template name="highlight-comment">
-            <xsl:with-param name="text">
-              <xsl:text>// </xsl:text>
-              <xsl:apply-templates select="purpose" mode="comment"/>
-            </xsl:with-param>
-          </xsl:call-template>
-        </xsl:if>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <xsl:template match="typedef" mode="synopsis">
-    <xsl:param name="indentation"/>
-    <xsl:param name="max-type-length" select="0"/>
-    <xsl:param name="max-name-length" select="0"/>
-    
-    <!-- Spacing -->
-    <xsl:if test="not (local-name(preceding-sibling::*[position()=1])=local-name(.)) and (position() &gt; 1)">
-      <xsl:text>&#10;</xsl:text>
-    </xsl:if>
-
-    <xsl:call-template name="type.typedef.display.aligned">
-      <xsl:with-param name="indentation" select="$indentation"/>
-      <xsl:with-param name="max-type-length" select="$max-type-length"/>
-      <xsl:with-param name="max-name-length" select="$max-name-length"/>
-    </xsl:call-template>
-  </xsl:template>
-
-  <!-- TBD: Implement this -->
-  <xsl:template match="typedef" mode="reference"/>
-
-  <!-- Emit a list of static constants -->
-  <xsl:template match="static-constant" mode="synopsis">
-    <xsl:param name="indentation"/>
-    <xsl:text>&#10;</xsl:text>
-
-    <xsl:call-template name="indent">
-      <xsl:with-param name="indentation" select="$indentation"/>
-    </xsl:call-template>
-    <xsl:call-template name="source-highlight">
-      <xsl:with-param name="text" select="'static const '"/>
-    </xsl:call-template>
-
-    <xsl:call-template name="source-highlight">
-      <xsl:with-param name="text">
-        <xsl:apply-templates select="type/*|type/text()"/>    
-      </xsl:with-param>
-    </xsl:call-template>
-    
-    <xsl:if test="not(@name = '')">
-      <xsl:text> </xsl:text>
-      <xsl:value-of select="@name"/>
-    </xsl:if>
-
-    <xsl:text> = </xsl:text>
-
-    <xsl:call-template name="source-highlight">
-      <xsl:with-param name="text">
-        <xsl:apply-templates select="default/*|default/text()"/>
-      </xsl:with-param>
-    </xsl:call-template>
-    <xsl:text>;</xsl:text>
-
-    <xsl:if test="purpose">
-      <xsl:text>  </xsl:text>
-      <xsl:call-template name="highlight-comment">
-        <xsl:with-param name="text">
-          <xsl:text>// </xsl:text>
-          <xsl:apply-templates select="purpose" mode="comment"/>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:template>
-
-  <!-- Format base classes on a single line -->
-  <xsl:template name="print.base.classes.single">
-    <xsl:apply-templates select="inherit"/>
-  </xsl:template>
-
-  <xsl:template name="print.base.classes.multi">
-    <xsl:param name="indentation"/>
-    
-    <xsl:variable name="n" select="count(inherit)"/>
-    <xsl:for-each select="inherit">
-      <!-- Indentation -->
-      <xsl:if test="position() &gt; 1">
-        <xsl:call-template name="indent">
-          <xsl:with-param name="indentation" select="$indentation"/>
-        </xsl:call-template>
-      </xsl:if>
-
-      <!-- Output the access specifier -->
-      <xsl:variable name="access">
-        <xsl:choose>
-          <xsl:when test="@access">
-            <xsl:value-of select="@access"/>
-          </xsl:when>
-          <xsl:when test="parent::class|parent::class-specialization">
-            <xsl:text>private</xsl:text>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:text>public</xsl:text>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
-      <xsl:call-template name="highlight-keyword">
-        <xsl:with-param name="keyword" select="@access"/>
-      </xsl:call-template>
-      <xsl:text> </xsl:text>
-
-      <!-- Output the type -->
-      <xsl:choose>
-        <xsl:when test="type">
-          <xsl:apply-templates select="type/*|type/text()" mode="annotation"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates mode="annotation"/>
-        </xsl:otherwise>
-      </xsl:choose>
-
-      <!-- Output a comma if not at the end -->
-      <xsl:if test="position() &lt; $n">
-        <xsl:text>,</xsl:text>
-      </xsl:if>
-
-      <!-- Output a comment if we have one -->
-      <xsl:if test="purpose">
-        <xsl:choose>
-          <xsl:when test="position() &lt; $n">
-            <xsl:text>  </xsl:text>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:text>   </xsl:text>
-          </xsl:otherwise>
-        </xsl:choose>
-        <xsl:call-template name="highlight-comment">
-          <xsl:with-param name="text">
-            <xsl:text>// </xsl:text>
-            <xsl:apply-templates select="purpose/*|purpose/text()"
-              mode="annotation"/>
-          </xsl:with-param>
-        </xsl:call-template>
-      </xsl:if>
-
-      <xsl:if test="position() &lt; $n">
-        <xsl:text>&#10;</xsl:text>
-      </xsl:if>
-    </xsl:for-each>
-  </xsl:template>
-
-  <xsl:template name="print.base.classes">
-    <xsl:param name="indentation" select="0"/>
-    <xsl:param name="base-indentation" select="0"/>
-
-    <xsl:variable name="single-line-candidate" select="not(inherit/purpose)"/>
-    <xsl:variable name="single-line">
-      <xsl:if test="$single-line-candidate">
-        <xsl:call-template name="print.base.classes.single"/>
-      </xsl:if>
-    </xsl:variable>
-
-    <xsl:choose>
-      <xsl:when test="$single-line-candidate and 
-                      (string-length($single-line) + $indentation + 3
-                        &lt; $max-columns)">
-        <xsl:call-template name="print.base.classes.single"/>
-        <xsl:text> {</xsl:text>
-      </xsl:when>
-      <xsl:when test="$single-line-candidate and
-                      (string-length($single-line) + $base-indentation + 5
-                        &lt; $max-columns)">
-        <xsl:text>&#10;</xsl:text>
-        <xsl:call-template name="indent">
-          <xsl:with-param name="indentation" select="$base-indentation"/>
-        </xsl:call-template>
-        <xsl:text>  : </xsl:text>
-        <xsl:call-template name="print.base.classes.single"/>
-        <xsl:text>&#10;</xsl:text>
-        <xsl:call-template name="indent">
-          <xsl:with-param name="indentation" select="$base-indentation"/>
-        </xsl:call-template>
-        <xsl:text>{</xsl:text>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:text> : </xsl:text>
-        <xsl:call-template name="print.base.classes.multi">
-          <xsl:with-param name="indentation" select="$indentation + 3"/>
-        </xsl:call-template>
-        <xsl:text>&#10;</xsl:text>
-        <xsl:call-template name="indent">
-          <xsl:with-param name="indentation" select="$base-indentation"/>
-        </xsl:call-template>
-        <xsl:text>{</xsl:text>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <!-- Emit a list of base classes without comments and on a single line -->
-  <xsl:template match="inherit">
-    <xsl:choose>
-      <xsl:when test="position()=1">
-        <xsl:text> : </xsl:text>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:text>, </xsl:text>
-      </xsl:otherwise>
-    </xsl:choose>
-    <xsl:call-template name="highlight-keyword">
-      <xsl:with-param name="keyword" select="@access"/>
-    </xsl:call-template>
-    <xsl:text> </xsl:text>
-    <xsl:apply-templates mode="annotation">
-      <xsl:with-param name="highlight" select="true()"/>
-    </xsl:apply-templates>
-  </xsl:template>
-
-  <!-- Find the maximum length of the types in typedefs -->
-  <xsl:template name="find-max-type-length">
-    <xsl:param name="typedefs" select="typedef"/>
-    <xsl:param name="max-length" select="0"/>
-    <xsl:param name="want-name" select="false()"/>
-
-    <xsl:choose>
-      <xsl:when test="$typedefs">
-        <xsl:variable name="typedef" select="$typedefs[position()=1]"/>
-        <xsl:variable name="rest" select="$typedefs[position()!=1]"/>
-
-        <!-- Find the length of the type -->
-        <xsl:variable name="length">
-          <xsl:choose>
-            <xsl:when test="$typedef/@name != '...'">
-              <xsl:choose>
-                <xsl:when test="$want-name">
-                  <xsl:value-of select="string-length($typedef/@name) + 1"/>
-                </xsl:when>
-                <xsl:when test="$typedef/@type">
-                  <xsl:value-of select="string-length($typedef/@type)"/>
-                </xsl:when>
-                <xsl:otherwise>
-                  <xsl:value-of select="string-length($typedef/type)"/>
-                </xsl:otherwise>
-              </xsl:choose>
-            </xsl:when>
-            <xsl:otherwise>
-              0
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:variable>
-
-        <!-- Pass on the larger length -->
-        <xsl:choose>
-          <xsl:when test="$length &gt; $max-length">
-            <xsl:call-template name="find-max-type-length">
-              <xsl:with-param name="typedefs" select="$rest"/>
-              <xsl:with-param name="max-length" select="$length"/>
-              <xsl:with-param name="want-name" select="$want-name"/>
-            </xsl:call-template>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:call-template name="find-max-type-length">
-              <xsl:with-param name="typedefs" select="$rest"/>
-              <xsl:with-param name="max-length" select="$max-length"/>
-              <xsl:with-param name="want-name" select="$want-name"/>
-            </xsl:call-template>            
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$max-length"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>  
-
-  <xsl:template match="constructor" mode="synopsis">
-    <xsl:param name="indentation"/>
-    <xsl:call-template name="function">
-      <xsl:with-param name="indentation" select="$indentation"/>
-      <xsl:with-param name="context" select="../@name"/>
-      <xsl:with-param name="is-reference" select="false()"/>
-      <xsl:with-param name="constructor-for" select="../@name"/>
-    </xsl:call-template>
-  </xsl:template>
-
-  <xsl:template match="copy-assignment" mode="synopsis">
-    <xsl:param name="indentation"/>
-    <xsl:call-template name="function">
-      <xsl:with-param name="indentation" select="$indentation"/>
-      <xsl:with-param name="context" select="../@name"/>
-      <xsl:with-param name="is-reference" select="false()"/>
-      <xsl:with-param name="copy-assign-for" select="../@name"/>
-    </xsl:call-template>
-  </xsl:template>
-
-  <xsl:template match="destructor" mode="synopsis">
-    <xsl:param name="indentation"/>
-    <xsl:call-template name="function">
-      <xsl:with-param name="indentation" select="$indentation"/>
-      <xsl:with-param name="context" select="../@name"/>
-      <xsl:with-param name="is-reference" select="false()"/>
-      <xsl:with-param name="destructor-for" select="../@name"/>
-    </xsl:call-template>
-  </xsl:template>
-
-  <xsl:template name="class-type-synopsis">
-    <xsl:param name="indentation" select="0"/>
-
-    <!-- The keyword used to declare this class type, e.g., class,
-         struct, or union. -->
-    <xsl:variable name="class-key">
-      <xsl:call-template name="type.class.key"/>
-    </xsl:variable>
-
-    <xsl:if test="ancestor::class|ancestor::class-specialization|
-                  ancestor::struct|ancestor::struct-specialization|
-                  ancestor::union|ancestor::union-specialization">
-      <xsl:text>&#10;&#10;</xsl:text>
-
-      <!-- If this nested class has a "purpose" element, use it as a
-           comment. -->
-      <xsl:if test="purpose">
-        <xsl:call-template name="indent">
-          <xsl:with-param name="indentation" select="$indentation"/>
-        </xsl:call-template>
-        <xsl:call-template name="highlight-comment">
-          <xsl:with-param name="text">
-            <xsl:text>// </xsl:text>
-            <xsl:apply-templates select="purpose" mode="comment"/>
-          </xsl:with-param>
-        </xsl:call-template>
-        <xsl:text>&#10;</xsl:text>
-      </xsl:if>
-    </xsl:if>
-
-    <!-- Template header -->
-    <xsl:if test="template">
-      <xsl:call-template name="indent">
-        <xsl:with-param name="indentation" select="$indentation"/>
-      </xsl:call-template>
-      <xsl:apply-templates select="template" mode="reference">
-        <xsl:with-param name="indentation" select="$indentation"/>
-      </xsl:apply-templates>
-    </xsl:if>
-    <xsl:text>&#10;</xsl:text>
-    
-    <!-- Class name -->
-    <xsl:call-template name="indent">
-      <xsl:with-param name="indentation" select="$indentation"/>
-    </xsl:call-template>
-    <xsl:call-template name="highlight-keyword">
-      <xsl:with-param name="keyword" select="$class-key"/>
-    </xsl:call-template>
-    <xsl:text> </xsl:text>
-    <xsl:value-of select="@name"/>
-    <xsl:apply-templates select="specialization"/>
-    
-    <xsl:choose>
-      <xsl:when test="inherit">
-        <!-- Base class list (with opening brace) -->
-        <xsl:call-template name="print.base.classes">
-          <xsl:with-param name="indentation" 
-            select="string-length($class-key) + string-length(@name) 
-                    + $indentation + 1"/>
-          <xsl:with-param name="base-indentation" select="$indentation"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <!-- Opening brace -->
-        <xsl:text> {</xsl:text>
-      </xsl:otherwise>
-    </xsl:choose>
-
-    <!-- Public designator -->
-    <xsl:if test="contains(local-name(.), 'class')">
-      <xsl:text>&#10;</xsl:text>
-      <xsl:call-template name="indent">
-        <xsl:with-param name="indentation" select="$indentation"/>
-      </xsl:call-template>
-      <xsl:call-template name="highlight-keyword">
-        <xsl:with-param name="keyword" select="'public'"/>
-      </xsl:call-template>
-      <xsl:text>:</xsl:text>
-    </xsl:if>
-
-    <!-- Typedefs -->
-    <xsl:if test="typedef">
-      <xsl:text>&#10;</xsl:text>
-      <xsl:call-template name="indent">
-        <xsl:with-param name="indentation" select="$indentation + 2"/>
-      </xsl:call-template>
-      <xsl:call-template name="highlight-comment">
-        <xsl:with-param name="text" select="'// types'"/>
-      </xsl:call-template>
-      
-      <xsl:variable name="max-type-length">
-        <xsl:call-template name="find-max-type-length"/>
-      </xsl:variable>
-      <xsl:variable name="max-name-length">
-        <xsl:call-template name="find-max-type-length">
-          <xsl:with-param name="want-name" select="true()"/>
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:apply-templates select="typedef" mode="synopsis">
-        <xsl:with-param name="indentation" select="$indentation + 2"/>
-        <xsl:with-param name="max-type-length" 
-          select="$max-type-length"/>
-        <xsl:with-param name="max-name-length" 
-          select="$max-name-length"/>
-      </xsl:apply-templates>
-    </xsl:if>
-    
-    <!-- Static constants -->
-    <xsl:if test="static-constant">
-      <xsl:text>&#10;</xsl:text>
-      <xsl:if test="typedef">
-        <xsl:text>&#10;</xsl:text>
-      </xsl:if>
-      <xsl:call-template name="indent">
-        <xsl:with-param name="indentation" select="$indentation + 2"/>
-      </xsl:call-template>
-      <xsl:call-template name="highlight-comment">
-        <xsl:with-param name="text" select="'// static constants'"/>
-      </xsl:call-template>
-      <xsl:apply-templates select="static-constant" mode="synopsis">
-        <xsl:with-param name="indentation" select="$indentation + 2"/>
-      </xsl:apply-templates>
-    </xsl:if>
-    
-    <!-- Nested classes/structs/unions -->
-    <xsl:apply-templates select="class|class-specialization|
-                                 struct|struct-specialization|
-                                 union|union-specialization"
-      mode="reference">
-      <xsl:with-param name="indentation" select="$indentation + 2"/>
-    </xsl:apply-templates>
-    
-    <!-- Construct/Copy/Destruct -->
-    <xsl:call-template name="construct-copy-destruct-synopsis">
-      <xsl:with-param name="indentation" select="$indentation + 2"/>
-    </xsl:call-template>
-    
-    <!-- Member functions -->
-    <xsl:apply-templates 
-      select="method-group|method|overloaded-method" 
-      mode="synopsis">
-      <xsl:with-param name="indentation" select="$indentation + 2"/>
-    </xsl:apply-templates>
-    
-    <!-- Data members -->
-    <xsl:apply-templates select="data-member" mode="synopsis">
-      <xsl:with-param name="indentation" select="$indentation + 2"/>
-    </xsl:apply-templates>
-    
-    <!-- Closing brace -->
-    <xsl:text>&#10;</xsl:text>
-    <xsl:call-template name="indent">
-      <xsl:with-param name="indentation" select="$indentation"/>
-    </xsl:call-template>
-    <xsl:text>};</xsl:text>
-  </xsl:template>
-
-  <!-- Emit nested class reference documentation -->
-  <xsl:template match="class|class-specialization|
-                       struct|struct-specialization|
-                       union|union-specialization" mode="reference">
-    <xsl:param name="indentation"/>
-
-    <xsl:call-template name="class-type-synopsis">
-      <xsl:with-param name="indentation" select="$indentation"/>
-    </xsl:call-template>
-  </xsl:template>
-
-  <!-- Emit namespace-level class reference documentation -->
-  <xsl:template match="class|class-specialization|
-                       struct|struct-specialization|
-                       union|union-specialization" mode="namespace-reference">
-    <xsl:param name="indentation" select="0"/>
-
-    <xsl:call-template name="separator"/>
-    <xsl:call-template name="reference-documentation">
-      <xsl:with-param name="refname">
-        <xsl:call-template name="fully-qualified-name">
-          <xsl:with-param name="node" select="."/>
-        </xsl:call-template>
-        <xsl:apply-templates select="specialization"/>
-      </xsl:with-param>
-      <xsl:with-param name="purpose" select="purpose/*|purpose/text()"/>
-      <xsl:with-param name="anchor">
-        <xsl:call-template name="generate.id">
-          <xsl:with-param name="node" select="."/>
-        </xsl:call-template>
-      </xsl:with-param>
-      <xsl:with-param name="name">
-        <xsl:call-template name="type.display.name"/>
-      </xsl:with-param>
-      <xsl:with-param name="synopsis">
-        <xsl:call-template name="class-type-synopsis">
-          <xsl:with-param name="indentation" select="$indentation"/>
-        </xsl:call-template>
-        <!-- Associated free functions -->
-        <xsl:apply-templates select="ancestor-or-self::*/free-function-group"
-          mode="synopsis">
-          <xsl:with-param name="indentation" select="$indentation"/>
-          <xsl:with-param name="class" select="@name"/>
-        </xsl:apply-templates>
-      </xsl:with-param>
-      <xsl:with-param name="text">
-        <!-- Paragraphs go into the top of the "Description" section. -->
-        <xsl:if test="para">
-          <xsl:message>
-            <xsl:text>Warning: Use of 'para' elements in 'class' element is deprecated.&#10;Wrap them in a 'description' element.</xsl:text>
-          </xsl:message>
-          <xsl:call-template name="print.warning.context"/>
-          <xsl:apply-templates select="para" mode="annotation"/>
-        </xsl:if>
-        <xsl:apply-templates select="description"/>
-        
-        <xsl:call-template name="construct-copy-destruct-reference"/>
-        <xsl:apply-templates 
-          select="method-group|method|overloaded-method"
-          mode="reference"/>
-        <xsl:apply-templates select="free-function-group" mode="reference">
-          <xsl:with-param name="class" select="@name"/>
-        </xsl:apply-templates>
-        
-        <!-- Specializations of this class -->
-        <!-- TBD: fix this. We should key off the class name and match
-             fully-qualified names -->
-        <xsl:variable name="name" select="@name"/>
-        <xsl:if test="local-name(.)='class' and 
-                      ../class-specialization[@name=$name]">
-          <refsect2>
-            <title>Specializations</title>
-            <itemizedlist>
-              <xsl:apply-templates 
-                select="../class-specialization[@name=$name]"
-                mode="specialization-list"/>
-            </itemizedlist>
-          </refsect2>
-        </xsl:if>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:template>
-
-  <!-- Output a link to a specialization -->
-  <xsl:template match="class-specialization|
-                       struct-specialization|
-                       union-specialization" mode="specialization-list">
-    <listitem>
-      <para>
-        <xsl:call-template name="internal-link">
-          <xsl:with-param name="to">
-            <xsl:call-template name="generate.id">
-              <xsl:with-param name="node" select="."/>
-            </xsl:call-template>
-          </xsl:with-param>
-          <xsl:with-param name="text">
-            <xsl:call-template name="type.display.name"/>
-          </xsl:with-param>
-        </xsl:call-template>
-      </para>
-    </listitem>
-  </xsl:template>
-
-  <!-- Data member synopsis -->
-  <xsl:template match="data-member" mode="synopsis">
-    <xsl:param name="indentation"/>
-
-    <!-- Spacing -->
-    <xsl:if 
-      test="not(local-name(preceding-sibling::*[position()=1])=local-name(.))">
-      <xsl:text>&#10;</xsl:text>
-    </xsl:if>
-
-    <!-- Indent -->
-    <xsl:text>&#10;</xsl:text>
-    <xsl:call-template name="indent">
-      <xsl:with-param name="indentation" select="$indentation"/>
-    </xsl:call-template>
-
-    <xsl:if test="@specifiers">
-      <xsl:call-template name="highlight-keyword">
-        <xsl:with-param name="keyword" select="@specifiers"/>
-      </xsl:call-template>
-      <xsl:text> </xsl:text>
-    </xsl:if>
-
-    <xsl:apply-templates select="type/*|type/text()" mode="annotation"/>
-    <xsl:text> </xsl:text>
-    <xsl:value-of select="@name"/>
-    <xsl:text>;</xsl:text>
-  </xsl:template>
-
-  <!-- Enumeration synopsis -->
-  <xsl:template match="enum" mode="synopsis">
-    <xsl:param name="indentation"/>
-
-    <!-- Spacing -->
-    <xsl:if 
-      test="(not (local-name(preceding-sibling::*[position()=1])=local-name(.))
-             and (position() &gt; 1)) or 
-            not (para or description or not ($boost.compact.enum=1))">
-      <xsl:text>&#10;</xsl:text>
-    </xsl:if>
-
-    <!-- Indent -->
-    <xsl:text>&#10;</xsl:text>
-    <xsl:call-template name="indent">
-      <xsl:with-param name="indentation" select="$indentation"/>
-    </xsl:call-template>
-
-    <xsl:choose>
-      <!-- When there is a detailed description, we only put the
-           declaration in the synopsis and will put detailed documentation
-           in either a <refentry/> or in class documentation. -->
-      <xsl:when test="para or description or not ($boost.compact.enum=1)">
-        <xsl:call-template name="highlight-keyword">
-          <xsl:with-param name="keyword" select="'enum'"/>
-        </xsl:call-template>
-
-        <xsl:text> </xsl:text>
-
-        <xsl:call-template name="internal-link">
-          <xsl:with-param name="to">
-            <xsl:call-template name="generate.id">
-              <xsl:with-param name="node" select="."/>
-            </xsl:call-template>
-          </xsl:with-param>
-          <xsl:with-param name="text" select="string(@name)"/>
-          <xsl:with-param name="higlhight" select="false()"/>
-        </xsl:call-template>
-      </xsl:when>
-      <!-- When there is no detailed description, we put the enum
-           definition within the synopsis. The purpose of the enum (if
-           available) is formatted as a comment prior to the
-           definition. This way, we do not create a separate block of text
-           for what is generally a very small amount of information. -->
-      <xsl:otherwise>
-        <xsl:if test="purpose">
-          <xsl:call-template name="highlight-comment">
-            <xsl:with-param name="text">
-              <xsl:text>// </xsl:text>
-              <xsl:apply-templates select="purpose/*" mode="annotation"/>
-            </xsl:with-param>
-          </xsl:call-template>
-
-          <xsl:text>&#10;</xsl:text>
-          <xsl:call-template name="indent">
-            <xsl:with-param name="indentation" select="$indentation"/>
-          </xsl:call-template>
-        </xsl:if>
-
-        <xsl:call-template name="highlight-keyword">
-          <xsl:with-param name="keyword" select="'enum'"/>
-        </xsl:call-template>
-
-        <xsl:text> </xsl:text>
-        
-        <xsl:call-template name="anchor">
-          <xsl:with-param name="to">
-            <xsl:call-template name="generate.id">
-              <xsl:with-param name="node" select="."/>
-            </xsl:call-template>
-          </xsl:with-param>
-          <xsl:with-param name="text" select="@name"/>
-          <xsl:with-param name="higlhight" select="false()"/>
-        </xsl:call-template>
-
-        <xsl:text> { </xsl:text>
-        <xsl:call-template name="type.enum.list.compact">
-          <xsl:with-param name="indentation"
-            select="$indentation + string-length(@name) + 8"/>
-        </xsl:call-template>
-        <xsl:text> }</xsl:text>
-      </xsl:otherwise>
-    </xsl:choose>
-    <xsl:text>;</xsl:text>
-  </xsl:template>
-
-  <!-- Enumeration reference at namespace level -->
-  <xsl:template match="enum" mode="namespace-reference">
-    <xsl:if test="para or description or not ($boost.compact.enum=1)">
-      <xsl:call-template name="reference-documentation">
-        <xsl:with-param name="name">
-          <xsl:call-template name="type.display.name"/>
-        </xsl:with-param>
-        <xsl:with-param name="refname">
-          <xsl:call-template name="fully-qualified-name">
-            <xsl:with-param name="node" select="."/>
-          </xsl:call-template>
-        </xsl:with-param>
-        <xsl:with-param name="purpose" select="purpose/*|purpose/text()"/>
-        <xsl:with-param name="anchor">
-          <xsl:call-template name="generate.id">
-            <xsl:with-param name="node" select="."/>
-          </xsl:call-template>
-        </xsl:with-param>
-        <xsl:with-param name="synopsis">
-          <xsl:call-template name="type.enum.display"/>
-        </xsl:with-param>
-        <xsl:with-param name="text">
-          <xsl:apply-templates select="para"/>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:template>
-
-  <!-- Output an enumeration along with its values -->
-  <xsl:template name="type.enum.display">
-    <!-- Spacing -->
-    <xsl:if test="position() &gt; 1">
-      <xsl:text>&#10;</xsl:text>
-    </xsl:if>
-
-    <xsl:text>&#10;</xsl:text>    
-
-    <xsl:call-template name="highlight-keyword">
-      <xsl:with-param name="keyword" select="'enum'"/>
-    </xsl:call-template>
-
-    <!-- Header -->
-    <xsl:variable name="header" select="concat(' ', @name, ' { ')"/>
-    <xsl:value-of select="$header"/>
-
-    <!-- Print the enumeration values -->
-    <xsl:call-template name="type.enum.list.compact">
-      <xsl:with-param name="indentation" select="4 + string-length($header)"/>
-    </xsl:call-template>
-
-    <xsl:text> };</xsl:text>    
-  </xsl:template>
-
-  <!-- List enumeration values in a compact form e.g.,
-       enum Name { value1 = foo, value2 = bar, ... }; 
-       This routine prints only the enumeration values; the caller is 
-       responsible for printing everything outside the braces
-       (inclusive). -->
-  <xsl:template name="type.enum.list.compact">
-    <xsl:param name="indentation"/>
-
-    <!-- Internal: The column we are on -->
-    <xsl:param name="column" select="$indentation"/>
-
-    <!-- Internal: The list of enumeration values -->
-    <xsl:param name="values" select="enumvalue"/>
-
-    <!-- Internal: a prefix that we need to print prior to printing
-         this value. -->
-    <xsl:param name="prefix" select="''"/>
-
-    <xsl:if test="$values">
-      <xsl:variable name="value" select="$values[position()=1]"/>
-      <xsl:variable name="rest" select="$values[position() &gt; 1]"/>
-
-      <!-- Compute the string to be printed for this value -->
-      <xsl:variable name="result">
-        <xsl:value-of select="$prefix"/>
-        <xsl:value-of select="$value/attribute::name"/>
-
-        <xsl:if test="$values/attribute">
-          <xsl:text> = </xsl:text>
-          <xsl:value-of select="string($values/attribute)"/>
-        </xsl:if>
-      </xsl:variable>
-
-      <!-- The column we will end on, assuming that this value fits on
-           this line -->
-      <xsl:variable name="end" select="$column + string-length($result)"/>
-
-      <xsl:choose>
-        <!-- If the enumeration value fits on this line, put it there -->
-        <xsl:when test="$end &lt; $max-columns">
-          <xsl:value-of select="$prefix"/>
-          <xsl:value-of select="$value/attribute::name"/>
-          <xsl:if test="$value/default">
-            <xsl:text> = </xsl:text>
-            <xsl:apply-templates 
-              select="$value/default/*|$value/default/text()"/>
-          </xsl:if>
-
-          <xsl:call-template name="type.enum.list.compact">
-            <xsl:with-param name="indentation" select="$indentation"/>
-            <xsl:with-param name="column" select="$end"/>
-            <xsl:with-param name="values" select="$rest"/>
-            <xsl:with-param name="prefix" select="', '"/>
-          </xsl:call-template>
-        </xsl:when>
-        <!-- This enumeration value doesn't fit on this line, so print
-             it on the next line -->
-        <xsl:otherwise>
-          <xsl:value-of select="$prefix"/>
-          <xsl:text>&#10;</xsl:text>
-
-          <xsl:call-template name="indent">
-            <xsl:with-param name="indentation" select="$indentation"/>
-          </xsl:call-template>
-
-          <xsl:value-of select="$value/attribute::name"/>
-          <xsl:if test="$value/default">
-            <xsl:text> = </xsl:text>
-            <xsl:apply-templates 
-              select="$value/default/*|$value/default/text()"/>
-          </xsl:if>
-
-          <xsl:variable name="end2" select="$indentation 
-                                           + string-length($result) 
-                                           - string-length($prefix)"/>
-
-          <xsl:call-template name="type.enum.list.compact">
-            <xsl:with-param name="indentation" select="$indentation"/>
-            <xsl:with-param name="column" select="$end2"/>
-            <xsl:with-param name="values" select="$rest"/>
-            <xsl:with-param name="prefix" select="', '"/>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:if>
-  </xsl:template>
-
-</xsl:stylesheet>
diff --git a/src/documentation/xsl/utility.xsl b/src/documentation/xsl/utility.xsl
deleted file mode 100644
index db240e2c1b..0000000000
--- a/src/documentation/xsl/utility.xsl
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE xsl:stylesheet [
-<!ENTITY nbsp "&#160;">
-]>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="1.0">
-  <!-- Indent the current line-->
-  <xsl:template name="indent">
-    <xsl:param name="indentation"/>
-    <xsl:if test="$indentation > 0">
-      <xsl:text>&nbsp;</xsl:text>
-      <xsl:call-template name="indent">
-        <xsl:with-param name="indentation" select="$indentation - 1"/>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:template>
-
-</xsl:stylesheet>
diff --git a/src/documentation/xsl/xml/collect.xsl b/src/documentation/xsl/xml/collect.xsl
deleted file mode 100644
index 083e4bfaa0..0000000000
--- a/src/documentation/xsl/xml/collect.xsl
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet        xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-  <xsl:output method="xml" version="1.0" indent="yes" standalone="yes" />
- 
-  <xsl:param name="doxygen.xml.path">./</xsl:param>
- 
-  <xsl:template match="/">
-    <doxygen>
-      <xsl:attribute name="version">
-        <xsl:choose>
-          <xsl:when test="doxygen">
-            <xsl:value-of select="doxygen/attribute::version"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="doxygenindex/attribute::version"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:attribute>
-
-      <!-- Load all doxgen generated xml files -->
-      <xsl:for-each select="doxygen/compound">
-        <xsl:variable name="id">
-          <xsl:choose>
-            <xsl:when test="@refid">
-              <xsl:value-of select="@refid"/>
-            </xsl:when>
-            <xsl:when test="@id">
-              <xsl:value-of select="@id"/>
-            </xsl:when>
-          </xsl:choose>
-        </xsl:variable>
-        <xsl:if test="$id">
-          <xsl:copy-of select="document( concat($doxygen.xml.path, '/',
-                               $id, '.xml' ) )/doxygen/*" />
-        </xsl:if>
-      </xsl:for-each>
-      <xsl:for-each select="doxygenindex/compound">
-        <xsl:variable name="id">
-          <xsl:choose>
-            <xsl:when test="@refid">
-              <xsl:value-of select="@refid"/>
-            </xsl:when>
-            <xsl:when test="@id">
-              <xsl:value-of select="@id"/>
-            </xsl:when>
-          </xsl:choose>
-        </xsl:variable>
-        <xsl:if test="$id">
-          <xsl:copy-of select="document( concat($doxygen.xml.path, '/',
-                               $id, '.xml' ) )/doxygen/*" />
-        </xsl:if>
-      </xsl:for-each>
-    </doxygen>
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/src/documentation/xsl/xml/combine.xslt b/src/documentation/xsl/xml/combine.xslt
deleted file mode 100644
index abdd9ac759..0000000000
--- a/src/documentation/xsl/xml/combine.xslt
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- XSLT script to combine the generated output into a single file. 
-     If you have xsltproc you could use:
-     xsltproc combine.xslt index.xml >all.xml
--->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-  <xsl:output method="xml" version="1.0" indent="yes" standalone="yes" />
-  <xsl:template match="/">
-    <doxygen version="{doxygenindex/@version}">
-      <!-- Load all doxgen generated xml files -->
-      <xsl:for-each select="doxygenindex/compound">
-        <xsl:copy-of select="document( concat( @refid, '.xml' ) )/doxygen/*" />
-      </xsl:for-each>
-    </doxygen>
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/src/documentation/xsl/xml/compound.xsd b/src/documentation/xsl/xml/compound.xsd
deleted file mode 100644
index 561ab94823..0000000000
--- a/src/documentation/xsl/xml/compound.xsd
+++ /dev/null
@@ -1,773 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <xsd:element name="doxygen" type="DoxygenType"/>
-
-  <!-- Complex types -->
-
-  <xsd:complexType name="DoxygenType">
-    <xsd:sequence maxOccurs="unbounded">
-      <xsd:element name="compounddef" type="compounddefType" minOccurs="0" />
-    </xsd:sequence>
-    <xsd:attribute name="version" type="DoxVersionNumber" use="required" />
-  </xsd:complexType>
-
-  <xsd:complexType name="compounddefType">
-    <xsd:sequence>
-      <xsd:element name="compoundname" type="xsd:string"/>
-      <xsd:element name="title" type="xsd:string" minOccurs="0" />
-      <xsd:element name="basecompoundref" type="compoundRefType" minOccurs="0" maxOccurs="unbounded" />
-      <xsd:element name="derivedcompoundref" type="compoundRefType" minOccurs="0" maxOccurs="unbounded" />
-      <xsd:element name="includes" type="incType" minOccurs="0" maxOccurs="unbounded" />
-      <xsd:element name="includedby" type="incType" minOccurs="0" maxOccurs="unbounded" />
-      <xsd:element name="incdepgraph" type="graphType" minOccurs="0" />
-      <xsd:element name="invincdepgraph" type="graphType" minOccurs="0" />
-      <xsd:element name="innerdir" type="refType" minOccurs="0" maxOccurs="unbounded" />
-      <xsd:element name="innerfile" type="refType" minOccurs="0" maxOccurs="unbounded" />
-      <xsd:element name="innerclass" type="refType" minOccurs="0" maxOccurs="unbounded" />
-      <xsd:element name="innernamespace" type="refType" minOccurs="0" maxOccurs="unbounded" />
-      <xsd:element name="innerpage" type="refType" minOccurs="0" maxOccurs="unbounded" />
-      <xsd:element name="innergroup" type="refType" minOccurs="0" maxOccurs="unbounded" />
-      <xsd:element name="templateparamlist" type="templateparamlistType" minOccurs="0" />
-      <xsd:element name="sectiondef" type="sectiondefType" minOccurs="0" maxOccurs="unbounded" />
-      <xsd:element name="briefdescription" type="descriptionType" minOccurs="0" />
-      <xsd:element name="detaileddescription" type="descriptionType" minOccurs="0" />
-      <xsd:element name="inheritancegraph" type="graphType" minOccurs="0" />
-      <xsd:element name="collaborationgraph" type="graphType" minOccurs="0" />
-      <xsd:element name="programlisting" type="listingType" minOccurs="0" />
-      <xsd:element name="location" type="locationType" minOccurs="0" />
-      <xsd:element name="listofallmembers" type="listofallmembersType" minOccurs="0" />
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:string" />
-    <xsd:attribute name="kind" type="DoxCompoundKind" />
-    <xsd:attribute name="prot" type="DoxProtectionKind" />
-  </xsd:complexType>
-
-  <xsd:complexType name="listofallmembersType">
-    <xsd:sequence>
-      <xsd:element name="member" type="memberRefType" minOccurs="0" maxOccurs="unbounded" />
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="memberRefType">
-    <xsd:sequence>
-      <xsd:element name="scope" />
-      <xsd:element name="name" />
-    </xsd:sequence>
-    <xsd:attribute name="refid" type="xsd:string" />
-    <xsd:attribute name="prot" type="DoxProtectionKind" />
-    <xsd:attribute name="virt" type="DoxVirtualKind" />
-    <xsd:attribute name="ambiguityscope" type="xsd:string" />
-  </xsd:complexType>
-
-  <xsd:complexType name="compoundRefType" mixed="true">
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:string">
-        <xsd:attribute name="refid" type="xsd:string" use="optional" />
-        <xsd:attribute name="prot" type="DoxProtectionKind" />
-        <xsd:attribute name="virt" type="DoxVirtualKind" />
-      </xsd:extension>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-  <xsd:complexType name="reimplementType" mixed="true">
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:string">
-        <xsd:attribute name="refid" type="xsd:string" />
-      </xsd:extension>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-  <xsd:complexType name="incType" mixed="true">
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:string">
-        <xsd:attribute name="refid" type="xsd:string" />
-        <xsd:attribute name="local" type="DoxBool" />
-      </xsd:extension>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-  <xsd:complexType name="refType" mixed="true">
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:string">
-        <xsd:attribute name="refid" type="xsd:string" />
-      </xsd:extension>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-  <xsd:complexType name="refTextType" mixed="true">
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:string">
-       <xsd:attribute name="refid" type="xsd:string" />
-       <xsd:attribute name="kindref" type="DoxRefKind" />
-       <xsd:attribute name="external" type="xsd:string" />
-      </xsd:extension>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-  <xsd:complexType name="sectiondefType">
-    <xsd:sequence>
-      <xsd:element name="header" type="xsd:string" minOccurs="0" />
-      <xsd:element name="description" type="descriptionType" minOccurs="0" />
-      <xsd:element name="memberdef" type="memberdefType" maxOccurs="unbounded" />
-    </xsd:sequence>
-    <xsd:attribute name="kind" type="DoxSectionKind" />
-  </xsd:complexType>
-
-  <xsd:complexType name="memberdefType">
-    <xsd:sequence>
-      <xsd:element name="templateparamlist" type="templateparamlistType" minOccurs="0" />
-      <xsd:element name="type" type="linkedTextType" minOccurs="0" />
-      <xsd:element name="definition" minOccurs="0" />
-      <xsd:element name="argsstring" minOccurs="0" />
-      <xsd:element name="name" />
-      <xsd:element name="read" minOccurs="0" />
-      <xsd:element name="write" minOccurs="0" />
-      <xsd:element name="reimplements" type="reimplementType" minOccurs="0" maxOccurs="unbounded" />
-      <xsd:element name="reimplementedby" type="reimplementType" minOccurs="0" maxOccurs="unbounded" />
-      <xsd:element name="param" type="paramType" minOccurs="0" maxOccurs="unbounded" />
-      <xsd:element name="enumvalue" type="enumvalueType" minOccurs="0" maxOccurs="unbounded" />
-      <xsd:element name="initializer" type="linkedTextType" minOccurs="0" />
-      <xsd:element name="exceptions" type="linkedTextType" minOccurs="0" />
-      <xsd:element name="briefdescription" type="descriptionType" minOccurs="0" />
-      <xsd:element name="detaileddescription" type="descriptionType" minOccurs="0" />
-      <xsd:element name="inbodydescription" type="descriptionType" minOccurs="0" />
-      <xsd:element name="location" type="locationType" />
-      <xsd:element name="references" type="referenceType" minOccurs="0" maxOccurs="unbounded" />
-      <xsd:element name="referencedby" type="referenceType" minOccurs="0" maxOccurs="unbounded" />
-    </xsd:sequence>
-    <xsd:attribute name="kind" type="DoxMemberKind" />
-    <xsd:attribute name="id" type="xsd:string" />
-    <xsd:attribute name="prot" type="DoxProtectionKind" />
-    <xsd:attribute name="static" type="DoxBool" />
-    <xsd:attribute name="const" type="DoxBool" />
-    <xsd:attribute name="explicit" type="DoxBool" />
-    <xsd:attribute name="inline" type="DoxBool" />
-    <xsd:attribute name="virt" type="DoxVirtualKind" />
-    <xsd:attribute name="volatile" type="DoxBool" />
-    <xsd:attribute name="mutable" type="DoxBool" />
-    <xsd:attribute name="readable" type="DoxBool" use="optional"/>
-    <xsd:attribute name="writable" type="DoxBool" use="optional"/>
-  </xsd:complexType>
-
-  <xsd:complexType name="descriptionType" mixed="true">
-    <xsd:sequence>
-      <xsd:element name="para" type="docParaType" minOccurs="0" maxOccurs="unbounded" />
-      <xsd:element name="sect1" type="docSect1Type" minOccurs="0" maxOccurs="unbounded" />
-      <xsd:element name="internal" type="docInternalType" minOccurs="0" />
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="enumvalueType" mixed="true">
-    <xsd:sequence>
-      <xsd:element name="name" />
-      <xsd:element name="initializer" type="linkedTextType" minOccurs="0" />
-      <xsd:element name="briefdescription" type="descriptionType" minOccurs="0" />
-      <xsd:element name="detaileddescription" type="descriptionType" minOccurs="0" />
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:string" />
-    <xsd:attribute name="prot" type="DoxProtectionKind" />
-  </xsd:complexType>
-
-  <xsd:complexType name="templateparamlistType">
-    <xsd:sequence>
-      <xsd:element name="param" type="paramType" minOccurs="0" maxOccurs="unbounded" />
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="paramType">
-    <xsd:sequence>
-      <xsd:element name="type" type="linkedTextType" minOccurs="0" />
-      <xsd:element name="declname" minOccurs="0" />
-      <xsd:element name="defname" minOccurs="0" />
-      <xsd:element name="array" minOccurs="0" />
-      <xsd:element name="defval" type="linkedTextType" minOccurs="0" />
-      <xsd:element name="briefdescription" type="descriptionType" minOccurs="0" />
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="linkedTextType" mixed="true">
-    <xsd:sequence>
-    <xsd:element name="ref" type="refTextType" minOccurs="0" maxOccurs="unbounded" />
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="graphType">
-    <xsd:sequence>
-      <xsd:element name="node" type="nodeType" maxOccurs="unbounded" />
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="nodeType">
-    <xsd:sequence>
-      <xsd:element name="label" />
-      <xsd:element name="link" type="linkType" minOccurs="0" />
-      <xsd:element name="childnode" type="childnodeType" minOccurs="0" maxOccurs="unbounded" />
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:string" />
-  </xsd:complexType>
-
-  <xsd:complexType name="childnodeType">
-    <xsd:sequence>
-      <xsd:element name="edgelabel" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="refid" type="xsd:string" />
-    <xsd:attribute name="relation" type="DoxGraphRelation" />
-  </xsd:complexType>
-
-  <xsd:complexType name="linkType">
-    <xsd:attribute name="refid" type="xsd:string" />
-    <xsd:attribute name="external" type="xsd:string" use="optional"/>
-  </xsd:complexType>
-
-  <xsd:complexType name="listingType">
-    <xsd:sequence>
-      <xsd:element name="codeline" type="codelineType" minOccurs="0" maxOccurs="unbounded" />
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="codelineType">
-    <xsd:sequence>
-      <xsd:element name="highlight" type="highlightType" minOccurs="0" maxOccurs="unbounded" />
-    </xsd:sequence>
-    <xsd:attribute name="lineno" type="xsd:integer" />
-    <xsd:attribute name="refid" type="xsd:string" />
-    <xsd:attribute name="refkind" type="DoxRefKind" />
-    <xsd:attribute name="external" type="DoxBool" />
-  </xsd:complexType>
-
-  <xsd:complexType name="highlightType" mixed="true">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="sp" />
-      <xsd:element name="ref" type="refTextType" />
-    </xsd:choice>
-    <xsd:attribute name="class" type="DoxHighlightClass" />
-  </xsd:complexType>
-
-  <xsd:complexType name="referenceType" mixed="true">
-    <xsd:attribute name="refid" type="xsd:string" />
-    <xsd:attribute name="compoundref" type="xsd:string" use="optional" />
-    <xsd:attribute name="startline" type="xsd:integer" />
-    <xsd:attribute name="endline" type="xsd:integer" />
-  </xsd:complexType>
-
-  <xsd:complexType name="locationType">
-    <xsd:attribute name="file" type="xsd:string" />
-    <xsd:attribute name="line" type="xsd:integer" />
-    <xsd:attribute name="bodyfile" type="xsd:string" />
-    <xsd:attribute name="bodystart" type="xsd:integer" />
-    <xsd:attribute name="bodyend" type="xsd:integer" />
-  </xsd:complexType>
-
-  <xsd:complexType name="docSect1Type" mixed="true">
-    <xsd:sequence>
-      <xsd:element name="title" type="xsd:string" />	    
-      <xsd:element name="para" type="docParaType" minOccurs="0" maxOccurs="unbounded" />
-      <xsd:element name="sect2" type="docSect2Type" minOccurs="0" maxOccurs="unbounded" />
-      <xsd:element name="internal" type="docInternalS1Type" minOccurs="0" />
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:string" />
-  </xsd:complexType>
-
-  <xsd:complexType name="docSect2Type" mixed="true">
-    <xsd:sequence>
-      <xsd:element name="title" type="xsd:string" />	    
-      <xsd:element name="para" type="docParaType" minOccurs="0" maxOccurs="unbounded" />
-      <xsd:element name="sect3" type="docSect3Type" minOccurs="0" maxOccurs="unbounded" />
-      <xsd:element name="internal" type="docInternalS2Type" minOccurs="0" />
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:string" />
-  </xsd:complexType>
-
-  <xsd:complexType name="docSect3Type" mixed="true">
-    <xsd:sequence>
-      <xsd:element name="title" type="xsd:string" />	    
-      <xsd:element name="para" type="docParaType" minOccurs="0" maxOccurs="unbounded" />
-      <xsd:element name="sect4" type="docSect4Type" minOccurs="0" maxOccurs="unbounded" />
-      <xsd:element name="internal" type="docInternalS3Type" minOccurs="0" />
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:string" />
-  </xsd:complexType>
-
-  <xsd:complexType name="docSect4Type" mixed="true">
-    <xsd:sequence>
-      <xsd:element name="title" type="xsd:string" />	    
-      <xsd:element name="para" type="docParaType" minOccurs="0" maxOccurs="unbounded" />
-      <xsd:element name="internal" type="docInternalS4Type" minOccurs="0" />
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:string" />
-  </xsd:complexType>
-
-  <xsd:complexType name="docInternalType" mixed="true">
-    <xsd:sequence>
-      <xsd:element name="para"  type="docParaType"  minOccurs="0" maxOccurs="unbounded" />
-      <xsd:element name="sect1" type="docSect1Type" minOccurs="0" maxOccurs="unbounded" />
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="docInternalS1Type" mixed="true">
-    <xsd:sequence>
-      <xsd:element name="para"  type="docParaType"  minOccurs="0" maxOccurs="unbounded" />
-      <xsd:element name="sect2" type="docSect2Type" minOccurs="0" maxOccurs="unbounded" />
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="docInternalS2Type" mixed="true">
-    <xsd:sequence>
-      <xsd:element name="para"  type="docParaType"  minOccurs="0" maxOccurs="unbounded" />
-      <xsd:element name="sect3" type="docSect3Type" minOccurs="0" maxOccurs="unbounded" />
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="docInternalS3Type" mixed="true">
-    <xsd:sequence>
-      <xsd:element name="para"  type="docParaType"  minOccurs="0" maxOccurs="unbounded" />
-      <xsd:element name="sect3" type="docSect4Type" minOccurs="0" maxOccurs="unbounded" />
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="docInternalS4Type" mixed="true">
-    <xsd:sequence>
-      <xsd:element name="para"  type="docParaType"  minOccurs="0" maxOccurs="unbounded" />
-    </xsd:sequence>
-  </xsd:complexType>
- 
-  <xsd:group name="docTitleCmdGroup">
-    <xsd:choice>
-      <xsd:element name="ulink" type="docURLLink" />
-      <xsd:element name="bold" type="docMarkupType" />
-      <xsd:element name="emphasis" type="docMarkupType" />
-      <xsd:element name="computeroutput" type="docMarkupType" />
-      <xsd:element name="subscript" type="docMarkupType" />
-      <xsd:element name="superscript" type="docMarkupType" />
-      <xsd:element name="center" type="docMarkupType" />
-      <xsd:element name="small" type="docMarkupType" />
-      <xsd:element name="htmlonly" type="xsd:string" />
-      <xsd:element name="latexonly" type="xsd:string" />
-      <xsd:element name="dot" type="xsd:string" />
-      <xsd:element name="anchor" type="docAnchorType" />
-      <xsd:element name="formula" type="docFormulaType" />
-      <xsd:element name="ref" type="docRefTextType" />
-      <xsd:element name="copy" type="docEmptyType" />
-      <xsd:element name="trademark" type="docEmptyType" />
-      <xsd:element name="registered" type="docEmptyType" />
-      <xsd:element name="umlaut" type="docCharType" />
-      <xsd:element name="acute" type="docCharType" />
-      <xsd:element name="grave" type="docCharType" />
-      <xsd:element name="circ" type="docCharType" />
-      <xsd:element name="slash" type="docCharType" />
-      <xsd:element name="tilde" type="docCharType" />
-      <xsd:element name="cedil" type="docCharType" />
-      <xsd:element name="ring" type="docCharType" />
-      <xsd:element name="szlig" type="docEmptyType" />
-      <xsd:element name="nonbreakablespace" type="docEmptyType" />
-    </xsd:choice>
-  </xsd:group>
-
-  <xsd:complexType name="docTitleType" mixed="true">
-    <xsd:group ref="docTitleCmdGroup" minOccurs="0" maxOccurs="unbounded" />
-  </xsd:complexType>
-
-  <xsd:group name="docCmdGroup">
-    <xsd:choice>
-      <xsd:group ref="docTitleCmdGroup"/>
-      <xsd:element name="linebreak" type="docEmptyType" />
-      <xsd:element name="hruler" type="docEmptyType" />
-      <xsd:element name="preformatted" type="docMarkupType" />
-      <xsd:element name="programlisting" type="listingType" />
-      <xsd:element name="verbatim" type="xsd:string" />
-      <xsd:element name="indexentry" type="docIndexEntryType" />
-      <xsd:element name="orderedlist" type="docListType" />
-      <xsd:element name="itemizedlist" type="docListType" />
-      <xsd:element name="simplesect" type="docSimpleSectType" />
-      <xsd:element name="title" type="docTitleType" />
-      <xsd:element name="variablelist" type="docVariableListType" />
-      <xsd:element name="table" type="docTableType" />
-      <xsd:element name="heading" type="docHeadingType" />
-      <xsd:element name="image" type="docImageType" />
-      <xsd:element name="dotfile" type="docDotFileType" />
-      <xsd:element name="toclist" type="docTocListType" />
-      <xsd:element name="language" type="docLanguageType" />
-      <xsd:element name="parameterlist" type="docParamListType" />
-      <xsd:element name="xrefsect" type="docXRefSectType" />
-      <xsd:element name="copydoc" type="docCopyType" />
-    </xsd:choice>
-  </xsd:group>
-
-  <xsd:complexType name="docParaType" mixed="true">
-    <xsd:group ref="docCmdGroup" minOccurs="0" maxOccurs="unbounded" />
-  </xsd:complexType>
-
-  <xsd:complexType name="docMarkupType" mixed="true">
-    <xsd:group ref="docCmdGroup" minOccurs="0" maxOccurs="unbounded" />
-  </xsd:complexType>
-
-  <xsd:complexType name="docURLLink" mixed="true">
-    <xsd:group ref="docTitleCmdGroup" minOccurs="0" maxOccurs="unbounded" />
-    <xsd:attribute name="url" type="xsd:string" />
-  </xsd:complexType>
-
-  <xsd:complexType name="docAnchorType" mixed="true">
-    <xsd:attribute name="id" type="xsd:string" />
-  </xsd:complexType>
-
-  <xsd:complexType name="docFormulaType" mixed="true">
-    <xsd:attribute name="id" type="xsd:string" />
-  </xsd:complexType>
-
-  <xsd:complexType name="docIndexEntryType">
-    <xsd:sequence>
-      <xsd:element name="primaryie" type="xsd:string" />
-      <xsd:element name="secondaryie" type="xsd:string" />
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="docListType">
-    <xsd:sequence>
-      <xsd:element name="listitem" type="docListItemType" maxOccurs="unbounded" />
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="docListItemType">
-    <xsd:sequence>
-      <xsd:element name="para" type="docParaType" minOccurs="0" maxOccurs="unbounded" />
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="docSimpleSectType">
-    <xsd:sequence>
-      <xsd:element name="title" type="docTitleType" minOccurs="0" />
-      <xsd:element name="para" type="docParaType" minOccurs="0" maxOccurs="unbounded" />
-    </xsd:sequence>
-    <xsd:attribute name="kind" type="DoxSimpleSectKind" />
-  </xsd:complexType>
-
-  <xsd:complexType name="docVarListEntryType">
-    <xsd:sequence>
-      <xsd:element name="term" type="docTitleType" />
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:group name="docVariableListGroup">
-    <xsd:sequence>
-      <xsd:element name="varlistentry" type="docVarListEntryType" />
-      <xsd:element name="listitem" type="docListItemType" />
-    </xsd:sequence>
-  </xsd:group>
-
-  <xsd:complexType name="docVariableListType">
-    <xsd:sequence>
-      <xsd:group ref="docVariableListGroup" maxOccurs="unbounded" />
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="docRefTextType" mixed="true">
-    <xsd:group ref="docTitleCmdGroup" minOccurs="0" maxOccurs="unbounded" />
-    <xsd:attribute name="refid" type="xsd:string" />
-    <xsd:attribute name="kindref" type="DoxRefKind" />
-    <xsd:attribute name="external" type="xsd:string" />
-  </xsd:complexType>
-
-  <xsd:complexType name="docTableType">
-    <xsd:sequence>
-      <xsd:element name="row" type="docRowType" minOccurs="0" maxOccurs="unbounded" />
-      <xsd:element name="caption" type="docCaptionType" minOccurs="0" />
-    </xsd:sequence>
-    <xsd:attribute name="rows" type="xsd:integer" />
-    <xsd:attribute name="cols" type="xsd:integer" />
-  </xsd:complexType>
-
-  <xsd:complexType name="docRowType">
-    <xsd:sequence>
-      <xsd:element name="entry" type="docEntryType" minOccurs="0" maxOccurs="unbounded" />
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="docEntryType">
-    <xsd:sequence>
-      <xsd:element name="para" type="docParaType" minOccurs="0" maxOccurs="unbounded" />
-    </xsd:sequence>
-    <xsd:attribute name="thead" type="DoxBool" />
-  </xsd:complexType>
-
-  <xsd:complexType name="docCaptionType" mixed="true">
-    <xsd:group ref="docTitleCmdGroup" minOccurs="0" maxOccurs="unbounded" />
-  </xsd:complexType>
-
-  <xsd:complexType name="docHeadingType" mixed="true">
-    <xsd:group ref="docTitleCmdGroup" minOccurs="0" maxOccurs="unbounded" />
-    <xsd:attribute name="level" type="xsd:integer" /> <!-- todo: range 1-6 -->
-  </xsd:complexType>
-
-  <xsd:complexType name="docImageType" mixed="true">
-    <xsd:group ref="docTitleCmdGroup" minOccurs="0" maxOccurs="unbounded" />
-    <xsd:attribute name="type" type="DoxImageKind" /> 
-    <xsd:attribute name="name" type="xsd:string" /> 
-    <xsd:attribute name="width" type="xsd:string" /> 
-    <xsd:attribute name="height" type="xsd:string" /> 
-  </xsd:complexType>
-
-  <xsd:complexType name="docDotFileType" mixed="true">
-    <xsd:group ref="docTitleCmdGroup" minOccurs="0" maxOccurs="unbounded" />
-    <xsd:attribute name="name" type="xsd:string" /> 
-  </xsd:complexType>
-
-  <xsd:complexType name="docTocItemType" mixed="true">
-    <xsd:group ref="docTitleCmdGroup" minOccurs="0" maxOccurs="unbounded" />
-    <xsd:attribute name="id" type="xsd:string" /> 
-  </xsd:complexType>
-
-  <xsd:complexType name="docTocListType">
-    <xsd:sequence>
-      <xsd:element name="tocitem" type="docTocItemType" minOccurs="0" maxOccurs="unbounded" />
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="docLanguageType">
-    <xsd:sequence>
-      <xsd:element name="para" type="docParaType" minOccurs="0" maxOccurs="unbounded" />
-    </xsd:sequence>
-    <xsd:attribute name="langid" type="xsd:string" /> 
-  </xsd:complexType>
-
-  <xsd:complexType name="docParamListType">
-    <xsd:sequence>
-      <xsd:element name="parameteritem" type="docParamListItem" minOccurs="0" maxOccurs="unbounded" />
-    </xsd:sequence>
-    <xsd:attribute name="kind" type="DoxParamListKind" /> 
-  </xsd:complexType>
-
-  <xsd:complexType name="docParamListItem">
-    <xsd:sequence>
-      <xsd:element name="parameternamelist" type="docParamNameList" minOccurs="0" maxOccurs="unbounded" />
-      <xsd:element name="parameterdescription" type="descriptionType" />
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="docParamNameList">
-    <xsd:sequence>
-      <xsd:element name="parametername" type="docParamName" minOccurs="0" maxOccurs="unbounded" />
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="docParamName" mixed="true">
-    <xsd:sequence>
-      <xsd:element name="ref" type="refTextType" minOccurs="0" maxOccurs="1" />
-    </xsd:sequence>
-    <xsd:attribute name="direction" type="DoxParamDir" use="optional" />
-  </xsd:complexType>
-
-  <xsd:complexType name="docXRefSectType">
-    <xsd:sequence>
-      <xsd:element name="xreftitle" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
-      <xsd:element name="xrefdescription" type="descriptionType" />
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:string" /> 
-  </xsd:complexType>
-
-  <xsd:complexType name="docCopyType">
-    <xsd:sequence>
-      <xsd:element name="para" type="docParaType" minOccurs="0" maxOccurs="unbounded" />
-      <xsd:element name="sect1" type="docSect1Type" minOccurs="0" maxOccurs="unbounded" />
-      <xsd:element name="internal" type="docInternalType" minOccurs="0" />
-    </xsd:sequence>
-    <xsd:attribute name="link" type="xsd:string" /> 
-  </xsd:complexType>
-
-  <xsd:complexType name="docCharType">
-    <xsd:attribute name="char" type="DoxCharRange"/> 
-  </xsd:complexType>
-
-  <xsd:complexType name="docEmptyType"/>
-
-  <!-- Simple types -->
-
-  <xsd:simpleType name="DoxBool">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="yes" />
-      <xsd:enumeration value="no" />
-    </xsd:restriction>
-  </xsd:simpleType>
-
-  <xsd:simpleType name="DoxGraphRelation">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="include" />
-      <xsd:enumeration value="usage" />
-      <xsd:enumeration value="template-instance" />
-      <xsd:enumeration value="public-inheritance" />
-      <xsd:enumeration value="protected-inheritance" />
-      <xsd:enumeration value="private-inheritance" />
-    </xsd:restriction>
-  </xsd:simpleType>
-
-  <xsd:simpleType name="DoxRefKind">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="compound" />
-      <xsd:enumeration value="member" />
-    </xsd:restriction>
-  </xsd:simpleType>
-
-  <xsd:simpleType name="DoxMemberKind">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="define" />
-      <xsd:enumeration value="property" />
-      <xsd:enumeration value="event" />
-      <xsd:enumeration value="variable" />
-      <xsd:enumeration value="typedef" />
-      <xsd:enumeration value="enum" />
-      <xsd:enumeration value="function" />
-      <xsd:enumeration value="signal" />
-      <xsd:enumeration value="prototype" />
-      <xsd:enumeration value="friend" />
-      <xsd:enumeration value="dcop" />
-      <xsd:enumeration value="slot" />
-    </xsd:restriction>
-  </xsd:simpleType>
-
-  <xsd:simpleType name="DoxProtectionKind">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="public" />
-      <xsd:enumeration value="protected" />
-      <xsd:enumeration value="private" />
-      <xsd:enumeration value="package" />
-    </xsd:restriction>
-  </xsd:simpleType>
-
-  <xsd:simpleType name="DoxVirtualKind">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="non-virtual" />
-      <xsd:enumeration value="virtual" />
-      <xsd:enumeration value="pure-virtual" />
-    </xsd:restriction>
-  </xsd:simpleType>
-
-  <xsd:simpleType name="DoxCompoundKind">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="class" />
-      <xsd:enumeration value="struct" />
-      <xsd:enumeration value="union" />
-      <xsd:enumeration value="interface" />
-      <xsd:enumeration value="protocol" />
-      <xsd:enumeration value="category" />
-      <xsd:enumeration value="exception" />
-      <xsd:enumeration value="file" />
-      <xsd:enumeration value="namespace" />
-      <xsd:enumeration value="group" />
-      <xsd:enumeration value="page" />
-      <xsd:enumeration value="example" />
-      <xsd:enumeration value="dir" />
-    </xsd:restriction>
-  </xsd:simpleType>
-
-  <xsd:simpleType name="DoxSectionKind">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="user-defined" />
-      <xsd:enumeration value="public-type" />
-      <xsd:enumeration value="public-func" />
-      <xsd:enumeration value="public-attrib" />
-      <xsd:enumeration value="public-slot" />
-      <xsd:enumeration value="signal" />
-      <xsd:enumeration value="dcop-func" />
-      <xsd:enumeration value="property" />
-      <xsd:enumeration value="event" />
-      <xsd:enumeration value="public-static-func" />
-      <xsd:enumeration value="public-static-attrib" />
-      <xsd:enumeration value="protected-type" />
-      <xsd:enumeration value="protected-func" />
-      <xsd:enumeration value="protected-attrib" />
-      <xsd:enumeration value="protected-slot" />
-      <xsd:enumeration value="protected-static-func" />
-      <xsd:enumeration value="protected-static-attrib" />
-      <xsd:enumeration value="package-type" />
-      <xsd:enumeration value="package-func" />
-      <xsd:enumeration value="package-attrib" />
-      <xsd:enumeration value="package-static-func" />
-      <xsd:enumeration value="package-static-attrib" />
-      <xsd:enumeration value="private-type" />
-      <xsd:enumeration value="private-func" />
-      <xsd:enumeration value="private-attrib" />
-      <xsd:enumeration value="private-slot" />
-      <xsd:enumeration value="private-static-func" />
-      <xsd:enumeration value="private-static-attrib" />
-      <xsd:enumeration value="friend" />
-      <xsd:enumeration value="related" />
-      <xsd:enumeration value="define" />
-      <xsd:enumeration value="prototype" />
-      <xsd:enumeration value="typedef" />
-      <xsd:enumeration value="enum" />
-      <xsd:enumeration value="func" />
-      <xsd:enumeration value="var" />
-    </xsd:restriction>
-  </xsd:simpleType>
-
-  <xsd:simpleType name="DoxHighlightClass">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="comment" />
-      <xsd:enumeration value="normal" />
-      <xsd:enumeration value="preprocessor" />
-      <xsd:enumeration value="keyword" />
-      <xsd:enumeration value="keywordtype" />
-      <xsd:enumeration value="keywordflow" />
-      <xsd:enumeration value="stringliteral" />
-      <xsd:enumeration value="charliteral" />
-    </xsd:restriction>
-  </xsd:simpleType>
-
-  <xsd:simpleType name="DoxSimpleSectKind">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="see" />
-      <xsd:enumeration value="return" />
-      <xsd:enumeration value="author" />
-      <xsd:enumeration value="authors" />
-      <xsd:enumeration value="version" />
-      <xsd:enumeration value="since" />
-      <xsd:enumeration value="date" />
-      <xsd:enumeration value="note" />
-      <xsd:enumeration value="warning" />
-      <xsd:enumeration value="pre" />
-      <xsd:enumeration value="post" />
-      <xsd:enumeration value="invariant" />
-      <xsd:enumeration value="remark" />
-      <xsd:enumeration value="attention" />
-      <xsd:enumeration value="par" />
-      <xsd:enumeration value="rcs" />
-    </xsd:restriction>
-  </xsd:simpleType>
-
-  <xsd:simpleType name="DoxVersionNumber">
-    <xsd:restriction base="xsd:string">
-      <xsd:pattern value="\d+\.\d+.*" />
-    </xsd:restriction>
-  </xsd:simpleType>
-
-  <xsd:simpleType name="DoxImageKind">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="html" />
-      <xsd:enumeration value="latex" />
-      <xsd:enumeration value="rtf" />
-    </xsd:restriction>
-  </xsd:simpleType>
-
-  <xsd:simpleType name="DoxParamListKind">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="param" />
-      <xsd:enumeration value="retval" />
-      <xsd:enumeration value="exception" />
-    </xsd:restriction>
-  </xsd:simpleType>
-
-  <xsd:simpleType name="DoxCharRange">
-    <xsd:restriction base="xsd:string">
-      <xsd:pattern value="[aeiouncAEIOUNC]" />
-    </xsd:restriction>
-  </xsd:simpleType>
-
-  <xsd:simpleType name="DoxParamDir">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="in"/>
-      <xsd:enumeration value="out"/>
-      <xsd:enumeration value="inout"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-
-</xsd:schema>
-
diff --git a/src/documentation/xsl/xml/doxygen2boostbook.xsl b/src/documentation/xsl/xml/doxygen2boostbook.xsl
deleted file mode 100644
index e694f07d98..0000000000
--- a/src/documentation/xsl/xml/doxygen2boostbook.xsl
+++ /dev/null
@@ -1,1226 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="1.0">
-  <xsl:import href="../lookup.xsl"/>
-
-  <!-- Set this parameter to a space-separated list of headers that
-       will be included in the output (all others are ignored). If this
-       parameter is omitted or left as the empty string, all headers will
-       be output. -->
-  <xsl:param name="boost.doxygen.headers" select="''"/>
-
-  <!-- The common prefix to all headers -->
-  <xsl:param name="boost.doxygen.header.prefix" select="'boost'"/>
-
-  <!-- The text that Doxygen places in overloaded functions. Damn them
-       for forcing us to compare TEXT just to figure out what's overloaded
-       and what isn't. -->
-  <xsl:param name="boost.doxygen.overload">
-    This is an overloaded member function, provided for convenience. It differs from the above function only in what argument(s) it accepts.
-  </xsl:param>
-
-  <!-- The namespace used to identify code that should not be
-       processed at all. -->
-  <xsl:param name="boost.doxygen.detailns">detail</xsl:param>
-
-  <!-- The substring used to identify unspecified types that we can't
-       mask from within Doxygen. This is a hack (big surprise). -->
-  <xsl:param name="boost.doxygen.detail"><xsl:value-of select="$boost.doxygen.detailns"/>::</xsl:param>
-
-  <!-- The title that will be used for the BoostBook library reference emitted. 
-       If left blank, BoostBook will assign a default title. -->
-  <xsl:param name="boost.doxygen.reftitle" select="''"/>
-  
-  <xsl:output method="xml" indent="yes" standalone="yes"/>
-
-  <xsl:key name="compounds-by-kind" match="compounddef" use="@kind"/>
-  <xsl:key name="compounds-by-id" match="compounddef" use="@id"/>
-  <xsl:key name="inner-classes" match="compounddef[not(attribute::kind='namespace') and not(attribute::kind='file')]/innerclass" use="@refid"/>
-
-  <xsl:strip-space elements="briefdescription detaileddescription"/>
-
-  <xsl:template match="/">
-    <xsl:apply-templates select="doxygen"/>
-  </xsl:template>
-
-  <xsl:template match="doxygen">
-    <library-reference>
-          <xsl:if test="string($boost.doxygen.reftitle) != ''">
-            <title><xsl:copy-of select="$boost.doxygen.reftitle"/></title>
-          </xsl:if>
-      <xsl:apply-templates select="key('compounds-by-kind', 'file')"/>
-    </library-reference>
-  </xsl:template>
-
-  <xsl:template match="compounddef">
-    <!-- The set of innernamespace nodes that limits our search -->
-    <xsl:param name="with-namespace-refs"/>
-    <xsl:param name="in-file"/>
-
-    <xsl:choose>
-      <!-- If the string INTERNAL ONLY is in the description, don't
-           emit this entity. This hack is necessary because Doxygen doesn't
-           tell us what is \internal and what isn't. -->
-      <xsl:when test="contains(detaileddescription/para, 'INTERNAL ONLY')"/>
-      <xsl:when test="contains(briefdescription/para, 'INTERNAL ONLY')"/>
-
-      <xsl:when test="@kind='file'">
-        <xsl:call-template name="file"/>
-      </xsl:when>
-      <xsl:when test="@kind='namespace'">
-        <xsl:call-template name="namespace">
-          <xsl:with-param name="with-namespace-refs" 
-            select="$with-namespace-refs"/>
-          <xsl:with-param name="in-file" select="$in-file"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:when test="@kind='class'">
-        <xsl:call-template name="class">
-          <xsl:with-param name="class-key" select="'class'"/>
-          <xsl:with-param name="in-file" select="$in-file"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:when test="@kind='struct'">
-        <xsl:call-template name="class">
-          <xsl:with-param name="class-key" select="'struct'"/>
-          <xsl:with-param name="in-file" select="$in-file"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:when test="@kind='union'">
-        <xsl:call-template name="class">
-          <xsl:with-param name="class-key" select="'union'"/>
-          <xsl:with-param name="in-file" select="$in-file"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:message>
-Cannot handle compounddef with kind=<xsl:value-of select="@kind"/>
-        </xsl:message>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <xsl:template name="namespace">
-    <!-- The set of innernamespace nodes that limits our search -->
-    <xsl:param name="with-namespace-refs"/>
-    <xsl:param name="in-file"/>
-
-    <xsl:variable name="fullname" select="string(compoundname)"/>
-
-    <xsl:if test="$with-namespace-refs[string(text())=$fullname]
-                  and not(contains($fullname, $boost.doxygen.detailns))">
-      <!-- Namespace without the prefix -->
-      <xsl:variable name="rest">
-        <xsl:call-template name="strip-qualifiers">
-          <xsl:with-param name="name" select="compoundname"/>
-        </xsl:call-template>
-      </xsl:variable>
-      
-      <!-- Grab only the namespace name, not any further nested namespaces -->
-      <xsl:variable name="name">
-        <xsl:choose>
-          <xsl:when 
-            test="contains($rest, '::')">
-            <xsl:value-of select="substring-before($rest, '::')"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="$rest"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
-      
-      <namespace>
-        <xsl:attribute name="name">
-          <xsl:value-of select="$name"/>
-        </xsl:attribute>
-        
-        <xsl:apply-templates>
-          <xsl:with-param name="with-namespace-refs" 
-            select="$with-namespace-refs"/>
-          <xsl:with-param name="in-file" select="$in-file"/>
-        </xsl:apply-templates>
-      </namespace>
-    </xsl:if>
-  </xsl:template>
-
-  <xsl:template name="class">
-    <xsl:param name="class-key"/>
-    <xsl:param name="in-file"/>
-    <xsl:param name="with-namespace-refs"/>
-
-    <xsl:if test="contains(string(location/attribute::file), 
-                           concat('/', $in-file)) and
-                  not (key('inner-classes', @id))">
-      <!-- The short name of this class -->
-      <xsl:variable name="name-with-spec">
-        <xsl:call-template name="strip-qualifiers">
-          <xsl:with-param name="name" select="compoundname"/>
-        </xsl:call-template>
-      </xsl:variable>
-      
-      <xsl:variable name="name">
-        <xsl:choose>
-          <xsl:when test="contains($name-with-spec, '&lt;')">
-            <xsl:value-of select="substring-before($name-with-spec, '&lt;')"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="$name-with-spec"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
-
-      <xsl:variable name="specialization">
-        <xsl:if test="contains($name-with-spec, '&lt;')">
-          <xsl:variable name="spec-with-gt" 
-            select="substring-after($name-with-spec, '&lt;')"/>
-          <xsl:value-of select="substring($spec-with-gt, 1, 
-                                          string-length($spec-with-gt)-1)"/>
-        </xsl:if>
-      </xsl:variable>
-
-      <xsl:variable name="actual-class-key">
-        <xsl:value-of select="$class-key"/>
-        <xsl:if test="string-length($specialization) &gt; 0">
-          <xsl:text>-specialization</xsl:text>
-        </xsl:if>
-      </xsl:variable>
-
-      <xsl:element name="{$actual-class-key}">
-        <xsl:attribute name="name">
-          <xsl:value-of select="$name"/>
-        </xsl:attribute>
-        
-        <xsl:apply-templates select="templateparamlist" mode="template"/>
-
-        <xsl:if test="string-length($specialization) &gt; 0">
-          <specialization>
-            <xsl:call-template name="specialization">
-              <xsl:with-param name="specialization" select="$specialization"/>
-            </xsl:call-template>
-          </specialization>
-        </xsl:if>
-
-        <xsl:apply-templates select="basecompoundref" mode="inherit"/>
-
-        <xsl:apply-templates select="briefdescription" mode="passthrough"/>
-        <xsl:apply-templates select="detaileddescription" mode="passthrough"/>
-        <xsl:apply-templates/>
-      </xsl:element>
-    </xsl:if>
-  </xsl:template>
-
-  <xsl:template name="enum">
-    <xsl:param name="in-file"/>
-
-    <xsl:if test="contains(string(location/attribute::file), 
-                           concat('/', $in-file))">
-      <xsl:variable name="name">
-        <xsl:call-template name="strip-qualifiers">
-          <xsl:with-param name="name" select="name"/>
-        </xsl:call-template>
-      </xsl:variable>
-      
-      <enum>
-        <xsl:attribute name="name">
-          <xsl:value-of select="$name"/>
-        </xsl:attribute>
-        
-        <xsl:apply-templates select="enumvalue"/>
-        
-        <xsl:apply-templates select="briefdescription" mode="passthrough"/>
-        <xsl:apply-templates select="detaileddescription" mode="passthrough"/>
-      </enum>
-    </xsl:if>
-  </xsl:template>
-
-  <xsl:template match="enumvalue">
-    <enumvalue>
-      <xsl:attribute name="name">
-        <xsl:value-of select="name"/>
-      </xsl:attribute>
-
-      <xsl:if test="initializer">
-        <default>
-          <xsl:apply-templates select="initializer" mode="passthrough"/>
-        </default>
-      </xsl:if>
-    </enumvalue>
-  </xsl:template>
-
-  <xsl:template name="doxygen.include.header.rec">
-    <xsl:param name="name"/>
-    <xsl:param name="header-list" select="$boost.doxygen.headers"/>
-
-    <xsl:choose>
-      <xsl:when test="contains($header-list, ' ')">
-        <xsl:variable name="header" 
-          select="substring-before($header-list, ' ')"/>
-        <xsl:variable name="rest" select="substring-after($header-list, ' ')"/>
-
-        <xsl:choose>
-          <xsl:when test="$name=$header">
-            <xsl:text>yes</xsl:text>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:call-template name="doxygen.include.header.rec">
-              <xsl:with-param name="name" select="$name"/>
-              <xsl:with-param name="header-list" select="$rest"/>
-            </xsl:call-template>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:when>
-      <xsl:when test="$name=$header-list">
-        <xsl:text>yes</xsl:text>
-      </xsl:when>
-    </xsl:choose>
-  </xsl:template>
-
-  <xsl:template name="doxygen.include.header">
-    <xsl:param name="name"/>
-    
-    <xsl:if test="$boost.doxygen.headers=''">
-      <xsl:text>yes</xsl:text>
-    </xsl:if>
-    <xsl:if test="not($boost.doxygen.headers='')">
-      <xsl:call-template name="doxygen.include.header.rec">
-        <xsl:with-param name="name" select="$name"/>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:template>
-
-  <xsl:template name="file">
-    <xsl:variable name="include-header">
-      <xsl:call-template name="doxygen.include.header">
-        <xsl:with-param name="name" select="string(compoundname)"/>
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:if test="$include-header='yes'">
-      <header>
-        <xsl:attribute name="name">
-          <xsl:call-template name="shorten.header.name">
-            <xsl:with-param name="header" select="location/attribute::file"/>
-          </xsl:call-template>
-        </xsl:attribute>
-        
-        <xsl:if test="briefdescription/*|detaileddescription/*">
-          <xsl:apply-templates select="briefdescription/*" mode="passthrough"/>
-          <xsl:apply-templates select="detaileddescription/*" mode="passthrough"/>
-        </xsl:if>
-        
-        <xsl:apply-templates mode="toplevel">
-          <xsl:with-param name="with-namespace-refs"
-            select="innernamespace"/>
-          <xsl:with-param name="in-file" select="string(compoundname)"/>
-        </xsl:apply-templates>
-      </header>
-    </xsl:if>
-  </xsl:template>
-
-  <xsl:template name="shorten.header.name">
-    <xsl:param name="header"/>
-
-    <xsl:variable name="prefix">
-      <xsl:value-of select="concat($boost.doxygen.header.prefix, '/')"/>
-    </xsl:variable>
-
-    <xsl:choose>
-      <xsl:when test="contains($header, $prefix)">
-        <xsl:variable name="rest" select="substring-after($header, $prefix)"/>
-        <xsl:choose>
-          <xsl:when test="contains($rest, $prefix)">
-            <xsl:call-template name="shorten.header.name">
-              <xsl:with-param name="header" select="$rest"/>
-            </xsl:call-template>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="$prefix"/>
-            <xsl:value-of select="$rest"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$header"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-
-  <xsl:template match="innernamespace">
-    <xsl:param name="with-namespace-refs"/>
-    <xsl:param name="in-file"/>
-
-    <xsl:apply-templates select="key('compounds-by-id', @refid)">
-      <xsl:with-param name="with-namespace-refs"
-        select="$with-namespace-refs"/>
-      <xsl:with-param name="in-file" select="$in-file"/>
-    </xsl:apply-templates>
-  </xsl:template>
-
-  <xsl:template match="innernamespace" mode="toplevel">
-    <!-- The set of innernamespace nodes that limits our search -->
-    <xsl:param name="with-namespace-refs"/>
-    <xsl:param name="in-file"/>
-
-    <!-- The full name of the namespace we are referring to -->
-    <xsl:variable name="fullname" 
-      select="string(key('compounds-by-id', @refid)/compoundname)"/>
-
-    <!-- Only pass on top-level namespaces -->
-    <xsl:if test="not(contains($fullname, '::'))">
-      <xsl:apply-templates select="key('compounds-by-id', @refid)">
-        <xsl:with-param name="with-namespace-refs" 
-          select="$with-namespace-refs"/>
-        <xsl:with-param name="in-file" select="$in-file"/>
-      </xsl:apply-templates>
-    </xsl:if>
-  </xsl:template>
-
-  <xsl:template match="memberdef" mode="toplevel">
-    <xsl:param name="with-namespace-refs"/>
-    <xsl:param name="in-file"/>
-
-    <xsl:if test="@kind='define'">
-      <macro>
-        <xsl:attribute name="name">
-          <xsl:value-of select="name/text()"/>
-        </xsl:attribute>
-
-        <xsl:if test="param">
-          <xsl:attribute name="kind">
-            <xsl:value-of select="'functionlike'"/>
-          </xsl:attribute>
-        </xsl:if>
-        
-        <xsl:for-each select="param">
-          <macro-parameter>
-            <xsl:attribute name="name">
-              <xsl:value-of select="defname/text()"/>
-            </xsl:attribute>
-          </macro-parameter>
-        </xsl:for-each>
-
-        <xsl:apply-templates select="briefdescription" mode="passthrough"/>
-        <xsl:apply-templates select="detaileddescription" mode="passthrough"/>
-      </macro>
-    </xsl:if>
-  </xsl:template>
-
-  <xsl:template match="innerclass" mode="toplevel">
-    <xsl:param name="with-namespace-refs"/>
-    <xsl:param name="in-file"/>
-
-    <xsl:apply-templates select="key('compounds-by-id', @refid)">
-      <xsl:with-param name="with-namespace-refs" 
-        select="$with-namespace-refs"/>
-      <xsl:with-param name="in-file" select="$in-file"/>
-    </xsl:apply-templates>
-  </xsl:template>
-
-  <xsl:template match="innerclass">
-    <xsl:param name="with-namespace-refs"/>
-    <xsl:param name="in-file"/>
-
-    <xsl:apply-templates select="key('compounds-by-id', @refid)">
-      <xsl:with-param name="with-namespace-refs" 
-        select="$with-namespace-refs"/>
-      <xsl:with-param name="in-file" select="$in-file"/>
-    </xsl:apply-templates>
-  </xsl:template>
-
-  <!-- Classes -->
-  <xsl:template match="templateparamlist" mode="template">
-    <template>
-      <xsl:apply-templates mode="template"/>
-    </template>
-  </xsl:template>
-
-  <xsl:template match="param" mode="template">
-    <xsl:choose>
-      <xsl:when test="string(type)='class' or string(type)='typename'">
-        <template-type-parameter>
-          <xsl:attribute name="name">
-            <xsl:value-of select="normalize-space(string(declname))"/>
-          </xsl:attribute>
-          <xsl:if test="defval">
-            <default>
-              <xsl:apply-templates select="defval/*|defval/text()" 
-                mode="passthrough"/>
-            </default>
-          </xsl:if>
-        </template-type-parameter>
-      </xsl:when>
-      <xsl:otherwise>
-        <template-nontype-parameter>
-          <xsl:attribute name="name">
-            <xsl:value-of select="normalize-space(string(declname))"/>
-          </xsl:attribute>
-          <type>
-            <xsl:apply-templates select="type"/>
-          </type>
-          <xsl:if test="defval">
-            <default>
-              <xsl:apply-templates select="defval/*|defval/text()" 
-                mode="passthrough"/>
-            </default>
-          </xsl:if>
-        </template-nontype-parameter>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <xsl:template match="templateparamlist"/>
-
-  <!-- "Parse" a specialization from part of a name -->
-  <xsl:template name="specialization">
-    <xsl:param name="specialization"/>
-
-    <xsl:choose>
-      <xsl:when test="contains($specialization, ',')">
-        <template-arg>
-          <xsl:value-of 
-            select="normalize-space(substring-before($specialization, ','))"/>
-        </template-arg>
-        <xsl:call-template name="specialization">
-          <xsl:with-param name="specialization" 
-            select="substring-after($specialization, ',')"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <template-arg>
-          <xsl:value-of select="normalize-space($specialization)"/>
-        </template-arg>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <!-- Inheritance -->
-  <xsl:template match="basecompoundref" mode="inherit">
-    <inherit>
-      <!-- Access specifier for inheritance -->
-      <xsl:attribute name="access">
-        <xsl:value-of select="@prot"/>
-      </xsl:attribute>
-      <!-- TBD: virtual vs. non-virtual inheritance -->
-
-      <xsl:apply-templates mode="passthrough"/>
-    </inherit>
-  </xsl:template>
-
-  <xsl:template match="basecompoundref"/>
-
-  <!-- Skip over sections: they aren't very useful at all -->
-  <xsl:template match="sectiondef">
-    <xsl:param name="in-file" select="''"/>
-
-    <xsl:choose>
-      <xsl:when test="@kind='public-static-func'">
-        <!-- TBD: pass on the fact that these are static functions -->
-        <method-group name="public static functions">
-          <xsl:apply-templates>
-            <xsl:with-param name="in-section" select="true()"/>
-          </xsl:apply-templates>
-        </method-group>
-      </xsl:when>
-      <xsl:when test="@kind='protected-static-func'">
-        <!-- TBD: pass on the fact that these are static functions -->
-        <method-group name="protected static functions">
-          <xsl:apply-templates>
-            <xsl:with-param name="in-section" select="true()"/>
-          </xsl:apply-templates>
-        </method-group>
-      </xsl:when>
-      <xsl:when test="@kind='private-static-func'">
-        <!-- TBD: pass on the fact that these are static functions -->
-        <method-group name="private static functions">
-          <xsl:apply-templates>
-            <xsl:with-param name="in-section" select="true()"/>
-          </xsl:apply-templates>
-        </method-group>
-      </xsl:when>
-      <xsl:when test="@kind='public-func'">
-        <method-group name="public member functions">
-          <xsl:apply-templates>
-            <xsl:with-param name="in-section" select="true()"/>
-          </xsl:apply-templates>
-        </method-group>
-        <xsl:apply-templates/>
-      </xsl:when>
-      <xsl:when test="@kind='protected-func'">
-        <method-group name="protected member functions">
-          <xsl:apply-templates>
-            <xsl:with-param name="in-section" select="true()"/>
-          </xsl:apply-templates>
-        </method-group>
-        <xsl:apply-templates/>
-      </xsl:when>
-      <xsl:when test="@kind='private-func'">
-        <method-group name="private member functions">
-          <xsl:apply-templates>
-            <xsl:with-param name="in-section" select="true()"/>
-          </xsl:apply-templates>
-        </method-group>
-        <xsl:apply-templates/>
-      </xsl:when>
-      <xsl:when test="@kind='public-static-attrib' or @kind='public-attrib'">
-        <xsl:apply-templates/>
-      </xsl:when>
-      <xsl:when test="@kind='public-type'">
-        <xsl:apply-templates/>
-      </xsl:when>
-      <xsl:when test="@kind='func'">
-        <xsl:apply-templates>
-          <xsl:with-param name="in-file" select="$in-file"/>
-        </xsl:apply-templates>
-      </xsl:when>
-      <xsl:when test="@kind='typedef'">
-        <xsl:apply-templates>
-          <xsl:with-param name="in-file" select="$in-file"/>
-        </xsl:apply-templates>
-      </xsl:when>
-      <xsl:when test="@kind='var'">
-        <xsl:apply-templates>
-          <xsl:with-param name="in-file" select="$in-file"/>
-        </xsl:apply-templates>
-      </xsl:when>
-      <xsl:when test="@kind='enum'">
-        <xsl:apply-templates>
-          <xsl:with-param name="in-file" select="$in-file"/>
-        </xsl:apply-templates>
-      </xsl:when>
-      <xsl:when test="@kind='user-defined'">
-        <xsl:apply-templates/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:message>
-Cannot handle sectiondef with kind=<xsl:value-of select="@kind"/>      
-        </xsl:message>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <!-- Handle member definitions -->
-  <xsl:template match="memberdef">
-    <!-- True when we're inside a section -->
-    <xsl:param name="in-section" select="false()"/>
-    <xsl:param name="in-file" select="''"/>
-
-    <xsl:choose>
-      <!-- If the string INTERNAL ONLY is in the description, don't
-           emit this entity. This hack is necessary because Doxygen doesn't
-           tell us what is \internal and what isn't. -->
-      <xsl:when test="contains(detaileddescription/para, 'INTERNAL ONLY')"/>
-      <xsl:when test="contains(briefdescription/para, 'INTERNAL ONLY')"/>
-
-      <xsl:when test="@kind='typedef'">
-        <xsl:call-template name="typedef">
-          <xsl:with-param name="in-file" select="$in-file"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:when test="@kind='function'">
-        <xsl:choose>
-          <xsl:when test="ancestor::compounddef/attribute::kind='namespace'">
-            <xsl:call-template name="function">
-              <xsl:with-param name="in-file" select="$in-file"/>
-            </xsl:call-template>
-          </xsl:when>
-          <xsl:otherwise>
-            <!-- We are in a class -->
-            <!-- The name of the class we are in -->
-            <xsl:variable name="in-class">
-              <xsl:call-template name="strip-qualifiers">
-                <xsl:with-param name="name" 
-                  select="string(ancestor::compounddef/compoundname/text())"/>
-              </xsl:call-template>
-            </xsl:variable>
-            
-            <xsl:choose>
-              <xsl:when test="string(name/text())=$in-class">
-                <xsl:if test="not ($in-section)">
-                  <xsl:call-template name="constructor"/>
-                </xsl:if>
-              </xsl:when>
-              <xsl:when test="string(name/text())=concat('~',$in-class)">
-                <xsl:if test="not ($in-section)">
-                  <xsl:call-template name="destructor"/>
-                </xsl:if>
-              </xsl:when>
-              <xsl:when test="string(name/text())='operator='">
-                <xsl:if test="not ($in-section)">
-                  <xsl:call-template name="copy-assignment"/>
-                </xsl:if>
-              </xsl:when>
-              <xsl:when test="normalize-space(string(type))=''
-                              and contains(name/text(), 'operator ')">
-                <xsl:if test="$in-section">
-                  <xsl:call-template name="conversion-operator"/>
-                </xsl:if>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:if test="$in-section">
-                  <xsl:call-template name="method"/>
-                </xsl:if>
-              </xsl:otherwise>
-            </xsl:choose>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:when>
-      <xsl:when test="@kind='enum'">
-        <xsl:call-template name="enum">
-          <xsl:with-param name="in-file" select="$in-file"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:when test="@kind='variable'">
-        <xsl:call-template name="variable"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:message>
-Cannot handle memberdef element with kind=<xsl:value-of select="@kind"/>
-        </xsl:message>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <!-- Display typedefs -->
-  <xsl:template name="typedef">
-    <xsl:param name="in-file" select="''"/>
-
-    <xsl:if test="contains(string(location/attribute::file), $in-file)">
-      <!-- TBD: Handle public/protected/private -->
-      <typedef>
-        <!-- Name of the type -->
-        <xsl:attribute name="name">
-          <xsl:value-of select="name/text()"/>
-        </xsl:attribute>
-        
-        <xsl:apply-templates select="briefdescription" mode="passthrough"/>
-        <xsl:apply-templates select="detaileddescription" mode="passthrough"/>
-        
-        <type><xsl:apply-templates select="type"/></type>
-      </typedef>
-    </xsl:if>
-  </xsl:template>
-
-  <!-- Handle function parameters -->
-  <xsl:template match="param" mode="function">
-    <parameter>
-      <!-- Parameter name -->
-      <xsl:attribute name="name">
-        <xsl:value-of select="normalize-space(declname/text())"/>
-      </xsl:attribute>
-
-      <!-- Parameter type -->
-      <paramtype><xsl:apply-templates select="type"/></paramtype>
-
-      <!-- Default argument -->
-      <xsl:if test="defval">
-        <default>
-          <xsl:choose>
-            <xsl:when test="contains(string(defval), $boost.doxygen.detail)">
-              <emphasis>unspecified</emphasis>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:apply-templates select="defval/*|defval/text()" 
-                mode="passthrough"/>
-            </xsl:otherwise>
-          </xsl:choose>
-
-        </default>
-      </xsl:if>
-
-      <!-- Parameter description -->
-      <xsl:variable name="name">
-        <xsl:value-of select="normalize-space(declname/text())"/>
-      </xsl:variable>
-
-      <xsl:apply-templates select="../detaileddescription/para/parameterlist[attribute::kind='param']/parameterdescription"
-        mode="parameter.description">
-        <xsl:with-param name="name">
-          <xsl:value-of select="$name"/>
-        </xsl:with-param>
-      </xsl:apply-templates>
-    </parameter>
-  </xsl:template>
-
-  <xsl:template match="parameterdescription" mode="parameter.description">
-    <!-- The parameter name we are looking for -->
-    <xsl:param name="name"/>
-
-    <!-- The parametername node associated with this description -->
-    <xsl:variable name="name-node" select="preceding-sibling::*[1]"/>
-
-    <xsl:if test="string($name-node/text()) = $name">
-      <description>
-        <xsl:apply-templates select="para" mode="passthrough"/>
-      </description>
-    </xsl:if>
-  </xsl:template>
-
-  <!-- Handle function children -->
-  <xsl:template name="function.children">
-    <xsl:param name="is-overloaded" select="false()"/>
-
-    <xsl:if test="not($is-overloaded)">
-      <!-- Emit template header -->
-      <xsl:apply-templates select="templateparamlist" mode="template"/>
-      
-      <!-- Emit function parameters -->
-      <xsl:apply-templates select="param" mode="function"/>
-    </xsl:if>
-
-    <!-- The description -->
-    <xsl:apply-templates select="briefdescription" mode="passthrough"/>
-    <xsl:apply-templates select="detaileddescription" mode="passthrough"/>
-      
-    <xsl:apply-templates 
-      select="detaileddescription/para/simplesect[@kind='pre']"
-      mode="function-clauses"/>
-    <xsl:apply-templates 
-      select="detaileddescription/para/simplesect[@kind='post']"
-      mode="function-clauses"/>
-    <xsl:apply-templates 
-      select="detaileddescription/para/simplesect[@kind='return']"
-      mode="function-clauses"/>
-    <xsl:if test="detaileddescription/para/parameterlist[@kind='exception']">
-      <throws>
-        <xsl:apply-templates 
-          select="detaileddescription/para/parameterlist[@kind='exception']"
-          mode="function-clauses"/>
-      </throws>
-    </xsl:if>
-    <xsl:variable name="notes" select="detaileddescription/para/simplesect[@kind='note' or @kind='attention']"/>
-    <xsl:if test="count($notes) &gt; 0"> 
-      <notes>
-        <xsl:apply-templates select="$notes" mode="function-clauses"/>
-      </notes>
-    </xsl:if>
-  </xsl:template>
-
-  <!-- Handle free functions -->
-  <xsl:template name="function">
-    <xsl:param name="in-file" select="''"/>
-
-    <xsl:variable name="firstpara" 
-      select="normalize-space(detaileddescription/para[1])"/>
-    <xsl:if test="contains(string(location/attribute::file), $in-file)
-                  and 
-                  not($firstpara=normalize-space($boost.doxygen.overload))">
-
-      <xsl:variable name="next-node" select="following-sibling::*[1]"/>
-      <xsl:variable name="has-overload">
-        <xsl:if test="not(local-name($next-node)='memberdef')">
-          false
-        </xsl:if>
-        <xsl:if test="not(string($next-node/name/text())=string(name/text()))">
-          false
-        </xsl:if>
-        <xsl:if 
-          test="not(normalize-space($next-node/detaileddescription/para[1])
-                    =normalize-space($boost.doxygen.overload))">
-          false
-        </xsl:if>
-      </xsl:variable>
-
-      <xsl:choose>
-        <xsl:when test="not(contains($has-overload, 'false'))">
-          <overloaded-function>
-            <xsl:attribute name="name">
-              <xsl:call-template name="normalize-name"/>
-            </xsl:attribute>
-
-            <xsl:call-template name="overload-signatures"/>
-            <xsl:call-template name="function.children">
-              <xsl:with-param name="is-overloaded" select="true()"/>
-            </xsl:call-template>
-          </overloaded-function>
-        </xsl:when>
-        <xsl:otherwise>
-          <function>
-            <xsl:attribute name="name">
-              <xsl:call-template name="normalize-name"/>
-            </xsl:attribute>
-            
-            <!-- Return type -->
-            <type><xsl:apply-templates select="type"/></type>
-            
-            <xsl:call-template name="function.children"/>
-          </function>          
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:if>
-  </xsl:template>
-
-  <!-- Emit overload signatures -->
-  <xsl:template name="overload-signatures">
-    <xsl:param name="node" select="."/>
-    <xsl:param name="name" select="string(name/text())"/>
-    <xsl:param name="first" select="true()"/>
-
-    <xsl:choose>
-      <xsl:when test="not(local-name($node)='memberdef')"/>
-      <xsl:when test="not(string($node/name/text())=$name)"/>
-      <xsl:when test="not(normalize-space($node/detaileddescription/para[1])
-                          =normalize-space($boost.doxygen.overload))
-                      and not($first)"/>
-      <xsl:otherwise>
-        <signature>
-          <type>
-            <xsl:apply-templates select="$node/type"/>
-          </type>
-          <xsl:apply-templates select="$node/templateparamlist" 
-            mode="template"/>
-          <xsl:apply-templates select="$node/param" mode="function"/>
-        </signature>
-
-        <xsl:call-template name="overload-signatures">
-          <xsl:with-param name="node" select="$node/following-sibling::*[1]"/>
-          <xsl:with-param name="name" select="$name"/>
-          <xsl:with-param name="first" select="false()"/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <!-- Handle constructors -->
-  <xsl:template name="constructor">
-    <constructor>
-      <xsl:call-template name="function.children"/>
-    </constructor>
-  </xsl:template>
-
-  <!-- Handle Destructors -->
-  <xsl:template name="destructor">
-    <destructor>
-      <xsl:call-template name="function.children"/>
-    </destructor>
-  </xsl:template>
-
-  <!-- Handle Copy Assignment -->
-  <xsl:template name="copy-assignment">
-    <copy-assignment>
-      <xsl:call-template name="function.children"/>
-    </copy-assignment>
-  </xsl:template>
-
-  <!-- Handle conversion operator -->
-  <xsl:template name="conversion-operator">
-    <method>
-      <xsl:attribute name="name">
-        <xsl:text>conversion-operator</xsl:text>
-      </xsl:attribute>
-
-      <!-- CV Qualifiers -->
-      <xsl:if test="not (@const='no' and @volatile='no')">
-        <xsl:attribute name="cv">
-          <xsl:if test="@const='yes'">
-            <xsl:text>const</xsl:text>
-          </xsl:if>
-          <xsl:if test="@volatile='yes'">
-            <xsl:if test="@const='yes'">
-              <xsl:text> </xsl:text>
-            </xsl:if>
-            <xsl:text>volatile</xsl:text>
-          </xsl:if>
-        </xsl:attribute>
-      </xsl:if>
-
-      <!-- Conversion type -->
-      <type>
-        <xsl:value-of select="substring-after(name/text(), 'operator ')"/>
-      </type>
-
-      <xsl:call-template name="function.children"/>
-    </method>
-  </xsl:template>
-
-  <!-- Handle methods -->
-  <xsl:template name="method">
-    <method>
-      <xsl:attribute name="name">
-        <xsl:value-of select="name/text()"/>
-      </xsl:attribute>
-
-      <!-- TBD: virtual and static functions -->
-
-      <!-- CV Qualifiers -->
-      <xsl:if test="not (@const='no' and @volatile='no')">
-        <xsl:attribute name="cv">
-          <xsl:if test="@const='yes'">
-            <xsl:text>const</xsl:text>
-          </xsl:if>
-          <xsl:if test="@volatile='yes'">
-            <xsl:if test="@const='yes'">
-              <xsl:text> </xsl:text>
-            </xsl:if>
-            <xsl:text>volatile</xsl:text>
-          </xsl:if>
-        </xsl:attribute>
-      </xsl:if>
-
-      <!-- Return type -->
-      <type><xsl:apply-templates select="type"/></type>
-
-      <xsl:call-template name="function.children"/>
-    </method>
-  </xsl:template>
-
-  <!-- Handle member variables -->
-  <xsl:template name="variable">
-    <data-member>
-      <xsl:attribute name="name">
-        <xsl:value-of select="name/text()"/>
-      </xsl:attribute>
-
-      <!-- Specifiers -->
-      <xsl:if test="@static = 'yes'">
-        <xsl:attribute name="specifiers">static</xsl:attribute>
-      </xsl:if>
-      <xsl:if test="@mutable = 'yes'">
-        <xsl:attribute name="specifiers">mutable</xsl:attribute>
-      </xsl:if>
-
-      <type>
-        <xsl:apply-templates select="type"/>
-      </type>
-
-      <xsl:apply-templates select="briefdescription" mode="passthrough"/>
-      <xsl:apply-templates select="detaileddescription" mode="passthrough"/>
-    </data-member>
-  </xsl:template>
-
-  <!-- Things we ignore directly -->
-  <xsl:template match="compoundname" mode="toplevel"/>
-  <xsl:template match="includes|includedby|incdepgraph|invincdepgraph" mode="toplevel"/>
-  <xsl:template match="programlisting" mode="toplevel"/>
-  <xsl:template match="text()" mode="toplevel"/>
-
-  <xsl:template match="text()"/>
-
-  <!-- Passthrough of text -->
-  <xsl:template match="text()" mode="passthrough">
-    <xsl:value-of select="."/>
-  </xsl:template>
-  <xsl:template match="para" mode="passthrough">
-    <para>
-      <xsl:apply-templates mode="passthrough"/>
-    </para>
-  </xsl:template>
-
-  <xsl:template match="para/simplesect" mode="passthrough">
-    <xsl:if test="not (@kind='pre') and
-                  not (@kind='return') and 
-                  not (@kind='post') and
-                  not (@kind='attention') and
-                  not (@kind='note')">
-      <xsl:apply-templates mode="passthrough"/>
-    </xsl:if>
-  </xsl:template>
-
-  <xsl:template match="computeroutput|orderedlist|itemizedlist|listitem" 
-    mode="passthrough">
-    <xsl:element name="{name(.)}">
-      <xsl:apply-templates mode="passthrough"/>
-    </xsl:element>
-  </xsl:template>
-  <xsl:template match="parameterlist" mode="passthrough"/>
-
-  <xsl:template match="bold" mode="passthrough">
-    <emphasis role="bold">
-      <xsl:apply-templates mode="passthrough"/>
-    </emphasis>
-  </xsl:template>
-
-  <xsl:template match="briefdescription" mode="passthrough">
-    <xsl:if test="text()|*">
-      <purpose>
-        <xsl:apply-templates mode="purpose"/>
-      </purpose>
-    </xsl:if>
-  </xsl:template>
-
-  <xsl:template match="detaileddescription" mode="passthrough">
-    <xsl:if test="text()|*">
-      <description>
-        <xsl:apply-templates mode="passthrough"/>
-      </description>
-    </xsl:if>
-  </xsl:template>
-
-  <!-- Handle function clauses -->
-  <xsl:template match="simplesect" mode="function-clauses">
-    <xsl:if test="@kind='pre'">
-      <requires>
-        <xsl:apply-templates mode="passthrough"/>
-      </requires>
-    </xsl:if>
-    <xsl:if test="@kind='return'">
-      <returns>
-        <xsl:apply-templates mode="passthrough"/>
-      </returns>
-    </xsl:if>
-    <xsl:if test="@kind='post'">
-      <postconditions>
-        <xsl:apply-templates mode="passthrough"/>
-      </postconditions>
-    </xsl:if>
-    <xsl:if test="@kind='note' or @kind='attention'">
-      <xsl:apply-templates mode="passthrough"/>
-    </xsl:if>
-  </xsl:template>
-
-  <xsl:template match="parameterlist" mode="function-clauses">
-    <xsl:if test="@kind='exception'">
-      <simpara>
-        <xsl:choose>
-          <xsl:when test="normalize-space(parametername/text())='nothrow'">
-            <xsl:text>Will not throw.</xsl:text>
-          </xsl:when>
-          <xsl:otherwise>
-            <classname>
-              <xsl:value-of select="parametername/text()"/>
-            </classname>
-            <xsl:text> </xsl:text>
-            <xsl:apply-templates 
-              select="parameterdescription/para/text()
-                      |parameterdescription/para/*"
-              mode="passthrough"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </simpara>
-    </xsl:if>
-  </xsl:template>
-
-  <xsl:template match="type">
-    <xsl:choose>
-      <xsl:when test="contains(string(.), $boost.doxygen.detail)">
-        <emphasis>unspecified</emphasis>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:apply-templates mode="type"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <xsl:template match="ref" mode="type">
-    <xsl:choose>
-      <xsl:when test="@kindref='compound'">
-        <classname>
-          <xsl:value-of select="text()"/>
-        </classname>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="text()"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <xsl:template match="*" mode="type">
-    <xsl:value-of select="."/>
-  </xsl:template>
-
-  <!-- Normalize the names of functions, because Doxygen sometimes
-       puts in an obnoixous space. -->
-  <xsl:template name="normalize-name">
-    <xsl:param name="name" select="name/text()"/>
-
-    <xsl:choose>
-      <xsl:when test="contains($name, ' ')">
-        <xsl:value-of select="substring-before($name, ' ')"/>
-        <xsl:value-of select="substring-after($name, ' ')"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$name"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <!-- Convert HTML tables into DocBook format -->
-  <xsl:template match="table" mode="passthrough">
-    <informaltable>
-      <tgroup>
-        <xsl:attribute name="cols">
-          <xsl:value-of select="@cols"/>
-        </xsl:attribute>
-
-        <tbody>
-          <xsl:apply-templates mode="table"/>
-        </tbody>
-      </tgroup>
-    </informaltable>
-  </xsl:template>
-
-  <xsl:template match="row" mode="table">
-    <row>
-      <xsl:apply-templates mode="table"/>
-    </row>
-  </xsl:template>
-  
-  <xsl:template match="entry" mode="table">
-    <entry>
-      <xsl:if test="para/center">
-        <xsl:attribute name="valign">
-          <xsl:value-of select="'middle'"/>
-        </xsl:attribute>
-        <xsl:attribute name="align">
-          <xsl:value-of select="'center'"/>
-        </xsl:attribute>
-      </xsl:if>
-
-      <xsl:choose>
-        <xsl:when test="@thead='yes'">
-          <emphasis role="bold">
-            <xsl:call-template name="table-entry"/>
-          </emphasis>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="table-entry"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </entry>
-  </xsl:template>
-
-  <xsl:template name="table-entry">
-    <xsl:choose>
-      <xsl:when test="para/center">
-        <xsl:apply-templates select="para/center/*|para/center/text()"
-          mode="passthrough"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:apply-templates select="para/*|para/text()" mode="passthrough"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <!-- Handle program listings -->
-  <xsl:template match="programlisting" mode="passthrough">
-    <programlisting>
-      <xsl:apply-templates mode="programlisting"/>
-    </programlisting>
-  </xsl:template>
-
-  <xsl:template match="highlight|codeline" mode="programlisting">
-    <xsl:apply-templates mode="programlisting"/>
-  </xsl:template>
-
-  <xsl:template match="sp" mode="programlisting">
-    <xsl:text> </xsl:text>
-  </xsl:template>
-
-  <xsl:template match="*" mode="programlisting">
-    <xsl:apply-templates select="." mode="passthrough"/>
-  </xsl:template>
-
-  <!-- Replace top-level "para" elements with "simpara" elements in
-       the purpose -->
-  <xsl:template match="*" mode="purpose">
-    <xsl:apply-templates mode="passthrough"/>
-  </xsl:template>
-
-  <xsl:template match="text()" mode="purpose">
-    <xsl:apply-templates mode="passthrough"/>
-  </xsl:template>
-
-  <xsl:template match="para" mode="purpose">
-    <xsl:apply-templates select="*|text()" mode="passthrough"/>
-  </xsl:template>
-
- </xsl:stylesheet>
diff --git a/src/documentation/xsl/xml/index.xsd b/src/documentation/xsl/xml/index.xsd
deleted file mode 100644
index d7ab2a906b..0000000000
--- a/src/documentation/xsl/xml/index.xsd
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <xsd:element name="doxygenindex" type="DoxygenType"/>
-
-  <xsd:complexType name="DoxygenType">
-    <xsd:sequence>
-      <xsd:element name="compound" type="CompoundType" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="version" type="xsd:string" use="required"/>
-  </xsd:complexType>
-
-  <xsd:complexType name="CompoundType">
-    <xsd:sequence>
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="member" type="MemberType" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="refid" type="xsd:string" use="required"/>
-    <xsd:attribute name="kind" type="CompoundKind" use="required"/>
-  </xsd:complexType>
-
-  <xsd:complexType name="MemberType">
-    <xsd:sequence>
-      <xsd:element name="name" type="xsd:string"/>
-    </xsd:sequence>
-    <xsd:attribute name="refid" type="xsd:string" use="required"/>
-    <xsd:attribute name="kind" type="MemberKind" use="required"/>
-  </xsd:complexType>
-  
-  <xsd:simpleType name="CompoundKind">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="class"/>
-      <xsd:enumeration value="struct"/>
-      <xsd:enumeration value="union"/>
-      <xsd:enumeration value="interface"/>
-      <xsd:enumeration value="protocol"/>
-      <xsd:enumeration value="category"/>
-      <xsd:enumeration value="exception"/>
-      <xsd:enumeration value="file"/>
-      <xsd:enumeration value="namespace"/>
-      <xsd:enumeration value="group"/>
-      <xsd:enumeration value="page"/>
-      <xsd:enumeration value="example"/>
-      <xsd:enumeration value="dir"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-
-  <xsd:simpleType name="MemberKind">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="define"/>
-      <xsd:enumeration value="property"/>
-      <xsd:enumeration value="event"/>
-      <xsd:enumeration value="variable"/>
-      <xsd:enumeration value="typedef"/>
-      <xsd:enumeration value="enum"/>
-      <xsd:enumeration value="enumvalue"/>
-      <xsd:enumeration value="function"/>
-      <xsd:enumeration value="signal"/>
-      <xsd:enumeration value="prototype"/>
-      <xsd:enumeration value="friend"/>
-      <xsd:enumeration value="dcop"/>
-      <xsd:enumeration value="slot"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-
-</xsd:schema>
-