metanorma-itu 2.8.0 → 2.8.2

data/lib/isodoc/itu/metadata.rb

@@ -6,13 +6,16 @@ module IsoDoc
     class Metadata < IsoDoc::Metadata
       def initialize(lang, script, locale, labels)
         super
+        @isodoc = IsoDoc::Itu::HtmlConvert.new({})
+      end
+
+      def images(isoxml, xml)
         n = "International_Telecommunication_Union_Logo.svg"
         set(:logo_html, fileloc(n))
         set(:logo_comb, fileloc("itu-document-comb.png"))
         set(:logo_word, fileloc(n))
         set(:logo_sp, fileloc("logo-sp.png"))
         set(:logo_small, fileloc("logo-small.png"))
-        @isodoc = IsoDoc::Itu::HtmlConvert.new({})
       end
 
       def fileloc(file)

data/lib/isodoc/itu/presentation_contribution.rb

@@ -50,7 +50,7 @@ module IsoDoc
       end
 
       def contribution_table_contacts
-        n = (0..@meta.get[:authors]&.size).each_with_object([]) do |i, ret|
+        n = (0...@meta.get[:authors]&.size).each_with_object([]) do |i, ret|
           ret << contribution_table_contact(i)
         end
         n.map do |x|
@@ -90,7 +90,7 @@ module IsoDoc
       end
 
       def contrib_justification_contacts
-        (0..@meta.get[:authors]&.size).each_with_object([]) do |i, ret|
+        (0...@meta.get[:authors]&.size).each_with_object([]) do |i, ret|
           ret << contribution_justification_contact(i)
         end
       end

data/lib/isodoc/itu/presentation_ref.rb

@@ -82,8 +82,8 @@ module IsoDoc
           bibitem["hidden"] == "true" || bibitem.parent["hidden"] == "true"
       end
 
-      def norm_ref_entry_code(_ordinal, idents, _ids, _standard, datefn, _bib)
-        ret = (idents[:metanorma] || idents[:ordinal] || idents[:sdo]).to_s
+      def norm_ref_entry_code(_ordinal, ids, _standard, datefn, _bib)
+        ret = (ids[:content] || ids[:metanorma] || ids[:ordinal] || ids[:sdo]).to_s
         ret.empty? and return ""
         ret = ret.sub(/^\[(.+)\]$/, "\\1")
         ret = "[#{esc ret}]"
@@ -91,8 +91,8 @@ module IsoDoc
         ret.gsub("-", "‑").gsub(/ /, " ")
       end
 
-      def biblio_ref_entry_code(_ordinal, idents, _id, _standard, datefn, _bib)
-        ret = (idents[:metanorma] || idents[:ordinal] || idents[:sdo]).to_s
+      def biblio_ref_entry_code(_ordinal, ids, _standard, datefn, _bib)
+        ret = (ids[:content] || ids[:metanorma] || ids[:ordinal] || ids[:sdo]).to_s
         ret = ret.sub(/^\[(.+)\]$/, "\\1")
         ret = "[#{esc ret}]"
         ret += datefn

data/lib/isodoc/itu/presentation_xml_convert.rb

@@ -157,6 +157,16 @@ module IsoDoc
         l10n(" – ", { prev: lbl })
       end
 
+      def link(docxml)
+        (docxml.xpath(ns("//fmt-link")) -
+         docxml.xpath(ns("//boilerplate//fmt-link")) -
+         docxml.xpath(ns("//preface//fmt-link"))).each do |l|
+          l.text.empty? || l.text.match?(URI::DEFAULT_PARSER.make_regexp) or
+            next
+          l["style"] ||= "url"
+        end
+      end
+
       include Init
     end
   end

data/lib/isodoc/itu/word_convert.rb

@@ -106,17 +106,6 @@ module IsoDoc
           start: node["start"] }
       end
 
-      def link_parse(node, out)
-        out.a **attr_code(href: node["target"], title: node["alt"],
-                          class: "url") do |l|
-          if node.text.empty?
-            l << node["target"].sub(/^mailto:/, "")
-          else
-            node.children.each { |n| parse(n, l) }
-          end
-        end
-      end
-
       def clause_attrs(node)
         ret = {}
         %w(source history).include?(node["type"]) and

data/lib/metanorma/itu/biblio.rng

@@ -466,11 +466,11 @@ Editorial and advisory groups are represented as consecutive subdivisions of the
         <a:documentation>Contact information for the organization, including address, phone number, and email</a:documentation>
       </ref>
     </optional>
-    <optional>
+    <zeroOrMore>
       <ref name="logo">
         <a:documentation>A logo for the organization</a:documentation>
       </ref>
-    </optional>
+    </zeroOrMore>
   </define>
   <define name="orgname">
     <element name="name">
@@ -502,6 +502,11 @@ Editorial and advisory groups are represented as consecutive subdivisions of the
   </define>
   <define name="logo">
     <element name="logo">
+      <optional>
+        <attribute name="type">
+          <a:documentation>The type of logo</a:documentation>
+        </attribute>
+      </optional>
       <ref name="image-no-id"/>
     </element>
   </define>
@@ -513,6 +518,11 @@ Editorial and advisory groups are represented as consecutive subdivisions of the
           <a:documentation>Description of what is being depicted</a:documentation>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="type">
+          <a:documentation>Description of what kind of depiction this</a:documentation>
+        </attribute>
+      </optional>
       <zeroOrMore>
         <ref name="image-no-id">
           <a:documentation>A visual depiction of the bibliographic item</a:documentation>
@@ -690,7 +700,7 @@ Examples include GRID, LEI, CrossRef, and Ringgold</a:documentation>
   <define name="CitationType">
     <attribute name="bibitemid">
       <a:documentation>Bibliographic item that the citation applies to, referenced as the anchor of a bibliographic description</a:documentation>
-      <data type="IDREF"/>
+      <ref name="IdRefType"/>
     </attribute>
     <choice>
       <zeroOrMore>
@@ -1236,9 +1246,9 @@ Refer to `BibliographicItem` for definitions</a:documentation>
     <optional>
       <ref name="validity"/>
     </optional>
-    <optional>
+    <zeroOrMore>
       <ref name="depiction"/>
-    </optional>
+    </zeroOrMore>
   </define>
   <define name="btitle">
     <a:documentation>A title of a bibliographic item, associated with a type of title</a:documentation>
@@ -1296,17 +1306,17 @@ for which this claim of validity is made, if applicable</a:documentation>
   </define>
   <define name="validityBegins">
     <element name="validityBegins">
-      <ref name="ISO8601Date"/>
+      <ref name="ISO8601DateTime"/>
     </element>
   </define>
   <define name="validityEnds">
     <element name="validityEnds">
-      <ref name="ISO8601Date"/>
+      <ref name="ISO8601DateTime"/>
     </element>
   </define>
   <define name="validityRevision">
     <element name="revision">
-      <ref name="ISO8601Date"/>
+      <ref name="ISO8601DateTime"/>
     </element>
   </define>
   <define name="TypedTitleString">

data/lib/metanorma/itu/cleanup.rb

@@ -7,7 +7,7 @@ module Metanorma
         super
         xmldoc.xpath("//thead/tr[1]/th | //thead/tr[1]/td").each do |t|
           text = t.at("./descendant::text()") or next
-          text.replace(text.text.capitalize)
+          text.replace(::Metanorma::Utils.strict_capitalize_first(text.text))
         end
       end
 
@@ -70,10 +70,10 @@ module Metanorma
         id = bib.at("./docidentifier[not(#{skip_docid} or @type = " \
                      "'metanorma')]")
         metaid = bib.at("./docidentifier[@type = 'metanorma']")&.text
-        #abbrid = metaid unless /^\[\d+\]$/.match?(metaid)
+        # abbrid = metaid unless /^\[\d+\]$/.match?(metaid)
         type = id["type"] if id
-        title = bib.at("./title[@type = 'main']")&.text ||
-          bib.at("./title")&.text || bib.at("./formattedref")&.text
+        title = (bib.at("./title[@type = 'main']") ||
+          bib.at("./title") || bib.at("./formattedref"))&.text
         "#{pubclass} :: #{type} :: #{id&.text || metaid} :: #{title}"
       end
 

data/lib/metanorma/itu/converter.rb

@@ -96,7 +96,8 @@ module Metanorma
         node.attr("keywords") or return
         node.attr("keywords").split(/, */).sort.each_with_index do |kw, i|
           kw_out = i.zero? ? Metanorma::Utils.strict_capitalize_first(kw) : kw
-          xml.keyword kw_out
+          add_noko_elem(xml, "keyword", kw_out)
+          # xml.keyword kw_out
         end
       end
 
@@ -112,7 +113,8 @@ module Metanorma
 
       def abstract_parse(attrs, xml, node)
         xml.abstract **attr_code(attrs) do |xml_section|
-          xml_section.title { |name| name << node.title }
+          # xml_section.title { |name| name << node.title }
+          add_noko_elem(xml_section, "title", node.title)
           xml_section << node.content
         end
       end

data/lib/metanorma/itu/front.rb

@@ -9,7 +9,8 @@ module Metanorma
         stage = node.attr("status") || node.attr("docstage") || "published"
         stage = "draft" if node.attributes.has_key?("draft")
         xml.status do |s|
-          s.stage stage
+          add_noko_elem(s, "stage", stage)
+          # s.stage stage
         end
       end
 
@@ -65,8 +66,9 @@ module Metanorma
         end
         vals.each do |v|
           xml.question do |q|
-            a = v[:id] and q.identifier a
-            a = v[:value] and q.name a
+            add_noko_elem(q, "identifier", v[:id])
+            # q.identifier a
+            add_noko_elem(q, "name", v[:value]) # q.name a
           end
         end
       end
@@ -83,7 +85,7 @@ module Metanorma
           .each do |k, v|
           node.attr(k.to_s) and
             xml.series **{ type: v } do |s|
-              s.title node.attr(k.to_s)
+              add_noko_elem(s, "title", node.attr(k.to_s))
             end
         end
       end
@@ -92,37 +94,46 @@ module Metanorma
         node.attr("recommendation-from") || node.attr("approval-process") or
           return
         xml.recommendationstatus do |s|
-          a = node.attr("recommendation-from") and s.from a
-          a = node.attr("recommendation-to") and s.to a
+          add_noko_elem(s, "from", node.attr("recommendation-from"))
+          add_noko_elem(s, "to", node.attr("recommendation-to"))
           node.attr("approval-process") and
-            s.approvalstage **{ process: node.attr("approval-process") } do |x|
-              x << node.attr("approval-status")
-            end
+            add_noko_elem(s, "approvalstage", node.attr("approval-status"),
+                          process: node.attr("approval-process"))
+          # s.approvalstage **{ process: node.attr("approval-process") } do |x|
+          #  x << node.attr("approval-status")
+          # end
         end
       end
 
       def metadata_ip_notice(node, xml)
-        xml.ip_notice_received (node.attr("ip-notice-received") || "false")
+        add_noko_elem(xml, "ip-notice-received",
+                      node.attr("ip-notice-received") || "false")
+        # xml.ip_notice_received (node.attr("ip-notice-received") || "false")
       end
 
       def metadata_techreport(node, xml)
         a = node.attr("meeting") and
           metadata_meeting(a, node.attr("meeting-acronym"), xml)
-        a = node.attr("meeting-place") and xml.meeting_place a
+        add_noko_elem(xml, "meeting_place", node.attr("meeting-place"))
+        # a = node.attr("meeting-place") and xml.meeting_place a
         a = node.attr("meeting-date") and metadata_meeting_date(a, xml)
-        a = node.attr("intended-type") and xml.intended_type a
-        a = node.attr("source") and xml.source a
+        add_noko_elem(xml, "intended_type", node.attr("intended-type"))
+        # a = node.attr("intended-type") and xml.intended_type a
+        add_noko_elem(xml, "source", node.attr("source"))
+        # a = node.attr("source") and xml.source a
       end
 
       def metadata_meeting(mtg, acronym, xml)
-        xml.meeting **attr_code(acronym: acronym) do |m|
-          m << mtg
-        end
+        add_noko_elem(xml, "meeting", mtg, acronym: acronym)
+        # xml.meeting **attr_code(acronym: acronym) do |m|
+        #  m << mtg
+        # end
       end
 
       def metadata_contribution(node, xml)
         %w(timing).each do |k|
-          a = node.attr(k) and xml.send k, a
+          add_noko_elem(xml, k, node.attr(k))
+          # a = node.attr(k) and xml.send k, a
         end
       end
 
@@ -130,17 +141,21 @@ module Metanorma
         xml.meeting_date do |m|
           d = val.split("/")
           if d.size > 1
-            m.from d[0]
-            m.to d[1]
+            add_noko_elem(m, "from", d[0])
+            # m.from d[0]
+            add_noko_elem(m, "to", d[1])
+            # m.to d[1]
           else
-            m.on d[0]
+            add_noko_elem(m, "on", d[0])
+            # m.on d[0]
           end
         end
       end
 
       def personal_role(node, contrib, suffix)
         if node.attr("role#{suffix}")&.downcase == "rapporteur"
-          contrib.role "raporteur", **{ type: "editor" }
+          add_noko_elem(contrib, "role", "raporteur", type: "editor")
+          # contrib.role "raporteur", **{ type: "editor" }
         else
           super
         end
@@ -149,8 +164,8 @@ module Metanorma
       def metadata_studyperiod(node, xml)
         s, e = group_period(node, "", "")
         xml.studyperiod do |p|
-          p.start s
-          p.end e
+          add_noko_elem(p, "start", s.to_s)
+          add_noko_elem(p, "end", e.to_s)
         end
       end
 

data/lib/metanorma/itu/front_id.rb

@@ -11,21 +11,27 @@ module Metanorma
 
       def provisional_id(node, xml)
         node.attr("provisional-name") or return
-        xml.docidentifier type: "ITU-provisional" do |i|
-          i << node.attr("provisional-name")
-        end
+        add_noko_elem(xml, "docidentifier",
+                      node.attr("provisional-name"), type: "ITU-provisional")
+        # xml.docidentifier type: "ITU-provisional" do |i|
+        #  i << node.attr("provisional-name")
+        # end
       end
 
       def td_id(node, xml)
         node.attr("td-number") or return
-        xml.docidentifier type: "ITU-TemporaryDocument" do |i|
-          i << node.attr("td-number")
-        end
+        add_noko_elem(xml, "docidentifier",
+                      node.attr("td-number"), type: "ITU-TemporaryDocument")
+        # xml.docidentifier type: "ITU-TemporaryDocument" do |i|
+        #  i << node.attr("td-number")
+        # end
       end
 
       def iso_id(node, xml)
-        a = node.attr("common-text-docnumber") and
-          xml.docidentifier a, type: "ISO"
+        add_noko_elem(xml, "docidentifier",
+                      node.attr("common-text-docnumber"), type: "ISO")
+        # a = node.attr("common-text-docnumber") and
+        #  xml.docidentifier a, type: "ISO"
       end
 
       ITULANG = { "en" => "E", "fr" => "F", "ar" => "A", "es" => "S",
@@ -56,31 +62,42 @@ module Metanorma
 
       def itu_id(node, xml)
         node.attr("docnumber") || node.attr("docidentifier") or return
-        xml.docidentifier type: "ITU", primary: "true" do |i|
-          i << (node.attr("docidentifier") || itu_id1(node, false))
-        end
-        xml.docidentifier type: "ITU-lang" do |i|
-          i << itu_id1(node, true)
-        end
+        add_noko_elem(xml, "docidentifier",
+                      node.attr("docidentifier") || itu_id1(node, false), type: "ITU", primary: "true")
+        # xml.docidentifier type: "ITU", primary: "true" do |i|
+        #  i << (node.attr("docidentifier") || itu_id1(node, false))
+        # end
+        add_noko_elem(xml, "docidentifier",
+                      itu_id1(node, true), type: "ITU-lang")
+        # xml.docidentifier type: "ITU-lang" do |i|
+        #   i << itu_id1(node, true)
+        # end
       end
 
       def recommendation_id(node, xml)
         node.attr("recommendationnumber") or return
         node.attr("recommendationnumber").split("/").each do |s|
-          xml.docidentifier type: "ITU-Recommendation" do |i|
-            i << s
-          end
+          add_noko_elem(xml, "docidentifier", s, type: "ITU-Recommendation")
+
+          # xml.docidentifier type: "ITU-Recommendation" do |i|
+          #   i << s
+          # end
         end
       end
 
       def structured_id(node, xml)
         node.attr("docnumber") or return
         xml.structuredidentifier do |i|
-          i.bureau node.attr("bureau") || "T"
-          i.docnumber node.attr("docnumber")
-          a = node.attr("annexid") and i.annexid a
-          a = node.attr("amendment-number") and i.amendment a
-          a = node.attr("corrigendum-number") and i.corrigendum a
+          add_noko_elem(i, "bureau", node.attr("bureau") || "T")
+          # i.bureau node.attr("bureau") || "T"
+          add_noko_elem(i, "docnumber", node.attr("docnumber"))
+          # i.docnumber node.attr("docnumber")
+          add_noko_elem(i, "annexid", node.attr("annexid"))
+          # a = node.attr("annexid") and i.annexid a
+          add_noko_elem(i, "amendment", node.attr("amendment-number"))
+          # a = node.attr("amendment-number") and i.amendment a
+          add_noko_elem(i, "corrigendum", node.attr("corrigendum-number"))
+          # a = node.attr("corrigendum-number") and i.corrigendum a
         end
       end
     end

data/lib/metanorma/itu/isodoc.rng

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
-<!-- VERSION v2.1.3 -->
+<!-- VERSION v2.1.5 -->
 
   <!--
     ALERT: cannot have root comments, because of https://github.com/metanorma/metanorma/issues/437
@@ -905,15 +905,32 @@ titlecase, or lowercase</a:documentation>
     </element>
   </define>
   <define name="image" combine="choice">
-    <element name="svg">
-      <a:documentation>Add svg mark up to image</a:documentation>
-      <oneOrMore>
-        <choice>
-          <text/>
-          <ref name="AnyElement"/>
-        </choice>
-      </oneOrMore>
-    </element>
+    <choice>
+      <element name="image">
+        <ref name="RequiredId"/>
+        <ref name="ImageAttributes"/>
+        <optional>
+          <element name="svg">
+            <a:documentation>Allow svg in image/svg, for consistency</a:documentation>
+            <oneOrMore>
+              <choice>
+                <text/>
+                <ref name="AnyElement"/>
+              </choice>
+            </oneOrMore>
+          </element>
+        </optional>
+      </element>
+      <element name="svg">
+        <a:documentation>Add svg mark up to image</a:documentation>
+        <oneOrMore>
+          <choice>
+            <text/>
+            <ref name="AnyElement"/>
+          </choice>
+        </oneOrMore>
+      </element>
+    </choice>
   </define>
   <define name="ParagraphFnBody" combine="interleave">
     <ref name="BlockSource">

data/lib/metanorma/itu/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Itu
-    VERSION = "2.8.0".freeze
+    VERSION = "2.8.2".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-itu
 version: !ruby/object:Gem::Version
-  version: 2.8.0
+  version: 2.8.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-11-03 00:00:00.000000000 Z
+date: 2025-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc