kramdown 2.3.2 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f656918e531f3b20c720da64a979ea287aabf5e9b2a9bb18599d968957926e41
-  data.tar.gz: 3150331b7195b4dd186984a301a174ca0943e85ad11c3aef47b797b9dd46ad58
+  metadata.gz: 3c41b216fbd6f50c68b10864bc3a98040f79641db9af8ced05eb43f7817335ad
+  data.tar.gz: ef3adb19cbfbe4586bf0ef4f14362ca843a7fe3331ff6dc990c270ff65cff000
 SHA512:
-  metadata.gz: d7b0d8a7af60a0c72a6a49b26a05fc8fe3c348458802f489891166711aad985d0240d8b8882432d81ba6a061fd78e5c598ddc6dd6fa5f5de7b1aa57cf5fc9514
-  data.tar.gz: bec4c4bb4705f28db0bc4b7f3e4f6105e531a8711870edd90f36b0e270a653305bef544116760d3748ef91f112d51e666b468c38cddc116bcdf8c1267fbab1d3
+  metadata.gz: 483e269f858aadd6bf8e7bf2f49ec90ddfdcd9628aec17822eb7eefcfc21897eb19d258a84b6291611a38a5958a79013c2c656d35f7740b116923bd8624a2329
+  data.tar.gz: 5ffeef35cdfb994411414d62bd8b5fcf09fcea7d926069896248148575b88b4abbfdc1e5aab6da8dbe6f97c3e0a4921b391802e391ea3c76a646be7f64fbbbda

data/CONTRIBUTERS

@@ -1,6 +1,6 @@
   Count Name
 ======= ====
-    960 Thomas Leitner <t_leitner@gmx.at>
+    964 Thomas Leitner <t_leitner@gmx.at>
      18 Ashwin Maroli <ashmaroli@gmail.com>
       7 Christian Cornelssen <ccorn@1tein.de>
       6 Gioele Barabucci <gioele@svario.it>
@@ -11,6 +11,7 @@
       4 Arne Brasseur <arne@arnebrasseur.net>
       3 Henning Perl <perl@fast-sicher.de>
       3 gettalong <t_leitner@gmx.at>
+      3 Carsten Bormann <cabo@tzi.org>
       3 Brandur <brandur@mutelight.org>
       3 Ben Armston <ben.armston@googlemail.com>
       3 Ashwin Maroli <ashmaroli@users.noreply.github.com>
@@ -20,7 +21,6 @@
       2 Nathanael Jones <nathanael.jones@gmail.com>
       2 Max Meyer <dev@fedux.org>
       2 Jo Hund <jhund@clearcove.ca>
-      2 Carsten Bormann <cabo@tzi.org>
       2 Bran <m.versum@gmail.com>
       1 winniehell <git@winniehell.de>
       1 William <suttonwilliamd@gmail.com>

data/VERSION

@@ -1 +1 @@
-2.3.2
+2.4.0

data/lib/kramdown/converter/html.rb

@@ -283,7 +283,7 @@ module Kramdown
         hl_opts = {}
         result = highlight_code(el.value, lang, :span, hl_opts)
         if result
-          add_syntax_highlighter_to_class_attr(attr, hl_opts[:default_lang])
+          add_syntax_highlighter_to_class_attr(attr, lang || hl_opts[:default_lang])
         else
           result = escape_html(el.value)
         end

data/lib/kramdown/converter/kramdown.rb

@@ -27,6 +27,8 @@ module Kramdown
         @footnotes = []
         @abbrevs = []
         @stack = []
+        @list_indent = @options[:list_indent]
+        @list_spacing = ' ' * (@list_indent - 2)
       end
 
       def convert(el, opts = {indent: 0})
@@ -77,7 +79,9 @@ module Kramdown
         else
           el.value.gsub(/\A\n/) do
             opts[:prev] && opts[:prev].type == :br ? '' : "\n"
-          end.gsub(/\s+/, ' ').gsub(ESCAPED_CHAR_RE) { "\\#{$1 || $2}" }
+          end.gsub(/\s+/, ' ').gsub(ESCAPED_CHAR_RE) do
+            $1 || !opts[:prev] || opts[:prev].type == :br ? "\\#{$1 || $2}" : $&
+          end
         end
       end
 
@@ -87,6 +91,7 @@ module Kramdown
         first&.gsub!(/^(?:(#|>)|(\d+)\.|([+-]\s))/) { $1 || $3 ? "\\#{$1 || $3}" : "#{$2}\\." }
         second&.gsub!(/^([=-]+\s*?)$/, "\\\1")
         res = [first, second, *rest].compact.join("\n") + "\n"
+        res.gsub!(/^[ ]{0,3}:/, "\\:")
         if el.children.length == 1 && el.children.first.type == :math
           res = "\\#{res}"
         elsif res.start_with?('\$$') && res.end_with?("\\$$\n")
@@ -124,7 +129,7 @@ module Kramdown
 
       def convert_li(el, opts)
         sym, width = if @stack.last.type == :ul
-                       [+'* ', el.children.first && el.children.first.type == :codeblock ? 4 : 2]
+                       ['* ' + @list_spacing, el.children.first && el.children.first.type == :codeblock ? 4 : @list_indent]
                      else
                        ["#{opts[:index] + 1}.".ljust(4), 4]
                      end
@@ -151,7 +156,7 @@ module Kramdown
       end
 
       def convert_dd(el, opts)
-        sym, width = +": ", (el.children.first && el.children.first.type == :codeblock ? 4 : 2)
+        sym, width = ": " + @list_spacing, (el.children.first && el.children.first.type == :codeblock ? 4 : @list_indent)
         if (ial = ial_for_element(el))
           sym << ial << " "
         end

data/lib/kramdown/options.rb

@@ -605,6 +605,13 @@ module Kramdown
       simple_array_validator(val, :forbidden_inline_options)
     end
 
+    define(:list_indent, Integer, 2, <<~EOF)
+      Sets the number of spaces to use for list indentation
+
+      Default: 2
+      Used by: Kramdown converter
+    EOF
+
   end
 
 end

data/lib/kramdown/version.rb

@@ -10,6 +10,6 @@
 module Kramdown
 
   # The kramdown version.
-  VERSION = '2.3.2'
+  VERSION = '2.4.0'
 
 end

data/man/man1/kramdown.1

@@ -174,6 +174,13 @@ If the value is a String, it has to contain a valid YAML hash and the hash has t
 Default: {} Used by: kramdown parser
 .RE
 .TP
+\fB\-\-list\-indent\fP \fIARG\fP
+Sets the number of spaces to use for list indentation
+.RS
+.P
+Default: 2 Used by: Kramdown converter
+.RE
+.TP
 \fB\-\-math\-engine\fP \fIARG\fP
 Set the math engine
 .RS

data/test/test_files.rb

@@ -197,6 +197,9 @@ class TestFiles < Minitest::Test
         kdtext = Kramdown::Document.new(File.read(text_file), options).to_kramdown
         html = Kramdown::Document.new(kdtext, options).to_html
         assert_equal(tidy_output(File.read(html_file)), tidy_output(html))
+        kdtext4 = Kramdown::Document.new(File.read(text_file), options.merge({list_indent: 4})).to_kramdown
+        html = Kramdown::Document.new(kdtext4, options).to_html
+        assert_equal(tidy_output(File.read(html_file)), tidy_output(html))
       end
     end
   end

data/test/testcases/block/03_paragraph/to_kramdown.kramdown

@@ -0,0 +1,7 @@
+aa aaaa aaaa aaaa aaaa aaaa aaaa aaaa aaaa aaaa aaaa aaaa aaaa aaaa aaaa
+\: No definiion list
+
+a:
+
+*a*:
+

data/test/testcases/block/03_paragraph/to_kramdown.text

@@ -0,0 +1,5 @@
+aa aaaa aaaa aaaa aaaa aaaa aaaa aaaa aaaa aaaa aaaa aaaa aaaa aaaa aaaa : No definiion list
+
+a:
+
+*a*:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kramdown
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.4.0
 platform: ruby
 authors:
 - Thomas Leitner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-18 00:00:00.000000000 Z
+date: 2022-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rexml
@@ -170,6 +170,8 @@ files:
 - test/testcases/block/03_paragraph/one_para.text
 - test/testcases/block/03_paragraph/standalone_image.html
 - test/testcases/block/03_paragraph/standalone_image.text
+- test/testcases/block/03_paragraph/to_kramdown.kramdown
+- test/testcases/block/03_paragraph/to_kramdown.text
 - test/testcases/block/03_paragraph/two_para.html
 - test/testcases/block/03_paragraph/two_para.text
 - test/testcases/block/03_paragraph/with_html_to_native.html