metanorma-itu 2.7.7 → 2.8.1

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.4 -->
 
   <!--
     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/log.rb

@@ -0,0 +1,47 @@
+module Metanorma
+  module Itu
+    class Converter
+      ITU_LOG_MESSAGES = {
+        # rubocop:disable Naming/VariableNumber
+        "ITU_1": { category: "Document Attributes",
+                   error: "%s is not a recognised document type",
+                   severity: 2 },
+        "ITU_2": { category: "Document Attributes",
+                   error: "%s is not a recognised status",
+                   severity: 2 },
+        "ITU_3": { category: "Document Attributes",
+                   error: "Title includes series name %s",
+                   severity: 2 },
+        "ITU_4": { category: "Style",
+                   error: "Requirement possibly in preface: %s",
+                   severity: 2 },
+        "ITU_6": { category: "Document Attributes",
+                   error: "Recommendation Status %s inconsistent with AAP",
+                   severity: 2 },
+        "ITU_7": { category: "Document Attributes",
+                   error: "Recommendation Status %s inconsistent with TAP",
+                   severity: 2 },
+        "ITU_8": { category: "Style",
+                   error: "%s does not match ITU document identifier conventions",
+                   severity: 2 },
+        "ITU_9": { category: "Style",
+                   error: "Unnumbered clause out of place",
+                   severity: 2 },
+        "ITU_10": { category: "Style",
+                    error: "No Summary has been provided",
+                    severity: 2 },
+        "ITU_11": { category: "Style",
+                    error: "No Keywords have been provided",
+                    severity: 2 },
+        "ITU_12": { category: "Style",
+                    error: "(terms) %s: %s",
+                    severity: 2 },
+      }.freeze
+      # rubocop:enable Naming/VariableNumber
+
+      def log_messages
+        super.merge(ITU_LOG_MESSAGES)
+      end
+    end
+  end
+end

data/lib/metanorma/itu/validate.rb

@@ -12,16 +12,14 @@ module Metanorma
            focus-group implementers-guide technical-paper technical-report
            joint-itu-iso-iec service-publication
            contribution).include? @doctype or
-          @log.add("Document Attributes", nil,
-                   "#{@doctype} is not a recognised document type")
+          @log.add("ITU_1", nil, params: [@doctype])
       end
 
       def stage_validate(xmldoc)
         stage = xmldoc&.at("//bibdata/status/stage")&.text
         %w(in-force superseded in-force-prepublished withdrawn
            draft).include? stage or
-          @log.add("Document Attributes", nil,
-                   "#{stage} is not a recognised status")
+          @log.add("ITU_2", nil, params: [stage])
       end
 
       def content_validate(doc)
@@ -41,8 +39,7 @@ module Metanorma
         xmldoc.xpath("//bibdata/series/title").each do |s|
           series = s.text.sub(/^[A-Z]: /, "")
           t.downcase.include?(series.downcase) and
-            @log.add("Document Attributes", nil,
-                     "Title includes series name #{series}")
+            @log.add("ITU_3", nil, params: [series])
         end
       end
 
@@ -61,8 +58,7 @@ module Metanorma
         xmldoc.xpath("//preface/*").each do |c|
           extract_text(c).split(/\.\s+/).each do |t|
             /\b(shall|must)\b/i.match(t) and
-              @log.add("Style", c,
-                       "Requirement possibly in preface: #{t.strip}")
+              @log.add("ITU_4", c, params: [t.strip])
           end
         end
       end
@@ -71,35 +67,33 @@ module Metanorma
       # Supplanted by rendering
       def numbers_validate(xmldoc); end
 
-      def style_two_regex_not_prev(node, text, regex, regex_prev, warning)
-        text.nil? and return
-        arr = text.split(/\W+/)
-        arr.each_index do |i|
-          m_prev = i.zero? ? nil : regex_prev.match(arr[i - 1])
-          if !regex.match?(arr[i]) && m_prev.nil?
-            @log.add("Style", node, "#{warning}: #{m[:num]}")
-          end
-        end
-      end
+      #       def style_two_regex_not_prev(node, text, regex, regex_prev, warning)
+      #         text.nil? and return
+      #         arr = text.split(/\W+/)
+      #         arr.each_index do |i|
+      #           m_prev = i.zero? ? nil : regex_prev.match(arr[i - 1])
+      #           if !regex.match?(arr[i]) && m_prev.nil?
+      #             @log.add("Style", node, "#{warning}: #{m[:num]}")
+      #             # ID = ITU_5
+      #           end
+      #         end
+      #       end
 
       def approval_validate(xmldoc)
         s = xmldoc.at("//bibdata/ext/recommendationstatus/approvalstage") or
           return
         process = s["process"]
         (process == "aap") && %w(determined in-force).include?(s.text) and
-          @log.add("Document Attributes", nil,
-                   "Recommendation Status #{s.text} inconsistent with AAP")
+          @log.add("ITU_6", nil, params: [s.text])
         (process == "tap") && !%w(determined in-force).include?(s.text) and
-          @log.add("Document Attributes", nil,
-                   "Recommendation Status #{s.text} inconsistent with TAP")
+          @log.add("ITU_7", nil, params: [s.text])
       end
 
       def itu_identifier_validate(xmldoc)
         xmldoc.xpath("//bibdata/docidentifier[@type = 'ITU']").each do |x|
           /^SG \d+/.match?(x.text) ||
             /^ITU-[RTD] [AD-VX-Z]\.\d+(\.\d+)?$/.match?(x.text) or
-            @log.add("Style", nil, "#{x.text} does not match ITU document " \
-                                   "identifier conventions")
+            @log.add("ITU_8", nil, params: [x.text])
         end
       end
 
@@ -114,16 +108,16 @@ module Metanorma
           next if (@doctype == "resolution") && (c.parent.name == "sections") &&
             !c.at("./preceding-sibling::clause")
 
-          @log.add("Style", c, "Unnumbered clause out of place")
+          @log.add("ITU_9", c)
         end
       end
 
       # Editing Guidelines 7.2, 7.3
       def section_check(xmldoc)
         xmldoc.at("//bibdata/abstract") or
-          @log.add("Style", nil, "No Summary has been provided")
+          @log.add("ITU_10", nil)
         xmldoc.at("//bibdata/keyword") or
-          @log.add("Style", nil, "No Keywords have been provided")
+          @log.add("ITU_11", nil)
       end
 
       def termdef_style(xmldoc)
@@ -139,7 +133,7 @@ module Metanorma
       end
 
       def termdef_warn(text, regex, node, term, msg)
-        regex.match(text) && @log.add("Style", node, "#{term}: #{msg}")
+        regex.match(text) && @log.add("ITU_12", node, params: [term, msg])
       end
     end
   end

data/lib/metanorma/itu/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Itu
-    VERSION = "2.7.7".freeze
+    VERSION = "2.8.1".freeze
   end
 end

data/lib/relaton/render/config.yml

@@ -1,3 +1,3 @@
 template:
   # skip authoritative identifier, it is inserted in front of formattedref within metanorma
-  standard: "<em>{{ title }}</em> ,_{{ edition | capitalize_first }} . {{ extent }}." 
+  standard: "<em>{{ title }}</em> ,_{{ edition | capitalize_first }} $$$ {{ extent }}" 

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", "~> 3.1.0"
+  spec.add_dependency "metanorma-standoc", "~> 3.2.0"
   spec.add_dependency "pubid"
   spec.add_dependency "twitter_cldr", ">= 3.0.0"
   spec.add_dependency "tzinfo-data" # we need this for windows only
@@ -34,6 +34,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "guard", "~> 2.14"
   spec.add_development_dependency "guard-rspec", "~> 4.7"
+  spec.add_development_dependency "openssl"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.6"
   spec.add_development_dependency "rubocop", "~> 1"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-itu
 version: !ruby/object:Gem::Version
-  version: 2.7.7
+  version: 2.8.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-10-13 00:00:00.000000000 Z
+date: 2025-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: pubid
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.7'
+- !ruby/object:Gem::Dependency
+  name: openssl
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -336,6 +350,7 @@ files:
 - lib/metanorma/itu/front_id.rb
 - lib/metanorma/itu/isodoc.rng
 - lib/metanorma/itu/itu.rng
+- lib/metanorma/itu/log.rb
 - lib/metanorma/itu/processor.rb
 - lib/metanorma/itu/relaton-itu.rng
 - lib/metanorma/itu/reqt.rng