metanorma-unece 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 310b51a54be216010c47f06e0c602d8a3fca3ea59c10ebc5308fa134252ebbea
-  data.tar.gz: 93a9deb63d422937ba7050b9cb1dca1b1ff698c8ab09c82ff20500b2074a58b8
+  metadata.gz: 7a005165e76100797baad319a57a783fb71c19e2ca96ccdf12f75e6462ac318c
+  data.tar.gz: 8a6eece329076aabbf2535cafae1a47a6e367019c9551ab570c0541d806bb4d8
 SHA512:
-  metadata.gz: 7c79df69d9bd44c93b46a600069eb6de08f9aec061277cbfc889071c85cb5645d679dda5ec786dc157f6f3d21c6f7252531a40fa255b73afafe04214077ed930
-  data.tar.gz: 57476c0fa779c278c75b1abc050d86afe71f999f56a53ca68b673739cba5e42edf387f3fe82acfee3dc5c4c4c02dd557a0156f836d323d0008d990ba09a48e41
+  metadata.gz: fe1b54d981364df91efd04afee04446db003063e42101ebb58011aa34e3761a1c6f1175dc59de137403d3f543d1e07779efef1b7751ef7360179a9859b063017
+  data.tar.gz: fec5309b45f4be54bc60ad5808406b28ac1151e69fb315cbea9086c235116f9a8c944284cf833fa12d899a57358fd71039c53abe53c67b101b12074dfe32e966

data/lib/asciidoctor/unece/biblio.rng

@@ -286,18 +286,23 @@
   </define>
   <define name="address">
     <element name="address">
-      <oneOrMore>
+      <choice>
         <!-- iso191606 TODO -->
-        <ref name="street"/>
-      </oneOrMore>
-      <ref name="city"/>
-      <optional>
-        <ref name="state"/>
-      </optional>
-      <ref name="country"/>
-      <optional>
-        <ref name="postcode"/>
-      </optional>
+        <group>
+          <oneOrMore>
+            <ref name="street"/>
+          </oneOrMore>
+          <ref name="city"/>
+          <optional>
+            <ref name="state"/>
+          </optional>
+          <ref name="country"/>
+          <optional>
+            <ref name="postcode"/>
+          </optional>
+        </group>
+        <ref name="formattedAddress"/>
+      </choice>
     </element>
   </define>
   <define name="street">
@@ -325,6 +330,11 @@
       <text/>
     </element>
   </define>
+  <define name="formattedAddress">
+    <element name="formattedAddress">
+      <text/>
+    </element>
+  </define>
   <define name="person-identifier">
     <element name="identifier">
       <attribute name="type">

data/lib/asciidoctor/unece/isodoc.rng

@@ -911,6 +911,9 @@
           </choice>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="alt"/>
+      </optional>
     </element>
   </define>
   <define name="stem">

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

@@ -703,6 +703,7 @@ div.Admonition {
     background-color: #e1eef1;
     padding: 1.2em;
     margin: 2em 0 1em 0;
+    padding-left: 2em;
 }
 
 .example .example-title {
@@ -710,6 +711,7 @@ div.Admonition {
     text-transform: uppercase;
     text-align: center;
     margin-top:0;
+    margin-left:-1.5em;
 }
 
 /*

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

@@ -630,13 +630,17 @@ div.coverpage_warning
         aside {
           font-size:10.0pt;
 }
-div.example {
-  margin-left:70.9pt;
-  text-indent:-70.9pt;
+
+.example-title {
+font-weight: bold;
+margin-left: -36.0pt;
 }
-p.example, li.example, div.example, td.example
-        {       margin:0in;
-        margin-bottom:.0001pt;
+
+p.example, li.example, div.example, td.example {
+    margin-top: 0cm;
+  margin-right: 36.0pt;
+  margin-bottom: 0cm;
+  margin-left: 36.0pt;
         mso-pagination:none;
         font-size:10.0pt;
         font-family:$bodyfont;}

data/lib/isodoc/unece/html_convert.rb

@@ -13,8 +13,12 @@ module IsoDoc
       def initialize(options)
         @libdir = File.dirname(__FILE__)
         super
+      end
+
+      def convert1(docxml, filename, dir)
         FileUtils.cp html_doc_path('logo.jpg'), "logo.jpg"
         @files_to_delete << "logo.jpg"
+        super
       end
 
       def default_fonts(options)

data/lib/isodoc/unece/word_convert.rb

@@ -13,7 +13,11 @@ module IsoDoc
         @libdir = File.dirname(__FILE__)
         super
         @toc = options[:toc]
+      end
+
+      def convert1(docxml, filename, dir)
         FileUtils.cp html_doc_path('logo.jpg'), "logo.jpg"
+        super
       end
 
       def default_fonts(options)

data/lib/metanorma/unece/version.rb

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

data/metanorma-unece.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "twitter_cldr"
   spec.add_dependency "iso-639"
 
-  spec.add_dependency "metanorma-standoc", "~> 1.0.0"
+  spec.add_dependency "metanorma-standoc", "~> 1.1.0"
   spec.add_dependency "isodoc", "~> 0.9.0"
 
   spec.add_development_dependency "bundler", "~> 2.0.1"
@@ -44,5 +44,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
   spec.add_development_dependency "metanorma", "~> 0.3.1"
-  spec.add_development_dependency "metanorma-cli", "~> 1.0.0"
+  spec.add_development_dependency "metanorma-cli", "~> 1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-unece
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-12 00:00:00.000000000 Z
+date: 2019-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: isodoc
   requirement: !ruby/object:Gem::Requirement
@@ -282,14 +282,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
 description: 'Metanorma for UNECE: United Nations Economic Commission for Europe.
 
 '