metanorma-itu 2.5.6 → 2.5.8

data/lib/isodoc/itu/presentation_xml_convert.rb

@@ -6,17 +6,7 @@ require_relative "presentation_bibdata"
 require_relative "presentation_preface"
 require_relative "presentation_ref"
 require_relative "presentation_contribution"
-
-module Nokogiri
-  module XML
-    class Node
-      def traverse_topdown(&block)
-        yield(self)
-        children.each { |j| j.traverse_topdown(&block) }
-      end
-    end
-  end
-end
+require_relative "../../nokogiri/xml"
 
 module IsoDoc
   module Itu
@@ -31,11 +21,33 @@ module IsoDoc
       end
 
       def origin(docxml)
-        docxml.xpath(ns("//origin[not(termref)]")).each { |f| eref1(f) }
+        docxml.xpath(ns("//origin[not(termref)]")).each do |f|
+          f["citeas"] = bracket_opt(f["citeas"])
+          eref1(f)
+        end
       end
 
       def quotesource(docxml)
-        docxml.xpath(ns("//quote/source")).each { |f| eref1(f) }
+        docxml.xpath(ns("//quote//source")).each { |f| eref1(f) }
+      end
+
+      def bracket_opt(text)
+        text.nil? and return
+        /^\[.+\]$/.match?(text) and return text
+        "[#{text}]"
+      end
+
+      def designation1(desgn)
+        super
+        desgn.name == "preferred" or return
+        desgn.children = l10n "#{to_xml desgn.children}:"
+      end
+
+      def termsource1(elem)
+        while elem&.next_element&.name == "termsource"
+          elem << "; #{to_xml(elem.next_element.remove.children)}"
+        end
+        elem.children = l10n(to_xml(elem.children).strip)
       end
 
       def eref1(elem)
@@ -47,6 +59,13 @@ module IsoDoc
         super
       end
 
+      def note_delim(elem)
+        if elem.at(ns("./*[local-name() != 'name'][1]"))&.name == "p"
+          "\u00a0\u2013\u00a0"
+        else ""
+        end
+      end
+
       def table1(elem)
         elem.xpath(ns("./name | ./thead/tr/th")).each do |n|
           capitalise_unless_text_transform(n)
@@ -66,6 +85,10 @@ module IsoDoc
         end
       end
 
+      def table_fn1(_table, fnote, _idx)
+        fnote["reference"] += ")"
+      end
+
       def get_eref_linkend(node)
         non_locality_elems(node).select do |c|
           !c.text? || /\S/.match(c)
@@ -103,12 +126,28 @@ module IsoDoc
       end
 
       def annex1(elem)
-        @doctype == "resolution" or return super
+        if @doctype == "resolution"
+          annex1_resolution(elem)
+        else
+          super
+          annex1_non_resolution(elem)
+        end
+      end
+
+      def annex1_resolution(elem)
         elem.elements.first.previous = annex1_supertitle(elem)
         t = elem.at(ns("./title")) and
           t.children = "<strong>#{to_xml(t.children)}</strong>"
       end
 
+      def annex1_non_resolution(elem)
+        info = elem["obligation"] == "informative"
+        ins = elem.at(ns("./title"))
+        p = (info ? @i18n.inform_annex : @i18n.norm_annex)
+          .sub("%", @i18n.doctype_dict[@meta.get[:doctype_original]] || "")
+        ins.next = %(<p class="annex_obligation">#{p}</p>)
+      end
+
       def annex1_supertitle(elem)
         lbl = @xrefs.anchor(elem["id"], :label)
         res = elem.at(ns("//bibdata/title[@type = 'resolution']"))
@@ -189,11 +228,6 @@ module IsoDoc
         ret
       end
 
-      def block(docxml)
-        super
-        dl docxml
-      end
-
       def dl(xml)
         (xml.xpath(ns("//dl")) -
          xml.xpath(ns("//table//dl | //figure//dl | //formula//dl")))
@@ -208,6 +242,10 @@ module IsoDoc
           '<colgroup><col width="20%"/><col width="80%"/></colgroup>'
       end
 
+      def termnote_delim(_elem)
+        " &#x2013; "
+      end
+
       include Init
     end
   end

data/lib/isodoc/itu/ref.rb

@@ -5,7 +5,7 @@ require "fileutils"
 module IsoDoc
   module Itu
     module BaseConvert
-      def nonstd_bibitem(list, bibitem, _ordinal, biblio)
+      def bibitem_entry(list, bibitem, _ordinal, biblio)
         list.tr **attr_code(iso_bibitem_entry_attrs(bibitem, biblio)) do |ref|
           ref.td style: "vertical-align:top" do |td|
             tag = bibitem.at(ns("./biblio-tag"))
@@ -15,20 +15,15 @@ module IsoDoc
         end
       end
 
-      def std_bibitem_entry(list, bibitem, ordinal, biblio)
-        nonstd_bibitem(list, bibitem, ordinal, biblio)
-      end
-
       def biblio_list(clause, div, biblio)
         div.table class: "biblio", border: "0" do |t|
           i = 0
           t.tbody do |tbody|
             clause.elements.each do |b|
               if b.name == "bibitem"
-                next if implicit_reference(b)
-
+                b["hidden"] == "true" and next
                 i += 1
-                nonstd_bibitem(tbody, b, i, biblio)
+                bibitem_entry(tbody, b, i, biblio)
               else
                 unless %w(title clause references).include? b.name
                   tbody.tx { |tx| parse(b, tx) }
@@ -37,30 +32,7 @@ module IsoDoc
             end
           end
         end
-        clause.xpath(ns("./clause | ./references")).each do |x|
-          parse(x, div)
-        end
-      end
-
-      def bracket_if_num(num)
-        return nil if num.nil?
-
-        num = num.text.sub(/^\[/, "").sub(/\]$/, "")
-        "[#{num}]"
-      end
-
-      def pref_ref_code(bibitem)
-        ret = bibitem.xpath(ns("./docidentifier[@type = 'ITU']"))
-        ret.empty? and ret = super
-        ret
-      end
-
-      def unbracket(ident)
-        if ident.respond_to?(:size)
-          ident.map { |x| unbracket1(x) }.join(" | ")
-        else
-          unbracket1(ident)
-        end
+        clause.xpath(ns("./clause | ./references")).each { |x| parse(x, div) }
       end
     end
   end

data/lib/isodoc/itu/terms.rb

@@ -8,8 +8,7 @@ module IsoDoc
             insert_tab(b, 1)
             node&.at(ns("./preferred"))&.children&.each { |n| parse(n, b) }
           end
-          p << ": "
-          source and p << "#{bracket_opt(source.value)} "
+          source and p << "#{source.value} "
         end
         defn&.children&.each { |n| parse(n, div) }
       end
@@ -19,7 +18,6 @@ module IsoDoc
         source = node.at(ns("./termsource/origin/@citeas"))
         out.div **attr_code(id: node["id"]) do |div|
           termdef_parse1(node, div, defn, source)
-          set_termdomain("")
           node.children.each do |n|
             next if %w(preferred definition termsource title
                        name).include? n.name
@@ -28,17 +26,6 @@ module IsoDoc
           end
         end
       end
-
-      def bracket_opt(text)
-        return text if text.nil?
-        return text if /^\[.+\]$/.match?(text)
-
-        "[#{text}]"
-      end
-
-      def termnote_delim
-        " &#x2013; "
-      end
     end
   end
 end

data/lib/isodoc/itu/word_cleanup.rb

@@ -25,8 +25,8 @@ module IsoDoc
 
       def word_footnote_cleanup(docxml)
         docxml.xpath("//aside").each do |a|
-          a.first_element_child.children.first.previous =
-            '<span style="mso-tab-count:1"/>'
+          a.first_element_child.
+            add_first_child '<span style="mso-tab-count:1"/>'
         end
       end
 

data/lib/isodoc/itu/word_convert.rb

@@ -50,7 +50,7 @@ module IsoDoc
             parse(node.at(ns("./stem")), div)
             if lbl = node&.at(ns("./name"))&.text
               insert_tab(div, 1)
-              div << "(#{lbl})"
+              div << lbl
             end
           end
         end

data/lib/isodoc/itu/xref.rb

@@ -91,12 +91,6 @@ module IsoDoc
         end
       end
 
-      def reference_names(ref)
-        super
-        @anchors[ref["id"]] =
-          { xref: @anchors[ref["id"]][:xref].sub(/^\[/, "").sub(/\]$/, "") }
-      end
-
       def termnote_anchor_names(docxml)
         docxml.xpath(ns("//term[termnote]")).each do |t|
           c = Counter.new

data/lib/metanorma/itu/isodoc.rng

@@ -17,7 +17,7 @@
   these elements; we just want one namespace for any child grammars
   of this.
 -->
-<!-- VERSION v1.3.4 -->
+<!-- VERSION v1.4.0 -->
 <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">

data/lib/metanorma/itu/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Itu
-    VERSION = "2.5.6".freeze
+    VERSION = "2.5.8".freeze
   end
 end

data/lib/nokogiri/xml.rb

@@ -0,0 +1,10 @@
+module Nokogiri
+  module XML
+    class Node
+      def traverse_topdown(&block)
+        yield(self)
+        children.each { |j| j.traverse_topdown(&block) }
+      end
+    end
+  end   
+end

data/metanorma-itu.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = Gem::Requirement.new(">= 3.1.0")
 
-  spec.add_dependency "metanorma-standoc", "~> 2.9.3"
+  spec.add_dependency "metanorma-standoc", "~> 2.10.0"
   spec.add_dependency "pubid"
   spec.add_dependency "twitter_cldr", ">= 3.0.0"
   spec.add_dependency "tzinfo-data" # we need this for windows only

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-itu
 version: !ruby/object:Gem::Version
-  version: 2.5.6
+  version: 2.5.8
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-10-28 00:00:00.000000000 Z
+date: 2024-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.9.3
+        version: 2.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.9.3
+        version: 2.10.0
 - !ruby/object:Gem::Dependency
   name: pubid
   requirement: !ruby/object:Gem::Requirement
@@ -339,6 +339,7 @@ files:
 - lib/metanorma/itu/reqt.rng
 - lib/metanorma/itu/validate.rb
 - lib/metanorma/itu/version.rb
+- lib/nokogiri/xml.rb
 - lib/relaton/render/config.yml
 - lib/relaton/render/general.rb
 - lib/relaton/render/parse.rb