metanorma-jis 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f4b866779290adcd5a6ebfa304c2bcd11efdcfa039ad8e32b9bf1a7fd0d8420
-  data.tar.gz: ff89ac0602425434bdc8711c4ce6856475aed99f509f4b39cb4d7cec898da379
+  metadata.gz: 1aae95e8715c8724eb119e3b53fc413839b99478aeaa81f7e314a64dcf03b324
+  data.tar.gz: b3ffa69df1685778cfc47d5fc5efe21dde085447494d68fbc566be121b9361d5
 SHA512:
-  metadata.gz: 3b4b622379cda25fb154f58be052fd2dd102bf9c18d7c8e6bdb2ac97827ba41b7f0bea44525690a1ac644257ddeff9cfaec1d2542c38ec7ab9b36e58415169e4
-  data.tar.gz: 14a62cf400fa6142ec8d4f4e39d3e86c10d85a5a0c2374fbd93d4e8723b95cc501f6875480fcd0dd531881e052f9b88676d6c3e95bf42323342f422c7d36a512
+  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(..)"/>
 
@@ -18027,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
 
@@ -205,24 +205,24 @@ module IsoDoc
 
       def short_style_origin(docxml); end
 
-      def norm_ref_entry_code(_ordinal, idents, _ids, _standard, datefn, bib)
+      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/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module Jis
-    VERSION = "1.0.1".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.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-11-17 00:00:00.000000000 Z
+date: 2025-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: japanese_calendar