kramdown-asciidoc 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2f299ca0d156093eca0b0bf206f13bbedb23604e4f6a237b2b5aa16faa76eb0
-  data.tar.gz: 7bc8f03b29ecc1986f25c53858a3f4920b3ff3ba8a1d4b3313cee73c4be0dcaa
+  metadata.gz: 72f332cee31234bcb8b870e8216bb76062a85a66cbdaf05c8aa3a1829677564a
+  data.tar.gz: e80097972c53c804615741fa8e4b7fe7eb185d173dbb14242ff3c9d7ab1ddf9a
 SHA512:
-  metadata.gz: 3d67ddef393d8155a0362ca7c8f0a997cf16f232f1293c13c8cb49ffa08009353224fa9703a25a4f1ab3b3b3dc4b048b56721b15d344695ec025ab3c8223efbe
-  data.tar.gz: 3ad990caafd8c8dd4eb0854e1af5095be820b735feff16d28aeac09b98967aabbefc43d6ecae35bda318d8cfdf65a691ea1e34e6b8a060337b17086b4a58e61e
+  metadata.gz: b48abf36246bf94d96f6c5f8ff75962f90ae0ec216c947fd9052d865d0e30a3d2b1cbe50a5d84592c95f2dc830c5c3bd82a56f82410bac3c5c082546d3030407
+  data.tar.gz: 6654bbe89a6e3dea310df6df79cad09ab0cd911ca0c562d057827dc5751ab79a03ad8d1914dfe69b3346b01356c4e0fc46611beb19705573918fee7d77bc6006

data/CHANGELOG.adoc

@@ -5,6 +5,27 @@
 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

data/README.adoc

@@ -1,6 +1,6 @@
 = {project-name} (Markdown to AsciiDoc)
 Dan Allen <https://github.com/mojavelinux>
-v2.0.1, 2022-06-29
+v2.1.0, 2022-07-04
 // Aliases:
 :project-name: Kramdown AsciiDoc
 :project-handle: kramdown-asciidoc

data/kramdown-asciidoc.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
 
   s.require_paths = ['lib']
 
-  s.add_runtime_dependency 'kramdown', '~> 2.3.0'
+  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'
 

data/lib/kramdown-asciidoc/cli.rb

@@ -35,6 +35,10 @@ module AsciiDoc
           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

data/lib/kramdown-asciidoc/converter.rb

@@ -92,6 +92,7 @@ module AsciiDoc
       @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
@@ -185,7 +186,8 @@ 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?
@@ -203,8 +205,16 @@ 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 && ::String === (last_line = contents[-1]) && (last_line.start_with? '-- ')
           attribution = (attribution_line = contents.pop).slice 3, attribution_line.length
@@ -224,7 +234,8 @@ 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
@@ -232,14 +243,21 @@ module AsciiDoc
       if (lang = el.attr['class'])
         # NOTE Kramdown always prefixes class with language-
         # TODO remap lang if requested
-        writer.add_line %([,#{lang = lang.slice 9, lang.length}])
+        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 '----'
+        writer.add_line delimiter
       elsif !prompt && ((lines.include? '') || (first_line && (ListMarkerRx.match? first_line)))
         writer.add_line '....'
         writer.add_lines lines
@@ -585,8 +603,12 @@ 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
 

data/lib/kramdown-asciidoc/version.rb

@@ -2,6 +2,6 @@
 
 module Kramdown
 module AsciiDoc
-  VERSION = '2.0.1'
+  VERSION = '2.1.0'
 end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kramdown-asciidoc
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Dan Allen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-29 00:00:00.000000000 Z
+date: 2022-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: rexml
   requirement: !ruby/object:Gem::Requirement