metanorma-jis 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4ff985af7fc1b5ab74a4ee61850124c6e36a3a83147644d07eb69e5be745058
-  data.tar.gz: 3ea4831e961be0aba07344cd093a7944ee73fcf096d125312ee9bbc7ddb7716f
+  metadata.gz: 52feb035503f2766a2c0281b2ea081358ca155ce13f606e9a0ce7641144c2bfa
+  data.tar.gz: 1f0cef17898c1245e14cece9fac7ff3fe1cabec0d4acac1d8b60e909867ef547
 SHA512:
-  metadata.gz: 607db2ddd112f5f47d487af9404f1bb65f3b3d689f28234e15d480a745d4b3e91547faeb267e2b33404e6a0b4b457af27059a4190be70703a89a63c90427d2fc
-  data.tar.gz: 9b908b1459da1193eb16eafe5e512af43263e4b10d099b60013fdb20e307f00639191f7c044b29946fb532e0965f20a8a0bd4a46b4915c293e35702532c744bc
+  metadata.gz: 473ff382fe45f94e9a7f10811f09e884de519482b43c8da4631ed357788b8d3743c8fde273f8f932d34196d1a11d7eb63782724afd716f243488115692eb32ac
+  data.tar.gz: daf7b6b8cab952334628287d116d49312f874be5d8ca1c593681ba0754f7f34b8bf0242c6fc1d94904a54bb47317e296a294410035d9c85ba034907708391cc6

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

@@ -1787,6 +1787,9 @@
 			<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>
 
 			<xsl:variable name="root">
 				<xsl:if test="ancestor-or-self::mn:preface">preface</xsl:if>
@@ -1798,9 +1801,18 @@
 					<xsl:attribute name="level">1</xsl:attribute>
 				</xsl:if>
 				<mnx:title>
-					<xsl:apply-templates select="xalan:nodeset($title)" mode="contents_item">
-						<xsl:with-param name="mode">contents</xsl:with-param>
-					</xsl:apply-templates>
+					<xsl:choose>
+						<xsl:when test="normalize-space($variant_title) != ''">
+							<xsl:apply-templates select="xalan:nodeset($variant_title)" mode="contents_item">
+								<xsl:with-param name="mode">contents</xsl:with-param>
+							</xsl:apply-templates>
+						</xsl:when>
+						<xsl:otherwise>
+							<xsl:apply-templates select="xalan:nodeset($title)" mode="contents_item">
+								<xsl:with-param name="mode">contents</xsl:with-param>
+							</xsl:apply-templates>
+						</xsl:otherwise>
+					</xsl:choose>
 				</mnx:title>
 				<xsl:if test="$type != 'index'">
 					<xsl:apply-templates mode="contents"/>
@@ -6109,7 +6121,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"/>
@@ -6337,6 +6366,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>
@@ -9668,6 +9706,8 @@
 		<xsl:if test="ancestor::mn:preface">
 			<xsl:attribute name="border">none</xsl:attribute>
 		</xsl:if>
+
+		<xsl:call-template name="setNoBordersForTableList"/>
 	</xsl:template> <!-- refine_table-style -->
 
 	<xsl:attribute-set name="table-number-style">
@@ -9710,6 +9750,8 @@
 			<xsl:attribute name="border-top">none</xsl:attribute>
 			<xsl:attribute name="border-bottom">none</xsl:attribute>
 		</xsl:if>
+
+		<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">
@@ -9718,6 +9760,8 @@
 	</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">
@@ -9727,6 +9771,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">
@@ -9753,6 +9799,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">
@@ -9774,6 +9830,15 @@
 			<xsl:attribute name="border">none</xsl:attribute>
 		</xsl:if>
 
+		<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">
@@ -9786,6 +9851,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">
@@ -9835,6 +9902,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 -->
 	<!-- ========================== -->
@@ -15555,6 +15632,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/isodoc/jis/presentation_section.rb

@@ -6,11 +6,11 @@ module IsoDoc
     class PresentationXMLConvert < IsoDoc::Iso::PresentationXMLConvert
       def annex1(elem)
         elem["commentary"] == "true" and return commentary(elem)
-        lbl = @xrefs.anchor(elem["id"], :label)
-        if t = elem.at(ns("./title"))
-          t.children = "<strong>#{to_xml(t.children)}</strong>"
-        end
-        prefix_name(elem, { caption: "<br/>" }, lbl, "title")
+        super
+      end
+
+      def annex_delim(_elem)
+        "<br/>"
       end
 
       def annex(docxml)
@@ -101,7 +101,7 @@ module IsoDoc
           %(#{@meta.get[:"investigative-committee"]} #{@i18n.membership_table})
         y = YAML.safe_load(s.children.to_xml(encoding: "UTF-8"))
         d = clause.at(ns("./key")) || clause.at(ns("./dl"))
-        s && y.is_a?(Array) or return [nil, nil, nil, nil]
+        (s && y.is_a?(Array)) or return [nil, nil, nil, nil]
         [s, t, y, d]
       end
 
@@ -111,7 +111,8 @@ module IsoDoc
           n = y["name"]
           if n.is_a?(Hash)
             n = if @lang == "ja" then "#{n['surname']} #{n['givenname']}"
-                else "#{n['givenname']} #{n['surname']}" end
+                else "#{n['givenname']} #{n['surname']}"
+                end
           end
           <<~XML
             <tr #{add_id_text}><td #{add_id_text}>#{r}</td><td #{add_id_text}>#{n}</td><td #{add_id_text}>#{y['affiliation']}</td></tr>

data/lib/isodoc/jis/xref.rb

@@ -31,7 +31,7 @@ module IsoDoc
         @autonumbering_style == :japanese ? "\u30fb" : "."
       end
 
-      def clause_counter(num, opts = { })
+      def clause_counter(num = 0, opts = { })
         opts[:numerals] ||= @autonumbering_style
         opts[:separator] ||= clausesep
         super

data/lib/metanorma/jis/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module Jis
-    VERSION = "1.0.5".freeze
+    VERSION = "1.0.6".freeze
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-jis
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 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: japanese_calendar