metanorma-iso 2.1.2 → 2.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43eeca2b2e24e0d8d1681a52ad493218736544151b9d440e4a38343dae49e22b
-  data.tar.gz: 79241bc11b898d70a969f984646e3aded85b0bf1a7fd9d56f73b359e84e36f9a
+  metadata.gz: d3629dd32172e9b6df3f58715579377d8cf71e989c27b54200f1f562a9892b3d
+  data.tar.gz: 5645a46a5e59c5a55543469064124582250ef5b676ced7627d839c120b5f6da2
 SHA512:
-  metadata.gz: 27b8c022d5e76b1d1d91ed48a2d7f95246df401c8ede504244387500ab371dd05fc0c6c71fb47d955059004321a9192ebd7d532ee593d46ccd594a0df3b654e2
-  data.tar.gz: 4f5d8ce30167455dd18418b82120ec7597d1daafde97b781d1b50b71d42a616754317c8faa6fd3906b35dcf040afc53bdad0c9f06d75b45784fb49fd7db33136
+  metadata.gz: b6cdedb8c9ebfd573277b5a757a9599687f3818c3be99cd50e835866b2306846c8d93c4df0fde2a0f29575832f56af3a17f4fb31fc98734df918626a21d9a035
+  data.tar.gz: bf939763b17cd5db3c55cfc3f870be2de3892727849073d33785439a113561300fe81941ee4d8ffe02a2cb5712b11b172a7347f5b9209d956f8755dbc4a694ef

data/lib/html2doc/lists.rb

@@ -35,11 +35,14 @@ class Html2Doc
                   !x.text.strip.empty?
                 end
 
-      prev = first_p.xpath("./preceding-sibling::* | ./preceding-sibling::text()")
+      prev = first_p.xpath("./preceding-sibling::* | "\
+                           "./preceding-sibling::text()[normalize-space()]")
       # bullet, tab, paragraph: ignore bullet, tab
-      return if prev.any? { |x| !x.text.strip.empty? }
-
-      para.replace(para.children)
+      if prev.empty? then para.replace(para.children)
+      elsif prev.size == 2 && prev[-1].name == "span" &&
+          prev[-1]["style"] == "mso-tab-count:1"
+        first_p.replace(first_p.children)
+      end
     end
 
     def list2para_style(listtype, depth)

data/lib/isodoc/iso/html/isodoc-dis.css

@@ -76,7 +76,7 @@ p.NormRef, li.NormRef, div.NormRef {
   mso-ansi-language: EN-GB; }
 
 p.FigureTitle, li.FigureTitle, div.FigureTitle {
-  mso-style-name: figuretitle;
+  mso-style-name: "Figure Title";
   mso-style-unhide: no;
   mso-style-qformat: yes;
   mso-style-parent: "";
@@ -1264,9 +1264,6 @@ table.MsoISOTable td, table.MsoISOTableBig td {
   mso-border-alt: solid windowtext 1pt;
   padding: 0cm 2.85pt 0cm 2.85pt; }
 
-table.MsoISOTable p, table.MsoISOTableBig p {
-  font-size: {{smallerfontsize}}; }
-
 table.MsoTableGrid {
   mso-style-name: "Table Grid";
   mso-tstyle-rowband-size: 0;
@@ -1694,12 +1691,6 @@ div.Example, td.Example {
   margin: 0in;
   margin-bottom: 6.0pt; }
 
-td.Example p.MsoListParagraph {
-  font-size: {{smallerfontsize}}; }
-
-div.Example p.MsoListParagraph {
-  font-size: {{smallerfontsize}}; }
-
 p.Example, li.Example, div.Example {
   mso-style-unhide: no;
   mso-style-qformat: yes;
@@ -3268,9 +3259,10 @@ p.ListContinue2-, li.ListContinue2-, div.ListContinue2- {
   line-height: 10.5pt;
   mso-pagination: widow-orphan;
   tab-stops: 40.3pt;
-  font-size: 9.0pt;
+  font-size: 10.0pt;
   mso-bidi-font-size: {{normalfontsize}};
-  font-family: "Arial",sans-serif;
+  font-family: {{bodyfont}};
+  /*font-family:"Arial",sans-serif;*/
   mso-fareast-font-family: Calibri;
   mso-bidi-font-family: "Times New Roman";
   mso-ansi-language: EN-GB;
@@ -4485,9 +4477,6 @@ span.SpellE {
   mso-style-name: "";
   mso-spl-e: yes; }
 
-div.Note p.MsoListParagraph {
-  font-size: {{smallerfontsize}}; }
-
 div.Note span.stem {
   font-size: {{smallerfontsize}}; }
 

data/lib/isodoc/iso/html/isodoc-dis.scss

@@ -71,7 +71,7 @@ p.NormRef, li.NormRef, div.NormRef
         mso-bidi-font-family:$bodyfont;
         mso-ansi-language:EN-GB;}
 p.FigureTitle, li.FigureTitle, div.FigureTitle
-	{mso-style-name:figuretitle;
+	{mso-style-name:"Figure Title";
 	mso-style-unhide:no;
 	mso-style-qformat:yes;
 	mso-style-parent:"";
@@ -1208,8 +1208,6 @@ table.MsoISOTable td, table.MsoISOTableBig td
     {border:solid windowtext 1pt;
     mso-border-alt:solid windowtext 1pt;
     padding:0cm 2.85pt 0cm 2.85pt;}
-table.MsoISOTable p, table.MsoISOTableBig p
-{font-size:$smallerfontsize; }
 table.MsoTableGrid
 	{mso-style-name:"Table Grid";
 	mso-tstyle-rowband-size:0;
@@ -1628,14 +1626,6 @@ div.Example, td.Example {
    margin-bottom:6.0pt;
 }
 
-td.Example p.MsoListParagraph {
-  font-size: $smallerfontsize;
-}
-
-div.Example p.MsoListParagraph {
-  font-size: $smallerfontsize;
-}
-
 p.Example, li.Example, div.Example
 	{
 	mso-style-unhide:no;
@@ -3148,9 +3138,10 @@ p.ListContinue2-, li.ListContinue2-, div.ListContinue2-
 	line-height:10.5pt;
 	mso-pagination:widow-orphan;
 	tab-stops:40.3pt;
-	font-size:9.0pt;
+	font-size:10.0pt;
 	mso-bidi-font-size:$normalfontsize;
-	font-family:"Arial",sans-serif;
+	font-family:$bodyfont;
+	/*font-family:"Arial",sans-serif;*/
 	mso-fareast-font-family:Calibri;
 	mso-bidi-font-family:"Times New Roman";
 	mso-ansi-language:EN-GB;
@@ -4309,10 +4300,6 @@ span.SpellE
 	mso-spl-e:yes;}
 
 
-div.Note p.MsoListParagraph {
-  font-size: $smallerfontsize;
-}
-
 div.Note span.stem {
   font-size: $smallerfontsize; }
 

data/lib/isodoc/iso/html/isodoc.css

@@ -376,6 +376,7 @@ p.SourceTitle {
   mso-ansi-language: EN-GB; }
 
 p.Tabletitle, li.Tabletitle, div.Tabletitle, p.ListTitle {
+  mso-style-name: "Table title";
   mso-style-unhide: no;
   mso-style-qformat: yes;
   mso-style-parent: "";
@@ -510,6 +511,7 @@ span.AnnexFigureTitleChar {
 
 p.Note, div.Note, li.Note, p.TableFootnote, div.TableFootnote, li.TableFootnote {
   mso-style-unhide: no;
+  mso-style-name: "Note";
   mso-style-qformat: yes;
   mso-style-parent: "";
   margin-top: 0cm;
@@ -1277,7 +1279,7 @@ aside {
   font-size: {{footnotefontsize}}; }
 
 /*
-div.example {
+div.Example {
 	border:solid black .25pt;
 	mso-border-alt:solid black .25pt;
 	padding:10pt;
@@ -1287,7 +1289,7 @@ div.example {
 }
 */
 /*
-div.example {
+div.Example {
   margin-left:70.9pt;
   text-indent:-70.9pt;
 }
@@ -1305,12 +1307,6 @@ div.Example, td.Example {
   margin: 0in;
   margin-bottom: 6.0pt; }
 
-td.Example p.MsoListParagraph {
-  font-size: {{smallerfontsize}}; }
-
-div.Example p.MsoListParagraph {
-  font-size: {{smallerfontsize}}; }
-
 p.Example, li.Example, div.Example {
   mso-style-unhide: no;
   mso-style-qformat: yes;
@@ -1334,9 +1330,6 @@ span.ExampleChar {
   mso-style-link: Example;
   mso-ansi-language: EN-GB; }
 
-div.Note p.MsoListParagraph {
-  font-size: {{smallerfontsize}}; }
-
 div.Note span.stem {
   font-size: {{smallerfontsize}}; }
 

data/lib/isodoc/iso/html/isodoc.scss

@@ -358,7 +358,8 @@ p.SourceTitle
         mso-bidi-font-family:$bodyfont;
         mso-ansi-language:EN-GB;}
 p.Tabletitle, li.Tabletitle, div.Tabletitle, p.ListTitle
-	{mso-style-unhide:no;
+	{mso-style-name:"Table title";
+        mso-style-unhide:no;
 	mso-style-qformat:yes;
 	mso-style-parent:"";
 	margin-top:0cm;
@@ -485,6 +486,7 @@ span.AnnexFigureTitleChar
 	font-weight:bold;}
 p.Note, div.Note, li.Note, p.TableFootnote, div.TableFootnote, li.TableFootnote
 	{mso-style-unhide:no;
+        mso-style-name:"Note";
 	mso-style-qformat:yes;
 	mso-style-parent:"";
 	margin-top:0cm;
@@ -1234,7 +1236,7 @@ aside {
 }
 
 /*
-div.example {
+div.Example {
 	border:solid black .25pt;
 	mso-border-alt:solid black .25pt;
 	padding:10pt;
@@ -1246,7 +1248,7 @@ div.example {
 
 
 /*
-div.example {
+div.Example {
   margin-left:70.9pt;
   text-indent:-70.9pt;
 }
@@ -1267,14 +1269,6 @@ div.Example, td.Example {
    margin-bottom:6.0pt;
 }
 
-td.Example p.MsoListParagraph {
-  font-size: $smallerfontsize;
-}
-
-div.Example p.MsoListParagraph {
-  font-size: $smallerfontsize;
-}
-
 p.Example, li.Example, div.Example
 	{
 	mso-style-unhide:no;
@@ -1300,10 +1294,6 @@ span.ExampleChar
 
 
 
-div.Note p.MsoListParagraph {
-  font-size: $smallerfontsize;
-}
-
 div.Note span.stem {
   font-size: $smallerfontsize; }
 

data/lib/isodoc/iso/i18n-en.yaml

@@ -1,5 +1,5 @@
 term_def_boilerplate: |
-      <p>ISO and IEC maintain terminological databases for use in
+      <p>ISO and IEC maintain terminology databases for use in
       standardization at the following addresses:</p>
 
       <ul>