metanorma-jis 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e2dd4ab84c0a6ed18a6fd314efc02f0fd4d21541ecefe84ca12ccfb7aafbad8
-  data.tar.gz: 376add510f1d13bbc145750ecf15eb3ac37e82ce3dfeac8cdd5c7f3a6de2fc28
+  metadata.gz: 1aae95e8715c8724eb119e3b53fc413839b99478aeaa81f7e314a64dcf03b324
+  data.tar.gz: b3ffa69df1685778cfc47d5fc5efe21dde085447494d68fbc566be121b9361d5
 SHA512:
-  metadata.gz: 1d998d2221b79cf39d75fa49ad989ab48cf13a851d8cdca786ce1e72a7ac93a96d164599412c0fa726a72ac1bd13840c37c3092bf29a0a2bfb8d48ad35af1fe0
-  data.tar.gz: ba1d3e6a819c3fc7b4dd834c9168b83becffd936595d3b2ccf68b89d2f2c072f1ba0a03ff9b16d358fcaf5ab0c4c899a26878ef6be03ef59a8e8ff24af51bdcd
+  metadata.gz: 3903babc038dcef541f92470a9dd436a1f7c8785bf139bdfb0f7a6e808d5ee5c9bfd7e7d5e42f975ee0d65f0ccbcf9bc7775774167ada7750b1e99af4ab2b421
+  data.tar.gz: adbed05bbe460843f9572569142a523875804f9b3415fc687e5f3235c2bb8a115a8e22bd12b48a112c4e66c5775267e66aaef9708f6a6e4afd612a0575882418

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

@@ -6764,7 +6764,7 @@
 	<xsl:variable name="non_white_space">[^\s\u3000-\u9FFF]</xsl:variable>
 	<xsl:variable name="regex_dots_units">((\b((<xsl:value-of select="$non_white_space"/>{1,3}\.<xsl:value-of select="$non_white_space"/>+)|(<xsl:value-of select="$non_white_space"/>+\.<xsl:value-of select="$non_white_space"/>{1,3}))\b)|(\.<xsl:value-of select="$non_white_space"/>{1,3})\b)</xsl:variable>
 
-	<xsl:template match="text()[not(ancestor::mn:bibdata or      ancestor::mn:fmt-link[not(contains(normalize-space(),' '))] or      ancestor::mn:sourcecode or      ancestor::*[local-name() = 'math'] or     ancestor::*[local-name() = 'svg'] or     ancestor::mn:name or ancestor::mn:fmt-name or     starts-with(., 'http://') or starts-with(., 'https://') or starts-with(., 'www.') or normalize-space() = '' )]" name="keep_together_standard_number" mode="update_xml_enclose_keep-together_within-line">
+	<xsl:template match="text()[not(ancestor::mn:bibdata or      ancestor::mn:fmt-link[not(contains(normalize-space(),' '))] or      ancestor::mn:sourcecode or      (ancestor::mn:tt and ancestor::mn:table and string-length() &gt; 20) or     ancestor::*[local-name() = 'math'] or     ancestor::*[local-name() = 'svg'] or     ancestor::mn:name or ancestor::mn:fmt-name or     starts-with(., 'http://') or starts-with(., 'https://') or starts-with(., 'www.') or normalize-space() = '' )]" name="keep_together_standard_number" mode="update_xml_enclose_keep-together_within-line">
 
 		<xsl:variable name="parent" select="local-name(..)"/>
 
@@ -15773,10 +15773,10 @@
 	<!-- END Admonition -->
 	<!-- ================ -->
 
-	<xsl:attribute-set name="references-non-normative-title-style">
+	<xsl:attribute-set name="bibliography-title-style">
 	</xsl:attribute-set>
 
-	<xsl:template name="refine_references-non-normative-title-style">
+	<xsl:template name="refine_bibliography-title-style">
 	</xsl:template>
 
 	<!-- bibitem in Normative References (references/@normative="true") -->
@@ -17866,9 +17866,18 @@
 	<!-- ===================================== -->
 
 	<xsl:attribute-set name="annex-title-style">
+		<xsl:attribute name="keep-with-next">always</xsl:attribute>
+		<xsl:attribute name="font-size">14pt</xsl:attribute>
+		<xsl:attribute name="font-weight">normal</xsl:attribute>
+		<xsl:attribute name="text-align">center</xsl:attribute>
 	</xsl:attribute-set> <!-- annex-title-style -->
 
 	<xsl:template name="refine_annex-title-style">
+		<xsl:if test="preceding-sibling::mn:annex[1][@commentary = 'true']">
+			<xsl:attribute name="font-size">16pt</xsl:attribute>
+			<xsl:attribute name="space-before">1mm</xsl:attribute>
+			<xsl:attribute name="margin-bottom">7mm</xsl:attribute>
+		</xsl:if>
 	</xsl:template>
 
 	<xsl:attribute-set name="p-zzSTDTitle1-style">
@@ -17961,14 +17970,17 @@
 				<xsl:attribute name="space-before">9mm</xsl:attribute>
 				<xsl:attribute name="margin-bottom">9mm</xsl:attribute>
 			</xsl:if>
-			<xsl:if test="@ancestor = 'annex'">
-				<xsl:attribute name="font-size">14pt</xsl:attribute>
-				<xsl:attribute name="text-align">center</xsl:attribute>
-				<xsl:if test="preceding-sibling::mn:annex[1][@commentary = 'true']">
-					<xsl:attribute name="font-size">16pt</xsl:attribute>
-					<xsl:attribute name="space-before">1mm</xsl:attribute>
-					<xsl:attribute name="margin-bottom">7mm</xsl:attribute>
-				</xsl:if>
+			<xsl:if test="@ancestor = 'annex'"><!-- Annex title -->
+				<xsl:variable name="annex_title_styles">
+					<styles xsl:use-attribute-sets="annex-title-style"><xsl:call-template name="refine_annex-title-style"/></styles>
+				</xsl:variable>
+				<xsl:copy-of select="xalan:nodeset($annex_title_styles)/styles/@*"/>
+			</xsl:if>
+			<xsl:if test="@ancestor = 'bibliography'"><!-- Bibliography section title -->
+				<xsl:variable name="bibliography_title_styles">
+					<styles xsl:use-attribute-sets="bibliography-title-style"><xsl:call-template name="refine_bibliography-title-style"/></styles>
+				</xsl:variable>
+				<xsl:copy-of select="xalan:nodeset($bibliography_title_styles)/styles/@*"/>
 			</xsl:if>
 		</xsl:if>
 
@@ -18015,9 +18027,12 @@
 	</xsl:template> <!-- refine_title-style -->
 
 	<xsl:template name="processPrefaceSectionsDefault">
+		<xsl:param name="num"/>
 		<xsl:for-each select="/*/mn:preface/*[not(self::mn:note or self::mn:admonition)]">
 			<xsl:sort select="@displayorder" data-type="number"/>
-			<xsl:apply-templates select="."/>
+			<xsl:apply-templates select=".">
+				<xsl:with-param name="num" select="$num"/>
+			</xsl:apply-templates>
 		</xsl:for-each>
 	</xsl:template>
 

data/lib/isodoc/jis/presentation_xml_convert.rb

@@ -165,7 +165,7 @@ module IsoDoc
         id = elem["bibitemid"] or return
         b = @bibitem_lookup[id] or return
         !b.at(ns(<<~XPATH))
-          ./docidentifier[not(#{SKIP_DOCID} or @scope = 'biblio-tag' or @type = 'metanorma' or @type = 'metanorma-ordinal' or @type='title')]
+          ./docidentifier[not(#{SERIAL_NUM_DOCID} or @scope = 'biblio-tag' or @type = 'metanorma' or @type = 'metanorma-ordinal' or @type='title')]
         XPATH
       end
 
@@ -203,24 +203,26 @@ module IsoDoc
 
       def bracketed_refs_processing(docxml); end
 
-      def norm_ref_entry_code(_ordinal, idents, _ids, _standard, datefn, bib)
+      def short_style_origin(docxml); end
+
+      def norm_ref_entry_code(_ordinal, ids, _standard, datefn, bib)
         delim = bib.at(ns("./language"))&.text == "ja" ? "&#x3000;" : "<esc>,</esc> "
-        ret = (idents[:ordinal] || idents[:metanorma] || idents[:sdo]).to_s
+        ret = (ids[:ordinal] || ids[:content] || ids[:metanorma] || ids[:sdo]).to_s
         ret = esc(ret)
-        (idents[:ordinal] || idents[:metanorma]) && idents[:sdo] and
-          ret += "#{delim}<strong>#{esc idents[:sdo]}</strong>"
-        !idents[:ordinal] && !idents[:metanorma] && idents[:sdo] and
+        (ids[:ordinal] || ids[:content] || ids[:metanorma]) && ids[:sdo] and
+          ret += "#{delim}<strong>#{esc ids[:sdo]}</strong>"
+        !ids[:ordinal] && !ids[:content] && !ids[:metanorma] && ids[:sdo] and
           ret = "<strong>#{ret}</ret>"
         ret += datefn
         ret.empty? and return ret
-        idents[:sdo] and ret += delim
+        ids[:sdo] and ret += delim
         ret.sub(delim, "").strip.empty? and return ""
         ret
       end
 
-      def biblio_ref_entry_code(ordinal, ids, _id, _standard, datefn, bib)
+      def biblio_ref_entry_code(ordinal, ids, _standard, datefn, bib)
         delim = bib.at(ns("./language"))&.text == "ja" ? "&#x3000;" : "<esc>,</esc> "
-        ret = esc(ids[:ordinal]) || esc(ids[:metanorma]) || "[#{esc ordinal.to_s}]"
+        ret = esc(ids[:ordinal]) || esc(ids[:content]) || esc(ids[:metanorma]) || "[#{esc ordinal.to_s}]"
         if ids[:sdo] && !ids[:sdo].empty?
           ret = prefix_bracketed_ref(ret)
           ret += "#{esc ids[:sdo]}#{datefn}#{delim}"

data/lib/isodoc/jis/xref.rb

@@ -178,17 +178,6 @@ module IsoDoc
           super
         end
       end
-
-      def hierarchical_figure_names(clause, num)
-        #require "debug"; binding.b
-        super
-      end
-
-      def localise_anchors(type = nil)
-        #require "debug"; binding.b
-        super
-      end
-
     end
   end
 end

data/lib/metanorma/jis/biblio.rng

@@ -690,7 +690,7 @@ Examples include GRID, LEI, CrossRef, and Ringgold</a:documentation>
   <define name="CitationType">
     <attribute name="bibitemid">
       <a:documentation>Bibliographic item that the citation applies to, referenced as the anchor of a bibliographic description</a:documentation>
-      <data type="IDREF"/>
+      <ref name="IdRefType"/>
     </attribute>
     <choice>
       <zeroOrMore>
@@ -1296,17 +1296,17 @@ for which this claim of validity is made, if applicable</a:documentation>
   </define>
   <define name="validityBegins">
     <element name="validityBegins">
-      <ref name="ISO8601Date"/>
+      <ref name="ISO8601DateTime"/>
     </element>
   </define>
   <define name="validityEnds">
     <element name="validityEnds">
-      <ref name="ISO8601Date"/>
+      <ref name="ISO8601DateTime"/>
     </element>
   </define>
   <define name="validityRevision">
     <element name="revision">
-      <ref name="ISO8601Date"/>
+      <ref name="ISO8601DateTime"/>
     </element>
   </define>
   <define name="TypedTitleString">

data/lib/metanorma/jis/front.rb

@@ -100,13 +100,11 @@ module Metanorma
       def multiling_noko_value(value, tag, xml)
         if value.is_a?(Hash)
           value.each do |k, v|
-            xml.send tag, language: k do |x|
-              x << v
-            end
+            add_noko_elem(xml, tag, v, language: k)
           end
         elsif value.is_a?(Array)
-          value.each { |a| xml.send tag, a }
-        else xml.send tag, value
+          value.each { |a| add_noko_elem(xml, tag, a) }
+        else add_noko_elem(xml, tag, value)
         end
       end
 
@@ -121,7 +119,7 @@ module Metanorma
         abbr = org[:abbr]
         abbr ||= org_abbrev[name_str]
         default_org && b = node&.attr("subdivision-abbr") and abbr = b
-        abbr and xml.abbreviation abbr
+        add_noko_elem(xml, "abbreviation", abbr)
       end
 
       def copyright_parse(node)
@@ -145,8 +143,8 @@ module Metanorma
 
       def metadata_id(node, xml)
         if id = node.attr("docidentifier")
-          xml.docidentifier id.sub(/^JIS /, ""),
-                            **attr_code(type: "JIS", primary: "true")
+          add_noko_elem(xml, "docidentifier", id.sub(/^JIS /, ""),
+                        **attr_code(type: "JIS", primary: "true"))
         else iso_id(node, xml)
         end
       end
@@ -185,7 +183,8 @@ module Metanorma
 
       def iso_id_out(xml, params, _with_prf)
         id = iso_id_default(params).to_s(with_publisher: false)
-        xml.docidentifier id.strip, type: "JIS", primary: "true"
+        add_noko_elem(xml, "docidentifier", id.strip, type: "JIS",
+                                                      primary: "true")
       end
 
       def iso_id_default(params)

data/lib/metanorma/jis/isodoc.rng

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-<!-- VERSION v2.1.3 -->
+<!-- VERSION v2.1.4 -->
 
   <!--
     ALERT: cannot have root comments, because of https://github.com/metanorma/metanorma/issues/437
@@ -905,15 +905,32 @@ titlecase, or lowercase</a:documentation>
     </element>
   </define>
   <define name="image" combine="choice">
-    <element name="svg">
-      <a:documentation>Add svg mark up to image</a:documentation>
-      <oneOrMore>
-        <choice>
-          <text/>
-          <ref name="AnyElement"/>
-        </choice>
-      </oneOrMore>
-    </element>
+    <choice>
+      <element name="image">
+        <ref name="RequiredId"/>
+        <ref name="ImageAttributes"/>
+        <optional>
+          <element name="svg">
+            <a:documentation>Allow svg in image/svg, for consistency</a:documentation>
+            <oneOrMore>
+              <choice>
+                <text/>
+                <ref name="AnyElement"/>
+              </choice>
+            </oneOrMore>
+          </element>
+        </optional>
+      </element>
+      <element name="svg">
+        <a:documentation>Add svg mark up to image</a:documentation>
+        <oneOrMore>
+          <choice>
+            <text/>
+            <ref name="AnyElement"/>
+          </choice>
+        </oneOrMore>
+      </element>
+    </choice>
   </define>
   <define name="ParagraphFnBody" combine="interleave">
     <ref name="BlockSource">

data/lib/metanorma/jis/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module Jis
-    VERSION = "1.0.0".freeze
+    VERSION = "1.0.2".freeze
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-jis
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-11-03 00:00:00.000000000 Z
+date: 2025-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: japanese_calendar