metanorma-jis 0.2.12 → 0.3.1

data/lib/isodoc/jis/metadata.rb

@@ -73,20 +73,23 @@ module IsoDoc
         investigative_committee(xml)
       end
 
+      def extract_role(role, desc)
+        <<~XPATH
+          //bibdata/contributor[xmlns:role/@type = '#{role}'][xmlns:role/description = '#{desc}' or xmlns:role/description = '#{desc.downcase}']
+        XPATH
+      end
+
       def investigative_organisation(xml)
-        xpath = "//bibdata/contributor" \
-          "[xmlns:role/@type = 'authorizer'][xmlns:role/description = " \
-          "'investigative organization']/organization/name"
-        org = xml.at(ns(xpath))
+        p = extract_role("authorizer", "Investigative organization")
+        org = xml.at(ns("#{p}/organization/name[@language = '#{@lang}']"))
+        org ||= xml.at(ns("#{p}/organization/name"))
         if org then set_encoded(:"investigative-organization", org)
         else set(:"investigative-organization", get[:publisher])
         end
       end
 
       def investigative_committee(xml)
-        xpath = "//bibdata/contributor" \
-          "[xmlns:role/@type = 'authorizer'][xmlns:role/description = " \
-          "'investigative committee']"
+        xpath = extract_role("authorizer", "Investigative committee")
         if o = xml.at(ns("#{xpath}/organization/name"))
           set_encoded(:"investigative-committee", o)
         elsif p = xml.at(ns("#{xpath}/person"))

data/lib/isodoc/jis/presentation_section.rb

@@ -22,7 +22,7 @@ module IsoDoc
         docxml.at(ns("//annex[@commentary = 'true']")) or return
         b = docxml.at(ns("//bibliography")) ||
           docxml.at(ns("//annex[last()]")).after(" ").next
-        docxml.xpath(ns("//annex[@commentary = 'true']")).reverse.each do |x|
+        docxml.xpath(ns("//annex[@commentary = 'true']")).reverse_each do |x|
           b.next = x.remove
         end
       end
@@ -42,17 +42,22 @@ module IsoDoc
         elem.previous = ret
       end
 
-      def toc_title_insert_pt(docxml)
-        ins = docxml.at(ns("//preface")) ||
+      def make_preface(docxml)
+        docxml.at(ns("//preface")) ||
           docxml.at(ns("//sections | //annex | //bibliography"))
             &.before("<preface> </preface>")
-            &.previous_element or return nil
+            &.previous_element
+      end
+
+      def toc_title_insert_pt(docxml)
+        ins = make_preface(docxml) or return nil
         ins.children.last.after(" ").next
       end
 
       def preface_rearrange(doc)
         move_introduction(doc)
         super
+        move_participants(doc)
       end
 
       def move_introduction(doc)
@@ -63,6 +68,45 @@ module IsoDoc
         dest.children.first.next = source
       end
 
+      def move_participants(doc)
+        p = doc.at(ns("//clause[@type = 'participants']")) or return
+        t = participant_table(p) or return
+        p.remove
+        ins = make_preface(doc) or return nil
+        ins.children.first.previous = t
+      end
+
+      def participant_table(clause)
+        s = clause.at(ns("./sourcecode")) or return nil
+        y = YAML.safe_load(s.children.to_xml(encoding: "UTF-8")) or return nil
+        y.is_a?(Array) or return nil
+        out1 = <<~OUTPUT
+          <clause id='_#{UUIDTools::UUID.random_create}'><title>#{@meta.get[:"investigative-committee"]} #{@i18n.membership_table}</title>
+          <table unnumbered='true'>
+          <thead>
+          <tr><th/><th>#{@i18n.full_name}</th><th>#{@i18n.affiliation}</th></tr>
+          </thead>
+          <tbody>
+        OUTPUT
+        out2 = <<~OUTPUT
+          </tbody></table></clause>
+        OUTPUT
+        "#{out1}#{participant_rows(y)}#{out2}"
+      end
+
+      def participant_rows(yaml)
+        yaml.map do |y|
+          r = y["role"] ? @i18n.l10n("(#{y['role']})") : ""
+          n = y["name"]
+          if n.is_a?(Hash)
+            n =
+              if @lang == "ja" then "#{n['surname']} #{n['givenname']}"
+              else "#{n['givenname']} #{n['surname']}" end
+          end
+          "<tr><td>#{r}</rd><td>#{n}</td><td>#{y['affiliation']}</td></tr>"
+        end.join("\n")
+      end
+
       def middle_title(docxml)
         s = docxml.at(ns("//sections")) or return
         elem = s.children.first

data/lib/isodoc/jis/presentation_xml_convert.rb

@@ -1,6 +1,7 @@
 require_relative "init"
 require "isodoc"
 require_relative "presentation_section"
+require_relative "../../relaton/render-jis/general"
 
 module IsoDoc
   module JIS
@@ -77,8 +78,8 @@ module IsoDoc
       end
 
       def dl_to_para_name(node)
-        e = node.at(ns("./name"))
-        "<p class='ListTitle'>#{e&.children&.to_xml || @i18n.key}</p>"
+        e = node.at(ns("./name")) or return ""
+        "<p class='ListTitle'>#{e.children.to_xml}</p>"
       end
 
       def dl_to_para_terms(node)

data/lib/isodoc/jis/xref.rb

@@ -17,11 +17,22 @@ module IsoDoc
     end
 
     class Xref < IsoDoc::Iso::Xref
+      def hierfigsep
+        @lang == "ja" ? "の" : super
+      end
+
+      def subfigure_label(subfignum)
+        subfignum.zero? and return ""
+        sep = @lang == "ja" ? "の" : " "
+        "#{sep}#{(subfignum + 96).chr})"
+      end
+
       def annex_name_lbl(clause, num)
         obl = l10n("(#{@labels['inform_annex']})")
         clause["obligation"] == "normative" and
           obl = l10n("(#{@labels['norm_annex']})")
-        title = Common::case_with_markup(@labels["annex"], "capital", @script)
+        title = Common::case_with_markup(@labels["annex"], "capital",
+                                         @script)
         l10n("#{title} #{num}<br/>#{obl}")
       end
 

data/lib/metanorma/jis/front.rb

@@ -14,12 +14,12 @@ module Metanorma
       def metadata_author(node, xml)
         org_contributor(node, xml,
                         { source: ["publisher", "pub"], role: "author",
-                          default: JIS_HASH })
+                          default: pub_hash })
         personal_author(node, xml)
       end
 
       def metadata_publisher(node, xml)
-        [{ source: ["publisher", "pub"], role: "publisher", default: JIS_HASH },
+        [{ source: ["publisher", "pub"], role: "publisher", default: pub_hash },
          { role: "authorizer",
            source: ["investigative-organization"],
            desc: "Investigative organization" },
@@ -32,8 +32,9 @@ module Metanorma
 
       LANGS = %w(ja en).freeze
 
-      JIS_HASH =
-        { "ja" => "日本工業規格", "en" => "Japanese Industrial Standards" }.freeze
+      def pub_hash
+        { "ja" => "日本工業規格", "en" => "Japanese Industrial Standards" }
+      end
 
       def org_organization(node, xml, org)
         organization(xml, { name: org[:name], abbr: org[:abbr] }.compact,
@@ -92,9 +93,9 @@ module Metanorma
 
       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
+          value.each do |k, v|
+            xml.send tag, language: k do |x|
+              x << v
             end
           end
         elsif value.is_a?(Array)
@@ -119,7 +120,7 @@ module Metanorma
 
       def copyright_parse(node)
         opt = { source: ["copyright-holder", "publisher", "pub"],
-                role: "publisher", default: JIS_HASH }
+                role: "publisher", default: pub_hash }
         ret = org_attrs_parse(node, opt)
         ret.empty? and ret = [{ name: "-" }]
         ret

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.3.2 -->
+<!-- VERSION v1.3.3 -->
 <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">
@@ -331,9 +331,9 @@
       <zeroOrMore>
         <ref name="table-note"/>
       </zeroOrMore>
-      <optional>
+      <zeroOrMore>
         <ref name="source"/>
-      </optional>
+      </zeroOrMore>
     </define>
     <define name="FigureAttr">
       <optional>
@@ -380,9 +380,9 @@
       <zeroOrMore>
         <ref name="note"/>
       </zeroOrMore>
-      <optional>
+      <zeroOrMore>
         <ref name="source"/>
-      </optional>
+      </zeroOrMore>
     </define>
     <define name="source">
       <element name="source">

data/lib/metanorma/jis/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module JIS
-    VERSION = "0.2.12".freeze
+    VERSION = "0.3.1".freeze
   end
 end
 

data/lib/relaton/render-jis/general.rb

@@ -0,0 +1,21 @@
+require "relaton-render"
+require "metanorma-iso"
+require "isodoc"
+require_relative "parse"
+
+module Relaton
+  module Render
+    module JIS
+      class General < ::Relaton::Render::Iso::General
+        #def config_loc
+        #  YAML.load_file(File.join(File.dirname(__FILE__), "config.yml"))
+        #end
+
+        def klass_initialize(_options)
+          super
+          @parseklass = Relaton::Render::JIS::Parse
+        end
+      end
+    end
+  end
+end

data/lib/relaton/render-jis/parse.rb

@@ -0,0 +1,24 @@
+require "metanorma-iso"
+
+module Relaton
+  module Render
+    module JIS
+      class Parse < ::Relaton::Render::Iso::Parse
+        def simple_or_host_xml2hash(doc, host)
+          ret = super
+          ret.merge(home_standard: home_standard(doc, ret[:publisher_raw] ||
+                                                 ret[:author_raw]))
+        end
+
+        def home_standard(_doc, pubs)
+          pubs&.any? do |r|
+            ["International Organization for Standardization", "ISO",
+             "International Electrotechnical Commission", "IEC",
+             "一般財団法人　日本規格協会", "Japanese Industrial Standards"]
+              .include?(r[:nonpersonal])
+          end
+        end
+      end
+    end
+  end
+end

data/metanorma-jis.gemspec

@@ -47,4 +47,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "timecop", "~> 0.9"
   spec.add_development_dependency "vcr", "~> 6.1.0"
   spec.add_development_dependency "webmock"
+  spec.add_development_dependency "xml-c14n"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-jis
 version: !ruby/object:Gem::Version
-  version: 0.2.12
+  version: 0.3.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-07-08 00:00:00.000000000 Z
+date: 2024-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: japanese_calendar
@@ -234,6 +234,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: xml-c14n
+  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'
 description: |
   metanorma-jis lets you write JIS standards in AsciiDoc syntax.
 
@@ -300,6 +314,8 @@ files:
 - lib/metanorma/jis/reqt.rng
 - lib/metanorma/jis/validate.rb
 - lib/metanorma/jis/version.rb
+- lib/relaton/render-jis/general.rb
+- lib/relaton/render-jis/parse.rb
 - metanorma-jis.gemspec
 homepage: https://github.com/metanorma/metanorma-jis
 licenses: