metanorma-iso 2.9.5 → 2.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1fe83bad2a7399c95b11c24d60ba37fb5068570bb7da9af1cf0bee99380dfc3f
-  data.tar.gz: a7b5bee127f589a01fbe2d4161c2ab1dfc3b7f2c03ca96d9294871dbbd25640c
+  metadata.gz: 02b8536c8dedc08d06356682d97dc203baa51f10136f1d8f5bd4166418f8ae0c
+  data.tar.gz: 46cd7825f277c494a45a626f16b72a7471d4894a6d85bb8fa58f184be73fa030
 SHA512:
-  metadata.gz: 2990837a34da1911b1070d458e735411235e6d2619993a95f2db33608ade897e289d4bb22e13897e5cfa5fd8b1ad60d129d5c65b5a85821dd556be724b202ca1
-  data.tar.gz: 808778fb664c374ce55a916da7b7e3389614ccd5a78297d525aed3926005256edceab2f72b80a4b50f194cdf270706fd4ec89071176b1f29b2484bd870fb9cf7
+  metadata.gz: 040eb6a7c0a9ed836363a87d63bd539093c56eb41d8e0e8770c11f64ecf3bf02ffa46a631b8db1a47877818a937f15fe31459c043ff8ab851dc4e07b3cd615ca
+  data.tar.gz: 0436551ec589f985bdf87d0028f68466000582a644ccbc9212427c5ac7e1dbef6e75f7c5fb11b5678f66ba84ffa333d5ca9bdd82dabf3ea5a2586a46d99a668c

data/lib/isodoc/iso/iso.amendment.xsl

@@ -11274,9 +11274,14 @@
 
 		<xsl:variable name="simple-table">
 
+			<xsl:variable name="table_without_semantic_elements">
+				<xsl:apply-templates mode="update_xml_pres"/>
+			</xsl:variable>
+
 			<!-- Step 0. replace <br/> to <p>...</p> -->
 			<xsl:variable name="table_without_br">
-				<xsl:apply-templates mode="table-without-br"/>
+				<!-- <xsl:apply-templates mode="table-without-br"/> -->
+				<xsl:apply-templates select="xalan:nodeset($table_without_semantic_elements)" mode="table-without-br"/>
 			</xsl:variable>
 
 			<!-- Step 1. colspan processing -->
@@ -17441,16 +17446,30 @@
 
 	<xsl:template match="*[local-name() = 'fmt-name']"/>
 	<xsl:template match="*[local-name() = 'fmt-name']" mode="update_xml_step1">
-		<xsl:element name="name" namespace="{$namespace_full}">
-			<xsl:copy-of select="@*"/>
-			<xsl:apply-templates mode="update_xml_step1"/>
-		</xsl:element>
+		<xsl:choose>
+			<xsl:when test="local-name(..) = 'p' and ancestor::*[local-name() = 'table']">
+				<xsl:apply-templates mode="update_xml_step1"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:element name="name" namespace="{$namespace_full}">
+					<xsl:copy-of select="@*"/>
+					<xsl:apply-templates mode="update_xml_step1"/>
+				</xsl:element>
+			</xsl:otherwise>
+		</xsl:choose>
 	</xsl:template>
 	<xsl:template match="*[local-name() = 'fmt-name']" mode="update_xml_pres">
-		<xsl:element name="name" namespace="{$namespace_full}">
-			<xsl:copy-of select="@*"/>
-			<xsl:apply-templates mode="update_xml_pres"/>
-		</xsl:element>
+		<xsl:choose>
+			<xsl:when test="local-name(..) = 'p' and ancestor::*[local-name() = 'table']">
+				<xsl:apply-templates mode="update_xml_step1"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:element name="name" namespace="{$namespace_full}">
+					<xsl:copy-of select="@*"/>
+					<xsl:apply-templates mode="update_xml_pres"/>
+				</xsl:element>
+			</xsl:otherwise>
+		</xsl:choose>
 	</xsl:template>
 
 	<xsl:template match="*[local-name() = 'fmt-preferred']"/>
@@ -17548,6 +17567,9 @@
 		<xsl:apply-templates mode="update_xml_pres"/>
 	</xsl:template>
 
+	<xsl:template match="*[local-name() = 'semx']">
+		<xsl:apply-templates/>
+	</xsl:template>
 	<xsl:template match="*[local-name() = 'semx']" mode="update_xml_step1">
 		<xsl:apply-templates mode="update_xml_step1"/>
 	</xsl:template>

data/lib/isodoc/iso/iso.international-standard.xsl

@@ -11274,9 +11274,14 @@
 
 		<xsl:variable name="simple-table">
 
+			<xsl:variable name="table_without_semantic_elements">
+				<xsl:apply-templates mode="update_xml_pres"/>
+			</xsl:variable>
+
 			<!-- Step 0. replace <br/> to <p>...</p> -->
 			<xsl:variable name="table_without_br">
-				<xsl:apply-templates mode="table-without-br"/>
+				<!-- <xsl:apply-templates mode="table-without-br"/> -->
+				<xsl:apply-templates select="xalan:nodeset($table_without_semantic_elements)" mode="table-without-br"/>
 			</xsl:variable>
 
 			<!-- Step 1. colspan processing -->
@@ -17441,16 +17446,30 @@
 
 	<xsl:template match="*[local-name() = 'fmt-name']"/>
 	<xsl:template match="*[local-name() = 'fmt-name']" mode="update_xml_step1">
-		<xsl:element name="name" namespace="{$namespace_full}">
-			<xsl:copy-of select="@*"/>
-			<xsl:apply-templates mode="update_xml_step1"/>
-		</xsl:element>
+		<xsl:choose>
+			<xsl:when test="local-name(..) = 'p' and ancestor::*[local-name() = 'table']">
+				<xsl:apply-templates mode="update_xml_step1"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:element name="name" namespace="{$namespace_full}">
+					<xsl:copy-of select="@*"/>
+					<xsl:apply-templates mode="update_xml_step1"/>
+				</xsl:element>
+			</xsl:otherwise>
+		</xsl:choose>
 	</xsl:template>
 	<xsl:template match="*[local-name() = 'fmt-name']" mode="update_xml_pres">
-		<xsl:element name="name" namespace="{$namespace_full}">
-			<xsl:copy-of select="@*"/>
-			<xsl:apply-templates mode="update_xml_pres"/>
-		</xsl:element>
+		<xsl:choose>
+			<xsl:when test="local-name(..) = 'p' and ancestor::*[local-name() = 'table']">
+				<xsl:apply-templates mode="update_xml_step1"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:element name="name" namespace="{$namespace_full}">
+					<xsl:copy-of select="@*"/>
+					<xsl:apply-templates mode="update_xml_pres"/>
+				</xsl:element>
+			</xsl:otherwise>
+		</xsl:choose>
 	</xsl:template>
 
 	<xsl:template match="*[local-name() = 'fmt-preferred']"/>
@@ -17548,6 +17567,9 @@
 		<xsl:apply-templates mode="update_xml_pres"/>
 	</xsl:template>
 
+	<xsl:template match="*[local-name() = 'semx']">
+		<xsl:apply-templates/>
+	</xsl:template>
 	<xsl:template match="*[local-name() = 'semx']" mode="update_xml_step1">
 		<xsl:apply-templates mode="update_xml_step1"/>
 	</xsl:template>

data/lib/metanorma/iso/cleanup.rb

@@ -42,7 +42,8 @@ module Metanorma
       end
 
       TERM_CLAUSE =
-        "//sections//terms[not(preceding-sibling::clause)] | " \
+        "//sections/terms | " \
+        "//sections/clause//terms[not(preceding-sibling::clause)] | " \
         "//sections//clause[descendant::terms][not(descendant::definitions)][@type = 'terms'] | " \
         "//sections/clause[not(@type = 'terms')][not(descendant::definitions)]//terms".freeze
 

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Iso
-    VERSION = "2.9.5".freeze
+    VERSION = "2.9.6".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 2.9.5
+  version: 2.9.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-20 00:00:00.000000000 Z
+date: 2025-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc