metanorma-itu 2.0.8.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b72833fd8174442ae52fa5586d1153f1487ea255d8624976c06b3865483ddeb
-  data.tar.gz: 84f4c5e4ec5fa53caa2e5b6d2dc9868adfac469a5eb570bf8262ab08ae768639
+  metadata.gz: 743a06651b90759b01616f7a254f26e0d74babce4384ae94c15932dfe90dd5f0
+  data.tar.gz: 6d88e654c29e8c35c8555e6c8dc1d01e0bd986d1ced452944ad5d37927c9c6e7
 SHA512:
-  metadata.gz: ebc8d6bf3d905a53717b86b91c2b9ad42b95b0fea78308ad7d2c76dd9bf8f35324c3931257f316f91f5996684fc3bfaaa07217ad0fb37f4653e60c20ca7c1aa8
-  data.tar.gz: 504a360980e1614092bb9ae5c9f900553646c7d7d72f8ed9293cfc7a5063e8c5fefce2a3af286aa35315f1ee2ca5d8bdf39445368f6804f3d9992edc65122886
+  metadata.gz: d5f67d19a8406be1101a295157b9954184dabc09f8200872d69e3f27730c0b36a87262d40ca1b4e68157cea95b3d0292a6144d2e9a4c118267e79404194bcf2c
+  data.tar.gz: 14f962e2615970c7c5c24dae145e690531f4e70eea97efb5fe03f0614922d06ca6f5407952d36cb11c0230fceeac9313bfa49168df5465f91ed01bd4b327ed15

data/lib/isodoc/itu/base_convert.rb

@@ -30,7 +30,7 @@ module IsoDoc
       end
 
       def note_delim
-        " – "
+        " – "
       end
 
       def para_class(node)

data/lib/isodoc/itu/cleanup.rb

@@ -25,7 +25,7 @@ module IsoDoc
       def term_cleanup1(docxml)
         docxml.xpath("//p[@class = 'Terms']").each do |d|
           h2 = d.at("./preceding-sibling::*[@class = 'TermNum'][1]")
-          d.children.first.previous = "<b>#{h2.children.to_xml}</b>&nbsp;"
+          d.children.first.previous = "<b>#{h2.children.to_xml}</b>&#xa0;"
           d["id"] = h2["id"]
           h2.remove
         end

data/lib/isodoc/itu/html/html_itu_titlepage.html

@@ -129,6 +129,7 @@
         <div id="draft-warning-destination"/>
         </div>
         {% endif %}
+        <div class="coverpage-warning" id="coverpage-note-destination"/>
 
 <div class="info-section">
   <div id="boilerplate-copyright-destination"/>

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

@@ -823,6 +823,12 @@ nav #toc {
   font-size: 1em;
   text-align: center; }
 
+.ListTitle {
+  font-weight: 700;
+  font-size: 1em;
+  text-align: center;
+  text-align: left; }
+
 pre {
   font-family: {{monospacefont}};
   font-variant-ligatures: none;

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

@@ -162,6 +162,8 @@ nav {
   @include blockTitle();
 }
 
+@include listBlock();
+
 pre {
   @include sourceBlock(#f6f6f6);
   font-size: $monospacefontsize;

data/lib/isodoc/itu/html/itu.css

@@ -142,7 +142,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: "";
@@ -180,13 +180,15 @@ p.Note, div.Note, li.Note {
   mso-layout-grid-align: none;
   punctuation-wrap: simple;
   text-autospace: none;
-  font-size: {{smallerfontsize}};
   mso-bidi-font-size: 10.0pt;
-  font-family: {{bodyfont}};
   mso-fareast-font-family: {{bodyfont}};
   mso-bidi-font-family: {{bodyfont}};
   mso-ansi-language: EN-GB; }
 
+p.Note, div.Note, li.Note {
+  font-size: {{smallerfontsize}};
+  font-family: {{bodyfont}}; }
+
 p.TableFootnote, div.TableFootnote, li.TableFootnote {
   mso-style-unhide: no;
   mso-style-qformat: yes;
@@ -682,12 +684,14 @@ p.Quote, li.Quote, div.Quote {
   line-height: {{normalfontsize}};
   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;
@@ -717,8 +721,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: {{normalfontsize}};
-  font-family: {{bodyfont}};
   mso-ascii-font-family: {{bodyfont}};
   mso-ascii-theme-font: minor-latin;
   mso-fareast-font-family: {{bodyfont}};
@@ -729,7 +731,11 @@ p.Admonition, li.Admonition, div.Admonition {
   mso-bidi-theme-font: minor-bidi;
   color: #4472C4;
   mso-themecolor: accent1;
-  mso-ansi-language: EN-AU;
+  mso-ansi-language: EN-AU; }
+
+p.Admonition, li.Admonition {
+  font-size: {{normalfontsize}};
+  font-family: {{bodyfont}};
   font-style: italic; }
 
 p.Code, li.Code, div.Code {
@@ -1098,7 +1104,9 @@ aside {
   margin-left: 0pt; }
 
 p.example, li.example, div.example, td.example {
-  mso-pagination: none;
+  mso-pagination: none; }
+
+p.example, li.example, td.example {
   font-size: 10.0pt;
   font-family: {{bodyfont}}; }
 

data/lib/isodoc/itu/html/itu.scss

@@ -135,7 +135,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:"";
@@ -172,12 +172,14 @@ p.Note, div.Note, li.Note
 	mso-layout-grid-align:none;
 	punctuation-wrap:simple;
 	text-autospace:none;
-	font-size:$smallerfontsize;
 	mso-bidi-font-size:10.0pt;
-	font-family:$bodyfont;
 	mso-fareast-font-family:$bodyfont;
 	mso-bidi-font-family:$bodyfont;
 	mso-ansi-language:EN-GB;}
+p.Note, div.Note, li.Note {
+	font-size:$smallerfontsize;
+	font-family:$bodyfont;
+        }
 p.TableFootnote, div.TableFootnote, li.TableFootnote
         {mso-style-unhide:no;
         mso-style-qformat:yes;
@@ -652,11 +654,13 @@ p.Quote, li.Quote, div.Quote
 	line-height:$normalfontsize;
 	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;
@@ -686,8 +690,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:$normalfontsize;
-	font-family:$bodyfont;
 	mso-ascii-font-family:$bodyfont;
 	mso-ascii-theme-font:minor-latin;
 	mso-fareast-font-family:$bodyfont;
@@ -699,7 +701,12 @@ p.Admonition, li.Admonition, div.Admonition
 	color:#4472C4;
 	mso-themecolor:accent1;
 	mso-ansi-language:EN-AU;
-	font-style:italic;}
+      }
+p.Admonition, li.Admonition {
+	font-size:$normalfontsize;
+	font-family:$bodyfont;
+        font-style:italic;
+        }
 p.Code, li.Code, div.Code
 	{mso-style-name:Code;
 	mso-style-priority:16;
@@ -1051,6 +1058,9 @@ margin-left: 0pt;
 
 p.example, li.example, div.example, td.example {
         mso-pagination:none;
+      }
+
+p.example, li.example, td.example {
         font-size:10.0pt;
         font-family:$bodyfont;}
 

data/lib/isodoc/itu/html/word_itu_intro.html

@@ -1,51 +1,50 @@
 {% if doctype != "Resolution" %}
-<table class=MsoNormalTable border=0 cellspacing=0 cellpadding=0
- style='border-collapse:collapse;mso-table-layout-alt:fixed;mso-padding-alt:
- 0cm 5.4pt 0cm 5.4pt'>
+<table class="MsoNormalTable" border="0" cellspacing="0" cellpadding="0"
+ style='border-collapse:collapse;mso-table-layout-alt:fixed;mso-padding-alt:0cm 5.4pt 0cm 5.4pt'>
  <tr style='mso-yfti-irow:0;mso-yfti-firstrow:yes;mso-yfti-lastrow:yes'>
-  <td width=663 valign=top style='width:497.25pt;padding:0cm 5.4pt 0cm 5.4pt'>
-  <p class=RecNo><span style='mso-bookmark:_Hlk526346232'><a name=irecnoe></a><span
-      lang=FR-CH style='mso-ansi-language:FR-CH;font-size:14pt;font-weight:bold;'>{% if doctype != "Service Publication" %}{{ doctype_display }} {% endif %}{{ docnumber }}<o:p></o:p></span></span></p>
-  <p class=Rectitle align="center"><span style='mso-bookmark:_Hlk526346232'><span lang=FR-CH
+  <td width="663" valign="top" style='width:497.25pt;padding:0cm 5.4pt 0cm 5.4pt'>
+  <p class="RecNo"><span style='mso-bookmark:_Hlk526346232'><a name="irecnoe"></a><span
+      lang="FR-CH" style='mso-ansi-language:FR-CH;font-size:14pt;font-weight:bold;'>{% if doctype != "Service Publication" %}{{ doctype_display }} {% endif %}{{ docnumber }}<o:p></o:p></span></span></p>
+  <p class="Rectitle" align="center"><span style='mso-bookmark:_Hlk526346232'><span lang="FR-CH"
       style='mso-ansi-language:FR-CH;font-size:14pt;font-weight:bold;'>{{ doctitle }}<o:p></o:p></span></span></p>
   {% if annexid %}
-  <p class=Rectitle align="center"><span style='mso-bookmark:_Hlk526346232'><span lang=FR-CH
+  <p class="Rectitle" align="center"><span style='mso-bookmark:_Hlk526346232'><span lang="FR-CH"
       style='mso-ansi-language:FR-CH;font-size:14pt;font-weight:bold;'>{{ annexid }}<o:p></o:p></span></span></p>
   {% endif %}
   {% if annextitle %}
-  <p class=Rectitle align="center"><span style='mso-bookmark:_Hlk526346232'><span lang=FR-CH
+  <p class="Rectitle" align="center"><span style='mso-bookmark:_Hlk526346232'><span lang="FR-CH"
       style='mso-ansi-language:FR-CH;font-size:14pt;font-weight:bold;'>{{ annextitle }}<o:p></o:p></span></span></p>
   {% endif %}
   {% if amendmentid %}
-  <p class=Rectitle align="center"><span style='mso-bookmark:_Hlk526346232'><span lang=FR-CH
+  <p class="Rectitle" align="center"><span style='mso-bookmark:_Hlk526346232'><span lang="FR-CH"
       style='mso-ansi-language:FR-CH;font-size:14pt;font-weight:bold;'>{{ amendmentid }}<o:p></o:p></span></span></p>
   {% endif %}
   {% if amendmenttitle %}
-  <p class=Rectitle align="center"><span style='mso-bookmark:_Hlk526346232'><span lang=FR-CH
+  <p class="Rectitle" align="center"><span style='mso-bookmark:_Hlk526346232'><span lang="FR-CH"
       style='mso-ansi-language:FR-CH;font-size:14pt;font-weight:bold;'>{{ amendmenttitle }}<o:p></o:p></span></span></p>
   {% endif %}
   {% if corrigendumid %}
-  <p class=Rectitle align="center"><span style='mso-bookmark:_Hlk526346232'><span lang=FR-CH
+  <p class="Rectitle" align="center"><span style='mso-bookmark:_Hlk526346232'><span lang="FR-CH"
       style='mso-ansi-language:FR-CH;font-size:14pt;font-weight:bold;'>{{ corrigendumid }}<o:p></o:p></span></span></p>
   {% endif %}
   {% if corrigendumtitle %}
-  <p class=Rectitle align="center"><span style='mso-bookmark:_Hlk526346232'><span lang=FR-CH
+  <p class="Rectitle" align="center"><span style='mso-bookmark:_Hlk526346232'><span lang="FR-CH"
       style='mso-ansi-language:FR-CH;font-size:14pt;font-weight:bold;'>{{ corrigendumtitle }}<o:p></o:p></span></span></p>
   {% endif %}
   <span style='mso-bookmark:_Hlk526346232'></span>
-  <p class=MsoNormal><span style='mso-bookmark:_Hlk526346232'><span lang=FR-CH
-  style='mso-ansi-language:FR-CH'><o:p>&nbsp;</o:p></span></span></p>
+  <p class="MsoNormal"><span style='mso-bookmark:_Hlk526346232'><span lang="FR-CH"
+  style='mso-ansi-language:FR-CH'><o:p>&#xa0;</o:p></span></span></p>
   </td>
   <span style='mso-bookmark:_Hlk526346232'></span>
  </tr>
 </table>
 
-<p class=MsoNormal><span style='mso-bookmark:_Hlk526346232'><span lang=FR-CH
-style='mso-ansi-language:FR-CH'><o:p>&nbsp;</o:p></span></span></p>
+<p class="MsoNormal"><span style='mso-bookmark:_Hlk526346232'><span lang="FR-CH"
+style='mso-ansi-language:FR-CH'><o:p>&#xa0;</o:p></span></span></p>
 
 {% if doctype != "Service Publication" %}
 
-<p class=MsoNormal><o:wrapblock><v:shapetype id="_x0000_t202"
+<p class="MsoNormal"><o:wrapblock><v:shapetype id="_x0000_t202"
   coordsize="21600,21600" o:spt="202" path="m,l,21600r21600,l21600,xe">
   <v:stroke joinstyle="miter"/>
   <v:path gradientshapeok="t" o:connecttype="rect"/>
@@ -97,50 +96,50 @@ AIYEAABkcnMvZG93bnJldi54bWxQSwUGAAAAAAQABADzAAAAlgUAAAAA
   <w:wrap type="topAndBottom" anchory="margin"/>
   <w:anchorlock/>
  </v:shape></o:wrapblock><br
-style='mso-ignore:vglayout' clear=ALL>
-<span lang=EN-US style='mso-ansi-language:EN-US'><o:p></o:p></span></p>
+style='mso-ignore:vglayout' clear="ALL">
+<span lang="EN-US" style='mso-ansi-language:EN-US'><o:p></o:p></span></p>
 
 
 
  
 
-<p class=MsoNormal><span style='mso-bookmark:_Hlk526346232'><span lang=EN-US
-style='mso-ansi-language:EN-US'><o:p>&nbsp;</o:p></span></span></p>
+<p class="MsoNormal"><span style='mso-bookmark:_Hlk526346232'><span lang="EN-US"
+style='mso-ansi-language:EN-US'><o:p>&#xa0;</o:p></span></span></p>
 
-<p class=MsoNormal><span style='mso-bookmark:_Hlk526346232'><span lang=EN-US
-style='mso-ansi-language:EN-US'><o:p>&nbsp;</o:p></span></span></p>
+<p class="MsoNormal"><span style='mso-bookmark:_Hlk526346232'><span lang="EN-US"
+style='mso-ansi-language:EN-US'><o:p>&#xa0;</o:p></span></span></p>
 
 <!--
-<table class=MsoNormalTable border=0 cellspacing=0 cellpadding=0 width=663
+<table class="MsoNormalTable" border="0" cellspacing="0" cellpadding="0" width="663"
  style='width:497.4pt;border-collapse:collapse;mso-padding-alt:0cm 5.4pt 0cm 5.4pt'>
  <tr style='mso-yfti-irow:0;mso-yfti-firstrow:yes;mso-yfti-lastrow:yes'>
-  <td width=663 valign=top style='width:497.4pt;padding:0cm 5.4pt 0cm 5.4pt'>
+  <td width="663" valign="top" style='width:497.4pt;padding:0cm 5.4pt 0cm 5.4pt'>
 -->
     <div id="historybox">
     </div>
 <!--
   <span style='mso-bookmark:_Hlk526346232'></span>
-  <p class=Headingb style='margin-bottom:6.0pt'><span style='mso-bookmark:_Hlk526346232'><span
-  lang=EN-US style='mso-ansi-language:EN-US'><o:p></o:p></span></span></p>
+  <p class="Headingb" style='margin-bottom:6.0pt'><span style='mso-bookmark:_Hlk526346232'><span
+  lang="EN-US" style='mso-ansi-language:EN-US'><o:p></o:p></span></span></p>
   </td>
   <span style='mso-bookmark:_Hlk526346232'></span>
  </tr>
 </table>
 -->
 
-<p class=MsoNormal><span style='mso-bookmark:_Hlk526346232'><span lang=EN-US
-style='mso-ansi-language:EN-US'><o:p>&nbsp;</o:p></span></span></p>
+<p class="MsoNormal"><span style='mso-bookmark:_Hlk526346232'><span lang="EN-US"
+style='mso-ansi-language:EN-US'><o:p>&#xa0;</o:p></span></span></p>
 
 <div id="sourcebox"/>
 
-<p class=MsoNormal><span style='mso-bookmark:_Hlk526346232'><span lang=EN-US
-style='mso-ansi-language:EN-US'><o:p>&nbsp;</o:p></span></span></p>
+<p class="MsoNormal"><span style='mso-bookmark:_Hlk526346232'><span lang="EN-US"
+style='mso-ansi-language:EN-US'><o:p>&#xa0;</o:p></span></span></p>
 
-<table class=MsoNormalTable border=0 cellspacing=0 cellpadding=0
+<table class="MsoNormalTable" border="0" cellspacing="0" cellpadding="0"
  style='border-collapse:collapse;mso-table-layout-alt:fixed;mso-padding-alt:
  0cm 5.4pt 0cm 5.4pt'>
  <tr style='mso-yfti-irow:0;mso-yfti-firstrow:yes;mso-yfti-lastrow:yes'>
-  <td width=663 valign=top style='width:497.25pt;padding:0cm 5.4pt 0cm 5.4pt'>
+  <td width="663" valign="top" style='width:497.25pt;padding:0cm 5.4pt 0cm 5.4pt'>
     <div id="keywordsbox">
     </div>
   </td>
@@ -152,14 +151,14 @@ style='mso-ansi-language:EN-US'><o:p>&nbsp;</o:p></span></span></p>
 
   {% endif %}
 
-<p class=MsoNormal><span style='mso-bookmark:_Hlk526346232'><span lang=EN-US
-style='mso-ansi-language:EN-US'><o:p>&nbsp;</o:p></span></span></p>
+<p class="MsoNormal"><span style='mso-bookmark:_Hlk526346232'><span lang="EN-US"
+style='mso-ansi-language:EN-US'><o:p>&#xa0;</o:p></span></span></p>
 {% endif %}
 
   {% if doctype == "Service Publication" %}
   {% else %}
   {% if doctype != "Resolution" %}
-<p><br clear=all
+<p><br clear="all"
          style='page-break-before:always'></p>
 {% endif %}
 
@@ -168,15 +167,15 @@ style='mso-ansi-language:EN-US'><o:p>&nbsp;</o:p></span></span></p>
 <div id="boilerplate-copyright-destination"/>
 
   {% if doctype != "Resolution" %}
-<b style='mso-bidi-font-weight:normal'><span lang=EN-US style='font-size:12.0pt;
+<b style='mso-bidi-font-weight:normal'><span lang="EN-US" style='font-size:12.0pt;
 mso-bidi-font-size:10.0pt;font-family:"Times New Roman",serif;mso-fareast-font-family:
 "Times New Roman";mso-ansi-language:EN-US;mso-fareast-language:EN-US;
-mso-bidi-language:AR-SA'><br clear=all style='page-break-before:always'>
+mso-bidi-language:AR-SA'><br clear="all" style='page-break-before:always'/>
 </span></b>
 
-<p class=MsoNormal align=center style='text-align:center'>
+<p class="MsoNormal" align="center" style='text-align:center'>
 <b>{{ labels["table_of_contents"] }}</b></p>
-<p class=MsoNormal style='tab-stops:right 17.0cm'><span style='mso-tab-count:1'/>
+<p class="MsoNormal" style='tab-stops:right 17.0cm'><span style='mso-tab-count:1'/>
   <b>{{ labels["page"] }}</b></p>
 
 WORDTOC

data/lib/isodoc/itu/html/word_itu_titlepage.html

@@ -419,6 +419,7 @@
   <span style='mso-bookmark:_Hlk526346232'></span>
  </tr>
 </table>
+<div class="coverpage-warning" id="coverpage-note-destination"/>
 
 <p class="MsoNormal" align="right" style='margin-top:0.0pt;text-align:right;
 tab-stops:39.7pt 59.55pt 79.4pt 99.25pt right 17.0cm'><span style='mso-bookmark:

data/lib/isodoc/itu/html/word_itu_titlepage_sp.html

@@ -99,7 +99,7 @@ normal'><span lang="EN-GB" style='font-size:14.0pt;mso-bidi-font-size:10.0pt'>{{
   <p class="MsoNormal"><b style='mso-bidi-font-weight:normal'><span lang="EN-GB"  style='font-size:14.0pt;mso-bidi-font-size:10.0pt'><o:p>&#xA0;</o:p></span></b></p>
   </td>
  </tr>
-</table>
+</table><div class="coverpage-warning" id="coverpage-note-destination"/>
 
 <p class="MEP">&#xA0;</p>
 

data/lib/isodoc/itu/html_convert.rb

@@ -4,7 +4,6 @@ require "fileutils"
 
 module IsoDoc
   module ITU
-
     # A {Converter} implementation that generates HTML output, and a document
     # schema encapsulation of the document for validation
     #
@@ -17,14 +16,20 @@ module IsoDoc
 
       def default_fonts(options)
         {
-          bodyfont: (options[:script] == "Hans" ? '"Source Han Sans",serif' : 
-                     '"Times New Roman",serif'),
-          headerfont: (options[:script] == "Hans" ? '"Source Han Sans",sans-serif' : 
-                       '"Times New Roman",serif'),
-                       monospacefont: '"Courier New",monospace',
-                       normalfontsize: "14px",
-                       monospacefontsize: "0.8em",
-                       footnotefontsize: "0.9em",
+          bodyfont: (if options[:script] == "Hans"
+                       '"Source Han Sans",serif'
+                     else
+                       '"Times New Roman",serif'
+                     end),
+          headerfont: (if options[:script] == "Hans"
+                         '"Source Han Sans",sans-serif'
+                       else
+                         '"Times New Roman",serif'
+                       end),
+          monospacefont: '"Courier New",monospace',
+          normalfontsize: "14px",
+          monospacefontsize: "0.8em",
+          footnotefontsize: "0.9em",
         }
       end
 
@@ -38,12 +43,12 @@ module IsoDoc
 
       def googlefonts
         <<~HEAD.freeze
-    <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,300i,400,400i,600,600i,800|Space+Mono:400,700" rel="stylesheet">
+          <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,300i,400,400i,600,600i,800|Space+Mono:400,700" rel="stylesheet">
         HEAD
       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/itu/i18n.rb

@@ -16,7 +16,7 @@ module IsoDoc
               end
             else load_yaml2x("en")
             end
-        super.merge(y)
+        super.deep_merge(y)
       end
     end
   end

data/lib/isodoc/itu/init.rb

@@ -17,7 +17,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)