X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/1840e1bbae56555bbc271056b47bbd602a956a83..3908d2e608c958bd6627afae4aab9362f84b6b90:/LUFA/StudioIntegration/HV1/lufa_docbook_transform.xslt

diff --git a/LUFA/StudioIntegration/HV1/lufa_docbook_transform.xslt b/LUFA/StudioIntegration/HV1/lufa_docbook_transform.xslt
index 4247b475d..82ad935c2 100644
--- a/LUFA/StudioIntegration/HV1/lufa_docbook_transform.xslt
+++ b/LUFA/StudioIntegration/HV1/lufa_docbook_transform.xslt
@@ -47,6 +47,7 @@
 		<xsl:variable name="book.title">
 			<xsl:call-template name="generate.book.title"/>
 		</xsl:variable>
+
 		<xsl:variable name="book.id">
 			<xsl:call-template name="generate.book.id">
 				<xsl:with-param name="book.title" select="$book.title"/>
@@ -60,11 +61,12 @@
 
 			<!-- Add index chapter -->
 			<xsl:call-template name="generate.top.level.page">
-				<xsl:with-param name="top.level.page" select="compounddef[@kind = 'page' and contains(@id, 'index')]"/>
+				<xsl:with-param name="top.level.page" select="compounddef[@kind = 'page' and @id = 'indexpage']"/>
+				<xsl:with-param name="top.level.page.title" select="'Library Information'"/>
 			</xsl:call-template>
 
 			<!-- Add free-floating chapters -->
-			<xsl:for-each select="compounddef[@kind = 'page' and not(contains(@id, 'index'))]">
+			<xsl:for-each select="compounddef[@kind = 'page' and not(@id = 'indexpage')]">
 				<xsl:if test="not(//innerpage[@refid = current()/@id])">
 					<xsl:call-template name="generate.top.level.page">
 						<xsl:with-param name="top.level.page" select="current()"/>
@@ -86,10 +88,11 @@
 
 	<xsl:template name="generate.top.level.page">
 		<xsl:param name="top.level.page"/>
+		<xsl:param name="top.level.page.title" select="$top.level.page/title"/>
 
 		<chapter id="{$top.level.page/@id}">
 			<title>
-				<xsl:value-of select="$top.level.page/title"/>
+				<xsl:value-of select="$top.level.page.title"/>
 			</title>
 
 			<xsl:apply-templates select="$top.level.page/detaileddescription"/>
@@ -124,16 +127,13 @@
 				<xsl:value-of select="title"/>
 			</title>
 
-			<xsl:variable name="book.title">
-				<xsl:call-template name="generate.book.title"/>
-			</xsl:variable>
-
 			<xsl:variable name="name">
 				<xsl:choose>
 					<xsl:when test="contains(compoundname, '_')">
 						<xsl:value-of select="translate(compoundname, '_', '/')"/>
 						<xsl:text>.h</xsl:text>
 					</xsl:when>
+
 					<xsl:otherwise>
 						<xsl:value-of select="compoundname"/>
 						<xsl:text>.h</xsl:text>
@@ -147,6 +147,7 @@
 						<xsl:value-of select="translate(compoundname, '_', '.')"/>
 						<xsl:text>.h</xsl:text>
 					</xsl:when>
+
 					<xsl:otherwise>
 						<xsl:value-of select="compoundname"/>
 						<xsl:text>.h</xsl:text>
@@ -194,10 +195,12 @@
 					<xsl:when test="@kind = 'struct'">
 						<xsl:text>Struct </xsl:text>
 					</xsl:when>
+
 					<xsl:when test="@kind = 'union'">
 						<xsl:text>Union </xsl:text>
 					</xsl:when>
 				</xsl:choose>
+
 				<xsl:value-of select="$name"/>
 			</title>
 
@@ -207,7 +210,7 @@
 
 			<xsl:apply-templates select="detaileddescription"/>
 
-			<xsl:for-each select="sectiondef[@kind='public-attrib']">
+			<xsl:for-each select="sectiondef[@kind = 'public-attrib']">
 				<table tabstyle="striped">
 					<title>
 						<xsl:value-of select="$name"/>
@@ -249,17 +252,15 @@
 	</xsl:template>
 
 	<xsl:template match="memberdef[@kind = 'function']">
-		<xsl:variable name="name" select="name"/>
-
 		<section id="{@id}" xreflabel="{name}">
 			<title>
 				<xsl:text>Function </xsl:text>
-				<xsl:value-of select="$name"/>
+				<xsl:value-of select="name"/>
 				<xsl:text>()</xsl:text>
 			</title>
 
 			<xsl:call-template name="generate.index.id">
-				<xsl:with-param name="name" select="$name"/>
+				<xsl:with-param name="name" select="name"/>
 			</xsl:call-template>
 
 			<para>
@@ -286,7 +287,7 @@
 							<xsl:if test="position() > 1">
 								<xsl:text>,</xsl:text>
 							</xsl:if>
-							<xsl:text>&#10;&#9;&#9;</xsl:text>
+							<xsl:text>&#10;&#9;</xsl:text>
 							<emphasis role="keyword">
 								<xsl:value-of select="type"/>
 							</emphasis>
@@ -348,8 +349,6 @@
 	</xsl:template>
 
 	<xsl:template match="memberdef[@kind = 'define']">
-		<xsl:variable name="name" select="name"/>
-
 		<section id="{@id}" xreflabel="{name}">
 			<title>
 				<xsl:text>Macro </xsl:text>
@@ -357,7 +356,7 @@
 			</title>
 
 			<xsl:call-template name="generate.index.id">
-				<xsl:with-param name="name" select="$name"/>
+				<xsl:with-param name="name" select="name"/>
 			</xsl:call-template>
 
 			<programlisting language="c">
@@ -378,7 +377,7 @@
 
 					<!-- Split long macro definitions across multiple lines -->
 					<xsl:if test="(string-length(initializer) > 50) or (count(param) > 0)">
-						<xsl:text>\&#10;&#09;&#9;</xsl:text>
+						<xsl:text>\&#10;&#9;</xsl:text>
 					</xsl:if>
 
 					<xsl:value-of select="initializer"/>
@@ -391,21 +390,19 @@
 	</xsl:template>
 
 	<xsl:template match="memberdef[@kind = 'variable' or @kind = 'typedef']">
-		<xsl:variable name="name" select="name"/>
-
 		<section id="{@id}" xreflabel="{name}">
 			<!-- Doxygen gets confused and thinks function pointer type definitions
 				 are variables, so we need to map them to this common section and
 				 check the definition to see which of the two it is. -->
 			<xsl:choose>
-				<xsl:when test="contains(definition,'typedef')">
+				<xsl:when test="contains(definition, 'typedef')">
 					<title>
 						<xsl:text>Type </xsl:text>
 						<xsl:value-of select="name"/>
 					</title>
 
 					<xsl:call-template name="generate.index.id">
-						<xsl:with-param name="name" select="$name"/>
+						<xsl:with-param name="name" select="name"/>
 					</xsl:call-template>
 
 					<programlisting language="c">
@@ -427,7 +424,7 @@
 					</title>
 
 					<xsl:call-template name="generate.index.id">
-						<xsl:with-param name="name" select="$name"/>
+						<xsl:with-param name="name" select="name"/>
 					</xsl:call-template>
 
 					<programlisting language="c">
@@ -471,11 +468,13 @@
 
 	<xsl:template match="simplesect">
 		<xsl:choose>
-			<xsl:when test="@kind = 'warning'">
-				<warning>
-					<title>Warning</title>
+			<xsl:when test="@kind = 'par'">
+				<note>
+					<title>
+						<xsl:value-of select="title"/>
+					</title>
 					<xsl:apply-templates select="para"/>
-				</warning>
+				</note>
 			</xsl:when>
 
 			<xsl:when test="@kind = 'return'">
@@ -485,18 +484,16 @@
 				</note>
 			</xsl:when>
 
-			<xsl:when test="@kind = 'pre'">
-				<note>
-					<title>Precondition</title>
+			<xsl:when test="@kind = 'warning'">
+				<warning>
+					<title>Warning</title>
 					<xsl:apply-templates select="para"/>
-				</note>
+				</warning>
 			</xsl:when>
 
-			<xsl:when test="@kind = 'par'">
+			<xsl:when test="@kind = 'pre'">
 				<note>
-					<title>
-						<xsl:value-of select="title"/>
-					</title>
+					<title>Precondition</title>
 					<xsl:apply-templates select="para"/>
 				</note>
 			</xsl:when>
@@ -569,6 +566,7 @@
 						<xsl:when test="not(descendant::parametername/@direction)">
 							<emphasis role="italic">?</emphasis>
 						</xsl:when>
+
 						<xsl:otherwise>
 							<emphasis role="bold">
 								[<xsl:value-of select="descendant::parametername/@direction"/>]
@@ -655,6 +653,11 @@
 				<xsl:value-of select="."/>
 			</xsl:when>
 
+			<!-- Don't show links to file compound definitions, as they are discarded -->
+			<xsl:when test="ancestor::*/compounddef[@kind = 'file' and @id = current()/@refid]">
+				<xsl:value-of select="."/>
+			</xsl:when>
+
 			<!-- Show links outside program listings -->
 			<xsl:otherwise>
 				<link linkend="{@refid}">
@@ -674,6 +677,7 @@
 					<xsl:call-template name="write.table.content"/>
 				</table>
 			</xsl:when>
+
 			<xsl:otherwise>
 				<informaltable tabstyle="striped">
 					<xsl:call-template name="write.table.content"/>
@@ -711,13 +715,13 @@
 
 	<xsl:template match="itemizedlist">
 		<itemizedlist>
-			<xsl:apply-templates select="listitem"/>
+			<xsl:apply-templates/>
 		</itemizedlist>
 	</xsl:template>
 
 	<xsl:template match="orderedlist">
 		<orderedlist>
-			<xsl:apply-templates select="listitem"/>
+			<xsl:apply-templates/>
 		</orderedlist>
 	</xsl:template>