kramdown-asciidoc 1.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09c0b0e16b5172881df4562790955bbf9190896c06799771984c8321c354d0c5'
-  data.tar.gz: 743892819a4038df506dee680b7db7f4281e16d6d372f48687114d1db3b03c97
+  metadata.gz: 72f332cee31234bcb8b870e8216bb76062a85a66cbdaf05c8aa3a1829677564a
+  data.tar.gz: e80097972c53c804615741fa8e4b7fe7eb185d173dbb14242ff3c9d7ab1ddf9a
 SHA512:
-  metadata.gz: 563fa683d2ca20b038abe5ae8b22986c21ce073240dedefb955b8a7f4c0ab5343914f2cf8529deeefcffc11455c0bc97c7f1b9306519411101c19caac47daf55
-  data.tar.gz: 90569c98b2ff2390c161bee4d3efa678528b3e6b7f7598834923ee369d4f3a2c3829c36bf4b1491be574bb0d4b4a884b113a04df0206ba5693e11012ad422ee9
+  metadata.gz: b48abf36246bf94d96f6c5f8ff75962f90ae0ec216c947fd9052d865d0e30a3d2b1cbe50a5d84592c95f2dc830c5c3bd82a56f82410bac3c5c082546d3030407
+  data.tar.gz: 6654bbe89a6e3dea310df6df79cad09ab0cd911ca0c562d057827dc5751ab79a03ad8d1914dfe69b3346b01356c4e0fc46611beb19705573918fee7d77bc6006

data/CHANGELOG.adoc

@@ -5,6 +5,71 @@
 This document provides a high-level view of the changes to {project-name} by release.
 For a detailed view of what has changed, refer to the {uri-repo}/commits/master[commit history] on GitHub.
 
+== 2.1.0 (2022-07-04) - @mojavelinux
+
+=== Added
+
+* Add support for multi-paragraph admonitions (#72)
+* Add support for GFM-style admonitions (#103)
+* Convert checkbox at start of items in a checklist (#94)
+* Allow diagram languages to be specified and convert matching fenced code blocks to diagram literal blocks (#76)
+
+=== Fixed
+
+* Separate adjacent delimited literal blocks
+
+=== Changed
+
+* Upgrade kramdown to 2.4.x
+
+=== Details
+
+{url-repo}/releases/tag/v2.1.0[git tag] | {url-repo}/compare/v2.0.1\...v2.1.0[full diff]
+
+== 2.0.1 (2022-06-29) - @mojavelinux
+
+=== Fixed
+
+* Fix crash when fenced code block is empty and does not specify a language (#93)
+* Fix crash when input contains `<script>` tag (#98)
+* Fix crash if blockquote ends with nested block (#96)
+* Handle text that maps to an abbreviation (#97)
+* Handle front matter value that is parsed as a date or datetime (#95)
+
+=== Changed
+
+* Add JRuby 9.3 to CI matrix
+
+=== Details
+
+{url-repo}/releases/tag/v2.0.1[git tag] | {url-repo}/compare/v2.0.0\...v2.0.1[full diff]
+
+== 2.0.0 (2021-07-11) - @mojavelinux
+
+=== Added
+
+* Add support for converting block LaTeX math to stem block
+* Add support for converting span LaTeX math to inline stem macro
+* Add basic support for footnotes (#74)
+
+=== Fixed
+
+* Use File.read instead of IO.read to suppress magic subprocess behavior
+* Enable compatibility with Ruby 3 by declaring rexml as a runtime dependency (#84)
+* Don't crash when converting list item that only contains spaces (#83)
+
+=== Changed
+
+* Upgrade kramdown to 2.3.x and declare kramdown-parser-gfm as runtime dependency (#85)
+* Don't add source style to listing block when language is specified
+* Switch CI to GitHub Actions
+* Run test suite in CI environment on Windows and macOS
+* Apply style rules to source code
+
+=== Details
+
+{uri-repo}/releases/tag/v2.0.0[git tag] | {uri-repo}/compare/v1.0.1\...v2.0.0[full diff]
+
 == 1.0.1 (2018-11-28) - @mojavelinux
 
 === Fixed

data/Gemfile

@@ -1,8 +1,23 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gemspec
 
+without = (Bundler.settings['WITHOUT'] || '').split ':'
+
 group :docs do
-  gem 'yard'
-  gem 'asciidoctor'
-end
+  gem 'asciidoctor', require: false
+  gem 'yard', require: false
+end unless without.include? 'docs'
+
+group :lint do
+  gem 'rubocop', '~> 1.28.0', require: false
+  gem 'rubocop-rake', '~> 0.6.0', require: false
+  gem 'rubocop-rspec', '~> 2.10.0', require: false
+end unless without.include? 'lint'
+
+group :coverage do
+  gem 'deep-cover-core', '~> 1.1.0', require: false
+  gem 'simplecov', '~> 0.21.0', require: false
+end unless without.include? 'coverage'

data/LICENSE.adoc

@@ -1,6 +1,6 @@
 .The MIT License
 ....
-Copyright (C) 2016 OpenDevise Inc. (on behalf of the Asciidoctor Project)
+Copyright (C) 2016-2021 OpenDevise Inc. and the individual contributors to {project-name}.
 
 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

@@ -1,6 +1,6 @@
 = {project-name} (Markdown to AsciiDoc)
 Dan Allen <https://github.com/mojavelinux>
-v1.0.1, 2018-11-28
+v2.1.0, 2022-07-04
 // Aliases:
 :project-name: Kramdown AsciiDoc
 :project-handle: kramdown-asciidoc
@@ -19,28 +19,23 @@ ifdef::env-github[]
 :tip-caption: :bulb:
 endif::[]
 // URIs:
-:uri-repo: https://github.com/asciidoctor/kramdown-asciidoc
-:uri-asciidoc: https://asciidoctor.org/docs/what-is-asciidoc/#what-is-asciidoc
-:uri-asciidoctor: https://asciidoctor.org
-:uri-kramdown: https://kramdown.gettalong.org
-:uri-rvm: https://rvm.io
-:uri-rvm-install: https://rvm.io/rvm/install
-:uri-api-docs: https://www.rubydoc.info/github/asciidoctor/kramdown-asciidoc/master
-:uri-ci-appveyor: https://ci.appveyor.com/project/asciidoctor/kramdown-asciidoc
-:img-uri-ci-appveyor: https://ci.appveyor.com/api/projects/status/2pwvdbcoeux1ifb5/branch/master?svg=true
-:uri-ci-travis: https://travis-ci.org/asciidoctor/kramdown-asciidoc
-:img-uri-ci-travis: https://img.shields.io/travis/asciidoctor/kramdown-asciidoc/master.svg
-:uri-gem: https://rubygems.org/gems/kramdown-asciidoc
-:img-uri-gem: https://img.shields.io/gem/v/kramdown-asciidoc.svg?label=gem
+:url-repo: https://github.com/asciidoctor/kramdown-asciidoc
+:url-asciidoc: https://asciidoctor.org/docs/what-is-asciidoc/#what-is-asciidoc
+:url-asciidoctor: https://asciidoctor.org
+:url-kramdown: https://kramdown.gettalong.org
+:url-rvm: https://rvm.io
+:url-rvm-install: https://rvm.io/rvm/install
+:url-api-docs: https://www.rubydoc.info/github/asciidoctor/kramdown-asciidoc/master
+:url-gem: https://rubygems.org/gems/kramdown-asciidoc
+:img-url-gem: https://img.shields.io/gem/v/kramdown-asciidoc.svg?label=gem
 
 ifdef::status[]
-image:{img-uri-gem}[Gem Version,link={uri-gem}]
-image:{img-uri-ci-travis}[Build Status (Travis CI),link={uri-ci-travis}]
-image:{img-uri-ci-appveyor}[Build Status (AppVeyor),link={uri-ci-appveyor}]
+image:{img-url-gem}[Gem Version,link={url-gem}]
+image:{url-repo}/workflows/CI/badge.svg[Build Status (GitHub Actions),link={url-repo}/actions?query=workflow%3ACI+branch%3Amain]
 endif::[]
 
-{uri-repo}[{project-name}] (gem: *{project-handle}*, command: `kramdoc`) is a {uri-kramdown}[kramdown] extension for converting Markdown documents to {uri-asciidoc}[AsciiDoc].
-Notably, the converter generates modern AsciiDoc syntax suitable for use with {uri-asciidoctor}[Asciidoctor].
+{url-repo}[{project-name}] (gem: *{project-handle}*, command: `kramdoc`) is a {url-kramdown}[kramdown] extension for converting Markdown documents to {url-asciidoc}[AsciiDoc].
+Notably, the converter generates modern AsciiDoc syntax suitable for use with {url-asciidoctor}[Asciidoctor].
 
 == Prerequisites
 
@@ -51,7 +46,7 @@ To check whether you have Ruby installed, and which version, run the following c
 
  $ ruby -v
 
-If Ruby is not installed, you can install it using {uri-rvm}[RVM] (or, if you prefer, the package manager for your system).
+If Ruby is not installed, you can install it using {url-rvm}[RVM] (or, if you prefer, the package manager for your system).
 We generally recommend using RVM because it allows you to install gems without requiring elevated privileges or messing with system libraries.
 
 == Installation
@@ -91,7 +86,7 @@ To see all the options the `kramdoc` command accepts, pass the `-h` option to th
 
 For example, you can inject attributes (key/value pairs) into the header of the AsciiDoc output document using the `-a` option.
 
- $ kramdoc -a product-name="ACME Cloud" -a hide-uri-scheme sample.md
+ $ kramdoc -a product-name="ACME Cloud" -a hide-url-scheme sample.md
 
 Another use for attributes is setting the shared images directory, which is covered in the next section.
 
@@ -164,7 +159,7 @@ If these values do not match the defaults in AsciiDoc, the `idprefix` and/or `id
 
 == API
 
-In additional to the command-line interface, {project-name} also provides a porcelain API (see {uri-api-docs}[API docs]).
+In additional to the command-line interface, {project-name} also provides a porcelain API (see {url-api-docs}[API docs]).
 We use the term "`porcelain`" because the API hides the details of registering the converter, preprocessing the Markdown document, parsing the document with kramdown, and calling the converter method to transform the parse tree to AsciiDoc.
 
 The API consists of two static methods in the Kramdoc module:
@@ -220,7 +215,7 @@ Kramdoc.convert markdown, to: 'result.adoc'
 
 The input string is automatically converted to UTF-8.
 
-For more information about the API, refer to the {uri-api-docs}[API documentation].
+For more information about the API, refer to the {url-api-docs}[API documentation].
 
 == Development
 
@@ -229,10 +224,10 @@ Follow the instructions below to learn how to clone the source and run the appli
 
 === Retrieve the source code
 
-Simply copy the {uri-repo}[GitHub repository URL] and pass it to the `git clone` command:
+Simply copy the {url-repo}[GitHub repository URL] and pass it to the `git clone` command:
 
 [subs=attributes+]
- $ git clone {uri-repo}
+ $ git clone {url-repo}
 
 Next, switch to the project directory:
 
@@ -241,9 +236,9 @@ Next, switch to the project directory:
 
 === Prepare RVM (optional)
 
-We recommend using {uri-rvm}[RVM] when developing applications with Ruby.
+We recommend using {url-rvm}[RVM] when developing applications with Ruby.
 We like RVM because it keeps the dependencies required by the project isolated from the rest of your system.
-Follow the {uri-rvm-install}[installation instructions] on the RVM site to setup RVM and install Ruby.
+Follow the {url-rvm-install}[installation instructions] on the RVM site to setup RVM and install Ruby.
 
 Once you have RVM setup, switch to the RVM-managed version of Ruby recommended by the project using this command:
 
@@ -372,7 +367,7 @@ To avoid having to do this, or make the `kramdoc` command available from anywher
 
 == Copyright
 
-Copyright (C) 2016-2018 OpenDevise Inc. (on behalf of the Asciidoctor Project).
+Copyright (C) 2016-2021 OpenDevise Inc. and the individual contributors to {project-name}.
 Free use of this software is granted under the terms of the MIT License.
 
 See the link:LICENSE.adoc[LICENSE] file for details.

data/bin/kramdoc

@@ -1,12 +1,11 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
-kramdown_asciidoc = File.absolute_path '../lib/kramdown-asciidoc', __dir__
-if File.exist? kramdown_asciidoc
+if File.file? (kramdown_asciidoc = File.join (File.dirname __dir__), 'lib/kramdown-asciidoc.rb')
   require kramdown_asciidoc
 else
   require 'kramdown-asciidoc'
 end
-
 require 'kramdown-asciidoc/cli'
 
 exit Kramdown::AsciiDoc::Cli.run

data/kramdown-asciidoc.gemspec

@@ -25,16 +25,16 @@ Gem::Specification.new do |s|
   rescue
     Dir['**/*']
   end
-  #s.files = files.grep %r/^(?:lib\/.+|Gemfile|Rakefile|(?:CHANGELOG|CONTRIBUTING|LICENSE|README)\.adoc|#{s.name}\.gemspec)$/
-  #s.test_files = files.grep %r/^(?:spec\/.+)$/
   s.files = files.grep %r/^(?:lib\/.+|Gemfile|(?:CHANGELOG|LICENSE|README)\.adoc|#{s.name}\.gemspec)$/
+  #s.test_files = files.grep %r/^spec\/./
   s.executables = ['kramdoc']
 
   s.require_paths = ['lib']
 
-  s.add_runtime_dependency 'kramdown', '~> 1.17.0'
-  s.add_development_dependency 'deep-cover-core', '~> 0.6.3'
-  s.add_development_dependency 'rake', '~> 12.3.1'
-  s.add_development_dependency 'rspec', '~> 3.8.0'
-  s.add_development_dependency 'simplecov', '~> 0.16.1'
+  s.add_runtime_dependency 'kramdown', '~> 2.4.0'
+  s.add_runtime_dependency 'rexml', '~> 3.2.0'
+  s.add_runtime_dependency 'kramdown-parser-gfm', '~> 1.1.0'
+
+  s.add_development_dependency 'rake', '~> 13.0.0'
+  s.add_development_dependency 'rspec', '~> 3.11.0'
 end

data/lib/kramdoc.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require 'kramdown-asciidoc'

data/lib/kramdown-asciidoc/api.rb

@@ -1,4 +1,7 @@
-module Kramdown; module AsciiDoc
+# frozen_string_literal: true
+
+module Kramdown
+module AsciiDoc
   DEFAULT_PARSER_OPTS = {
     auto_ids: false,
     hard_wrap: false,
@@ -9,7 +12,7 @@ module Kramdown; module AsciiDoc
   DEFAULT_PREPROCESSORS = [
     (Preprocessors.method :extract_front_matter),
     (Preprocessors.method :replace_toc),
-    (Preprocessors.method :snap_leading_comment),
+    (Preprocessors.method :trim_before_leading_comment),
   ]
 
   # Converts a Markdown string to an AsciiDoc string and either returns the result or writes it to a file.
@@ -24,7 +27,10 @@ module Kramdown; module AsciiDoc
   # @option opts [Symbol] :wrap (:preserve) the line wrapping behavior to apply (:preserve, :ventilate, or :none).
   # @option opts [Integer] :heading_offset (0) the heading offset to apply to heading levels.
   # @option opts [Boolean] :auto_links (true) whether to allow raw URLs to be recognized as links.
-  # @option opts [Hash] :attributes ({}) AsciiDoc attributes to add to the document header of the output document.
+  # @option opts [Hash] :attributes ({}) additional AsciiDoc attributes to add to header of output document; reserved
+  #   attributes, like stem, may be overridden; some attributes may impact conversion, such as idprefix and idseparator
+  # @option opts [String] :imagesdir (nil) the prefix to remove from image references found in the Markdown document;
+  #   if not specified, the value of the imagesdir attribute is used
   # @option opts [Symbol] :encode (true) whether to reencode the source to UTF-8.
   # @option opts [Array<Proc>] :preprocessors ([]) a list of preprocessors functions to execute on the cleaned Markdown source.
   # @option opts [Array<Proc>] :postprocessors ([]) a list of functions through which to run the output document.
@@ -79,7 +85,10 @@ module Kramdown; module AsciiDoc
   # @option opts [Symbol] :wrap (:preserve) the line wrapping behavior to apply (:preserve, :ventilate, or :none).
   # @option opts [Integer] :heading_offset (0) the heading offset to apply to heading levels.
   # @option opts [Boolean] :auto_links (true) whether to allow raw URLs to be recognized as links.
-  # @option opts [Hash] :attributes ({}) AsciiDoc attributes to add to the document header of the output document.
+  # @option opts [Hash] :attributes ({}) additional AsciiDoc attributes to add to header of output document; reserved
+  #   attributes, like stem, may be overridden; some attributes may impact conversion, such as idprefix and idseparator
+  # @option opts [String] :imagesdir (nil) the prefix to remove from image references found in the Markdown document;
+  #   if not specified, the value of the imagesdir attribute is used
   # @option opts [Array<Proc>] :preprocessors ([]) a list of preprocessors functions to execute on the cleaned Markdown source.
   # @option opts [Array<Proc>] :postprocessors ([]) a list of functions through which to run the output document.
   # @option opts [Proc] :postprocess (nil) a function through which to run the output document (if :postprocessors is falsy).
@@ -92,7 +101,7 @@ module Kramdown; module AsciiDoc
       markdown_file = markdown_file.path
       encode = true
     else
-      markdown = ::IO.read markdown_file, mode: 'r:UTF-8', newline: :universal
+      markdown = ::File.read markdown_file, mode: 'r:UTF-8', newline: :universal
       encode = false
     end
     if (to = opts[:to])
@@ -104,10 +113,11 @@ module Kramdown; module AsciiDoc
     convert markdown, (opts.merge to: to, encode: encode)
   end
 
-  private
-
   CR = ?\r
   LF = ?\n
   TAB = ?\t
   UTF_8 = ::Encoding::UTF_8
-end; end
+
+  private_constant :CR, :LF, :TAB, :UTF_8
+end
+end

data/lib/kramdown-asciidoc/cli.rb

@@ -1,18 +1,21 @@
+# frozen_string_literal: true
+
 require 'optparse'
 require 'pathname'
 
-module Kramdown; module AsciiDoc
+module Kramdown
+module AsciiDoc
   autoload :VERSION, (::File.join __dir__, 'version.rb')
   class Cli
     def parse args
       options = {
-        attributes: {}
+        attributes: {},
       }
 
       opt_parser = ::OptionParser.new do |opts|
         opts.program_name = 'kramdoc'
         opts.banner = <<~EOS
-        Usage: #{opts.program_name} [OPTION]... FILE...
+        Usage: #{opts.program_name} [OPTION]... FILE
 
         Converts Markdown to AsciiDoc.
 
@@ -28,10 +31,14 @@ module Kramdown; module AsciiDoc
 
         opts.on '-a KEY[=VALUE]', '--attribute=KEY[=VALUE]', 'Set an attribute in the AsciiDoc document header (accepts: key, key!, or key=value)' do |attr|
           key, val = attr.split '=', 2
-          val = '' unless val
+          val ||= ''
           options[:attributes][key] = val
         end
 
+        opts.on '--diagram-languages=VALUES', 'Specify source languages to treat as diagrams (default: plantuml,mermaid)' do |names|
+          options[:diagram_languages] = names.split ','
+        end
+
         opts.on '--wrap=preserve|none|ventilate', [:none, :preserve, :ventilate], 'Set how lines are wrapped in the AsciiDoc document (default: preserve)' do |wrap|
           options[:wrap] = wrap
         end
@@ -84,10 +91,8 @@ module Kramdown; module AsciiDoc
       if args.empty?
         opt_parser.warn 'Please specify a Markdown file to convert.'
         $stdout.write opt_parser.help
-        return 1
-      end
-
-      if args.size == 1
+        1
+      elsif args.size == 1
         options[:input_file] = args[0]
         [0, options]
       else
@@ -117,9 +122,10 @@ module Kramdown; module AsciiDoc
         ::Kramdoc.convert_file input_file, options
       end
       0
-    rescue ::IOError => e
-      $stderr.write %(kramdoc: #{e.message}\n)
+    rescue ::IOError
+      $stderr.write %(kramdoc: #{$!.message}\n)
       1
     end
   end
-end; end
+end
+end

data/lib/kramdown-asciidoc/converter.rb

@@ -1,5 +1,7 @@
-# encoding: UTF-8
-module Kramdown; module AsciiDoc
+# frozen_string_literal: true
+
+module Kramdown
+module AsciiDoc
   class Converter < ::Kramdown::Converter::Base
     using CoreExt
 
@@ -45,12 +47,12 @@ module Kramdown; module AsciiDoc
     InvalidIdCharsRx = /&(?:[a-z][a-z]+\d{0,2}|#\d\d\d{0,4}|#x[\da-f][\da-f][\da-f]{0,3});|[^ \p{Word}\-.]+?/
     ListMarkerRx = /^[ \t]*(?:(?:-|\*\*{0,4}|\.\.{0,4}|\d+\.|[a-zA-Z]\.|[IVXivx]+\))[ \t]|.*?(?::::{0,2}|;;)(?:$|[ \t]))/
     MenuRefRx = /^([\p{Word}&].*?)\s>\s([\p{Word}&].*(?:\s>\s|$))+/
-    ReplaceableTextRx = /[-=]>|<[-=]| -- |\p{Word}--\p{Word}|\*\*|\.\.\.|&\S+;|\{\p{Word}[\p{Word}-]*\}|(?:https?|ftp):\/\/\p{Word}|\((?:C|R|TM)\)/
+    ReplaceableTextRx = %r([-=]>|<[-=]| -- |\p{Word}--\p{Word}|\*\*|\.\.\.|&\S+;|\{\p{Word}[\p{Word}-]*\}|(?:https?|ftp)://\p{Word}|\((?:C|R|TM)\))
     SmartApostropheRx = /\b’\b/
-    StopPunctRx = /(?<=\S[.;]|.\?|.!)\p{Blank}+/
+    StopPunctRx = /(?<=\S[.;]|.[?!])\p{Blank}+/
     TrailingSpaceRx = / +$/
     TypographicSymbolRx = /[“”‘’—–…]/
-    UriSchemeRx = /(?:https?|ftp):\/\/\p{Word}/
+    UriSchemeRx = %r((?:https?|ftp)://\p{Word})
     WordishRx = /[\p{Word};:<>&]/
     WordRx = /\p{Word}/
     XmlCommentRx = /\A<!--(.*)-->\Z/m
@@ -67,13 +69,13 @@ module Kramdown; module AsciiDoc
       @lazy_ids = opts[:lazy_ids]
       if @auto_ids || @lazy_ids
         if @auto_ids
-          unless (@id_pre = opts[:auto_id_prefix]) == '_'
+          @id_pre = opts[:auto_id_prefix]
+          sep = opts[:auto_id_separator] || '-'
+          if @lazy_ids
             # NOTE only need to set idprefix when lazy_ids is set since otherwise all IDs are explicit
-            @attributes['idprefix'] = @id_pre if @lazy_ids
-          end
-          unless (sep = opts[:auto_id_separator] || '-') == '_'
+            @attributes['idprefix'] = @id_pre unless @id_pre == '_'
             # NOTE only need to set idseparator when lazy_ids is set since otherwise all IDs are explicit
-            @attributes['idseparator'] = sep if @lazy_ids
+            @attributes['idseparator'] = sep unless sep == '_'
           end
         else
           @id_pre = @attributes['idprefix'] || '_'
@@ -88,7 +90,9 @@ module Kramdown; module AsciiDoc
         @id_sep_replace = sep_replace
       end
       @ids_seen = {}
+      @footnote_ids = ::Set.new
       @auto_links = opts.fetch :auto_links, true
+      @diagram_languages = opts[:diagram_languages] || %w(plantuml mermaid)
       @heading_offset = opts[:heading_offset] || 0
       @imagesdir = opts[:imagesdir] || @attributes['imagesdir']
       @wrap = opts[:wrap] || :preserve
@@ -166,8 +170,7 @@ module Kramdown; module AsciiDoc
     # Kramdown incorrectly uses the term header for headings
     alias convert_header convert_heading
 
-    def convert_blank el, opts
-    end
+    def convert_blank el, opts; end
 
     def convert_p el, opts
       (writer = opts[:writer]).start_block
@@ -183,7 +186,8 @@ module Kramdown; module AsciiDoc
       elsif (child_i.type == :strong || child_i.type == :em) &&
           (marker_el = child_i.children[0]) && ((marker = ADMON_FORMATTED_MARKERS[marker_el.value]) ||
           ((marker = ADMON_LABELS[marker_el.value]) && (child_ii = to_element children[1]).type == :text &&
-          ((child_ii_text = child_ii.value).start_with? ': ')))
+          (((child_ii_text = child_ii.value).start_with? ': ') ||
+          (opts[:parent].type == :blockquote && (child_ii_text.start_with? ?\n)))))
         children = children.drop 1
         children[0] = clone child_ii, value: (child_ii_text.slice 1, child_ii_text.length) if child_ii
         # Q: should we only rstrip?
@@ -201,10 +205,18 @@ module Kramdown; module AsciiDoc
       (writer = opts[:writer]).start_block
       traverse el, (opts.merge writer: (block_writer = Writer.new), blockquote_depth: (depth = opts[:blockquote_depth] || 0) + 1)
       contents = block_writer.body
-      if contents[0].start_with?(*ADMON_MARKERS_ASCIIDOC) && !(contents.include? '')
-        writer.add_lines contents
+      if contents[0].start_with?(*ADMON_MARKERS_ASCIIDOC)
+        if contents.include? ''
+          style, _, contents[0] = contents[0].partition ': '
+          writer.add_line %([#{style}])
+          writer.start_delimited_block '='
+          writer.add_lines contents
+          writer.end_delimited_block
+        else
+          writer.add_lines contents
+        end
       else
-        if contents.size > 1 && (contents[-1].start_with? '-- ')
+        if contents.size > 1 && ::String === (last_line = contents[-1]) && (last_line.start_with? '-- ')
           attribution = (attribution_line = contents.pop).slice 3, attribution_line.length
           writer.add_line %([,#{attribution}])
           # NOTE there will be at least one non-blank line, but coerce .to_s just to be safe
@@ -222,29 +234,38 @@ module Kramdown; module AsciiDoc
     def convert_codeblock el, opts
       writer = opts[:writer]
       # NOTE hack to down-convert level-5 heading to block title
-      if (current_line = writer.current_line) && (!(current_line.start_with? '.') || (current_line.start_with? '. '))
+      if (current_line = writer.current_line) &&
+          ((current_line.start_with? '.') ? (current_line == '....' || (current_line.start_with? '. ')) : true)
         writer.start_block
       end
       lines = el.value.rstrip.split LF
+      first_line = lines[0]
       if (lang = el.attr['class'])
         # NOTE Kramdown always prefixes class with language-
         # TODO remap lang if requested
-        writer.add_line %([source,#{lang = lang.slice 9, lang.length}])
-      elsif (prompt = lines[0].start_with? '$ ')
-        writer.add_line %([source,#{lang = 'console'}]) if lines.include? ''
+        lang = lang.slice 9, lang.length
+        if @diagram_languages.include? lang
+          diagram = true
+          writer.add_line %([#{lang}])
+        else
+          writer.add_line %([,#{lang}])
+        end
+      elsif (prompt = first_line && (first_line.start_with? '$ '))
+        writer.add_line %([,#{lang = 'console'}]) if lines.include? ''
       end
       if lang || (el.options[:fenced] && !prompt)
-        writer.add_line '----'
+        delimiter = diagram ? '....' : '----'
+        writer.add_line delimiter
         writer.add_lines lines
-        writer.add_line '----'
-      elsif !prompt && ((lines.include? '') || (ListMarkerRx.match? lines[0]))
+        writer.add_line delimiter
+      elsif !prompt && ((lines.include? '') || (first_line && (ListMarkerRx.match? first_line)))
         writer.add_line '....'
         writer.add_lines lines
         writer.add_line '....'
       else
         # NOTE clear the list continuation as it isn't required
         writer.clear_line if writer.current_line == '+'
-        writer.add_line lines.map {|l| %( #{l}) }
+        writer.add_line(lines.map {|l| %( #{l}) })
       end
     end
 
@@ -263,8 +284,8 @@ module Kramdown; module AsciiDoc
         block = true
       end
       macro_attrs = [nil]
-      if (alt_text = el.attr['alt'])
-        macro_attrs[0] = alt_text unless alt_text.empty?
+      if (alt_text = el.attr['alt']) && !alt_text.empty?
+        macro_attrs[0] = alt_text
       end
       if (width = el.attr['width'])
         macro_attrs << width
@@ -293,7 +314,7 @@ module Kramdown; module AsciiDoc
       end
     end
 
-    def convert_ul el, opts
+    def _convert_list el, opts
       kin = el.type == :dl ? :dlist : :list
       (writer = opts[:writer]).start_list (parent = opts[:parent]).type == :dd || parent.options[:compound], kin
       traverse el, opts
@@ -301,15 +322,16 @@ module Kramdown; module AsciiDoc
       writer.add_blank_line if writer.in_list? && opts[:next]
     end
 
-    alias convert_ol convert_ul
-    alias convert_dl convert_ul
+    alias convert_ul _convert_list
+    alias convert_ol _convert_list
+    alias convert_dl _convert_list
 
     def convert_li el, opts
       writer = opts[:writer]
       writer.add_blank_line if (prev = opts[:prev]) && prev.options[:compound]
       marker = opts[:parent].type == :ol ? '.' : '*'
       indent = (level = writer.list_level) - 1
-      if (children = el.children)[0].type == :p
+      if !(children = el.children).empty? && children[0].type == :p
         primary, remaining = [(children = children.dup).shift, children]
         primary_lines = compose_text [primary], parent: el, strip: true, split: true, wrap: @wrap
       else
@@ -320,7 +342,7 @@ module Kramdown; module AsciiDoc
       writer.add_lines primary_lines
       unless remaining.empty?
         if remaining.find {|n| (type = n.type) == :blank ? nil : ((BLOCK_TYPES.include? type) ? true : break) }
-          el.options[:compound] = true 
+          el.options[:compound] = true
         end
         traverse remaining, (opts.merge parent: el)
       end
@@ -402,7 +424,7 @@ module Kramdown; module AsciiDoc
       opts[:writer].add_lines table_buffer
     end
 
-    def convert_hr el, opts
+    def convert_hr _el, opts
       (writer = opts[:writer]).start_block
       writer.add_line '\'\'\''
     end
@@ -411,11 +433,11 @@ module Kramdown; module AsciiDoc
       if (url = el.attr['href']).start_with? '#'
         opts[:writer].append %(<<#{url.slice 1, url.length},#{compose_text el, strip: true}>>)
       elsif url.start_with? 'https://', 'http://'
-        if (children = el.children).size == 1 && (child_i = el.children[0]).type == :img
+        if (children = el.children).size == 1 && (child_i = children[0]).type == :img
           convert_img child_i, parent: opts[:parent], index: 0, url: url, writer: opts[:writer]
         else
           bare = ((text = compose_text el, strip: true).chomp '/') == (url.chomp '/')
-          url = url.gsub '__', '%5F%5F' if (url.include? '__')
+          url = url.gsub '__', '%5F%5F' if url.include? '__'
           opts[:writer].append bare ? url : %(#{url}[#{text.gsub ']', '\]'}])
         end
       elsif url.end_with? '.md'
@@ -425,7 +447,7 @@ module Kramdown; module AsciiDoc
       else
         opts[:writer].append %(link:#{url}[#{(compose_text el, strip: true).gsub ']', '\]'}])
       end
-    end 
+    end
 
     def convert_codespan el, opts
       attrlist, mark = '', '`'
@@ -446,9 +468,10 @@ module Kramdown; module AsciiDoc
       text = el.value
       pass = (replaceable? text) ? :shorthand : nil
       pass = :macro if text.include? '++'
-      if pass == :shorthand
+      case pass
+      when :shorthand
         opts[:writer].append %(#{mark}+#{text}+#{mark})
-      elsif pass == :macro
+      when :macro
         opts[:writer].append %(#{mark}pass:c[#{text}]#{mark})
       else
         opts[:writer].append %(#{attrlist}#{mark}#{text}#{mark})
@@ -483,13 +506,17 @@ module Kramdown; module AsciiDoc
       next_el && next_el.type == :text && (WordRx.match? next_el.value.chr)
     end
 
+    def convert_abbreviation el, opts
+      opts[:writer].append el.value
+    end
+
     def convert_text el, opts
       text = escape_replacements el.value
       if text.include? '++'
         @attributes['pp'] = '{plus}{plus}'
         text = text.gsub '++', '{pp}'
       end
-      if (current_line = (writer = opts[:writer]).current_line).to_s.empty?
+      if (writer = opts[:writer]).current_line.to_s.empty?
         writer.append text.lstrip
       else
         writer.append text
@@ -519,15 +546,19 @@ module Kramdown; module AsciiDoc
       else
         writer.append %(#{(writer.current_line.end_with? ' ') ? '' : ' '}+)
       end
-      if el.options[:html_tag]
-        writer.add_blank_line unless (next_el = to_element opts[:next]).type == :text && (next_el.value.start_with? LF)
-      end
+      writer.add_blank_line if el.options[:html_tag] && ((next_el = to_element opts[:next]).type != :text || !(next_el.value.start_with? LF))
     end
 
     def convert_entity el, opts
       opts[:writer].append RESOLVE_ENTITY_TABLE[el.value.code_point] || el.options[:original]
     end
 
+    def convert_footnote el, opts
+      id = el.options[:name]
+      composed_text = (@footnote_ids.add? id) ? ((compose_text el.value).gsub ']', '\]') : ''
+      opts[:writer].append %(footnote:#{id}[#{composed_text}])
+    end
+
     def convert_smart_quote el, opts
       opts[:writer].append SMART_QUOTE_ENTITY_TO_MARKUP[el.value]
     end
@@ -538,7 +569,11 @@ module Kramdown; module AsciiDoc
     end
 
     def convert_html_element el, opts
-      if (tag = el.value) == 'div' && (child_i = el.children[0]) && child_i.options[:transparent] && (child_i_i = child_i.children[0])
+      if (tag = el.value) == 'script'
+        opts[:writer].start_block
+        opts[:writer].add_lines ['++++', '<script>', el.children[0].value.strip, '</script>', '++++']
+        return
+      elsif tag == 'div' && (child_i = el.children[0]) && child_i.options[:transparent] && (child_i_i = child_i.children[0])
         if child_i_i.value == 'span' && ((role = el.attr['class'].to_s).start_with? 'note') && child_i_i.attr['class'] == 'notetitle'
           marker = ADMON_FORMATTED_MARKERS[(to_element child_i_i.children[0]).value] || 'Note'
           lines = compose_text (child_i.children.drop 1), parent: child_i, strip: true, split: true, wrap: @wrap
@@ -568,8 +603,12 @@ module Kramdown; module AsciiDoc
       when 'sub'
         opts[:writer].append %(~#{contents}~)
       else
-        attrs = (attrs = el.attr).empty? ? '' : attrs.map {|k, v| %( #{k}="#{v}") }.join
-        opts[:writer].append %(+++<#{tag}#{attrs}>+++#{contents}+++</#{tag}>+++)
+        if tag == 'input' && el.attr['type'] == 'checkbox' && el.attr['class'] == 'task-list-item-checkbox'
+          opts[:writer].append %([#{el.attr['checked'] ? 'x' : ' '}] )
+        else
+          attrs = (attrs = el.attr).empty? ? '' : attrs.map {|k, v| %( #{k}="#{v}") }.join
+          opts[:writer].append %(+++<#{tag}#{attrs}>+++#{contents}+++</#{tag}>+++)
+        end
       end
     end
 
@@ -583,7 +622,7 @@ module Kramdown; module AsciiDoc
         lines = val.split LF
       end
       #siblings = (parent = opts[:parent]) ? parent.children : []
-      if (el.options[:category] == :block)# || (!opts[:result][-1] && siblings[-1] == el)
+      if el.options[:category] == :block # || (!opts[:result][-1] && siblings[-1] == el)
         writer.start_block
         if lines.empty?
           writer.add_line '//'
@@ -611,10 +650,24 @@ module Kramdown; module AsciiDoc
       end
     end
 
+    def convert_math el, opts
+      writer = opts[:writer]
+      @attributes['stem'] = 'latexmath'
+      if el.options[:category] == :span
+        writer.append %(stem:[#{el.value.gsub ']', '\]'}])
+      else
+        writer.start_block
+        writer.add_line '[stem]'
+        writer.add_line '++++'
+        writer.add_lines el.value.rstrip.split LF
+        writer.add_line '++++'
+      end
+    end
+
     private
 
     def extract_prologue el, opts
-      if (child_i = to_element (children = el.children)[0]).type == :xml_comment
+      if (to_element (children = el.children)[0]).type == :xml_comment
         (prologue_el = el.dup).children = children.take_while {|child| child.type == :xml_comment || child.type == :blank }
         (el = el.dup).children = children.drop prologue_el.children.size
         traverse prologue_el, (opts.merge writer: (prologue_writer = Writer.new))
@@ -692,9 +745,9 @@ module Kramdown; module AsciiDoc
         end
       end
       if ventilate
-        result.map {|line|
-          (line.start_with? '//') || !(STOP_PUNCTUATION.any? {|punc| line.include? punc }) ? line : (line.gsub StopPunctRx, LF)
-        }.join LF
+        result.map do |l|
+          (l.start_with? '//') || !(STOP_PUNCTUATION.any? {|punc| l.include? punc }) ? l : (l.gsub StopPunctRx, LF)
+        end.join LF
       else
         result.join LF
       end
@@ -741,4 +794,5 @@ module Kramdown; module AsciiDoc
       @ids_seen[id] = idx || UNIQUE_ID_START_INDEX
     end
   end
-end; end
+end
+end

data/lib/kramdown-asciidoc/core_ext/regexp/is_match.rb

@@ -1,5 +1,13 @@
-module Kramdown; module AsciiDoc; module CoreExt
-  refine Regexp do
-    alias match? === unless method_defined? :match? # nocov
+# frozen_string_literal: true
+
+module Kramdown
+module AsciiDoc
+  module CoreExt
+    refine Regexp do
+      # rubocop:disable Style/Alias
+      alias match? === unless method_defined? :match? # nocov
+      # rubocop:enable Style/Alias
+    end
   end
-end; end; end
+end
+end

data/lib/kramdown-asciidoc/core_ext/yaml.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require 'yaml'
+
+autoload :Date, 'time'
+autoload :Time, 'time'
+
+unless (YAML.method :safe_load).parameters.include? [:key, :aliases]
+  YAML.singleton_class.prepend (Module.new do
+    def safe_load yaml, permitted_classes: [], permitted_symbols: [], aliases: false, filename: nil
+      super yaml, permitted_classes, permitted_symbols, aliases, filename
+    end
+  end)
+end

data/lib/kramdown-asciidoc/kramdown_ext/parser/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Kramdown::Parser::Base
   # Overload the parse method to force value of the :auto_ids option to false.
   #

data/lib/kramdown-asciidoc/kramdown_ext/parser/html.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Kramdown::Parser::Html::ElementConverter
   # Overload the convert_br method to add the :html_tag option to indicate this element originates from an HTML tag.
   #

data/lib/kramdown-asciidoc/preprocessors.rb

@@ -1,4 +1,7 @@
-module Kramdown; module AsciiDoc
+# frozen_string_literal: true
+
+module Kramdown
+module AsciiDoc
   module Preprocessors
     # Skims off the front matter from the top of the Markdown source and store the data in the provided attributes Hash.
     #
@@ -15,7 +18,7 @@ module Kramdown; module AsciiDoc
         end
         return source unless line && line.chomp == '---' && !(front_matter.include? ?\n)
         lines.shift while (line = lines[0]) && line == ?\n
-        (::YAML.load front_matter.join).each do |key, val|
+        (::YAML.safe_load front_matter.join, permitted_classes: [::Date, ::Time]).each do |key, val|
           if key == 'layout'
             attributes['page-layout'] = val unless val == 'default'
           else
@@ -43,22 +46,21 @@ module Kramdown; module AsciiDoc
       end
     end
 
-    # Snaps the leading XML comment to the start of the Markdown source.
+    # Trims space characters that precede a leading XML comment in the Markdown source.
     #
     # @param markdown [String] the Markdown source to process.
     # @param attributes [Hash] a map of AsciiDoc attributes to set on the output document.
     #
-    # @return [String] the Markdown source with whitespace the precedes a leading XML comment removed.
-    def self.snap_leading_comment markdown, attributes
+    # @return [String] the Markdown source with the space characters preceding a leading XML comment removed.
+    def self.trim_before_leading_comment markdown, _attributes
       (markdown.start_with? ' ', TAB) && (markdown.lstrip.start_with? '<!--') ? markdown.lstrip : markdown
     end
 
-    private
-
     TAB = ?\t
-
     TocDirectiveTip = '<!-- TOC '
+    TocDirectiveRx = %r(^<!-- TOC .*<!-- /TOC -->)m
 
-    TocDirectiveRx = /^<!-- TOC .*<!-- \/TOC -->/m
+    private_constant :TAB, :TocDirectiveTip, :TocDirectiveRx
   end
-end; end
+end
+end

data/lib/kramdown-asciidoc/version.rb

@@ -1,3 +1,7 @@
-module Kramdown; module AsciiDoc
-  VERSION = '1.0.1'
-end; end
+# frozen_string_literal: true
+
+module Kramdown
+module AsciiDoc
+  VERSION = '2.1.0'
+end
+end

data/lib/kramdown-asciidoc/writer.rb

@@ -1,4 +1,7 @@
-module Kramdown; module AsciiDoc
+# frozen_string_literal: true
+
+module Kramdown
+module AsciiDoc
   class Writer
     LF = ?\n
 
@@ -48,7 +51,6 @@ module Kramdown; module AsciiDoc
       parent_body, @block_delimiter, @block_separator, @list_level = @nesting_stack.pop
       @body = (parent_body + @body) << @block_delimiter
       @block_delimiter = nil
-      nil
     end
 
     # Q: perhaps do_in_list that takes a block?
@@ -130,4 +132,5 @@ module Kramdown; module AsciiDoc
       (header.empty? ? @body : (header + (@body.empty? ? [] : [''] + @body))).join LF
     end
   end
-end; end
+end
+end

data/lib/kramdown-asciidoc.rb

@@ -1,7 +1,10 @@
+# frozen_string_literal: true
+
 require 'kramdown'
 require_relative 'kramdown-asciidoc/kramdown_ext/parser/base'
 require_relative 'kramdown-asciidoc/kramdown_ext/parser/html'
 require_relative 'kramdown-asciidoc/core_ext/regexp/is_match'
+require_relative 'kramdown-asciidoc/core_ext/yaml'
 require_relative 'kramdown-asciidoc/preprocessors'
 require_relative 'kramdown-asciidoc/writer'
 require_relative 'kramdown-asciidoc/converter'
@@ -11,4 +14,3 @@ Kramdown::Converter::Asciidoc = Kramdown::AsciiDoc::Converter
 # add Kramdoc alias
 Kramdoc = Kramdown::AsciiDoc
 autoload :Pathname, 'pathname'
-autoload :YAML, 'yaml'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kramdown-asciidoc
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Dan Allen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-29 00:00:00.000000000 Z
+date: 2022-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown
@@ -16,70 +16,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.17.0
+        version: 2.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.17.0
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
-  name: deep-cover-core
+  name: rexml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.3
-  type: :development
+        version: 3.2.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: kramdown-parser-gfm
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.3.1
-  type: :development
+        version: 1.1.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.3.1
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: 13.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: 13.0.0
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: 3.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: 3.11.0
 description: A kramdown extension for converting Markdown documents to AsciiDoc.
 email:
 - dan.j.allen@gmail.com
@@ -100,6 +100,7 @@ files:
 - lib/kramdown-asciidoc/cli.rb
 - lib/kramdown-asciidoc/converter.rb
 - lib/kramdown-asciidoc/core_ext/regexp/is_match.rb
+- lib/kramdown-asciidoc/core_ext/yaml.rb
 - lib/kramdown-asciidoc/kramdown_ext/parser/base.rb
 - lib/kramdown-asciidoc/kramdown_ext/parser/html.rb
 - lib/kramdown-asciidoc/preprocessors.rb
@@ -128,8 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: A Markdown to AsciiDoc converter based on kramdown