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-6BUJd6xbMe7#J8Hd}d{k
znLJTeXL2OtZpIUnMVYMYyQ&^7%{S}0;q-Fj&BSR9k3MeLCbs?C)I$YJV=mwCsZY>6
z&pu1!mOzhs<O`Kw9FJF8ed(+ZIMMt2%#4XYZ+J0@Xeq?}@V;lX<8|#{u4SA4l{Vdy
zeQ46*%O%+@W4xp9QssIs_lfzR_Bh=zT=w#7^ryE%rhP?cMcZV}d`ybov)y4_wfO>5
z4I8f>J3~Q!I0FNhmQ#`N<Va3K#@NZ-oK}qUn~!m}ALC?fKgP+_evFg3{TL_9_G6r^
z)8<RA;9y`-4h?3|P-S2cU|?WSb`SM*VPIge*j~DlRZ^MJe0u*GR-Nrf&#*Q#3NbLq
zT7^GceYx6oZcETZ*RW~Vw?~{~ox-jYKYMy0D5#hi7#Ok{7#RM1W@Y$um6ahV*d;hs
p_LHnnw2J?_c<ECo_f&{am$=3n!8l=h;Wbu6MuzRPud$}G0|3VOlCJ;&

delta 390
zcmZqJBi^t_d_o7)vZ)ih{FqohCf-uxEBM07;LQL6YzzX-6BUJd6xbMe7#J8{d}d{k
znLJTeXL2OtZpI6fMVYMYCETUX-rOJXVqfTwd7N+N_3S#`c<7V>%aO2on=AG@{4mjO
zw9IbabgbZr*7s>YQi|5jP(3`0F*BsDJn^det52mXe`T-qSN_MktJ1Y+qCQV@oLc7b
zZ#L5{9i-ef+IhD2#qRN`*bwq~TYmSHx<hO{iZ`zXxqNzVa;b4?*S=2aX^o6KHeX<>
zVdJ%6XDG-IXJFvcaw?LY9LZ_Om_E6i(~5Cr^D)l$W1Nib$2ghVk8v`$ALC@%evFfK
z+I-0k91IM~p}`CWstgPQ3=9m)?xCJ83=9ko+e=rnN-8rtPVYa%s>2?@kjRkEkh*=x
z8P+yNfuCv9xg74?ckY??ok{DfLFD#;bF5R?b(T$?9ta9BCI$wEYz77fmM^RfEZ0~W
sf`VOw^EsFFgh_ny-kqxaV)FMBd#4LrV~t>(F+KAdtKs%V*I47&0YsvaSpWb4

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>