metanorma-jis 1.0.8 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b408818c892ab433c66dbe129cea0ffdbd82283755ccffce0556d4b47b8d756
-  data.tar.gz: 2dc6d2c7e7f67e2ca89c53088efd03ca598061a0cf55a543b7c55a54799985e7
+  metadata.gz: f4d4550d188829625c178c0e93665cbb42c02ea5cd4bfb1d639ee7403bc5c83d
+  data.tar.gz: 1c7e761e682a77bde33f6799f6e99b0dd222e5fb0324779e95e14a99971eec2a
 SHA512:
-  metadata.gz: 0edff9c8c05ada995358ed6fdea0b6f840f554e4b052dc05e7473e6fb8e6008eccf73bcec9d619497230b5c139586fc121fbd7ac3917e7f203c083a1e5564e74
-  data.tar.gz: efbf2c34d966ac98b7897e9eb8466902a0aaaf038535ccee4a847dd93a797bc0298fe1866dbb59aeeb5dae473d9a7b6000d1fede44bd165cfe18dc544e108e25
+  metadata.gz: 52dffbca1335aeabdc22b0f298a861380d2f8c48d09e3d7af78fb467599e2c77b513cbde98425a4a61d2f9bd8cc07236949dde79a533530be0d7af5ebd0e205b
+  data.tar.gz: 99b341de0659073ce8d63a2c661149f9c1c74b0f4623bd9f7f96daa57663ad8612d6a9743130f0b0ab2385fe2c3e1e1c21472ed563bf6222be55314eb051c6e2

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/html/style-human.css

@@ -821,7 +821,9 @@ nav {
     background-color: black;
     color: white !important;
     cursor: pointer;
-    z-index: 100;
+    left: 0;
+    top: 0;
+    z-index: 103;
   }
   #toggle span {
     text-align: center;

data/lib/isodoc/jis/html/style-iso.css

@@ -765,7 +765,9 @@ nav {
     background-color: #f7f7f7;
     color: black !important;
     cursor: pointer;
-    z-index: 100;
+    left: 0;
+    top: 0;
+    z-index: 103;
   }
   #toggle span {
     text-align: center;

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/init.rb

@@ -24,8 +24,8 @@ module IsoDoc
           .merge(language: @lang, script: @script, i18nhash: @i18n.get))
       end
 
-      def std_docid_semantic(text)
-        text
+      def annotate_docid?(_id)
+        false
       end
 
       def convert_i18n_init1(docxml)

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/basicdoc.rng

@@ -187,6 +187,15 @@ Applicable to modify and delete</a:documentation>
         <a:documentation>Optional caption of this block</a:documentation>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="position">
+        <a:documentation>For an "add" change, whether the change is added before or after the location</a:documentation>
+        <choice>
+          <value>before</value>
+          <value>after</value>
+        </choice>
+      </attribute>
+    </optional>
     <optional>
       <element name="location">
         <a:documentation>The location(s) in the original document which have undergone the change described in this block</a:documentation>

data/lib/metanorma/jis/biblio.rng

@@ -1142,11 +1142,11 @@ NOTE: This should preferably be encoded as  a URI or short identifier, rather th
         <a:documentation>Information about how long the current description of the bibliographic item is valid for</a:documentation>
       </ref>
     </optional>
-    <optional>
+    <zeroOrMore>
       <ref name="depiction">
         <a:documentation>Depiction of the bibliographic item, typically an image</a:documentation>
       </ref>
-    </optional>
+    </zeroOrMore>
   </define>
   <define name="ReducedBibliographicItem">
     <a:documentation>Reduced description of a bibliographic resource, without mandatory title and docidentifier, used for document relations
@@ -2015,15 +2015,11 @@ provided that it is not the entire bibliographic item that is so related</a:docu
     <a:documentation>A version of the bibliographic item (within an edition). Can be used for drafts</a:documentation>
     <element name="version">
       <optional>
-        <ref name="revision-date">
-          <a:documentation>The date at which the current version of the bibliographic item was produced</a:documentation>
-        </ref>
-      </optional>
-      <optional>
-        <ref name="draft">
-          <a:documentation>The identifier for the current draft of the bibliographic item</a:documentation>
-        </ref>
+        <attribute name="type">
+          <a:documentation>Versioning scheme, in case of multiple versioning schemes</a:documentation>
+        </attribute>
       </optional>
+      <text/>
     </element>
   </define>
   <define name="vedition">
@@ -2063,13 +2059,13 @@ provided that it is not the entire bibliographic item that is so related</a:docu
           <ref name="LocalizedString"/>
         </element>
       </optional>
-      <oneOrMore>
+      <zeroOrMore>
         <element name="taxon">
           <a:documentation>The keywords as a hierarchical taxonomy. For example, the sequence of `taxon` elements
 `pump`, `centrifugal pump`, `line shaft pump` represents a taxonomic classification</a:documentation>
           <ref name="LocalizedString"/>
         </element>
-      </oneOrMore>
+      </zeroOrMore>
       <zeroOrMore>
         <ref name="vocabid">
           <a:documentation>Identifiers for the keyword as a controlled vocabulary</a:documentation>

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.5 -->
+<!-- VERSION v2.1.6 -->
 
   <!--
     ALERT: cannot have root comments, because of https://github.com/metanorma/metanorma/issues/437
@@ -164,6 +164,9 @@ Sources are currently only rendered in metanorma-plateau</a:documentation>
           </choice>
         </attribute>
       </optional>
+      <optional>
+        <ref name="DisplayDirective"/>
+      </optional>
     </define>
     <define name="DlAttributes">
       <ref name="BlockAttributes"/>
@@ -814,6 +817,9 @@ titlecase, or lowercase</a:documentation>
   </define>
   <define name="UlAttributes" combine="interleave">
     <ref name="BlockAttributes"/>
+    <optional>
+      <ref name="DisplayDirective"/>
+    </optional>
   </define>
   <define name="TableAttributes" combine="interleave">
     <optional>
@@ -1968,7 +1974,7 @@ used in document amendments</a:documentation>
           <a:documentation>Zero or more examples of how the term is to be used</a:documentation>
         </ref>
       </zeroOrMore>
-      <ref name="TermSource">
+      <ref name="TermSources">
         <a:documentation>Bibliographic references for the managed term</a:documentation>
       </ref>
     </element>
@@ -2077,7 +2083,7 @@ used in document amendments</a:documentation>
         <a:documentation>Information about how the designation is to be used</a:documentation>
       </ref>
     </optional>
-    <ref name="TermSource">
+    <ref name="TermSources">
       <a:documentation>Bibliographic references for this designation of the managed term</a:documentation>
     </ref>
   </define>
@@ -2348,7 +2354,7 @@ used in document amendments</a:documentation>
           <ref name="formula"/>
         </choice>
       </oneOrMore>
-      <ref name="TermSource">
+      <ref name="TermSources">
         <a:documentation>Bibliographic references for this designation of the managed term</a:documentation>
       </ref>
     </element>
@@ -2365,7 +2371,7 @@ used in document amendments</a:documentation>
           <ref name="formula"/>
         </choice>
       </oneOrMore>
-      <ref name="TermSource">
+      <ref name="TermSources">
         <a:documentation>Bibliographic references for this designation of the managed term</a:documentation>
       </ref>
     </element>
@@ -2788,6 +2794,26 @@ to span across both columns</a:documentation>
       </attribute>
     </optional>
   </define>
+  <define name="DisplayDirective">
+    <a:documentation>Directive on how to render a block in Presentation XML </a:documentation>
+    <optional>
+      <attribute name="display">
+        <a:documentation>Display style for block.
+If the block is `ol` or `ul` and dispay is `table`, 
+the list is to be rendered as a table, with a column for each nested level, and a row for each terminal sublist</a:documentation>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="display-directives">
+        <a:documentation>display-directives is a key-value set of attributes, guiding how the rendering of the block should happen. 
+The key-value set is comma-delimited, and encoded as `key1='value1',key2='value'`, 
+as with stem//mn/@data-metanorma-numberformat
+*  If the block is `ol` or `ul` and dispay is `table`,  display-directives can have the value `colgroup='col1,col2,...coln'`, 
+where each col value is a percentage width of the column in the output table (with no % suffix). 
+e.g. `colgroup='50,33.3,16.7'`  </a:documentation>
+      </attribute>
+    </optional>
+  </define>
   <define name="ReferencesAttributes">
     <optional>
       <attribute name="obligation">
@@ -2800,7 +2826,7 @@ Normative References contents contain normative references, but as a clause in t
       <data type="boolean"/>
     </attribute>
   </define>
-  <define name="TermSource">
+  <define name="TermSources">
     <zeroOrMore>
       <ref name="termsource"/>
     </zeroOrMore>

data/lib/metanorma/jis/reqt.rng

@@ -47,7 +47,15 @@ the tag name of the top level containers</a:documentation>
     </optional>
     <optional>
       <attribute name="model">
-        <a:documentation>Model of requirements realised by this requirement, e.g. "ogc" for Modspec</a:documentation>
+        <a:documentation>Model of requirements realised by this requirement, e.g. "ogc" for Modspec.
+Current legal values: ogc, default</a:documentation>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="render">
+        <a:documentation>Rendering of requirements realised by this requirement. Current legal values:
+default:: default, inline
+ogc:: default</a:documentation>
       </attribute>
     </optional>
     <optional>

data/lib/metanorma/jis/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module Jis
-    VERSION = "1.0.8".freeze
+    VERSION = "1.1.1".freeze
   end
 end
 

data/metanorma-jis.gemspec

@@ -31,10 +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 "canon"# , "= 0.2.3"
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "guard", "~> 2.14"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-jis
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.1.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-04-27 00:00:00.000000000 Z
+date: 2026-05-25 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
@@ -56,16 +56,16 @@ dependencies:
   name: canon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement