metanorma-m3d 1.0.13 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7ee7b8bd216cc4c6f77728f19a511c95dc3468f311a501bb42ebb0efc5767bd
-  data.tar.gz: c7d5198cf8b51f8a84b8db1b9490278842a2863057b11a0526712c6b045c2097
+  metadata.gz: 16057f9779c4a42b7f6b67094d063a83449169a10c8bbb295436a87472fba519
+  data.tar.gz: 7fcfdd7fd5357af21872b723bd2bb48e75e52fdc0137183aee93b6c7cd309d13
 SHA512:
-  metadata.gz: '01893848b7cf6a612d0161b51b843aaa0631af27a41edfbb5f3a3a0b858ea91a100b646ef27d038c826476410a4e53f8fb5772b8c5bd5d2610de716b4b82b284'
-  data.tar.gz: 9ec043bad9a26f7b8d2d2af8eb0ed26442ab10f5f999775c3ed4c17f38d87e28ccd6eb6cdbed8066340f0167293cf8a1626795c77e719b4bc93b01e4000470e5
+  metadata.gz: b1f06460f0cbcfcca0fade6cdbbf35262009422fbc47b28081eac3a5bb6a2b6094d08acb04cd8739fee49e51afd443b554bf49370d820a5d1c8273f5a965a5d6
+  data.tar.gz: 76b46badb1b37b6121a753f29f56053db179fa80419821991572fd4180f8d44a5811865523cee261deea0efc48360751176e9c4ad2f035cc0a3e886075897672

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

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

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

@@ -629,15 +629,20 @@ p.Biblio, p.NormRef {
     background-color: #F5F6F6;
     border-left: solid 5px #69C5DC;
     color: rgb(91, 94, 95);
-    padding: 1.2em 1.2em 1.2em 2.2em;
+    padding: 1.2em;
     margin: 2em 0 2em -1em;
+    padding-left: 2em;
+}
+
+.example p {
+    margin: 0;
 }
 
 .example .example-title {
     font-weight: 700;
     text-transform: uppercase;
-    text-align: center;
     margin-top:0;
+    margin-left:-1.5em;
 }
 
 /*

data/lib/isodoc/m3d/html/m3d.scss

@@ -635,13 +635,16 @@ 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/m3d/m3dhtmlconvert.rb

@@ -18,7 +18,11 @@ module IsoDoc
       def initialize(options)
         @libdir = File.dirname(__FILE__)
         super
+      end
+
+      def convert1(docxml, filename, dir)
         add_image(%w(logo.jpg m3-logo.png))
+        super
       end
 
       def default_fonts(options)

data/lib/isodoc/m3d/m3dpdfconvert.rb

@@ -18,7 +18,11 @@ module IsoDoc
       def initialize(options)
         @libdir = File.dirname(__FILE__)
         super
+      end
+
+      def convert1(docxml, filename, dir)
         add_image(%w(logo.jpg m3-logo.png))
+        super
       end
 
       def default_fonts(options)

data/lib/isodoc/m3d/m3dwordconvert.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)

data/lib/isodoc/m3d/metadata.rb

@@ -40,8 +40,8 @@ module IsoDoc
         end
       end
 
-            def unpublished(status)
-        %w(published withdrawn).include? status.downcase
+      def unpublished(status)
+        !%w(published withdrawn).include? status.downcase
       end
 
       def version(isoxml, _out)

data/lib/metanorma/m3d/version.rb

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

data/metanorma-m3d.gemspec

@@ -38,7 +38,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "thread_safe"
   spec.add_dependency "uuidtools"
 
-  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"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-m3d
 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-11 00:00:00.000000000 Z
+date: 2019-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -156,14 +156,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