metanorma-mpfd 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87602011623efb1127c8dd1a19a6812c491aed3148d8d561232ce494e45ccfe3
-  data.tar.gz: cf0f26d14b14814641f32bc3f8cd4bf886691317f6714fd07a557278e4f70df1
+  metadata.gz: 82ce3121d334698058ea64ecc8c801094cce208416eec09a035dfe746e712fbd
+  data.tar.gz: 4017449fd0e9bfb7ae5bf5fbe06408f3df2ea74a17206decceb41bcd136a1b7e
 SHA512:
-  metadata.gz: e54bf36db25e2533a9009ee95e189bdeb387192b95192e588a04163e708d1415a7b0a1f16b5bcd0cec8330b1826c19ea2f89d5560e36e447bbfc0acd93e606d4
-  data.tar.gz: e5441f308639b8def4cbd504747bb4faa1cb63529852b70ca88930b8a5ebc2cdcfbdd0cf5d51ba2e3be6d922a82a382f7eecfd6ccebf2adf434472c46fcd3f4e
+  metadata.gz: 19b994ae93a81148560e5511c03de72959a473ab75ca7f5446eaaba08518724eab04bd4fa9e5a5a4149cbac52c4f0d68dc88d20b05c98c58a7075276955e8765
+  data.tar.gz: d7faa7284301c61473a0a67de83e680261f1215f3085c55caf9654c359aedd8d54ba62784b456fa5ce5600673fe88fcf208bae969bac4c88d390aff8bcc64e1d

data/README.adoc

@@ -1,7 +1,7 @@
 = Metanorma-MPFD: Metanorma processor for MPFA documents
 
 image:https://img.shields.io/gem/v/metanorma-mpfd.svg["Gem Version", link="https://rubygems.org/gems/metanorma-mpfd"]
-image:https://img.shields.io/travis/riboseinc/metanorma-mpfd/master.svg["Build Status", link="https://travis-ci.org/riboseinc/metanorma-mpfd"]
+image:https://img.shields.io/travis/riboseinc/metanorma-mpfd/master.svg["Build Status", link="https://travis-ci.com/riboseinc/metanorma-mpfd"]
 image:https://codeclimate.com/github/riboseinc/metanorma-mpfd/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/riboseinc/metanorma-mpfd"]
 
 WARNING: This gem is still under development. Moreover, unlike other Metanorma gems, 

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

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

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

@@ -625,17 +625,22 @@ p.Biblio, p.NormRef {
 .example {
   background-color: #e1eef1;
   margin: 2em 0 1em 0;
+  padding-left: 2em;
 }
 
 table.example {
   padding: 1.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/mpfd/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
-        {       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/mpfd/html_convert.rb

@@ -12,10 +12,14 @@ 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"
         FileUtils.cp html_doc_path('mpfa-logo-no-text@4x.png'), "mpfa-logo-no-text@4x.png"
         @files_to_delete << "logo.jpg"
         @files_to_delete << "mpfa-logo-no-text@4x.png"
+        super
       end
 
       def default_fonts(options)
@@ -107,9 +111,9 @@ module IsoDoc
         "//preface/clause[descendant::terms]".freeze
 
       SECTIONS_XPATH = 
-         "//foreword | //introduction | //preface/terms | //preface/clause | //annex | "\
-      "//sections/clause | //bibliography/references | "\
-      "//bibliography/clause".freeze
+        "//foreword | //introduction | //preface/terms | //preface/clause | //annex | "\
+        "//sections/clause | //bibliography/references | "\
+        "//bibliography/clause".freeze
 
       def terms_defs(isoxml, out, num)
         f = isoxml.at(ns(TERM_CLAUSE)) or return num

data/lib/isodoc/mpfd/pdf_convert.rb

@@ -10,10 +10,14 @@ 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"
         FileUtils.cp html_doc_path('mpfa-logo-no-text@4x.png'), "mpfa-logo-no-text@4x.png"
         @files_to_delete << "logo.jpg"
         @files_to_delete << "mpfa-logo-no-text@4x.png"
+        super
       end
 
       def default_fonts(options)

data/lib/isodoc/mpfd/word_convert.rb

@@ -10,10 +10,14 @@ 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"
         FileUtils.cp html_doc_path('mpfa-logo-no-text@4x.png'), "mpfa-logo-no-text@4x.png"
         @files_to_delete << "logo.jpg"
         @files_to_delete << "mpfa-logo-no-text@4x.png"
+        super
       end
 
       def default_fonts(options)

data/lib/metanorma/mpfd/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Mpfd
-    VERSION = "0.1.5"
+    VERSION = "0.1.6"
   end
 end

data/metanorma-mpfd.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 "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_dependency "twitter_cldr"
 

metadata

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