metanorma-jis 0.0.10 → 0.1.1

data/lib/isodoc/jis/word_convert.rb

@@ -63,34 +63,29 @@ module IsoDoc
           olstyle: "l8" }
       end
 
-      def norm_ref(isoxml, out, num)
-        (f = isoxml.at(ns(norm_ref_xpath)) and f["hidden"] != "true") or
-          return num
+      def norm_ref(node, out)
+        node["hidden"] != "true" or return
         out.div class: "normref_div" do |div|
-          num += 1
-          clause_name(f, f.at(ns("./title")), div, nil)
-          if f.name == "clause"
-            f.elements.each { |e| parse(e, div) unless e.name == "title" }
-          else biblio_list(f, div, false)
+          clause_name(node, node.at(ns("./title")), div, nil)
+          if node.name == "clause"
+            node.elements.each { |e| parse(e, div) unless e.name == "title" }
+          else biblio_list(node, div, false)
           end
         end
-        num
       end
 
-      def bibliography(isoxml, out)
-        (f = isoxml.at(ns(bibliography_xpath)) and f["hidden"] != "true") or
-          return
+      def bibliography(node, out)
+        node["hidden"] != "true" or return
         page_break(out)
         out.div class: "bibliography" do |div|
           div.h1 class: "Section3" do |h1|
-            f.at(ns("./title"))&.children&.each { |c2| parse(c2, h1) }
+            node.at(ns("./title"))&.children&.each { |c2| parse(c2, h1) }
           end
-          biblio_list(f, div, true)
+          biblio_list(node, div, true)
         end
       end
 
       def annex_name(_annex, name, div)
-        preceding_floating_titles(name, div)
         return if name.nil?
 
         div.h1 class: "Annex" do |t|
@@ -114,32 +109,6 @@ module IsoDoc
         end
       end
 
-      def make_body2(body, docxml)
-        body.div class: "WordSection2" do |div2|
-          boilerplate docxml, div2
-          front docxml, div2
-          div2.p { |p| p << "&#xa0;" } # placeholder
-        end
-        section_break(body)
-      end
-
-      def middle(isoxml, out)
-        middle_title(isoxml, out)
-        middle_admonitions(isoxml, out)
-        i = isoxml.at(ns("//sections/introduction")) and
-          introduction i, out
-        scope isoxml, out, 0
-        norm_ref isoxml, out, 0
-        clause_etc isoxml, out, 0
-        annex isoxml, out
-        bibliography isoxml, out
-      end
-
-      def make_body3(body, docxml)
-        super
-        commentary docxml, body
-      end
-
       def footnote_parse(node, out)
         return table_footnote_parse(node, out) if @in_table || @in_figure # &&
 
@@ -161,23 +130,20 @@ module IsoDoc
         @seen_footnote << fn
       end
 
-      def annex(isoxml, out)
-        amd(isoxml) and @suppressheadingnumbers = @oldsuppressheadingnumbers
-        isoxml.xpath(ns("//annex[not(@commentary = 'true')]")).each do |c|
-          page_break(out)
-          render_annex(out, c)
-        end
-        amd(isoxml) and @suppressheadingnumbers = true
+      def annex(node, out)
+        node["commentary"] == "true" and return commentary(node, out)
+        amd?(node.document.root) and
+          @suppressheadingnumbers = @oldsuppressheadingnumbers
+        page_break(out)
+        render_annex(out, node)
+        amd?(node.document.root) and @suppressheadingnumbers = true
       end
 
-      def commentary(isoxml, out)
-        isoxml.xpath(ns("//annex[@commentary = 'true']")).each do |c|
-          out.span style: "mso-bookmark:PRECOMMENTARYPAGEREF"
-          section_break(out)
-          out.div class: "WordSectionCommentary" do |div|
-            commentary_title(isoxml, div)
-            render_annex(div, c)
-          end
+      def commentary(node, out)
+        out.span style: "mso-bookmark:PRECOMMENTARYPAGEREF"
+        section_break(out)
+        out.div class: "WordSectionCommentary" do |div|
+          render_annex(div, node)
         end
       end
 

data/lib/isodoc/jis/xref.rb

@@ -25,23 +25,48 @@ module IsoDoc
         l10n("#{title} #{num}<br/>#{obl}")
       end
 
-      def back_anchor_names(xml)
-        if @parse_settings.empty? || @parse_settings[:clauses]
-          i = Counter.new("@")
-          xml.xpath(ns("//annex")).each do |c|
+      def clause_order_main(docxml)
+        [
+          { path: "//sections/introduction" },
+          { path: "//clause[@type = 'scope']" },
+          { path: @klass.norm_ref_xpath },
+          { path: "//sections/terms | " \
+                  "//sections/clause[descendant::terms]" },
+          { path: "//sections/definitions | " \
+                  "//sections/clause[descendant::definitions][not(descendant::terms)]" },
+          { path: @klass.middle_clause(docxml), multi: true },
+        ]
+      end
+
+      def clause_order_annex(_docxml)
+        [{ path: "//annex[not(@commentary = 'true')]", multi: true }]
+      end
+
+      def clause_order_back(_docxml)
+        [
+          { path: @klass.bibliography_xpath },
+          { path: "//annex[@commentary = 'true']", multi: true },
+          { path: "//indexsect", multi: true },
+          { path: "//colophon/*", multi: true },
+        ]
+      end
+
+      def section_names(clause, num, lvl)
+        clause&.name == "introduction" and clause["unnumbered"] = "true"
+        super
+      end
+
+      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
-              annex_names(c, i.increment(c).print)
+              preface_names(c)
             end
+            a[:multi] or break
           end
-          xml.xpath(ns(@klass.bibliography_xpath)).each do |b|
-            preface_names(b)
-          end
-          xml.xpath(ns("//colophon/clause")).each { |b| preface_names(b) }
-          xml.xpath(ns("//indexsect")).each { |b| preface_names(b) }
         end
-        references(xml) if @parse_settings.empty? || @parse_settings[:refs]
       end
 
       def commentary_names(clause)

data/lib/metanorma/jis/front.rb

@@ -7,42 +7,130 @@ module Metanorma
         super.merge("Japanese Industrial Standards" => "JIS")
       end
 
+      def home_agency
+        "JIS"
+      end
+
+      # Like the ISO code, but multilingual
       def metadata_author(node, xml)
-        publishers = node.attr("publisher") || "JIS"
-        csv_split(publishers)&.each do |p|
-          xml.contributor do |c|
-            c.role type: "author"
-            c.organization do |a|
-              organization(a, p, false, node, !node.attr("publisher"))
-            end
-          end
-        end
+        metadata_contrib_sdo(node, xml, JIS_HASH,
+                             { role: "author", sourcerole: "publisher" })
         node.attr("doctype") == "expert-commentary" and
           personal_author(node, xml)
       end
 
       def metadata_publisher(node, xml)
-        publishers = node.attr("publisher") || "JIS"
-        csv_split(publishers)&.each do |p|
+        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" })
+      end
+
+      LANGS = %w(ja en).freeze
+
+      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)
+      end
+
+      def metadata_contrib_sdo_build(node, xml, pub, default, opt)
+        pub&.each do |p|
           xml.contributor do |c|
-            c.role type: "publisher"
+            c.role type: opt[:role] do |r|
+              opt[:desc] and r.description opt[:desc]
+            end
             c.organization do |a|
-              organization(a, p, true, node, !node.attr("publisher"))
+              organization(a, p, opt[:role] == "publisher", node, default)
+            end
+          end
+        end
+      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
+        ret = langs.each_with_object({}).each do |l, m|
+          x = node.attr("#{attr}-#{l}") 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]
+      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
+          end
+        end
+      end
+
+      def multiling_noko_value(value, tag, xml)
+        if value.is_a?(Hash)
+          xml.send tag do |t|
+            value.each do |k, v|
+              t.variant v, language: k
             end
           end
+        elsif value.is_a?(Array)
+          value.each { |a| xml.send tag, a }
+        else xml.send tag, value
         end
       end
 
+      def organization(xml, org, _is_pub, node = nil, default_org = nil)
+        org.is_a?(Hash) 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
+          multiling_noko_value(a, "subdivision", xml)
+        abbr = org[:abbr]
+        abbr ||= org_abbrev[name_str]
+        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 = node.attr("copyright-holder") || node.attr("publisher") || "JIS"
-        csv_split(pub)&.each do |p|
+        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,
-                             !node.attr("copyright-holder") ||
-                             node.attr("publisher"))
+                organization(o, p, true, node, default)
               end
             end
           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.2 -->
+<!-- VERSION v1.2.4 -->
 <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">
@@ -192,9 +192,11 @@
         </attribute>
       </optional>
       <attribute name="citeas"/>
-      <attribute name="type">
-        <ref name="ReferenceFormat"/>
-      </attribute>
+      <optional>
+        <attribute name="type">
+          <ref name="ReferenceFormat"/>
+        </attribute>
+      </optional>
       <optional>
         <attribute name="alt"/>
       </optional>
@@ -836,6 +838,26 @@
         <ref name="paragraph"/>
       </element>
     </define>
+    <define name="stem">
+      <element name="stem">
+        <attribute name="type">
+          <choice>
+            <value>MathML</value>
+            <value>AsciiMath</value>
+            <value>LatexMath</value>
+          </choice>
+        </attribute>
+        <attribute name="block">
+          <data type="boolean"/>
+        </attribute>
+        <oneOrMore>
+          <choice>
+            <text/>
+            <ref name="AnyElement"/>
+          </choice>
+        </oneOrMore>
+      </element>
+    </define>
     <define name="em">
       <element name="em">
         <zeroOrMore>
@@ -2046,6 +2068,9 @@
   </define>
   <define name="termdefinition">
     <element name="definition">
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <choice>
         <ref name="verbaldefinition"/>
         <ref name="nonverbalrep"/>

data/lib/metanorma/jis/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module JIS
-    VERSION = "0.0.10".freeze
+    VERSION = "0.1.1".freeze
   end
 end
 

data/metanorma-jis.gemspec

@@ -30,9 +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.4.2"
-  #spec.add_dependency "relaton-bipm", "~> 1.14.8"
-  #spec.add_dependency "relaton-iho", "~> 1.14.3"
+  spec.add_dependency "metanorma-iso", "~> 2.5.1"
   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.0.10
+  version: 0.1.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-24 00:00:00.000000000 Z
+date: 2023-08-28 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.4.2
+        version: 2.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.2
+        version: 2.5.1
 - !ruby/object:Gem::Dependency
   name: pubid-jis
   requirement: !ruby/object:Gem::Requirement