metanorma-itu 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a01b41f5c9f8d50fb914d13b31886549d419b83e8d034c0ca4e5d9e994761432
-  data.tar.gz: e800c96be0ffd2c15c1843a2f40a43b794db520d7ce4f49eb00bab5ad83f3598
+  metadata.gz: 66a239389cf1af0edc1da2b0e4544f410ac653fddc89d067a144e77b57b2eef5
+  data.tar.gz: '0891530512830674abbf98a184c40f02316049e53098769910fb662597e7c5be'
 SHA512:
-  metadata.gz: e3c84c117a175f638dc17acd752d9fa6009e0d211b7b2c36490c53f4d6325515ec901790266ad3f3222d20a0f47a9c2cf899b0d90fa9c395f3e5c31b546d3d91
-  data.tar.gz: 8b72c08d2ff1bd1933c1bb0227d99768b202f2671d217b556e39de208f67d112f09c1ebba12d4f90699ecc3be02c04e384aae470687c235b24a1b8a711e66b33
+  metadata.gz: 61b16c2f290c2969a3c21f2bc1bc4f16e55bc50b847bd4a51c1562f34614f9865a591a4f41dc6759ed4300db2061b1484f2aa4d1b7281b853638ce22dc491919
+  data.tar.gz: c17a28663f612e773f092521e09df621d78fec768c4bbbb8bb8b62d4f5afdb5544a351297f406cba48428823502d74a54ce4291359c0cc7b53c49477a88dc532

data/README.adoc

@@ -66,7 +66,6 @@ See https://www.metanorma.com/author/itu/[Write ITU-T documents with Metanorma].
 
 == Examples
 
-* link:spec/examples/rfc6350.adoc[] is an Metanorma Asciidoctor version of https://tools.ietf.org/html/rfc6350[RFC 6350].
-* link:spec/examples/rfc6350.html[] is an HTML file generated from the Asciidoctor.
-* link:spec/examples/rfc6350.doc[] is a Word document generated from the Asciidoctor.
+* Example documents are avalable at the https://github.com/metanorma/mn-samples-itu[mn-samples-itu] repository.
+* Document templates are available at the https://github.com/metanorma/mn-templates-itu[mn-templates-itu] repository.
 

data/lib/asciidoctor/itu/basicdoc.rng

@@ -284,6 +284,9 @@
       <attribute name="id">
         <data type="ID"/>
       </attribute>
+      <optional>
+        <attribute name="alt"/>
+      </optional>
       <optional>
         <ref name="tname"/>
       </optional>

data/lib/asciidoctor/itu/biblio.rng

@@ -278,10 +278,12 @@
   </define>
   <define name="organization">
     <element name="organization">
-      <ref name="orgname"/>
-      <optional>
+      <oneOrMore>
+        <ref name="orgname"/>
+      </oneOrMore>
+      <zeroOrMore>
         <ref name="subdivision"/>
-      </optional>
+      </zeroOrMore>
       <optional>
         <ref name="abbreviation"/>
       </optional>
@@ -357,6 +359,9 @@
   </define>
   <define name="phone">
     <element name="phone">
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <text/>
     </element>
   </define>
@@ -1024,6 +1029,8 @@
       <value>correctedBy</value>
       <value>revises</value>
       <value>revisedBy</value>
+      <value>describes</value>
+      <value>describedBy</value>
     </choice>
   </define>
   <define name="docrelation">

data/lib/asciidoctor/itu/cleanup.rb

@@ -88,6 +88,31 @@ module Asciidoctor
           biblio_reorder1(r)
         end
       end
+
+      def boilerplate_cleanup(xmldoc)
+        super
+        initial_boilerplate(xmldoc)
+      end
+
+      def initial_boilerplate(x)
+        return if x.at("//boilerplate")
+        preface = x.at("//preface") || x.at("//sections") || x.at("//annex") ||
+          x.at("//references") || return
+        preface.previous = boilerplate(x)
+      end
+
+       def boilerplate(x_orig)
+        x = x_orig.dup
+        # TODO variable
+        x.root.add_namespace(nil, Metanorma::ITU::DOCUMENT_NAMESPACE)
+        x = Nokogiri::XML(x.to_xml)
+        conv = IsoDoc::ITU::HtmlConvert.new({})
+        conv.metadata_init("en", "Latn", {})
+        conv.info(x, nil)
+        file = @boilerplateauthority ? "#{@localdir}/#{@boilerplateauthority}" :
+          File.join(File.dirname(__FILE__), "itu_intro.xml")
+          conv.populate_template((File.read(file, encoding: "UTF-8")), nil)
+      end
     end
   end
 end

data/lib/asciidoctor/itu/converter.rb

@@ -43,7 +43,9 @@ module Asciidoctor
       end
 
       def doctype(node)
-        node.attr("doctype") || "recommendation"
+        ret = node.attr("doctype") || "recommendation"
+        ret = "recommendation" if ret == "article"
+        ret
       end
 
       def olist(node)

data/lib/asciidoctor/itu/isostandard.rng

@@ -6,7 +6,9 @@
     </start>
     <define name="organization">
       <element name="organization">
-        <ref name="orgname"/>
+        <oneOrMore>
+          <ref name="orgname"/>
+        </oneOrMore>
         <optional>
           <ref name="abbreviation"/>
         </optional>

data/lib/asciidoctor/itu/itu.rng

@@ -147,13 +147,13 @@
         </oneOrMore>
       </element>
     </define>
-    <define name="TextElement" combine="choice">
-      <choice>
-        <ref name="add"/>
-        <ref name="del"/>
-      </choice>
-    </define>
   </include>
+  <define name="TextElement" combine="choice">
+    <choice>
+      <ref name="add"/>
+      <ref name="del"/>
+    </choice>
+  </define>
   <define name="add">
     <element name="add">
       <choice>

data/lib/asciidoctor/itu/itu_intro.xml

@@ -0,0 +1,48 @@
+<boilerplate>
+  <legal-statement>
+    <clause>
+      <title>FOREWORD</title>
+<p>The International Telecommunication Union (ITU) is the United Nations specialized agency in the field of telecommunications , information and communication technologies (ICTs). The ITU Telecommunication Standardization Sector (ITU-T) is a permanent organ of ITU. ITU-T is responsible for studying technical, operating and tariff questions and issuing Recommendations on them with a view to standardizing telecommunications on a worldwide basis.</p>
+<p>The World Telecommunication Standardization Assembly (WTSA), which meets every four years, establishes the topics for study by the ITU T study groups which, in turn, produce Recommendations on these topics.</p>
+<p>The approval of ITU-T Recommendations is covered by the procedure laid down in WTSA Resolution 1 .</p>
+<p>In some areas of information technology which fall within ITU-T's purview, the necessary standards are prepared on a collaborative basis with ISO and IEC.</p>
+
+
+<clause>
+<title>NOTE</title>
+<p>In this Recommendation, the expression "Administration" is used for conciseness to indicate both a telecommunication administration and a recognized operating agency .</p>
+<p>Compliance with this Recommendation is voluntary. However, the Recommendation may contain certain mandatory provisions (to ensure, e.g., interoperability or applicability) and compliance with the Recommendation is achieved when all of these mandatory provisions are met. The words "shall" or some other obligatory language such as "must" and the negative equivalents are used to express requirements. The use of such words does not suggest that compliance with the Recommendation is required of any party .</p>
+</clause>
+    </clause>
+
+    {% if unpublished %}
+    <clause id="draft-warning">
+      <title>CAUTION! PREPUBLISHED {{ doctype  | upcase }}</title>
+      <p>This
+        prepublication is an unedited version of a recently approved {{doctype}}.
+  It will be replaced by the published version after editing. Therefore,
+  there will be differences between this prepublication and the published
+  version.</p>
+    </clause>
+    {% endif %}
+  </legal-statement>
+
+  <copyright-statement>
+    <clause>
+      <p>&copy; ITU {{ docyear }}</p>
+<p>All rights reserved. No part of this publication may be reproduced, by any means whatsoever, without the prior written permission of ITU.</p>
+    </clause>
+  </copyright-statement>
+
+  <license-statement>
+    <clause>
+      <title>INTELLECTUAL PROPERTY RIGHTS</title>
+      <p>ITU draws attention to the possibility that the practice or implementation of this Recommendation may involve the use of a claimed Intellectual Property Right. ITU takes no position concerning the evidence, validity or applicability of claimed Intellectual Property Rights, whether asserted by ITU members or others outside of the Recommendation development process.</p>
+<p>As of the date of approval of this Recommendation, ITU had {% if ip_notice_received %}{% else %}not{% endif %} received notice of intellectual property, protected by patents, which may be required to implement this Recommendation. However, implementers are cautioned that this may not represent the latest information and are therefore strongly urged to consult the TSB patent database at <link target="http://www.itu.int/ITU-T/ipr/"/>.
+</p>
+</clause>
+</license-statement>
+</boilerplate>
+
+
+

data/lib/isodoc/itu/base_convert.rb

@@ -176,6 +176,18 @@ module IsoDoc
         case node.name
         when "add" then add_parse(node, out)
         when "del" then del_parse(node, out)
+        when "copyright-statement"
+          out.div **{class: "copyright"} do |div|
+            node.children.each { |n| parse(n, div) }
+          end
+        when "license-statement"
+          out.div **{class: "license"} do |div|
+            node.children.each { |n| parse(n, out) }
+          end
+        when "legal-statement"
+          out.div **{class: "legal"} do |div|
+            node.children.each { |n| parse(n, out) }
+          end
         else
           super
         end
@@ -199,6 +211,22 @@ module IsoDoc
         end
         node.children.each { |n| parse(n, div) }
       end
+
+      def boilerplate(node, out)
+        boilerplate = node.at(ns("//boilerplate")) or return
+        out.div **{class: "authority"} do |s|
+          boilerplate.children.each do |n|
+            if n.name == "title"
+              s.h1 do |h|
+                n.children.each { |nn| parse(nn, h) }
+              end
+            else
+              parse(n, s)
+            end
+          end
+        end
+      end
+
     end
   end
 end

data/lib/isodoc/itu/html/html_itu_intro.html

@@ -1,37 +1,5 @@
-<p>FOREWORD</p>
-<p>The International Telecommunication Union (ITU) is the United Nations specialized agency in the field of telecommunications , information and communication technologies (ICTs). The ITU Telecommunication Standardization Sector (ITU-T) is a permanent organ of ITU. ITU-T is responsible for studying technical, operating and tariff questions and issuing Recommendations on them with a view to standardizing telecommunications on a worldwide basis.</p>
-<p>The World Telecommunication Standardization Assembly (WTSA), which meets every four years, establishes the topics for study by the ITU T study groups which, in turn, produce Recommendations on these topics.</p>
-<p>The approval of ITU-T Recommendations is covered by the procedure laid down in WTSA Resolution 1 .</p>
-<p>In some areas of information technology which fall within ITU-T's purview, the necessary standards are prepared on a collaborative basis with ISO and IEC.</p>
-
-
-
-<p>NOTE</p>
-<p>In this Recommendation, the expression "Administration" is used for conciseness to indicate both a telecommunication administration and a recognized operating agency .</p>
-<p>Compliance with this Recommendation is voluntary. However, the Recommendation may contain certain mandatory provisions (to ensure, e.g., interoperability or applicability) and compliance with the Recommendation is achieved when all of these mandatory provisions are met. The words "shall" or some other obligatory language such as "must" and the negative equivalents are used to express requirements. The use of such words does not suggest that compliance with the Recommendation is required of any party .</p>
-
-
-
-
-<p>INTELLECTUAL PROPERTY RIGHTS</p>
-<p>ITU draws attention to the possibility that the practice or implementation of this Recommendation may involve the use of a claimed Intellectual Property Right. ITU takes no position concerning the evidence, validity or applicability of claimed Intellectual Property Rights, whether asserted by ITU members or others outside of the Recommendation development process.</p>
-{% if unpublished %}
-<p>As of the date of approval of this Recommendation, ITU [had/had not] received notice of intellectual property, protected by patents, which may be required to implement this Recommendation. However, implementers are cautioned that this may not represent the latest information and are therefore strongly urged to consult the TSB patent database at <a href="http://www.itu.int/ITU-T/ipr/">http://www.itu.int/ITU-T/ipr/</a>.
-</p>
-{% else %}
-{% if ip_notice_received %}
-<p>As of the date of approval of this Recommendation, ITU had received notice of intellectual property, protected by patents, which may be required to implement this Recommendation. However, implementers are cautioned that this may not represent the latest information and are therefore strongly urged to consult the TSB patent database at <a href="http://www.itu.int/ITU-T/ipr/">http://www.itu.int/ITU-T/ipr/</a>.
-</p>
-{% else %}
-<p>As of the date of approval of this Recommendation, ITU had not received notice of intellectual property, protected by patents, which may be required to implement this Recommendation. However, implementers are cautioned that this may not represent the latest information and are therefore strongly urged to consult the TSB patent database at <a href="http://www.itu.int/ITU-T/ipr/">http://www.itu.int/ITU-T/ipr/</a>.
-</p>
-{% endif %}
-{% endif %}
-
-
-
-<p>&copy; ITU 2019</p>
-<p>All rights reserved. No part of this publication may be reproduced, by any means whatsoever, without the prior written permission of ITU.</p>
+<div id="legal"/>
+<div id="license"/>
 
 
 

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

@@ -30,9 +30,9 @@
             {% if edition %} <div> Revision {{ edition }}</div> {% endif %}
             <div> {{ draftinfo }}</div>
           </div>
-           {% if annexid %}
-           <div class="doc-identifier">{{annexid}}</div>
-           {% endif %}
+          {% if annexid %}
+          <div class="doc-identifier">{{annexid}}</div>
+          {% endif %}
           <div class="publication-month">
             ({{ pubdate_monthyear }})
           </div>
@@ -72,8 +72,8 @@
         {% endif %}
         <div>
           <span class="doc-type">{% if stage == "Draft" %}Draft {% endif %}{{ doctype }}</span>
-        <span class="ITU-sector">ITU-{{ bureau }}</span>
-        <span class="doc-identifier">{{ docnumber }}</span>
+          <span class="ITU-sector">ITU-{{ bureau }}</span>
+          <span class="doc-identifier">{{ docnumber }}</span>
         </div>
 
       </div>
@@ -95,54 +95,31 @@
         <span class="coverpage-maturity" id="{{ stage }}">{{ stage }}</span>
 
         </div>
-      -->
-
+        -->
 
-      {% if unpublished %}
-      <div class="coverpage-warning">
-        <span class="title">Warning for Drafts</span>
+<div class="coverpage-warning">
+        <div class="draft-warning"/>
+        </div>
 
-        <p class="content">
-        This
-        prepublication is an unedited version of a recently approved Recommendation.
-        It will be replaced by the published version after editing. Therefore,
-        there will be differences between this prepublication and the published
-        version.
-        </p> 
-      </div>
-      {% endif %}
-
-      <div class="info-section">
-        <div class="copyright">
-
-          <p class="year"> 
-          &copy; {{ docyear }} ITU.
-          </p>
-
-          <p class="message">
-          All rights reserved. Unless otherwise specified, no part of this
-          publication may be reproduced or utilized otherwise in any form or by any
-          means, electronic or mechanical, including photocopying, or posting on the
-          internet or an intranet, without prior written permission. Permission can
-          be requested from the address below.
-          </p> 
-
-          <div class="contact-info">
-            <p class="name">International Telecommunication Union</p>
-            <p class="address">
-            Place des Nations 
-            1211 Geneva 20 Switzerland
-            <br />
-            <a href="mailto:itumail@itu.int">itumail@itu.int</a><br />
-            <a href="www.itu.int">www.itu.int</a>
-            </p>
-          </div>
+<div class="info-section">
+  <div id="copyright"/>
+
+    <div class="contact-info">
+      <p class="name">International Telecommunication Union</p>
+      <p class="address">
+      Place des Nations 
+      1211 Geneva 20 Switzerland
+      <br />
+      <a href="mailto:itumail@itu.int">itumail@itu.int</a><br />
+      <a href="www.itu.int">www.itu.int</a>
+      </p>
+    </div>
 
 
-        </div>
+  </div>
 
-        <div class="rule"></div>
-      </div>
+  <div class="rule"></div>
+</div>
     </div>
 
 

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

@@ -1000,6 +1000,10 @@ span.doc-title {
   border-radius: 25px;
   }
 
+  .coverpage-warning h1 {
+    margin-top: 0em;
+  }
+
   .coverpage-warning .title {
     font-family: $bodyfont;
     font-weight: 300;

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

@@ -762,6 +762,25 @@ p.RecNo, li.RecNo, div.RecNo
 	mso-fareast-language:EN-US;
 	font-weight:bold;
 	mso-bidi-font-weight:normal;}
+p.boilerplateHdr {
+        text-align:center;
+	font-family:$bodyfont;
+	font-size:11.0pt;
+}
+p.boilerplate {
+	font-family:$bodyfont;
+	font-size:11.0pt;
+	text-align:justify;
+         margin-top:6.0pt;
+         margin-bottom:0.0pt;
+}
+p.draftwarningHdr {
+text-align:center;
+font-family:$bodyfont;
+font-weight:bold;
+	font-size:16.0pt;
+        font-style:italic;
+}
 span.addition {
         color: blue;
 }

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

@@ -125,162 +125,9 @@ style='mso-ansi-language:EN-US'><o:p>&nbsp;</o:p></span></span></p>
 <p><br clear=all
          style='page-break-before:always'></p>
 
-<p class=MsoNormal align=center style='margin-top:24.0pt;text-align:center'><span
-style='mso-bookmark:_Hlk526346232'><span lang=EN-US style='font-size:11.0pt;
-mso-bidi-font-size:10.0pt;mso-ansi-language:EN-US'>FOREWORD<o:p></o:p></span></span></p>
-
-<p class=MsoNormal><span style='mso-bookmark:_Hlk526346232'><span lang=EN-US
-style='font-size:11.0pt;mso-bidi-font-size:10.0pt;mso-ansi-language:EN-US'>The
-International Telecommunication Union (ITU) is the United Nations specialized
-agency in the field of tele­com­mu­ni­ca­tions</span></span><span
-style='mso-bookmark:_Hlk526346232'><span lang=EN-US style='font-size:11.0pt;
-mso-ansi-language:EN-US'>, information and communication technologies (ICTs).</span></span><span
-style='mso-bookmark:_Hlk526346232'><span lang=EN-US style='font-size:11.0pt;
-mso-bidi-font-size:10.0pt;mso-ansi-language:EN-US'> The ITU Telecommunication
-Standardization Sector (ITU-T) is a permanent organ of ITU. ITU-T is
-responsible for studying technical, operating and tariff questions and issuing
-Recommendations on them with a view to standardizing telecommunications on a
-worldwide basis.<o:p></o:p></span></span></p>
-
-<p class=MsoNormal><span style='mso-bookmark:_Hlk526346232'><span lang=EN-US
-style='font-size:11.0pt;mso-bidi-font-size:10.0pt;mso-ansi-language:EN-US'>The <a
-name=iitexte>World Telecommunication Standardization Assembly (WTSA), which
-meets every four years, establishes the topics for study by the ITU‑T study
-groups which, in turn, produce Recommendations on these topics.<o:p></o:p></a></span></span></p>
-
-<p class=MsoNormal><span style='mso-bookmark:_Hlk526346232'><span
-style='mso-bookmark:iitexte'><span lang=EN-US style='font-size:11.0pt;
-mso-bidi-font-size:10.0pt;mso-ansi-language:EN-US'>The approval of ITU-T
-Recommendations is covered by the procedure laid down in WTSA Resolution&nbsp;1</span></span></span><span
-style='mso-bookmark:_Hlk526346232'><span lang=EN-US style='font-size:11.0pt;
-mso-bidi-font-size:10.0pt;mso-ansi-language:EN-US'>.<o:p></o:p></span></span></p>
-
-<p class=MsoNormal><span style='mso-bookmark:_Hlk526346232'><span lang=EN-US
-style='font-size:11.0pt;mso-bidi-font-size:10.0pt;mso-ansi-language:EN-US'>In
-some areas of information technology which fall within ITU-T's purview, the
-necessary standards are prepared on a collaborative basis with ISO and IEC.<o:p></o:p></span></span></p>
-
-<p class=MsoNormal align=center style='text-align:center'><span
-style='mso-bookmark:_Hlk526346232'><span lang=EN-US style='font-size:11.0pt;
-mso-bidi-font-size:10.0pt;mso-ansi-language:EN-US'><o:p>&nbsp;</o:p></span></span></p>
-
-<p class=MsoNormal align=center style='text-align:center'><span
-style='mso-bookmark:_Hlk526346232'><span lang=EN-US style='font-size:11.0pt;
-mso-bidi-font-size:10.0pt;mso-ansi-language:EN-US'><o:p>&nbsp;</o:p></span></span></p>
-
-<p class=MsoNormal align=center style='text-align:center'><span
-style='mso-bookmark:_Hlk526346232'><span lang=EN-US style='font-size:11.0pt;
-mso-bidi-font-size:10.0pt;mso-ansi-language:EN-US'><o:p>&nbsp;</o:p></span></span></p>
-
-<p class=MsoNormal align=center style='text-align:center'><span
-style='mso-bookmark:_Hlk526346232'><span lang=EN-US style='font-size:11.0pt;
-mso-bidi-font-size:10.0pt;mso-ansi-language:EN-US'>NOTE<o:p></o:p></span></span></p>
-
-<p class=MsoNormal style='margin-top:9.0pt'><span style='mso-bookmark:_Hlk526346232'><span
-lang=EN-GB style='font-size:11.0pt;mso-bidi-font-size:10.0pt'>In <a
-name=iitextea>this Recommendation, the expression &quot;Administration&quot; is
-used for conciseness to indicate both a telecommunication administration and a
-recognized operating agency</a></span></span><span style='mso-bookmark:_Hlk526346232'><span
-style='mso-bookmark:iitextea'><span lang=EN-US style='font-size:11.0pt;
-mso-bidi-font-size:10.0pt;mso-ansi-language:EN-US'>.<o:p></o:p></span></span></span></p>
-
-<p class=MsoNormal style='margin-top:9.0pt'><span style='mso-bookmark:_Hlk526346232'><span
-style='mso-bookmark:iitextea'><span lang=EN-US style='font-size:11.0pt;
-mso-bidi-font-size:10.0pt;mso-ansi-language:EN-US'>Compliance with this
-Recommendation is voluntary. However, the Recommendation may contain certain
-mandatory provisions (to ensure, e.g., interoperability or applicability) and
-compliance with the Recommendation is achieved when all of these mandatory
-provisions are met. The words &quot;shall&quot; or some other obligatory
-language such as &quot;must&quot; and the negative equivalents are used to
-express requirements. The use of such words does not suggest that compliance
-with the Recommendation is required of any party</span></span></span><span
-style='mso-bookmark:_Hlk526346232'><span lang=EN-US style='font-size:11.0pt;
-mso-bidi-font-size:10.0pt;mso-ansi-language:EN-US'>.<o:p></o:p></span></span></p>
-
-<p class=MsoNormal align=center style='text-align:center'><span
-style='mso-bookmark:_Hlk526346232'><span lang=EN-US style='font-size:11.0pt;
-mso-bidi-font-size:10.0pt;mso-ansi-language:EN-US'><o:p>&nbsp;</o:p></span></span></p>
-
-<p class=MsoNormal align=center style='text-align:center'><span
-style='mso-bookmark:_Hlk526346232'><span lang=EN-US style='font-size:11.0pt;
-mso-bidi-font-size:10.0pt;mso-ansi-language:EN-US'><o:p>&nbsp;</o:p></span></span></p>
-
-<p class=MsoNormal align=center style='text-align:center'><span
-style='mso-bookmark:_Hlk526346232'><span lang=EN-US style='font-size:11.0pt;
-mso-bidi-font-size:10.0pt;mso-ansi-language:EN-US'><o:p>&nbsp;</o:p></span></span></p>
-
-<p class=MsoNormal align=center style='text-align:center'><span
-style='mso-bookmark:_Hlk526346232'><span lang=EN-US style='font-size:11.0pt;
-mso-bidi-font-size:10.0pt;mso-ansi-language:EN-US'><o:p>&nbsp;</o:p></span></span></p>
-
-<p class=MsoNormal align=center style='text-align:center'><span
-style='mso-bookmark:_Hlk526346232'><span lang=EN-US style='font-size:11.0pt;
-mso-bidi-font-size:10.0pt;mso-ansi-language:EN-US'>INTELLECTUAL PROPERTY RIGHTS</span></span><span
-style='mso-bookmark:_Hlk526346232'><span lang=EN-US style='font-size:11.0pt;
-mso-bidi-font-size:10.0pt;font-family:Symbol;mso-ansi-language:EN-US'><o:p></o:p></span></span></p>
-
-<p class=MsoNormal><span style='mso-bookmark:_Hlk526346232'><span lang=EN-US
-style='font-size:11.0pt;mso-bidi-font-size:10.0pt;mso-ansi-language:EN-US'>ITU <a
-name=iitexteb>draws attention to the possibility that the practice or
-implementation of this Recommendation may involve the use of a claimed
-Intellectual Property Right. ITU takes no position concerning the evidence,
-validity or applicability of claimed Intellectual Property Rights, whether
-asserted by ITU members or others outside of the Recommendation development
-process.<o:p></o:p></a></span></span></p>
-
-{% if unpublished %}
-<p class=MsoNormal><span lang=EN-US style='font-size:11.0pt;
-mso-bidi-font-size:10.0pt;mso-ansi-language:EN-US'>As of the date of approval
-of this Recommendation, ITU [had/had not] received notice of intellectual property,
-protected by patents, which may be required to implement this Recommendation.
-However, implementers are cautioned that this may not represent the latest
-information and are therefore strongly urged to consult the TSB patent database at
-<a href="http://www.itu.int/ITU-T/ipr/">http://www.itu.int/ITU-T/ipr/</a>.</span></p>
-{% else %}
-{% if ip_notice_received %}
-<p class=MsoNormal><span lang=EN-US style='font-size:11.0pt;
-mso-bidi-font-size:10.0pt;mso-ansi-language:EN-US'>As of the date of approval
-of this Recommendation, ITU had received notice of intellectual property,
-protected by patents, which may be required to implement this Recommendation.
-However, implementers are cautioned that this may not represent the latest
-information and are therefore strongly urged to consult the TSB patent database at
-<a href="http://www.itu.int/ITU-T/ipr/">http://www.itu.int/ITU-T/ipr/</a>.</span></p>
-{% else %}
-<p class=MsoNormal><span lang=EN-US style='font-size:11.0pt;
-mso-bidi-font-size:10.0pt;mso-ansi-language:EN-US'>As of the date of approval
-of this Recommendation, ITU had not received notice of intellectual property,
-protected by patents, which may be required to implement this Recommendation.
-However, implementers are cautioned that this may not represent the latest
-information and are therefore strongly urged to consult the TSB patent database at
-<a href="http://www.itu.int/ITU-T/ipr/">http://www.itu.int/ITU-T/ipr/</a>.</span></p>
-{% endif %}
-{% endif %}
-
-<p class=MsoNormal align=center style='text-align:center'><span
-style='mso-bookmark:_Hlk526346232'><span lang=EN-US style='font-size:11.0pt;
-mso-bidi-font-size:10.0pt;mso-ansi-language:EN-US'><o:p>&nbsp;</o:p></span></span></p>
-
-<p class=MsoNormal align=center style='text-align:center'><span
-style='mso-bookmark:_Hlk526346232'><span lang=EN-US style='font-size:11.0pt;
-mso-bidi-font-size:10.0pt;mso-ansi-language:EN-US'><o:p>&nbsp;</o:p></span></span></p>
-
-<p class=MsoNormal align=center style='text-align:center'><span
-style='mso-bookmark:_Hlk526346232'><span lang=EN-US style='font-size:11.0pt;
-mso-bidi-font-size:10.0pt;mso-ansi-language:EN-US'><o:p>&nbsp;</o:p></span></span></p>
-
-<p class=MsoNormal align=center style='text-align:center'><span
-style='mso-bookmark:_Hlk526346232'><span lang=EN-US style='font-size:11.0pt;
-mso-bidi-font-size:10.0pt;font-family:Symbol;mso-ascii-font-family:"Times New Roman";
-mso-hansi-font-family:"Times New Roman";mso-ansi-language:EN-US;mso-char-type:
-symbol;mso-symbol-font-family:Symbol'><span style='mso-char-type:symbol;
-mso-symbol-font-family:Symbol'>ã</span></span></span><span style='mso-bookmark:
-_Hlk526346232'><span lang=EN-US style='font-size:11.0pt;mso-bidi-font-size:
-10.0pt;mso-ansi-language:EN-US'>&nbsp;ITU&nbsp;<a name=iiannee></a>2019<o:p></o:p></span></span></p>
-
-<p class=MsoNormal><span style='mso-bookmark:_Hlk526346232'><span lang=EN-US
-style='font-size:11.0pt;mso-bidi-font-size:10.0pt;mso-ansi-language:EN-US'>All
-rights reserved. No part of this publication may be reproduced, by any means
-whatsoever, without the prior written permission of ITU.<o:p></o:p></span></span></p>
+<div id="legal"/>
+<div id="license"/>
+<div id="copyright"/>
 
 <b style='mso-bidi-font-weight:normal'><span lang=EN-US style='font-size:12.0pt;
 mso-bidi-font-size:10.0pt;font-family:"Times New Roman",serif;mso-fareast-font-family:

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

@@ -221,21 +221,7 @@
   none;border-bottom:solid windowtext 2.25pt;border-right:solid windowtext 2.25pt;
   mso-border-top-alt:solid windowtext 2.25pt;mso-border-left-alt:solid windowtext 2.25pt;
   padding:0cm 5.4pt 0cm 5.4pt;height:4.0cm;mso-height-rule:exactly'>
-  <p class="MsoNormal" align="center" style='text-align:center'><b
-  style='mso-bidi-font-weight:normal'><i style='mso-bidi-font-style:normal'><span
-  lang="EN-GB" style='font-size:16.0pt;mso-bidi-font-size:10.0pt'>CAUTION !<o:p></o:p></span></i></b></p>
-  <p class="MsoNormal" align="center" style='margin-top:3.0pt;text-align:center'><span
-  class="SpellE"><b style='mso-bidi-font-weight:normal'><i style='mso-bidi-font-style:
-  normal'><span lang="EN-GB" style='font-size:16.0pt;mso-bidi-font-size:10.0pt'>PREPUBLISHED</span></i></b></span><b
-  style='mso-bidi-font-weight:normal'><i style='mso-bidi-font-style:normal'><span
-  lang="EN-GB" style='font-size:16.0pt;mso-bidi-font-size:10.0pt'><span
-  style='mso-spacerun:yes'>  </span>{{ doctype  | upcase }}<o:p></o:p></span></i></b></p>
-  <p class="MsoNormal" style='tab-stops:right 17.0cm'><span lang="EN-GB">This
-    prepublication is an unedited version of a recently approved {{doctype}}.
-  It&#xA0;will be replaced by the published version after editing. Therefore,
-  there will be differences between this prepublication and the published
-  version.</span><span lang="EN-GB" style='font-size:9.0pt;mso-bidi-font-size:
-  10.0pt;font-family:"Arial",sans-serif;mso-bidi-font-family:"Times New Roman"'><o:p></o:p></span></p>
+    <div class="draft-warning"/>
   </td>
  </tr>
  {% else %}

data/lib/isodoc/itu/html_convert.rb

@@ -15,12 +15,6 @@ module IsoDoc
         super
       end
 
-      #def convert1(docxml, filename, dir)
-      #  FileUtils.cp html_doc_path('Logo_ITU.jpg'), "#{@localdir}/Logo_ITU.jpg"
-      #  @files_to_delete << "#{@localdir}/Logo_ITU.jpg"
-      #  super
-      #end
-
       def default_fonts(options)
         {
           bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' : '"Open Sans",sans-serif'),
@@ -55,6 +49,7 @@ module IsoDoc
 
       def make_body3(body, docxml)
         body.div **{ class: "main-section" } do |div3|
+          boilerplate docxml, div3
           abstract docxml, div3
           preface docxml, div3
           middle docxml, div3
@@ -63,7 +58,26 @@ module IsoDoc
         end
       end
 
-      include BaseConvert
+       def html_preface(docxml)
+        super
+        authority_cleanup(docxml)
+        docxml
+      end
+
+       def authority_cleanup(docxml)
+         dest = docxml.at("//div[@class = 'draft-warning']")
+         auth = docxml.at("//div[@id = 'draft-warning']")
+         auth&.xpath(".//h1 | .//h2")&.each { |h| h["class"] = "IntroTitle" }
+         dest and auth and dest.replace(auth.remove)
+         %w(copyright license legal).each do |t|
+           dest = docxml.at("//div[@id = '#{t}']")
+           auth = docxml.at("//div[@class = '#{t}']")
+           auth&.xpath(".//h1 | .//h2")&.each { |h| h["class"] = "IntroTitle" }
+           dest and auth and dest.replace(auth.remove)
+         end
+       end
+
+       include BaseConvert
     end
   end
 end

data/lib/isodoc/itu/pdf_convert.rb

@@ -57,6 +57,7 @@ module IsoDoc
 
       def make_body3(body, docxml)
         body.div **{ class: "main-section" } do |div3|
+          boilerplate docxml, div3
           abstract docxml, div3
           preface docxml, div3
           middle docxml, div3
@@ -65,6 +66,25 @@ module IsoDoc
         end
       end
 
+       def html_preface(docxml)
+        super
+        authority_cleanup(docxml)
+        docxml     
+      end
+
+       def authority_cleanup(docxml)
+         dest = docxml.at("//div[@class = 'draft-warning']")
+         auth = docxml.at("//div[@id = 'draft-warning']")
+         auth&.xpath(".//h1 | .//h2")&.each { |h| h["class"] = "IntroTitle" }
+         dest and auth and dest.replace(auth.remove)
+         %w(copyright license legal).each do |t|
+           dest = docxml.at("//div[@id = '#{t}']")
+           auth = docxml.at("//div[@class = '#{t}']")
+           auth&.xpath(".//h1 | .//h2")&.each { |h| h["class"] = "IntroTitle" }
+           dest and auth and dest.replace(auth.remove)
+         end
+       end
+
       include BaseConvert
     end
   end

data/lib/isodoc/itu/word_convert.rb

@@ -26,6 +26,7 @@ module IsoDoc
       def make_body2(body, docxml)
         body.div **{ class: "WordSection2" } do |div2|
           info docxml, div2 
+          boilerplate docxml, div2
           abstract docxml, div2
           keywords docxml, div2
           preface docxml, div2
@@ -70,7 +71,9 @@ module IsoDoc
         word_preface_cleanup(docxml)
         word_term_cleanup(docxml)
         word_history_cleanup(docxml)
+        authority_hdr_cleanup(docxml)
         super
+        authority_cleanup(docxml)
         docxml
       end
 
@@ -124,15 +127,6 @@ module IsoDoc
         end
       end
 
-      #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
-
       def default_fonts(options)
         { bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' :
                      '"Times New Roman",serif'),
@@ -161,16 +155,16 @@ module IsoDoc
         end
       end
 
-       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&.path,
-                       header_file: header&.path, dir: dir,
-                       asciimathdelims: [@openmathdelim, @closemathdelim],
-                       liststyles: { ul: @ulstyle, ol: @olstyle, steps: "l4" })
-      header&.unlink
-      @wordstylesheet&.unlink
-    end
+      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&.path,
+                         header_file: header&.path, dir: dir,
+                         asciimathdelims: [@openmathdelim, @closemathdelim],
+                         liststyles: { ul: @ulstyle, ol: @olstyle, steps: "l4" })
+        header&.unlink
+        @wordstylesheet&.unlink
+      end
 
 =begin
       def eref_parse(node, out)
@@ -189,15 +183,52 @@ module IsoDoc
       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) }
+      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
+
+      def authority_hdr_cleanup(docxml)
+        docxml&.xpath("//div[@id = 'draft-warning']").each do |d|
+          d.xpath(".//h1 | .//h2").each do |p|
+            p.name = "p"
+            p["class"] = "draftwarningHdr"
+          end
+        end
+        %w(copyright license legal).each do |t|
+          docxml&.xpath("//div[@class = '#{t}']").each do |d|
+            p = d&.at("./descendant::h1[2]") and
+              p.previous = "<p>&nbsp;</p><p>&nbsp;</p><p>&nbsp;</p>"
+            d.xpath(".//h1 | .//h2").each do |p|
+              p.name = "p"
+              p["class"] = "boilerplateHdr"
+            end
+          end
+        end
+      end
+
+      def authority_cleanup(docxml)
+        dest = docxml.at("//div[@class = 'draft-warning']")
+        auth = docxml.at("//div[@id = 'draft-warning']")
+        dest and auth and dest.replace(auth.remove)
+        %w(copyright license legal).each do |t|
+          dest = docxml.at("//div[@id = '#{t}']")
+          auth = docxml.at("//div[@class = '#{t}']")
+          next unless auth && dest
+          t == "copyright" and p = auth&.at(".//p[@class = 'Normalaftertitle']") and
+            p["class"] = "boilerplateHdr"
+          auth&.xpath(".//p[not(@class) or @class = 'Normalaftertitle']")&.each do |p|
+            p["class"] = "boilerplate"
+          end
+          auth << "<p>&nbsp;</p><p>&nbsp;</p><p>&nbsp;</p>" unless t == "copyright"
+          dest.replace(auth.remove)
         end
       end
-    end
 
       include BaseConvert
     end

data/lib/isodoc/itu/xref.rb

@@ -46,9 +46,8 @@ module IsoDoc
       end
 
       def initial_anchor_names(d)
-        d.xpath("//xmlns:preface/child::*").each do |c|
-          preface_names(c)
-        end
+        d.xpath(ns("//boilerplate//clause")).each { |c| preface_names(c) }
+        d.xpath("//xmlns:preface/child::*").each { |c| preface_names(c) }
         @hierarchical_assets ?
           hierarchical_asset_names(d.xpath("//xmlns:preface/child::*"), "Preface") :
           sequential_asset_names(d.xpath("//xmlns:preface/child::*"))
@@ -83,7 +82,7 @@ module IsoDoc
       def sequential_figure_names(clause)
         c = IsoDoc::Function::XrefGen::Counter.new
         j = 0
-        clause.xpath(ns(".//figure[not(@type = 'pseudocode')]")).each do |t|
+        clause.xpath(ns(".//figure | .//sourcecode[not(ancestor::example)]")).each do |t|
           if t.parent.name == "figure" then j += 1
           else
             j = 0
@@ -99,7 +98,7 @@ module IsoDoc
       def hierarchical_figure_names(clause, num)
         c = IsoDoc::Function::XrefGen::Counter.new
         j = 0
-        clause.xpath(ns(".//figure[not(@type = 'pseudocode')]")).each do |t|
+        clause.xpath(ns(".//figure | .//sourcecode[not(ancestor::example)]")).each do |t|
           if t.parent.name == "figure" then j += 1
           else
             j = 0

data/lib/metanorma/itu/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ITU
-    VERSION = "1.0.0"
+    VERSION = "1.0.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-itu
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-29 00:00:00.000000000 Z
+date: 2019-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -281,6 +281,7 @@ files:
 - lib/asciidoctor/itu/isodoc.rng
 - lib/asciidoctor/itu/isostandard.rng
 - lib/asciidoctor/itu/itu.rng
+- lib/asciidoctor/itu/itu_intro.xml
 - lib/asciidoctor/itu/macros.rb
 - lib/asciidoctor/itu/reqt.rng
 - lib/asciidoctor/itu/validate.rb