metanorma-jis 0.0.1 → 0.0.3

data/lib/metanorma/jis/cleanup.rb

@@ -0,0 +1,42 @@
+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[not(ancestor::name)]").each do |fn|
+          t.xpath(".//fn").each do |fn|
+            i, seen = table_footnote_renumber1(fn, i, seen)
+          end
+        end
+      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
@@ -12,9 +14,17 @@ module Metanorma
 
       def init_i18n(node)
         node.attr("language") or node.set_attr("language", "ja")
+        node.attr("language") == "jp" and node.set_attr("language", "ja")
         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
@@ -37,7 +47,6 @@ module Metanorma
 
       def pdf_converter(node)
         return if node.attr("no-pdf")
-        return
 
         if node.nil?
           IsoDoc::JIS::PdfConvert.new({})
@@ -53,19 +62,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

@@ -46,6 +46,42 @@ module Metanorma
           end
         end
       end
+
+      def title(node, xml)
+        %w(en ja).each do |lang|
+          at = { language: lang, format: "text/plain" }
+          title_full(node, xml, lang, at)
+          title_intro(node, xml, lang, at)
+          title_main(node, xml, lang, at)
+          title_part(node, xml, lang, at)
+          title_amd(node, xml, lang, at) if @amd
+        end
+      end
+
+      def metadata_id(node, xml)
+        if id = node.attr("docidentifier")
+          xml.docidentifier id, **attr_code(type: "JIS")
+        else iso_id(node, xml)
+        end
+        xml.docnumber node.attr("docnumber")
+      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"
+      end
     end
   end
 end

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

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.1".freeze
+    VERSION = "0.0.3".freeze
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-jis
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-16 00:00:00.000000000 Z
+date: 2023-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-iso
@@ -254,12 +254,15 @@ files:
 - lib/isodoc/jis/html/wordstyle.css
 - lib/isodoc/jis/html/wordstyle.scss
 - lib/isodoc/jis/html_convert.rb
+- lib/isodoc/jis/i18n-en.yaml
 - 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/word_cleanup.rb
 - lib/isodoc/jis/word_convert.rb
 - lib/isodoc/jis/xref.rb
 - lib/metanorma-jis.rb
@@ -267,6 +270,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
@@ -275,6 +279,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