metanorma-standoc 1.1.8 → 1.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 824b1e03a0d0ad3473df22d417991f5e7a1dbf551143d0a810c3b0d66a126f4e
-  data.tar.gz: 67a0fe247f7c6bf8339bcd8e0188a2b301b44fd865d8c171bd39508ca42f6246
+  metadata.gz: e60988dd72d65a660d97266b8e2a0afd786b619f97e7cf948e040a1b31f7d6fc
+  data.tar.gz: ef5405bcb35b0250cbfbbf30b092a4dd0f0cbaf4435edfab0b8dcf4ddd46cc14
 SHA512:
-  metadata.gz: e1a583f8f45b49cc1645bda7eea76e45750eadec72abc248db93e980fde9d96525e6c2fa80de2092ca0db4b58b5e58159621059ceab9a4a383ecc4a67a4a8202
-  data.tar.gz: 7dfff1109a7d3fb6905840170fe738c94301c3521c65786702a5f6055756885acb20f0cf013ead5d1004bfe6e9b558bb9e679f4d45ee73e9d1cef8cbfb8d9219
+  metadata.gz: e2af11f2fecbfa996d3fda092aabcfd3803117f98afdff33471e27182db1931359acb16379eaa29a998ae3667eea31e3622029cba4c110ab1daa6063d0cf9b2c
+  data.tar.gz: 3f19ae9393a94ceb2dd768f926f14f6ea798ae8be156f9aad3fa578d9eeb93e8e7d82a0f9af1d0eeefe53cb3e5bc4578cd3e959df268c06e0dbe4274dce1fc31

data/Gemfile.lock

@@ -8,7 +8,7 @@ GIT
 PATH
   remote: .
   specs:
-    metanorma-standoc (1.1.8)
+    metanorma-standoc (1.1.9)
       asciidoctor (~> 1.5.7)
       concurrent-ruby
       html2doc (~> 0.8.0)
@@ -88,7 +88,7 @@ GEM
       algoliasearch
       iecbib (~> 0.2.1)
       iso-bib-item (~> 0.4.2)
-    isodoc (0.9.22)
+    isodoc (0.9.23)
       asciimath
       html2doc (~> 0.8.6)
       htmlentities (~> 4.3.4)
@@ -117,8 +117,8 @@ GEM
     mime-types-data (3.2019.0331)
     mini_portile2 (2.3.0)
     nenv (0.3.0)
-    nistbib (0.1.2)
-      iso-bib-item (~> 0.4.2)
+    nistbib (0.1.3)
+      relaton-bib (~> 0.1.0)
     nokogiri (1.8.5)
       mini_portile2 (~> 2.3.0)
     notiffany (0.1.1)
@@ -126,7 +126,7 @@ GEM
       shellany (~> 0.0)
     optout (0.0.2)
     parallel (1.17.0)
-    parser (2.6.2.1)
+    parser (2.6.3.0)
       ast (~> 2.4.0)
     powerpack (0.1.2)
     pry (0.12.2)
@@ -146,6 +146,8 @@ GEM
       iso-bib-item (~> 0.4.2)
       isobib (~> 0.4.0)
       nistbib (~> 0.1.1)
+    relaton-bib (0.1.1)
+      nokogiri (~> 1.8.4)
     roman-numerals (0.3.0)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)

data/lib/asciidoctor/standoc/cleanup_block.rb

@@ -233,7 +233,7 @@ module Asciidoctor
         x.xpath("//requirement | //recommendation | //permission").each do |r|
           r.children.each do |e|
             unless e.element? && (Utils::reqt_subpart(e.name) || 
-                %w(requirement recommnedation permission).include?(e.name))
+                %w(requirement recommendation permission).include?(e.name))
               t = Nokogiri::XML::Element.new("description", x)
               e.before(t)
               t.children = e.remove

data/lib/asciidoctor/standoc/inline.rb

@@ -43,7 +43,7 @@ module Asciidoctor
       def inline_anchor_link(node)
         contents = node.text
         contents = "" if node.target.gsub(%r{^mailto:}, "") == node.text
-        attributes = { "target": node.target }
+        attributes = { "target": node.target, "alt": node.attr("title") }
         noko do |xml|
           xml.link **attr_code(attributes) do |l|
             l << contents

data/lib/asciidoctor/standoc/isodoc.rng

@@ -40,6 +40,9 @@
   <define name="standard-document">
     <element name="standard-document">
       <ref name="bibdata"/>
+      <optional>
+        <ref name="boilerplate"/>
+      </optional>
       <optional>
         <ref name="preface"/>
       </optional>
@@ -64,6 +67,42 @@
       </oneOrMore>
     </element>
   </define>
+  <define name="boilerplate">
+    <element name="boilerplate">
+      <optional>
+        <ref name="copyright-statement"/>
+      </optional>
+      <optional>
+        <ref name="license-statement"/>
+      </optional>
+      <optional>
+        <ref name="legal-statement"/>
+      </optional>
+      <optional>
+        <ref name="feedback-statement"/>
+      </optional>
+    </element>
+  </define>
+  <define name="copyright-statement">
+    <element name="copyright-statement">
+      <ref name="Content-Section"/>
+    </element>
+  </define>
+  <define name="license-statement">
+    <element name="license-statement">
+      <ref name="Content-Section"/>
+    </element>
+  </define>
+  <define name="legal-statement">
+    <element name="legal-statement">
+      <ref name="Content-Section"/>
+    </element>
+  </define>
+  <define name="feedback-statement">
+    <element name="feedback-statement">
+      <ref name="Content-Section"/>
+    </element>
+  </define>
   <define name="sections">
     <element name="sections">
       <oneOrMore>
@@ -533,6 +572,9 @@
       <attribute name="id">
         <data type="ID"/>
       </attribute>
+      <optional>
+        <attribute name="alt"/>
+      </optional>
       <optional>
         <ref name="tname"/>
       </optional>
@@ -868,6 +910,9 @@
       <attribute name="type">
         <ref name="ReferenceFormat"/>
       </attribute>
+      <optional>
+        <attribute name="alt"/>
+      </optional>
       <text/>
     </element>
   </define>

data/lib/asciidoctor/standoc/table.rb

@@ -3,7 +3,8 @@ module Asciidoctor
     module Table
       def table_attrs(node)
         { id: Utils::anchor_or_uuid(node),
-          headerrows: node.attr("headerrows") }
+          headerrows: node.attr("headerrows"),
+          alt: node.attr("alt") }
       end
 
       def table(node)

data/lib/metanorma/standoc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Standoc
-    VERSION = "1.1.8".freeze
+    VERSION = "1.1.9".freeze
   end
 end

data/spec/asciidoctor-standoc/inline_spec.rb

@@ -84,12 +84,14 @@ RSpec.describe Asciidoctor::Standoc do
       mailto:fred@example.com
       http://example.com[]
       http://example.com[Link]
+      http://example.com[Link,title="tip"]
     INPUT
             #{BLANK_HDR}
        <sections>
          <p id="_">mailto:fred@example.com
        <link target="http://example.com"/>
-       <link target="http://example.com">Link</link></p>
+       <link target="http://example.com">Link</link>
+       <link target="http://example.com" alt="tip">Link</link></p>
        </sections>
        </standard-document>
     OUTPUT

data/spec/asciidoctor-standoc/table_spec.rb

@@ -114,7 +114,7 @@ RSpec.describe Asciidoctor::Standoc do
   it "processes complex tables" do
     expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
       #{ASCIIDOC_BLANK_HDR}
-      [cols="<,^,^,^,^",options="header,footer",headerrows=2]
+      [cols="<,^,^,^,^",options="header,footer",headerrows=2,alt="An extensive summary, and illustration, of tables"]
       .Maximum _permissible_ mass fraction of defects
       |===
       .2+|Defect 4+^| Maximum permissible mass fraction of defects in husked rice +
@@ -144,7 +144,7 @@ RSpec.describe Asciidoctor::Standoc do
     INPUT
             #{BLANK_HDR}
        <sections>
-         <table id="_">
+         <table id="_" alt="An extensive summary, and illustration, of tables">
          <name>Maximum <em>permissible</em> mass fraction of defects</name>
          <thead>
            <tr>

data/spec/metanorma/processor_spec.rb

@@ -51,15 +51,6 @@ RSpec.describe Metanorma::Standoc::Processor do
              <p class="zzSTDTitle1"></p>
              <div id="H"><h1>1.&#xA0; Terms and definitions</h1><p>For the purposes of this document,
            the following terms and definitions apply.</p>
-       <p>ISO and IEC maintain terminological databases for use in
-       standardization at the following addresses:</p>
-
-       <ul>
-       <li> <p>ISO Online browsing platform: available at
-         <a href="http://www.iso.org/obp">http://www.iso.org/obp</a></p> </li>
-       <li> <p>IEC Electropedia: available at
-         <a href="http://www.electropedia.org">http://www.electropedia.org</a>
-       </p> </li> </ul>
        <h2 class="TermNum" id="J">1.1.</h2>
          <p class="Terms" style="text-align:left;">Term2</p>
        </div>
@@ -80,7 +71,7 @@ RSpec.describe Metanorma::Standoc::Processor do
         </sections>
         </iso-standard>
     INPUT
-    expect(File.read("test.doc", encoding: "utf-8")).to match(/Electropedia/)
+    expect(File.read("test.doc", encoding: "utf-8")).to match(/Terms and definitions/)
     end
 
     it "generates XML from IsoDoc XML" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 1.1.8
+  version: 1.1.9
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-25 00:00:00.000000000 Z
+date: 2019-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor