kramdown 0.13.3 → 0.13.4

data/lib/kramdown/parser/html.rb

@@ -51,7 +51,7 @@ module Kramdown
         HTML_CONTENT_MODEL_SPAN  = %w{a abbr acronym b bdo big button cite caption del dfn dt em
              h1 h2 h3 h4 h5 h6 i ins kbd label legend optgroup p q rb rbc
              rp rt rtc ruby samp select small span strong sub sup summary th tt var}
-        HTML_CONTENT_MODEL_RAW   = %w{script math option textarea pre code}
+        HTML_CONTENT_MODEL_RAW   = %w{script style math option textarea pre code}
         # The following elements are also parsed as raw since they need child elements that cannot
         # be expressed using kramdown syntax: colgroup table tbody thead tfoot tr ul ol
 
@@ -86,7 +86,7 @@ module Kramdown
         # (first parameter is the created element, the second parameter is +true+ if the HTML
         # element is already closed, ie. contains no body).
         def handle_html_start_tag # :yields: el, closed
-          name = @src[1]
+          name = @src[1].downcase
           closed = !@src[4].nil?
           attrs = Utils::OrderedHash.new
           @src[2].scan(HTML_ATTRIBUTE_RE).each {|attr,sep,val| attrs[attr] = val}
@@ -98,24 +98,24 @@ module Kramdown
             warning("The HTML tag '#{el.value}' cannot have any content - auto-closing it")
             closed = true
           end
-          if name == 'script'
-            handle_html_script_tag
+          if name == 'script' || name == 'style'
+            handle_raw_html_tag(name)
             yield(el, true)
           else
             yield(el, closed)
           end
         end
 
-        # Handle the HTML script tag at the current position.
-        def handle_html_script_tag
+        # Handle the raw HTML tag at the current position.
+        def handle_raw_html_tag(name)
           curpos = @src.pos
-          if result = @src.scan_until(/(?=<\/script\s*>)/m)
+          if @src.scan_until(/(?=<\/#{name}\s*>)/mi)
             add_text(extract_string(curpos...@src.pos, @src), @tree.children.last, :raw)
             @src.scan(HTML_TAG_CLOSE_RE)
           else
             add_text(@src.rest, @tree.children.last, :raw)
             @src.terminate
-            warning("Found no end tag for 'script' - auto-closing it")
+            warning("Found no end tag for '#{name}' - auto-closing it")
           end
         end
 
@@ -145,10 +145,10 @@ module Kramdown
               elsif @src.scan(HTML_TAG_RE)
                 handle_html_start_tag(&block)
               elsif @src.scan(HTML_TAG_CLOSE_RE)
-                if @tree.value == @src[1]
+                if @tree.value == @src[1].downcase
                   done = true
                 else
-                  warning("Found invalidly used HTML closing tag for '#{@src[1]}' - ignoring it")
+                  warning("Found invalidly used HTML closing tag for '#{@src[1].downcase}' - ignoring it")
                 end
               else
                 add_text(@src.getch, @tree, :text)
@@ -322,7 +322,7 @@ module Kramdown
 
         def remove_whitespace_children(el)
           i = -1
-          el.children.delete_if do |c|
+          el.children = el.children.reject do |c|
             i += 1
             c.type == :text && c.value.strip.empty? &&
               (i == 0 || i == el.children.length - 1 || (Element.category(el.children[i-1]) == :block &&

data/lib/kramdown/parser/kramdown.rb

@@ -205,7 +205,7 @@ module Kramdown
         while !@src.eos? && !stop_re_found
           if result = @src.scan_until(used_re)
             add_text(result)
-            if stop_re && (stop_re_matched = @src.check(stop_re))
+            if stop_re && @src.check(stop_re)
               stop_re_found = (block_given? ? yield : true)
             end
             processed = parsers.any? do |name|

data/lib/kramdown/parser/kramdown/header.rb

@@ -52,7 +52,7 @@ module Kramdown
       def parse_atx_header
         return false if !after_block_boundary?
 
-        result = @src.scan(ATX_HEADER_MATCH)
+        @src.scan(ATX_HEADER_MATCH)
         level, text, id = @src[1], @src[2], @src[3]
         text.strip!
         el = new_block_el(:header, nil, nil, :level => level.length, :raw_text => text)

data/lib/kramdown/parser/kramdown/html.rb

@@ -57,7 +57,7 @@ module Kramdown
             end
           elsif content_model == :span
             curpos = @src.pos
-            if result = @src.scan_until(/(?=<\/#{el.value}\s*>)/m)
+            if @src.scan_until(/(?=<\/#{el.value}\s*>)/mi)
               add_text(extract_string(curpos...@src.pos, @src), el)
               @src.scan(HTML_TAG_CLOSE_RE)
             else
@@ -86,13 +86,13 @@ module Kramdown
           @src.scan(TRAILING_WHITESPACE)
           true
         else
-          if result = @src.check(/^#{OPT_SPACE}#{HTML_TAG_RE}/) && !HTML_SPAN_ELEMENTS.include?(@src[1])
+          if result = @src.check(/^#{OPT_SPACE}#{HTML_TAG_RE}/) && !HTML_SPAN_ELEMENTS.include?(@src[1].downcase)
             @src.pos += @src.matched_size
             handle_html_start_tag(&method(:handle_kramdown_html_tag))
             Kramdown::Parser::Html::ElementConverter.convert(@root, @tree.children.last) if @options[:html_to_native]
             true
-          elsif result = @src.check(/^#{OPT_SPACE}#{HTML_TAG_CLOSE_RE}/) && !HTML_SPAN_ELEMENTS.include?(@src[1])
-            name = @src[1]
+          elsif result = @src.check(/^#{OPT_SPACE}#{HTML_TAG_CLOSE_RE}/) && !HTML_SPAN_ELEMENTS.include?(@src[1].downcase)
+            name = @src[1].downcase
 
             if @tree.type == :html_element && @tree.value == name
               @src.pos += @src.matched_size
@@ -120,32 +120,32 @@ module Kramdown
           warning("Found invalidly used HTML closing tag for '#{@src[1]}'")
           add_text(result)
         elsif result = @src.scan(HTML_TAG_RE)
-          if HTML_BLOCK_ELEMENTS.include?(@src[1])
-            warning("Found block HTML tag '#{@src[1]}' in span-level text")
+          tag_name = @src[1].downcase
+          if HTML_BLOCK_ELEMENTS.include?(tag_name)
+            warning("Found block HTML tag '#{tag_name}' in span-level text")
             add_text(result)
             return
           end
 
-          reset_pos = @src.pos
           attrs = Utils::OrderedHash.new
           @src[2].scan(HTML_ATTRIBUTE_RE).each {|name,sep,val| attrs[name] = val.gsub(/\n+/, ' ')}
 
-          do_parsing = (HTML_CONTENT_MODEL[@src[1]] == :raw || @tree.options[:content_model] == :raw ? false : @options[:parse_span_html])
+          do_parsing = (HTML_CONTENT_MODEL[tag_name] == :raw || @tree.options[:content_model] == :raw ? false : @options[:parse_span_html])
           if val = HTML_MARKDOWN_ATTR_MAP[attrs.delete('markdown')]
             if val == :block
               warning("Cannot use block-level parsing in span-level HTML tag - using default mode")
             elsif val == :span
               do_parsing = true
             elsif val == :default
-              do_parsing = HTML_CONTENT_MODEL[@src[1]] != :raw
+              do_parsing = HTML_CONTENT_MODEL[tag_name] != :raw
             elsif val == :raw
               do_parsing = false
             end
           end
 
-          el = Element.new(:html_element, @src[1], attrs, :category => :span, :content_model => (do_parsing ? :span : :raw))
+          el = Element.new(:html_element, tag_name, attrs, :category => :span, :content_model => (do_parsing ? :span : :raw))
           @tree.children << el
-          stop_re = /<\/#{Regexp.escape(@src[1])}\s*>/
+          stop_re = /<\/#{Regexp.escape(tag_name)}\s*>/i
           if !@src[4] && HTML_ELEMENTS_WITHOUT_BODY.include?(el.value)
             warning("The HTML tag '#{el.value}' cannot have any content - auto-closing it")
           elsif !@src[4]

data/lib/kramdown/parser/kramdown/smart_quotes.rb

@@ -197,7 +197,7 @@ module Kramdown
 
       # Parse the smart quotes at current location.
       def parse_smart_quotes
-        regexp, substs = SQ_RULES.find {|reg, subst| @src.scan(reg)}
+        substs = SQ_RULES.find {|reg, subst| @src.scan(reg)}[1]
         substs.each do |subst|
           if subst.kind_of?(Integer)
             add_text(@src[subst])

data/lib/kramdown/version.rb

@@ -23,6 +23,6 @@
 module Kramdown
 
   # The kramdown version.
-  VERSION = '0.13.3'
+  VERSION = '0.13.4'
 
 end

data/setup.rb

@@ -785,7 +785,7 @@ class ToplevelInstaller
     else
       require 'rbconfig'
     end
-    ::Config::CONFIG
+    ::RbConfig::CONFIG
   end
 
   def initialize(ardir_root, config)

data/test/test_files.rb

@@ -56,11 +56,12 @@ class TestFiles < Test::Unit::TestCase
                           'test/testcases/block/09_html/simple.html', # bc of xml elements
                           'test/testcases/span/03_codespan/highlighting.html', # bc of span elements inside code element
                          ]
-    Dir[File.dirname(__FILE__) + '/testcases/**/*.html'].each do |html_file|
+    Dir[File.dirname(__FILE__) + '/testcases/**/*.{html, htmlinput}'].each do |html_file|
       next if EXCLUDE_HTML_FILES.any? {|f| html_file =~ /#{f}$/}
+      out_file = (html_file =~ /\.htmlinput$/ ? html_file.sub(/input$/, '') : html_file)
       define_method('test_' + html_file.tr('.', '_') + "_to_html") do
         doc = Kramdown::Document.new(File.read(html_file), :input => 'html', :auto_ids => false, :footnote_nr => 1)
-        assert_equal(tidy_output(File.read(html_file)), tidy_output(doc.to_html))
+        assert_equal(tidy_output(File.read(out_file)), tidy_output(doc.to_html))
       end
     end
   end
@@ -163,7 +164,6 @@ class TestFiles < Test::Unit::TestCase
 
   # Generate test methods for asserting that converters don't modify the document tree.
   Dir[File.dirname(__FILE__) + '/testcases/**/*.text'].each do |text_file|
-    basename = text_file.sub(/\.text$/, '')
     opts_file = text_file.sub(/\.text$/, '.options')
     options = File.exist?(opts_file) ? YAML::load(File.read(opts_file)) : {:auto_ids => false, :footnote_nr => 1}
     (Kramdown::Converter.constants.map {|c| c.to_sym} - [:Base]).each do |conv_class|

data/test/testcases/block/09_html/parse_as_raw.html

@@ -30,3 +30,6 @@ about it
 </script>
 
 <p><a href="http://example.com">http://example.com</a></p>
+
+<style> body > * { background-color: Red; } </style>
+

data/test/testcases/block/09_html/parse_as_raw.htmlinput

@@ -0,0 +1,34 @@
+<p>baz { |qux| quux }</p>
+
+<p>This is some para.
+<script type="javascript">
+This *text* must not be converted.
+  </SCRIPT></p>
+
+<script>Not *parsed* here</script>
+
+<sCRIpt>*not*</script>
+<p><em>parsed</em>
+This too
+</p>
+
+<script>*not*<p>*parsed*
+This too
+</p></script>
+
+<sCRIpt>something<p>*not*</p></scrIPt>
+
+<script></script>
+
+<script>
+This should be output
+<p> *as* is
+</p> and nothing should be done
+about it
+</not>
+</p>
+</script>
+
+<p><a href="http://example.com">http://example.com</a></p>
+
+<style> body > * { background-color: Red; } </style>

data/test/testcases/block/09_html/parse_as_raw.text

@@ -3,7 +3,7 @@
 This is some para.
 <script type="javascript">
 This *text* must not be converted.
-  </script>
+  </SCRIPT>
 
 <script>Not *parsed* here</script>
 
@@ -29,3 +29,5 @@ about it
 </script>
 
 <http://example.com>
+
+<style> body > * { background-color: Red; } </style>

data/test/testcases/block/09_html/parse_as_span.htmlinput

@@ -0,0 +1,12 @@
+<P>This <EM>text
+should</em> be parsed
+as span
+</p>
+
+<p>This produces `</p>
+<p>` an unwanted result.&lt;/p&gt;</p>
+
+<p>This <em>text</EM> too</P>
+<p>
+some text
+</p>

data/test/testcases/block/09_html/parse_as_span.text

@@ -1,7 +1,7 @@
 <p>This *text
 should* be parsed
 as span
-</p>
+</P>
 
 <p>This produces `</p>` an unwanted result.</p>
 

data/test/testcases/block/09_html/parse_block_html.text

@@ -1,6 +1,6 @@
-<div>
+<DIV>
   test
-</div>
+</diV>
 
 <div>
     test

data/test/testcases/block/12_extension/options.html

@@ -15,7 +15,7 @@ some <span>*para*</span>
 <div class="footnotes">
   <ol start="10">
     <li id="fn:ab">
-      <p>Some text.<a href="#fnref:ab" rev="footnote">&#8617;</a></p>
+      <p>Some text.<a href="#fnref:ab" rel="reference">&#8617;</a></p>
     </li>
   </ol>
 </div>

data/test/testcases/block/12_extension/options2.html

@@ -4,7 +4,7 @@
 <div class="footnotes">
   <ol>
     <li id="fn:ab">
-      <p>Some text.<a href="#fnref:ab" rev="footnote">&#8617;</a></p>
+      <p>Some text.<a href="#fnref:ab" rel="reference">&#8617;</a></p>
     </li>
   </ol>
 </div>

data/test/testcases/block/12_extension/options3.html

@@ -1,7 +1,7 @@
-<div><span class="CodeRay">x = <span class="co">Class</span>.new
+<div><span class="CodeRay">x = <span class="constant">Class</span>.new
 </span>
 </div>
 
-<div><span class="CodeRay">x = <span class="co">Class</span>.new
+<div><span class="CodeRay">x = <span class="constant">Class</span>.new
 </span>
 </div>

data/test/testcases/block/14_table/table_with_footnote.html

@@ -19,7 +19,7 @@
       <blockquote>
         <p>special here</p>
       </blockquote>
-      <p><a href="#fnref:1" rev="footnote">&#8617;</a></p>
+      <p><a href="#fnref:1" rel="reference">&#8617;</a></p>
     </li>
   </ol>
 </div>

data/test/testcases/span/04_footnote/footnote_nr.html

@@ -3,10 +3,10 @@
 <div class="footnotes">
   <ol start="35">
     <li id="fn:ab">
-      <p>Some text.<a href="#fnref:ab" rev="footnote">&#8617;</a></p>
+      <p>Some text.<a href="#fnref:ab" rel="reference">&#8617;</a></p>
     </li>
     <li id="fn:bc">
-      <p>Some other text.<a href="#fnref:bc" rev="footnote">&#8617;</a></p>
+      <p>Some other text.<a href="#fnref:bc" rel="reference">&#8617;</a></p>
     </li>
   </ol>
 </div>

data/test/testcases/span/04_footnote/markers.html

@@ -17,7 +17,7 @@
 <div class="footnotes">
   <ol>
     <li id="fn:fn">
-      <p>Some foot note text<a href="#fnref:fn" rev="footnote">&#8617;</a></p>
+      <p>Some foot note text<a href="#fnref:fn" rel="reference">&#8617;</a></p>
     </li>
     <li id="fn:3">
       <p>other text
@@ -26,21 +26,21 @@ with more lines</p>
       <blockquote>
         <p>and a quote</p>
       </blockquote>
-      <p><a href="#fnref:3" rev="footnote">&#8617;</a></p>
+      <p><a href="#fnref:3" rel="reference">&#8617;</a></p>
     </li>
     <li id="fn:1">
-      <p>some <em>text</em><a href="#fnref:1" rev="footnote">&#8617;</a></p>
+      <p>some <em>text</em><a href="#fnref:1" rel="reference">&#8617;</a></p>
     </li>
     <li id="fn:now">
 
       <pre><code>code block
 continued here
 </code></pre>
-      <p><a href="#fnref:now" rev="footnote">&#8617;</a></p>
+      <p><a href="#fnref:now" rel="reference">&#8617;</a></p>
     </li>
     <li id="fn:empty">
 
-      <p><a href="#fnref:empty" rev="footnote">&#8617;</a></p>
+      <p><a href="#fnref:empty" rel="reference">&#8617;</a></p>
     </li>
   </ol>
 </div>

data/test/testcases/span/05_html/normal.html

@@ -15,13 +15,15 @@ now </span>.</p>
 <p>This is <span>tag
 </span> now.</p>
 
-<p>This is <em>something<span test="do_it" /> strange</em>.</p>
+<p>This is an empty <span></span> tag.</p>
+
+<p>This is <em>something<span test="do_it"></span> strange</em>.</p>
 
 <p>Auto-closing: <br /></p>
 
 <p>Expanding: <textarea></textarea></p>
 
-<p>An invalid tag: &lt;hr&gt;</p>
+<p>An invalid tag: &lt;hR&gt;</p>
 
 <p>A &lt;p&gt;block tag&lt;/p&gt;.</p>
 

data/test/testcases/span/05_html/normal.text

@@ -1,4 +1,4 @@
-Empty <a name="anchor" id="anchor"></a>!
+Empty <a name="anchor" id="anchor"></A>!
 
 <a href="test">title</a> is a title.
 
@@ -12,8 +12,10 @@ This is <!-- a
 This is <span>tag
 now </span>.
 
-This is <span>tag
-</span> now.
+This is <sPAn>tag
+</SPAN> now.
+
+This is an empty <span></span> tag.
 
 This is _something<span test="do_it" /> strange_.
 
@@ -21,7 +23,7 @@ Auto-closing: <br>
 
 Expanding: <textarea></textarea>
 
-An invalid tag: <hr>
+An invalid tag: <hR>
 
 A <p>block tag</p>.
 

metadata

@@ -1,35 +1,39 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: kramdown
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 13
-  - 3
-  version: 0.13.3
+version: !ruby/object:Gem::Version
+  version: 0.13.4
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Thomas Leitner
 autorequire: 
 bindir: bin
 cert_chain: []
+date: 2011-12-16 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: coderay
+  requirement: &13137080 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :development
+  prerelease: false
+  version_requirements: *13137080
+description: ! 'kramdown is yet-another-markdown-parser but fast, pure Ruby,
 
-date: 2011-05-06 00:00:00 +02:00
-default_executable: kramdown
-dependencies: []
-
-description: |
-  kramdown is yet-another-markdown-parser but fast, pure Ruby,
   using a strict syntax definition and supporting several common extensions.
 
+'
 email: t_leitner@gmx.at
-executables: 
+executables:
 - kramdown
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README
-files: 
+files:
 - Rakefile
 - setup.rb
 - COPYING
@@ -82,10 +86,12 @@ files:
 - lib/kramdown/utils/ordered_hash.rb
 - lib/kramdown/version.rb
 - lib/kramdown/error.rb
+- lib/kramdown/element.rb
 - lib/kramdown/converter/base.rb
 - lib/kramdown/converter/latex.rb
 - lib/kramdown/converter/html.rb
 - lib/kramdown/converter/kramdown.rb
+- lib/kramdown/converter/toc.rb
 - lib/kramdown/converter.rb
 - lib/kramdown/parser.rb
 - lib/kramdown/compatibility.rb
@@ -293,6 +299,7 @@ files:
 - test/testcases/block/09_html/processing_instruction.text
 - test/testcases/block/09_html/simple.options
 - test/testcases/block/09_html/processing_instruction.html
+- test/testcases/block/09_html/parse_as_span.htmlinput
 - test/testcases/block/09_html/comment.html
 - test/testcases/block/09_html/parse_as_raw.options
 - test/testcases/block/09_html/parse_as_raw.html
@@ -307,6 +314,7 @@ files:
 - test/testcases/block/09_html/content_model/tables.text
 - test/testcases/block/09_html/content_model/deflists.options
 - test/testcases/block/09_html/content_model/deflists.text
+- test/testcases/block/09_html/parse_as_raw.htmlinput
 - test/testcases/block/09_html/not_parsed.text
 - test/testcases/block/09_html/simple.html.19
 - test/testcases/block/08_list/special_cases.html
@@ -436,38 +444,30 @@ files:
 - test/testcases/block/06_codeblock/normal.text
 - test/testcases/encoding.html
 - test/test_files.rb
-has_rdoc: true
 homepage: http://kramdown.rubyforge.org
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: kramdown
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: kramdown is a fast, pure-Ruby Markdown-superset converter.
 test_files: []
-