asciidoctor-html5s 0.1.0.beta.5 → 0.1.0.beta.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6edb5fed9a549c826fe6cee650e693100626d9e1ad1fe464c1c35e458f7ee7b0
-  data.tar.gz: 80d81e62638bca8e8df3025dac8f6fe8be758941fa8887368acc12b7d8adae95
+  metadata.gz: ed1c08fd98586b0e12dcb8ccdfde03a6006ced31e6ba71535c681b039d580218
+  data.tar.gz: 697a89107371a410e9d240d08e55a8901bff9e458ac8a5b06ef481eca326c3d4
 SHA512:
-  metadata.gz: 7aac1db96dd77420ff7e42deefdf378a0f965cc85b61db850cc37e24bbd81ab037371521049cac9315166a581ba2d9bc5aabda6574eb088b50ecac921209f038
-  data.tar.gz: 4a9a897ac7ca4fdba8ca69452a8e5c8b1138f69d6f6fa096cd859022609f1955fa40788c79f328c34575c388feb034fcc28a58cf7cd91745fda8f424f8287ff1
+  metadata.gz: bc1b4d6df407f6d34eef7ba932ca4881749141bec6ba6dd93f7368245915690adf4ca04115fb3033907ab1e64fdd20feb60e1ebac2d1ae462770f8028de41d7a
+  data.tar.gz: 90fca83f5e268fd9b2ee21e2b3910a677aee549d3d98145ba063289b7112d7d07b77f53938b3f351020b04491ad7bebad9233bd895894a46d82809a15cf98b2e

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright 2014-2017 Jakub Jirutka <jakub@jirutka.cz> and the Asciidoctor Project.
+Copyright 2014-2018 Jakub Jirutka <jakub@jirutka.cz>.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.adoc

@@ -83,6 +83,15 @@ console.log(html)
 ----
 
 
+=== Attributes
+
+Extra attributes accepted by the {gem-name}:
+
+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.
+
+
 == License
 
 This project is licensed under http://opensource.org/licenses/MIT/[MIT License].

data/asciidoctor-html5s.gemspec

@@ -18,7 +18,6 @@ with common typographic CSS styles.
 EOF
 
   s.files         = Dir['data/**/*', 'lib/**/*', '*.gemspec', 'LICENSE*', 'README*']
-  s.has_rdoc      = false
 
   s.required_ruby_version = '>= 2.0'
 
@@ -26,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.3.0'
+  s.add_development_dependency 'asciidoctor-templates-compiler', '~> 0.4.1'
   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

@@ -1,4 +1,5 @@
 require 'asciidoctor/html5s'
+require 'asciidoctor/html5s/logger'
 require 'date' unless RUBY_PLATFORM == 'opal'
 
 # Add custom functions to this module that you want to use in your Slim
@@ -37,6 +38,11 @@ module Slim::Helpers
                      meta param source track wbr)
 
 
+  # @return [Logger]
+  def log
+    @_html5s_logger ||= ::Asciidoctor::Html5s::Logging.default_logger
+  end
+
   ##
   # Captures the given block for later yield.
   #
@@ -224,6 +230,10 @@ module Slim::Helpers
   # @return [String] the delimited equation.
   #
   def delimit_stem(equation, type)
+    if (@_html5s_stem_type ||= document.attr('html5s-force-stem-type'))
+      type = @_html5s_stem_type
+    end
+
     if is_a? ::Asciidoctor::Block
       open, close = ::Asciidoctor::BLOCK_MATH_DELIMITERS[type.to_sym]
     else
@@ -439,7 +449,7 @@ module Slim::Helpers
   # otherwise prints warning and returns +false+.
   def abstract_allowed?
     if result = (parent == document && document.doctype == 'book')
-      puts 'asciidoctor: WARNING: abstract block cannot be used in a document
+      log.warn 'asciidoctor: WARNING: abstract block cannot be used in a document
 without a title when doctype is book. Excluding block content.'
     end
     !result
@@ -450,7 +460,7 @@ without a title when doctype is book. Excluding block content.'
   # prints warning and returns +false+.
   def partintro_allowed?
     if result = (level != 0 || parent.context != :section || document.doctype != 'book')
-      puts "asciidoctor: ERROR: partintro block can only be used when doctype
+      log.warn "asciidoctor: ERROR: partintro block can only be used when doctype
 is book and it's a child of a book part. Excluding block content."
     end
     !result

data/lib/asciidoctor/html5s/attached_colist_treeprocessor.rb

@@ -9,16 +9,20 @@ module Asciidoctor::Html5s
   class AttachedColistTreeprocessor < ::Asciidoctor::Extensions::Treeprocessor
 
     def process(document)
-      document.find_by(context: :colist) do |colist|
+      # XXX: We have to defer deletion of the original colist nodes after
+      # the #find_by iteration is done to make it work under Opal.
+      # See <https://github.com/jirutka/asciidoctor-html5s/issues/7>.
+      document.find_by(context: :colist).reduce([]) { |memo, colist|
         blocks = colist.parent.blocks
         colist_idx = blocks.find_index(colist)
         prev_block = blocks[colist_idx - 1] if colist_idx
 
         if prev_block && prev_block.node_name == 'listing'
-          blocks.delete_at(colist_idx)  # mutates node's blocks list!
           prev_block.instance_variable_set(:@html5s_colist, colist)
+          memo << ->() { blocks.delete_at(colist_idx) }  # mutates node's blocks list!
         end
-      end
+        memo
+      }.each(&:call)
     end
   end
 end

data/lib/asciidoctor/html5s/converter.rb

@@ -6,6 +6,7 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
   #------------------------------ Begin of Helpers ------------------------------#
 
   require 'asciidoctor/html5s'
+  require 'asciidoctor/html5s/logger'
   require 'date' unless RUBY_PLATFORM == 'opal'
 
   # Add custom functions to this module that you want to use in your Slim
@@ -44,6 +45,11 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
                        meta param source track wbr)
 
 
+    # @return [Logger]
+    def log
+      @_html5s_logger ||= ::Asciidoctor::Html5s::Logging.default_logger
+    end
+
     ##
     # Captures the given block for later yield.
     #
@@ -231,6 +237,10 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
     # @return [String] the delimited equation.
     #
     def delimit_stem(equation, type)
+      if (@_html5s_stem_type ||= document.attr('html5s-force-stem-type'))
+        type = @_html5s_stem_type
+      end
+
       if is_a? ::Asciidoctor::Block
         open, close = ::Asciidoctor::BLOCK_MATH_DELIMITERS[type.to_sym]
       else
@@ -446,7 +456,7 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
     # otherwise prints warning and returns +false+.
     def abstract_allowed?
       if result = (parent == document && document.doctype == 'book')
-        puts 'asciidoctor: WARNING: abstract block cannot be used in a document
+        log.warn 'asciidoctor: WARNING: abstract block cannot be used in a document
   without a title when doctype is book. Excluding block content.'
       end
       !result
@@ -457,7 +467,7 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
     # prints warning and returns +false+.
     def partintro_allowed?
       if result = (level != 0 || parent.context != :section || document.doctype != 'book')
-        puts "asciidoctor: ERROR: partintro block can only be used when doctype
+        log.warn "asciidoctor: ERROR: partintro block can only be used when doctype
   is book and it's a child of a book part. Excluding block content."
       end
       !result
@@ -681,9 +691,10 @@ class Asciidoctor::Html5s::Converter < ::Asciidoctor::Converter::Base
 
   def initialize(backend, opts = {})
     super
-    basebackend "html"
-    outfilesuffix ".html"
-    filetype "html"
+    basebackend "html" if respond_to? :basebackend
+    outfilesuffix ".html" if respond_to? :outfilesuffix
+    filetype "html" if respond_to? :filetype
+    supports_templates if respond_to? :supports_templates
   end
 
   def convert(node, transform = nil, opts = {})

data/lib/asciidoctor/html5s/logger.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+require 'logger' unless RUBY_PLATFORM == 'opal'
+require 'asciidoctor' unless RUBY_PLATFORM == 'opal'
+require 'asciidoctor/html5s/version'
+
+module Asciidoctor::Html5s
+  # Helper module for getting default Logger based on the Asciidoctor version.
+  module Logging
+    module_function
+
+    # @return [Logger] the default `Asciidoctor::Logger` if using Asciidoctor
+    #   1.5.7 or later, or Ruby's `Logger` that outputs to `STDERR`.
+    def default_logger
+      if defined? ::Asciidoctor::LoggerManager
+        ::Asciidoctor::LoggerManager.logger
+      elsif defined? ::Logger
+        ::Logger.new(STDERR)
+      else
+        # Fake logger for Opal.
+        # TODO: Remove after update to Asciidoctor 1.5.7 or Opal with Logger.
+        Object.new.tap do |o|
+          # rubocop: disable MethodMissing
+          def o.method_missing(_, *args)
+            STDERR.puts(*args)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/asciidoctor/html5s/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
   module Html5s
-    VERSION = '0.1.0.beta.5'.freeze
+    VERSION = '0.1.0.beta.6'.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.5
+  version: 0.1.0.beta.6
 platform: ruby
 authors:
 - Jakub Jirutka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-02 00:00:00.000000000 Z
+date: 2018-08-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.3.0
+        version: 0.4.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -199,6 +199,7 @@ files:
 - lib/asciidoctor/html5s.rb
 - lib/asciidoctor/html5s/attached_colist_treeprocessor.rb
 - lib/asciidoctor/html5s/converter.rb
+- lib/asciidoctor/html5s/logger.rb
 - lib/asciidoctor/html5s/version.rb
 homepage: https://github.com/jirutka/asciidoctor-html5s
 licenses:
@@ -220,7 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Semantic HTML5 backend (converter) for Asciidoctor