From dd7cc7ff396e716bd883cf9b4fa48647609c6510 Mon Sep 17 00:00:00 2001
From: Alexander Dyuzhev <dyuzhev@gmail.com>
Date: Sat, 3 Sep 2022 15:40:46 +0300
Subject: [PATCH 1/2] tables_only.xsl updated for dl in colspan table cells,
 metanorma/mn-native-pdf#365

---
 src/main/resources/tables_only.xsl | 58 ++++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)

diff --git a/src/main/resources/tables_only.xsl b/src/main/resources/tables_only.xsl
index e98c4816..929bdce6 100644
--- a/src/main/resources/tables_only.xsl
+++ b/src/main/resources/tables_only.xsl
@@ -41,4 +41,62 @@
 	
 	<xsl:template match="*[local-name() = 'fn']"/>
 	
+	<xsl:template match="*[local-name() = 'table' or local-name() = 'dl']">
+		<xsl:param name="child">false</xsl:param>
+		<xsl:choose>
+			<xsl:when test="ancestor::*[local-name() = 'table' or local-name() = 'dl']"> <!-- if there is parent table / definition list -->
+				
+				
+				<xsl:choose>
+					<xsl:when test="local-name() = 'table'">
+					
+						<!-- <xsl:copy>
+							<xsl:apply-templates select="@*|node()"/>
+						</xsl:copy> -->
+						
+						<!-- create simple table and then paragraphs from it  -->
+					
+					</xsl:when>
+					<xsl:when test="local-name() = 'dl'">
+						<!-- convert definition list to paragraphs -->
+						<xsl:for-each select=".//*[local-name() = 'dt']">
+							<xsl:variable name="ns" select="namespace-uri()"/>
+							<xsl:element name="p" namespace="{$ns}">
+								<xsl:copy-of select="node()"/>
+								<xsl:text> </xsl:text>
+								<xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]/*[local-name() = 'p']/node()" />
+							</xsl:element>
+						</xsl:for-each>
+					</xsl:when>
+				</xsl:choose>
+				
+				
+			</xsl:when>
+			<xsl:otherwise> <!-- table/dl doesn't have parent tables / definition lists, i.e. most upper element -->
+				
+				<!-- <xsl:if test="$child = 'true'"> -->
+					<xsl:copy>
+						<xsl:apply-templates select="@*|node()"/>
+					</xsl:copy>
+				<!-- </xsl:if> -->
+				<!-- put child tables / definition lists after table -->
+				
+				<!-- isolate child table and dl from parent table context -->
+				<xsl:variable name="table_dl_id" select="@id"/>
+				<xsl:variable name="child_tables_dl">
+					<xsl:for-each select=".//*[local-name() = 'table' or local-name() = 'dl'][ancestor::*[local-name() = 'table' or local-name() = 'dl'][1][@id = $table_dl_id]]">
+						<xsl:copy-of select="."/>
+					</xsl:for-each>
+				</xsl:variable>
+				<!-- <iter> -->
+				<xsl:apply-templates select="xalan:nodeset($child_tables_dl)/*">
+					<xsl:with-param name="child">true</xsl:with-param>
+				</xsl:apply-templates>
+				<!-- </iter> -->
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
+	
+	
+	
 </xsl:stylesheet>

From 218356203358a0a7040115c55b2ef49db1e60e91 Mon Sep 17 00:00:00 2001
From: Alexander Dyuzhev <dyuzhev@gmail.com>
Date: Sat, 3 Sep 2022 17:43:37 +0300
Subject: [PATCH 2/2] tables_only.xsl updated for table in colspan table cells,
 metanorma/mn-native-pdf#365

---
 src/main/resources/tables_only.xsl | 54 ++++++++++++++++++++----------
 1 file changed, 36 insertions(+), 18 deletions(-)

diff --git a/src/main/resources/tables_only.xsl b/src/main/resources/tables_only.xsl
index 929bdce6..652e603b 100644
--- a/src/main/resources/tables_only.xsl
+++ b/src/main/resources/tables_only.xsl
@@ -42,7 +42,6 @@
 	<xsl:template match="*[local-name() = 'fn']"/>
 	
 	<xsl:template match="*[local-name() = 'table' or local-name() = 'dl']">
-		<xsl:param name="child">false</xsl:param>
 		<xsl:choose>
 			<xsl:when test="ancestor::*[local-name() = 'table' or local-name() = 'dl']"> <!-- if there is parent table / definition list -->
 				
@@ -50,14 +49,20 @@
 				<xsl:choose>
 					<xsl:when test="local-name() = 'table'">
 					
-						<!-- <xsl:copy>
-							<xsl:apply-templates select="@*|node()"/>
-						</xsl:copy> -->
-						
-						<!-- create simple table and then paragraphs from it  -->
+						<xsl:for-each select=".//*[local-name() = 'tr']">
+							<xsl:variable name="ns" select="namespace-uri()"/>
+							<xsl:element name="p" namespace="{$ns}">
+								<xsl:for-each select=".//*[local-name() = 'td']">
+									<xsl:apply-templates mode="simple_td"/>
+									<xsl:text> </xsl:text>
+								</xsl:for-each>
+							</xsl:element>
+						</xsl:for-each>
+					
+					</xsl:when> <!-- table -->
 					
-					</xsl:when>
 					<xsl:when test="local-name() = 'dl'">
+					
 						<!-- convert definition list to paragraphs -->
 						<xsl:for-each select=".//*[local-name() = 'dt']">
 							<xsl:variable name="ns" select="namespace-uri()"/>
@@ -67,18 +72,16 @@
 								<xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]/*[local-name() = 'p']/node()" />
 							</xsl:element>
 						</xsl:for-each>
-					</xsl:when>
+					</xsl:when> <!-- dl -->
+					
 				</xsl:choose>
-				
-				
 			</xsl:when>
 			<xsl:otherwise> <!-- table/dl doesn't have parent tables / definition lists, i.e. most upper element -->
 				
-				<!-- <xsl:if test="$child = 'true'"> -->
-					<xsl:copy>
-						<xsl:apply-templates select="@*|node()"/>
-					</xsl:copy>
-				<!-- </xsl:if> -->
+				<xsl:copy>
+					<xsl:apply-templates select="@*|node()"/>
+				</xsl:copy>
+				
 				<!-- put child tables / definition lists after table -->
 				
 				<!-- isolate child table and dl from parent table context -->
@@ -89,14 +92,29 @@
 					</xsl:for-each>
 				</xsl:variable>
 				<!-- <iter> -->
-				<xsl:apply-templates select="xalan:nodeset($child_tables_dl)/*">
-					<xsl:with-param name="child">true</xsl:with-param>
-				</xsl:apply-templates>
+				<xsl:apply-templates select="xalan:nodeset($child_tables_dl)/*" />
 				<!-- </iter> -->
 			</xsl:otherwise>
 		</xsl:choose>
 	</xsl:template>
 	
+
+	<xsl:template match="@*|node()" mode="simple_td">
+		<xsl:copy>
+				<xsl:apply-templates select="@*|node()" mode="simple_td"/>
+		</xsl:copy>
+	</xsl:template>
 	
+	<xsl:template match="*[local-name() = 'dl']" mode="simple_td">
+		<!-- convert definition list to paragraphs -->
+		<xsl:for-each select=".//*[local-name() = 'dt']">
+			<xsl:variable name="ns" select="namespace-uri()"/>
+			<xsl:element name="p" namespace="{$ns}">
+				<xsl:copy-of select="node()"/>
+				<xsl:text> </xsl:text>
+				<xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]/*[local-name() = 'p']/node()" mode="simple_td"/>
+			</xsl:element>
+		</xsl:for-each>
+	</xsl:template>
 	
 </xsl:stylesheet>