metanorma-iec 1.4.1 → 1.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dde0fc97c56d1bc99719089986d636bb6c4a09c3c16299cc7c7437bf646909d5
-  data.tar.gz: a97f30a1964f8b48ae6db39b2384653fe15f8bafbdca0740852f8e856fc6d0a7
+  metadata.gz: 2cd54ae113583e981d0db28b08ed00eb92f1b07a79d395c1d907860270889b59
+  data.tar.gz: bb89fee2a134f6affa9a94d21da24a9ef2c827bb5a5ea03991d405325fe101b0
 SHA512:
-  metadata.gz: a780b66ab532b7d2f5f6e827b9147817c032e517188799c8941e52a29b2be60066cd31ebdbe5121aeac27a99a4cb72262f12770cdb8d1941a15da2885226ac2a
-  data.tar.gz: d06c63ac625b6b8ad2da7bd159ec021206d530ee9c92236219155d0b27ff467cef6be4de4f679471366cd70e4f00093899f25fa5cc5237c8286b64f2e5c98b3c
+  metadata.gz: 1b3b33b44d4f1434415774b9ceccdff08a48ce8983aee4e7717e5a217fb47bfbfa77b447d70dd4a4530e5fd0e36e9158ebc18ff9ff58a07d4e3a7d80aee82219
+  data.tar.gz: 4aa8430cb7caa4450916cf7a677612c937183e62a77b938787f4baf76e4d63fa4de0630283bc761cdd30063aca1df8472a8e5098bc9b453121f9eec75038c684

data/Gemfile

@@ -5,3 +5,5 @@ source "https://rubygems.org"
 
 # Specify your gem's dependencies in gemspec
 gemspec
+
+gem "reline", "~> 0.2.8.pre.11"

data/Rakefile

@@ -1,6 +1,6 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
-require 'isodoc/gem_tasks'
+require "isodoc/gem_tasks"
 
 IsoDoc::GemTasks.install
 RSpec::Core::RakeTask.new(:spec)

data/lib/asciidoctor/iec/converter.rb

@@ -1,6 +1,6 @@
 require "asciidoctor"
 require "metanorma-iso"
-require_relative "./front.rb"
+require_relative "./front"
 
 module Asciidoctor
   module Iec
@@ -12,7 +12,10 @@ module Asciidoctor
 
       def init(node)
         super
-        @is_iev = node.attr("docnumber") == "60050"
+        if @is_iev = node.attr("docnumber") == "60050"
+          @vocab = true
+          node.set_attr("docsubtype", "vocabulary")
+        end
       end
 
       def boilerplate_file(x_orig)
@@ -26,13 +29,15 @@ module Asciidoctor
 
       def doctype_validate(xmldoc)
         doctype = xmldoc&.at("//bibdata/ext/doctype")&.text
-        %w(international-standard technical-specification technical-report 
-        publicly-available-specification international-workshop-agreement 
-        guide interpretation-sheet).include? doctype or
-        @log.add("Document Attributes", nil, "#{doctype} is not a recognised document type")
+        %w(international-standard technical-specification technical-report
+           publicly-available-specification international-workshop-agreement
+           guide interpretation-sheet).include? doctype or
+          @log.add("Document Attributes", nil,
+                   "#{doctype} is not a recognised document type")
         if function = xmldoc&.at("//bibdata/ext/function")&.text
-          %w(emc quality-assurance safety environment).include? function or 
-            @log.add("Document Attributes", nil, "#{function} is not a recognised document function")
+          %w(emc quality-assurance safety environment).include? function or
+            @log.add("Document Attributes", nil,
+                     "#{function} is not a recognised document function")
         end
       end
 
@@ -43,29 +48,43 @@ module Asciidoctor
       end
 
       def html_converter(node)
-        node.nil? ? IsoDoc::Iec::HtmlConvert.new({}) :
+        if node.nil?
+          IsoDoc::Iec::HtmlConvert.new({})
+        else
           IsoDoc::Iec::HtmlConvert.new(html_extract_attributes(node))
+        end
       end
 
       def doc_converter(node)
-        node.nil? ? IsoDoc::Iec::WordConvert.new({}) :
+        if node.nil?
+          IsoDoc::Iec::WordConvert.new({})
+        else
           IsoDoc::Iec::WordConvert.new(doc_extract_attributes(node))
+        end
       end
 
       def pdf_converter(node)
         return if node.attr("no-pdf")
-        node.nil? ? IsoDoc::Iec::PdfConvert.new({}) :
-          IsoDoc::Iec::PdfConvert.new(doc_extract_attributes(node))
+
+        if node.nil?
+          IsoDoc::Iec::PdfConvert.new({})
+        else
+          IsoDoc::Iec::PdfConvert.new(pdf_extract_attributes(node))
+        end
       end
 
       def presentation_xml_converter(node)
-        node.nil? ? IsoDoc::Iec::PresentationXMLConvert.new({}) :
+        if node.nil?
+          IsoDoc::Iec::PresentationXMLConvert.new({})
+        else
           IsoDoc::Iec::PresentationXMLConvert.new(doc_extract_attributes(node))
+        end
       end
 
-      def norm_ref_preface(f)
+      def norm_ref_preface(node)
         return super unless @is_iev
-        f.at("./title").next =
+
+        node.at("./title").next =
           "<p>#{@i18n.norm_empty_pref}</p>"
       end
 
@@ -73,19 +92,17 @@ module Asciidoctor
         return super unless @is_iev
       end
 
-      def sts_converter(node)
-      end
-
-      def sections_names_cleanup(x)
+      def sections_names_cleanup(xml)
         super
-        @is_iev and replace_title(x, "//introduction", @i18n&.introduction_iev)
+        @is_iev and replace_title(xml, "//introduction",
+                                  @i18n&.introduction_iev)
       end
 
-      def note(n)
-        if n.title == "Note from TC/SC Officers"
+      def note(note)
+        if note.title == "Note from TC/SC Officers"
           noko do |xml|
             xml.tc_sc_officers_note do |c|
-              wrap_in_para(n, c)
+              wrap_in_para(note, c)
             end
           end.join("\n")
         else
@@ -95,11 +112,11 @@ module Asciidoctor
 
       def note_cleanup(xmldoc)
         super
-        n = xmldoc.at("//tc-sc-officers-note") and xmldoc.at("//bibdata/ext").add_child(n.remove)
+        n = xmldoc.at("//tc-sc-officers-note") and
+          xmldoc.at("//bibdata/ext").add_child(n.remove)
       end
 
-      def image_name_validate(xmldoc)
-      end
+      def image_name_validate(xmldoc); end
     end
   end
 end

data/lib/asciidoctor/iec/front.rb

@@ -199,9 +199,8 @@ module Asciidoctor
         end
       end
 
-      def metadata_doctype(node, xml)
-        xml.doctype doctype(node)
-        xml.horizontal (node.attr("horizontal") || "false")
+      def metadata_subdoctype(node, xml)
+        super
         a = node.attr("function") and xml.function a
       end
 

data/lib/asciidoctor/iec/iec.rng

@@ -57,6 +57,54 @@
         <ref name="tc-sc-officers-note"/>
       </optional>
     </define>
+    <define name="term">
+      <element name="term">
+        <optional>
+          <attribute name="id">
+            <data type="ID"/>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="language"/>
+        </optional>
+        <optional>
+          <attribute name="script"/>
+        </optional>
+        <optional>
+          <attribute name="tag"/>
+        </optional>
+        <optional>
+          <attribute name="multilingual-rendering">
+            <ref name="MultilingualRenderingType"/>
+          </attribute>
+        </optional>
+        <oneOrMore>
+          <ref name="preferred"/>
+        </oneOrMore>
+        <zeroOrMore>
+          <ref name="admitted"/>
+        </zeroOrMore>
+        <zeroOrMore>
+          <ref name="deprecates"/>
+        </zeroOrMore>
+        <optional>
+          <ref name="termdomain"/>
+        </optional>
+        <ref name="termdefinition"/>
+        <zeroOrMore>
+          <ref name="termnote"/>
+        </zeroOrMore>
+        <zeroOrMore>
+          <ref name="termexample"/>
+        </zeroOrMore>
+        <zeroOrMore>
+          <ref name="termsource"/>
+        </zeroOrMore>
+        <zeroOrMore>
+          <ref name="term"/>
+        </zeroOrMore>
+      </element>
+    </define>
   </include>
   <!-- end overrides -->
   <define name="function">

data/lib/asciidoctor/iec/isodoc.rng

@@ -58,7 +58,7 @@
           <attribute name="alt"/>
         </optional>
         <optional>
-          <attribute name="updatetype">
+          <attribute name="update-type">
             <data type="boolean"/>
           </attribute>
         </optional>
@@ -1796,6 +1796,20 @@
           <data type="ID"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="language"/>
+      </optional>
+      <optional>
+        <attribute name="script"/>
+      </optional>
+      <optional>
+        <attribute name="tag"/>
+      </optional>
+      <optional>
+        <attribute name="multilingual-rendering">
+          <ref name="MultilingualRenderingType"/>
+        </attribute>
+      </optional>
       <oneOrMore>
         <ref name="preferred"/>
       </oneOrMore>
@@ -1814,9 +1828,6 @@
       <optional>
         <ref name="termsubject"/>
       </optional>
-      <optional>
-        <ref name="termusage"/>
-      </optional>
       <oneOrMore>
         <ref name="termdefinition"/>
       </oneOrMore>
@@ -1880,17 +1891,37 @@
       </attribute>
     </optional>
     <optional>
-      <attribute name="geographicArea"/>
+      <attribute name="geographic-area"/>
     </optional>
     <choice>
       <ref name="expression_designation"/>
       <ref name="letter_symbol_designation"/>
       <ref name="graphical_symbol_designation"/>
     </choice>
+    <optional>
+      <ref name="fieldofapplication"/>
+    </optional>
+    <optional>
+      <ref name="usageinfo"/>
+    </optional>
     <zeroOrMore>
       <ref name="termsource"/>
     </zeroOrMore>
   </define>
+  <define name="fieldofapplication">
+    <element name="field-of-application">
+      <oneOrMore>
+        <ref name="PureTextElement"/>
+      </oneOrMore>
+    </element>
+  </define>
+  <define name="usageinfo">
+    <element name="usage-info">
+      <oneOrMore>
+        <ref name="PureTextElement"/>
+      </oneOrMore>
+    </element>
+  </define>
   <define name="letter_symbol_designation">
     <element name="letter-symbol">
       <optional>
@@ -1942,11 +1973,15 @@
       </optional>
       <element name="name">
         <zeroOrMore>
-          <ref name="PureTextElement"/>
+          <choice>
+            <ref name="PureTextElement"/>
+            <ref name="stem"/>
+            <ref name="index"/>
+          </choice>
         </zeroOrMore>
       </element>
       <optional>
-        <element name="abbreviationType">
+        <element name="abbreviation-type">
           <ref name="AbbreviationType"/>
         </element>
       </optional>
@@ -1956,7 +1991,7 @@
         </element>
       </optional>
       <optional>
-        <element name="grammarInfo">
+        <element name="grammar">
           <ref name="Grammar"/>
         </element>
       </optional>
@@ -1983,6 +2018,11 @@
         <ref name="GrammarGender"/>
       </element>
     </zeroOrMore>
+    <zeroOrMore>
+      <element name="number">
+        <ref name="GrammarNumber"/>
+      </element>
+    </zeroOrMore>
     <optional>
       <element name="isPreposition">
         <data type="boolean"/>
@@ -2014,7 +2054,7 @@
       </element>
     </optional>
     <zeroOrMore>
-      <element name="grammarvalue">
+      <element name="grammar-value">
         <text/>
       </element>
     </zeroOrMore>
@@ -2027,6 +2067,13 @@
       <value>common</value>
     </choice>
   </define>
+  <define name="GrammarNumber">
+    <choice>
+      <value>singular</value>
+      <value>dual</value>
+      <value>plural</value>
+    </choice>
+  </define>
   <define name="termdomain">
     <element name="domain">
       <oneOrMore>
@@ -2041,13 +2088,6 @@
       </oneOrMore>
     </element>
   </define>
-  <define name="termusage">
-    <element name="usageinfo">
-      <oneOrMore>
-        <ref name="BasicBlock"/>
-      </oneOrMore>
-    </element>
-  </define>
   <define name="termdefinition">
     <element name="definition">
       <choice>
@@ -2061,13 +2101,16 @@
     </element>
   </define>
   <define name="verbaldefinition">
-    <element name="verbaldefinition">
+    <element name="verbal-definition">
       <oneOrMore>
         <choice>
           <ref name="paragraph"/>
           <ref name="dl"/>
           <ref name="ol"/>
           <ref name="ul"/>
+          <ref name="table"/>
+          <ref name="figure"/>
+          <ref name="formula"/>
         </choice>
       </oneOrMore>
       <zeroOrMore>
@@ -2076,7 +2119,7 @@
     </element>
   </define>
   <define name="nonverbalrep">
-    <element name="nonverbalrepresentation">
+    <element name="non-verbal-representation">
       <oneOrMore>
         <choice>
           <ref name="table"/>

data/lib/asciidoctor/iec/isostandard.rng

@@ -159,6 +159,20 @@
             <data type="ID"/>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="language"/>
+        </optional>
+        <optional>
+          <attribute name="script"/>
+        </optional>
+        <optional>
+          <attribute name="tag"/>
+        </optional>
+        <optional>
+          <attribute name="multilingual-rendering">
+            <ref name="MultilingualRenderingType"/>
+          </attribute>
+        </optional>
         <ref name="preferred"/>
         <zeroOrMore>
           <ref name="admitted"/>

data/lib/isodoc/iec/base_convert.rb

@@ -14,13 +14,17 @@ module IsoDoc
         page_break(out)
         iec_orgname(out)
         middle_title(isoxml, out)
-        out.div **attr_code(id: f ? f["id"] : "") do |s|
+        foreword1(f, b, out)
+      end
+
+      def foreword1(sect, boilerplate, out)
+        out.div **attr_code(id: sect ? sect["id"] : "") do |s|
           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) }
+              boilerplate&.elements&.each { |e| parse(e, s1) }
             end
-          f&.elements&.each { |e| parse(e, s) unless e.name == "title" }
+          sect&.elements&.each { |e| parse(e, s) unless e.name == "title" }
         end
       end
 
@@ -31,19 +35,11 @@ module IsoDoc
       end
 
       def middle_title(_isoxml, out)
-        title1 = @meta.get[:doctitlemain]&.sub(/\s+$/, "")
-        @meta.get[:doctitleintro] and
-          title1 = "#{@meta.get[:doctitleintro]} &mdash; #{title1}"
-        if @meta.get[:doctitlepart]
-          title1 += " &mdash;"
-          title2 = @meta.get[:doctitlepart]&.sub(/\s+$/, "")
-          @meta.get[:doctitlepartlabel] and
-            title2 = "#{@meta.get[:doctitlepartlabel]}: #{title2}"
-        end
+        title1, title2 = middle_title_parts(out)
         out.p(**{ class: "zzSTDTitle1" }) do |p|
           p.b { |b| b << title1 }
         end
-        if @meta.get[:doctitlepart]
+        if title2
           out.p(**{ class: "zzSTDTitle1" }) { |p| p << "&nbsp;" }
           out.p(**{ class: "zzSTDTitle2" }) do |p|
             p.b { |b| b << title2 }
@@ -52,6 +48,20 @@ module IsoDoc
         out.p(**{ class: "zzSTDTitle1" }) { |p| p << "&nbsp;" }
       end
 
+      def middle_title_parts(out)
+        title1 = @meta.get[:doctitlemain]&.sub(/\s+$/, "")
+        @meta.get[:doctitleintro] and
+          title1 = "#{@meta.get[:doctitleintro]} &mdash; #{title1}"
+        title2 = nil
+        if @meta.get[:doctitlepart]
+          title1 += " &mdash;"
+          title2 = @meta.get[:doctitlepart]&.sub(/\s+$/, "")
+          @meta.get[:doctitlepartlabel] and
+            title2 = "#{@meta.get[:doctitlepartlabel]}: #{title2}"
+        end
+        [title1, title2]
+      end
+
       def bibliography(isoxml, out)
         return super unless @is_iev
       end
@@ -80,54 +90,9 @@ module IsoDoc
         end
       end
 
-      def termref_cleanup(docxml)
-        return super unless @is_iev
-
-        docxml
-          .gsub(%r{\s*\[/TERMREF\]\s*</p>\s*<p>\s*\[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(", #{@i18n.modified} &mdash; "))
-      end
-
       def set_termdomain(termdomain)
         return super unless @is_iev
       end
-
-      def term_suffix(node, out)
-        return unless @is_iev
-
-        domain = node&.at(ns("../domain"))&.text
-        return unless domain
-
-        out << ", &lt;#{domain}&gt;"
-      end
-
-      def deprecated_term_parse(node, out)
-        out.p **{ class: "DeprecatedTerms", style: "text-align:left;" } do |p|
-          p << l10n("#{@i18n.deprecated}: ")
-          node.children.each { |c| parse(c, p) }
-          term_suffix(node, p)
-        end
-      end
-
-      def admitted_term_parse(node, out)
-        out.p **{ class: "AltTerms", style: "text-align:left;" } do |p|
-          node.children.each { |c| parse(c, p) }
-          term_suffix(node, p)
-        end
-      end
-
-      def term_parse(node, out)
-        return super unless @is_iev
-
-        out.p **{ class: "Terms", style: "text-align:left;" } do |p|
-          node.children.each { |c| parse(c, p) }
-          term_suffix(node, p)
-        end
-      end
     end
   end
 end

data/lib/isodoc/iec/html/htmlstyle.css

@@ -75,6 +75,12 @@ code *, pre *, tt *, kbd *, samp * {
   font-family: {{monospacefont}} !important;
   font-variant-ligatures: none; }
 
+p code, dt code, li code, label code, legend code, caption code, th code, td code,
+p tt, dt tt, li tt, label tt, legend tt, caption tt, th tt, td tt,
+p kbd, dt kbd, li kbd, label kbd, legend kbd, caption kbd, th kbd, td kbd,
+p samp, dt samp, li samp, label samp, legend samp, caption samp, th samp, td samp {
+  font-size: {{monospacefontsize}}; }
+
 article, aside, details, figcaption, figure,
 footer, header, hgroup, menu, nav, section {
   display: block; }
@@ -86,6 +92,9 @@ table {
 h1, h2, h3, h4, h5, h6 {
   font-family: {{headerfont}}; }
 
+.h1, .h2, .h3, .h4, .h5, .h6 {
+  font-family: {{headerfont}}; }
+
 blockquote, q {
   quotes: none; }
   blockquote:before, blockquote:after, q:before, q:after {
@@ -298,19 +307,19 @@ span.partlabel {
   font-size: 0.9em; }
 
 /* TYPOGRAPHY */
-h1 {
+h1, .h1 {
   font-size: 1.5em;
   line-height: 2em;
   margin-top: 2em;
   margin-bottom: 1em; }
 
-h2 {
+h2, .h2 {
   font-size: 1.2em;
   line-height: 1.5em;
   margin-top: 2em;
   margin-bottom: 1em; }
 
-h1, h2, h3, h4, h5, h6 {
+h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
   line-height: 1.2; }
 
 p {
@@ -337,7 +346,7 @@ nav a {
   text-decoration: none;
   color: black; }
 
-h2 p {
+h2 p, .h2 p {
   display: inline; }
 
 ul > li {
@@ -365,9 +374,11 @@ p.AltTerms {
   margin-left: 2em; }
 
 p.Terms {
-  font-weight: bold;
   margin-top: 0em; }
 
+p.TermNum {
+  font-weight: bold; }
+
 /* Navigation*/
 @media screen and (min-width: 768px) {
   nav {
@@ -971,3 +982,24 @@ span.keyword {
 
 .Admonition p, .admonition p {
   margin: 0; }
+
+/* Collapse TOC */
+.collapse-group {
+  display: flex;
+  align-items: center;
+  position: relative; }
+
+.collapse-button {
+  position: absolute;
+  right: 0;
+  display: inline-block;
+  height: 20px;
+  width: 20px;
+  cursor: pointer;
+  background-image: url('data:image/svg+xml,<svg focusable="false" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="rgba(0,0,0,.54)" d="M16.59 8.59L12 13.17 7.41 8.59 6 10l6 6 6-6z"></path></svg>'); }
+
+.collapse {
+  display: none; }
+
+.expand {
+  transform: rotateZ(-180deg); }