kramdown-rfc2629 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27f5302b493aa86201fbd23cf1f19c756b5c4ff6
-  data.tar.gz: ed04ef11f870f228b81e4debb3a92a3b72738e51
+  metadata.gz: c5b374a652c01bf5be8224ac29dce91b88ddabc2
+  data.tar.gz: ff8e2f02be3c2fa0c1940f47fb6a8620fbb8cc96
 SHA512:
-  metadata.gz: 41ab3f9f24729e21c1d369ecc04216fdeea7864b23048d6a3b8e8cff77d023ac08dae4efd29bdf10b6c7de39fab35a4fd5f4682ade29d1944344e4d955163eee
-  data.tar.gz: df968cdd4100624fe7b4f226f8b52dd6e2730d86b3287d2f3e4f87c349c928fee273e05515fe6d88bb3db2c9722c8cf8117e190015a4fd7065b42fd406f57f5f
+  metadata.gz: 465d42ddd5285fc636fa62bebb664b72557c8679cacfc4bcb6147a3f358e6d0dd53ebb20124aa2870348d149a6e05ac483c67e34173055f3e66525bd85b3ca25
+  data.tar.gz: 44bfd7348d0526f757447b6cab6a08df540215d8a4f92bdc3ca861654b705182a0ea0e7543a5e67d634e35e8e016d1b1beac22cfc76ed254e986af02b7930bf6

data/kramdown-rfc2629.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
   s.name = 'kramdown-rfc2629'
-  s.version = '1.0.1'
+  s.version = '1.0.2'
   s.summary = "Kramdown extension for generating RFC 2629 XML."
   s.description = %{An RFC2629 (XML2RFC) generating backend for Thomas Leitner's
 "kramdown" markdown parser.  Mostly useful for RFC writers.}

data/lib/kramdown-rfc2629.rb

@@ -134,10 +134,6 @@ module Kramdown
       def convert_codeblock(el, indent, opts)
         el.attr['anchor'] ||= saner_generate_id(el.value)
         result = el.value
-        # compensate for XML2RFC idiosyncracy by insisting on a blank line
-        unless el.attr.delete('tight')
-          result[0,0] = "\n" unless result[0,1] == "\n"
-        end
         blockclass = el.attr.delete('class')
         if blockclass == 'language-tbreak'
           result = result.lines.map {|line| [line.chomp, 0]}
@@ -145,19 +141,24 @@ module Kramdown
           result.each_with_index {|pair, index|
             if pair[0] == ''
               result[spaceind][1] += 1
+              pair[0] = nil unless index == spaceind
             else
               spaceind = index
             end
           }
-          $stderr.puts(result.inspect)
+          # $stderr.puts(result.inspect)
           result = result.map {|line, space|
-            "<![CDATA[#{line.gsub(/^\s+/) {|s| "\u00A0" * s.size}}]]><vspace blankLines=\"#{space}\"/>"
-          }.join("\n")
+            "<![CDATA[#{line.gsub(/^\s+/) {|s| "\u00A0" * s.size}}]]><vspace blankLines=\"#{space}\"/>" if line
+          }.compact.join("\n")
           "#{' '*indent}<t>#{result}</t>\n"
         else
           if blockclass
             $stderr.puts "*** Unimplemented block class: #{blockclass}"
           end
+          # compensate for XML2RFC idiosyncracy by insisting on a blank line
+          unless el.attr.delete('tight')
+            result[0,0] = "\n" unless result[0,1] == "\n"
+          end
           "#{' '*indent}<figure#{el_html_attributes(el)}><artwork><![CDATA[#{result}#{result =~ /\n\Z/ ? '' : "\n"}]]></artwork></figure>\n"
         end
       end
@@ -198,6 +199,7 @@ module Kramdown
 
       def convert_ul(el, indent, opts)
         style = STYLES[el.type]
+        opts = opts.merge(vspace: el.attr.delete('vspace'))
         if opts[:unpacked]
           "#{' '*indent}<list style='#{style}'#{el_html_attributes(el)}>\n#{inner(el, indent, opts)}#{' '*indent}</list>\n"
           else
@@ -239,7 +241,9 @@ module Kramdown
       def convert_dt(el, indent, opts) # SERIOUSLY BAD HACK:
         close = "#{' '*indent}</t>\n" * @in_dt
         @in_dt = 1
-        "#{close}#{' '*indent}<t#{el_html_attributes(el)} hangText='#{inner(el, indent, opts)}'>\n"
+        vspace = opts[:vspace]
+        vspaceel = "<vspace blankLines='#{vspace}'/>" if vspace
+        "#{close}#{' '*indent}<t#{el_html_attributes(el)} hangText='#{inner(el, indent, opts)}'>#{vspaceel}\n"
       end
 
       HTML_TAGS_WITH_BODY=['div', 'script']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kramdown-rfc2629
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Carsten Bormann