metanorma-iso 1.1.5 → 1.2.0

data/lib/isodoc/iso/word_convert.rb

@@ -1,3 +1,4 @@
+require_relative "base_convert"
 require "isodoc"
 require_relative "metadata"
 
@@ -33,15 +34,6 @@ module IsoDoc
         }
       end
 
-      def metadata_init(lang, script, labels)
-        @meta = Metadata.new(lang, script, labels)
-      end
-
-      def implicit_reference(b)
-        isocode = b.at(ns("./docidentifier")).text
-        isocode == "IEV"
-      end
-
       def make_body(xml, docxml)
         body_attr = { lang: "EN-US", link: "blue", vlink: "#954F72" }
         xml.body **body_attr do |body|
@@ -60,165 +52,6 @@ module IsoDoc
         end
       end
 
-      def introduction(isoxml, out)
-        f = isoxml.at(ns("//introduction")) || return
-        num = f.at(ns(".//clause")) ? "0" : nil
-        title_attr = { class: "IntroTitle" }
-        page_break(out)
-        out.div **{ class: "Section3", id: f["id"] } do |div|
-          # div.h1 "Introduction", **attr_code(title_attr)
-          clause_name(num, @introduction_lbl, div, title_attr)
-          f.elements.each do |e|
-            if e.name == "patent-notice"
-              e.elements.each { |e1| parse(e1, div) }
-            else
-              parse(e, div) unless e.name == "title"
-            end
-          end
-        end
-      end
-
-      def foreword(isoxml, out)
-        f = isoxml.at(ns("//foreword")) || return
-        page_break(out)
-        out.div **attr_code(id: f["id"]) do |s|
-          s.h1(**{ class: "ForewordTitle" }) { |h1| h1 << @foreword_lbl }
-          f.elements.each { |e| parse(e, s) unless e.name == "title" }
-        end
-      end
-
-      def initial_anchor_names(d)
-        super
-        introduction_names(d.at(ns("//introduction")))
-      end
-
-      # we can reference 0-number clauses in introduction
-      def introduction_names(clause)
-        return if clause.nil?
-        clause.xpath(ns("./clause")).each_with_index do |c, i|
-          section_names1(c, "0.#{i + 1}", 2)
-        end
-      end
-
-      # terms not defined in standoc
-      def error_parse(node, out)
-        case node.name
-        when "appendix" then clause_parse(node, out)
-        else
-          super
-        end
-      end
-
-      def annex_names(clause, num)
-        appendix_names(clause, num)
-        super
-      end
-
-      def appendix_names(clause, num)
-        clause.xpath(ns("./appendix")).each_with_index do |c, i|
-          @anchors[c["id"]] = anchor_struct(i + 1, nil, @appendix_lbl, "clause")
-          @anchors[c["id"]][:level] = 2
-          @anchors[c["id"]][:container] = clause["id"]
-        end
-      end
-
-      def section_names1(clause, num, level)
-        @anchors[clause["id"]] =
-          { label: num, level: level, xref: num }
-        # subclauses are not prefixed with "Clause"
-        clause.xpath(ns("./clause | ./terms | ./term | ./definitions")).
-          each_with_index do |c, i|
-          section_names1(c, "#{num}.#{i + 1}", level + 1)
-        end
-      end
-
-      def annex_names1(clause, num, level)
-        @anchors[clause["id"]] = { label: num, xref: num, level: level }
-        clause.xpath(ns("./clause")).each_with_index do |c, i|
-          annex_names1(c, "#{num}.#{i + 1}", level + 1)
-        end
-      end
-
-      def eref_localities1_zh(target, type, from, to)
-        subsection = from&.text&.match(/\./)
-        ret = type == "list" ? "" : ","
-        ret += " 第#{from.text}" if from
-        ret += "&ndash;#{to}" if to
-        loc = (@locality[type] || type.sub(/^locality:/, "").capitalize )
-        ret += " #{loc}" unless subsection && type == "clause" ||
-          type == "list" || target.match(/^IEV$|^IEC 60050-/)
-        ret += ")" if type == "list"
-        ret
-      end
-
-      def eref_localities1(target, type, from, to, lang = "en")
-        subsection = from&.text&.match(/\./)
-        type = type.downcase
-        return l10n(eref_localities1_zh(target, type, from, to)) if lang == "zh"
-        ret = type == "list" ? "" : ","
-        loc = @locality[type] || type.sub(/^locality:/, "").capitalize
-        ret += " #{loc}" unless subsection && type == "clause" ||
-          type == "list" || target.match(/^IEV$|^IEC 60050-/)
-        ret += " #{from.text}" if from
-        ret += "&ndash;#{to.text}" if to
-        ret += ")" if type == "list"
-        l10n(ret)
-      end
-
-      def prefix_container(container, linkend, target)
-        delim = get_anchors[target][:type] == "listitem" ? " " : ", "
-        l10n(get_anchors[container][:xref] + delim + linkend)
-      end
-
-      def example_p_parse(node, div)
-        div.p do |p|
-          p.span **{ class: "example_label" } do |s|
-            s << example_label(node)
-          end
-          insert_tab(p, 1)
-          node.first_element_child.children.each { |n| parse(n, p) }
-        end
-        node.element_children[1..-1].each { |n| parse(n, div) }
-      end
-
-      def example_parse1(node, div)
-        div.p do |p|
-          p.span **{ class: "example_label" } do |s|
-            s << example_label(node)
-          end
-          insert_tab(p, 1)
-        end
-        node.children.each { |n| parse(n, div) }
-      end
-
-      def example_parse(node, out)
-        out.div **{ id: node["id"], class: "example" } do |div|
-          if node.first_element_child.name == "p"
-            example_p_parse(node, div)
-          else
-            example_parse1(node, div)
-          end
-        end
-      end
-
-      def termexamples_before_termnotes(node)
-        return unless node.at(ns("./termnote")) && node.at(ns("./termexample"))
-        return unless insert = node.at(ns("./definition"))
-        insert = insertall_after_here(node, insert, "termexample")
-        insert = insertall_after_here(node, insert, "termnote")
-      end
-
-      def term_parse(node, out)
-        termexamples_before_termnotes(node)
-        out.p **{ class: "Terms", style:"text-align:left;" } do |p|
-          node.children.each { |c| parse(c, p) }
-        end
-      end
-
-      def clausedelim
-        ""
-      end
-
       def figure_cleanup(docxml)
         super
         docxml.xpath("//div[@class = 'figure']//table[@class = 'dl']").each do |t|
@@ -243,6 +76,8 @@ module IsoDoc
         word_annex_cleanup1(docxml, 5)
         word_annex_cleanup1(docxml, 6)
       end
+
+      include BaseConvert
     end
   end
 end

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "1.1.5".freeze
+    VERSION = "1.2.0".freeze
   end
 end

data/metanorma-iso.gemspec

@@ -27,13 +27,12 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.files         = `git ls-files`.split("\n")
   spec.test_files    = `git ls-files -- {spec}/*`.split("\n")
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
 
   spec.add_dependency "asciidoctor", "~> 1.5.7"
   spec.add_dependency "ruby-jing"
-  spec.add_dependency "isodoc", "~> 0.9.8"
-  spec.add_dependency "iev", "~> 0.2.0"
-  spec.add_dependency "metanorma-standoc", "~> 1.1.0"
+  spec.add_dependency "isodoc", "~> 0.10.0"
+  spec.add_dependency "metanorma-standoc", "~> 1.2.0"
 
   spec.add_development_dependency "bundler", "~> 2.0.1"
   spec.add_development_dependency "byebug"
@@ -46,4 +45,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
   spec.add_development_dependency "metanorma", "~> 0.3.0"
+  spec.add_development_dependency "iev", "~> 0.2.0"
 end

data/spec/asciidoctor-iso/base_spec.rb

@@ -90,21 +90,16 @@ RSpec.describe Asciidoctor::ISO do
     INPUT
            <?xml version="1.0" encoding="UTF-8"?>
        <iso-standard xmlns="http://riboseinc.com/isoxml">
-       <bibdata type="article">
-         <title>
-           <title-intro language="en" format="text/plain">Introduction</title-intro>
-           <title-main language="en" format="text/plain">Main Title — Title</title-main>
-           <title-part language="en" format="text/plain">Title Part</title-part>
-         </title>
-         <title>
-           <title-intro language="fr" format="text/plain">Introduction Française</title-intro>
-           <title-main language="fr" format="text/plain">Titre Principal</title-main>
-           <title-part language="fr" format="text/plain">Part du Titre</title-part>
-         </title>
+       <bibdata type="standard">
+   <title language="en" format="text/plain" type="main">Introduction — Main Title — Title — Title Part</title>
+   <title language="en" format="text/plain" type="title-intro">Introduction</title>
+   <title language="en" format="text/plain" type="title-main">Main Title — Title</title>
+   <title language="en" format="text/plain" type="title-part">Title Part</title>
+   <title language="fr" format="text/plain" type="main">Introduction Française — Titre Principal — Part du Titre</title>
+   <title language="fr" format="text/plain" type="title-intro">Introduction Française</title>
+   <title language="fr" format="text/plain" type="title-main">Titre Principal</title>
+   <title language="fr" format="text/plain" type="title-part">Part du Titre</title>
          <docidentifier type="iso">ISO/PreNWIP3 1000-1</docidentifier>
-<docidentifier type="iso-structured">
-  <project-number part="1">ISO 1000</project-number>
-</docidentifier>
 <docnumber>1000</docnumber>
          <edition>2</edition>
 <version>
@@ -141,6 +136,8 @@ RSpec.describe Asciidoctor::ISO do
              </organization>
            </owner>
          </copyright>
+         <ext>
+         <doctype>article</doctype>
          <editorialgroup>
            <technical-committee number="1" type="A">TC</technical-committee>
            <technical-committee number="11" type="A1">TC1</technical-committee>
@@ -159,6 +156,10 @@ RSpec.describe Asciidoctor::ISO do
 <ics>
   <code>3</code>
 </ics>
+<structuredidentifier>
+  <project-number part="1">ISO 1000</project-number>
+</structuredidentifier>
+       </ext>
        </bibdata>
        <sections/>
        </iso-standard>
@@ -184,17 +185,8 @@ RSpec.describe Asciidoctor::ISO do
     INPUT
            <?xml version="1.0" encoding="UTF-8"?>
        <iso-standard xmlns="http://riboseinc.com/isoxml">
-       <bibdata type="article">
-         <title>
-
-         </title>
-         <title>
-
-         </title>
+       <bibdata type="standard">
          <docidentifier type="iso">ISO/IEC/IETF 1000-1-1:2001</docidentifier>
-         <docidentifier type="iso-structured">
-           <project-number part="1" subpart="1">ISO/IEC/IETF 1000</project-number>
-         </docidentifier>
          <docidentifier type="iso-tc">2000</docidentifier>
          <docnumber>1000</docnumber>
          <contributor>
@@ -269,17 +261,211 @@ RSpec.describe Asciidoctor::ISO do
              </organization>
            </owner>
          </copyright>
+         <ext>
+         <doctype>article</doctype>
          <editorialgroup>
            <technical-committee/>
            <subcommittee/>
            <workgroup/>
          </editorialgroup>
+         <structuredidentifier>
+           <project-number part="1" subpart="1">ISO/IEC/IETF 1000</project-number>
+         </structuredidentifier>
+         </ext>
        </bibdata>
        <sections/>
        </iso-standard>
     OUTPUT
   end
 
+    it "defaults substage" do
+    expect(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)).to be_equivalent_to <<~"OUTPUT"
+      = Document title
+      Author
+      :docfile: test.adoc
+      :nodoc:
+      :novalid:
+      :no-isobib:
+      :docnumber: 1000
+      :docstage: 50
+    INPUT
+    <iso-standard xmlns="http://riboseinc.com/isoxml">
+<bibdata type="standard">
+  <docidentifier type="iso">ISO/FDIS 1000</docidentifier>
+  <docnumber>1000</docnumber>
+  <contributor>
+    <role type="author"/>
+    <organization>
+      <name>International Organization for Standardization</name>
+      <abbreviation>ISO</abbreviation>
+    </organization>
+  </contributor>
+  <contributor>
+    <role type="publisher"/>
+    <organization>
+      <name>International Organization for Standardization</name>
+      <abbreviation>ISO</abbreviation>
+    </organization>
+  </contributor>
+
+  <language>en</language>
+  <script>Latn</script>
+  <status>
+    <stage>50</stage>
+    <substage>00</substage>
+  </status>
+  <copyright>
+    <from>#{Date.today.year}</from>
+    <owner>
+      <organization>
+        <name>International Organization for Standardization</name>
+        <abbreviation>ISO</abbreviation>
+      </organization>
+    </owner>
+  </copyright>
+  <ext>
+    <doctype>article</doctype>
+    <editorialgroup>
+      <technical-committee/>
+      <subcommittee/>
+      <workgroup/>
+    </editorialgroup>
+    <structuredidentifier>
+      <project-number>ISO 1000</project-number>
+    </structuredidentifier>
+  </ext>
+</bibdata>
+<sections/>
+</iso-standard>
+OUTPUT
+    end
+
+        it "defaults substage for stage 60" do
+    expect(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)).to be_equivalent_to <<~"OUTPUT"
+      = Document title
+      Author
+      :docfile: test.adoc
+      :nodoc:
+      :novalid:
+      :no-isobib:
+      :docnumber: 1000
+      :docstage: 60
+    INPUT
+<iso-standard xmlns="http://riboseinc.com/isoxml">
+<bibdata type="standard">
+  <docidentifier type="iso">ISO 1000</docidentifier>
+  <docnumber>1000</docnumber>
+  <contributor>
+    <role type="author"/>
+    <organization>
+      <name>International Organization for Standardization</name>
+      <abbreviation>ISO</abbreviation>
+    </organization>
+  </contributor>
+  <contributor>
+    <role type="publisher"/>
+    <organization>
+      <name>International Organization for Standardization</name>
+      <abbreviation>ISO</abbreviation>
+    </organization>
+  </contributor>
+
+  <language>en</language>
+  <script>Latn</script>
+  <status>
+    <stage>60</stage>
+    <substage>60</substage>
+  </status>
+  <copyright>
+    <from>#{Date.today.year}</from>
+    <owner>
+      <organization>
+        <name>International Organization for Standardization</name>
+        <abbreviation>ISO</abbreviation>
+      </organization>
+    </owner>
+  </copyright>
+  <ext>
+    <doctype>article</doctype>
+    <editorialgroup>
+      <technical-committee/>
+      <subcommittee/>
+      <workgroup/>
+    </editorialgroup>
+    <structuredidentifier>
+      <project-number>ISO 1000</project-number>
+    </structuredidentifier>
+  </ext>
+</bibdata>
+<sections/>
+</iso-standard>
+OUTPUT
+    end
+
+  it "populates metadata for PRF" do
+    expect(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)).to be_equivalent_to <<~"OUTPUT"
+      = Document title
+      Author
+      :docfile: test.adoc
+      :nodoc:
+      :novalid:
+      :no-isobib:
+      :docnumber: 1000
+      :docstage: 60
+      :docsubstage: 00
+    INPUT
+<iso-standard xmlns="http://riboseinc.com/isoxml">
+<bibdata type="standard">
+  <docidentifier type="iso">ISO/PRF 1000</docidentifier>
+  <docnumber>1000</docnumber>
+  <contributor>
+    <role type="author"/>
+    <organization>
+      <name>International Organization for Standardization</name>
+      <abbreviation>ISO</abbreviation>
+    </organization>
+  </contributor>
+  <contributor>
+    <role type="publisher"/>
+    <organization>
+      <name>International Organization for Standardization</name>
+      <abbreviation>ISO</abbreviation>
+    </organization>
+  </contributor>
+
+  <language>en</language>
+  <script>Latn</script>
+  <status>
+    <stage>60</stage>
+    <substage>00</substage>
+  </status>
+  <copyright>
+    <from>#{Date.today.year}</from>
+    <owner>
+      <organization>
+        <name>International Organization for Standardization</name>
+        <abbreviation>ISO</abbreviation>
+      </organization>
+    </owner>
+  </copyright>
+  <ext>
+    <doctype>article</doctype>
+    <editorialgroup>
+      <technical-committee/>
+      <subcommittee/>
+      <workgroup/>
+    </editorialgroup>
+    <structuredidentifier>
+      <project-number>ISO 1000</project-number>
+    </structuredidentifier>
+  </ext>
+</bibdata>
+<sections/>
+</iso-standard>
+OUTPUT
+    end
+
+
   it "reads scripts into blank HTML document" do
     FileUtils.rm_f "test.html"
     Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)