metanorma-generic 1.5.1 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c1680dbc80de8b900946d582965cdb87975a2f796416441a9a5ad7958d3c5cf
-  data.tar.gz: 361b7a5c7ecb51b5c3a2180e2f17b083384678e8e6a976a19f0b14e0fb704bf3
+  metadata.gz: dbd87f79baeb66107643bd3c6e9377853f72f3b19d17615aced5737609ea31e4
+  data.tar.gz: a1e014a6a7076b4f39c37bcb35d67fecb221ff0494ba38ce88482affb8aef854
 SHA512:
-  metadata.gz: c1edbb399ba66ea7c7836c5f4644fc5da9f1080b19d52b37ca42e2679811a858a540a9cd7c165fceea10e150e32039a6613b1f0ce25915b88c24dfefc73c01bd
-  data.tar.gz: 34981e89ab1542522d57f6840907e19b5d107ae6b20d2aba15090253655ff79c7ede49d81ac5b608377c77f6c93bf09a00b6db81d1f4d13a1c914cf61e9472da
+  metadata.gz: b26374f517b2c486fd6780a66f05357689990026dab52e88c8f8b9a1aec881653a4f23f915bf5e6944c83ae8fe943046ae42047382c3968a5b1cca11204f5a53
+  data.tar.gz: 35502f72cf8aa2f3f19848d4fe9326994f8af544531e71da3dabf61215329c164404cfd5d7fab6e72da66f43ae851272ceaf6a1d9fbf6a72fdf15552d6dcd4e6

data/lib/asciidoctor/generic/basicdoc.rng

@@ -402,6 +402,16 @@
           </choice>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="valign">
+          <choice>
+            <value>top</value>
+            <value>middle</value>
+            <value>bottom</value>
+            <value>baseline</value>
+          </choice>
+        </attribute>
+      </optional>
       <choice>
         <zeroOrMore>
           <ref name="TextElement"/>
@@ -429,6 +439,16 @@
           </choice>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="valign">
+          <choice>
+            <value>top</value>
+            <value>middle</value>
+            <value>bottom</value>
+            <value>baseline</value>
+          </choice>
+        </attribute>
+      </optional>
       <choice>
         <zeroOrMore>
           <ref name="TextElement"/>
@@ -998,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

@@ -24,28 +24,30 @@ module Asciidoctor
 
        def baselocation(loc)
         return nil if loc.nil?
-        File.expand_path(File.join(File.dirname(self.class::_file || __FILE__), "..", "..", "..", loc))
+        File.expand_path(File.join(File.dirname(
+          self.class::_file || __FILE__), "..", "..", "..", loc))
       end
 
-      def metadata_author(node, xml)
-        xml.contributor do |c|
-          c.role **{ type: "author" }
-          c.organization do |a|
-            a.name configuration.organization_name_long
-          end
-        end
-        personal_author(node, xml)
+      def default_publisher
+        configuration.organization_name_long
       end
 
-      def metadata_publisher(node, xml)
-        xml.contributor do |c|
-          c.role **{ type: "publisher" }
-          c.organization do |a|
-            a.name 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|
@@ -85,18 +87,6 @@ module Asciidoctor
         xml.docnumber { |i| i << node.attr("docnumber") }
       end
 
-      def metadata_copyright(node, xml)
-        from = node.attr("copyright-year") || Date.today.year
-        xml.copyright do |c|
-          c.from from
-          c.owner do |owner|
-            owner.organization do |o|
-              o.name configuration.organization_name_long
-            end
-          end
-        end
-      end
-
       def metadata_ext(node, ext)
         super
         Array(configuration.metadata_extensions).each do |e|
@@ -105,7 +95,7 @@ module Asciidoctor
       end
 
       def doctype(node)
-        d = node.attr("doctype")
+        d = super
         configuration.doctypes or return d == "article" ? "standard" : d
         default = configuration.default_doctype || Array(configuration.doctypes).dig(0) ||
           "standard"
@@ -143,10 +133,13 @@ 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")
-        pdf_converter(node)&.convert(@filename + ".presentation.xml", nil, false, "#{@filename}.pdf")
+        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")
 
       end
 
@@ -164,6 +157,7 @@ module Asciidoctor
 
       def bibdata_validate(doc)
         stage_validate(doc)
+        committee_validate(doc)
       end
 
       def stage_validate(xmldoc)
@@ -174,6 +168,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|
@@ -206,10 +209,18 @@ module Asciidoctor
       def boilerplate_isodoc(xmldoc)
         conv = super
         Metanorma::Generic::Configuration::CONFIG_ATTRS.each do |a|
-          conv.labels[a] = configuration.send a
+          conv.i18n.set(a, configuration.send(a))
         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
     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

@@ -42,8 +42,11 @@
     </define>
     <define name="xref">
       <element name="xref">
+        <!-- attribute target { xsd:IDREF }, -->
         <attribute name="target">
-          <data type="IDREF"/>
+          <data type="string">
+            <param name="pattern">\i\c*|\c+#\c+</param>
+          </data>
         </attribute>
         <optional>
           <attribute name="type">
@@ -61,6 +64,11 @@
             </choice>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="droploc">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
         <text/>
       </element>
     </define>
@@ -578,6 +586,8 @@
             <ref name="ol"/>
             <ref name="dl"/>
             <ref name="formula"/>
+            <ref name="quote"/>
+            <ref name="sourcecode"/>
           </choice>
         </oneOrMore>
       </element>
@@ -661,6 +671,16 @@
             </choice>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="valign">
+            <choice>
+              <value>top</value>
+              <value>middle</value>
+              <value>bottom</value>
+              <value>baseline</value>
+            </choice>
+          </attribute>
+        </optional>
         <choice>
           <zeroOrMore>
             <choice>
@@ -697,6 +717,16 @@
             </choice>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="valign">
+            <choice>
+              <value>top</value>
+              <value>middle</value>
+              <value>bottom</value>
+              <value>baseline</value>
+            </choice>
+          </attribute>
+        </optional>
         <choice>
           <zeroOrMore>
             <choice>
@@ -834,6 +864,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"/>
@@ -855,7 +892,7 @@
       <oneOrMore>
         <choice>
           <ref name="content"/>
-          <ref name="preface_abstract"/>
+          <ref name="abstract"/>
           <ref name="foreword"/>
           <ref name="introduction"/>
           <ref name="acknowledgements"/>
@@ -922,6 +959,9 @@
       <optional>
         <attribute name="script"/>
       </optional>
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <optional>
         <attribute name="obligation">
           <choice>
@@ -961,9 +1001,6 @@
   </define>
   <define name="content-subsection">
     <element name="clause">
-      <optional>
-        <attribute name="type"/>
-      </optional>
       <ref name="Content-Section"/>
     </element>
   </define>
@@ -992,6 +1029,9 @@
         </choice>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="type"/>
+    </optional>
     <optional>
       <ref name="section-title"/>
     </optional>
@@ -1011,9 +1051,6 @@
   </define>
   <define name="clause">
     <element name="clause">
-      <optional>
-        <attribute name="type"/>
-      </optional>
       <ref name="Clause-Section"/>
     </element>
   </define>
@@ -1042,18 +1079,24 @@
         </choice>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="type"/>
+    </optional>
     <optional>
       <ref name="section-title"/>
     </optional>
     <group>
-      <group>
-        <zeroOrMore>
-          <ref name="BasicBlock"/>
-        </zeroOrMore>
-        <zeroOrMore>
-          <ref name="note"/>
-        </zeroOrMore>
-      </group>
+      <choice>
+        <group>
+          <zeroOrMore>
+            <ref name="BasicBlock"/>
+          </zeroOrMore>
+          <zeroOrMore>
+            <ref name="note"/>
+          </zeroOrMore>
+        </group>
+        <ref name="amend"/>
+      </choice>
       <zeroOrMore>
         <choice>
           <ref name="clause-subsection"/>
@@ -1180,6 +1223,9 @@
       <optional>
         <attribute name="script"/>
       </optional>
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <optional>
         <attribute name="obligation">
           <choice>
@@ -1447,11 +1493,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>
@@ -1501,4 +1542,79 @@
       <ref name="CitationType"/>
     </element>
   </define>
+  <define name="amend">
+    <element name="amend">
+      <optional>
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+      </optional>
+      <attribute name="change">
+        <choice>
+          <value>add</value>
+          <value>modify</value>
+          <value>delete</value>
+        </choice>
+      </attribute>
+      <optional>
+        <attribute name="path"/>
+      </optional>
+      <optional>
+        <attribute name="path_end"/>
+      </optional>
+      <optional>
+        <attribute name="title"/>
+      </optional>
+      <optional>
+        <element name="location">
+          <zeroOrMore>
+            <ref name="locality"/>
+          </zeroOrMore>
+        </element>
+      </optional>
+      <zeroOrMore>
+        <ref name="autonumber"/>
+      </zeroOrMore>
+      <optional>
+        <element name="description">
+          <zeroOrMore>
+            <ref name="BasicBlock"/>
+          </zeroOrMore>
+        </element>
+      </optional>
+      <optional>
+        <element name="newcontent">
+          <zeroOrMore>
+            <ref name="BasicBlock"/>
+          </zeroOrMore>
+        </element>
+      </optional>
+      <optional>
+        <element name="description">
+          <zeroOrMore>
+            <ref name="BasicBlock"/>
+          </zeroOrMore>
+        </element>
+      </optional>
+    </element>
+  </define>
+  <define name="autonumber">
+    <element name="autonumber">
+      <attribute name="type">
+        <choice>
+          <value>requirement</value>
+          <value>recommendation</value>
+          <value>permission</value>
+          <value>table</value>
+          <value>figure</value>
+          <value>admonition</value>
+          <value>formula</value>
+          <value>sourcecode</value>
+          <value>example</value>
+          <value>note</value>
+        </choice>
+      </attribute>
+      <text/>
+    </element>
+  </define>
 </grammar>

data/lib/isodoc/generic/base_convert.rb

@@ -1,41 +1,16 @@
 require "isodoc"
-require_relative "metadata"
-require_relative "xref"
 require "fileutils"
 
 module IsoDoc
   module Generic
     module BaseConvert
-      def metadata_init(lang, script, labels)
-        @meta = Metadata.new(lang, script, labels)
-      end
-
-      def xref_init(lang, script, klass, labels, options)
-        @xrefs = Xref.new(lang, script, klass, labels, options)
-      end
-
+=begin
       def baselocation(loc)
         return nil if loc.nil?
-        File.expand_path(File.join(File.dirname(self.class::_file || __FILE__), "..", "..", "..", loc))
-      end
-
-      def annex_name(annex, name, div)
-        div.h1 **{ class: "Annex" } do |t|
-          t << "#{@xrefs.anchor(annex['id'], :label)} "
-          t.br
-          t.b do |b|
-            name&.children&.each { |c2| parse(c2, b) }
-          end
-        end
-      end
-
-      def i18n_init(lang, script)
-        super
-      end
-
-      def fileloc(loc)
-        File.join(File.dirname(__FILE__), loc)
+        File.expand_path(File.join(
+          File.dirname(self.class::_file || __FILE__), "..", "..", "..", loc))
       end
+=end
 
       def cleanup(docxml)
         super
@@ -52,7 +27,8 @@ module IsoDoc
       end
 
       def make_body(xml, docxml)
-        body_attr = { lang: "EN-US", link: "blue", vlink: "#954F72", "xml:lang": "EN-US", class: "container" }
+        body_attr = { lang: "EN-US", link: "blue", vlink: "#954F72", 
+                      "xml:lang": "EN-US", class: "container" }
         xml.body **body_attr do |body|
           make_body1(body, docxml)
           make_body2(body, 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

@@ -1,4 +1,5 @@
 require_relative "base_convert"
+require_relative "init"
 require "isodoc"
 
 module IsoDoc
@@ -23,10 +24,14 @@ 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'
         }
       end
@@ -34,27 +39,33 @@ module IsoDoc
       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)
         }
       end
 
+=begin
       def configuration
         Metanorma::Generic.configuration
       end
+=end
 
       def googlefonts
         return unless configuration.webfont
-        Array(configuration.webfont).map { |x| %{<link href="#{x.gsub(/\&amp;/, '&')}" rel="stylesheet">} }.join("\n")
+        Array(configuration.webfont).map do |x|
+          %{<link href="#{x.gsub(/\&amp;/, '&')}" rel="stylesheet">}
+        end.join("\n")
       end
 
       include BaseConvert
+      include Init
     end
   end
 end

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

@@ -0,0 +1,30 @@
+require "isodoc"
+require_relative "metadata"
+require_relative "xref"
+require_relative "i18n"
+require_relative "utils"
+
+module IsoDoc
+  module Generic
+    module Init
+      def metadata_init(lang, script, i18n)
+        @meta = Metadata.new(lang, script, i18n)
+      end
+
+      def xref_init(lang, script, klass, i18n, options)
+        html = HtmlConvert.new(language: lang, script: script)
+        @xrefs = Xref.new(lang, script, html, i18n, options)
+      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 || f || @i18nyaml)
+      end
+
+      include Utils
+    end
+  end
+end
+

data/lib/isodoc/generic/metadata.rb

@@ -1,4 +1,6 @@
 require "isodoc"
+require_relative "init"
+require_relative "utils"
 
 module IsoDoc
   module Generic
@@ -22,14 +24,19 @@ module IsoDoc
         k._file = caller_locations.first.absolute_path
       end
 
-      def baselocation(loc)
+=begin
+       def baselocation(loc)
         return nil if loc.nil?
-        File.expand_path(File.join(File.dirname(self.class::_file || __FILE__), "..", "..", "..", loc))
+        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
+=end
 
       def author(isoxml, _out)
         super
@@ -53,6 +60,8 @@ module IsoDoc
           set(e.to_sym, b)
         end
       end
+
+      include Utils
     end
   end
 end

data/lib/isodoc/generic/pdf_convert.rb

@@ -1,4 +1,5 @@
 require_relative "base_convert"
+require_relative "init"
 require "isodoc"
 
 module IsoDoc
@@ -58,6 +59,7 @@ module IsoDoc
       end
 
       include BaseConvert
+      include Init
     end
   end
 end

data/lib/isodoc/generic/presentation_xml_convert.rb

@@ -1,9 +1,19 @@
-require_relative "base_convert"
+require_relative "init"
+require_relative "metadata"
 require "isodoc"
 
 module IsoDoc
   module Generic
     class PresentationXMLConvert < IsoDoc::PresentationXMLConvert
+      def annex1(f)
+        lbl = @xrefs.anchor(f['id'], :label)
+        if t = f.at(ns("./title"))
+          t.children = "<strong>#{t.children.to_xml}</strong>"
+        end
+        prefix_name(f, "<br/>", lbl, "title")
+      end
+
+      include Init
     end
   end
 end

data/lib/isodoc/generic/utils.rb

@@ -0,0 +1,21 @@
+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?
+        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

@@ -1,4 +1,5 @@
 require_relative "base_convert"
+require_relative "init"
 require "isodoc"
 
 module IsoDoc
@@ -22,8 +23,14 @@ 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'
         }
       end
@@ -31,26 +38,30 @@ module IsoDoc
       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",
+          html_doc_path("word_generic_intro.html"),
+          i18nyaml: (configuration.i18nyaml.is_a?(String) ?
+                     baselocation(configuration.i18nyaml) : nil),
+        ulstyle: "l3",
+        olstyle: "l2",
         }
       end
 
+=begin
       def configuration
         Metanorma::Generic.configuration
       end
+=end
 
       include BaseConvert
+      include Init
     end
   end
 end

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

data/lib/metanorma/generic/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Generic
-    VERSION = "1.5.1"
+    VERSION = "1.7.0"
   end
 end

data/metanorma-generic.gemspec

@@ -28,10 +28,11 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "htmlentities", "~> 4.3.4"
   spec.add_dependency "ruby-jing"
-  spec.add_dependency "metanorma-standoc", "~> 1.4.0"
-  spec.add_dependency "isodoc", "~> 1.1.0"
+  spec.add_dependency "metanorma-standoc", "~> 1.6.0"
+  spec.add_dependency "isodoc", "~> 1.2.0"
 
   spec.add_development_dependency "byebug", "~> 9.1"
+  spec.add_development_dependency "sassc", "2.4.0"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "guard", "~> 2.14"
   spec.add_development_dependency "guard-rspec", "~> 4.7"

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.5.1
+  version: 1.7.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-07-10 00:00:00.000000000 Z
+date: 2020-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -44,28 +44,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: isodoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '9.1'
+- !ruby/object:Gem::Dependency
+  name: sassc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.4.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
   requirement: !ruby/object:Gem::Requirement
@@ -239,9 +253,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