metanorma-itu 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc42b5f0ce3f11b23b8bcd171e19342c3f2c237742e8084cb6545af5a56e954f
-  data.tar.gz: 73ae3b1e5cf914b8e715e1ccb14b0492819cbe811334cbfe7c5b24787490f5bd
+  metadata.gz: 39299e29cd911ccc2c3ee6da83a7eb7bc2c82fae171e59f01ffc079a757d941e
+  data.tar.gz: b7dbd2216cdf8afb36d5104bff9353450e3da6617cc75c67f448c06ea94eab4d
 SHA512:
-  metadata.gz: 8f72656f8c80c6bff4e48aba41f45d0342fb6fc5e542eb0410908efb465862ba7f3b9dee3cc6ef4ef5175fa60fdb05570339d9718b99193f56d6b2e4818734b0
-  data.tar.gz: 13071d691ced638d57cb4085835b359e00a7851c6198739159ccb5e675b491e34983fba7a89c16e6a090a3172a9e6ef577b46c2df4948125b279d7b510223c61
+  metadata.gz: f5bb0e107c92028f5c34a11b8a0331a34a2e5adc15892703deffbe4391e4cc5d7582c95589819f917eeae1362de8adbd683fb546d193b3d8e7ae230df7e3c7fa
+  data.tar.gz: 3330e9cfb48867c2031b89eec8ac9402a01423b288d3f14e5395dba16b6f24d681d3024bf150c6cf676a6a116e5310eed03999c47b012689908f2671efceb760

data/README.adoc

@@ -1,11 +1,11 @@
 = metanorma-itu: Asciidoctor processor for ITU
 
 image:https://img.shields.io/gem/v/metanorma-itu.svg["Gem Version", link="https://rubygems.org/gems/metanorma-itu"]
-image:https://travis-ci.com/metanorma/metanorma-itu.svg?branch=master["Build Status", link="https://travis-ci.com/metanorma/metanorma-itu"]
+image:https://travis-ci.com/metanorma/metanorma-itu.svg["Build Status", link="https://travis-ci.com/metanorma/metanorma-itu"]
+image:https://ci.appveyor.com/api/projects/status/pl6lh4a9224ijbe1?svg=true["Appveyor Build Status", link="https://ci.appveyor.com/project/metanorma/metanorma-itu"]
 image:https://codeclimate.com/github/metanorma/metanorma-itu/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/metanorma/metanorma-itu"]
-image:https://ci.appveyor.com/api/projects/status/lo05dblngrgx2tlq?svg=true["Appveyor Build Status", link="https://ci.appveyor.com/project/ribose/metanorma-itu"]
-
-WARNING: This gem is still under development.
+image:https://img.shields.io/github/issues-pr-raw/metanorma/metanorma-itu.svg["Pull Requests", link="https://github.com/metanorma/metanorma-itu/pulls"]
+image:https://img.shields.io/github/commits-since/metanorma/metanorma-itu/latest.svg["Commits since latest",link="https://github.com/metanorma/metanorma-itu/releases"]
 
 == Functionality
 

data/lib/asciidoctor/itu/basicdoc.rng

@@ -341,11 +341,6 @@
       </oneOrMore>
     </element>
   </define>
-  <define name="tclass">
-    <element name="name">
-      <text/>
-    </element>
-  </define>
   <define name="thead">
     <element name="thead">
       <ref name="tr"/>
@@ -515,19 +510,22 @@
         <attribute name="subsequence"/>
       </optional>
       <optional>
-        <ref name="source"/>
+        <attribute name="class"/>
       </optional>
       <optional>
-        <ref name="tname"/>
+        <ref name="source"/>
       </optional>
       <optional>
-        <ref name="tclass"/>
+        <ref name="tname"/>
       </optional>
       <choice>
         <ref name="image"/>
         <ref name="video"/>
         <ref name="audio"/>
         <ref name="pre"/>
+        <oneOrMore>
+          <ref name="paragraph-with-footnote"/>
+        </oneOrMore>
         <zeroOrMore>
           <ref name="figure"/>
         </zeroOrMore>

data/lib/asciidoctor/itu/cleanup.rb

@@ -0,0 +1,92 @@
+module Asciidoctor
+  module ITU
+    class Converter < Standoc::Converter
+      def sections_cleanup(x)
+        super
+        x.xpath("//*[@inline-header]").each do |h|
+          h.delete("inline-header")
+        end
+      end
+
+      def cleanup(xmldoc)
+        symbols_cleanup(xmldoc)
+        super
+      end
+
+      def smartquotes_cleanup(xmldoc)
+        return super if @smartquotes
+        xmldoc.traverse do |n|
+          next unless n.text?
+          n.replace(n.text.gsub(/\u2019|\u2018|\u201a|\u201b/, "'").
+                    gsub(/\u201c|\u201d|\u201e|\u201f/, '"'))
+        end
+        xmldoc
+      end
+
+      def termdef_cleanup(xmldoc)
+        xmldoc.xpath("//term/preferred").each do |p|
+          if ["terms defined elsewhere",
+              "terms defined in this recommendation"].include? p.text.downcase
+            p.name = "title"
+            p.parent.name = "terms"
+          end
+        end
+        super
+      end
+
+      def termdef_boilerplate_cleanup(xmldoc)
+      end
+
+      def symbols_cleanup(xmldoc)
+        sym = xmldoc.at("//definitions/title")
+        sym and sym&.next_element&.name == "dl" and
+          sym.next = "<p>#{@symbols_boilerplate}</p>"
+      end
+
+      PUBLISHER = "./contributor[role/@type = 'publisher']/organization".freeze
+
+      def pub_class(bib)
+        return 1 if bib.at("#{PUBLISHER}[abbreviation = 'ITU']")
+        return 1 if bib.at("#{PUBLISHER}[name = 'International Telecommunication Union']")
+        return 2 if bib.at("#{PUBLISHER}[abbreviation = 'ISO']")
+        return 2 if bib.at("#{PUBLISHER}[name = 'International Organization "\
+                           "for Standardization']")
+        return 3 if bib.at("#{PUBLISHER}[abbreviation = 'IEC']")
+        return 3 if bib.at("#{PUBLISHER}[name = 'International "\
+                           "Electrotechnical Commission']")
+        return 4 if bib.at("./docidentifier[@type][not(@type = 'DOI' or "\
+                           "@type = 'metanorma' or @type = 'ISSN' or @type = 'ISBN')]")
+        5
+      end
+
+      def sort_biblio(bib)
+        bib.sort do |a, b|
+          sort_biblio_key(a) <=> sort_biblio_key(b)
+        end
+      end
+
+      # sort by: doc class (ITU, ISO, IEC, other standard (not DOI &c), other
+      # then standard class (docid class other than DOI &c)
+      # then alphanumeric doc id (not DOI &c)
+      # then title
+      def sort_biblio_key(bib)
+        pubclass = pub_class(bib)
+        num = bib&.at("./docnumber")&.text
+        id = bib&.at("./docidentifier[not(@type = 'DOI' or "\
+                           "@type = 'metanorma' or @type = 'ISSN' or @type = 'ISBN')]")
+        metaid = bib&.at("./docidentifier[@type = 'metanorma']")&.text
+        abbrid = metaid unless /^\[\d+\]$/.match(metaid)
+        type = id['type'] if id
+        title = bib&.at("./title[@type = 'main']")&.text ||
+          bib&.at("./title")&.text || bib&.at("./formattedref")&.text
+        "#{pubclass} :: #{type} :: #{id&.text || metaid} :: #{title}"
+      end
+
+      def biblio_reorder(xmldoc)
+        xmldoc.xpath("//references").each do |r|
+          biblio_reorder1(r)
+        end
+      end
+    end
+  end
+end

data/lib/asciidoctor/itu/converter.rb

@@ -3,6 +3,7 @@ require "asciidoctor/standoc/converter"
 require "fileutils"
 require_relative "./front.rb"
 require_relative "./validate.rb"
+require_relative "./cleanup.rb"
 require_relative "./macros.rb"
 
 module Asciidoctor
@@ -12,16 +13,22 @@ module Asciidoctor
     # schema encapsulation of the document for validation
     #
     class Converter < Standoc::Converter
+      register_for "itu"
+
       Asciidoctor::Extensions.register do
-        block PseudocodeBlockMacro
+        inline_macro AddMacro
+        inline_macro DelMacro
       end
 
-      register_for "itu"
-
       def title_validate(root)
         nil
       end
 
+      def init(node)
+        super
+        @smartquotes = node.attr("smartquotes") == "true"
+      end
+
       def makexml(node)
         result = ["<?xml version='1.0' encoding='UTF-8'?>\n<itu-standard>"]
         @draft = node.attributes.has_key?("draft")
@@ -39,28 +46,15 @@ module Asciidoctor
         node.attr("doctype") || "recommendation"
       end
 
-       def example(node)
-        role = node.role || node.attr("style")
-        return pseudocode_example(node) if role == "pseudocode"
-        super
-      end
-
-      def pseudocode_example(node)
+      def olist(node)
         noko do |xml|
-          xml.figure **{id: Asciidoctor::Standoc::Utils::anchor_or_uuid(node),
-                        type: "pseudocode"} do |ex|
-            figure_title(node, ex)
-            wrap_in_para(node, ex)
+          xml.ol **attr_code(id: Asciidoctor::Standoc::Utils::anchor_or_uuid(node),
+                             class: node.attr("class")) do |xml_ol|
+            node.items.each { |item| li(xml_ol, item) }
           end
         end.join("\n")
       end
 
-      def init_indent(s)
-        /^(?<prefix>[ \t]*)(?<suffix>.*)$/ =~ s
-        prefix = prefix.gsub(/\t/, "&#xa0;&#xa0;&#xa0;&#xa0;").gsub(/ /, "&#xa0;")
-        prefix + suffix
-      end
-
       def clause_parse(attrs, xml, node)
         attrs[:preface] = true if node.attr("style") == "preface"
         super
@@ -101,18 +95,6 @@ module Asciidoctor
                         File.join(File.dirname(__FILE__), "itu.rng"))
       end
 
-      def sections_cleanup(x)
-        super
-        x.xpath("//*[@inline-header]").each do |h|
-          h.delete("inline-header")
-        end
-      end
-
-      def cleanup(xmldoc)
-        symbols_cleanup(xmldoc)
-        super
-      end
-
       def style(n, t)
         return
       end
@@ -170,20 +152,6 @@ module Asciidoctor
         "Definitions"
       end
 
-      def termdef_cleanup(xmldoc)
-        xmldoc.xpath("//term/preferred").each do |p|
-          if ["terms defined elsewhere",
-              "terms defined in this recommendation"].include? p.text.downcase
-            p.name = "title"
-            p.parent.name = "terms"
-          end
-        end
-        super
-      end
-
-      def termdef_boilerplate_cleanup(xmldoc)
-      end
-
       def terms_extract(div)
         internal = nil
         external = nil
@@ -213,12 +181,6 @@ module Asciidoctor
 
       NORM_REF = "//bibliography/references[title = 'References']".freeze
 
-      def symbols_cleanup(xmldoc)
-        sym = xmldoc.at("//definitions/title")
-        sym and sym&.next_element&.name == "dl" and
-          sym.next = "<p>#{@symbols_boilerplate}</p>"
-      end
-
       def load_yaml(lang, script)
         y = if @i18nyaml then YAML.load_file(@i18nyaml)
             elsif lang == "en"

data/lib/asciidoctor/itu/itu.rng

@@ -49,6 +49,24 @@
         </choice>
       </element>
     </define>
+    <define name="ol">
+      <element name="ol">
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+        <optional>
+          <attribute name="class">
+            <value>steps</value>
+          </attribute>
+        </optional>
+        <oneOrMore>
+          <ref name="li"/>
+        </oneOrMore>
+        <zeroOrMore>
+          <ref name="note"/>
+        </zeroOrMore>
+      </element>
+    </define>
     <define name="DocumentType">
       <choice>
         <value>recommendation</value>
@@ -129,7 +147,37 @@
         </oneOrMore>
       </element>
     </define>
+    <define name="TextElement" combine="choice">
+      <choice>
+        <ref name="add"/>
+        <ref name="del"/>
+      </choice>
+    </define>
   </include>
+  <define name="add">
+    <element name="add">
+      <choice>
+        <ref name="PureTextElement"/>
+        <ref name="eref"/>
+        <ref name="stem"/>
+        <ref name="keyword"/>
+        <ref name="xref"/>
+        <ref name="hyperlink"/>
+      </choice>
+    </element>
+  </define>
+  <define name="del">
+    <element name="del">
+      <choice>
+        <ref name="PureTextElement"/>
+        <ref name="eref"/>
+        <ref name="stem"/>
+        <ref name="keyword"/>
+        <ref name="xref"/>
+        <ref name="hyperlink"/>
+      </choice>
+    </element>
+  </define>
   <define name="ipnoticereceived">
     <element name="ip-notice-received">
       <data type="boolean"/>

data/lib/asciidoctor/itu/macros.rb

@@ -1,19 +1,27 @@
-require "asciidoctor/extensions"
+module Asciidoctor
+  module ITU
+    class AddMacro < Asciidoctor::Extensions::InlineMacroProcessor
+      use_dsl
+      named :add
+      parse_content_as :text
+      using_format :short
 
-class PseudocodeBlockMacro < Asciidoctor::Extensions::BlockProcessor
-  use_dsl
-  named :pseudocode
-  on_context :example, :sourcecode
+      def process(parent, _target, attrs)
+        out = Asciidoctor::Inline.new(parent, :quoted, attrs["text"]).convert
+        %{<add>#{out}</add>}
+      end
+    end
 
-  def init_indent(s)
-    /^(?<prefix>[ \t]*)(?<suffix>.*)$/ =~ s
-    prefix = prefix.gsub(/\t/, "\u00a0\u00a0\u00a0\u00a0").gsub(/ /, "\u00a0")
-    prefix + suffix
-  end
+    class DelMacro < Asciidoctor::Extensions::InlineMacroProcessor
+      use_dsl
+      named :del
+      parse_content_as :text
+      using_format :short
 
-  def process parent, reader, attrs
-    attrs['role'] = 'pseudocode'
-    create_block parent, :example, reader.lines.map { |m| init_indent(m) }, attrs,
-      content_model: :compound
+      def process(parent, _target, attrs)
+        out = Asciidoctor::Inline.new(parent, :quoted, attrs["text"]).convert
+        %{<del>#{out}</del>}
+      end
+    end
   end
 end

data/lib/asciidoctor/itu/validate.rb

@@ -26,6 +26,7 @@ module Asciidoctor
         approval_validate(doc)
         itu_identifier_validate(doc)
         bibdata_validate(doc.root)
+        termdef_style(doc.root)
       end
 
       def approval_validate(xmldoc)
@@ -46,6 +47,19 @@ module Asciidoctor
         end
       end
 
+      def termdef_style(xmldoc)
+        xmldoc.xpath("//term").each do |t|
+          para = t.at("./definition") || return
+          term = t.at("./preferred").text
+          termdef_warn(term, /^[A-Z][a-z]+/, term, "term is not lowercase")
+          termdef_warn(para.text, /^[a-z]/, term, "term definition does not start with capital")
+          termdef_warn(para.text, /[^.]$/, term, "term definition does not end with period")
+        end
+      end
+
+      def termdef_warn(text, re, term, msg)
+        re.match(text) && warn("ITU style: #{term}: #{msg}")
+      end
     end
   end
 end

data/lib/isodoc/itu/base_convert.rb

@@ -3,6 +3,7 @@ require_relative "metadata"
 require "fileutils"
 require_relative "./ref.rb"
 require_relative "./xref.rb"
+require_relative "./terms.rb"
 
 module IsoDoc
   module ITU
@@ -40,21 +41,32 @@ module IsoDoc
         ""
       end
 
-      def figure_parse(node, out)
-        return pseudocode_parse(node, out) if node["type"] == "pseudocode"
-        super
+      def note_label(node)
+        n = get_anchors[node["id"]]
+        return "#{@note_lbl} – " if n.nil? || n[:label].nil? || n[:label].empty?
+        l10n("#{@note_lbl} #{n[:label]} – ")
       end
 
-      def pseudocode_parse(node, out)
-        @in_figure = true
-        name = node.at(ns("./name"))
-        out.div **attr_code(id: node["id"], class: "pseudocode") do |div|
-          node.children.each do |n|
-            parse(n, div) unless n.name == "name"
-          end
-          sourcecode_name_parse(node, div, name) if name
-        end
-        @in_figure = false
+      def formula_where(dl, out)
+        return unless dl
+        out.p { |p| p << l10n("#{@where_lbl}:") }
+        parse(dl, out)
+      end
+
+      def prefix_container(container, linkend, _target)
+        l10n("#{linkend} #{@labels["in"]} #{anchor(container, :xref)}")
+      end
+
+      def ol_depth(node)
+        return super unless node["class"] == "steps" or
+          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
+        ol_style(type)
       end
 
       def annex_name(annex, name, div)
@@ -112,70 +124,6 @@ module IsoDoc
         super
       end
 
-      def terms_defs_title(node)
-        t = node.at(ns("./title")) and return t.text
-        super
-      end
-
-      def terms_defs(node, out, num)
-        f = node.at(ns(IsoDoc::Convert::TERM_CLAUSE)) or return num
-        out.div **attr_code(id: f["id"]) do |div|
-          num = num + 1
-          clause_name(num, terms_defs_title(f), div, nil)
-          if f.at(ns("./clause | ./terms | ./term")).nil? then out.p "None."
-          else
-            f.children.reject { |c1| c1.name == "title" }.each do |c1|
-              parse(c1, div)
-            end
-          end
-        end
-        num
-      end
-
-      def terms_parse(node, out)
-        out.div **attr_code(id: node["id"]) do |div|
-          clause_parse_title(node, div, node.at(ns("./title")), out)
-          title = node.at(ns("./title"))&.text&.downcase
-          title == "terms defined elsewhere" and
-            out.p @labels["elsewhere_terms"]
-          title == "terms defined in this recommendation" and
-            out.p @labels["here_terms"]
-          if node.at(ns("./clause | ./term")).nil? then out.p "None."
-          else
-            node.children.reject { |c1| c1.name == "title" }.each do |c1|
-              parse(c1, div)
-            end
-          end
-        end
-      end
-
-      def termdef_parse1(node, div, term, defn, source)
-        div.p **{ class: "TermNum", id: node["id"] } do |p|
-          p.b do |b|
-            b << anchor(node["id"], :label)
-            insert_tab(b, 1)
-            term.children.each { |n| parse(n, b) }
-          end
-          source and p << " [#{source.value}]"
-          p << ": "
-        end
-        defn and defn.children.each { |n| parse(n, div) }
-      end
-
-      def termdef_parse(node, out)
-        term = node.at(ns("./preferred"))
-        defn = node.at(ns("./definition"))
-        source = node.at(ns("./termsource/origin/@citeas"))
-        out.div **attr_code(id: node["id"]) do |div|
-          termdef_parse1(node, div, term, defn, source)
-          set_termdomain("")
-          node.children.each do |n|
-            next if %w(preferred definition termsource title).include? n.name
-            parse(n, out)
-          end
-        end
-      end
-
       def get_eref_linkend(node)
         link = "[#{anchor_linkend(node, docid_l10n(node["target"] || node["citeas"]))}]"
         link += eref_localities(node.xpath(ns("./locality")), link)
@@ -211,6 +159,46 @@ module IsoDoc
           insert_tab(s, 1)
         end
       end
+
+      def add_parse(node, out)
+        out.span **{class: "addition"} do |e|
+          node.children.each { |n| parse(n, e) }
+        end
+      end
+
+      def del_parse(node, out)
+        out.span **{class: "deletion"} do |e|
+          node.children.each { |n| parse(n, e) }
+        end
+      end
+
+      def error_parse(node, out)
+        case node.name
+        when "add" then add_parse(node, out)
+        when "del" then del_parse(node, out)
+        else
+          super
+        end
+      end
+
+      def note_p_parse(node, div)
+        div.p do |p|
+          p.span **{ class: "note_label" } do |s|
+            s << note_label(node)
+          end
+          node.first_element_child.children.each { |n| parse(n, p) }
+        end
+        node.element_children[1..-1].each { |n| parse(n, div) }
+      end
+
+      def note_parse1(node, div)
+        div.p do |p|
+          p.span **{ class: "note_label" } do |s|
+            s << note_label(node)
+          end
+        end
+        node.children.each { |n| parse(n, div) }
+      end
     end
   end
 end

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

@@ -680,8 +680,10 @@ p.Biblio, p.NormRef {
     margin-left:-1.5em;
 }
 
-.example .Sourcecode {
+.example .Sourcecode, .example .pseudocode {
       background: none;
+      margin: 0;
+      padding: 0 0 0 2em;
 }
 
 .pseudocode {
@@ -841,6 +843,15 @@ h2 p {
   display: inline;
 }
 
+.addition {
+  color: blue;
+}
+
+.deletion {
+  color: red;
+  text-decoration: line-through;
+}
+
 
 /*
     4.0 Page header

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

@@ -14,6 +14,22 @@ p.Sourcecode, li.Sourcecode, div.Sourcecode, pre.Sourcecode, pre
 	mso-fareast-font-family:Calibri;
 	mso-bidi-font-family:"Courier New";
 	mso-ansi-language:EN-GB;}
+p.pseudocode, li.pseudocode, div.pseudocode
+        {mso-style-unhide:no;
+        mso-style-qformat:yes;
+        mso-style-parent:"";
+        margin-top:6.0pt;
+        margin-right:0cm;
+        margin-bottom:6.0pt;
+        margin-left:0cm;
+        text-align:left;
+        mso-pagination:widow-orphan;
+        tab-stops:45.8pt 91.6pt 137.4pt 183.2pt 229.0pt 274.8pt 320.6pt 366.4pt 412.2pt 458.0pt 503.8pt 549.6pt 595.4pt 641.2pt 687.0pt 732.8pt;
+        font-size:10.0pt;
+        font-family:$bodyfont;
+        mso-fareast-font-family:Calibri;
+        mso-bidi-font-family:"Courier New";
+        mso-ansi-language:EN-GB;}
 p.annex_obligation, li.annex_obligation, div.annex_obligation
         {mso-style-unhide:no;
         mso-style-qformat:yes;
@@ -171,8 +187,6 @@ p.TableFootnote, div.TableFootnote, li.TableFootnote
         margin-left:14.2pt;
         text-indent:-14.2pt;
         margin-bottom:.0001pt;
-        text-align:justify; 
-        text-justify:inter-ideograph;
         mso-pagination:widow-orphan;
         tab-stops:39.7pt 59.55pt 79.4pt 99.25pt;
         mso-layout-grid-align:none;
@@ -748,6 +762,13 @@ p.RecNo, li.RecNo, div.RecNo
 	mso-fareast-language:EN-US;
 	font-weight:bold;
 	mso-bidi-font-weight:normal;}
+span.addition {
+        color: blue;
+}
+span.deletion {
+        color: red;
+        text-decoration: line-through;
+}
 
 @page {
 	mso-page-border-surround-header:no;
@@ -836,7 +857,7 @@ table.MsoISOTable td
     mso-border-alt:solid windowtext 1pt;
     padding:0cm 2.85pt 0cm 2.85pt;}
 table.MsoISOTable p
-{font-size:11.0pt;}
+{font-size:11.0pt; }
 table.MsoTableGrid
 	{mso-style-name:"Table Grid";
 	mso-tstyle-rowband-size:0;
@@ -929,9 +950,13 @@ div.example p.MsoListParagraph {
   font-size: 10.0pt;
 }
 
+div.Note  p.MsoListParagraph {
+  font-size: 11.0pt;
+}
+
 span.note_label, span.example_label, td.example_label, td.note_label
 {
-font-size: 10.0pt;
+font-size: 11.0pt;
 font-family:$bodyfont;
 }
 

data/lib/isodoc/itu/html/word_itu_intro.html

@@ -18,24 +18,64 @@
 <p class=MsoNormal><span style='mso-bookmark:_Hlk526346232'><span lang=FR-CH
 style='mso-ansi-language:FR-CH'><o:p>&nbsp;</o:p></span></span></p>
 
-<p class=MsoNormal><span style='mso-bookmark:_Hlk526346232'><span lang=FR-CH
-style='mso-ansi-language:FR-CH'><o:p>&nbsp;</o:p></span></span></p>
-
-<!--
-<table class=MsoNormalTable border=0 cellspacing=0 cellpadding=0
- style='border-collapse:collapse;mso-table-layout-alt:fixed;mso-padding-alt:
- 0cm 5.4pt 0cm 5.4pt'>
- <tr style='mso-yfti-irow:0;mso-yfti-firstrow:yes;mso-yfti-lastrow:yes'>
-  <td width=663 valign=top style='width:497.25pt;padding:0cm 5.4pt 0cm 5.4pt'>
--->
-  <div id="abstractbox">
-  </div>
-<!--
-  </td>
-  <span style='mso-bookmark:_Hlk526346232'></span>
- </tr>
-</table>
--->
+<p class=MsoNormal><o:wrapblock><v:shapetype id="_x0000_t202"
+  coordsize="21600,21600" o:spt="202" path="m,l,21600r21600,l21600,xe">
+  <v:stroke joinstyle="miter"/>
+  <v:path gradientshapeok="t" o:connecttype="rect"/>
+ </v:shapetype><v:shape id="Text_x0020_Box_x0020_1" o:spid="_x0000_s1026"
+  type="#_x0000_t202" style='position:absolute;margin-left:-8pt;margin-top:141.75pt;
+  width:448.15pt;height:69.8pt;z-index:-251657216;visibility:visible;
+  mso-wrap-style:square;mso-width-percent:0;mso-height-percent:0;
+  mso-wrap-distance-left:9pt;mso-wrap-distance-top:0;mso-wrap-distance-right:9pt;
+  mso-wrap-distance-bottom:0;mso-position-horizontal:absolute;
+  mso-position-horizontal-relative:text;mso-position-vertical:absolute;
+  mso-position-vertical-relative:top-margin-area;mso-width-percent:0;
+  mso-height-percent:0;mso-width-relative:margin;mso-height-relative:margin;
+  v-text-anchor:top' o:gfxdata="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
+" o:allowoverlap="f" filled="f" stroked="f" strokeweight=".5pt">
+  <v:fill o:detectmouseclick="t"/>
+  <v:textbox style='mso-fit-shape-to-text:t'>
+      <div id="abstractbox">
+  	 </div>
+     </v:textbox>
+  <w:wrap type="topAndBottom" anchory="margin"/>
+  <w:anchorlock/>
+ </v:shape></o:wrapblock><br
+style='mso-ignore:vglayout' clear=ALL>
+<span lang=EN-US style='mso-ansi-language:EN-US'><o:p></o:p></span></p>
+
+
+
+ 
 
 <p class=MsoNormal><span style='mso-bookmark:_Hlk526346232'><span lang=EN-US
 style='mso-ansi-language:EN-US'><o:p>&nbsp;</o:p></span></span></p>

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

@@ -296,18 +296,18 @@ a:link, span.MsoHyperlink
 	{mso-style-unhide:no;
 	mso-style-parent:"";
 	color:blue;
-        font-family:"Arial",sans-serif;
-        font-size:8pt;
-	text-decoration:underline;
-	text-underline:single;}
+}
 a:visited, span.MsoHyperlinkFollowed
 	{mso-style-unhide:no;
 	mso-style-parent:"";
+	color:purple;}
+a.url {
         font-family:"Arial",sans-serif;
         font-size:8pt;
-	color:purple;
 	text-decoration:underline;
-	text-underline:single;}
+	text-underline:single;
+}
+
 p.MsoCommentSubject, li.MsoCommentSubject, div.MsoCommentSubject
 	{mso-style-noshow:yes;
 	mso-style-unhide:no;
@@ -466,7 +466,6 @@ p.h1Preface
 	text-indent:-39.7pt;
 	mso-pagination:widow-orphan lines-together;
 	page-break-after:avoid;
-	mso-outline-level:1;
 	tab-stops:39.7pt 59.55pt 79.4pt 99.25pt;
 	mso-layout-grid-align:none;
 	punctuation-wrap:simple;
@@ -853,7 +852,6 @@ p.MsoToc1, li.MsoToc1, div.MsoToc1
 	mso-fareast-font-family:$bodyfont;
 	mso-bidi-font-family:$bodyfont;
 	mso-ansi-language:EN-GB;
-	font-weight:bold;
 	mso-bidi-font-weight:normal;}
 p.MsoToc2, li.MsoToc2, div.MsoToc2
 	{mso-style-noshow:yes;
@@ -1042,8 +1040,7 @@ span.MsoFootnoteReference
 	position:relative;
 	top:-3.0pt;
 	mso-text-raise:3.0pt;
-	mso-style-priority:99;
-	vertical-align:super;}
+	mso-style-priority:99;}
 p.MsoFootnoteText, li.MsoFootnoteText, div.MsoFootnoteText
 	{mso-style-noshow:yes;
 	mso-style-priority:99;
@@ -1523,6 +1520,72 @@ p.Tablebody, li.Tablebody, div.Tablebody
 	mso-level-number-position:left;
 	margin-left:178.65pt;
 	text-indent:-19.85pt;}
+/* steps ordered list */
+@list l4
+        {mso-list-id:525294608;
+        mso-list-template-ids:676331812}
+@list l4:level1
+        {mso-level-text:"%1\)";
+        mso-level-tab-stop:none;
+        mso-level-number-position:left;
+        margin-left:18.0pt;
+        text-indent:-18.0pt;}
+@list l4:level2
+        {mso-level-text:"%2\)";
+        mso-level-number-format:alpha-lower;
+        mso-level-tab-stop:none;
+        mso-level-number-position:left;
+        margin-left:36.0pt;
+        text-indent:-18.0pt;}
+@list l4:level3
+        {mso-level-number-format:roman-lower;
+        mso-level-text:"%3\)";
+        mso-level-tab-stop:none;
+        mso-level-number-position:left;
+        margin-left:54.0pt;
+        text-indent:-18.0pt;}
+@list l4:level4
+        {mso-level-number-format:alpha-upper;
+        mso-level-text:"%4\)";
+        mso-level-tab-stop:none;
+        mso-level-number-position:left;
+        margin-left:72.0pt;
+        text-indent:-18.0pt;}
+@list l4:level5
+        {mso-level-number-format:roman-upper;
+        mso-level-text:"%5\)";
+        mso-level-tab-stop:none;
+        mso-level-number-position:left;
+        margin-left:90.0pt;
+        text-indent:-18.0pt;}
+@list l4:level6
+        {mso-level-text:"%6\)";
+        mso-level-tab-stop:none;
+        mso-level-number-position:left;
+        margin-left:108.0pt;
+        text-indent:-18.0pt;}
+@list l4:level7
+        {mso-level-tab-stop:none;
+        mso-level-number-format:alpha-lower;
+        mso-level-text:"%7\)";
+        mso-level-number-position:left;
+        margin-left:126.0pt;
+        text-indent:-18.0pt;}
+@list l4:level8
+        {mso-level-number-format:roman-lower;
+        mso-level-text:"%8\)";
+        mso-level-tab-stop:none;
+        mso-level-number-position:left;
+        margin-left:144.0pt;
+        text-indent:-18.0pt;}
+@list l4:level9
+        {mso-level-number-format:alpha-upper;
+        mso-level-text:"%9\)";
+        mso-level-tab-stop:none;
+        mso-level-number-position:left;
+        margin-left:162.0pt;
+        text-indent:-18.0pt;}
+
 
 p.ListContLevel1, li.ListContLevel1, div.ListContLevel1
 	{mso-style-priority:34;

data/lib/isodoc/itu/i18n-en.yaml

@@ -10,3 +10,4 @@ inform_annex: (This appendix does not form an integral part of this %.)
 formula: Equation
 inequality: Inequality
 annex_subclause: Clause
+in: in

data/lib/isodoc/itu/terms.rb

@@ -0,0 +1,87 @@
+module IsoDoc
+  module ITU
+    module BaseConvert
+       def terms_defs_title(node)
+        t = node.at(ns("./title")) and return t.text
+        super
+      end
+
+      def terms_defs(node, out, num)
+        f = node.at(ns(IsoDoc::Convert::TERM_CLAUSE)) or return num
+        out.div **attr_code(id: f["id"]) do |div|
+          num = num + 1
+          clause_name(num, terms_defs_title(f), div, nil)
+          if f.at(ns("./clause | ./terms | ./term")).nil? then out.p "None."
+          else
+            f.children.reject { |c1| c1.name == "title" }.each do |c1|
+              parse(c1, div)
+            end
+          end
+        end
+        num
+      end
+
+      def terms_parse(node, out)
+        out.div **attr_code(id: node["id"]) do |div|
+          clause_parse_title(node, div, node.at(ns("./title")), out)
+          if node.at(ns("./clause | ./term")).nil? then out.p "None."
+          else
+            node.children.reject { |c1| c1.name == "title" }.each do |c1|
+              parse(c1, div)
+            end
+          end
+        end
+      end
+
+      def termdef_parse1(node, div, term, defn, source)
+        div.p **{ class: "TermNum", id: node["id"] } do |p|
+          p.b do |b|
+            b << anchor(node["id"], :label)
+            insert_tab(b, 1)
+            term.children.each { |n| parse(n, b) }
+          end
+          source and p << " [#{source.value}]"
+          p << ": "
+        end
+        defn and defn.children.each { |n| parse(n, div) }
+      end
+
+      def termdef_parse(node, out)
+        term = node.at(ns("./preferred"))
+        defn = node.at(ns("./definition"))
+        source = node.at(ns("./termsource/origin/@citeas"))
+        out.div **attr_code(id: node["id"]) do |div|
+          termdef_parse1(node, div, term, defn, source)
+          set_termdomain("")
+          node.children.each do |n|
+            next if %w(preferred definition termsource title).include? n.name
+            parse(n, out)
+          end
+        end
+      end
+
+      def termnote_parse(node, out)
+      out.div **{ class: "Note" } do |div|
+        first = node.first_element_child
+        div.p do |p|
+          p << note_label(node) # "#{anchor(node['id'], :label) || '???'}: "
+          para_then_remainder(first, node, p, div)
+        end
+      end
+    end
+
+      def termnote_anchor_names(docxml)
+        docxml.xpath(ns("//term[descendant::termnote]")).each do |t|
+          c = IsoDoc::Function::XrefGen::Counter.new
+          notes = t.xpath(ns(".//termnote"))
+          notes.each do |n|
+            return if n["id"].nil? || n["id"].empty?
+            idx = notes.size == 1 ? "" : " #{c.increment(n).print}"
+            @anchors[n["id"]] = anchor_struct(idx, n, @note_xref_lbl,
+                                              "termnote", false)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/isodoc/itu/word_convert.rb

@@ -151,16 +151,51 @@ module IsoDoc
           olstyle: "l2", }
       end
 
-      def word_example_cleanup(docxml)
-        super
-        docxml.xpath("//div[@class = 'pseudocode']//p[not(@class)]").each do |p|
-          p["class"] = "pseudocode"
+      def make_tr_attr(td, row, totalrows, header)
+        super.merge(valign: "top")
+      end
+
+      def ol_parse(node, out)
+        out.ol **attr_code(class: node["class"], id: node["id"] ) do |ol|
+          node.children.each { |n| parse(n, ol) }
         end
       end
 
-      def make_tr_attr(td, row, totalrows, header)
-        super.merge(valign: "top")
+      def toWord(result, filename, dir, header)
+        result = populate_template(result, :word)
+        result = from_xhtml(word_cleanup(to_xhtml(result)))
+        Html2Doc.process(result, filename: filename, stylesheet: @wordstylesheet,
+                         header_file: header, dir: dir,
+                         asciimathdelims: [@openmathdelim, @closemathdelim],
+                         liststyles: { ul: @ulstyle, ol: @olstyle, steps: "l4" })
+      end
+
+=begin
+      def eref_parse(node, out)
+        linkend = get_linkend(node)
+        if node["type"] == "footnote"
+          out.sup { |s| s << linkend }
+        else
+          out << linkend
+        end
+      end
+
+      def xref_parse(node, out)
+        #target = /#/.match(node["target"]) ? node["target"].sub(/#/, ".html#") :
+        #  "##{node["target"]}"
+        out << get_linkend(node)
       end
+=end
+
+def link_parse(node, out)
+      out.a **attr_code(href: node["target"], title: node["alt"], class: "url") do |l|
+        if node.text.empty?
+          l << node["target"].sub(/^mailto:/, "")
+        else
+          node.children.each { |n| parse(n, l) }
+        end
+      end
+    end
 
       include BaseConvert
     end

data/lib/metanorma/itu/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ITU
-    VERSION = "0.2.8"
+    VERSION = "0.2.9"
   end
 end

data/metanorma-itu.gemspec

@@ -24,7 +24,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
 
-  spec.add_dependency "asciidoctor", "~> 1.5.7"
   spec.add_dependency "htmlentities", "~> 4.3.4"
   spec.add_dependency "ruby-jing"
   spec.add_dependency "metanorma-standoc", "~> 1.3.0"
@@ -41,4 +40,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
   spec.add_development_dependency "metanorma", "~> 0.3.0"
+  spec.add_development_dependency "vcr", "~> 5.0.0"
+  spec.add_development_dependency "webmock"
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-itu
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-27 00:00:00.000000000 Z
+date: 2019-11-08 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: asciidoctor
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.5.7
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.5.7
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement
@@ -234,6 +220,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.0
+- !ruby/object:Gem::Dependency
+  name: vcr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.0.0
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 'Metanorma for the ITU.
 
   '
@@ -260,6 +274,7 @@ files:
 - lib/asciidoctor/itu.rb
 - lib/asciidoctor/itu/basicdoc.rng
 - lib/asciidoctor/itu/biblio.rng
+- lib/asciidoctor/itu/cleanup.rb
 - lib/asciidoctor/itu/converter.rb
 - lib/asciidoctor/itu/front.rb
 - lib/asciidoctor/itu/i18n-en.yaml
@@ -289,6 +304,7 @@ files:
 - lib/isodoc/itu/metadata.rb
 - lib/isodoc/itu/pdf_convert.rb
 - lib/isodoc/itu/ref.rb
+- lib/isodoc/itu/terms.rb
 - lib/isodoc/itu/word_convert.rb
 - lib/isodoc/itu/xref.rb
 - lib/metanorma-itu.rb