metanorma-generic 1.10.2 → 1.11.1

data/lib/asciidoctor/generic/reqt.rng

@@ -58,15 +58,23 @@
     <optional>
       <attribute name="type"/>
     </optional>
+    <optional>
+      <attribute name="tag"/>
+    </optional>
+    <optional>
+      <attribute name="multilingual-rendering">
+        <ref name="MultilingualRenderingType"/>
+      </attribute>
+    </optional>
     <optional>
       <ref name="reqtitle"/>
     </optional>
     <optional>
       <ref name="label"/>
     </optional>
-    <optional>
+    <zeroOrMore>
       <ref name="subject"/>
-    </optional>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="reqinherit"/>
     </zeroOrMore>
@@ -80,6 +88,7 @@
         <ref name="verification"/>
         <ref name="import"/>
         <ref name="description"/>
+        <ref name="component"/>
       </choice>
     </zeroOrMore>
     <optional>
@@ -100,17 +109,23 @@
   </define>
   <define name="label">
     <element name="label">
-      <text/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
     </element>
   </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 +153,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>
@@ -164,8 +185,19 @@
         <data type="boolean"/>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="tag"/>
+    </optional>
+    <optional>
+      <attribute name="multilingual-rendering">
+        <ref name="MultilingualRenderingType"/>
+      </attribute>
+    </optional>
     <oneOrMore>
-      <ref name="BasicBlock"/>
+      <choice>
+        <ref name="BasicBlock"/>
+        <ref name="component"/>
+      </choice>
     </oneOrMore>
   </define>
   <define name="ObligationType">

data/lib/isodoc/generic/base_convert.rb

@@ -12,14 +12,15 @@ module IsoDoc
       def term_cleanup(docxml)
         docxml.xpath("//p[@class = 'Terms']").each do |d|
           h2 = d.at("./preceding-sibling::*[@class = 'TermNum'][1]")
-          h2.add_child(" ")
-          h2.add_child(d.remove)
+          d["id"] = h2["id"]
+          d.children.first.previous =
+            "<strong>#{h2.remove.children.to_xml}</strong>&nbsp;"
         end
         docxml
       end
 
       def make_body(xml, docxml)
-        body_attr = { lang: "EN-US", link: "blue", vlink: "#954F72", 
+        body_attr = { lang: "EN-US", link: "blue", vlink: "#954F72",
                       "xml:lang": "EN-US", class: "container" }
         xml.body **body_attr do |body|
           make_body1(body, docxml)

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

@@ -296,7 +296,6 @@ p.Terms, li.Terms, div.Terms
         mso-fareast-font-family:$headerfont;
         mso-bidi-font-family:$headerfont;
         mso-ansi-language:EN-GB;
-        font-weight:bold;
         mso-bidi-font-weight:normal;}
 p.AltTerms, li.AltTerms, div.AltTerms
         {mso-style-name:"AltTerm\(s\)";

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

@@ -216,9 +216,12 @@ h3 {
   font-weight: 100;
 }
 
+.TermNum {
+  font-weight: 100;
+}
+
 .TermNum, .Terms, .AltTerms {
   color: #1661AD;
-  font-weight: 100;
 }
 
 h2.TermNum {
@@ -275,6 +278,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/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/metanorma/generic/processor.rb

@@ -17,7 +17,6 @@ module Metanorma
         super.merge(
           html: "html",
           doc: "doc",
-          pdf: "pdf"
         )
       end
 
@@ -44,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.10.2".freeze
+    VERSION = "1.11.1".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
 

data/metanorma-generic.gemspec

@@ -27,11 +27,10 @@ Gem::Specification.new do |spec|
   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 "metanorma-standoc", "~> 1.11.0"
   spec.add_dependency "ruby-jing"
 
-  spec.add_development_dependency "byebug", "~> 9.1"
+  spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "guard", "~> 2.14"
   spec.add_development_dependency "guard-rspec", "~> 4.7"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-generic
 version: !ruby/object:Gem::Version
-  version: 1.10.2
+  version: 1.11.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-07-05 00:00:00.000000000 Z
+date: 2021-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -24,34 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 4.3.4
-- !ruby/object:Gem::Dependency
-  name: isodoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.7.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.11.0
 - !ruby/object:Gem::Dependency
   name: ruby-jing
   requirement: !ruby/object:Gem::Requirement
@@ -67,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: debug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '9.1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '9.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
   requirement: !ruby/object:Gem::Requirement
@@ -251,7 +237,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
@@ -282,7 +267,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Metanorma template gem for customisation.

data/lib/isodoc/generic/pdf_convert.rb

@@ -1,66 +0,0 @@
-require_relative "base_convert"
-require_relative "init"
-require "isodoc"
-
-module IsoDoc
-  module Generic
-    # A {Converter} implementation that generates PDF HTML output, and a
-    # document schema encapsulation of the document for validation
-    class PdfConvert < IsoDoc::PdfConvert
-      def initialize(options)
-        @libdir = File.dirname(__FILE__)
-        super
-      end
-
-      class << self
-        attr_accessor :_file
-      end
-
-      def self.inherited( k )
-        k._file = caller_locations.first.absolute_path
-      end
-
-       def default_fonts(options)
-        {
-          bodyfont: (options[:script] == "Hans" ? '"Source Han Sans",serif'
-                     : configuration.html_bodyfont || '"Overpass",sans-serif'),
-          headerfont: (options[:script] == "Hans" ? '"Source Han Sans",sans-serif' :
-                       configuration.html_headerfont || '"Overpass",sans-serif'),
-          monospacefont: configuration.html_monospacefont || '"Space Mono",monospace'
-        }.transform_values { |v| v&.empty? ? nil : v }
-      end
-
-      def default_file_locations(_options)
-        {
-          htmlstylesheet: baselocation(configuration.htmlstylesheet) ||
-            html_doc_path("htmlstyle.scss"),
-          htmlcoverpage: baselocation(configuration.htmlcoverpage) ||
-            html_doc_path("html_generic_titlepage.html"),
-          htmlintropage: baselocation(configuration.htmlintropage) ||
-            html_doc_path("html_generic_intro.html"),
-          scripts_pdf: baselocation(configuration.scripts_pdf) ||
-            html_doc_path("scripts.pdf.html")
-        }.transform_values { |v| v&.empty? ? nil : v }
-      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
-      end
-
-      def html_toc(docxml)
-        docxml
-      end
-
-      def configuration
-        Metanorma::Generic.configuration
-      end
-
-      include BaseConvert
-      include Init
-    end
-  end
-end
-