metanorma-iec 1.1.3 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 771cadd9f9bf1460c635f15452e434e54daef0e326527745cd7813369385da96
-  data.tar.gz: 46d1d213d84f937c7346cb2e9d33c92b9dae13544cec218a04a4d7b30638845c
+  metadata.gz: e72099c93ed3258ff5f342d7e2904b9e5a4d34e00a0546a0f77e0993f2bf824f
+  data.tar.gz: d12c6b7259b187bf5718140ad47addf83b19281bcd34e1f1bcb80b8f695e39ef
 SHA512:
-  metadata.gz: d4166a09b5768d7ec0bdeb4527764af193dac81ef3cc99ac728224fffc9120833d1bd8063c0cb82922d263b473349e279ef8a95a59774e4750185bb0d2eef1c2
-  data.tar.gz: 5278271ffad07995fc3fdba9715371091d1bbc2743b94f7903d2cfe4e706c046c48de8f06901d70680bf04d878b1af291a8fa37a716ab8e8697ea88fcf112693
+  metadata.gz: 86a009528de61d607c417a99ca4090a829c26e86e2f91c9ab513b3800456d68a544c7fc18eaaeaac0fe0b85474c0fdd1f34d9aaf653ddc54a263ad98dae1e10d
+  data.tar.gz: 19fb4b433da961438c84da0cc0fbc697a7a7d684f37725a6b4f6ad2c193b5e38cefc524405c9071fcfa376e10f85f30101bb3060f2a742db9ecea3ea29c6e518

data/lib/asciidoctor/iec/converter.rb

@@ -38,20 +38,6 @@ module Asciidoctor
                         File.join(File.dirname(__FILE__), "iec.rng"))
       end
 
-      def load_yaml(lang, script)
-        y = if @i18nyaml then YAML.load_file(@i18nyaml)
-            elsif lang == "en"
-              YAML.load_file(File.join(File.dirname(__FILE__), "i18n-en.yaml"))
-            elsif lang == "fr"
-              YAML.load_file(File.join(File.dirname(__FILE__), "i18n-fr.yaml"))
-            elsif lang == "zh" && script == "Hans"
-              YAML.load_file(File.join(File.dirname(__FILE__), "i18n-zh-Hans.yaml"))
-            else
-              YAML.load_file(File.join(File.dirname(__FILE__), "i18n-en.yaml"))
-            end
-        super.merge(y)
-      end
-
       def html_converter(node)
         node.nil? ? IsoDoc::Iec::HtmlConvert.new({}) :
           IsoDoc::Iec::HtmlConvert.new(html_extract_attributes(node))
@@ -75,7 +61,7 @@ module Asciidoctor
       def norm_ref_preface(f)
         return super unless @is_iev
         f.at("./title").next =
-          "<p>#{@norm_empty_pref}</p>"
+          "<p>#{@i18n.norm_empty_pref}</p>"
       end
 
       def term_defs_boilerplate(div, source, term, preface, isodoc)
@@ -84,6 +70,11 @@ module Asciidoctor
 
       def sts_converter(node)
       end
+
+      def sections_names_cleanup(x)
+        super
+        @is_iev and replace_title(x, "//introduction", @i18n&.introduction_iev)
+      end
     end
   end
 end

data/lib/asciidoctor/iec/isodoc.rng

@@ -922,6 +922,9 @@
       <optional>
         <attribute name="script"/>
       </optional>
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <optional>
         <attribute name="obligation">
           <choice>
@@ -961,9 +964,6 @@
   </define>
   <define name="content-subsection">
     <element name="clause">
-      <optional>
-        <attribute name="type"/>
-      </optional>
       <ref name="Content-Section"/>
     </element>
   </define>
@@ -992,6 +992,9 @@
         </choice>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="type"/>
+    </optional>
     <optional>
       <ref name="section-title"/>
     </optional>
@@ -1011,9 +1014,6 @@
   </define>
   <define name="clause">
     <element name="clause">
-      <optional>
-        <attribute name="type"/>
-      </optional>
       <ref name="Clause-Section"/>
     </element>
   </define>
@@ -1042,6 +1042,9 @@
         </choice>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="type"/>
+    </optional>
     <optional>
       <ref name="section-title"/>
     </optional>
@@ -1180,6 +1183,9 @@
       <optional>
         <attribute name="script"/>
       </optional>
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <optional>
         <attribute name="obligation">
           <choice>

data/lib/isodoc/iec/base_convert.rb

@@ -4,14 +4,6 @@ require "metanorma-iso"
 module IsoDoc
   module Iec
     module BaseConvert
-      def metadata_init(lang, script, labels)
-        @meta = Metadata.new(lang, script, labels)
-      end
-
-      def xref_init(lang, script, klass, labels, options)
-        @xrefs = Xref.new(lang, script, klass, labels, options)
-      end
-
       def boilerplate(node, out)
         # processed in foreword instead
       end
@@ -23,7 +15,7 @@ module IsoDoc
         iec_orgname(out)
         middle_title(out)
         out.div **attr_code(id: f ? f["id"] : "") do |s|
-          s.h1(**{ class: "ForewordTitle" }) { |h1| h1 << @foreword_lbl }
+          s.h1(**{ class: "ForewordTitle" }) { |h1| h1 << @i18n.foreword }
           @meta.get[:doctype] == "Amendment" or
             s.div **attr_code(class: "boilerplate_legal") do |s1|
             b&.elements&.each { |e| parse(e, s1) }
@@ -33,7 +25,7 @@ module IsoDoc
       end
 
       def iec_orgname(out)
-        out.p(**{ class: "zzSTDTitle1" }) { |p| p << @labels["IEC"] }
+        out.p(**{ class: "zzSTDTitle1" }) { |p| p << @i18n.get["IEC"] }
         out.p(**{ class: "zzSTDTitle1" }) { |p| p << "____________" }
         out.p(**{ class: "zzSTDTitle1" }) { |p| p << "&nbsp;" }
       end
@@ -60,39 +52,20 @@ module IsoDoc
         out.p(**{ class: "zzSTDTitle1" }) { |p| p << "&nbsp;" }
       end
 
-      def load_yaml(lang, script)
-        y = if @i18nyaml then YAML.load_file(@i18nyaml)
-            elsif lang == "en"
-              YAML.load_file(File.join(File.dirname(__FILE__), "i18n-en.yaml"))
-            elsif lang == "fr"
-              YAML.load_file(File.join(File.dirname(__FILE__), "i18n-fr.yaml"))
-            elsif lang == "zh" && script == "Hans"
-              YAML.load_file(File.join(File.dirname(__FILE__),
-                                       "i18n-zh-Hans.yaml"))
-            else
-              YAML.load_file(File.join(File.dirname(__FILE__), "i18n-en.yaml"))
-            end
-        super.merge(y)
-      end
-
-      def convert1(docxml, filename, dir)
-        id = docxml&.at(ns("//bibdata/docnumber"))&.text
-        @is_iev = id == "60050"
-        super
-      end
-
+=begin
       def introduction(isoxml, out)
         return super unless @is_iev
         f = isoxml.at(ns("//introduction")) || return
         title_attr = { class: "IntroTitle" }
         page_break(out)
         out.div **{ class: "Section3", id: f["id"] } do |div|
-          clause_name(nil, @labels["introduction_iev"], div, title_attr)
+          clause_name(nil, @i18n.get["introduction_iev"], div, title_attr)
           f.elements.each do |e|
             parse(e, div) unless e.name == "title"
           end
         end
       end
+=end
 
       def bibliography(isoxml, out)
         return super unless @is_iev
@@ -112,7 +85,6 @@ module IsoDoc
         out.div **attr_code(id: node["id"]) do |div|
           out.p(**{ class: "zzSTDTitle2" }) do |p|
             p.b do |b|
-              b << "#{@xrefs.anchor(node['id'], :label)} "
               node&.at(ns("./title"))&.children&.each { |c2| parse(c2, b) }
             end
           end
@@ -126,10 +98,10 @@ module IsoDoc
         return super unless @is_iev
         docxml.
           gsub(%r{\s*\[/TERMREF\]\s*</p>\s*<p>\s*\[TERMREF\]}, "; ").
-          gsub(/\[TERMREF\]\s*/, l10n("#{@source_lbl}: ")).
-          gsub(/\s*\[MODIFICATION\]\s*\[\/TERMREF\]/, l10n(", #{@modified_lbl} [/TERMREF]")).
+          gsub(/\[TERMREF\]\s*/, l10n("#{@i18n.source}: ")).
+          gsub(/\s*\[MODIFICATION\]\s*\[\/TERMREF\]/, l10n(", #{@i18n.modified} [/TERMREF]")).
           gsub(/\s*\[\/TERMREF\]\s*/, l10n("")).
-          gsub(/\s*\[MODIFICATION\]/, l10n(", #{@modified_lbl} &mdash; "))
+          gsub(/\s*\[MODIFICATION\]/, l10n(", #{@i18n.modified} &mdash; "))
       end
 
       def set_termdomain(termdomain)
@@ -145,7 +117,7 @@ module IsoDoc
 
       def deprecated_term_parse(node, out)
         out.p **{ class: "DeprecatedTerms", style:"text-align:left;" } do |p|
-          p << l10n("#{@deprecated_lbl}: ")
+          p << l10n("#{@i18n.deprecated}: ")
           node.children.each { |c| parse(c, p) }
           term_suffix(node, p)
         end
@@ -166,10 +138,6 @@ module IsoDoc
         end
       end
 
-      def clause_parse_title(node, div, c1, out)
-        IsoDoc::Common.instance_method(:clause_parse_title).bind(self).call(node, div, c1, out)
-      end
-
       def biblio_list(f, div, biblio)
         biblio = false
         super

data/lib/isodoc/iec/html_convert.rb

@@ -1,6 +1,7 @@
 require "isodoc"
 require "metanorma-iso"
 require_relative "base_convert"
+require_relative "init"
 
 module IsoDoc
   module Iec
@@ -36,6 +37,7 @@ module IsoDoc
       end
 
       include BaseConvert
+      include Init
     end
   end
 end

data/lib/isodoc/iec/i18n-en.yaml

@@ -2,4 +2,17 @@ introduction: INTRODUCTION
 introduction_iev: INTRODUCTION<br/>Principles and rules followed
 foreword: FOREWORD
 IEC: INTERNATIONAL ELECTROTECHNICAL COMMISSION
+formula: Equation
+inequality: Inequality
 section_iev: Section
+term_def_boilerplate: |
+      <p>ISO and IEC maintain terminological databases for use in
+      standardization at the following addresses:</p>
+
+      <ul>
+      <li> <p>IEC Electropedia: available at
+      <link target="http://www.electropedia.org"/>
+      </p> </li>
+      <li> <p>ISO Online browsing platform: available at
+        <link target="http://www.iso.org/obp"/></p> </li>
+      </ul>

data/lib/isodoc/iec/i18n-fr.yaml

@@ -1,5 +1,18 @@
 introduction: INTRODUCTION
 introduction_iev: INTRODUCTION<br/>Principes d’établissement et règles suivies
 foreword: AVANT-PROPOS
+formula: Equation
+inequality: Inégalité
 IEC: COMMISSION ELECTROTECHNIQUE INTERNATIONALE
 section_iev: Section
+term_def_boilerplate: |
+      <p>L'ISO et l'IEC tiennent à jour des bases de données terminologiques
+      destinées à être utilisées en normalisation, consultables aux adresses
+      suivantes:</p>
+      <ul>
+      <li> <p>IEC Electropedia: disponible à l'adresse
+        <link target="http://www.electropedia.org"/>
+      </p> </li>
+      <li> <p>ISO Online browsing platform: disponible à l'adresse
+        <link target="http://www.iso.org/obp"/></p> </li>
+      </ul>

data/lib/isodoc/iec/i18n-zh-Hans.yaml

@@ -1,3 +1,14 @@
 introduction: 引言
 foreword: 前言
 IEC: 国际电工委员会
+formula: 方程式
+inequality: 不等式
+term_def_boilerplate: |
+      <p>ISO和IEC用于标准化的术语数据库地址如下：</p>
+      <ul>
+      <li> <p>IEC Electropedia:
+        位于<link target="http://www.electropedia.org"/>
+      </p> </li>
+      <li> <p>ISO在线浏览平台:
+        位于<link target="http://www.iso.org/obp"/></p></li>
+      </ul>

data/lib/isodoc/iec/i18n.rb

@@ -0,0 +1,19 @@
+module IsoDoc
+  module Iec
+    class I18n < IsoDoc::Iso::I18n
+      def load_yaml1(lang, script)
+        y = if lang == "en"
+              YAML.load_file(File.join(File.dirname(__FILE__), "i18n-en.yaml"))
+            elsif lang == "fr"
+              YAML.load_file(File.join(File.dirname(__FILE__), "i18n-fr.yaml"))
+            elsif lang == "zh" && script == "Hans"
+              YAML.load_file(File.join(File.dirname(__FILE__), "i18n-zh-Hans.yaml"))
+            else
+              YAML.load_file(File.join(File.dirname(__FILE__), "i18n-en.yaml"))
+            end
+        super.merge(y)
+      end
+    end
+  end
+end
+

data/lib/isodoc/iec/init.rb

@@ -0,0 +1,29 @@
+require "isodoc"
+require_relative "metadata"
+require_relative "xref"
+require_relative "i18n"
+
+module IsoDoc
+  module Iec
+    module Init
+      def metadata_init(lang, script, labels)
+        @meta = Metadata.new(lang, script, labels)
+      end
+
+      def xref_init(lang, script, klass, labels, options)
+        @xrefs = Xref.new(lang, script, HtmlConvert.new(language: lang, script: script), labels, options)
+      end
+
+       def i18n_init(lang, script, i18nyaml = nil)
+        @i18n = I18n.new(lang, script, i18nyaml || @i18nyaml)
+      end
+
+      def convert1(docxml, filename, dir)
+        id = docxml&.at(ns("//bibdata/docnumber"))&.text
+        @is_iev = id == "60050"
+        super
+      end
+    end
+  end
+end
+

data/lib/isodoc/iec/presentation_xml_convert.rb

@@ -1,9 +1,34 @@
-require_relative "base_convert"
+require_relative "init"
 require "isodoc"
 
 module IsoDoc
   module Iec
     class PresentationXMLConvert < IsoDoc::Iso::PresentationXMLConvert
+      def clause(docxml)
+        docxml.xpath(ns("//clause[not(ancestor::annex)] | "\
+                        "//definitions | //references | "\
+                        "//preface/introduction[clause]")).
+        each do |f|
+          clause1(f)
+        end
+        docxml.xpath(ns("//terms")).each do |f|
+          termclause1(f)
+        end
+      end
+
+      def termclause1(f)
+        return clause1(f) unless @is_iev
+        return if @suppressheadingnumbers || f["unnumbered"]
+        lbl = @xrefs.anchor(f['id'], :label, true) or return
+        prefix_name(f, " ", "#{lbl}#{clausedelim}", "title")
+      end
+
+      def clause1(f)
+        IsoDoc::PresentationXMLConvert.instance_method(:clause1).bind(self).
+          call(f)
+      end
+
+      include Init
     end
   end
 end

data/lib/isodoc/iec/word_convert.rb

@@ -1,6 +1,7 @@
 require "isodoc"
 require "metanorma-iso"
 require_relative "base_convert"
+require_relative "init"
 
 module IsoDoc
   module Iec
@@ -171,7 +172,7 @@ module IsoDoc
           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)
+            lbl = node&.at(ns("./name"))&.text
             unless lbl.nil?
               insert_tab(div, 1)
               div << "(#{lbl})"
@@ -181,6 +182,7 @@ module IsoDoc
       end
 
       include BaseConvert
+      include Init
     end
   end
 end

data/lib/isodoc/iec/xref.rb

@@ -38,7 +38,7 @@ module IsoDoc
       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}")
+        l10n("<strong>#{@labels["annex"]} #{num}</strong><br/>#{obl}")
       end
     end
   end

data/lib/metanorma/iec/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module Iec
-    VERSION = "1.1.3"
+    VERSION = "1.2.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.1.0"
-  spec.add_dependency "metanorma-iso", "~> 1.4.0"
+  spec.add_dependency "isodoc", "~> 1.2.0"
+  spec.add_dependency "metanorma-iso", "~> 1.5.0"
 
   spec.add_development_dependency "byebug"
   spec.add_development_dependency "sassc", "2.4.0"

data/spec/asciidoctor-iec/blocks_spec.rb

@@ -265,7 +265,7 @@ RSpec.describe Asciidoctor::Iec do
       INPUT
       #{BLANK_HDR}
              <preface><foreword id="_" obligation="informative">
-         <title>Foreword</title>
+         <title>FOREWORD</title>
          <p id="_">This is a preamble</p>
        </foreword></preface><sections>
        <clause id="_" inline-header="false" obligation="normative">