metanorma-gb 1.4.0 → 1.5.1

data/lib/isodoc/gb/html_convert.rb

@@ -1,3 +1,4 @@
+require_relative "init"
 require_relative "base_convert"
 require "isodoc"
 
@@ -27,6 +28,16 @@ module IsoDoc
         }
       end
 
+      def fonts_options
+        default_font_options = default_fonts(options)
+        {
+          bodyfont: options[:bodyfont] || default_font_options[:bodyfont],
+          headerfont: options[:headerfont] || default_font_options[:headerfont],
+          monospacefont: options[:monospacefont] || default_font_options[:monospacefont],
+          titlefont: options[:titlefont] || default_font_options[:titlefont]
+        }
+      end
+
       def default_file_locations(options)
         {
           htmlstylesheet: options[:compliant] ? html_doc_path("htmlcompliantstyle.scss") : html_doc_path("htmlstyle.scss"),
@@ -37,31 +48,23 @@ module IsoDoc
       end
 
       def populate_template(docxml, format)
-        meta = @meta.get.merge(@labels)
+        meta = @meta.get.merge(@i18n.get).merge(@meta.fonts_options || {})
         logo = @common.format_logo(meta[:gbprefix], meta[:gbscope], format, @localdir)
         logofile = @meta.standard_logo(meta[:gbprefix])
         meta[:standard_agency_formatted] =
           @common.format_agency(meta[:standard_agency], format, @localdir)
         meta[:standard_logo] = logo
-
         template = Liquid::Template.parse(docxml)
         template.render(meta.map { |k, v| [k.to_s, v] }.to_h)
-
-        #template = liquid(docxml)
-      #template.render(meta.map { |k, v| [k.to_s, empty2nil(v)] }.to_h).
-        #gsub('<', '<').gsub('>', '>').gsub('&', '&')
       end
 
-      def annex_name(annex, name, div)
-        div.h1 **{ class: "Annex" } do |t|
-          t << "#{@xrefs.anchor(annex['id'], :label)}<br/><br/>"
-          t.b do |b|
-            name&.children&.each { |c2| parse(c2, b) }
-          end
-        end
+      def insert_tab(out, n)
+        tab = "&#x3000;"
+        [1..n].each { out << tab }
       end
 
       include BaseConvert
+      include Init
     end
   end
 end

data/lib/isodoc/gb/i18n.rb

@@ -0,0 +1,16 @@
+module IsoDoc
+  module Gb
+    class I18n < IsoDoc::Iso::I18n
+      def load_yaml1(lang, script)
+        y = if lang == "en"
+              YAML.load_file(File.join(File.dirname(__FILE__), "i18n-en.yaml"))
+            elsif lang == "zh" && script == "Hans"
+              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"))
+            end
+        super.merge(y)
+      end
+    end
+  end
+end

data/lib/isodoc/gb/init.rb

@@ -0,0 +1,29 @@
+require "isodoc"
+require_relative "metadata"
+require_relative "xref"
+require_relative "i18n"
+
+module IsoDoc
+  module Gb
+    module Init
+      def metadata_init(lang, script, labels)
+        unless ["en", "zh"].include? lang
+          lang = "zh"
+          script = "Hans"
+        end
+        @meta = Metadata.new(lang, script, labels)
+        @meta.set(:standardclassimg, @standardclassimg)
+        @common&.meta = @meta
+      end
+
+      def xref_init(lang, script, klass, labels, options)
+        @xrefs = Xref.new(lang, script, HtmlConvert.new(language: lang, script: script), labels, options)
+      end
+
+      def i18n_init(lang, script, i18nyaml = nil)
+        @i18n = I18n.new(lang, script, i18nyaml || @i18nyaml)
+      end
+    end
+  end
+end
+

data/lib/isodoc/gb/metadata.rb

@@ -8,7 +8,7 @@ module IsoDoc
     # A {Converter} implementation that generates GB output, and a document
     # schema encapsulation of the document for validation
     class Metadata < IsoDoc::Iso::Metadata
-      def initialize(lang, script, labels)
+      def initialize(lang, script, i18n)
         super
         set(:docmaintitlezh, "")
         set(:docsubtitlezh, "XXXX")

data/lib/isodoc/gb/presentation_xml_convert.rb

@@ -1,9 +1,25 @@
-require_relative "base_convert"
+require_relative "init"
 require "isodoc"
 
 module IsoDoc
   module Gb
     class PresentationXMLConvert < IsoDoc::Iso::PresentationXMLConvert
+      def example1(f)
+        n = @xrefs.get[f["id"]]
+        lbl = (n.nil? || n[:label].nil? || n[:label].empty?) ? @i18n.example :
+          l10n("#{@i18n.example} #{n[:label]}")
+        prefix_name(f, "&nbsp;&mdash; ", l10n(lbl + ":"), "name")
+      end
+
+      def annex1(f)
+      lbl = @xrefs.anchor(f['id'], :label)
+      if t = f.at(ns("./title"))
+        t.children = "#{t.children.to_xml}"
+      end
+      prefix_name(f, "<br/><br/>", lbl, "title")
+    end
+
+      include Init
     end
   end
 end

data/lib/isodoc/gb/word_convert.rb

@@ -1,4 +1,5 @@
 require_relative "base_convert"
+require_relative "init"
 require "isodoc"
 
 module IsoDoc
@@ -24,11 +25,21 @@ module IsoDoc
           monospacefont: '"Courier New",monospace',
           titlefont: (scope == "national" ? (script != "Hans" ? '"Cambria",serif' : '"SimSun",serif' ) :
                       (script == "Hans" ? '"SimHei",sans-serif' : '"Calibri",sans-serif' ))
-        }     
-      end     
+        }
+      end
+
+      def fonts_options
+        default_font_options = default_fonts(options)
+        {
+          bodyfont: options[:bodyfont] || default_font_options[:bodyfont],
+          headerfont: options[:headerfont] || default_font_options[:headerfont],
+          monospacefont: options[:monospacefont] || default_font_options[:monospacefont],
+          titlefont: options[:titlefont] || default_font_options[:titlefont]
+        }
+      end
 
       def default_file_locations(options)
-        {   
+        {
           wordstylesheet: html_doc_path("wordstyle.scss"),
           standardstylesheet: html_doc_path("gb.scss"),
           header: html_doc_path("header.html"),
@@ -37,10 +48,10 @@ module IsoDoc
           ulstyle: "l7",
           olstyle: "l10",
         }
-      end 
+      end
 
       ENDLINE = <<~END.freeze
-      <v:line 
+      <v:line
  alt="" style='position:absolute;left:0;text-align:left;z-index:251662848;
  mso-wrap-edited:f;mso-width-percent:0;mso-height-percent:0;
  mso-width-percent:0;mso-height-percent:0'
@@ -61,17 +72,17 @@ module IsoDoc
         out.table **attr_code(id: node["id"], class: "example") do |t|
           t.tr do |tr|
             tr.td **EXAMPLE_TBL_ATTR do |td|
-              td << l10n(example_label(node) + ":")
+              node.at(ns("./name")).children.each { |n| parse(n, td) }
             end
             tr.td **{ valign: "top", class: "example" } do |td|
-              node.children.each { |n| parse(n, td) }
+              node.children.each { |n| parse(n, td) unless n.name == "name" }
             end
           end
         end
       end
 
       def populate_template(docxml, format)
-        meta = @meta.get.merge(@labels)
+        meta = @meta.get.merge(@i18n.get).merge(@meta.fonts_options || {})
         logo = @common.format_logo(meta[:gbprefix], meta[:gbscope], format, @localdir)
         logofile = @meta.standard_logo(meta[:gbprefix])
         meta[:standard_agency_formatted] =
@@ -82,13 +93,6 @@ module IsoDoc
         gsub('&lt;', '&#x3c;').gsub('&gt;', '&#x3e;').gsub('&amp;', '&#x26;')
       end
 
-      def annex_name(annex, name, div)
-        div.h1 **{ class: "Annex" } do |t|
-          t << "#{@xrefs.anchor(annex['id'], :label)}<br/><br/>"
-          name&.children&.each { |c2| parse(c2, t) }
-        end
-      end
-
       def make_body(xml, docxml)
         body_attr = { lang: "EN-US", link: "blue", vlink: "#954F72" }
         xml.body **body_attr do |body|
@@ -116,6 +120,7 @@ module IsoDoc
       end
 
       include BaseConvert
+      include Init
     end
   end
 end

data/lib/isodoc/gb/xref.rb

@@ -0,0 +1,6 @@
+module IsoDoc
+  module Gb
+    class Xref < IsoDoc::Xref
+    end
+  end
+end

data/lib/metanorma/gb/processor.rb

@@ -32,10 +32,6 @@ module Metanorma
         "Metanorma::Gb #{Metanorma::Gb::VERSION}"
       end
 
-      def input_to_isodoc(file, filename)
-        Metanorma::Input::Asciidoc.new.process(file, filename, @asciidoctor_backend)
-      end
-
       def extract_options(file)
         head = file.sub(/\n\n.*$/m, "\n")
         /\n:standard-logo-img: (?<standardlogoimg>[^\n]+)\n/ =~ head

data/lib/metanorma/gb/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Gb
-    VERSION = "1.4.0"
+    VERSION = "1.5.1"
   end
 end

data/metanorma-gb.gemspec

@@ -29,13 +29,14 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
 
-  spec.add_dependency "metanorma-iso", "~> 1.4.0"
-  spec.add_dependency "isodoc", "~> 1.1.0"
+  spec.add_dependency "metanorma-iso", "~> 1.5.0"
+  spec.add_dependency "isodoc", "~> 1.2.0"
   spec.add_dependency "twitter_cldr", "~> 4.4.4"
   spec.add_dependency "gb-agencies", "~> 0.0.4"
   spec.add_dependency "htmlentities", "~> 4.3.4"
 
   spec.add_development_dependency "byebug", "~> 9.1"
+  spec.add_development_dependency "sassc", "2.4.0"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "guard", "~> 2.14"
   spec.add_development_dependency "guard-rspec", "~> 4.7"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-gb
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-06-26 00:00:00.000000000 Z
+date: 2020-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-iso
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: isodoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: twitter_cldr
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '9.1'
+- !ruby/object:Gem::Dependency
+  name: sassc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.4.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
   requirement: !ruby/object:Gem::Requirement
@@ -253,6 +267,7 @@ files:
 - lib/asciidoctor/gb/basicdoc.rng
 - lib/asciidoctor/gb/biblio.rng
 - lib/asciidoctor/gb/boilerplate.xml
+- lib/asciidoctor/gb/cleanup.rb
 - lib/asciidoctor/gb/converter.rb
 - lib/asciidoctor/gb/front.rb
 - lib/asciidoctor/gb/front_id.rb
@@ -266,6 +281,7 @@ files:
 - lib/isodoc/gb/cleanup.rb
 - lib/isodoc/gb/common.rb
 - lib/isodoc/gb/gb.recommendation.xsl
+- lib/isodoc/gb/html/_coverpage.css
 - lib/isodoc/gb/html/_coverpage.scss
 - lib/isodoc/gb/html/blank.png
 - lib/isodoc/gb/html/footer.png
@@ -290,25 +306,32 @@ files:
 - lib/isodoc/gb/html/gb-logos/gb-standard-zb.gif
 - lib/isodoc/gb/html/gb-logos/gb-standard-zb.png
 - lib/isodoc/gb/html/gb-logos/gb-standard-zb.svg
+- lib/isodoc/gb/html/gb.css
 - lib/isodoc/gb/html/gb.scss
 - lib/isodoc/gb/html/header.html
 - lib/isodoc/gb/html/html_compliant_gb_titlepage.html
 - lib/isodoc/gb/html/html_gb_intro.html
 - lib/isodoc/gb/html/html_gb_titlepage.html
+- lib/isodoc/gb/html/htmlcompliantstyle.css
 - lib/isodoc/gb/html/htmlcompliantstyle.scss
+- lib/isodoc/gb/html/htmlstyle.css
 - lib/isodoc/gb/html/htmlstyle.scss
 - lib/isodoc/gb/html/logo.png
 - lib/isodoc/gb/html/scripts.html
 - lib/isodoc/gb/html/word_gb_intro.html
 - lib/isodoc/gb/html/word_gb_titlepage.html
+- lib/isodoc/gb/html/wordstyle.css
 - lib/isodoc/gb/html/wordstyle.scss
 - lib/isodoc/gb/html_convert.rb
 - lib/isodoc/gb/i18n-en.yaml
 - lib/isodoc/gb/i18n-zh-Hans.yaml
+- lib/isodoc/gb/i18n.rb
+- lib/isodoc/gb/init.rb
 - lib/isodoc/gb/metadata.rb
 - lib/isodoc/gb/pdf_convert.rb
 - lib/isodoc/gb/presentation_xml_convert.rb
 - lib/isodoc/gb/word_convert.rb
+- lib/isodoc/gb/xref.rb
 - lib/metanorma-gb.rb
 - lib/metanorma/gb.rb
 - lib/metanorma/gb/processor.rb