metanorma-itu 1.2.16 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74f8f79bc99c8ff459c43ec1dd68f5fc1486f9f55d2632408a3d22514b5c9d9e
-  data.tar.gz: 9c15a9900916ffaad81a23b3d44e8238da413fbf2bc042a8c5aa2ff34a67e62b
+  metadata.gz: 2ed5bdd15fc291b42dd7b7760aea1a16d11e20cbd098baed7d9670cf4377bef6
+  data.tar.gz: dd1cae93081ac5da55e4b1efee4fd908bf9fde4e01e244ae59ea061cb2d0262e
 SHA512:
-  metadata.gz: 00f039f6898254841544adace9b22ecc17e9e470198885be2027dc2b435401203fd240ccbcc0a61dae4bf239791e42a62ec27235e940060aea64168f07b5526e
-  data.tar.gz: ca7a801478f776e35b0dc25fac1b32cc9e5b610466a85ad381e4b689bef95159fbdb5e3017e3a542f0eaa8329bef5b724104b50b9abc5a6a070c63a00381376e
+  metadata.gz: 42380cb1f49fed3fc99f51e3455049cdf907b158dad19da9ae2a244a761802924ff1727af053f604bfbfab933dab73bd3b225c03af9318fd15362aebf7d89d7c
+  data.tar.gz: 1b4ced1d5237dd83b90254a77a47ed71f3ee97e4b9dc468e09789f8a4d9dd5efda9fd418b42a2e618ee6e66c0404ec43bbd9b0bc1d5e57bf0b8457d0ee5507d3

data/lib/asciidoctor/itu/cleanup.rb

@@ -24,12 +24,12 @@ module Asciidoctor
         end
       end
 
-      def insert_missing_sections(x)
-        insert_scope(x)
-        insert_norm_ref(x)
-        insert_terms(x)
-        insert_symbols(x)
-        insert_conventions(x)
+      def insert_missing_sections(xml)
+        insert_scope(xml)
+        insert_norm_ref(xml)
+        insert_terms(xml)
+        insert_symbols(xml)
+        insert_conventions(xml)
       end
 
       def add_id
@@ -109,8 +109,10 @@ module Asciidoctor
 
       def smartquotes_cleanup(xmldoc)
         return super if @smartquotes
+
         xmldoc.traverse do |n|
           next unless n.text?
+
           n.replace(HTMLEntities.new.encode(
             n.text.gsub(/\u2019|\u2018|\u201a|\u201b/, "'").
             gsub(/\u201c|\u201d|\u201e|\u201f/, '"'), :basic))
@@ -175,6 +177,7 @@ module Asciidoctor
         return 4 if bib.at("./docidentifier[@type][not(@type = 'DOI' or "\
                            "@type = 'metanorma' or @type = 'ISSN' or @type = "\
                            "'ISBN')]")
+
         5
       end
 

data/lib/asciidoctor/itu/converter.rb

@@ -1,10 +1,9 @@
 require "asciidoctor"
 require "asciidoctor/standoc/converter"
 require "fileutils"
-require_relative "./front.rb"
-require_relative "./validate.rb"
-require_relative "./cleanup.rb"
-require_relative "./macros.rb"
+require_relative "./front"
+require_relative "./validate"
+require_relative "./cleanup"
 
 module Asciidoctor
   module ITU
@@ -17,12 +16,7 @@ module Asciidoctor
 
       register_for "itu"
 
-      Asciidoctor::Extensions.register do
-        inline_macro AddMacro
-        inline_macro DelMacro
-      end
-
-      def title_validate(root)
+      def title_validate(_root)
         nil
       end
 
@@ -94,6 +88,7 @@ module Asciidoctor
           hdr != "terms and definitions" && node.level > 1
         return nil if ret == "symbols and abbreviated terms" && 
           hdr != "symbols and abbreviated terms" && node.level > 1
+
         ret
       end
 
@@ -110,6 +105,7 @@ module Asciidoctor
 
       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
@@ -117,22 +113,24 @@ module Asciidoctor
 
       def clause_parse(attrs, xml, node)
         node.option?("unnumbered") and attrs[:unnumbered] = true
-        case clausetype = sectiontype1(node)
+        case sectiontype1(node)
         when "conventions" then attrs = attrs.merge(type: "conventions")
-        when "history" 
+        when "history"
           attrs[:preface] and attrs = attrs.merge(type: "history")
-        when "source" 
+        when "source"
           attrs[:preface] and attrs = attrs.merge(type: "source")
         end
         super
       end
 
       def html_extract_attributes(node)
-        super.merge(hierarchical_assets: node.attr("hierarchical-object-numbering"))
+        super.merge(hierarchical_assets:
+                    node.attr("hierarchical-object-numbering"))
       end
 
       def doc_extract_attributes(node)
-        super.merge(hierarchical_assets: node.attr("hierarchical-object-numbering"))
+        super.merge(hierarchical_assets:
+                    node.attr("hierarchical-object-numbering"))
       end
 
       def presentation_xml_converter(node)

data/lib/asciidoctor/itu/isodoc.rng

@@ -86,6 +86,35 @@
         <text/>
       </element>
     </define>
+    <define name="erefType">
+      <optional>
+        <attribute name="normative">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <attribute name="citeas"/>
+      <attribute name="type">
+        <ref name="ReferenceFormat"/>
+      </attribute>
+      <optional>
+        <attribute name="alt"/>
+      </optional>
+      <optional>
+        <attribute name="case">
+          <choice>
+            <value>capital</value>
+            <value>lowercase</value>
+          </choice>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="droploc">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <ref name="CitationType"/>
+      <text/>
+    </define>
     <define name="ul">
       <element name="ul">
         <attribute name="id">
@@ -775,6 +804,78 @@
         <ref name="paragraph"/>
       </element>
     </define>
+    <define name="em">
+      <element name="em">
+        <zeroOrMore>
+          <choice>
+            <ref name="PureTextElement"/>
+            <ref name="stem"/>
+            <ref name="index"/>
+          </choice>
+        </zeroOrMore>
+      </element>
+    </define>
+    <define name="strong">
+      <element name="strong">
+        <zeroOrMore>
+          <choice>
+            <ref name="PureTextElement"/>
+            <ref name="stem"/>
+            <ref name="index"/>
+          </choice>
+        </zeroOrMore>
+      </element>
+    </define>
+    <define name="tt">
+      <element name="tt">
+        <zeroOrMore>
+          <choice>
+            <ref name="PureTextElement"/>
+            <ref name="index"/>
+          </choice>
+        </zeroOrMore>
+      </element>
+    </define>
+    <define name="keyword">
+      <element name="keyword">
+        <zeroOrMore>
+          <choice>
+            <ref name="PureTextElement"/>
+            <ref name="index"/>
+          </choice>
+        </zeroOrMore>
+      </element>
+    </define>
+    <define name="strike">
+      <element name="strike">
+        <zeroOrMore>
+          <choice>
+            <ref name="PureTextElement"/>
+            <ref name="index"/>
+          </choice>
+        </zeroOrMore>
+      </element>
+    </define>
+    <define name="underline">
+      <element name="underline">
+        <zeroOrMore>
+          <choice>
+            <ref name="PureTextElement"/>
+            <ref name="index"/>
+          </choice>
+        </zeroOrMore>
+      </element>
+    </define>
+    <define name="smallcap">
+      <element name="smallcap">
+        <zeroOrMore>
+          <choice>
+            <ref name="PureTextElement"/>
+            <ref name="index"/>
+          </choice>
+        </zeroOrMore>
+      </element>
+    </define>
   </include>
   <!-- end overrides -->
   <define name="colgroup">
@@ -793,7 +894,35 @@
     <value>internal</value>
   </define>
   <define name="TextElement" combine="choice">
-    <ref name="concept"/>
+    <choice>
+      <ref name="concept"/>
+      <ref name="add"/>
+      <ref name="del"/>
+    </choice>
+  </define>
+  <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="concept">
     <element name="concept">

data/lib/asciidoctor/itu/itu.rng

@@ -234,36 +234,6 @@
       <text/>
     </element>
   </define>
-  <define name="TextElement" combine="choice">
-    <choice>
-      <ref name="add"/>
-      <ref name="del"/>
-    </choice>
-  </define>
-  <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/isodoc/itu/base_convert.rb

@@ -1,9 +1,9 @@
 require "isodoc"
 require "fileutils"
-require_relative "./ref.rb"
-require_relative "./xref.rb"
-require_relative "./terms.rb"
-require_relative "./cleanup.rb"
+require_relative "./ref"
+require_relative "./xref"
+require_relative "./terms"
+require_relative "./cleanup"
 
 module IsoDoc
   module ITU
@@ -14,6 +14,7 @@ module IsoDoc
       def preface(isoxml, out)
         isoxml.xpath(ns(FRONT_CLAUSE)).each do |c|
           next unless is_clause?(c.name)
+
           title = c&.at(ns("./title"))
           out.div **attr_code(clause_attrs(c)) do |s|
             clause_name(nil, title, s, class: "IntroTitle")
@@ -34,12 +35,14 @@ module IsoDoc
 
       def para_class(node)
         return "supertitle" if node["class"] == "supertitle"
+
         super
       end
 
       def ol_depth(node)
-        return super unless node["class"] == "steps" or
+        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
@@ -54,19 +57,22 @@ module IsoDoc
         div.h1 **{ class: r_a ? "RecommendationAnnex" : "Annex" } do |t|
           name&.children&.each { |c2| parse(c2, t) }
         end
-        annex_obligation_subtitle(annex, div) unless @meta.get[:doctype_original] == "resolution"
+        @meta.get[:doctype_original] == "resolution" or
+          annex_obligation_subtitle(annex, div)
       end
 
       def annex_obligation_subtitle(annex, div)
         info = annex["obligation"] == "informative"
-        div.p **{class: "annex_obligation" } do |p|
-          p << (info ? @i18n.inform_annex : @i18n.norm_annex).sub(/%/, @meta.get[:doctype] || "")
+        div.p **{ class: "annex_obligation" } do |p|
+          p << (info ? @i18n.inform_annex : @i18n.norm_annex)
+            .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)
+          @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|
@@ -106,7 +112,8 @@ module IsoDoc
         out.p(**{ align: "center", style: "text-align:center;" }) do |p|
           p.i do |i|
             i << "("
-            isoxml.at(ns("//bibdata/title[@type = 'resolution-placedate']")).children.each { |n| parse(n, i) }
+            isoxml.at(ns("//bibdata/title[@type = 'resolution-placedate']"))
+              .children.each { |n| parse(n, i) }
             i << ")"
           end
           isoxml.xpath(ns("//note[@type = 'title-footnote']")).each do |f|
@@ -117,7 +124,7 @@ module IsoDoc
 
       def middle_title_recommendation(isoxml, out)
         out.p(**{ class: "zzSTDTitle1" }) do |p|
-          id = @meta.get[:docnumber] and p << "#{@meta.get[:doctype]} #{id}" 
+          id = @meta.get[:docnumber] and p << "#{@meta.get[:doctype]} #{id}"
         end
         out.p(**{ class: "zzSTDTitle2" }) do |p|
           p << @meta.get[:doctitle]
@@ -129,27 +136,6 @@ module IsoDoc
           out.p(**{ class: "zzSTDTitle3" }) { |p| p << s }
       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)
         name = node&.at(ns("./name"))&.remove
         div.p do |p|
@@ -172,12 +158,13 @@ module IsoDoc
         node.children.each { |n| parse(n, div) }
       end
 
-      def table_footnote_reference_format(a)
-        a.content = a.content + ")"
+      def table_footnote_reference_format(node)
+        node.content += ")"
       end
 
       def note_parse(node, out)
         return if node["type"] == "title-footnote"
+
         super
       end
 
@@ -188,9 +175,9 @@ module IsoDoc
         end
       end
 
-      def clause_core(c, out)
-        out.div **attr_code(clause_attrs(c)) do |s|
-          c.elements.each do |c1|
+      def clause_core(clause, out)
+        out.div **attr_code(clause_attrs(clause)) do |s|
+          clause.elements.each do |c1|
             if c1.name == "title" then clause_name(nil, c1, s, nil)
             else
               parse(c1, s)
@@ -201,6 +188,7 @@ module IsoDoc
 
       def scope(isoxml, out, num)
         return super unless @meta.get[:doctype_original] == "resolution"
+
         f = isoxml.at(ns("//clause[@type = 'scope']")) or return num
         clause_core(f, out)
         num + 1