metanorma-iso 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe27e81a226e0eb506a4cf4cc1c80d482e25ef5e9866577a2cd42689852e2b50
-  data.tar.gz: 4dd394c88bcf6ff2d1a47c179b20fa957e2fae882aad6fa54b19dfda62b8b8ae
+  metadata.gz: da80e1829e3bb23b48ec255ec0d6533f4649eb2ad68c226213bc79715ae2b1a4
+  data.tar.gz: 91fde5d59c47042e11426c4b66128acd946302786345f30aead55e0783b30297
 SHA512:
-  metadata.gz: c7772933f31a12224a87c36f2a520763b664ca6c6aa6f25a7372392fa77487923a8c879d5493b0d3b7bf4e99e65c4b33a6eb31b95e392a5793652339c958990a
-  data.tar.gz: 6d287c011e5b7192842ff3b4dbc789a75c68d1b5e4e64ce3082be51aac60f9fcc7579d550c38f7d7cd88fab3d912ec7e1ea7f42dd4dc21a29afb380ad8d5d8f2
+  metadata.gz: a20bb43d79f3e9590238a0f115d70d149d14b8ee5884e97898f7ab40f8fcc5cf6855bb5065d90e3931f763d620a68dba936ad79a0a7d87e42e31289a5273b1da
+  data.tar.gz: d9ed11afc2c9ba8ed9964106dc9ebdbbde7278be5b06036e4ba7150a2a0501bd968a10bf7f31cf98c96cb713cb0cd9950b4b47431f91471ce1831b8f454b2bec

data/lib/asciidoctor/iso/biblio.rng

@@ -384,7 +384,7 @@
   </define>
   <define name="LocalityType">
     <data type="string">
-      <param name="pattern">section|clause|part|paragraph|chapter|page|whole|table|annex|figure|note|example|volume|issue|locality:[a-zA-Z0-9_]+</param>
+      <param name="pattern">section|clause|part|paragraph|chapter|page|whole|table|annex|figure|note|list|example|volume|issue|locality:[a-zA-Z0-9_]+</param>
     </data>
   </define>
   <define name="referenceFrom">
@@ -700,8 +700,12 @@
         <ref name="btitle"/>
         <ref name="formattedref"/>
       </choice>
-      <ref name="bplace"/>
-      <ref name="seriesorganization"/>
+      <optional>
+        <ref name="bplace"/>
+      </optional>
+      <optional>
+        <ref name="seriesorganization"/>
+      </optional>
       <optional>
         <ref name="abbreviation"/>
       </optional>

data/lib/asciidoctor/iso/isostandard.rng

@@ -20,6 +20,9 @@
     <!-- add type to docidentifier in isodoc? -->
     <define name="docidentifier">
       <element name="docidentifier">
+        <optional>
+          <attribute name="type"/>
+        </optional>
         <choice>
           <text/>
           <group>
@@ -108,6 +111,27 @@
       <zeroOrMore>
         <ref name="docrelation"/>
       </zeroOrMore>
+      <zeroOrMore>
+        <ref name="series"/>
+      </zeroOrMore>
+      <optional>
+        <ref name="medium"/>
+      </optional>
+      <zeroOrMore>
+        <ref name="bplace"/>
+      </zeroOrMore>
+      <zeroOrMore>
+        <ref name="extent"/>
+      </zeroOrMore>
+      <zeroOrMore>
+        <ref name="accesslocation"/>
+      </zeroOrMore>
+      <optional>
+        <ref name="bclassification"/>
+      </optional>
+      <optional>
+        <ref name="validity"/>
+      </optional>
       <optional>
         <ref name="editorialgroup"/>
       </optional>
@@ -164,6 +188,27 @@
       <zeroOrMore>
         <ref name="docrelation"/>
       </zeroOrMore>
+      <zeroOrMore>
+        <ref name="series"/>
+      </zeroOrMore>
+      <optional>
+        <ref name="medium"/>
+      </optional>
+      <zeroOrMore>
+        <ref name="bplace"/>
+      </zeroOrMore>
+      <zeroOrMore>
+        <ref name="extent"/>
+      </zeroOrMore>
+      <zeroOrMore>
+        <ref name="accesslocation"/>
+      </zeroOrMore>
+      <optional>
+        <ref name="bclassification"/>
+      </optional>
+      <optional>
+        <ref name="validity"/>
+      </optional>
       <ref name="editorialgroup"/>
       <zeroOrMore>
         <ref name="ics"/>
@@ -866,7 +911,7 @@
     </element>
   </define>
   <define name="allParts">
-    <element name="allParts">
+    <element name="allparts">
       <data type="boolean"/>
     </element>
   </define>
@@ -954,17 +999,13 @@
       <optional>
         <ref name="section-title"/>
       </optional>
-      <choice>
-        <oneOrMore>
+      <zeroOrMore>
+        <choice>
           <ref name="term-clause"/>
-        </oneOrMore>
-        <zeroOrMore>
-          <choice>
-            <ref name="terms"/>
-            <ref name="definitions"/>
-          </choice>
-        </zeroOrMore>
-      </choice>
+          <ref name="terms"/>
+          <ref name="definitions"/>
+        </choice>
+      </zeroOrMore>
     </element>
   </define>
   <define name="reference-clause">

data/lib/asciidoctor/iso/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
   module ISO
-    VERSION = "1.0.2".freeze
+    VERSION = "1.0.3".freeze
   end
 end

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

@@ -273,6 +273,7 @@ p.AltTerms {
 
 p.Terms {
     font-weight: bold;
+    margin-top: 0em;
 }
 
 

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

@@ -275,6 +275,7 @@ p.AltTerms {
 
 p.Terms {
     font-weight: bold;
+    margin-top: 0em;
 }
 
 /* Navigation*/

data/lib/isodoc/iso/html_convert.rb

@@ -119,7 +119,8 @@ module IsoDoc
         ret = ", 第#{from.text}" if from
         ret += "–#{to}" if to
         loc = (@locality[type] || type.sub(/^locality:/, "").capitalize )
-        ret += " #{loc}" unless subsection && type == "clause" || target.match(/^IEV$/)
+        ret += " #{loc}" unless subsection && type == "clause" || type == "list" || target.match(/^IEV$/)
+        ret += ")" if type == "list"
         ret
       end
 
@@ -128,9 +129,10 @@ module IsoDoc
         return l10n(eref_localities1_zh(target, type, from, to)) if lang == "zh"
         ret = ","
         loc = @locality[type] || type.sub(/^locality:/, "").capitalize
-        ret += " #{loc}" unless subsection && type == "clause" || target.match(/^IEV$/)
+        ret += " #{loc}" unless subsection && type == "clause" || type == "list" || target.match(/^IEV$/)
         ret += " #{from.text}" if from
         ret += "–#{to.text}" if to
+        ret += ")" if type == "list"
         l10n(ret)
       end
     end

data/lib/isodoc/iso/word_convert.rb

@@ -137,12 +137,13 @@ module IsoDoc
         end
       end
 
-      def eref_localities1_zh(target, type, from, to)
+            def eref_localities1_zh(target, type, from, to)
         subsection = from&.text&.match(/\./)
         ret = ", 第#{from.text}" if from
         ret += "–#{to}" if to
         loc = (@locality[type] || type.sub(/^locality:/, "").capitalize )
-        ret += " #{loc}" unless subsection && type == "clause" || target.match(/^IEV$/)
+        ret += " #{loc}" unless subsection && type == "clause" || type == "list" || target.match(/^IEV$/)
+        ret += ")" if type == "list"
         ret
       end
 
@@ -151,9 +152,10 @@ module IsoDoc
         return l10n(eref_localities1_zh(target, type, from, to)) if lang == "zh"
         ret = ","
         loc = @locality[type] || type.sub(/^locality:/, "").capitalize
-        ret += " #{loc}" unless subsection && type == "clause" || target.match(/^IEV$/)
+        ret += " #{loc}" unless subsection && type == "clause" || type == "list" || target.match(/^IEV$/)
         ret += " #{from.text}" if from
         ret += "–#{to.text}" if to
+        ret += ")" if type == "list"
         l10n(ret)
       end
     end

data/spec/asciidoctor-iso/refs_spec.rb

@@ -337,7 +337,7 @@ RSpec.describe Asciidoctor::ISO do
              <abbreviation>ISO</abbreviation>
            </organization>
          </contributor>
-         <allParts>true</allParts>
+         <allparts>true</allparts>
        </bibitem>
       </references>
       </bibliography>

data/spec/asciidoctor-iso/section_spec.rb

@@ -318,7 +318,7 @@ RSpec.describe Asciidoctor::ISO do
 
      INPUT
              #{BLANK_HDR}
-             <termdocsource bibitemid="iso1234" type="inline"/><termdocsource bibitemid="iso5678" type="inline"/>
+             <termdocsource bibitemid="iso1234"/><termdocsource bibitemid="iso5678"/>
         <preface><foreword obligation="informative">
          <title>Foreword</title>
          <p id="_">Foreword</p>

data/spec/assets/iso.doc

@@ -1,7 +1,7 @@
 MIME-Version: 1.0
-Content-Type: multipart/related; boundary="----=_NextPart_f1bb7f88.630f.42d2"
+Content-Type: multipart/related; boundary="----=_NextPart_c65e6679.db03.4744"
 
-------=_NextPart_f1bb7f88.630f.42d2
+------=_NextPart_c65e6679.db03.4744
 Content-Location: file:///C:/Doc/spec/assets/iso.htm
 Content-Type: text/html; charset="utf-8"
 
@@ -19,13 +19,12 @@ Content-Type: text/html; charset="utf-8"
 <meta http-equiv=Content-Type content="text/html; charset=utf-8"/>
 
   <link rel=File-List href="spec/assets/iso_files/filelist.xml"/>
-<meta http-equiv=Content-Type content="text/html; charset=UTF-8"/>
-    <title>spec/assets/iso</title><style>
+<style>
   <!--
 /* one empty stylesheet */
 
 -->
-</style>
+</style><meta http-equiv=Content-Type content="text/html; charset=UTF-8"/>
     <style>
       <!--
 p.Sourcecode, li.Sourcecode, div.Sourcecode, pre.Sourcecode {
@@ -844,11 +843,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="#_Toc663335066">Foreword<span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB">
+<a href="#_Toc586635060">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 _Toc663335066 \h </span>
+<span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB"> PAGEREF _Toc586635060 \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>
 
@@ -881,7 +880,7 @@ Switzerland<p class="MsoNormal"></p></span></p>
 </html>
 
 
-------=_NextPart_f1bb7f88.630f.42d2
+------=_NextPart_c65e6679.db03.4744
 Content-Location: file:///C:/Doc/spec/assets/iso_files/filelist.xml
 Content-Transfer-Encoding: base64
 Content-Type: application/xml
@@ -891,7 +890,7 @@ ICAgICAgIDxvOk1haW5GaWxlIEhSZWY9Ii4uL3NwZWMvYXNzZXRzL2lzby5odG0iLz4gIDxvOkZp
 bGUgSFJlZj0iZmlsZWxpc3QueG1sIi8+CiAgPG86RmlsZSBIUmVmPSJoZWFkZXIuaHRtbCIvPgo8
 L3htbD4K
 
-------=_NextPart_f1bb7f88.630f.42d2
+------=_NextPart_c65e6679.db03.4744
 Content-Location: file:///C:/Doc/spec/assets/iso_files/header.html
 Content-Transfer-Encoding: base64
 Content-Type: text/html charset="utf-8"
@@ -1084,4 +1083,4 @@ cD4NCg0KPHAgY2xhc3M9TXNvRm9vdGVyPjxzcGFuIGxhbmc9RU4tQVUgc3R5bGU9J2ZvbnQtc2l6
 ZToxMC4wcHQ7Jz7CqQ0KJm5ic3A7Jm5ic3A74oCTIEFsbCByaWdodHMgcmVzZXJ2ZWQ8bzpwPjwv
 bzpwPjwvc3Bhbj48L3A+DQoNCjwvZGl2Pg0KDQoNCg0KPC9ib2R5Pg0KDQo8L2h0bWw+DQo=
 
-------=_NextPart_f1bb7f88.630f.42d2--
+------=_NextPart_c65e6679.db03.4744--

data/spec/assets/iso.html

@@ -1,14 +1,13 @@
 <?xml version="1.0"?>
 <!DOCTYPE html SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns:epub="http://www.idpf.org/2007/ops">
-  <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>spec/assets/iso</title><style>
+  <head><style>
   <!--
 /* another empty stylesheet */
 
 -->
-</style>
-  <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
+</style><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title></title>
+<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
 
 <!--TOC script import-->
 <script type="text/javascript" src="https://cdn.rawgit.com/jgallen23/toc/0.3.2/dist/toc.min.js"></script>

data/spec/isodoc/inline_spec.rb

@@ -205,6 +205,7 @@ RSpec.describe IsoDoc do
     <eref type="inline" bibitemid="ISO712"><locality type="table"><referenceFrom>1</referenceFrom></locality></eref>
     <eref type="inline" bibitemid="ISO712"><locality type="table"><referenceFrom>1</referenceFrom><referenceTo>1</referenceTo></locality></eref>
     <eref type="inline" bibitemid="ISO712"><locality type="clause"><referenceFrom>1</referenceFrom></locality><locality type="table"><referenceFrom>1</referenceFrom></locality></eref>
+    <eref type="inline" bibitemid="ISO712"><locality type="clause"><referenceFrom>1</referenceFrom></locality><locality type="list"><referenceFrom>a</referenceFrom></locality></eref>
     <eref type="inline" bibitemid="ISO712"><locality type="clause"><referenceFrom>1</referenceFrom></locality></eref>
     <eref type="inline" bibitemid="ISO712"><locality type="clause"><referenceFrom>1.5</referenceFrom></locality></eref>
     <eref type="inline" bibitemid="ISO712"><locality type="table"><referenceFrom>1</referenceFrom></locality>A</eref>
@@ -239,6 +240,7 @@ RSpec.describe IsoDoc do
            <a href="#ISO712">ISO 712, Table 1</a>
            <a href="#ISO712">ISO 712, Table 1&#8211;1</a>
            <a href="#ISO712">ISO 712, Clause 1, Table 1</a>
+           <a href="#ISO712">ISO 712, Clause 1, a)</a>
            <a href="#ISO712">ISO 712, Clause 1</a>
            <a href="#ISO712">ISO 712, 1.5</a>
            <a href="#ISO712">A</a>

data/spec/isodoc/postproc_spec.rb

@@ -6,6 +6,11 @@ RSpec.describe IsoDoc do
     system "rm -f test.html"
     IsoDoc::Iso::HtmlConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css", filename: "test"}).convert("test", <<~"INPUT", false)
         <iso-standard xmlns="http://riboseinc.com/isoxml">
+        <title>
+            <title-intro language="en" format="text/plain">Cereals and pulses</title-intro>
+    <title-main language="en" format="text/plain">Specifications and test methods</title-main>
+    <title-part language="en" format="text/plain">Rice</title-part>
+  </title>
     <preface><foreword>
     <note>
   <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">These results are based on a study carried out on three different types of kernel.</p>
@@ -15,7 +20,7 @@ RSpec.describe IsoDoc do
     INPUT
     expect(File.exist?("test.html")).to be true
     html = File.read("test.html")
-    expect(html).to match(%r{<title>test</title><style>})
+    expect(html).to match(%r{<title>Cereals and pulses\&nbsp;\&mdash; Specifications and test methods\&nbsp;\&mdash; Rice</title>})
     expect(html).to match(%r{cdnjs\.cloudflare\.com/ajax/libs/mathjax/2\.7\.1/MathJax\.js})
     expect(html).to match(/delimiters: \[\['\(#\(', '\)#\)'\]\]/)
   end
@@ -25,6 +30,11 @@ RSpec.describe IsoDoc do
     system "rm -f test.html"
     IsoDoc::Iso::HtmlConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css"}).convert("test", <<~"INPUT", false)
         <iso-standard xmlns="http://riboseinc.com/isoxml">
+        <title>
+            <title-intro language="en" format="text/plain">Cereals and pulses</title-intro>
+    <title-main language="en" format="text/plain">Specifications and test methods</title-main>
+    <title-part language="en" format="text/plain">Rice</title-part>
+  </title>
     <preface><foreword>
     <note>
   <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">These results are based on a study carried out on three different types of kernel.</p>
@@ -34,7 +44,7 @@ RSpec.describe IsoDoc do
     INPUT
     expect(File.exist?("test.html")).to be true
     html = File.read("test.html")
-    expect(html).to match(%r{<title>test</title><style>})
+    expect(html).to match(%r{<title>Cereals and pulses\&nbsp;\&mdash; Specifications and test methods\&nbsp;\&mdash; Rice</title>})
     expect(html).to match(%r{cdnjs\.cloudflare\.com/ajax/libs/mathjax/2\.7\.1/MathJax\.js})
     expect(html).to match(/delimiters: \[\['\(#\(', '\)#\)'\]\]/)
   end

data/spec/spec_helper.rb

@@ -135,9 +135,7 @@ HDR
 
 HTML_HDR = <<~END
         <html xmlns:epub="http://www.idpf.org/2007/ops">
-          <head>
-            <title>test</title>
-          </head>
+          <head/>
           <body lang="EN-US" link="blue" vlink="#954F72">
             <div class="title-section">
               <p>&#160;</p>
@@ -152,9 +150,9 @@ END
 
 WORD_HDR = <<~END
        <html xmlns:epub="http://www.idpf.org/2007/ops">
-         <head>
-           <title>test</title>
-         </head>
+          <head>
+            <title>test</title>
+          </head>
          <body lang="EN-US" link="blue" vlink="#954F72">
            <div class="WordSection1">
              <p>&#160;</p>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-21 00:00:00.000000000 Z
+date: 2018-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor