metanorma-jis 1.0.7 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9264a84cbb934b379ad2cee784fadbeec0b01e850daf28f4b67a8ba8c5668502
-  data.tar.gz: 210ea73f892f813acec0b10bc01326eaeaa5cea7e6060ab6b736b34f21c33b5c
+  metadata.gz: e6f96c87a0bfcb04ce47eb78813f5e9bd830025f9fad83c0ed56bb77235b6c1e
+  data.tar.gz: 818f774a6bc9b177f5b6857e0d133300a3ef5966c51e9c2a55d35c466a95cd4e
 SHA512:
-  metadata.gz: 3de4b8aa200abf1c3b5c6cd1ad9a0387a19e6921f26223511130640cd6b414d19681d7abe698987dacc1d2e9f52dd6bb1a8ad8dafc4ed1092f6ca56875a47c51
-  data.tar.gz: db5922a87e7c4a4ae87b147b03d6f3e5ede56c4109c0a43fc87ab4e3779ca4c8505846708e09d050620b71128916fc3a1646c8ebeabe0f33dcc89c7ae9850d38
+  metadata.gz: e7591207765fde1ecd5c3060e0ba6c9ffb1da8cd7db401828226a6f3e5585b92593f55e2b8f048e6427a245ac84f3ff300d7f026a386efb7d3a72f93e59bb9fc
+  data.tar.gz: b156b59b6787b5f3819b2ee357bd582753f1b71d0a26e598a9ea79304ff804f104d2d95ddfd9de7406ec9a09928a87b532a9ac6405af26b281df71016dd91292

data/.rubocop.yml

@@ -1,10 +1,10 @@
 # Auto-generated by Cimas: Do not edit it manually!
 # See https://github.com/metanorma/cimas
 inherit_from:
-  - https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
+  - https://raw.githubusercontent.com/riboseinc/oss-guides/main/ci/rubocop.yml
 
 # local repo-specific modifications
 # ...
 
 AllCops:
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 3.4

data/lib/isodoc/jis/base_convert.rb

@@ -16,7 +16,8 @@ module IsoDoc
         out.div **attr_code(annex_attrs(node)) do |s|
           node.elements.each do |c1|
             if c1.name == "fmt-title" then annex_name(node, c1, s)
-            else parse(c1, s) end
+            else parse(c1, s)
+            end
           end
         end
         amd?(isoxml) and @suppressheadingnumbers = true
@@ -42,12 +43,17 @@ module IsoDoc
       end
 
       def table_parse_tail(node, out)
-        node.xpath(ns("./p[@class = 'ListTitle' or @class = 'dl']"))
-          .each { |p| parse(p, out) }
-        node.xpath(ns("./fmt-source")).each { |n| parse(n, out) }
-        node.xpath(ns("./note")).each { |n| parse(n, out) }
-        node.xpath(ns("./fmt-footnote-container/fmt-fn-body"))
-          .each { |n| parse(n, out) }
+        table_parse_tail?(node) or return
+        tfoot = table_get_or_make_tfoot(out.parent)
+        [["./key", "./fmt-source", "./note"],
+         ["./fmt-footnote-container/fmt-fn-body"]].each do |e|
+          e.any? { |x| node.at(ns(x)) } or next
+          ins = new_fullcolspan_row(out.parent, tfoot)
+          b = Nokogiri::XML::Builder.with(ins)
+          e.each do |k|
+            node.xpath(ns(k)).each { |n| parse(n, b) }
+          end
+        end
       end
 
       def table_thead_pt(node, name)
@@ -72,7 +78,7 @@ module IsoDoc
         name or return
         thead.add_first_child full_row(
           cols, "<fmt-name><p class='TableTitle' style='text-align:center;'> " \
-          "#{name.remove.children.to_xml}</p></fmt-name>"
+                "#{name.remove.children.to_xml}</p></fmt-name>"
         )
       end
 

data/lib/isodoc/jis/i18n-ja.yaml

@@ -31,10 +31,19 @@ doctype_dict:
 stage_dict:
   international-standard: 日本産業規格
 punct:
-  open-title: 
-  close-title: 
+  open-title:
+  close-title:
   open-secondary-title:
   close-secondary-title:
   # We need the trailing half-width space, to allow it to be converted to cjk-latin-separator if Latn text follows
   biblio-field-delimiter: "。 "
   biblio-terminator: ""
+date_format:
+  default:
+    year:       "%EY[spellout]年"
+    year_month: "%EY[spellout]年%-m月"
+    full:       "%EY[spellout]年%-m月%-d日"
+  japanese_numbering:
+    year:       "%EY[spellout]年"
+    year_month: "%EY[spellout]年%Om[spellout]月"
+    full:       "%EY[spellout]年%Om[spellout]月%Od[spellout]日"

data/lib/isodoc/jis/i18n.rb

@@ -18,26 +18,16 @@ module IsoDoc
         end
       end
 
-      # use Japanese ordinals for era years
-      def japanese_date(date)
-        date.nil? and return date
-        d = date.split("-").map(&:to_i)
-        time = Date.new(*d)
-        yr = japanese_year(time)
-        case d.size
-        when 1 then yr
-        when 2 then yr + time.strftime("%-m月")
-        when 3 then yr + time.strftime("%-m月%-d日")
-        else date
-        end
-      end
-
-      def japanese_year(time)
-        era_yr = time.era_year.to_i.localize(:ja)
-          .to_rbnf_s("SpelloutRules", "spellout-numbering-year")
-        "#{time.strftime('%JN')}#{era_yr}年"
-      rescue StandardError
-        time.year.to_s
+      def japanese_date(date, japanese_numbering: false)
+        branch = japanese_numbering ? "japanese_numbering" : "default"
+        fmts = @labels.dig("date_format", branch) || {}
+        IsoDoc::ExtendedDateFormatter.format_iso_date(
+          date,
+          lang: "ja",
+          year: fmts["year"],
+          year_month: fmts["year_month"],
+          full: fmts["full"],
+        )
       end
     end
   end

data/lib/isodoc/jis/metadata.rb

@@ -13,9 +13,11 @@ module IsoDoc
         tp[:intro] and set(:doctitleintro, tp[:intro].children.to_xml)
         set(:doctitlepartlabel, title_part_prefix(isoxml, "part", lang))
         tp[:part] and set(:doctitlepart, tp[:part].children.to_xml)
-        tn[:amd] and set(:doctitleamdlabel, title_part_prefix(isoxml, "amendment", lang))
+        tn[:amd] and set(:doctitleamdlabel,
+                         title_part_prefix(isoxml, "amendment", lang))
         tp[:amd] and set(:doctitleamd, tp[:amd].children.to_xml)
-        tn[:corr] and set(:doctitlecorrlabel, title_part_prefix(isoxml, "corrigendum", lang))
+        tn[:corr] and set(:doctitlecorrlabel,
+                          title_part_prefix(isoxml, "corrigendum", lang))
         main = compose_title(tp, tn, lang)
         set(:doctitle, main)
       end
@@ -28,9 +30,11 @@ module IsoDoc
         tp[:intro] and set(:docsubtitleintro, tp[:intro].children.to_xml)
         set(:docsubtitlepartlabel, title_part_prefix(isoxml, "part", lang))
         tp[:part] and set(:docsubtitlepart, tp[:part].children.to_xml)
-        tn[:amd] and set(:docsubtitleamdlabel, title_part_prefix(isoxml, "amendment", lang))
+        tn[:amd] and set(:docsubtitleamdlabel,
+                         title_part_prefix(isoxml, "amendment", lang))
         tp[:amd] and set(:docsubtitleamd, tp[:amd].children.to_xml)
-        tn[:corr] and set(:docsubtitlecorrlabel, title_part_prefix(isoxml, "corrigendum", lang))
+        tn[:corr] and set(:docsubtitlecorrlabel,
+                          title_part_prefix(isoxml, "corrigendum", lang))
         main = compose_title(tp, tn, lang)
         set(:docsubtitle, main)
       end
@@ -53,15 +57,18 @@ module IsoDoc
           val = Common::date_range(d)
           @lang == "ja" && /^\d+[0-9-]+$/.match?(val) and
             val = @i18n.japanese_date(val)
-          set("#{d['type'].tr('-', '_')}date".to_sym, val)
+          set(:"#{d['type'].tr('-', '_')}date", val)
         end
       end
 
       def version(isoxml, out)
         super
         @lang == "ja" or return
-        revdate = @i18n.japanese_date(isoxml
-          .at(ns("//bibdata/version/revision-date"))&.text)
+        revdate = if revdate = isoxml.at(ns("//bibdata/date[@type = 'updated']/on"))
+                    @i18n.japanese_date(revdate.text)
+                  else
+                    isoxml.at(ns("//bibdata/date[@type = 'updated']"))&.text
+                  end
         set(:revdate, revdate)
         set(:draftinfo, draftinfo(get[:draft], revdate))
       end

data/lib/isodoc/jis/presentation_xml_convert.rb

@@ -74,12 +74,8 @@ module IsoDoc
       end
 
       def date_translate1(date)
-        j = @i18n.japanese_date(date.strip)
-        @autonumbering_style == :japanese and
-          j.gsub!(/(\d+)/) do
-            $1.to_i.localize(:ja).spellout
-          end
-        j
+        ja = @autonumbering_style == :japanese
+        @i18n.japanese_date(date.strip, japanese_numbering: ja)
       end
 
       def edition_integer?(bibdata)

data/lib/metanorma/jis/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module Jis
-    VERSION = "1.0.7".freeze
+    VERSION = "1.1.0".freeze
   end
 end
 

data/lib/metanorma-jis.rb

@@ -9,7 +9,7 @@ require "isodoc/jis/pdf_convert"
 require "isodoc/jis/presentation_xml_convert"
 require "isodoc/jis/metadata"
 require "isodoc/jis/xref"
-require "metanorma"
+require "metanorma-core"
 
 if defined? Metanorma::Registry
   require_relative "metanorma/jis"

data/metanorma-jis.gemspec

@@ -31,9 +31,10 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 3.1.0")
 
   spec.add_dependency "japanese_calendar", "~> 0"
-  spec.add_dependency "metanorma-iso", "~> 3.4.0"
+  spec.add_dependency "metanorma-iso", "~> 3.4.2"
   spec.add_dependency "pubid"
 
+  spec.add_development_dependency "canon"# , "= 0.2.3"
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "guard", "~> 2.14"
@@ -48,5 +49,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
   spec.add_development_dependency "webmock"
-  spec.add_development_dependency "canon", "= 0.1.3"
+  # spec.metadata["rubygems_mfa_required"] = "true"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-jis
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.1.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-04-13 00:00:00.000000000 Z
+date: 2026-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: japanese_calendar
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 3.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 3.4.2
 - !ruby/object:Gem::Dependency
   name: pubid
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: canon
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -248,20 +262,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: canon
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.1.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.1.3
 description: |
   metanorma-jis lets you write JIS standards in AsciiDoc syntax.