metanorma-mpfa 0.8.8 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16af01006c9ba1b937162a084406d3e5423cc88fff68cd9d63bfcd171dc55f04
-  data.tar.gz: 7c0ed6a1fe246257a76c3ce439e0ab6bf03fb8dd88842958b2263cd4a43fb73f
+  metadata.gz: 5c3b04e5fb6a9f99b94c5cf597e6d80bef70d952d0cfc1f6d2a2b081939727b4
+  data.tar.gz: 2e02a39e3009c12d85c960d28e705ce53d911979c9a37f6dd7a730a31ca58d14
 SHA512:
-  metadata.gz: a655d6eabf158f72d72b2c44eba937d3c4e2338ffe088f0467fd7c40234092a6e2eaea3adc9c39c99c7eb6d99a10de238593870de8dade3a2d6c5e8840eb5f8a
-  data.tar.gz: 8a71300c8ad615ddd9b932fa5e7929e900d35ff5a1f2fca9941344d43f63b6ba8c5936af009e86e8cc39e1e33757874bf9336a22a91244c85b855b5ed6e2463a
+  metadata.gz: 8e1158c928f597747067879cc5fb639742215796c9396c230221ca0c488a902e4a482b6258d3192561b8990be2d7f4d11ff25f764ae426c63169030da4092f7b
+  data.tar.gz: 134d0fee389c0ded1805d83ccc51cbf52623e8eb1b52e9448707f55dc178c98c3c5e38ae5811e94e8607a8ec1d489687e14eaa8f8b5f0096cb76adbb0b481a4a

data/lib/isodoc/mpfa/html/html_rsd_titlepage.html

@@ -24,6 +24,8 @@
         <!--<span class="title-second">{{ docsubtitle }}</span>-->
       </div>
 
+        <div class="coverpage-warning" id="coverpage-note-destination"/>
+
       <div class="coverpage-footer">
         <div class="coverpage-logo">
           <span class="doc-edition">{{ edition }} Edition</span>

data/lib/isodoc/mpfa/html/htmlstyle.css

@@ -743,6 +743,12 @@ pre {
   font-size: 1em;
   text-align: center; }
 
+.ListTitle {
+  font-weight: 700;
+  font-size: 1em;
+  text-align: center;
+  text-align: left; }
+
 .FigureTitle,
 .SourceTitle {
   font-weight: 700;

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

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

data/lib/isodoc/mpfa/html/rsd.css

@@ -111,7 +111,7 @@ p.AdmonitionTitle, p.RecommendationTitle {
   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: "";
@@ -142,13 +142,15 @@ 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: {{smallerfontsize}};
   mso-bidi-font-size: 11.0pt;
-  font-family: {{bodyfont}};
   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-size: {{smallerfontsize}};
+  font-family: {{bodyfont}}; }
+
 p.ANNEX, li.ANNEX, div.ANNEX {
   mso-style-name: ANNEX;
   mso-style-priority: 10;
@@ -494,12 +496,14 @@ p.Quote, li.Quote, div.Quote {
   line-height: 12.0pt;
   mso-pagination: widow-orphan;
   tab-stops: 20.15pt;
-  font-size: {{normalfontsize}};
-  font-family: {{bodyfont}};
   mso-fareast-font-family: {{bodyfont}};
   mso-bidi-font-family: {{bodyfont}};
   mso-ansi-language: EN-GB; }
 
+p.Quote, li.Quote {
+  font-size: {{normalfontsize}};
+  font-family: {{bodyfont}}; }
+
 p.QuoteAttribution {
   text-align: right;
   mso-style-priority: 99;
@@ -529,8 +533,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}};
@@ -544,6 +546,10 @@ p.Admonition, li.Admonition, div.Admonition {
   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;
@@ -775,7 +781,9 @@ div.example {
   margin-bottom: 0cm; }
 
 p.example, li.example, div.example, td.example {
-  mso-pagination: none;
+  mso-pagination: none; }
+
+p.example, li.example, td.example {
   font-size: {{smallerfontsize}};
   font-family: {{bodyfont}}; }
 

data/lib/isodoc/mpfa/html/rsd.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,12 +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:$smallerfontsize;
 	mso-bidi-font-size:11.0pt;
-	font-family:$bodyfont;
 	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-size:$smallerfontsize;
+	font-family:$bodyfont;
+        }
 p.ANNEX, li.ANNEX, div.ANNEX
 	{mso-style-name:ANNEX;
 	mso-style-priority:10;
@@ -471,11 +473,13 @@ p.Quote, li.Quote, div.Quote
 	line-height:12.0pt;
 	mso-pagination:widow-orphan;
 	tab-stops:20.15pt;
-	font-size:$normalfontsize;
-	font-family:$bodyfont;
 	mso-fareast-font-family:$bodyfont;
 	mso-bidi-font-family:$bodyfont;
 	mso-ansi-language:EN-GB;}
+p.Quote, li.Quote {
+	font-size:$normalfontsize;
+	font-family:$bodyfont;
+        }
 p.QuoteAttribution
         {text-align:right;
         mso-style-priority:99;
@@ -505,8 +509,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 +521,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,6 +738,9 @@ div.example {
 
 p.example, li.example, div.example, td.example {
         mso-pagination:none;
+       }
+
+p.example, li.example, td.example {
         font-size:$smallerfontsize;
         font-family:$bodyfont;}
 

data/lib/isodoc/mpfa/html/word_rsd_titlepage.html

@@ -29,9 +29,11 @@ mso-border-alt:solid windowtext .5pt;padding:0cm;mso-padding-alt:1.0pt 4.0pt 1.0
 
 <div style='mso-element:para-border-div;border:solid windowtext 1.0pt;
 mso-border-alt:solid windowtext .5pt;padding:1.0pt 4.0pt 1.0pt 4.0pt;
-margin-left:4.25pt;margin-right:4.25pt'>
+margin-left:4.25pt;margin-right:4.25pt'  id="boilerplate-license-destination"></div>
 
-</div>
+        <div style='mso-element:para-border-div;border:solid windowtext 1.0pt;
+mso-border-alt:solid windowtext .5pt;padding:1.0pt 4.0pt 1.0pt 4.0pt;
+margin-left:4.25pt;margin-right:4.25pt'  class="coverpage-warning" id="coverpage-note-destination"/>
 
 <p class="MsoNormal" align="center" style='text-align:center'><span lang="EN-GB"
 style='mso-no-proof:yes'>Ribose Group Inc.&nbsp;</span><span lang="EN-GB"><span

data/lib/isodoc/mpfa/i18n.rb

@@ -9,7 +9,7 @@ module IsoDoc
             else
               YAML.load_file(File.join(File.dirname(__FILE__), "i18n-en.yaml"))
             end
-        super.merge(y)
+        super.deep_merge(y)
       end
     end
   end

data/lib/isodoc/mpfa/init.rb

@@ -16,7 +16,7 @@ module IsoDoc
       end
 
       def i18n_init(lang, script, i18nyaml = nil)
-        @i18n = I18n.new(lang, script, i18nyaml || @i18nyaml)
+        @i18n = I18n.new(lang, script, i18nyaml: i18nyaml || @i18nyaml)
       end
 
       def fileloc(loc)