asciidoctor-gb 0.3.5 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9213a1bd7d6f3ee41636366ddf0d10eb4e062d54a576e5f4759d4e85941e21e
-  data.tar.gz: 27bf85a798034864204eb6cb4cf5b1ae1ff89a01d1dd9152fdb2a6081e73e70c
+  metadata.gz: fc8afdfe9783472af80f7034c6934df0ba76dd35a2013b777ac63ca758c9e907
+  data.tar.gz: 81295903887476e3069d30c615ff4f2b34bda8723dc64571c9f0507868419625
 SHA512:
-  metadata.gz: 76443a422963f885da61d8266753d17ce8e6176ae38e051d375c4d2282d44c53a231298f732e97d3593e197db881ccef543cd08e1aaf0780a6b39aca354c0a43
-  data.tar.gz: eb97aeb9db37f6692e6ca3a6fea18e653728930fa801f41814e8000b7a2b4d65d00975685f97f526eabf1f1a8c074fcb16ba6fbcb2e21f1477d05ef3e7293910
+  metadata.gz: 57560a856f9529465482a98bcade61ee1b9b47baaf7178363ce4851ebf0b99cc9c61e90cf402e8434b0887aed5916f33d032fa4948bec9c09ee5b85a59c4a5ad
+  data.tar.gz: 40598211a8031e40895ed56e3500ce6e8098a1f1605d88c6e02be2e065f100b1bc86d1c1dcf8cbd0c7fc7b93cf6ea19b360486070d97882991d7704461273cfc

data/asciidoctor-gb.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |spec|
 
   spec.homepage      = "https://github.com/riboseinc/asciidoctor-gb"
   spec.license       = "BSD-2-Clause"
+  spec.post_install_message = "The asciidoctor-gb gem has been deprecated and has been replaced by metanorma-gb"
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
@@ -28,7 +29,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "asciidoctor-iso", "~> 0.10.0"
   spec.add_dependency "gbbib", "~> 0.2.2"
-  spec.add_dependency "isodoc", "~> 0.8.7"
+  spec.add_dependency "isodoc", "~> 0.8.8"
   spec.add_dependency "twitter_cldr"
   spec.add_dependency "gb-agencies", "~> 0.0.1"
 

data/lib/asciidoctor/gb/converter.rb

@@ -7,8 +7,6 @@ require "gb_agencies"
 require_relative "./section_input.rb"
 require_relative "./front.rb"
 require_relative "./validate.rb"
-require "pp"
-# require "byebug"
 
 module Asciidoctor
   module Gb
@@ -34,10 +32,6 @@ module Asciidoctor
         ret1
       end
 
-      def html_doc_path(file)
-        File.join(File.dirname(__FILE__), File.join("html", file))
-      end
-
       def html_converter(node)
         node.nil? ? IsoDoc::Gb::HtmlConvert.new({}) :
           IsoDoc::Gb::HtmlConvert.new(
@@ -48,6 +42,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
 
@@ -62,6 +60,10 @@ module Asciidoctor
             i18nyaml: node.attr("i18nyaml"),
             scope: node.attr("scope"),
             compliant: true,
+            htmlstylesheet: node.attr("htmlstylesheet"),
+            htmlcoverpage: node.attr("htmlcoverpage"),
+            htmlintropage: node.attr("htmlintropage"),
+            scripts: node.attr("scripts"),
         )
       end
 
@@ -75,25 +77,16 @@ 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
 
-      def default_fonts(node)
-        script = node.attr("script") || "Hans"
-        b = node.attr("body-font") ||
-          (script == "Hans" ? '"SimSun",serif' :
-           script == "Latn" ? '"Cambria",serif' : '"SimSun",serif' )
-        h = node.attr("header-font") ||
-          (script == "Hans" ? '"SimHei",sans-serif' :
-           script == "Latn" ? '"Calibri",sans-serif' : '"SimHei",sans-serif' )
-        m = node.attr("monospace-font") || '"Courier New",monospace'
-        scope = node.attr("scope") || "national"
-        t = node.attr("title-font") ||
-          (scope == "national" ? (script != "Hans" ? '"Cambria",serif' : '"SimSun",serif' ) :
-           (script == "Hans" ? '"SimHei",sans-serif' : '"Calibri",sans-serif' ))
-        "$bodyfont: #{b};\n$headerfont: #{h};\n$monospacefont: #{m};\n$titlefont: #{t};\n"
-      end
-
       def document(node)
         init(node)
         ret = makexml(node).to_xml(indent: 2)
@@ -222,7 +215,6 @@ module Asciidoctor
       end
 
       def docidentifier_cleanup(xmldoc)
-        #byebug
         id = xmldoc.at("//bibdata/docidentifier/project-number") or return
         scope = xmldoc.at("//gbscope")&.text
         prefix = xmldoc.at("//gbprefix")&.text

data/lib/asciidoctor/gb/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
   module Gb
-    VERSION = "0.3.5"
+    VERSION = "0.3.7"
   end
 end

data/lib/isodoc/gb/gbconvert.rb

@@ -1,6 +1,7 @@
 require "isodoc"
 require_relative "./gbcleanup.rb"
 require_relative "./metadata.rb"
+require "fileutils"
 
 module IsoDoc
   module Gb
@@ -19,7 +20,8 @@ module IsoDoc
         return agency unless agency.is_a?(Array)
         if agency == ["中华人民共和国国家质量监督检验检疫总局", "中国国家标准化管理委员会"]
           logo = "gb-issuer-default.gif"
-          system "cp #{fileloc(File.join('html/gb-logos', logo))}  #{logo}"
+          #system "cp #{fileloc(File.join('html/gb-logos', logo))}  #{logo}"
+          FileUtils.cp fileloc(File.join('html/gb-logos', logo)), logo
           return "<img src='#{logo}' alt='#{agency.join(",")}'></img>"
         end
         format_agency1(agency, format)
@@ -52,7 +54,8 @@ module IsoDoc
 
       def format_logo1(logo, prefix, scope)
         logo += ".gif"
-        system "cp #{fileloc(File.join('html/gb-logos', logo))}  #{logo}"
+        #system "cp #{fileloc(File.join('html/gb-logos', logo))}  #{logo}"
+        FileUtils.cp fileloc(File.join('html/gb-logos', logo)), logo
         local = local_logo_suffix(scope)
         #@files_to_delete << logo
         "<img width='113' height='56' src='#{logo}' alt='#{prefix}'></img>"\

data/lib/isodoc/gb/gbhtmlconvert.rb

@@ -9,37 +9,41 @@ module IsoDoc
     # A {Converter} implementation that generates GB output, and a document
     # schema encapsulation of the document for validation
     class HtmlConvert < IsoDoc::HtmlConvert
+      def initialize(options)
+        @common = IsoDoc::Gb::Common.new(options)
+        @libdir = File.dirname(__FILE__)
+        super
+        @lang = "zh"
+        @script = "Hans"
+      end
+
       def default_fonts(options)
         script = options[:script] || "Hans"
-        b = options[:bodyfont] ||
-          (script == "Hans" ? '"SimSun",serif' :
-           script == "Latn" ? '"Cambria",serif' : '"SimSun",serif' )
-        h = options[:headerfont] ||
-          (script == "Hans" ? '"SimHei",sans-serif' :
-           script == "Latn" ? '"Calibri",sans-serif' : '"SimHei",sans-serif' )
-        m = options[:monospacefont] || '"Courier New",monospace'
         scope = options[:scope] || "national"
-        t = options[:titlefont] ||
-          (scope == "national" ? (script != "Hans" ? '"Cambria",serif' : '"SimSun",serif' ) :
+        {
+          bodyfont: (script == "Hans" ? '"SimSun",serif' : '"Cambria",serif'),
+          headerfont: (script == "Hans" ? '"SimHei",sans-serif' : '"Calibri",sans-serif'),
+          monospacefont: '"Courier New",monospace',
+          titlefont: (scope == "national" ? (script != "Hans" ? '"Cambria",serif' : '"SimSun",serif' ) :
            (script == "Hans" ? '"SimHei",sans-serif' : '"Calibri",sans-serif' ))
-        "$bodyfont: #{b};\n$headerfont: #{h};\n$monospacefont: #{m};\n$titlefont: #{t};\n"
+        }
       end
 
-      def initialize(options)
-        @common = IsoDoc::Gb::Common.new(options)
-        super
-        if options[:compliant]
-          @htmlstylesheet = generate_css(html_doc_path("htmlcompliantstyle.scss"), true, default_fonts(options))
-          @htmlcoverpage = html_doc_path("html_compliant_gb_titlepage.html")
-        else
-          @htmlstylesheet = generate_css(html_doc_path("htmlstyle.scss"), true, default_fonts(options))
-          #@htmlcoverpage = html_doc_path("html_gb_titlepage.html")
-          @htmlcoverpage = html_doc_path("html_compliant_gb_titlepage.html")
-        end
-        @htmlintropage = html_doc_path("html_gb_intro.html")
-        @scripts = html_doc_path("scripts.html")
-        @lang = "zh"
-        @script = "Hans"
+      def default_file_locations(options)
+        {
+          htmlstylesheet: options[:compliant] ? html_doc_path("htmlcompliantstyle.scss") : html_doc_path("htmlstyle.scss"),
+          htmlcoverpage: html_doc_path("html_compliant_gb_titlepage.html"),
+          htmlintropage: html_doc_path("html_gb_intro.html"),
+          scripts: html_doc_path("scripts.html"),
+        }
+      end
+
+      def extract_fonts(options)
+        b = options[:bodyfont] || "Arial"
+        h = options[:headerfont] || "Arial"
+        m = options[:monospacefont] || "Courier"
+        t = options[:titlefont] || "Arial"
+        "$bodyfont: #{b};\n$headerfont: #{h};\n$monospacefont: #{m};\n$titlefont: #{t};\n"
       end
 
       def metadata_init(lang, script, labels)
@@ -63,10 +67,6 @@ module IsoDoc
         @cleanup.example_cleanup(docxml)
       end
 
-      def html_doc_path(file)
-        File.join(File.dirname(__FILE__), File.join("html", file))
-      end
-
       def i18n_init(lang, script)
         super
         y = if lang == "en"

data/lib/isodoc/gb/gbwordconvert.rb

@@ -4,51 +4,52 @@ require_relative "gbcleanup"
 require "gb_agencies"
 require_relative "metadata"
 require_relative "gbwordrender"
+require "fileutils"
 
 module IsoDoc
   module Gb
     # A {Converter} implementation that generates GB output, and a document
     # schema encapsulation of the document for validation
-
     class WordConvert < IsoDoc::WordConvert
-      def default_fonts(options)
-        script = options[:script] || "Hans"
-        b = options[:bodyfont] ||
-          (script == "Hans" ? '"SimSun",serif' :
-           script == "Latn" ? '"Cambria",serif' : '"SimSun",serif' )
-        h = options[:headerfont] ||
-          (script == "Hans" ? '"SimHei",sans-serif' :
-           script == "Latn" ? '"Calibri",sans-serif' : '"SimHei",sans-serif' )
-        m = options[:monospacefont] || '"Courier New",monospace'
-        scope = options[:scope] || "national"
-        t = options[:titlefont] ||
-          (scope == "national" ? (script != "Hans" ? '"Cambria",serif' : '"SimSun",serif' ) :
-           (script == "Hans" ? '"SimHei",sans-serif' : '"Calibri",sans-serif' ))
-        "$bodyfont: #{b};\n$headerfont: #{h};\n$monospacefont: #{m};\n$titlefont: #{t};\n"
-      end
-
-      def metadata_init(lang, script, labels)
-        @meta = Metadata.new(lang, script, labels)
-        @common = IsoDoc::Gb::Common.new(meta: @meta)
-      end
-
-      def html_doc_path(file)
-        File.join(File.dirname(__FILE__), File.join("html", file))
-      end
-
       def initialize(options)
         @common = IsoDoc::Gb::Common.new(options)
+        @libdir = File.dirname(__FILE__)
         super
-        @wordstylesheet = generate_css(html_doc_path("wordstyle.scss"), false, default_fonts(options))
-        @standardstylesheet = generate_css(html_doc_path("gb.scss"), false, default_fonts(options))
-        @header = html_doc_path("header.html")
-        @wordcoverpage = html_doc_path("word_gb_titlepage.html")
-        @wordintropage = html_doc_path("word_gb_intro.html")
-        @ulstyle = "l7"
-        @olstyle = "l10"
         @lang = "zh"
         @script = "Hans"
       end
+        
+      def default_fonts(options)
+        script = options[:script] || "Hans"
+        scope = options[:scope] || "national"
+        {
+          bodyfont: (script == "Hans" ? '"SimSun",serif' : '"Cambria",serif'),
+          headerfont: (script == "Hans" ? '"SimHei",sans-serif' : '"Calibri",sans-serif'),
+          monospacefont: '"Courier New",monospace',
+          titlefont: (scope == "national" ? (script != "Hans" ? '"Cambria",serif' : '"SimSun",serif' ) :
+           (script == "Hans" ? '"SimHei",sans-serif' : '"Calibri",sans-serif' ))
+        }     
+      end     
+                
+      def default_file_locations(options)
+        {   
+          wordstylesheet: html_doc_path("wordstyle.scss"),
+          standardstylesheet: html_doc_path("gb.scss"),
+          header: html_doc_path("header.html"),
+          wordcoverpage: html_doc_path("word_gb_titlepage.html"),
+          wordintropage: html_doc_path("word_gb_intro.html"),
+          ulstyle: "l7",
+          olstyle: "l10",
+        }
+      end 
+          
+      def extract_fonts(options)
+        b = options[:bodyfont] || "Arial"
+        h = options[:headerfont] || "Arial"
+        m = options[:monospacefont] || "Courier"
+        t = options[:titlefont] || "Arial"
+        "$bodyfont: #{b};\n$headerfont: #{h};\n$monospacefont: #{m};\n$titlefont: #{t};\n"
+      end   
 
       def metadata_init(lang, script, labels)
         unless ["en", "zh"].include? lang
@@ -71,10 +72,6 @@ module IsoDoc
         @cleanup.example_cleanup(docxml)
       end
 
-      def html_doc_path(file)
-        File.join(File.dirname(__FILE__), File.join("html", file))
-      end
-
       def i18n_init(lang, script)
         super
         y = if lang == "en"
@@ -109,6 +106,7 @@ module IsoDoc
         params = meta.map { |k, v| [k.to_s, v] }.to_h
         File.open("header.html", "w") { |f| f.write(template.render(params)) }
         system "cp #{@common.fileloc(File.join('html', 'blank.png'))} blank.png"
+        FileUtils.cp @common.fileloc(File.join('html', 'blank.png')), "blank.png"
         @files_to_delete << "blank.png"
         @files_to_delete << "header.html"
         "header.html"
@@ -133,10 +131,6 @@ module IsoDoc
         @cleanup.title_cleanup(docxml.at('//div[@class="WordSection2"]'))
         docxml
       end
-
-      def html_doc_path(file)
-        File.join(File.dirname(__FILE__), File.join("html", file))
-      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-gb
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-12 00:00:00.000000000 Z
+date: 2018-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor-iso
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: 0.8.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: 0.8.8
 - !ruby/object:Gem::Dependency
   name: twitter_cldr
   requirement: !ruby/object:Gem::Requirement
@@ -354,7 +354,8 @@ homepage: https://github.com/riboseinc/asciidoctor-gb
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message: 
+post_install_message: The asciidoctor-gb gem has been deprecated and has been replaced
+  by metanorma-gb
 rdoc_options: []
 require_paths:
 - lib