metanorma-generic 1.9.0 → 1.10.3

data/lib/asciidoctor/generic/reqt.rng

@@ -64,9 +64,9 @@
     <optional>
       <ref name="label"/>
     </optional>
-    <optional>
+    <zeroOrMore>
       <ref name="subject"/>
-    </optional>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="reqinherit"/>
     </zeroOrMore>
@@ -80,6 +80,7 @@
         <ref name="verification"/>
         <ref name="import"/>
         <ref name="description"/>
+        <ref name="component"/>
       </choice>
     </zeroOrMore>
     <optional>
@@ -105,12 +106,16 @@
   </define>
   <define name="subject">
     <element name="subject">
-      <text/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="reqinherit">
     <element name="inherit">
-      <text/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="measurementtarget">
@@ -138,6 +143,12 @@
       <ref name="RequirementSubpart"/>
     </element>
   </define>
+  <define name="component">
+    <element name="component">
+      <attribute name="class"/>
+      <ref name="RequirementSubpart"/>
+    </element>
+  </define>
   <define name="reqt_references">
     <element name="references">
       <oneOrMore>

data/lib/isodoc/generic.rb

@@ -1,6 +1,5 @@
 require "isodoc/generic/metadata"
 require "isodoc/generic/html_convert"
-require "isodoc/generic/pdf_convert"
 require "isodoc/generic/word_convert"
 require "isodoc/generic/presentation_xml_convert"
 

data/lib/isodoc/generic/html_convert.rb

@@ -48,8 +48,7 @@ module IsoDoc
           html_doc_path("html_generic_titlepage.html"),
           htmlintropage: baselocation(configuration.htmlintropage) ||
           html_doc_path("html_generic_intro.html"),
-          scripts: baselocation(configuration.scripts) ||
-          html_doc_path("scripts.html"),
+          scripts: baselocation(configuration.scripts),
           i18nyaml: (configuration.i18nyaml.is_a?(String) ? 
                      baselocation(configuration.i18nyaml) : nil)
         }.transform_values { |v| v&.empty? ? nil : v }

data/lib/isodoc/generic/metadata.rb

@@ -4,20 +4,20 @@ require_relative "init"
 require_relative "utils"
 
 class Nokogiri::XML::Node
-  TYPENAMES = {1=>'element',2=>'attribute',3=>'text',4=>'cdata',8=>'comment'}
+  TYPENAMES = { 1 => "element", 2 => "attribute", 3 => "text",
+                4 => "cdata", 8 => "comment" }.freeze
   def to_hash
-    ret = {kind:TYPENAMES[node_type],name:name}.tap do |h|
-      h.merge! text:text&.strip 
+    { kind: TYPENAMES[node_type], name: name }.tap do |h|
+      h[:text] = text&.strip
       a = attribute_nodes.map(&:to_hash)
       if element? && !a.empty?
-        h.merge! attr: a.inject({}) { |m, v| m[v[:name]] = v[:text]; m }
+        h[:attr] = a.inject({}) { |m, v| m[v[:name]] = v[:text]; m }
       end
       c = children.map(&:to_hash)
       if element? && !(c&.size == 1 && c[0][:kind] == "text")
         h.merge! kids: c.delete_if { |n| n[:kind] == "text" && n[:text].empty? }
       end
     end
-    ret
   end
 end
 
@@ -27,15 +27,16 @@ end
 
 module IsoDoc
   module Generic
-
     class Metadata < IsoDoc::Metadata
       def initialize(lang, script, labels)
         super
         here = File.dirname(__FILE__)
-        default_logo_path = File.expand_path(File.join(here, "html", "logo.jpg"))
+        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) })
+          set(:logo_paths,
+              Array(configuration.logo_paths).map { |p| baselocation(p) })
         end
       end
 
@@ -43,8 +44,8 @@ module IsoDoc
         attr_accessor :_file
       end
 
-      def self.inherited( k )
-        k._file = caller_locations.first.absolute_path
+      def self.inherited(klass) # rubocop:disable Lint/MissingSuper
+        klass._file = caller_locations(1..1).first.absolute_path
       end
 
       def author(isoxml, _out)
@@ -55,6 +56,7 @@ module IsoDoc
 
       def stage_abbr(status)
         return super unless configuration.stage_abbreviations
+
         Hash(configuration.stage_abbreviations).dig(status)
       end
 
@@ -65,32 +67,35 @@ module IsoDoc
 
       def doctype(isoxml, _out)
         super
-        b = isoxml&.at(ns("//bibdata/ext/doctype#{currlang}")) || 
+        b = isoxml&.at(ns("//bibdata/ext/doctype#{currlang}")) ||
           isoxml&.at(ns("//bibdata/ext/doctype#{NOLANG}")) || return
         a = b["abbreviation"] and set(:doctype_abbr, a)
       end
 
-      def xmlhash2hash(h)
+      def xmlhash2hash(hash)
         ret = {}
-        return ret if h.nil? || h[:kind] != "element"
-        h[:attr].nil? or h[:attr].each { |k, v| ret["#{h[:name]}_#{k}"] = v }
-        ret[h[:name]] = h[:kids] ? xmlhash2hash_kids(h) : h[:text]
+        return ret if hash.nil? || hash[:kind] != "element"
+
+        hash[:attr].nil? or
+          hash[:attr].each { |k, v| ret["#{hash[:name]}_#{k}"] = v }
+        ret[hash[:name]] = hash[:kids] ? xmlhash2hash_kids(hash) : hash[:text]
         ret
       end
 
-      def xmlhash2hash_kids(h)
+      def xmlhash2hash_kids(hash)
         c = {}
-        h[:kids].each do |n|
+        hash[:kids].each do |n|
           xmlhash2hash(n).each do |k1, v1|
-            c[k1] = c[k1].nil? ? v1 :
-              c[k1].is_a?(Array) ? c[k1] << v1 :
-              [c[k1], v1]
+            c[k1] = if c[k1].nil? then v1
+                    elsif c[k1].is_a?(Array) then c[k1] << v1
+                    else [c[k1], v1]
+                    end
           end
         end
         c
       end
 
-      def ext(isoxml, out)
+      def ext(isoxml, _out)
         b = isoxml&.at(ns("//bibdata/ext")) or return
         set(:metadata_extensions, xmlhash2hash(b.to_hash)["ext"])
       end

data/lib/metanorma/generic/processor.rb

@@ -17,7 +17,6 @@ module Metanorma
         super.merge(
           html: "html",
           doc: "doc",
-          pdf: "pdf"
         )
       end
 
@@ -27,31 +26,15 @@ module Metanorma
 
       def extract_options(file)
         head = file.sub(/\n\n.*$/m, "\n")
-        /\n:htmlstylesheet: (?<htmlstylesheet>[^\n]+)\n/ =~ head
-        /\n:htmlcoverpage: (?<htmlcoverpage>[^\n]+)\n/ =~ head
-        /\n:htmlintropage: (?<htmlintropage>[^\n]+)\n/ =~ head
-        /\n:scripts: (?<scripts>[^\n]+)\n/ =~ head
-        /\n:wordstylesheet: (?<wordstylesheet>[^\n]+)\n/ =~ head
-        /\n:standardstylesheet: (?<standardstylesheet>[^\n]+)\n/ =~ head
-        /\n:header: (?<header>[^\n]+)\n/ =~ head
-        /\n:wordcoverpage: (?<wordcoverpage>[^\n]+)\n/ =~ head
-        /\n:wordintropage: (?<wordintropage>[^\n]+)\n/ =~ head
-        /\n:ulstyle: (?<ulstyle>[^\n]+)\n/ =~ head
-        /\n:olstyle: (?<olstyle>[^\n]+)\n/ =~ head
-        new_options = {
-          htmlstylesheet: defined?(htmlstylesheet) ? htmlstylesheet : nil,
-          htmlcoverpage: defined?(htmlcoverpage) ? htmlcoverpage : nil,
-          htmlintropage: defined?(htmlintropage) ? htmlintropage : nil,
-          scripts: defined?(scripts) ? scripts : nil,
-          wordstylesheet: defined?(wordstylesheet) ? wordstylesheet : nil,
-          standardstylesheet: defined?(standardstylesheet) ? standardstylesheet : nil,
-          header: defined?(header) ? header : nil,
-          wordcoverpage: defined?(wordcoverpage) ? wordcoverpage : nil,
-          wordintropage: defined?(wordintropage) ? wordintropage : nil,
-          ulstyle: defined?(ulstyle) ? ulstyle : nil,
-          olstyle: defined?(olstyle) ? olstyle : nil,
-        }.reject { |_, val| val.nil? }
-        super.merge(new_options)
+        ret = %w(htmlstylesheet htmlcoverpage htmlintropage scripts scripts-pdf
+                 wordstylesheet standardstylesheet header wordcoverpage
+                 wordintropage datauriimage htmltoclevels doctoclevels
+                 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]
+        end
+        super.merge(ret)
       end
 
       def output(isodoc_node, inname, outname, format, options={})
@@ -60,8 +43,6 @@ module Metanorma
           IsoDoc::Generic::HtmlConvert.new(options).convert(inname, isodoc_node, nil, outname)
         when :doc
           IsoDoc::Generic::WordConvert.new(options).convert(inname, isodoc_node, nil, outname)
-        when :pdf
-          IsoDoc::Generic::PdfConvert.new(options).convert(inname, isodoc_node, nil, outname)
         when :presentation
           IsoDoc::Generic::PresentationXMLConvert.new(options).convert(inname, isodoc_node, nil, outname)
         else

data/lib/metanorma/generic/version.rb

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

data/metanorma-generic.gemspec

@@ -1,4 +1,4 @@
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "metanorma/generic/version"
 
@@ -10,9 +10,9 @@ Gem::Specification.new do |spec|
 
   spec.summary       = "Metanorma template gem for customisation."
   spec.description   = <<~DESCRIPTION
-    Metanorma template gem for customisation. This gem is meant to be customised for any downstream use.
-    
-    Formerly known as metanorma-acme
+        Metanorma template gem for customisation. This gem is meant to be customised for any downstream use.
+    #{'    '}
+        Formerly known as metanorma-acme
   DESCRIPTION
 
   spec.homepage      = "https://github.com/metanorma/metanorma-generic"
@@ -24,21 +24,21 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
   spec.add_dependency "htmlentities", "~> 4.3.4"
+  spec.add_dependency "isodoc", "~> 1.7.0"
+  spec.add_dependency "metanorma-standoc", "~> 1.10.0"
   spec.add_dependency "ruby-jing"
-  spec.add_dependency "metanorma-standoc", "~> 1.8.0"
-  spec.add_dependency "isodoc", "~> 1.5.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"
-  spec.add_development_dependency "rake", "~> 12.0"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.6"
-  spec.add_development_dependency "rubocop", "= 0.54.0"
+  spec.add_development_dependency "rubocop", "~> 1.5.2"
+  spec.add_development_dependency "sassc", "2.4.0"
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-generic
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.10.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-25 00:00:00.000000000 Z
+date: 2021-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -25,47 +25,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 4.3.4
 - !ruby/object:Gem::Dependency
-  name: ruby-jing
+  name: isodoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.10.0
 - !ruby/object:Gem::Dependency
-  name: isodoc
+  name: ruby-jing
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -80,20 +80,6 @@ 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
@@ -142,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -166,18 +152,32 @@ dependencies:
         version: '3.6'
 - !ruby/object:Gem::Dependency
   name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.5.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.5.2
+- !ruby/object:Gem::Dependency
+  name: sassc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.54.0
+        version: 2.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.54.0
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -206,10 +206,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
-description: |
-  Metanorma template gem for customisation. This gem is meant to be customised for any downstream use.
-
-  Formerly known as metanorma-acme
+description: "    Metanorma template gem for customisation. This gem is meant to be
+  customised for any downstream use.\n    \n    Formerly known as metanorma-acme\n"
 email:
 - open.source@ribose.com
 executables: []
@@ -219,8 +217,6 @@ files:
 - ".github/workflows/rake.yml"
 - ".gitignore"
 - ".hound.yml"
-- ".rubocop.ribose.yml"
-- ".rubocop.tb.yml"
 - ".rubocop.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -255,7 +251,6 @@ files:
 - 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
@@ -279,14 +274,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Metanorma template gem for customisation.