metanorma-generic 1.6.3 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38f634ace384417096ff4e1ea82dcc50c0cad5d4a81186934df2c7f32e24ebe2
-  data.tar.gz: 76a20654285bb56c3c7796c6ee3e8a57776a3417cdb81f945eca21c064454afd
+  metadata.gz: 4ecff55e1f5665be747c3502c80865395444c81341f884f886fdd2962e769824
+  data.tar.gz: b6ca5204417ec9fd4a55010a85dfdc9379747aab1519254762410c72bca330e7
 SHA512:
-  metadata.gz: dccf6988964bd683012b07ce100789538f44464b4c98f9f22804e12ef98434c05ada0a879a2f46e67c8d243f1263b0e25639c3dc2e66a320e3f28cf73e7f315e
-  data.tar.gz: fb7a296bb6d167ec80ff110671b7dca107f510bd2e81c9ea2104f687595b10972a9d9fa7a8b9b9e45b4d1f8b6c6b8c0d2624c7e70f7e4d87827644e9a5fe88ad
+  metadata.gz: 36b0019a33b5900b6d3ecd5392fc8f99e061f3d0f0e1b58e504095d002db8b44efb6ec11fb518468a6398a4f89d0da88f824bf799ccc7fbe3edec1b27ac6bc74
+  data.tar.gz: 425d8153f56479453f61c760799fdf2625a0ee9bb78e34fd8dfff3ca4d54eb793810bee43bb9faf1d41a8930a9aa220a2fbc652f312a5973dbe42cab4161021a

data/.github/workflows/rake.yml

@@ -0,0 +1,62 @@
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
+name: rake
+
+on:
+  push:
+    branches: [ master, main  ]
+    tags: [ v* ]
+  pull_request:
+
+jobs:
+  rake:
+    name: Test on Ruby ${{ matrix.ruby }} ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    continue-on-error: ${{ matrix.experimental }}
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [ '2.6', '2.5', '2.4' ]
+        os: [ ubuntu-latest, windows-latest, macos-latest ]
+        experimental: [ false ]
+        include:
+          - ruby: '2.7'
+            os: 'ubuntu-latest'
+            experimental: true
+          - ruby: '2.7'
+            os: 'windows-latest'
+            experimental: true
+          - ruby: '2.7'
+            os: 'macos-latest'
+            experimental: true
+    steps:
+      - uses: actions/checkout@master
+
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+
+      - uses: actions/cache@v2
+        with:
+          path: vendor/bundle
+          key: bundle-${{ matrix.os }}-${{ matrix.ruby }}-${{ hashFiles('**/*.gemspec') }}
+          restore-keys: bundle-${{ matrix.os }}-${{ matrix.ruby }}
+
+      - run: bundle config set path 'vendor/bundle'
+
+      - run: bundle install --jobs 4 --retry 3
+
+      - run: bundle exec rake
+
+  tests-passed:
+    needs: rake
+    runs-on: ubuntu-latest
+    steps:
+      - name: Trigger tests passed event
+        uses: Sibz/github-status-action@v1
+        with:
+          authToken: ${{ secrets.METANORMA_CI_PAT_TOKEN || secrets.GITHUB_TOKEN }}
+          context: 'tests-passed-successfully'
+          description: 'Tests passed successfully'
+          state: 'success'
+          sha: ${{ github.event.pull_request.head.sha || github.sha }}

data/README.adoc

@@ -3,9 +3,7 @@
 Formerly known as metanorma-acme
 
 image:https://img.shields.io/gem/v/metanorma-generic.svg["Gem Version", link="https://rubygems.org/gems/metanorma-generic"]
-image:https://github.com/metanorma/metanorma-generic/workflows/macos/badge.svg["Build Status (macOS)", link="https://github.com/metanorma/metanorma-generic/actions?workflow=macos"]
-image:https://github.com/metanorma/metanorma-generic/workflows/ubuntu/badge.svg["Build Status (ubuntu)", link="https://github.com/metanorma/metanorma-generic/actions?workflow=ubuntu"]
-image:https://github.com/metanorma/metanorma-generic/workflows/windows/badge.svg["Build Status (Windows)", link="https://github.com/metanorma/metanorma-generic/actions?workflow=windows"]
+image:https://github.com/metanorma/metanorma-generic/workflows/rake/badge.svg["Build Status", link="https://github.com/metanorma/metanorma-generic/actions?workflow=rake"]
 image:https://codeclimate.com/github/metanorma/metanorma-acme/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/metanorma/metanorma-acme"]
 image:https://img.shields.io/github/issues-pr-raw/metanorma/metanorma-generic.svg["Pull Requests", link="https://github.com/metanorma/metanorma-generic/pulls"]
 image:https://img.shields.io/github/commits-since/metanorma/metanorma-generic/latest.svg["Commits since latest",link="https://github.com/metanorma/metanorma-generic/releases"]

data/lib/asciidoctor/generic/basicdoc.rng

@@ -158,17 +158,7 @@
         <data type="ID"/>
       </attribute>
       <oneOrMore>
-        <choice>
-          <ref name="formula"/>
-          <ref name="ul"/>
-          <ref name="ol"/>
-          <ref name="dl"/>
-          <ref name="quote"/>
-          <ref name="sourcecode"/>
-          <ref name="paragraph"/>
-          <ref name="table"/>
-          <ref name="figure"/>
-        </choice>
+        <ref name="paragraph"/>
       </oneOrMore>
     </element>
   </define>
@@ -1028,6 +1018,9 @@
           <value>alphabet_upper</value>
         </choice>
       </attribute>
+      <optional>
+        <attribute name="start"/>
+      </optional>
       <oneOrMore>
         <ref name="li"/>
       </oneOrMore>

data/lib/asciidoctor/generic/converter.rb

@@ -1,13 +1,10 @@
 require "asciidoctor"
 require "asciidoctor/standoc/converter"
 require "fileutils"
+require_relative "front"
 
 module Asciidoctor
   module Generic
-
-    # A {Converter} implementation that generates RSD output, and a document
-    # schema encapsulation of the document for validation
-    #
     class Converter < Standoc::Converter
       XML_ROOT_TAG = "generic-standard".freeze
       XML_NAMESPACE = "https://www.metanorma.org/ns/generic".freeze
@@ -24,37 +21,11 @@ module Asciidoctor
 
        def baselocation(loc)
         return nil if loc.nil?
+        return loc
         File.expand_path(File.join(File.dirname(
           self.class::_file || __FILE__), "..", "..", "..", loc))
       end
 
-      def default_publisher
-        configuration.organization_name_long
-      end
-
-      def metadata_committee(node, xml)
-        return unless node.attr("committee")
-        xml.editorialgroup do |a|
-          a.committee node.attr("committee"),
-            **attr_code(type: node.attr("committee-type"))
-          i = 2
-          while node.attr("committee_#{i}") do
-            a.committee node.attr("committee_#{i}"),
-              **attr_code(type: node.attr("committee-type_#{i}"))
-            i += 1
-          end
-        end
-      end
-
-      def metadata_status(node, xml)
-        xml.status do |s|
-          s.stage ( node.attr("status") || node.attr("docstage") ||
-                   configuration.default_stage || "published" )
-          x = node.attr("substage") and s.substage x
-          x = node.attr("iteration") and s.iteration x
-        end
-      end
-
       def docidentifier_cleanup(xmldoc)
         template = configuration.docid_template ||
           "{{ organization_name_short }} {{ docnumeric }}"
@@ -63,30 +34,16 @@ module Asciidoctor
         id.empty? and docid.remove or docid.children = id
       end
 
-      def metadata_id(node, xml)
-        xml.docidentifier **{ type:
-                              configuration.organization_name_short } do |i|
-          i << "DUMMY"
-        end
-        xml.docnumber { |i| i << node.attr("docnumber") }
-      end
-
-      def metadata_ext(node, ext)
-        super
-        Array(configuration.metadata_extensions).each do |e|
-          a = node.attr(e) and ext.send e, a
-        end
-      end
-
       def doctype(node)
         d = super
-        configuration.doctypes or return d == "article" ? "standard" : d
-        default = configuration.default_doctype || Array(configuration.doctypes).dig(0) ||
-          "standard"
-        unless Array(configuration.doctypes).include? d
+        configuration.doctypes or return d == "article" ? 
+          (configuration.default_doctype || "standard") : d
+        type = configuration.default_doctype ||
+          configuration.doctypes.keys.dig(0) || "standard"
+        unless configuration.doctypes.keys.include? d
           @log.add("Document Attributes", nil,
-                   "#{d} is not a legal document type: reverting to '#{default}'")
-          d = default
+                   "#{d} is not a legal document type: reverting to '#{type}'")
+          d = type
         end
         d
       end
@@ -97,13 +54,13 @@ module Asciidoctor
       end
 
       def sectiontype_streamline(ret)
-        if configuration.termsdefs_titles.map(&:downcase).include? (ret)
+        if configuration&.termsdefs_titles&.map(&:downcase)&.include? (ret)
           "terms and definitions"
-        elsif configuration.symbols_titles.map(&:downcase).include? (ret)
+        elsif configuration&.symbols_titles&.map(&:downcase)&.include? (ret)
           "symbols and abbreviated terms"
-        elsif configuration.normref_titles.map(&:downcase).include? (ret)
+        elsif configuration&.normref_titles&.map(&:downcase)&.include? (ret)
           "normative references"
-        elsif configuration.bibliography_titles.map(&:downcase).include? (ret)
+        elsif configuration&.bibliography_titles&.map(&:downcase)&.include? (ret)
           "bibliography"
         else
           ret
@@ -117,11 +74,11 @@ 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_converter(node).convert(@filename + ".presentation.xml", 
-                                     nil, false, "#{@filename}.html")
-        doc_converter(node).convert(@filename + ".presentation.xml", 
-                                    nil, false, "#{@filename}.doc")
+        presentation_xml_converter(node)&.convert(@filename + ".xml")
+        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")
 
@@ -141,6 +98,7 @@ module Asciidoctor
 
       def bibdata_validate(doc)
         stage_validate(doc)
+        committee_validate(doc)
       end
 
       def stage_validate(xmldoc)
@@ -151,6 +109,15 @@ module Asciidoctor
           @log.add("Document Attributes", nil, "#{stage} is not a recognised status")
       end
 
+      def committee_validate(xmldoc)
+        committees = Array(configuration&.committees) || return
+        committees.empty? and return
+        xmldoc.xpath("//bibdata/ext/editorialgroup/committee").each do |c|
+          committees.include? c.text or
+            @log.add("Document Attributes", nil, "#{c.text} is not a recognised committee")
+        end
+      end
+
       def sections_cleanup(x)
         super
         x.xpath("//*[@inline-header]").each do |h|
@@ -187,6 +154,26 @@ module Asciidoctor
         end
         conv
       end
+
+      def boilerplate_file(xmldoc)
+        f = configuration.boilerplate
+        f.nil? and return super
+        f.is_a? String and return baselocation(f)
+        f.is_a? Hash and f[@lang] and return baselocation(f[@lang])
+        super
+      end
+
+      def cleanup(xmldoc)
+        super
+        empty_metadata_cleanup(xmldoc)
+        xmldoc
+      end
+
+      def empty_metadata_cleanup(xmldoc)
+        xmldoc.xpath("//bibdata/ext//*").each do |x|
+          x.remove if x.children.empty?
+        end
+      end
     end
   end
 end

data/lib/asciidoctor/generic/front.rb

@@ -0,0 +1,108 @@
+module Asciidoctor
+  module Generic
+    class Converter < Standoc::Converter
+      def default_publisher
+        configuration.organization_name_long
+      end
+
+      def org_abbrev
+        if !configuration.organization_name_long.empty? &&
+            !configuration.organization_name_short.empty? &&
+            configuration.organization_name_long !=
+            configuration.organization_name_short
+          { configuration.organization_name_long =>
+            configuration.organization_name_short }
+        else
+          super
+        end
+      end
+
+      def relaton_relations
+        Array(configuration.relations) || []
+      end
+
+      def metadata_committee(node, xml)
+        return unless node.attr("committee")
+        xml.editorialgroup do |a|
+          a.committee node.attr("committee"),
+            **attr_code(type: node.attr("committee-type"))
+          i = 2
+          while node.attr("committee_#{i}") do
+            a.committee node.attr("committee_#{i}"),
+              **attr_code(type: node.attr("committee-type_#{i}"))
+            i += 1
+          end
+        end
+      end
+
+      def metadata_status(node, xml)
+        xml.status do |s|
+          s.stage ( node.attr("status") || node.attr("docstage") ||
+                   configuration.default_stage || "published" )
+          x = node.attr("substage") and s.substage x
+          x = node.attr("iteration") and s.iteration x
+        end
+      end
+
+      def metadata_id(node, xml)
+        xml.docidentifier **{ type:
+                              configuration.organization_name_short } do |i|
+          i << "DUMMY"
+        end
+        xml.docnumber { |i| i << node.attr("docnumber") }
+      end
+
+      def metadata_ext(node, ext)
+        super
+        if configuration.metadata_extensions.is_a? Hash
+          metadata_ext_hash(node, ext, configuration.metadata_extensions)
+        else
+          Array(configuration.metadata_extensions).each do |e|
+            a = node.attr(e) and ext.send e, a
+          end
+        end
+      end
+
+      def metadata_doctype(node, xml)
+        d = doctype(node)
+        xml.doctype d, attr_code(abbreviation: configuration&.doctypes&.dig(d))
+      end
+
+      EXT_STRUCT = %w(_output _attribute _list).freeze
+
+      def metadata_ext_hash(node, ext, hash)
+        hash.each do |k, v|
+          next if EXT_STRUCT.include?(k) || !v&.is_a?(Hash) && !node.attr(k)
+          if v&.is_a?(Hash) && v["_list"]
+            csv_split(node.attr(k)).each do |val|
+              metadata_ext_hash1(k, val, ext, v, node)
+            end
+          else
+            metadata_ext_hash1(k, node.attr(k), ext, v, node)
+          end
+        end
+      end
+
+      def metadata_ext_hash1(key, value, ext, hash, node)
+        return if hash&.is_a?(Hash) && hash["_attribute"]
+        is_hash = hash&.is_a?(Hash) &&
+            !hash.keys.reject { |n| EXT_STRUCT.include?(n) }.empty?
+        return if !is_hash && (value.nil? || value.empty?)
+        name = hash&.is_a?(Hash) ? (hash["_output"] || key) : key
+        ext.send name, **attr_code(metadata_ext_attrs(hash, node)) do |e|
+            is_hash ? metadata_ext_hash(node, e, hash) : (e << value)
+        end
+      end
+
+      def metadata_ext_attrs(hash, node)
+        return {} unless hash.is_a?(Hash)
+        ret = {}
+        hash.each do |k, v|
+          next unless v.is_a?(Hash) && v["_attribute"]
+          ret[(v["_output"] || k).to_sym] = node.attr(k)
+        end
+        ret
+      end
+    end
+  end
+end

data/lib/asciidoctor/generic/generic.rng

@@ -59,6 +59,13 @@
   </define>
   <define name="generic-standard">
     <element name="generic-standard">
+      <attribute name="version"/>
+      <attribute name="type">
+        <choice>
+          <value>semantic</value>
+          <value>presentation</value>
+        </choice>
+      </attribute>
       <ref name="bibdata"/>
       <zeroOrMore>
         <ref name="termdocsource"/>

data/lib/asciidoctor/generic/isodoc.rng

@@ -24,6 +24,14 @@
     <start>
       <ref name="standard-document"/>
     </start>
+    <define name="doctype">
+      <element name="doctype">
+        <optional>
+          <attribute name="abbreviation"/>
+        </optional>
+        <ref name="DocumentType"/>
+      </element>
+    </define>
     <define name="hyperlink">
       <element name="link">
         <attribute name="target">
@@ -42,7 +50,6 @@
     </define>
     <define name="xref">
       <element name="xref">
-        <!-- attribute target { xsd:IDREF }, -->
         <attribute name="target">
           <data type="string">
             <param name="pattern">\i\c*|\c+#\c+</param>
@@ -64,6 +71,11 @@
             </choice>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="droploc">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
         <text/>
       </element>
     </define>
@@ -137,6 +149,11 @@
             <data type="boolean"/>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="key">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
         <oneOrMore>
           <ref name="dt"/>
           <ref name="dd"/>
@@ -859,6 +876,13 @@
   </define>
   <define name="standard-document">
     <element name="standard-document">
+      <attribute name="version"/>
+      <attribute name="type">
+        <choice>
+          <value>semantic</value>
+          <value>presentation</value>
+        </choice>
+      </attribute>
       <ref name="bibdata"/>
       <optional>
         <ref name="boilerplate"/>
@@ -880,7 +904,7 @@
       <oneOrMore>
         <choice>
           <ref name="content"/>
-          <ref name="preface_abstract"/>
+          <ref name="abstract"/>
           <ref name="foreword"/>
           <ref name="introduction"/>
           <ref name="acknowledgements"/>
@@ -1153,49 +1177,7 @@
   </define>
   <define name="annex">
     <element name="annex">
-      <optional>
-        <attribute name="id">
-          <data type="ID"/>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="language"/>
-      </optional>
-      <optional>
-        <attribute name="script"/>
-      </optional>
-      <optional>
-        <attribute name="inline-header">
-          <data type="boolean"/>
-        </attribute>
-      </optional>
-      <attribute name="obligation">
-        <choice>
-          <value>normative</value>
-          <value>informative</value>
-        </choice>
-      </attribute>
-      <optional>
-        <ref name="section-title"/>
-      </optional>
-      <group>
-        <group>
-          <zeroOrMore>
-            <ref name="BasicBlock"/>
-          </zeroOrMore>
-          <zeroOrMore>
-            <ref name="note"/>
-          </zeroOrMore>
-        </group>
-        <zeroOrMore>
-          <choice>
-            <ref name="annex-subsection"/>
-            <ref name="terms"/>
-            <ref name="definitions"/>
-            <ref name="references"/>
-          </choice>
-        </zeroOrMore>
-      </group>
+      <ref name="Annex-Section"/>
     </element>
   </define>
   <define name="terms">
@@ -1481,11 +1463,6 @@
       </optional>
     </element>
   </define>
-  <define name="preface_abstract">
-    <element name="abstract">
-      <ref name="Basic-Section"/>
-    </element>
-  </define>
   <define name="term-clause">
     <element name="clause">
       <optional>

data/lib/isodoc/generic/base_convert.rb

@@ -4,12 +4,6 @@ require "fileutils"
 module IsoDoc
   module Generic
     module BaseConvert
-      def baselocation(loc)
-        return nil if loc.nil?
-        File.expand_path(File.join(
-          File.dirname(self.class::_file || __FILE__), "..", "..", "..", loc))
-      end
-
       def cleanup(docxml)
         super
         term_cleanup(docxml)

data/lib/isodoc/generic/html_convert.rb

@@ -24,30 +24,35 @@ module IsoDoc
 
       def default_fonts(options)
         {
-          bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' 
-                     : configuration.html_bodyfont || '"Overpass",sans-serif'),
-          headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' : 
-                       configuration.html_headerfont || '"Overpass",sans-serif'),
-          monospacefont: configuration.html_monospacefont || '"Space Mono",monospace'
-        }
+          bodyfont: (
+            options[:script] == "Hans" ? '"SimSun",serif' :
+            configuration.html_bodyfont || '"Overpass",sans-serif'
+          ),
+          headerfont: (
+            options[:script] == "Hans" ? '"SimHei",sans-serif' : 
+            configuration.html_headerfont || '"Overpass",sans-serif'
+          ),
+          monospacefont: configuration.html_monospacefont || '"Space Mono",monospace',
+          normalfontsize: configuration.html_normalfontsize,
+          smallerfontsize: configuration.html_smallerfontsize,
+          footnotefontsize: configuration.html_footnotefontsize,
+          monospacefontsize: configuration.html_monospacefontsize,
+        }.transform_values { |v| v&.empty? ? nil : v }
       end
 
       def default_file_locations(_options)
         {
           htmlstylesheet: baselocation(configuration.htmlstylesheet) ||
-            html_doc_path("htmlstyle.scss"),
+          html_doc_path("htmlstyle.scss"),
           htmlcoverpage: baselocation(configuration.htmlcoverpage) ||
-            html_doc_path("html_generic_titlepage.html"),
+          html_doc_path("html_generic_titlepage.html"),
           htmlintropage: baselocation(configuration.htmlintropage) ||
-            html_doc_path("html_generic_intro.html"),
+          html_doc_path("html_generic_intro.html"),
           scripts: baselocation(configuration.scripts) ||
-            html_doc_path("scripts.html"),
-          i18nyaml: baselocation(configuration.i18nyaml)
-        }
-      end
-
-      def configuration
-        Metanorma::Generic.configuration
+          html_doc_path("scripts.html"),
+          i18nyaml: (configuration.i18nyaml.is_a?(String) ? 
+                     baselocation(configuration.i18nyaml) : nil)
+        }.transform_values { |v| v&.empty? ? nil : v }
       end
 
       def googlefonts

data/lib/isodoc/generic/i18n.rb

@@ -0,0 +1,26 @@
+require_relative "utils"
+
+module IsoDoc
+  module Generic
+    class I18n < IsoDoc::I18n
+      class << self
+        attr_accessor :_file
+      end
+
+      def self.inherited( k )
+        k._file = caller_locations.first.absolute_path
+      end
+
+      def load_yaml1(lang, script)
+        return super unless configuration.i18nyaml
+        file = configuration.i18nyaml.is_a?(Hash) ?
+          configuration.i18nyaml[lang] : configuration.i18nyaml
+        return super if file.nil?
+        y = YAML.load_file(baselocation(file))
+        super.merge(y)
+      end
+
+      include Utils
+    end
+  end
+end

data/lib/isodoc/generic/init.rb

@@ -1,6 +1,8 @@
 require "isodoc"
 require_relative "metadata"
 require_relative "xref"
+require_relative "i18n"
+require_relative "utils"
 
 module IsoDoc
   module Generic
@@ -15,14 +17,13 @@ module IsoDoc
       end
 
       def i18n_init(lang, script, i18nyaml = nil)
+        f = Metanorma::Generic.configuration.i18nyaml
+        f = nil unless f.is_a? String
         @i18n = I18n.new(
-          lang, script, i18nyaml ||
-          Metanorma::Generic.configuration.i18nyaml || @i18nyaml)
+          lang, script, i18nyaml || f || @i18nyaml)
       end
 
-      def fileloc(loc)
-        File.join(File.dirname(__FILE__), loc)
-      end
+      include Utils
     end
   end
 end

data/lib/isodoc/generic/metadata.rb

@@ -1,5 +1,29 @@
 require "isodoc"
+require "nokogiri"
 require_relative "init"
+require_relative "utils"
+
+class Nokogiri::XML::Node
+  TYPENAMES = {1=>'element',2=>'attribute',3=>'text',4=>'cdata',8=>'comment'}
+  def to_hash
+    ret = {kind:TYPENAMES[node_type],name:name}.tap do |h|
+      h.merge! text:text&.strip 
+      a = attribute_nodes.map(&:to_hash)
+      if element? && !a.empty?
+        h.merge! attr: a.inject({}) { |m, v| m[v[:name]] = v[:text]; m }
+      end
+      c = children.map(&:to_hash)
+      if element? && !(c&.size == 1 && c[0][:kind] == "text")
+        h.merge! kids: c.delete_if { |n| n[:kind] == "text" && n[:text].empty? }
+      end
+    end
+    ret
+  end
+end
+
+class Nokogiri::XML::Document
+  def to_hash; root.to_hash; end
+end
 
 module IsoDoc
   module Generic
@@ -23,18 +47,6 @@ module IsoDoc
         k._file = caller_locations.first.absolute_path
       end
 
-       def baselocation(loc)
-        return nil if loc.nil?
-        File.expand_path(File.join(File.dirname(
-          self.class.respond_to?(:_file) ? (self.class::_file || __FILE__) :
-          __FILE__),
-        "..", "..", "..", loc))
-      end
-
-      def configuration
-        Metanorma::Generic.configuration
-      end
-
       def author(isoxml, _out)
         super
         tc = isoxml.at(ns("//bibdata/ext/editorialgroup/committee"))
@@ -51,12 +63,39 @@ module IsoDoc
         !(Array(stages).map { |m| m.downcase }.include? status.downcase)
       end
 
-      def ext(isoxml, out)
-        Array(configuration.metadata_extensions).each do |e|
-          b = isoxml&.at(ns("//bibdata/ext/#{e}"))&.text or next
-          set(e.to_sym, b)
+      def doctype(isoxml, _out)
+        super
+        b = isoxml&.at(ns("//bibdata/ext/doctype#{currlang}")) || 
+          isoxml&.at(ns("//bibdata/ext/doctype#{NOLANG}")) || return
+        a = b["abbreviation"] and set(:doctype_abbr, a)
+      end
+
+      def xmlhash2hash(h)
+        ret = {}
+        return ret if h.nil? || h[:kind] != "element"
+        h[:attr].nil? or h[:attr].each { |k, v| ret["#{h[:name]}_#{k}"] = v }
+        ret[h[:name]] = h[:kids] ? xmlhash2hash_kids(h) : h[:text]
+        ret
+      end
+
+      def xmlhash2hash_kids(h)
+        c = {}
+        h[:kids].each do |n|
+          xmlhash2hash(n).each do |k1, v1|
+            c[k1] = c[k1].nil? ? v1 :
+              c[k1].is_a?(Array) ? c[k1] << v1 :
+              [c[k1], v1]
+          end
         end
+        c
       end
+
+      def ext(isoxml, out)
+        b = isoxml&.at(ns("//bibdata/ext")) or return
+        set(:metadata_extensions, xmlhash2hash(b.to_hash)["ext"])
+      end
+
+      include Utils
     end
   end
 end

data/lib/isodoc/generic/pdf_convert.rb

@@ -27,7 +27,7 @@ module IsoDoc
           headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' :
                        configuration.html_headerfont || '"Overpass",sans-serif'),
           monospacefont: configuration.html_monospacefont || '"Space Mono",monospace'
-        }
+        }.transform_values { |v| v&.empty? ? nil : v }
       end
 
       def default_file_locations(_options)
@@ -40,7 +40,7 @@ module IsoDoc
             html_doc_path("html_generic_intro.html"),
           scripts_pdf: baselocation(configuration.scripts_pdf) ||
             html_doc_path("scripts.pdf.html")
-        }
+        }.transform_values { |v| v&.empty? ? nil : v }
       end
 
       def googlefonts

data/lib/isodoc/generic/utils.rb

@@ -0,0 +1,23 @@
+module IsoDoc
+  module Generic
+    module Utils
+      def configuration
+        Metanorma::Generic.configuration
+      end
+
+      def fileloc(loc)
+        File.join(File.dirname(__FILE__), loc)
+      end
+
+      def baselocation(loc)
+        return nil if loc.nil?
+        return "" if loc.empty?
+        return loc
+        f = defined?(self.class::_file) ? (self.class::_file || __FILE__) :
+          __FILE__
+        File.expand_path(File.join(
+          File.dirname(f), "..", "..", "..", loc))
+      end
+    end
+  end
+end

data/lib/isodoc/generic/word_convert.rb

@@ -23,34 +23,39 @@ module IsoDoc
 
       def default_fonts(options)
         {
-          bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' : 
-                     configuration.word_bodyfont || '"Arial",sans-serif'),
-          headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' : 
-                       configuration.word_headerfont ||  '"Arial",sans-serif'),
-          monospacefont:  configuration.word_monospacefont ||  '"Courier New",monospace'
-        }
+          bodyfont: (
+            options[:script] == "Hans" ? '"SimSun",serif' : 
+            configuration.word_bodyfont || '"Arial",sans-serif'
+          ),
+          headerfont: (
+            options[:script] == "Hans" ? '"SimHei",sans-serif' : 
+            configuration.word_headerfont ||  '"Arial",sans-serif'
+          ),
+          monospacefont:  configuration.word_monospacefont ||  '"Courier New",monospace',
+          normalfontsize: configuration.word_normalfontsize,
+          smallerfontsize: configuration.word_smallerfontsize,
+          footnotefontsize: configuration.word_footnotefontsize,
+          monospacefontsize: configuration.word_monospacefontsize,
+        }.transform_values { |v| v&.empty? ? nil : v  }
       end
 
       def default_file_locations(options)
         {
           wordstylesheet: baselocation(configuration.wordstylesheet) ||
-            html_doc_path("wordstyle.scss"),
+          html_doc_path("wordstyle.scss"),
           standardstylesheet: baselocation(configuration.standardstylesheet) ||
-            html_doc_path("generic.scss"),
+          html_doc_path("generic.scss"),
           header: baselocation(configuration.header) ||
-            html_doc_path("header.html"),
+          html_doc_path("header.html"),
           wordcoverpage: baselocation(configuration.wordcoverpage) ||
-            html_doc_path("word_generic_titlepage.html"),
+          html_doc_path("word_generic_titlepage.html"),
           wordintropage: baselocation(configuration.wordintropage) ||
-            html_doc_path("word_generic_intro.html"),
-          i18nyaml: baselocation(configuration.i18nyaml),
-          ulstyle: "l3",
-          olstyle: "l2",
-        }
-      end
-
-      def configuration
-        Metanorma::Generic.configuration
+          html_doc_path("word_generic_intro.html"),
+          i18nyaml: (configuration.i18nyaml.is_a?(String) ?
+                     baselocation(configuration.i18nyaml) : nil),
+        ulstyle: "l3",
+        olstyle: "l2",
+        }.transform_values { |v| v&.empty? ? nil : v }
       end
 
       include BaseConvert

data/lib/metanorma/generic.rb

@@ -15,6 +15,8 @@ module Metanorma
         organization_name_short
         organization_name_long
         bibliography_titles
+        boilerplate
+        committees
         document_namespace
         docid_template
         doctypes
@@ -29,10 +31,15 @@ module Metanorma
         html_bodyfont
         html_headerfont
         html_monospacefont
+        html_normalfontsize
+        html_monospacefontsize
+        html_smallerfontsize
+        html_footnotefontsize
         metadata_extensions
         metanorma_name
         normref_titles
         published_stages
+        relations
         default_stage
         stage_abbreviations
         scripts
@@ -48,9 +55,33 @@ module Metanorma
         word_bodyfont
         word_headerfont
         word_monospacefont
+        word_normalfontsize
+        word_monospacefontsize
+        word_smallerfontsize
+        word_footnotefontsize
         xml_root_tag
       ].freeze
 
+      def filepath_attrs
+        return %i[
+          i18nyaml
+          boilerplate
+          logo_path
+          logo_paths
+          header
+          htmlcoverpage
+          htmlintropage
+          htmlstylesheet
+          scripts
+          scripts_pdf
+          standardstylesheet
+          validate_rng_file
+          wordcoverpage
+          wordintropage
+          wordstylesheet
+        ]
+      end
+
       attr_accessor(*CONFIG_ATTRS)
 
       class << self
@@ -81,13 +112,47 @@ module Metanorma
       end
 
       def set_default_values_from_yaml_file(config_file)
+        root_path = File.dirname(self.class::_file || __FILE__)
         default_config_options = YAML.load(File.read(config_file))
+        if default_config_options["doctypes"]&.is_a? Array
+          default_config_options["doctypes"] = default_config_options["doctypes"].
+            each_with_object({}) { |k, m| m[k] = nil }
+        end
         CONFIG_ATTRS.each do |attr_name|
-          instance_variable_set("@#{attr_name}", default_config_options[attr_name.to_s])
+          value = default_config_options[attr_name.to_s]
+          if value && filepath_attrs.include?(attr_name)
+            value = absolute_path(value, root_path)
+          end
+
+          instance_variable_set("@#{attr_name}", value)
+        end
+      end
+
+      def blank?(v)
+        v.nil? || v.respond_to?(:empty?) && v.empty?
+      end
+
+      def absolute_path(value, root_path)
+        if value.is_a? Hash then absolute_path1(value, root_path)
+        elsif value.is_a? Array
+          value.reject { |a| blank?(a) }.each_with_object([]) do |v1, g|
+            g << absolute_path(v1, root_path)
+          end
+        elsif value.is_a?(String) && !value.empty?
+          File.join(root_path, "..", "..", value)
+        else
+          value
+        end
+      end
+
+      def absolute_path1(h, pref)
+        h.reject { |k, v| blank?(v) }.each_with_object({}) do |(k, v), g|
+          g[k] = absolute_path(v, pref)
         end
       end
     end
 
+
     class << self
       extend Forwardable
 

data/lib/metanorma/generic/fonts_manifest.yaml

@@ -0,0 +1,5 @@
+---
+Source Sans Pro:
+Overpass:
+Space Mono:
+Arial:

data/lib/metanorma/generic/processor.rb

@@ -2,21 +2,6 @@ require "metanorma/processor"
 
 module Metanorma
   module Generic
-    def self.fonts_used
-      {
-        html: [
-          configuration.html_bodyfont || "Overpass", configuration.html_headerfont || "Overpass", 
-          configuration.html_monospacefont || "Space Mono"
-        ].uniq,
-        doc: [
-          configuration.word_bodyfont || "Overpass", configuration.word_headerfont || "Overpass", 
-          configuration.word_monospacefont || "Space Mono"].uniq,
-        pdf: [
-          configuration.word_bodyfont || "Overpass", configuration.word_headerfont || "Overpass", 
-          configuration.word_monospacefont || "Space Mono"].uniq,
-      }
-    end
-
     class Processor < Metanorma::Processor
       def configuration
         Metanorma::Generic.configuration

data/lib/metanorma/generic/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Generic
-    VERSION = "1.6.3"
+    VERSION = "1.8.0"
   end
 end

data/metanorma-generic.gemspec

@@ -28,8 +28,8 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "htmlentities", "~> 4.3.4"
   spec.add_dependency "ruby-jing"
-  spec.add_dependency "metanorma-standoc", "~> 1.5.0"
-  spec.add_dependency "isodoc", "~> 1.2.0"
+  spec.add_dependency "metanorma-standoc", "~> 1.6.0"
+  spec.add_dependency "isodoc", "~> 1.3.0"
 
   spec.add_development_dependency "byebug", "~> 9.1"
   spec.add_development_dependency "sassc", "2.4.0"

data/metanorma.yml.example

@@ -14,6 +14,10 @@ htmlstylesheet: /metanorma-mine/lib/isodoc/mine/html/htmlstyle.scss
 html_bodyfont: '"Source Sans Pro",sans-serif'
 html_headerfont: '"Source Sans Pro",sans-serif'
 html_monospacefont: '"Source Code Pro",monospace'
+html_normalfontsize: "1.0em"
+html_monospacefontsize: "0.8em"
+html_smallerfontsize: "0.9em"
+html_footnotefontsize: "0.8em"
 scripts: /metanorma-mine/lib/isodoc/mine/html/scripts.html
 scripts_pdf: /metanorma-mine/lib/isodoc/mine/html/scripts.prd.html
 standardstylesheet: /metanorma-mine/lib/isodoc/mine/html/
@@ -24,11 +28,20 @@ wordstylesheet: /metanorma-mine/lib/isodoc/mine/html/wordstyle.scss
 word_bodyfont: '"Source Sans Pro","Arial",sans-serif'
 word_headerfont: '"Source Sans Pro","Arial",sans-serif'
 word_monospacefont: '"Source Code Pro",monospace'
+word_normalfontsize: "12.0pt"
+word_monospacefontsize: "11.0pt"
+word_smallerfontsize: "10.0pt"
+word_footnotefontsize: "9.0pt"
 docid_template: "{{ organization_name_short }} {{ docnumeric }}"
 metadata_extensions:
   - security
 published_stages:
   - published
+committees:
+  - TC 1
+relations:
+  - part-of
+  - translated-from
 stage_abbreviations:
   draft-proposal:
   draft-development:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-generic
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 1.8.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-11 00:00:00.000000000 Z
+date: 2020-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -44,28 +44,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: isodoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -216,9 +216,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/macos.yml"
-- ".github/workflows/ubuntu.yml"
-- ".github/workflows/windows.yml"
+- ".github/workflows/rake.yml"
 - ".gitignore"
 - ".hound.yml"
 - ".rubocop.ribose.yml"
@@ -236,6 +234,7 @@ files:
 - lib/asciidoctor/generic/basicdoc.rng
 - lib/asciidoctor/generic/biblio.rng
 - lib/asciidoctor/generic/converter.rb
+- lib/asciidoctor/generic/front.rb
 - lib/asciidoctor/generic/generic.rng
 - lib/asciidoctor/generic/isodoc.rng
 - lib/asciidoctor/generic/reqt.rng
@@ -253,14 +252,17 @@ files:
 - lib/isodoc/generic/html/word_generic_titlepage.html
 - lib/isodoc/generic/html/wordstyle.scss
 - lib/isodoc/generic/html_convert.rb
+- lib/isodoc/generic/i18n.rb
 - lib/isodoc/generic/init.rb
 - lib/isodoc/generic/metadata.rb
 - lib/isodoc/generic/pdf_convert.rb
 - lib/isodoc/generic/presentation_xml_convert.rb
+- lib/isodoc/generic/utils.rb
 - lib/isodoc/generic/word_convert.rb
 - lib/isodoc/generic/xref.rb
 - lib/metanorma-generic.rb
 - lib/metanorma/generic.rb
+- lib/metanorma/generic/fonts_manifest.yaml
 - lib/metanorma/generic/processor.rb
 - lib/metanorma/generic/version.rb
 - metanorma-generic.gemspec

data/.github/workflows/macos.yml

@@ -1,38 +0,0 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
-name: macos
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    paths-ignore:
-      - .github/workflows/ubuntu.yml
-      - .github/workflows/windows.yml
-
-jobs:
-  test-macos:
-    name: Test on Ruby ${{ matrix.ruby }} macOS
-    runs-on: macos-latest
-    continue-on-error: ${{ matrix.experimental }}
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [ '2.6', '2.5', '2.4' ]
-        experimental: [false]
-        include:
-          - ruby: '2.7'
-            experimental: true
-    steps:
-      - uses: actions/checkout@master
-      - name: Use Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-      - name: Update gems
-        run: |
-          sudo gem install bundler --force
-          bundle install --jobs 4 --retry 3
-      - name: Run specs
-        run: |
-          bundle exec rake

data/.github/workflows/ubuntu.yml

@@ -1,56 +0,0 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
-name: ubuntu
-
-on:
-  push:
-    branches: [ master ]
-    tags:
-      - '*'
-  pull_request:
-    paths-ignore:
-      - .github/workflows/macos.yml
-      - .github/workflows/windows.yml
-
-jobs:
-  test-linux:
-    name: Test on Ruby ${{ matrix.ruby }} Ubuntu
-    runs-on: ubuntu-latest
-    continue-on-error: ${{ matrix.experimental }}
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [ '2.6', '2.5', '2.4' ]
-        experimental: [false]
-        include:
-          - ruby: '2.7'
-            experimental: true
-    steps:
-      - uses: actions/checkout@master
-      - name: Use Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-      - name: Update gems
-        run: |
-          gem install bundler
-          bundle install --jobs 4 --retry 3
-      - name: Run specs
-        run: |
-          bundle exec rake
-      - name: Trigger repositories
-        if: matrix.ruby == '2.6'
-        env:
-          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
-          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 "$CLIENT_PAYLOAD"
-          done

data/.github/workflows/windows.yml

@@ -1,40 +0,0 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
-name: windows
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    paths-ignore:
-      - .github/workflows/macos.yml
-      - .github/workflows/ubuntu.yml
-
-jobs:
-  test-windows:
-    name: Test on Ruby ${{ matrix.ruby }} Windows
-    runs-on: windows-latest
-    continue-on-error: ${{ matrix.experimental }}
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [ '2.6', '2.5', '2.4' ]
-        experimental: [false]
-        include:
-          - ruby: '2.7'
-            experimental: true
-    steps:
-      - uses: actions/checkout@master
-      - name: Use Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-      - name: Update gems
-        shell: pwsh
-        run: |
-          gem install bundler
-          bundle config --local path vendor/bundle
-          bundle install --jobs 4 --retry 3
-      - name: Run specs
-        run: |
-          bundle exec rake