metanorma-ogc 1.0.4 → 1.0.5

data/lib/isodoc/ogc/pdf_convert.rb

@@ -1,95 +1,32 @@
 require_relative "base_convert"
-require "fileutils"
 require "isodoc"
-require_relative "metadata"
 
 module IsoDoc
   module Ogc
     # 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__)
         super
-        #FileUtils.cp html_doc_path('logo.jpg'), "logo.jpg"
-        #@files_to_delete << "logo.jpg"
       end
 
-      def default_fonts(options)
-        {
-          bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' : '"Overpass",sans-serif'),
-          headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' : '"Overpass",sans-serif'),
-          monospacefont: '"Space Mono",monospace'
-        }
-      end
-
-      def default_file_locations(_options)
-        {
-          htmlstylesheet: html_doc_path("htmlstyle.scss"),
-          htmlcoverpage: html_doc_path("html_ogc_titlepage.html"),
-          htmlintropage: html_doc_path("html_ogc_intro.html"),
-          scripts_pdf: html_doc_path("scripts.pdf.html"),
-        }
-      end
-
-      def metadata_init(lang, script, labels)
-        @meta = Metadata.new(lang, script, labels)
-      end
-
-      def googlefonts
-        <<~HEAD.freeze
-    <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,300i,400,400i,600,600i|Space+Mono:400,700" rel="stylesheet" />
-    <link href="https://fonts.googleapis.com/css?family=Overpass:300,300i,600,900" rel="stylesheet" />
-    <link href="https://fonts.googleapis.com/css?family=Teko:300,400,500" rel="stylesheet">
-        HEAD
-      end
-
-      def admonition_class(node)
-        case node["type"]
-        when "important" then "Admonition.Important"
-        when "warning" then "Admonition.Warning"
-        else
-          "Admonition"
-        end
-      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 html_toc(docxml)
-        docxml
-      end
-
-      def make_body3(body, docxml)
-        body.div **{ class: "main-section" } do |div3|
-          @prefacenum = 0
-          boilerplate docxml, div3
-          abstract docxml, div3
-          keywords docxml, div3
-          foreword docxml, div3
-          introduction docxml, div3
-          submittingorgs docxml, div3
-          submitters docxml, div3
-          preface docxml, div3
-          acknowledgements 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)
+        doctype = docxml&.at(ns("//bibdata/ext/doctype"))&.text
+        doctype = "other" unless %w(community-standard engineering-report policy
+        reference-model release-notes standard user-guide test-suite).include? doctype
+        /\.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, "unece.#{doctype}.xsl"))
       end
-
-       def authority_cleanup(docxml)
-        authority_cleanup1(docxml, "contact")
-        super
-      end
-
-      include BaseConvert
     end
   end
 end

data/lib/metanorma/ogc/processor.rb

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

data/lib/metanorma/ogc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ogc
-    VERSION = "1.0.4"
+    VERSION = "1.0.5"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ogc
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-03 00:00:00.000000000 Z
+date: 2020-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -257,6 +257,15 @@ files:
 - lib/isodoc/ogc/html_convert.rb
 - lib/isodoc/ogc/i18n-en.yaml
 - lib/isodoc/ogc/metadata.rb
+- lib/isodoc/ogc/ogc.community-standard.xsl
+- lib/isodoc/ogc/ogc.engineering-report.xsl
+- lib/isodoc/ogc/ogc.other.xsl
+- lib/isodoc/ogc/ogc.policy.xsl
+- lib/isodoc/ogc/ogc.reference-model.xsl
+- lib/isodoc/ogc/ogc.release-notes.xsl
+- lib/isodoc/ogc/ogc.standard.xsl
+- lib/isodoc/ogc/ogc.test-suite.xsl
+- lib/isodoc/ogc/ogc.user-guide.xsl
 - lib/isodoc/ogc/pdf_convert.rb
 - lib/isodoc/ogc/reqt.rb
 - lib/isodoc/ogc/sections.rb