metanorma-generic 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c262a3e06b94acff866441168d02ca8b127dcdbcf4ab05050c807d0e636adcc
-  data.tar.gz: 133c5dd41e5aedb7c2b68369cc9a54ecc9eda3113221da4afc90847ca2f9b113
+  metadata.gz: 05f89e4a6adb0222c1cc71f880010902337d92cde88328a4754a61c5f30eb7dc
+  data.tar.gz: f506457c7e94d17694fe9512b559aa82a1665952bfdd06ae1554fc9b5e2d3d11
 SHA512:
-  metadata.gz: f1a2f73f6898381fa004da28eb1bfc0dd068f5e04e7780c39f5a70ba7ac0dd0ea5bc12154182d9363778ebac9bad636d6288948684757f30a888a0e0232371eb
-  data.tar.gz: 7e7ab0b187be8894af035b919f949409418acc1d66d3c0b6c12ebbdacfe041c0d9428ebe6f114da9cee00252e2cb228c9674a2b1fa0e2a76772465875a23b9a5
+  metadata.gz: 704cda28036803f93d1cb11790dfe605fcc2c2eb4ff1ba09007b4ce30bf84cd511e307640f7803c83a1447d5f9af650dc32b00a447b0a704ca73ac198ea68523
+  data.tar.gz: b70f01e52405512c56e8fd3ef3994a245972f92f49029b2700c54d16b3cf7179fed7fd706c7fe683da3aae9cd294db4cf1bd561333b2689315ec8e0a58ad30fe

data/lib/isodoc/generic/base_convert.rb

@@ -14,7 +14,7 @@ module IsoDoc
           h2 = d.at("./preceding-sibling::*[@class = 'TermNum'][1]")
           d["id"] = h2["id"]
           d.children.first.previous =
-            "<strong>#{h2.remove.children.to_xml}</strong>&nbsp;"
+            "<strong>#{h2.remove.children.to_xml}</strong>&#xa0;"
         end
         docxml
       end

data/lib/isodoc/generic/html_convert.rb

@@ -4,7 +4,6 @@ require "isodoc"
 
 module IsoDoc
   module Generic
-
     # A {Converter} implementation that generates HTML output, and a document
     # schema encapsulation of the document for validation
     #
@@ -18,19 +17,25 @@ module IsoDoc
         attr_accessor :_file
       end
 
-      def self.inherited( k )
-        k._file = caller_locations.first.absolute_path
+      def self.inherited(k)
+        k._file = caller_locations(1..1).first.absolute_path
       end
 
       def default_fonts(options)
         {
           bodyfont: (
-            options[:script] == "Hans" ? '"Source Han Sans",serif' :
-            configuration.html_bodyfont || '"Overpass",sans-serif'
+            if options[:script] == "Hans"
+              '"Source Han Sans",serif'
+            else
+              configuration.html_bodyfont || '"Overpass",sans-serif'
+            end
           ),
           headerfont: (
-            options[:script] == "Hans" ? '"Source Han Sans",sans-serif' : 
-            configuration.html_headerfont || '"Overpass",sans-serif'
+            if options[:script] == "Hans"
+              '"Source Han Sans",sans-serif'
+            else
+              configuration.html_headerfont || '"Overpass",sans-serif'
+            end
           ),
           monospacefont: configuration.html_monospacefont || '"Space Mono",monospace',
           normalfontsize: configuration.html_normalfontsize,
@@ -43,21 +48,23 @@ module IsoDoc
       def default_file_locations(_options)
         {
           htmlstylesheet: baselocation(configuration.htmlstylesheet) ||
-          html_doc_path("htmlstyle.scss"),
+            html_doc_path("htmlstyle.scss"),
           htmlcoverpage: baselocation(configuration.htmlcoverpage) ||
-          html_doc_path("html_generic_titlepage.html"),
+            html_doc_path("html_generic_titlepage.html"),
           htmlintropage: baselocation(configuration.htmlintropage) ||
-          html_doc_path("html_generic_intro.html"),
+            html_doc_path("html_generic_intro.html"),
           scripts: baselocation(configuration.scripts),
-          i18nyaml: (configuration.i18nyaml.is_a?(String) ? 
-                     baselocation(configuration.i18nyaml) : nil)
+          i18nyaml: (if configuration.i18nyaml.is_a?(String)
+                       baselocation(configuration.i18nyaml)
+                     end),
         }.transform_values { |v| v&.empty? ? nil : v }
       end
 
       def googlefonts
         return unless configuration.webfont
+
         Array(configuration.webfont).map do |x|
-          %{<link href="#{x.gsub(/\&amp;/, '&')}" rel="stylesheet">}
+          %{<link href="#{x}" rel="stylesheet"/>}
         end.join("\n")
       end
 
@@ -66,4 +73,3 @@ module IsoDoc
     end
   end
 end
-

data/lib/metanorma/generic/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Generic
-    VERSION = "2.1.0".freeze
+    VERSION = "2.1.1".freeze
   end
 end

data/lib/metanorma/generic.rb

@@ -3,7 +3,6 @@ require "metanorma/generic/version"
 require "forwardable"
 require "yaml"
 
-
 module Metanorma
   module Generic # rubocop:disable Style/MutableConstant
     ORGANIZATION_NAME_SHORT = "Acme"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-generic
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-09 00:00:00.000000000 Z
+date: 2022-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities