metanorma-standoc 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ade6c1c0ec2ee0ab99b2442458300ff20d4ff4f54852d27555c12102325bde55
-  data.tar.gz: 8438c7af3cdb3950dfef74a6834a5110dd6fdb64b8919b491f1e0c3899ced318
+  metadata.gz: 51e50247eb8a0979d7d568867bd281252a690b8373f3e05436840cadfb00edd5
+  data.tar.gz: 7c00c5489a948885f561b55710399253cd8e0ecc38d1ea12538d07d9459a8c0c
 SHA512:
-  metadata.gz: 5d4932ccc12e249099226f62fccfd08e116d362c1b0b045e758325db52fa0f2425ffa8b197d106cd4fcb4d7b28ba8a1fcacaacba5cc69be2391e74ced1b3ecac
-  data.tar.gz: 8eda800af76b44522d194711cc5272387b8e1c996713db8c54ff1a0dbbad86b229b9cd1feb3139c45cbbfec326d92503eb51fea857c007958588aaf36cc67e2c
+  metadata.gz: 34c5e293d54c6c32466722efdfb6f2dfaef4939b03ebf676acaf591f52488516f4a2c95deea3b46c8f8c5870c770904afc3a5ec0c140109c7f3cf5eab9c47a8b
+  data.tar.gz: 9779488fe79002cf065a0ccff2802477096175c1d0e166adeb3fb6d92ffbe8a3f97aead0008b93dfd684044877892e876aa5de34ee1e7832a9beddcd836113f4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    metanorma-standoc (1.1.0)
+    metanorma-standoc (1.1.1)
       asciidoctor (~> 1.5.7)
       concurrent-ruby
       iev (~> 0.2.0)
@@ -13,7 +13,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.5.2)
+    addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
     algoliasearch (1.25.2)
       httpclient (~> 2.8, >= 2.8.3)
@@ -80,13 +80,13 @@ GEM
       algoliasearch
       iecbib (~> 0.2.1)
       iso-bib-item (~> 0.4.2)
-    isodoc (0.9.14)
+    isodoc (0.9.15)
       asciimath
       html2doc (~> 0.8.6)
       htmlentities (~> 4.3.4)
       liquid
       metanorma (~> 0.3.0)
-      nokogiri
+      nokogiri (>= 1)
       rake (~> 12.0)
       roman-numerals
       ruby-xslt
@@ -101,7 +101,7 @@ GEM
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
     lumberjack (1.0.13)
-    metanorma (0.3.5)
+    metanorma (0.3.7)
       asciidoctor
     method_source (0.9.2)
     mime-types (3.2.2)
@@ -115,8 +115,8 @@ GEM
       nenv (~> 0.1)
       shellany (~> 0.0)
     optout (0.0.2)
-    parallel (1.12.1)
-    parser (2.5.3.0)
+    parallel (1.13.0)
+    parser (2.6.0.0)
       ast (~> 2.4.0)
     powerpack (0.1.2)
     pry (0.12.2)

data/README.adoc

@@ -1,7 +1,7 @@
 = Metanorma-standoc
 
 image:https://img.shields.io/gem/v/metanorma-standoc.svg["Gem Version", link="https://rubygems.org/gems/metanorma-standoc"]
-image:https://img.shields.io/travis/riboseinc/metanorma-standoc/master.svg["Build Status", link="https://travis-ci.com/riboseinc/metanorma-standoc"]
+image:https://img.shields.io/travis/riboseinc/metanorma-standoc/master.svg["Build Status", link="https://travis-ci.org/riboseinc/metanorma-standoc"]
 image:https://codeclimate.com/github/riboseinc/metanorma-standoc/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/riboseinc/metanorma-standoc"]
 
 WARNING: This gem is still under development.

data/lib/asciidoctor/standoc/blocks.rb

@@ -139,7 +139,8 @@ module Asciidoctor
           id: Utils::anchor_or_uuid,
           imagetype: types.first.sub_type.upcase,
           height: node.attr("height") || "auto",
-          width: node.attr("width") || "auto" }
+          width: node.attr("width") || "auto" ,
+          alt: node.alt == node.attr("default-alt") ? nil : node.alt }
       end
 
       def figure_title(node, f)

data/lib/asciidoctor/standoc/front.rb

@@ -140,12 +140,12 @@ module Asciidoctor
       end
 
       def metadata_source(node, xml)
-        node.attr("uri") && xml.source(node.attr("uri"))
-        node.attr("xml-uri") && xml.source(node.attr("xml-uri"), type: "xml")
-        node.attr("html-uri") && xml.source(node.attr("html-uri"), type: "html")
-        node.attr("pdf-uri") && xml.source(node.attr("pdf-uri"), type: "pdf")
-        node.attr("doc-uri") && xml.source(node.attr("doc-uri"), type: "doc")
-        node.attr("relaton-uri") && xml.source(node.attr("relaton-uri"), type: "relaton")
+        node.attr("uri") && xml.uri(node.attr("uri"))
+        node.attr("xml-uri") && xml.uri(node.attr("xml-uri"), type: "xml")
+        node.attr("html-uri") && xml.uri(node.attr("html-uri"), type: "html")
+        node.attr("pdf-uri") && xml.uri(node.attr("pdf-uri"), type: "pdf")
+        node.attr("doc-uri") && xml.uri(node.attr("doc-uri"), type: "doc")
+        node.attr("relaton-uri") && xml.uri(node.attr("relaton-uri"), type: "relaton")
       end
 
       def metadata_date1(node, xml, type)
@@ -184,9 +184,9 @@ module Asciidoctor
         metadata_source(node, xml)
         metadata_id(node, xml)
         metadata_date(node, xml)
-        metadata_version(node, xml)
         metadata_author(node, xml)
         metadata_publisher(node, xml)
+        metadata_version(node, xml)
         metadata_language(node, xml)
         metadata_script(node, xml)
         metadata_status(node, xml)

data/lib/asciidoctor/standoc/isodoc.rng

@@ -911,6 +911,9 @@
           </choice>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="alt"/>
+      </optional>
     </element>
   </define>
   <define name="stem">

data/lib/asciidoctor/standoc/utils.rb

@@ -110,7 +110,7 @@ module Asciidoctor
         fragment = doc.fragment("")
         ::Nokogiri::XML::Builder.with fragment, &block
         fragment.to_xml(encoding: "US-ASCII").lines.map do |l|
-          l.gsub(/\s*\n/, "")
+          l.gsub(/\s*\n/, " ")
         end
       end
 

data/lib/metanorma/standoc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Standoc
-    VERSION = "1.1.0".freeze
+    VERSION = "1.1.1".freeze
   end
 end

data/spec/asciidoctor-standoc/base_spec.rb

@@ -279,12 +279,12 @@ RSpec.describe Asciidoctor::Standoc do
        <bibdata type="article">
          <title language="en" format="text/plain">Document title</title>
          <title language="eo" format="text/plain">Dokumenttitolo</title>
-         <source>A</source>
-         <source type="xml">B</source>
-         <source type="html">C</source>
-         <source type="pdf">D</source>
-         <source type="doc">E</source>
-         <source type="relaton">F</source>
+         <uri>A</uri>
+         <uri type="xml">B</uri>
+         <uri type="html">C</uri>
+         <uri type="pdf">D</uri>
+         <uri type="doc">E</uri>
+         <uri type="relaton">F</uri>
          <docidentifier>1000-1-1</docidentifier>
          <docnumber>1000</docnumber>
          <contributor>

data/spec/asciidoctor-standoc/blocks_spec.rb

@@ -308,14 +308,14 @@ RSpec.describe Asciidoctor::Standoc do
       expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
       #{ASCIIDOC_BLANK_HDR}
       .Split-it-right sample divider
-      image::spec/examples/rice_images/rice_image1.png[]
+      image::spec/examples/rice_images/rice_image1.png[alttext]
 
       INPUT
       #{BLANK_HDR}
               <sections>
          <figure id="_">
          <name>Split-it-right sample divider</name>
-                  <image src="spec/examples/rice_images/rice_image1.png" id="_" imagetype="PNG" height="auto" width="auto"/>
+                  <image src="spec/examples/rice_images/rice_image1.png" id="_" imagetype="PNG" height="auto" width="auto" alt="alttext"/>
        </figure>
        </sections>
        </standard-document>
@@ -364,7 +364,7 @@ RSpec.describe Asciidoctor::Standoc do
       INPUT
       #{BLANK_HDR}
               <sections>
-          <p id="_">Hello <image src="spec/examples/rice_images/rice_image1.png" id="_" imagetype="PNG" height="3" width="4"/>, how are you?</p>
+          <p id="_">Hello <image src="spec/examples/rice_images/rice_image1.png" id="_" imagetype="PNG" height="3" width="4" alt="alt"/>, how are you?</p>
        </figure>
        </sections>
        </standard-document>

data/spec/asciidoctor-standoc/inline_spec.rb

@@ -4,7 +4,8 @@ RSpec.describe Asciidoctor::Standoc do
   it "processes inline_quoted formatting" do
     expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
       #{DUMBQUOTE_BLANK_HDR}
-      _emphasis_
+      _Physical noise
+      sources_
       *strong*
       `monospace`
       "double quote"
@@ -23,7 +24,7 @@ RSpec.describe Asciidoctor::Standoc do
     INPUT
             #{BLANK_HDR}
        <sections>
-         <em>emphasis</em>
+       <em>Physical noise sources</em>
        <strong>strong</strong>
        <tt>monospace</tt>
        "double quote"

data/spec/metanorma/processor_spec.rb

@@ -14,7 +14,7 @@ RSpec.describe Metanorma::Standoc::Processor do
 
   it "registers output formats against metanorma" do
     expect(processor.output_formats.sort.to_s).to be_equivalent_to <<~"OUTPUT"
-    [[:doc, "doc"], [:html, "html"], [:xml, "xml"]]
+    [[:doc, "doc"], [:html, "html"], [:rxl, "rxl"], [:xml, "xml"]]
     OUTPUT
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-15 00:00:00.000000000 Z
+date: 2019-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor