diff --git a/doc/Jamfile b/doc/Jamfile
index f42881d8..0cee1212 100644
--- a/doc/Jamfile
+++ b/doc/Jamfile
@@ -14,6 +14,7 @@ import quickbook ;
 import xsltproc ;
 import doxygen ;
 import modules ;
+import saxonhe ;
 
 #-------------------------------------------------------------------------------
 #
@@ -132,10 +133,10 @@ actions call-xsltproc
 #
 make reference.qbk
     :
-        transform.xsl
         reference.xml
+        transform.xsl
     :
-        @call-xsltproc
+        saxonhe.saxonhe
     ;
 
 # We have to make a copy of reference.qbk and put it
diff --git a/doc/docca/include/docca/doxygen.xsl b/doc/docca/include/docca/doxygen.xsl
index 7a428789..7c192da8 100644
--- a/doc/docca/include/docca/doxygen.xsl
+++ b/doc/docca/include/docca/doxygen.xsl
@@ -867,14 +867,14 @@
             </xsl:otherwise>
           </xsl:choose>
           <xsl:text> `</xsl:text>
-          <xsl:value-of name="text" select="$dox-name"/>
+          <xsl:value-of select="$dox-name"/>
           <xsl:text>`]</xsl:text>
         </xsl:when>
         <xsl:when test="$def-kind = 'class' or $def-kind = 'struct'">
           <xsl:text>[link </xsl:text><xsl:value-of select="$doc-ref"/>
           <xsl:value-of select="concat($ref-id,'.',$dox-name)"/>
           <xsl:text> `</xsl:text>
-          <xsl:value-of name="text" select="$name"/>
+          <xsl:value-of select="$name"/>
           <xsl:text>`]</xsl:text>
         </xsl:when>
         <xsl:otherwise>
@@ -992,7 +992,7 @@
     <xsl:text>[table [[Name][Description]]&#xd;</xsl:text>
     <xsl:for-each select="
         sectiondef[@kind='public-type']/memberdef |
-        innerclass[@prot='public' and not(contains(., '_handler'))]" mode="class-table">
+        innerclass[@prot='public' and not(contains(., '_handler'))]" >
       <xsl:sort select="concat(name,  (.)[not(name)])"/>
       <xsl:text>  [&#xd;</xsl:text>
       <xsl:choose>
@@ -1038,7 +1038,7 @@
   <xsl:if test="count(sectiondef[@kind='public-func' or @kind='public-static-func']) &gt; 0">
     <xsl:text>[heading Member Functions]&#xd;</xsl:text>
     <xsl:text>[table [[Name][Description]]&#xd;</xsl:text>
-    <xsl:for-each select="sectiondef[@kind='public-func' or @kind='public-static-func']/memberdef" mode="class-table">
+    <xsl:for-each select="sectiondef[@kind='public-func' or @kind='public-static-func']/memberdef" >
       <xsl:sort select="name"/>
       <xsl:variable name="name">
         <xsl:value-of select="name"/>
@@ -1088,7 +1088,7 @@
   <xsl:if test="count(sectiondef[@kind='protected-func' or @kind='protected-static-func']) &gt; 0">
     <xsl:text>[heading Protected Member Functions]&#xd;</xsl:text>
     <xsl:text>[table [[Name][Description]]&#xd;</xsl:text>
-    <xsl:for-each select="sectiondef[@kind='protected-func' or @kind='protected-static-func']/memberdef" mode="class-table">
+    <xsl:for-each select="sectiondef[@kind='protected-func' or @kind='protected-static-func']/memberdef" >
       <xsl:sort select="name"/>
       <xsl:variable name="name">
         <xsl:value-of select="name"/>
@@ -1133,7 +1133,7 @@
   <xsl:if test="count(sectiondef[@kind='private-func' or @kind='protected-private-func']) &gt; 0 and $private &gt; 0">
     <xsl:text>[heading Private Member Functions]&#xd;</xsl:text>
     <xsl:text>[table [[Name][Description]]&#xd;</xsl:text>
-    <xsl:for-each select="sectiondef[@kind='private-func']/memberdef" mode="class-table">
+    <xsl:for-each select="sectiondef[@kind='private-func']/memberdef" >
       <xsl:sort select="name"/>
       <xsl:variable name="name">
         <xsl:value-of select="name"/>
@@ -1178,7 +1178,7 @@
   <xsl:if test="count(sectiondef[@kind='public-attrib' or @kind='public-static-attrib']) &gt; 0">
     <xsl:text>[heading Data Members]&#xd;</xsl:text>
     <xsl:text>[table [[Name][Description]]&#xd;</xsl:text>
-    <xsl:for-each select="sectiondef[@kind='public-attrib' or @kind='public-static-attrib']/memberdef" mode="class-table">
+    <xsl:for-each select="sectiondef[@kind='public-attrib' or @kind='public-static-attrib']/memberdef" >
       <xsl:sort select="name"/>
       <xsl:text>  [&#xd;</xsl:text>
       <xsl:text>    [[link </xsl:text><xsl:value-of select="$doc-ref"/>
@@ -1194,7 +1194,7 @@
   <xsl:if test="count(sectiondef[@kind='protected-attrib' or @kind='protected-static-attrib']) &gt; 0">
     <xsl:text>[heading Protected Data Members]&#xd;</xsl:text>
     <xsl:text>[table [[Name][Description]]&#xd;</xsl:text>
-    <xsl:for-each select="sectiondef[@kind='protected-attrib' or @kind='protected-static-attrib']/memberdef" mode="class-table">
+    <xsl:for-each select="sectiondef[@kind='protected-attrib' or @kind='protected-static-attrib']/memberdef" >
       <xsl:sort select="name"/>
       <xsl:text>  [&#xd;</xsl:text>
       <xsl:text>    [[link </xsl:text><xsl:value-of select="$doc-ref"/>
@@ -1211,7 +1211,7 @@
       $private &gt; 0">
     <xsl:text>[heading Private Data Members]&#xd;</xsl:text>
     <xsl:text>[table [[Name][Description]]&#xd;</xsl:text>
-    <xsl:for-each select="sectiondef[@kind='private-attrib' or @kind='private-static-attrib']/memberdef" mode="class-table">
+    <xsl:for-each select="sectiondef[@kind='private-attrib' or @kind='private-static-attrib']/memberdef" >
       <xsl:sort select="name"/>
       <xsl:text>  [&#xd;</xsl:text>
       <xsl:text>    [[link </xsl:text><xsl:value-of select="$doc-ref"/>
@@ -1227,7 +1227,7 @@
   <xsl:if test="count(sectiondef[@kind='friend']/memberdef[not(type = 'friend class') and not(contains(name, '_helper'))]) &gt; 0">
     <xsl:text>[heading Friends]&#xd;</xsl:text>
     <xsl:text>[table [[Name][Description]]&#xd;</xsl:text>
-    <xsl:for-each select="sectiondef[@kind='friend']/memberdef[not(type = 'friend class') and not(contains(name, '_helper'))]" mode="class-table">
+    <xsl:for-each select="sectiondef[@kind='friend']/memberdef[not(type = 'friend class') and not(contains(name, '_helper'))]"  >
       <xsl:sort select="name"/>
       <xsl:variable name="name">
         <xsl:value-of select="name"/>
@@ -1279,7 +1279,7 @@
   <xsl:if test="count(sectiondef[@kind='related']/memberdef) &gt; 0">
     <xsl:text>[heading Related Functions]&#xd;</xsl:text>
     <xsl:text>[table [[Name][Description]]&#xd;</xsl:text>
-    <xsl:for-each select="sectiondef[@kind='related']/memberdef" mode="class-table">
+    <xsl:for-each select="sectiondef[@kind='related']/memberdef" >
       <xsl:sort select="name"/>
       <xsl:variable name="name">
         <xsl:value-of select="name"/>
@@ -1537,26 +1537,26 @@
   </xsl:if>
   <xsl:choose>
     <xsl:when test="@kind='typedef'">
-      <xsl:call-template name="typedef" mode="class-detail">
+      <xsl:call-template name="typedef">
         <xsl:with-param name="class-name" select="$class-name"/>
       </xsl:call-template>
     </xsl:when>
     <xsl:when test="@kind='variable'">
-      <xsl:call-template name="variable" mode="class-detail"/>
+      <xsl:call-template name="variable"/>
     </xsl:when>
     <xsl:when test="@kind='enum'">
-      <xsl:call-template name="enum" mode="class-detail">
+      <xsl:call-template name="enum">
         <xsl:with-param name="enum-name" select="$class-name"/>
       </xsl:call-template>
     </xsl:when>
     <xsl:when test="@kind='function'">
       <xsl:text>```&#xd;</xsl:text>
-      <xsl:call-template name="function" mode="class-detail"/>
+      <xsl:call-template name="function"/>
       <xsl:text>```&#xd;</xsl:text>
     </xsl:when>
     <xsl:when test="@kind='friend'">
       <xsl:text>```&#xd;</xsl:text>
-      <xsl:call-template name="function" mode="class-detail"/>
+      <xsl:call-template name="function"/>
       <xsl:text>```&#xd;</xsl:text>
     </xsl:when>
   </xsl:choose>