metanorma-iec 2.1.0 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b64414d9800a26aed385b99ac9b5178a27c43bfd58f678837d71d344e2740e61
-  data.tar.gz: 905726b08c6963223ed6951d838632e42f551e47dc1c14834713b82de5ae86c4
+  metadata.gz: 535b9e23e62c05288443e4dafa15aee49770f661c97dd64d426cf6c10099ddf1
+  data.tar.gz: 958f1ca736bb2a30fdda5c5068d46ac58ec11a659a4cd7745faebeebac23ffa9
 SHA512:
-  metadata.gz: 65d359f82dd1cdfac87b79d9f00532d9028b0ae31bf470a7c8481a243a313f3abf87b710f4a4a93759705e1f62c9a87449a0ab990156c7e6e1d7b25f8c13affc
-  data.tar.gz: 6b745bab4fcd31c3fc0f762162e6f10231b28caa51dd3d999179c31b74f107594662299e7fa066d8fb76dd06b9054f6016b8fe6c807b09a9198a404c8d69bb7d
+  metadata.gz: a826de8a5df40dc0ed6a1ff7d962dc18bcdc7db0128882231b48b4294fba4d75416e413ac219f8de09182ce0674bbe73c1fc84f1c0d106ec0a92416010e6ed02
+  data.tar.gz: c7720c6a1bf26b6134060b7a629e9b445bccbde1a03e4265858c4fc3fffbbcb985b6601660c621e0f85b38f8d69e6c91aa3603feed07871b7c79d518219c1e0a

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/base_convert.rb

@@ -31,7 +31,7 @@ module IsoDoc
       def iec_orgname(out)
         out.p(**{ class: "zzSTDTitle1" }) { |p| p << @i18n.get["IEC"] }
         out.p(**{ class: "zzSTDTitle1" }) { |p| p << "____________" }
-        out.p(**{ class: "zzSTDTitle1" }) { |p| p << "&nbsp;" }
+        out.p(**{ class: "zzSTDTitle1" }) { |p| p << "&#xa0;" }
       end
 
       def middle_title(_isoxml, out)
@@ -40,21 +40,21 @@ module IsoDoc
           p.b { |b| b << title1 }
         end
         if title2
-          out.p(**{ class: "zzSTDTitle1" }) { |p| p << "&nbsp;" }
+          out.p(**{ class: "zzSTDTitle1" }) { |p| p << "&#xa0;" }
           out.p(**{ class: "zzSTDTitle2" }) do |p|
             p.b { |b| b << title2 }
           end
         end
-        out.p(**{ class: "zzSTDTitle1" }) { |p| p << "&nbsp;" }
+        out.p(**{ class: "zzSTDTitle1" }) { |p| p << "&#xa0;" }
       end
 
       def middle_title_parts(_out)
         title1 = @meta.get[:doctitlemain]&.sub(/\s+$/, "")
         @meta.get[:doctitleintro] and
-          title1 = "#{@meta.get[:doctitleintro]} &mdash; #{title1}"
+          title1 = "#{@meta.get[:doctitleintro]} &#x2014; #{title1}"
         title2 = nil
         if @meta.get[:doctitlepart]
-          title1 += " &mdash;"
+          title1 += " &#x2014;"
           title2 = @meta.get[:doctitlepart]&.sub(/\s+$/, "")
           @meta.get[:doctitlepartlabel] and
             title2 = "#{@meta.get[:doctitlepartlabel]}: #{title2}"

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