metanorma-itu 1.0.15 → 1.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1716cf558f18bf55eec7bd90d86283304f0ff55fc7d8f384f0f85ce7808fdcc6
-  data.tar.gz: 3bb69ae66bfd7e2a1f8a791a7b1536f204830a40c16ae6ca972c5e7e86510190
+  metadata.gz: 1075b0ab1b5ce442ec5e1048b390b717a0722dfb66b5130c934f4a0eaf39caca
+  data.tar.gz: 6d5d755eaf6cfea89ca934e0f54b9c0ef2042da3b289e4fb0297ae7f7efa6267
 SHA512:
-  metadata.gz: 6e76f70372f778f9d487af3b6e2f7af48bee0fe0275b7facd4562d5106588f8e0141ea5a2af3113312674c946db7c39ac5b6a5a15065ffce3a493b6ec54947da
-  data.tar.gz: c3b7170b688848cd7dec19f96a504a5ae55a86645bae0bb11b48ea8ca9a84541c6d6033a526e8ae82cc80cba6a1e07f2b9d58b36fe244597ab3e4d6da1e30556
+  metadata.gz: cef7bfe22e96dda2a19678c7f04f60c5a82f76544e6e29f9ae77a34873cc13413139b26c2c84cdbc736438531a034a9c934bc8e9bce96b4d2a6534520948ab75
+  data.tar.gz: 932eb30b185032d66a843bb9981e40cb103df654096528742c9029bb092f500b83f11de6553ffc30ec64867b584d54ff750e8bf00e03fde4f4bc467b76110047

data/.github/workflows/macos.yml

@@ -6,15 +6,23 @@ on:
   push:
     branches: [ master ]
   pull_request:
+    paths-ignore:
+      - .github/workflows/ubuntu.yml
+      - .github/workflows/windows.yml
 
 jobs:
   test-macos:
     name: Test on Ruby ${{ matrix.ruby }} macOS
     runs-on: macos-latest
+    continue-on-error: ${{ matrix.experimental }}
     strategy:
       fail-fast: false
       matrix:
         ruby: [ '2.6', '2.5', '2.4' ]
+        experimental: [false]
+        include:
+          - ruby: '2.7'
+            experimental: true
     steps:
       - uses: actions/checkout@master
       - name: Use Ruby

data/.github/workflows/ubuntu.yml

@@ -5,16 +5,26 @@ name: ubuntu
 on:
   push:
     branches: [ master ]
+    tags:
+      - '*'
   pull_request:
+    paths-ignore:
+      - .github/workflows/macos.yml
+      - .github/workflows/windows.yml
 
 jobs:
   test-linux:
     name: Test on Ruby ${{ matrix.ruby }} Ubuntu
     runs-on: ubuntu-latest
+    continue-on-error: ${{ matrix.experimental }}
     strategy:
       fail-fast: false
       matrix:
         ruby: [ '2.6', '2.5', '2.4' ]
+        experimental: [false]
+        include:
+          - ruby: '2.7'
+            experimental: true
     steps:
       - uses: actions/checkout@master
       - name: Use Ruby

data/.github/workflows/windows.yml

@@ -6,15 +6,23 @@ on:
   push:
     branches: [ master ]
   pull_request:
+    paths-ignore:
+      - .github/workflows/macos.yml
+      - .github/workflows/ubuntu.yml
 
 jobs:
   test-windows:
     name: Test on Ruby ${{ matrix.ruby }} Windows
     runs-on: windows-latest
+    continue-on-error: ${{ matrix.experimental }}
     strategy:
       fail-fast: false
       matrix:
         ruby: [ '2.6', '2.5', '2.4' ]
+        experimental: [false]
+        include:
+          - ruby: '2.7'
+            experimental: true
     steps:
       - uses: actions/checkout@master
       - name: Use Ruby

data/lib/asciidoctor/itu/biblio.rng

@@ -88,7 +88,7 @@
       <text/>
     </element>
   </define>
-  <define name="LocalizedString">
+  <define name="LocalizedString1">
     <optional>
       <!-- multiple languages and scripts possible: comma delimit them if so -->
       <attribute name="language"/>
@@ -98,6 +98,16 @@
     </optional>
     <text/>
   </define>
+  <define name="LocalizedString">
+    <choice>
+      <ref name="LocalizedString1"/>
+      <oneOrMore>
+        <element name="variant">
+          <ref name="LocalizedString1"/>
+        </element>
+      </oneOrMore>
+    </choice>
+  </define>
   <!--
     Unlike UML, change type to format: type is overloaded
     Would be need if plain were default value and could omit the attribute
@@ -121,7 +131,7 @@
     </optional>
     <ref name="LocalizedStringOrXsAny"/>
   </define>
-  <define name="LocalizedStringOrXsAny">
+  <define name="LocalizedStringOrXsAny1">
     <optional>
       <!-- multiple languages and scripts possible: comma delimit them if so -->
       <attribute name="language"/>
@@ -136,6 +146,16 @@
       </choice>
     </oneOrMore>
   </define>
+  <define name="LocalizedStringOrXsAny">
+    <choice>
+      <ref name="LocalizedStringOrXsAny1"/>
+      <oneOrMore>
+        <element name="variant">
+          <ref name="LocalizedStringOrXsAny1"/>
+        </element>
+      </oneOrMore>
+    </choice>
+  </define>
   <define name="contributor">
     <element name="contributor">
       <zeroOrMore>

data/lib/asciidoctor/itu/cleanup.rb

@@ -3,9 +3,6 @@ module Asciidoctor
     class Converter < Standoc::Converter
       def sections_cleanup(x)
         super
-        x.xpath("//*[@inline-header]").each do |h|
-          h.delete("inline-header")
-        end
         insert_missing_sections(x) unless @no_insert_missing_sections
       end
 
@@ -44,8 +41,10 @@ module Asciidoctor
           "<bibliography><sentinel/></bibliography>"
         ins = x.at("//bibliography").elements.first
         unless x.at("//bibliography/references[@normative = 'true']")
-          ins.previous = "<references normative='true'><title>References</title><p>"\
-            "#{@labels['clause_empty']}</p></references>"
+          #ins.previous = "<references normative='true'><title>References</title><p>"\
+          #  "#{@labels['clause_empty']}</p></references>"
+          ins.previous = "<references normative='true'><title>References</title>"\
+            "</references>"
         end
         x&.at("//sentinel")&.remove
       end
@@ -62,7 +61,7 @@ module Asciidoctor
         ins =  x.at("//sections/terms") ||
           x.at("//sections/clause[descendant::terms]")
         unless x.at("//sections//definitions")
-          ins.next = "<definitions><title>Definitions</title><p>"\
+          ins.next = "<definitions><title>Abbreviations and acronyms</title><p>"\
             "#{@labels['clause_empty']}</p></definitions>"
         end
       end
@@ -71,46 +70,47 @@ module Asciidoctor
         ins =  x.at("//sections//definitions") ||
           x.at("//sections/clause[descendant::definitions]")
         unless x.at("//sections/clause/title[text() = 'Conventions']")
-          ins.next = "<clause><title>Conventions</title><p>"\
-            "#{@labels['clause_empty']}</p></clause>"
-        end
-      end
+          ins.next = "<clause id='_#{UUIDTools::UUID.random_create}'>"\
+          "<title>Conventions</title><p>"\
+          "#{@labels['clause_empty']}</p></clause>"
+          end
+          end
 
-      def cleanup(xmldoc)
-        symbols_cleanup(xmldoc)
-        super
-        obligations_cleanup(xmldoc)
-        xmldoc
-      end
+          def cleanup(xmldoc)
+          symbols_cleanup(xmldoc)
+          super
+          obligations_cleanup(xmldoc)
+          xmldoc
+          end
 
-      def smartquotes_cleanup(xmldoc)
-        return super if @smartquotes
-        xmldoc.traverse do |n|
+          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))
-        end
-        xmldoc
-      end
+          end
+          xmldoc
+          end
 
-      def termdef_cleanup(xmldoc)
-        xmldoc.xpath("//term/preferred").each do |p|
+          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"
+          "terms defined in this recommendation"].include? p.text.downcase
+          p.name = "title"
+          p.parent.name = "terms"
+          end
+          end
+          super
           end
-        end
-        super
-      end
 
-      def termdef_boilerplate_cleanup(xmldoc)
-      end
+          def termdef_boilerplate_cleanup(xmldoc)
+          end
 
-      def symbols_cleanup(xmldoc)
-        sym = xmldoc.at("//definitions/title")
-        sym and sym&.next_element&.name == "dl" and
+          def symbols_cleanup(xmldoc)
+          sym = xmldoc.at("//definitions/title")
+          sym and sym&.next_element&.name == "dl" and
           sym.next = "<p>#{@symbols_boilerplate}</p>"
       end
 
@@ -118,55 +118,55 @@ module Asciidoctor
 
       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
+          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)
+        def sort_biblio(bib)
+          bib.sort do |a, b|
+            sort_biblio_key(a) <=> sort_biblio_key(b)
+          end
         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
+        # 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)
+        def biblio_reorder(xmldoc)
+          xmldoc.xpath("//references").each do |r|
+            biblio_reorder1(r)
+          end
         end
-      end
 
-      def normref_cleanup(xmldoc)
-        super
-        r = xmldoc.at(NORM_REF) || return
-        title = r.at("./title") and
-          title.content = "References"
+        def normref_cleanup(xmldoc)
+          super
+          r = xmldoc.at(NORM_REF) || return
+          title = r.at("./title") and
+            title.content = "References"
+        end
       end
     end
   end
-end

data/lib/asciidoctor/itu/converter.rb

@@ -137,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

@@ -39,6 +39,31 @@ module Asciidoctor
         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
+
       def metadata_author(node, xml)
         xml.contributor do |c|
           c.role **{ type: "author" }

data/lib/isodoc/itu/base_convert.rb

@@ -143,6 +143,8 @@ module IsoDoc
           id = @meta.get[:docnumber] and p << "Recommendation #{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

@@ -107,7 +107,7 @@ span.doc-title {
   padding: 0 3em 0 6em;
 }
 
-.zzSTDTitle1, .zzSTDTitle2, .MsoCommentText {
+.zzSTDTitle1, .zzSTDTitle2, .zzSTDTitle3, .MsoCommentText {
   display: none;
 }
 

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

@@ -53,10 +53,10 @@
           <span class="doc-title">{{ doctitle }}</span>
           {% if docsubtitle %}
           <br/><span class="doc-subtitle">{{ docsubtitle }}</span>
+          {% endif %}
           {% if annextitle %}
           <br/><span class="doctitle">{{ annextitle }}</span>
           {% endif %}
-          {% endif %}
         </div>
 
 
@@ -98,9 +98,11 @@
         </div>
         -->
 
+        {% if unpublished %}
 <div class="coverpage-warning">
         <div id="draft-warning-destination"/>
         </div>
+        {% endif %}
 
 <div class="info-section">
   <div id="boilerplate-copyright-destination"/>

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

@@ -185,7 +185,7 @@ pre {
 }
 
 #ITU-logo {
-  width: 200px;
+  width: 150px;
   height: auto;
   margin-left: auto;
 }

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

@@ -620,6 +620,29 @@ p.zzSTDTitle2, li.zzSTDTitle2, div.zzSTDTitle2
         font-weight:bold;
         text-align:center;
         mso-bidi-font-weight:normal;}
+p.zzSTDTitle3, li.zzSTDTitle3, div.zzSTDTitle3
+        {mso-style-name:zzSTDTitle;
+        mso-style-noshow:yes;
+        mso-style-unhide:no;
+        mso-style-next:Normal;
+        margin-top:0pt;
+        margin-right:0cm;
+        margin-bottom:18.0pt;
+        margin-left:0cm;
+        line-height:17.5pt;
+        mso-line-height-rule:exactly;
+        mso-pagination:widow-orphan;
+        mso-hyphenate:none;
+        tab-stops:20.15pt;
+        font-size:14.0pt;
+        mso-bidi-font-size:11.0pt;
+        font-family:$headerfont;
+        mso-fareast-font-family:$headerfont;
+        mso-bidi-font-family:$headerfont;
+        mso-ansi-language:EN-GB;
+        font-style:italic;
+        text-align:center;
+        mso-bidi-font-weight:normal;}
 p.Quote, li.Quote, div.Quote
 	{mso-style-priority:99;
 	margin-top:0cm;

data/lib/isodoc/itu/html/scripts.html

@@ -42,13 +42,16 @@ $('#toggle').on('click', function(){
     </script>
 
   <script>
-/**
- * AnchorJS - v4.1.0 - 2017-09-20
- * https://github.com/bryanbraun/anchorjs
- * Copyright (c) 2017 Bryan Braun; Licensed MIT
- */
-!function(A,e){"use strict";"function"==typeof define&&define.amd?define([],e):"object"==typeof module&&module.exports?module.exports=e():(A.AnchorJS=e(),A.anchors=new A.AnchorJS)}(this,function(){"use strict";return function(A){function e(A){A.icon=A.hasOwnProperty("icon")?A.icon:"",A.visible=A.hasOwnProperty("visible")?A.visible:"hover",A.placement=A.hasOwnProperty("placement")?A.placement:"right",A.ariaLabel=A.hasOwnProperty("ariaLabel")?A.ariaLabel:"Anchor",A.class=A.hasOwnProperty("class")?A.class:"",A.truncate=A.hasOwnProperty("truncate")?Math.floor(A.truncate):64}function t(A){var e;if("string"==typeof A||A instanceof String)e=[].slice.call(document.querySelectorAll(A));else{if(!(Array.isArray(A)||A instanceof NodeList))throw new Error("The selector provided to AnchorJS was invalid.");e=[].slice.call(A)}return e}function i(){if(null===document.head.querySelector("style.anchorjs")){var A,e=document.createElement("style");e.className="anchorjs",e.appendChild(document.createTextNode("")),void 0===(A=document.head.querySelector('[rel="stylesheet"], style'))?document.head.appendChild(e):document.head.insertBefore(e,A),e.sheet.insertRule(" .anchorjs-link {   opacity: 0;   text-decoration: none;   -webkit-font-smoothing: antialiased;   -moz-osx-font-smoothing: grayscale; }",e.sheet.cssRules.length),e.sheet.insertRule(" *:hover > .anchorjs-link, .anchorjs-link:focus  {   opacity: 1; }",e.sheet.cssRules.length),e.sheet.insertRule(" [data-anchorjs-icon]::after {   content: attr(data-anchorjs-icon); }",e.sheet.cssRules.length),e.sheet.insertRule(' @font-face {   font-family: "anchorjs-icons";   src: url(data:n/a;base64,AAEAAAALAIAAAwAwT1MvMg8yG2cAAAE4AAAAYGNtYXDp3gC3AAABpAAAAExnYXNwAAAAEAAAA9wAAAAIZ2x5ZlQCcfwAAAH4AAABCGhlYWQHFvHyAAAAvAAAADZoaGVhBnACFwAAAPQAAAAkaG10eASAADEAAAGYAAAADGxvY2EACACEAAAB8AAAAAhtYXhwAAYAVwAAARgAAAAgbmFtZQGOH9cAAAMAAAAAunBvc3QAAwAAAAADvAAAACAAAQAAAAEAAHzE2p9fDzz1AAkEAAAAAADRecUWAAAAANQA6R8AAAAAAoACwAAAAAgAAgAAAAAAAAABAAADwP/AAAACgAAA/9MCrQABAAAAAAAAAAAAAAAAAAAAAwABAAAAAwBVAAIAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAMCQAGQAAUAAAKZAswAAACPApkCzAAAAesAMwEJAAAAAAAAAAAAAAAAAAAAARAAAAAAAAAAAAAAAAAAAAAAQAAg//0DwP/AAEADwABAAAAAAQAAAAAAAAAAAAAAIAAAAAAAAAIAAAACgAAxAAAAAwAAAAMAAAAcAAEAAwAAABwAAwABAAAAHAAEADAAAAAIAAgAAgAAACDpy//9//8AAAAg6cv//f///+EWNwADAAEAAAAAAAAAAAAAAAAACACEAAEAAAAAAAAAAAAAAAAxAAACAAQARAKAAsAAKwBUAAABIiYnJjQ3NzY2MzIWFxYUBwcGIicmNDc3NjQnJiYjIgYHBwYUFxYUBwYGIwciJicmNDc3NjIXFhQHBwYUFxYWMzI2Nzc2NCcmNDc2MhcWFAcHBgYjARQGDAUtLXoWOR8fORYtLTgKGwoKCjgaGg0gEhIgDXoaGgkJBQwHdR85Fi0tOAobCgoKOBoaDSASEiANehoaCQkKGwotLXoWOR8BMwUFLYEuehYXFxYugC44CQkKGwo4GkoaDQ0NDXoaShoKGwoFBe8XFi6ALjgJCQobCjgaShoNDQ0NehpKGgobCgoKLYEuehYXAAAADACWAAEAAAAAAAEACAAAAAEAAAAAAAIAAwAIAAEAAAAAAAMACAAAAAEAAAAAAAQACAAAAAEAAAAAAAUAAQALAAEAAAAAAAYACAAAAAMAAQQJAAEAEAAMAAMAAQQJAAIABgAcAAMAAQQJAAMAEAAMAAMAAQQJAAQAEAAMAAMAAQQJAAUAAgAiAAMAAQQJAAYAEAAMYW5jaG9yanM0MDBAAGEAbgBjAGgAbwByAGoAcwA0ADAAMABAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAH//wAP) format("truetype"); }',e.sheet.cssRules.length)}}this.options=A||{},this.elements=[],e(this.options),this.isTouchDevice=function(){return!!("ontouchstart"in window||window.DocumentTouch&&document instanceof DocumentTouch)},this.add=function(A){var n,o,s,a,r,c,h,l,u,d,f,p=[];if(e(this.options),"touch"===(f=this.options.visible)&&(f=this.isTouchDevice()?"always":"hover"),A||(A="h2, h3, h4, h5, h6"),0===(n=t(A)).length)return this;for(i(),o=document.querySelectorAll("[id]"),s=[].map.call(o,function(A){return A.id}),r=0;r<n.length;r++)if(this.hasAnchorJSLink(n[r]))p.push(r);else{if(n[r].hasAttribute("id"))a=n[r].getAttribute("id");else if(n[r].hasAttribute("data-anchor-id"))a=n[r].getAttribute("data-anchor-id");else{u=l=this.urlify(n[r].textContent),h=0;do{void 0!==c&&(u=l+"-"+h),c=s.indexOf(u),h+=1}while(-1!==c);c=void 0,s.push(u),n[r].setAttribute("id",u),a=u}a.replace(/-/g," "),(d=document.createElement("a")).className="anchorjs-link "+this.options.class,d.href="#"+a,d.setAttribute("aria-label",this.options.ariaLabel),d.setAttribute("data-anchorjs-icon",this.options.icon),"always"===f&&(d.style.opacity="1"),""===this.options.icon&&(d.style.font="1em/1 anchorjs-icons","left"===this.options.placement&&(d.style.lineHeight="inherit")),"left"===this.options.placement?(d.style.position="absolute",d.style.marginLeft="-1em",d.style.paddingRight="0.5em",n[r].insertBefore(d,n[r].firstChild)):(d.style.paddingLeft="0.375em",n[r].appendChild(d))}for(r=0;r<p.length;r++)n.splice(p[r]-r,1);return this.elements=this.elements.concat(n),this},this.remove=function(A){for(var e,i,n=t(A),o=0;o<n.length;o++)(i=n[o].querySelector(".anchorjs-link"))&&(-1!==(e=this.elements.indexOf(n[o]))&&this.elements.splice(e,1),n[o].removeChild(i));return this},this.removeAll=function(){this.remove(this.elements)},this.urlify=function(A){var t=/[& +$,:;=?@"#{}|^~[`%!'<>\]\.\/\(\)\*\\]/g;return this.options.truncate||e(this.options),A.trim().replace(/\'/gi,"").replace(t,"-").replace(/-{2,}/g,"-").substring(0,this.options.truncate).replace(/^-+|-+$/gm,"").toLowerCase()},this.hasAnchorJSLink=function(A){var e=A.firstChild&&(" "+A.firstChild.className+" ").indexOf(" anchorjs-link ")>-1,t=A.lastChild&&(" "+A.lastChild.className+" ").indexOf(" anchorjs-link ")>-1;return e||t||!1}}});  </script>
-
+// @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&dn=expat.txt Expat
+//
+// AnchorJS - v4.2.2 - 2020-04-20
+// https://www.bryanbraun.com/anchorjs/
+// Copyright (c) 2020 Bryan Braun; Licensed MIT
+//
+// @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&dn=expat.txt Expat
+!function(A,e){"use strict";"function"==typeof define&&define.amd?define([],e):"object"==typeof module&&module.exports?module.exports=e():(A.AnchorJS=e(),A.anchors=new A.AnchorJS)}(this,function(){"use strict";return function(A){function f(A){A.icon=A.hasOwnProperty("icon")?A.icon:"",A.visible=A.hasOwnProperty("visible")?A.visible:"hover",A.placement=A.hasOwnProperty("placement")?A.placement:"right",A.ariaLabel=A.hasOwnProperty("ariaLabel")?A.ariaLabel:"Anchor",A.class=A.hasOwnProperty("class")?A.class:"",A.base=A.hasOwnProperty("base")?A.base:"",A.truncate=A.hasOwnProperty("truncate")?Math.floor(A.truncate):64,A.titleText=A.hasOwnProperty("titleText")?A.titleText:""}function p(A){var e;if("string"==typeof A||A instanceof String)e=[].slice.call(document.querySelectorAll(A));else{if(!(Array.isArray(A)||A instanceof NodeList))throw new Error("The selector provided to AnchorJS was invalid.");e=[].slice.call(A)}return e}this.options=A||{},this.elements=[],f(this.options),this.isTouchDevice=function(){return!!("ontouchstart"in window||window.DocumentTouch&&document instanceof DocumentTouch)},this.add=function(A){var e,t,i,n,o,s,a,r,c,h,l,u,d=[];if(f(this.options),"touch"===(l=this.options.visible)&&(l=this.isTouchDevice()?"always":"hover"),0===(e=p(A=A||"h2, h3, h4, h5, h6")).length)return this;for(!function(){if(null!==document.head.querySelector("style.anchorjs"))return;var A,e=document.createElement("style");e.className="anchorjs",e.appendChild(document.createTextNode("")),void 0===(A=document.head.querySelector('[rel="stylesheet"],style'))?document.head.appendChild(e):document.head.insertBefore(e,A);e.sheet.insertRule(".anchorjs-link{opacity:0;text-decoration:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}",e.sheet.cssRules.length),e.sheet.insertRule(":hover>.anchorjs-link,.anchorjs-link:focus{opacity:1}",e.sheet.cssRules.length),e.sheet.insertRule("[data-anchorjs-icon]::after{content:attr(data-anchorjs-icon)}",e.sheet.cssRules.length),e.sheet.insertRule('@font-face{font-family:anchorjs-icons;src:url(data:n/a;base64,AAEAAAALAIAAAwAwT1MvMg8yG2cAAAE4AAAAYGNtYXDp3gC3AAABpAAAAExnYXNwAAAAEAAAA9wAAAAIZ2x5ZlQCcfwAAAH4AAABCGhlYWQHFvHyAAAAvAAAADZoaGVhBnACFwAAAPQAAAAkaG10eASAADEAAAGYAAAADGxvY2EACACEAAAB8AAAAAhtYXhwAAYAVwAAARgAAAAgbmFtZQGOH9cAAAMAAAAAunBvc3QAAwAAAAADvAAAACAAAQAAAAEAAHzE2p9fDzz1AAkEAAAAAADRecUWAAAAANQA6R8AAAAAAoACwAAAAAgAAgAAAAAAAAABAAADwP/AAAACgAAA/9MCrQABAAAAAAAAAAAAAAAAAAAAAwABAAAAAwBVAAIAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAMCQAGQAAUAAAKZAswAAACPApkCzAAAAesAMwEJAAAAAAAAAAAAAAAAAAAAARAAAAAAAAAAAAAAAAAAAAAAQAAg//0DwP/AAEADwABAAAAAAQAAAAAAAAAAAAAAIAAAAAAAAAIAAAACgAAxAAAAAwAAAAMAAAAcAAEAAwAAABwAAwABAAAAHAAEADAAAAAIAAgAAgAAACDpy//9//8AAAAg6cv//f///+EWNwADAAEAAAAAAAAAAAAAAAAACACEAAEAAAAAAAAAAAAAAAAxAAACAAQARAKAAsAAKwBUAAABIiYnJjQ3NzY2MzIWFxYUBwcGIicmNDc3NjQnJiYjIgYHBwYUFxYUBwYGIwciJicmNDc3NjIXFhQHBwYUFxYWMzI2Nzc2NCcmNDc2MhcWFAcHBgYjARQGDAUtLXoWOR8fORYtLTgKGwoKCjgaGg0gEhIgDXoaGgkJBQwHdR85Fi0tOAobCgoKOBoaDSASEiANehoaCQkKGwotLXoWOR8BMwUFLYEuehYXFxYugC44CQkKGwo4GkoaDQ0NDXoaShoKGwoFBe8XFi6ALjgJCQobCjgaShoNDQ0NehpKGgobCgoKLYEuehYXAAAADACWAAEAAAAAAAEACAAAAAEAAAAAAAIAAwAIAAEAAAAAAAMACAAAAAEAAAAAAAQACAAAAAEAAAAAAAUAAQALAAEAAAAAAAYACAAAAAMAAQQJAAEAEAAMAAMAAQQJAAIABgAcAAMAAQQJAAMAEAAMAAMAAQQJAAQAEAAMAAMAAQQJAAUAAgAiAAMAAQQJAAYAEAAMYW5jaG9yanM0MDBAAGEAbgBjAGgAbwByAGoAcwA0ADAAMABAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAH//wAP) format("truetype")}',e.sheet.cssRules.length)}(),t=document.querySelectorAll("[id]"),i=[].map.call(t,function(A){return A.id}),o=0;o<e.length;o++)if(this.hasAnchorJSLink(e[o]))d.push(o);else{if(e[o].hasAttribute("id"))n=e[o].getAttribute("id");else if(e[o].hasAttribute("data-anchor-id"))n=e[o].getAttribute("data-anchor-id");else{for(c=r=this.urlify(e[o].textContent),a=0;void 0!==s&&(c=r+"-"+a),a+=1,-1!==(s=i.indexOf(c)););s=void 0,i.push(c),e[o].setAttribute("id",c),n=c}(h=document.createElement("a")).className="anchorjs-link "+this.options.class,h.setAttribute("aria-label",this.options.ariaLabel),h.setAttribute("data-anchorjs-icon",this.options.icon),this.options.titleText&&(h.title=this.options.titleText),u=document.querySelector("base")?window.location.pathname+window.location.search:"",u=this.options.base||u,h.href=u+"#"+n,"always"===l&&(h.style.opacity="1"),""===this.options.icon&&(h.style.font="1em/1 anchorjs-icons","left"===this.options.placement&&(h.style.lineHeight="inherit")),"left"===this.options.placement?(h.style.position="absolute",h.style.marginLeft="-1em",h.style.paddingRight="0.5em",e[o].insertBefore(h,e[o].firstChild)):(h.style.paddingLeft="0.375em",e[o].appendChild(h))}for(o=0;o<d.length;o++)e.splice(d[o]-o,1);return this.elements=this.elements.concat(e),this},this.remove=function(A){for(var e,t,i=p(A),n=0;n<i.length;n++)(t=i[n].querySelector(".anchorjs-link"))&&(-1!==(e=this.elements.indexOf(i[n]))&&this.elements.splice(e,1),i[n].removeChild(t));return this},this.removeAll=function(){this.remove(this.elements)},this.urlify=function(A){return this.options.truncate||f(this.options),A.trim().replace(/\'/gi,"").replace(/[& +$,:;=?@"#{}|^~[`%!'<>\]\.\/\(\)\*\\\n\t\b\v]/g,"-").replace(/-{2,}/g,"-").substring(0,this.options.truncate).replace(/^-+|-+$/gm,"").toLowerCase()},this.hasAnchorJSLink=function(A){var e=A.firstChild&&-1<(" "+A.firstChild.className+" ").indexOf(" anchorjs-link "),t=A.lastChild&&-1<(" "+A.lastChild.className+" ").indexOf(" anchorjs-link ");return e||t||!1}}});
+// @license-end
+  </script>
   <script>
 /*
   $(document).ready(function() {

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

@@ -104,6 +104,8 @@ style='mso-ansi-language:EN-US'>
 <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>
 
+<div id="sourcebox"/>
+
 <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

@@ -1561,7 +1561,7 @@ p.Tablebody, li.Tablebody, div.Tablebody
         mso-level-tab-stop:none;
         mso-level-number-position:left;
         margin-left:1.4cm;
-	text-indent:-0.7cm;}
+	text-indent:-1.4cm;}
 @list l4:level2
         {mso-level-text:"%2\)";
         mso-level-number-format:alpha-lower;

data/lib/isodoc/itu/metadata.rb

@@ -15,8 +15,10 @@ module IsoDoc
       end
 
       def title(isoxml, _out)
-        main = isoxml&.at(ns("//bibdata/title[@language='en']"))&.text
+        main = isoxml&.at(ns("//bibdata/title[@language='#{@lang}'][@type = 'main']"))&.text
         set(:doctitle, main)
+        main = isoxml&.at(ns("//bibdata/title[@language='#{@lang}'][@type = 'subtitle']"))&.text
+        set(:docsubtitle, main)
         series = isoxml&.at(ns("//bibdata/series[@type='main']/title"))&.text
         set(:series, series)
         series1 =

data/lib/isodoc/itu/ref.rb

@@ -18,7 +18,8 @@ module IsoDoc
 
       def nonstd_bibitem(list, b, ordinal, biblio)
         list.p **attr_code(iso_bibitem_entry_attrs(b, biblio)) do |ref|
-          ref << "[#{render_identifier(bibitem_ref_code(b))}]"
+          id = render_identifier(bibitem_ref_code(b))
+          ref << (id[0] || "[#{id[1]}]")
           date_note_process(b, ref)
           insert_tab(ref, 1)
           reference_format(b, ref)
@@ -29,6 +30,12 @@ module IsoDoc
         nonstd_bibitem(list, b, ordinal, biblio)
       end
 
+      def bracket_if_num(x)
+      return nil if x.nil?
+      x = x.text.sub(/^\[/, "").sub(/\]$/, "")
+      "[#{x}]"
+    end
+
       def reference_format(b, r)
         reference_format_start(b, r)
         reference_format_title(b, r)
@@ -38,20 +45,13 @@ module IsoDoc
         s.gsub(/ |\_|\-/, " ").split(/ /).map(&:capitalize).join(" ")
       end
 
-      IGNORE_IDS =
-        "@type = 'DOI' or @type = 'ISSN' or @type = 'ISBN' or @type = 'rfc-anchor'".freeze
-
-      def bibitem_ref_code(b)
-        id = b.at(ns("./docidentifier[@type = 'metanorma']"))
-        id ||= b.at(ns("./docidentifier[@type = 'ITU']"))
-        id ||= b.at(ns("./docidentifier[not(#{IGNORE_IDS})]"))
-        id ||= b.at(ns("./docidentifier"))
-        return id if id
-        id = Nokogiri::XML::Node.new("docidentifier", b.document)
-        id.text = "(NO ID)"
-        id
+      def pref_ref_code(b)
+        b.at(ns("./docidentifier[@type = 'ITU']")) || super
       end
 
+      IGNORE_IDS =
+  "@type = 'DOI' or @type = 'ISSN' or @type = 'ISBN' or @type = 'rfc-anchor'".freeze
+
       def multi_bibitem_ref_code(b)
         id = b.xpath(ns("./docidentifier[not(@type = 'metanorma' or #{IGNORE_IDS})]"))
         id.empty? and id = b.xpath(ns("./docidentifier[not(@type = 'metanorma')]"))
@@ -59,7 +59,7 @@ module IsoDoc
         id.sort_by { |i| i["type"] == "ITU" ? 0 : 1 }
       end
 
-      def render_identifiers(ids)
+      def render_multi_identifiers(ids)
         ids.map do |id|
           id["type"] == "ITU" ? doctype_title(id) : 
             docid_prefix(id["type"], id.text.sub(/^\[/, "").sub(/\]$/, ""))
@@ -78,7 +78,7 @@ module IsoDoc
 
       def reference_format_start(b, r)
         id = multi_bibitem_ref_code(b)
-        id1 = render_identifiers(id)
+        id1 = render_multi_identifiers(id)
         r << id1
         date = b.at(ns("./date[@type = 'published']")) and
           r << " (#{date.text.sub(/-.*$/, '')})"
@@ -97,8 +97,9 @@ module IsoDoc
         end
       end
 
-      def format_ref(ref, prefix, isopub, date, allparts)
-        docid_prefix(prefix, ref).sub(/^\[/, "").sub(/\]$/, "")
+      def reference_names(ref)
+        super
+        @anchors[ref["id"]] = { xref: @anchors[ref["id"]][:xref].sub(/^\[/, '').sub(/\]$/, '') }
       end
     end
   end

data/lib/isodoc/itu/word_convert.rb

@@ -48,7 +48,7 @@ module IsoDoc
         kw.nil? || kw.empty? and return
         out.div do |div|
           clause_name(nil, "Keywords", div,  class: "IntroTitle")
-          div.p kw.sort.join(", ") + "."
+          div.p kw.join(", ") + "."
         end
       end
 
@@ -105,12 +105,15 @@ module IsoDoc
         super
         abstractbox = docxml.at("//div[@id='abstractbox']")
         historybox = docxml.at("//div[@id='historybox']")
+        sourcebox = docxml.at("//div[@id='sourcebox']")
         keywordsbox = docxml.at("//div[@id='keywordsbox']")
         abstract = docxml.at("//p[@class = 'h1Preface' and text() = 'Summary']/..")
         history = docxml.at("//p[@class = 'h1Preface' and text() = 'History']/..")
+        source = docxml.at("//p[@class = 'h1Preface' and text() = 'Source']/..")
         keywords = docxml.at("//p[@class = 'h1Preface' and text() = 'Keywords']/..")
         abstract.parent = abstractbox if abstract && abstractbox
         history.parent = historybox if history && historybox
+        source.parent = sourcebox if source && sourcebox
         keywords.parent = keywordsbox if keywords && keywordsbox
       end
 

data/lib/metanorma/itu/processor.rb

@@ -3,7 +3,11 @@ require "metanorma/processor"
 module Metanorma
   module ITU
     def self.fonts_used
-      ["Arial", "Courier New", "Times New Roman"]
+      {
+        html: ["Arial", "Courier New", "Times New Roman"],
+        doc: ["Arial", "Courier New", "Times New Roman"],
+        pdf: ["Arial", "Courier New", "Times New Roman"]
+      }
     end
 
     class Processor < Metanorma::Processor

data/lib/metanorma/itu/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ITU
-    VERSION = "1.0.15"
+    VERSION = "1.0.16"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-itu
 version: !ruby/object:Gem::Version
-  version: 1.0.15
+  version: 1.0.16
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-13 00:00:00.000000000 Z
+date: 2020-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -269,7 +269,6 @@ files:
 - lib/isodoc/itu/html/itu.scss
 - lib/isodoc/itu/html/logo.png
 - lib/isodoc/itu/html/scripts.html
-- lib/isodoc/itu/html/scripts.pdf.html
 - lib/isodoc/itu/html/word_itu_intro.html
 - lib/isodoc/itu/html/word_itu_titlepage.html
 - lib/isodoc/itu/html/wordstyle.scss

data/lib/isodoc/itu/html/scripts.pdf.html

@@ -1,72 +0,0 @@
-  <script>
-    //TOC generation
-      $('#toc').toc({
-          'selectors': toclevel(), //elements to use as headings
-          'container': 'main', //element to find all selectors in
-          'smoothScrolling': true, //enable or disable smooth scrolling on click
-          'prefix': 'toc', //prefix for anchor tags and class names
-          'onHighlight': function(el) {}, //called when a new section is highlighted 
-          'highlightOnScroll': false, //add class to heading that is currently in focus
-          'highlightOffset': 100, //offset to trigger the next headline
-          'anchorName': function(i, heading, prefix) { //custom function for anchor name
-              return prefix+i;
-          },
-          'headerText': function(i, heading, $heading) { //custom function building the header-item text
-              return $heading.text();
-          },
-      'itemClass': function(i, heading, $heading, prefix) { // custom function for item class
-        return $heading[0].tagName.toLowerCase();
-      }
-      });
-      
-  </script>
-
-<script>
-  //TOC toggle animation
-$('#toggle').on('click', function(){
-    if( $('nav').is(':visible') ) {
-        $('nav').animate({ 'left': '-353px' }, 'slow', function(){
-            $('nav').hide();
-        });
-        $('.container').animate({ 'padding-left': '31px' }, 'slow');
-    }
-    else {
-        $('nav').show();
-        $('nav').animate({ 'left': '0px' }, 'slow');
-        $('.container').animate({ 'padding-left': '360px' }, 'slow');
-    }
-});
-</script>
-
-<script>
-    // Scroll to top button
-    window.onscroll = function() {scrollFunction()};
-    
-    function scrollFunction() {
-        if (document.body.scrollTop > 100 || document.documentElement.scrollTop > 100) {
-            document.getElementById("myBtn").style.display = "block";
-        } else {
-            document.getElementById("myBtn").style.display = "none";
-        }
-    }
-    
-    // When the user clicks on the button, scroll to the top of the document
-    function topFunction() {
-        document.body.scrollTop = 0;
-        document.documentElement.scrollTop = 0;
-    }
-    </script>
-
-  <script>
-/*
-  $(document).ready(function() {
-          $('[id^=toc]').each(function ()
-          {
-             var currentToc = $(this);
-       var url = window.location.href;
-             currentToc.wrap("<a href='" + url + "#" + currentToc.attr("id") + "' </a>");
-          });
-});
-*/
-</script>
-