metanorma-itu 2.5.12 → 2.5.13

data/lib/isodoc/itu/presentation_ref.rb

@@ -53,6 +53,7 @@ module IsoDoc
         id = multi_bibitem_ref_code(bib)
         id1 = render_multi_identifiers(id, bib)
         out = id1
+        out.empty? and return out
         date = bib.at(ns("./date[@type = 'published']/on | " \
           "./date[@type = 'published']/from")) and
           out << " (#{date.text.sub(/-.*$/, '')})"
@@ -79,9 +80,9 @@ module IsoDoc
 
       def norm_ref_entry_code(_ordinal, idents, _ids, _standard, datefn, _bib)
         ret = (idents[:metanorma] || idents[:ordinal] || idents[:sdo]).to_s
+        ret.empty? and return ret
         /^\[.+\]$/.match?(ret) or ret = "[#{ret}]"
         ret += datefn
-        ret.empty? and return ret
         ret.gsub("-", "&#x2011;").gsub(/ /, "&#xa0;")
       end
 
@@ -94,7 +95,7 @@ module IsoDoc
       end
 
       def bracket_if_num(num)
-        return nil if num.nil?
+        return nil if num.nil? || num.text.strip.empty?
 
         num = num.text.sub(/^\[/, "").sub(/\]$/, "")
         "[#{num}]"

data/lib/isodoc/itu/presentation_xml_convert.rb

@@ -40,14 +40,22 @@ module IsoDoc
       def designation1(desgn)
         super
         desgn.name == "preferred" or return
-        desgn.children = l10n "#{to_xml desgn.children}:"
+        out = desgn.parent
+          .at(ns("./fmt-preferred//semx[@element = 'preferred'][last()]"))
+       out or return
+        out.text.strip.empty? and return
+        out.children = l10n "#{to_xml out.children}:"
       end
 
-      def termsource1(elem)
-        while elem&.next_element&.name == "termsource"
-          elem << "; #{to_xml(elem.next_element.remove.children)}"
+      def designation(docxml)
+        super
+        docxml.xpath(ns("//fmt-preferred")).each do |x|
+          x.xpath(ns("./p")).each { |p| p.replace(p.children) }
         end
-        elem.children = l10n(to_xml(elem.children).strip)
+      end
+
+      def termsource_label(elem, sources)
+        elem.replace(sources)
       end
 
       def eref1(elem)

data/lib/isodoc/itu/terms.rb

@@ -6,7 +6,7 @@ module IsoDoc
           p.b do |b|
             node&.at(ns("./fmt-name"))&.children&.each { |n| parse(n, b) }
             insert_tab(b, 1)
-            node&.at(ns("./preferred"))&.children&.each { |n| parse(n, b) }
+            node&.at(ns("./fmt-preferred"))&.children&.each { |n| parse(n, b) }
           end
           source and p << "#{source.value} "
         end
@@ -14,12 +14,12 @@ module IsoDoc
       end
 
       def termdef_parse(node, out)
-        defn = node.at(ns("./definition"))
-        source = node.at(ns("./termsource/origin/@citeas"))
+        defn = node.at(ns("./fmt-definition"))
+        source = node.at(ns("./fmt-termsource//origin/@citeas"))
         out.div **attr_code(id: node["id"]) do |div|
           termdef_parse1(node, div, defn, source)
           node.children.each do |n|
-            next if %w(preferred definition termsource fmt-title
+            next if %w(fmt-preferred fmt-definition fmt-termsource fmt-title
                        fmt-name).include? n.name
 
             parse(n, out)

data/lib/metanorma/itu/biblio.rng

@@ -267,11 +267,11 @@ Detailed in https://www.relaton.org/model/creator/</a:documentation>
           <a:documentation>An identifier of the person according to an international identifier scheme</a:documentation>
         </ref>
       </zeroOrMore>
-      <zeroOrMore>
+      <optional>
         <ref name="contact">
           <a:documentation>Contact information for the person, including URI, address, phone number, and email</a:documentation>
         </ref>
-      </zeroOrMore>
+      </optional>
     </element>
   </define>
   <define name="fullname">
@@ -454,11 +454,11 @@ real names (if the person is named with a pseudonym or user name); previous lega
         <a:documentation>An identifier of the organization according to an international identifier scheme</a:documentation>
       </ref>
     </zeroOrMore>
-    <zeroOrMore>
+    <optional>
       <ref name="contact">
         <a:documentation>Contact information for the organization, including address, phone number, and email</a:documentation>
       </ref>
-    </zeroOrMore>
+    </optional>
     <optional>
       <ref name="logo">
         <a:documentation>A logo for the organization</a:documentation>
@@ -540,12 +540,18 @@ real names (if the person is named with a pseudonym or user name); previous lega
   <!-- TODO may change -->
   <define name="contact">
     <a:documentation>Contact information for a person or organization</a:documentation>
-    <choice>
+    <zeroOrMore>
       <ref name="address"/>
+    </zeroOrMore>
+    <zeroOrMore>
       <ref name="phone"/>
+    </zeroOrMore>
+    <zeroOrMore>
       <ref name="email"/>
+    </zeroOrMore>
+    <zeroOrMore>
       <ref name="uri"/>
-    </choice>
+    </zeroOrMore>
   </define>
   <define name="phone">
     <a:documentation>The phone number associated with a person or organization</a:documentation>
@@ -1271,17 +1277,17 @@ for which this claim of validity is made, if applicable</a:documentation>
   </define>
   <define name="validityBegins">
     <element name="validityBegins">
-      <ref name="ISO8601DateTime"/>
+      <ref name="ISO8601Date"/>
     </element>
   </define>
   <define name="validityEnds">
     <element name="validityEnds">
-      <ref name="ISO8601DateTime"/>
+      <ref name="ISO8601Date"/>
     </element>
   </define>
   <define name="validityRevision">
     <element name="revision">
-      <ref name="ISO8601DateTime"/>
+      <ref name="ISO8601Date"/>
     </element>
   </define>
   <define name="TypedTitleString">

data/lib/metanorma/itu/relaton-itu.rng

@@ -18,6 +18,7 @@
         <value>service-publication</value>
         <value>handbook</value>
         <value>question</value>
+        <value>contribution</value>
       </choice>
     </define>
     <define name="editorialgroup">

data/lib/metanorma/itu/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Itu
-    VERSION = "2.5.12".freeze
+    VERSION = "2.5.13".freeze
   end
 end

metadata

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