metanorma-iso 1.3.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c19e6c74f9375995e56a1e37a32ddb30772d952ace1c418e69a9a833c3ab2bd2
-  data.tar.gz: b0a914f36aea83bc10d3b01f699c6f0362d83e6f63827742dc27c8bea789c958
+  metadata.gz: 0a5b90ddbeeef900695b41ef41bfeeaecc8f7863367d8c0e57ae853d55775402
+  data.tar.gz: 3bdea2158e471705e5b71f9280144060abe795184fcc625a96ad367970554c52
 SHA512:
-  metadata.gz: a98a998ebf542a21aa53996ba826827fcf6a5216b109356c40ea8edd86f4fcf18f4d8d20168e014817fac422632af5ff4326bc297600d4a5b9e42f671698aaa2
-  data.tar.gz: 004766f312b82a75a7b9831d6da6e024dcc1fc4db75f1971a4496255861e6b7a7a6d102b5e73c17c9872c3a09a0817d61d8a1614afab4c69ebe8a360527136ad
+  metadata.gz: 48ba99c04cdd298ef296cc23fb49b707f310ebb1a7d6169be010c1381bc6ab5c5214a534c4e804efe4982cd8a68d0227b9d0496a4537619b4cde4325e594fe2a
+  data.tar.gz: bcb88247191f7945477f2aecff592f5d21364b126757a2b8b5e0c9675579aa3c5ab03cdf72997189f790809cce9d80b59c529885d2b2b6089b6af63ce023c1c3

data/lib/asciidoctor/iso/basicdoc.rng

@@ -194,6 +194,14 @@
           <data type="boolean"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="subsequence"/>
+      </optional>
+      <optional>
+        <attribute name="inequality">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
       <ref name="stem"/>
       <optional>
         <ref name="dl"/>
@@ -247,6 +255,9 @@
           <data type="boolean"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="subsequence"/>
+      </optional>
       <optional>
         <attribute name="lang"/>
       </optional>
@@ -291,9 +302,15 @@
           <data type="boolean"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="subsequence"/>
+      </optional>
       <optional>
         <attribute name="alt"/>
       </optional>
+      <optional>
+        <attribute name="summary"/>
+      </optional>
       <optional>
         <attribute name="uri">
           <data type="anyURI"/>
@@ -423,6 +440,9 @@
           <data type="boolean"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="subsequence"/>
+      </optional>
       <oneOrMore>
         <choice>
           <ref name="formula"/>
@@ -486,6 +506,9 @@
           <data type="boolean"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="subsequence"/>
+      </optional>
       <optional>
         <ref name="source"/>
       </optional>
@@ -497,6 +520,8 @@
       </optional>
       <choice>
         <ref name="image"/>
+        <ref name="video"/>
+        <ref name="audio"/>
         <ref name="pre"/>
         <zeroOrMore>
           <ref name="figure"/>
@@ -792,7 +817,7 @@
     </element>
   </define>
   <define name="video">
-    <element name="image">
+    <element name="video">
       <attribute name="id">
         <data type="ID"/>
       </attribute>
@@ -833,7 +858,7 @@
     </element>
   </define>
   <define name="audio">
-    <element name="image">
+    <element name="audio">
       <attribute name="id">
         <data type="ID"/>
       </attribute>

data/lib/asciidoctor/iso/reqt.rng

@@ -30,6 +30,9 @@
         <data type="boolean"/>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="subsequence"/>
+    </optional>
     <attribute name="id">
       <data type="ID"/>
     </attribute>

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "1.3.2".freeze
+    VERSION = "1.3.3".freeze
   end
 end

data/spec/asciidoctor-iso/blocks_spec.rb

@@ -37,8 +37,7 @@ RSpec.describe Asciidoctor::ISO do
             #{BLANK_HDR}
        <sections>
          <formula id="_">
-         <stem type="AsciiMath">r = 1 %
-       r = 1 %</stem>
+         <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mi>r</mi><mo>=</mo><mn>1</mn><mi>%</mi><mi>r</mi><mo>=</mo><mn>1</mn><mi>%</mi></math></stem>
        </formula>
 
        <formula id="_">

data/spec/asciidoctor-iso/cleanup_spec.rb

@@ -142,8 +142,7 @@ RSpec.describe Asciidoctor::ISO do
     INPUT
        #{BLANK_HDR}
     <sections><formula id="_">
-  <stem type="AsciiMath">r = 1 %
-r = 1 %</stem>
+  <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mi>r</mi><mo>=</mo><mn>1</mn><mi>%</mi><mi>r</mi><mo>=</mo><mn>1</mn><mi>%</mi></math></stem>
 <note id="_">
   <p id="_">That formula does not do much</p>
 </note></formula>
@@ -666,7 +665,7 @@ r = 1 %</stem>
         <p>The following documents are referred to in the text in such a way that some or all of their content constitutes requirements of this document. For dated references, only the edition cited applies. For undated references, the latest edition of the referenced document (including any amendments) applies.</p>
         <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/refs_spec.rb

@@ -20,7 +20,7 @@ RSpec.describe Asciidoctor::ISO do
          <p>The following documents are referred to in the text in such a way that some or all of their content constitutes requirements of this document. For dated references, only the edition cited applies. For undated references, the latest edition of the referenced document (including any amendments) applies.</p>
          <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/isodoc/postproc_spec.rb

@@ -22,7 +22,7 @@ RSpec.describe IsoDoc do
     </iso-standard>
     INPUT
     expect(File.exist?("test.html")).to be true
-    html = File.read("test.html")
+    html = File.read("test.html", encoding: "UTF-8")
     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/})
     expect(html).to match(/delimiters: \[\['\(#\(', '\)#\)'\]\]/)
@@ -48,7 +48,7 @@ RSpec.describe IsoDoc do
     </iso-standard>
     INPUT
     expect(File.exist?("test.html")).to be true
-    html = File.read("test.html")
+    html = File.read("test.html", encoding: "UTF-8")
     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/})
     expect(html).to match(/delimiters: \[\['\(#\(', '\)#\)'\]\]/)
@@ -67,7 +67,7 @@ RSpec.describe IsoDoc do
     </iso-standard>
     INPUT
     expect(File.exist?("test.doc")).to be true
-    word = File.read("test.doc")
+    word = File.read("test.doc", encoding: "UTF-8")
     expect(word).to match(/<style>/)
   end
 
@@ -76,7 +76,7 @@ RSpec.describe IsoDoc do
     FileUtils.rm_f "spec/assets/iso.html"
     IsoDoc::Iso::HtmlConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css"}).convert("spec/assets/iso.xml", nil, false)
     expect(File.exist?("spec/assets/iso.html")).to be true
-    html = File.read("spec/assets/iso.html")
+    html = File.read("spec/assets/iso.html", encoding: "UTF-8")
     expect(html).to match(/<style>/)
     expect(html).to match(%r{https://use.fontawesome.com})
     expect(html).to match(%r{libs/jquery})
@@ -86,7 +86,7 @@ RSpec.describe IsoDoc do
     FileUtils.rm_f "spec/assets/iso.doc"
     IsoDoc::Iso::WordConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css"}).convert("spec/assets/iso.xml", nil, false)
     expect(File.exist?("spec/assets/iso.doc")).to be true
-    word = File.read("spec/assets/iso.doc")
+    word = File.read("spec/assets/iso.doc", encoding: "UTF-8")
     expect(word).to match(/<w:WordDocument>/)
     expect(word).to match(/<style>/)
   end
@@ -107,7 +107,7 @@ RSpec.describe IsoDoc do
     </annex>
     </iso-standard>
     INPUT
-    word = File.read("test.doc").sub(/^.*<div class="WordSection3">/m, '<div class="WordSection3">').
+    word = File.read("test.doc", encoding: "UTF-8").sub(/^.*<div class="WordSection3">/m, '<div class="WordSection3">').
       sub(%r{<div style="mso-element:footnote-list"/>.*$}m, "")
     expect(word).to be_equivalent_to <<~"OUTPUT"
            <div class="WordSection3">
@@ -150,7 +150,7 @@ RSpec.describe IsoDoc do
 </iso-standard>
 
     INPUT
-    word = File.read("test.doc").sub(/^.*<div class="WordSection3">/m, '<div class="WordSection3">').
+    word = File.read("test.doc", encoding: "UTF-8").sub(/^.*<div class="WordSection3">/m, '<div class="WordSection3">').
       sub(%r{<div style="mso-element:footnote-list"/>.*$}m, "")
     expect(word).to be_equivalent_to <<~"OUTPUT"
            <div class="WordSection3">
@@ -177,7 +177,7 @@ RSpec.describe IsoDoc do
 </iso-standard>
 
     INPUT
-    word = File.read("test.doc").sub(%r{^.*Content-Location: file:///C:/Doc/test_files/header.html}m, "Content-Location: file:///C:/Doc/test_files/header.html").
+    word = File.read("test.doc", encoding: "UTF-8").sub(%r{^.*Content-Location: file:///C:/Doc/test_files/header.html}m, "Content-Location: file:///C:/Doc/test_files/header.html").
       sub(/------=_NextPart.*$/m, "")
     #expect(word).to include(%{Content-Location: file:///C:/Doc/test_files/header.html\nContent-Transfer-Encoding: base64\nContent-Type: text/html charset="utf-8" })
     expect(word).to include(%{Content-Location: file:///C:/Doc/test_files/header.html})
@@ -204,7 +204,7 @@ RSpec.describe IsoDoc do
         </iso-standard>
 
     INPUT
-    word = File.read("test.doc").sub(/^.*An empty word intro page\./m, '').
+    word = File.read("test.doc", encoding: "UTF-8").sub(/^.*An empty word intro page\./m, '').
       sub(%r{<br clear="all" class="section"/>\s*<div class="WordSection3">.*$}m, "")
     expect(word.gsub(/_Toc\d\d+/, "_Toc")).to be_equivalent_to <<~'OUTPUT'
        <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
@@ -281,7 +281,7 @@ RSpec.describe IsoDoc do
         </sections>
         </iso-standard>
     INPUT
-    html = File.read("test.html").sub(/^.*<main class="main-section">/m, '<main class="main-section">').
+    html = File.read("test.html", encoding: "UTF-8").sub(/^.*<main class="main-section">/m, '<main class="main-section">').
       sub(%r{</main>.*$}m, "</main>")
     expect(html).to be_equivalent_to <<~"OUTPUT"
            <main class="main-section"><button onclick="topFunction()" id="myBtn" title="Go to top">Top</button>
@@ -329,7 +329,7 @@ RSpec.describe IsoDoc do
        </foreword></preface>
         </iso-standard>
     INPUT
-    html = File.read("test.html").sub(/^.*<main class="main-section">/m, '<main class="main-section">').
+    html = File.read("test.html", encoding: "UTF-8").sub(/^.*<main class="main-section">/m, '<main class="main-section">').
       sub(%r{</main>.*$}m, "</main>")
     expect(`ls test_htmlimages`).to match(/\.png$/)
     expect(html.gsub(/\/[0-9a-f-]+\.png/, "/_.png")).to be_equivalent_to <<~"OUTPUT"
@@ -403,7 +403,7 @@ RSpec.describe IsoDoc do
 </iso-standard>
     INPUT
     expect(File.exist?("test.html")).to be true
-    html = File.read("test.html")
+    html = File.read("test.html", encoding: "UTF-8")
     expect(html).to match(%r{<h2 class="TermNum" id="paddy1">1\.1</h2>})
     expect(html).to match(%r{<h2 class="TermNum" id="paddy">1\.2</h2>})
   end
@@ -423,7 +423,7 @@ RSpec.describe IsoDoc do
     </annex>
     </iso-standard>
     INPUT
-    word = File.read("test.doc").sub(/^.*<div class="WordSection3">/m, '<div class="WordSection3">').
+    word = File.read("test.doc", encoding: "UTF-8").sub(/^.*<div class="WordSection3">/m, '<div class="WordSection3">').
       sub(%r{<div style="mso-element:footnote-list"/>.*$}m, "")
     expect(word).to be_equivalent_to <<~"OUTPUT"
          <div class="WordSection3">
@@ -463,7 +463,7 @@ RSpec.describe IsoDoc do
     </annex>
     </iso-standard>
     INPUT
-    word = File.read("test.doc").sub(/^.*<div class="WordSection3">/m, '<div class="WordSection3">').
+    word = File.read("test.doc", encoding: "UTF-8").sub(/^.*<div class="WordSection3">/m, '<div class="WordSection3">').
       sub(%r{<div style="mso-element:footnote-list"/>.*$}m, "")
     expect(word).to be_equivalent_to <<~"OUTPUT"
        <div class="WordSection3">

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-12 00:00:00.000000000 Z
+date: 2019-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor