metanorma-gb 1.3.25 → 1.3.26

data/lib/isodoc/gb/gbbaseconvert.rb

@@ -12,7 +12,8 @@ module IsoDoc
         h = options[:headerfont] || "Arial"
         m = options[:monospacefont] || "Courier"
         t = options[:titlefont] || "Arial"
-        "$bodyfont: #{b};\n$headerfont: #{h};\n$monospacefont: #{m};\n$titlefont: #{t};\n"
+        "$bodyfont: #{b};\n$headerfont: #{h};\n$monospacefont: #{m};\n"\
+          "$titlefont: #{t};\n"
       end   
 
       def metadata_init(lang, script, labels)
@@ -45,7 +46,8 @@ module IsoDoc
               YAML.load_file(File.join(File.dirname(__FILE__),
                                        "i18n-zh-Hans.yaml"))
             else
-              YAML.load_file(File.join(File.dirname(__FILE__), "i18n-zh-Hans.yaml"))
+              YAML.load_file(File.join(File.dirname(__FILE__),
+                                       "i18n-zh-Hans.yaml"))
             end
         @labels = @labels.merge(y)
       end
@@ -100,12 +102,16 @@ module IsoDoc
       end
 
       def note_parse(node, out)
+        note_parse1(node, out, note_label(node) + ":")
+      end
+
+      def note_parse1(node, out, label)
         @note = true
         out.table **attr_code(id: node["id"], class: "Note") do |t|
           t.tr do |tr|
             @libdir = File.dirname(__FILE__)
             tr.td **EXAMPLE_TBL_ATTR do |td|
-              td << l10n(note_label(node) + ":")
+              td << l10n(label)
             end
             tr.td **{ style: "vertical-align:top;", class: "Note" } do |td|
               node.children.each { |n| parse(n, td) }
@@ -116,18 +122,7 @@ module IsoDoc
       end
 
       def termnote_parse(node, out)
-        @note = true
-        out.table **attr_code(id: node["id"], class: "Note") do |t|
-          t.tr do |tr|
-            tr.td **EXAMPLE_TBL_ATTR do |td|
-              td << l10n("#{anchor(node['id'], :label)}:")
-            end
-            tr.td **{ style: "vertical-align:top;", class: "Note" } do |td|
-              node.children.each { |n| parse(n, td) }
-            end
-          end
-        end
-        @note = false
+        note_parse1(node, out, "#{anchor(node['id'], :label)}:")
       end
 
       def middle(isoxml, out)
@@ -168,15 +163,17 @@ module IsoDoc
       def termref_render(x)
         x.sub!(%r{\s*\[MODIFICATION\]\s*$}m, l10n(", #{@modified_lbl}"))
         parts = x.split(%r{(\s*\[MODIFICATION\]|,)}m)
-        parts[1] = l10n(", #{@source_lbl}") if parts.size > 1 && parts[1] == "," &&
-          !/^\s*#{@modified_lbl}/.match(parts[2])
+        parts[1] = l10n(", #{@source_lbl}") if parts.size > 1 &&
+          parts[1] == "," && !/^\s*#{@modified_lbl}/.match(parts[2])
           parts.map do |p|
-            /\s*\[MODIFICATION\]/.match(p) ? l10n(", #{@modified_lbl} &mdash; ") : p
+            /\s*\[MODIFICATION\]/.match(p) ?
+              l10n(", #{@modified_lbl} &mdash; ") : p
           end.join.sub(/\A\s*/m, l10n("[")).sub(/\s*\z/m, l10n("]"))
       end
 
       def termref_resolve(docxml)
-        docxml.split(%r{(\[TERMREF\]|\[/TERMREF\])}).each_slice(4).
+        docxml.gsub(%r{\s*\[/TERMREF\]\s*</p>\s*<p>\s*\[TERMREF\]}, l10n("; ")).
+          split(%r{(\[TERMREF\]|\[/TERMREF\])}).each_slice(4).
           map do |a|
           a.size < 3 ? a[0] : a[0] + termref_render(a[2])
         end.join
@@ -251,11 +248,8 @@ module IsoDoc
 
       def example_parse(node, out)
         out.div **{ id: node["id"], class: "example" } do |div|
-          if node_begins_with_para(node)
-            example_p_parse(node, div)
-          else
-            example_parse1(node, div)
-          end
+          node_begins_with_para(node) ?
+            example_p_parse(node, div) : example_parse1(node, div)
         end
       end
 

data/lib/isodoc/gb/pdf_convert.rb

@@ -0,0 +1,30 @@
+require "isodoc"
+
+module IsoDoc
+  module Gb
+
+    # A {Converter} implementation that generates HTML output, and a document
+    # schema encapsulation of the document for validation
+    #
+    class PdfConvert < IsoDoc::XslfoPdfConvert
+      def initialize(options)
+        @libdir = File.dirname(__FILE__)
+        super
+      end
+
+      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)
+        /\.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, "gb.recommendation.xsl"))
+      end
+    end
+  end
+end
+

data/lib/metanorma-gb.rb

@@ -4,6 +4,7 @@ require_relative "metanorma/gb/version"
 require "isodoc/gb/gbconvert"
 require "isodoc/gb/gbhtmlconvert"
 require "isodoc/gb/gbwordconvert"
+require "isodoc/gb/pdf_convert"
 
 if defined? Metanorma
   require_relative "metanorma/gb"

data/lib/metanorma/gb/processor.rb

@@ -7,6 +7,7 @@ module Metanorma
         compliant_html: ["SimSun", "Cambria", "SimHei", "Calibri", "Courier New"],
         html: ["SimSun", "Cambria", "SimHei", "Calibri", "Courier New"],
         doc: ["SimSun", "Cambria", "SimHei", "Calibri", "Courier New"],
+        pdf: ["SimSun", "Cambria", "SimHei", "Calibri", "Courier New"],
       }
     end
 
@@ -22,7 +23,8 @@ module Metanorma
         super.merge(
           html: "html",
           compliant_html: "compliant.html",
-          doc: "doc"
+          doc: "doc",
+          pdf: "pdf",
         )
       end
 
@@ -57,6 +59,8 @@ module Metanorma
           IsoDoc::Gb::HtmlConvert.new(options.merge(compliant: true)).convert(outname, isodoc_node)
         when :doc
           IsoDoc::Gb::WordConvert.new(options).convert(outname, isodoc_node)
+        when :doc
+          IsoDoc::Gb::PdfConvert.new(options).convert(outname, isodoc_node)
         else
           super
         end

data/lib/metanorma/gb/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Gb
-    VERSION = "1.3.25"
+    VERSION = "1.3.26"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-gb
 version: !ruby/object:Gem::Version
-  version: 1.3.25
+  version: 1.3.26
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-29 00:00:00.000000000 Z
+date: 2020-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-iso
@@ -255,12 +255,14 @@ files:
 - lib/asciidoctor/gb/boilerplate.xml
 - lib/asciidoctor/gb/converter.rb
 - lib/asciidoctor/gb/front.rb
+- lib/asciidoctor/gb/front_id.rb
 - lib/asciidoctor/gb/gbstandard.rng
 - lib/asciidoctor/gb/isodoc.rng
 - lib/asciidoctor/gb/isostandard.rng
 - lib/asciidoctor/gb/reqt.rng
 - lib/asciidoctor/gb/section_input.rb
 - lib/asciidoctor/gb/validate.rb
+- lib/isodoc/gb/gb.recommendation.xsl
 - lib/isodoc/gb/gbbaseconvert.rb
 - lib/isodoc/gb/gbcleanup.rb
 - lib/isodoc/gb/gbconvert.rb
@@ -305,6 +307,7 @@ files:
 - lib/isodoc/gb/i18n-en.yaml
 - lib/isodoc/gb/i18n-zh-Hans.yaml
 - lib/isodoc/gb/metadata.rb
+- lib/isodoc/gb/pdf_convert.rb
 - lib/metanorma-gb.rb
 - lib/metanorma/gb.rb
 - lib/metanorma/gb/processor.rb