Fix up page and group F1 lookup IDs in the Atmel Studio help. Fix struct namespacing...

diff --git a/LUFA/StudioIntegration/Blob/LUFA.dll b/LUFA/StudioIntegration/Blob/LUFA.dll
index afa3944..a5dc436 100644 (file)
Binary files a/LUFA/StudioIntegration/Blob/LUFA.dll and b/LUFA/StudioIntegration/Blob/LUFA.dll differ

diff --git a/LUFA/StudioIntegration/HV1/lufa_docbook_transform.xslt b/LUFA/StudioIntegration/HV1/lufa_docbook_transform.xslt
index fc16f61..d543bc0 100644 (file)
--- a/LUFA/StudioIntegration/HV1/lufa_docbook_transform.xslt
+++ b/LUFA/StudioIntegration/HV1/lufa_docbook_transform.xslt
@@ -88,7 +88,7 @@
                        </xsl:attribute>
 
                        <xsl:variable name="name">
                        </xsl:attribute>
 
                        <xsl:variable name="name">

-                               <xsl:text>LUFA.Page.</xsl:text>
+                               <xsl:text>LUFA.</xsl:text>

                                <xsl:value-of select="translate(compoundname, '_', '/')"/>
                        </xsl:variable>
 
                                <xsl:value-of select="translate(compoundname, '_', '/')"/>
                        </xsl:variable>
 


@@ -115,7 +115,7 @@
                        </title>
 
                        <xsl:variable name="name">
                        </title>
 
                        <xsl:variable name="name">

-                               <xsl:text>LUFA.Group.</xsl:text>
+                               <xsl:text>LUFA.</xsl:text>

                                <xsl:value-of select="translate(compoundname, '_', '/')"/>
                        </xsl:variable>
 
                                <xsl:value-of select="translate(compoundname, '_', '/')"/>
                        </xsl:variable>
 


@@ -188,7 +188,16 @@
                                                                                <xsl:if test="starts-with(argsstring, '[')">
                                                                                        <xsl:text>[]</xsl:text>
                                                                                </xsl:if>
                                                                                <xsl:if test="starts-with(argsstring, '[')">
                                                                                        <xsl:text>[]</xsl:text>
                                                                                </xsl:if>

-                                                                               <indexterm id="{$keyword.namespace}.{$name}.{name}"/>
+
+                                                                               <xsl:variable name="struct.element.name">
+                                                                                       <xsl:value-of select="$name"/>
+                                                                                       <xsl:text>.</xsl:text>
+                                                                                       <xsl:value-of select="name"/>
+                                                                               </xsl:variable>
+
+                                                                               <xsl:call-template name="generate.index.id">
+                                                                                       <xsl:with-param name="name" select="$struct.element.name"/>
+                                                                               </xsl:call-template>

                                                                        </entry>
                                                                        <entry>
                                                                                <xsl:apply-templates select="detaileddescription"/>
                                                                        </entry>
                                                                        <entry>
                                                                                <xsl:apply-templates select="detaileddescription"/>


@@ -283,7 +292,10 @@
                                                                <entry>
                                                                        <para id="{@id}" xreflabel="{name}">
                                                                                <xsl:value-of select="name"/>
                                                                <entry>
                                                                        <para id="{@id}" xreflabel="{name}">
                                                                                <xsl:value-of select="name"/>

-                                                                               <indexterm id="{$keyword.namespace}.{name}"/>
+
+                                                                               <xsl:call-template name="generate.index.id">
+                                                                                       <xsl:with-param name="name" select="name"/>
+                                                                               </xsl:call-template>

                                                                        </para>
                                                                </entry>
                                                                <entry>
                                                                        </para>
                                                                </entry>
                                                                <entry>