metanorma-itu 2.5.8 → 2.5.9

data/lib/isodoc/itu/presentation_contribution.rb

@@ -74,6 +74,7 @@ module IsoDoc
         x = clause.at(ns("./clause[@type = '#{type}']")) or return
         ret = x.dup
         ret.at(ns("./title"))&.remove
+        ret.at(ns("./fmt-title"))&.remove
         ret.children.to_xml
       end
 

data/lib/isodoc/itu/presentation_preface.rb

@@ -85,6 +85,7 @@ module IsoDoc
         abstract or return
         @doctype == "contribution" or return
         abstract.at(ns("./title"))&.remove
+        abstract.at(ns("./fmt-title"))&.remove
         abstract.children = <<~TABLE
           <table class="abstract" unnumbered="true" width="100%">
           <colgroup><col width="11.8%"/><col width="78.2%"/></colgroup>
@@ -98,7 +99,7 @@ module IsoDoc
       def keywords(_docxml)
         kw = @meta.get[:keywords]
         kw.nil? || kw.empty? || @doctype == "contribution" and return
-        "<clause type='keyword'><title>#{@i18n.keywords}</title>" \
+        "<clause type='keyword'><fmt-title>#{@i18n.keywords}</fmt-title>" \
           "<p>#{@i18n.l10n(kw.join(', '))}.</p>"
       end
 

data/lib/isodoc/itu/presentation_xml_convert.rb

@@ -67,10 +67,13 @@ module IsoDoc
       end
 
       def table1(elem)
-        elem.xpath(ns("./name | ./thead/tr/th")).each do |n|
+        elem.xpath(ns("./thead/tr/th")).each do |n|
           capitalise_unless_text_transform(n)
         end
         super
+        elem.xpath(ns("./fmt-name//semx[@element = 'name']")).each do |n|
+          capitalise_unless_text_transform(n)
+        end
       end
 
       def capitalise_unless_text_transform(elem)
@@ -110,16 +113,32 @@ module IsoDoc
         { group: "'" }
       end
 
-      def clause1(elem)
+      # KILL
+      def clause1x(elem)
         clause1_super?(elem) and return super
         @suppressheadingnumbers || elem["unnumbered"] and return
         t = elem.at(ns("./title")) and t["depth"] = "1"
-        lbl = @xrefs.anchor(elem["id"], :label, false) or return
+        lbl = @xrefs.anchor(elem["id"], :label, false)
+        lbl.blank? and return
         elem.previous =
           "<p keep-with-next='true' class='supertitle'>" \
           "#{@i18n.get['section'].upcase} #{lbl}</p>"
       end
 
+            def clause1(elem)
+        clause1_super?(elem) and return super
+        lbl = @xrefs.anchor(elem["id"], :label, false)
+        oldsuppressheadingnumbers = @suppressheadingnumbers
+        @suppressheadingnumbers = true
+        super
+        @suppressheadingnumbers = oldsuppressheadingnumbers
+        lbl.blank? || elem["unnumbered"] and return
+        elem.previous =
+          "<p keep-with-next='true' class='supertitle'>" \
+          "#{labelled_autonum(@i18n.get['section'].upcase, elem["id"], lbl)}</p>"
+          #"<span element='fmt-element-name'>#{@i18n.get['section'].upcase}</span> #{autonum(elem['id'], lbl)}</p>"
+      end
+
       def clause1_super?(elem)
         @doctype != "resolution" ||
           !%w(sections bibliography).include?(elem.parent.name)
@@ -136,23 +155,25 @@ module IsoDoc
 
       def annex1_resolution(elem)
         elem.elements.first.previous = annex1_supertitle(elem)
+         # TODO: do not alter title, alter semx/@element = title
         t = elem.at(ns("./title")) and
           t.children = "<strong>#{to_xml(t.children)}</strong>"
+        prefix_name(elem, {}, nil, "title")
       end
 
       def annex1_non_resolution(elem)
         info = elem["obligation"] == "informative"
-        ins = elem.at(ns("./title"))
+        ins = elem.at(ns("./fmt-xref-label")) || elem.at(ns("./fmt-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>)
+        ins.next = %(<p class="annex_obligation"><span class='fmt-obligation'>#{p}</span></p>)
       end
 
       def annex1_supertitle(elem)
         lbl = @xrefs.anchor(elem["id"], :label)
         res = elem.at(ns("//bibdata/title[@type = 'resolution']"))
         subhead = @i18n.l10n("(#{@i18n.get['to']} #{to_xml(res.children)})")
-        "<p class='supertitle'>#{lbl}<br/>#{subhead}</p>"
+        "<p class='supertitle'>#{autonum(elem['id'], lbl)}<br/>#{subhead}</p>"
       end
 
       def ol_depth(node)
@@ -229,14 +250,15 @@ module IsoDoc
       end
 
       def dl(xml)
+        super
         (xml.xpath(ns("//dl")) -
          xml.xpath(ns("//table//dl | //figure//dl | //formula//dl")))
           .each do |d|
-            dl1(d)
+            dl2(d)
           end
       end
 
-      def dl1(dlist)
+      def dl2(dlist)
         ins = dlist.at(ns("./dt"))
         ins.previous =
           '<colgroup><col width="20%"/><col width="80%"/></colgroup>'

data/lib/isodoc/itu/ref.rb

@@ -25,7 +25,7 @@ module IsoDoc
                 i += 1
                 bibitem_entry(tbody, b, i, biblio)
               else
-                unless %w(title clause references).include? b.name
+                unless %w(title clause references fmt-title fmt-xref-label).include? b.name
                   tbody.tx { |tx| parse(b, tx) }
                 end
               end

data/lib/isodoc/itu/terms.rb

@@ -4,7 +4,7 @@ module IsoDoc
       def termdef_parse1(node, div, defn, source)
         div.p **{ class: "TermNum", id: node["id"] } do |p|
           p.b do |b|
-            node&.at(ns("./name"))&.children&.each { |n| parse(n, 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) }
           end
@@ -19,8 +19,8 @@ module IsoDoc
         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 title
-                       name).include? n.name
+            next if %w(preferred definition termsource fmt-title
+                       fmt-name).include? n.name
 
             parse(n, out)
           end

data/lib/isodoc/itu/word_convert.rb

@@ -39,7 +39,7 @@ module IsoDoc
         out.div **attr_code(id: clause["id"], class: "Abstract") do |s|
           @doctype == "contribution" or
             clause_name(clause, "Summary", s, class: "AbstractTitle")
-          clause.elements.each { |e| parse(e, s) unless e.name == "title" }
+          clause.elements.each { |e| parse(e, s) unless e.name == "fmt-title" }
         end
       end
 
@@ -48,7 +48,7 @@ module IsoDoc
           div.p **attr_code(class: "formula") do |_p|
             insert_tab(div, 1)
             parse(node.at(ns("./stem")), div)
-            if lbl = node&.at(ns("./name"))&.text
+            if lbl = node&.at(ns("./fmt-name"))&.text
               insert_tab(div, 1)
               div << lbl
             end
@@ -127,7 +127,7 @@ module IsoDoc
         page_break(out)
         out.div **attr_code(preface_attrs(clause)) do |div|
           div.p class: "zzContents" do |p|
-            clause.at(ns("./title"))&.children&.each do |c|
+            clause.at(ns("./fmt-title"))&.children&.each do |c|
               parse(c, p)
             end
           end
@@ -136,7 +136,7 @@ module IsoDoc
             p << "<b>#{@i18n.page}</b>"
           end
           clause.elements.each do |e|
-            parse(e, div) unless e.name == "title"
+            parse(e, div) unless e.name == "fmt-title"
           end
         end
       end

data/lib/isodoc/itu/xref.rb

@@ -48,11 +48,16 @@ module IsoDoc
       end
 
       def subfigure_label(subfignum)
-        subfignum.zero? and return ""
-        "-#{(subfignum + 96).chr}"
+        subfignum.zero? and return
+        (subfignum + 96).chr
       end
 
-      def sequential_figure_body(subfig, counter, elem, klass, container: false)
+      def subfigure_delim
+        ")"
+      end
+
+      # KILL
+      def sequential_figure_bodyx(subfig, counter, elem, klass, container: false)
         label = counter.print
         label &&= label + subfigure_label(subfig)
         @anchors[elem["id"]] = anchor_struct(
@@ -61,8 +66,39 @@ module IsoDoc
         )
       end
 
-      def hierarchical_figure_body(num, subfignum, counter, block, klass)
-        label = "#{num}#{hiersep}#{counter.print}" + subfigure_label(subfignum)
+      def figure_anchor(elem, sublabel, label, klass, container: false)
+        if sublabel
+          subfigure_anchor(elem, sublabel, label, klass, container: false)
+        else
+          @anchors[elem["id"]] = anchor_struct(
+            label, elem, @labels[klass] || klass.capitalize, klass,
+            { unnumb: elem["unnumbered"], container: }
+          )
+        end
+      end
+
+      def fig_subfig_label(label, sublabel)
+        "#{label}#{delim_wrap("-")}#{sublabel}"
+      end
+
+      def subfigure_anchor(elem, sublabel, label, klass, container: false)
+        figlabel = fig_subfig_label(semx(elem.parent, label), semx(elem, sublabel))
+        @anchors[elem["id"]] = anchor_struct(
+          figlabel, elem, @labels[klass] || klass.capitalize, klass,
+          { unnumb: elem["unnumbered"] }
+        )
+        if elem["unnumbered"] != "true"
+          #@anchors[elem["id"]][:label] = sublabel
+          @anchors[elem["id"]][:xref] = @anchors[elem.parent["id"]][:xref] +
+            delim_wrap("-") + semx(elem, sublabel)
+          x = @anchors[elem.parent["id"]][:container] and
+          @anchors[elem["id"]][:container] = x
+        end
+      end
+
+      # KILL
+      def hierarchical_figure_bodyx(num, subfignum, counter, block, klass)
+        label = "#{num}#{hier_separator}#{counter.print}" + subfigure_label(subfignum)
         @anchors[block["id"]] = anchor_struct(
           label, nil, @labels[klass] || klass.capitalize,
           klass, block["unnumbered"]
@@ -84,9 +120,9 @@ module IsoDoc
         c = Counter.new
         clause.xpath(ns(".//formula")).noblank.each do |t|
           @anchors[t["id"]] = anchor_struct(
-            "#{num}-#{c.increment(t).print}", nil,
+            "#{semx(clause, num)}#{delim_wrap("-")}#{semx(t, c.increment(t).print)}", t,
             t["inequality"] ? @labels["inequality"] : @labels["formula"],
-            "formula", t["unnumbered"]
+            "formula", { unnumb:t["unnumbered"] }
           )
         end
       end
@@ -96,11 +132,11 @@ module IsoDoc
           c = Counter.new
           notes = t.xpath(ns("./termnote"))
           notes.noblank.each do |n|
-            idx = notes.size == 1 ? "" : " #{c.increment(n).print}"
+            idx = notes.size == 1 ? "" : c.increment(n).print
+            idx.blank? or notenum = " #{semx(n, idx)}"
             @anchors[n["id"]] =
-              { label: termnote_label(idx).strip, type: "termnote", value: idx,
-                xref: l10n("#{anchor(t['id'], :xref)},
-                           #{@labels['note_xref']} #{c.print}") }
+              { label: termnote_label(n, idx).strip, type: "termnote", value: idx,
+                xref: l10n("#{semx(t, anchor(t['id'], :xref))}<span class='fmt-comma'>,</span> <span class='fmt-element-name'>#{@labels['note_xref']}</span>#{notenum}") }
           end
         end
       end

data/lib/isodoc/itu/xref_section.rb

@@ -44,9 +44,9 @@ module IsoDoc
       def annex_name_lbl(clause, num)
         lbl = annextype(clause)
         if @doctype == "resolution"
-          l10n("#{lbl.upcase} #{num}")
+          l10n("<span class='fmt-element-name'>#{lbl.upcase}</span> #{semx(clause, num)}")
         else
-          l10n("<strong>#{lbl} #{num}</strong>")
+          l10n("<strong><span class='fmt-caption-label'><span class='fmt-element-name'>#{lbl}</span> #{semx(clause, num)}</span></strong>")
         end
       end
 
@@ -56,21 +56,35 @@ module IsoDoc
           { label: annex_name_lbl(clause, num),
             elem: lbl,
             type: "clause", value: num.to_s, level: level,
-            xref: l10n("#{lbl} #{num}") }
+            #xref: l10n("#{lbl} #{num}") }
+        xref: labelled_autonum(lbl, num) 
+          }
       end
 
-      def annex_names1(clause, num, level)
+      # KILL
+      def annex_names1x(clause, parentnum, num, level)
+        lbl = clause_number_semx(parentnum, clause, num)
+            #require 'debug'; binding.b
         @anchors[clause["id"]] =
-          { label: num, elem: @labels["annex_subclause"],
-            xref: @doctype == "resolution" ? num : l10n("#{@labels['annex_subclause']} #{num}"),
+          { label: lbl, elem: @labels["annex_subclause"],
+            xref: @doctype == "resolution" ? lbl : labelled_autonum(@labels['annex_subclause'], lbl),  # l10n("#{@labels['annex_subclause']} #{num}"),
             level: level, type: "clause" }
-        i = Counter.new(0, prefix: num)
+        i = Counter.new(0)
         clause.xpath(ns("./clause | ./references | ./terms | ./definitions"))
           .each do |c|
-          annex_names1(c, i.increment(c).print, level + 1)
+            #require 'debug'; binding.b
+          annex_names1(c, lbl, i.increment(c).print, level + 1)
         end
       end
 
+      def annex_name_anchors1(clause, lbl, level)
+        xref = labelled_autonum(@labels['annex_subclause'], lbl)
+@doctype == "resolution" and xref = lbl
+        @anchors[clause["id"]] =
+          { label: lbl, elem: @labels["annex_subclause"],
+            xref: xref, level: level, type: "clause" }
+      end
+
       def main_anchor_names(xml)
         n = Counter.new
         clause_order_main(xml).each do |a|
@@ -88,26 +102,28 @@ module IsoDoc
         )
 
         num.increment(clause)
-        lbl = @doctype == "resolution" ? @labels["section"] : @labels["clause"]
+        elem = @doctype == "resolution" ? @labels["section"] : @labels["clause"]
+        lbl = semx(clause, num.print)
         @anchors[clause["id"]] =
-          { label: num.print, xref: l10n("#{lbl} #{num.print}"),
-            level: lvl, type: "clause", elem: lbl }
-        i = Counter.new(0, prefix: num.print)
+          { label: lbl, xref: labelled_autonum(elem, lbl),# l10n("#{lbl} #{num.print}"),
+            level: lvl, type: "clause", elem: elem }
+        i = Counter.new(0)
         clause.xpath(ns(SUBCLAUSES)).each do |c|
-          section_names1(c, i.increment(c).print, lvl + 1)
+          section_names1(c, lbl, i.increment(c).print, lvl + 1)
         end
         num
       end
 
-      def section_names1(clause, num, level)
-        x = @doctype == "resolution" ? num : l10n("#{@labels['clause']} #{num}")
+      def section_names1(clause, parentnum, num, level)
+        lbl = clause_number_semx(parentnum, clause, num)
+        x = @doctype == "resolution" ? semx(clause, lbl) : labelled_autonum(@labels['clause'], lbl) #l10n("#{@labels['clause']} #{num}")
         @anchors[clause["id"]] =
-          { label: num, level: level,
+          { label: lbl, level: level,
             elem: @doctype == "resolution" ? "" : @labels["clause"],
             xref: x }
-        i = Counter.new(0, prefix: num)
+        i = Counter.new(0)
         clause.xpath(ns(SUBCLAUSES)).each do |c|
-          section_names1(c, i.increment(c).print, level + 1)
+          section_names1(c, lbl, i.increment(c).print, level + 1)
         end
       end
 
@@ -115,7 +131,10 @@ module IsoDoc
         clause.nil? and return
         lbl = clause.at(ns("./title"))&.text || "[#{clause['id']}]"
         @anchors[clause["id"]] =
-          { label: lbl, xref: l10n(%{"#{lbl}"}), level: lvl,
+          { label: lbl, 
+            # xref: l10n(%{"#{lbl}"}),
+            xref: semx(clause, lbl),
+            level: lvl,
             type: "clause" }
         clause.xpath(ns(SUBCLAUSES)).each do |c|
           unnumbered_section_names1(c, lvl + 1)
@@ -125,7 +144,10 @@ module IsoDoc
       def unnumbered_section_names1(clause, level)
         lbl = clause&.at(ns("./title"))&.text || "[#{clause['id']}]"
         @anchors[clause["id"]] =
-          { label: lbl, xref: l10n(%{"#{lbl}"}), level: level,
+          { label: lbl,
+            #xref: l10n(%{"#{lbl}"}), 
+            xref: semx(clause, lbl),
+            level: level,
             type: "clause" }
         clause.xpath(ns(SUBCLAUSES)).each do |c|
           unnumbered_section_names1(c, level + 1)

data/lib/metanorma/itu/biblio.rng

@@ -1783,9 +1783,21 @@ that the `number` given for the series applies to the second iteration of number
 May be used to differentiate rendering of notes in bibliographies</a:documentation>
         </attribute>
       </optional>
-      <ref name="LocalizedMarkedUpString">
+      <ref name="LocalizedStringAttributes">
         <a:documentation>The content of the note</a:documentation>
       </ref>
+      <choice>
+        <oneOrMore>
+          <ref name="BasicBlockNoId">
+            <a:documentation>Multiple blocks of content</a:documentation>
+          </ref>
+        </oneOrMore>
+        <oneOrMore>
+          <ref name="TextElement">
+            <a:documentation>Single block of content</a:documentation>
+          </ref>
+        </oneOrMore>
+      </choice>
     </element>
   </define>
   <define name="bibabstract">

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.4.0 -->
+<!-- VERSION v1.4.1 -->
 <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">
@@ -326,7 +326,7 @@ normative or informative references, some split references into sections organiz
       <a:documentation>Content of note</a:documentation>
       <oneOrMore>
         <choice>
-          <ref name="paragraph"/>
+          <ref name="paragraph-with-footnote"/>
           <ref name="ul"/>
           <ref name="ol"/>
           <ref name="dl"/>
@@ -412,7 +412,7 @@ normative or informative references, some split references into sections organiz
       <element name="note">
         <ref name="OptionalId"/>
         <oneOrMore>
-          <ref name="paragraph"/>
+          <ref name="paragraph-with-footnote"/>
         </oneOrMore>
       </element>
     </define>
@@ -1977,7 +1977,7 @@ used in document amendments</a:documentation>
       <oneOrMore>
         <choice>
           <a:documentation>Content of the verbal representation of the term</a:documentation>
-          <ref name="paragraph"/>
+          <ref name="paragraph-with-footnote"/>
           <ref name="dl"/>
           <ref name="ol"/>
           <ref name="ul"/>
@@ -2015,7 +2015,7 @@ used in document amendments</a:documentation>
       <oneOrMore>
         <choice>
           <a:documentation>Content of the term note</a:documentation>
-          <ref name="paragraph"/>
+          <ref name="paragraph-with-footnote"/>
           <ref name="ul"/>
           <ref name="ol"/>
           <ref name="dl"/>
@@ -2037,7 +2037,7 @@ used in document amendments</a:documentation>
           <ref name="dl"/>
           <ref name="quote"/>
           <ref name="sourcecode"/>
-          <ref name="paragraph"/>
+          <ref name="paragraph-with-footnote"/>
           <ref name="figure"/>
         </choice>
       </oneOrMore>

data/lib/metanorma/itu/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Itu
-    VERSION = "2.5.8".freeze
+    VERSION = "2.5.9".freeze
   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.10.0"
+  spec.add_dependency "metanorma-standoc", "~> 2.10.1"
   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.8
+  version: 2.5.9
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-11-11 00:00:00.000000000 Z
+date: 2024-12-09 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.10.0
+        version: 2.10.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: 2.10.1
 - !ruby/object:Gem::Dependency
   name: pubid
   requirement: !ruby/object:Gem::Requirement