metanorma-standoc 1.0.12 → 1.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df3bc5fdf41e7916256d3f763868f63c5bd8fe02365db0fe5d37d1efcaedda7e
-  data.tar.gz: 051d1a4cb3849e2b843feb62290f557d3ef07182a23699c4bbc1312345f1d143
+  metadata.gz: 021021d1bd53dd9011a83d465073805d52c54931bcb4084317a121147b556a6a
+  data.tar.gz: 3e4ea599f6df9d42a41ee7e6e1886f82553ab04cde4c38411dc48044de9277b4
 SHA512:
-  metadata.gz: 2f7c94c8c0a8e81a9b064e4e679fcb2b48801a991d2d75aa852870a596879b0d9c4b9090c63fb03c789a712a2a2cf5de85ea92699318f91773236533dfc48a6d
-  data.tar.gz: ffac3ee6a7820406d9a138839e65e3e57cc073298335930999040ac7ba71c2e5126b94f99e94fcde403669a2edc95818de440d5eaebf63412c09acce39c923b8
+  metadata.gz: df869dbccb358ca2de8bd49f4350fc0f45154cbf18f78f39ab8369de01302d32bccc1d8c5527bcc593bbd8ea75990be92ec592182abbb68bcc4db38652051ebe
+  data.tar.gz: 352d4574be35edc5496eac9dd3227f91fc026d0bc273d7c0e63909218366139966815765256bbbc0b5a1e8c59b2c43aa4267b72257ebd667a58520d1ba0c63cf

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    metanorma-standoc (1.0.12)
+    metanorma-standoc (1.0.13)
       asciidoctor (~> 1.5.7)
       concurrent-ruby
       iev (~> 0.2.0)
@@ -24,7 +24,7 @@ GEM
     byebug (10.0.2)
     cnccs (0.1.3)
     coderay (1.1.2)
-    concurrent-ruby (1.1.3)
+    concurrent-ruby (1.1.4)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     diff-lcs (1.3)
@@ -80,7 +80,7 @@ GEM
       algoliasearch
       iecbib (~> 0.2.1)
       iso-bib-item (~> 0.4.2)
-    isodoc (0.9.12)
+    isodoc (0.9.13)
       asciimath
       html2doc (~> 0.8.6)
       htmlentities (~> 4.3.4)
@@ -126,8 +126,8 @@ GEM
     rainbow (3.0.0)
     rake (12.3.2)
     rb-fsevent (0.10.3)
-    rb-inotify (0.9.10)
-      ffi (>= 0.5.0, < 2)
+    rb-inotify (0.10.0)
+      ffi (~> 1.0)
     relaton (0.3.1)
       algoliasearch
       gbbib (~> 0.4.0)
@@ -210,4 +210,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   1.17.1
+   1.17.2

data/lib/asciidoctor/standoc/base.rb

@@ -86,10 +86,13 @@ module Asciidoctor
         @files_to_delete = []
         @filename = node.attr("docfile") ?
           node.attr("docfile").gsub(/\.adoc$/, "").gsub(%r{^.*/}, "") : ""
+        @localdir = %r{/}.match(node.attr("docfile")) ?
+          node.attr("docfile").sub(%r{/[^/]+$}, "/") : "./"
         @no_isobib_cache = node.attr("no-isobib-cache")
         @no_isobib = node.attr("no-isobib")
         @bibdb = nil
         @seen_headers = []
+        @datauriimage = node.attr("data-uri-image")
         init_bib_caches(node)
         init_iev_caches(node)
       end

data/lib/asciidoctor/standoc/blocks.rb

@@ -1,5 +1,7 @@
 require "htmlentities"
 require "uri"
+require "mime/types"
+require "base64"
 
 module Asciidoctor
   module Standoc
@@ -122,10 +124,18 @@ module Asciidoctor
         end.join("\n")
       end
 
+      def datauri(uri)
+        types = MIME::Types.type_for(@localdir + uri)
+        type = types ? types.first.to_s : 'text/plain; charset="utf-8"'
+        bin = File.read(@localdir + uri, encoding: "utf-8")
+        data = Base64.strict_encode64(bin)
+        "data:#{type};base64,#{data}"
+      end
+
       def image_attributes(node)
         uri = node.image_uri node.attr("target")
         types = MIME::Types.type_for(uri)
-        { src: uri,
+        { src: @datauriimage ? datauri(uri) : uri,
           id: Utils::anchor_or_uuid,
           imagetype: types.first.sub_type.upcase,
           height: node.attr("height") || "auto",
@@ -185,8 +195,10 @@ module Asciidoctor
       def listing(node)
         # NOTE: html escaping is performed by Nokogiri
         noko do |xml|
-          xml.sourcecode(**id_attr(node)) { |s| s << node.content }
-          # xml.sourcecode(**id_attr(node)) { |s| s << node.lines.join("\n") }
+          xml.sourcecode(**id_attr(node)) do |s|
+            figure_title(node, s)
+            s << node.content
+          end
         end
       end
     end

data/lib/asciidoctor/standoc/cleanup.rb

@@ -48,7 +48,7 @@ module Asciidoctor
         return unless @smartquotes
         xmldoc.traverse do |n|
           next unless n.text?
-          next unless n.ancestors("pre, tt, sourcecode, bibdata").empty?
+          next unless n.ancestors("pre, tt, sourcecode, bibdata, on").empty?
           n.replace(Utils::smartformat(n.text))
         end
         xmldoc

data/lib/asciidoctor/standoc/utils.rb

@@ -34,7 +34,7 @@ module Asciidoctor
 
         def smartformat(n)
           n.gsub(/ -- /, " — ").
-                      gsub(/--/, "—").smart_format
+            gsub(/--/, "&#8212;").smart_format.gsub(/</, "&lt;").gsub(/>/, "&gt;")
         end
 
         def smart_render_xml(x)

data/lib/metanorma/standoc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Standoc
-    VERSION = "1.0.12".freeze
+    VERSION = "1.0.13".freeze
   end
 end

data/spec/asciidoctor-standoc/blocks_spec.rb

@@ -356,6 +356,21 @@ RSpec.describe Asciidoctor::Standoc do
       OUTPUT
     end
 
+        it "processes images as datauri" do
+      expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true))).to include '<image src="data:image/png;base64'
+      = Document title
+      Author
+      :docfile: test.adoc
+      :nodoc:
+      :novalid:
+      :no-isobib:
+      :data-uri-image:
+
+      .Split-it-right sample divider
+      image::spec/examples/rice_images/rice_image1.png[]
+      INPUT
+    end
+
     it "accepts alignment attribute on paragraphs" do
       expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
       #{ASCIIDOC_BLANK_HDR}
@@ -393,6 +408,7 @@ RSpec.describe Asciidoctor::Standoc do
     it "processes source code" do
       expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
       #{ASCIIDOC_BLANK_HDR}
+      .Caption
       [source,ruby]
       --
       puts "Hello, world."
@@ -403,7 +419,7 @@ RSpec.describe Asciidoctor::Standoc do
       INPUT
       #{BLANK_HDR}
        <sections>
-         <sourcecode id="_">puts "Hello, world."
+         <sourcecode id="_"><name>Caption</name>puts "Hello, world."
        %w{a b c}.each do |x|
          puts x
        end</sourcecode>

data/spec/asciidoctor-standoc/cleanup_spec.rb

@@ -96,6 +96,22 @@ RSpec.describe Asciidoctor::Standoc do
     OUTPUT
   end
 
+  it "handles < > &amp; in Asciidoctor correctly" do
+    expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
+      #{ASCIIDOC_BLANK_HDR}
+      == {blank}
+
+      <&amp;>
+    INPUT
+       #{BLANK_HDR}
+              <sections>
+         <clause id="_" inline-header="false" obligation="normative">
+<p id="_">&lt;&amp;&gt;</p>
+       </clause>
+       </sections>
+       </standard-document>
+    OUTPUT
+  end
 
   it "removes empty text elements" do
     expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
@@ -750,7 +766,7 @@ r = 1 %</stem>
          <title format="text/plain">Standard</title>
          <docidentifier>ISO 123:—</docidentifier>
          <date type="published">
-           <on>—</on>
+           <on>--</on>
          </date>
          <contributor>
            <role type="publisher"/>

data/spec/asciidoctor-standoc/refs_spec.rb

@@ -320,7 +320,7 @@ RSpec.describe Asciidoctor::Standoc do
          <title format="text/plain">Standard</title>
          <docidentifier>ISO 123:—</docidentifier>
          <date type="published">
-           <on>—</on>
+           <on>--</on>
          </date>
          <contributor>
            <role type="publisher"/>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 1.0.12
+  version: 1.0.13
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-11 00:00:00.000000000 Z
+date: 2018-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor