metanorma-iso 1.3.13 → 1.3.15

data/spec/isodoc/postproc_spec.rb

@@ -489,15 +489,16 @@ RSpec.describe IsoDoc do
     <boilerplate>
   <copyright-statement>
     <clause>
-    <p id="authority1">
+    <p id="boilerplate-year">
     © ISO 2019, Published in Switzerland
   </p>
 
-  <p id="authority2">
+  <p id="boilerplate-message">
 I am the Walrus.
   </p>
 
-  <p id="authority3" align="left">
+    <p id="boilerplate-name">ISO copyright office</p>
+  <p id="boilerplate-address" align="left">
     ISO copyright office<br/>
     Ch. de Blandonnet 8 ?~@? CP 401<br/>
     CH-1214 Vernier, Geneva, Switzerland<br/>
@@ -545,11 +546,12 @@ end
     <boilerplate>
   <copyright-statement>
     <clause>
-    <p id="authority1">Published in Elbonia</p>
+    <p id="boilerplate-year">Published in Elbonia</p>
 
-  <p id="authority2">No soup for you</p>
+  <p id="boilerplate-message">No soup for you</p>
 
-  <p id="authority3" align="left">Elbonia 5000</p>
+  <p id="boilerplate-name">Dilbert Associates</p>
+  <p id="boilerplate-address" align="left">Elbonia 5000</p>
 </clause>
   </copyright-statement>
 
@@ -567,15 +569,17 @@ end
     INPUT
     word = File.read("test.doc", encoding: "UTF-8")
     expect(xmlpp(word.sub(%r{^.*<p class="zzCopyright">}m, '<p class="zzCopyright">').sub(%r{</p>.*$}m, '</p>'))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-           <p class="zzCopyright"><a name="authority1" id="authority1"></a>Published in Elbonia</p>
+           <p class="zzCopyright"><a name="boilerplate-year" id="boilerplate-year"></a>Published in Elbonia</p>
            OUTPUT
     expect(xmlpp(word.sub(%r{^.*<p class="zzCopyright1">}m, '<p class="zzCopyright1">').sub(%r{</p>.*$}m, '</p>'))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-           <p class="zzCopyright1"><a name="authority2" id="authority2"></a>No soup for you</p>
+           <p class="zzCopyright1"><a name="boilerplate-message" id="boilerplate-message"></a>No soup for you</p>
            OUTPUT
     expect(xmlpp(word.sub(%r{^.*<p align="left" style="text-align:left" class="zzAddress">}m, '<p align="left" style="text-align:left" class="zzAddress">').sub(%r{</p>.*$}m, '</p>'))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-           <p align="left" style="text-align:left" class="zzAddress"><a name="authority3" id="authority3"></a>Elbonia 5000</p>
+           <p align="left" style="text-align:left" class="zzAddress"><a name="boilerplate-address" id="boilerplate-address"></a>Elbonia 5000</p>
+           OUTPUT
+    expect(xmlpp(word.sub(%r{^.*<p class="boilerplate-name">}m, '<p class="boilerplate-name">').sub(%r{</p>.*$}m, '</p>'))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    <p class="boilerplate-name"><a name="boilerplate-name" id="boilerplate-name"></a>Dilbert Associates</p>
            OUTPUT
-    expect(word).to include '<p class="zzWarning">I am the Walrus</p>'
     expect(word).to include '<p class="zzWarning">I am the Walrus</p>'
 end
 

data/spec/spec_helper.rb

@@ -97,9 +97,11 @@ HDR
 
 BOILERPLATE =
   HTMLEntities.new.decode(
-  File.read(File.join(File.dirname(__FILE__), "..", "lib", "asciidoctor", "iso", "iso_intro.xml"), encoding: "utf-8").
+  File.read(File.join(File.dirname(__FILE__), "..", "lib", "asciidoctor", "iso", "boilerplate.xml"), encoding: "utf-8").
   gsub(/\{\{ agency \}\}/, "ISO").gsub(/\{\{ docyear \}\}/, Date.today.year.to_s).
-  gsub(/\{% if unpublished %\}.*\{% endif %\}/m, ""))
+  gsub(/\{% if unpublished %\}.*\{% endif %\}/m, "").
+  gsub(/(?<=\p{Alnum})'(?=\p{Alpha})/, "’")
+)
 
 
 BLANK_HDR = <<~"HDR"
@@ -148,15 +150,15 @@ BLANK_HDR = <<~"HDR"
 HDR
 
 TERM_BOILERPLATE = <<~END
-  <p>For the purposes of this document,
+  <p id="_">For the purposes of this document,
     the following terms and definitions apply.</p>
-<p>ISO and IEC maintain terminological databases for use in
+<p id="_">ISO and IEC maintain terminological databases for use in
 standardization at the following addresses:</p>
 
-<ul>
-<li> <p>ISO Online browsing platform: available at
+<ul id="_">
+<li> <p id="_">ISO Online browsing platform: available at
   <link target="http://www.iso.org/obp"/></p> </li>
-<li> <p>IEC Electropedia: available at
+<li> <p id="_">IEC Electropedia: available at
 <link target="http://www.electropedia.org"/>
 </p> </li> </ul>
 END

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 1.3.13
+  version: 1.3.15
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-04 00:00:00.000000000 Z
+date: 2020-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-jing
@@ -243,13 +243,13 @@ files:
 - lib/asciidoctor/iso/base.rb
 - lib/asciidoctor/iso/basicdoc.rng
 - lib/asciidoctor/iso/biblio.rng
+- lib/asciidoctor/iso/boilerplate.xml
 - lib/asciidoctor/iso/cleanup.rb
 - lib/asciidoctor/iso/converter.rb
 - lib/asciidoctor/iso/front.rb
 - lib/asciidoctor/iso/i18n-en.yaml
 - lib/asciidoctor/iso/i18n-fr.yaml
 - lib/asciidoctor/iso/i18n-zh-Hans.yaml
-- lib/asciidoctor/iso/iso_intro.xml
 - lib/asciidoctor/iso/isodoc.rng
 - lib/asciidoctor/iso/isostandard.rnc
 - lib/asciidoctor/iso/isostandard.rng