From 1d5b268fd98d8062f760831450b2ef022440d4c5 Mon Sep 17 00:00:00 2001 From: Dean Camera 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 | 254 ++++++++++++------ LUFA/StudioIntegration/makefile | 3 +- 3 files changed, 172 insertions(+), 85 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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 @@ -40,11 +40,11 @@ - +
Macro Definitions - +
<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 + @@ -134,7 +136,7 @@ - +  
@@ -151,9 +153,34 @@ - - - + + + + + + ( + + + + void + + + + + + , + + + + + + + + + + + + ) @@ -168,11 +195,12 @@ - + + Members - Enum Value + Enum value Description @@ -191,7 +219,7 @@ - +
 
@@ -202,26 +230,29 @@ Macro <xsl:value-of select="name"/> - #define - - - ( - - - , - - - - ) - - + + #define + + + ( + + + , + + + + ) + + - - - \ - + + + \ + - + + + @@ -232,26 +263,37 @@
- - <!-- 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> - - <xsl:otherwise> - <xsl:text>Variable </xsl:text> - </xsl:otherwise> - </xsl:choose> - - <xsl:value-of select="name"/> - - - - - + + + + Type <xsl:value-of select="name"/> + + + + typedef + + + + + + + + + + + Variable <xsl:value-of select="name"/> + + + + + + + + + + @@ -269,7 +311,7 @@ - + @@ -324,8 +366,8 @@ To Do - - tip + + tips Tip @@ -370,7 +412,7 @@ - + @@ -402,8 +444,8 @@ - Data Direction - Parameter Name + Data direction + Parameter name Description @@ -424,7 +466,7 @@ - Return Value + Return value Description @@ -549,6 +591,18 @@ ™ + + + + + + + + + + + + @@ -558,9 +612,18 @@ - - - + + + + + + + + + + + @@ -578,7 +641,9 @@ - + +
<xsl:value-of select="caption"/> @@ -640,6 +705,11 @@ + + + keep-together="auto" + + @@ -648,10 +718,7 @@ - - - - + @@ -660,7 +727,7 @@ - + @@ -678,7 +745,9 @@ -
+ +
<xsl:value-of select="."/> @@ -686,7 +755,10 @@ - html/ + + html/ + + @@ -694,20 +766,44 @@ - + + + + + + + + + + + + + + + + + + + + + + + + - - + -
+
<xsl:value-of select="ancestor::*/title"/> @@ -715,7 +811,7 @@ - + .svg @@ -724,14 +820,4 @@
- - - - - , - - - - - 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