metanorma-iec 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65e8b6110c8b027d0e499a4cafa47209512d46d1844423002e96d5f099849178
-  data.tar.gz: f74fa9c52f4f03818bd948b31aa467923779831e32bba5561985a9a82cd155f8
+  metadata.gz: 73845b0f396ac7f5dd11ef15f2d9d7365aa2ced653f2f5611b0808d95f598acd
+  data.tar.gz: 9b52cac8db8146bfee98bb78296c1eb4402304334bd4b0992bec81884a24e39f
 SHA512:
-  metadata.gz: fe060bbb28532776431133cf2e0b7f1ff7356dd0b387076fd4b9e51e8b8810a19e1b58cc9bb74c74090c22183778f8cb800c8ff6963465391502877991936e2d
-  data.tar.gz: 0a147df6aef5e2aa075a5c86ed5a487a33a40d188ba1ab843177c291d7cc9850de1e60aba4b8b90a07140598703cf4b9c87bbf532e948a9219c9c51ba4882203
+  metadata.gz: 66995e9d3026f0aac838fb9b7478f9d2f40ebda4437beaa1758f9c08cecc1e5691eb0de777b4055fde6b3e1a667f9486d9b54df6080f9a8ffa7f88d8e1eeb97e
+  data.tar.gz: 60ed769002bad5d29edc41899801579b08d5458901f1b8037754693bddc24a14726149fbdeca5d2c994dd734deaed56ad3440fdd9dd3531704e2c10cebb03d2e

data/Gemfile

@@ -6,8 +6,6 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in gemspec
 gemspec
 
-gem "reline", "~> 0.2.8.pre.11"
-
 if File.exist? "Gemfile.devel"
   eval File.read("Gemfile.devel"), nil, "Gemfile.devel" # rubocop:disable Security/Eval
 end

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

@@ -677,34 +677,34 @@ ul, ol {
   list-style-type: none; }
 
 /* https://github.com/metanorma/metanorma-iso/issues/319 : ordered list rendering */
-ol[type="alphabet"] {
+ol[class="alphabet"] {
   counter-reset: alphabet; }
 
-ol[type="arabic"] {
+ol[class="arabic"] {
   counter-reset: arabic; }
 
-ol[type="roman"] {
+ol[class="roman"] {
   counter-reset: roman; }
 
-ol[type="alphabet_upper"] {
+ol[class="alphabet_upper"] {
   counter-reset: alphabet_upper; }
 
-ol[type="roman_upper"] {
+ol[class="roman_upper"] {
   counter-reset: roman_upper; }
 
-ol[type="alphabet"] ol[type="alphabet"] {
+ol[class="alphabet"] ol[class="alphabet"] {
   counter-reset: alphabet2; }
 
-ol[type="arabic"] ol[type="arabic"] {
+ol[class="arabic"] ol[class="arabic"] {
   counter-reset: arabic2; }
 
-ol[type="roman"] ol[type="roman"] {
+ol[class="roman"] ol[class="roman"] {
   counter-reset: roman2; }
 
-ol[type="alphabet_upper"] ol[type="alphabet_upper"] {
+ol[class="alphabet_upper"] ol[class="alphabet_upper"] {
   counter-reset: alphabet_upper2; }
 
-ol[type="roman_upper"] ol[type="roman_upper"] {
+ol[class="roman_upper"] ol[class="roman_upper"] {
   counter-reset: roman_upper2; }
 
 ol {
@@ -718,29 +718,29 @@ ol > li:before {
   position: absolute;
   left: -1.4em; }
 
-ol[type="roman"] > li:before {
+ol[class="roman"] > li:before {
   left: -2.0em; }
 
-ol[type="roman_upper"] > li:before {
+ol[class="roman_upper"] > li:before {
   left: -2.3em; }
 
-ol[type="alphabet"] > li:before {
+ol[class="alphabet"] > li:before {
   counter-increment: alphabet;
   content: counter(alphabet, lower-alpha) ") "; }
 
-ol[type="arabic"] > li:before {
+ol[class="arabic"] > li:before {
   counter-increment: arabic;
   content: counter(arabic, decimal) ") "; }
 
-ol[type="roman"] > li:before {
+ol[class="roman"] > li:before {
   counter-increment: roman;
   content: counter(roman, lower-roman) ") "; }
 
-ol[type="alphabet_upper"] > li:before {
+ol[class="alphabet_upper"] > li:before {
   counter-increment: alphabet_upper;
   content: counter(alphabet_upper, upper-alpha) ") "; }
 
-ol[type="roman_upper"] > li:before {
+ol[class="roman_upper"] > li:before {
   counter-increment: roman_upper;
   content: counter(roman_upper, upper-roman) ") "; }
 
@@ -748,23 +748,23 @@ ol > li:before {
   counter-increment: alphabet;
   content: counter(alphabet, lower-alpha) ") "; }
 
-ol[type="alphabet"] ol[type="alphabet"] > li:before {
+ol[class="alphabet"] ol[class="alphabet"] > li:before {
   counter-increment: alphabet2;
   content: counter(alphabet2, lower-alpha) ") "; }
 
-ol[type="arabic"] ol[type="arabic"] > li:before {
+ol[class="arabic"] ol[class="arabic"] > li:before {
   counter-increment: arabic2;
   content: counter(arabic2, decimal) ") "; }
 
-ol[type="roman"] ol[type="roman"] > li:before {
+ol[class="roman"] ol[class="roman"] > li:before {
   counter-increment: roman2;
   content: counter(roman2, lower-roman) ") "; }
 
-ol[type="alphabet_upper"] ol[type="alphabet_upper"] > li:before {
+ol[class="alphabet_upper"] ol[class="alphabet_upper"] > li:before {
   counter-increment: alphabet_upper2;
   content: counter(alphabet_upper2, upper-alpha) ") "; }
 
-ol[type="roman_upper"] ol[type="roman_upper"] > li:before {
+ol[class="roman_upper"] ol[class="roman_upper"] > li:before {
   counter-increment: roman_upper2;
   content: counter(roman_upper2, upper-roman) ") "; }
 
@@ -819,6 +819,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/iec/html/htmlstyle.scss

@@ -406,34 +406,34 @@ ul, ol {margin-left: 2em;}
 
 /* https://github.com/metanorma/metanorma-iso/issues/319 : ordered list rendering */
 
-ol[type="alphabet"] {
+ol[class="alphabet"] {
   counter-reset: alphabet;
 }
-ol[type="arabic"] {
+ol[class="arabic"] {
   counter-reset: arabic;
 }
-ol[type="roman"] {
+ol[class="roman"] {
   counter-reset: roman;
 }
-ol[type="alphabet_upper"] {
+ol[class="alphabet_upper"] {
   counter-reset: alphabet_upper;
 }
-ol[type="roman_upper"] {
+ol[class="roman_upper"] {
   counter-reset: roman_upper;
 }
-ol[type="alphabet"] ol[type="alphabet"] {
+ol[class="alphabet"] ol[class="alphabet"] {
   counter-reset: alphabet2;
 }
-ol[type="arabic"] ol[type="arabic"] {
+ol[class="arabic"] ol[class="arabic"] {
   counter-reset: arabic2;
 }
-ol[type="roman"] ol[type="roman"] {
+ol[class="roman"] ol[class="roman"] {
   counter-reset: roman2;
 }
-ol[type="alphabet_upper"] ol[type="alphabet_upper"] {
+ol[class="alphabet_upper"] ol[class="alphabet_upper"] {
   counter-reset: alphabet_upper2;
 }
-ol[type="roman_upper"] ol[type="roman_upper"] {
+ol[class="roman_upper"] ol[class="roman_upper"] {
   counter-reset: roman_upper2;
 }
 ol {
@@ -448,29 +448,29 @@ ol > li:before {
   position: absolute;
   left: -1.4em;
 }
-ol[type="roman"] > li:before {
+ol[class="roman"] > li:before {
   left: -2.0em;
 }
-ol[type="roman_upper"] > li:before {
+ol[class="roman_upper"] > li:before {
   left: -2.3em;
 }
-ol[type="alphabet"] > li:before {
+ol[class="alphabet"] > li:before {
   counter-increment: alphabet;
   content: counter(alphabet, lower-alpha)") "
 }
-ol[type="arabic"] > li:before {
+ol[class="arabic"] > li:before {
   counter-increment: arabic;
   content: counter(arabic, decimal)") "
 }
-ol[type="roman"] > li:before {
+ol[class="roman"] > li:before {
   counter-increment: roman;
   content: counter(roman, lower-roman)") "
 }
-ol[type="alphabet_upper"] > li:before {
+ol[class="alphabet_upper"] > li:before {
   counter-increment: alphabet_upper;
   content: counter(alphabet_upper, upper-alpha)") "
 }
-ol[type="roman_upper"] > li:before {
+ol[class="roman_upper"] > li:before {
   counter-increment: roman_upper;
   content: counter(roman_upper, upper-roman)") "
 }
@@ -478,23 +478,23 @@ ol > li:before {
   counter-increment: alphabet;
   content: counter(alphabet, lower-alpha)") "
 }
-ol[type="alphabet"] ol[type="alphabet"] > li:before {
+ol[class="alphabet"] ol[class="alphabet"] > li:before {
   counter-increment: alphabet2;
   content: counter(alphabet2, lower-alpha)") "
 }
-ol[type="arabic"] ol[type="arabic"] > li:before {
+ol[class="arabic"] ol[class="arabic"] > li:before {
   counter-increment: arabic2;
   content: counter(arabic2, decimal)") "
 }
-ol[type="roman"] ol[type="roman"] > li:before {
+ol[class="roman"] ol[class="roman"] > li:before {
   counter-increment: roman2;
   content: counter(roman2, lower-roman)") "
 }
-ol[type="alphabet_upper"] ol[type="alphabet_upper"] > li:before {
+ol[class="alphabet_upper"] ol[class="alphabet_upper"] > li:before {
   counter-increment: alphabet_upper2;
   content: counter(alphabet_upper2, upper-alpha)") "
 }
-ol[type="roman_upper"] ol[type="roman_upper"] > li:before {
+ol[class="roman_upper"] ol[class="roman_upper"] > li:before {
   counter-increment: roman_upper2;
   content: counter(roman_upper2, upper-roman)") "
 }
@@ -535,6 +535,7 @@ pre {
 
 @include admonitionBlock();
 @include recommendationBlock();
+@include listBlock();
 
 .FigureTitle,
 .SourceTitle {

data/lib/isodoc/iec/html/isodoc.css

@@ -168,7 +168,7 @@ p.SourceTitle {
   font-weight: bold; }
 
 /* IEC: TABLE-title */
-p.TableTitle {
+p.TableTitle, p.ListTitle {
   mso-style-unhide: no;
   mso-style-qformat: yes;
   mso-style-parent: Normal;
@@ -192,7 +192,6 @@ p.TableTitle {
 /* IEC: NOTE */
 p.Note, div.Note, li.Note {
   mso-style-unhide: no;
-  mso-style-name: "NOTE";
   mso-style-qformat: yes;
   mso-style-next: Normal;
   margin-top: 5.0pt;
@@ -202,13 +201,16 @@ p.Note, div.Note, li.Note {
   text-align: justify;
   mso-pagination: widow-orphan;
   layout-grid-mode: char;
-  font-size: {{smallerfontsize}};
-  font-family: {{bodyfont}};
   mso-fareast-font-family: "Times New Roman";
-  letter-spacing: .4pt;
   mso-ansi-language: EN-GB;
   mso-fareast-language: ZH-CN; }
 
+p.Note, li.Note {
+  mso-style-name: "NOTE";
+  font-size: {{smallerfontsize}};
+  font-family: {{bodyfont}};
+  letter-spacing: .4pt; }
+
 /* IEC: TABFIGfootnote */
 p.TableFootnote, div.TableFootnote, li.TableFootnote {
   mso-style-unhide: no;
@@ -543,20 +545,20 @@ 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, div.Quote {
+  font-size: {{normalfontsize}};
+  font-family: {{bodyfont}}; }
+
 p.QuoteAttribution {
   text-align: right; }
 
 p.Admonition, li.Admonition, div.Admonition {
   mso-style-priority: 99;
   mso-pagination: widow-orphan;
-  font-size: {{normalfontsize}};
-  font-family: {{bodyfont}};
   mso-ascii-font-family: {{bodyfont}};
   mso-ascii-theme-font: minor-latin;
   mso-fareast-font-family: {{bodyfont}};
@@ -569,9 +571,13 @@ p.Admonition, li.Admonition, div.Admonition {
   border: solid windowtext 1.0pt;
   mso-border-alt: solid windowtext .5pt;
   padding: 1.0pt 4.0pt 1.0pt 4.0pt;
-  font-weight: bold;
   mso-ansi-language: EN-AU; }
 
+p.Admonition, li.Admonition {
+  font-size: {{normalfontsize}};
+  font-family: {{bodyfont}};
+  font-weight: bold; }
+
 /* IEC:PARAEQUATION */
 p.formula, li.formula, div.formula {
   mso-style-name: Formula;
@@ -820,7 +826,9 @@ div.example {
 */
 p.example, li.example, div.example, td.example {
   mso-pagination: none;
-  tab-stops: 70.9pt;
+  tab-stops: 70.9pt; }
+
+p.example, li.example, td.example {
   font-size: {{normalfontsize}};
   font-family: {{bodyfont}}; }
 

data/lib/isodoc/iec/html/isodoc.scss

@@ -160,7 +160,7 @@ p.SourceTitle
 	mso-fareast-language:ZH-CN;
 	font-weight:bold;}
 /* IEC: TABLE-title */
-p.TableTitle
+p.TableTitle, p.ListTitle
 	{mso-style-unhide:no;
 	mso-style-qformat:yes;
 	mso-style-parent:Normal;
@@ -183,7 +183,6 @@ p.TableTitle
 /* IEC: NOTE */
 p.Note, div.Note, li.Note
 	{mso-style-unhide:no;
-        mso-style-name:"NOTE";
 	mso-style-qformat:yes;
 	mso-style-next:Normal;
 	margin-top:5.0pt;
@@ -193,12 +192,15 @@ p.Note, div.Note, li.Note
 	text-align:justify;
 	mso-pagination:widow-orphan;
 	layout-grid-mode:char;
-	font-size:$smallerfontsize;
-	font-family:$bodyfont;
 	mso-fareast-font-family:"Times New Roman";
-	letter-spacing:.4pt;
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:ZH-CN;}
+p.Note, li.Note {
+        mso-style-name:"NOTE";
+	font-size:$smallerfontsize;
+	font-family:$bodyfont;
+	letter-spacing:.4pt;
+        }
 /* IEC: TABFIGfootnote */
 p.TableFootnote, div.TableFootnote, li.TableFootnote
 	/* may need to be revised */
@@ -520,18 +522,18 @@ 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, div.Quote {
+	font-size:$normalfontsize;
+	font-family:$bodyfont;
+        }
 p.QuoteAttribution
         {text-align:right;}
 p.Admonition, li.Admonition, div.Admonition
 	{mso-style-priority:99;
 	mso-pagination:widow-orphan;
-	font-size:$normalfontsize;
-	font-family:$bodyfont;
 	mso-ascii-font-family:$bodyfont;
 	mso-ascii-theme-font:minor-latin;
 	mso-fareast-font-family:$bodyfont;
@@ -544,8 +546,12 @@ p.Admonition, li.Admonition, div.Admonition
         border:solid windowtext 1.0pt;
         mso-border-alt:solid windowtext .5pt;
         padding:1.0pt 4.0pt 1.0pt 4.0pt;
-        font-weight:bold;
 	mso-ansi-language:EN-AU;}
+p.Admonition, li.Admonition {
+	font-size:$normalfontsize;
+	font-family:$bodyfont;
+        font-weight:bold;
+        }
 /* IEC:PARAEQUATION */
 p.formula, li.formula, div.formula
 	{mso-style-name:Formula;
@@ -804,8 +810,11 @@ p.example, li.example, div.example, td.example
 	{	
 	mso-pagination:none;
         tab-stops:70.9pt;
-	font-size:$normalfontsize;
-	font-family:$bodyfont;}
+        }
+p.example, li.example, td.example {
+  font-size:$normalfontsize;
+        font-family:$bodyfont;
+}
 
 td.example p.MsoListParagraph {
   font-size: $normalfontsize;

data/lib/isodoc/iec/i18n.rb

@@ -11,7 +11,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