Fixed bug #1309992. All elements with explicit ID are now added into help map file.

diff --git a/xsl/javahelp/javahelp.xsl b/xsl/javahelp/javahelp.xsl
index 438d2182f4ff23dad69842c1f12cb1c2bea735d0..9bb43bdab82f3ccc37b0c1188841ed26b9424d7f 100644 (file)
--- a/xsl/javahelp/javahelp.xsl
+++ b/xsl/javahelp/javahelp.xsl
@@ -339,7 +339,8 @@ references. In that case you can select appropriate encoding here.</para>
                                      | key('id',$rootid)//sect3
                                      | key('id',$rootid)//sect4
                                      | key('id',$rootid)//sect5
-                                     | key('id',$rootid)//indexterm"
+                                     | key('id',$rootid)//indexterm
+                                    | key('id',$rootid)//*[@id]"
                              mode="map"/>
       </xsl:when>
       <xsl:otherwise>
@@ -359,7 +360,8 @@ references. In that case you can select appropriate encoding here.</para>
                                      | //sect3
                                      | //sect4
                                      | //sect5
-                                     | //indexterm"
+                                     | //indexterm
+                                    | //*[@id]"
                              mode="map"/>
       </xsl:otherwise>
     </xsl:choose>
@@ -431,6 +433,18 @@ references. In that case you can select appropriate encoding here.</para>
   </mapID>
 </xsl:template>
 
+<xsl:template match="*[@id]" mode="map">
+  <xsl:variable name="id">
+    <xsl:call-template name="object.id"/>
+  </xsl:variable>
+
+  <mapID target="{$id}">
+    <xsl:attribute name="url">
+      <xsl:call-template name="href.target.uri"/>
+    </xsl:attribute>
+  </mapID>
+</xsl:template>
+
 <!-- ==================================================================== -->
 
 <xsl:template name="helpidx">