metanorma-iec 1.0.5 → 1.1.0

data/lib/isodoc/iec/pdf_convert.rb

@@ -13,18 +13,8 @@ module IsoDoc
         super
       end
 
-      def convert(filename, file = nil, debug = false)
-        file = File.read(filename, encoding: "utf-8") if file.nil?
-        docxml, outname_html, dir = convert_init(file, filename, debug)
-        /\.xml$/.match(filename) or
-          filename = Tempfile.open([outname_html, ".xml"], encoding: "utf-8") do |f|
-          f.write file
-          f.path
-        end
-        FileUtils.rm_rf dir
-        ::Metanorma::Output::XslfoPdf.new.convert(
-          filename, outname_html + ".pdf",
-          File.join(@libdir, "iec.international-standard.xsl"))
+      def pdf_stylesheet(docxml)
+        "iec.international-standard.xsl"
       end
     end
   end

data/lib/isodoc/iec/presentation_xml_convert.rb

@@ -0,0 +1,10 @@
+require_relative "base_convert"
+require "isodoc"
+
+module IsoDoc
+  module Iec
+    class PresentationXMLConvert < IsoDoc::Iso::PresentationXMLConvert
+    end
+  end
+end
+

data/lib/isodoc/iec/word_convert.rb

@@ -137,6 +137,9 @@ module IsoDoc
         docxml.xpath("//h1[not(@class)]").each do |h1|
           h1["class"] = "main"
         end
+        docxml.xpath("//h1[@class = 'Section3']").each do |h1|
+          h1["class"] = "main"
+        end
       end
 
       # Incredibly, the numbered boilerplate list in IEC is NOT A LIST,
@@ -160,15 +163,23 @@ module IsoDoc
       def make_body1(body, _docxml)
       end
 
-      #def make_body2(body, docxml)
-        #FileUtils.rm_rf tmpimagedir
-        #FileUtils.mkdir tmpimagedir
-        #super
-      #end
-
       def word_cover(docxml)
       end
 
+      def formula_parse1(node, out)
+        out.div **attr_code(class: "formula") do |div|
+          div.p **attr_code(class: "formula") do |p|
+            insert_tab(div, 1)
+            parse(node.at(ns("./stem")), div)
+            lbl = @xrefs.anchor(node['id'], :label, false)
+            unless lbl.nil?
+              insert_tab(div, 1)
+              div << "(#{lbl})"
+            end
+          end
+        end
+      end
+
       include BaseConvert
     end
   end

data/lib/isodoc/iec/xref.rb

@@ -0,0 +1,45 @@
+module IsoDoc
+  module Iec
+    class Xref < IsoDoc::Iso::Xref
+      def parse(docxml)
+        id = docxml&.at(ns("//bibdata/docnumber"))&.text
+        @is_iev = id == "60050"
+        id = docxml&.at(ns("//bibdata/docidentifier[@type = 'ISO']"))&.text
+        m = /60050-(\d+)/.match(id) and @iev_part = m[1]
+        super
+      end
+
+      def introduction_names(clause)
+        return super unless @is_iev
+      end
+
+      def initial_anchor_names(d)
+        super
+        return unless @is_iev
+        terms_iev_names(d)
+        middle_section_asset_names(d)
+        termnote_anchor_names(d)
+        termexample_anchor_names(d)
+      end
+
+      def terms_iev_names(d)
+        d.xpath(ns("//sections/clause/terms")).each_with_index do |t, i|
+          num = "#{@iev_part}-%02d" % [i+1]
+          @anchors[t["id"]] =
+            { label: num, xref: l10n("#{@labels["section_iev"]}-#{num}"), level: 2,
+              type: "clause" }
+          t.xpath(ns("./term")).each_with_index do |c, i|
+            num2 = "%02d" % [i+1]
+            section_names1(c, "#{num}-#{num2}", 3)
+          end
+        end
+      end
+
+      def annex_name_lbl(clause, num)
+        obl = l10n("(#{@labels["inform_annex"]})")
+        obl = l10n("(#{@labels["norm_annex"]})") if clause["obligation"] == "normative"
+        l10n("<b>#{@labels["annex"]} #{num}</b><br/><br/>#{obl}")
+      end
+    end
+  end
+end

data/lib/metanorma-iec.rb

@@ -4,7 +4,9 @@ require_relative "metanorma/iec/version"
 require "isodoc/iec/html_convert"
 require "isodoc/iec/word_convert"
 require "isodoc/iec/pdf_convert"
+require "isodoc/iec/presentation_xml_convert"
 require "isodoc/iec/metadata"
+require "isodoc/iec/xref"
 
 if defined? Metanorma
   require_relative "metanorma/iec"

data/lib/metanorma/iec/processor.rb

@@ -2,8 +2,12 @@ require "metanorma/processor"
 
 module Metanorma
   module Iec
-    def self.pdf_fonts
-      ["Arial", "Times New Roman", "HanSans", "Courier"]
+    def self.fonts_used
+      {
+        html: ["Arial", "Times New Roman", "HanSans", "Courier New"],
+        doc: ["Arial", "Times New Roman", "HanSans", "Courier New"],
+        pdf: ["Arial", "Times New Roman", "HanSans", "Courier New"],
+      }
     end
 
     class Processor < Metanorma::Processor
@@ -30,14 +34,16 @@ module Metanorma
         Metanorma::Input::Asciidoc.new.process(file, filename, @asciidoctor_backend)
       end
 
-      def output(isodoc_node, outname, format, options={})
+      def output(isodoc_node, inname, outname, format, options={})
         case format
         when :html
-          IsoDoc::Iec::HtmlConvert.new(options).convert(outname, isodoc_node)
+          IsoDoc::Iec::HtmlConvert.new(options).convert(inname, isodoc_node, nil, outname)
         when :doc
-          IsoDoc::Iec::WordConvert.new(options).convert(outname, isodoc_node)
+          IsoDoc::Iec::WordConvert.new(options).convert(inname, isodoc_node, nil, outname)
         when :pdf
-          IsoDoc::Iec::PdfConvert.new(options).convert(outname, isodoc_node)
+          IsoDoc::Iec::PdfConvert.new(options).convert(inname, isodoc_node, nil, outname)
+        when :presentation
+          IsoDoc::Iec::PresentationXMLConvert.new(options).convert(inname, isodoc_node, nil, outname)
         else
           super
         end

data/lib/metanorma/iec/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module Iec
-    VERSION = "1.0.5"
+    VERSION = "1.1.0"
   end
 end
 

data/metanorma-iec.gemspec

@@ -28,8 +28,8 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
 
   spec.add_dependency "ruby-jing"
-  spec.add_dependency "isodoc", "~> 1.0.0"
-  spec.add_dependency "metanorma-iso", "~> 1.3.0"
+  spec.add_dependency "isodoc", "~> 1.1.0"
+  spec.add_dependency "metanorma-iso", "~> 1.4.0"
 
   spec.add_development_dependency "byebug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"

data/spec/asciidoctor-iec/base_spec.rb

@@ -99,7 +99,7 @@ RSpec.describe Asciidoctor::Iec do
    <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">IEC/3NWIP 1000-1 ED 2</docidentifier>
+         <docidentifier type="ISO">IEC/3NWIP 1000-1 ED 2</docidentifier>
 <docnumber>1000</docnumber>
          <contributor>
            <role type="author"/>
@@ -185,11 +185,12 @@ RSpec.describe Asciidoctor::Iec do
       :publisher: IEC,IETF,ISO
       :copyright-year: 2001
       :docstage: A2CD
+      :doctype: technical-specification
     INPUT
            <?xml version="1.0" encoding="UTF-8"?>
        <iec-standard xmlns="https://www.metanorma.org/ns/iec">
        <bibdata type="standard">
-         <docidentifier type="iso">ISO/IEC/IETF/2CD 1000-1-1 ED 1</docidentifier>
+         <docidentifier type="ISO">ISO/IEC/IETF/2CDTS 1000-1-1 ED 1</docidentifier>
          <docidentifier type="iso-tc">2000</docidentifier>
          <docnumber>1000</docnumber>
          <contributor>
@@ -266,7 +267,7 @@ RSpec.describe Asciidoctor::Iec do
            </owner>
          </copyright>
          <ext>
-         <doctype>article</doctype>
+         <doctype>technical-specification</doctype>
          <editorialgroup>
            <technical-committee/>
            <subcommittee/>
@@ -337,7 +338,7 @@ RSpec.describe Asciidoctor::Iec do
     INPUT
     <iec-standard xmlns="https://www.metanorma.org/ns/iec">
 <bibdata type="standard">
-  <docidentifier type="iso">IEC/FDIS 1000 ED 1</docidentifier>
+  <docidentifier type="ISO">IEC/FDIS 1000 ED 1</docidentifier>
   <docnumber>1000</docnumber>
   <contributor>
     <role type="author"/>
@@ -401,7 +402,7 @@ OUTPUT
     INPUT
 <iec-standard xmlns="https://www.metanorma.org/ns/iec">
 <bibdata type="standard">
-  <docidentifier type="iso">IEC 1000 ED 1</docidentifier>
+  <docidentifier type="ISO">IEC 1000 ED 1</docidentifier>
   <docnumber>1000</docnumber>
   <contributor>
     <role type="author"/>
@@ -466,7 +467,7 @@ OUTPUT
     INPUT
 <iec-standard xmlns="https://www.metanorma.org/ns/iec">
 <bibdata type="standard">
-  <docidentifier type="iso">IEC 1000 ED 1</docidentifier>
+  <docidentifier type="ISO">IEC 1000 ED 1</docidentifier>
   <docnumber>1000</docnumber>
   <contributor>
     <role type="author"/>
@@ -542,23 +543,8 @@ OUTPUT
     INPUT
     html = File.read("test.html", encoding: "utf-8")
     expect(html).to match(%r[\bpre[^{]+\{[^{]+font-family: "Courier New", monospace;]m)
-    expect(html).to match(%r[blockquote[^{]+\{[^{]+font-family: "Cambria", serif;]m)
-    expect(html).to match(%r[\.h2Annex[^{]+\{[^{]+font-family: "Cambria", serif;]m)
-  end
-
-  it "uses default fonts for alt doc" do
-    FileUtils.rm_f "test_alt.html"
-    Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)
-      = Document title
-      Author
-      :docfile: test.adoc
-      :novalid:
-      :no-isobib:
-    INPUT
-    html = File.read("test_alt.html", encoding: "utf-8")
-    expect(html).to match(%r[\bpre[^{]+\{[^{]+font-family: "Space Mono", monospace;]m)
-    expect(html).to match(%r[blockquote[^{]+\{[^{]+font-family: "Lato", sans-serif;]m)
-    expect(html).to match(%r[\.h2Annex[^{]+\{[^{]+font-family: "Lato", sans-serif;]m)
+    expect(html).to match(%r[blockquote[^{]+\{[^{]+font-family: "Arial", sans-serif;]m)
+    expect(html).to match(%r[\.h2Annex[^{]+\{[^{]+font-family: "Arial", sans-serif;]m)
   end
 
   it "uses Chinese fonts" do

data/spec/asciidoctor-iec/blocks_spec.rb

@@ -113,7 +113,7 @@ RSpec.describe Asciidoctor::Iec do
          <title>Terms and definitions</title>
          <p id="_">For the purposes of this document, the following terms and definitions apply.</p>
          #{TERMS_BOILERPLATE}
-         <term id="_">
+         <term id="term-term1">
          <preferred>Term1</preferred>
          <termnote id="_">
          <p id="_">This is a note</p>
@@ -224,7 +224,7 @@ RSpec.describe Asciidoctor::Iec do
          <title>Terms and definitions</title>
          <p id="_">For the purposes of this document, the following terms and definitions apply.</p>
          #{TERMS_BOILERPLATE}
-         <term id="_">
+         <term id="term-term1">
          <preferred>Term1</preferred>
          <termexample id="_">
          <p id="_">This is an example</p>
@@ -426,7 +426,7 @@ RSpec.describe Asciidoctor::Iec do
          <title>Terms and definitions</title>
          <p id="_">For the purposes of this document, the following terms and definitions apply.</p>
          #{TERMS_BOILERPLATE}
-         <term id="_">
+         <term id="term-term1">
          <preferred>Term1</preferred>
          <termsource status="identical">
          <origin bibitemid="ISO2191" type="inline" citeas="">
@@ -458,7 +458,7 @@ RSpec.describe Asciidoctor::Iec do
          <title>Terms and definitions</title>
          <p id="_">For the purposes of this document, the following terms and definitions apply.</p>
          #{TERMS_BOILERPLATE}
-         <term id="_">
+         <term id="term-term1">
          <preferred>Term1</preferred>
          <termsource status="modified">
          <origin bibitemid="ISO2191" type="inline" citeas="">

data/spec/asciidoctor-iec/cleanup_spec.rb

@@ -34,7 +34,7 @@ RSpec.describe Asciidoctor::Iec do
          <p id="_">For the purposes of this document, 
        the following terms and definitions apply.</p>
         #{TERMS_BOILERPLATE}
-         <term id="_"><preferred><stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub><mi>t</mi><mn>90</mn></msub></math></stem></preferred><admitted><stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub><mi>t</mi><mn>91</mn></msub></math></stem></admitted>
+         <term id="term-t90"><preferred><stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub><mi>t</mi><mn>90</mn></msub></math></stem></preferred><admitted><stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub><mi>t</mi><mn>91</mn></msub></math></stem></admitted>
        <definition><p id="_">Time</p></definition></term>
        </terms>
        </sections>
@@ -70,7 +70,7 @@ RSpec.describe Asciidoctor::Iec do
          <p id="_">For the purposes of this document, 
        the following terms and definitions apply.</p>
         #{TERMS_BOILERPLATE}
-         <term id="_"><preferred><stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub><mi>t</mi><mn>90</mn></msub></math></stem></preferred><definition><formula id="_">
+         <term id="term-t90"><preferred><stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub><mi>t</mi><mn>90</mn></msub></math></stem></preferred><definition><formula id="_">
          <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub><mi>t</mi><mi>A</mi></msub></math></stem>
        </formula><p id="_">This paragraph is extraneous</p></definition>
        </term>
@@ -100,7 +100,7 @@ RSpec.describe Asciidoctor::Iec do
        the following terms and definitions apply.</p>
         #{TERMS_BOILERPLATE}
 
-       <term id="_">
+       <term id="term-time">
        <preferred>Time</preferred>
          <definition><p id="_">This paragraph is extraneous</p></definition>
        </term></terms>
@@ -126,7 +126,7 @@ RSpec.describe Asciidoctor::Iec do
          <eref type="inline" bibitemid="iso216" citeas="ISO 216"/>
        </p>
        </foreword></preface><sections>
-       </sections><bibliography><references id="_" obligation="informative">
+       </sections><bibliography><references id="_" obligation="informative" normative="false">
   <title>Bibliography</title>
   <bibitem id="iso216" type="standard">
   <title format="text/plain">Reference</title>
@@ -161,7 +161,7 @@ RSpec.describe Asciidoctor::Iec do
          <title>Terms and definitions</title>
          <p id="_">For the purposes of this document, the following terms and definitions apply.</p>
          #{TERMS_BOILERPLATE}
-         <term id="_">
+         <term id="term-term1">
          <preferred>Term1</preferred>
          <termsource status="identical">
          <origin bibitemid="ISO2191" type="inline" citeas="">
@@ -189,7 +189,7 @@ RSpec.describe Asciidoctor::Iec do
     INPUT
       #{BLANK_HDR}
       <sections></sections>
-      <bibliography><references id="_" obligation="informative"><title>Normative References</title>
+      <bibliography><references id="_" obligation="informative" normative="true"><title>Normative References</title>
       <p id="_">The following documents are referred to in the text in such a way that some or all of their content constitutes requirements of this document. For dated references, only the edition cited applies. For undated references, the latest edition of the referenced document (including any amendments) applies.</p>
              <bibitem id="iso216" type="standard">
          <title format="text/plain">Reference</title>
@@ -288,7 +288,7 @@ RSpec.describe Asciidoctor::Iec do
     INPUT
        #{BLANK_HDR}
        <sections><formula id="_">
-          <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mi>F</mi><mtext>or</mtext><mi>μ</mi><mi>l</mi><mi>a</mi></math></stem>
+          <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mi>F</mi><mi>or</mi><mi>μ</mi><mi>l</mi><mi>a</mi></math></stem>
        <dl id="_">
          <dt>a</dt>
          <dd>

data/spec/asciidoctor-iec/iev_spec.rb

@@ -20,7 +20,7 @@ RSpec.describe Asciidoctor::Iec do
 <?xml version='1.0' encoding='UTF-8'?>
        <iec-standard xmlns='https://www.metanorma.org/ns/iec'>
          <bibdata type='standard'>
-           <docidentifier type='iso'>IEC 60050 ED 1</docidentifier>
+           <docidentifier type='ISO'>IEC 60050 ED 1</docidentifier>
            <docnumber>60050</docnumber>
            <contributor>
              <role type='author'/>
@@ -67,7 +67,7 @@ RSpec.describe Asciidoctor::Iec do
          #{BOILERPLATE}
          <sections> </sections>
          <bibliography>
-           <references id='_' obligation='informative'>
+           <references id='_' obligation='informative' normative="true">
              <title>Normative References</title>
              <p id='_'>There are no normative references in this document.</p>
              <bibitem id='A'>
@@ -98,7 +98,7 @@ RSpec.describe Asciidoctor::Iec do
 INPUT
 <iec-standard xmlns='https://www.metanorma.org/ns/iec'>
   <bibdata type='standard'>
-    <docidentifier type='iso'>IEC 60050 ED 1</docidentifier>
+    <docidentifier type='ISO'>IEC 60050 ED 1</docidentifier>
     <docnumber>60050</docnumber>
     <contributor>
       <role type='author'/>
@@ -148,7 +148,7 @@ INPUT
       <title>Terms and definitions</title>
       <terms id='_' obligation='normative'>
         <title>General</title>
-        <term id='_'>
+        <term id='term-term-1'>
           <preferred>Term 1</preferred>
         </term>
       </terms>

data/spec/asciidoctor-iec/inline_spec.rb

@@ -127,7 +127,7 @@ RSpec.describe Asciidoctor::Iec do
             #{BLANK_HDR}
        <sections>
 
-       </sections><bibliography><references id="_" obligation="informative">
+       </sections><bibliography><references id="_" obligation="informative" normative="true">
          <title>Normative References</title>
          <p id="_">The following documents are referred to in the text in such a way that some or all of their content constitutes requirements of this document. For dated references, only the edition cited applies. For undated references, the latest edition of the referenced document (including any amendments) applies.</p>
          <bibitem id="ISO712">

data/spec/asciidoctor-iec/section_spec.rb

@@ -69,7 +69,7 @@ RSpec.describe Asciidoctor::Iec do
          <title>Terms and definitions</title>
          <p id="_">For the purposes of this document, the following terms and definitions apply.</p>
          #{TERMS_BOILERPLATE}
-         <term id="_">
+         <term id="term-term1">
          <preferred>Term1</preferred>
        </term>
        </terms>
@@ -94,7 +94,7 @@ RSpec.describe Asciidoctor::Iec do
         </p>
       </li>
     </ul>
-         <term id="_">
+         <term id="term-term2">
          <preferred>Term2</preferred>
        </term>
        </terms>
@@ -118,11 +118,11 @@ RSpec.describe Asciidoctor::Iec do
        </clause>
        <appendix id="_" inline-header="false" obligation="normative">
           <title>Appendix 1</title>
-       </appendix></annex><bibliography><references id="_" obligation="informative">
+       </appendix></annex><bibliography><references id="_" obligation="informative" normative="true">
          <title>Normative References</title><p id="_">There are no normative references in this document.</p>
        </references><clause id="_" obligation="informative">
          <title>Bibliography</title>
-         <references id="_" obligation="informative">
+         <references id="_" obligation="informative" normative="false">
          <title>Bibliography Subsection</title>
        </references>
        </clause>
@@ -209,7 +209,7 @@ RSpec.describe Asciidoctor::Iec do
          <title>Terms and definitions</title>
          <p id="_">For the purposes of this document, the following terms and definitions apply.</p>
          #{TERMS_BOILERPLATE}
-         <term id="_">
+         <term id="term-term1">
          <preferred>Term1</preferred>
        </term>
        </terms>
@@ -236,7 +236,7 @@ RSpec.describe Asciidoctor::Iec do
      </p>
    </li>
  </ul>
-               <term id='_'>
+               <term id='term-term2'>
                  <preferred>Term2</preferred>
                </term>
              </terms>
@@ -267,13 +267,13 @@ RSpec.describe Asciidoctor::Iec do
            </appendix>
          </annex>
          <bibliography>
-           <references id='_' obligation='informative'>
+           <references id='_' obligation='informative' normative="true">
              <title>Normative References</title>
              <p id="_">There are no normative references in this document.</p>
            </references>
            <clause id='_' obligation='informative'>
              <title>Bibliography</title>
-             <references id='_' obligation='informative'>
+             <references id='_' obligation='informative' normative="false">
                <title>Bibliography Subsection</title>
              </references>
            </clause>