metanorma-generic 1.4.7 → 1.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9110146825a604b3cd6e40ae2f33ace4f1d6a1969ddc9ca478b9001b06ee3a1
-  data.tar.gz: d958195686063ea45a0db177d1e854b406561412d3ba5473a97c56afd5c55ee0
+  metadata.gz: d23b72d227c475a3df05f0bb00d1cbcdc85a92e2bfbdf7f9cf25a936ae6438d5
+  data.tar.gz: 87bc5f53bbb881b078906165aed5dc420ff916c9a7111610c24ff9f0ce343fb8
 SHA512:
-  metadata.gz: 4559ae6f318844ad9a9ce03ca66a12bddbfaf951ba33fdc1762c5eb1db66c6c6e2d75ea5063d44cc653c77d50175636237618d97b67d1b37e6de097c9214fd69
-  data.tar.gz: e35ef1be4f2145df3436a97ad4b58221c99e03ecfb73018a3f6c7a342937f25822a2b2e647afb9437086fee317a79a440ef8f32c369dd10d68586e950dac5878
+  metadata.gz: 0c04db2c93abe52d82d17d19d726124d108a58f591c78d83ccfd93ef88739fbd15789ecaeffedc7e22ca8958e25cc19bb4f53c1fe38602047fe1b61275cefd58
+  data.tar.gz: 3899c5b73b13a660c446f057ac2224dba81474788983d86a4994bfe32a6c31719e494a083e446c5f90396249100f2f9df161c309ecac68f82939cbb15e97ef7a

data/lib/asciidoctor/generic/converter.rb

@@ -31,7 +31,7 @@ module Asciidoctor
         xml.contributor do |c|
           c.role **{ type: "author" }
           c.organization do |a|
-            a.name configuration.organization_name_short
+            a.name configuration.organization_name_long
           end
         end
         personal_author(node, xml)
@@ -41,7 +41,7 @@ module Asciidoctor
         xml.contributor do |c|
           c.role **{ type: "publisher" }
           c.organization do |a|
-            a.name configuration.organization_name_short
+            a.name configuration.organization_name_long
           end
         end
       end
@@ -60,6 +60,15 @@ module Asciidoctor
         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 }}"
@@ -69,7 +78,8 @@ module Asciidoctor
       end
 
       def metadata_id(node, xml)
-        xml.docidentifier do |i|
+        xml.docidentifier **{ type:
+                              configuration.organization_name_short } do |i|
           i << "DUMMY"
         end
         xml.docnumber { |i| i << node.attr("docnumber") }
@@ -81,7 +91,7 @@ module Asciidoctor
           c.from from
           c.owner do |owner|
             owner.organization do |o|
-              o.name configuration.organization_name_short
+              o.name configuration.organization_name_long
             end
           end
         end
@@ -94,31 +104,15 @@ module Asciidoctor
         end
       end
 
-=begin
-      def makexml(node)
-        #root_tag = configuration.xml_root_tag || XML_ROOT_TAG
-        root_tag = XML_ROOT_TAG
-        result = ["<?xml version='1.0' encoding='UTF-8'?>\n<#{root_tag}>"]
-        @draft = node.attributes.has_key?("draft")
-        result << noko { |ixml| front node, ixml }
-        result << noko { |ixml| middle node, ixml }
-        result << "</#{root_tag}>"
-        result = textcleanup(result)
-        ret1 = cleanup(Nokogiri::XML(result))
-        validate(ret1) unless @novalid
-        ret1.root.add_namespace(nil, configuration.document_namespace ||
-                                XML_NAMESPACE)
-        ret1
-      end
-=end
-
       def doctype(node)
         d = node.attr("doctype")
-        unless %w{policy-and-procedures best-practices supporting-document
-          report legal directives proposal standard}.include? d
+        configuration.doctypes or return d == "article" ? "standard" : d
+        default = configuration.default_doctype || Array(configuration.doctypes).dig(0) ||
+          "standard"
+        unless Array(configuration.doctypes).include? d
           @log.add("Document Attributes", nil,
-                   "#{d} is not a legal document type: reverting to 'standard'")
-          d = "standard"
+                   "#{d} is not a legal document type: reverting to '#{default}'")
+          d = default
         end
         d
       end
@@ -128,6 +122,20 @@ module Asciidoctor
           set_default_values_from_yaml_file(path_to_config_file)
       end
 
+      def sectiontype_streamline(ret)
+        if configuration.termsdefs_titles.map(&:downcase).include? (ret)
+          "terms and definitions"
+        elsif configuration.symbols_titles.map(&:downcase).include? (ret)
+          "symbols and abbreviated terms"
+        elsif configuration.normref_titles.map(&:downcase).include? (ret)
+          "normative references"
+        elsif configuration.bibliography_titles.map(&:downcase).include? (ret)
+          "bibliography"
+        else
+          ret
+        end
+      end
+
       def document(node)
         read_config_file(node.attr("customize")) if node.attr("customize")
         init(node)
@@ -153,6 +161,23 @@ module Asciidoctor
                         File.join(File.dirname(__FILE__), "generic.rng"))
       end
 
+      def content_validate(doc)
+        super
+        bibdata_validate(doc.root)
+      end
+
+      def bibdata_validate(doc)
+        stage_validate(doc)
+      end
+
+      def stage_validate(xmldoc)
+        stages = configuration&.stage_abbreviations&.keys || return
+        stages.empty? and return
+        stage = xmldoc&.at("//bibdata/status/stage")&.text
+        stages.include? stage or
+          @log.add("Document Attributes", nil, "#{stage} is not a recognised status")
+      end
+
       def sections_cleanup(x)
         super
         x.xpath("//*[@inline-header]").each do |h|

data/lib/asciidoctor/generic/isodoc.rng

@@ -129,6 +129,9 @@
             </choice>
           </attribute>
         </optional>
+        <attribute name="normative">
+          <data type="boolean"/>
+        </attribute>
         <optional>
           <ref name="section-title"/>
         </optional>
@@ -303,11 +306,11 @@
         <ref name="paragraph"/>
       </element>
     </define>
-    <define name="TextElement" combine="choice">
-      <ref name="concept"/>
-    </define>
   </include>
   <!-- end overrides -->
+  <define name="TextElement" combine="choice">
+    <ref name="concept"/>
+  </define>
   <define name="concept">
     <element name="concept">
       <optional>

data/lib/isodoc/generic/html_convert.rb

@@ -50,10 +50,8 @@ module IsoDoc
       end
 
       def googlefonts
-        <<~HEAD.freeze
-    <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,300i,400,400i,600,600i|Space+Mono:400,700" rel="stylesheet">
-    <link href="https://fonts.googleapis.com/css?family=Overpass:300,300i,600,900" rel="stylesheet">
-        HEAD
+        return unless configuration.webfont
+        Array(configuration.webfont).map { |x| %{<link href="#{x.gsub(/\&amp;/, '&')}" rel="stylesheet">} }.join("\n")
       end
 
       include BaseConvert

data/lib/isodoc/generic/metadata.rb

@@ -9,6 +9,9 @@ module IsoDoc
         here = File.dirname(__FILE__)
         default_logo_path = File.expand_path(File.join(here, "html", "logo.jpg"))
         set(:logo, baselocation(configuration.logo_path) || default_logo_path)
+        unless configuration.logo_paths.nil?
+          set(:logo_paths, Array(configuration.logo_paths).map { |p| baselocation(p) })
+        end
       end
 
       class << self

data/lib/metanorma/generic.rb

@@ -14,10 +14,14 @@ module Metanorma
       CONFIG_ATTRS = %i[
         organization_name_short
         organization_name_long
+        bibliography_titles
         document_namespace
         docid_template
+        doctypes
+        default_doctype
         i18nyaml
         logo_path
+        logo_paths
         header
         htmlcoverpage
         htmlintropage
@@ -26,12 +30,18 @@ module Metanorma
         html_headerfont
         html_monospacefont
         metadata_extensions
+        metanorma_name
+        normref_titles
         published_stages
+        default_stage
         stage_abbreviations
         scripts
         scripts_pdf
         standardstylesheet
+        symbols_titles
+        termsdefs_titles
         validate_rng_file
+        webfont
         wordcoverpage
         wordintropage
         wordstylesheet
@@ -59,6 +69,15 @@ module Metanorma
         self.organization_name_short ||= ORGANIZATION_NAME_SHORT
         self.organization_name_long ||= ORGANIZATION_NAME_LONG
         self.document_namespace ||= DOCUMENT_NAMESPACE
+        self.termsdefs_titles ||= 
+          ["Terms and definitions", "Terms, definitions, symbols and abbreviated terms",
+           "Terms, definitions, symbols and abbreviations", "Terms, definitions and symbols",
+           "Terms, definitions and abbreviations", "Terms, definitions and abbreviated terms"]
+        self.symbols_titles ||=
+          ["Symbols and abbreviated terms", "Symbols", "Abbreviated terms", "Abbreviations"]
+        self.normref_titles ||=
+          ["Normative references"]
+        self.bibliography_titles ||= ["Bibliography"]
       end
 
       def set_default_values_from_yaml_file(config_file)

data/lib/metanorma/generic/processor.rb

@@ -3,10 +3,14 @@ require "metanorma/processor"
 module Metanorma
   module Generic
     class Processor < Metanorma::Processor
+      def configuration
+        Metanorma::Generic.configuration
+      end
+
       def initialize
-        @short = :generic
+        @short = configuration&.metanorma_name&.to_sym || :generic
         @input_format = :asciidoc
-        @asciidoctor_backend = :generic
+        @asciidoctor_backend = configuration&.metanorma_name&.to_sym || :generic
       end
 
       def output_formats

data/lib/metanorma/generic/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Generic
-    VERSION = "1.4.7"
+    VERSION = "1.4.8"
   end
 end

data/metanorma.yml.example

@@ -1,12 +1,19 @@
+metanorma_name: generic
 organization_name_short: My Organization
 organization_name_long: My Organization name
 document_namespace: https://open.ribose.com/standards/mine
 xml_root_tag: 'mine-standard'
 logo_path: /metanorma-mine/lib/isodoc/mine/html/logo.jpg
+logo_paths: 
+  - /metanorma-mine/lib/isodoc/mine/html/logo1.jpg
+  - /metanorma-mine/lib/isodoc/mine/html/logo2.jpg
 validate_rng_file: /metanorma-mine/lib/asciidoctor/mine/mine.rng
 htmlcoverpage: /metanorma-mine/lib/isodoc/mine/html/html_mine_titlepage.html
 htmlintropage: /metanorma-mine/lib/isodoc/mine/html/html_mine_intro.html
 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'
 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/
@@ -14,8 +21,41 @@ header: /metanorma-mine/lib/isodoc/mine/html/header.html
 wordcoverpage: /metanorma-mine/lib/isodoc/mine/html/word_mine_titlepage.html
 wordintropage: /metanorma-mine/lib/isodoc/mine/html/word_mine_intro.html
 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'
 docid_template: "{{ organization_name_short }} {{ docnumeric }}"
 metadata_extensions:
   - security
 published_stages:
   - published
+stage_abbreviations:
+  draft-proposal:
+  draft-development:
+  draft-testing:
+  draft-implementation:
+  in-force:
+  retired:
+metadata_extensions:
+ - security
+ - recipient
+doctypes:
+ - standard
+ - recommendation
+default_doctype: standard
+termsdefs_titles:
+  - Terms and definitions
+  - Terms, definitions, symbols and abbreviated terms
+  - Terms, definitions, symbols and abbreviations
+  - Terms, definitions and symbls
+  - Terms, definitions and abbreviations
+  - Terms, definitions and abbreviated terms
+symbols_titles:
+  - Symbols and abbreviated terms
+  - Symbols
+  - Abbreviated terms
+  - Abbreviations
+normref_titles:
+  - Normative references
+bibliography_titles
+  - Bibliography

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-generic
 version: !ruby/object:Gem::Version
-  version: 1.4.7
+  version: 1.4.8
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-01 00:00:00.000000000 Z
+date: 2020-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities