metanorma-jis 0.0.2 → 0.0.4

data/lib/metanorma/jis/cleanup.rb

@@ -0,0 +1,43 @@
+module Metanorma
+  module JIS
+    class Converter < ISO::Converter
+      def norm_ref_preface(ref)
+        if ref.at("./note[@type = 'boilerplate']")
+          unwrap_boilerplate_clauses(ref, ".")
+        else
+          pref = if ref_empty?(ref) then @i18n.norm_empty_pref
+                 else @i18n.get[ref_dated(ref)]
+                 end
+          ref.at("./title").next = "<p>#{pref}</p>"
+        end
+      end
+
+      def ref_empty?(ref)
+        ref.xpath(".//bibitem").empty?
+      end
+
+      def ref_dated(ref)
+        refs = ref.xpath("./bibitem").each_with_object({}) do |e, m|
+          if e.at("./date") then m[:dated] = true
+          else m[:undated] = true
+          end
+        end
+        refs[:dated] && refs[:undated] and return "norm_with_refs_pref"
+        refs[:dated] and return "norm_with_refs_pref_all_dated"
+        "norm_with_refs_pref_none_dated"
+      end
+
+      def table_footnote_renumber(xmldoc)
+        xmldoc.xpath("//table | //figure").each do |t|
+          seen = {}
+          i = 0
+          t.xpath(".//fn").each do |fn|
+            i, seen = table_footnote_renumber1(fn, i, seen)
+          end
+        end
+      end
+
+      def docidentifier_cleanup(xmldoc); end
+    end
+  end
+end

data/lib/metanorma/jis/converter.rb

@@ -1,6 +1,8 @@
 require "asciidoctor"
 require "metanorma-iso"
 require_relative "./front"
+require_relative "./validate"
+require_relative "./cleanup"
 
 module Metanorma
   module JIS
@@ -16,10 +18,27 @@ module Metanorma
         super
       end
 
+      def doctype(node)
+        ret = node.attr("doctype")&.gsub(/\s+/, "-")&.downcase ||
+          "japanese-industrial-standard"
+        ret = "japanese-industrial-standard" if ret == "article"
+        ret
+      end
+
       def boilerplate_file(_x_orig)
         File.join(@libdir, "jis_intro_jp.xml")
       end
 
+      def section_attributes(node)
+        ret = super
+        if node.attr("style") == "appendix" && node.level == 1 &&
+            node.option?("commentary")
+          ret[:commentary] = true
+          node.set_attr("obligation", "informative")
+        end
+        ret
+      end
+
       def html_converter(node)
         if node.nil?
           IsoDoc::JIS::HtmlConvert.new({})
@@ -39,8 +58,6 @@ module Metanorma
       def pdf_converter(node)
         return if node.attr("no-pdf")
 
-        return
-
         if node.nil?
           IsoDoc::JIS::PdfConvert.new({})
         else
@@ -55,19 +72,6 @@ module Metanorma
           IsoDoc::JIS::PresentationXMLConvert.new(doc_extract_attributes(node))
         end
       end
-
-      def script_validate(xmldoc)
-        script = xmldoc&.at("//bibdata/script")&.text
-        %w(Jpan Latn).include?(script) or
-          @log.add("Document Attributes", nil,
-                   "#{script} is not a recognised script")
-      end
-
-      def validate(doc)
-        content_validate(doc)
-        schema_validate(formattedstr_strip(doc.dup),
-                        File.join(File.dirname(__FILE__), "jis.rng"))
-      end
     end
   end
 end

data/lib/metanorma/jis/front.rb

@@ -1,3 +1,5 @@
+require "pubid-jis"
+
 module Metanorma
   module JIS
     class Converter < ISO::Converter
@@ -57,6 +59,71 @@ module Metanorma
           title_amd(node, xml, lang, at) if @amd
         end
       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)
+        end
+        xml.docnumber node.attr("docnumber")
+      end
+
+      def get_typeabbr(node, amd: false)
+        amd || node.attr("amendment-number") and return :amd
+        case doctype(node)
+        when "technical-report" then :tr
+        when "technical-specification" then :ts
+        when "amendment" then :amd
+        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)
+      end
+
+      def iso_id_params_core(node)
+        pub = (node.attr("publisher") || "JIS").split(/[;,]/)
+        ret = { number: node.attr("docnumber") || "0",
+                part: node.attr("partnumber"),
+                series: node.attr("docseries"),
+                language: node.attr("language") == "en" ? "E" : nil,
+                type: get_typeabbr(node),
+                publisher: pub[0],
+                copublisher: pub[1..-1] }.compact
+        ret[:copublisher].empty? and ret.delete(:copublisher)
+        ret
+      end
+
+      def iso_id_params_add(node)
+        { number: node.attr("amendment-number"),
+          year: iso_id_year(node) }.compact
+      end
+
+      def iso_id_out(xml, params, _with_prf)
+        id = iso_id_default(params).to_s(with_publisher: false)
+        xml.docidentifier id.strip, type: "JIS"
+      end
+
+      def iso_id_default(params)
+        Pubid::Jis::Identifier.create(**params)
+      rescue StandardError => e
+        clean_abort("Document identifier: #{e}", xml)
+      end
     end
   end
 end

data/lib/metanorma/jis/isodoc.rng

@@ -382,6 +382,9 @@
         <optional>
           <ref name="dl"/>
         </optional>
+        <optional>
+          <ref name="source"/>
+        </optional>
       </element>
     </define>
     <define name="figure">
@@ -404,9 +407,6 @@
           <attribute name="class"/>
         </optional>
         <ref name="BlockAttributes"/>
-        <optional>
-          <ref name="source"/>
-        </optional>
         <optional>
           <ref name="tname"/>
         </optional>
@@ -431,6 +431,20 @@
         <zeroOrMore>
           <ref name="note"/>
         </zeroOrMore>
+        <optional>
+          <ref name="source"/>
+        </optional>
+      </element>
+    </define>
+    <define name="source">
+      <element name="source">
+        <attribute name="status">
+          <ref name="SourceStatusType"/>
+        </attribute>
+        <ref name="origin"/>
+        <optional>
+          <ref name="modification"/>
+        </optional>
       </element>
     </define>
     <define name="sourcecode">
@@ -2099,10 +2113,7 @@
   <define name="termsource">
     <element name="termsource">
       <attribute name="status">
-        <choice>
-          <value>identical</value>
-          <value>modified</value>
-        </choice>
+        <ref name="SourceStatusType"/>
       </attribute>
       <attribute name="type">
         <choice>
@@ -2116,6 +2127,17 @@
       </optional>
     </element>
   </define>
+  <define name="SourceStatusType">
+    <choice>
+      <value>identical</value>
+      <value>modified</value>
+      <value>restyled</value>
+      <value>context-added</value>
+      <value>generalisation</value>
+      <value>specialisation</value>
+      <value>unspecified</value>
+    </choice>
+  </define>
   <define name="origin">
     <element name="origin">
       <choice>

data/lib/metanorma/jis/jis.rng

@@ -6,6 +6,16 @@
     <start>
       <ref name="jis-standard"/>
     </start>
+    <define name="annex">
+      <element name="annex">
+        <optional>
+          <attribute name="commentary">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
+        <ref name="Annex-Section"/>
+      </element>
+    </define>
   </include>
   <!-- end overrides -->
   <define name="floating-section-title">

data/lib/metanorma/jis/processor.rb

@@ -13,7 +13,7 @@ module Metanorma
       def output_formats
         super.merge(
           html: "html",
-          # pdf: "pdf",
+          pdf: "pdf",
           doc: "doc",
         )
       end
@@ -21,8 +21,8 @@ module Metanorma
       def fonts_manifest
         {
           "STIX Two Math" => nil,
-          "MS Gothic" => nil,
-          "MS Mincho" => nil,
+          "IPAexGothic" => nil,
+          "IPAexMincho" => nil,
           "Courier New" => nil,
           "Cambria Math" => nil,
           "Times New Roman" => nil,

data/lib/metanorma/jis/relaton-jis.rng

@@ -6,9 +6,6 @@
         <attribute name="schema-version"/>
       </optional>
       <ref name="doctype"/>
-      <optional>
-        <ref name="docsubtype"/>
-      </optional>
       <ref name="editorialgroup"/>
       <zeroOrMore>
         <ref name="ics"/>
@@ -18,93 +15,12 @@
         <ref name="stagename"/>
       </optional>
     </define>
-    <define name="bdate">
-      <element name="date">
-        <attribute name="type">
-          <choice>
-            <ref name="BibliographicDateType"/>
-            <text/>
-          </choice>
-        </attribute>
-        <choice>
-          <group>
-            <element name="from">
-              <ref name="ISO8601Date"/>
-            </element>
-            <optional>
-              <element name="to">
-                <ref name="ISO8601Date"/>
-              </element>
-            </optional>
-          </group>
-          <element name="on">
-            <choice>
-              <ref name="ISO8601Date"/>
-              <value>--</value>
-              <value>–</value>
-            </choice>
-          </element>
-        </choice>
-      </element>
-    </define>
-    <define name="organization">
-      <element name="organization">
-        <oneOrMore>
-          <ref name="orgname"/>
-        </oneOrMore>
-        <optional>
-          <ref name="abbreviation"/>
-        </optional>
-        <optional>
-          <ref name="uri"/>
-        </optional>
-        <zeroOrMore>
-          <ref name="org-identifier"/>
-        </zeroOrMore>
-        <zeroOrMore>
-          <ref name="contact"/>
-        </zeroOrMore>
-        <optional>
-          <ref name="technical-committee"/>
-        </optional>
-        <optional>
-          <ref name="subcommittee"/>
-        </optional>
-        <optional>
-          <ref name="workgroup"/>
-        </optional>
-        <optional>
-          <ref name="secretariat"/>
-        </optional>
-      </element>
-    </define>
     <define name="DocumentType">
       <choice>
-        <value>british-standard</value>
-        <value>draft-for-development</value>
-        <value>published-document</value>
-        <value>privately-subscribed-standard</value>
-        <value>publicly-available-specification</value>
-        <value>flex-standard</value>
-        <value>international-standard</value>
-        <value>technical-specification</value>
+        <value>japanese-industrial-standard</value>
         <value>technical-report</value>
-        <value>guide</value>
-        <value>international-workshop-agreement</value>
-        <value>industry-technical-agreement</value>
-        <value>standard</value>
-        <value>european-workshop-agreement</value>
-        <value>fast-track-standard</value>
-        <value>expert-commentary</value>
-      </choice>
-    </define>
-    <define name="DocumentSubtype">
-      <choice>
-        <value>specification</value>
-        <value>method-of-test</value>
-        <value>method-of-specifying</value>
-        <value>vocabulary</value>
-        <value>code-of-practice</value>
+        <value>technical-specification</value>
+        <value>amendment</value>
       </choice>
     </define>
     <define name="structuredidentifier">
@@ -126,11 +42,6 @@
       </element>
     </define>
   </include>
-  <define name="updates_document_type">
-    <element name="updates-document-type">
-      <ref name="DocumentType"/>
-    </element>
-  </define>
   <define name="ISOProjectGroup">
     <zeroOrMore>
       <ref name="agency"/>
@@ -148,21 +59,11 @@
       <ref name="secretariat"/>
     </optional>
   </define>
-  <define name="approvalgroup">
-    <element name="approvalgroup">
-      <ref name="ISOProjectGroup"/>
-    </element>
-  </define>
   <define name="agency">
     <element name="agency">
       <text/>
     </element>
   </define>
-  <define name="horizontal">
-    <element name="horizontal">
-      <data type="boolean"/>
-    </element>
-  </define>
   <define name="documentnumber">
     <element name="project-number">
       <optional>
@@ -221,11 +122,4 @@
       <text/>
     </element>
   </define>
-  <define name="coverimages">
-    <element name="coverimages">
-      <oneOrMore>
-        <ref name="image"/>
-      </oneOrMore>
-    </element>
-  </define>
 </grammar>

data/lib/metanorma/jis/validate.rb

@@ -0,0 +1,26 @@
+module Metanorma
+  module JIS
+    class Converter < ISO::Converter
+      def doctype_validate(xmldoc)
+        doctype = xmldoc&.at("//bibdata/ext/doctype")&.text
+        %w(japanese-industrial-standard technical-report
+           technical-specification amendment).include? doctype or
+          @log.add("Document Attributes", nil,
+                   "#{doctype} is not a recognised document type")
+      end
+
+      def script_validate(xmldoc)
+        script = xmldoc&.at("//bibdata/script")&.text
+        %w(Jpan Latn).include?(script) or
+          @log.add("Document Attributes", nil,
+                   "#{script} is not a recognised script")
+      end
+
+      def validate(doc)
+        content_validate(doc)
+        schema_validate(formattedstr_strip(doc.dup),
+                        File.join(File.dirname(__FILE__), "jis.rng"))
+      end
+    end
+  end
+end

data/lib/metanorma/jis/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module JIS
-    VERSION = "0.0.2".freeze
+    VERSION = "0.0.4".freeze
   end
 end
 

data/metanorma-jis.gemspec

@@ -30,8 +30,8 @@ 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.0"
-  spec.add_dependency "ruby-jing"
+  spec.add_dependency "metanorma-iso", "~> 2.4.2"
+  spec.add_dependency "pubid-jis"
 
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-jis
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-20 00:00:00.000000000 Z
+date: 2023-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-iso
@@ -16,16 +16,16 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.4.2
 - !ruby/object:Gem::Dependency
-  name: ruby-jing
+  name: pubid-jis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -238,6 +238,7 @@ files:
 - README.adoc
 - lib/html2doc/lists.rb
 - lib/isodoc/jis/base_convert.rb
+- lib/isodoc/jis/figure.rb
 - lib/isodoc/jis/html/header.html
 - lib/isodoc/jis/html/html_jis_intro.html
 - lib/isodoc/jis/html/html_jis_titlepage.html
@@ -258,9 +259,12 @@ files:
 - lib/isodoc/jis/i18n-ja.yaml
 - lib/isodoc/jis/i18n.rb
 - lib/isodoc/jis/init.rb
+- lib/isodoc/jis/jis.international-standard.xsl
 - lib/isodoc/jis/metadata.rb
 - lib/isodoc/jis/pdf_convert.rb
 - lib/isodoc/jis/presentation_xml_convert.rb
+- lib/isodoc/jis/table.rb
+- lib/isodoc/jis/word_cleanup.rb
 - lib/isodoc/jis/word_convert.rb
 - lib/isodoc/jis/xref.rb
 - lib/metanorma-jis.rb
@@ -268,6 +272,7 @@ files:
 - lib/metanorma/jis/basicdoc.rng
 - lib/metanorma/jis/biblio-standoc.rng
 - lib/metanorma/jis/biblio.rng
+- lib/metanorma/jis/cleanup.rb
 - lib/metanorma/jis/converter.rb
 - lib/metanorma/jis/front.rb
 - lib/metanorma/jis/isodoc.rng
@@ -276,6 +281,7 @@ files:
 - lib/metanorma/jis/processor.rb
 - lib/metanorma/jis/relaton-jis.rng
 - lib/metanorma/jis/reqt.rng
+- lib/metanorma/jis/validate.rb
 - lib/metanorma/jis/version.rb
 - metanorma-jis.gemspec
 homepage: https://github.com/metanorma/metanorma-jis