metanorma-generic 1.10.3 → 1.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25641110b45e76829391dc1a8d7558ed8a57b1c205ed3edd68b7691e13efffa4
-  data.tar.gz: 7370721bedccaca54ee3277d9d03a96af28582c3a787b75900971e812992b4f0
+  metadata.gz: fb399e7d7f6b0b778b49515a23b3c29297e0cf35b84b4da1837230ee014350fd
+  data.tar.gz: 4f8ae09e5df6c3385d7773f5c8a6bd489880d77955112223ce1dfbb073a66547
 SHA512:
-  metadata.gz: 783da8466b07f8e9afc0bb8553e1363b8587a4b5883371b0db5611f53fce39a2ae2dd990c556e65424511bf4241f451d9efc3cddbf75644f9d93760416477aad
-  data.tar.gz: 4dac2a50657d08b05e23e4c3e2ad59c200d9a3413e1ec37077b233a4a6c4b9e3ec31deb25d40f278dfe2e77460fbc21237b1461995da82fed95eae7aa4f02521
+  metadata.gz: 0bfd36e3f4f82b021b0af8c8a318a39de2ee7af2b786f3b927523d209c10a24b49cd39bc5e34e3deb567f4b3428c4067fade47e6b3ebecf38cf4339cecc95b00
+  data.tar.gz: 41e61d3c2c8aa1ac1607bd0902a8ee7c6d784b4d6c354b8d543c763cec589dc9551c4264262430d96cb3a17b49ed133f7391c9256fb82bb88f2376cf3291755c

data/lib/asciidoctor/generic/converter.rb

@@ -19,11 +19,13 @@ module Asciidoctor
         configuration.document_namespace || XML_NAMESPACE
       end
 
-       def baselocation(loc)
+      def baselocation(loc)
         return nil if loc.nil?
+
         return loc
         File.expand_path(File.join(File.dirname(
-          self.class::_file || __FILE__), "..", "..", "..", loc))
+                                     self.class::_file || __FILE__,
+                                   ), "..", "..", "..", loc))
       end
 
       def docidentifier_cleanup(xmldoc)
@@ -36,7 +38,7 @@ module Asciidoctor
 
       def doctype(node)
         d = super
-        configuration.doctypes or return d == "article" ? 
+        configuration.doctypes or return d == "article" ?
           (configuration.default_doctype || "standard") : d
         type = configuration.default_doctype ||
           configuration.doctypes.keys.dig(0) || "standard"
@@ -49,18 +51,18 @@ module Asciidoctor
       end
 
       def read_config_file(path_to_config_file)
-        Metanorma::Generic.configuration.
-          set_default_values_from_yaml_file(path_to_config_file)
+        Metanorma::Generic.configuration
+          .set_default_values_from_yaml_file(path_to_config_file)
       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
@@ -73,15 +75,14 @@ module Asciidoctor
       end
 
       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", 
+        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", 
+        doc_converter(node)&.convert("#{@filename}.presentation.xml",
                                      nil, false, "#{@filename}.doc")
-        pdf_converter(node)&.convert(@filename + ".presentation.xml", 
+        pdf_converter(node)&.convert("#{@filename}.presentation.xml",
                                      nil, false, "#{@filename}.pdf")
-
       end
 
       def validate(doc)
@@ -106,7 +107,8 @@ module Asciidoctor
         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")
+          @log.add("Document Attributes", nil,
+                   "#{stage} is not a recognised status")
       end
 
       def committee_validate(xmldoc)
@@ -114,13 +116,14 @@ module Asciidoctor
         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")
+            @log.add("Document Attributes", nil,
+                     "#{c.text} is not a recognised committee")
         end
       end
 
-      def sections_cleanup(x)
+      def sections_cleanup(xml)
         super
-        x.xpath("//*[@inline-header]").each do |h|
+        xml.xpath("//*[@inline-header]").each do |h|
           h.delete("inline-header")
         end
       end
@@ -132,7 +135,8 @@ module Asciidoctor
       end
 
       def presentation_xml_converter(node)
-        IsoDoc::Generic::PresentationXMLConvert.new(html_extract_attributes(node))
+        IsoDoc::Generic::PresentationXMLConvert
+          .new(html_extract_attributes(node))
       end
 
       alias_method :pdf_converter, :html_converter

data/lib/asciidoctor/generic/isodoc.rng

@@ -170,15 +170,17 @@
             <data type="boolean"/>
           </attribute>
         </optional>
-        <attribute name="type">
-          <choice>
-            <value>roman</value>
-            <value>alphabet</value>
-            <value>arabic</value>
-            <value>roman_upper</value>
-            <value>alphabet_upper</value>
-          </choice>
-        </attribute>
+        <optional>
+          <attribute name="type">
+            <choice>
+              <value>roman</value>
+              <value>alphabet</value>
+              <value>arabic</value>
+              <value>roman_upper</value>
+              <value>alphabet_upper</value>
+            </choice>
+          </attribute>
+        </optional>
         <oneOrMore>
           <ref name="li"/>
         </oneOrMore>
@@ -988,6 +990,16 @@
           <data type="boolean"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="linkmention">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="linkref">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
       <optional>
         <element name="refterm">
           <zeroOrMore>
@@ -1698,7 +1710,9 @@
       <zeroOrMore>
         <ref name="termgrammar"/>
       </zeroOrMore>
-      <ref name="definition"/>
+      <oneOrMore>
+        <ref name="termdefinition"/>
+      </oneOrMore>
       <zeroOrMore>
         <ref name="termnote"/>
       </zeroOrMore>
@@ -1761,7 +1775,7 @@
       </oneOrMore>
     </element>
   </define>
-  <define name="definition">
+  <define name="termdefinition">
     <element name="definition">
       <oneOrMore>
         <choice>
@@ -1770,6 +1784,9 @@
           <ref name="formula"/>
         </choice>
       </oneOrMore>
+      <zeroOrMore>
+        <ref name="termsource"/>
+      </zeroOrMore>
     </element>
   </define>
   <define name="termnote">

data/lib/isodoc/generic/html/htmlstyle.scss

@@ -275,6 +275,14 @@ ul > li:first-child {
   margin-top: 1em;
 }
 
+ul ul > li:first-child {
+      margin-top: 0;
+}
+ol ul > li:first-child {
+      margin-top: 0;
+}
+
+
 #toc-list ul {
   margin-bottom: 0.25em;
 }

data/lib/metanorma/generic/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Generic
-    VERSION = "1.10.3".freeze
+    VERSION = "1.10.4".freeze
   end
 end

data/lib/metanorma/generic.rb

@@ -1,14 +1,14 @@
 require "metanorma/generic/processor"
 require "metanorma/generic/version"
-require 'forwardable'
-require 'yaml'
+require "forwardable"
+require "yaml"
 
 module Metanorma
   module Generic
     ORGANIZATION_NAME_SHORT = "Acme"
     ORGANIZATION_NAME_LONG = "Acme Corp."
     DOCUMENT_NAMESPACE = "https://www.metanorma.org/ns/generic"
-    YAML_CONFIG_FILE = 'metanorma.yml'
+    YAML_CONFIG_FILE = "metanorma.yml"
 
     class Configuration
       CONFIG_ATTRS = %i[
@@ -63,7 +63,7 @@ module Metanorma
       ].freeze
 
       def filepath_attrs
-        return %i[
+        %i[
           i18nyaml
           boilerplate
           logo_path
@@ -88,24 +88,26 @@ module Metanorma
         attr_accessor :_file
       end
 
-      def self.inherited( k )
-        k._file = caller_locations.first.absolute_path
+      def self.inherited(klass)
+        klass._file = caller_locations(1..1).first.absolute_path
       end
 
       def initialize(*args)
         super
         # Try to set config values from yaml file in current directory
-        @yaml = File.join(File.dirname(self.class::_file || __FILE__), "..", "..", YAML_CONFIG_FILE)
+        @yaml = File.join(File.dirname(self.class::_file || __FILE__), "..",
+                          "..", YAML_CONFIG_FILE)
         set_default_values_from_yaml_file(@yaml) if File.file?(@yaml)
         self.organization_name_short ||= ORGANIZATION_NAME_SHORT
         self.organization_name_long ||= ORGANIZATION_NAME_LONG
         self.document_namespace ||= DOCUMENT_NAMESPACE
-        self.termsdefs_titles ||= 
+        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"]
+          ["Symbols and abbreviated terms", "Symbols", "Abbreviated terms",
+           "Abbreviations"]
         self.normref_titles ||=
           ["Normative references"]
         self.bibliography_titles ||= ["Bibliography"]
@@ -114,9 +116,11 @@ module Metanorma
       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 }
+        if default_config_options["doctypes"].is_a? Array
+          default_config_options["doctypes"] =
+            default_config_options["doctypes"].each_with_object({}) do |k, m|
+              m[k] = nil
+            end
         end
         CONFIG_ATTRS.each do |attr_name|
           value = default_config_options[attr_name.to_s]
@@ -128,8 +132,8 @@ module Metanorma
         end
       end
 
-      def blank?(v)
-        v.nil? || v.respond_to?(:empty?) && v.empty?
+      def blank?(val)
+        val.nil? || val.respond_to?(:empty?) && val.empty?
       end
 
       def absolute_path(value, root_path)
@@ -145,14 +149,14 @@ module Metanorma
         end
       end
 
-      def absolute_path1(h, pref)
-        h.reject { |k, v| blank?(v) }.each_with_object({}) do |(k, v), g|
+      def absolute_path1(hash, pref)
+        hash.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
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-generic
 version: !ruby/object:Gem::Version
-  version: 1.10.3
+  version: 1.10.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-20 00:00:00.000000000 Z
+date: 2021-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities