metanorma-generic 2.5.2 → 2.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ae108f4701db136c4b8c73c5e81655a98e2ec1c2e4e4a6134ed5d103232cf2d
-  data.tar.gz: 4cecf0d0e8c47f9b8f7d8b2e494325bff3687e6bd5b1a912d86ea5106f6edc92
+  metadata.gz: 68a961c4f291ecd308456bcf433c026cc1909ab6d6efd1f6c04ffff4f69b1ba6
+  data.tar.gz: b9cc680b965b92562494e2c537473376e60938a584f3e2e27fe411b458f4c6d3
 SHA512:
-  metadata.gz: 751eb003debf5e833a7cbe8a2f49971a0a265fa14022434db3694deaeecc59212e8976788db5132d771a4efa166260e6b854426697425d41d9c0474fa3e5b5e7
-  data.tar.gz: d1a17c671c431bfdd48bd599c5b8196fcca13b86e63654cb060f09cbcd70aa41656a55c5a2d246e1473328ede8aa1704206432e13d81b9d137572cbf11b5afc6
+  metadata.gz: 44bdcd0e2a650b2918195dc98edb289f530f107780196efc1a90c1a2ca089f1ce1f92cdb98efd1bb6a6314819dd36218118733b28090aed247a7160d3ec6eaa3
+  data.tar.gz: b945d5c97a7390143e19331640074f5c8933a8b31b66ac46bd2b15d96af18fda9c936220b88787685685e1d599f6529bea14a8b0fb514d734122ed8ffb7c50b5

data/lib/asciidoctor/generic/deprecated.rb

@@ -1,5 +1,7 @@
-warn "Please replace your references to Asciidoctor::Generic with Metanorma::Generic and your instances of require 'asciidoctor/generic' with require 'metanorma/generic'"
+warn <<~WARN
+  Please replace your references to Asciidoctor::Generic with Metanorma::Generic and your instances of require 'asciidoctor/generic' with require 'metanorma/generic'
+WARN
 
-exit 127 if ENV['METANORMA_DEPRECATION_FAIL']
+exit 127 if ENV["METANORMA_DEPRECATION_FAIL"]
 
 Asciidoctor::Generic = Metanorma::Generic unless defined? Asciidoctor::Generic

data/lib/asciidoctor/generic/front.rb

@@ -1,3 +1,2 @@
 require "asciidoctor/generic/deprecated"
 require "metanorma/generic/front"
-

data/lib/isodoc/generic.rb

@@ -5,6 +5,5 @@ require "isodoc/generic/presentation_xml_convert"
 
 module IsoDoc
   module Generic
-
   end
 end

data/lib/metanorma/generic/basicdoc.rng

@@ -346,6 +346,8 @@
           <ref name="keyword"/>
           <ref name="xref"/>
           <ref name="hyperlink"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
         </choice>
       </oneOrMore>
     </element>
@@ -623,6 +625,8 @@
           <ref name="eref"/>
           <ref name="xref"/>
           <ref name="hyperlink"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
         </choice>
       </zeroOrMore>
     </element>
@@ -636,6 +640,8 @@
           <ref name="eref"/>
           <ref name="xref"/>
           <ref name="hyperlink"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
         </choice>
       </zeroOrMore>
     </element>
@@ -648,6 +654,8 @@
           <ref name="eref"/>
           <ref name="xref"/>
           <ref name="hyperlink"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
         </choice>
       </zeroOrMore>
     </element>
@@ -655,7 +663,11 @@
   <define name="keyword">
     <element name="keyword">
       <zeroOrMore>
-        <ref name="PureTextElement"/>
+        <choice>
+          <ref name="PureTextElement"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
+        </choice>
       </zeroOrMore>
     </element>
   </define>
@@ -676,7 +688,11 @@
   <define name="strike">
     <element name="strike">
       <zeroOrMore>
-        <ref name="PureTextElement"/>
+        <choice>
+          <ref name="PureTextElement"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
+        </choice>
       </zeroOrMore>
     </element>
   </define>
@@ -898,44 +914,47 @@
   -->
   <define name="image">
     <element name="image">
-      <attribute name="id">
-        <data type="ID"/>
+      <ref name="Image"/>
+    </element>
+  </define>
+  <define name="Image">
+    <attribute name="id">
+      <data type="ID"/>
+    </attribute>
+    <attribute name="src">
+      <data type="anyURI"/>
+    </attribute>
+    <attribute name="mimetype"/>
+    <optional>
+      <attribute name="filename"/>
+    </optional>
+    <optional>
+      <attribute name="width">
+        <choice>
+          <data type="int"/>
+          <value>auto</value>
+        </choice>
       </attribute>
-      <attribute name="src">
+    </optional>
+    <optional>
+      <attribute name="height">
+        <choice>
+          <data type="int"/>
+          <value>auto</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="alt"/>
+    </optional>
+    <optional>
+      <attribute name="title"/>
+    </optional>
+    <optional>
+      <attribute name="longdesc">
         <data type="anyURI"/>
       </attribute>
-      <attribute name="mimetype"/>
-      <optional>
-        <attribute name="filename"/>
-      </optional>
-      <optional>
-        <attribute name="width">
-          <choice>
-            <data type="int"/>
-            <value>auto</value>
-          </choice>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="height">
-          <choice>
-            <data type="int"/>
-            <value>auto</value>
-          </choice>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="alt"/>
-      </optional>
-      <optional>
-        <attribute name="title"/>
-      </optional>
-      <optional>
-        <attribute name="longdesc">
-          <data type="anyURI"/>
-        </attribute>
-      </optional>
-    </element>
+    </optional>
   </define>
   <define name="video">
     <element name="video">

data/lib/metanorma/generic/biblio.rng

@@ -348,6 +348,9 @@
       <zeroOrMore>
         <ref name="contact"/>
       </zeroOrMore>
+      <optional>
+        <ref name="logo"/>
+      </optional>
     </element>
   </define>
   <define name="orgname">
@@ -366,6 +369,11 @@
       </choice>
     </element>
   </define>
+  <define name="logo">
+    <element name="logo">
+      <ref name="image"/>
+    </element>
+  </define>
   <define name="NameWithVariants">
     <element name="primary">
       <ref name="LocalizedString"/>
@@ -942,6 +950,7 @@
       <value>obsoleted</value>
       <value>confirmed</value>
       <value>updated</value>
+      <value>corrected</value>
       <value>issued</value>
       <value>transmitted</value>
       <value>copied</value>
@@ -1283,7 +1292,7 @@
       <value>mergedInto</value>
       <value>splits</value>
       <value>splitInto</value>
-      <value>instance</value>
+      <value>instanceOf</value>
       <value>hasInstance</value>
       <value>exemplarOf</value>
       <value>hasExemplar</value>

data/lib/metanorma/generic/converter.rb

@@ -141,7 +141,8 @@ module Metanorma
 
       def presentation_xml_converter(node)
         IsoDoc::Generic::PresentationXMLConvert
-          .new(html_extract_attributes(node))
+          .new(html_extract_attributes(node)
+          .merge(output_formats: ::Metanorma::Generic::Processor.new.output_formats))
       end
 
       alias_method :pdf_converter, :html_converter

data/lib/metanorma/generic/front.rb

@@ -22,8 +22,7 @@ module Metanorma
       end
 
       def metadata_committee(node, xml)
-        return unless node.attr("committee")
-
+        node.attr("committee") or return
         xml.editorialgroup do |a|
           a.committee node.attr("committee"),
                       **attr_code(type: node.attr("committee-type"))
@@ -73,8 +72,7 @@ module Metanorma
 
       def metadata_ext_hash(node, ext, hash)
         hash.each do |k, v|
-          next if EXT_STRUCT.include?(k) || (!v.is_a?(Hash) && !node.attr(k))
-
+          EXT_STRUCT.include?(k) || (!v.is_a?(Hash) && !node.attr(k)) and next
           if v.is_a?(Hash) && v["_list"]
             csv_split(node.attr(k), ",").each do |val|
               metadata_ext_hash1(k, val, ext, v, node)
@@ -86,13 +84,11 @@ module Metanorma
       end
 
       def metadata_ext_hash1(key, value, ext, hash, node)
-        return if hash.is_a?(Hash) && hash["_attribute"]
-
-        is_hash = hash.is_a?(Hash) &&
-          !hash.keys.reject { |n| EXT_STRUCT.include?(n) }.empty?
-        return if !is_hash && (value.nil? || value.empty?)
-
-        name = hash.is_a?(Hash) ? (hash["_output"] || key) : key
+        h = hash.is_a?(Hash)
+        h && hash["_attribute"] and return
+        is_hash = h && !hash.keys.reject { |n| EXT_STRUCT.include?(n) }.empty?
+        !is_hash && (value.nil? || value.empty?) and return
+        name = h ? (hash["_output"] || key) : key
         ext.send name, **attr_code(metadata_ext_attrs(hash, node)) do |e|
           is_hash ? metadata_ext_hash(node, e, hash) : (e << value)
         end

data/lib/metanorma/generic/isodoc.rng

@@ -17,7 +17,7 @@
   these elements; we just want one namespace for any child grammars
   of this.
 -->
-<!-- VERSION v1.2.4 -->
+<!-- VERSION v1.2.8 -->
 <grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <include href="reqt.rng"/>
   <include href="basicdoc.rng">
@@ -485,6 +485,8 @@
           <choice>
             <text/>
             <ref name="callout"/>
+            <ref name="xref"/>
+            <ref name="eref"/>
           </choice>
         </oneOrMore>
         <zeroOrMore>
@@ -865,6 +867,7 @@
             <ref name="PureTextElement"/>
             <ref name="stem"/>
             <ref name="index"/>
+            <ref name="index-xref"/>
             <ref name="eref"/>
             <ref name="erefstack"/>
             <ref name="xref"/>
@@ -880,6 +883,7 @@
             <ref name="PureTextElement"/>
             <ref name="stem"/>
             <ref name="index"/>
+            <ref name="index-xref"/>
             <ref name="eref"/>
             <ref name="erefstack"/>
             <ref name="xref"/>
@@ -894,6 +898,7 @@
           <choice>
             <ref name="PureTextElement"/>
             <ref name="index"/>
+            <ref name="index-xref"/>
             <ref name="eref"/>
             <ref name="erefstack"/>
             <ref name="xref"/>
@@ -908,6 +913,7 @@
           <choice>
             <ref name="PureTextElement"/>
             <ref name="index"/>
+            <ref name="index-xref"/>
           </choice>
         </zeroOrMore>
       </element>
@@ -918,6 +924,7 @@
           <choice>
             <ref name="PureTextElement"/>
             <ref name="index"/>
+            <ref name="index-xref"/>
           </choice>
         </zeroOrMore>
       </element>
@@ -928,6 +935,7 @@
           <choice>
             <ref name="PureTextElement"/>
             <ref name="index"/>
+            <ref name="index-xref"/>
           </choice>
         </zeroOrMore>
       </element>
@@ -938,6 +946,7 @@
           <choice>
             <ref name="PureTextElement"/>
             <ref name="index"/>
+            <ref name="index-xref"/>
           </choice>
         </zeroOrMore>
       </element>
@@ -1004,6 +1013,14 @@
       </oneOrMore>
     </element>
   </define>
+  <define name="BasicBlock" combine="choice">
+    <ref name="columnbreak"/>
+  </define>
+  <define name="columnbreak">
+    <element name="columnbreak">
+      <empty/>
+    </element>
+  </define>
   <define name="MultilingualRenderingType">
     <choice>
       <value>common</value>
@@ -1037,6 +1054,17 @@
       <ref name="date_inline"/>
     </choice>
   </define>
+  <define name="PureTextElement" combine="choice">
+    <ref name="passthrough_inline"/>
+  </define>
+  <define name="passthrough_inline">
+    <element name="passthrough">
+      <optional>
+        <attribute name="formats"/>
+      </optional>
+      <text/>
+    </element>
+  </define>
   <define name="add">
     <element name="add">
       <choice>
@@ -1047,6 +1075,8 @@
         <ref name="keyword"/>
         <ref name="xref"/>
         <ref name="hyperlink"/>
+        <ref name="index"/>
+        <ref name="index-xref"/>
       </choice>
     </element>
   </define>
@@ -1060,6 +1090,8 @@
         <ref name="keyword"/>
         <ref name="xref"/>
         <ref name="hyperlink"/>
+        <ref name="index"/>
+        <ref name="index-xref"/>
       </choice>
     </element>
   </define>
@@ -1071,6 +1103,9 @@
       <optional>
         <attribute name="style"/>
       </optional>
+      <optional>
+        <attribute name="custom-charset"/>
+      </optional>
       <oneOrMore>
         <ref name="TextElement"/>
       </oneOrMore>
@@ -1126,6 +1161,8 @@
             <choice>
               <ref name="PureTextElement"/>
               <ref name="stem"/>
+              <ref name="index"/>
+              <ref name="index-xref"/>
             </choice>
           </zeroOrMore>
         </element>
@@ -1136,6 +1173,8 @@
             <choice>
               <ref name="PureTextElement"/>
               <ref name="stem"/>
+              <ref name="index"/>
+              <ref name="index-xref"/>
             </choice>
           </zeroOrMore>
         </element>
@@ -1369,6 +1408,9 @@
       <optional>
         <attribute name="number"/>
       </optional>
+      <optional>
+        <attribute name="branch-number"/>
+      </optional>
       <optional>
         <attribute name="obligation">
           <choice>
@@ -1592,6 +1634,9 @@
     <optional>
       <attribute name="number"/>
     </optional>
+    <optional>
+      <attribute name="branch-number"/>
+    </optional>
     <optional>
       <attribute name="type"/>
     </optional>
@@ -1643,6 +1688,9 @@
     <optional>
       <attribute name="number"/>
     </optional>
+    <optional>
+      <attribute name="branch-number"/>
+    </optional>
     <optional>
       <ref name="section-title"/>
     </optional>
@@ -1740,6 +1788,9 @@
       <optional>
         <attribute name="number"/>
       </optional>
+      <optional>
+        <attribute name="branch-number"/>
+      </optional>
       <optional>
         <attribute name="obligation">
           <choice>

data/lib/metanorma/generic/processor.rb

@@ -7,10 +7,11 @@ module Metanorma
         Metanorma::Generic.configuration
       end
 
-      def initialize
-        @short = configuration&.metanorma_name&.to_sym || :generic
+      def initialize # rubocop:disable Lint/MissingSuper
+        n = configuration&.metanorma_name&.to_sym
+        @short = n || :generic
         @input_format = :asciidoc
-        @asciidoctor_backend = configuration&.metanorma_name&.to_sym || :generic
+        @asciidoctor_backend = n || :generic
       end
 
       def output_formats
@@ -32,22 +33,24 @@ module Metanorma
                  ulstyle olstyle htmlstylesheet-override sectionsplit
                  wordstylesheet-override).each_with_object({}) do |w, acc|
           m = /\n:#{w}: ([^\n]+)\n/.match(head) or next
-          acc[w.sub(/-/, "_").to_sym] = m[1]
+          acc[w.sub("-", "_").to_sym] = m[1]
         end
         super.merge(ret)
       end
 
-      def output(isodoc_node, inname, outname, format, options={})
+      def output(isodoc_node, inname, outname, format, options = {})
+        options_preprocess(options)
         case format
         when :html
-          IsoDoc::Generic::HtmlConvert.new(options).convert(inname, isodoc_node, nil, outname)
+          IsoDoc::Generic::HtmlConvert.new(options)
+            .convert(inname, isodoc_node, nil, outname)
         when :doc
-          IsoDoc::Generic::WordConvert.new(options).convert(inname, isodoc_node, nil, outname)
+          IsoDoc::Generic::WordConvert.new(options)
+            .convert(inname, isodoc_node, nil, outname)
         when :presentation
-          IsoDoc::Generic::PresentationXMLConvert.new(options).convert(inname, isodoc_node, nil, outname)
-        else
-          super
-        end
+          IsoDoc::Generic::PresentationXMLConvert.new(options)
+            .convert(inname, isodoc_node, nil, outname)
+        else super end
       end
     end
   end

data/lib/metanorma/generic/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Generic
-    VERSION = "2.5.2".freeze
+    VERSION = "2.5.3".freeze
   end
 end

data/lib/metanorma/generic.rb

@@ -88,6 +88,10 @@ module Metanorma
         self.organization_name_short ||= ORGANIZATION_NAME_SHORT
         self.organization_name_long ||= ORGANIZATION_NAME_LONG
         self.document_namespace ||= DOCUMENT_NAMESPACE
+        default_titles
+      end
+
+      def default_titles
         self.termsdefs_titles ||=
           ["Terms and definitions", "Terms, definitions, symbols and abbreviated terms",
            "Terms, definitions, symbols and abbreviations", "Terms, definitions and symbols",
@@ -101,23 +105,26 @@ module Metanorma
       end
 
       def set_default_values_from_yaml_file(config_file)
+        root_path, default_config_options =
+          set_default_values_from_yaml_file_prep(config_file)
+        CONFIG_ATTRS.each do |attr_name|
+          value = default_config_options[attr_name.to_s]
+          value && filepath_attrs.include?(attr_name) and
+            value = absolute_path(value, root_path)
+          instance_variable_set("@#{attr_name}", value)
+        end
+      end
+
+      def set_default_values_from_yaml_file_prep(config_file)
         root_path = File.dirname(self.class::_file || __FILE__)
         default_config_options =
           YAML.safe_load(File.read(config_file, encoding: "UTF-8"))
-        if default_config_options["doctypes"].is_a? Array
+        default_config_options["doctypes"].is_a? Array and
           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]
-          if value && filepath_attrs.include?(attr_name)
-            value = absolute_path(value, root_path)
-          end
-
-          instance_variable_set("@#{attr_name}", value)
-        end
+        [root_path, default_config_options]
       end
 
       def blank?(val)
@@ -132,15 +139,13 @@ module Metanorma
           end
         elsif value.is_a?(String) && !value.empty?
           File.join(root_path, "..", "..", value)
-        else
-          value
+        else value
         end
       end
 
       def absolute_path1(hash, pref)
-        hash.reject { |_k, v| blank?(v) }
-          .each_with_object({}) do |(k, v), g|
-          g[k] = absolute_path(v, pref)
+        hash.reject { |_k, v| blank?(v) }.transform_values do |v|
+          absolute_path(v, pref)
         end
       end
     end

data/metanorma-generic.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
   spec.add_dependency "htmlentities", "~> 4.3.4"
-  spec.add_dependency "metanorma-standoc", "~> 2.6.0"
+  spec.add_dependency "metanorma-standoc", "~> 2.6.3"
   spec.add_dependency "ruby-jing"
 
   spec.add_development_dependency "debug"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-generic
 version: !ruby/object:Gem::Version
-  version: 2.5.2
+  version: 2.5.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-09-11 00:00:00.000000000 Z
+date: 2023-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.6.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.6.3
 - !ruby/object:Gem::Dependency
   name: ruby-jing
   requirement: !ruby/object:Gem::Requirement