metanorma-generic 1.6.3 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38f634ace384417096ff4e1ea82dcc50c0cad5d4a81186934df2c7f32e24ebe2
-  data.tar.gz: 76a20654285bb56c3c7796c6ee3e8a57776a3417cdb81f945eca21c064454afd
+  metadata.gz: dbd87f79baeb66107643bd3c6e9377853f72f3b19d17615aced5737609ea31e4
+  data.tar.gz: a1e014a6a7076b4f39c37bcb35d67fecb221ff0494ba38ce88482affb8aef854
 SHA512:
-  metadata.gz: dccf6988964bd683012b07ce100789538f44464b4c98f9f22804e12ef98434c05ada0a879a2f46e67c8d243f1263b0e25639c3dc2e66a320e3f28cf73e7f315e
-  data.tar.gz: fb7a296bb6d167ec80ff110671b7dca107f510bd2e81c9ea2104f687595b10972a9d9fa7a8b9b9e45b4d1f8b6c6b8c0d2624c7e70f7e4d87827644e9a5fe88ad
+  metadata.gz: b26374f517b2c486fd6780a66f05357689990026dab52e88c8f8b9a1aec881653a4f23f915bf5e6944c83ae8fe943046ae42047382c3968a5b1cca11204f5a53
+  data.tar.gz: 35502f72cf8aa2f3f19848d4fe9326994f8af544531e71da3dabf61215329c164404cfd5d7fab6e72da66f43ae851272ceaf6a1d9fbf6a72fdf15552d6dcd4e6

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

@@ -32,6 +32,22 @@ module Asciidoctor
         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|
@@ -117,10 +133,10 @@ 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", 
+        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", 
+        doc_converter(node)&.convert(@filename + ".presentation.xml", 
                                     nil, false, "#{@filename}.doc")
         pdf_converter(node)&.convert(@filename + ".presentation.xml", 
                                      nil, false, "#{@filename}.pdf")
@@ -141,6 +157,7 @@ module Asciidoctor
 
       def bibdata_validate(doc)
         stage_validate(doc)
+        committee_validate(doc)
       end
 
       def stage_validate(xmldoc)
@@ -151,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|
@@ -187,6 +213,14 @@ 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
     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

@@ -64,6 +64,11 @@
             </choice>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="droploc">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
         <text/>
       </element>
     </define>
@@ -859,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"/>
@@ -880,7 +892,7 @@
       <oneOrMore>
         <choice>
           <ref name="content"/>
-          <ref name="preface_abstract"/>
+          <ref name="abstract"/>
           <ref name="foreword"/>
           <ref name="introduction"/>
           <ref name="acknowledgements"/>
@@ -1481,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>

data/lib/isodoc/generic/base_convert.rb

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

data/lib/isodoc/generic/html_convert.rb

@@ -24,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
@@ -35,20 +39,23 @@ 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

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,6 @@
 require "isodoc"
 require_relative "init"
+require_relative "utils"
 
 module IsoDoc
   module Generic
@@ -23,6 +24,7 @@ module IsoDoc
         k._file = caller_locations.first.absolute_path
       end
 
+=begin
        def baselocation(loc)
         return nil if loc.nil?
         File.expand_path(File.join(File.dirname(
@@ -34,6 +36,7 @@ module IsoDoc
       def configuration
         Metanorma::Generic.configuration
       end
+=end
 
       def author(isoxml, _out)
         super
@@ -57,6 +60,8 @@ module IsoDoc
           set(e.to_sym, b)
         end
       end
+
+      include Utils
     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

@@ -23,10 +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
@@ -34,24 +38,27 @@ 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

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.6.3"
+    VERSION = "1.7.0"
   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.3
+  version: 1.7.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-11 00:00:00.000000000 Z
+date: 2020-09-26 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
@@ -253,10 +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