metanorma-cc 2.8.2 → 2.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92b75430711039a12ea6f8907c406e7cfc01a5169e4f31f643ee0aaeb542954e
-  data.tar.gz: 1bcd9bfcdfaab4918a83c9c1968b6cd9b2cd51369adc03ad905d01e12fa71070
+  metadata.gz: cc0ffb6813bd4a4a9451ddba8a1d68f8b485e9a8ef182e77daa5cc31cd3078fe
+  data.tar.gz: 012fa0089b821d23d6a43a5b09aa42384a651489e9723bd73fec055323857dfd
 SHA512:
-  metadata.gz: 06a496b5fc95f4450c0b4673e81430b16d20dfbee0294abe6052a999b09403fbd598b68107fe3667376d81962f7de807f9ace6b5b608dc14cb77a078889c7c4c
-  data.tar.gz: 6fb8e7bda62fdb553c61a0740202ffc4039f0f4ea14b7927d6ab22705b508c24ca9ae605ab87eb9607382d767daf152c27750f332918a823a6f3f2f7a50d4eb2
+  metadata.gz: b21c5e472e3f29cede108ffcf078ba4b5ea024c12db3c219976e43ef44d451573c31f78e4f7f7dc72d7b37e6c9f5ee5cc8484711b926405558eb6a32337d2428
+  data.tar.gz: 4f77fe9a73a8f7b6ab8f81d2609d692057f56749705c32e035f279dbe1e1a70f8fdf934250483569c72144f8219b1f4421b2ea2dc20c3fb0fe680b3bcfab9c13

data/lib/isodoc/cc/cc.standard.xsl

@@ -538,13 +538,23 @@
 			<xsl:variable name="title">
 				<xsl:call-template name="getName"/>
 			</xsl:variable>
+			<xsl:variable name="variant_title">
+				<xsl:copy-of select="mn:variant-title[@type = 'toc']/node()"/>
+			</xsl:variable>
 
 			<mnx:item id="{@id}" level="{$level}" section="{$section}" display="{$display}">
 				<xsl:if test="$type = 'indexsect'">
 					<xsl:attribute name="level">1</xsl:attribute>
 				</xsl:if>
 				<mnx:title>
-					<xsl:apply-templates select="xalan:nodeset($title)" mode="contents_item"/>
+					<xsl:choose>
+						<xsl:when test="normalize-space($variant_title) != ''">
+							<xsl:apply-templates select="xalan:nodeset($variant_title)" mode="contents_item"/>
+						</xsl:when>
+						<xsl:otherwise>
+							<xsl:apply-templates select="xalan:nodeset($title)" mode="contents_item"/>
+						</xsl:otherwise>
+					</xsl:choose>
 				</mnx:title>
 				<xsl:if test="$type != 'indexsect'">
 					<xsl:apply-templates mode="contents"/>
@@ -1299,7 +1309,24 @@
 	<xsl:template match="mn:metanorma-extension/*[local-name() = 'UnitsML']" mode="update_xml_step1"/>
 
 	<!-- remove image/emf -->
-	<xsl:template match="mn:image/mn:emf" mode="update_xml_step1"/>
+	<xsl:template match="mn:image//mn:emf" mode="update_xml_step1"/>
+
+	<!-- https://github.com/metanorma/metanorma/issues/540 -->
+	<xsl:template match="mn:image[mn:altsource]" priority="3" mode="update_xml_step1">
+		<xsl:copy>
+			<xsl:apply-templates select="@*" mode="update_xml_step1"/>
+			<xsl:choose>
+				<xsl:when test="mn:altsource[contains(@tag, 'pdf')]">
+					<xsl:apply-templates select="mn:altsource[contains(@tag, 'pdf')]/@*" mode="update_xml_step1"/>
+					<xsl:apply-templates select="mn:altsource[contains(@tag, 'pdf')]/node()" mode="update_xml_step1"/>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:apply-templates select="mn:altsource[contains(@tag, 'default')]/@*" mode="update_xml_step1"/>
+					<xsl:apply-templates select="mn:altsource[contains(@tag, 'default')]/node()" mode="update_xml_step1"/>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:copy>
+	</xsl:template>
 
 	<!-- remove preprocess-xslt -->
 	<xsl:template match="mn:preprocess-xslt" mode="update_xml_step1"/>
@@ -1527,6 +1554,15 @@
 		</xsl:choose>
 	</xsl:template>
 
+	<!-- https://github.com/metanorma/metanorma-iso/issues/1535 -->
+	<xsl:template match="mn:ol[mn:fmt-ol]" mode="update_xml_step1">
+		<xsl:apply-templates select="mn:fmt-ol" mode="update_xml_step1"/>
+	</xsl:template>
+
+	<xsl:template match="mn:ul[mn:fmt-ul]" mode="update_xml_step1">
+		<xsl:apply-templates select="mn:fmt-ul" mode="update_xml_step1"/>
+	</xsl:template>
+
 	<!-- li/fmt-name -->
 	<xsl:template match="mn:li/mn:fmt-name" priority="2" mode="update_xml_step1">
 		<xsl:attribute name="label"><xsl:value-of select="."/></xsl:attribute>
@@ -4781,6 +4817,8 @@
 		</xsl:if>
 
 		<xsl:call-template name="setBordersTableArray"/>
+
+		<xsl:call-template name="setNoBordersForTableList"/>
 	</xsl:template> <!-- refine_table-style -->
 
 	<xsl:attribute-set name="table-number-style">
@@ -4815,12 +4853,16 @@
 	<xsl:template name="refine_table-header-row-style">
 
 		<xsl:call-template name="setBordersTableArray"/>
+
+		<xsl:call-template name="setNoBordersForTableList"/>
 	</xsl:template> <!-- refine_table-header-row-style -->
 
 	<xsl:attribute-set name="table-footer-row-style" use-attribute-sets="table-row-style">
 	</xsl:attribute-set>
 
 	<xsl:template name="refine_table-footer-row-style">
+
+		<xsl:call-template name="setNoBordersForTableList"/>
 	</xsl:template> <!-- refine_table-footer-row-style -->
 
 	<xsl:attribute-set name="table-body-row-style" use-attribute-sets="table-row-style">
@@ -4830,6 +4872,8 @@
 	<xsl:template name="refine_table-body-row-style">
 
 		<xsl:call-template name="setBordersTableArray"/>
+
+		<xsl:call-template name="setNoBordersForTableList"/>
 	</xsl:template> <!-- refine_table-body-row-style -->
 
 	<xsl:attribute-set name="table-header-cell-style">
@@ -4848,6 +4892,16 @@
 		</xsl:if>
 
 		<xsl:call-template name="setTableCellAttributes"/>
+
+		<xsl:if test="ancestor::mn:fmt-ol or ancestor::mn:fmt-ul">
+			<xsl:attribute name="display-align">before</xsl:attribute>
+			<xsl:attribute name="text-align">left</xsl:attribute>
+			<xsl:if test="following-sibling::*">
+				<xsl:attribute name="padding-right">4mm</xsl:attribute>
+			</xsl:if>
+			<xsl:call-template name="setNoBordersForTableList"/>
+		</xsl:if>
+
 	</xsl:template> <!-- refine_table-header-cell-style -->
 
 	<xsl:attribute-set name="table-cell-style">
@@ -4864,6 +4918,15 @@
 
 		<xsl:call-template name="setBordersTableArray"/>
 
+		<xsl:if test="ancestor::mn:fmt-ol or ancestor::mn:fmt-ul">
+			<xsl:attribute name="display-align">before</xsl:attribute>
+			<xsl:attribute name="text-align">left</xsl:attribute>
+			<xsl:if test="following-sibling::*">
+				<xsl:attribute name="padding-right">4mm</xsl:attribute>
+			</xsl:if>
+			<xsl:call-template name="setNoBordersForTableList"/>
+		</xsl:if>
+
 	</xsl:template> <!-- refine_table-cell-style -->
 
 	<xsl:attribute-set name="table-footer-cell-style">
@@ -4874,6 +4937,8 @@
 	</xsl:attribute-set> <!-- table-footer-cell-style -->
 
 	<xsl:template name="refine_table-footer-cell-style">
+
+		<xsl:call-template name="setNoBordersForTableList"/>
 	</xsl:template> <!-- refine_table-footer-cell-style -->
 
 	<xsl:attribute-set name="table-note-style">
@@ -4912,6 +4977,16 @@
 	<xsl:template name="refine_table-fn-body-style">
 	</xsl:template>
 
+	<xsl:template name="setNoBordersForTableList">
+		<xsl:if test="ancestor::mn:fmt-ol or ancestor::mn:fmt-ul">
+			<xsl:attribute name="border">none</xsl:attribute>
+			<xsl:attribute name="border-top">none</xsl:attribute>
+			<xsl:attribute name="border-bottom">none</xsl:attribute>
+			<xsl:attribute name="border-left">none</xsl:attribute>
+			<xsl:attribute name="border-right">none</xsl:attribute>
+		</xsl:if>
+	</xsl:template>
+
 	<!-- ========================== -->
 	<!-- END Table styles -->
 	<!-- ========================== -->
@@ -10470,6 +10545,10 @@
 		</fo:list-item>
 	</xsl:template>
 
+	<xsl:template match="mn:fmt-ol | mn:fmt-ul">
+		<xsl:apply-templates/>
+	</xsl:template>
+
 	<!-- ===================================== -->
 	<!-- END Lists processing -->
 	<!-- ===================================== -->

data/lib/metanorma/cc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Cc
-    VERSION = "2.8.2".freeze
+    VERSION = "2.8.3".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-cc
 version: !ruby/object:Gem::Version
-  version: 2.8.2
+  version: 2.8.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-03-16 00:00:00.000000000 Z
+date: 2026-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-generic