asciidoctor-html5s 0.3.0 → 0.5.1

data/lib/asciidoctor/html5s/html_pipeline_highlighter.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Asciidoctor::Html5s
+
+  # Modification of Asciidoctor::SyntaxHighlighter::HtmlPipelineAdapter that
+  # uses attribute `data-lang` instead of `lang`.
+  #
+  # Rationale: Attribute `lang` is defined for natural language of text, not
+  # for programming languages.
+  class HtmlPipelineHighlighter < ::Asciidoctor::SyntaxHighlighter::Base
+    register_for 'html-pipeline'
+
+    def initialize(name, backend, opts = {})
+      super
+      # Use this version of the #format method only for our backend, otherwise
+      # use the original variant.
+      singleton_class.send(:alias_method, :format, :format_orig) if backend != 'html5s'
+    end
+
+    def format(node, lang, _opts)
+      %(<pre><code#{%{ data-lang="#{lang}"} if lang}>#{node.content}</code></pre>)
+    end
+
+    # Copied from Asciidoctor::SyntaxHighlighter::HtmlPipelineAdapter#format.
+    # Note: HtmlPipelineAdapter is not available in asciidoctor.js, that's why
+    # it's done like this instead of delegation or inheritance.
+    def format_orig(node, lang, _opts)
+      %(<pre#{%{ lang="#{lang}"} if lang}><code>#{node.content}</code></pre>)
+    end
+  end
+end

data/lib/asciidoctor/html5s/version.rb

@@ -2,6 +2,6 @@
 
 module Asciidoctor
   module Html5s
-    VERSION = '0.3.0'
+    VERSION = '0.5.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-html5s
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Jakub Jirutka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-13 00:00:00.000000000 Z
+date: 2021-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.5
+        version: 1.5.7
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.5
+        version: 1.5.7
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -50,14 +50,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta.6
+        version: 2.0.0.beta.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta.6
+        version: 2.0.0.beta.7
 - !ruby/object:Gem::Dependency
   name: asciidoctor-templates-compiler
   requirement: !ruby/object:Gem::Requirement
@@ -86,20 +86,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.6'
-- !ruby/object:Gem::Dependency
-  name: coderay
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: pandoc-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -120,14 +106,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: slim
   requirement: !ruby/object:Gem::Requirement
@@ -172,9 +158,7 @@ files:
 - data/templates/_attribution.html.slim
 - data/templates/_footer.html.slim
 - data/templates/_footnotes.html.slim
-- data/templates/_hdlist.html.slim
 - data/templates/_header.html.slim
-- data/templates/_qanda.html.slim
 - data/templates/_toc.html.slim
 - data/templates/admonition.html.slim
 - data/templates/audio.html.slim
@@ -220,7 +204,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/html_pipeline_highlighter.rb
 - lib/asciidoctor/html5s/replacements.rb
 - lib/asciidoctor/html5s/version.rb
 homepage: https://github.com/jirutka/asciidoctor-html5s
@@ -242,8 +226,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Semantic HTML5 backend (converter) for Asciidoctor

data/data/templates/_hdlist.html.slim

@@ -1,20 +0,0 @@
-= block_with_title :class=>'hdlist'
-  table
-    - if (attr? :labelwidth) || (attr? :itemwidth)
-      colgroup
-        col style=style_value(width: [(attr :labelwidth), '%'])
-        col style=style_value(width: [(attr :itemwidth), '%'])
-    - items.each do |terms, dd|
-      tr
-        th.hdlist1 class=('strong' if option? 'strong')
-          - terms = [*terms]
-          - terms.each_with_index do |dt, idx|
-            =dt.text
-            - unless idx >= terms.count - 1
-              br
-        td.hdlist2
-          - unless dd.nil?
-            - if dd.text?
-              p =dd.text
-            - if dd.blocks?
-              =dd.content

data/data/templates/_qanda.html.slim

@@ -1,12 +0,0 @@
-= block_with_title :class=>'qlist qanda', :role=>'doc-qna'
-  dl.qanda
-    - items.each do |questions, answer|
-      - [*questions].each do |question|
-        dt.qanda-question =question.text
-      - unless answer.nil?
-        dd.qanda-answer
-          - if answer.text?
-            = html_tag_if answer.blocks?, :p
-              =answer.text
-          - if answer.blocks?
-            =answer.content

data/lib/asciidoctor/html5s/logger.rb

@@ -1,21 +0,0 @@
-# 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
-      else
-        ::Logger.new(STDERR)
-      end
-    end
-  end
-end