metanorma-gb 1.1.5 → 1.2.0

data/lib/metanorma/gb/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Gb
-    VERSION = "1.1.5"
+    VERSION = "1.2.0"
   end
 end

data/metanorma-gb.gemspec

@@ -27,9 +27,10 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
 
-  spec.add_dependency "metanorma-iso", "~> 1.1.0"
-  spec.add_dependency "isodoc", "~> 0.9.1"
+  spec.add_dependency "metanorma-iso", "~> 1.2.0"
+  spec.add_dependency "isodoc", "~> 0.10.0"
   spec.add_dependency "twitter_cldr", "~> 4.4.4"
   spec.add_dependency "gb-agencies", "~> 0.0.4"
   spec.add_dependency "htmlentities", "~> 4.3.4"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-gb
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.2.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-04 00:00:00.000000000 Z
+date: 2019-06-15 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.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: isodoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: twitter_cldr
   requirement: !ruby/object:Gem::Requirement
@@ -272,12 +272,11 @@ files:
 - lib/asciidoctor/gb/reqt.rng
 - lib/asciidoctor/gb/section_input.rb
 - lib/asciidoctor/gb/validate.rb
+- lib/isodoc/gb/gbbaseconvert.rb
 - lib/isodoc/gb/gbcleanup.rb
 - lib/isodoc/gb/gbconvert.rb
 - lib/isodoc/gb/gbhtmlconvert.rb
-- lib/isodoc/gb/gbhtmlrender.rb
 - lib/isodoc/gb/gbwordconvert.rb
-- lib/isodoc/gb/gbwordrender.rb
 - lib/isodoc/gb/html/blank.png
 - lib/isodoc/gb/html/footer.png
 - lib/isodoc/gb/html/gb-logos/gb-issuer-default.gif
@@ -333,7 +332,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/isodoc/gb/gbwordrender.rb

@@ -1,243 +0,0 @@
-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 formula_parse(node, out)
-        out.div **attr_code(id: node["id"], class: "formula") do |div|
-          insert_tab(div, 1)
-          parse(node.at(ns("./stem")), out)
-          insert_tab(div, 1)
-          div << "(#{get_anchors[node['id']][:label]})"
-        end
-        formula_where(node.at(ns("./dl")), out)
-      end
-
-      def formula_where(dl, out)
-        return unless dl
-        out.p { |p| p << @where_lbl }
-        formula_dl_parse(dl, out)
-      end
-
-      def formula_dl_parse(node, out)
-        out.table **{ class: "dl" } do |v|
-          node.elements.each_slice(2) do |dt, dd|
-            v.tr do |tr|
-              tr.td **{ valign: "top", align: "left" } do |term|
-                dt_parse(dt, term)
-              end
-              tr.td(**{ valign: "top" }) { |td| td << "&mdash;" }
-              tr.td **{ valign: "top" } do |listitem|
-                dd.children.each { |n| parse(n, listitem) }
-              end
-            end
-          end
-        end
-      end
-
-      EXAMPLE_TBL_ATTR =
-        { valign: "top", class: "example_label",
-          style: "padding:2pt 2pt 2pt 2pt" }.freeze
-
-      def example_table_parse(node, out)
-        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) + ":")
-            end
-            tr.td **{ valign: "top", class: "example" } do |td|
-              node.children.each { |n| parse(n, td) }
-            end
-          end
-        end
-      end
-
-      def example_label(node)
-        l10n(super + ":")
-      end
-
-      def note_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(note_label(node) + ":")
-            end
-            tr.td **{ valign: "top", class: "Note" } do |td|
-              node.children.each { |n| parse(n, td) }
-            end
-          end
-        end
-        @note = false
-      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("#{get_anchors[node['id']][:label]}:")
-            end
-            tr.td **{ valign: "top", class: "Note" } do |td|
-              node.children.each { |n| parse(n, td) }
-            end
-          end
-        end
-        @note = false
-      end
-
-      def middle(isoxml, out)
-        super
-        end_line(isoxml, out)
-      end
-
-      def end_line(_isoxml, out)
-        out.hr **{ width: "25%" }
-      end 
-
-      def error_parse(node, out)
-        # catch elements not defined in ISO
-        case node.name
-        when "string" then string_parse(node, out)
-        else
-          super
-        end
-      end
-
-      def string_parse(node, out)
-        if node["script"] == "Hant"
-          out.span **{ class: "Hant" } do |s|
-            node.children.each { |c| parse(c, s) }
-          end
-        else
-          node.children.each { |c| parse(c, out) }
-        end
-      end
-
-      def deprecated_term_parse(node, out) 
-        out.p **{ class: "DeprecatedTerms" } do |p|
-          p << l10n("#{@deprecated_lbl}: ")
-          node.children.each { |c| parse(c, p) }
-        end
-      end
-
-      def termref_render(x)
-        parts = x.split(%r{(\s*\[MODIFICATION\]|,)}m)
-        parts[1] = l10n(", #{@source_lbl}") if parts.size > 1 && parts[1] == ","
-        parts.map do |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).
-          map do |a|
-          a.size < 3 ? a[0] : a[0] + termref_render(a[2])
-        end.join
-      end
-
-      def populate_template(docxml, format)
-        meta = @meta.get.merge(@labels)
-        logo = @common.format_logo(meta[:gbprefix], meta[:gbscope], format, @localdir)
-        logofile = @meta.standard_logo(meta[:gbprefix])
-        @files_to_delete << logofile + ".gif" unless logofile.nil?
-        docxml = termref_resolve(docxml)
-        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)
-      end
-
-      def foreword(isoxml, out)
-        f = isoxml.at(ns("//foreword")) || return
-        page_break(out)
-        out.div do |s|
-          s.h1 **{ class: "ForewordTitle" } do |h1|
-            h1 << "#{@foreword_lbl}&nbsp;"
-            # insert_tab(h1, 1)
-          end
-          f.elements.each { |e| parse(e, s) unless e.name == "title" }
-        end
-      end
-
-      def clause_name(num, title, div, header_class)
-        header_class = {} if header_class.nil?
-        div.h1 **attr_code(header_class) do |h1|
-          if num && !@suppressheadingnumbers
-            h1 << "#{num}."
-            h1 << "&#x3000;"
-          end
-          h1 << title
-        end
-        div.parent.at(".//h1")
-      end
-
-      def clause_parse_title(node, div, c1, out)
-        if node["inline-header"] == "true"
-          inline_header_title(out, node, c1)
-        else
-          div.send "h#{get_anchors[node['id']][:level]}" do |h|
-            h << "#{get_anchors[node['id']][:label]}.&#x3000;" if !@suppressheadingnumbers
-            c1 && c1.children.each { |c2| parse(c2, h) }
-          end
-        end
-      end
-
-      def annex_name(annex, name, div)
-        div.h1 **{ class: "Annex" } do |t|
-          t << "#{get_anchors[annex['id']][:label]}<br/><br/>"
-          name&.children&.each { |c2| parse(c2, t) }
-        end
-      end
-
-      def term_defs_boilerplate(div, source, term, preface)
-        (source.empty? && term.nil?) and div << @no_terms_boilerplate or
-          div << term_defs_boilerplate_cont(source, term)
-        #div << @term_def_boilerplate unless preface
-      end
-
-=begin
-      def reference_names(ref)
-        isopub = ref.at(ns(ISO_PUBLISHER_XPATH))
-        docid = ref.at(ns("./docidentifier"))
-        date = ref.at(ns("./date[@type = 'published']"))
-        reference = format_ref(docid.text, isopub, date)
-        @anchors[ref["id"]] = { xref: reference }
-      end
-=end
-
-      def example_p_parse(node, div)
-        div.p do |p|
-          p.span **{ class: "example_label" } do |s|
-            s << example_label(node)
-          end
-          insert_tab(p, 1)
-          node.first_element_child.children.each { |n| parse(n, p) }
-        end
-        node.element_children[1..-1].each { |n| parse(n, div) }
-      end
-
-      def example_parse1(node, div)
-        div.p do |p|
-          p.span **{ class: "example_label" } do |s|
-            s << example_label(node)
-          end
-          insert_tab(p, 1)
-        end
-        node.children.each { |n| parse(n, div) }
-      end
-
-      def example_parse(node, out)
-        out.div **{ id: node["id"], class: "example" } do |div|
-          if node.first_element_child.name == "p"
-            example_p_parse(node, div)
-          else
-            example_parse1(node, div)
-          end
-        end
-      end
-    end
-  end
-end
-