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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 819e3a71952cef839eef80a5e236792f4c580554
-  data.tar.gz: 51f5722fb9a01deae23ac1f4bb2433e565bd72f3
+SHA256:
+  metadata.gz: 6edb5fed9a549c826fe6cee650e693100626d9e1ad1fe464c1c35e458f7ee7b0
+  data.tar.gz: 80d81e62638bca8e8df3025dac8f6fe8be758941fa8887368acc12b7d8adae95
 SHA512:
-  metadata.gz: 8f88f4dbfccc68c008b6ee5e105cb7fcc1aee7ece21ea28932d1bd9dc82b0f0195ff908814c6125f84f095d0fa5b5a37931cc974a9a2fd16b4060220e8f76647
-  data.tar.gz: 98c9005fbf4e458e836b42be497fb4aaf1f8ade40ac72988a760266b66f66d8032833372b279fa38114872262a8c2bc30e9f47ae517dd49187f53b1ae83cf91a
+  metadata.gz: 7aac1db96dd77420ff7e42deefdf378a0f965cc85b61db850cc37e24bbd81ab037371521049cac9315166a581ba2d9bc5aabda6574eb088b50ecac921209f038
+  data.tar.gz: 4a9a897ac7ca4fdba8ca69452a8e5c8b1138f69d6f6fa096cd859022609f1955fa40788c79f328c34575c388feb034fcc28a58cf7cd91745fda8f424f8287ff1

data/README.adoc

@@ -7,6 +7,7 @@
 ifdef::env-github[]
 image:https://travis-ci.org/{gh-name}.svg?branch={gh-branch}[Build Status, link="https://travis-ci.org/{gh-name}"]
 image:https://img.shields.io/gem/v/{gem-name}.svg?style=flat[Gem Version, link="https://rubygems.org/gems/{gem-name}"]
+image:https://img.shields.io/npm/v/{gem-name}.svg?style=flat[npm Version, link="https://www.npmjs.org/package/{gem-name}"]
 endif::env-github[]
 
 This project provides alternative HTML5 converter (backend) for http://asciidoctor.org/[Asciidoctor] that focuses on correct semantics, accessibility and compatibility with common typographic CSS styles.
@@ -29,15 +30,17 @@ This project provides alternative HTML5 converter (backend) for http://asciidoct
 
 == Requirements
 
-* https://www.ruby-lang.org/[Ruby] 2.0+ or http://jruby.org/[JRuby] 9.1+
-* https://rubygems.org/gems/asciidoctor/[Asciidoctor] 1.5.5+
-* https://rubygems.org/gems/thread_safe/[thread_safe] (not required, but recommended)
+* 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/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!
 
 
 == Installation
 
+=== Ruby
+
 Install {gem-name} from Rubygems:
 
 [source, sh, subs="+attributes"]
@@ -49,12 +52,37 @@ or to get the latest development version:
 gem install --pre {gem-name}
 
 
+=== Node.js
+
+Install {gem-name} from npmjs.com:
+
+[source, sh, subs="+attributes"]
+npm install --save {gem-name}
+
+
 == Usage
 
+=== CLI
+
 [source, sh, subs="+attributes"]
 asciidoctor -r {gem-name} -b html5s FILE...
 
 
+=== Node.js
+
+[source, js, subs="+attributes"]
+----
+// Load asciidoctor.js and {gem-name}.
+const asciidoctor = require('asciidoctor.js')()
+require('{gem-name}')
+
+// Convert the content to HTML using html5s converter.
+const content = "Hello, *world!*!"
+const html = asciidoctor.convert(content, { backend: 'html5s' })
+console.log(html)
+----
+
+
 == License
 
 This project is licensed under http://opensource.org/licenses/MIT/[MIT License].

data/data/templates/helpers.rb

@@ -1,7 +1,5 @@
-require 'asciidoctor'
 require 'asciidoctor/html5s'
-require 'date'
-require 'json'
+require 'date' unless RUBY_PLATFORM == 'opal'
 
 # Add custom functions to this module that you want to use in your Slim
 # templates. Within the template you can invoke them as top-level functions
@@ -9,27 +7,31 @@ require 'json'
 module Slim::Helpers
 
   # URIs of external assets.
-  FONT_AWESOME_URI     = '//cdnjs.cloudflare.com/ajax/libs/font-awesome/4.1.0/css/font-awesome.min.css'
-  HIGHLIGHTJS_BASE_URI = '//cdnjs.cloudflare.com/ajax/libs/highlight.js/7.4'
-  MATHJAX_JS_URI       = '//cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-MML-AM_HTMLorMML'
+  FONT_AWESOME_URI     = '//cdn.jsdelivr.net/npm/font-awesome@4.7.0/css/font-awesome.min.css'
+  HIGHLIGHTJS_BASE_URI = '//cdn.jsdelivr.net/gh/highlightjs/cdn-release@9.12.0/build/'
+  KATEX_CSS_URI        = '//cdn.jsdelivr.net/npm/katex@0.8.3/dist/katex.min.css'
+  KATEX_JS_URI         = '//cdn.jsdelivr.net/npm/katex@0.8.3/dist/katex.min.js'
 
   # Defaults
   DEFAULT_HIGHLIGHTJS_THEME = 'github'
   DEFAULT_SECTNUMLEVELS = 3
   DEFAULT_TOCLEVELS = 2
 
-  # The MathJax configuration.
-  MATHJAX_CONFIG = {
-    tex2jax: {
-      inlineMath:  [::Asciidoctor::INLINE_MATH_DELIMITERS[:latexmath].inspect],
-      displayMath: [::Asciidoctor::BLOCK_MATH_DELIMITERS[:latexmath].inspect],
-      ignoreClass: 'nostem|nolatexmath',
-    },
-    asciimath2jax: {
-      delimiters:  [::Asciidoctor::BLOCK_MATH_DELIMITERS[:asciimath].inspect],
-      ignoreClass: 'nostem|noasciimath',
-    }
-  }.to_json
+  KATEX_RENDER_CODE = <<-JS.gsub(/\s+/, ' ')
+    document.addEventListener("DOMContentLoaded", function() {
+      var elements = document.getElementsByClassName("math");
+      for (var i = 0; i < elements.length; i++) {
+        var el = elements[i];
+        if (el.getAttribute("data-lang") !== "tex") {
+          continue;
+        }
+        katex.render(el.textContent.slice(2, -2), el, {
+          "displayMode": el.nodeName.toUpperCase() !== "SPAN",
+          "throwOnError": false,
+        });
+      }
+    });
+  JS
 
   VOID_ELEMENTS = %w(area base br col command embed hr img input keygen link
                      meta param source track wbr)
@@ -214,6 +216,9 @@ module Slim::Helpers
   ##
   # Delimite the given equation as a STEM of the specified type.
   #
+  # Note: This is not needed nor used for KaTeX, but keep this for the case
+  # user wants to use a different method.
+  #
   # @param equation [String] the equation to delimite.
   # @param type [#to_sym] the type of the STEM renderer (latexmath, or asciimath).
   # @return [String] the delimited equation.
@@ -360,6 +365,13 @@ module Slim::Helpers
     end
   end
 
+  ##
+  # @return [String] language of STEM block or inline node (tex or asciimath).
+  def stem_lang
+    value = (inline? ? type : style).to_s
+    value == 'latexmath' ? 'tex' : value
+  end
+
   def link_rel
     'noopener' if option?('noopener') || attr(:window) == '_blank'
   end
@@ -514,7 +526,7 @@ is book and it's a child of a book part. Excluding block content."
   # @return [String, nil] the revision date in ISO 8601, or nil if not
   #   available or in invalid format.
   def revdate_iso
-    ::Date.parse(revdate).iso8601
+    ::Date.parse(revdate).iso8601 if defined? ::Date
   rescue ArgumentError
     nil
   end
@@ -560,8 +572,9 @@ is book and it's a child of a book part. Excluding block content."
     end
 
     if attr? 'stem'
-      scripts << { src: MATHJAX_JS_URI }
-      scripts << { type: 'text/x-mathjax-config', text: "MathJax.Hub.Config(#{MATHJAX_CONFIG});" }
+      styles << { href: KATEX_CSS_URI }
+      scripts << { src: KATEX_JS_URI }
+      scripts << { text: KATEX_RENDER_CODE }
     end
 
     case attr 'source-highlighter'
@@ -579,7 +592,6 @@ is book and it's a child of a book part. Excluding block content."
       hjs_theme = attr 'highlightjs-theme', DEFAULT_HIGHLIGHTJS_THEME
 
       scripts << { src: [hjs_base, 'highlight.min.js'] }
-      scripts << { src: [hjs_base, 'lang/common.min.js'] }
       scripts << { text: 'hljs.initHighlightingOnLoad()' }
       styles  << { href: [hjs_base, "styles/#{hjs_theme}.min.css"] }
     end

data/data/templates/inline_quoted.html.slim

@@ -20,7 +20,10 @@
   = html_tag_if role?, :span, :class=>role
     | ‘#{text}’
 - when :asciimath, :latexmath
-  span.math =delimit_stem text, type
+  span.math data-lang=stem_lang =(delimit_stem text, type)
 - else
-  = html_tag_if role?, :span, :class=>role
-    =text
+  - if role == 'line-through' || role == 'del'
+    del =text
+  - else
+    = html_tag_if role?, :span, :class=>role
+      =text

data/data/templates/stem.html.slim

@@ -1,2 +1,2 @@
 = block_with_caption :top, :class=>'stem-block'
-  .math =(delimit_stem content, style)
+  .math data-lang=stem_lang =(delimit_stem content, style)

data/lib/asciidoctor/html5s/attached_colist_treeprocessor.rb

@@ -1,5 +1,5 @@
 require 'asciidoctor/html5s/version'
-require 'asciidoctor/extensions'
+require 'asciidoctor/extensions' unless RUBY_PLATFORM == 'opal'
 
 module Asciidoctor::Html5s