metanorma-iec 2.2.8 → 2.2.10

data/lib/isodoc/iec/presentation_xml_convert.rb

@@ -28,9 +28,8 @@ module IsoDoc
       end
 
       def termclause1(elem)
-        return clause1(elem) unless @is_iev
-        return if @suppressheadingnumbers || elem["unnumbered"]
-
+        @is_iev or return clause1(elem)
+        @suppressheadingnumbers || elem["unnumbered"] and return
         lbl = @xrefs.anchor(elem["id"], :label, true) or return
         prefix_name(elem, " ", "#{lbl}#{clausedelim}", "title")
       end
@@ -88,8 +87,7 @@ module IsoDoc
       end
 
       def merge_fr_into_en_term(docxml)
-        return unless @is_iev
-
+        @is_iev or return
         docxml.xpath(ns("//term[@language = 'en'][@tag]")).each do |en|
           fr = docxml.at(ns("//term[@language = 'fr'][@tag = '#{en['tag']}']"))
           merge_fr_into_en_term1(en, fr) if fr
@@ -108,8 +106,7 @@ module IsoDoc
       end
 
       def otherlang_designations(docxml)
-        return unless @is_iev
-
+        @is_iev or return
         docxml.xpath(ns("//term")).each do |t|
           otherlang_designations1(t, t["language"]&.split(/,/) || %w(en fr))
         end
@@ -133,8 +130,7 @@ module IsoDoc
         script = Metanorma::Utils.default_script(lang)
         c = HTMLEntities.new
         xml.traverse do |x|
-          next unless x.text?
-
+          x.text? or next
           text = c.encode(c.decode(x.text), :hexadecimal)
           x.replace(cleanup_entities(l10n(text, lang, script), is_xml: false))
         end
@@ -155,8 +151,7 @@ module IsoDoc
         pr = merge_otherlang_designations(
           extract_otherlang_designations(term, lgs),
         )
-        return if pr.empty?
-
+        pr.empty? and return
         prefs = pr.map do |p|
           "<dt>#{p[:lang]}</dt>" \
             "<dd language='#{p[:lang]}' script='#{p[:script]}'>" \
@@ -239,6 +234,59 @@ module IsoDoc
                                             i18nhash: @i18n.get)
       end
 
+      def rearrange_clauses(docxml)
+        insert_foreword(docxml) # feeds preface_rearrange
+        super
+        insert_middle_title(docxml)
+      end
+
+      def insert_foreword(docxml)
+        @meta.get[:doctype] == "Amendment" and return
+        b = docxml.at(ns("//boilerplate/legal-statement")) or return
+        unless f = docxml.at(ns("//preface/foreword"))
+          ins = toc_title_insert_pt(docxml)
+          f = ins.before(<<~CLAUSE).previous_element
+            <foreword id='_#{UUIDTools::UUID.random_create}'> </foreword>
+          CLAUSE
+        end
+        f.children.empty? and f.children = " "
+        ins = f.at(ns("./title")) || f.children.first.before(" ").previous
+        ins.next =
+          "<clause type='boilerplate_legal'>#{to_xml(b.children)}</clause>"
+      end
+
+      def insert_middle_title(docxml)
+        ins = docxml.at(ns("//preface/clause[@type = 'toc']")) or return
+        title1, title2 = middle_title_parts(nil)
+        title2out = ""
+        title2 and title2out = <<~OUTPUT
+          <p class="zzSTDTitle1">&#xa0;</p>
+          <p class="zzSTDTitle2"><strong>#{title2}</strong></p>
+        OUTPUT
+        ins.next = <<~OUTPUT
+          <pagebreak/>
+          <p class="zzSTDTitle1">#{@i18n.get['IEC']}</p>
+          <p class="zzSTDTitle1">____________</p>
+          <p class="zzSTDTitle1">&#xa0;</p>
+          <p class="zzSTDTitle1"><strong>#{title1.upcase}</strong></p>#{title2out}
+          <p class="zzSTDTitle1">&#xa0;</p>
+        OUTPUT
+      end
+
+      def middle_title_parts(_out)
+        title1 = @meta.get[:doctitlemain]&.sub(/\s+$/, "")
+        @meta.get[:doctitleintro] and
+          title1 = "#{@meta.get[:doctitleintro]} \u2014 #{title1}"
+        title2 = nil
+        if @meta.get[:doctitlepart]
+          title1 += " \u2014"
+          title2 = @meta.get[:doctitlepart]&.sub(/\s+$/, "")
+          @meta.get[:doctitlepartlabel] and
+            title2 = "#{@meta.get[:doctitlepartlabel]}: #{title2}"
+        end
+        [title1, title2]
+      end
+
       include Init
     end
   end

data/lib/isodoc/iec/word_convert.rb

@@ -13,16 +13,16 @@ module IsoDoc
 
       def convert(input_filename, file = nil, debug = false,
                 output_filename = nil)
-      file = File.read(input_filename, encoding: "utf-8") if file.nil?
-      @openmathdelim, @closemathdelim = extract_delims(file)
-      docxml, filename, dir = convert_init(file, input_filename, debug)
-      result = convert1(docxml, filename, dir)
-      return result if debug
-
-      output_filename ||= "#{filename}.#{@suffix}"
-      postprocess(result, output_filename, dir)
-      FileUtils.rm_rf dir
-    end
+        file = File.read(input_filename, encoding: "utf-8") if file.nil?
+        @openmathdelim, @closemathdelim = extract_delims(file)
+        docxml, filename, dir = convert_init(file, input_filename, debug)
+        result = convert1(docxml, filename, dir)
+        return result if debug
+
+        output_filename ||= "#{filename}.#{@suffix}"
+        postprocess(result, output_filename, dir)
+        FileUtils.rm_rf dir
+      end
 
       def font_choice(options)
         if options[:script] == "Hans" then '"Source Han Sans",serif'
@@ -169,8 +169,8 @@ module IsoDoc
         docxml.xpath("//div[@class = 'boilerplate_legal']//li").each do |l|
           l.replace(l.children)
         end
-        b = docxml.at("div[@class = 'boilerplate_legal']")
-        b.replace(b.children)
+        b = docxml.at("//div[@class = 'boilerplate_legal']")
+        b and b.replace(b.children)
       end
 
       def authority_cleanup(docxml)
@@ -202,11 +202,15 @@ module IsoDoc
         { class: "TableTitle", style: "text-align:center;" }
       end
 
-      def para_class(_node)
-        classtype = nil
-        classtype = "MsoCommentText" if @in_comment
-        classtype = "Sourcecode" if @annotation
-        classtype
+      def para_class(node)
+        case node["class"]
+        when "zzSTDTitle1", "zzSTDTitle2" then node["class"]
+        else
+          classtype = nil
+          classtype = "MsoCommentText" if @in_comment
+          classtype = "Sourcecode" if @annotation
+          classtype
+        end
       end
 
       def annex_name(_annex, name, div)

data/lib/metanorma/iec/iec.rng

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<grammar ns="https://www.metanorma.org/ns/iec" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-  <!-- default namespace = "https://www.metanorma.com/ns/iec" -->
+<grammar ns='https://www.metanorma.org/ns/iec' xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+  <!--
+    VERSION v1.2.1
+    default namespace = "https://www.metanorma.com/ns/iec"
+  -->
   <include href="relaton-iec.rng"/>
   <include href="isostandard.rng">
     <start>
@@ -55,13 +58,7 @@
   -->
   <define name="iec-standard">
     <element name="iec-standard">
-      <attribute name="version"/>
-      <attribute name="type">
-        <choice>
-          <value>semantic</value>
-          <value>presentation</value>
-        </choice>
-      </attribute>
+      <ref name="Root-Attributes"/>
       <ref name="bibdata"/>
       <zeroOrMore>
         <ref name="termdocsource"/>

data/lib/metanorma/iec/isodoc.rng

@@ -17,6 +17,7 @@
   these elements; we just want one namespace for any child grammars
   of this.
 -->
+<!-- VERSION v1.2.2 -->
 <grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <include href="reqt.rng"/>
   <include href="basicdoc.rng">
@@ -210,6 +211,9 @@
           <data type="boolean"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="style"/>
+      </optional>
       <ref name="CitationType"/>
       <oneOrMore>
         <ref name="PureTextElement"/>
@@ -1349,15 +1353,19 @@
       </choice>
     </element>
   </define>
+  <define name="Root-Attributes">
+    <attribute name="version"/>
+    <attribute name="schema-version"/>
+    <attribute name="type">
+      <choice>
+        <value>semantic</value>
+        <value>presentation</value>
+      </choice>
+    </attribute>
+  </define>
   <define name="standard-document">
     <element name="standard-document">
-      <attribute name="version"/>
-      <attribute name="type">
-        <choice>
-          <value>semantic</value>
-          <value>presentation</value>
-        </choice>
-      </attribute>
+      <ref name="Root-Attributes"/>
       <ref name="bibdata"/>
       <optional>
         <ref name="misccontainer"/>
@@ -2131,6 +2139,7 @@
     <choice>
       <value>identical</value>
       <value>modified</value>
+      <value>adapted</value>
       <value>restyled</value>
       <value>context-added</value>
       <value>generalisation</value>

data/lib/metanorma/iec/isostandard.rng

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-  <!-- default namespace isostandard = "https://www.metanorma.com/ns/iso" -->
+  <!--
+    VERSION v1.2.1
+    default namespace isostandard = "https://www.metanorma.com/ns/iso"
+  -->
   <include href="isodoc.rng">
     <start>
       <ref name="iso-standard"/>
@@ -240,13 +243,7 @@
   -->
   <define name="iso-standard">
     <element name="iso-standard">
-      <attribute name="version"/>
-      <attribute name="type">
-        <choice>
-          <value>semantic</value>
-          <value>presentation</value>
-        </choice>
-      </attribute>
+      <ref name="Root-Attributes"/>
       <ref name="bibdata"/>
       <zeroOrMore>
         <ref name="termdocsource"/>

data/lib/metanorma/iec/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module Iec
-    VERSION = "2.2.8".freeze
+    VERSION = "2.2.10".freeze
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iec
 version: !ruby/object:Gem::Version
-  version: 2.2.8
+  version: 2.2.10
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-10 00:00:00.000000000 Z
+date: 2023-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-iso