metanorma-rsd 1.0.13 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87b62054297007670e86fe29e7ba5a32777109209b7c77d8e77d61abcb5048e6
-  data.tar.gz: 3ee3e1f5935484da11163966236735b68f968640782f7e4aaf070a6db47974f0
+  metadata.gz: 0c5152e4335a14f4046d5f257d79a7c480e8c1ec1a6dc986436bac11fb02a5ae
+  data.tar.gz: a67ed2acc1cd9b63c44b835f295ad4f50e9301c2976302eda0c0b8bd9be5eaa0
 SHA512:
-  metadata.gz: 63828a56e9583202a3cf574bb1424197facdf6203cfc6524652ae8050b5b3ed4065bdf68d4578ae1ae34fbb9684028f79cd69114e7ce0a223b8e62334b93b637
-  data.tar.gz: fcfdb68f9ec28eb1ffae772483a493d3852cb74b3b0cdbd83ca520e29109e63d9491afc7d5ae66da9222abec598bb024b799e3dba114145d3a22e96627ddcebc
+  metadata.gz: d27d521ed8ac4fb8e3d17ebbbf324b6f8243271f89ccaa62f2fc98499022855c67f0f6df3e61baa341a159e934767bce493b8bfa64c981eee703d451cb814ebf
+  data.tar.gz: fd42ea20421e77d073a575d37a19092f8399694e6d551cd24243bd66f715de682220e0a644c910a00620d113682e0aa5b001a7d2295d395f71b171cc7e8c35ef

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

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

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

@@ -623,13 +623,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/rsd/html/rsd.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, td.example p
-        {       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/rsd/html_convert.rb

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

data/lib/isodoc/rsd/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.svg'), "logo.svg"
         @files_to_delete << "logo.svg"
+        super
       end
 
       def default_fonts(options)

data/lib/isodoc/rsd/word_convert.rb

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

data/lib/metanorma/rsd/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Rsd
-    VERSION = "1.0.13"
+    VERSION = "1.1.0"
   end
 end

data/metanorma-rsd.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "asciidoctor", "~> 1.5.7"
   spec.add_dependency "htmlentities", "~> 4.3.4"
   spec.add_dependency "nokogiri"
-  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 "byebug", "~> 9.1"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-rsd
 version: !ruby/object:Gem::Version
-  version: 1.0.13
+  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.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