From 292907d2d3368002b62d4dd3db8eeb24387b0761 Mon Sep 17 00:00:00 2001
From: Jarno Elovirta <jarno.elovirta@wunderdog.fi>
Date: Fri, 3 Mar 2023 11:36:39 +0200
Subject: [PATCH 1/6] Remove key artefacts

---
 build.xml         | 15 +++++++++++++++
 plugin.xml        |  7 ++++++-
 xsl/normalize.xsl | 10 +++++++++-
 3 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/build.xml b/build.xml
index 7dd91f6..90564b2 100644
--- a/build.xml
+++ b/build.xml
@@ -9,11 +9,26 @@
           depends="build-init,
                    preprocess">
     <makeurl property="output.dir.uri" file="${output.dir}"/>
+    <local name="_normalize-strip-keyref"/>
+    <condition property="_normalize-strip-keyref" value="true" else="false">
+      <and>
+        <not>
+          <isset property="keyref.skip"/>
+        </not>
+        <or>
+          <istrue value="${normalize-strip-keyref}"/>
+          <not>
+            <isset property="normalize-strip-keyref"/>
+          </not>
+        </or>
+      </and>
+    </condition>
     <!--pipeline message="Normalize DITA files" taskname="normalize"-->
       <xslt in="${dita.temp.dir}/.job.xml" out="${dita.temp.dir}/.job.xml.temp"
             style="${dita.plugin.org.dita.normalize.dir}/xsl/normalize.xsl"
             taskname="normalize">
         <param name="output.dir.uri" expression="${output.dir.uri}"/>
+        <param name="normalize-strip-keyref" expression="${_normalize-strip-keyref}"/>
         <xmlcatalog refid="dita.catalog"/>
       </xslt>
     <!--/pipeline-->
diff --git a/plugin.xml b/plugin.xml
index ca985c0..3e233ba 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -4,6 +4,11 @@
   See the accompanying license.txt file for applicable licenses.
 -->
 <plugin id="org.dita.normalize">
-  <transtype name="dita" desc="Normalized DITA"/>
+  <transtype name="dita" desc="Normalized DITA">
+    <param name="normalize-strip-keyref" desc="Remove key artefacts after key resolution." type="enum">
+      <val default="true">yes</val>
+      <val>no</val>
+    </param>
+  </transtype>
   <feature extension="dita.conductor.target.relative" file="conductor.xml"/>
 </plugin>
diff --git a/xsl/normalize.xsl b/xsl/normalize.xsl
index 933aab0..3c2575f 100644
--- a/xsl/normalize.xsl
+++ b/xsl/normalize.xsl
@@ -13,7 +13,8 @@
 
   <xsl:import href="plugin:org.dita.base:xsl/common/uri-utils.xsl"/>
 
-  <xsl:param name="output.dir.uri"/>
+  <xsl:param name="output.dir.uri" as="xs:string"/>
+  <xsl:param name="normalize-strip-keyref" as="xs:string"/>
 
   <xsl:function name="dita-ot:get-fragment" as="xs:string">
     <xsl:param name="input" as="xs:string"/>
@@ -157,6 +158,13 @@
     </xsl:element>
   </xsl:template>
 
+  <xsl:template match="*[contains(@class, ' map/topicref ')]
+                        [exists(@keys) and @processing-role = 'resource-only']
+                        [$normalize-strip-keyref = 'true']"/>
+
+  <xsl:template match="@keyref[$normalize-strip-keyref = 'true'] |
+                       @keys[$normalize-strip-keyref = 'true']"/>
+
   <xsl:template match="*[contains(@class, ' topic/xref ') or
                          contains(@class, ' topic/xref ') or
                          contains(@class, ' map/topicref ')]

From a801ea4b593d4ce8a1f331e00d183b18e333967c Mon Sep 17 00:00:00 2001
From: Jarno Elovirta <jarno.elovirta@wunderdog.fi>
Date: Fri, 3 Mar 2023 13:10:54 +0200
Subject: [PATCH 2/6] Strip ditavalref elements

---
 build.xml         | 15 +++++++++++++++
 plugin.xml        |  4 ++++
 xsl/normalize.xsl |  4 ++++
 3 files changed, 23 insertions(+)

diff --git a/build.xml b/build.xml
index 90564b2..8a178a3 100644
--- a/build.xml
+++ b/build.xml
@@ -23,12 +23,27 @@
         </or>
       </and>
     </condition>
+    <local name="_normalize-strip-branch-filter"/>
+    <condition property="_normalize-strip-branch-filter" value="true" else="false">
+      <and>
+        <not>
+          <isset property="branch-filter.skip"/>
+        </not>
+        <or>
+          <istrue value="${normalize-strip-branch-filter}"/>
+          <not>
+            <isset property="normalize-strip-branch-filter"/>
+          </not>
+        </or>
+      </and>
+    </condition>
     <!--pipeline message="Normalize DITA files" taskname="normalize"-->
       <xslt in="${dita.temp.dir}/.job.xml" out="${dita.temp.dir}/.job.xml.temp"
             style="${dita.plugin.org.dita.normalize.dir}/xsl/normalize.xsl"
             taskname="normalize">
         <param name="output.dir.uri" expression="${output.dir.uri}"/>
         <param name="normalize-strip-keyref" expression="${_normalize-strip-keyref}"/>
+        <param name="normalize-strip-branch-filter" expression="${_normalize-strip-branch-filter}"/>
         <xmlcatalog refid="dita.catalog"/>
       </xslt>
     <!--/pipeline-->
diff --git a/plugin.xml b/plugin.xml
index 3e233ba..78e9aac 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -9,6 +9,10 @@
       <val default="true">yes</val>
       <val>no</val>
     </param>
+    <param name="normalize-strip-branch-filter" desc="Remove branch filter artefacts after branch filter resolution." type="enum">
+      <val default="true">yes</val>
+      <val>no</val>
+    </param>
   </transtype>
   <feature extension="dita.conductor.target.relative" file="conductor.xml"/>
 </plugin>
diff --git a/xsl/normalize.xsl b/xsl/normalize.xsl
index 3c2575f..2cc2ee8 100644
--- a/xsl/normalize.xsl
+++ b/xsl/normalize.xsl
@@ -15,6 +15,7 @@
 
   <xsl:param name="output.dir.uri" as="xs:string"/>
   <xsl:param name="normalize-strip-keyref" as="xs:string"/>
+  <xsl:param name="normalize-strip-branch-filter" as="xs:string"/>
 
   <xsl:function name="dita-ot:get-fragment" as="xs:string">
     <xsl:param name="input" as="xs:string"/>
@@ -165,6 +166,9 @@
   <xsl:template match="@keyref[$normalize-strip-keyref = 'true'] |
                        @keys[$normalize-strip-keyref = 'true']"/>
 
+  <xsl:template match="*[contains(@class, ' ditavalref-d/ditavalref ')]
+                        [$normalize-strip-branch-filter = 'true']"/>
+
   <xsl:template match="*[contains(@class, ' topic/xref ') or
                          contains(@class, ' topic/xref ') or
                          contains(@class, ' map/topicref ')]

From 90672a536b01f69c77f249043359d9e29d0dc7fa Mon Sep 17 00:00:00 2001
From: Jarno Elovirta <jarno.elovirta@wunderdog.fi>
Date: Fri, 3 Mar 2023 13:11:02 +0200
Subject: [PATCH 3/6] Ignore path2rootmap-uri PI

---
 xsl/normalize.xsl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/xsl/normalize.xsl b/xsl/normalize.xsl
index 2cc2ee8..a3b3e22 100644
--- a/xsl/normalize.xsl
+++ b/xsl/normalize.xsl
@@ -143,6 +143,7 @@
                        processing-instruction('workdir-uri') |
                        processing-instruction('path2project') |
                        processing-instruction('path2project-uri') |
+                       processing-instruction('path2rootmap-uri') |
                        processing-instruction('ditaot') |
                        processing-instruction('doctype-public') |
                        processing-instruction('doctype-system') |

From 94f972b75564c45e0214ff3d3f64188b37fe2534 Mon Sep 17 00:00:00 2001
From: Jarno Elovirta <jarno.elovirta@wunderdog.fi>
Date: Fri, 3 Mar 2023 13:51:31 +0200
Subject: [PATCH 4/6] Fix condition checks

---
 build.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.xml b/build.xml
index 8a178a3..ac51833 100644
--- a/build.xml
+++ b/build.xml
@@ -13,7 +13,7 @@
     <condition property="_normalize-strip-keyref" value="true" else="false">
       <and>
         <not>
-          <isset property="keyref.skip"/>
+          <isset property="preprocess.keyref.skip"/>
         </not>
         <or>
           <istrue value="${normalize-strip-keyref}"/>
@@ -27,7 +27,7 @@
     <condition property="_normalize-strip-branch-filter" value="true" else="false">
       <and>
         <not>
-          <isset property="branch-filter.skip"/>
+          <isset property="preprocess.branch-filter.skip"/>
         </not>
         <or>
           <istrue value="${normalize-strip-branch-filter}"/>

From 6cf639796e0a965c5cbd8ad3eec0af6817e451de Mon Sep 17 00:00:00 2001
From: Jarno Elovirta <jarno.elovirta@wunderdog.fi>
Date: Fri, 3 Mar 2023 16:28:00 +0200
Subject: [PATCH 5/6] Clean bugs that cause output to be invalid

---
 xsl/normalize.xsl | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/xsl/normalize.xsl b/xsl/normalize.xsl
index a3b3e22..ce59c6b 100644
--- a/xsl/normalize.xsl
+++ b/xsl/normalize.xsl
@@ -171,7 +171,8 @@
                         [$normalize-strip-branch-filter = 'true']"/>
 
   <xsl:template match="*[contains(@class, ' topic/xref ') or
-                         contains(@class, ' topic/xref ') or
+                         contains(@class, ' topic/link ') or
+                         (contains(@class, ' topic/keyword') and exists(@href)) or
                          contains(@class, ' map/topicref ')]
                         [empty(@format) or @format = 'dita']
                         [empty(@scope) or @scope = 'local']/@href">
@@ -194,6 +195,21 @@
     </xsl:choose>
   </xsl:template>
 
+  <xsl:template match="*[contains(@class, ' topic/keyword ') and exists(@href)]">
+    <xref>
+      <xsl:apply-templates select="@*"/>
+      <xsl:attribute name="class">- topic/xref </xsl:attribute>
+      <xsl:apply-templates select="node()"/>
+    </xref>
+  </xsl:template>
+
+  <xsl:template match="*[contains(@class, ' topic/pre ')]/@xml:space[. = 'preserve'] |
+                       @scope[. = 'local'] |
+                       @format[. = 'dita'] |
+                       *[contains(@class, ' topic/xref ')]/@locktitle"/>
+
+  <xsl:template match="*[contains(@class, ' subjectScheme/')]" priority="5"/>
+
   <xsl:template match="*[contains(@class, ' topic/entry ')]/@colname">
     <xsl:if test="empty(../@namest) and empty(../@nameend)">
       <xsl:copy-of select="."/>

From 901acac920f57c04efb3de748963c64643d14ce3 Mon Sep 17 00:00:00 2001
From: Jarno Elovirta <jarno.elovirta@wunderdog.fi>
Date: Sun, 5 Mar 2023 09:19:51 +0200
Subject: [PATCH 6/6] Document

---
 xsl/normalize.xsl | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/xsl/normalize.xsl b/xsl/normalize.xsl
index ce59c6b..5e13765 100644
--- a/xsl/normalize.xsl
+++ b/xsl/normalize.xsl
@@ -136,9 +136,11 @@
     </xsl:choose>
   </xsl:function>
 
+  <!-- Remove default attributes from schema -->
   <xsl:template match="@class | @domains | @specializations | @xtrf | @xtrc | @ditaarch:DITAArchVersion"
                 priority="10"/>
 
+  <!-- Remove processing time PIs -->
   <xsl:template match="processing-instruction('workdir') |
                        processing-instruction('workdir-uri') |
                        processing-instruction('path2project') |
@@ -151,8 +153,10 @@
                        @mapclass"
                 priority="10"/>
 
+  <!-- Remove cascade inserted by preprocess -->
   <xsl:template match="*[number(@ditaarch:DITAArchVersion) &lt; 1.3]/@cascade"/>
 
+  <!-- Rename elements to match class type -->
   <xsl:template match="*[@class]" priority="-5">
     <xsl:element name="{tokenize(tokenize(normalize-space(@class), '\s+')[last()], '/')[last()]}"
       namespace="{namespace-uri()}">
@@ -160,16 +164,20 @@
     </xsl:element>
   </xsl:template>
 
+  <!-- Remove resolved keydefs -->
   <xsl:template match="*[contains(@class, ' map/topicref ')]
                         [exists(@keys) and @processing-role = 'resource-only']
                         [$normalize-strip-keyref = 'true']"/>
 
+  <!-- Remove resolved key definition and references -->
   <xsl:template match="@keyref[$normalize-strip-keyref = 'true'] |
                        @keys[$normalize-strip-keyref = 'true']"/>
 
+  <!-- Remove resolved ditavalrefs -->
   <xsl:template match="*[contains(@class, ' ditavalref-d/ditavalref ')]
                         [$normalize-strip-branch-filter = 'true']"/>
 
+  <!-- Rewrite link target -->
   <xsl:template match="*[contains(@class, ' topic/xref ') or
                          contains(@class, ' topic/link ') or
                          (contains(@class, ' topic/keyword') and exists(@href)) or
@@ -195,6 +203,7 @@
     </xsl:choose>
   </xsl:template>
 
+  <!-- Rename keyword that has been converted into a link using keys -->
   <xsl:template match="*[contains(@class, ' topic/keyword ') and exists(@href)]">
     <xref>
       <xsl:apply-templates select="@*"/>
@@ -203,6 +212,7 @@
     </xref>
   </xsl:template>
 
+  <!-- Remove default attributes -->
   <xsl:template match="*[contains(@class, ' topic/pre ')]/@xml:space[. = 'preserve'] |
                        @scope[. = 'local'] |
                        @format[. = 'dita'] |
@@ -210,6 +220,7 @@
 
   <xsl:template match="*[contains(@class, ' subjectScheme/')]" priority="5"/>
 
+  <!-- Remove colname inserted by preprocess -->
   <xsl:template match="*[contains(@class, ' topic/entry ')]/@colname">
     <xsl:if test="empty(../@namest) and empty(../@nameend)">
       <xsl:copy-of select="."/>