metanorma-generic 2.1.0 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c262a3e06b94acff866441168d02ca8b127dcdbcf4ab05050c807d0e636adcc
-  data.tar.gz: 133c5dd41e5aedb7c2b68369cc9a54ecc9eda3113221da4afc90847ca2f9b113
+  metadata.gz: a1ea2cd4613f684350bfa37ff726720ff2e84805ccd32cfde1678fb090834964
+  data.tar.gz: a37875b2848be73265687de24eaa5ae00b755ae4e353fd36fa0dae88a0e0c29e
 SHA512:
-  metadata.gz: f1a2f73f6898381fa004da28eb1bfc0dd068f5e04e7780c39f5a70ba7ac0dd0ea5bc12154182d9363778ebac9bad636d6288948684757f30a888a0e0232371eb
-  data.tar.gz: 7e7ab0b187be8894af035b919f949409418acc1d66d3c0b6c12ebbdacfe041c0d9428ebe6f114da9cee00252e2cb228c9674a2b1fa0e2a76772465875a23b9a5
+  metadata.gz: 1a92438595ed2a5cab6a73ccfb3bda7231c8a36597d7136f24b625a0d01502129a7fcda21ea77671bbef1eb190aa7c74b57cec977b1d935e8bdad31ba4d1b5bb
+  data.tar.gz: b953cd5e9ff920b0222245901d790d9f50ff2b891c175fb7fc9c3b465f379747e9ac88deeac7737b1263734e8e70fa0f2510172bbff71aa3dab9992513a2bd5c

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/generic.scss

@@ -105,7 +105,7 @@ p.AdmonitionTitle, p.RecommendationTitle
         mso-fareast-font-family:$bodyfont;
         mso-bidi-font-family:$bodyfont;
         mso-ansi-language:EN-GB;}
-p.TableTitle
+p.TableTitle, p.ListTitle
 	{mso-style-unhide:no;
 	mso-style-qformat:yes;
 	mso-style-parent:"";
@@ -135,13 +135,14 @@ p.Note, div.Note, li.Note, p.TableFootnote, div.TableFootnote, li.TableFootnote
 	line-height:12.0pt;
 	mso-pagination:widow-orphan;
 	tab-stops:20.15pt;
-	font-size:10.0pt;
 	mso-bidi-font-size:11.0pt;
-	font-family:$bodyfont;
-    font-size:10.0pt;
 	mso-fareast-font-family:$bodyfont;
 	mso-bidi-font-family:$bodyfont;
 	mso-ansi-language:EN-GB;}
+p.Note, li.Note, p.TableFootnote, div.TableFootnote, li.TableFootnote {
+	font-family:$bodyfont;
+        font-size:10.0pt;
+}
 p.ANNEX, li.ANNEX, div.ANNEX
 	{mso-style-name:ANNEX;
 	mso-style-priority:10;
@@ -471,11 +472,13 @@ p.Quote, li.Quote, div.Quote
 	line-height:12.0pt;
 	mso-pagination:widow-orphan;
 	tab-stops:20.15pt;
-	font-size:10.5pt;
-	font-family:$bodyfont;
 	mso-fareast-font-family:$bodyfont;
 	mso-bidi-font-family:$bodyfont;
 	mso-ansi-language:EN-GB;}
+p.Quote, li.Quote {
+	font-size:10.5pt;
+	font-family:$bodyfont;
+}
 p.QuoteAttribution
         {text-align:right;
         mso-style-priority:99;
@@ -505,8 +508,6 @@ p.Admonition, li.Admonition, div.Admonition
 	mso-border-themecolor:accent1;
 	padding:0cm;
 	mso-padding-alt:10.0pt 10.0pt 10.0pt 10.0pt;
-	font-size:12.0pt;
-	font-family:$bodyfont;
 	mso-ascii-font-family:$bodyfont;
 	mso-ascii-theme-font:minor-latin;
 	mso-fareast-font-family:$bodyfont;
@@ -519,6 +520,10 @@ p.Admonition, li.Admonition, div.Admonition
 	mso-themecolor:accent1;
 	mso-ansi-language:EN-AU;
 	font-style:italic;}
+p.Admonition, li.Admonition {
+	font-size:12.0pt;
+	font-family:$bodyfont;
+}
 p.Code, li.Code, div.Code
 	{mso-style-name:Code;
 	mso-style-priority:16;
@@ -732,12 +737,13 @@ div.example {
 p.example, li.example, td.example {
   margin-right: 0pt;
   margin-left: 0pt;
+  font-size:10.0pt;
+  font-family:$bodyfont;
 }
 
 p.example, li.example, div.example, td.example {
         mso-pagination:none;
-        font-size:10.0pt;
-        font-family:$bodyfont;}
+}
 
 td.example p.MsoListParagraph {
   font-size: 10.0pt;

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

@@ -336,6 +336,7 @@ pre {
 
 @include admonitionBlock();
 @include recommendationBlock();
+@include listBlock();
 
 .FigureTitle, .SourceTitle {
   @include blockTitle()

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/isodoc/generic/i18n.rb

@@ -7,17 +7,22 @@ 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 load_yaml1(lang, script)
         return super unless configuration.i18nyaml
-        file = configuration.i18nyaml.is_a?(Hash) ?
-          configuration.i18nyaml[lang] : configuration.i18nyaml
+
+        file = if configuration.i18nyaml.is_a?(Hash)
+                 configuration.i18nyaml[lang]
+               else
+                 configuration.i18nyaml
+               end
         return super if file.nil?
+
         y = YAML.load_file(baselocation(file))
-        super.merge(y)
+        super.deep_merge(y)
       end
 
       include Utils

data/lib/metanorma/generic/biblio.rng

@@ -614,12 +614,103 @@
     <optional>
       <ref name="fetched"/>
     </optional>
-    <choice>
-      <oneOrMore>
-        <ref name="btitle"/>
-      </oneOrMore>
+    <optional>
       <ref name="formattedref"/>
-    </choice>
+    </optional>
+    <oneOrMore>
+      <ref name="btitle"/>
+    </oneOrMore>
+    <zeroOrMore>
+      <ref name="bsource"/>
+    </zeroOrMore>
+    <oneOrMore>
+      <ref name="docidentifier"/>
+    </oneOrMore>
+    <optional>
+      <ref name="docnumber"/>
+    </optional>
+    <zeroOrMore>
+      <ref name="bdate"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="contributor"/>
+    </zeroOrMore>
+    <optional>
+      <ref name="edition"/>
+    </optional>
+    <zeroOrMore>
+      <ref name="version"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="biblionote"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="language"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="script"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="bibabstract"/>
+    </zeroOrMore>
+    <optional>
+      <ref name="status"/>
+    </optional>
+    <zeroOrMore>
+      <ref name="copyright"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="docrelation"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="series"/>
+    </zeroOrMore>
+    <optional>
+      <ref name="medium"/>
+    </optional>
+    <zeroOrMore>
+      <ref name="bplace"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="bprice"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="extent"/>
+    </zeroOrMore>
+    <optional>
+      <ref name="bibliographic_size"/>
+    </optional>
+    <zeroOrMore>
+      <ref name="accesslocation"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="license"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="bclassification"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="bkeyword"/>
+    </zeroOrMore>
+    <optional>
+      <ref name="validity"/>
+    </optional>
+  </define>
+  <define name="ReducedBibliographicItem">
+    <optional>
+      <attribute name="type">
+        <ref name="BibItemType"/>
+      </attribute>
+    </optional>
+    <optional>
+      <ref name="fetched"/>
+    </optional>
+    <optional>
+      <ref name="formattedref"/>
+    </optional>
+    <zeroOrMore>
+      <ref name="btitle"/>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="bsource"/>
     </zeroOrMore>
@@ -638,9 +729,9 @@
     <optional>
       <ref name="edition"/>
     </optional>
-    <optional>
+    <zeroOrMore>
       <ref name="version"/>
-    </optional>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="biblionote"/>
     </zeroOrMore>
@@ -833,6 +924,12 @@
           <data type="boolean"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="language"/>
+      </optional>
+      <optional>
+        <attribute name="script"/>
+      </optional>
       <text/>
     </element>
   </define>
@@ -986,36 +1083,34 @@
           <ref name="SeriesType"/>
         </attribute>
       </optional>
-      <choice>
+      <optional>
         <ref name="formattedref"/>
-        <group>
-          <ref name="btitle"/>
-          <optional>
-            <ref name="bplace"/>
-          </optional>
-          <optional>
-            <ref name="seriesorganization"/>
-          </optional>
-          <optional>
-            <ref name="abbreviation"/>
-          </optional>
-          <optional>
-            <ref name="seriesfrom"/>
-          </optional>
-          <optional>
-            <ref name="seriesto"/>
-          </optional>
-          <optional>
-            <ref name="seriesnumber"/>
-          </optional>
-          <optional>
-            <ref name="seriespartnumber"/>
-          </optional>
-          <optional>
-            <ref name="seriesrun"/>
-          </optional>
-        </group>
-      </choice>
+      </optional>
+      <ref name="btitle"/>
+      <optional>
+        <ref name="bplace"/>
+      </optional>
+      <optional>
+        <ref name="seriesorganization"/>
+      </optional>
+      <optional>
+        <ref name="abbreviation"/>
+      </optional>
+      <optional>
+        <ref name="seriesfrom"/>
+      </optional>
+      <optional>
+        <ref name="seriesto"/>
+      </optional>
+      <optional>
+        <ref name="seriesnumber"/>
+      </optional>
+      <optional>
+        <ref name="seriespartnumber"/>
+      </optional>
+      <optional>
+        <ref name="seriesrun"/>
+      </optional>
     </element>
   </define>
   <define name="SeriesType">
@@ -1174,7 +1269,7 @@
         </element>
       </optional>
       <element name="bibitem">
-        <ref name="BibliographicItem"/>
+        <ref name="ReducedBibliographicItem"/>
       </element>
       <choice>
         <zeroOrMore>
@@ -1199,9 +1294,9 @@
       <optional>
         <ref name="revision-date"/>
       </optional>
-      <zeroOrMore>
+      <optional>
         <ref name="draft"/>
-      </zeroOrMore>
+      </optional>
     </element>
   </define>
   <define name="vedition">

data/lib/metanorma/generic/isodoc.rng

@@ -282,6 +282,9 @@
             <ref name="MultilingualRenderingType"/>
           </attribute>
         </optional>
+        <optional>
+          <ref name="tname"/>
+        </optional>
         <oneOrMore>
           <ref name="ul_li"/>
         </oneOrMore>
@@ -324,6 +327,9 @@
             </choice>
           </attribute>
         </optional>
+        <optional>
+          <ref name="tname"/>
+        </optional>
         <oneOrMore>
           <ref name="li"/>
         </oneOrMore>
@@ -360,6 +366,9 @@
             <ref name="MultilingualRenderingType"/>
           </attribute>
         </optional>
+        <optional>
+          <ref name="tname"/>
+        </optional>
         <oneOrMore>
           <ref name="dt"/>
           <ref name="dd"/>
@@ -694,6 +703,9 @@
       <optional>
         <attribute name="tag"/>
       </optional>
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <optional>
         <attribute name="multilingual-rendering">
           <ref name="MultilingualRenderingType"/>
@@ -729,6 +741,9 @@
         <optional>
           <attribute name="tag"/>
         </optional>
+        <optional>
+          <attribute name="type"/>
+        </optional>
         <optional>
           <attribute name="multilingual-rendering">
             <ref name="MultilingualRenderingType"/>
@@ -2050,6 +2065,7 @@
       <value>compare</value>
       <value>contrast</value>
       <value>see</value>
+      <value>seealso</value>
     </choice>
   </define>
   <define name="deprecates">

data/lib/metanorma/generic/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Generic
-    VERSION = "2.1.0".freeze
+    VERSION = "2.1.3".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.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-09 00:00:00.000000000 Z
+date: 2022-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -270,7 +270,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.9
+rubygems_version: 3.3.16
 signing_key:
 specification_version: 4
 summary: Metanorma template gem for customisation.