metanorma-unece 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a005165e76100797baad319a57a783fb71c19e2ca96ccdf12f75e6462ac318c
-  data.tar.gz: 8a6eece329076aabbf2535cafae1a47a6e367019c9551ab570c0541d806bb4d8
+  metadata.gz: 2adb6c3972881dad7dd9bff2b4db4a5124ad15df1645d43466a7b8af3b5bc90a
+  data.tar.gz: '086d60e66f62a70886fbcf2cefa5921cc0e82f798ca77afd9d405c5588ab80b0'
 SHA512:
-  metadata.gz: fe1b54d981364df91efd04afee04446db003063e42101ebb58011aa34e3761a1c6f1175dc59de137403d3f543d1e07779efef1b7751ef7360179a9859b063017
-  data.tar.gz: fec5309b45f4be54bc60ad5808406b28ac1151e69fb315cbea9086c235116f9a8c944284cf833fa12d899a57358fd71039c53abe53c67b101b12074dfe32e966
+  metadata.gz: f126e7ba8f6ffc1c9c1a18b94b67f3942aadb49d25c4d2b1d7ddb78bc6efcec72879d44a8a4b2b9dd94a5c403cb251de5996b31977af17573368ccd2a5ac0e78
+  data.tar.gz: 192322ec27031fb8388e940ebedd6a03ea3699004df6610fb35f50ab9e5a12c49fffaaa940ba06683cd028501893bbb25d7cae857747a7d037d9507eb5e0e030

data/lib/asciidoctor/unece/converter.rb

@@ -120,7 +120,7 @@ module Asciidoctor
         result << noko { |ixml| front node, ixml }
         result << noko { |ixml| middle node, ixml }
         result << "</unece-standard>"
-        result = textcleanup(result.flatten * "\n")
+        result = textcleanup(result)
         ret1 = cleanup(Nokogiri::XML(result))
         validate(ret1)
         ret1.root.add_namespace(nil, Metanorma::Unece::DOCUMENT_NAMESPACE)

data/lib/asciidoctor/unece/isodoc.rng

@@ -493,6 +493,9 @@
       <attribute name="id">
         <data type="ID"/>
       </attribute>
+      <optional>
+        <attribute name="lang"/>
+      </optional>
       <optional>
         <ref name="tname"/>
       </optional>

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

@@ -714,6 +714,10 @@ div.Admonition {
     margin-left:-1.5em;
 }
 
+.example .Sourcecode {
+      background: none;
+}
+
 /*
     3.9 Tables
 */

data/lib/isodoc/unece/html/wordstyle.scss

@@ -924,7 +924,8 @@ p.Tablebody, li.Tablebody, div.Tablebody
 	margin-left:0cm;
 	text-indent:0cm;
 	mso-bidi-font-family:$headerfont;}
-/* ordered list */
+
+        /* ordered list */
 @list l2
 	{mso-list-id:525294607;
 	mso-list-template-ids:67633181;}
@@ -933,61 +934,61 @@ p.Tablebody, li.Tablebody, div.Tablebody
 	mso-level-text:"%1\)";
 	mso-level-tab-stop:none;
 	mso-level-number-position:left;
-	margin-left:36.0pt;
+	margin-left:18.0pt;
 	text-indent:-18.0pt;}
 @list l2:level2
 	{mso-level-text:"%2\)";
 	mso-level-tab-stop:none;
 	mso-level-number-position:left;
-	margin-left:54.0pt;
+	margin-left:36.0pt;
 	text-indent:-18.0pt;}
 @list l2:level3
 	{mso-level-number-format:roman-lower;
 	mso-level-text:"%3\)";
 	mso-level-tab-stop:none;
 	mso-level-number-position:left;
-	margin-left:72.0pt;
+	margin-left:54.0pt;
 	text-indent:-18.0pt;}
 @list l2:level4
 	{mso-level-number-format:alpha-upper;
 	mso-level-text:"%4\)";
 	mso-level-tab-stop:none;
 	mso-level-number-position:left;
-	margin-left:90.0pt;
+	margin-left:72.0pt;
 	text-indent:-18.0pt;}
 @list l2:level5
 	{mso-level-number-format:roman-upper;
 	mso-level-text:"%5\)";
 	mso-level-tab-stop:none;
 	mso-level-number-position:left;
-	margin-left:108.0pt;
+	margin-left:90.0pt;
 	text-indent:-18.0pt;}
 @list l2:level6
 	{mso-level-number-format:alpha-lower;
 	mso-level-text:"%6\)";
 	mso-level-tab-stop:none;
 	mso-level-number-position:left;
-	margin-left:126.0pt;
+	margin-left:108.0pt;
 	text-indent:-18.0pt;}
 @list l2:level7
 	{mso-level-tab-stop:none;
 	mso-level-text:"%7\)";
 	mso-level-number-position:left;
-	margin-left:144.0pt;
+	margin-left:126.0pt;
 	text-indent:-18.0pt;}
 @list l2:level8
 	{mso-level-number-format:roman-lower;
 	mso-level-text:"%8\)";
 	mso-level-tab-stop:none;
 	mso-level-number-position:left;
-	margin-left:162.0pt;
+	margin-left:144.0pt;
 	text-indent:-18.0pt;}
 @list l2:level9
 	{mso-level-number-format:alpha-upper;
 	mso-level-text:"%9\)";
 	mso-level-tab-stop:none;
 	mso-level-number-position:left;
-	margin-left:180.0pt;
+	margin-left:162.0pt;
 	text-indent:-18.0pt;}
 /* Unordered list */
 @list l3
@@ -996,67 +997,167 @@ p.Tablebody, li.Tablebody, div.Tablebody
 	mso-list-template-ids:-277327948 -457018030 67633155 67633157 67633153 67633155 67633157 67633153 67633155 67633157;}
 @list l3:level1
 	{mso-level-number-format:bullet;
-	mso-level-text:•;
+	mso-level-text:—;
 	mso-level-tab-stop:none;
 	mso-level-number-position:left;
-	margin-left:36.0pt;
+	margin-left:18.0pt;
 	text-indent:-18.0pt;}
 @list l3:level2
 	{mso-level-number-format:bullet;
-	mso-level-text:•;
+	mso-level-text:—;
 	mso-level-tab-stop:none;
 	mso-level-number-position:left;
-	margin-left:54.0pt;
+	margin-left:36.0pt;
 	text-indent:-18.0pt;}
 @list l3:level3
 	{mso-level-number-format:bullet;
-	mso-level-text:•;
+	mso-level-text:—;
 	mso-level-tab-stop:none;
 	mso-level-number-position:left;
-	margin-left:72.0pt;
+	margin-left:54.0pt;
 	text-indent:-18.0pt;}
 @list l3:level4
 	{mso-level-number-format:bullet;
-	mso-level-text:•;
+	mso-level-text:—;
 	mso-level-tab-stop:none;
 	mso-level-number-position:left;
-	margin-left:90.0pt;
+	margin-left:72.0pt;
 	text-indent:-18.0pt;}
 @list l3:level5
 	{mso-level-number-format:bullet;
-	mso-level-text:•;
+	mso-level-text:—;
 	mso-level-tab-stop:none;
 	mso-level-number-position:left;
-	margin-left:108.0pt;
+	margin-left:90.0pt;
 	text-indent:-18.0pt;}
 @list l3:level6
 	{mso-level-number-format:bullet;
-	mso-level-text:•;
+	mso-level-text:—;
 	mso-level-tab-stop:none;
 	mso-level-number-position:left;
-	margin-left:126.0pt;
+	margin-left:108.0pt;
 	text-indent:-18.0pt;}
 @list l3:level7
 	{mso-level-number-format:bullet;
-	mso-level-text:•;
+	mso-level-text:—;
 	mso-level-tab-stop:none;
 	mso-level-number-position:left;
-	margin-left:144.0pt;
+	margin-left:126.0pt;
 	text-indent:-18.0pt;}
 @list l3:level8
 	{mso-level-number-format:bullet;
-	mso-level-text:•;
+	mso-level-text:—;
 	mso-level-tab-stop:none;
 	mso-level-number-position:left;
-	margin-left:162.0pt;
+	margin-left:144.0pt;
 	text-indent:-18.0pt;}
 @list l3:level9
 	{mso-level-number-format:bullet;
-	mso-level-text:•;
+	mso-level-text:—;
 	mso-level-tab-stop:none;
 	mso-level-number-position:left;
-	margin-left:180.0pt;
+	margin-left:162.0pt;
 	text-indent:-18.0pt;}
+        p.ListContLevel1, li.ListContLevel1, div.ListContLevel1
+	{mso-style-priority:34;
+	margin-top:0cm;
+	margin-left:18.0pt;
+	margin-right:0cm;
+	margin-bottom:12.0pt;
+	mso-pagination:widow-orphan;
+	font-size:11.0pt;
+	font-family:$bodyfont;
+	mso-ansi-language:EN-AU;
+	mso-fareast-language:EN-US;}
+p.ListContLevel2, li.ListContLevel2, div.ListContLevel2
+	{mso-style-priority:34;
+	margin-top:0cm;
+	margin-left:36.0pt;
+	margin-right:0cm;
+	margin-bottom:12.0pt;
+	mso-pagination:widow-orphan;
+	font-size:11.0pt;
+	font-family:$bodyfont;
+	mso-ansi-language:EN-AU;
+	mso-fareast-language:EN-US;}
+p.ListContLevel3, li.ListContLevel3, div.ListContLevel3
+	{mso-style-priority:34;
+	margin-top:0cm;
+	margin-left:54.0pt;
+	margin-right:0cm;
+	margin-bottom:12.0pt;
+	mso-pagination:widow-orphan;
+	font-size:11.0pt;
+	font-family:$bodyfont;
+	mso-ansi-language:EN-AU;
+	mso-fareast-language:EN-US;}
+p.ListContLevel4, li.ListContLevel4, div.ListContLevel4
+	{mso-style-priority:34;
+	margin-top:0cm;
+	margin-left:72.0pt;
+	margin-right:0cm;
+	margin-bottom:12.0pt;
+	mso-pagination:widow-orphan;
+	font-size:11.0pt;
+	font-family:$bodyfont;
+	mso-ansi-language:EN-AU;
+	mso-fareast-language:EN-US;}
+p.ListContLevel5, li.ListContLevel5, div.ListContLevel5
+	{mso-style-priority:34;
+	margin-top:0cm;
+	margin-left:90.0pt;
+	margin-right:0cm;
+	margin-bottom:12.0pt;
+	mso-pagination:widow-orphan;
+	font-size:11.0pt;
+	font-family:$bodyfont;
+	mso-ansi-language:EN-AU;
+	mso-fareast-language:EN-US;}
+p.ListContLevel6, li.ListContLevel6, div.ListContLevel6
+	{mso-style-priority:34;
+	margin-top:0cm;
+	margin-left:108.0pt;
+	margin-right:0cm;
+	margin-bottom:12.0pt;
+	mso-pagination:widow-orphan;
+	font-size:11.0pt;
+	font-family:$bodyfont;
+	mso-ansi-language:EN-AU;
+	mso-fareast-language:EN-US;}
+p.ListContLevel7, li.ListContLevel7, div.ListContLevel7
+	{mso-style-priority:34;
+	margin-top:0cm;
+	margin-left:126.0pt;
+	margin-right:0cm;
+	margin-bottom:12.0pt;
+	mso-pagination:widow-orphan;
+	font-size:11.0pt;
+	font-family:$bodyfont;
+	mso-ansi-language:EN-AU;
+	mso-fareast-language:EN-US;}
+p.ListContLevel8, li.ListContLevel8, div.ListContLevel8
+	{mso-style-priority:34;
+	margin-top:0cm;
+	margin-left:144.0pt;
+	margin-right:0cm;
+	margin-bottom:12.0pt;
+	mso-pagination:widow-orphan;
+	font-size:11.0pt;
+	font-family:$bodyfont;
+	mso-ansi-language:EN-AU;
+	mso-fareast-language:EN-US;}
+p.ListContLevel9, li.ListContLevel9, div.ListContLevel9
+	{mso-style-priority:34;
+	margin-top:0cm;
+	margin-left:162.0pt;
+	margin-right:0cm;
+	margin-bottom:12.0pt;
+	mso-pagination:widow-orphan;
+	font-size:11.0pt;
+	font-family:$bodyfont;
+	mso-ansi-language:EN-AU;
+	mso-fareast-language:EN-US;}
+
 
 table.MsoNormalTable
 	{mso-style-name:"Table Normal";

data/lib/isodoc/unece/word_convert.rb

@@ -147,8 +147,8 @@ module IsoDoc
       intro = docxml.at("//p[@class = 'IntroTitle']/..")
       abstract = docxml.at("//p[@class = 'AbstractTitle']/..")
       abstract.parent = (abstractbox || preface_container) if abstract
-      abstractbox and abstract&.xpath("./br")&.each do |a|
-        a.remove if /page-break-before:always/.match(a["style"])
+      abstractbox and abstract&.xpath(".//p/br")&.each do |a|
+        a.parent.remove if /page-break-before:always/.match(a["style"])
       end
       docxml&.at("//p[@class = 'AbstractTitle']")&.remove if abstractbox
       foreword.parent = preface_container if foreword && preface_container

data/lib/metanorma/unece/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Unece
-    VERSION = "0.0.9"
+    VERSION = "0.0.10"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-unece
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-21 00:00:00.000000000 Z
+date: 2019-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor