metanorma-acme 1.0.9 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f92eecb2ec9350efda09ba06a211745a52dd8e77e7423d6cb0ffda156724fe2
-  data.tar.gz: 7189c366347aaac3299a3aac7cd7f78ec36d8bbec2c866057b18d333adee1d30
+  metadata.gz: 706c34cec8264684b2402f94f756ae0c19fd259a06839c10c5ad578ac5392b8b
+  data.tar.gz: 1bf3b000f406c7531636f3636d2842c88b3a846c13fb8e3535742a7d1d4ad278
 SHA512:
-  metadata.gz: 1882f351732a105c1e0903b48b1af9a5a3ed083242069d65e7eedb173762149f0d2ae966e8dd244417ed615e74b8ac0a949092c19547d9a42d0d35481dbff96b
-  data.tar.gz: 36721f08dd92909451538fd47b4abbc200b33ad8f9092f3175dea769fbdc8625457794b07705d24cfa5c82aa234683a94244ff1493bb0e578cc9613eb4699c4a
+  metadata.gz: fcaee5c325f50509fad3bc50c37429a22844eed39353378de01d28de3b52c49baa95dafdca7b7d18b22fc8e7234ec756b806d950ec69aedba323196c71322100
+  data.tar.gz: 64e3cf32541024874a30388e5a269530f41bd83f671101b4c6601cfb55fc8e96c114f6b5bd6bc8688bfb45fae2b6e60812e0e777be8b78ad58b79061deffb4fb

data/lib/asciidoctor/acme/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/acme/isodoc.rng

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

data/lib/isodoc/acme/html/acme.scss

@@ -607,13 +607,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;}
@@ -622,6 +626,10 @@ td.example p.MsoListParagraph {
   font-size: 10.0pt;
 }
 
+td.example p.MsoListParagraph {
+  font-size: 10.0pt;
+}
+
 span.note_label, span.example_label, td.example_label, td.note_label
 {
 font-size: 10.0pt;

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

@@ -622,13 +622,14 @@ p.Biblio, p.NormRef {
     background-color: #e1eef1;
     padding: 1.2em;
     margin: 2em 0 1em 0;
+    padding-left: 2em;
 }
 
 .example .example-title {
     font-weight: 700;
     text-transform: uppercase;
-    text-align: center;
     margin-top:0;
+    margin-left:-1.5em;
 }
 
 /*

data/lib/isodoc/acme/html_convert.rb

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

data/lib/isodoc/acme/pdf_convert.rb

@@ -10,8 +10,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)
@@ -71,8 +75,8 @@ module IsoDoc
           t << "#{get_anchors[annex['id']][:label]} "
           t.br
           t.b do |b|
-          name&.children&.each { |c2| parse(c2, b) }
-        end
+            name&.children&.each { |c2| parse(c2, b) }
+          end
         end
       end
 

data/lib/isodoc/acme/word_convert.rb

@@ -11,7 +11,11 @@ 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"
+        super
       end
 
       def default_fonts(options)
@@ -68,8 +72,8 @@ module IsoDoc
           t << "#{get_anchors[annex['id']][:label]} "
           t.br
           t.b do |b|
-          name&.children&.each { |c2| parse(c2, b) }
-        end
+            name&.children&.each { |c2| parse(c2, b) }
+          end
         end
       end
 

data/lib/metanorma/acme/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Acme
-    VERSION = "1.0.9"
+    VERSION = "1.1.0"
   end
 end

data/metanorma-acme.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "asciidoctor", "~> 1.5.7"
   spec.add_dependency "htmlentities", "~> 4.3.4"
   spec.add_dependency "ruby-jing"
-  spec.add_dependency "metanorma-standoc", "~> 1.0.8"
+  spec.add_dependency "metanorma-standoc", "~> 1.1.0"
   spec.add_dependency "isodoc", "~> 0.9.0"
 
   spec.add_development_dependency "bundler", "~> 2.0.1"
@@ -42,5 +42,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.0"
-  spec.add_development_dependency "metanorma-cli", "~> 1.0.3"
+  spec.add_development_dependency "metanorma-cli", "~> 1.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-acme
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.1.0
 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
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.8
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.8
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: isodoc
   requirement: !ruby/object:Gem::Requirement
@@ -240,14 +240,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.1.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.1.2
 description: |
   Metanorma for the (fictitious) Acme Corp.