metanorma-iso 1.0.11 → 1.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 291654144418257ce85f6e706e00aef3bf5b3f94c756d1dab58a4ab367778324
-  data.tar.gz: 55b5b74fab210b29de23d0fbbaec7c686186cfdc4fe69bb30a5e9eff820dbe31
+  metadata.gz: 7b2fd50423287814aff0d576d39555ea55d61e81aae37b935f93b7b524d49f41
+  data.tar.gz: cc19dd56225507e4327df1dfd6adfb0b1976269207751b18aca8c4d87704a1e7
 SHA512:
-  metadata.gz: 458f173ae5efb03bcde539daea3939f493d7e3cef5f0bd1bc9d8ddb6f9812172341c45666d8c55a203a5095f55eec3e55b10536d746632cd12256fda08e80e7e
-  data.tar.gz: bd7dcbc1efa5949bbc42bb0933ff913128e2a101862846e076f8adf9ba50371924e028505fee8e15384deba48e03f484850cce6e83575ddbc314f07f3dc61a83
+  metadata.gz: d754116f5aa51090288365d923f0c157ff68aab9453758e76f0566f18fb5f9a778e92687284920d528e1cca7081bb132a1d16d3acf8aa344c0c561706efeebdc
+  data.tar.gz: 906ab5fd28c1a66af873e89cdac4486335681400a405335f110380a9840b0a3f5304b52f2204f17c12833b46df9554667c24067a00dbf03664719372d1faf8c7

data/README.adoc

@@ -169,11 +169,11 @@ The following document attributes are specific to ISO:
 
 `:title-intro-en:`:: The introductory component of the English title of the
 document. This and the other `:title-*` document attributes are used instead
-of the metanorma-standoc `:title:` attribute.
+of the metanorma-standoc `:title:` attribute and the default Asciidoctor title
+(the first line of the document header, prefixed with `=`).
 
 `:title-main-en:`:: The main component of the English title of the document
-(mandatory). (The first line of the AsciiDoc document, which contains the title
-introduced with `=`, is ignored)
+(mandatory). 
 
 `:title-part-en:`:: The English title of the document part
 

data/docs/guidance.adoc

@@ -404,6 +404,8 @@ Ordered lists in both HTML and Word have their labels pre-configured, to align w
 
 TIP: The stylesheets for ISO render unordered lists with em-dashes instead of bullets, as preferred by ISO. Ordered lists in Word are rendered with their labels bracketed. (_a)_, _1)_, etc.) 
 
+TIP: Asciidoctor and HTML support multiple paragraphs within a single list item (through https://asciidoctor.org/docs/user-manual/#list-continuation[list continuation]); in HTML output, all the paragraphs within a list item will be aligned. In Word, each list entry must be a single paragraph; if the Asciidoctor contains more than one paragraph for a list item, the subsequent paragraphs will not be preceded by a bullet in Word, but they will also not be indented under the first paragraph of the list item.
+
 === Footnotes
 
 Asciidoctor supports only single-paragraph footnotes through its footnote macro (which can only contain a single line of text); this reflects a stylistic bias against digressive text by the Asciidoc creator, and will not change. It can be worked around by introducing line breaks into the macro (see https://github.com/asciidoctor/asciidoctor.org/issues/599, http://discuss.asciidoctor.org/footnotes-with-paragraph-breaks-td4130.html).

data/lib/asciidoctor/iso/isodoc.rng

@@ -384,6 +384,7 @@
       <ref name="sourcecode"/>
       <ref name="example"/>
       <ref name="review"/>
+      <ref name="pre"/>
     </choice>
   </define>
   <define name="paragraph">
@@ -540,6 +541,20 @@
       </zeroOrMore>
     </element>
   </define>
+  <define name="pre">
+    <element name="pre">
+      <attribute name="id">
+        <data type="ID"/>
+      </attribute>
+      <optional>
+        <ref name="tname"/>
+      </optional>
+      <text/>
+      <zeroOrMore>
+        <ref name="note"/>
+      </zeroOrMore>
+    </element>
+  </define>
   <define name="table">
     <element name="table">
       <attribute name="id">
@@ -710,6 +725,7 @@
       </optional>
       <choice>
         <ref name="image"/>
+        <ref name="pre"/>
         <zeroOrMore>
           <ref name="figure"/>
         </zeroOrMore>
@@ -735,6 +751,7 @@
       <ref name="sub"/>
       <ref name="sup"/>
       <ref name="tt"/>
+      <ref name="keyword"/>
       <ref name="strike"/>
       <ref name="smallcap"/>
       <ref name="xref"/>
@@ -765,6 +782,11 @@
       <text/>
     </element>
   </define>
+  <define name="keyword">
+    <element name="keyword">
+      <text/>
+    </element>
+  </define>
   <define name="sub">
     <element name="sub">
       <text/>

data/lib/isodoc/iso/html/style-human.scss

@@ -76,6 +76,12 @@ time, mark, audio, video {
 
 code, pre, tt, kbd, samp {
   font-family: $monospacefont;
+  font-variant-ligatures: none;
+}
+
+code *, pre *, tt *, kbd *, samp * {
+  font-family: $monospacefont !important;
+  font-variant-ligatures: none;
 }
 
 h1, h2, h3, h4, h5, h6, .h2Annex {
@@ -612,6 +618,7 @@ margin-left: 2em;
 
 .Sourcecode {
 font-family: $monospacefont;
+font-variant-ligatures: none;
 }
 
 .figure, .Sourcecode {

data/lib/isodoc/iso/html/style-iso.scss

@@ -75,6 +75,12 @@ time, mark, audio, video {
 
 code, pre, tt, kbd, samp {
   font-family: $monospacefont;
+  font-variant-ligatures: none;
+}
+
+code *, pre *, tt *, kbd *, samp * {
+  font-family: $monospacefont !important;
+  font-variant-ligatures: none;
 }
 
 dl {
@@ -597,6 +603,7 @@ margin-left: 2em;
 
 .Sourcecode {
 font-family: $monospacefont;
+font-variant-ligatures: none;
 }
 
 .figure, .Sourcecode {

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "1.0.11".freeze
+    VERSION = "1.0.12".freeze
   end
 end

data/metanorma-iso.gemspec

@@ -42,7 +42,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "guard-rspec", "~> 4.7"
   spec.add_development_dependency "rake", "~> 12.0"
   spec.add_development_dependency "rspec", "~> 3.6"
-  spec.add_development_dependency "rubocop", "~> 0.50"
+  spec.add_development_dependency "rubocop", "= 0.54.0"
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
   spec.add_development_dependency "metanorma", "~> 0.3.0"

data/spec/asciidoctor-iso/base_spec.rb

@@ -106,6 +106,11 @@ RSpec.describe Asciidoctor::ISO do
   <project-number part="1">ISO 1000</project-number>
 </docidentifier>
 <docnumber>1000</docnumber>
+         <edition>2</edition>
+<version>
+         <revision-date>2000-01-01</revision-date>
+         <draft>0.3.4</draft>
+       </version>
          <contributor>
            <role type="author"/>
            <organization>
@@ -154,11 +159,7 @@ RSpec.describe Asciidoctor::ISO do
 <ics>
   <code>3</code>
 </ics>
-       </bibdata><version>
-         <edition>2</edition>
-         <revision-date>2000-01-01</revision-date>
-         <draft>0.3.4</draft>
-       </version>
+       </bibdata>
        <sections/>
        </iso-standard>
     OUTPUT

data/spec/asciidoctor-iso/blocks_spec.rb

@@ -72,7 +72,7 @@ RSpec.describe Asciidoctor::ISO do
     end
 
   it "processes review blocks if document is in draft mode" do
-    expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
+    expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)).sub(/^.+<sections>/m, "")).to be_equivalent_to <<~"OUTPUT"
       = Document title
       Author
       :docfile: test.adoc
@@ -92,11 +92,7 @@ RSpec.describe Asciidoctor::ISO do
       For further information on the Foreword, see *ISO/IEC Directives, Part 2, 2016, Clause 12.*
       ****
       INPUT
-              #{BLANK_HDR}
-       <version>
-         <draft>1.2</draft>
-       </version>
-       <sections><p id="foreword">Foreword</p>
+       <p id="foreword">Foreword</p>
        <review reviewer="ISO" id="_" date="20170101T00:00:00Z" from="foreword" to="foreword"><p id="_">A Foreword shall appear in each document. The generic text is shown here. It does not contain requirements, recommendations or permissions.</p>
        <p id="_">For further information on the Foreword, see <strong>ISO/IEC Directives, Part 2, 2016, Clause 12.</strong></p></review></sections>
        </iso-standard>
@@ -145,7 +141,7 @@ RSpec.describe Asciidoctor::ISO do
       OUTPUT
     end
 
-    it "does nothing in particular with literals" do
+    it "processes literals" do
       expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
       #{ASCIIDOC_BLANK_HDR}
       ....
@@ -153,11 +149,12 @@ RSpec.describe Asciidoctor::ISO do
       ....
       INPUT
       #{BLANK_HDR}
-       <sections>
-         <p id="_">LITERAL</p>
-       </sections>
-       </iso-standard>
-
+<sections>
+  <figure id="_">
+  <pre id="_">LITERAL</pre>
+</figure>
+</sections>
+</iso-standard>
       OUTPUT
     end
 

data/spec/asciidoctor-iso/cleanup_spec.rb

@@ -657,7 +657,7 @@ r = 1 %</stem>
         <title>Normative References</title>
         <bibitem id="iso123" type="standard">
          <title format="text/plain">Standard</title>
-         <docidentifier>ISO 123:--</docidentifier>
+         <docidentifier>ISO 123:—</docidentifier>
          <date type="published">
            <on>--</on>
          </date>

data/spec/asciidoctor-iso/inline_spec.rb

@@ -24,8 +24,8 @@ RSpec.describe Asciidoctor::ISO do
          <em>emphasis</em>
        <strong>strong</strong>
        <tt>monospace</tt>
-       "double quote"
-       'single quote'
+       “double quote”
+       ‘single quote’
        super<sup>script</sup>
        sub<sub>script</sub>
        <stem type="AsciiMath">a_90</stem>

data/spec/asciidoctor-iso/refs_spec.rb

@@ -295,7 +295,7 @@ RSpec.describe Asciidoctor::ISO do
          <title>Normative References</title>
          <bibitem id="iso123" type="standard">
          <title format="text/plain">Standard</title>
-         <docidentifier>ISO 123:--</docidentifier>
+         <docidentifier>ISO 123:—</docidentifier>
          <date type="published">
            <on>--</on>
          </date>

data/spec/assets/iso.doc

@@ -1,7 +1,7 @@
 MIME-Version: 1.0
-Content-Type: multipart/related; boundary="----=_NextPart_0262872e.6d12.4917"
+Content-Type: multipart/related; boundary="----=_NextPart_c199ad4e.a0ae.4a75"
 
-------=_NextPart_0262872e.6d12.4917
+------=_NextPart_c199ad4e.a0ae.4a75
 Content-Location: file:///C:/Doc/iso.htm
 Content-Type: text/html; charset="utf-8"
 
@@ -834,11 +834,11 @@ Switzerland<p class="MsoNormal"></p></span></p>
 <p class="MsoToc1"><span lang="EN-GB" xml:lang="EN-GB"><span style="mso-element:field-begin"></span><span style="mso-spacerun:yes">&#xA0;</span>TOC
   \o "1-2" \h \z \u <span style="mso-element:field-separator"></span></span>
 <span class="MsoHyperlink"><span lang="EN-GB" style="mso-no-proof:yes" xml:lang="EN-GB">
-<a href="#_Toc987694138">Foreword<span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB">
+<a href="#_Toc355783382">Foreword<span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB">
 <span style="mso-tab-count:1 dotted">. </span>
 </span><span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB">
 <span style="mso-element:field-begin"></span></span>
-<span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB"> PAGEREF _Toc987694138 \h </span>
+<span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB"> PAGEREF _Toc355783382 \h </span>
   <span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB"><span style="mso-element:field-separator"></span></span><span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB">1</span>
   <span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB"></span><span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB"><span style="mso-element:field-end"></span></span></a></span></span></p>
 
@@ -871,7 +871,7 @@ Switzerland<p class="MsoNormal"></p></span></p>
 </html>
 
 
-------=_NextPart_0262872e.6d12.4917
+------=_NextPart_c199ad4e.a0ae.4a75
 Content-Location: file:///C:/Doc/iso_files/filelist.xml
 Content-Transfer-Encoding: base64
 Content-Type: application/xml
@@ -881,7 +881,7 @@ ICAgICAgIDxvOk1haW5GaWxlIEhSZWY9Ii4uL3NwZWMvYXNzZXRzL2lzby5odG0iLz4gIDxvOkZp
 bGUgSFJlZj0iZmlsZWxpc3QueG1sIi8+CiAgPG86RmlsZSBIUmVmPSJoZWFkZXIuaHRtbCIvPgo8
 L3htbD4K
 
-------=_NextPart_0262872e.6d12.4917
+------=_NextPart_c199ad4e.a0ae.4a75
 Content-Location: file:///C:/Doc/iso_files/header.html
 Content-Transfer-Encoding: base64
 Content-Type: text/html charset="utf-8"
@@ -1074,4 +1074,4 @@ cD4NCg0KPHAgY2xhc3M9TXNvRm9vdGVyPjxzcGFuIGxhbmc9RU4tQVUgc3R5bGU9J2ZvbnQtc2l6
 ZToxMC4wcHQ7Jz7CqQ0KJm5ic3A7Jm5ic3A74oCTIEFsbCByaWdodHMgcmVzZXJ2ZWQ8bzpwPjwv
 bzpwPjwvc3Bhbj48L3A+DQoNCjwvZGl2Pg0KDQoNCg0KPC9ib2R5Pg0KDQo8L2h0bWw+DQo=
 
-------=_NextPart_0262872e.6d12.4917--
+------=_NextPart_c199ad4e.a0ae.4a75--

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 1.0.12
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-27 00:00:00.000000000 Z
+date: 2018-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -182,16 +182,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.50'
+        version: 0.54.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.50'
+        version: 0.54.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement