metanorma-generic 1.6.2 → 1.7.3

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/generic.scss

@@ -636,7 +636,7 @@ div.WordSection2
 
 div.WordSection3
 	{page:WordSection3;}
-table.MsoISOTable
+table.MsoISOTable, table.MsoISOTableBig
 	{mso-style-name:"Table ISO";
 	mso-tstyle-rowband-size:0;
 	mso-tstyle-colband-size:0;
@@ -656,15 +656,15 @@ table.MsoISOTable
 	mso-border-insidev:.75pt solid windowtext;
 	font-size:10.0pt;
 	font-family:$bodyfont;}
-table.MsoISOTable th
+table.MsoISOTable th, table.MsoISOTableBig th
     {border:solid windowtext 1pt;
     mso-border-alt:solid windowtext 1pt;
     padding:0cm 2.85pt 0cm 2.85pt;}
-table.MsoISOTable td
+table.MsoISOTable td, table.MsoISOTableBig td
     {border:solid windowtext 1pt;
     mso-border-alt:solid windowtext 1pt;
     padding:0cm 2.85pt 0cm 2.85pt;}
-table.MsoISOTable p
+table.MsoISOTable p, table.MsoISOTableBig p
 {font-size:10.0pt; }
 table.MsoTableGrid
 	{mso-style-name:"Table Grid";
@@ -750,6 +750,20 @@ div.example p.MsoListParagraph {
 
 div.Note p.MsoListParagraph {
   font-size: 10.0pt;
+  margin-left: 1.0cm;
+}
+
+div.Note span.stem {
+  font-size: 10.0pt; }
+
+div.Note p.Sourcecode, div.Note pre.Sourcecode  {
+  font-size: 8.0pt;
+  margin-left: 1.0cm;
+}
+
+div.Note table.dl  {
+  font-size: 10.0pt;
+  margin-left: 1.0cm;
 }
 
 span.note_label, span.example_label, td.example_label, td.note_label

data/lib/isodoc/generic/html_convert.rb

@@ -24,31 +24,38 @@ 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'),
+          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'
-        }
+        }.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)
-        }
+          html_doc_path("scripts.html"),
+          i18nyaml: (configuration.i18nyaml.is_a?(String) ? 
+                     baselocation(configuration.i18nyaml) : nil)
+        }.transform_values { |v| v&.empty? ? nil : v }
       end
 
+=begin
       def configuration
         Metanorma::Generic.configuration
       end
+=end
 
       def googlefonts
         return unless configuration.webfont

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,12 +17,13 @@ module IsoDoc
       end
 
       def i18n_init(lang, script, i18nyaml = nil)
-        @i18n = I18n.new(lang, script, i18nyaml || @i18nyaml)
+        f = Metanorma::Generic.configuration.i18nyaml
+        f = nil unless f.is_a? String
+        @i18n = I18n.new(
+          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,4 +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
@@ -22,16 +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::_file || __FILE__), "..", "..", "..", loc))
-      end
-
-      def configuration
-        Metanorma::Generic.configuration
-      end
-
       def author(isoxml, _out)
         super
         tc = isoxml.at(ns("//bibdata/ext/editorialgroup/committee"))
@@ -48,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/presentation_xml_convert.rb

@@ -1,4 +1,5 @@
 require_relative "init"
+require_relative "metadata"
 require "isodoc"
 
 module IsoDoc

data/lib/isodoc/generic/utils.rb

@@ -0,0 +1,22 @@
+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?
+        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,35 @@ 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'),
+          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'
-        }
+        }.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
@@ -33,6 +35,7 @@ module Metanorma
         metanorma_name
         normref_titles
         published_stages
+        relations
         default_stage
         stage_abbreviations
         scripts
@@ -82,6 +85,10 @@ module Metanorma
 
       def set_default_values_from_yaml_file(config_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])
         end

data/lib/metanorma/generic/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Generic
-    VERSION = "1.6.2"
+    VERSION = "1.7.3"
   end
 end

data/metanorma-generic.gemspec

@@ -28,7 +28,7 @@ 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 "metanorma-standoc", "~> 1.6.0"
   spec.add_dependency "isodoc", "~> 1.2.0"
 
   spec.add_development_dependency "byebug", "~> 9.1"

data/metanorma.yml.example

@@ -29,6 +29,11 @@ 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.2
+  version: 1.7.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-08-27 00:00:00.000000000 Z
+date: 2020-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -44,14 +44,14 @@ 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
@@ -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,10 +252,12 @@ 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