metanorma-mpfd 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 238bab7a2daa91c072fcffe1e980e0f0ecb5e62eb7c172a4a6c370cc99e852f9
-  data.tar.gz: d1d85bb87fd2370b0f9834439a2e6ecf5aeb2894fc5b5c0899f87095e7b0ce72
+  metadata.gz: 3aa5a9f0ef4bfd60f3ed379ab93658d135595d46f683ccf902cf500dc872259d
+  data.tar.gz: acc27115044a5e3f1503e81bf004144538123dde339c35340a19acb1a37c6efb
 SHA512:
-  metadata.gz: b85ce0da3f2519239833cc72e1f1f8a6fe4306495a7e95d1df5820518f371d5c5c7af81c93ae3aad04b14fbdc05a33bc8e6a2085d0f3dd61b9c2dc836e79838f
-  data.tar.gz: a1819b39e4002c1cd5f976f54dae5172e7519f4e7be2c26cfcc8fd8e93be46fa923f2858def537a9a06ab09424e7421a41e56ae16c0508f5fe1cdf8dc27e618d
+  metadata.gz: 5cf869caa9bc42e2ba1369d100bf737316ea04b34994b39ea00d00024b1ad9c340c903e82fdbc1ecb20af1754fc6f0c60de9b043d28bc5ee0a047a322159cb2f
+  data.tar.gz: 47516f68c9b7c8b079af57a1bee5cc161fb21e8563f430679fe7a8cbacd5d463c91b67af075d820f44df54da32df6719eea825cfabd742da777d551ff1fd8b06

data/lib/asciidoctor/mpfd/converter.rb

@@ -161,6 +161,10 @@ module Asciidoctor
           titlefont: node.attr("title-font"),
           i18nyaml: node.attr("i18nyaml"),
           scope: node.attr("scope"),
+          htmlstylesheet: node.attr("htmlstylesheet"),
+          htmlcoverpage: node.attr("htmlcoverpage"),
+          htmlintropage: node.attr("htmlintropage"),
+          scripts: node.attr("scripts"),
         )
       end
 
@@ -173,6 +177,13 @@ module Asciidoctor
           titlefont: node.attr("title-font"),
           i18nyaml: node.attr("i18nyaml"),
           scope: node.attr("scope"),
+          wordstylesheet: node.attr("wordstylesheet"),
+          standardstylesheet: node.attr("standardstylesheet"),
+          header: node.attr("header"),
+          wordcoverpage: node.attr("wordcoverpage"),
+          wordintropage: node.attr("wordintropage"),
+          ulstyle: node.attr("ulstyle"),
+          olstyle: node.attr("olstyle"),
         )
       end
 

data/lib/asciidoctor/mpfd/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
   module Mpfd
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/lib/isodoc/mpfd/html_convert.rb

@@ -1,5 +1,6 @@
 require "isodoc"
 require_relative "metadata"
+require  "fileutils"
 
 module IsoDoc
   module Mpfd
@@ -8,31 +9,30 @@ module IsoDoc
     # schema encapsulation of the document for validation
     #
     class HtmlConvert < IsoDoc::HtmlConvert
-      def rsd_html_path(file)
-        File.join(File.dirname(__FILE__), File.join("html", file))
-      end
-
       def initialize(options)
+        @libdir = File.dirname(__FILE__)
         super
-        @htmlstylesheet = generate_css(rsd_html_path("htmlstyle.scss"), true, default_fonts(options))
-        @htmlcoverpage = rsd_html_path("html_rsd_titlepage.html")
-        @htmlintropage = rsd_html_path("html_rsd_intro.html")
-        @scripts = rsd_html_path("scripts.html")
-        system "cp #{rsd_html_path('logo.jpg')} logo.jpg"
-        system "cp #{rsd_html_path('mpfa-logo-no-text@4x.png')} mpfa-logo-no-text@4x.png"
+        FileUtils.cp html_doc_path("logo.jpg"), "logo.jpg"
+        FileUtils.cp html_doc_path('mpfa-logo-no-text@4x.png'), "mpfa-logo-no-text@4x.png"
         @files_to_delete << "logo.jpg"
         @files_to_delete << "mpfa-logo-no-text@4x.png"
       end
 
       def default_fonts(options)
-        b = options[:bodyfont] ||
-          (options[:script] == "Hans" ? '"SimSun",serif' :
-           '"Titillium Web",sans-serif')
-        h = options[:headerfont] ||
-          (options[:script] == "Hans" ? '"SimHei",sans-serif' :
-           '"Titillium Web",sans-serif')
-        m = options[:monospacefont] || '"Space Mono",monospace'
-        "$bodyfont: #{b};\n$headerfont: #{h};\n$monospacefont: #{m};\n"
+        {
+          bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' : '"Titillium Web",sans-serif'),
+          headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' : '"Titillium Web",sans-serif'),
+          monospacefont: '"Space Mono",monospace'
+        }
+      end
+
+      def default_file_locations(_options)
+        {
+          htmlstylesheet: html_doc_path("htmlstyle.scss"),
+          htmlcoverpage: html_doc_path("html_rsd_titlepage.html"),
+          htmlintropage: html_doc_path("html_rsd_intro.html"),
+          scripts: html_doc_path("scripts.html"),
+        }
       end
 
       def metadata_init(lang, script, labels)

data/lib/isodoc/mpfd/pdf_convert.rb

@@ -1,36 +1,36 @@
 require "isodoc"
 require_relative "metadata"
+require "fileutils"
 
 module IsoDoc
   module Mpfd
     # A {Converter} implementation that generates PDF HTML output, and a
     # document schema encapsulation of the document for validation
     class PdfConvert < IsoDoc::PdfConvert
-      def rsd_html_path(file)
-        File.join(File.dirname(__FILE__), File.join("html", file))
-      end
-
       def initialize(options)
+        @libdir = File.dirname(__FILE__)
         super
-        @htmlstylesheet = generate_css(rsd_html_path("htmlstyle.scss"), true, default_fonts(options))
-        @htmlcoverpage = rsd_html_path("html_rsd_titlepage.html")
-        @htmlintropage = rsd_html_path("html_rsd_intro.html")
-        @scripts = rsd_html_path("scripts.html")
-        system "cp #{rsd_html_path('logo.jpg')} logo.jpg"
-        system "cp #{rsd_html_path('mpfa-logo-no-text@4x.png')} mpfa-logo-no-text@4x.png"
+        FileUtils.cp html_doc_path("logo.jpg"), "logo.jpg"
+        FileUtils.cp html_doc_path('mpfa-logo-no-text@4x.png'), "mpfa-logo-no-text@4x.png"
         @files_to_delete << "logo.jpg"
         @files_to_delete << "mpfa-logo-no-text@4x.png"
       end
 
       def default_fonts(options)
-        b = options[:bodyfont] ||
-          (options[:script] == "Hans" ? '"SimSun",serif' :
-           '"Overpass",sans-serif')
-        h = options[:headerfont] ||
-          (options[:script] == "Hans" ? '"SimHei",sans-serif' :
-           '"Overpass",sans-serif')
-        m = options[:monospacefont] || '"Space Mono",monospace'
-        "$bodyfont: #{b};\n$headerfont: #{h};\n$monospacefont: #{m};\n"
+        {
+          bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' : '"Titillium Web",sans-serif'),
+          headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' : '"Titillium Web",sans-serif'),
+          monospacefont: '"Space Mono",monospace'
+        }
+      end
+
+      def default_file_locations(_options)
+        {
+          htmlstylesheet: html_doc_path("htmlstyle.scss"),
+          htmlcoverpage: html_doc_path("html_rsd_titlepage.html"),
+          htmlintropage: html_doc_path("html_rsd_intro.html"),
+          scripts: html_doc_path("scripts.html"),
+        }
       end
 
       def metadata_init(lang, script, labels)
@@ -179,84 +179,84 @@ module IsoDoc
         @clause_lbl = y["clause"]
       end
 
-            def terms_defs_title(f)
+      def terms_defs_title(f)
         return f&.at(ns("./title"))&.content
       end
 
-          TERM_CLAUSE = "//preface/terms | "\
-      "//preface/clause[descendant::terms]".freeze
+      TERM_CLAUSE = "//preface/terms | "\
+        "//preface/clause[descendant::terms]".freeze
+
+
+      def terms_defs(isoxml, out, num)
+        f = isoxml.at(ns(TERM_CLAUSE)) or return num
+        out.div **attr_code(id: f["id"]) do |div|
+          clause_name(nil, terms_defs_title(f), div, nil)
+          f.elements.each do |e|
+            parse(e, div) unless %w{title source}.include? e.name
+          end
+        end
+        num
+      end
+
+      FRONT_CLAUSE = "//*[parent::preface]".freeze
+      #FRONT_CLAUSE = "//clause[parent::preface] | //terms[parent::preface]".freeze
+
+      def preface(isoxml, out)
+        isoxml.xpath(ns(FRONT_CLAUSE)).each do |c|
+          if c.name == "terms" then  terms_defs isoxml, out, 0
+          else
+            out.div **attr_code(id: c["id"]) do |s|
+              clause_name(get_anchors[c['id']][:label],
+                          c&.at(ns("./title"))&.content, s, nil)
+              c.elements.reject { |c1| c1.name == "title" }.each do |c1|
+                parse(c1, s)
+              end
+            end
+          end
+        end
+      end
+
+      def make_body3(body, docxml)
+        body.div **{ class: "main-section" } do |div3|
+          preface docxml, div3
+          middle docxml, div3
+          footnotes div3
+          comments div3
+        end
+      end
 
+      def middle(isoxml, out)
+        middle_title(out)
+        clause isoxml, out
+        annex isoxml, out
+        bibliography isoxml, out
+      end
 
-     def terms_defs(isoxml, out, num)
-      f = isoxml.at(ns(TERM_CLAUSE)) or return num
-      out.div **attr_code(id: f["id"]) do |div|
-        clause_name(nil, terms_defs_title(f), div, nil)
-        f.elements.each do |e|
-          parse(e, div) unless %w{title source}.include? e.name
+      def termdef_parse(node, out)
+        set_termdomain("")
+        node.children.each { |n| parse(n, out) }
+      end
+
+      def initial_anchor_names(d)
+        #preface_names(d.at(ns("//foreword")))
+        #preface_names(d.at(ns("//introduction")))
+        #preface_names(d.at(ns("//preface/terms | "\
+        #"//preface/clause[descendant::terms]")))
+        d.xpath(ns(FRONT_CLAUSE)).each do |c|
+          preface_names(c)
+          sequential_asset_names(c)
         end
+        middle_section_asset_names(d)
+        clause_names(d, 0)
+        termnote_anchor_names(d)
+        termexample_anchor_names(d)
+      end
+
+      def annex_name_lbl(clause, num)
+        l10n("<b>#{@annex_lbl} #{num}</b>")
       end
-      num
-     end
-
-     FRONT_CLAUSE = "//*[parent::preface]".freeze
-     #FRONT_CLAUSE = "//clause[parent::preface] | //terms[parent::preface]".freeze
-
-     def preface(isoxml, out)
-       isoxml.xpath(ns(FRONT_CLAUSE)).each do |c|
-         if c.name == "terms" then  terms_defs isoxml, out, 0
-         else
-           out.div **attr_code(id: c["id"]) do |s|
-             clause_name(get_anchors[c['id']][:label],
-                         c&.at(ns("./title"))&.content, s, nil)
-             c.elements.reject { |c1| c1.name == "title" }.each do |c1|
-               parse(c1, s)
-             end
-           end
-         end
-       end
-     end
-
-     def make_body3(body, docxml)
-       body.div **{ class: "main-section" } do |div3|
-         preface docxml, div3
-         middle docxml, div3
-         footnotes div3
-         comments div3
-       end
-     end
-
-     def middle(isoxml, out)
-       middle_title(out)
-       clause isoxml, out
-       annex isoxml, out
-       bibliography isoxml, out
-     end
-
-     def termdef_parse(node, out)
-       set_termdomain("")
-       node.children.each { |n| parse(n, out) }
-     end
-
-     def initial_anchor_names(d)
-       #preface_names(d.at(ns("//foreword")))
-       #preface_names(d.at(ns("//introduction")))
-       #preface_names(d.at(ns("//preface/terms | "\
-                             #"//preface/clause[descendant::terms]")))
-       d.xpath(ns(FRONT_CLAUSE)).each do |c|
-         preface_names(c)
-         sequential_asset_names(c)
-       end
-       middle_section_asset_names(d)
-       clause_names(d, 0)
-       termnote_anchor_names(d)
-       termexample_anchor_names(d)
-     end
-
-     def annex_name_lbl(clause, num)
-       l10n("<b>#{@annex_lbl} #{num}</b>")
-     end
-
-           def clause_names(docxml, sect_num)
+
+      def clause_names(docxml, sect_num)
         q = "//clause[parent::sections]"
         @topnum = nil
         lvl = 0

data/lib/isodoc/mpfd/word_convert.rb

@@ -1,40 +1,47 @@
 require "isodoc"
 require_relative "metadata"
+require "fileutils"
 
 module IsoDoc
   module Mpfd
     # A {Converter} implementation that generates Word output, and a document
     # schema encapsulation of the document for validation
-
     class WordConvert < IsoDoc::WordConvert
       def rsd_html_path(file)
         File.join(File.dirname(__FILE__), File.join("html", file))
       end
 
       def initialize(options)
+        @libdir = File.dirname(__FILE__)
         super
-        @wordstylesheet = generate_css(rsd_html_path("wordstyle.scss"), false, default_fonts(options))
-        @standardstylesheet = generate_css(rsd_html_path("rsd.scss"), false, default_fonts(options))
-        @header = rsd_html_path("header.html")
-        @wordcoverpage = rsd_html_path("word_rsd_titlepage.html")
-        @wordintropage = rsd_html_path("word_rsd_intro.html")
-        @ulstyle = "l3"
-        @olstyle = "l2"
-        system "cp #{rsd_html_path('logo.jpg')} logo.jpg"
-        system "cp #{rsd_html_path('mpfa-logo-no-text@4x.png')} mpfa-logo-no-text@4x.png"
+        FileUtils.cp html_doc_path("logo.jpg"), "logo.jpg"
+        FileUtils.cp html_doc_path('mpfa-logo-no-text@4x.png'), "mpfa-logo-no-text@4x.png"
         @files_to_delete << "logo.jpg"
         @files_to_delete << "mpfa-logo-no-text@4x.png"
       end
 
       def default_fonts(options)
-        b = options[:bodyfont] ||
-          (options[:script] == "Hans" ? '"SimSun",serif' :
-           '"Arial",sans-serif')
-        h = options[:headerfont] ||
-          (options[:script] == "Hans" ? '"SimHei",sans-serif' :
-           '"Arial",sans-serif')
-        m = options[:monospacefont] || '"Courier New",monospace'
-        "$bodyfont: #{b};\n$headerfont: #{h};\n$monospacefont: #{m};\n"
+        {
+          bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' : '"Arial",sans-serif'),
+          headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' : '"Arial",sans-serif'),
+          monospacefont: '"Courier New",monospace'
+        }
+      end
+
+      def default_file_locations(options)
+        {
+          htmlstylesheet: html_doc_path("htmlstyle.scss"),
+          htmlcoverpage: html_doc_path("html_rsd_titlepage.html"),
+          htmlintropage: html_doc_path("html_rsd_intro.html"),
+          scripts: html_doc_path("scripts.html"),
+          wordstylesheet: html_doc_path("wordstyle.scss"),
+          standardstylesheet: html_doc_path("rsd.scss"),
+          header: html_doc_path("header.html"),
+          wordcoverpage: html_doc_path("word_rsd_titlepage.html"),
+          wordintropage: html_doc_path("word_rsd_intro.html"),
+          ulstyle: "l3",
+          olstyle: "l2",
+        }
       end
 
       def metadata_init(lang, script, labels)
@@ -233,11 +240,11 @@ module IsoDoc
         node.children.each { |n| parse(n, out) }
       end
 
-     def annex_name_lbl(clause, num)
-       l10n("<b>#{@annex_lbl} #{num}</b>")
-     end
+      def annex_name_lbl(clause, num)
+        l10n("<b>#{@annex_lbl} #{num}</b>")
+      end
 
-           def clause_names(docxml, sect_num)
+      def clause_names(docxml, sect_num)
         q = "//clause[parent::sections]"
         @topnum = nil
         lvl = 0

data/metanorma-mpfd.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "htmlentities", "~> 4.3.4"
   spec.add_dependency "nokogiri"
   spec.add_dependency "asciidoctor-iso", "~> 0.10.1"
-  spec.add_dependency "isodoc", ">= 0.8.4"
+  spec.add_dependency "isodoc", "~> 0.8.8"
   spec.add_dependency "twitter_cldr"
 
   spec.add_development_dependency "bundler", "~> 1.15"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-mpfd
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-10 00:00:00.000000000 Z
+date: 2018-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -70,16 +70,16 @@ dependencies:
   name: isodoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.4
+        version: 0.8.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.4
+        version: 0.8.8
 - !ruby/object:Gem::Dependency
   name: twitter_cldr
   requirement: !ruby/object:Gem::Requirement
@@ -319,7 +319,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: metanorma-mpfd lets you write MPF documents in AsciiDoc.