Updating to 3.5.1

Author: jason-fox

.travis.yml

@@ -11,7 +11,7 @@ addons:
       - ant
 
 env:
-  - DITA_OT=3.5
+  - DITA_OT=3.5.1
 
 before_install:
   - zip -r fox.jason.passthrough.doxygen.zip . -x *.zip* *.git/* *temp/* *out/*

Customization/xsl/class.xsl

@@ -91,7 +91,7 @@
             </xsl:when>
           </xsl:choose>
         </codeblock>
-        <xsl:value-of select="briefdescription"/>
+        <xsl:call-template name="parse-detailed-description"/>
 
         <xsl:if test="sectiondef[contains(@kind,'-attrib')]/memberdef[@kind='variable' and @prot='public']">
           <!-- Class Field Summary -->
@@ -227,7 +227,7 @@
         <xsl:call-template name="add-signature"/>
       </codeblock>
       <xsl:choose>
-        <xsl:when test="normalize-space(detaileddescription)!=''">
+        <xsl:when test="detaileddescription/node()">
           <xsl:call-template name="parse-detailed-description"/>
         </xsl:when>
         <xsl:otherwise>

Customization/xsl/html-processing.xsl

@@ -32,9 +32,11 @@
   <!--
     Paragraph processing
   -->
-  <xsl:template match="p" mode="html">
+  <xsl:template match="para" mode="html">
     <p class="- topic/p ">
-      <xsl:apply-templates mode="html"/>
+      
+      <xsl:value-of select="."/>
+      <!--xsl:apply-templates mode="html"/-->
     </p>
   </xsl:template>
 

Customization/xsl/method.xsl

@@ -190,7 +190,7 @@
       </xsl:if>
 
 
-
+      <xsl:call-template name="parse-detailed-description"/>
       <xsl:call-template name="parameter-description"/>
       <xsl:call-template name="return-description"/>
     </xsl:variable>

Customization/xsl/package.xsl

@@ -121,8 +121,8 @@
         <xsl:with-param name="href" select="concat('#', dita-ot:name-to-id(compoundname))" />
         <xsl:with-param name="text" select="replace(compoundname, '^.*::','')" />
       </xsl:call-template>
-      <xsl:if test="normalize-space(briefdescription)!=''">
-        <xsl:value-of select="concat (' - ', briefdescription)"/>
+      <xsl:if test="briefdescription">
+        <xsl:value-of select="concat (' - ', briefdescription, detaileddescription/para[1])"/>
       </xsl:if>
     </li>
   </xsl:template>

README.md

@@ -81,19 +81,19 @@ DITA-OT version is therefore 3.3. It is recommended that you upgrade to the late
 The DITA-OT doxygen plug-in is a file reader for the DITA Open Toolkit.
 
 -   Full installation instructions for downloading DITA-OT can be found
-    [here](https://www.dita-ot.org/3.5/topics/installing-client.html).
+    [here](https://www.dita-ot.org/3.5.1/topics/installing-client.html).
 
-    1.  Download the `dita-ot-3.5.zip` package from the project website at
+    1.  Download the `dita-ot-3.5.1.zip` package from the project website at
         [dita-ot.org/download](https://www.dita-ot.org/download)
     2.  Extract the contents of the package to the directory where you want to install DITA-OT.
     3.  **Optional**: Add the absolute path for the `bin` directory to the _PATH_ system variable.
 
     This defines the necessary environment variable to run the `dita` command from the command line.
 
 ```console
-curl -LO https://github.com/dita-ot/dita-ot/releases/download/3.5/dita-ot-3.5.zip
-unzip -q dita-ot-3.5.zip
-rm dita-ot-3.5.zip
+curl -LO https://github.com/dita-ot/dita-ot/releases/download/3.5.1/dita-ot-3.5.1.zip
+unzip -q dita-ot-3.5.1.zip
+rm dita-ot-3.5.1.zip
 ```
 
 ### Installing the Plug-in

xsl/doxygen2dita.xsl

@@ -80,19 +80,7 @@
   </xsl:template>
 
    <xsl:template name="parse-detailed-description">
-    <xsl:variable name="html-fragment">
-      <xsl:try>
-        <xsl:copy>
-          <xsl:copy-of select="parse-xml-fragment(concat('&lt;root&gt;',detaileddescription,'&lt;/root&gt;'))"/>
-        </xsl:copy>
-        <xsl:catch>
-          <xsl:copy>
-            <xsl:copy-of select="parse-xml-fragment(concat('&lt;root&gt;',replace(detaileddescription,'&lt;p&gt;','&#10;&#10;'),'&lt;/root&gt;'))"/>
-          </xsl:copy>
-        </xsl:catch>
-      </xsl:try>
-    </xsl:variable>
-    <xsl:apply-templates select="$html-fragment" mode="html"/>
+    <xsl:apply-templates select="detaileddescription" mode="html"/>
   </xsl:template>
 
   <!--