metanorma-itu 2.0.8.1 → 2.1.2

data/lib/isodoc/itu/presentation_xml_convert.rb

@@ -1,6 +1,7 @@
 require_relative "init"
 require "roman-numerals"
 require "isodoc"
+require_relative "../../relaton/render/general"
 
 module IsoDoc
   module ITU
@@ -121,6 +122,21 @@ module IsoDoc
         end
       end
 
+      def bibrenderer
+        ::Relaton::Render::ITU::General.new(language: @lang)
+      end
+
+      def bibrender(xml)
+        if f = xml.at(ns("./formattedref"))
+          f << "." unless /\.$/.match?(f.text)
+        else
+          # retain date in order to generate reference tag
+          xml.children =
+            "#{bibrenderer.render(xml.to_xml)}"\
+            "#{xml.xpath(ns('./docidentifier | ./uri | ./note | ./date')).to_xml}"
+        end
+      end
+
       def ddmmmmyyyy(date)
         if @lang == "zh"
           ddMMMyyyy(date)

data/lib/isodoc/itu/ref.rb

@@ -5,27 +5,27 @@ require "fileutils"
 module IsoDoc
   module ITU
     module BaseConvert
-      def nonstd_bibitem(list, b, _ordinal, biblio)
-        list.tr **attr_code(iso_bibitem_entry_attrs(b, biblio)) do |ref|
-          id = render_identifier(bibitem_ref_code(b))
+      def nonstd_bibitem(list, bibitem, _ordinal, biblio)
+        list.tr **attr_code(iso_bibitem_entry_attrs(bibitem, biblio)) do |ref|
+          id = render_identifier(bibitem_ref_code(bibitem))
           ref.td **{ style: "vertical-align:top" } do |td|
             td << (id[:metanorma] || "[#{id[:sdo]}]")
               &.gsub(/-/, "&#x2011;")&.gsub(/ /, "&#xa0;")
-            date_note_process(b, td)
+            date_note_process(bibitem, td)
           end
-          ref.td { |td| reference_format(b, td) }
+          ref.td { |td| reference_format(bibitem, td) }
         end
       end
 
-      def std_bibitem_entry(list, b, ordinal, biblio)
-        nonstd_bibitem(list, b, ordinal, biblio)
+      def std_bibitem_entry(list, bibitem, ordinal, biblio)
+        nonstd_bibitem(list, bibitem, ordinal, biblio)
       end
 
-      def biblio_list(f, div, biblio)
+      def biblio_list(clause, div, biblio)
         div.table **{ class: "biblio", border: "0" } do |t|
           i = 0
           t.tbody do |tbody|
-            f.elements.each do |b|
+            clause.elements.each do |b|
               if b.name == "bibitem"
                 next if implicit_reference(b)
 
@@ -39,7 +39,7 @@ module IsoDoc
             end
           end
         end
-        f.xpath(ns("./clause | ./references")).each do |x|
+        clause.xpath(ns("./clause | ./references")).each do |x|
           parse(x, div)
         end
       end
@@ -53,7 +53,7 @@ module IsoDoc
 
       def reference_format(biblio, ref)
         reference_format_start(biblio, ref)
-        reference_format_title(biblio, ref)
+        super
       end
 
       def titlecase(str)
@@ -61,7 +61,7 @@ module IsoDoc
       end
 
       def pref_ref_code(bibitem)
-        ret = bibitem.xpath(ns("./docidentifier[@type = 'ITU']")) 
+        ret = bibitem.xpath(ns("./docidentifier[@type = 'ITU']"))
         ret.empty? and ret = super
         ret
       end
@@ -69,11 +69,11 @@ module IsoDoc
       IGNORE_IDS = "@type = 'DOI' or @type = 'ISSN' or @type = 'ISBN' or "\
                    "@type = 'rfc-anchor' or @type = 'metanorma-ordinal'".freeze
 
-      def multi_bibitem_ref_code(b)
-        id = b.xpath(ns("./docidentifier[not(@type = 'metanorma' or "\
-                        "#{IGNORE_IDS})]"))
+      def multi_bibitem_ref_code(bibitem)
+        id = bibitem.xpath(ns("./docidentifier[not(@type = 'metanorma' or "\
+                              "#{IGNORE_IDS})]"))
         id.empty? and
-          id = b.xpath(ns("./docidentifier[not(@type = 'metanorma')]"))
+          id = bibitem.xpath(ns("./docidentifier[not(@type = 'metanorma')]"))
         return [] if id.empty?
 
         id.sort_by { |i| i["type"] == "ITU" ? 0 : 1 }
@@ -108,25 +108,13 @@ module IsoDoc
         end
       end
 
-      def reference_format_start(bib, r)
+      def reference_format_start(bib, out)
         id = multi_bibitem_ref_code(bib)
         id1 = render_multi_identifiers(id)
-        r << id1
+        out << id1
         date = bib.at(ns("./date[@type = 'published']")) and
-          r << " (#{date.text.sub(/-.*$/, '')})"
-        r << ", " if date || !id1.empty?
-      end
-
-      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(bib)
-          r.i do |i|
-            title&.children&.each { |n| parse(n, i) }
-          end
-          /\.$/.match(title&.text) or r << "."
-        end
+          out << " (#{date.text.sub(/-.*$/, '')})"
+        out << ", " if date || !id1.empty?
       end
     end
   end

data/lib/isodoc/itu/terms.rb

@@ -37,7 +37,7 @@ module IsoDoc
       end
 
       def termnote_delim
-        " – "
+        " – "
       end
     end
   end

data/lib/isodoc/itu/word_cleanup.rb

@@ -76,13 +76,13 @@ module IsoDoc
           @wordstylesheet&.write(@landscapestyle)
           @wordstylesheet&.close
         end
-        Html2Doc.process(
-          result, filename: filename,
-                  stylesheet: @wordstylesheet&.path,
-                  header_file: header&.path, dir: dir,
-                  asciimathdelims: [@openmathdelim, @closemathdelim],
-                  liststyles: { ul: @ulstyle, ol: @olstyle, steps: "l4" }
-        )
+        Html2Doc.new(
+          filename: filename,
+          stylesheet: @wordstylesheet&.path,
+          header_file: header&.path, dir: dir,
+          asciimathdelims: [@openmathdelim, @closemathdelim],
+          liststyles: { ul: @ulstyle, ol: @olstyle, steps: "l4" }
+        ).process(result)
         header&.unlink
         @wordstylesheet&.unlink
       end
@@ -105,7 +105,7 @@ module IsoDoc
         %w(copyright license legal).each do |t|
           docxml&.xpath("//div[@class = 'boilerplate-#{t}']")&.each do |d|
             para = d&.at("./descendant::h1[2]") and
-              para.previous = "<p>&nbsp;</p><p>&nbsp;</p><p>&nbsp;</p>"
+              para.previous = "<p>&#xa0;</p><p>&#xa0;</p><p>&#xa0;</p>"
             d.xpath(".//h1 | .//h2").each do |p|
               p.name = "p"
               p["class"] = "boilerplateHdr"
@@ -131,9 +131,10 @@ module IsoDoc
             # i == 0 && t == "copyright" and p["style"] = "text-align:center;"
           end
           t == "copyright" or
-            auth << "<p>&nbsp;</p><p>&nbsp;</p><p>&nbsp;</p>"
+            auth << "<p>&#xa0;</p><p>&#xa0;</p><p>&#xa0;</p>"
           dest.replace(auth.remove)
         end
+        coverpage_note_cleanup(docxml)
       end
 
       TOPLIST = "[not(ancestor::ul) and not(ancestor::ol)]".freeze

data/lib/isodoc/itu/word_convert.rb

@@ -29,7 +29,7 @@ module IsoDoc
           abstract docxml, div2
           keywords docxml, div2
           preface docxml, div2
-          div2.p { |p| p << "&nbsp;" } # placeholder
+          div2.p { |p| p << "&#xa0;" } # placeholder
         end
         section_break(body)
       end

data/lib/isodoc/itu/xref.rb

@@ -6,8 +6,11 @@ module IsoDoc
   module ITU
     class Counter < IsoDoc::XrefGen::Counter
       def print
-        super.sub(/([0-9])(bis|ter|quater|quinquies|sexies|septies|octies|nonies)$/,
-                  "\\1<em>\\2</em>")
+        ret = super or return nil
+
+        ret
+          .sub(/([0-9])(bis|ter|quater|quinquies|sexies|septies|octies|nonies)$/,
+               "\\1<em>\\2</em>")
       end
     end
 
@@ -19,12 +22,14 @@ module IsoDoc
 
       def back_anchor_names(docxml)
         super
-        if annexid = docxml
-          &.at(ns("//bibdata/ext/structuredidentifier/annexid"))&.text
-          docxml.xpath(ns("//annex")).each { |c| annex_names(c, annexid) }
-        else
-          informative_annex_names(docxml)
-          normative_annex_names(docxml)
+        if @parse_settings.empty? || @parse_settings[:clauses]
+          if annexid = docxml
+            &.at(ns("//bibdata/ext/structuredidentifier/annexid"))&.text
+            docxml.xpath(ns("//annex")).each { |c| annex_names(c, annexid) }
+          else
+            informative_annex_names(docxml)
+            normative_annex_names(docxml)
+          end
         end
       end
 
@@ -48,25 +53,33 @@ module IsoDoc
 
       def initial_anchor_names(doc)
         @doctype = doc&.at(ns("//bibdata/ext/doctype"))&.text
-        doc.xpath(ns("//boilerplate//clause")).each { |c| preface_names(c) }
-        doc.xpath("//xmlns:preface/child::*").each { |c| preface_names(c) }
-        if @hierarchical_assets
-          hierarchical_asset_names(doc.xpath("//xmlns:preface/child::*"),
-                                   "Preface")
-        else
-          sequential_asset_names(doc.xpath("//xmlns:preface/child::*"))
+        if @parse_settings.empty? || @parse_settings[:clauses]
+          doc.xpath(ns("//boilerplate//clause")).each { |c| preface_names(c) }
+          doc.xpath("//xmlns:preface/child::*").each { |c| preface_names(c) }
+        end
+        if @parse_settings.empty?
+          if @hierarchical_assets
+            hierarchical_asset_names(doc.xpath("//xmlns:preface/child::*"),
+                                     "Preface")
+          else
+            sequential_asset_names(doc.xpath("//xmlns:preface/child::*"))
+          end
+        end
+        if @parse_settings.empty? || @parse_settings[:clauses]
+          n = Counter.new
+          n = section_names(doc.at(ns("//clause[@type = 'scope']")), n, 1)
+          n = section_names(doc.at(ns(@klass.norm_ref_xpath)), n, 1)
+          n = section_names(
+            doc.at(ns("//sections/terms | //sections/clause[descendant::terms]")), n, 1
+          )
+          n = section_names(doc.at(ns("//sections/definitions")), n, 1)
+          clause_names(doc, n)
+        end
+        if @parse_settings.empty?
+          middle_section_asset_names(doc)
+          termnote_anchor_names(doc)
+          termexample_anchor_names(doc)
         end
-        n = Counter.new
-        n = section_names(doc.at(ns("//clause[@type = 'scope']")), n, 1)
-        n = section_names(doc.at(ns(@klass.norm_ref_xpath)), n, 1)
-        n = section_names(
-          doc.at(ns("//sections/terms | //sections/clause[descendant::terms]")), n, 1
-        )
-        n = section_names(doc.at(ns("//sections/definitions")), n, 1)
-        clause_names(doc, n)
-        middle_section_asset_names(doc)
-        termnote_anchor_names(doc)
-        termexample_anchor_names(doc)
       end
 
       def middle_sections
@@ -134,7 +147,9 @@ module IsoDoc
 
       def hierarchical_formula_names(clause, num)
         c = Counter.new
-        clause.xpath(ns(".//formula")).reject { |n| blank?(n["id"]) }.each do |t|
+        clause.xpath(ns(".//formula")).reject do |n|
+          blank?(n["id"])
+        end.each do |t|
           @anchors[t["id"]] = anchor_struct(
             "#{num}-#{c.increment(t).print}", nil,
             t["inequality"] ? @labels["inequality"] : @labels["formula"],

data/lib/isodoc/itu/xref_section.rb

@@ -24,21 +24,6 @@ module IsoDoc
           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
-          i = Counter.new
-          clause.xpath(ns("./clause | ./references | ./terms | ./definitions"))
-            .each do |c|
-            i.increment(c)
-            annex_names1(c, "#{num}.#{i.print}", 2)
-          end
-        end
-        hierarchical_asset_names(clause, num)
-      end
-
       def annex_names1(clause, num, level)
         @anchors[clause["id"]] =
           { label: num, elem: @labels["annex_subclause"],

data/lib/metanorma/itu/biblio.rng

@@ -614,12 +614,12 @@
     <optional>
       <ref name="fetched"/>
     </optional>
-    <choice>
-      <oneOrMore>
-        <ref name="btitle"/>
-      </oneOrMore>
+    <optional>
       <ref name="formattedref"/>
-    </choice>
+    </optional>
+    <oneOrMore>
+      <ref name="btitle"/>
+    </oneOrMore>
     <zeroOrMore>
       <ref name="bsource"/>
     </zeroOrMore>
@@ -851,17 +851,46 @@
   </define>
   <define name="bplace">
     <element name="place">
-      <optional>
-        <attribute name="uri">
-          <data type="anyURI"/>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="region"/>
-      </optional>
+      <choice>
+        <text/>
+        <group>
+          <ref name="bibliocity"/>
+          <zeroOrMore>
+            <ref name="biblioregion"/>
+          </zeroOrMore>
+          <zeroOrMore>
+            <ref name="bibliocountry"/>
+          </zeroOrMore>
+        </group>
+      </choice>
+    </element>
+  </define>
+  <define name="bibliocity">
+    <element name="city">
       <text/>
     </element>
   </define>
+  <define name="biblioregion">
+    <element name="region">
+      <ref name="RegionType"/>
+    </element>
+  </define>
+  <define name="bibliocountry">
+    <element name="country">
+      <ref name="RegionType"/>
+    </element>
+  </define>
+  <define name="RegionType">
+    <optional>
+      <attribute name="iso"/>
+    </optional>
+    <optional>
+      <attribute name="recommended">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
+    <text/>
+  </define>
   <define name="bprice">
     <element name="price">
       <attribute name="currency"/>
@@ -957,36 +986,34 @@
           <ref name="SeriesType"/>
         </attribute>
       </optional>
-      <choice>
+      <optional>
         <ref name="formattedref"/>
-        <group>
-          <ref name="btitle"/>
-          <optional>
-            <ref name="bplace"/>
-          </optional>
-          <optional>
-            <ref name="seriesorganization"/>
-          </optional>
-          <optional>
-            <ref name="abbreviation"/>
-          </optional>
-          <optional>
-            <ref name="seriesfrom"/>
-          </optional>
-          <optional>
-            <ref name="seriesto"/>
-          </optional>
-          <optional>
-            <ref name="seriesnumber"/>
-          </optional>
-          <optional>
-            <ref name="seriespartnumber"/>
-          </optional>
-          <optional>
-            <ref name="seriesrun"/>
-          </optional>
-        </group>
-      </choice>
+      </optional>
+      <ref name="btitle"/>
+      <optional>
+        <ref name="bplace"/>
+      </optional>
+      <optional>
+        <ref name="seriesorganization"/>
+      </optional>
+      <optional>
+        <ref name="abbreviation"/>
+      </optional>
+      <optional>
+        <ref name="seriesfrom"/>
+      </optional>
+      <optional>
+        <ref name="seriesto"/>
+      </optional>
+      <optional>
+        <ref name="seriesnumber"/>
+      </optional>
+      <optional>
+        <ref name="seriespartnumber"/>
+      </optional>
+      <optional>
+        <ref name="seriesrun"/>
+      </optional>
     </element>
   </define>
   <define name="SeriesType">

data/lib/metanorma/itu/converter.rb

@@ -31,7 +31,7 @@ module Metanorma
       end
 
       def doctype(node)
-        ret = super || "recommendation"
+        ret = node.attr("doctype")&.gsub(/\s+/, "-")&.downcase || "recommendation"
         ret = "recommendation" if ret == "article"
         ret
       end
@@ -40,6 +40,7 @@ module Metanorma
         id = Metanorma::Utils::anchor_or_uuid(node)
         noko do |xml|
           xml.ol **attr_code(id: id, class: node.attr("class")) do |xml_ol|
+            list_caption(node, xml_ol)
             node.items.each { |item| li(xml_ol, item) }
           end
         end.join("\n")

data/lib/metanorma/itu/isodoc.rng

@@ -32,6 +32,43 @@
         <ref name="DocumentType"/>
       </element>
     </define>
+    <define name="admonition">
+      <element name="admonition">
+        <attribute name="type">
+          <ref name="AdmonitionType"/>
+        </attribute>
+        <optional>
+          <attribute name="class"/>
+        </optional>
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+        <optional>
+          <attribute name="uri">
+            <data type="anyURI"/>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="coverpage">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="notag">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
+        <optional>
+          <ref name="tname"/>
+        </optional>
+        <zeroOrMore>
+          <ref name="paragraph-with-footnote"/>
+        </zeroOrMore>
+        <zeroOrMore>
+          <ref name="note"/>
+        </zeroOrMore>
+      </element>
+    </define>
     <define name="index">
       <element name="index">
         <optional>
@@ -245,6 +282,9 @@
             <ref name="MultilingualRenderingType"/>
           </attribute>
         </optional>
+        <optional>
+          <ref name="tname"/>
+        </optional>
         <oneOrMore>
           <ref name="ul_li"/>
         </oneOrMore>
@@ -287,6 +327,9 @@
             </choice>
           </attribute>
         </optional>
+        <optional>
+          <ref name="tname"/>
+        </optional>
         <oneOrMore>
           <ref name="li"/>
         </oneOrMore>
@@ -323,6 +366,9 @@
             <ref name="MultilingualRenderingType"/>
           </attribute>
         </optional>
+        <optional>
+          <ref name="tname"/>
+        </optional>
         <oneOrMore>
           <ref name="dt"/>
           <ref name="dd"/>
@@ -851,6 +897,16 @@
             <ref name="MultilingualRenderingType"/>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="coverpage">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="notag">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
         <oneOrMore>
           <choice>
             <ref name="paragraph"/>
@@ -1178,6 +1234,7 @@
       <ref name="concept"/>
       <ref name="add"/>
       <ref name="del"/>
+      <ref name="span"/>
     </choice>
   </define>
   <define name="add">
@@ -1204,6 +1261,14 @@
       </choice>
     </element>
   </define>
+  <define name="span">
+    <element name="span">
+      <attribute name="class"/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
+    </element>
+  </define>
   <define name="concept">
     <element name="concept">
       <optional>

data/lib/metanorma/itu/itu.rng

@@ -19,6 +19,9 @@
             <value>steps</value>
           </attribute>
         </optional>
+        <optional>
+          <ref name="tname"/>
+        </optional>
         <oneOrMore>
           <ref name="li"/>
         </oneOrMore>

data/lib/metanorma/itu/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ITU
-    VERSION = "2.0.8.1".freeze
+    VERSION = "2.1.2".freeze
   end
 end

data/lib/relaton/render/config.yml

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

data/lib/relaton/render/general.rb

@@ -0,0 +1,13 @@
+require "relaton-render"
+
+module Relaton
+  module Render
+    module ITU
+      class General < ::Relaton::Render::IsoDoc::General
+        def config_loc
+          YAML.load_file(File.join(File.dirname(__FILE__), "config.yml"))
+        end
+      end
+    end
+  end
+end

data/metanorma-itu.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
   spec.add_dependency "htmlentities", "~> 4.3.4"
-  spec.add_dependency "metanorma-standoc", "~> 2.0.0"
+  spec.add_dependency "metanorma-standoc", "~> 2.1.0"
   spec.add_dependency "ruby-jing"
   spec.add_dependency "twitter_cldr", ">= 3.0.0"
   spec.add_dependency "tzinfo-data" # we need this for windows only