metanorma-jis 0.0.3 → 0.0.5

data/lib/metanorma/jis/front.rb

@@ -1,3 +1,5 @@
+require "pubid-jis"
+
 module Metanorma
   module JIS
     class Converter < ISO::Converter
@@ -59,28 +61,68 @@ 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, **attr_code(type: "JIS")
+          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)
-        id = case doctype(node)
-             when "japanese-industrial-standard", "amendment" then "JIS"
-             when "technical-report" then "TR"
-             when "technical-specification" then "TS"
-             else "JIS"
-             end
-        a = node.attr("docseries") and id += " #{a}"
-        a = node.attr("docnumber") and id += " #{a}"
-        yr = iso_id_year(node)
-        origyr = node.attr("created-date") || yr
-        a = node.attr("amendment-number") and
-          id += ":#{origyr}/AMD #{a}"
-        id += ":#{yr}"
-        xml.docidentifier id, type: "JIS"
+        (!@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

data/lib/metanorma/jis/isodoc.rng

@@ -17,6 +17,7 @@
   these elements; we just want one namespace for any child grammars
   of this.
 -->
+<!-- VERSION v1.2.1 -->
 <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">
@@ -382,6 +383,9 @@
         <optional>
           <ref name="dl"/>
         </optional>
+        <optional>
+          <ref name="source"/>
+        </optional>
       </element>
     </define>
     <define name="figure">
@@ -404,9 +408,6 @@
           <attribute name="class"/>
         </optional>
         <ref name="BlockAttributes"/>
-        <optional>
-          <ref name="source"/>
-        </optional>
         <optional>
           <ref name="tname"/>
         </optional>
@@ -431,6 +432,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">
@@ -1335,15 +1350,19 @@
       </choice>
     </element>
   </define>
+  <define name="Root-Attributes">
+    <attribute name="version"/>
+    <attribute name="schema-version"/>
+    <attribute name="type">
+      <choice>
+        <value>semantic</value>
+        <value>presentation</value>
+      </choice>
+    </attribute>
+  </define>
   <define name="standard-document">
     <element name="standard-document">
-      <attribute name="version"/>
-      <attribute name="type">
-        <choice>
-          <value>semantic</value>
-          <value>presentation</value>
-        </choice>
-      </attribute>
+      <ref name="Root-Attributes"/>
       <ref name="bibdata"/>
       <optional>
         <ref name="misccontainer"/>
@@ -2099,10 +2118,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 +2132,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/isostandard.rng

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-  <!-- default namespace isostandard = "https://www.metanorma.com/ns/iso" -->
+  <!--
+    VERSION v1.2.1
+    default namespace isostandard = "https://www.metanorma.com/ns/iso"
+  -->
   <include href="isodoc.rng">
     <start>
       <ref name="iso-standard"/>
@@ -240,13 +243,7 @@
   -->
   <define name="iso-standard">
     <element name="iso-standard">
-      <attribute name="version"/>
-      <attribute name="type">
-        <choice>
-          <value>semantic</value>
-          <value>presentation</value>
-        </choice>
-      </attribute>
+      <ref name="Root-Attributes"/>
       <ref name="bibdata"/>
       <zeroOrMore>
         <ref name="termdocsource"/>

data/lib/metanorma/jis/jis.rng

@@ -1,11 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<grammar ns="https://www.metanorma.org/ns/jis" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-  <!-- default namespace = "https://www.metanorma.com/ns/jis" -->
+<grammar ns='https://www.metanorma.org/ns/jis' xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+  <!--
+    VERSION v1.2.1
+    default namespace = "https://www.metanorma.com/ns/jis"
+  -->
   <include href="relaton-jis.rng"/>
   <include href="isostandard.rng">
     <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">
@@ -27,13 +40,7 @@
   -->
   <define name="jis-standard">
     <element name="jis-standard">
-      <attribute name="version"/>
-      <attribute name="type">
-        <choice>
-          <value>semantic</value>
-          <value>presentation</value>
-        </choice>
-      </attribute>
+      <ref name="Root-Attributes"/>
       <ref name="bibdata"/>
       <zeroOrMore>
         <ref name="termdocsource"/>

data/lib/metanorma/jis/processor.rb

@@ -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/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module JIS
-    VERSION = "0.0.3".freeze
+    VERSION = "0.0.5".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.3
+  version: 0.0.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-27 00:00:00.000000000 Z
+date: 2023-04-25 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
@@ -262,6 +263,7 @@ files:
 - 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