metanorma-itu 1.0.12 → 1.0.17

data/lib/asciidoctor/itu/converter.rb

@@ -90,15 +90,6 @@ module Asciidoctor
         end
       end
 
-      def norm_ref_parse(attrs, xml, node)
-        @norm_ref = true
-        xml.references **attr_code(attrs) do |xml_section|
-          xml_section.title { |t| t << "References" }
-          xml_section << node.content
-        end
-        @norm_ref = false
-      end
-
       def term_def_title(toplevel, node)
         return node.title unless toplevel
         "Definitions"
@@ -131,8 +122,6 @@ module Asciidoctor
           div.next = "<p>#{@term_def_boilerplate}</p>"
       end
 
-      NORM_REF = "//bibliography/references[title = 'References']".freeze
-
       def load_yaml(lang, script)
         y = if @i18nyaml then YAML.load_file(@i18nyaml)
             elsif lang == "en"
@@ -148,6 +137,13 @@ module Asciidoctor
         super
       end
 
+       def metadata_keywords(node, xml)
+        return unless node.attr("keywords")
+        node.attr("keywords").split(/,[ ]*/).sort.each_with_index do |kw, i|
+          xml.keyword (i == 0 ? kw.capitalize : kw)
+        end
+      end
+
       def html_extract_attributes(node)
         super.merge(hierarchical_assets: node.attr("hierarchical-object-numbering"))
       end

data/lib/asciidoctor/itu/front.rb

@@ -4,36 +4,63 @@ require "fileutils"
 
 module Asciidoctor
   module ITU
-
-    # A {Converter} implementation that generates RSD output, and a document
-    # schema encapsulation of the document for validation
-    #
     class Converter < Standoc::Converter
       def metadata_status(node, xml)
         xml.status do |s|
           s.stage (node.attributes.has_key?("draft") ? "draft" :
-                   (node.attr("status") || node.attr("docstage") || "published" ))
+                   (node.attr("status") || node.attr("docstage") ||
+                    "published" ))
         end
       end
 
       def title_english(node, xml)
-        ["en"].each do |lang|
-          at = { language: lang, format: "text/plain", type: "main" }
-          a = node.attr("title") || node.attr("title-en") || node.title
-          xml.title Asciidoctor::Standoc::Utils::asciidoc_sub(a), **attr_code(at)
-          if a = node.attr("annextitle") || node.attr("annextitle-en")
-            at[:type] = "annex"
-            xml.title Asciidoctor::Standoc::Utils::asciidoc_sub(a), **attr_code(at)
+        at = { language: "en", format: "text/plain", type: "main" }
+        a = node.attr("title") || node.attr("title-en")
+        xml.title **attr_code(at) do |t|
+          t << (Asciidoctor::Standoc::Utils::asciidoc_sub(a) || node.title)
+        end
+        if a = node.attr("annextitle") || node.attr("annextitle-en")
+          at[:type] = "annex"
+          xml.title **attr_code(at) do |t|
+            t << Asciidoctor::Standoc::Utils::asciidoc_sub(a)
           end
         end
       end
 
       def title_otherlangs(node, xml)
         node.attributes.each do |k, v|
-          next unless /^(annex)?title-(?<titlelang>.+)$/ =~ k
-          next if titlelang == "en"
-          xml.title v, { language: titlelang, format: "text/plain",
-                         type: /^annex/.match(k) ? "annex" : "main" }
+          next unless /^(annex)?title-(?<lang>.+)$/ =~ k
+          next if lang == "en"
+          type = /^annex/.match(k) ? "annex" : "main"
+          xml.title **attr_code(language: lang, format: "text/plain",
+                                type: type) do |t|
+            t << v
+          end
+        end
+      end
+
+      def title(node, xml)
+        super
+        subtitle_english(node, xml)
+        subtitle_otherlangs(node, xml)
+      end
+
+      def subtitle_english(node, xml)
+        at = { language: "en", format: "text/plain", type: "subtitle" }
+        a = node.attr("subtitle") || node.attr("subtitle-en")
+        xml.title **attr_code(at) do |t|
+          t << Asciidoctor::Standoc::Utils::asciidoc_sub(a)
+        end
+      end
+
+      def subtitle_otherlangs(node, xml)
+        node.attributes.each do |k, v|
+          next unless /^subtitle-(?<lang>.+)$/ =~ k
+          next if lang == "en"
+          xml.title **attr_code(language: lang, format: "text/plain",
+                                type: "subtitle") do |t|
+            t << v
+          end
         end
       end
 
@@ -89,11 +116,13 @@ module Asciidoctor
 
       def metadata_committee2(node, g, suffix, prefix)
         g.name node.attr("#{prefix}group#{suffix}")
-        g.acronym node.attr("#{prefix}groupacronym#{suffix}") if node.attr("#{prefix}groupacronym#{suffix}")
+        node.attr("#{prefix}groupacronym#{suffix}") and
+          g.acronym node.attr("#{prefix}groupacronym#{suffix}")
         if node.attr("#{prefix}groupyearstart#{suffix}")
           g.period do |p|
             p.start node.attr("#{prefix}groupyearstart#{suffix}")
-            p.end node.attr("#{prefix}groupyearend#{suffix}") if node.attr("#{prefix}groupacronym#{suffix}")
+            node.attr("#{prefix}groupacronym#{suffix}") and
+              p.end node.attr("#{prefix}groupyearend#{suffix}")
           end
         end
       end

data/lib/asciidoctor/itu/isodoc.rng

@@ -53,6 +53,14 @@
         <optional>
           <attribute name="alt"/>
         </optional>
+        <optional>
+          <attribute name="case">
+            <choice>
+              <value>capital</value>
+              <value>lowercase</value>
+            </choice>
+          </attribute>
+        </optional>
         <text/>
       </element>
     </define>
@@ -129,6 +137,9 @@
             </choice>
           </attribute>
         </optional>
+        <attribute name="normative">
+          <data type="boolean"/>
+        </attribute>
         <optional>
           <ref name="section-title"/>
         </optional>
@@ -305,6 +316,21 @@
     </define>
   </include>
   <!-- end overrides -->
+  <define name="TextElement" combine="choice">
+    <ref name="concept"/>
+  </define>
+  <define name="concept">
+    <element name="concept">
+      <optional>
+        <attribute name="term"/>
+      </optional>
+      <choice>
+        <ref name="eref"/>
+        <ref name="xref"/>
+        <ref name="termref"/>
+      </choice>
+    </element>
+  </define>
   <define name="BasicBlock" combine="choice">
     <choice>
       <ref name="requirement"/>
@@ -884,7 +910,15 @@
       <attribute name="id">
         <data type="ID"/>
       </attribute>
-      <ref name="paragraph"/>
+      <oneOrMore>
+        <choice>
+          <ref name="paragraph"/>
+          <ref name="ul"/>
+          <ref name="ol"/>
+          <ref name="dl"/>
+          <ref name="formula"/>
+        </choice>
+      </oneOrMore>
     </element>
   </define>
   <define name="termexample">
@@ -911,7 +945,10 @@
   </define>
   <define name="origin">
     <element name="origin">
-      <ref name="erefType"/>
+      <choice>
+        <ref name="erefType"/>
+        <ref name="termref"/>
+      </choice>
     </element>
   </define>
   <define name="modification">
@@ -919,6 +956,15 @@
       <ref name="paragraph"/>
     </element>
   </define>
+  <define name="termref">
+    <element name="termref">
+      <attribute name="base"/>
+      <attribute name="target"/>
+      <optional>
+        <text/>
+      </optional>
+    </element>
+  </define>
   <define name="structuredidentifier">
     <element name="structuredidentifier">
       <optional>

data/lib/asciidoctor/itu/validate.rb

@@ -45,7 +45,7 @@ module Asciidoctor
       def extract_text(node)
         return "" if node.nil?
         node1 = Nokogiri::XML.fragment(node.to_s)
-        node1.xpath("//link | //locality").each(&:remove)
+        node1.xpath("//link | //locality | //localityStack").each(&:remove)
         ret = ""
         node1.traverse { |x| ret += x.text if x.text? }
         ret

data/lib/isodoc/itu/base_convert.rb

@@ -37,13 +37,20 @@ module IsoDoc
         end
       end
 
+      def bracket_opt(b)
+        return b if b.nil?
+        return b if /^\[.+\]$/.match(b)
+        "[#{b}]"
+      end
+
       def clausedelim
         ""
       end
 
       def note_label(node)
         n = get_anchors[node["id"]]
-        return "#{@note_lbl} – " if n.nil? || n[:label].nil? || n[:label].empty?
+        (n.nil? || n[:label].nil? || n[:label].empty?) and
+          return "#{@note_lbl} – "
         l10n("#{@note_lbl} #{n[:label]} – ")
       end
 
@@ -64,7 +71,8 @@ module IsoDoc
       end
 
       def annex_name(annex, name, div)
-        div.h1 **{ class: "Annex" } do |t|
+        r_a = @meta.get[:doctype_original] == "recommendation-annex"
+        div.h1 **{ class: r_a ? "RecommendationAnnex" : "Annex" } do |t|
           t << "#{anchor(annex['id'], :label)} "
           t.br
           t.br
@@ -76,14 +84,28 @@ module IsoDoc
       end
 
       def annex_obligation_subtitle(annex, div)
-        type = annex&.document&.root&.at("//bibdata/ext/doctype")&.text ||
-          "recommendation"
-        type = type.split(" ").map {|w| w.capitalize }.join(" ")
         info = annex["obligation"] == "informative"
         div.p **{class: "annex_obligation" } do |p|
-          p << (info ? @inform_annex_lbl : @norm_annex_lbl).sub(/%/, type)
+          p << (info ? @inform_annex_lbl : @norm_annex_lbl).
+            sub(/%/, @meta.get[:doctype] || "")
+        end
+      end
+
+      def annex(isoxml, out)
+      isoxml.xpath(ns("//annex")).each do |c|
+        @meta.get[:doctype_original] == "recommendation-annex" or
+          page_break(out)
+        out.div **attr_code(id: c["id"], class: "Section3") do |s|
+          annex_name(c, nil, s) unless c.at(ns("./title"))
+          c.elements.each do |c1|
+            if c1.name == "title" then annex_name(c, c1, s)
+            else
+              parse(c1, s)
+            end
+          end
         end
       end
+    end
 
       def i18n_init(lang, script)
         super
@@ -96,13 +118,24 @@ module IsoDoc
       def cleanup(docxml)
         super
         term_cleanup(docxml)
+        refs_cleanup(docxml)
+        title_cleanup(docxml)
+      end
+
+      def title_cleanup(docxml)
+        docxml.xpath("//h1[@class = 'RecommendationAnnex']").each do |h|
+          h.name = "p"
+          h["class"] = "h1Annex"
+        end
+        docxml
       end
 
       def term_cleanup(docxml)
         docxml.xpath("//p[@class = 'Terms']").each do |d|
           h2 = d.at("./preceding-sibling::*[@class = 'TermNum'][1]")
-          h2.add_child("&nbsp;")
-          h2.add_child(d.remove)
+          d.children.first.previous = "<b>#{h2.children.to_xml}</b>&nbsp;"
+          d["id"] = h2["id"]
+          h2.remove
         end
         docxml.xpath("//p[@class = 'TermNum']").each do |d|
           d1 = d.next_element and d1.name == "p" or next
@@ -112,17 +145,31 @@ module IsoDoc
         docxml
       end
 
+      def refs_cleanup(docxml)
+        docxml.xpath("//tx[following-sibling::tx]").each do |tx|
+          tx << tx.next_element.remove.children
+        end
+        docxml.xpath("//tx").each do |tx|
+          tx.name = "td"
+          tx["colspan"] = "2"
+          tx.wrap("<tr></tr>")
+        end
+        docxml
+      end
+
       def info(isoxml, out)
-        @meta.keywords isoxml, out
         @meta.ip_notice_received isoxml, out
         super
       end
 
       def get_eref_linkend(node)
-        link = "[#{anchor_linkend(node, docid_l10n(node["target"] || node["citeas"]))}]"
-        link += eref_localities(node.xpath(ns("./locality")), link)
-        contents = node.children.select { |c| c.name != "locality" }
-        return link if contents.nil? || contents.empty?
+        l = anchor_linkend(node, docid_l10n(node["target"] || node["citeas"]))
+        l && !/^\[.*\]$/.match(l) and l = "[#{l}]"
+        l += eref_localities(node.xpath(ns("./locality | ./localityStack")), l)
+        contents = node.children.select do |c|
+          !%w{locality localityStack}.include? c.name
+        end
+        return l if contents.nil? || contents.empty?
         Nokogiri::XML::NodeSet.new(node.document, contents).to_xml
       end
 
@@ -139,9 +186,11 @@ module IsoDoc
 
       def middle_title(out)
         out.p(**{ class: "zzSTDTitle1" }) do |p|
-          id = @meta.get[:docnumber] and p << "Recommendation #{id}" 
+          id = @meta.get[:docnumber] and p << "#{@meta.get[:doctype]} #{id}" 
         end
         out.p(**{ class: "zzSTDTitle2" }) { |p| p << @meta.get[:doctitle] }
+        s = @meta.get[:docsubtitle] and
+          out.p(**{ class: "zzSTDTitle3" }) { |p| p << s }
       end
 
       def add_parse(node, out)

data/lib/isodoc/itu/html/_coverpage.scss

@@ -62,14 +62,18 @@
   @include coverpageStageBlock();
 }
 
-span.doc-title {
+span.doc-title, span.doc-annextitle {
   font-size: 26px;
   font-weight: 800;
   margin-top: 20px;
-  border-top: 2px solid #DA1D52;
   margin-right: 42px;
 }
 
+span.doc-title {
+  border-top: 2px solid #DA1D52;
+}
+
+
 .doc-footer {
   margin-top: 100px;
 
@@ -107,7 +111,7 @@ span.doc-title {
   padding: 0 3em 0 6em;
 }
 
-.zzSTDTitle1, .zzSTDTitle2, .MsoCommentText {
+.zzSTDTitle1, .zzSTDTitle2, .zzSTDTitle3, .MsoCommentText {
   display: none;
 }
 

data/lib/isodoc/itu/html/header.html

@@ -116,7 +116,7 @@ style='mso-element:field-separator'>
 style='mso-ansi-language:FR-CH;font-weight:normal;mso-no-proof:yes'>ii</span><!--[if supportFields]><span
 lang=EN-GB style='font-weight:normal'><span style='mso-element:field-end'></span></span><![endif]--><span
 lang=FR-CH style='mso-ansi-language:FR-CH'><span style='mso-tab-count:1'>              </span>Rec.
-ITU‑{{ bureau }} {{ docnumber }} ({{ pubdate_monthyear }})<o:p></o:p></span></p>
+ITU‑{{ bureau }} {{ docnumeric }} ({{ pubdate_monthyear }})<o:p></o:p></span></p>
 </div>
 
 <div style='mso-element:footer' id=ef2l>
@@ -129,12 +129,12 @@ style='mso-element:field-separator'>
 style='mso-ansi-language:FR-CH;font-weight:normal;mso-no-proof:yes'>ii</span><!--[if supportFields]><span
 lang=EN-GB style='font-weight:normal'><span style='mso-element:field-end'></span></span><![endif]--><span
 lang=FR-CH style='mso-ansi-language:FR-CH'><span style='mso-tab-count:1'>              </span>Rec.
-ITU‑{{ bureau }} {{ docnumber }} ({{ pubdate_monthyear }})<o:p></o:p></span></p>
+ITU‑{{ bureau }} {{ docnumeric }} ({{ pubdate_monthyear }})<o:p></o:p></span></p>
 </div>
 
 <div style='mso-element:footer' id=f2>
 <p class=FooterQP style='line-height:12.0pt'><span lang=EN-GB><span style='mso-tab-count:2'>                                                                                                       </span>Rec.
-  ITU‑{{ bureau }} {{docnumber}} ({{ pubdate_monthyear }})<span style='mso-tab-count:1'>             </span></span><!--[if supportFields]><span
+  ITU‑{{ bureau }} {{docnumeric}} ({{ pubdate_monthyear }})<span style='mso-tab-count:1'>             </span></span><!--[if supportFields]><span
 lang=EN-GB style='font-weight:normal'><span style='mso-element:field-begin'></span>
 PAGE<span style='mso-spacerun:yes'>  </span>\* MERGEFORMAT <span
 style='mso-element:field-separator'></span></span><![endif]--><span lang=EN-GB
@@ -145,7 +145,7 @@ lang=EN-GB style='font-weight:normal'>
 
 <div style='mso-element:footer' id=f2l>
 <p class=FooterQPLandscape style='line-height:12.0pt'><span lang=EN-GB><span style='mso-tab-count:2'>                                                                                                       </span>Rec.
-  ITU‑{{ bureau }} {{docnumber}} ({{ pubdate_monthyear }})<span style='mso-tab-count:1'>             </span></span><!--[if supportFields]><span
+  ITU‑{{ bureau }} {{docnumeric}} ({{ pubdate_monthyear }})<span style='mso-tab-count:1'>             </span></span><!--[if supportFields]><span
 lang=EN-GB style='font-weight:normal'><span style='mso-element:field-begin'></span>
 PAGE<span style='mso-spacerun:yes'>  </span>\* MERGEFORMAT <span
 style='mso-element:field-separator'></span></span><![endif]--><span lang=EN-GB
@@ -164,7 +164,7 @@ style='mso-element:field-separator'>
 style='mso-ansi-language:FR-CH;font-weight:normal;mso-no-proof:yes'>ii</span><!--[if supportFields]><span
 lang=EN-GB style='font-weight:normal'><span style='mso-element:field-end'></span></span><![endif]--><span
 lang=FR-CH style='mso-ansi-language:FR-CH'><span style='mso-tab-count:1'>              </span>Rec.
-ITU‑{{ bureau }} {{ docnumber }} ({{ pubdate_monthyear }})<o:p></o:p></span></p>
+ITU‑{{ bureau }} {{ docnumeric }} ({{ pubdate_monthyear }})<o:p></o:p></span></p>
 </div>
 
 <div style='mso-element:footer' id=ef3l>
@@ -177,12 +177,12 @@ style='mso-element:field-separator'>
 style='mso-ansi-language:FR-CH;font-weight:normal;mso-no-proof:yes'>ii</span><!--[if supportFields]><span
 lang=EN-GB style='font-weight:normal'><span style='mso-element:field-end'></span></span><![endif]--><span
 lang=FR-CH style='mso-ansi-language:FR-CH'><span style='mso-tab-count:1'>              </span>Rec.
-ITU‑{{ bureau }} {{ docnumber }} ({{ pubdate_monthyear }})<o:p></o:p></span></p>
+ITU‑{{ bureau }} {{ docnumeric }} ({{ pubdate_monthyear }})<o:p></o:p></span></p>
 </div>
 
 <div style='mso-element:footer' id=f3>
 <p class=FooterQP style='line-height:12.0pt'><span lang=EN-GB><span style='mso-tab-count:2'>                                                                                                       </span>Rec.
-  ITU‑{{ bureau }} {{docnumber}} ({{ pubdate_monthyear }})<span style='mso-tab-count:1'>             </span></span><!--[if supportFields]><span
+  ITU‑{{ bureau }} {{docnumeric}} ({{ pubdate_monthyear }})<span style='mso-tab-count:1'>             </span></span><!--[if supportFields]><span
 lang=EN-GB style='font-weight:normal'><span style='mso-element:field-begin'></span>
 PAGE<span style='mso-spacerun:yes'>  </span>\* MERGEFORMAT <span
 style='mso-element:field-separator'></span></span><![endif]--><span lang=EN-GB
@@ -193,7 +193,7 @@ lang=EN-GB style='font-weight:normal'>
 
 <div style='mso-element:footer' id=f3l>
 <p class=FooterQPLandscape style='line-height:12.0pt'><span lang=EN-GB><span style='mso-tab-count:2'>                                                                                                       </span>Rec.
-  ITU‑{{ bureau }} {{docnumber}} ({{ pubdate_monthyear }})<span style='mso-tab-count:1'>             </span></span><!--[if supportFields]><span
+  ITU‑{{ bureau }} {{docnumeric}} ({{ pubdate_monthyear }})<span style='mso-tab-count:1'>             </span></span><!--[if supportFields]><span
 lang=EN-GB style='font-weight:normal'><span style='mso-element:field-begin'></span>
 PAGE<span style='mso-spacerun:yes'>  </span>\* MERGEFORMAT <span
 style='mso-element:field-separator'></span></span><![endif]--><span lang=EN-GB