metanorma-generic 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05f89e4a6adb0222c1cc71f880010902337d92cde88328a4754a61c5f30eb7dc
-  data.tar.gz: f506457c7e94d17694fe9512b559aa82a1665952bfdd06ae1554fc9b5e2d3d11
+  metadata.gz: f62fbca91a932dfd2962b5bc10e5fcb2ee58b26dbc1caead516decf679fa1fe3
+  data.tar.gz: 3b940ed44e676a48c5d263e57651e5e18883148fedc04776c27e31821552b083
 SHA512:
-  metadata.gz: 704cda28036803f93d1cb11790dfe605fcc2c2eb4ff1ba09007b4ce30bf84cd511e307640f7803c83a1447d5f9af650dc32b00a447b0a704ca73ac198ea68523
-  data.tar.gz: b70f01e52405512c56e8fd3ef3994a245972f92f49029b2700c54d16b3cf7179fed7fd706c7fe683da3aae9cd294db4cf1bd561333b2689315ec8e0a58ad30fe
+  metadata.gz: af9a7f040d1a5202ab38d52b34705bdff7130c3513a479bf2f9530bd9f012869359408c09da7e644995b897c925a3e2ffd2131d8f85f06b78c13de6734206f16
+  data.tar.gz: b4fa73685306cff6096ed6cb7689e755feee0666b494d56ea68d940e31f373ae146293c2fd4ccef9b4b025bb66db965762d2f4f4c852aa025dd7596d1fdea992

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/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,12 @@
     <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>
@@ -986,36 +986,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">

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"/>

data/lib/metanorma/generic/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-generic
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-16 00:00:00.000000000 Z
+date: 2022-06-06 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.7
 signing_key:
 specification_version: 4
 summary: Metanorma template gem for customisation.