metanorma-itu 1.0.13 → 1.0.14

data/lib/isodoc/itu/pdf_convert.rb

@@ -6,61 +6,27 @@ module IsoDoc
   module ITU
     # A {Converter} implementation that generates PDF HTML output, and a
     # document schema encapsulation of the document for validation
-    class PdfConvert < IsoDoc::PdfConvert
+    class PdfConvert < IsoDoc::XslfoPdfConvert
       def initialize(options)
         @libdir = File.dirname(__FILE__)
         @hierarchical_assets = options[:hierarchical_assets]
         super
       end
 
-      def html_toc(docxml)
-        docxml
-      end
-
-      def default_fonts(options)
-        {
-          bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' : '"Open Sans",sans-serif'),
-          headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' : '"Open Sans",sans-serif'),
-          monospacefont: '"Space Mono",monospace'
-        }
-      end
-
-      def default_file_locations(_options)
-        {
-          htmlstylesheet: html_doc_path("htmlstyle.scss"),
-          htmlcoverpage: html_doc_path("html_itu_titlepage.html"),
-          htmlintropage: html_doc_path("html_itu_intro.html"),
-          scripts_pdf: html_doc_path("scripts.pdf.html"),
-        }
-      end
-
-      def googlefonts()
-        <<~HEAD.freeze
-    <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,300i,400,400i,600,600i,800|Space+Mono:400,700" rel="stylesheet">
-        HEAD
-      end
-
-      def make_body(xml, docxml)
-        body_attr = { lang: "EN-US", link: "blue", vlink: "#954F72", "xml:lang": "EN-US", class: "container" }
-        xml.body **body_attr do |body|
-          make_body1(body, docxml)
-          make_body2(body, docxml)
-          make_body3(body, docxml)
-        end
-      end
-
-      def make_body3(body, docxml)
-        body.div **{ class: "main-section" } do |div3|
-          boilerplate docxml, div3
-          abstract docxml, div3
-          preface docxml, div3
-          middle docxml, div3
-          footnotes div3
-          comments div3
+      def convert(filename, file = nil, debug = false)
+        file = File.read(filename, encoding: "utf-8") if file.nil?
+        docxml, outname_html, dir = convert_init(file, filename, debug)
+        resolution = docxml.at(ns("//bibdata/ext[doctype = 'resolution']"))
+        /\.xml$/.match(filename) or
+          filename = Tempfile.open([outname_html, ".xml"], encoding: "utf-8") do |f|
+          f.write file
+          f.path
         end
+        FileUtils.rm_rf dir
+        ::Metanorma::Output::XslfoPdf.new.convert(
+          filename, outname_html + ".pdf",
+          File.join(@libdir, resolution ? "itu.resolution.xsl" : "itu.recommendation.xsl"))
       end
-
-      include BaseConvert
     end
   end
 end

data/lib/isodoc/itu/terms.rb

@@ -1,16 +1,15 @@
 module IsoDoc
   module ITU
     module BaseConvert
-       def terms_defs_title(node)
-        t = node.at(ns("./title")) and return t.text
-        super
+       def term_def_title(node)
+         node
       end
 
       def terms_defs(node, out, num)
         f = node.at(ns(IsoDoc::Convert::TERM_CLAUSE)) or return num
         out.div **attr_code(id: f["id"]) do |div|
           num = num + 1
-          clause_name(num, terms_defs_title(f), div, nil)
+          clause_name(num, term_def_title(f.at(ns("./title"))), div, nil)
           if f.at(ns("./clause | ./terms | ./term")).nil? then out.p "None."
           else
             f.children.reject { |c1| c1.name == "title" }.each do |c1|

data/lib/isodoc/itu/word_convert.rb

@@ -117,7 +117,7 @@ module IsoDoc
       def formula_parse1(node, out)
         out.div **attr_code(id: node["id"], class: "formula") do |div|
           div.p **attr_code(class: "formula") do |p|
-            insert_tab(div, 2)
+            insert_tab(div, 1)
             parse(node.at(ns("./stem")), div)
             lbl = anchor(node['id'], :label, false)
             unless lbl.nil?

data/lib/isodoc/itu/xref.rb

@@ -89,7 +89,7 @@ module IsoDoc
             j = 0
             c.increment(t)
           end
-          label = c.print + (j.zero? ? "" : "-#{(97 + j).chr.to_s}")
+          label = c.print + (j.zero? ? "" : "-#{(96 + j).chr.to_s}")
           next if t["id"].nil? || t["id"].empty?
           @anchors[t["id"]] =
             anchor_struct(label, nil, @figure_lbl, "figure", t["unnumbered"])
@@ -106,7 +106,7 @@ module IsoDoc
             c.increment(t)
           end
           label = "#{num}#{hiersep}#{c.print}" +
-            (j.zero? ? "" : "#{hierfigsep}#{(97 + j).chr.to_s}")
+            (j.zero? ? "" : "#{hierfigsep}#{(96 + j).chr.to_s}")
           next if t["id"].nil? || t["id"].empty?
           @anchors[t["id"]] = anchor_struct(label, nil, @figure_lbl, "figure",
                                             t["unnumbered"])

data/lib/metanorma/itu/processor.rb

@@ -2,6 +2,10 @@ require "metanorma/processor"
 
 module Metanorma
   module ITU
+    def self.pdf_fonts
+      ["Arial", "Courier", "Times New Roman"]
+    end
+
     class Processor < Metanorma::Processor
 
       def initialize

data/lib/metanorma/itu/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ITU
-    VERSION = "1.0.13"
+    VERSION = "1.0.14"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-itu
 version: !ruby/object:Gem::Version
-  version: 1.0.13
+  version: 1.0.14
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-17 00:00:00.000000000 Z
+date: 2020-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -275,6 +275,8 @@ files:
 - lib/isodoc/itu/html/wordstyle.scss
 - lib/isodoc/itu/html_convert.rb
 - lib/isodoc/itu/i18n-en.yaml
+- lib/isodoc/itu/itu.recommendation.xsl
+- lib/isodoc/itu/itu.resolution.xsl
 - lib/isodoc/itu/metadata.rb
 - lib/isodoc/itu/pdf_convert.rb
 - lib/isodoc/itu/ref.rb