asciidoctor-html5s 0.1.0.beta.3 → 0.1.0.beta.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5250cc92ec9b7b6460b36fc66305d32f6ac1eb7
-  data.tar.gz: a7721dedf96135964437a8ebaadc2d5d9628b8dd
+  metadata.gz: 819e3a71952cef839eef80a5e236792f4c580554
+  data.tar.gz: 51f5722fb9a01deae23ac1f4bb2433e565bd72f3
 SHA512:
-  metadata.gz: 5cdff5bb63ae883477432d06cf63e6bd5310c2c3b95c5e4811d902ee22e40ae6b91f59f1c24294936fd21ddd15c66fe6302848033d05690a042e3a363677fb05
-  data.tar.gz: 9efa099ea3cb9d01a8fb03c32dc6abb6950b758ce449b46bc308d3dc7ceb898f25d974cf2897e79f58809672fa352565a47f7d323cc0c671624ccfa0bdb11977
+  metadata.gz: 8f88f4dbfccc68c008b6ee5e105cb7fcc1aee7ece21ea28932d1bd9dc82b0f0195ff908814c6125f84f095d0fa5b5a37931cc974a9a2fd16b4060220e8f76647
+  data.tar.gz: 98c9005fbf4e458e836b42be497fb4aaf1f8ade40ac72988a760266b66f66d8032833372b279fa38114872262a8c2bc30e9f47ae517dd49187f53b1ae83cf91a

data/data/templates/helpers.rb

@@ -274,8 +274,8 @@ module Slim::Helpers
   def urlize(*segments)
     path = segments * '/'
     if path.start_with? '//'
-      @_uri_scheme ||= document.attr('asset-uri-scheme', 'https')
-      path = "#{@_uri_scheme}:#{path}" unless @_uri_scheme.empty?
+      @_html5s_uri_scheme ||= document.attr('asset-uri-scheme', 'https')
+      path = "#{@_html5s_uri_scheme}:#{path}" unless @_html5s_uri_scheme.empty?
     end
     normalize_web_path path
   end
@@ -395,7 +395,7 @@ module Slim::Helpers
   # @return [String] a canonical name of the source-highlighter to be used as
   #         a style class.
   def highlighter
-    @_highlighter ||=
+    @_html5s_highlighter ||=
       case (highlighter = document.attr('source-highlighter'))
       when 'coderay'; 'CodeRay'
       when 'highlight.js'; 'highlightjs'
@@ -617,7 +617,7 @@ is book and it's a child of a book part. Excluding block content."
       elsif document.respond_to? :catalog  # Asciidoctor >=1.5.6
         ref = document.catalog[:refs][attr :refid]
         if ref.kind_of? Asciidoctor::AbstractNode
-          ref.xreftext((@_xrefstyle ||= document.attributes['xrefstyle']))
+          ref.xreftext((@_html5s_xrefstyle ||= document.attributes['xrefstyle']))
         end
       else  # Asciidoctor < 1.5.6
         document.references[:ids][attr :refid || target]

data/data/templates/toc.html.slim

@@ -1,9 +1,11 @@
 / This template is used only for toc::[] macro; for document and preamble TOC
 / see document.html, preamble.html and _toc.html.
-- if document.attr? :toc
+- if document.attr?(:toc) && document.sections?
   - toc_id = id || ('toc' if document.embedded? || !document.attr?('toc-placement'))
   nav id=toc_id class=(attr :role, (document.attr 'toc-class', 'toc')) role='doc-toc'
-    h level=(section_level + 2) id=("#{toc_id}-title" if toc_id)
+    h level=(level + 2) id=("#{toc_id}-title" if toc_id)
       =(title || (document.attr 'toc-title'))
     / Renders outline.html.
     = converter.convert document, 'outline', :toclevels=>((attr :levels).to_i if attr? :levels)
+- else
+  /! toc disabled

data/lib/asciidoctor/html5s/converter.rb

@@ -281,8 +281,8 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
     def urlize(*segments)
       path = segments * '/'
       if path.start_with? '//'
-        @_uri_scheme ||= document.attr('asset-uri-scheme', 'https')
-        path = "#{@_uri_scheme}:#{path}" unless @_uri_scheme.empty?
+        @_html5s_uri_scheme ||= document.attr('asset-uri-scheme', 'https')
+        path = "#{@_html5s_uri_scheme}:#{path}" unless @_html5s_uri_scheme.empty?
       end
       normalize_web_path path
     end
@@ -402,7 +402,7 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
     # @return [String] a canonical name of the source-highlighter to be used as
     #         a style class.
     def highlighter
-      @_highlighter ||=
+      @_html5s_highlighter ||=
         case (highlighter = document.attr('source-highlighter'))
         when 'coderay'; 'CodeRay'
         when 'highlight.js'; 'highlightjs'
@@ -624,7 +624,7 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
         elsif document.respond_to? :catalog  # Asciidoctor >=1.5.6
           ref = document.catalog[:refs][attr :refid]
           if ref.kind_of? Asciidoctor::AbstractNode
-            ref.xreftext((@_xrefstyle ||= document.attributes['xrefstyle']))
+            ref.xreftext((@_html5s_xrefstyle ||= document.attributes['xrefstyle']))
           end
         else  # Asciidoctor < 1.5.6
           document.references[:ids][attr :refid || target]
@@ -2755,7 +2755,7 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
     node.instance_eval do
       converter.set_local_variables(binding, opts) unless opts.empty?
       _buf = ''
-      if document.attr? :toc
+      if document.attr?(:toc) && document.sections?
         toc_id = id || ('toc' if document.embedded? || !document.attr?('toc-placement'))
         _buf << ("<nav".freeze)
         _slim_codeattributes1 = toc_id
@@ -2785,7 +2785,7 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
           _buf << ("\"".freeze)
         end
         _buf << (" role=\"doc-toc\">".freeze)
-        _slim_htag_filter1 = ((section_level + 2)).to_s
+        _slim_htag_filter1 = ((level + 2)).to_s
         _buf << ("<h".freeze)
         _buf << ((_slim_htag_filter1).to_s)
         _slim_codeattributes3 = ("#{toc_id}-title" if toc_id)
@@ -2805,6 +2805,8 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
         _buf << (">".freeze)
         _buf << ((converter.convert document, 'outline', :toclevels=>((attr :levels).to_i if attr? :levels)).to_s)
         _buf << ("</nav>".freeze)
+      else
+        _buf << ("<!--toc disabled-->".freeze)
       end
       _buf
     end

data/lib/asciidoctor/html5s/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
   module Html5s
-    VERSION = '0.1.0.beta.3'.freeze
+    VERSION = '0.1.0.beta.4'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-html5s
 version: !ruby/object:Gem::Version
-  version: 0.1.0.beta.3
+  version: 0.1.0.beta.4
 platform: ruby
 authors:
 - Jakub Jirutka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-12 00:00:00.000000000 Z
+date: 2017-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor