Merge pull request #90 from AntennaHouse/issue-2019-04-10

Fix #89

Author: ToshihikoMakita

com.antennahouse.pdf5.ml/build_transform_template.xml

@@ -177,6 +177,7 @@
             <dita:extension id="com.antennahouse.pdf5.ml.param" behavior="org.dita.dost.platform.InsertAction"/>
             <sysproperty key="com.innodata.i18n.home" value="${i18n.home}"/>
             <sysproperty key="use.i18n.index.lib" value="${use.i18n.index.lib}"/>
+            <sysproperty key="ot.version" value="${otversion}"/>
         </xslt>
     </target>
 
@@ -237,6 +238,7 @@
             <dita:extension id="com.antennahouse.pdf5.ml.saxon.param" behavior="org.dita.dost.platform.InsertAction"/>
             <sysproperty key="com.innodata.i18n.home" value="${i18n.home}"/>
             <sysproperty key="use.i18n.index.lib" value="${use.i18n.index.lib}"/>
+            <sysproperty key="ot.version" value="${otversion}"/>
         </java>
     </target>
 

com.antennahouse.pdf5.ml/xsl/dita2fo_glossaryrelatedelements.xsl

@@ -52,7 +52,11 @@ E-mail : [email protected]
             <xsl:number select="."
                 level="any"
                 count="*[contains(@class,' abbrev-d/abbreviated-form ')][string(@href) eq $href]"
-                from="$root"/>
+                from="/*"  use-when="starts-with(system-property('ot.version'),'2') or starts-with(system-property('ot.version'),'1')"/>
+            <xsl:number select="."
+                level="any"
+                count="*[contains(@class,' abbrev-d/abbreviated-form ')][string(@href) eq $href]"
+                from="$root"  use-when="not(starts-with(system-property('ot.version'),'2') or starts-with(system-property('ot.version'),'1'))"/>
         </xsl:variable>
         <xsl:variable name="topicElement" as="element()?" select="ahf:getTopicFromHref(substring-after($href, '#'))"/>
 

com.antennahouse.pdf5.ml/xsl/dita2fo_main.xsl

@@ -56,7 +56,6 @@ E-mail : [email protected]
         <!--xsl:call-template name="dumpFootnoteMap"/-->
         <!--xsl:call-template name="outputEquationCountMap"/-->
     <xsl:template match="/">
-        <xsl:call-template name="dumpFigureMap"/>
         <xsl:if test="$pDebugStyle">
             <xsl:call-template name="stlyeDump"/>
         </xsl:if>

com.antennahouse.pdf5.ml/xsl/dita2fo_style_get.xsl

@@ -398,6 +398,7 @@
          parameter: prmAttr: attribute()?
          notes:     See font-size definition on XSL1.1
                     https://www.w3.org/TR/xsl11/#font-size
+                    Support DITA-OT 2.x and 3.x both.
       -->
     <xsl:function name="ahf:isRelativeFontSizeAttr" as="xs:boolean">
         <xsl:param name="prmAttr" as="attribute()?"/>
@@ -409,7 +410,10 @@
             <xsl:when test="name($prmAttr) ne 'font-size'">
                 <xsl:sequence select="false()"/>
             </xsl:when>
-            <xsl:when test="matches($attVal,'larger|smaller|\d+(?:\.\d+)?em|\d+(?:\.\d+)?%')">
+            <xsl:when test="matches($attVal,'larger|smaller|\d+(\.\d+)?em|\d+(\.\d+)?%')" use-when="starts-with(system-property('ot.version'),'2') or starts-with(system-property('ot.version'),'1')">
+                <xsl:sequence select="true()"/>
+            </xsl:when>
+            <xsl:when test="matches($attVal,'larger|smaller|\d+(?:\.\d+)?em|\d+(?:\.\d+)?%')" use-when="not(starts-with(system-property('ot.version'),'2') or starts-with(system-property('ot.version'),'1'))">
                 <xsl:sequence select="true()"/>
             </xsl:when>
             <xsl:otherwise>