metanorma-gb 1.4.3 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61424361f137760e81ac2be44d0612606ff8d5e7073e6d7f06d3036d15030798
-  data.tar.gz: 5b16f50829090ae682162ed84713fc21290dd864440fe54cc07e9c55e42e7738
+  metadata.gz: fe9a20b1e4d09c3ed8151c2021f51c1b8e412f823f0363db5bf0b9e4eb182908
+  data.tar.gz: 6601454ed383cbb484434deebc8195d280a50f36282e0d84a096c1406751e322
 SHA512:
-  metadata.gz: d0ce63e59a9f544d136615b857e326d0a3ac2985f66eef19eb194e727033c205dc1f4c7e7cfb7a076576666088c537c5ca164bf560a4ba0b1c6e638e4bbc594b
-  data.tar.gz: d6e5ab147c8b47a65fd7c47a6f1a107837e001bd2801e9a81b50ab40865c189ad9d768000f65e881612feda144eb72090acb81f09800632699ac9fdab9db2bcf
+  metadata.gz: fd3154c799e5794a5b9a7a13b8cfe3eb2d70a0a1b1bb36ea6e1d85a9b14d8a5658726320734105f5abfcf1f0c8990ce2e9ce681cbc8d600d0702430f8416f048
+  data.tar.gz: 8f90f5d26fe2601454ad8f6a27d6103d494443ce9948a25d2b2d697b9eb562018802cb08e529855916f2d8e7b4c0296e1e7001af8201374eda350ee4bf2fece0

data/lib/asciidoctor/gb/cleanup.rb

@@ -0,0 +1,130 @@
+module Asciidoctor
+  module Gb
+    class Converter < ISO::Converter
+      def termdef_cleanup(xmldoc)
+        super
+        # TODO this should become variant tag
+        localisedstr(xmldoc)
+      end
+
+      ROMAN_TEXT = /\s*[a-z\u00c0-\u00d6\u00d8-\u00f0\u0100-\u0240]/i
+      HAN_TEXT = /\s*[\u4e00-\u9fff]+/
+
+      LOCALISED_ELEMS = "//admitted | //deprecates | //preferred | //prefix | "\
+        "//initial | //addition | //surname | //forename | //name | "\
+        "//abbreviation | //role/description | //affiliation/description | "\
+        "//bibdata/item | //bibitem/title | //bibdata/formattedref | "\
+        "//bibitem/formattedref | //bibdata/note | //bibitem/note | "\
+        "//bibdata/abstract | //bibitem/note ".freeze
+
+      MUST_LOCALISE_ELEMS = %w{admitted deprecates preferred}.freeze
+
+      def localisedstr(xmldoc)
+        xmldoc.xpath(LOCALISED_ELEMS).each do |zh|
+          if zh.at("./string")
+            extract_localisedstrings(zh)
+          elsif MUST_LOCALISE_ELEMS.include? zh.name
+            duplicate_localisedstrings(zh)
+          end
+        end
+      end
+
+      # element consists solely of localised strings, with no attributes
+      def extract_localisedstrings(elem)
+        elem.xpath("./string").each do |s|
+          s.name = elem.name
+        end
+        elem.replace(elem.children)
+      end
+
+      def text_clean(text)
+        text.gsub(/^\s*/, "").gsub(/</, "&lt;").gsub(/>/, "&gt;")
+      end
+
+      def duplicate_localisedstrings(zh)
+        en = zh.dup.remove
+        zh.after(en).after(" ")
+        zh["language"] = "zh"
+        en["language"] = "en"
+        en.traverse do |c|
+          c.text? && c.content = text_clean(c.text.gsub(HAN_TEXT, ""))
+        end
+        zh.traverse do |c|
+          c.text? && c.content = text_clean(c.text.gsub(ROMAN_TEXT, ""))
+        end
+      end
+
+      def termdef_boilerplate_cleanup(xmldoc)
+        return if @keepboilerplate
+        super
+      end
+
+      def cleanup(xmldoc)
+        lang = xmldoc.at("//language")&.text
+        @agencyclass = GbAgencies::Agencies.new(lang, {}, "")
+        super
+        contributor_cleanup(xmldoc)
+        xmldoc
+      end
+
+      def docidentifier_cleanup(xmldoc)
+        id = xmldoc.at("//bibdata/docidentifier[@type = 'gb']") or return
+        scope = xmldoc.at("//gbscope")&.text
+        prefix = xmldoc.at("//gbprefix")&.text
+        mand = xmldoc.at("//gbmandate")&.text || "mandatory"
+        idtext = @agencyclass.docidentifier(scope, prefix, mand, nil, id.text)
+        id.content = idtext&.gsub(/\&#x2002;/, " ")
+        id = xmldoc.at("//bibdata/ext/structuredidentifier/"\
+                       "project-number") or return
+        idtext = @agencyclass.docidentifier(scope, prefix, mand, nil, id.text)
+        id.content = idtext&.gsub(/\&#x2002;/, " ")
+      end
+
+      def committee_cleanup(xmldoc)
+        xmldoc.xpath("//gbcommittee").each do |c|
+          xmldoc.at("//bibdata/contributor").next =
+            "<contributor><role type='technical-committee'/><organization>"\
+            "<name>#{c.text}</name></organization></contributor>"
+        end
+      end
+
+      def agency_value(issuer, scope, prefix, mandate)
+        agency = issuer.content
+        agency == "GB" and
+          agency = @agencyclass.standard_agency1(scope, prefix, mandate)
+        agency = "GB" if agency.nil? || agency.empty?
+        agency
+      end
+
+      def contributor_cleanup(xmldoc)
+        issuer = xmldoc.at("//bibdata/contributor[role/@type = 'issuer']/"\
+                           "organization/name")
+        scope = xmldoc.at("//gbscope")&.text
+        prefix = xmldoc.at("//gbprefix")&.text
+        mandate = xmldoc.at("//gbmandate")&.text || "mandatory"
+        agency = agency_value(issuer, scope, prefix, mandate)
+        owner = xmldoc.at("//copyright/owner/organization/name")
+        owner.content = agency
+        issuer.content = agency
+        committee_cleanup(xmldoc)
+      end
+
+      def omit_docid_prefix(prefix)
+        IsoDoc::Gb::HtmlConvert.new({}).omit_docid_prefix(prefix)
+      end
+
+      def boilerplate_cleanup(xmldoc)
+        isodoc = boilerplate_isodoc(xmldoc)
+        initial_boilerplate(xmldoc, isodoc)
+        return if @keepboilerplate
+        xmldoc.xpath(self.class::TERM_CLAUSE).each do |f|
+          term_defs_boilerplate(f.at("./title"),
+                                xmldoc.xpath(".//termdocsource"),
+                                f.at(".//term"), f.at(".//p"), isodoc)
+        end
+        f = xmldoc.at(self.class::NORM_REF) and
+          norm_ref_preface(f)
+      end
+    end
+  end
+end

data/lib/asciidoctor/gb/converter.rb

@@ -1,6 +1,5 @@
 require "asciidoctor"
 require "asciidoctor/iso/converter"
-require "metanorma/gb/version"
 require "isodoc/gb/common"
 require "isodoc/gb/word_convert"
 require "isodoc/gb/pdf_convert"
@@ -9,6 +8,7 @@ require "gb_agencies"
 require_relative "./section_input.rb"
 require_relative "./front.rb"
 require_relative "./validate.rb"
+require_relative "cleanup.rb"
 require "fileutils"
 
 module Asciidoctor
@@ -74,62 +74,15 @@ module Asciidoctor
       def outputs(node, ret)
         File.open(@filename + ".xml", "w:UTF-8") { |f| f.write(ret) }
         presentation_xml_converter(node).convert(@filename + ".xml")
-        html_compliant_converter(node).convert(@filename + ".presentation.xml", nil, false, "#{@filename}_compliant.html")
-        html_converter(node).convert(@filename + ".presentation.xml", nil, false, "#{@filename}.html")
-        doc_converter(node).convert(@filename + ".presentation.xml", nil, false, "#{@filename}.doc")
-        pdf_converter(node)&.convert(@filename + ".presentation.xml", nil, false, "#{@filename}.pdf")
-      end
-
-      def termdef_cleanup(xmldoc)
-        super
-        localisedstr(xmldoc)
-      end
-
-      ROMAN_TEXT = /\s*[a-z\u00c0-\u00d6\u00d8-\u00f0\u0100-\u0240]/i
-      HAN_TEXT = /\s*[\u4e00-\u9fff]+/
-
-      LOCALISED_ELEMS = "//admitted | //deprecates | //preferred | //prefix | "\
-        "//initial | //addition | //surname | //forename | //name | "\
-        "//abbreviation | //role/description | //affiliation/description | "\
-        "//bibdata/item | //bibitem/title | //bibdata/formattedref | "\
-        "//bibitem/formattedref | //bibdata/note | //bibitem/note | "\
-        "//bibdata/abstract | //bibitem/note ".freeze
-
-      MUST_LOCALISE_ELEMS = %w{admitted deprecates preferred}.freeze
-
-      def localisedstr(xmldoc)
-        xmldoc.xpath(LOCALISED_ELEMS).each do |zh|
-          if zh.at("./string")
-            extract_localisedstrings(zh)
-          elsif MUST_LOCALISE_ELEMS.include? zh.name
-            duplicate_localisedstrings(zh)
-          end
-        end
-      end
-
-      # element consists solely of localised strings, with no attributes
-      def extract_localisedstrings(elem)
-        elem.xpath("./string").each do |s|
-          s.name = elem.name
-        end
-        elem.replace(elem.children)
-      end
-
-      def text_clean(text)
-        text.gsub(/^\s*/, "").gsub(/</, "&lt;").gsub(/>/, "&gt;")
-      end
-
-      def duplicate_localisedstrings(zh)
-        en = zh.dup.remove
-        zh.after(en).after(" ")
-        zh["language"] = "zh"
-        en["language"] = "en"
-        en.traverse do |c|
-          c.text? && c.content = text_clean(c.text.gsub(HAN_TEXT, ""))
-        end
-        zh.traverse do |c|
-          c.text? && c.content = text_clean(c.text.gsub(ROMAN_TEXT, ""))
-        end
+        html_compliant_converter(node).
+          convert(@filename + ".presentation.xml", 
+                  nil, false, "#{@filename}_compliant.html")
+        html_converter(node).convert(@filename + ".presentation.xml", 
+                                     nil, false, "#{@filename}.html")
+        doc_converter(node).convert(@filename + ".presentation.xml", 
+                                    nil, false, "#{@filename}.doc")
+        pdf_converter(node)&.convert(@filename + ".presentation.xml", 
+                                     nil, false, "#{@filename}.pdf")
       end
 
       def inline_quoted(node)
@@ -149,11 +102,6 @@ module Asciidoctor
         super
       end
 
-      def termdef_boilerplate_cleanup(xmldoc)
-        return if @keepboilerplate
-        super
-      end
-
       GBCODE = "((AQ|BB|CB|CH|CJ|CY|DA|DB|DL|DZ|EJ|FZ|GA|GH|GM|GY|HB|HG|"\
         "HJ|HS|HY|JB|JC|JG|JR|JT|JY|LB|LD|LS|LY|MH|MT|MZ|NY|QB|QC|QJ|"\
         "QZ|SB|SC|SH|SJ|SN|SY|TB|TD|TJ|TY|WB|WH|WJ|WM|WS|WW|XB|YB|YC|"\
@@ -186,71 +134,12 @@ module Asciidoctor
           super
       end
 
-      def cleanup(xmldoc)
-        lang = xmldoc.at("//language")&.text
-        @agencyclass = GbAgencies::Agencies.new(lang, {}, "")
+      def init(node)
+        node.attr("language") or node.set_attr("language", "zh")
+        node.attr("script") or
+          node.set_attr("script", node.attr("language") == "zh" ?
+                        "Hans" : "Latn")
         super
-        contributor_cleanup(xmldoc)
-        xmldoc
-      end
-
-      def docidentifier_cleanup(xmldoc)
-        id = xmldoc.at("//bibdata/docidentifier[@type = 'gb']") or return
-        scope = xmldoc.at("//gbscope")&.text
-        prefix = xmldoc.at("//gbprefix")&.text
-        mand = xmldoc.at("//gbmandate")&.text || "mandatory"
-        idtext = @agencyclass.docidentifier(scope, prefix, mand, nil, id.text)
-        id.content = idtext&.gsub(/\&#x2002;/, " ")
-        id = xmldoc.at("//bibdata/ext/structuredidentifier/"\
-                       "project-number") or return
-        idtext = @agencyclass.docidentifier(scope, prefix, mand, nil, id.text)
-        id.content = idtext&.gsub(/\&#x2002;/, " ")
-      end
-
-      def committee_cleanup(xmldoc)
-        xmldoc.xpath("//gbcommittee").each do |c|
-          xmldoc.at("//bibdata/contributor").next =
-            "<contributor><role type='technical-committee'/><organization>"\
-            "<name>#{c.text}</name></organization></contributor>"
-        end
-      end
-
-      def agency_value(issuer, scope, prefix, mandate)
-        agency = issuer.content
-        agency == "GB" and
-          agency = @agencyclass.standard_agency1(scope, prefix, mandate)
-        agency = "GB" if agency.nil? || agency.empty?
-        agency
-      end
-
-      def contributor_cleanup(xmldoc)
-        issuer = xmldoc.at("//bibdata/contributor[role/@type = 'issuer']/"\
-                           "organization/name")
-        scope = xmldoc.at("//gbscope")&.text
-        prefix = xmldoc.at("//gbprefix")&.text
-        mandate = xmldoc.at("//gbmandate")&.text || "mandatory"
-        agency = agency_value(issuer, scope, prefix, mandate)
-        owner = xmldoc.at("//copyright/owner/organization/name")
-        owner.content = agency
-        issuer.content = agency
-        committee_cleanup(xmldoc)
-      end
-
-      def omit_docid_prefix(prefix)
-        IsoDoc::Gb::HtmlConvert.new({}).omit_docid_prefix(prefix)
-      end
-
-      def boilerplate_cleanup(xmldoc)
-        isodoc = boilerplate_isodoc(xmldoc)
-        initial_boilerplate(xmldoc, isodoc)
-        return if @keepboilerplate
-        xmldoc.xpath(self.class::TERM_CLAUSE).each do |f|
-          term_defs_boilerplate(f.at("./title"),
-                                xmldoc.xpath(".//termdocsource"),
-                                f.at(".//term"), f.at(".//p"), isodoc)
-        end
-        f = xmldoc.at(self.class::NORM_REF) and
-          norm_ref_preface(f)
       end
     end
   end

data/lib/asciidoctor/gb/front_id.rb

@@ -1,7 +1,7 @@
 module Asciidoctor
   module Gb
     class Converter < ISO::Converter
-            STAGE_ABBRS_CN = {
+      STAGE_ABBRS_CN = {
         "00": "新工作项目建议",
         "10": "新工作项目",
         "20": "标准草案工作组讨论稿",
@@ -43,7 +43,7 @@ module Asciidoctor
 
       def id_stage_prefix(dn, node)
         if node.attr("docstage") && node.attr("docstage").to_i < 60
-          abbr = IsoDoc::Gb::Metadata.new("en", "Latn", {}).
+          abbr = IsoDoc::Gb::Metadata.new("en", "Latn", @i18n).
             status_abbrev(node.attr("docstage"), nil, node.attr("iteration"),
                           node.attr("draft"), node.attr("doctype"))
           dn = "/#{abbr} #{dn}" # prefixes added in cleanup

data/lib/asciidoctor/gb/isodoc.rng

@@ -922,6 +922,9 @@
       <optional>
         <attribute name="script"/>
       </optional>
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <optional>
         <attribute name="obligation">
           <choice>
@@ -961,9 +964,6 @@
   </define>
   <define name="content-subsection">
     <element name="clause">
-      <optional>
-        <attribute name="type"/>
-      </optional>
       <ref name="Content-Section"/>
     </element>
   </define>
@@ -992,6 +992,9 @@
         </choice>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="type"/>
+    </optional>
     <optional>
       <ref name="section-title"/>
     </optional>
@@ -1011,9 +1014,6 @@
   </define>
   <define name="clause">
     <element name="clause">
-      <optional>
-        <attribute name="type"/>
-      </optional>
       <ref name="Clause-Section"/>
     </element>
   </define>
@@ -1042,6 +1042,9 @@
         </choice>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="type"/>
+    </optional>
     <optional>
       <ref name="section-title"/>
     </optional>
@@ -1180,6 +1183,9 @@
       <optional>
         <attribute name="script"/>
       </optional>
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <optional>
         <attribute name="obligation">
           <choice>

data/lib/asciidoctor/gb/section_input.rb

@@ -8,6 +8,8 @@ module Asciidoctor
     class Converter < ISO::Converter
       def sectiontype_streamline(ret)
         case ret
+        when "前言" then "foreword"
+        when "致謝" then "acknowledgements"
         when "引言" then "introduction"
         when "范围" then "scope"
         when "规范性引用文件" then "normative references"
@@ -21,6 +23,15 @@ module Asciidoctor
         end
       end
 
+      def symbols_attrs(node, a)
+        case sectiontype1(node)
+        when "符号" then a.merge(type: "symbols")
+        when "代号和缩略语" then a.merge(type: "abbreviated_terms")
+        else
+          super
+        end
+      end
+
       def appendix_parse(attrs, xml, node)
         # UNSAFE, there is no unset_option() in asciidoctor
         node.remove_attr("appendix-option")

data/lib/asciidoctor/gb/validate.rb

@@ -1,7 +1,6 @@
 module Asciidoctor
   module Gb
     class Converter < ISO::Converter
-
       def validate(doc)
         content_validate(doc)
         schema_validate(formattedstr_strip(doc.dup),

data/lib/isodoc/gb/base_convert.rb

@@ -1,7 +1,6 @@
 require_relative "common"
 require "gb_agencies"
 require_relative "cleanup"
-require_relative "metadata"
 require "fileutils"
 
 module IsoDoc
@@ -16,18 +15,9 @@ module IsoDoc
           "$titlefont: #{t};\n"
       end
 
-      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 cleanup(docxml)
-        @cleanup = Cleanup.new(@script, @deprecated_lbl)
+        @i18n ||= i18n_init(@lang, @script)
+        @cleanup = Cleanup.new(@script, @i18n.deprecated)
         super
         @cleanup.cleanup(docxml)
         docxml
@@ -38,43 +28,26 @@ module IsoDoc
         @cleanup.example_cleanup(docxml)
       end
 
-      def i18n_init(lang, script)
-        super
-        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
-        @labels = @labels.merge(y)
-      end
-
       def omit_docid_prefix(prefix)
         super || prefix == "Chinese Standard"
       end
 
-      def formula_parse(node, out)
-        out.div **formula_attrs(node) do |div1|
-         div1.div **attr_code(class: "formula") do |div|
+      def formula_parse1(node, out)
+         out.div **attr_code(class: "formula") do |div|
           insert_tab(div, 1)
           parse(node.at(ns("./stem")), div)
-          lbl = @xrefs.anchor(node['id'], :label, false)
+          lbl = node&.at(ns("./name"))&.text
           unless lbl.nil?
             insert_tab(div, 1)
             div << "(#{lbl})"
           end
         end
-        formula_where(node.at(ns("./dl")), div1)
-        end
       end
 
       def formula_where(dl, out)
         return unless dl
         out.p **{ style: "page-break-after:avoid;"} do |p|
-          p << @where_lbl
+          p << @i18n.where
         end
         formula_dl_parse(dl, out)
       end
@@ -99,32 +72,37 @@ module IsoDoc
         { class: "example_label",
           style: "padding:2pt 2pt 2pt 2pt;vertical-align:top;" }.freeze
 
-      def example_label(node)
-        l10n(super + ":")
+      def note_delim
+        l10n(": ")
       end
 
       def note_parse(node, out)
-        note_parse_table(node, out, note_label(node) + ":")
+        note_parse_table(node, out)
       end
 
-      def note_parse_table(node, out, label)
+      def note_parse_table(node, out)
         @note = true
+        name = node&.at(ns("./name"))&.remove
+        note_parse_table1(node, out, name)
+        @note = false
+      end
+
+      def note_parse_table1(node, out, name)
         out.table **note_attrs(node) do |t|
           t.tr do |tr|
-            @libdir = File.dirname(__FILE__)
             tr.td **EXAMPLE_TBL_ATTR do |td|
-              td << l10n(label)
+              name and name.children.each { |n| parse(n, td) }
+              td << note_delim
             end
             tr.td **{ style: "vertical-align:top;", class: "Note" } do |td|
               node.children.each { |n| parse(n, td) }
             end
           end
         end
-        @note = false
       end
 
       def termnote_parse(node, out)
-        note_parse_table(node, out, "#{@xrefs.anchor(node['id'], :label)}:")
+        note_parse_table(node, out)
       end
 
       def middle(isoxml, out)
@@ -157,19 +135,19 @@ module IsoDoc
 
       def deprecated_term_parse(node, out)
         out.p **{ class: "DeprecatedTerms" } do |p|
-          p << l10n("#{@deprecated_lbl}: ")
+          p << l10n("#{@i18n.deprecated}: ")
           node.children.each { |c| parse(c, p) }
         end
       end
 
       def termref_render(x)
-        x.sub!(%r{\s*\[MODIFICATION\]\s*$}m, l10n(", #{@modified_lbl}"))
+        x.sub!(%r{\s*\[MODIFICATION\]\s*$}m, l10n(", #{@i18n.modified}"))
         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(", #{@i18n.source}") if parts.size > 1 &&
+          parts[1] == "," && !/^\s*#{@i18n.modified}/.match(parts[2])
           parts.map do |p|
             /\s*\[MODIFICATION\]/.match(p) ?
-              l10n(", #{@modified_lbl} &mdash; ") : p
+              l10n(", #{@i18n.modified} &mdash; ") : p
           end.join.sub(/\A\s*/m, l10n("[")).sub(/\s*\z/m, l10n("]"))
       end
 
@@ -181,42 +159,12 @@ module IsoDoc
         end.join
       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 clausedelimspace(out)
         out << "&#x3000;"
       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
-          title.is_a?(String) ? h1 << title :
-            title&.children&.each { |c2| parse(c2, h1) }
-        end
-        div.parent.at(".//h1")
-      end
-
       def example_span_label(node, div, name)
-        n = @xrefs.get[node["id"]]
         div.span **{ class: "example_label" } do |p|
-          lbl = (n.nil? || n[:label].nil? || n[:label].empty?) ? @example_lbl :
-            l10n("#{@example_lbl} #{n[:label]}")
-          p << l10n(lbl + ":")
-          name and !lbl.nil? and p << "&nbsp;&mdash; "
           name and name.children.each { |n| parse(n, div) }
         end
       end

data/lib/isodoc/gb/cleanup.rb

@@ -74,17 +74,6 @@ module IsoDoc
         term_merge(docxml, "DeprecatedTerms")
         docxml
       end
-
-=begin
-      def intro_cleanup(docxml)
-        # insert tab for purposes of ToC lining up
-        docxml.xpath("//h1[@class = 'IntroTitle']").each do |h1|
-          if h1.content == "引言"
-            h1.add_child('<span style="mso-tab-count:1">&#xA0; </span>')
-          end
-        end
-      end
-=end
     end
   end
 end

data/lib/isodoc/gb/html_convert.rb

@@ -1,3 +1,4 @@
+require_relative "init"
 require_relative "base_convert"
 require "isodoc"
 
@@ -47,31 +48,23 @@ module IsoDoc
       end
 
       def populate_template(docxml, format)
-        meta = @meta.get.merge(@labels).merge(@meta.fonts_options || {})
+        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
@@ -71,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).merge(@meta.fonts_options || {})
+        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] =
@@ -92,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|
@@ -126,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/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Gb
-    VERSION = "1.4.3"
+    VERSION = "1.5.0"
   end
 end

data/metanorma-gb.gemspec

@@ -29,8 +29,8 @@ 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"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-gb
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.5.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-07-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
@@ -267,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
@@ -324,10 +325,13 @@ files:
 - 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