From 38bc718c3aa0f2e69b74b301674c4c3f84c6405c Mon Sep 17 00:00:00 2001
From: Toshihiko Makita <tmakita@antenna.co.jp>
Date: Wed, 10 May 2023 10:40:20 +0900
Subject: [PATCH 01/13] Create dita2fo_util_node.xsl

Added node related utility functions
---
 .../xsl/dita2fo_util_node.xsl                 | 183 ++++++++++++++++++
 1 file changed, 183 insertions(+)
 create mode 100644 com.antennahouse.pdf5.ml/xsl/dita2fo_util_node.xsl

diff --git a/com.antennahouse.pdf5.ml/xsl/dita2fo_util_node.xsl b/com.antennahouse.pdf5.ml/xsl/dita2fo_util_node.xsl
new file mode 100644
index 0000000..159f526
--- /dev/null
+++ b/com.antennahouse.pdf5.ml/xsl/dita2fo_util_node.xsl
@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+    **************************************************************
+    DITA to XSL-FO Stylesheet
+    Node Related Utility Templates
+    **************************************************************
+    File Name : dita2xslfo_util_node.xsl
+    **************************************************************
+    Copyright © 2009-2019 Antenna House, Inc. All rights reserved.
+    Antenna House is a trademark of Antenna House, Inc.
+    URL : http://www.antennahouse.com/
+    **************************************************************
+-->
+
+<xsl:stylesheet version="2.0" 
+	xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
+	xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    xmlns:svg="http://www.w3.org/2000/svg"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    xmlns:ahf="http://www.antennahouse.com/names/XSLT/Functions/Document"
+    exclude-result-prefixes="xs ahf" >
+
+    <!-- 
+      ============================================
+         Node functions
+      ============================================
+    -->
+    
+    <!-- 
+     function:  determine empty element
+     param:     prmElem
+     return:    xs:boolean
+     note:		
+     -->
+    <xsl:function name="ahf:isNotEmptyElement" as="xs:boolean">
+        <xsl:param name="prmElem" as="element()?"/>
+        <xsl:sequence select="not(ahf:isEmptyElement($prmElem))"/>
+    </xsl:function>        
+    
+    <xsl:function name="ahf:isEmptyElement" as="xs:boolean">
+        <xsl:param name="prmElem" as="element()?"/>
+        <xsl:choose>
+            <xsl:when test="empty($prmElem)">
+                <xsl:sequence select="true()"/>
+            </xsl:when>
+            <xsl:when test="empty($prmElem/node())">
+                <xsl:sequence select="true()"/>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:sequence select="every $node in $prmElem/node() satisfies ahf:isRedundantNode($node)"/>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:function>
+    
+    <!-- 
+     function:  determine redundant node
+     param:     prmNode
+     return:    xs:boolean
+     note:		
+     -->
+    <xsl:function name="ahf:isRedundantNode" as="xs:boolean">
+        <xsl:param name="prmNode" as="node()"/>
+        <xsl:choose>
+            <xsl:when test="$prmNode/self::comment()">
+                <xsl:sequence select="true()"/>
+            </xsl:when>
+            <xsl:when test="$prmNode/self::processing-instruction()">
+                <xsl:sequence select="true()"/>
+            </xsl:when>
+            <xsl:when test="$prmNode/self::text()">
+                <xsl:choose>
+                    <xsl:when test="string(normalize-space($prmNode)) eq ''">
+                        <xsl:sequence select="true()"/>
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <xsl:sequence select="false()"/>
+                    </xsl:otherwise>
+                </xsl:choose>
+            </xsl:when>
+            <xsl:when test="$prmNode/self::element()">
+                <xsl:sequence select="false()"/>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:sequence select="true()"/>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:function>
+
+    <!-- 
+     function:  determine redundant nodes
+     param:     prmNodes
+     return:    xs:boolean
+     note:		
+     -->
+    <xsl:function name="ahf:isRedundantNodes" as="xs:boolean">
+        <xsl:param name="prmNodes" as="node()+"/>
+        <xsl:sequence select="every $node in $prmNodes satisfies ahf:isRedundantNode($node)"/>
+    </xsl:function>
+
+    <!-- 
+     function:  Get first preceding elememnt
+     param:     prmElem
+     return:    element()?
+     note:		
+     -->
+    <xsl:function name="ahf:getFirstPrecedingSiblingElemWoWh" as="element()?">
+        <xsl:param name="prmElem" as="element()?"/>
+        <xsl:variable name="precedingFirstElem" as="element()?" select="$prmElem/preceding-sibling::*[1]"/>
+        <xsl:choose>
+            <xsl:when test="empty($precedingFirstElem)">
+                <xsl:sequence select="()"/>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:variable name="nodesBetween" as="node()*" select="$prmElem/preceding-sibling::node()[. &gt;&gt; $precedingFirstElem]"/>
+                <xsl:choose>
+                    <xsl:when test="empty($nodesBetween)">
+                        <xsl:sequence select="$precedingFirstElem"/>
+                    </xsl:when>
+                    <xsl:when test="every $node in $nodesBetween satisfies ahf:isRedundantNode($node)">
+                        <xsl:sequence select="$precedingFirstElem"/>
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <xsl:sequence select="()"/>
+                    </xsl:otherwise>
+                </xsl:choose>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:function>
+
+    <!-- 
+     function:  Get first following elememnt
+     param:     prmElem
+     return:    element()?
+     note:		
+     -->
+    <xsl:function name="ahf:getFirstFollowingSiblingElemWoWh" as="element()?">
+        <xsl:param name="prmElem" as="element()?"/>
+        <xsl:variable name="followingFirstElem" as="element()?" select="$prmElem/following-sibling::*[1]"/>
+        <xsl:choose>
+            <xsl:when test="empty($followingFirstElem)">
+                <xsl:sequence select="()"/>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:variable name="nodesBetween" as="node()*" select="$prmElem/following-sibling::node()[. &lt;&lt; $followingFirstElem]"/>
+                <xsl:choose>
+                    <xsl:when test="empty($nodesBetween)">
+                        <xsl:sequence select="$followingFirstElem"/>
+                    </xsl:when>
+                    <xsl:when test="every $node in $nodesBetween satisfies ahf:isRedundantNode($node)">
+                        <xsl:sequence select="$followingFirstElem"/>
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <xsl:sequence select="()"/>
+                    </xsl:otherwise>
+                </xsl:choose>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:function>
+
+    <!-- 
+     function:  Determine the first child of parent
+     param:     prmElem
+     return:    xs:boolean
+     note:		
+     -->
+    <xsl:function name="ahf:isFirstChildOfParent" as="xs:boolean">
+        <xsl:param name="prmElem" as="element()?"/>
+        <xsl:sequence select="$prmElem[parent::*/*[1] is $prmElem] => exists()"/>
+    </xsl:function>
+    
+    <!-- 
+     function:  Determine the last child of parent
+     param:     prmElem
+     return:    xs:boolean
+     note:		
+     -->
+    <xsl:function name="ahf:isLastChildOfParent" as="xs:boolean">
+        <xsl:param name="prmElem" as="element()?"/>
+        <xsl:sequence select="$prmElem[parent::*/*[last()] is $prmElem] => exists()"/>
+    </xsl:function>
+
+    <!-- end of stylesheet -->
+</xsl:stylesheet>

From 2f08f12d9f2e2282056816214359a400134a7d57 Mon Sep 17 00:00:00 2001
From: Toshihiko Makita <tmakita@antenna.co.jp>
Date: Wed, 10 May 2023 10:41:35 +0900
Subject: [PATCH 02/13] Ignore empty shortdesc, abstract, body

---
 .../xsl/dita2fo_import.xsl                    |  1 +
 .../xsl/dita2fo_topicelements.xsl             | 90 +++++++++++++------
 2 files changed, 66 insertions(+), 25 deletions(-)

diff --git a/com.antennahouse.pdf5.ml/xsl/dita2fo_import.xsl b/com.antennahouse.pdf5.ml/xsl/dita2fo_import.xsl
index 5784259..49d733c 100644
--- a/com.antennahouse.pdf5.ml/xsl/dita2fo_import.xsl
+++ b/com.antennahouse.pdf5.ml/xsl/dita2fo_import.xsl
@@ -50,6 +50,7 @@
    <xsl:include href="dita2fo_thumbindexmap.xsl"/>
    <xsl:include href="dita2fo_common.xsl"/>
    <xsl:include href="dita2fo_util.xsl"/>
+   <xsl:include href="dita2fo_util_node.xsl"/>
    <xsl:include href="dita2fo_dita_util.xsl"/>
    <xsl:include href="dita2fo_dita_class.xsl"/>
    <xsl:include href="dita2fo_style_set.xsl"/>
diff --git a/com.antennahouse.pdf5.ml/xsl/dita2fo_topicelements.xsl b/com.antennahouse.pdf5.ml/xsl/dita2fo_topicelements.xsl
index 972fc46..e3d4de4 100644
--- a/com.antennahouse.pdf5.ml/xsl/dita2fo_topicelements.xsl
+++ b/com.antennahouse.pdf5.ml/xsl/dita2fo_topicelements.xsl
@@ -22,55 +22,68 @@ E-mail : info@antennahouse.com
     <!-- relatedlink is implemented in dita2fo_relatedlinks.xsl -->
 
     <!-- 
-     function:	topic template to get style
+     function:  topic template to get style
      param:	    
-     return:	style name
-     note:		This template is common for topic/task/concept/reference
+     return:    style name
+     note:      This template is common for topic/task/concept/reference
      -->
     <xsl:template match="*[contains(@class, ' topic/topic ')]" mode="MODE_GET_STYLE" as="xs:string*">
         <xsl:sequence select="'atsBase'"/>
     </xsl:template>    
     
     <!-- 
-     function:	titlealts template
+     function:  titlealts template
      param:	    
-     return:	none
-     note:		none
+     return:    none
+     note:      none
      -->
     <xsl:template match="*[contains(@class, ' topic/titlealts ')]">
     </xsl:template>
     <!-- 
-     function:	navtitle template
+     function:  navtitle template
      param:	    
-     return:	none
-     note:		none
+     return:    none
+     note:      none
      -->
     <xsl:template match="*[contains(@class, ' topic/navtitle ')]">
         <xsl:apply-templates/>
     </xsl:template>
     
     <!-- 
-     function:	searchtitle template
+     function:  searchtitle template
      param:	    
-     return:	none
-     note:		none
+     return:    none
+     note:      none
      -->
     <xsl:template match="*[contains(@class, ' topic/searchtitle ')]">
     </xsl:template>
     
     <!-- 
-     function:	abstract template
-     param:	    prmTopicRef, prmNeedId
+     function:  abstract template
+     param:     prmTopicRef, prmNeedId
      return:	
-     note:		xsl:strip-space is applied for this element.
+     note:      xsl:strip-space is applied for this element.
                 Make fo:block unconditionally. (2011-09-07 t.makita)
                 Call "processAbstarct" for easy override.
                 2015-08-25 t.makita
+                Ignore empty abstract.
+                2023-05-10 t.makita
      -->
     <xsl:template match="*[contains(@class, ' topic/abstract ')]" mode="MODE_GET_STYLE" as="xs:string*">
         <xsl:sequence select="'atsAbstract'"/>
     </xsl:template>    
 
+    <xsl:template match="*[contains(@class, ' topic/abstract ')][ahf:isEmptyElement(.)]" priority="2">
+        <xsl:variable name="abstract" as="element()" select="."/>
+        <xsl:if test="@id">
+            <fo:wrapper>
+                <xsl:call-template name="ahf:getIdAtts">
+                    <xsl:with-param name="prmElement" select="$abstract"/>
+                </xsl:call-template>
+            </fo:wrapper>
+        </xsl:if>
+    </xsl:template>
+
     <xsl:template match="*[contains(@class, ' topic/abstract ')]">
         <xsl:call-template name="processAbstract"/>
     </xsl:template>
@@ -85,10 +98,13 @@ E-mail : info@antennahouse.com
     </xsl:template>
     
     <!-- 
-     function:	shortdesc template
+     function:  shortdesc template
      param:	    
-     return:	fo:block or descendant generated fo objects
-     note:		Abstract can contain shortdesc as inline or block level objects.
+     return:    fo:block or descendant generated fo objects
+     note:      Abstract can contain shortdesc as inline or block level objects.
+                Ignore empty shortdesc.
+                2023-05-10 t.makita
+
      -->
     <xsl:template match="*[contains(@class, ' topic/shortdesc ')]" mode="MODE_GET_STYLE" as="xs:string*">
         <xsl:choose>
@@ -101,6 +117,17 @@ E-mail : info@antennahouse.com
         </xsl:choose>
     </xsl:template>    
 
+    <xsl:template match="*[contains(@class, ' topic/shortdesc ')][empty(parent::*[contains(@class, ' topic/abstract ')])][ahf:isEmptyElement(.)]" priority="2">
+        <xsl:variable name="shortdesc" as="element()" select="."/>
+        <xsl:if test="@id">
+            <fo:wrapper>
+                <xsl:call-template name="ahf:getIdAtts">
+                    <xsl:with-param name="prmElement" select="$shortdesc"/>
+                </xsl:call-template>
+            </fo:wrapper>
+        </xsl:if>
+    </xsl:template>
+
     <xsl:template match="*[contains(@class, ' topic/shortdesc ')]">
         <xsl:choose>
             <xsl:when test="parent::*[contains(@class, ' topic/abstract ')]">
@@ -124,15 +151,28 @@ E-mail : info@antennahouse.com
     </xsl:template>
     
     <!-- 
-     function:	body template
-     param:	    prmTopicRef, prmNeedId
-     return:	fo:block
-     note:		Generate fo:block instead of fo:wrapper because it is sometimes needed for debugging generated areas.
+     function:  body template
+     param:     prmTopicRef, prmNeedId
+     return:    fo:block
+     note:      Generate fo:block instead of fo:wrapper because it is sometimes needed for debugging generated areas.
                 2016-09-23 t.makita
+                Ignore empty body.
+                2023-05-10 t.makita
      -->
     <xsl:template match="*[contains(@class, ' topic/body ')]" mode="MODE_GET_STYLE" as="xs:string*">
         <xsl:sequence select="'atsBody'"/>
     </xsl:template>    
+
+    <xsl:template match="*[contains(@class, ' topic/body ')][ahf:isEmptyElement(.)]" priority="2">
+        <xsl:variable name="body" as="element()" select="."/>
+        <xsl:if test="@id">
+            <fo:wrapper>
+                <xsl:call-template name="ahf:getIdAtts">
+                    <xsl:with-param name="prmElement" select="$body"/>
+                </xsl:call-template>
+            </fo:wrapper>
+        </xsl:if>
+    </xsl:template>
     
     <xsl:template match="*[contains(@class, ' topic/body ')]">
         <xsl:variable name="body" select="."/>
@@ -153,9 +193,9 @@ E-mail : info@antennahouse.com
     </xsl:template>
     
     <!-- 
-        function:	bodydiv template
-        param:	    prmTopicRef, prmNeedId
-        return:	    fo:wrapper
+        function:   bodydiv template
+        param:      prmTopicRef, prmNeedId
+        return:     fo:block
         note:       Bodydiv needs no special formattings. (2011-10-25 t.makita)		
     -->
     <xsl:template match="*[contains(@class, ' topic/bodydiv ')]">

From 6be1c335bd4d28dec05f85f6c80c7737c143fde4 Mon Sep 17 00:00:00 2001
From: Toshihiko Makita <tmakita@antenna.co.jp>
Date: Wed, 10 May 2023 10:41:56 +0900
Subject: [PATCH 03/13] Change .xpr

---
 com.antennahouse.pdf5.ml/pdf5.ml.xpr | 70 ++++++++++++++++++----------
 1 file changed, 45 insertions(+), 25 deletions(-)

diff --git a/com.antennahouse.pdf5.ml/pdf5.ml.xpr b/com.antennahouse.pdf5.ml/pdf5.ml.xpr
index 90cfdcf..e654760 100644
--- a/com.antennahouse.pdf5.ml/pdf5.ml.xpr
+++ b/com.antennahouse.pdf5.ml/pdf5.ml.xpr
@@ -24,11 +24,11 @@
                         <scenarioAssociation-array>
                             <scenarioAssociation>
                                 <field name="url">
-                                    <String>xsl/psmi_impl.xsl</String>
+                                    <String>xsl/dita2fo_shell.xsl</String>
                                 </field>
                                 <field name="scenarioIds">
                                     <list>
-                                        <String>psmi</String>
+                                        <String>dita2fo_shell</String>
                                     </list>
                                 </field>
                                 <field name="scenarioTypes">
@@ -44,11 +44,11 @@
                             </scenarioAssociation>
                             <scenarioAssociation>
                                 <field name="url">
-                                    <String>xsl/psmi.xsl</String>
+                                    <String>xsl/dita2fo_util_node.xsl</String>
                                 </field>
                                 <field name="scenarioIds">
                                     <list>
-                                        <String>psmi</String>
+                                        <String>dita2fo_shell</String>
                                     </list>
                                 </field>
                                 <field name="scenarioTypes">
@@ -64,7 +64,7 @@
                             </scenarioAssociation>
                             <scenarioAssociation>
                                 <field name="url">
-                                    <String>xsl/dita2fo_shell.xsl</String>
+                                    <String>xsl/dita2fo_import.xsl</String>
                                 </field>
                                 <field name="scenarioIds">
                                     <list>
@@ -82,6 +82,46 @@
                                     </list>
                                 </field>
                             </scenarioAssociation>
+                            <scenarioAssociation>
+                                <field name="url">
+                                    <String>xsl/psmi_impl.xsl</String>
+                                </field>
+                                <field name="scenarioIds">
+                                    <list>
+                                        <String>psmi</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioTypes">
+                                    <list>
+                                        <String>Validation_scenario</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioStorageLocations">
+                                    <list>
+                                        <Byte>2</Byte>
+                                    </list>
+                                </field>
+                            </scenarioAssociation>
+                            <scenarioAssociation>
+                                <field name="url">
+                                    <String>xsl/psmi.xsl</String>
+                                </field>
+                                <field name="scenarioIds">
+                                    <list>
+                                        <String>psmi</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioTypes">
+                                    <list>
+                                        <String>Validation_scenario</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioStorageLocations">
+                                    <list>
+                                        <Byte>2</Byte>
+                                    </list>
+                                </field>
+                            </scenarioAssociation>
                             <scenarioAssociation>
                                 <field name="url">
                                     <String>xsl/dita2fo_tablelist.xsl</String>
@@ -1062,26 +1102,6 @@
                                     </list>
                                 </field>
                             </scenarioAssociation>
-                            <scenarioAssociation>
-                                <field name="url">
-                                    <String>xsl/dita2fo_import.xsl</String>
-                                </field>
-                                <field name="scenarioIds">
-                                    <list>
-                                        <String>dita2fo_shell</String>
-                                    </list>
-                                </field>
-                                <field name="scenarioTypes">
-                                    <list>
-                                        <String>Validation_scenario</String>
-                                    </list>
-                                </field>
-                                <field name="scenarioStorageLocations">
-                                    <list>
-                                        <Byte>2</Byte>
-                                    </list>
-                                </field>
-                            </scenarioAssociation>
                             <scenarioAssociation>
                                 <field name="url">
                                     <String>xsl/dita2fo_glossaryrelatedelements.xsl</String>

From 95e6f18f629fecaaa15ea61ed3d04b392969fcee Mon Sep 17 00:00:00 2001
From: Toshihiko Makita <tmakita@antenna.co.jp>
Date: Fri, 2 Jun 2023 00:35:30 +0900
Subject: [PATCH 04/13] First commit for topic only output

---
 .../config/topic-only-prototype.xml           |  38 +++++
 com.antennahouse.pdf5.ml/integrator.xml       |  27 +++-
 com.antennahouse.pdf5.ml/pdf5.ml.xpr          | 146 +++++++++++++++---
 .../xsl/dita2fo_gen_merged_main.xsl           | 144 +++++++++++++++++
 .../xsl/dita2fo_gen_merged_param.xsl          |  27 ++++
 .../xsl/dita2fo_gen_merged_shell.xsl          |  35 +++++
 6 files changed, 395 insertions(+), 22 deletions(-)
 create mode 100644 com.antennahouse.pdf5.ml/config/topic-only-prototype.xml
 create mode 100644 com.antennahouse.pdf5.ml/xsl/dita2fo_gen_merged_main.xsl
 create mode 100644 com.antennahouse.pdf5.ml/xsl/dita2fo_gen_merged_param.xsl
 create mode 100644 com.antennahouse.pdf5.ml/xsl/dita2fo_gen_merged_shell.xsl

diff --git a/com.antennahouse.pdf5.ml/config/topic-only-prototype.xml b/com.antennahouse.pdf5.ml/config/topic-only-prototype.xml
new file mode 100644
index 0000000..57647e4
--- /dev/null
+++ b/com.antennahouse.pdf5.ml/config/topic-only-prototype.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<dita-merge xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot"
+            xmlns:ditaarch="http://dita.oasis-open.org/architecture/2005/">
+   <?workdir /dummy?>
+   <?workdir-uri file:/dummy/?>
+   <?path2project?>
+   <?path2project-uri ./?>
+   <?path2rootmap-uri ./?>
+   <?doctype-public -//OASIS//DTD DITA Map//EN?>
+   <?doctype-system map.dtd?>
+   <map cascade="merge"
+        class="- map/map "
+        ditaarch:DITAArchVersion="1.3"
+        domain="(map mapgroup-d) (topic abbrev-d) (topic delay-d) a(props deliveryTarget) (map ditavalref-d) (map glossref-d) (topic hazard-d) (topic hi-d) (topic indexing-d) (topic markup-d) (topic pr-d) (topic relmgmt-d) (topic sw-d) (topic ui-d) (topic ut-d) (topic markup-d xml-d)"
+        specializations="@props/deliveryTarget"
+        xtrc="map:1;1:1"
+        xtrf="file:/dummy.ditamap">
+      <title class="- topic/title "
+             xtrc="title:1;1:1"
+             xtrf="file:/dummy.ditamap">Dummy</title>
+      <?ditaot gentext?>
+      <topicref class="- map/topicref "
+                first_topic_id="#unique_1"
+                href="#unique_1"
+                ohref="dummy-topic.dita"
+                type="topic"
+                xtrc="topicref:1;1:1"
+                xtrf="file:/dummy.ditamap">
+         <!--topicmeta class="- map/topicmeta ">
+            <navtitle class="- topic/navtitle "><?pdf5.ml insert-navtitle?></navtitle>
+            <?ditaot gentext?>
+            <linktext class="- map/linktext "><?pdf5.ml insert-linktext?></linktext>
+         </topicmeta-->
+      </topicref>
+   </map>
+   <!-- Topic information from here! -->
+   <!-- Set @id="unique_1", @oid="@id" -->
+</dita-merge>
diff --git a/com.antennahouse.pdf5.ml/integrator.xml b/com.antennahouse.pdf5.ml/integrator.xml
index e4df40e..cf3b06d 100644
--- a/com.antennahouse.pdf5.ml/integrator.xml
+++ b/com.antennahouse.pdf5.ml/integrator.xml
@@ -36,12 +36,35 @@
   <target name="dita2pdf5.ml" depends="dita2pdf5.ml.init, build-init, preprocess, map2pdf5.ml, topic2pdf5.ml"/> 
   
   <target name="topic2pdf5.ml" if="noMap" depends="preprocess">
-	<echo message="[pdf5.ml] This plugin does not support topic formatting. Use map or bookmap!"/>
+    <!-- Generate merged middle file from topic -->
+    <echo message="[pdf5.ml] Start generating merged middle file from topic."/>
+    <makeurl file="${dita.temp.dir}${file.separator}${user.input.file}" property="topic.url" validate="yes"/>
+    <xslt processor="trax" 
+      in="${dita.dir}${file.separator}${pdf5.ml.dir}${file.separator}${pdf5.ml.plugin.folder}${file.separator}config${file.separator}topic-only-prototype.xml" 
+      out="${dita.temp.dir}${file.separator}${dita.topic.filename.root}_MERGED.xml"
+      style="${dita.dir}${file.separator}${pdf5.ml.dir}${file.separator}${pdf5.ml.plugin.folder}${file.separator}xsl${file.separator}dita2fo_gen_merged_shell.xsl" 
+      force="true">
+      <factory name="net.sf.saxon.TransformerFactoryImpl">
+        <attribute name="http://saxon.sf.net/feature/timing" value="true"/>
+        <!-- Suppress namespace warning -->
+        <!--attribute name="http://saxon.sf.net/feature/suppressXsltNamespaceCheck" value="true"/-->
+        <!--Assert-->
+        <!--attribute name="http://saxon.sf.net/feature/enableAssertions" value="true"/-->
+        <!-- Trace -->
+        <!--attribute name="http://saxon.sf.net/feature/traceListenerClass" value="net.sf.saxon.trace.XSLTTraceListener"/-->
+      </factory>
+      <param name="PRM_TOPIC_FILE_URL" expression="${topic.url}"/>
+    </xslt>
+    
+    <!-- Merged middle file to PDF -->
+    <ant dir="${dita.dir}${file.separator}${pdf5.ml.dir}${file.separator}${pdf5.ml.plugin.folder}" target="merged2pdf">
+      <property name="caller.basedir" value="${basedir}"/>
+    </ant>
   </target>
 
   <target name="map2pdf5.ml" unless="noMap" depends="preprocess">
     <!-- Call Java TopicMerge -->
-    <echo message="Start generating merged middle file."/>
+    <echo message="[pdf5.ml] Start generating merged middle file."/>
   	<dirname property="dita.temp.dir.fullpath" file="${dita.temp.dir}${file.separator}dummy.file"/>
     <pipeline message="topicmerge" 
               inputmap="${dita.temp.dir.fullpath}${file.separator}${user.input.file}"
diff --git a/com.antennahouse.pdf5.ml/pdf5.ml.xpr b/com.antennahouse.pdf5.ml/pdf5.ml.xpr
index e654760..abee2b6 100644
--- a/com.antennahouse.pdf5.ml/pdf5.ml.xpr
+++ b/com.antennahouse.pdf5.ml/pdf5.ml.xpr
@@ -22,6 +22,86 @@
                     <entry>
                         <String>validation.scenario.associations</String>
                         <scenarioAssociation-array>
+                            <scenarioAssociation>
+                                <field name="url">
+                                    <String>xsl/dita2fo_gen_merged_main.xsl</String>
+                                </field>
+                                <field name="scenarioIds">
+                                    <list>
+                                        <String>dita2fo_gen_merged_shell</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioTypes">
+                                    <list>
+                                        <String>Validation_scenario</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioStorageLocations">
+                                    <list>
+                                        <Byte>2</Byte>
+                                    </list>
+                                </field>
+                            </scenarioAssociation>
+                            <scenarioAssociation>
+                                <field name="url">
+                                    <String>xsl/dita2fo_gen_merged_shell.xsl</String>
+                                </field>
+                                <field name="scenarioIds">
+                                    <list>
+                                        <String>dita2fo_gen_merged_shell</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioTypes">
+                                    <list>
+                                        <String>Validation_scenario</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioStorageLocations">
+                                    <list>
+                                        <Byte>2</Byte>
+                                    </list>
+                                </field>
+                            </scenarioAssociation>
+                            <scenarioAssociation>
+                                <field name="url">
+                                    <String>xsl/dita2fo_gen_merged.xsl</String>
+                                </field>
+                                <field name="scenarioIds">
+                                    <list>
+                                        <String>dita2fo_shell</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioTypes">
+                                    <list>
+                                        <String>Validation_scenario</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioStorageLocations">
+                                    <list>
+                                        <Byte>2</Byte>
+                                    </list>
+                                </field>
+                            </scenarioAssociation>
+                            <scenarioAssociation>
+                                <field name="url">
+                                    <String>xsl/dita2fo_main.xsl</String>
+                                </field>
+                                <field name="scenarioIds">
+                                    <list>
+                                        <String>dita2fo_shell</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioTypes">
+                                    <list>
+                                        <String>Validation_scenario</String>
+                                    </list>
+                                </field>
+                                <field name="scenarioStorageLocations">
+                                    <list>
+                                        <Byte>2</Byte>
+                                    </list>
+                                </field>
+                            </scenarioAssociation>
                             <scenarioAssociation>
                                 <field name="url">
                                     <String>xsl/dita2fo_shell.xsl</String>
@@ -862,26 +942,6 @@
                                     </list>
                                 </field>
                             </scenarioAssociation>
-                            <scenarioAssociation>
-                                <field name="url">
-                                    <String>xsl/dita2fo_main.xsl</String>
-                                </field>
-                                <field name="scenarioIds">
-                                    <list>
-                                        <String>dita2fo_shell</String>
-                                    </list>
-                                </field>
-                                <field name="scenarioTypes">
-                                    <list>
-                                        <String>Validation_scenario</String>
-                                    </list>
-                                </field>
-                                <field name="scenarioStorageLocations">
-                                    <list>
-                                        <Byte>2</Byte>
-                                    </list>
-                                </field>
-                            </scenarioAssociation>
                             <scenarioAssociation>
                                 <field name="url">
                                     <String>xsl/dita2fo_list_elements.xsl</String>
@@ -1833,6 +1893,52 @@
                                     <String>dita2fo_convmerged_shell</String>
                                 </field>
                             </validationScenario>
+                            <validationScenario>
+                                <field name="pairs">
+                                    <list>
+                                        <validationUnit>
+                                            <field name="validationType">
+                                                <validationUnitType>
+                                                    <field name="validationInputType">
+                                                        <String>text/xsl</String>
+                                                    </field>
+                                                </validationUnitType>
+                                            </field>
+                                            <field name="url">
+                                                <String>${pdu}/xsl/dita2fo_gen_merged_shell.xsl</String>
+                                            </field>
+                                            <field name="validationEngine">
+                                                <validationEngine>
+                                                    <field name="engineType">
+                                                        <String>&lt;Default engine></String>
+                                                    </field>
+                                                    <field name="allowsAutomaticValidation">
+                                                        <Boolean>true</Boolean>
+                                                    </field>
+                                                </validationEngine>
+                                            </field>
+                                            <field name="allowAutomaticValidation">
+                                                <Boolean>true</Boolean>
+                                            </field>
+                                            <field name="extensions">
+                                                <null/>
+                                            </field>
+                                            <field name="validationSchema">
+                                                <null/>
+                                            </field>
+                                            <field name="validationAdvancedSettings">
+                                                <null/>
+                                            </field>
+                                        </validationUnit>
+                                    </list>
+                                </field>
+                                <field name="type">
+                                    <String>Validation_scenario</String>
+                                </field>
+                                <field name="name">
+                                    <String>dita2fo_gen_merged_shell</String>
+                                </field>
+                            </validationScenario>
                             <validationScenario>
                                 <field name="pairs">
                                     <list>
diff --git a/com.antennahouse.pdf5.ml/xsl/dita2fo_gen_merged_main.xsl b/com.antennahouse.pdf5.ml/xsl/dita2fo_gen_merged_main.xsl
new file mode 100644
index 0000000..80b075c
--- /dev/null
+++ b/com.antennahouse.pdf5.ml/xsl/dita2fo_gen_merged_main.xsl
@@ -0,0 +1,144 @@
+<?xml version='1.0' encoding="UTF-8" ?>
+<!--
+    ****************************************************************
+    DITA to XSL-FO Stylesheet
+    Module: Generate merged-middle file from sigle topic
+    Copyright © 2009-2023 Antenna House, Inc. All rights reserved.
+    Antenna House is a trademark of Antenna House, Inc.
+    URL    : http://www.antennahouse.com/
+    E-mail : info@antennahouse.com
+    ****************************************************************
+-->
+<xsl:stylesheet version="3.0" 
+ xmlns:fo="http://www.w3.org/1999/XSL/Format" 
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ xmlns:axf="http://www.antennahouse.com/names/XSL/Extensions"
+ xmlns:ahf="http://www.antennahouse.com/names/XSLT/Functions/Document"
+ xmlns:ahd="http://www.antennahouse.com/names/XSLT/Debugging"
+ exclude-result-prefixes="ahf" 
+>
+    
+    <!-- 
+     function:	Output plug-in & XSLT processor information
+     param:		none
+     return:	
+     note:		
+     -->
+    <xsl:template name="outputPluginInfo">
+        <!-- Plug-in name and version -->
+        <xsl:variable name="pluginAuthor" as="xs:string" select="'Antenna House'"/>
+        <xsl:variable name="pluginName" as="xs:string" select="'PDF5-ML: Generate merged-middle file from single topic'"/>
+        <xsl:variable name="pluginVersion" as="xs:string" select="'1.0.0'"/>
+        <xsl:message select="concat($pluginAuthor,' ',$pluginName,' plug-in Version: ',$pluginVersion)"/>
+        <!-- XSLT processor information -->
+        <xsl:variable name="vendor" as="xs:string" select="system-property('xsl:vendor')"/>
+        <xsl:variable name="vendorUrl" as="xs:string" select="system-property('xsl:vendor-url')"/>
+        <xsl:variable name="productName" as="xs:string" select="system-property('xsl:product-name')"/>
+        <xsl:variable name="productVersion" as="xs:string" select="system-property('xsl:product-version')"/>
+        <xsl:message select="concat('Running on: ',$productName,' (',$vendorUrl,') Version: ',$productVersion)"/>
+    </xsl:template>
+    
+    <!-- 
+     function:  root matching template
+     param:     none
+     return:	dita-merge
+     note:      This template inputs topic-only-prototype.xml and outputs [topic file name]_MERGED.xml in temporary folder.
+     -->
+    <xsl:template match="/">
+        <xsl:call-template name="outputPluginInfo"/>
+        <xsl:apply-templates/>
+    </xsl:template>
+    
+    <!-- 
+     function:  dita-merge matching template
+     param:     none
+     return:	dita-merge
+     note:      Output topic at the end of map contents.
+     -->
+    <xsl:template match="dita-merge">
+        <xsl:copy>
+            <xsl:apply-templates select="@*"/>
+            <xsl:apply-templates/>
+            <xsl:call-template name="outputTopic"/>
+        </xsl:copy>
+    </xsl:template>
+    
+    <!-- 
+     function:  Genral node() template
+     param:     none
+     return:	itself
+     note:      
+     -->
+    <xsl:template match="node()">
+        <xsl:copy>
+            <xsl:apply-templates select="@*"/>
+            <xsl:apply-templates/>
+        </xsl:copy>
+    </xsl:template>
+
+    <xsl:template match="@*">
+        <xsl:copy/>
+    </xsl:template>
+
+    <!-- 
+     function:  map
+     param:     none
+     return:    map
+     note:      coompliment xml:lang
+     -->
+    <xsl:template match="map">
+        <xsl:copy>
+            <xsl:apply-templates select="@*"/>
+            <xsl:copy-of select="$gpTopicFileDoc/*[@class => contains-token('topic/topic')]/@xml:lang"/>
+            <xsl:apply-templates/>
+        </xsl:copy>
+    </xsl:template>
+    
+    <!-- 
+     function:  topicref
+     param:     none
+     return:    topicref
+     note:      none
+     -->
+    <xsl:template match="topicref">
+        <xsl:copy>
+            <xsl:apply-templates select="@*"/>
+            <xsl:apply-templates/>
+        </xsl:copy>
+    </xsl:template>
+
+    <xsl:template match="topicref/@ohref" priority="10">
+        <!--xsl:message select="'[topicref/@ohref] Match!'"/-->
+        <xsl:attribute name="ohref" select="$gpTopicFileDoc/*[@class => contains-token('topic/topic')]/@xtrf => string()"/>
+    </xsl:template>
+    
+    <!-- 
+     function:  Output topic
+     param:     none
+     return:    *[@class => contains-token('topic/topic')]
+     note:      
+     -->
+    <xsl:template name="outputTopic">
+        <xsl:apply-templates select="$gpTopicFileDoc/*"/>
+    </xsl:template>    
+
+    <xsl:template match="*[@class => contains-token('topic/topic')][ancestor::*[@class => contains-token('topic/topic')] => empty()]" priority="10">
+        <!--xsl:message select="'[topic] Match!'"/-->
+        <xsl:copy>
+            <xsl:variable name="id" as="xs:string" select="@id => string()"/>
+            <xsl:apply-templates select="@*">
+                <xsl:with-param name="prmId" select="$id"/>
+            </xsl:apply-templates>
+            <xsl:apply-templates/>
+        </xsl:copy>
+    </xsl:template>
+
+    <xsl:template match="*[@class => contains-token('topic/topic')][ancestor::*[@class => contains-token('topic/topic')] => empty()]/@id" priority="10">
+        <xsl:param name="prmId" as="xs:string" required="yes"/>
+        <!--xsl:message select="'[@id] Match!'"/-->
+        <xsl:attribute name="id" select="'unique_1'"/>
+        <xsl:attribute name="oid" select="$prmId"/>
+    </xsl:template>
+    
+</xsl:stylesheet>
diff --git a/com.antennahouse.pdf5.ml/xsl/dita2fo_gen_merged_param.xsl b/com.antennahouse.pdf5.ml/xsl/dita2fo_gen_merged_param.xsl
new file mode 100644
index 0000000..387a054
--- /dev/null
+++ b/com.antennahouse.pdf5.ml/xsl/dita2fo_gen_merged_param.xsl
@@ -0,0 +1,27 @@
+<?xml version='1.0' encoding="UTF-8" ?>
+<!--
+    ****************************************************************
+    DITA to XSL-FO Stylesheet
+    Module: Generate merged-middle file from sigle topic
+    Copyright © 2009-2023 Antenna House, Inc. All rights reserved.
+    Antenna House is a trademark of Antenna House, Inc.
+    URL    : http://www.antennahouse.com/
+    E-mail : info@antennahouse.com
+    ****************************************************************
+-->
+<xsl:stylesheet version="3.0" 
+ xmlns:fo="http://www.w3.org/1999/XSL/Format" 
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ xmlns:axf="http://www.antennahouse.com/names/XSL/Extensions"
+ xmlns:ahf="http://www.antennahouse.com/names/XSLT/Functions/Document"
+ xmlns:ahd="http://www.antennahouse.com/names/XSLT/Debugging"
+ exclude-result-prefixes="ahf" 
+>
+    
+    <!-- Topic file -->
+    <xsl:param name="PRM_TOPIC_FILE_URL" as="xs:string" required="yes"/>
+    <xsl:variable name="gpTopicFileUrl" as="xs:string" select="$PRM_TOPIC_FILE_URL"/>
+    <xsl:variable name="gpTopicFileDoc" as="document-node()?" select="doc($gpTopicFileUrl)"/>    
+
+</xsl:stylesheet>
diff --git a/com.antennahouse.pdf5.ml/xsl/dita2fo_gen_merged_shell.xsl b/com.antennahouse.pdf5.ml/xsl/dita2fo_gen_merged_shell.xsl
new file mode 100644
index 0000000..93fe90f
--- /dev/null
+++ b/com.antennahouse.pdf5.ml/xsl/dita2fo_gen_merged_shell.xsl
@@ -0,0 +1,35 @@
+<?xml version='1.0' encoding="UTF-8" ?>
+<!--
+    ****************************************************************
+    DITA to XSL-FO Stylesheet
+    Module: Generate merged-middle file from sigle topic
+    Copyright © 2009-2023 Antenna House, Inc. All rights reserved.
+    Antenna House is a trademark of Antenna House, Inc.
+    URL    : http://www.antennahouse.com/
+    E-mail : info@antennahouse.com
+    ****************************************************************
+-->
+<xsl:stylesheet version="3.0" 
+ xmlns:fo="http://www.w3.org/1999/XSL/Format" 
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ xmlns:axf="http://www.antennahouse.com/names/XSL/Extensions"
+ xmlns:ahf="http://www.antennahouse.com/names/XSLT/Functions/Document"
+ xmlns:ahd="http://www.antennahouse.com/names/XSLT/Debugging"
+ exclude-result-prefixes="ahf" 
+>
+
+    <!-- Important notice
+         This styleshhet is intended to use XSLT 3.0 rather than XSLT 2.0.
+         Use appropriate DITA-OT versions that support XSLT 3.0 XSLT stylesheet.
+     -->
+    <!--xsl:include href="dita2fo_error_util.xsl"/>
+    <xsl:include href="dita2fo_util.xsl"/>
+    <xsl:include href="dita2fo_dita_class.xsl"/>
+    <xsl:include href="dita2fo_common.xsl"/-->
+    
+    <xsl:include href="dita2fo_gen_merged_main.xsl"/>
+    <xsl:include href="dita2fo_gen_merged_param.xsl"/>
+    
+    
+</xsl:stylesheet>

From eda71ec0647a8fa40b031d5ed7e164704303eaaf Mon Sep 17 00:00:00 2001
From: Toshihiko Makita <tmakita@antenna.co.jp>
Date: Fri, 2 Jun 2023 06:58:15 +0900
Subject: [PATCH 05/13] Second commit

Fix image URL problem.
Remove cover and toc when topic only build.
---
 com.antennahouse.pdf5.ml/build_template.xml           | 4 ++--
 com.antennahouse.pdf5.ml/build_transform_template.xml | 2 ++
 com.antennahouse.pdf5.ml/integrator.xml               | 2 ++
 com.antennahouse.pdf5.ml/xsl/dita2fo_bookmark.xsl     | 2 +-
 com.antennahouse.pdf5.ml/xsl/dita2fo_main.xsl         | 4 ++--
 com.antennahouse.pdf5.ml/xsl/dita2fo_param.xsl        | 7 +++++++
 6 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/com.antennahouse.pdf5.ml/build_template.xml b/com.antennahouse.pdf5.ml/build_template.xml
index f3a8e20..cd35994 100644
--- a/com.antennahouse.pdf5.ml/build_template.xml
+++ b/com.antennahouse.pdf5.ml/build_template.xml
@@ -190,8 +190,8 @@
     </condition>
 
     <!-- Make URL for input directory -->
-    <dirname property="user.input.dir" file="${args.input}"/>
-    <makeurl property="user.input.dir.url" file="${user.input.dir}"/>
+    <dirname property="input.file.dir" file="${args.input}"/>
+    <makeurl property="user.input.dir.url" file="${input.file.dir}"/>
     
     <!-- Make URL for output directory -->
     <makeurl property="output.dir.url" file="${dita.map.output.dir}"/>
diff --git a/com.antennahouse.pdf5.ml/build_transform_template.xml b/com.antennahouse.pdf5.ml/build_transform_template.xml
index 04abb62..cab0074 100644
--- a/com.antennahouse.pdf5.ml/build_transform_template.xml
+++ b/com.antennahouse.pdf5.ml/build_transform_template.xml
@@ -177,6 +177,7 @@
             <param name="PRM_OUTPUT_INDEX" expression="${output.index}" if:set="output.index"/>
             <param name="PRM_OT_VERSION" expression="${otversion}" if:set="otversion"/>
             <param name="PRM_TEMP_DIR_URL" expression="${temp.dir.url}" if:set="temp.dir.url"/>
+            <param name="PRM_BUILD_MAP" expression="${build.map}" if:set="build.map"/>
             
             <dita:extension id="com.antennahouse.pdf5.ml.param" behavior="org.dita.dost.platform.InsertAction"/>
             <sysproperty key="com.innodata.i18n.home" value="${i18n.home}"/>
@@ -248,6 +249,7 @@
             <arg line='"PRM_OUTPUT_INDEX=${output.index}"' if:set="output.index"/>
             <arg line='"PRM_OT_VERSION=${otversion}"' if:set="otversion"/>
             <arg line='"PRM_TEMP_DIR_URL=${temp.dir.url}"' if:set="temp.dir.url"/> 
+            <arg line='"PRM_BUILD_MAP=${build.map}"' if:set="build.map"/> 
             
             <dita:extension id="com.antennahouse.pdf5.ml.saxon.param" behavior="org.dita.dost.platform.InsertAction"/>
             <sysproperty key="com.innodata.i18n.home" value="${i18n.home}"/>
diff --git a/com.antennahouse.pdf5.ml/integrator.xml b/com.antennahouse.pdf5.ml/integrator.xml
index cf3b06d..b8597d6 100644
--- a/com.antennahouse.pdf5.ml/integrator.xml
+++ b/com.antennahouse.pdf5.ml/integrator.xml
@@ -59,6 +59,7 @@
     <!-- Merged middle file to PDF -->
     <ant dir="${dita.dir}${file.separator}${pdf5.ml.dir}${file.separator}${pdf5.ml.plugin.folder}" target="merged2pdf">
       <property name="caller.basedir" value="${basedir}"/>
+      <property name="build.map" value="no"/>
     </ant>
   </target>
 
@@ -77,6 +78,7 @@
     <!-- Merged middle file to PDF -->
     <ant dir="${dita.dir}${file.separator}${pdf5.ml.dir}${file.separator}${pdf5.ml.plugin.folder}" target="merged2pdf">
         <property name="caller.basedir" value="${basedir}"/>
+      <property name="build.map" value="yes"/>
     </ant>
   </target>
 </project>
diff --git a/com.antennahouse.pdf5.ml/xsl/dita2fo_bookmark.xsl b/com.antennahouse.pdf5.ml/xsl/dita2fo_bookmark.xsl
index bb49aca..1671e9e 100644
--- a/com.antennahouse.pdf5.ml/xsl/dita2fo_bookmark.xsl
+++ b/com.antennahouse.pdf5.ml/xsl/dita2fo_bookmark.xsl
@@ -43,7 +43,7 @@
     </xsl:template>
 
     <xsl:template name="genBookmarkTreeSub">
-        <xsl:if test="$isMap and $pMakeTocForMap">
+        <xsl:if test="$isMap and $pMakeTocForMap and $pBuildMap">
             <xsl:call-template name="genMapTocBookmark"/>
         </xsl:if>
         <xsl:apply-templates select="$map" mode="MAKE_BOOKMARK"/>
diff --git a/com.antennahouse.pdf5.ml/xsl/dita2fo_main.xsl b/com.antennahouse.pdf5.ml/xsl/dita2fo_main.xsl
index 6e4ad89..9ad68c9 100644
--- a/com.antennahouse.pdf5.ml/xsl/dita2fo_main.xsl
+++ b/com.antennahouse.pdf5.ml/xsl/dita2fo_main.xsl
@@ -76,12 +76,12 @@ E-mail : info@antennahouse.com
        		<xsl:call-template name="genBookmarkTree"/>
             
             <!-- Make cover -->
-    	    <xsl:if test="not($hasCover)">
+    	    <xsl:if test="not($hasCover) and $pBuildMap">
     	        <xsl:call-template name="genCover"/>
     	    </xsl:if>
             
             <!-- Make toc for map -->
-    	    <xsl:if test="$isMap and $pMakeTocForMap">
+    	    <xsl:if test="$isMap and $pMakeTocForMap and $pBuildMap">
     	        <xsl:call-template name="genMapToc"/>
     	    </xsl:if>
             
diff --git a/com.antennahouse.pdf5.ml/xsl/dita2fo_param.xsl b/com.antennahouse.pdf5.ml/xsl/dita2fo_param.xsl
index 80af564..32840f0 100644
--- a/com.antennahouse.pdf5.ml/xsl/dita2fo_param.xsl
+++ b/com.antennahouse.pdf5.ml/xsl/dita2fo_param.xsl
@@ -342,5 +342,12 @@ E-mail : info@antennahouse.com
      -->
     <xsl:param name="PRM_ADD_MAP_TITLE_TO_BOOKMARK" required="no" as="xs:string" select="$cNo"/>
     <xsl:variable name="pAddMapTitleToBookmark" as="xs:boolean" select="$PRM_ADD_MAP_TITLE_TO_BOOKMARK eq $cYes"/>
+
+    <!-- Build map
+        If the value is "yes" then build map or bookmap.
+        If the value is not "yes" then build topic other than map.
+     -->
+    <xsl:param name="PRM_BUILD_MAP" required="yes" as="xs:string"/>
+    <xsl:variable name="pBuildMap" as="xs:boolean" select="$PRM_BUILD_MAP eq $cYes"/>
     
 </xsl:stylesheet>

From c342fb2a916ceb60f714569be3e96b1def014019 Mon Sep 17 00:00:00 2001
From: Toshihiko Makita <tmakita@antenna.co.jp>
Date: Fri, 2 Jun 2023 09:19:39 +0900
Subject: [PATCH 06/13] Third commit for topic only build

1. Remove topic number from topic title
2. Remove thumbnail index from fo:region-end
---
 .../xsl/dita2fo_staticcontent.xsl                 |  2 +-
 com.antennahouse.pdf5.ml/xsl/dita2fo_title.xsl    | 15 ++++++++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/com.antennahouse.pdf5.ml/xsl/dita2fo_staticcontent.xsl b/com.antennahouse.pdf5.ml/xsl/dita2fo_staticcontent.xsl
index c9a3da4..26fa8e5 100644
--- a/com.antennahouse.pdf5.ml/xsl/dita2fo_staticcontent.xsl
+++ b/com.antennahouse.pdf5.ml/xsl/dita2fo_staticcontent.xsl
@@ -128,7 +128,7 @@ E-mail : info@antennahouse.com
          2014-09-14 t.makita
      -->
     <xsl:template name="chapterEndRight">
-        <xsl:if test="$pAddThumbnailIndex">
+        <xsl:if test="$pAddThumbnailIndex and $pBuildMap">
             <xsl:call-template name="genThumbIndex">
                 <xsl:with-param name="prmId" select="ahf:generateId(.,())"/>
                 <xsl:with-param name="prmClass">
diff --git a/com.antennahouse.pdf5.ml/xsl/dita2fo_title.xsl b/com.antennahouse.pdf5.ml/xsl/dita2fo_title.xsl
index bb96260..a9908cf 100644
--- a/com.antennahouse.pdf5.ml/xsl/dita2fo_title.xsl
+++ b/com.antennahouse.pdf5.ml/xsl/dita2fo_title.xsl
@@ -908,7 +908,20 @@ E-mail : info@antennahouse.com
             </xsl:choose>
         </xsl:variable>
         
-        <xsl:variable name="result" select="if ($pAddPartToTitle) then concat($prefixPart,$numberPart,$suffixPart) else $numberPart"/>
+        <xsl:variable name="result" as="xs:string">
+            <xsl:choose>
+                <xsl:when test="not($pBuildMap)">
+                    <xsl:sequence select="''"/>
+                </xsl:when>
+                <xsl:when test="$pAddPartToTitle">
+                    <xsl:sequence select="concat($prefixPart,$numberPart,$suffixPart)"/>
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:sequence select="$numberPart"/>
+                </xsl:otherwise>
+            </xsl:choose>
+        </xsl:variable>
+        
         <xsl:sequence select="$result"/>
     </xsl:template>
 

From 723676c50328006fd88fb4af2d7a152718fd0c10 Mon Sep 17 00:00:00 2001
From: Toshihiko Makita <tmakita@antenna.co.jp>
Date: Mon, 12 Jun 2023 07:57:14 +0900
Subject: [PATCH 07/13] Remove index page from topic only input

---
 com.antennahouse.pdf5.ml/xsl/dita2fo_main.xsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/com.antennahouse.pdf5.ml/xsl/dita2fo_main.xsl b/com.antennahouse.pdf5.ml/xsl/dita2fo_main.xsl
index 9ad68c9..fb99a5f 100644
--- a/com.antennahouse.pdf5.ml/xsl/dita2fo_main.xsl
+++ b/com.antennahouse.pdf5.ml/xsl/dita2fo_main.xsl
@@ -100,7 +100,7 @@ E-mail : info@antennahouse.com
             </xsl:choose>
             
     	    <!-- Make index for map -->
-    	    <xsl:if test="$isMap and $pMakeIndexForMap and $pOutputIndex">
+            <xsl:if test="$isMap and $pMakeIndexForMap and $pOutputIndex and $pBuildMap">
     	        <xsl:call-template name="genMapIndex"/>
     	    </xsl:if>
     

From 86c794a165e570ca5d36dc934ca20d2739817ab6 Mon Sep 17 00:00:00 2001
From: Toshihiko Makita <tmakita@antenna.co.jp>
Date: Mon, 12 Jun 2023 11:03:23 +0900
Subject: [PATCH 08/13] Update dita2fo_param.xsl

Add global variable
---
 com.antennahouse.pdf5.ml/xsl/dita2fo_param.xsl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/com.antennahouse.pdf5.ml/xsl/dita2fo_param.xsl b/com.antennahouse.pdf5.ml/xsl/dita2fo_param.xsl
index 32840f0..6c8ebb2 100644
--- a/com.antennahouse.pdf5.ml/xsl/dita2fo_param.xsl
+++ b/com.antennahouse.pdf5.ml/xsl/dita2fo_param.xsl
@@ -349,5 +349,6 @@ E-mail : info@antennahouse.com
      -->
     <xsl:param name="PRM_BUILD_MAP" required="yes" as="xs:string"/>
     <xsl:variable name="pBuildMap" as="xs:boolean" select="$PRM_BUILD_MAP eq $cYes"/>
+    <xsl:variable name="pBuildTopic" as="xs:boolean" select="not($pBuildMap)"/>
     
 </xsl:stylesheet>

From b29b1e5b4859fdd98cf68c124aac537d9d40047d Mon Sep 17 00:00:00 2001
From: Toshihiko Makita <tmakita@antenna.co.jp>
Date: Mon, 12 Jun 2023 11:03:52 +0900
Subject: [PATCH 09/13] Update dita2fo_taskelements.xsl

Output footnote at the end of steps
---
 com.antennahouse.pdf5.ml/xsl/dita2fo_taskelements.xsl | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/com.antennahouse.pdf5.ml/xsl/dita2fo_taskelements.xsl b/com.antennahouse.pdf5.ml/xsl/dita2fo_taskelements.xsl
index 8cf31d9..ecbcb43 100644
--- a/com.antennahouse.pdf5.ml/xsl/dita2fo_taskelements.xsl
+++ b/com.antennahouse.pdf5.ml/xsl/dita2fo_taskelements.xsl
@@ -80,6 +80,11 @@ E-mail : info@antennahouse.com
                 </fo:list-block>
             </xsl:otherwise>
         </xsl:choose>
+        <xsl:if test="not($pDisplayFnAtEndOfTopic)">
+            <xsl:call-template name="makeFootNote">
+                <xsl:with-param name="prmElement"  select="."/>
+            </xsl:call-template>
+        </xsl:if>
     </xsl:template>
     
     <!-- 

From f7f5f0c4b880e289327e4a6acb984f53dbdd44d0 Mon Sep 17 00:00:00 2001
From: Toshihiko Makita <tmakita@antenna.co.jp>
Date: Mon, 12 Jun 2023 11:05:00 +0900
Subject: [PATCH 10/13] Rewrite xref/@href when it contains self topic id

---
 .../xsl/dita2fo_gen_merged_main.xsl           | 44 +++++++++++++++++--
 .../xsl/dita2fo_gen_merged_shell.xsl          |  6 +--
 2 files changed, 44 insertions(+), 6 deletions(-)

diff --git a/com.antennahouse.pdf5.ml/xsl/dita2fo_gen_merged_main.xsl b/com.antennahouse.pdf5.ml/xsl/dita2fo_gen_merged_main.xsl
index 80b075c..66c20d2 100644
--- a/com.antennahouse.pdf5.ml/xsl/dita2fo_gen_merged_main.xsl
+++ b/com.antennahouse.pdf5.ml/xsl/dita2fo_gen_merged_main.xsl
@@ -128,17 +128,55 @@
         <xsl:copy>
             <xsl:variable name="id" as="xs:string" select="@id => string()"/>
             <xsl:apply-templates select="@*">
-                <xsl:with-param name="prmId" select="$id"/>
+                <xsl:with-param name="prmId" tunnel="yes" select="$id"/>
+            </xsl:apply-templates>
+            <xsl:apply-templates>
+                <xsl:with-param name="prmId" tunnel="yes" as="xs:string" select="$id"/>
             </xsl:apply-templates>
-            <xsl:apply-templates/>
         </xsl:copy>
     </xsl:template>
 
     <xsl:template match="*[@class => contains-token('topic/topic')][ancestor::*[@class => contains-token('topic/topic')] => empty()]/@id" priority="10">
-        <xsl:param name="prmId" as="xs:string" required="yes"/>
+        <xsl:param name="prmId" as="xs:string" tunnel="yes" required="yes"/>
         <!--xsl:message select="'[@id] Match!'"/-->
         <xsl:attribute name="id" select="'unique_1'"/>
         <xsl:attribute name="oid" select="$prmId"/>
     </xsl:template>
+
+    <xsl:template match="*[@class => contains-token('topic/xref')]/@href" priority="10">
+        <xsl:param name="prmId" as="xs:string" tunnel="yes" required="yes"/>
+        <xsl:variable name="href" as="xs:string" select="string(.)"/>
+        <xsl:variable name="topicId" as="xs:string?">
+            <xsl:choose>
+                <xsl:when test="starts-with($href,'#')">
+                    <xsl:variable name="idAndElementIdPart" select="substring($href,2)"/>
+                    <xsl:choose>
+                        <xsl:when test="contains($idAndElementIdPart,'/')">
+                            <xsl:sequence select="substring-before($idAndElementIdPart,'/')"/>
+                        </xsl:when>
+                        <xsl:otherwise>
+                            <xsl:sequence select="$idAndElementIdPart"/>
+                        </xsl:otherwise>
+                    </xsl:choose>
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:sequence select="()"/>
+                </xsl:otherwise>
+            </xsl:choose>
+        </xsl:variable>
+        <xsl:choose>
+            <xsl:when test="$topicId => empty()">
+                <xsl:copy/>
+            </xsl:when>
+            <xsl:when test="$prmId  eq $topicId">
+                <xsl:attribute name="href">
+                    <xsl:value-of select="ahf:replace($href,('#'||$topicId),('#unique_1'))"/>
+                </xsl:attribute>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:copy/>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
     
 </xsl:stylesheet>
diff --git a/com.antennahouse.pdf5.ml/xsl/dita2fo_gen_merged_shell.xsl b/com.antennahouse.pdf5.ml/xsl/dita2fo_gen_merged_shell.xsl
index 93fe90f..fe5701d 100644
--- a/com.antennahouse.pdf5.ml/xsl/dita2fo_gen_merged_shell.xsl
+++ b/com.antennahouse.pdf5.ml/xsl/dita2fo_gen_merged_shell.xsl
@@ -23,10 +23,10 @@
          This styleshhet is intended to use XSLT 3.0 rather than XSLT 2.0.
          Use appropriate DITA-OT versions that support XSLT 3.0 XSLT stylesheet.
      -->
-    <!--xsl:include href="dita2fo_error_util.xsl"/>
     <xsl:include href="dita2fo_util.xsl"/>
-    <xsl:include href="dita2fo_dita_class.xsl"/>
-    <xsl:include href="dita2fo_common.xsl"/-->
+    <xsl:include href="dita2fo_error_util.xsl"/>
+    <xsl:include href="dita2fo_constants.xsl"/>
+    <xsl:include href="dita2fo_message.xsl"/>
     
     <xsl:include href="dita2fo_gen_merged_main.xsl"/>
     <xsl:include href="dita2fo_gen_merged_param.xsl"/>

From 02ec7ac6a48ac86dad9cb64ff65afd51cffddc6a Mon Sep 17 00:00:00 2001
From: Toshihiko Makita <tmakita@antenna.co.jp>
Date: Sat, 1 Jul 2023 17:27:38 +0900
Subject: [PATCH 11/13] Prepare V1.1.0 release

---
 com.antennahouse.pdf5.ml/revision.txt         | 8 +++++++-
 com.antennahouse.pdf5.ml/xsl/dita2fo_main.xsl | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/com.antennahouse.pdf5.ml/revision.txt b/com.antennahouse.pdf5.ml/revision.txt
index dc8ae13..bbd9631 100644
--- a/com.antennahouse.pdf5.ml/revision.txt
+++ b/com.antennahouse.pdf5.ml/revision.txt
@@ -2,9 +2,15 @@
 
                  Antenna House PDF5-ML Plug-in Revision Notes
 
-      Copyright (C) 2009-2022 Antenna House, Inc. All rights reserved.
+      Copyright (C) 2009-2023 Antenna House, Inc. All rights reserved.
              Antenna House is a trademark of Antenna House, Inc.
 _______________________________________________________________________________
+Jul. 2023
+V1.1.0
+- Introduce dita2fo_util_node.xsl
+- Ignore empty shortdesc, abstract, body
+- Implement the topic only output 
+
 Nov. 2022
 V1.0.9
 - Fix 218
diff --git a/com.antennahouse.pdf5.ml/xsl/dita2fo_main.xsl b/com.antennahouse.pdf5.ml/xsl/dita2fo_main.xsl
index fb99a5f..12c00d4 100644
--- a/com.antennahouse.pdf5.ml/xsl/dita2fo_main.xsl
+++ b/com.antennahouse.pdf5.ml/xsl/dita2fo_main.xsl
@@ -29,7 +29,7 @@ E-mail : info@antennahouse.com
         <!-- Plug-in name and version -->
         <xsl:variable name="pluginAuthor" as="xs:string" select="'Antenna House'"/>
         <xsl:variable name="pluginName" as="xs:string" select="'PDF5-ML'"/>
-        <xsl:variable name="pluginVersion" as="xs:string" select="'1.0.9'"/>
+        <xsl:variable name="pluginVersion" as="xs:string" select="'1.1.0'"/>
         <xsl:message select="concat($pluginAuthor,' ',$pluginName,' plug-in Version: ',$pluginVersion)"/>
         <!-- XSLT processor information -->
         <xsl:variable name="vendor" as="xs:string" select="system-property('xsl:vendor')"/>

From 86be2eaca05213f4cb770eddf939396fe890e26c Mon Sep 17 00:00:00 2001
From: Toshihiko Makita <tmakita@antenna.co.jp>
Date: Sat, 1 Jul 2023 20:18:56 +0900
Subject: [PATCH 12/13] Added plug-in version (Effective from DITA-OT 4.1)

---
 com.antennahouse.pdf5.ml/plugin.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/com.antennahouse.pdf5.ml/plugin.xml b/com.antennahouse.pdf5.ml/plugin.xml
index e030083..d1b2ef0 100644
--- a/com.antennahouse.pdf5.ml/plugin.xml
+++ b/com.antennahouse.pdf5.ml/plugin.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<plugin id="com.antennahouse.pdf5.ml">
+<plugin id="com.antennahouse.pdf5.ml" version="1.1.0">
   <extension-point id="com.antennahouse.pdf5.ml.param" name="PDF XSLT parameters (JAXP)"/>
   <extension-point id="com.antennahouse.pdf5.ml.saxon.param" name="PDF XSLT parameters (SAXON)"/>
   <extension-point id="com.antennahouse.pdf5.ml.psmi.param" name="PDF XSLT parameters (PSMI)"/>

From 3444244c47dd2b24879b8051b52379b30ea79e7e Mon Sep 17 00:00:00 2001
From: Toshihiko Makita <tmakita@antenna.co.jp>
Date: Sat, 1 Jul 2023 20:22:50 +0900
Subject: [PATCH 13/13] Update revision.txt

Add description for topic input.
---
 com.antennahouse.pdf5.ml/revision.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/com.antennahouse.pdf5.ml/revision.txt b/com.antennahouse.pdf5.ml/revision.txt
index bbd9631..982e3b5 100644
--- a/com.antennahouse.pdf5.ml/revision.txt
+++ b/com.antennahouse.pdf5.ml/revision.txt
@@ -10,6 +10,8 @@ V1.1.0
 - Introduce dita2fo_util_node.xsl
 - Ignore empty shortdesc, abstract, body
 - Implement the topic only output 
+  Now you can specify topic file as input via dita command "-i [your topic file path]" 
+  or ant command-line "-Dargs.input=[your topic file path]".
 
 Nov. 2022
 V1.0.9