kramdown 0.13.8 → 0.14.0

data/CONTRIBUTERS

@@ -1,15 +1,16 @@
   Count Name
 ======= ====
-    528 Thomas Leitner <t_leitner@gmx.at>
+    537 Thomas Leitner <t_leitner@gmx.at>
+      6 Gioele Barabucci <gioele@svario.it>
       3 gettalong <t_leitner@gmx.at>
       3 Ben Armston <ben.armston@googlemail.com>
       3 Alex Marandon <contact@alexmarandon.com>
       2 Bran <m.versum@gmail.com>
       1 tomykaira <tomykaira@gmail.com>
+      1 Tim Bates <tim@rumpuslabs.com>
       1 Postmodern <postmodern.mod3@gmail.com>
       1 Michal Till <michal.till@gmail.com>
       1 John Croisant <jacius@gmail.com>
       1 Joe Fiorini <joe@faithfulgeek.org>
-      1 Gioele Barabucci <gioele@svario.it>
       1 Damien Pollet <damien.pollet@gmail.com>
       1 Alex Tomlins <alex.tomlins@digital.cabinet-office.gov.uk>

data/ChangeLog

@@ -1,3 +1,145 @@
+commit a29151de6a88eefbd0a181331ebae298ee441d27
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Sun Sep 16 07:58:38 2012 +0200
+
+    Updated release notes and version
+
+doc/news/release_0_14_0.page
+doc/sidebar.template
+lib/kramdown/version.rb
+
+commit eacc89ce68a87bb1d1d68fb76efa5ca2a55bebd1
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Wed Sep 12 22:06:29 2012 +0200
+
+    Backwards incompatible change: code language now specified via special class
+    
+    Using lang='LANGUAGE' for specifying the code language of code
+    blocks/spans is not good because it conflicts with the normal
+    usage of the lang attr.
+    
+    Therefore the code language must now be specified via a special
+    class 'language-LANGUAGE' which is also the way how it is done
+    in the HTML5 spec.
+
+doc/converter/html.page
+doc/documentation.page
+doc/news/release_0_5_0.page
+lib/kramdown/converter/base.rb
+lib/kramdown/converter/html.rb
+lib/kramdown/converter/latex.rb
+lib/kramdown/parser/html.rb
+lib/kramdown/parser/kramdown/codeblock.rb
+test/testcases/block/06_codeblock/highlighting.text
+test/testcases/block/06_codeblock/with_lang_in_fenced_block.html
+test/testcases/block/06_codeblock/with_lang_in_fenced_block.text
+test/testcases/block/12_extension/options3.text
+test/testcases/span/03_codespan/highlighting.html
+test/testcases/span/03_codespan/highlighting.text
+
+commit f7424c0c9d38aea6ad781ad66d19a2a4d429263e
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Wed Sep 12 21:37:20 2012 +0200
+
+    Fixed typo in syntax doc
+
+doc/syntax.page
+
+commit 967b6dac2ae71638ba00a5ac67dd0f2d9e7d60d2
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Wed Sep 12 20:50:35 2012 +0200
+
+    Implemented support for setting language on fenced code block starting line
+    
+    Patch based on a series of commits by @unibr (Bran) with some needed fixes
+
+doc/quickref.page
+doc/syntax.page
+lib/kramdown/parser/kramdown/codeblock.rb
+test/testcases/block/06_codeblock/with_lang_in_fenced_block.html
+test/testcases/block/06_codeblock/with_lang_in_fenced_block.options
+test/testcases/block/06_codeblock/with_lang_in_fenced_block.text
+
+commit fb903f8fd1ae1ed3a37f3adae41b5e48f72d16ba
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Fri Sep 7 17:09:01 2012 +0200
+
+    Added failing test case to exclusion list
+
+test/test_files.rb
+
+commit 6fdc0ca4483ead67adbb2034f85b81c8529a4451
+Merge: 4d4e5f6 f2ccb8e
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Fri Sep 7 16:06:19 2012 +0200
+
+    Merge branch 'notoc' of https://github.com/rumpuslabs/kramdown
+
+commit f2ccb8e9e9ead6ca90f039e0e8d9e5af7b86409d
+Author: Tim Bates <tim@rumpuslabs.com>
+Date:   Wed Sep 5 23:27:32 2012 +0930
+
+    Exclude headers from TOC using `.no_toc` class.
+    
+    Applying {:.no_toc} to a header will prevent it from being included in
+    the table of contents.
+
+doc/converter/html.page
+lib/kramdown/converter/base.rb
+test/testcases/block/16_toc/toc_exclude.html
+test/testcases/block/16_toc/toc_exclude.options
+test/testcases/block/16_toc/toc_exclude.text
+
+commit 4d4e5f6471d395f554833ecd8899dc42bf509971
+Author: Gioele Barabucci <gioele@svario.it>
+Date:   Wed Aug 29 19:55:57 2012 +0200
+
+    Use Unicode regexes on Ruby 1.8.x and 1.9.x
+
+lib/kramdown/parser/kramdown/autolink.rb
+
+commit 51315236ee6d2bdee4ec6cddd32b7c82408c34ec
+Author: Gioele Barabucci <gioele@svario.it>
+Date:   Wed Aug 29 19:51:53 2012 +0200
+
+    Check for encoding support instead of version string
+
+lib/kramdown/converter/html.rb
+lib/kramdown/parser/base.rb
+lib/kramdown/parser/html.rb
+
+commit 4bd036c0df4eacc31ee0e7b5b38c9ec5164f86ab
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Tue Sep 4 17:26:38 2012 +0200
+
+    Fixed test cases to correspond with new default entity fallback
+
+test/testcases/block/04_header/setext_header.html
+test/testcases/block/04_header/setext_header.html.19
+test/testcases/block/04_header/setext_header.text
+test/testcases/block/07_horizontal_rule/error.html
+test/testcases/block/09_html/html_to_native/typography.html
+test/testcases/block/14_table/simple.html
+test/testcases/span/01_link/inline.html
+test/testcases/span/01_link/reference.html
+test/testcases/span/text_substitutions/typography.html.19
+test/testcases/span/text_substitutions/typography.options
+
+commit c41870969ca13535ac16b564eb5ab34833d001e3
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Tue Sep 4 16:59:51 2012 +0200
+
+    Use symbolic entities as default fallback for predefined XML entities
+
+lib/kramdown/utils/html.rb
+
+commit ec5bf062031cb1116d1b45b7d85955a9e651cfde
+Merge: 69fbdcb 462c80c
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Tue Sep 4 16:47:12 2012 +0200
+
+    Merge branch 'num-entities' of https://github.com/gioele/kramdown
+
 commit 69fbdcbf2b3585f92819f941f695f2ab10d2051f
 Author: Thomas Leitner <t_leitner@gmx.at>
 Date:   Fri Aug 31 18:35:39 2012 +0200
@@ -85,6 +227,17 @@ test/testcases/block/06_codeblock/disable-highlighting.html
 test/testcases/block/06_codeblock/disable-highlighting.options
 test/testcases/block/06_codeblock/disable-highlighting.text
 
+commit 462c80c67ea839b84e2a2c5bf6d3a752cb7cf9cc
+Author: Gioele Barabucci <gioele@svario.it>
+Date:   Wed Aug 29 19:06:58 2012 +0200
+
+    Use numeric entities as default fallback if :as_code is not available
+    
+    Numeric entities can be used directly both in HTML, XHTML, and XML files. On
+    the contrary, symbolic entities are allowed only in HTML files.
+
+lib/kramdown/utils/html.rb
+
 commit df8ff9df6968993e73fcc3a8a08db94e4683a23d
 Author: Gioele Barabucci <gioele@svario.it>
 Date:   Wed Aug 29 18:52:39 2012 +0200
@@ -96,6 +249,22 @@ Date:   Wed Aug 29 18:52:39 2012 +0200
 
 Rakefile
 
+commit a08339310d066b81e55f3bc488ac33892135eee3
+Author: Gioele Barabucci <gioele@svario.it>
+Date:   Wed Aug 29 18:52:05 2012 +0200
+
+    Check for method existence instead of Ruby version
+
+lib/kramdown/utils/html.rb
+
+commit 245c79ccb8c6410d807ce51e429abe4de322ba86
+Author: Gioele Barabucci <gioele@svario.it>
+Date:   Wed Aug 29 18:45:23 2012 +0200
+
+    Read entity output configuration only once
+
+lib/kramdown/utils/html.rb
+
 commit 46bd5f670b674fe3dcd310069e334ac4d7a0b008
 Author: Thomas Leitner <t_leitner@gmx.at>
 Date:   Tue Aug 28 18:12:07 2012 +0200

data/Rakefile

@@ -85,7 +85,6 @@ if defined? Webgen
   Webgen::WebgenTask.new('htmldoc') do |site|
     site.clobber_outdir = true
     site.config_block = lambda do |config|
-      YAML::ENGINE.yamler = 'syck'
       config['sources'] = [['/', "Webgen::Source::FileSystem", 'doc']]
       config['output'] = ['Webgen::Output::FileSystem', 'htmldoc']
       config.default_processing_pipeline('Page' => 'erb,tags,kramdown,blocks,fragments')

data/VERSION

@@ -1 +1 @@
-0.13.8
+0.14.0

data/doc/documentation.page

@@ -22,7 +22,7 @@ from standard Markdown.
 
 ## Usage
 
-{:ruby: lang='ruby'}
+{:ruby: .language-ruby}
 
 The kramdown package provides two ways for using it:
 

data/doc/quickref.page

@@ -147,6 +147,16 @@ many tildes as the starting line.
 ~~~~~~~~~~~~
 {kdexample}
 
+The following is a code block with a language specified:
+
+{kdexample::}
+~~~ ruby
+def what?
+  42
+end
+~~~
+{kdexample}
+
 
 ## Horizontal Rules
 

data/doc/sidebar.template

@@ -1,7 +1,7 @@
 <h2>News</h2>
 
-<p>The latest version of kramdown is <b>0.13.8</b> and it was released
-on <b>2012-08-31</b>.</p>
+<p>The latest version of kramdown is <b>0.14.0</b> and it was released
+on <b>2012-09-16</b>.</p>
 
 <p>More <a href="{relocatable: news.html}">news</a>…</p>
 

data/doc/syntax.page

@@ -399,6 +399,30 @@ example:
 This type of code block is especially useful for copy-pasted code since you don't need to indent the
 code.
 
+### Language of Code Blocks
+
+You can tell kramdown the language of a code block by using an [IAL](#inline-attribute-lists):
+
+    ~~~
+    def what?
+      42
+    end
+    ~~~
+    {: .language-ruby}
+
+The specially named class `language-ruby` tells kramdown that this code block is written in the Ruby
+language. Such information can be used, for example, by converters to do syntax highlighting on the
+code block.
+
+Fenced code blocks provide an easier way to specify the language, namely by appending the language
+of the code block to the end of the starting line:
+
+    ~~~ ruby
+    def what?
+      42
+    end
+    ~~~
+
 
 ## Lists
 
@@ -1229,8 +1253,8 @@ want to force the literal meaning of an asterisk or an underscore you can backsl
 
 ## Code Spans
 
-This is the span-level equivalent of the code block element. You can markup a text part as code span
-by surrounding it with backticks `` ` ``. For example:
+This is the span-level equivalent of the [code block](#code-blocks) element. You can markup a text
+part as code span by surrounding it with backticks `` ` ``. For example:
 
     Use `<html>` tags for this.
 
@@ -1252,6 +1276,11 @@ literal meaning of a backtick you can backslash-escape it:
     This is a ` literal backtick.
     As \`are\` these!
 
+As with [code blocks](#language-of-code-blocks) you can set the language of a code span by using an
+[IAL](#inline-attribute-lists):
+
+    This is a Ruby code fragment `x = Class.new`{:.language-ruby}
+
 
 ## HTML Spans
 
@@ -1531,7 +1560,7 @@ class names
       {:id: .cls1 .cls2}
       {:id: class="cls1" .cls2}
       {:id: class="something" class="cls1" .cls2}
-      {:id: class="cls1 cls2}
+      {:id: class="cls1 cls2"}
 
 As can be seen from the example of the class names, attributes that are defined earlier are
 overwritten by ones with the same name defined later.

data/lib/kramdown/converter/base.rb

@@ -132,7 +132,7 @@ module Kramdown
       # Return +true+ if the header element +el+ should be used for the table of contents (as
       # specified by the +toc_levels+ option).
       def in_toc?(el)
-        @options[:toc_levels].include?(el.options[:level])
+        @options[:toc_levels].include?(el.options[:level]) and ((not el.attr['class'].split.include?('no_toc')) rescue true)
       end
 
       # Return the output header level given a level.
@@ -142,6 +142,23 @@ module Kramdown
         [[level + @options[:header_offset], 6].min, 1].max
       end
 
+      # Extract the code block/span language from the attributes.
+      def extract_code_language(attr)
+        if attr['class'] && attr['class'] =~ /\blanguage-\w+\b/
+          attr['class'].scan(/\blanguage-(\w+)\b/).first.first
+        end
+      end
+
+      # See #extract_code_language
+      #
+      # *Warning*: This version will modify the given attributes if a language is present.
+      def extract_code_language!(attr)
+        lang = extract_code_language(attr)
+        attr['class'] = attr['class'].sub(/\blanguage-\w+\b/, '').strip if lang
+        attr.delete('class') if lang && attr['class'].empty?
+        lang
+      end
+
       # Generate an unique alpha-numeric ID from the the string +str+ for use as a header ID.
       #
       # Uses the option +auto_id_prefix+: the value of this option is prepended to every generated

data/lib/kramdown/converter/html.rb

@@ -109,12 +109,13 @@ module Kramdown
       end
 
       def convert_codeblock(el, indent)
-        if @coderay_enabled && (el.attr['lang'] || @options[:coderay_default_lang])
-          attr = el.attr.dup
+        attr = el.attr.dup
+        lang = extract_code_language!(attr)
+        if @coderay_enabled && (lang || @options[:coderay_default_lang])
           opts = {:wrap => @options[:coderay_wrap], :line_numbers => @options[:coderay_line_numbers],
             :line_number_start => @options[:coderay_line_number_start], :tab_width => @options[:coderay_tab_width],
             :bold_every => @options[:coderay_bold_every], :css => @options[:coderay_css]}
-          lang = (attr.delete('lang') || @options[:coderay_default_lang]).to_sym
+          lang = (lang || @options[:coderay_default_lang]).to_sym
           result = CodeRay.scan(el.value, lang).html(opts).chomp << "\n"
           "#{' '*indent}<div#{html_attributes(attr)}>#{result}#{' '*indent}</div>\n"
         else
@@ -131,7 +132,9 @@ module Kramdown
               end.join('')
             end
           end
-          "#{' '*indent}<pre#{html_attributes(el.attr)}><code>#{result}\n</code></pre>\n"
+          code_attr = {}
+          code_attr['class'] = "language-#{lang}" if lang
+          "#{' '*indent}<pre#{html_attributes(attr)}><code#{html_attributes(code_attr)}>#{result}\n</code></pre>\n"
         end
       end
 
@@ -267,10 +270,10 @@ module Kramdown
       end
 
       def convert_codespan(el, indent)
-        if @coderay_enabled && el.attr['lang']
-          attr = el.attr.dup
-          result = CodeRay.scan(el.value, attr.delete('lang').to_sym).html(:wrap => :span, :css => @options[:coderay_css]).chomp
-          "<code#{html_attributes(attr)}>#{result}</code>"
+        lang = extract_code_language(el.attr)
+        if @coderay_enabled && lang
+          result = CodeRay.scan(el.value, lang.to_sym).html(:wrap => :span, :css => @options[:coderay_css]).chomp
+          "<code#{html_attributes(el.attr)}>#{result}</code>"
         else
           "<code#{html_attributes(el.attr)}>#{escape_html(el.value)}</code>"
         end
@@ -393,7 +396,7 @@ module Kramdown
         text.each_byte do |b|
           result << (b > 128 ? b.chr : "&#%03d;" % b)
         end
-        result.force_encoding(text.encoding) if RUBY_VERSION >= '1.9'
+        result.force_encoding(text.encoding) if result.respond_to?(:force_encoding)
         result
       end
 

data/lib/kramdown/converter/latex.rb

@@ -97,7 +97,7 @@ module Kramdown
 
       def convert_codeblock(el, opts)
         show_whitespace = el.attr['class'].to_s =~ /\bshow-whitespaces\b/
-        lang = el.attr['lang']
+        lang = extract_code_language(el.attr)
         if show_whitespace || lang
           options = []
           options << "showspaces=%s,showtabs=%s" % (show_whitespace ? ['true', 'true'] : ['false', 'false'])

data/lib/kramdown/parser/base.rb

@@ -62,7 +62,7 @@ module Kramdown
       def initialize(source, options)
         @source = source
         @options = Kramdown::Options.merge(options)
-        @root = Element.new(:root, nil, nil, :encoding => (RUBY_VERSION >= '1.9' ? source.encoding : nil))
+        @root = Element.new(:root, nil, nil, :encoding => (source.encoding rescue nil))
         @warnings = []
         @text_type = :text
       end
@@ -115,7 +115,7 @@ module Kramdown
       # method works correctly under Ruby 1.8 and Ruby 1.9.
       def extract_string(range, strscan)
         result = nil
-        if RUBY_VERSION >= '1.9'
+        if strscan.string.respond_to?(:encoding)
           begin
             enc = strscan.string.encoding
             strscan.string.force_encoding('ASCII-8BIT')

data/lib/kramdown/parser/html.rb

@@ -383,8 +383,9 @@ module Kramdown
               if c.type == :text
                 mem << c.value
               elsif c.type == :entity
-                if RUBY_VERSION >= '1.9'
-                  mem << c.value.char.encode(@root.options[:encoding])
+                value_char = c.value.char
+                if value_char.respond_to?(:encode)
+                  mem << value_char.encode(@root.options[:encoding])
                 elsif [60, 62, 34, 38].include?(c.value.code_point)
                   mem << c.value.code_point.chr
                 end
@@ -405,6 +406,10 @@ module Kramdown
               set_basics(el, :codespan)
             else
               set_basics(el, :codeblock)
+              if el.children.size == 1 && el.children.first.value == 'code'
+                value = (el.children.first.attr['class'] || '').scan(/\blanguage-\w+\b/).first
+                el.attr['class'] = "#{value} #{el.attr['class']}".rstrip if value
+              end
             end
             el.value = result.first.value
             el.children.clear

data/lib/kramdown/parser/kramdown/autolink.rb

@@ -32,11 +32,7 @@ module Kramdown
         ACHARS = '[[:alnum:]]'
       end
       AUTOLINK_START_STR = "<((mailto|https?|ftps?):.+?|[-.#{ACHARS}]+@[-#{ACHARS}]+(?:\.[-#{ACHARS}]+)*\.[a-z]+)>"
-      if RUBY_VERSION < '1.9.0'
-        AUTOLINK_START = /#{AUTOLINK_START_STR}/u
-      else
-        AUTOLINK_START = /#{AUTOLINK_START_STR}/
-      end
+      AUTOLINK_START = /#{AUTOLINK_START_STR}/u
 
       # Parse the autolink at the current location.
       def parse_autolink

data/lib/kramdown/parser/kramdown/codeblock.rb

@@ -44,13 +44,16 @@ module Kramdown
 
 
       FENCED_CODEBLOCK_START = /^~{3,}/
-      FENCED_CODEBLOCK_MATCH = /^(~{3,})\s*?\n(.*?)^\1~*\s*?\n/m
+      FENCED_CODEBLOCK_MATCH = /^(~{3,})\s*?(\w+)?\s*?\n(.*?)^\1~*\s*?\n/m
 
       # Parse the fenced codeblock at the current location.
       def parse_codeblock_fenced
         if @src.check(FENCED_CODEBLOCK_MATCH)
           @src.pos += @src.matched_size
-          @tree.children << new_block_el(:codeblock, @src[2])
+          el = new_block_el(:codeblock, @src[3])
+          lang = @src[2].to_s.strip
+          el.attr['class'] = "language-#{lang}" unless lang.empty?
+          @tree.children << el
           true
         else
           false

data/lib/kramdown/utils/html.rb

@@ -36,15 +36,17 @@ module Kramdown
       #
       # This method uses the option +entity_output+ to determine the output form for the entity.
       def entity_to_str(e, original = nil)
-        if RUBY_VERSION >= '1.9' && @options[:entity_output] == :as_char &&
+        entity_output = @options[:entity_output]
+
+        if e.char.respond_to?(:encoding) && entity_output == :as_char &&
             (c = e.char.encode(@root.options[:encoding]) rescue nil) && !ESCAPE_MAP.has_key?(c)
           c
-        elsif (@options[:entity_output] == :as_input || @options[:entity_output] == :as_char) && original
+        elsif (entity_output == :as_input || entity_output == :as_char) && original
           original
-        elsif @options[:entity_output] == :numeric || e.name.nil?
-          "&##{e.code_point};"
-        else
+        elsif (entity_output == :symbolic || ESCAPE_MAP.has_key?(e.char)) && !e.name.nil?
           "&#{e.name};"
+        else # default to :numeric
+          "&##{e.code_point};"
         end
       end
 

data/lib/kramdown/version.rb

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

data/test/test_files.rb

@@ -157,6 +157,7 @@ class TestFiles < Test::Unit::TestCase
                              'test/testcases/span/03_codespan/highlighting.html', # bc of span elements inside code element
                              'test/testcases/block/04_header/with_auto_ids.html', # bc of auto_ids=true option
                              'test/testcases/block/04_header/header_type_offset.html', # bc of header_offset option
+                             'test/testcases/block/16_toc/toc_exclude.html',      # bc of different attribute ordering
                             ]
     Dir[File.dirname(__FILE__) + '/testcases/**/*.html'].each do |html_file|
       next if EXCLUDE_HTML_KD_FILES.any? {|f| html_file =~ /#{f}$/}

data/test/testcases/block/04_header/setext_header.html

@@ -18,7 +18,7 @@ And not a header.
 <blockquote>
   <p>Blockquote.
 Not a Header
-&mdash;</p>
+-</p>
 </blockquote>
 
 <h2 id="id">header</h2>

data/test/testcases/block/04_header/setext_header.text

@@ -21,7 +21,7 @@ And not a header.
 
 > Blockquote.
 Not a Header
----
+-
 
 header {#id}  
 ------------

data/test/testcases/block/06_codeblock/highlighting.text

@@ -1,4 +1,4 @@
     x = Class.new
 ^
     <a>href</a>
-{: lang="html"}
+{: .language-html}

data/test/testcases/block/06_codeblock/with_lang_in_fenced_block.html

@@ -0,0 +1,24 @@
+<pre><code class="language-ruby">def what?
+  42
+end
+</code></pre>
+
+<pre class="class1"><code class="language-ruby">def what?
+  42
+end
+</code></pre>
+
+<pre><code class="language-ruby">def what?
+  42
+end
+</code></pre>
+
+<pre class="language-python"><code class="language-ruby">def what?
+  42
+end
+</code></pre>
+
+<pre class="language-python"><code class="language-ruby">def what?
+  42
+end
+</code></pre>

data/test/testcases/block/06_codeblock/with_lang_in_fenced_block.options

@@ -0,0 +1,2 @@
+:enable_coderay: false
+

data/test/testcases/block/06_codeblock/with_lang_in_fenced_block.text

@@ -0,0 +1,33 @@
+~~~ ruby
+def what?
+  42
+end
+~~~
+
+~~~ ruby
+def what?
+  42
+end
+~~~
+{:.class1}
+
+~~~
+def what?
+  42
+end
+~~~
+{: .language-ruby}
+
+~~~ ruby
+def what?
+  42
+end
+~~~
+{: .language-python}
+
+~~~ ruby
+def what?
+  42
+end
+~~~
+{: class="language-python"}

data/test/testcases/block/07_horizontal_rule/error.html

@@ -1,7 +1,7 @@
 <p>_ * _</p>
 
-<p>&mdash; * * *</p>
+<p>&#8212; * * *</p>
 
 <p>_ - *</p>
 
-<p>&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;- test</p>
+<p>&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;- test</p>

data/test/testcases/block/09_html/html_to_native/typography.html

@@ -1 +1 @@
-<p>This is &hellip; something &ldquo;to remember&rdquo;!</p>
+<p>This is &#8230; something &#8220;to remember&#8221;!</p>

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

@@ -1,7 +1,7 @@
     x = Class.new
-{: lang="ruby"}
+{: .language-ruby}
 
 {::options coderay_wrap="span" coderay_line_numbers="" coderay_css="class" coderay_tab_width="4" /}
 
     x = Class.new
-{: lang="ruby"}
+{: .language-ruby}

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

@@ -30,11 +30,11 @@
     </tr>
     <tr>
       <td>cell1</td>
-      <td>&nbsp;</td>
-      <td>&nbsp;</td>
+      <td>&#160;</td>
+      <td>&#160;</td>
     </tr>
     <tr>
-      <td>&nbsp;</td>
+      <td>&#160;</td>
       <td>cell2</td>
       <td>cell3</td>
     </tr>
@@ -66,9 +66,9 @@
   <tbody>
     <tr>
       <td>This is a <code>span | with</code> a pipe.</td>
-      <td>&nbsp;</td>
-      <td>&nbsp;</td>
-      <td>&nbsp;</td>
+      <td>&#160;</td>
+      <td>&#160;</td>
+      <td>&#160;</td>
     </tr>
     <tr>
       <td>Some <em>span</em></td>
@@ -153,7 +153,7 @@
   </thead>
   <tbody>
     <tr>
-      <td>&nbsp;</td>
+      <td>&#160;</td>
       <td>cell2</td>
     </tr>
   </tbody>

data/test/testcases/block/16_toc/toc_exclude.html

@@ -0,0 +1,35 @@
+<h1 class="no_toc" id="contents">Contents</h1>
+
+<ul id="markdown-toc">
+  <li><a href="#header-level-1">Header level 1</a>    <ul>
+      <li><a href="#header-level-2">Header level 2</a>        <ul>
+          <li><a href="#header-level-3">Header level 3</a>            <ul>
+              <li><a href="#header-level-4">Header level 4</a></li>
+            </ul>
+          </li>
+        </ul>
+      </li>
+    </ul>
+  </li>
+  <li><a href="#other-header-level-1">Other header level 1</a>    <ul>
+      <li><a href="#other-header-level-2">Other header level 2</a>        <ul>
+          <li><a href="#other-header-level-3">Other header level 3</a></li>
+        </ul>
+      </li>
+    </ul>
+  </li>
+</ul>
+
+<h1 id="header-level-1">Header level 1</h1>
+
+<h2 id="header-level-2">Header level 2</h2>
+
+<h3 id="header-level-3">Header level 3</h3>
+
+<h4 id="header-level-4">Header level 4</h4>
+
+<h1 id="other-header-level-1">Other header level 1</h1>
+
+<h2 id="other-header-level-2">Other header level 2</h2>
+
+<h3 id="other-header-level-3">Other header level 3</h3>

data/test/testcases/block/16_toc/toc_exclude.options

@@ -0,0 +1 @@
+:auto_ids: true

data/test/testcases/block/16_toc/toc_exclude.text

@@ -0,0 +1,19 @@
+# Contents
+{:.no_toc}
+
+* Here comes the table of content
+{:toc}
+
+# Header level 1
+
+## Header level 2
+
+### Header level 3
+
+#### Header level 4
+
+# Other header level 1
+
+## Other header level 2
+
+### Other header level 3

data/test/testcases/span/01_link/inline.html

@@ -39,7 +39,7 @@ on line</a></p>
 
 <p>bad [URL with parens](something(new.html)</p>
 
-<p>bad [URL with empty title](something.html &lsquo;&rsquo;)</p>
+<p>bad [URL with empty title](something.html &#8216;&#8217;)</p>
 
 <p>bad [URL](</p>
 

data/test/testcases/span/01_link/reference.html

@@ -23,14 +23,14 @@ the text</a></p>
 <p>[no url] invalid.html
 [no url]:</p>
 
-<p>&ldquo;title&rdquo;</p>
+<p>&#8220;title&#8221;</p>
 
 <p>test <a href="invalid.html">url but no title</a>
 test [urldef]</p>
 
-<p>[urldef]: some.url &lsquo;title&rdquo;</p>
+<p>[urldef]: some.url &#8216;title&#8221;</p>
 
 <p>some <a href="with spaces.html" title="title">with spaces</a></p>
 
-<p>this <a href="occasion.html">is a &lsquo;special&rsquo; occasion for /all/ of us</a></p>
+<p>this <a href="occasion.html">is a &#8216;special&#8217; occasion for /all/ of us</a></p>
 

data/test/testcases/span/03_codespan/highlighting.html

@@ -1 +1 @@
-<p>You can say <code><span class="CodeRay">x = <span style="color:#036;font-weight:bold">Class</span>.new</span></code>, for example.</p>
+<p>You can say <code class="language-ruby"><span class="CodeRay">x = <span style="color:#036;font-weight:bold">Class</span>.new</span></code>, for example.</p>

data/test/testcases/span/03_codespan/highlighting.text

@@ -1 +1 @@
-You can say `x = Class.new`{: lang="ruby"}, for example.
+You can say `x = Class.new`{:.language-ruby}, for example.

data/test/testcases/span/text_substitutions/typography.options

@@ -0,0 +1 @@
+:entity_output: symbolic

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kramdown
 version: !ruby/object:Gem::Version
-  version: 0.13.8
+  version: 0.14.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-31 00:00:00.000000000 Z
+date: 2012-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coderay
@@ -187,6 +187,7 @@ files:
 - test/testcases/span/ial/simple.text
 - test/testcases/span/math/normal.html
 - test/testcases/span/math/normal.text
+- test/testcases/span/text_substitutions/typography.options
 - test/testcases/span/text_substitutions/entities_as_input.options
 - test/testcases/span/text_substitutions/typography.html
 - test/testcases/span/text_substitutions/entities.html
@@ -206,7 +207,6 @@ files:
 - test/testcases/span/text_substitutions/entities.text
 - test/testcases/span/text_substitutions/entities_symbolic.html
 - test/testcases/span/text_substitutions/entities_numeric.html
-- test/testcases/span/text_substitutions/typography.html.19
 - test/testcases/span/text_substitutions/entities_as_input.text
 - test/testcases/span/text_substitutions/entities_as_input.html
 - test/testcases/span/text_substitutions/greaterthan.text
@@ -358,7 +358,6 @@ files:
 - test/testcases/block/04_header/atx_header.html
 - test/testcases/block/04_header/header_type_offset.kramdown
 - test/testcases/block/04_header/setext_header_no_newline_at_end.text
-- test/testcases/block/04_header/setext_header.html.19
 - test/testcases/block/04_header/atx_header_no_newline_at_end.text
 - test/testcases/block/04_header/setext_header.html
 - test/testcases/block/04_header/with_auto_id_prefix.html
@@ -432,17 +431,22 @@ files:
 - test/testcases/block/16_toc/no_toc.html
 - test/testcases/block/16_toc/toc_levels.html
 - test/testcases/block/16_toc/toc_levels.text
+- test/testcases/block/16_toc/toc_exclude.html
 - test/testcases/block/16_toc/toc_with_footnotes.html
 - test/testcases/block/16_toc/toc_with_footnotes.text
+- test/testcases/block/16_toc/toc_exclude.options
 - test/testcases/block/16_toc/toc_levels.options
+- test/testcases/block/16_toc/toc_exclude.text
 - test/testcases/block/01_blank_line/spaces.html
 - test/testcases/block/01_blank_line/tabs.text
 - test/testcases/block/01_blank_line/spaces.text
 - test/testcases/block/01_blank_line/tabs.html
 - test/testcases/block/06_codeblock/highlighting.html
 - test/testcases/block/06_codeblock/highlighting.options
+- test/testcases/block/06_codeblock/with_lang_in_fenced_block.html
 - test/testcases/block/06_codeblock/whitespace.text
 - test/testcases/block/06_codeblock/disable-highlighting.text
+- test/testcases/block/06_codeblock/with_lang_in_fenced_block.options
 - test/testcases/block/06_codeblock/with_eob_marker.text
 - test/testcases/block/06_codeblock/tilde_syntax.html
 - test/testcases/block/06_codeblock/no_newline_at_end_1.text
@@ -465,6 +469,7 @@ files:
 - test/testcases/block/06_codeblock/no_newline_at_end.html
 - test/testcases/block/06_codeblock/error.text
 - test/testcases/block/06_codeblock/normal.text
+- test/testcases/block/06_codeblock/with_lang_in_fenced_block.text
 - test/testcases/encoding.html
 - test/test_files.rb
 homepage: http://kramdown.rubyforge.org

data/test/testcases/block/04_header/setext_header.html.19

@@ -1,30 +0,0 @@
-<h2>test</h2>
-
-<h1>test2</h1>
-
-<h2>test</h2>
-<p>para</p>
-
-<pre><code>   header =
-</code></pre>
-
-<p>=</p>
-
-<p>This is a para.
-With two lines.
-And not a header.
-=================</p>
-
-<blockquote>
-  <p>Blockquote.
-Not a Header
-—</p>
-</blockquote>
-
-<h2 id="id">header</h2>
-
-<h1 id="id">header</h1>
-
-<h2>header{#noid}</h2>
-
-<h2>header</h2>

data/test/testcases/span/text_substitutions/typography.html.19

@@ -1,18 +0,0 @@
-<p>This is… something—this too–!</p>
-
-<p>This «is» some text, « this » too!</p>
-
-<p>“Fancy quotes” are ‘cool’, even in the ’80s!
-Je t’ aime. You’re a funny one! Thomas’ name
-Mark’s name. “…you”
-“‘Nested’ quotes are ‘possible’”, too!
-‘“Otherway” is “round”’!</p>
-
-<p>‘Opening now!’</p>
-
-<p>’80s are really cool.</p>
-
-<p><em>Cluster</em>’s Last Stand.</p>
-
-<p>Nam liber tempor
-“…At vero eos et accusam”</p>