From 1d5b268fd98d8062f760831450b2ef022440d4c5 Mon Sep 17 00:00:00 2001
From: Dean Camera <dean@fourwalledcubicle.com>
Date: Mon, 22 Apr 2013 16:35:18 +0000
Subject: [PATCH] Fix Atmel Studio integrated help generation and branding.

---
 LUFA/StudioIntegration/Blob/LUFA.dll          | Bin 379904 -> 379904 bytes
 LUFA/StudioIntegration/HV1/transform_base.xsl | 250 ++++++++++++------
 LUFA/StudioIntegration/makefile               |   3 +-
 3 files changed, 170 insertions(+), 83 deletions(-)

diff --git a/LUFA/StudioIntegration/Blob/LUFA.dll b/LUFA/StudioIntegration/Blob/LUFA.dll
index b25c4b59ff7348dd2bfcccbf81c4ce0671113c48..457016242afc21c1723141a18f34bad752171dd1 100644
GIT binary patch
delta 4568
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
T7c<iWqwRvHSl=^FG++k+q^m`<

delta 4385
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

diff --git a/LUFA/StudioIntegration/HV1/transform_base.xsl b/LUFA/StudioIntegration/HV1/transform_base.xsl
index 03b7901b61..8ff34285fb 100644
--- a/LUFA/StudioIntegration/HV1/transform_base.xsl
+++ b/LUFA/StudioIntegration/HV1/transform_base.xsl
@@ -7,7 +7,7 @@
   version="1.0">
 
   <xsl:output
-    method="xml" indent="yes"
+    method="xml" indent="no"
     doctype-public="-//OASIS//DTD DocBook XML V4.5//EN"
     doctype-system="http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"/>
 
@@ -40,11 +40,11 @@
         </section>
       </xsl:if>
 
-      <xsl:if test="count(ancestor::*/sectiondef[memberdef/@kind = 'define' or @kind = 'define']) > 0">
+      <xsl:if test="count(ancestor::*/sectiondef[memberdef/@kind = 'define']) > 0">
         <section>
           <title>Macro Definitions</title>
 
-          <xsl:for-each select="ancestor::*/sectiondef[memberdef/@kind = 'define' or @kind = 'define']">
+          <xsl:for-each select="ancestor::*/sectiondef[memberdef/@kind = 'define']">
             <section>
               <title>
                 <xsl:value-of select="header"/>
@@ -106,7 +106,9 @@
       <xsl:apply-templates select="detaileddescription"/>
 
       <xsl:for-each select="sectiondef[@kind = 'public-attrib']">
-        <informaltable tabstyle="striped">
+        <table tabstyle="striped">
+          <title>Members</title>
+
           <tgroup cols="3">
             <thead>
               <row>
@@ -134,7 +136,7 @@
               </xsl:for-each>
             </tbody>
           </tgroup>
-        </informaltable>
+        </table>
         <para>&#xa0;</para>
       </xsl:for-each>
     </section>
@@ -151,9 +153,34 @@
       </para>
 
       <programlisting language="c">
-        <xsl:value-of select="definition"/>
-        <xsl:text>&#10;&#9;&#9;</xsl:text>
-        <xsl:apply-templates select="argsstring"/>
+        <emphasis role="keyword">
+          <xsl:value-of select="type"/>
+        </emphasis>
+        <xsl:text> </xsl:text>
+        <xsl:value-of select="name"/>
+        <xsl:text>(</xsl:text>
+
+        <xsl:choose>
+          <xsl:when test="argsstring = '(void)'">
+            <emphasis role="keyword">void</emphasis>
+          </xsl:when>
+
+          <xsl:otherwise>
+            <xsl:for-each select="param">
+              <xsl:if test="position() > 1">
+                <xsl:text>,</xsl:text>
+              </xsl:if>
+              <xsl:text>&#10;&#9;&#9;</xsl:text>
+              <emphasis role="keyword">
+                <xsl:value-of select="type"/>
+              </emphasis>
+              <xsl:text> </xsl:text>
+              <xsl:value-of select="declname"/>
+            </xsl:for-each>
+          </xsl:otherwise>
+        </xsl:choose>
+
+        <xsl:text>)</xsl:text>
       </programlisting>
 
       <xsl:apply-templates select="detaileddescription"/>
@@ -168,11 +195,12 @@
 
       <xsl:apply-templates select="detaileddescription"/>
 
-      <informaltable tabstyle="striped">
+      <table tabstyle="striped">
+        <title>Members</title>
         <tgroup cols="2">
           <thead>
             <row>
-              <entry>Enum Value</entry>
+              <entry>Enum value</entry>
               <entry>Description</entry>
             </row>
           </thead>
@@ -191,7 +219,7 @@
             </xsl:for-each>
           </tbody>
         </tgroup>
-      </informaltable>
+      </table>
 
       <para>&#xa0;</para>
     </section>
@@ -202,26 +230,29 @@
       <title> Macro <xsl:value-of select="name"/> </title>
 
       <programlisting language="c">
-        <xsl:text>#define </xsl:text>
-        <xsl:value-of select="name"/>
-        <xsl:if test="count(param) > 0">
-          <xsl:text>(</xsl:text>
-          <xsl:for-each select="param/defname">
-            <xsl:if test="position() > 1">
-              <xsl:text>, </xsl:text>
-            </xsl:if>
-            <xsl:value-of select="."/>
-          </xsl:for-each>
-          <xsl:text>)</xsl:text>
-        </xsl:if>
+        <emphasis role="preprocessor">
+          <xsl:text>#define </xsl:text>
+          <xsl:value-of select="name"/>
+          <xsl:if test="count(param) > 0">
+            <xsl:text>(</xsl:text>
+            <xsl:for-each select="param/defname">
+              <xsl:if test="position() > 1">
+                <xsl:text>, </xsl:text>
+              </xsl:if>
+              <xsl:value-of select="."/>
+            </xsl:for-each>
+            <xsl:text>)</xsl:text>
+          </xsl:if>
+          <xsl:text> </xsl:text>
+
+          <!-- 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:if>
+
+          <xsl:value-of select="initializer"/>
+        </emphasis>
         <xsl:text> </xsl:text>
-
-        <!-- 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:if>
-
-        <xsl:value-of select="initializer"/>
       </programlisting>
 
       <xsl:apply-templates select="detaileddescription"/>
@@ -232,26 +263,37 @@
 
   <xsl:template match="memberdef[@kind = 'variable' or @kind = 'typedef']">
     <section id="{@id}" xreflabel="{name}">
-      <title>
-        <!-- 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:text>Type </xsl:text>
-          </xsl:when>
+      <!-- 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> Type <xsl:value-of select="name"/></title>
 
-          <xsl:otherwise>
-            <xsl:text>Variable </xsl:text>
-          </xsl:otherwise>
-        </xsl:choose>
+          <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:value-of select="name"/>
-      </title>
+        <xsl:otherwise>
+          <title> Variable <xsl:value-of select="name"/></title>
 
-      <programlisting language="c">
-        <xsl:value-of select="definition"/>
-      </programlisting>
+          <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>
 
       <xsl:apply-templates select="detaileddescription"/>
 
@@ -269,7 +311,7 @@
 
   <xsl:template match="simplesect" mode="struct">
     <footnote>
-      <xsl:apply-templates select="para"/>
+      <xsl:apply-templates/>
     </footnote>
   </xsl:template>
 
@@ -324,8 +366,8 @@
               <title>To Do</title>
             </xsl:when>
 
-            <xsl:when test="$note.prefix = 'TIP:'">
-              <xsl:attribute name="role">tip</xsl:attribute>
+            <xsl:when test="$note.prefix = 'TIPS:'">
+              <xsl:attribute name="role">tips</xsl:attribute>
               <title>Tip</title>
             </xsl:when>
 
@@ -370,7 +412,7 @@
         <xsl:value-of select="$note.content"/>
       </xsl:when>
 
-      <xsl:when test="$note.prefix = 'TIP:'">
+      <xsl:when test="$note.prefix = 'TIPS:'">
         <xsl:value-of select="$note.content"/>
       </xsl:when>
 
@@ -402,8 +444,8 @@
       <tgroup cols="3">
         <thead>
           <row>
-            <entry>Data Direction</entry>
-            <entry>Parameter Name</entry>
+            <entry>Data direction</entry>
+            <entry>Parameter name</entry>
             <entry>Description</entry>
           </row>
         </thead>
@@ -424,7 +466,7 @@
       <tgroup cols="2">
         <thead>
           <row>
-            <entry>Return Value</entry>
+            <entry>Return value</entry>
             <entry>Description</entry>
           </row>
         </thead>
@@ -549,6 +591,18 @@
     <xsl:text>&#8482;</xsl:text>
   </xsl:template>
 
+  <xsl:template match="superscript">
+    <superscript>
+      <xsl:value-of select="."/>
+    </superscript>
+  </xsl:template>
+
+  <xsl:template match="subscript">
+    <subscript>
+      <xsl:value-of select="."/>
+    </subscript>
+  </xsl:template>
+
   <xsl:template match="ref">
     <xsl:choose>
       <!-- Don't show links inside program listings -->
@@ -558,9 +612,18 @@
 
       <!-- Show links outside program listings -->
       <xsl:otherwise>
-        <link linkend="{@refid}" xrefstyle="nopage">
-          <xsl:value-of select="text()"/>
-        </link>
+        <xsl:choose>
+          <!-- Use hard links for anchors to make the reference
+               look correct for figure and table references -->
+          <xsl:when test="//anchor[@id = current()/@refid]">
+            <xref linkend="{@refid}" xrefstyle="select: label title"/>
+          </xsl:when>
+          <xsl:otherwise>
+            <link linkend="{@refid}">
+              <xsl:value-of select="text()"/>
+            </link>
+          </xsl:otherwise>
+        </xsl:choose>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
@@ -578,7 +641,9 @@
   <xsl:template match="table">
     <xsl:choose>
       <xsl:when test="caption">
-        <table tabstyle="striped">
+        <!-- Fetch the ID using a preceding doxygen \anchor to be
+             able to reference tables -->
+        <table tabstyle="striped" id="{preceding-sibling::anchor[last()]/@id}">
           <title>
             <xsl:value-of select="caption"/>
           </title>
@@ -640,6 +705,11 @@
 
   <xsl:template match="programlisting">
     <programlisting language="c">
+      <!-- Only allow really long code segments to split across pages -->
+      <xsl:if test="count(codeline) > 30">
+        <xsl:processing-instruction name="dbfo">keep-together="auto"</xsl:processing-instruction>
+      </xsl:if>
+
       <xsl:for-each select="codeline[position() > 1 or highlight]">
         <xsl:apply-templates select="."/>
         <xsl:text>&#10;</xsl:text>
@@ -648,10 +718,7 @@
   </xsl:template>
 
   <xsl:template match="highlight">
-    <emphasis>
-      <xsl:attribute name="role">
-        <xsl:value-of select="@class"/>
-      </xsl:attribute>
+    <emphasis role="{@class}">
       <xsl:apply-templates/>
     </emphasis>
   </xsl:template>
@@ -660,7 +727,7 @@
     <xsl:choose>
       <!-- Need to check if this is the first part of the line - if so we may
            need to strip off any leading <sp/> element indentation -->
-      <xsl:when test="ancestor::highlight = ancestor::codeline/highlight[1]">
+      <xsl:when test="count(../preceding-sibling::highlight) = 0">
         <!-- Doxygen retains a level of indentation in some code fragments - obtain
              the base indentation level by counting the leading <sp/> elements of the
              first code line, and use that to remove the indentation on the rest -->
@@ -678,7 +745,9 @@
   </xsl:template>
 
   <xsl:template match="image">
-    <figure>
+    <!-- Fetch the ID using a preceding doxygen \anchor to be
+         able to reference figures -->
+    <figure id="{preceding-sibling::anchor[last()]/@id}">
       <title>
         <xsl:value-of select="."/>
       </title>
@@ -686,7 +755,10 @@
       <mediaobject>
         <imageobject>
           <imagedata scalefit="1" width="{@width}">
-            <xsl:attribute name="fileref">html/<xsl:value-of select="@name"/></xsl:attribute>
+            <xsl:attribute name="fileref">
+              <xsl:text>html/</xsl:text>
+              <xsl:value-of select="@name"/>
+            </xsl:attribute>
           </imagedata>
         </imageobject>
       </mediaobject>
@@ -694,20 +766,44 @@
   </xsl:template>
 
   <xsl:template match="anchor">
-    <anchor id="{@id}"/>
+    <!-- Remove anchors from the PDF output, as these are used for referencing
+         images and tables. -->
   </xsl:template>
 
   <xsl:template match="dot">
+    <!-- Fetch the ID using a preceding doxygen \anchor to be able to reference
+         figures -->
+    <xsl:variable name="dot.id" select="preceding-sibling::anchor[last()]/@id" />
+
+    <xsl:choose>
+      <!-- If the DOT graph has an ID, use that for the filename -->
+      <xsl:when test="$dot.id">
+        <xsl:call-template name="write.dot.content">
+          <xsl:with-param name="dot.filename" select="$dot.id"/>
+          <xsl:with-param name="dot.id" select="$dot.id"/>
+        </xsl:call-template>
+      </xsl:when>
+
+      <!-- Otherwise use the auto-generated ID for it in the document -->
+      <xsl:otherwise>
+        <xsl:call-template name="write.dot.content"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+  <xsl:template name="write.dot.content">
+    <xsl:param name="dot.filename" select="generate-id(.)"/>
+    <xsl:param name="dot.id" select="''"/>
+
     <!-- We get raw DOT syntax rather than a rendered image: write the DOT code
-         to a new unique file, and make a image reference to a SVG version of
-         that file. The build system should then call dot to render all generated
+         to a external file, and make a image reference to a SVG version of that
+         file. The build system should then call dot to render all generated
          DOT files into their SVG equivalents before rendering the PDF. -->
-    <xsl:variable name="filename" select="generate-id(.)" />
-    <exsl:document href="{$filename}.dot" method="text">
+    <exsl:document href="{$dot.filename}.dot" method="text">
       <xsl:value-of select="." />
     </exsl:document>
 
-    <figure>
+    <figure id="{$dot.id}">
       <title>
         <xsl:value-of select="ancestor::*/title"/>
       </title>
@@ -715,7 +811,7 @@
         <imageobject>
           <imagedata format="SVG">
             <xsl:attribute name="fileref">
-                <xsl:value-of select="$filename" />
+                <xsl:value-of select="$dot.filename" />
                 <xsl:text>.svg</xsl:text>
             </xsl:attribute>
           </imagedata>
@@ -724,14 +820,4 @@
     </figure>
   </xsl:template>
 
-  <xsl:template match="argsstring" name="split.functions.args">
-    <xsl:param name="text" select="."/>
-    <xsl:value-of select="substring-before(concat($text,','),',')"/>
-    <xsl:if test="contains($text,',')">
-      <xsl:text>,&#10;&#09;&#9;</xsl:text>
-      <xsl:call-template name="split.functions.args">
-        <xsl:with-param name="text" select="substring-after($text,',')"/>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:template>
 </xsl:stylesheet>
diff --git a/LUFA/StudioIntegration/makefile b/LUFA/StudioIntegration/makefile
index 32279970fb..af9563aabb 100644
--- a/LUFA/StudioIntegration/makefile
+++ b/LUFA/StudioIntegration/makefile
@@ -44,7 +44,8 @@ VSIX_ASSETS          := $(LUFA_ROOT)/DoxygenPages/Images/LUFA_thumb.png \
 MSHELP_GEN_PARAMS   := --stringparam generate.toc "book toc"            \
                        --stringparam chunk.quietly "1"                  \
                        --stringparam chunk.section.depth "3"            \
-                       --stringparam chunk.first.sections "1"
+                       --stringparam chunk.first.sections "1"           \
+                       --stringparam chapter.autolabel "0"
 
 all: generate_xml check_filenames generate_vsix