metanorma-itu 1.0.5 → 1.0.10

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

@@ -216,6 +216,24 @@ p.FooterQP, li.FooterQP, div.FooterQP
 	mso-fareast-language:EN-US;
 	font-weight:bold;
 	mso-bidi-font-weight:normal;}
+p.FooterQPLandscape, li.FooterQPLandscape, div.FooterQPLandscape
+        {
+        mso-style-unhide:no;
+        margin:0cm;
+        margin-bottom:.0001pt;
+        mso-pagination:widow-orphan;
+        tab-stops:45.35pt right 439.45pt 733.1pt;
+        mso-layout-grid-align:none;
+        punctuation-wrap:simple;
+        text-autospace:none;
+        font-size:11.0pt;
+        mso-bidi-font-size:10.0pt;
+        font-family:$bodyfont;
+        mso-fareast-font-family:$bodyfont;
+        mso-ansi-language:EN-GB;
+        mso-fareast-language:EN-US;
+        font-weight:bold;
+        mso-bidi-font-weight:normal;}
 p.FirstFooter, li.FirstFooter, div.FirstFooter
 	{mso-style-name:FirstFooter;
 	mso-style-unhide:no;
@@ -362,13 +380,36 @@ p.IntroTitle, li.IntroTitle, div.IntroTitle
 	tab-stops:20.15pt;
 	font-size:14.0pt;
 	mso-bidi-font-size:11.0pt;
-	page-break-before:always;
 	font-family:$headerfont;
 	mso-fareast-font-family:$headerfont;
 	mso-bidi-font-family:$headerfont;
 	mso-ansi-language:EN-GB;
 	font-weight:bold;
+        page-break-before:always;
 	mso-bidi-font-weight:normal;}
+p.TitlePageSubhead, li.TitlePageSubhead, div.TitlePageSubhead {
+mso-style-noshow:yes;
+        mso-style-unhide:no;
+        mso-style-parent:"Foreword Title";
+        margin-top:0cm;
+        margin-right:0cm;
+        margin-bottom:15.5pt;
+        margin-left:0cm;
+        text-align:center;
+        line-height:15.5pt;
+        mso-pagination:widow-orphan;
+        page-break-after:avoid;
+        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-weight:bold;
+        mso-bidi-font-weight:normal;
+}
 p.Terms, li.Terms, div.Terms
         {mso-style-name:"Term\(s\)";
         mso-style-priority:8;
@@ -823,6 +864,33 @@ div.WordSection1
 	mso-first-header:url("file:///C:/Doc/FILENAME_files/header.html") fh2;
 	mso-first-footer:url("file:///C:/Doc/FILENAME_files/header.html") ff2;
 	mso-paper-source:0;}
+@page WordSection2L
+        {
+        size:842.0pt 21.0cm;
+        margin:54.45pt 54.45pt 54.45pt 54.45pt;
+        mso-header-margin:24.1pt;
+        mso-footer-margin:24.1pt;
+        mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh2l;
+        mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2l;
+        mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef2l;
+        mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") f2l;
+        mso-first-header:url("file:///C:/Doc/FILENAME_files/header.html") fh2l;
+        mso-first-footer:url("file:///C:/Doc/FILENAME_files/header.html") ff2l;
+        mso-paper-source:0;}
+@page WordSection2P
+        {
+        size:21.0cm 842.0pt;
+        margin:54.45pt 54.45pt 54.45pt 54.45pt;
+        mso-header-margin:24.1pt;
+        mso-footer-margin:24.1pt;
+        mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh2;
+        mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2;
+        mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef2;
+        mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") f2;
+        mso-first-header:url("file:///C:/Doc/FILENAME_files/header.html") fh2;
+        mso-first-footer:url("file:///C:/Doc/FILENAME_files/header.html") ff2;
+        mso-paper-source:0;}
+
 div.WordSection2
 	{page:WordSection2;}
 @page WordSection3
@@ -839,6 +907,32 @@ div.WordSection2
 	mso-first-header:url("file:///C:/Doc/FILENAME_files/header.html") fh2;
 	mso-first-footer:url("file:///C:/Doc/FILENAME_files/header.html") ff2;
 	mso-paper-source:0;}
+@page WordSection3L
+        {
+        size:842.0pt 21.0cm;
+        margin:2.0cm 2.0cm 2.0cm 2.0cm;
+        mso-header-margin:1.0cm;
+        mso-footer-margin:1.0cm;
+        mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh2l;
+        mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2l;
+        mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef3l;
+        mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") f3l;
+        mso-first-header:url("file:///C:/Doc/FILENAME_files/header.html") fh2l;
+        mso-first-footer:url("file:///C:/Doc/FILENAME_files/header.html") ff2l;
+        mso-paper-source:0;}
+@page WordSection3P
+        {
+        size:21.0cm 842.0pt;
+        margin:2.0cm 2.0cm 2.0cm 2.0cm;
+        mso-header-margin:1.0cm;
+        mso-footer-margin:1.0cm;
+        mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh2;
+        mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2;
+        mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef3;
+        mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") f3;
+        mso-first-header:url("file:///C:/Doc/FILENAME_files/header.html") fh2;
+        mso-first-footer:url("file:///C:/Doc/FILENAME_files/header.html") ff2;
+        mso-paper-source:0;}
 div.WordSection3
 	{page:WordSection3;}
 table.MsoISOTable

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

@@ -125,9 +125,9 @@ style='mso-ansi-language:EN-US'>
 <p><br clear=all
          style='page-break-before:always'></p>
 
-<div id="legal"/>
-<div id="license"/>
-<div id="copyright"/>
+<div id="boilerplate-legal-destination"/>
+<div id="boilerplate-license-destination"/>
+<div id="boilerplate-copyright-destination"/>
 
 <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

@@ -261,13 +261,13 @@
  </tr>
 </table>
 
-<p class="MsoNormal" align="right" style='margin-top:12.0pt;text-align:right;
+<p class="MsoNormal" align="right" style='margin-top:0.0pt;text-align:right;
 tab-stops:39.7pt 59.55pt 79.4pt 99.25pt right 17.0cm'><span style='mso-bookmark:
 _Hlk526346232'><span lang="EN-US" style='font-size:9.0pt;mso-bidi-font-size:10.0pt;
 font-family:"Arial",sans-serif;mso-bidi-font-family:"Times New Roman";
 mso-ansi-language:EN-US;mso-fareast-language:ZH-CN;mso-no-proof:yes'><v:shape
  id="Picture_x0020_1" o:spid="_x0000_i1033" type="#_x0000_t75" alt="logo_E"
- style='width:121pt;height:50pt;visibility:visible;mso-wrap-style:square'>
+ style='width:70pt;height:70pt;visibility:visible;mso-wrap-style:square'>
 <v:imagedata src="{{ logo_word }}" o:title="logo_E"/>
 </v:shape></span></span><span style='mso-bookmark:_Hlk526346232'><span
 lang="EN-US" style='font-size:9.0pt;mso-bidi-font-size:10.0pt;font-family:"Arial",sans-serif;

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

@@ -179,6 +179,20 @@ p.MsoHeader, li.MsoHeader, div.MsoHeader
 	mso-fareast-font-family:"Times New Roman";
 	mso-ansi-language:EN-US;
 	mso-fareast-language:EN-US;}
+p.MsoHeaderLandscape, li.MsoHeaderLandscape, div.MsoHeaderLandscape
+        {mso-style-unhide:no;
+        margin:0cm;
+        margin-bottom:.0001pt;
+        mso-pagination:widow-orphan;
+        mso-layout-grid-align:none;
+        punctuation-wrap:simple;
+        text-autospace:none;
+        font-size:9.0pt;
+        mso-bidi-font-size:10.0pt;
+        font-family:$bodyfont;
+        mso-fareast-font-family:"Times New Roman";
+        mso-ansi-language:EN-US;
+        mso-fareast-language:EN-US;}
 p.MsoFooter, li.MsoFooter, div.MsoFooter
         {mso-style-unhide:no;
 	margin:0cm;
@@ -197,6 +211,24 @@ p.MsoFooter, li.MsoFooter, div.MsoFooter
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:EN-US;
 	mso-bidi-font-weight:normal;}
+p.MsoFooterLandscape, li.MsoFooterLandscape, div.MsoFooterLandscape
+        {mso-style-unhide:no;
+        margin:0cm;
+        margin-bottom:.0001pt;
+        text-align:justify;
+        text-justify:inter-ideograph;
+        mso-pagination:widow-orphan;
+        tab-stops:366.5pt right 733.1pt;
+        mso-layout-grid-align:none;
+        punctuation-wrap:simple;
+        text-autospace:none;
+        font-size:8.0pt;
+        mso-bidi-font-size:10.0pt;
+        font-family:$bodyfont;
+        mso-fareast-font-family:"Times New Roman";
+        mso-ansi-language:EN-GB;
+        mso-fareast-language:EN-US;
+        mso-bidi-font-weight:normal;}
 span.MsoCommentReference
 	{mso-style-noshow:yes;
 	mso-style-unhide:no;

data/lib/isodoc/itu/html_convert.rb

@@ -58,26 +58,12 @@ module IsoDoc
         end
       end
 
-       def html_preface(docxml)
+      def authority_cleanup(docxml)
+        authority_cleanup1(docxml, "draft-warning")
         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
+      include BaseConvert
     end
   end
 end

data/lib/isodoc/itu/metadata.rb

@@ -8,10 +8,12 @@ module IsoDoc
         super
         here = File.dirname(__FILE__)
         set(:logo_html,
-            File.expand_path(File.join(here, "html", "Logo_ITU.jpg")))
+            #File.expand_path(File.join(here, "html", "Logo_ITU.jpg")))
+            File.expand_path(File.join(here, "html", "International_Telecommunication_Union_Logo.svg")))
         set(:logo_comb,
             File.expand_path(File.join(here, "html", "itu-document-comb.png")))
-        set(:logo_word, File.expand_path(File.join(here, "html", "logo.png")))
+        #set(:logo_word, File.expand_path(File.join(here, "html", "logo.png")))
+        set(:logo_word, File.expand_path(File.join(here, "html", "International_Telecommunication_Union_Logo.svg")))
       end
 
       def title(isoxml, _out)
@@ -41,8 +43,6 @@ module IsoDoc
       end
 
       def docid(isoxml, _out)
-        dn = isoxml.at(ns("//bibdata/docnumber"))
-        set(:docnumber, dn&.text)
         dn = isoxml.at(ns("//bibdata/docidentifier"))
         set(:docidentifier, dn&.text)
         dn = isoxml.at(ns("//bibdata/ext/structuredidentifier/annexid"))

data/lib/isodoc/itu/pdf_convert.rb

@@ -13,12 +13,6 @@ module IsoDoc
         super
       end
 
-      #def convert1(docxml, filename, dir)
-      #  FileUtils.cp html_doc_path('Logo_ITU.jpg'), File.join(@localdir, "Logo_ITU.jpg")
-      #  @files_to_delete << File.join(@localdir, "Logo_ITU.jpg")
-      #  super
-      #end
-
       def html_toc(docxml)
         docxml
       end
@@ -66,25 +60,6 @@ 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/ref.rb

@@ -42,9 +42,8 @@ module IsoDoc
       end
 
       def bibitem_ref_code(b)
-        id = b.at(ns("./docidentifier[@type = 'ITU']"))
-        id ||= b.at(ns("./docidentifier[not(@type = 'DOI' or @type = 'metanorma' "\
-                     "or @type = 'ISSN' or @type = 'ISBN')]"))
+        id = b.at(ns("./docidentifier[@type = 'metanorma']"))
+        id ||= b.at(ns("./docidentifier[@type = 'ITU']"))
         id ||= b.at(ns("./docidentifier[not(@type = 'DOI' or @type = 'ISSN' or "\
                        "@type = 'ISBN')]"))
         id ||= b.at(ns("./docidentifier"))
@@ -66,9 +65,10 @@ module IsoDoc
 
       def render_identifiers(ids)
         ids.map do |id|
-          (id["type"] == "ITU" ? titlecase(id.parent&.at(ns("./ext/doctype"))&.text ||
-                                           "recommendation") + " " : "") +
-                                          docid_prefix(id["type"], id.text.sub(/^\[/, "").sub(/\]$/, ""))
+          (id["type"] == "ITU" ?
+           titlecase(id.parent&.at(ns("./ext/doctype"))&.text ||
+                     "recommendation") + " " : "") +
+                    docid_prefix(id["type"], id.text.sub(/^\[/, "").sub(/\]$/, ""))
         end.join(" | ")
       end
 

data/lib/isodoc/itu/word_convert.rb

@@ -73,7 +73,6 @@ module IsoDoc
         word_history_cleanup(docxml)
         authority_hdr_cleanup(docxml)
         super
-        authority_cleanup(docxml)
         docxml
       end
 
@@ -85,12 +84,14 @@ module IsoDoc
       end
 
       def word_title_cleanup(docxml)
-        docxml.xpath("p[@class = 'h1Preface'] | p[@class = 'h2Annex'] | "\
-                     "//h1 | //h2 | //h3 | //h4 | //h5 | //h6 | "\
-                     "//p[@class = 'annex_obligation']").each do |h|
+        docxml.xpath("//p[@class = 'annex_obligation']").each do |h|
           h&.next_element&.name == "p" or next
           h.next_element["class"] ||= "Normalaftertitle"
         end
+        docxml.xpath("//p[@class = 'FigureTitle']").each do |h|
+          h&.parent&.next_element&.name == "p" or next
+          h.parent.next_element["class"] ||= "Normalaftertitle"
+        end
       end
 
       def word_history_cleanup(docxml)
@@ -158,6 +159,11 @@ module IsoDoc
       def toWord(result, filename, dir, header)
         result = populate_template(result, :word)
         result = from_xhtml(word_cleanup(to_xhtml(result)))
+        unless @landscapestyle.nil? || @landscapestyle.empty?
+          @wordstylesheet&.open
+          @wordstylesheet&.write(@landscapestyle)
+          @wordstylesheet&.close
+        end
         Html2Doc.process(result, filename: filename, stylesheet: @wordstylesheet&.path,
                          header_file: header&.path, dir: dir,
                          asciimathdelims: [@openmathdelim, @closemathdelim],
@@ -166,23 +172,6 @@ module IsoDoc
         @wordstylesheet&.unlink
       end
 
-=begin
-      def eref_parse(node, out)
-        linkend = get_linkend(node)
-        if node["type"] == "footnote"
-          out.sup { |s| s << linkend }
-        else
-          out << linkend
-        end
-      end
-
-      def xref_parse(node, out)
-        #target = /#/.match(node["target"]) ? node["target"].sub(/#/, ".html#") :
-        #  "##{node["target"]}"
-        out << get_linkend(node)
-      end
-=end
-
       def link_parse(node, out)
         out.a **attr_code(href: node["target"], title: node["alt"], class: "url") do |l|
           if node.text.empty?
@@ -201,7 +190,7 @@ module IsoDoc
           end
         end
         %w(copyright license legal).each do |t|
-          docxml&.xpath("//div[@class = '#{t}']").each do |d|
+          docxml&.xpath("//div[@class = 'boilerplate-#{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|
@@ -217,12 +206,12 @@ module IsoDoc
         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}']")
+          dest = docxml.at("//div[@id = 'boilerplate-#{t}-destination']")
+          auth = docxml.at("//div[@class = 'boilerplate-#{t}']")
           next unless auth && dest
-          t == "copyright" and p = auth&.at(".//p[@class = 'Normalaftertitle']") and
+          t == "copyright" and p = auth&.at(".//p") and
             p["class"] = "boilerplateHdr"
-          auth&.xpath(".//p[not(@class) or @class = 'Normalaftertitle']")&.each do |p|
+          auth&.xpath(".//p[not(@class)]")&.each do |p|
             p["class"] = "boilerplate"
           end
           auth << "<p>&nbsp;</p><p>&nbsp;</p><p>&nbsp;</p>" unless t == "copyright"

data/lib/isodoc/itu/xref.rb

@@ -70,9 +70,9 @@ module IsoDoc
       def middle_section_asset_names(d)
         return super unless @hierarchical_assets
         middle_sections = "//clause[title = 'Scope'] | "\
-          "//foreword | //introduction | "\
+          "//foreword | //introduction | //acknowledgements | "\
           "//references[title = 'References' or title = 'references'] | "\
-          "//sections/terms | "\
+          "//sections/terms | //preface/clause | "\
           "//sections/definitions | //clause[parent::sections]"
         d.xpath(ns(middle_sections)).each do |c|
           hierarchical_asset_names(c, @anchors[c["id"]][:label])

data/lib/metanorma/itu/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ITU
-    VERSION = "1.0.5"
+    VERSION = "1.0.10"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-itu
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.10
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-17 00:00:00.000000000 Z
+date: 2020-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -260,18 +260,19 @@ files:
 - lib/asciidoctor/itu.rb
 - lib/asciidoctor/itu/basicdoc.rng
 - lib/asciidoctor/itu/biblio.rng
+- lib/asciidoctor/itu/boilerplate.xml
 - lib/asciidoctor/itu/cleanup.rb
 - lib/asciidoctor/itu/converter.rb
 - lib/asciidoctor/itu/front.rb
 - lib/asciidoctor/itu/i18n-en.yaml
 - lib/asciidoctor/itu/isodoc.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
 - lib/isodoc/itu.rb
 - lib/isodoc/itu/base_convert.rb
+- lib/isodoc/itu/html/International_Telecommunication_Union_Logo.svg
 - lib/isodoc/itu/html/Logo_ITU.jpg
 - lib/isodoc/itu/html/_coverpage.scss
 - lib/isodoc/itu/html/header.html