metanorma-jis 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a9602ab994ed2bd305740c06c8e905e6a006cc61f90a86eaae5636382029592
-  data.tar.gz: 720ccbdc20eef80020f6360d049655b8b3d50a7341290eca697f126e7b8cf1db
+  metadata.gz: 6bbc9bfd3ed93ebd4eb27838a31bae9b074c79c280f0eee5c476475de1239a9c
+  data.tar.gz: 3404f0677c547960ef888d5503ed89b942a21c33812bb3ae042c9ed7d09f5fdb
 SHA512:
-  metadata.gz: c9aba7ea31bf9d5d50c2c1a16cb7e430287c11440ed7bf636483c077830b494d782c1b858649f065031180ebcbc12f745b887628f6ca312794f1de8afe9655f6
-  data.tar.gz: cb1d5e2653e717b942d10d6d83211a57c4343e30989f7f023dcb9dc0eee3ec8ef2011a68e05b993344779031f7c53e3e60714fd6017ae98979dd34a7c0608080
+  metadata.gz: '0839e480d352f8971eda023631979408b4ac4f352b06673b17e5ee02f3280842c2e51a40b9cd1bb091494f54cc9cc4235453d8d8ee18458bad55f43fe9228ec3'
+  data.tar.gz: bcaf0551aa3d35711b213137019a580eb84ae83c4b13a409c76644fc2af6eb577e06d46acb65260a48699598537064a6354fb35072392137161405097bc22798

data/Gemfile

@@ -2,11 +2,14 @@ Encoding.default_external = Encoding::UTF_8
 Encoding.default_internal = Encoding::UTF_8
 
 source "https://rubygems.org"
+git_source(:github) { |repo| "https://github.com/#{repo}" }
 
-# Specify your gem's dependencies in gemspec
-gemspec
+group :development, :test do
+  gem "rspec"
+end
 
 if File.exist? "Gemfile.devel"
   eval File.read("Gemfile.devel"), nil, "Gemfile.devel" # rubocop:disable Security/Eval
 end
 
+gemspec

data/lib/isodoc/jis/i18n.rb

@@ -1,15 +1,15 @@
 module IsoDoc
   module JIS
     class I18n < IsoDoc::Iso::I18n
+      def load_file(fname)
+        f = File.join(File.dirname(__FILE__), fname)
+        File.exist?(f) ? YAML.load_file(f) : {}
+      end
+
       def load_yaml1(lang, script)
-        y = if lang == "en"
-              YAML.load_file(File.join(File.dirname(__FILE__), "i18n-en.yaml"))
-            else
-              YAML.load_file(File.join(File.dirname(__FILE__), "i18n-ja.yaml"))
-            end
-        super.deep_merge(y)
+        y = load_file("i18n-#{yaml_lang(lang, script)}.yaml")
+        y.empty? ? load_file("i18n-en.yaml").merge(super) : super.deep_merge(y)
       end
     end
   end
 end
-

data/lib/isodoc/jis/presentation_xml_convert.rb

@@ -205,7 +205,7 @@ module IsoDoc
         elem = s.children.first
         middle_title_hdr(elem)
         middle_title_main(elem, "zzSTDTitle1")
-        middle_subtitle_main(elem)
+        middle_subtitle_main(elem, "zzSTDTitle2")
         # middle_title_amd(s.children.first)
       end
 
@@ -225,11 +225,8 @@ module IsoDoc
       def middle_title_main(out, style)
         t = @meta.get[:doctitlemain]
         (t && !t.empty?) or return
-        ret = "<p class='#{style}'>#{@meta.get[:doctitleintro]}"
-        ret += " &#x2014; " if @meta.get[:doctitleintro] && t
-        ret += t
-        ret += " &#x2014; " if t && @meta.get[:doctitlepart]
-        ret += "</p>"
+        ret =
+          middle_title_para(style, :doctitleintro, :doctitlemain, :doctitlepart)
         if a = @meta.get[:doctitlepart]
           ret += "<p class='zzSTDTitle1'>"
           b = @meta.get[:doctitlepartlabel] and ret += "#{b}: "
@@ -238,14 +235,11 @@ module IsoDoc
         out.previous = ret
       end
 
-      def middle_subtitle_main(out)
+      def middle_subtitle_main(out, style)
         t = @meta.get[:docsubtitlemain]
         (t && !t.empty?) or return
-        ret = "<p class='zzSTDTitle2'>#{@meta.get[:docsubtitleintro]}"
-        ret += " &#x2014; " if @meta.get[:docsubtitleintro] && t
-        ret += @meta.get[:docsubtitlemain]
-        ret += " &#x2014; " if t && @meta.get[:docsubtitlepart]
-        ret += "</p>"
+        ret = middle_title_para(style, :docsubtitleintro, :docsubtitlemain,
+                                :docsubtitlepart)
         if a = @meta.get[:docsubtitlepart]
           ret += "<p class='zzSTDTitle2'>"
           b = @meta.get[:docsubtitlepartlabel] and ret += "#{b}: "
@@ -254,6 +248,15 @@ module IsoDoc
         out.previous = ret
       end
 
+      def middle_title_para(style, intro, main, part)
+        ret = "<p class='#{style}'>#{@meta.get[intro]}"
+        ret += " &#x2014; " if @meta.get[intro] && @meta.get[main]
+        ret += @meta.get[main]
+        ret += " &#x2014; " if @meta.get[main] && @meta.get[part]
+        ret += "</p>"
+        ret
+      end
+
       include Init
     end
   end

data/lib/isodoc/jis/xref.rb

@@ -59,11 +59,11 @@ module IsoDoc
       def back_clauses_anchor_names(xml)
         clause_order_back(xml).each do |a|
           xml.xpath(ns(a[:path])).each do |c|
-            if c["commentary"] == "true"
-              commentary_names(c)
-            else
-              preface_names(c)
+            if c["commentary"] == "true" then commentary_names(c)
+            else preface_names(c)
             end
+            x = Nokogiri::XML::NodeSet.new(c.document, [c])
+            sequential_asset_names(x, container: true)
             a[:multi] or break
           end
         end

data/lib/metanorma/jis/biblio.rng

@@ -374,6 +374,16 @@
       <ref name="image"/>
     </element>
   </define>
+  <define name="depiction">
+    <element name="depiction">
+      <optional>
+        <attribute name="scope"/>
+      </optional>
+      <zeroOrMore>
+        <ref name="image"/>
+      </zeroOrMore>
+    </element>
+  </define>
   <define name="NameWithVariants">
     <element name="primary">
       <ref name="LocalizedString"/>
@@ -760,6 +770,9 @@
     <optional>
       <ref name="validity"/>
     </optional>
+    <optional>
+      <ref name="depiction"/>
+    </optional>
   </define>
   <define name="ReducedBibliographicItem">
     <optional>

data/lib/metanorma/jis/front.rb

@@ -7,29 +7,28 @@ module Metanorma
         super.merge("Japanese Industrial Standards" => "JIS")
       end
 
-      def home_agency
+      def default_publisher
         "JIS"
       end
 
-      # Like the ISO code, but multilingual
       def metadata_author(node, xml)
-        metadata_contrib_sdo(node, xml, JIS_HASH,
-                             { role: "author", sourcerole: "publisher" })
+        org_contributor(node, xml,
+                        { source: ["publisher", "pub"], role: "author",
+                          default: JIS_HASH })
         node.attr("doctype") == "expert-commentary" and
           personal_author(node, xml)
       end
 
       def metadata_publisher(node, xml)
-        metadata_contrib_sdo(node, xml, JIS_HASH,
-                             { role: "publisher", sourcerole: "publisher" })
-        metadata_contrib_sdo(node, xml, nil,
-                             { role: "authorizer",
-                               sourcerole: "investigative-organization",
-                               desc: "Investigative organization" })
-        metadata_contrib_sdo(node, xml, nil,
-                             { role: "authorizer",
-                               sourcerole: "investigative-committee",
-                               desc: "Investigative committee" })
+        [{ source: ["publisher", "pub"], role: "publisher", default: JIS_HASH },
+         { role: "authorizer",
+           source: ["investigative-organization"],
+           desc: "Investigative organization" },
+         { role: "authorizer",
+           source: ["investigative-committee"],
+           desc: "Investigative committee" }].each do |o|
+          org_contributor(node, xml, o)
+        end
       end
 
       LANGS = %w(ja en).freeze
@@ -37,56 +36,58 @@ module Metanorma
       JIS_HASH =
         { "ja" => "日本工業規格", "en" => "Japanese Industrial Standards" }.freeze
 
-      def metadata_contrib_sdo(node, xml, default_value, opt)
-        pub, default = metadata_contrib_extract(node, opt[:sourcerole], default_value)
-        metadata_contrib_sdo_build(node, xml, pub, default, opt)
+      def org_organization(node, xml, org)
+        organization(xml, { name: org[:name], abbr: org[:abbr] }.compact,
+                     node, !multiling_docattr(node, "publisher", "", LANGS))
+        org_address(org, xml)
+        org_logo(xml, org[:logo])
       end
 
-      def metadata_contrib_sdo_build(node, xml, pub, default, opt)
-        pub&.each do |p|
-          xml.contributor do |c|
-            c.role type: opt[:role] do |r|
-              opt[:desc] and r.description opt[:desc]
-            end
-            c.organization do |a|
-              organization(a, p, opt[:role] == "publisher", node, default)
-            end
-          end
+      def org_attrs_parse(node, opts)
+        source = opts[:source]&.detect { |s| node.attr(s) }
+        source ||= opts[:source]&.detect do |s|
+          LANGS.detect { |l| node.attr("#{s}-#{l}") }
         end
+        org_attrs_simple_parse(node, opts, source) ||
+          org_attrs_complex_parse(node, opts, source)
+      end
+
+      def org_attrs_complex_parse(node, opts, source)
+        i = 1
+        suffix = ""
+        ret = []
+        while multiling_docattr(node, source, suffix, LANGS)
+          ret << extract_org_attrs_complex(node, opts, source, suffix)
+          i += 1
+          suffix = "_#{i}"
+        end
+        ret
       end
 
-      def metadata_contrib_extract(node, role, default_value)
-        pub, default = multiling_docattr_csv(node, role, LANGS, default_value)
-        a = node.attr("#{role}-abbr") and abbr = a # one abbrev for all languages
-        [pub&.map { |p| { name: p, abbr: abbr } }, default]
-      end
-
-      def multiling_docattr(node, attr, langs)
-        ret = node.attr(attr) and return ret
+      def multiling_docattr(node, attr, suffix, langs)
+        node.nil? and return nil
+        ret = node.attr(attr + suffix) and return ret
         ret = langs.each_with_object({}).each do |l, m|
-          x = node.attr("#{attr}-#{l}") and m[l] = x
+          x = node.attr("#{attr}-#{l}#{suffix}") and m[l] = x
         end.compact
         ret.empty? and return nil
         ret
       end
 
-      def multiling_docattr_csv(node, attr, langs, default)
-        ret = multiling_docattr(node, attr, langs)
-        not_found = ret.nil?
-        ret ||= default
-        ret &&= if ret.is_a?(Hash) then interleave_multiling_docattr(ret)
-                else csv_split(ret)
-                end
-        [ret, not_found]
+      def extract_org_attrs_complex(node, opts, source, suffix)
+        { name: multiling_docattr(node, source, suffix, LANGS),
+          role: opts[:role], desc: opts[:desc],
+          abbr: multiling_docattr(node, "#{source}-abbr", suffix, LANGS),
+          logo: multiling_docattr(node, "#{source}_logo", suffix, LANGS) }
+          .compact
+          .merge(extract_org_attrs_address(node, opts, suffix))
       end
 
-      # TODO abort if CSV count different between different languages
-      def interleave_multiling_docattr(ret)
-        h = ret.transform_values { |v| csv_split(v) }
-        h.each_with_object([]) do |(k, v), m|
-          v.each_with_index do |v1, i|
-            m[i] ||= {}
-            m[i][k] = v1
+      def extract_org_attrs_address(node, opts, suffix)
+        %w(address phone fax email uri).each_with_object({}) do |a, m|
+          opts[:source]&.each do |s|
+            p = multiling_docattr(node, "#{s}-#{a}", suffix, LANGS) and
+              m[a.to_sym] = p
           end
         end
       end
@@ -104,37 +105,26 @@ module Metanorma
         end
       end
 
-      def organization(xml, org, _is_pub, node = nil, default_org = nil)
-        org.is_a?(Hash) or org = { name: org }
+      def organization(xml, org, node = nil, default_org = nil)
+        org.is_a?(Hash) && org[:name] or org = { name: org }
         abbrevs = org_abbrev
         name_str = org[:name].is_a?(Hash) ? org[:name]["en"] : org[:name]
         n = abbrevs.invert[org[:name]] and org = { name: n, abbr: org[:name] }
         multiling_noko_value(org[:name], "name", xml)
-        default_org && a = multiling_docattr(node, "subdivision", LANGS) and
+        default_org && a = multiling_docattr(node, "subdivision", "", LANGS) and
           multiling_noko_value(a, "subdivision", xml)
         abbr = org[:abbr]
         abbr ||= org_abbrev[name_str]
-        default_org && b = node.attr("subdivision-abbr") and abbr = b
+        default_org && b = node&.attr("subdivision-abbr") and abbr = b
         abbr and xml.abbreviation abbr
-        # is_pub && node and org_address(node, org) # should refactor into struct, like abbr
       end
 
-      def metadata_copyright(node, xml)
-        pub, default = metadata_contrib_extract(node, "copyright-holder", nil)
-        if default
-          pub, default = metadata_contrib_extract(node, "publisher", JIS_HASH)
-        end
-
-        pub&.each do |p|
-          xml.copyright do |c|
-            c.from (node.attr("copyright-year") || Date.today.year)
-            c.owner do |owner|
-              owner.organization do |o|
-                organization(o, p, true, node, default)
-              end
-            end
-          end
-        end
+      def copyright_parse(node)
+        opt = { source: ["copyright-holder", "publisher", "pub"],
+                role: "publisher", default: JIS_HASH }
+        ret = org_attrs_parse(node, opt)
+        ret.empty? and ret = [{ name: "-" }]
+        ret
       end
 
       def title(node, xml)
@@ -149,8 +139,6 @@ module Metanorma
       end
 
       def metadata_id(node, xml)
-        node.attr("docidentifier") || node.attr("docnumber") or
-          @fatalerror << "No docnumber attribute supplied"
         if id = node.attr("docidentifier")
           xml.docidentifier id.sub(/^JIS /, ""), **attr_code(type: "JIS")
         else iso_id(node, xml)
@@ -167,21 +155,8 @@ module Metanorma
         end
       end
 
-      def iso_id(node, xml)
-        (!@amd && node.attr("docnumber")) || (@amd && node.attr("updates")) or
-          return
-        params = iso_id_params(node)
-        iso_id_out(xml, params, true)
-      end
-
-      def iso_id_params(node)
-        params = iso_id_params_core(node)
-        params2 = iso_id_params_add(node)
-        if node.attr("updates")
-          orig_id = Pubid::Jis::Identifier::Base.parse(node.attr("updates"))
-          orig_id.edition ||= 1
-        end
-        iso_id_params_resolve(params, params2, node, orig_id)
+      def base_pubid
+        Pubid::Jis::Identifier
       end
 
       def iso_id_params_core(node)
@@ -208,7 +183,7 @@ module Metanorma
       end
 
       def iso_id_default(params)
-        Pubid::Jis::Identifier.create(**params)
+        base_pubid.create(**params)
       rescue StandardError => e
         clean_abort("Document identifier: #{e}", xml)
       end

data/lib/metanorma/jis/isodoc.rng

@@ -17,7 +17,7 @@
   these elements; we just want one namespace for any child grammars
   of this.
 -->
-<!-- VERSION v1.2.8 -->
+<!-- VERSION v1.2.9 -->
 <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">
   <include href="reqt.rng"/>
   <include href="basicdoc.rng">
@@ -1958,6 +1958,16 @@
           <data type="boolean"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="type">
+          <choice>
+            <value>letter</value>
+            <value>symbol</value>
+            <value>formula</value>
+            <value>equation</value>
+          </choice>
+        </attribute>
+      </optional>
       <element name="name">
         <oneOrMore>
           <choice>

data/lib/metanorma/jis/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module JIS
-    VERSION = "0.1.3".freeze
+    VERSION = "0.1.5".freeze
   end
 end
 

data/metanorma-jis.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = `git ls-files -- {spec}/*`.split("\n")
   spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
-  spec.add_dependency "metanorma-iso", "~> 2.5.4"
+  spec.add_dependency "metanorma-iso", "~> 2.6.0"
   spec.add_dependency "pubid-jis"
 
   spec.add_development_dependency "debug"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-jis
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-11-20 00:00:00.000000000 Z
+date: 2023-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-iso
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.4
+        version: 2.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.4
+        version: 2.6.0
 - !ruby/object:Gem::Dependency
   name: pubid-jis
   requirement: !ruby/object:Gem::Requirement