--- ../cvs/htdocs/xsl/guide.xsl	2003-11-14 18:30:39.000000000 +0100
+++ guide.xsl	2003-11-15 14:35:07.000000000 +0100
@@ -851,7 +851,15 @@
   <xsl:when test="title">
     <p class="chaphead">
       <span class="chapnum">
-        <a name="doc_chap{$chid}"><xsl:number/>. </a>
+        <xsl:choose>
+          <xsl:when test="@id">
+            <a name="doc_chap{$chid}"><xsl:number/></a>
+            <a name="{@id}">. </a>
+          </xsl:when>
+          <xsl:otherwise>
+            <a name="doc_chap{$chid}"><xsl:number/> .</a>
+          </xsl:otherwise>
+        </xsl:choose>
       </span>
       <xsl:value-of select="title"/>
     </p>
@@ -860,7 +868,15 @@
     <xsl:if test="/guide">
       <p class="chaphead">
         <span class="chapnum">
-          <a name="doc_chap{$chid}"><xsl:number/>.</a>
+          <xsl:choose>
+            <xsl:when test="@id">
+              <a name="doc_chap{$chid}"><xsl:number/></a>
+              <a name="{@id}">.</a>
+            </xsl:when>
+            <xsl:otherwise>
+              <a name="doc_chap{$chid}"><xsl:number/>.</a>
+            </xsl:otherwise>
+          </xsl:choose>
         </span>
       </p>
     </xsl:if>
@@ -881,7 +897,15 @@
 <xsl:if test="title">
   <xsl:variable name="sectid">doc_chap<xsl:value-of select="$chid"/>_sect<xsl:number/></xsl:variable>
   <p class="secthead">
-    <a name="{$sectid}"><xsl:value-of select="title"/>&#160;</a>
+    <xsl:choose>
+      <xsl:when test="@id">
+        <a name="{$sectid}"><xsl:value-of select="title"/></a>
+        <a name="{@id}">&#160;</a>
+      </xsl:when>
+      <xsl:otherwise>
+        <a name="{$sectid}"><xsl:value-of select="title"/>&#160;</a>
+      </xsl:otherwise>
+    </xsl:choose>
   </p>
 </xsl:if>
 <xsl:apply-templates select="body">
@@ -896,6 +920,9 @@
 <xsl:variable name="figid">doc_chap<xsl:value-of select="$chid"/>_fig<xsl:value-of select="$fignum"/></xsl:variable>
 <br/>
 <a name="{$figid}"/>
+<xsl:if test="@id">
+  <a name="{@id}"/>
+</xsl:if>
 <table cellspacing="0" cellpadding="0" border="0">
   <tr>
     <td class="infohead" bgcolor="#7a5ada">
@@ -1095,6 +1122,9 @@
 <xsl:variable name="prenum"><xsl:number level="any" from="chapter" count="pre"/></xsl:variable>
 <xsl:variable name="preid">doc_chap<xsl:value-of select="$chid"/>_pre<xsl:value-of select="$prenum"/></xsl:variable>
 <a name="{$preid}"/>
+<xsl:if test="@id">
+  <a name="{@id}"/>
+</xsl:if>
 <table class="ntable" width="100%" cellspacing="0" cellpadding="0" border="0">
   <tr>
     <td class="infohead" bgcolor="#7a5ada">