metanorma-gb 1.1.5 → 1.2.0

data/lib/asciidoctor/gb/reqt.rng

@@ -25,6 +25,11 @@
         <ref name="ObligationType"/>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="unnumbered">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
     <attribute name="id">
       <data type="ID"/>
     </attribute>

data/lib/asciidoctor/gb/section_input.rb

@@ -1,4 +1,4 @@
-require "gbbib"
+require "relaton_gb"
 
 module Asciidoctor
   module Gb

data/lib/asciidoctor/gb/validate.rb

@@ -13,9 +13,27 @@ module Asciidoctor
         bilingual_terms_validate(doc.root)
         issuer_validate(doc.root)
         prefix_validate(doc.root)
+        bibdata_validate(doc.root)
         @agencyclass.gbtype_validate(doc.root.at("//gbscope")&.text, doc.root.at("//gbprefix")&.text)
       end
 
+      def bibdata_validate(doc)
+        doctype_validate(doc)
+        script_validate(doc)
+      end
+
+      def doctype_validate(xmldoc)
+        doctype = xmldoc&.at("//bibdata/ext/doctype")&.text
+        %w(standard recommendation).include? doctype or
+          warn "Document Attributes: #{doctype} is not a recognised document type"
+      end
+
+      def script_validate(xmldoc)
+        script = xmldoc&.at("//bibdata/script")&.text
+        %(Hans Latn).include?(script) or
+          warn "Document Attributes: #{script} is not a recognised script"
+      end
+
       def prefix_validate(root)
         prefix = root&.at("//gbprefix")&.text
         scope = root&.at("//gbscope")&.text
@@ -69,8 +87,8 @@ module Asciidoctor
       end
 
       def title_intro_validate(root)
-        title_intro_en = root.at("//title-intro[@language='en']")
-        title_intro_zh = root.at("//title-intro[@language='zh']")
+        title_intro_en = root.at("//title[@type='title-intro' and @language='en']")
+        title_intro_zh = root.at("//title[@type='title-intro' and @language='zh']")
         if title_intro_en.nil? && !title_intro_zh.nil?
           warn "No English Title Intro!"
         end
@@ -80,8 +98,8 @@ module Asciidoctor
       end
 
       def title_main_validate(root)
-        title_main_en = root.at("//title-main[@language='en']")
-        title_main_zh = root.at("//title-main[@language='zh']")
+        title_main_en = root.at("//title[@type='title-main' and @language='en']")
+        title_main_zh = root.at("//title[@type='title-main' and @language='zh']")
         if title_main_en.nil? && !title_main_zh.nil?
           warn "No English Title!"
         end
@@ -91,8 +109,8 @@ module Asciidoctor
       end
 
       def title_part_validate(root)
-        title_part_en = root.at("//title-part[@language='en']")
-        title_part_zh = root.at("//title-part[@language='zh']")
+        title_part_en = root.at("//title[@type='title-part' and @language='en']")
+        title_part_zh = root.at("//title[@type='title-part' and @language='zh']")
         if title_part_en.nil? && !title_part_zh.nil?
           warn "No English Title Part!"
         end

data/lib/isodoc/gb/{gbhtmlrender.rb → gbbaseconvert.rb}

@@ -1,14 +1,68 @@
+require_relative "gbconvert"
+require "gb_agencies"
+require_relative "gbcleanup"
+require_relative "metadata"
+require "fileutils"
+
 module IsoDoc
   module Gb
-    # A {Converter} implementation that generates GB output, and a document
-    # schema encapsulation of the document for validation
-    class HtmlConvert < IsoDoc::HtmlConvert
+    module BaseConvert
+      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
+          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)
+        super
+        @cleanup.cleanup(docxml)
+        docxml
+      end
+
+      def example_cleanup(docxml)
+        super
+        @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 **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]})"
+          lbl = anchor(node['id'], :label, false)
+          unless lbl.nil?
+            insert_tab(div, 1)
+            div << "(#{lbl})"
+          end
         end
         formula_where(node.at(ns("./dl")), out)
       end
@@ -63,7 +117,7 @@ module IsoDoc
         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]}:")
+              td << l10n("#{anchor(node['id'], :label)}:")
             end
             tr.td **{ valign: "top", class: "Note" } do |td|
               node.children.each { |n| parse(n, td) }
@@ -123,18 +177,6 @@ module IsoDoc
         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])
-        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)
@@ -163,42 +205,15 @@ module IsoDoc
         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
+          div.send "h#{anchor(node['id'], :level) || '1'}" do |h|
+            lbl = anchor(node['id'], :label, false)
+            h << "#{lbl}.&#x3000;" if !@suppressheadingnumbers
             c1 and 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/>"
-          t.b do |b|
-            name&.children&.each { |c2| parse(c2, b) }
-          end
-        end
-      end
-
-      def term_defs_boilerplate(div, source, term, preface)
-        unless preface
-          (source.empty? && term.nil?) and div << @no_terms_boilerplate or
-            div << term_defs_boilerplate_cont(source, term)
-        end
-        #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']"))
-        allparts = ref.at(ns("./allparts"))
-        reference = format_ref(docid.text, isopub, date, allparts)
-        @anchors[ref["id"]] = { xref: reference }
-      end
-=end
-
-           def example_p_parse(node, div)
+      def example_p_parse(node, div)
         div.p do |p|
           p.span **{ class: "example_label" } do |s|
             s << example_label(node)
@@ -231,4 +246,3 @@ module IsoDoc
     end
   end
 end
-

data/lib/isodoc/gb/gbhtmlconvert.rb

@@ -1,8 +1,5 @@
-require_relative "gbconvert"
-require "gb_agencies"
-require_relative "gbcleanup"
-require_relative "metadata"
-require_relative "gbhtmlrender"
+require_relative "gbbaseconvert"
+require "isodoc"
 
 module IsoDoc
   module Gb
@@ -26,7 +23,7 @@ module IsoDoc
           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' ))
+                      (script == "Hans" ? '"SimHei",sans-serif' : '"Calibri",sans-serif' ))
         }
       end
 
@@ -39,52 +36,36 @@ module IsoDoc
         }
       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"
+      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])
+        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 metadata_init(lang, script, labels)
-        unless ["en", "zh"].include? lang
-          lang = "zh"
-          script = "Hans"
+      def annex_name(annex, name, div)
+        div.h1 **{ class: "Annex" } do |t|
+          t << "#{anchor(annex['id'], :label)}<br/><br/>"
+          t.b do |b|
+            name&.children&.each { |c2| parse(c2, b) }
+          end
         end
-        @meta = Metadata.new(lang, script, labels)
-        @meta.set(:standardclassimg, @standardclassimg)
-        @common.meta = @meta
       end
 
-      def cleanup(docxml)
-        @cleanup = Cleanup.new(@script, @deprecated_lbl)
-        super
-        @cleanup.cleanup(docxml)
-        docxml
-      end
-
-      def example_cleanup(docxml)
-        super
-        @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)
+      def term_defs_boilerplate(div, source, term, preface)
+        unless preface
+          (source.empty? && term.nil?) and div << @no_terms_boilerplate or
+            div << term_defs_boilerplate_cont(source, term)
+        end
+        #div << @term_def_boilerplate unless preface
       end
 
-      def omit_docid_prefix(prefix)
-        super || prefix == "Chinese Standard"
-      end
+      include BaseConvert
     end
   end
 end

data/lib/isodoc/gb/gbwordconvert.rb

@@ -1,10 +1,5 @@
+require_relative "gbbaseconvert"
 require "isodoc"
-require_relative "gbconvert"
-require_relative "gbcleanup"
-require "gb_agencies"
-require_relative "metadata"
-require_relative "gbwordrender"
-require "fileutils"
 
 module IsoDoc
   module Gb
@@ -44,49 +39,6 @@ module IsoDoc
         }
       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
-          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)
-        super
-        @cleanup.cleanup(docxml)
-        docxml
-      end
-
-      def example_cleanup(docxml)
-        super
-        @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
-
       ENDLINE = <<~END.freeze
       <v:line id="_x0000_s1026"
  alt="" style='position:absolute;left:0;text-align:left;z-index:251662848;
@@ -107,9 +59,46 @@ module IsoDoc
         docxml
       end
 
-      def omit_docid_prefix(prefix)
-        super || prefix == "Chinese Standard"
+      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 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 annex_name(annex, name, div)
+        div.h1 **{ class: "Annex" } do |t|
+          t << "#{anchor(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
+
+      include BaseConvert
     end
   end
 end

data/lib/isodoc/gb/metadata.rb

@@ -24,10 +24,10 @@ module IsoDoc
       end
 
       def title(isoxml, _out)
-        intro = isoxml.at(ns("//bibdata//title-intro[@language='zh']"))
-        main = isoxml.at(ns("//bibdata//title-main[@language='zh']"))
-        part = isoxml.at(ns("//bibdata//title-part[@language='zh']"))
-        partnumber = isoxml.at(ns("//bibdata/docidentifier/project-number/@part"))
+        intro = isoxml.at(ns("//bibdata//title[@type='title-intro' and @language='zh']"))
+        main = isoxml.at(ns("//bibdata//title[@type='title-main' and @language='zh']"))
+        part = isoxml.at(ns("//bibdata//title[@type='title-part' and @language='zh']"))
+        partnumber = isoxml.at(ns("//bibdata/ext/structuredidentifier/project-number/@part"))
         intro.nil? || set(:docmaintitlezh, intro.text + " ")
         main.nil? || set(:docsubtitlezh, main.text)
         partnum = partnumber ? "#{part_label(partnumber, 'zh')}:" : ""
@@ -46,10 +46,10 @@ module IsoDoc
       end
 
       def subtitle(isoxml, _out)
-        intro = isoxml.at(ns("//bibdata//title-intro[@language='en']"))
-        main = isoxml.at(ns("//bibdata//title-main[@language='en']"))
-        part = isoxml.at(ns("//bibdata//title-part[@language='en']"))
-        partnumber = isoxml.at(ns("//bibdata/docidentifier/project-number/@part"))
+        intro = isoxml.at(ns("//bibdata//title[@type='title-intro' and @language='en']"))
+        main = isoxml.at(ns("//bibdata//title[@type='title-main' and @language='en']"))
+        part = isoxml.at(ns("//bibdata//title[@type='title-part' and @language='en']"))
+        partnumber = isoxml.at(ns("//bibdata/ext/structuredidentifier/project-number/@part"))
         intro.nil? || set(:docmaintitleen, intro.text + "—")
         main.nil? || set(:docsubtitleen, main.text)
         partnum = partnumber ? "#{part_label(partnumber, 'en')}: " : ""
@@ -59,7 +59,7 @@ module IsoDoc
       end
 
       def author(isoxml, _out)
-        gbcommittee = isoxml.at(ns("//bibdata/gbcommittee"))
+        gbcommittee = isoxml.at(ns("//bibdata/ext/gbcommittee"))
         set(:committee, gbcommittee&.text)
       end
 
@@ -164,9 +164,9 @@ module IsoDoc
       end
 
       def gb_identifier(isoxml)
-        scope = isoxml.at(ns("//bibdata/gbtype/gbscope"))&.text || "national"
-        mandate = isoxml.at(ns("//bibdata/gbtype/gbmandate"))&.text || "mandatory"
-        prefix = isoxml.at(ns("//bibdata/gbtype/gbprefix"))&.text || "XXX"
+        scope = isoxml.at(ns("//bibdata/ext/gbtype/gbscope"))&.text || "national"
+        mandate = isoxml.at(ns("//bibdata/ext/gbtype/gbmandate"))&.text || "mandatory"
+        prefix = isoxml.at(ns("//bibdata/ext/gbtype/gbprefix"))&.text || "XXX"
         docyear = isoxml&.at(ns("//bibdata/copyright/from"))&.text
         issuer = isoxml&.at(ns("//bibdata/contributor[role/@type = 'issuer']/"\
                                "organization/name"))&.text || "GB"
@@ -199,9 +199,9 @@ module IsoDoc
       def gb_library_identifier(isoxml)
         ics = []
         ccs = []
-        isoxml.xpath(ns("//bibdata/ics/code")).each { |i| ics << i.text }
-        isoxml.xpath(ns("//bibdata/ccs")).each { |i| ccs << i.text }
-        p = isoxml.at(ns("//bibdata/plannumber"))
+        isoxml.xpath(ns("//bibdata/ext/ics/code")).each { |i| ics << i.text }
+        isoxml.xpath(ns("//bibdata/ext/ccs")).each { |i| ccs << i.text }
+        p = isoxml.at(ns("//bibdata/ext/plannumber"))
         set(:libraryid_ics, ics.empty? ? "XXX" : ics.join(", "))
         set(:libraryid_ccs, ccs.empty? ? "XXX" : ccs.join(", "))
         set(:libraryid_plan, p ? p.text : "XXX")