X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/7af4d949e2bc691297e6b4a3b437819896070557..987cd32f6502f074dcb565d67d0ee39149e8a4a8:/LUFA/StudioIntegration/HV1/lufa_docbook_transform.xslt?ds=sidebyside

diff --git a/LUFA/StudioIntegration/HV1/lufa_docbook_transform.xslt b/LUFA/StudioIntegration/HV1/lufa_docbook_transform.xslt
index d543bc0ae..2ebda6d5d 100644
--- a/LUFA/StudioIntegration/HV1/lufa_docbook_transform.xslt
+++ b/LUFA/StudioIntegration/HV1/lufa_docbook_transform.xslt
@@ -89,7 +89,7 @@
 
 			<xsl:variable name="name">
 				<xsl:text>LUFA.</xsl:text>
-				<xsl:value-of select="translate(compoundname, '_', '/')"/>
+				<xsl:value-of select="translate(compoundname, '_', '.')"/>
 			</xsl:variable>
 
 			<xsl:call-template name="generate.index.id">
@@ -102,6 +102,21 @@
 
 			<xsl:apply-templates select="detaileddescription"/>
 
+			<xsl:if test="not(innerpage) and count(detaileddescription//sect1)">
+				<para>
+					<emphasis role="bold">Subsections:</emphasis>
+					<itemizedlist>
+						<xsl:for-each select="detaileddescription//sect1">
+							<listitem>
+								<link linkend="{@id}">
+									<xsl:value-of select="title"/>
+								</link>
+							</listitem>
+						</xsl:for-each>
+					</itemizedlist>
+				</para>
+			</xsl:if>
+
 			<xsl:for-each select="innerpage">
 				<xsl:apply-templates select="ancestor::*/compounddef[@kind = 'page' and @id = current()/@refid]"/>
 			</xsl:for-each>
@@ -116,7 +131,7 @@
 
 			<xsl:variable name="name">
 				<xsl:text>LUFA.</xsl:text>
-				<xsl:value-of select="translate(compoundname, '_', '/')"/>
+				<xsl:value-of select="translate(compoundname, '_', '.')"/>
 			</xsl:variable>
 
 			<xsl:call-template name="generate.index.id">
@@ -125,6 +140,21 @@
 
 			<xsl:apply-templates select="detaileddescription"/>
 
+			<xsl:if test="count(innergroup)">
+				<para>
+					<emphasis role="bold">Subgroups:</emphasis>
+					<itemizedlist>
+						<xsl:for-each select="innergroup">
+							<listitem>
+								<link linkend="{@refid}">
+									<xsl:value-of select="text()"/>
+								</link>
+							</listitem>
+						</xsl:for-each>
+					</itemizedlist>
+				</para>
+			</xsl:if>
+
 			<xsl:apply-templates select="sectiondef"/>
 
 			<xsl:for-each select="innerclass">
@@ -162,14 +192,12 @@
 			<xsl:apply-templates select="detaileddescription"/>
 
 			<xsl:for-each select="sectiondef[@kind = 'public-attrib']">
-				<table tabstyle="striped">
+				<table>
 					<title>
 						<xsl:value-of select="$name"/>
 					</title>
+
 					<tgroup cols="3">
-						<colspec colnum="1" colname="start.col"/>
-						<colspec colnum="3" colname="stop.col"/>
-						<spanspec spanname="full" namest="start.col" nameend="stop.col"/>
 						<thead>
 							<row>
 								<entry>Type</entry>
@@ -177,6 +205,7 @@
 								<entry>Description</entry>
 							</row>
 						</thead>
+
 						<tbody>
 							<xsl:for-each select="memberdef">
 								<row id="{@id}" xreflabel="{name}">
@@ -277,7 +306,7 @@
 
 			<xsl:apply-templates select="detaileddescription"/>
 
-			<table tabstyle="striped">
+			<table>
 				<title>Members</title>
 				<tgroup cols="2">
 					<thead>
@@ -286,6 +315,7 @@
 							<entry>Description</entry>
 						</row>
 					</thead>
+
 					<tbody>
 						<xsl:for-each select="enumvalue">
 							<row>
@@ -350,59 +380,58 @@
 		</section>
 	</xsl:template>
 
-	<xsl:template match="memberdef[@kind = 'variable' or @kind = 'typedef']">
+	<xsl:template match="memberdef[@kind = 'typedef']">
 		<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')">
-					<title>
-						<xsl:text>Type </xsl:text>
-						<xsl:value-of select="name"/>
-					</title>
+			<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:call-template>
-
-					<programlisting language="c">
-						<emphasis role="keyword">
-							<xsl:text>typedef </xsl:text>
-							<xsl:value-of select="type"/>
-						</emphasis>
-						<xsl:text> </xsl:text>
-						<xsl:value-of select="name"/>
-						<xsl:text> </xsl:text>
-						<xsl:value-of select="argsstring"/>
-					</programlisting>
-				</xsl:when>
-
-				<xsl:otherwise>
-					<title>
-						<xsl:text>Variable </xsl:text>
-						<xsl:value-of select="name"/>
-					</title>
+			<xsl:call-template name="generate.index.id">
+				<xsl:with-param name="name" select="name"/>
+			</xsl:call-template>
 
-					<xsl:call-template name="generate.index.id">
-						<xsl:with-param name="name" select="name"/>
-					</xsl:call-template>
+			<programlisting language="c">
+				<emphasis role="keyword">
+					<xsl:text>typedef </xsl:text>
+					<xsl:value-of select="type"/>
+				</emphasis>
+				<xsl:text> </xsl:text>
+				<xsl:value-of select="name"/>
+				<xsl:text> </xsl:text>
+				<xsl:value-of select="argsstring"/>
+			</programlisting>
+
+			<xsl:apply-templates select="detaileddescription"/>
+		</section>
+	</xsl:template>
+
+
+	<xsl:template match="memberdef[@kind = 'variable']">
+		<section id="{@id}" xreflabel="{name}">
+			<title>
+				<xsl:text>Variable </xsl:text>
+				<xsl:value-of select="name"/>
+			</title>
+
+			<xsl:call-template name="generate.index.id">
+				<xsl:with-param name="name" select="name"/>
+			</xsl:call-template>
 
-					<programlisting language="c">
-						<emphasis role="keyword">
-							<xsl:value-of select="type"/>
-						</emphasis>
-						<xsl:text> </xsl:text>
-						<xsl:value-of select="name"/>
-					</programlisting>
-				</xsl:otherwise>
-			</xsl:choose>
+			<programlisting language="c">
+				<emphasis role="keyword">
+					<xsl:value-of select="type"/>
+				</emphasis>
+				<xsl:text> </xsl:text>
+				<xsl:value-of select="name"/>
+			</programlisting>
 
 			<xsl:apply-templates select="detaileddescription"/>
 		</section>
 	</xsl:template>
 
 	<xsl:template match="linebreak | simplesectsep">
+		<!-- MUST be on two separate lines, as this is a *literal* newline -->
 		<literallayout>
 		</literallayout>
 	</xsl:template>
@@ -477,7 +506,7 @@
 	</xsl:template>
 
 	<xsl:template match="parameterlist[@kind = 'param']">
-		<table tabstyle="striped">
+		<table>
 			<title>Parameters</title>
 			<tgroup cols="3">
 				<thead>
@@ -499,7 +528,7 @@
 	</xsl:template>
 
 	<xsl:template match="parameterlist[@kind = 'retval']">
-		<table tabstyle="striped">
+		<table>
 			<title>Return Values</title>
 			<tgroup cols="2">
 				<thead>
@@ -576,6 +605,8 @@
 	</xsl:template>
 
 	<xsl:template match="mdash | ndash">
+		<!-- Doxygen bug; double dashed are replaced with single HTML dash
+		     entities, even in verbatim-like <tt> sections -->
 		<xsl:text>--</xsl:text>
 	</xsl:template>
 
@@ -640,43 +671,42 @@
 		</entry>
 	</xsl:template>
 
-	<xsl:template match="table">
-		<xsl:choose>
-			<xsl:when test="caption">
-				<table tabstyle="striped">
-					<title>
-						<xsl:value-of select="caption"/>
-					</title>
+	<xsl:template match="table[caption]">
+		<table>
+			<title>
+				<xsl:value-of select="caption"/>
+			</title>
 
-					<xsl:call-template name="write.table.content"/>
-				</table>
-			</xsl:when>
+			<tgroup cols="{@cols}">
+				<thead>
+					<xsl:apply-templates select="row[entry/@thead = 'yes']"/>
+				</thead>
 
-			<xsl:otherwise>
-				<informaltable tabstyle="striped">
-					<xsl:call-template name="write.table.content"/>
-				</informaltable>
-			</xsl:otherwise>
-		</xsl:choose>
+				<tbody>
+					<xsl:apply-templates select="row[entry/@thead != 'yes']"/>
+				</tbody>
+			</tgroup>
+		</table>
 	</xsl:template>
 
-	<xsl:template name="write.table.content">
-		<tgroup cols="{@cols}">
-			<thead>
-				<xsl:for-each select="row[1]">
-					<row>
-						<xsl:apply-templates select="entry"/>
-					</row>
-				</xsl:for-each>
-			</thead>
-			<tbody>
-				<xsl:for-each select="row[position() != 1]">
-					<row>
-						<xsl:apply-templates select="entry"/>
-					</row>
-				</xsl:for-each>
-			</tbody>
-		</tgroup>
+	<xsl:template match="table[not(caption)]">
+		<informaltable>
+			<tgroup cols="{@cols}">
+				<thead>
+					<xsl:apply-templates select="row[entry/@thead = 'yes']"/>
+				</thead>
+
+				<tbody>
+					<xsl:apply-templates select="row[entry/@thead != 'yes']"/>
+				</tbody>
+			</tgroup>
+		</informaltable>
+	</xsl:template>
+
+	<xsl:template match="row">
+		<row>
+			<xsl:apply-templates/>
+		</row>
 	</xsl:template>
 
 	<xsl:template match="itemizedlist">
@@ -712,6 +742,18 @@
 		</emphasis>
 	</xsl:template>
 
+	<xsl:template match="highlight[1]/text()">
+		<xsl:choose>
+			<xsl:when test="substring(., 1, 1) = '*'">
+				<xsl:value-of select="substring(., 2)"/>
+			</xsl:when>
+
+			<xsl:otherwise>
+				<xsl:value-of select="."/>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
+
 	<xsl:template match="sp[ancestor::codeline]">
 		<xsl:text> </xsl:text>
 	</xsl:template>
@@ -760,7 +802,7 @@
 	<xsl:template match="htmlonly"/>
 
 	<xsl:template match="*">
-		<xsl:message>NO XSL TEMPLATE MATCH: <xsl:value-of select="name()"/></xsl:message>
+		<xsl:message>NO XSL TEMPLATE MATCH: <xsl:value-of select="local-name()"/></xsl:message>
 	</xsl:template>
 
 </xsl:stylesheet>