From 7af4d949e2bc691297e6b4a3b437819896070557 Mon Sep 17 00:00:00 2001
From: Dean Camera <dean@fourwalledcubicle.com>
Date: Sat, 18 May 2013 17:26:40 +0200
Subject: [PATCH] Fix up page and group F1 lookup IDs in the Atmel Studio help.
 Fix struct namespacing in the help.

---
 LUFA/StudioIntegration/Blob/LUFA.dll          | Bin 384512 -> 384512 bytes
 .../HV1/lufa_docbook_transform.xslt           |  20 ++++++++++++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/LUFA/StudioIntegration/Blob/LUFA.dll b/LUFA/StudioIntegration/Blob/LUFA.dll
index afa394475bf5ad9848cd1a32304c30c733c6986c..a5dc43692cc11b78d94fc770f269308d818da90e 100644
GIT binary patch
delta 386
zcmZqJBi^t_d_o6P{OpNceoP9RCf-ux%lN{|5X=AqYzzX-6BUJd6xbMefZPY4Ss7#|
zPn6Y}9Lczw@x)|NChPjHsz*!n&3bM)z1(;+aazNpj~lj$ZT~j)P{Goe%lCWg6Ex4W
z&l0&M(4!vtLgg37<CRulI_m>Y^!`3GW8%*nUQ8ld3Nb&t?-}iQUHg}7*`|M`O}Atp
znsoSbNp{N^@94W!xt_~?V*aN+PB#pfz5E*e>8+4yU(s37Hd!+tlcM)*cNkY~zQ9z&
z#;eE9P>>(az`&*DR3tn(lGBhec5*kT732KoW1Q{BI2nPM35c12m}UDhPS$DjC0B4T
zFerxxGiazXFbDvBr|cf;=>nuJwwJDCl~iUlpWc6lRcHIrGpx;wLJSPDR^bm<U#@nY
z+Y<E9HEi1T?Gfi#r?Bh9&z>F#)WpC9#Mwan2N*_wuCg)&1-k^N%6^jdiB|Dn7cYJ4
d<em!g=@QpiBN!)4FTBQT$jGpL_BGa2b^ylslCJ;&

delta 390
zcmZqJBi^t_d_o7)vZ)ih{FqohCf-uxEBM07;LQL6YzzX-6BUJd6xbMefZP|KSs7#|
zPn6Y}9Lczw@xo+LChK|$cd4^C_XoV#7y4r!=bL#wyG}PAIwinzBy8U1ioFg$Otc#<
zvzs>^D>$O{ecF$dqO~(r56@!E45=$mylVdHQ|ZcI*(?2(|FQ0>bnTg_&yyUdmU;Y}
z&2&o#DR+%_o~?bcdweQ3ggoAs-#w-75F3x;&1*p}pPrjsYFyg2uTy$jBjb+E7no|;
zcrDl&3i87l7`U{Yiex88avCzGPwwWlVqDpLjI;e1CnFFu0WmWWvur=c$vSPm<OU7~
z2IbIT1_M<F1_7Y&l-)x;U4XR1_R^KClFE#Z)BDe`>aYheBr>Ekq;B7FhP91R;Ah%&
zE{8k!oqMKzXVUs=5V<|z9P1Qzon=#}2LiP+FadEk5VHV-kmVXHLr}0wa6adfo-m0o
h-n&zkUrhdfV()Z;YpfBBGp1)=V>R5q=o)JrI{-wYky!u$

diff --git a/LUFA/StudioIntegration/HV1/lufa_docbook_transform.xslt b/LUFA/StudioIntegration/HV1/lufa_docbook_transform.xslt
index fc16f61ee4..d543bc0ae6 100644
--- 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:text>LUFA.Page.</xsl:text>
+				<xsl:text>LUFA.</xsl:text>
 				<xsl:value-of select="translate(compoundname, '_', '/')"/>
 			</xsl:variable>
 
@@ -115,7 +115,7 @@
 			</title>
 
 			<xsl:variable name="name">
-				<xsl:text>LUFA.Group.</xsl:text>
+				<xsl:text>LUFA.</xsl:text>
 				<xsl:value-of select="translate(compoundname, '_', '/')"/>
 			</xsl:variable>
 
@@ -188,7 +188,16 @@
 										<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"/>
@@ -283,7 +292,10 @@
 								<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>