metanorma-gb 1.3.27 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 104fa3b5fc7d3e33240859aef77a0d5f58e5950f48e86e3926eaf0f111f4da2f
-  data.tar.gz: 96f89d45b2037d39a2eb25eca6c71c1c744462ed722bc84e1fb9ea6506e16938
+  metadata.gz: fe9a20b1e4d09c3ed8151c2021f51c1b8e412f823f0363db5bf0b9e4eb182908
+  data.tar.gz: 6601454ed383cbb484434deebc8195d280a50f36282e0d84a096c1406751e322
 SHA512:
-  metadata.gz: f1d08aeddfba0b2c6898a18a9d98afc55a8b60c8d4a4a5fc2f884c7db4ed3b8cc788579d044da88d77ee5afb19e05e123bb6a1be094c4954b80b360fe3441242
-  data.tar.gz: bbb429a25e81dabe6e9ff1867d4b2ad0e3f743c827179a405d1439f19bc8e166c267d7a7eea4a323fc04082e5129a3d01dfa3842eeafff09f4337ece8485d02d
+  metadata.gz: fd3154c799e5794a5b9a7a13b8cfe3eb2d70a0a1b1bb36ea6e1d85a9b14d8a5658726320734105f5abfcf1f0c8990ce2e9ce681cbc8d600d0702430f8416f048
+  data.tar.gz: 8f90f5d26fe2601454ad8f6a27d6103d494443ce9948a25d2b2d697b9eb562018802cb08e529855916f2d8e7b4c0296e1e7001af8201374eda350ee4bf2fece0

data/.github/workflows/macos.yml

@@ -29,7 +29,6 @@ jobs:
         uses: actions/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-          architecture: 'x64'
       - name: Update gems
         run: |
           sudo gem install bundler --force

data/.github/workflows/ubuntu.yml

@@ -31,7 +31,6 @@ jobs:
         uses: actions/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-          architecture: 'x64'
       - name: Update gems
         run: |
           gem install bundler
@@ -39,15 +38,19 @@ jobs:
       - name: Run specs
         run: |
           bundle exec rake
-      - name: Trigger dependent repositories
-        if: github.ref == 'refs/heads/master' && matrix.ruby == '2.6'
+      - name: Trigger repositories
+        if: matrix.ruby == '2.6'
         env:
-          GH_USERNAME: ${{ secrets.PAT_USERNAME }}
-          GH_ACCESS_TOKEN: ${{ secrets.PAT_TOKEN }}
+          GH_USERNAME: metanorma-ci
+          GH_ACCESS_TOKEN: ${{ secrets.METANORMA_CI_PAT_TOKEN }}
         run: |
           curl -LO --retry 3 https://raw.githubusercontent.com/metanorma/metanorma-build-scripts/master/trigger-gh-actions.sh
           [[ -f ".github/workflows/dependent_repos.env" ]] && source .github/workflows/dependent_repos.env
-          for repo in $DEPENDENT_REPOS
+          CLIENT_PAYLOAD=$(cat <<EOF
+          "{ "ref": "${GITHUB_REF}", "repo": "${GITHUB_REPOSITORY}" }"
+          EOF
+          )
+          for repo in $REPOS
           do
-            sh trigger-gh-actions.sh $ORGANISATION $repo $GH_USERNAME $GH_ACCESS_TOKEN $GITHUB_REPOSITORY "{ \"ref\": \"${GITHUB_REF}\" }"
+            sh trigger-gh-actions.sh $ORGANISATION $repo $GH_USERNAME $GH_ACCESS_TOKEN $GITHUB_REPOSITORY "$CLIENT_PAYLOAD"
           done

data/.github/workflows/windows.yml

@@ -29,7 +29,6 @@ jobs:
         uses: actions/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-          architecture: 'x64'
       - name: Update gems
         shell: pwsh
         run: |

data/.gitignore

@@ -3,7 +3,5 @@ coverage/
 .rspec_status
 .tmp.xml
 gb-issuer-default.gif
-gb.css
-htmlstyle.css
 test.html
 test.xml

data/Gemfile

@@ -3,7 +3,6 @@ Encoding.default_internal = Encoding::UTF_8
 
 source "https://rubygems.org"
 git_source(:github) { |repo| "https://github.com/#{repo}" }
-
 gemspec
 
 if File.exist? 'Gemfile.devel'

data/Rakefile

@@ -1,6 +1,23 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
+require 'isodoc/gem_tasks'
 
+module IsoDoc
+  module GemTasks
+    module_function
+
+    def fonts_placeholder
+      <<~TEXT
+        $bodyfont: '{{bodyfont}}';
+        $headerfont: '{{headerfont}}';
+        $monospacefont: '{{monospacefont}}';
+        $titlefont: '{{titlefont}}';
+      TEXT
+    end
+  end
+end
+
+IsoDoc::GemTasks.install
 RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec

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,13 +1,14 @@
 require "asciidoctor"
 require "asciidoctor/iso/converter"
-require "metanorma/gb/version"
-require "isodoc/gb/gbconvert"
-require "isodoc/gb/gbwordconvert"
+require "isodoc/gb/common"
+require "isodoc/gb/word_convert"
 require "isodoc/gb/pdf_convert"
+require "isodoc/gb/presentation_xml_convert"
 require "gb_agencies"
 require_relative "./section_input.rb"
 require_relative "./front.rb"
 require_relative "./validate.rb"
+require_relative "cleanup.rb"
 require "fileutils"
 
 module Asciidoctor
@@ -60,77 +61,28 @@ module Asciidoctor
       end
 
       def pdf_converter(node)
+        return nil if node.attr("no-pdf")
         node.nil? ? IsoDoc::Gb::PdfConvert.new({}) :
           IsoDoc::Gb::PdfConvert.new(doc_extract_attributes(node))
       end
 
-      def document(node)
-        init(node)
-        ret = makexml(node).to_xml(indent: 2)
-        unless node.attr("nodoc") || !node.attr("docfile")
-          filename = node.attr("docfile").gsub(/\.adoc$/, "").gsub(%r{^.*/}, "")
-          File.open(filename + ".xml", "w:utf-8") { |f| f.write(ret) }
-          html_compliant_converter(node).convert(filename + ".xml")
-          FileUtils.mv "#{filename}.html", "#{filename}_compliant.html"
-          html_converter(node).convert(filename + ".xml")
-          doc_converter(node).convert(filename + ".xml")
-          pdf_converter(node).convert(filename + ".xml")
-        end
-        @log.write(@localdir + @filename + ".err") unless @novalid
-        @files_to_delete.each { |f| FileUtils.rm f }
-        ret
+      def presentation_xml_converter(node)
+        node.nil? ? IsoDoc::Gb::PresentationXMLConvert.new({}) :
+          IsoDoc::Gb::PresentationXMLConvert.new(html_extract_attributes(node))
       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
+      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 inline_quoted(node)
@@ -150,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|"\
@@ -187,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": "标准草案工作组讨论稿",
@@ -15,7 +15,7 @@ module Asciidoctor
 
       def stage_name(stage, substage)
         return "Proof" if stage == "60" && substage == "00"
-        @language == "en" ?
+        @lang == "en" ?
           STAGE_NAMES[stage.to_sym] : STAGE_ABBRS_CN[stage.to_sym]
       end
 
@@ -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