metanorma-iec 1.2.6 → 1.2.11

data/lib/isodoc/iec/metadata.rb

@@ -20,6 +20,39 @@ module IsoDoc
         set(:revdate, revdate&.text)
       end
 
+      def doctype(isoxml, _out)
+        super
+        b = isoxml&.at(ns("//bibdata/ext/doctype#{NOLANG}"))&.text 
+        b1 = isoxml&.at(ns("//bibdata/ext/doctype[@language = 'en']"))&.text || b
+        b1 and set(:doctype_en, status_print(b1))
+        b1 = isoxml&.at(ns("//bibdata/ext/doctype[@language = 'fr']"))&.text || b
+        b1 and set(:doctype_fr, status_print(b1))
+        docfunction(isoxml)
+        dochorizontal(isoxml)
+      end
+
+      def docfunction(isoxml)
+        b = isoxml&.at(ns("//bibdata/ext/function#{NOLANG}"))&.text || return
+        b and set(:function, status_print(b))
+        b1 = isoxml&.at(ns("//bibdata/ext/function#{currlang}"))&.text || b
+        b1 and set(:function_display, status_print(b1))
+        b1 = isoxml&.at(ns("//bibdata/ext/function[@language = 'en']"))&.text || b
+        b1 and set(:function_en, status_print(b1))
+        b1 = isoxml&.at(ns("//bibdata/ext/function[@language = 'fr']"))&.text || b
+        b1 and set(:function_fr, status_print(b1))
+      end
+
+      def dochorizontal(isoxml)
+        b = isoxml&.at(ns("//bibdata/ext/horizontal#{NOLANG}"))&.text || return
+        b and set(:horizontal, status_print(b))
+        b1 = isoxml&.at(ns("//bibdata/ext/horizontal#{currlang}"))&.text
+        b1 and set(:horizontal_display, status_print(b1))
+        b1 = isoxml&.at(ns("//bibdata/ext/horizontal[@language = 'en']"))&.text
+        b1 and set(:horizontal_en, status_print(b1))
+        b1 = isoxml&.at(ns("//bibdata/ext/horizontal[@language = 'fr']"))&.text
+        b1 and set(:horizontal_fr, status_print(b1))
+      end
+
       def unpublished(status)
         status.to_i > 0 && status.to_i < 60
       end

data/lib/isodoc/iec/presentation_xml_convert.rb

@@ -28,6 +28,18 @@ module IsoDoc
           call(f)
       end
 
+      def bibdata_i18n(b)
+        fr = IsoDoc::Iec::I18n.new("fr", "Latn")
+        en = IsoDoc::Iec::I18n.new("en", "Latn")
+        [{ lang: "en", i18n: en }, { lang: "fr", i18n: fr }].each do |v|
+          hash_translate(b, v[:i18n].get["doctype_dict"], "./ext/doctype", v[:lang])
+          hash_translate(b, v[:i18n].get["stage_dict"], "./status/stage", v[:lang])
+          hash_translate(b, v[:i18n].get["substage_dict"], "./status/substage", v[:lang])
+          hash_translate(b, v[:i18n].get["function_dict"], "./ext/function", v[:lang])
+          hash_translate(b, v[:i18n].get["horizontal_dict"], "./ext/horizontal", v[:lang])
+        end
+      end
+
       include Init
     end
   end

data/lib/isodoc/iec/word_convert.rb

@@ -16,6 +16,10 @@ module IsoDoc
           bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' : '"Arial",sans-serif'),
           headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' : '"Arial",sans-serif'),
           monospacefont: '"Courier New",monospace',
+          normalfontsize: "10.0pt",
+          footnotefontsize: "8.0pt",
+          smallerfontsize: "8.0pt",
+          monospacefontsize: "9.0pt",
         }
       end
 
@@ -161,6 +165,12 @@ module IsoDoc
         b.replace(b.children)
       end
 
+      def authority_cleanup(docxml)
+        auth = docxml.at("//div[@id = 'boilerplate-feedback' or @class = 'boilerplate-feedback']")
+        auth&.remove
+        super
+      end
+
       def make_body1(body, _docxml)
       end
 

data/lib/metanorma/iec/processor.rb

@@ -2,14 +2,6 @@ require "metanorma/processor"
 
 module Metanorma
   module Iec
-    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
 
       def initialize
@@ -26,6 +18,17 @@ module Metanorma
         )
       end
 
+      def fonts_manifest
+        {
+          "Arial" => nil,
+          "Times New Roman" => nil,
+          "STIX Two Math" => nil,
+          "Source Han Sans" => nil,
+          "Courier" => nil,
+          "Courier New" => nil,
+        }
+      end
+
       def version
         "Metanorma::Iec #{Metanorma::Iec::VERSION}"
       end

data/lib/metanorma/iec/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module Iec
-    VERSION = "1.2.6"
+    VERSION = "1.2.11"
   end
 end
 

data/metanorma-iec.gemspec

@@ -28,8 +28,7 @@ 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.2.0"
-  spec.add_dependency "metanorma-iso", "~> 1.5.10"
+  spec.add_dependency "metanorma-iso", "~> 1.6.0"
 
   spec.add_development_dependency "byebug"
   spec.add_development_dependency "sassc", "2.4.0"

data/spec/asciidoctor-iec/base_spec.rb

@@ -29,6 +29,8 @@ RSpec.describe Asciidoctor::Iec do
 
   it "converts a blank document" do
     FileUtils.rm_f "test.doc"
+    FileUtils.rm_f "test.html"
+    FileUtils.rm_f "test.pdf"
     expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       = Document title
       Author
@@ -40,6 +42,8 @@ RSpec.describe Asciidoctor::Iec do
 <sections/>
 </iec-standard>
     OUTPUT
+    expect(File.exist?("test.pdf")).to be true
+    expect(File.exist?("test.html")).to be true
     expect(File.exist?("test.doc")).to be true
     expect(File.exist?("htmlstyle.css")).to be false
   end
@@ -87,6 +91,9 @@ RSpec.describe Asciidoctor::Iec do
       :title-main-fr: Titre Principal
       :title-part-fr: Part du Titre
       :library-ics: 1,2,3
+      :accessibility-color-inside: true
+      :price-code: XC
+      :cen-processing: true
     INPUT
            <?xml version="1.0" encoding="UTF-8"?>
        <iec-standard xmlns="https://www.metanorma.org/ns/iec" type="semantic" version="#{Metanorma::Iec::VERSION}">
@@ -138,6 +145,7 @@ RSpec.describe Asciidoctor::Iec do
          </copyright>
          <ext>
          <doctype>article</doctype>
+         <horizontal>false</horizontal>
          <editorialgroup>
            <technical-committee number="1" type="A">TC</technical-committee>
            <technical-committee number="11" type="A1">TC1</technical-committee>
@@ -160,6 +168,9 @@ RSpec.describe Asciidoctor::Iec do
   <project-number part="1">IEC 1000</project-number>
 </structuredidentifier>
 <stagename>New work item proposal</stagename>
+<accessibility-color-inside>true</accessibility-color-inside>
+<price-code>XC</price-code>
+<cen-processing>true</cen-processing>
        </ext>
        </bibdata>
        #{UNPUBLISHED_BOILERPLATE}
@@ -182,10 +193,12 @@ RSpec.describe Asciidoctor::Iec do
       :tc-docnumber: 2000
       :language: el
       :script: Grek
-      :publisher: IEC,IETF,ISO
+      :publisher: IEC;IETF;ISO
       :copyright-year: 2001
       :docstage: A2CD
       :doctype: technical-specification
+      :function: emc
+      :horizontal: true
     INPUT
            <?xml version="1.0" encoding="UTF-8"?>
        <iec-standard xmlns="https://www.metanorma.org/ns/iec" type="semantic" version="#{Metanorma::Iec::VERSION}">
@@ -268,6 +281,8 @@ RSpec.describe Asciidoctor::Iec do
          </copyright>
          <ext>
          <doctype>technical-specification</doctype>
+         <horizontal>true</horizontal>
+         <function>emc</function>
          <editorialgroup>
            <technical-committee/>
            <subcommittee/>
@@ -372,6 +387,7 @@ RSpec.describe Asciidoctor::Iec do
   </copyright>
   <ext>
     <doctype>article</doctype>
+             <horizontal>false</horizontal>
     <editorialgroup>
       <technical-committee/>
       <subcommittee/>
@@ -436,6 +452,7 @@ OUTPUT
   </copyright>
   <ext>
     <doctype>article</doctype>
+             <horizontal>false</horizontal>
     <editorialgroup>
       <technical-committee/>
       <subcommittee/>
@@ -501,6 +518,7 @@ OUTPUT
   </copyright>
   <ext>
     <doctype>article</doctype>
+             <horizontal>false</horizontal>
     <editorialgroup>
       <technical-committee/>
       <subcommittee/>
@@ -527,6 +545,7 @@ OUTPUT
       :docfile: test.adoc
       :novalid:
       :no-isobib:
+      :no-pdf:
     INPUT
     html = File.read("test.html", encoding: "utf-8")
     expect(html).to match(%r{<script>})
@@ -540,6 +559,7 @@ OUTPUT
       :docfile: test.adoc
       :novalid:
       :no-isobib:
+      :no-pdf:
     INPUT
     html = File.read("test.html", encoding: "utf-8")
     expect(html).to match(%r[\bpre[^{]+\{[^{]+font-family: "Courier New", monospace;]m)
@@ -556,6 +576,7 @@ OUTPUT
       :novalid:
       :no-isobib:
       :script: Hans
+      :no-pdf:
     INPUT
     html = File.read("test.html", encoding: "utf-8")
     expect(html).to match(%r[\bpre[^{]+\{[^{]+font-family: "Courier New", monospace;]m)
@@ -575,6 +596,7 @@ OUTPUT
       :body-font: Zapf Chancery
       :header-font: Comic Sans
       :monospace-font: Andale Mono
+      :no-pdf:
     INPUT
     html = File.read("test.html", encoding: "utf-8")
     expect(html).to match(%r[\bpre[^{]+\{[^{]+font-family: Andale Mono;]m)
@@ -591,6 +613,7 @@ OUTPUT
       :docfile: test.adoc
       :novalid:
       :no-isobib:
+      :no-pdf:
     INPUT
     word = File.read("test.doc", encoding: "utf-8")
     html = File.read("test.html", encoding: "utf-8")

data/spec/asciidoctor-iec/blocks_spec.rb

@@ -191,7 +191,7 @@ RSpec.describe Asciidoctor::Iec do
       #{BLANK_HDR}
       <sections>
          <admonition id="_" type="safety precautions"><name>Safety Precautions</name><p id="_">While werewolves are hardy community members, keep in mind the following dietary concerns:</p>
-       <ol id="_" type="arabic">
+       <ol id="_">
          <li>
            <p id="_">They are allergic to cinnamon.</p>
          </li>

data/spec/asciidoctor-iec/cleanup_spec.rb

@@ -104,7 +104,7 @@ RSpec.describe Asciidoctor::Iec do
     OUTPUT
   end
 
-  it "strips any initial boilerplate from terms and definitions" do
+  it "keeps any initial boilerplate from terms and definitions" do
     expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       == Terms and Definitions
@@ -123,7 +123,12 @@ RSpec.describe Asciidoctor::Iec do
          <p id="_">For the purposes of this document, 
        the following terms and definitions apply.</p>
         #{TERMS_BOILERPLATE}
-
+<p id='_'>I am boilerplate</p>
+<ul id='_'>
+  <li>
+    <p id='_'>So am I</p>
+  </li>
+</ul>
        <term id="term-time">
        <preferred>Time</preferred>
          <definition><p id="_">This paragraph is extraneous</p></definition>
@@ -266,65 +271,6 @@ RSpec.describe Asciidoctor::Iec do
     OUTPUT
   end
 
-  it "moves table key inside table" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-      #{ASCIIDOC_BLANK_HDR}
-      |===
-      |a |b |c
-      |===
-
-      Key
-
-      a:: b
-    INPUT
-       #{BLANK_HDR}
-       <sections><table id="_">
-         <tbody>
-           <tr>
-             <td valign="top" align="left">a</td>
-             <td valign="top" align="left">b</td>
-             <td valign="top" align="left">c</td>
-           </tr>
-         </tbody>
-       <dl id="_">
-         <dt>a</dt>
-         <dd>
-           <p id="_">b</p>
-         </dd>
-       </dl></table>
-
-       </sections>
-       </iec-standard>
-    OUTPUT
-  end
-
-  it "moves formula key inside formula" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-      #{ASCIIDOC_BLANK_HDR}
-      [stem]
-      ++++
-      Formula
-      ++++
-
-      where
-
-      a:: b
-    INPUT
-       #{BLANK_HDR}
-       <sections><formula id="_">
-          <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>
-           <p id="_">b</p>
-         </dd>
-       </dl></formula>
-
-       </sections>
-       </iec-standard>
-    OUTPUT
-  end
-
   it "moves footnotes inside figures" do
     expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
@@ -349,31 +295,6 @@ RSpec.describe Asciidoctor::Iec do
     OUTPUT
   end
 
-  it "moves figure key inside figure" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-      #{ASCIIDOC_BLANK_HDR}
-      image::spec/examples/rice_images/rice_image1.png[]
-
-      Key
-
-      a:: b
-    INPUT
-       #{BLANK_HDR}
-       <sections><figure id="_">
-         <image src="spec/examples/rice_images/rice_image1.png" id="_" mimetype="image/png" height="auto" width="auto"/>
-       <dl id="_">
-         <dt>a</dt>
-         <dd>
-           <p id="_">b</p>
-         </dd>
-       </dl></figure>
-
-       </sections>
-
-       </iec-standard>
-    OUTPUT
-  end
-
   it "defaults section obligations" do
     expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}

data/spec/asciidoctor-iec/iev_spec.rb

@@ -53,6 +53,7 @@ RSpec.describe Asciidoctor::Iec do
            </copyright>
            <ext>
              <doctype>article</doctype>
+                      <horizontal>false</horizontal>
              <editorialgroup>
                <technical-committee/>
                <subcommittee/>
@@ -131,6 +132,7 @@ INPUT
     </copyright>
     <ext>
       <doctype>article</doctype>
+                      <horizontal>false</horizontal>
       <editorialgroup>
         <technical-committee/>
         <subcommittee/>
@@ -209,6 +211,7 @@ OUTPUT
            </copyright>
            <ext>
              <doctype>article</doctype>
+                      <horizontal>false</horizontal>
              <editorialgroup>
                <technical-committee/>
                <subcommittee/>

data/spec/asciidoctor-iec/lists_spec.rb

@@ -28,7 +28,7 @@ RSpec.describe Asciidoctor::Iec do
          </li>
          <li>
            <p id="_">List 3</p>
-           <ol id="_" type="arabic">
+           <ol id="_">
          <li>
            <p id="_">List A</p>
          </li>
@@ -107,13 +107,13 @@ RSpec.describe Asciidoctor::Iec do
          <li><p id="_">Second</p><p id="_">entry1</p>
        <p id="_">entry2</p></li>
        </ul>
-       <ol id="id1" type="alphabet">
+       <ol id="id1">
          <li>
            <p id="_">First</p>
          </li>
          <li>
            <p id="_">Second</p>
-           <ol id="_" type="alphabet_upper">
+           <ol id="_">
          <li>
            <p id="_">Third</p>
          </li>
@@ -129,19 +129,19 @@ RSpec.describe Asciidoctor::Iec do
            <p id="_">Sixth</p>
          </li>
        </ol>
-       <ol id="_" type="roman">
+       <ol id="_">
          <li>
            <p id="_">A</p>
          </li>
          <li>
            <p id="_">B</p>
-           <ol id="_" type="roman_upper">
+           <ol id="_">
          <li>
            <p id="_">C</p>
          </li>
          <li>
            <p id="_">D</p>
-           <ol id="_" type="arabic">
+           <ol id="_">
          <li>
            <p id="_">E</p>
          </li>