metanorma-itu 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '097f0285c22f6f51336c34ad430f66a892dd0dadd7e4414cbcfc5f3d28a66475'
-  data.tar.gz: 021a5ebb560e1bad15258a86b36f4b4876b5966a09a7cb4b8d6bf52d3bf85cb8
+  metadata.gz: c26dd78f21a8922175597c45a4570101e0bc80ea1089f508f1f363a3fc02b440
+  data.tar.gz: a061bb4174075cc27f6aaaecbb11f0c5e9db58545d8087885630420ea953c289
 SHA512:
-  metadata.gz: d4f096b1352ec9d3ee2186f954cdd662956d8e73e4355bbaa3821b15b2d2c03047dc6825a779fe306546b1f0ebbb434d26f29138f26f672fdc87b5a7884fdfeb
-  data.tar.gz: 959f94bbf718b055016d8d095f2521715813e20e3d519785f9d626e10627e21488da9a6658030cda83230f522336051832966d168ac2152edd75608961f7e8f7
+  metadata.gz: a1445d077b0f147f53a4e3a3a5a69789fcfe20eccc475c482c4131151e2138429bd03809650b637eae8adbaeba74df8f649272b5b0d14cebf722716950f0aa66
+  data.tar.gz: dcca5c7362f9777208f13d26c84b4e4cda972d07ac6f25a059a2b792139a0263ad5db217348c69056d2f5cfca863efab3ac3f2e3ff87dd870ebb8a3787b0b38e

data/.gitignore

@@ -0,0 +1,4 @@
+.DS_Store
+.byebug_history
+.rspec_status
+coverage/

data/lib/asciidoctor/itu/basicdoc.rng

@@ -194,6 +194,14 @@
           <data type="boolean"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="subsequence"/>
+      </optional>
+      <optional>
+        <attribute name="inequality">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
       <ref name="stem"/>
       <optional>
         <ref name="dl"/>
@@ -247,6 +255,9 @@
           <data type="boolean"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="subsequence"/>
+      </optional>
       <optional>
         <attribute name="lang"/>
       </optional>
@@ -291,9 +302,15 @@
           <data type="boolean"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="subsequence"/>
+      </optional>
       <optional>
         <attribute name="alt"/>
       </optional>
+      <optional>
+        <attribute name="summary"/>
+      </optional>
       <optional>
         <attribute name="uri">
           <data type="anyURI"/>
@@ -423,6 +440,9 @@
           <data type="boolean"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="subsequence"/>
+      </optional>
       <oneOrMore>
         <choice>
           <ref name="formula"/>
@@ -486,6 +506,9 @@
           <data type="boolean"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="subsequence"/>
+      </optional>
       <optional>
         <ref name="source"/>
       </optional>
@@ -497,6 +520,8 @@
       </optional>
       <choice>
         <ref name="image"/>
+        <ref name="video"/>
+        <ref name="audio"/>
         <ref name="pre"/>
         <zeroOrMore>
           <ref name="figure"/>
@@ -792,7 +817,7 @@
     </element>
   </define>
   <define name="video">
-    <element name="image">
+    <element name="video">
       <attribute name="id">
         <data type="ID"/>
       </attribute>
@@ -833,7 +858,7 @@
     </element>
   </define>
   <define name="audio">
-    <element name="image">
+    <element name="audio">
       <attribute name="id">
         <data type="ID"/>
       </attribute>

data/lib/asciidoctor/itu/front.rb

@@ -13,18 +13,21 @@ module Asciidoctor
       def title_english(node, xml)
         ["en"].each do |lang|
           at = { language: lang, format: "text/plain", type: "main" }
-          xml.title **attr_code(at) do |t|
-            t << Asciidoctor::Standoc::Utils::asciidoc_sub(node.attr("title") ||
-                                                           node.attr("title-en") || node.title)
+          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)
           end
         end
       end
 
       def title_otherlangs(node, xml)
         node.attributes.each do |k, v|
-          next unless /^title-(?<titlelang>.+)$/ =~ k
+          next unless /^(annex)?title-(?<titlelang>.+)$/ =~ k
           next if titlelang == "en"
-          xml.title v, { language: titlelang, format: "text/plain", type: "main" }
+          xml.title v, { language: titlelang, format: "text/plain",
+                         type: /^annex/.match(k) ? "annex" : "main" }
         end
       end
 
@@ -154,12 +157,22 @@ module Asciidoctor
         xml.ip_notice_received (node.attr("ip-notice-received") || "false")
       end
 
+      def structured_id(node, xml)
+        return unless node.attr("docnumber")
+        xml.structuredidentifier do |i|
+          i.bureau node.attr("bureau") || "T"
+          i.docnumber node.attr("docnumber")
+          a = node.attr("annexid") and i.annexid a
+        end
+      end
+
       def metadata_ext(node, xml)
         metadata_doctype(node, xml)
         metadata_committee(node, xml)
         metadata_ics(node, xml)
         metadata_recommendationstatus(node, xml)
         metadata_ip_notice(node, xml)
+        structured_id(node, xml)
       end
     end
   end

data/lib/asciidoctor/itu/itu.rng

@@ -81,6 +81,19 @@
         <ref name="ItuGroup"/>
       </element>
     </define>
+    <define name="structuredidentifier">
+      <element name="structuredidentifier">
+        <ref name="bureau"/>
+        <element name="docnumber">
+          <text/>
+        </element>
+        <optional>
+          <element name="annexid">
+            <text/>
+          </element>
+        </optional>
+      </element>
+    </define>
     <define name="BibDataExtensionType">
       <optional>
         <ref name="doctype"/>
@@ -92,6 +105,9 @@
       <optional>
         <ref name="recommendationstatus"/>
       </optional>
+      <optional>
+        <ref name="structuredidentifier"/>
+      </optional>
     </define>
   </include>
   <define name="recommendationstatus">

data/lib/asciidoctor/itu/reqt.rng

@@ -30,6 +30,9 @@
         <data type="boolean"/>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="subsequence"/>
+    </optional>
     <attribute name="id">
       <data type="ID"/>
     </attribute>

data/lib/isodoc/itu/base_convert.rb

@@ -38,9 +38,33 @@ module IsoDoc
         div.h1 **{ class: "Annex" } do |t|
           t << "#{anchor(annex['id'], :label)} "
           t.br
+          t.br
           t.b do |b|
             name&.children&.each { |c2| parse(c2, b) }
           end
+          type = annex&.document&.root&.at("//bibdata/ext/doctype")&.text || "recommendation"
+          type = type.split(" ").map {|w| w.capitalize }.join(" ")
+          info = annex["obligation"] == "informative"
+          t.p { |p| p << (info ? @inform_annex_lbl : @norm_annex_lbl).sub(/%/, type) }
+        end
+      end
+
+      def annex_name_lbl(clause, num)
+        lbl = clause["obligation"] == "informative" ? @appendix_lbl : @annex_lbl
+        l10n("<b>#{lbl} #{num}</b>")
+      end
+
+      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
+          docxml.xpath(ns("//annex[@obligation = 'informative']")).each_with_index do |c, i|
+            annex_names(c, RomanNumerals.to_roman(i + 1))
+          end
+          docxml.xpath(ns("//annex[not(@obligation = 'informative')]")).each_with_index do |c, i|
+            annex_names(c, (65 + i + (i > 7 ? 1 : 0)).chr.to_s)
+          end
         end
       end
 
@@ -102,9 +126,7 @@ module IsoDoc
 
       def split_bibitems(f)
         bibitem = []
-        f.xpath(ns("./bibitem")).each do |x|
-          bibitem << x
-        end
+        f.xpath(ns("./bibitem")).each { |x| bibitem << x }
         bibitem
       end
 

data/lib/isodoc/itu/html/html_itu_titlepage.html

@@ -30,6 +30,9 @@
             {% if edition %} <div> Revision {{ edition }}</div> {% endif %}
             <div> {{ draftinfo }}</div>
           </div>
+           {% if annexid %}
+           <div class="doc-identifier">{{annexid}}</div>
+           {% endif %}
           <div class="publication-month">
             ({{ pubdate_monthyear }})
           </div>
@@ -50,6 +53,9 @@
           <span class="doc-title">{{ doctitle }}</span>
           {% if docsubtitle %}
           <br/><span class="doc-subtitle">{{ docsubtitle }}</span>
+          {% if annextitle %}
+          <br/><span class="doctitle">{{ annextitle }}</span>
+          {% endif %}
           {% endif %}
         </div>
 

data/lib/isodoc/itu/html/word_itu_titlepage.html

@@ -142,7 +142,11 @@
   <span style='mso-bookmark:_Hlk526346232'></span>
   <td width="265" valign="top" style='width:198.55pt;padding:0cm 4.25pt 0cm 4.25pt;
   height:48.7pt'>
-  <p class="MsoNormal" align="right" style='margin-top:0cm;text-align:right'><span
+  <p class="MsoNormal" align="right" style='margin-top:0cm;text-align:right'>
+  {% if annexid %}
+  <span style='font-size:18.0pt;font-family:"Arial",sans-serif'><b>{{annexid}}</b></span><br/>
+  {% endif %}
+  <span
   style='mso-bookmark:_Hlk526346232'><a name="ddatee"><span lang="EN-US"
   style='font-size:14.0pt;mso-bidi-font-size:10.0pt;font-family:"Arial",sans-serif;
   mso-ansi-language:EN-US'>{% if pubdate_monthyear %}({{ pubdate_monthyear }}){% endif %}<span style='mso-spacerun:yes'>   </span><o:p></o:p></span></a></span></p>
@@ -191,9 +195,11 @@
   <td width="569" colspan="4" valign="top" style='width:426.5pt;padding:0cm 5.4pt 0cm 5.4pt;
   height:4.0cm;mso-height-rule:exactly'>
   <p class="MsoNormal" align="left" style='text-align:left;tab-stops:39.7pt 59.55pt 79.4pt 99.25pt right 17.0cm'><span
-  style='mso-bookmark:_Hlk526346232'><a name="c1tite"><b><span lang="EN-GB"
+  style='mso-bookmark:_Hlk526346232'><a name="c1tite">
+    <span lang="EN-GB"
   style='font-size:18.0pt;mso-bidi-font-size:10.0pt;font-family:"Arial",sans-serif;
-  mso-bidi-font-family:"Times New Roman"'>{{ doctitle }}</span></b></a></span><span
+  mso-bidi-font-family:"Times New Roman"'>{% if annextitle %}{{ doctitle }}<br/><b>{{ annextitle }}</b>{% else %}<b>{{ doctitle }}</b>{% endif %}</span>
+  </a></span><span
   style='mso-bookmark:_Hlk526346232'><span style='mso-bookmark:c1tite'><b><span
   lang="EN-US" style='font-size:18.0pt;mso-bidi-font-size:10.0pt;font-family:
   "Arial",sans-serif;mso-bidi-font-family:"Times New Roman";mso-ansi-language:

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

@@ -5,4 +5,7 @@ elsewhere_terms: >-
   This Recommendation uses the following terms defined elsewhere:
 here_terms: >-
   This Recommendation defines the following terms:
-
+norm_annex: (This annex forms an integral part of this %.)
+inform_annex: (This appendix does not form an integral part of this %.)
+formula: Equation
+inequality: Inequality

data/lib/isodoc/itu/metadata.rb

@@ -17,6 +17,8 @@ module IsoDoc
         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)
       end
 
       def subtitle(_isoxml, _out)
@@ -35,6 +37,10 @@ module IsoDoc
         set(:docnumber, dn&.text)
         dn = isoxml.at(ns("//bibdata/docidentifier"))
         set(:docidentifier, dn&.text)
+        dn = isoxml.at(ns("//bibdata/ext/structuredidentifier/annexid"))
+        oblig = isoxml&.at(ns("//annex/@obligation"))&.text
+        lbl = oblig == "informative" ? @labels["appendix"] : @labels["annex"]
+        dn and set(:annexid, IsoDoc::Function::I18n::l10n("#{lbl} #{dn&.text}"))
       end
 
       def unpublished(status)

data/lib/isodoc/itu/word_convert.rb

@@ -81,6 +81,8 @@ module IsoDoc
       def convert1(docxml, filename, dir)
         FileUtils.cp html_doc_path('itu-document-comb.png'), File.join(@localdir, "itu-document-comb.png")
         FileUtils.cp html_doc_path('logo.png'), File.join(@localdir, "logo.png")
+        @files_to_delete << File.join(@localdir, "itu-document-comb.png")
+        @files_to_delete << File.join(@localdir, "logo.png")
         super
       end
 

data/lib/metanorma/itu/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ITU
-    VERSION = "0.2.4"
+    VERSION = "0.2.5"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-itu
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-12 00:00:00.000000000 Z
+date: 2019-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -243,6 +243,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
 - ".hound.yml"
 - ".rubocop.yml"
 - ".travis.yml"