kramdown-asciidoc 2.0.1 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2f299ca0d156093eca0b0bf206f13bbedb23604e4f6a237b2b5aa16faa76eb0
-  data.tar.gz: 7bc8f03b29ecc1986f25c53858a3f4920b3ff3ba8a1d4b3313cee73c4be0dcaa
+  metadata.gz: 4b026dc30505b178f8854dce27a0b5d9972a6ce80d81e0fdde7eaf8c7a9792d5
+  data.tar.gz: ae96a96821d9e9e94fc75f952284e748fb2018debbd6097eb066e8b1666eb1eb
 SHA512:
-  metadata.gz: 3d67ddef393d8155a0362ca7c8f0a997cf16f232f1293c13c8cb49ffa08009353224fa9703a25a4f1ab3b3b3dc4b048b56721b15d344695ec025ab3c8223efbe
-  data.tar.gz: 3ad990caafd8c8dd4eb0854e1af5095be820b735feff16d28aeac09b98967aabbefc43d6ecae35bda318d8cfdf65a691ea1e34e6b8a060337b17086b4a58e61e
+  metadata.gz: b97537e4d267473a0ae9cb8cfab8e89ad01e2a8811f42d9b95bfe06299fec0a1c0fe48979c630ab1b93b380b216a217af1a92b42c272b272e378e6e13e00cffb
+  data.tar.gz: d17563c0d85bbced68ef54fa6ed267a00c62de88ac912a38f8518d797c385a5cb707530a681ccb5699a0606d9139b029fb4ab5ded35ecf04a8f452fcc85e1c0e

data/CHANGELOG.adoc

@@ -5,6 +5,39 @@
 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.1 (2025-09-04) - @mojavelinux
+
+=== Fixed
+
+* Convert language tag on source block to lowercase (#106)
+* Turn off system-dependent newline conversion when writing output file
+* Remove direct runtime dependency on rexml as the latest version is already pulled in by kramdown (#122)
+
+=== Details
+
+{url-repo}/releases/tag/v2.1.1[git tag] | {url-repo}/compare/v2.1.0\...v2.1.1[full diff]
+
+== 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
@@ -41,7 +74,7 @@ For a detailed view of what has changed, refer to the {uri-repo}/commits/master[
 
 * 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
+* Switch CI to GitHub Actions (including Windows build)
 * Run test suite in CI environment on Windows and macOS
 * Apply style rules to source code
 

data/Gemfile

@@ -4,20 +4,21 @@ source 'https://rubygems.org'
 
 gemspec
 
-without = (Bundler.settings['WITHOUT'] || '').split ':'
+gem 'rexml', '~> 3.2.0' if (Gem::Version.new RUBY_VERSION) < (Gem::Version.new '2.5.0')
+
+group :coverage do
+  gem 'deep-cover-core', '~> 1.1.0', require: false
+  gem 'simplecov', '~> 0.21.0', require: false
+end unless (Gem::Version.new RUBY_VERSION) < (Gem::Version.new '2.5.0')
 
 group :docs do
   gem 'asciidoctor', require: false
   gem 'yard', require: false
-end unless without.include? 'docs'
+end
 
 group :lint do
-  gem 'rubocop', '~> 1.28.0', require: false
+  gem 'json', '~> 2.6.0', require: false
+  gem 'rubocop', '~> 1.36.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'
+  gem 'rubocop-rspec', '~> 2.13.0', require: false
+end unless (Gem::Version.new RUBY_VERSION) < (Gem::Version.new '2.6.0')

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.1, 2025-09-04
 // Aliases:
 :project-name: Kramdown AsciiDoc
 :project-handle: kramdown-asciidoc
@@ -25,7 +25,7 @@ endif::[]
 :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-api-docs: https://www.rubydoc.info/github/asciidoctor/kramdown-asciidoc
 :url-gem: https://rubygems.org/gems/kramdown-asciidoc
 :img-url-gem: https://img.shields.io/gem/v/kramdown-asciidoc.svg?label=gem
 

data/kramdown-asciidoc.gemspec

@@ -31,8 +31,7 @@ Gem::Specification.new do |s|
 
   s.require_paths = ['lib']
 
-  s.add_runtime_dependency 'kramdown', '~> 2.3.0'
-  s.add_runtime_dependency 'rexml', '~> 3.2.0'
+  s.add_runtime_dependency 'kramdown', '~> 2.4.0'
   s.add_runtime_dependency 'kramdown-parser-gfm', '~> 1.1.0'
 
   s.add_development_dependency 'rake', '~> 13.0.0'

data/lib/kramdown-asciidoc/api.rb

@@ -63,7 +63,7 @@ module AsciiDoc
     if (to = opts[:to])
       if ::Pathname === to || (!(to.respond_to? :write) && (to = ::Pathname.new to.to_s))
         to.dirname.mkpath
-        to.write asciidoc, encoding: UTF_8
+        to.write asciidoc, encoding: UTF_8, newline: :universal
       else
         to.write asciidoc
       end

data/lib/kramdown-asciidoc/cli.rb

@@ -14,12 +14,12 @@ module AsciiDoc
 
       opt_parser = ::OptionParser.new do |opts|
         opts.program_name = 'kramdoc'
-        opts.banner = <<~EOS
+        opts.banner = <<~END
         Usage: #{opts.program_name} [OPTION]... FILE
 
         Converts Markdown to AsciiDoc.
 
-        EOS
+        END
 
         opts.on '-o FILE', '--output=FILE', 'Set the output filename or stream' do |file|
           options[:output_file] = file
@@ -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).downcase
+        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
@@ -322,12 +340,11 @@ module AsciiDoc
       end
       primary_lines.unshift %(#{indent > 0 ? ' ' * indent : ''}#{marker * level} #{primary_lines.shift})
       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
-        end
-        traverse remaining, (opts.merge parent: el)
+      return if remaining.empty?
+      if remaining.find {|n| (type = n.type) == :blank ? nil : ((BLOCK_TYPES.include? type) ? true : break) }
+        el.options[:compound] = true
       end
+      traverse remaining, (opts.merge parent: el)
     end
 
     def convert_dt el, opts
@@ -353,12 +370,11 @@ module AsciiDoc
           opts[:writer].add_lines primary_lines
         end
       end
-      unless remaining.empty?
-        if remaining.find {|n| (type = n.type) == :blank ? nil : ((BLOCK_TYPES.include? type) ? true : break) }
-          el.options[:compound] = true
-        end
-        traverse remaining, (opts.merge parent: el)
+      return if remaining.empty?
+      if remaining.find {|n| (type = n.type) == :blank ? nil : ((BLOCK_TYPES.include? type) ? true : break) }
+        el.options[:compound] = true
       end
+      traverse remaining, (opts.merge parent: el)
     end
 
     def convert_table el, opts
@@ -556,7 +572,7 @@ module AsciiDoc
         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'
+        if child_i_i.value == 'span' && ((role = el.attr['class'].to_s).start_with? 'note') && child_i_i.attr['class'] == 'notetitle' # rubocop:disable Style/GuardClause
           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
           lines.unshift %(#{ADMON_TYPE_MAP[marker]}: #{lines.shift})
@@ -585,8 +601,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.1'
 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.1
 platform: ruby
 authors:
 - Dan Allen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-29 00:00:00.000000000 Z
+date: 2025-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown
@@ -16,28 +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
-- !ruby/object:Gem::Dependency
-  name: rexml
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: kramdown-parser-gfm
   requirement: !ruby/object:Gem::Requirement
@@ -129,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.27
 signing_key: 
 specification_version: 4
 summary: A Markdown to AsciiDoc converter based on kramdown