Tweak HV1 help styling and image elements.

diff --git a/LUFA/StudioIntegration/HV1/lufa_docbook_transform.xsl b/LUFA/StudioIntegration/HV1/lufa_docbook_transform.xsl
index c51944b..4247b47 100644 (file)
--- a/LUFA/StudioIntegration/HV1/lufa_docbook_transform.xsl
+++ b/LUFA/StudioIntegration/HV1/lufa_docbook_transform.xsl
@@ -53,7 +53,7 @@
                        </xsl:call-template>
                </xsl:variable>
 
                        </xsl:call-template>
                </xsl:variable>
 

-               <book name="{$book.id}">
+               <book id="{$book.id}">

                        <title>
                                <xsl:value-of select="$book.title"/>
                        </title>
                        <title>
                                <xsl:value-of select="$book.title"/>
                        </title>


@@ -747,22 +747,16 @@
        </xsl:template>
 
        <xsl:template match="image">
        </xsl:template>
 
        <xsl:template match="image">

-               <figure>
-                       <title>
-                               <xsl:value-of select="."/>
-                       </title>
-
-                       <mediaobject>
-                               <imageobject>
-                                       <imagedata>
-                                               <xsl:attribute name="fileref">
-                                                       <xsl:text>images/</xsl:text>
-                                                       <xsl:value-of select="@name"/>
-                                               </xsl:attribute>
-                                       </imagedata>
-                               </imageobject>
-                       </mediaobject>
-               </figure>
+               <mediaobject>
+                       <imageobject>
+                               <imagedata>
+                                       <xsl:attribute name="fileref">
+                                               <xsl:text>images/</xsl:text>
+                                               <xsl:value-of select="@name"/>
+                                       </xsl:attribute>
+                               </imagedata>
+                       </imageobject>
+               </mediaobject>

        </xsl:template>
 
        <xsl:template match="detaileddescription">
        </xsl:template>
 
        <xsl:template match="detaileddescription">

diff --git a/LUFA/StudioIntegration/HV1/lufa_studio_help_styling.css b/LUFA/StudioIntegration/HV1/lufa_studio_help_styling.css
index 892c0ef..6a4aca0 100644 (file)
--- a/LUFA/StudioIntegration/HV1/lufa_studio_help_styling.css
+++ b/LUFA/StudioIntegration/HV1/lufa_studio_help_styling.css
@@ -20,7 +20,7 @@
        font-family: "Consolas", "Courier New", sans-serif;\r
  }\r
 \r
        font-family: "Consolas", "Courier New", sans-serif;\r
  }\r
 \r

-.note {\r
+.note, .warning, .tip {\r

        display: block;\r
        margin-left: 15px;\r
        padding-left: 10px;\r
        display: block;\r
        margin-left: 15px;\r
        padding-left: 10px;\r

diff --git a/LUFA/StudioIntegration/makefile b/LUFA/StudioIntegration/makefile
index bf89bea..c86d2c5 100644 (file)
--- a/LUFA/StudioIntegration/makefile
+++ b/LUFA/StudioIntegration/makefile
@@ -86,6 +86,8 @@ $(MSHELP_OUTPUT_XML): $(DOXYGEN_COMBINED_XML)
        @echo Converting Doxygen XML to Docbook...
        @-mkdir mshelp 2> /dev/null
        @xsltproc HV1/lufa_docbook_transform.xsl $(DOXYGEN_COMBINED_XML) > mshelp/lufa_docbook.xml
        @echo Converting Doxygen XML to Docbook...
        @-mkdir mshelp 2> /dev/null
        @xsltproc HV1/lufa_docbook_transform.xsl $(DOXYGEN_COMBINED_XML) > mshelp/lufa_docbook.xml

+
+       @echo Converting Docbook to Microsoft Help 1.0...

        @cd mshelp && xsltproc $(MSHELP_GEN_PARAMS) ../Docbook/mshelp/docbook.xsl lufa_docbook.xml
 
        @echo Copying help assets...
        @cd mshelp && xsltproc $(MSHELP_GEN_PARAMS) ../Docbook/mshelp/docbook.xsl lufa_docbook.xml
 
        @echo Copying help assets...