metanorma-iec 1.2.8 → 1.2.9

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/fonts_manifest.yaml

@@ -0,0 +1,5 @@
+---
+Arial:
+Times New Roman:
+Source Han Sans:
+Courier New:

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

data/lib/metanorma/iec/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module Iec
-    VERSION = "1.2.8"
+    VERSION = "1.2.9"
   end
 end
 

data/metanorma-iec.gemspec

@@ -28,7 +28,6 @@ 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_development_dependency "byebug"

data/spec/asciidoctor-iec/base_spec.rb

@@ -142,6 +142,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>
@@ -190,6 +191,8 @@ RSpec.describe Asciidoctor::Iec do
       :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}">
@@ -272,6 +275,8 @@ RSpec.describe Asciidoctor::Iec do
          </copyright>
          <ext>
          <doctype>technical-specification</doctype>
+         <horizontal>true</horizontal>
+         <function>emc</function>
          <editorialgroup>
            <technical-committee/>
            <subcommittee/>
@@ -376,6 +381,7 @@ RSpec.describe Asciidoctor::Iec do
   </copyright>
   <ext>
     <doctype>article</doctype>
+             <horizontal>false</horizontal>
     <editorialgroup>
       <technical-committee/>
       <subcommittee/>
@@ -440,6 +446,7 @@ OUTPUT
   </copyright>
   <ext>
     <doctype>article</doctype>
+             <horizontal>false</horizontal>
     <editorialgroup>
       <technical-committee/>
       <subcommittee/>
@@ -505,6 +512,7 @@ OUTPUT
   </copyright>
   <ext>
     <doctype>article</doctype>
+             <horizontal>false</horizontal>
     <editorialgroup>
       <technical-committee/>
       <subcommittee/>

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/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>

data/spec/asciidoctor-iec/validate_spec.rb

@@ -37,4 +37,19 @@ it "Warns of illegal doctype" do
   INPUT
     expect(File.read("test.err")).to include "pizza is not a recognised document type"
 end
+
+it "Warns of illegal function" do
+    FileUtils.rm_f "test.err"
+    Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)
+  = Document title
+  Author
+  :docfile: test.adoc
+  :nodoc:
+  :no-isobib:
+  :function: pizza
+
+  text
+  INPUT
+    expect(File.read("test.err")).to include "pizza is not a recognised document function"
+end
 end

data/spec/isodoc/i18n_spec.rb

@@ -7,6 +7,11 @@ RSpec.describe IsoDoc do
       <bibdata>
       <docnumber>1</docnumber>
       <language>en</language>
+      <ext>
+      <doctype>international-standard</doctype>
+      <horizontal>true</horizontal>
+      <function>emc</function>
+      </ext>
       </bibdata>
       <preface>
       <foreword obligation="informative">
@@ -77,6 +82,17 @@ RSpec.describe IsoDoc do
        <bibdata>
        <docnumber>1</docnumber>
        <language current="true">en</language>
+       <ext>
+  <doctype language=''>international-standard</doctype>
+  <doctype language='fr'>Norme international</doctype>
+  <doctype language='en'>International Standard</doctype>
+<horizontal language=''>true</horizontal>
+<horizontal language='fr'>Norme horizontale</horizontal>
+<horizontal language='en'>Horizontal Standard</horizontal>
+<function language=''>emc</function>
+<function language='fr'>Publication fondamentale en CEM</function>
+<function language='en'>Basic EMC Publication</function>
+</ext>
        </bibdata>
        <preface>
        <foreword obligation="informative">
@@ -432,6 +448,11 @@ RSpec.describe IsoDoc do
       <iso-standard xmlns="http://riboseinc.com/isoxml">
       <bibdata>
       <language>fr</language>
+      <ext>
+      <doctype>international-standard</doctype>
+      <horizontal>false</horizontal>
+      <function>emc</function>
+      </ext>
       </bibdata>
       <preface>
       <foreword obligation="informative">
@@ -501,6 +522,15 @@ RSpec.describe IsoDoc do
 <iso-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
        <bibdata>
        <language current="true">fr</language>
+       <ext>
+  <doctype language=''>international-standard</doctype>
+  <doctype language='fr'>Norme international</doctype>
+  <doctype language='en'>International Standard</doctype>
+  <horizontal language=''>false</horizontal>
+  <function language=''>emc</function>
+  <function language='fr'>Publication fondamentale en CEM</function>
+  <function language='en'>Basic EMC Publication</function>
+</ext>
        </bibdata>
        <preface>
        <foreword obligation="informative">

data/spec/isodoc/iso_spec.rb

@@ -65,9 +65,9 @@ RSpec.describe IsoDoc::Iec do
     </iso-standard>
     INPUT
     html = File.read("test.doc", encoding: "utf-8")
-    expect(html).to match(%r[\bpre[^{]+\{[^{]+font-family: "Courier New",monospace;]m)
+    expect(html).to match(%r[\bpre[^{]+\{[^{]+font-family: "Courier New", monospace;]m)
     expect(html).to match(%r[Quote[^{]+\{[^{]+font-family: "Arial", sans-serif;]m)
-    expect(html).to match(%r[\.h2Annex[^{]+\{[^{]+font-family: "Arial",sans-serif;]m)
+    expect(html).to match(%r[\.h2Annex[^{]+\{[^{]+font-family: "Arial", sans-serif;]m)
   end
 
   it "processes examples" do

data/spec/isodoc/metadata_spec.rb

@@ -59,7 +59,15 @@ RSpec.describe IsoDoc::Iec::Metadata do
     </owner>
   </copyright>
   <ext>
-  <doctype>international-standard</doctype>
+  <doctype language=''>international-standard</doctype>
+  <doctype language='fr'>Norme international</doctype>
+  <doctype language='en'>International Standard</doctype>
+<horizontal language=''>true</horizontal>
+<horizontal language='fr'>Norme horizontale</horizontal>
+<horizontal language='en'>Horizontal Standard</horizontal>
+<function language=''>emc</function>
+<function language='fr'>Publication fondamentale en CEM</function>
+<function language='en'>Basic EMC Publication</function>
   <editorialgroup>
     <technical-committee number="34">Food products</technical-committee>
     <subcommittee number="4">Cereals and pulses</subcommittee>
@@ -94,11 +102,21 @@ INPUT
 :doctitlepartlabel=>"Part&nbsp;1",
 :doctype=>"International Standard",
 :doctype_display=>"International Standard",
+:doctype_en=>"International Standard",
+:doctype_fr=>"Norme International",
 :docyear=>"2016",
 :draft=>"0.4",
 :draftinfo=>" (draft 0.4, 2016-05-01)",
 :edition=>"2",
 :editorialgroup=>["TC 34", "SC 4", "WG 3"],
+:function=>"Emc",
+:function_display=>"Basic Emc Publication",
+:function_en=>"Basic Emc Publication",
+:function_fr=>"Publication Fondamentale En Cem",
+:horizontal=>"True",
+:horizontal_display=>"Horizontal Standard",
+:horizontal_en=>"Horizontal Standard",
+:horizontal_fr=>"Norme Horizontale",
 :implementeddate=>"XXX",
 :issueddate=>"XXX",
 :lang=>"en",
@@ -188,6 +206,7 @@ OUTPUT
   </relation>
   <ext>
   <doctype>technical-report</doctype>
+  <horizontal>false</horizontal>
   <editorialgroup>
     <technical-committee number="34" type="ABC">Food products</technical-committee>
     <subcommittee number="4" type="DEF">Cereals and pulses</subcommittee>
@@ -221,8 +240,11 @@ INPUT
 :doctitlepartlabel=>"Part&nbsp;1&ndash;3",
 :doctype=>"Technical Report",
 :doctype_display=>"Technical Report",
+:doctype_en=>"Technical Report",
+:doctype_fr=>"Technical Report",
 :docyear=>"2016",
 :editorialgroup=>["ABC 34", "DEF 4", "GHI 3"],
+:horizontal=>"False",
 :ics=>"1.2.3, 1.2.3",
 :implementeddate=>"XXX",
 :issueddate=>"XXX",

data/spec/spec_helper.rb

@@ -119,7 +119,9 @@ BOILERPLATE =
   gsub(/\{% if unpublished %\}.*\{% endif %\}/m, "").
   gsub(/(?<=\p{Alnum})'(?=\p{Alpha})/, "’").
   gsub(/<p>/, "<p id='_'>").
-  gsub(/<ol>/, "<ol id='_'>")
+  gsub(/<ol>/, "<ol id='_'>").
+  gsub(/ - /, " — ").
+  gsub(/\.\.\./, "…")
 )
 
 BOILERPLATE_LICENSE = <<~END
@@ -178,6 +180,7 @@ BLANK_HDR = <<~"HDR"
   </copyright>
   <ext>
     <doctype>article</doctype>
+    <horizontal>false</horizontal>
   <editorialgroup>
     <technical-committee/>
     <subcommittee/>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iec
 version: !ruby/object:Gem::Version
-  version: 1.2.8
+  version: 1.2.9
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-09 00:00:00.000000000 Z
+date: 2020-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-jing
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: isodoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: metanorma-iso
   requirement: !ruby/object:Gem::Requirement
@@ -263,6 +249,7 @@ files:
 - lib/isodoc/iec/xref.rb
 - lib/metanorma-iec.rb
 - lib/metanorma/iec.rb
+- lib/metanorma/iec/fonts_manifest.yaml
 - lib/metanorma/iec/processor.rb
 - lib/metanorma/iec/version.rb
 - metanorma-iec.gemspec