metanorma-itu 2.0.2 → 2.0.5

data/lib/isodoc/itu/metadata.rb

@@ -11,6 +11,7 @@ module IsoDoc
         set(:logo_comb, fileloc("itu-document-comb.png"))
         set(:logo_word, fileloc(n))
         set(:logo_sp, fileloc("logo-sp.png"))
+        @isodoc = IsoDoc::ITU::HtmlConvert.new({})
       end
 
       def fileloc(file)
@@ -19,30 +20,30 @@ module IsoDoc
       end
 
       def title(isoxml, _out)
-        main = isoxml&.at(ns("//bibdata/title[@language='#{@lang}']"\
-                             "[@type = 'main']"))&.text
-        set(:doctitle, main)
-        main = isoxml&.at(ns("//bibdata/title[@language='#{@lang}']"\
-                             "[@type = 'subtitle']"))&.text
-        set(:docsubtitle, main)
-        main = isoxml&.at(ns("//bibdata/title[@language='#{@lang}']"\
-                             "[@type = 'amendment']"))&.text
-        set(:amendmenttitle, main)
-        main = isoxml&.at(ns("//bibdata/title[@language='#{@lang}']"\
-                             "[@type = 'corrigendum']"))&.text
-        set(:corrigendumtitle, main)
-        series = isoxml&.at(ns("//bibdata/series[@type='main']/title"))&.text
-        set(:series, series)
-        series1 =
-          isoxml&.at(ns("//bibdata/series[@type='secondary']/title"))&.text
-        set(:series1, series1)
-        series2 =
-          isoxml&.at(ns("//bibdata/series[@type='tertiary']/title"))&.text
-        set(:series2, series2)
-        annext = isoxml&.at(ns("//bibdata/title[@type='annex']"))&.text
-        set(:annextitle, annext)
-        annext = isoxml&.at(ns("//bibdata/title[@type='position-sp']"))&.text
-        set(:positiontitle, annext)
+        { doctitle: "//bibdata/title[@language='#{@lang}'][@type = 'main']",
+          docsubtitle: "//bibdata/title[@language='#{@lang}']"\
+                       "[@type = 'subtitle']",
+          amendmenttitle: "//bibdata/title[@language='#{@lang}']"\
+                          "[@type = 'amendment']",
+          corrigendumtitle: "//bibdata/title[@language='#{@lang}']"\
+                            "[@type = 'corrigendum']",
+          series: "//bibdata/series[@type='main']/title",
+          series1: "//bibdata/series[@type='secondary']/title",
+          series2: "//bibdata/series[@type='tertiary']/title",
+          annextitle: "//bibdata/title[@type='annex']",
+          positiontitle: "//bibdata/title[@type='position-sp']" }.each do |k, v|
+          titleset(isoxml, k, v)
+        end
+      end
+
+      def titleset(isoxml, key, xpath)
+        value = isoxml.at(ns(xpath)) or return
+        out = @isodoc.noko do |xml|
+          xml.span do |s|
+            value.children.each { |c| @isodoc.parse(c, s) }
+          end
+        end.join
+        set(key, out.sub(%r{^<span>}, "").sub(%r{</span>$}, ""))
       end
 
       def subtitle(_isoxml, _out)

data/lib/isodoc/itu/presentation_xml_convert.rb

@@ -174,6 +174,19 @@ module IsoDoc
           t.children = "<strong>#{t.children.to_xml}</strong>"
       end
 
+      def ol_depth(node)
+        return super unless node["class"] == "steps" ||
+          node.at(".//ancestor::xmlns:ol[@class = 'steps']")
+
+        depth = node.ancestors("ul, ol").size + 1
+        type = :arabic
+        type = :alphabet if [2, 7].include? depth
+        type = :roman if [3, 8].include? depth
+        type = :alphabet_upper if [4, 9].include? depth
+        type = :roman_upper if [5, 10].include? depth
+        type
+      end
+
       include Init
     end
   end

data/lib/isodoc/itu/ref.rb

@@ -44,24 +44,26 @@ module IsoDoc
         end
       end
 
-      def bracket_if_num(x)
-        return nil if x.nil?
+      def bracket_if_num(num)
+        return nil if num.nil?
 
-        x = x.text.sub(/^\[/, "").sub(/\]$/, "")
-        "[#{x}]"
+        num = num.text.sub(/^\[/, "").sub(/\]$/, "")
+        "[#{num}]"
       end
 
-      def reference_format(b, r)
-        reference_format_start(b, r)
-        reference_format_title(b, r)
+      def reference_format(biblio, ref)
+        reference_format_start(biblio, ref)
+        reference_format_title(biblio, ref)
       end
 
-      def titlecase(s)
-        s.gsub(/ |_|-/, " ").split(/ /).map(&:capitalize).join(" ")
+      def titlecase(str)
+        str.gsub(/ |_|-/, " ").split(/ /).map(&:capitalize).join(" ")
       end
 
-      def pref_ref_code(b)
-        b.at(ns("./docidentifier[@type = 'ITU']")) || super
+      def pref_ref_code(bibitem)
+        ret = bibitem.xpath(ns("./docidentifier[@type = 'ITU']")) 
+        ret.empty? and ret = super
+        ret
       end
 
       IGNORE_IDS = "@type = 'DOI' or @type = 'ISSN' or @type = 'ISBN' or "\
@@ -84,7 +86,7 @@ module IsoDoc
           else
             docid_prefix(id["type"], id.text.sub(/^\[/, "").sub(/\]$/, ""))
           end
-        end.join(" | ")
+        end.join(" | ")
       end
 
       def doctype_title(id)
@@ -98,20 +100,28 @@ module IsoDoc
         end
       end
 
-      def reference_format_start(b, r)
-        id = multi_bibitem_ref_code(b)
+      def unbracket(ident)
+        if ident.respond_to?(:size)
+          ident.map { |x| unbracket1(x) }.join(" | ")
+        else
+          unbracket1(ident)
+        end
+      end
+
+      def reference_format_start(bib, r)
+        id = multi_bibitem_ref_code(bib)
         id1 = render_multi_identifiers(id)
         r << id1
-        date = b.at(ns("./date[@type = 'published']")) and
+        date = bib.at(ns("./date[@type = 'published']")) and
           r << " (#{date.text.sub(/-.*$/, '')})"
         r << ", " if date || !id1.empty?
       end
 
-      def reference_format_title(b, r)
-        if ftitle = b.at(ns("./formattedref"))
+      def reference_format_title(bib, r)
+        if ftitle = bib.at(ns("./formattedref"))
           ftitle&.children&.each { |n| parse(n, r) }
           /\.$/.match(ftitle&.text) or r << "."
-        elsif title = iso_title(b)
+        elsif title = iso_title(bib)
           r.i do |i|
             title&.children&.each { |n| parse(n, i) }
           end

data/lib/isodoc/itu/word_convert.rb

@@ -23,7 +23,7 @@ module IsoDoc
 
       def make_body2(body, docxml)
         body.div **{ class: "WordSection2" } do |div2|
-          info docxml, div2 
+          info docxml, div2
           boilerplate docxml, div2
           preface_block docxml, div2
           abstract docxml, div2
@@ -46,14 +46,14 @@ module IsoDoc
         kw = @meta.get[:keywords]
         kw.nil? || kw.empty? and return
         out.div **attr_code(class: "Keyword") do |div|
-          clause_name(nil, "Keywords", div,  class: "IntroTitle")
+          clause_name(nil, "Keywords", div, class: "IntroTitle")
           div.p kw.join(", ") + "."
         end
       end
 
       def formula_parse1(node, out)
         out.div **attr_code(class: "formula") do |div|
-          div.p **attr_code(class: "formula") do |p|
+          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
@@ -74,29 +74,34 @@ module IsoDoc
       end
 
       def default_fonts(options)
-        { bodyfont: (options[:script] == "Hans" ? '"Source Han Sans",serif' :
-                     '"Times New Roman",serif'),
-                     headerfont: (options[:script] == "Hans" ? '"Source Han Sans",sans-serif' :
-                                  '"Times New Roman",serif'),
-                                  monospacefont: '"Courier New",monospace',
-                                  normalfontsize: "12.0pt",
-                                  footnotefontsize: "11.0pt",
-                                  smallerfontsize: "11.0pt",
-                                  monospacefontsize: "10.0pt",
-        }
+        { bodyfont: (if options[:script] == "Hans"
+                       '"Source Han Sans",serif'
+                     else
+                       '"Times New Roman",serif'
+                     end),
+          headerfont: (if options[:script] == "Hans"
+                         '"Source Han Sans",sans-serif'
+                       else
+                         '"Times New Roman",serif'
+                       end),
+          monospacefont: '"Courier New",monospace',
+          normalfontsize: "12.0pt",
+          footnotefontsize: "11.0pt",
+          smallerfontsize: "11.0pt",
+          monospacefontsize: "10.0pt" }
       end
 
-      def default_file_locations(options)
+      def default_file_locations(_options)
         { wordstylesheet: html_doc_path("wordstyle.scss"),
           standardstylesheet: html_doc_path("itu.scss"),
           header: html_doc_path("header.html"),
           wordcoverpage: html_doc_path("word_itu_titlepage.html"),
           wordintropage: html_doc_path("word_itu_intro.html"),
           ulstyle: "l3",
-          olstyle: "l2", }
+          olstyle: "l2" }
       end
 
-      def make_tr_attr(td, row, totalrows, header)
+      def make_tr_attr(tcell, row, totalrows, header)
         super.merge(valign: "top")
       end
 
@@ -105,7 +110,7 @@ module IsoDoc
       end
 
       def link_parse(node, out)
-        out.a **attr_code(href: node["target"], title: node["alt"], 
+        out.a **attr_code(href: node["target"], title: node["alt"],
                           class: "url") do |l|
           if node.text.empty?
             l << node["target"].sub(/^mailto:/, "")

data/lib/isodoc/itu/xref_section.rb

@@ -16,11 +16,16 @@ module IsoDoc
         end
       end
 
-      def annex_names(clause, num)
+      def annex_name_anchors(clause, num)
         lbl = annextype(clause)
-        @anchors[clause["id"]] =
-          { label: annex_name_lbl(clause, num), type: "clause",
-            xref: l10n("#{lbl} #{num}"), level: 1, value: num }
+        { label: annex_name_lbl(clause, num),
+          elem: lbl,
+          type: "clause", value: num.to_s, level: 1,
+          xref: l10n("#{lbl} #{num}") }
+      end
+
+      def annex_names(clause, num)
+        @anchors[clause["id"]] = annex_name_anchors(clause, num)
         if a = single_annex_special_section(clause)
           annex_names1(a, num.to_s, 1)
         else
@@ -36,7 +41,7 @@ module IsoDoc
 
       def annex_names1(clause, num, level)
         @anchors[clause["id"]] =
-          { label: num,
+          { label: num, elem: @labels["annex_subclause"],
             xref: @doctype == "resolution" ? num : l10n("#{@labels['annex_subclause']} #{num}"),
             level: level, type: "clause" }
         i = Counter.new
@@ -65,7 +70,7 @@ module IsoDoc
         lbl = @doctype == "resolution" ? @labels["section"] : @labels["clause"]
         @anchors[clause["id"]] =
           { label: num.print, xref: l10n("#{lbl} #{num.print}"),
-            level: lvl, type: "clause" }
+            level: lvl, type: "clause", elem: lbl }
         i = Counter.new
         clause.xpath(ns(SUBCLAUSES)).each do |c|
           i.increment(c)
@@ -77,6 +82,7 @@ module IsoDoc
       def section_names1(clause, num, level)
         @anchors[clause["id"]] =
           { label: num, level: level,
+            elem: @doctype == "resolution" ? "" : @labels["clause"],
             xref: @doctype == "resolution" ? num : l10n("#{@labels['clause']} #{num}") }
         i = Counter.new
         clause.xpath(ns(SUBCLAUSES)).each do |c|

data/lib/metanorma/itu/basicdoc.rng

@@ -173,9 +173,11 @@
           <data type="dateTime"/>
         </attribute>
       </optional>
-      <attribute name="from">
-        <data type="IDREF"/>
-      </attribute>
+      <optional>
+        <attribute name="from">
+          <data type="IDREF"/>
+        </attribute>
+      </optional>
       <optional>
         <attribute name="to">
           <data type="IDREF"/>

data/lib/metanorma/itu/biblio.rng

@@ -209,9 +209,6 @@
       <zeroOrMore>
         <ref name="contact"/>
       </zeroOrMore>
-      <zeroOrMore>
-        <ref name="uri"/>
-      </zeroOrMore>
     </element>
   </define>
   <define name="fullname">
@@ -828,6 +825,11 @@
       <optional>
         <attribute name="scope"/>
       </optional>
+      <optional>
+        <attribute name="primary">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
       <text/>
     </element>
   </define>

data/lib/metanorma/itu/isodoc.rng

@@ -152,9 +152,7 @@
             <data type="boolean"/>
           </attribute>
         </optional>
-        <oneOrMore>
-          <ref name="PureTextElement"/>
-        </oneOrMore>
+        <ref name="XrefBody"/>
       </element>
     </define>
     <define name="erefType">
@@ -188,6 +186,42 @@
         <ref name="PureTextElement"/>
       </oneOrMore>
     </define>
+    <define name="localityStack">
+      <element name="localityStack">
+        <optional>
+          <attribute name="connective">
+            <choice>
+              <value>and</value>
+              <value>or</value>
+              <value>from</value>
+              <value>to</value>
+              <value/>
+            </choice>
+          </attribute>
+        </optional>
+        <zeroOrMore>
+          <ref name="locality"/>
+        </zeroOrMore>
+      </element>
+    </define>
+    <define name="sourceLocalityStack">
+      <element name="sourceLocalityStack">
+        <optional>
+          <attribute name="connective">
+            <choice>
+              <value>and</value>
+              <value>or</value>
+              <value>from</value>
+              <value>to</value>
+              <value/>
+            </choice>
+          </attribute>
+        </optional>
+        <zeroOrMore>
+          <ref name="sourceLocality"/>
+        </zeroOrMore>
+      </element>
+    </define>
     <define name="ul">
       <element name="ul">
         <attribute name="id">
@@ -1098,6 +1132,16 @@
     </define>
   </include>
   <!-- end overrides -->
+  <define name="image" combine="choice">
+    <element name="svg">
+      <oneOrMore>
+        <choice>
+          <text/>
+          <ref name="AnyElement"/>
+        </choice>
+      </oneOrMore>
+    </element>
+  </define>
   <define name="MultilingualRenderingType">
     <choice>
       <value>common</value>
@@ -2631,4 +2675,30 @@
       </zeroOrMore>
     </element>
   </define>
+  <define name="XrefBody">
+    <zeroOrMore>
+      <ref name="XrefTarget"/>
+    </zeroOrMore>
+    <oneOrMore>
+      <ref name="PureTextElement"/>
+    </oneOrMore>
+  </define>
+  <define name="XrefTarget">
+    <element name="location">
+      <attribute name="target">
+        <data type="string">
+          <param name="pattern">\i\c*|\c+#\c+</param>
+        </data>
+      </attribute>
+      <attribute name="connective">
+        <choice>
+          <value>and</value>
+          <value>or</value>
+          <value>from</value>
+          <value>to</value>
+          <value/>
+        </choice>
+      </attribute>
+    </element>
+  </define>
 </grammar>

data/lib/metanorma/itu/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ITU
-    VERSION = "2.0.2".freeze
+    VERSION = "2.0.5".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-itu
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-22 00:00:00.000000000 Z
+date: 2022-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities