asciidoctor-html5s 0.1.0.beta.11 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9072cf9f64b3d874247c3d236eb74ea5373961c1a6d60e6cff310f60365d077
-  data.tar.gz: 1f9e5a1e368753ec09b49007f06f0b74785b34db7d4f72061e9f7ca7290f7aa1
+  metadata.gz: af32231a91e01ff0a316159145979917985ca2e69c0f0775c6082fe2ddcc10f8
+  data.tar.gz: 6f87d67ef1d15e90c446732f3dc1844c88d9c0951fee91cfc2cfe131d44c2989
 SHA512:
-  metadata.gz: 82170204752958af610a625c76fc0fb8f1ce1ac35219b46445f8c0c8dbed8530d07453e7fd7b0bd541ebf10bbb442ec8091c9f47c06fcf56bbbe93294f0edaca
-  data.tar.gz: b96df671bc00d7aabeca8eea657d9e6d8b98d5b85d06064513f204fcd9d4895b35ec3574328323a9b2210be0d74b8311ec37b7bff761794582dc441e9812cbf4
+  metadata.gz: c8c055a99d80711ccc2e2bceb00206275cf586fadb4d9c61fb7a37cdfa7b6d77047ecb69cb8b7c2225b021c75d1731ccd2a94c7b71398bbc9a4c127e71495605
+  data.tar.gz: 35a1f226f415061c31d9afc188252d1075b9bd3c764bbf94280a6a98dfa0d0328de582175aa3be5af9c61892cb280abc80cac03068df7aa49d70c76e113ad40b

data/README.adoc

@@ -110,10 +110,23 @@ When flanked by space characters (e.g. `+a -- b+` or `+a --- b+`), the normal sp
 |===
 
 
+== Other Enhancements
+
+=== Image Block
+
+The `link` attribute recognizes few special values:
+
+link=self::
+  Make the image a link with URL of the image itself – to open it in full size.
+
+link=none / link=false::
+  Suppress the effect of `:html5s-image-default-link: self`, i.e. remove the default image link.
+
+
 == Requirements
 
 * https://www.ruby-lang.org/[Ruby] 2.0+, http://jruby.org/[JRuby] 9.1+ or https://nodejs.org/[Node.js]
-* https://rubygems.org/gems/asciidoctor/[Asciidoctor] 1.5.5+ or https://www.npmjs.com/package/asciidoctor.js[asciidoctor.js] 1.5.5
+* https://rubygems.org/gems/asciidoctor/[Asciidoctor] 1.5.5+ or https://www.npmjs.com/package/asciidoctor.js[asciidoctor.js] 1.5.6
 * https://rubygems.org/gems/thread_safe/[thread_safe] (not required, but recommended for Ruby MRI)
 
 Note: This converter consists of https://github.com/slim-template/slim/[Slim] templates, but they are precompiled into pure Ruby code using https://github.com/jirutka/asciidoctor-templates-compiler/[asciidoctor-templates-compiler], so you don’t need Slim to use it!
@@ -176,6 +189,13 @@ html5s-force-stem-type::
   Ignore declared (e.g. `:stem: asciimath`, `asciimath:[]`, ...) and default type of the stem macro/block and always use the one specified by this attribute. +
   Asciidoctor hard-codes the default stem type to “asciimath”, which is not supported by KaTeX.
 
+html5s-image-default-link: self::
+  Make every block image a link with the image’s source URL (i.e. user can click on the image to open it in full size), unless the link attribute is defined and is not `none` or `false`.
+
+html5s-image-self-link-label::
+  The link title and ARIA label for the block image link that points to the image file (i.e. `href` equals the image’s `src`).
+  Default is `Open the image in full size`.
+
 
 == License
 

data/asciidoctor-html5s.gemspec

@@ -25,7 +25,7 @@ EOF
   s.add_runtime_dependency 'thread_safe', '~> 0.3.4'
 
   s.add_development_dependency 'asciidoctor-doctest', '= 2.0.0.beta.4'
-  s.add_development_dependency 'asciidoctor-templates-compiler', '~> 0.4.1'
+  s.add_development_dependency 'asciidoctor-templates-compiler', '~> 0.5.0'
   s.add_development_dependency 'bundler', '~> 1.6'
   s.add_development_dependency 'coderay', '~> 1.1'
   s.add_development_dependency 'rake', '~> 10.0'

data/data/templates/helpers.rb

@@ -422,6 +422,34 @@ module Slim::Helpers
     end
   end
 
+  #--------------------------------------------------------
+  # block_image
+  #
+
+  ##
+  # @return [String, nil] an URL for the image's link.
+  def image_link
+    @_html5s_image_link ||=
+      case (link = attr(:link))
+      when 'none', 'false'
+        return
+      when 'self'
+        image_uri(attr(:target))
+      when nil, ''
+        image_uri(attr(:target)) if document.attr?('html5s-image-default-link', 'self')
+      else
+        link
+      end
+  end
+
+  ##
+  # @return [String, nil] a label/title of the image link.
+  def image_link_label
+    if image_uri(attr(:target)) == image_link
+      document.attr('html5s-image-self-link-label', 'Open the image in full size')
+    end
+  end
+
   #--------------------------------------------------------
   # block_listing
   #
@@ -526,6 +554,7 @@ is book and it's a child of a book part. Excluding block content."
       "//www.youtube.com/embed/#{video_id}#{url_query params}"
     else
       anchor = [attr(:start), attr(:end)].join(',').chomp(',')
+      anchor = '' if anchor == ','  # XXX: https://github.com/opal/opal/issues/1902
       anchor = '#t=' + anchor unless anchor.empty?
       media_uri "#{attr :target}#{anchor}"
     end

data/data/templates/image.html.slim

@@ -1,3 +1,10 @@
 = block_with_caption(:bottom, :class=>'image-block', :style=>style_value(text_align: (attr :align), float: (attr :float)))
-  = html_tag_if(attr?(:link), :a, :class=>'image', :href=>(attr :link), :target=>(attr :window), :rel=>link_rel)
-    img src=image_uri(attr :target) alt=(attr :alt) width=(attr :width) height=(attr :height)
+  - target_url = image_uri(attr :target)
+  = html_tag_if(image_link, :a,
+      :class=>['image', ('bare' if image_link == target_url)],
+      :href=>image_link,
+      :title=>image_link_label,
+      'aria-label'=>image_link_label,
+      :target=>(attr :window),
+      :rel=>link_rel)
+    img src=target_url alt=(attr :alt) width=(attr :width) height=(attr :height)

data/data/templates/outline.html.slim

@@ -1,5 +1,6 @@
 - unless sections.empty?
-  - toclevels ||= (document.attr 'toclevels', DEFAULT_TOCLEVELS).to_i
+  / XXX: opts[:toclevels] is workaround for Opal (see asciidoctor-templates-compiler)
+  - toclevels ||= opts[:toclevels] || (document.attr 'toclevels', DEFAULT_TOCLEVELS).to_i
   - slevel = section_level sections.first
   ol.toc-list class="level-#{slevel}"
     - sections.each do |sec|

data/lib/asciidoctor/html5s/converter.rb

@@ -429,6 +429,34 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
       end
     end
 
+    #--------------------------------------------------------
+    # block_image
+    #
+
+    ##
+    # @return [String, nil] an URL for the image's link.
+    def image_link
+      @_html5s_image_link ||=
+        case (link = attr(:link))
+        when 'none', 'false'
+          return
+        when 'self'
+          image_uri(attr(:target))
+        when nil, ''
+          image_uri(attr(:target)) if document.attr?('html5s-image-default-link', 'self')
+        else
+          link
+        end
+    end
+
+    ##
+    # @return [String, nil] a label/title of the image link.
+    def image_link_label
+      if image_uri(attr(:target)) == image_link
+        document.attr('html5s-image-self-link-label', 'Open the image in full size')
+      end
+    end
+
     #--------------------------------------------------------
     # block_listing
     #
@@ -533,6 +561,7 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
         "//www.youtube.com/embed/#{video_id}#{url_query params}"
       else
         anchor = [attr(:start), attr(:end)].join(',').chomp(',')
+        anchor = '' if anchor == ','  # XXX: https://github.com/opal/opal/issues/1902
         anchor = '#t=' + anchor unless anchor.empty?
         media_uri "#{attr :target}#{anchor}"
       end
@@ -745,7 +774,6 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
   def admonition(node, opts = {})
     node.extend(Helpers)
     node.instance_eval do
-      converter.set_local_variables(binding, opts) unless opts.empty?
       _buf = []; capture do; 
       ; _buf << ("<h6"); _temple_html_attributeremover1 = []; _temple_html_attributemerger1 = []; _temple_html_attributemerger1[0] = "block-title"; _temple_html_attributemerger1[1] = []; _slim_codeattributes1 = ('label-only' unless title?); if Array === _slim_codeattributes1; _slim_codeattributes1 = _slim_codeattributes1.flatten; _slim_codeattributes1.map!(&:to_s); _slim_codeattributes1.reject!(&:empty?); _temple_html_attributemerger1[1] << (_slim_codeattributes1.join(" ")); else; _temple_html_attributemerger1[1] << (_slim_codeattributes1); end; _temple_html_attributemerger1[1] = _temple_html_attributemerger1[1].join(""); _temple_html_attributeremover1 << (_temple_html_attributemerger1.reject(&:empty?).join(" ")); _temple_html_attributeremover1 = _temple_html_attributeremover1.join(""); if !_temple_html_attributeremover1.empty?; _buf << (" class=\""); _buf << (_temple_html_attributeremover1); _buf << ("\""); end; _buf << ("><span class=\"title-label\">"); 
       ; _buf << ("#{local_attr :textlabel}: "); 
@@ -765,7 +793,6 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
   def audio(node, opts = {})
     node.extend(Helpers)
     node.instance_eval do
-      converter.set_local_variables(binding, opts) unless opts.empty?
       _buf = []; _slim_controls1 = block_with_caption :bottom, :class=>'audio-block' do; _slim_controls2 = []; 
       ; 
       ; 
@@ -780,7 +807,6 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
   def colist(node, opts = {})
     node.extend(Helpers)
     node.instance_eval do
-      converter.set_local_variables(binding, opts) unless opts.empty?
       _buf = []; 
       ; _buf << ("<ol"); _temple_html_attributeremover1 = []; _temple_html_attributemerger1 = []; _temple_html_attributemerger1[0] = "callout-list"; _temple_html_attributemerger1[1] = []; _slim_codeattributes1 = [style, role]; if Array === _slim_codeattributes1; _slim_codeattributes1 = _slim_codeattributes1.flatten; _slim_codeattributes1.map!(&:to_s); _slim_codeattributes1.reject!(&:empty?); _temple_html_attributemerger1[1] << (_slim_codeattributes1.join(" ")); else; _temple_html_attributemerger1[1] << (_slim_codeattributes1); end; _temple_html_attributemerger1[1] = _temple_html_attributemerger1[1].join(""); _temple_html_attributeremover1 << (_temple_html_attributemerger1.reject(&:empty?).join(" ")); _temple_html_attributeremover1 = _temple_html_attributeremover1.join(""); if !_temple_html_attributeremover1.empty?; _buf << (" class=\""); _buf << (_temple_html_attributeremover1); _buf << ("\""); end; _slim_codeattributes2 = id; if _slim_codeattributes2; if _slim_codeattributes2 == true; _buf << (" id"); else; _buf << (" id=\""); _buf << (_slim_codeattributes2); _buf << ("\""); end; end; _buf << (">"); 
       ; items.each do |item|; 
@@ -792,7 +818,6 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
   def dlist(node, opts = {})
     node.extend(Helpers)
     node.instance_eval do
-      converter.set_local_variables(binding, opts) unless opts.empty?
       _buf = []; case style; 
       ; when 'qanda'; 
       ; _slim_controls1 = block_with_title :class=>'qlist qanda', :role=>'doc-qna' do; _slim_controls2 = []; 
@@ -845,7 +870,6 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
   def document(node, opts = {})
     node.extend(Helpers)
     node.instance_eval do
-      converter.set_local_variables(binding, opts) unless opts.empty?
       _buf = []; _buf << ("<!DOCTYPE html><html"); 
       ; _slim_codeattributes1 = (attr :lang, 'en' unless attr? :nolang); if _slim_codeattributes1; if _slim_codeattributes1 == true; _buf << (" lang"); else; _buf << (" lang=\""); _buf << (_slim_codeattributes1); _buf << ("\""); end; end; _buf << ("><head><meta"); 
       ; 
@@ -933,7 +957,6 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
   def embedded(node, opts = {})
     node.extend(Helpers)
     node.instance_eval do
-      converter.set_local_variables(binding, opts) unless opts.empty?
       _buf = []; if !notitle && has_header?; 
       ; _buf << ("<h1"); _slim_codeattributes1 = id; if _slim_codeattributes1; if _slim_codeattributes1 == true; _buf << (" id"); else; _buf << (" id=\""); _buf << (_slim_codeattributes1); _buf << ("\""); end; end; _buf << (">"); _buf << (header.title); 
       ; _buf << ("</h1>"); end; if node.sections? && (attr? :toc) && (attr 'toc-placement', 'auto') == 'auto'; 
@@ -963,7 +986,6 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
   def empty(node, opts = {})
     node.extend(Helpers)
     node.instance_eval do
-      converter.set_local_variables(binding, opts) unless opts.empty?
       _buf = []; ; _buf = _buf.join("")
     end
   end
@@ -971,7 +993,6 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
   def example(node, opts = {})
     node.extend(Helpers)
     node.instance_eval do
-      converter.set_local_variables(binding, opts) unless opts.empty?
       _buf = []; _slim_controls1 = block_with_caption :top, :class=>'example-block' do; _slim_controls2 = []; 
       ; _slim_controls2 << ("<div class=\"example\">"); 
       ; _slim_controls2 << (content); 
@@ -982,7 +1003,6 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
   def floating_title(node, opts = {})
     node.extend(Helpers)
     node.instance_eval do
-      converter.set_local_variables(binding, opts) unless opts.empty?
       _buf = []; _slim_htag_filter1 = ((level + 1)).to_s; _buf << ("<h"); _buf << (_slim_htag_filter1); _slim_codeattributes1 = id; if _slim_codeattributes1; if _slim_codeattributes1 == true; _buf << (" id"); else; _buf << (" id=\""); _buf << (_slim_codeattributes1); _buf << ("\""); end; end; _temple_html_attributeremover1 = []; _slim_codeattributes2 = [style, role]; if Array === _slim_codeattributes2; _slim_codeattributes2 = _slim_codeattributes2.flatten; _slim_codeattributes2.map!(&:to_s); _slim_codeattributes2.reject!(&:empty?); _temple_html_attributeremover1 << (_slim_codeattributes2.join(" ")); else; _temple_html_attributeremover1 << (_slim_codeattributes2); end; _temple_html_attributeremover1 = _temple_html_attributeremover1.join(""); if !_temple_html_attributeremover1.empty?; _buf << (" class=\""); _buf << (_temple_html_attributeremover1); _buf << ("\""); end; _buf << (">"); 
       ; _buf << (title); 
       ; _buf << ("</h"); _buf << (_slim_htag_filter1); _buf << (">"); _buf = _buf.join("")
@@ -992,10 +1012,16 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
   def image(node, opts = {})
     node.extend(Helpers)
     node.instance_eval do
-      converter.set_local_variables(binding, opts) unless opts.empty?
       _buf = []; _slim_controls1 = block_with_caption(:bottom, :class=>'image-block', :style=>style_value(text_align: (attr :align), float: (attr :float))) do; _slim_controls2 = []; 
-      ; _slim_controls3 = html_tag_if(attr?(:link), :a, :class=>'image', :href=>(attr :link), :target=>(attr :window), :rel=>link_rel) do; _slim_controls4 = []; 
-      ; _slim_controls4 << ("<img"); _slim_codeattributes1 = image_uri(attr :target); if _slim_codeattributes1; if _slim_codeattributes1 == true; _slim_controls4 << (" src"); else; _slim_controls4 << (" src=\""); _slim_controls4 << (_slim_codeattributes1); _slim_controls4 << ("\""); end; end; _slim_codeattributes2 = (attr :alt); if _slim_codeattributes2; if _slim_codeattributes2 == true; _slim_controls4 << (" alt"); else; _slim_controls4 << (" alt=\""); _slim_controls4 << (_slim_codeattributes2); _slim_controls4 << ("\""); end; end; _slim_codeattributes3 = (attr :width); if _slim_codeattributes3; if _slim_codeattributes3 == true; _slim_controls4 << (" width"); else; _slim_controls4 << (" width=\""); _slim_controls4 << (_slim_codeattributes3); _slim_controls4 << ("\""); end; end; _slim_codeattributes4 = (attr :height); if _slim_codeattributes4; if _slim_codeattributes4 == true; _slim_controls4 << (" height"); else; _slim_controls4 << (" height=\""); _slim_controls4 << (_slim_codeattributes4); _slim_controls4 << ("\""); end; end; _slim_controls4 << (">"); 
+      ; target_url = image_uri(attr :target); 
+      ; _slim_controls3 = html_tag_if(image_link, :a,
+      :class=>['image', ('bare' if image_link == target_url)],
+      :href=>image_link,
+      :title=>image_link_label,
+      'aria-label'=>image_link_label,
+      :target=>(attr :window),
+      :rel=>link_rel) do; _slim_controls4 = []; 
+      ; _slim_controls4 << ("<img"); _slim_codeattributes1 = target_url; if _slim_codeattributes1; if _slim_codeattributes1 == true; _slim_controls4 << (" src"); else; _slim_controls4 << (" src=\""); _slim_controls4 << (_slim_codeattributes1); _slim_controls4 << ("\""); end; end; _slim_codeattributes2 = (attr :alt); if _slim_codeattributes2; if _slim_codeattributes2 == true; _slim_controls4 << (" alt"); else; _slim_controls4 << (" alt=\""); _slim_controls4 << (_slim_codeattributes2); _slim_controls4 << ("\""); end; end; _slim_codeattributes3 = (attr :width); if _slim_codeattributes3; if _slim_codeattributes3 == true; _slim_controls4 << (" width"); else; _slim_controls4 << (" width=\""); _slim_controls4 << (_slim_codeattributes3); _slim_controls4 << ("\""); end; end; _slim_codeattributes4 = (attr :height); if _slim_codeattributes4; if _slim_codeattributes4 == true; _slim_controls4 << (" height"); else; _slim_controls4 << (" height=\""); _slim_controls4 << (_slim_codeattributes4); _slim_controls4 << ("\""); end; end; _slim_controls4 << (">"); 
       ; _slim_controls4 = _slim_controls4.join(""); end; _slim_controls2 << (_slim_controls3); _slim_controls2 = _slim_controls2.join(""); end; _buf << (_slim_controls1); _buf = _buf.join("")
     end
   end
@@ -1003,7 +1029,6 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
   def inline_anchor(node, opts = {})
     node.extend(Helpers)
     node.instance_eval do
-      converter.set_local_variables(binding, opts) unless opts.empty?
       _buf = []; case type; 
       ; when :xref; 
       ; _buf << ("<a"); _slim_codeattributes1 = target; if _slim_codeattributes1; if _slim_codeattributes1 == true; _buf << (" href"); else; _buf << (" href=\""); _buf << (_slim_codeattributes1); _buf << ("\""); end; end; _buf << (">"); _buf << (xref_text); 
@@ -1023,7 +1048,6 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
   def inline_break(node, opts = {})
     node.extend(Helpers)
     node.instance_eval do
-      converter.set_local_variables(binding, opts) unless opts.empty?
       _buf = []; _buf << (text); 
       ; _buf << ("<br>"); 
       ; _buf = _buf.join("")
@@ -1033,7 +1057,6 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
   def inline_button(node, opts = {})
     node.extend(Helpers)
     node.instance_eval do
-      converter.set_local_variables(binding, opts) unless opts.empty?
       _buf = []; _buf << ("<b class=\"button\">"); _buf << (text); 
       ; _buf << ("</b>"); _buf = _buf.join("")
     end
@@ -1042,7 +1065,6 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
   def inline_callout(node, opts = {})
     node.extend(Helpers)
     node.instance_eval do
-      converter.set_local_variables(binding, opts) unless opts.empty?
       _buf = []; _buf << ("<b class=\"conum\">"); _buf << (text); 
       ; _buf << ("</b>"); _buf = _buf.join("")
     end
@@ -1051,7 +1073,6 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
   def inline_footnote(node, opts = {})
     node.extend(Helpers)
     node.instance_eval do
-      converter.set_local_variables(binding, opts) unless opts.empty?
       _buf = []; if (index = local_attr :index); 
       ; 
       ; 
@@ -1068,7 +1089,6 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
   def inline_image(node, opts = {})
     node.extend(Helpers)
     node.instance_eval do
-      converter.set_local_variables(binding, opts) unless opts.empty?
       _buf = []; _slim_controls1 = html_tag_if((attr? :link), :a, :class=>'image', :href=>(attr :link), :target=>(attr :window), :rel=>link_rel) do; _slim_controls2 = []; 
       ; if type == 'icon' && (document.attr? :icons, 'font'); 
       ; _slim_controls2 << ("<i"); _temple_html_attributeremover1 = []; _slim_codeattributes1 = [*icon_fa_classes, role]; if Array === _slim_codeattributes1; _slim_codeattributes1 = _slim_codeattributes1.flatten; _slim_codeattributes1.map!(&:to_s); _slim_codeattributes1.reject!(&:empty?); _temple_html_attributeremover1 << (_slim_codeattributes1.join(" ")); else; _temple_html_attributeremover1 << (_slim_codeattributes1); end; _temple_html_attributeremover1 = _temple_html_attributeremover1.join(""); if !_temple_html_attributeremover1.empty?; _slim_controls2 << (" class=\""); _slim_controls2 << (_temple_html_attributeremover1); _slim_controls2 << ("\""); end; _slim_codeattributes2 = (attr :title); if _slim_codeattributes2; if _slim_codeattributes2 == true; _slim_controls2 << (" title"); else; _slim_controls2 << (" title=\""); _slim_controls2 << (_slim_codeattributes2); _slim_controls2 << ("\""); end; end; _slim_controls2 << ("></i>"); 
@@ -1086,7 +1106,6 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
   def inline_indexterm(node, opts = {})
     node.extend(Helpers)
     node.instance_eval do
-      converter.set_local_variables(binding, opts) unless opts.empty?
       _buf = []; if type == :visible; 
       ; _buf << (text); 
       ; end; _buf = _buf.join("")
@@ -1096,7 +1115,6 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
   def inline_kbd(node, opts = {})
     node.extend(Helpers)
     node.instance_eval do
-      converter.set_local_variables(binding, opts) unless opts.empty?
       _buf = []; if (keys = attr 'keys').size == 1; 
       ; _buf << ("<kbd>"); _buf << (keys.first); 
       ; _buf << ("</kbd>"); else; 
@@ -1111,7 +1129,6 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
   def inline_menu(node, opts = {})
     node.extend(Helpers)
     node.instance_eval do
-      converter.set_local_variables(binding, opts) unless opts.empty?
       _buf = []; if local_attr :menuitem; 
       ; capture do; 
       ; _buf << ("&#160;<b class=\"caret\">&#8250;</b>"); 
@@ -1134,7 +1151,6 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
   def inline_quoted(node, opts = {})
     node.extend(Helpers)
     node.instance_eval do
-      converter.set_local_variables(binding, opts) unless opts.empty?
       _buf = []; unless id.nil?; 
       ; _buf << ("<a"); _slim_codeattributes1 = id; if _slim_codeattributes1; if _slim_codeattributes1 == true; _buf << (" id"); else; _buf << (" id=\""); _buf << (_slim_codeattributes1); _buf << ("\""); end; end; _buf << (" aria-hidden=\"true\"></a>"); 
       ; end; case type; 
@@ -1171,7 +1187,6 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
   def listing(node, opts = {})
     node.extend(Helpers)
     node.instance_eval do
-      converter.set_local_variables(binding, opts) unless opts.empty?
       _buf = []; _slim_controls1 = block_with_caption :top, :class=>'listing-block' do; _slim_controls2 = []; 
       ; if style == 'source'; 
       ; if highlighter == 'html-pipeline'; 
@@ -1194,7 +1209,6 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
   def literal(node, opts = {})
     node.extend(Helpers)
     node.instance_eval do
-      converter.set_local_variables(binding, opts) unless opts.empty?
       _buf = []; _slim_controls1 = block_with_title :class=>'literal-block' do; _slim_controls2 = []; 
       ; _slim_controls2 << ("<pre"); _temple_html_attributeremover1 = []; _slim_codeattributes1 = nowrap?; if Array === _slim_codeattributes1; _slim_codeattributes1 = _slim_codeattributes1.flatten; _slim_codeattributes1.map!(&:to_s); _slim_codeattributes1.reject!(&:empty?); _temple_html_attributeremover1 << (_slim_codeattributes1.join(" ")); else; _temple_html_attributeremover1 << (_slim_codeattributes1); end; _temple_html_attributeremover1 = _temple_html_attributeremover1.join(""); if !_temple_html_attributeremover1.empty?; _slim_controls2 << (" class=\""); _slim_controls2 << (_temple_html_attributeremover1); _slim_controls2 << ("\""); end; _slim_controls2 << (">"); _slim_controls2 << (content); 
       ; _slim_controls2 << ("</pre>"); _slim_controls2 = _slim_controls2.join(""); end; _buf << (_slim_controls1); _buf = _buf.join("")
@@ -1204,7 +1218,6 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
   def olist(node, opts = {})
     node.extend(Helpers)
     node.instance_eval do
-      converter.set_local_variables(binding, opts) unless opts.empty?
       _buf = []; _slim_controls1 = block_with_title :class=>['olist', style] do; _slim_controls2 = []; 
       ; _slim_controls2 << ("<ol"); _temple_html_attributeremover1 = []; _slim_codeattributes1 = style; if Array === _slim_codeattributes1; _slim_codeattributes1 = _slim_codeattributes1.flatten; _slim_codeattributes1.map!(&:to_s); _slim_codeattributes1.reject!(&:empty?); _temple_html_attributeremover1 << (_slim_codeattributes1.join(" ")); else; _temple_html_attributeremover1 << (_slim_codeattributes1); end; _temple_html_attributeremover1 = _temple_html_attributeremover1.join(""); if !_temple_html_attributeremover1.empty?; _slim_controls2 << (" class=\""); _slim_controls2 << (_temple_html_attributeremover1); _slim_controls2 << ("\""); end; _slim_codeattributes2 = (attr :start); if _slim_codeattributes2; if _slim_codeattributes2 == true; _slim_controls2 << (" start"); else; _slim_controls2 << (" start=\""); _slim_controls2 << (_slim_codeattributes2); _slim_controls2 << ("\""); end; end; _slim_codeattributes3 = list_marker_keyword; if _slim_codeattributes3; if _slim_codeattributes3 == true; _slim_controls2 << (" type"); else; _slim_controls2 << (" type=\""); _slim_controls2 << (_slim_codeattributes3); _slim_controls2 << ("\""); end; end; _slim_codeattributes4 = (option? 'reversed'); if _slim_codeattributes4; if _slim_codeattributes4 == true; _slim_controls2 << (" reversed"); else; _slim_controls2 << (" reversed=\""); _slim_controls2 << (_slim_codeattributes4); _slim_controls2 << ("\""); end; end; _slim_controls2 << (">"); 
       ; items.each do |item|; 
@@ -1216,7 +1229,6 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
   def open(node, opts = {})
     node.extend(Helpers)
     node.instance_eval do
-      converter.set_local_variables(binding, opts) unless opts.empty?
       _buf = []; if style == 'abstract'; 
       ; if abstract_allowed?; 
       ; _slim_controls1 = block_with_title :class=>'quote-block abstract' do; _slim_controls2 = []; 
@@ -1231,9 +1243,9 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
   def outline(node, opts = {})
     node.extend(Helpers)
     node.instance_eval do
-      converter.set_local_variables(binding, opts) unless opts.empty?
       _buf = []; unless sections.empty?; 
-      ; toclevels ||= (document.attr 'toclevels', DEFAULT_TOCLEVELS).to_i; 
+      ; 
+      ; toclevels ||= opts[:toclevels] || (document.attr 'toclevels', DEFAULT_TOCLEVELS).to_i; 
       ; slevel = section_level sections.first; 
       ; _buf << ("<ol class=\"toc-list level-"); _buf << (slevel); _buf << ("\">"); 
       ; sections.each do |sec|; 
@@ -1248,7 +1260,6 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
   def page_break(node, opts = {})
     node.extend(Helpers)
     node.instance_eval do
-      converter.set_local_variables(binding, opts) unless opts.empty?
       _buf = []; _buf << ("<div role=\"doc-pagebreak\" style=\"page-break-after: always;\"></div>"); 
       ; _buf = _buf.join("")
     end
@@ -1257,7 +1268,6 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
   def paragraph(node, opts = {})
     node.extend(Helpers)
     node.instance_eval do
-      converter.set_local_variables(binding, opts) unless opts.empty?
       _buf = []; if title?; 
       ; _buf << ("<section class=\"paragraph\""); _slim_codeattributes1 = id; if _slim_codeattributes1; if _slim_codeattributes1 == true; _buf << (" id"); else; _buf << (" id=\""); _buf << (_slim_codeattributes1); _buf << ("\""); end; end; _buf << ("><h6 class=\"block-title\">"); 
       ; _buf << (title); 
@@ -1271,7 +1281,6 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
   def pass(node, opts = {})
     node.extend(Helpers)
     node.instance_eval do
-      converter.set_local_variables(binding, opts) unless opts.empty?
       _buf = []; _buf << (content); 
       ; _buf = _buf.join("")
     end
@@ -1280,7 +1289,6 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
   def preamble(node, opts = {})
     node.extend(Helpers)
     node.instance_eval do
-      converter.set_local_variables(binding, opts) unless opts.empty?
       _buf = []; _buf << ("<section id=\"preamble\" aria-label=\"Preamble\">"); 
       ; _buf << (content); 
       ; _buf << ("</section>"); if (attr? :toc) && (attr? 'toc-placement', 'preamble'); 
@@ -1296,7 +1304,6 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
   def quote(node, opts = {})
     node.extend(Helpers)
     node.instance_eval do
-      converter.set_local_variables(binding, opts) unless opts.empty?
       _buf = []; _slim_controls1 = block_with_title :class=>'quote-block' do; _slim_controls2 = []; 
       ; _slim_controls2 << ("<blockquote>"); 
       ; _slim_controls3 = html_tag_if !blocks?, :p do; _slim_controls4 = []; 
@@ -1314,7 +1321,6 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
   def section(node, opts = {})
     node.extend(Helpers)
     node.instance_eval do
-      converter.set_local_variables(binding, opts) unless opts.empty?
       _buf = []; _buf << ("<section"); _temple_html_attributeremover1 = []; _temple_html_attributemerger1 = []; _temple_html_attributemerger1[0] = "doc-section"; _temple_html_attributemerger1[1] = []; _slim_codeattributes1 = ["level-#{section_level}", role]; if Array === _slim_codeattributes1; _slim_codeattributes1 = _slim_codeattributes1.flatten; _slim_codeattributes1.map!(&:to_s); _slim_codeattributes1.reject!(&:empty?); _temple_html_attributemerger1[1] << (_slim_codeattributes1.join(" ")); else; _temple_html_attributemerger1[1] << (_slim_codeattributes1); end; _temple_html_attributemerger1[1] = _temple_html_attributemerger1[1].join(""); _temple_html_attributeremover1 << (_temple_html_attributemerger1.reject(&:empty?).join(" ")); _temple_html_attributeremover1 = _temple_html_attributeremover1.join(""); if !_temple_html_attributeremover1.empty?; _buf << (" class=\""); _buf << (_temple_html_attributeremover1); _buf << ("\""); end; _buf << (">"); 
       ; _slim_htag_filter1 = ((section_level + 1)).to_s; _buf << ("<h"); _buf << (_slim_htag_filter1); _slim_codeattributes2 = id; if _slim_codeattributes2; if _slim_codeattributes2 == true; _buf << (" id"); else; _buf << (" id=\""); _buf << (_slim_codeattributes2); _buf << ("\""); end; end; _buf << (">"); 
       ; if id; 
@@ -1334,7 +1340,6 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
   def sidebar(node, opts = {})
     node.extend(Helpers)
     node.instance_eval do
-      converter.set_local_variables(binding, opts) unless opts.empty?
       _buf = []; _buf << ("<aside"); _temple_html_attributeremover1 = []; _temple_html_attributemerger1 = []; _temple_html_attributemerger1[0] = "sidebar"; _temple_html_attributemerger1[1] = []; _slim_codeattributes1 = role; if Array === _slim_codeattributes1; _slim_codeattributes1 = _slim_codeattributes1.flatten; _slim_codeattributes1.map!(&:to_s); _slim_codeattributes1.reject!(&:empty?); _temple_html_attributemerger1[1] << (_slim_codeattributes1.join(" ")); else; _temple_html_attributemerger1[1] << (_slim_codeattributes1); end; _temple_html_attributemerger1[1] = _temple_html_attributemerger1[1].join(""); _temple_html_attributeremover1 << (_temple_html_attributemerger1.reject(&:empty?).join(" ")); _temple_html_attributeremover1 = _temple_html_attributeremover1.join(""); if !_temple_html_attributeremover1.empty?; _buf << (" class=\""); _buf << (_temple_html_attributeremover1); _buf << ("\""); end; _slim_codeattributes2 = id; if _slim_codeattributes2; if _slim_codeattributes2 == true; _buf << (" id"); else; _buf << (" id=\""); _buf << (_slim_codeattributes2); _buf << ("\""); end; end; _buf << (">"); 
       ; if title?; 
       ; _buf << ("<h6 class=\"block-title\">"); _buf << (title); 
@@ -1346,7 +1351,6 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
   def stem(node, opts = {})
     node.extend(Helpers)
     node.instance_eval do
-      converter.set_local_variables(binding, opts) unless opts.empty?
       _buf = []; _slim_controls1 = block_with_caption :top, :class=>'stem-block' do; _slim_controls2 = []; 
       ; _slim_controls2 << ("<div class=\"math\""); _slim_codeattributes1 = stem_lang; if _slim_codeattributes1; if _slim_codeattributes1 == true; _slim_controls2 << (" data-lang"); else; _slim_controls2 << (" data-lang=\""); _slim_controls2 << (_slim_codeattributes1); _slim_controls2 << ("\""); end; end; _slim_controls2 << (">"); _slim_controls2 << ((delimit_stem content, style)); 
       ; _slim_controls2 << ("</div>"); _slim_controls2 = _slim_controls2.join(""); end; _buf << (_slim_controls1); _buf = _buf.join("")
@@ -1356,7 +1360,6 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
   def table(node, opts = {})
     node.extend(Helpers)
     node.instance_eval do
-      converter.set_local_variables(binding, opts) unless opts.empty?
       _buf = []; _slim_controls1 = block_with_caption :top, :class=>'table-block' do; _slim_controls2 = []; 
       ; 
       ; 
@@ -1403,7 +1406,6 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
   def thematic_break(node, opts = {})
     node.extend(Helpers)
     node.instance_eval do
-      converter.set_local_variables(binding, opts) unless opts.empty?
       _buf = []; _buf << ("<hr>"); 
       ; _buf = _buf.join("")
     end
@@ -1412,7 +1414,6 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
   def toc(node, opts = {})
     node.extend(Helpers)
     node.instance_eval do
-      converter.set_local_variables(binding, opts) unless opts.empty?
       _buf = []; 
       ; 
       ; if document.attr?(:toc) && document.sections?; 
@@ -1431,7 +1432,6 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
   def ulist(node, opts = {})
     node.extend(Helpers)
     node.instance_eval do
-      converter.set_local_variables(binding, opts) unless opts.empty?
       _buf = []; checklist = 'task-list' if option? 'checklist'; 
       ; _slim_controls1 = block_with_title :class=>['ulist', style] do; _slim_controls2 = []; 
       ; _slim_controls2 << ("<ul"); _temple_html_attributeremover1 = []; _slim_codeattributes1 = (checklist || style); if Array === _slim_codeattributes1; _slim_codeattributes1 = _slim_codeattributes1.flatten; _slim_codeattributes1.map!(&:to_s); _slim_codeattributes1.reject!(&:empty?); _temple_html_attributeremover1 << (_slim_codeattributes1.join(" ")); else; _temple_html_attributeremover1 << (_slim_codeattributes1); end; _temple_html_attributeremover1 = _temple_html_attributeremover1.join(""); if !_temple_html_attributeremover1.empty?; _slim_controls2 << (" class=\""); _slim_controls2 << (_temple_html_attributeremover1); _slim_controls2 << ("\""); end; _slim_controls2 << (">"); 
@@ -1450,7 +1450,6 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
   def verse(node, opts = {})
     node.extend(Helpers)
     node.instance_eval do
-      converter.set_local_variables(binding, opts) unless opts.empty?
       _buf = []; _slim_controls1 = block_with_title :class=>'verse-block' do; _slim_controls2 = []; 
       ; if attr?(:attribution) || attr?(:citetitle); 
       ; _slim_controls2 << ("<blockquote class=\"verse\"><pre class=\"verse\">"); 
@@ -1469,7 +1468,6 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
   def video(node, opts = {})
     node.extend(Helpers)
     node.instance_eval do
-      converter.set_local_variables(binding, opts) unless opts.empty?
       _buf = []; _slim_controls1 = block_with_caption :bottom, :class=>'video-block' do; _slim_controls2 = []; 
       ; if video_iframe?; 
       ; 
@@ -1493,10 +1491,5 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
   end
   #------------------ End of generated transformation methods ------------------#
 
-  def set_local_variables(binding, vars)
-    vars.each do |key, val|
-      binding.local_variable_set(key.to_sym, val)
-    end
-  end
 
 end

data/lib/asciidoctor/html5s/replacements.rb

@@ -1,10 +1,6 @@
 require 'asciidoctor' unless RUBY_PLATFORM == 'opal'
 
 module Asciidoctor
-  # XXX: Regexps escaping is kinda broken in Opal 0.11.x. This is a hack how to
-  # make the third regexp work both in Ruby and Opal.
-  _BACKSLASH = '\\\\'
-
   # XXX: Modifies constant defined in Asciidoctor.
   REPLACEMENTS.unshift(
     # foo --- bar ->  — 
@@ -14,7 +10,7 @@ module Asciidoctor
 
     # foo -- bar -> &thinksp;– 
     # Note: The regexp is copied from Asciidoctor.
-    [/(^|\n|#{_BACKSLASH}| )--( |\n|$)/, ' – ', :none],
+    [/(^|\n|\\| )--( |\n|$)/, ' – ', :none],
     # foo--bar -> –
     # Note: The regexp is copied from Asciidoctor.
     [/(#{CG_WORD})\\?--(?=#{CG_WORD})/, '–', :leading],

data/lib/asciidoctor/html5s/version.rb

@@ -2,6 +2,6 @@
 
 module Asciidoctor
   module Html5s
-    VERSION = '0.1.0.beta.11'
+    VERSION = '0.1.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-html5s
 version: !ruby/object:Gem::Version
-  version: 0.1.0.beta.11
+  version: 0.1.0
 platform: ruby
 authors:
 - Jakub Jirutka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-25 00:00:00.000000000 Z
+date: 2018-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -218,12 +218,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: Semantic HTML5 backend (converter) for Asciidoctor