Hello community, here is the log from the commit of package rubygem-kramdown for openSUSE:Factory checked in at 2016-05-29 03:11:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-kramdown (Old) and /work/SRC/openSUSE:Factory/.rubygem-kramdown.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rubygem-kramdown" Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-kramdown/rubygem-kramdown.changes 2016-03-18 21:41:12.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rubygem-kramdown.new/rubygem-kramdown.changes 2016-05-29 03:12:45.000000000 +0200 @@ -1,0 +2,6 @@ +Mon May 2 04:36:46 UTC 2016 - [email protected] + +- updated to version 1.11.1 + see installed news.feed + +------------------------------------------------------------------- Old: ---- kramdown-1.10.0.gem New: ---- kramdown-1.11.1.gem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-kramdown.spec ++++++ --- /var/tmp/diff_new_pack.vz0ME8/_old 2016-05-29 03:12:45.000000000 +0200 +++ /var/tmp/diff_new_pack.vz0ME8/_new 2016-05-29 03:12:45.000000000 +0200 @@ -24,7 +24,7 @@ # Name: rubygem-kramdown -Version: 1.10.0 +Version: 1.11.1 Release: 0 %define mod_name kramdown %define mod_full_name %{mod_name}-%{version} ++++++ kramdown-1.10.0.gem -> kramdown-1.11.1.gem ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CONTRIBUTERS new/CONTRIBUTERS --- old/CONTRIBUTERS 2016-03-02 18:45:04.000000000 +0100 +++ new/CONTRIBUTERS 2016-05-01 22:18:00.000000000 +0200 @@ -1,6 +1,6 @@ Count Name ======= ==== - 789 Thomas Leitner <[email protected]> + 802 Thomas Leitner <[email protected]> 6 Gioele Barabucci <[email protected]> 4 Ted Pak <[email protected]> 4 Arne Brasseur <[email protected]> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Rakefile new/Rakefile --- old/Rakefile 2016-03-02 18:45:04.000000000 +0100 +++ new/Rakefile 2016-05-01 22:18:00.000000000 +0200 @@ -180,6 +180,7 @@ s.add_development_dependency 'rouge', '~> 1.8' s.add_development_dependency 'stringex', '~> 1.5.1' s.add_development_dependency 'prawn', '~> 2.0' + s.add_development_dependency 'prawn-table', '~> 0.2.2' s.add_development_dependency 'ritex', '~> 1.0' s.add_development_dependency 'itextomml', '~> 1.5' @@ -239,7 +240,7 @@ COPYRIGHT=<<EOF # #-- -# Copyright (C) 2009-2015 Thomas Leitner <[email protected]> +# Copyright (C) 2009-2016 Thomas Leitner <[email protected]> # # This file is part of kramdown which is licensed under the MIT. #++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/VERSION new/VERSION --- old/VERSION 2016-03-02 18:45:04.000000000 +0100 +++ new/VERSION 2016-05-01 22:18:00.000000000 +0200 @@ -1 +1 @@ -1.10.0 +1.11.1 Files old/checksums.yaml.gz and new/checksums.yaml.gz differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/default.template new/doc/default.template --- old/doc/default.template 2016-03-02 18:45:04.000000000 +0100 +++ new/doc/default.template 2016-05-01 22:18:00.000000000 +0200 @@ -3,7 +3,7 @@ <head> <meta http-equiv="content-type" content="text/html; charset=utf-8" /> <meta name="author" content="Thomas Leitner" /> - <meta name="copyright" content="2009-2015 Thomas Leitner" /> + <meta name="copyright" content="2009-2016 Thomas Leitner" /> <meta name="description" content="kramdown is a fast, pure-Ruby Markdown-superset converter" /> <meta name="keywords" content="ruby, kramdown, markdown, text markup" /> <link href="{relocatable: default.css}" type="text/css" rel="stylesheet" media="screen,projection" /> @@ -43,7 +43,7 @@ </div> <footer> - <div class="float-left">Copyright © 2009-2015 Thomas Leitner</div> + <div class="float-left">Copyright © 2009-2016 Thomas Leitner</div> <div class="float-right">Generated by <a href="http://webgen.gettalong.org";>webgen</a></div> </footer> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/index.page new/doc/index.page --- old/doc/index.page 2016-03-02 18:45:04.000000000 +0100 +++ new/doc/index.page 2016-05-01 22:18:00.000000000 +0200 @@ -97,8 +97,8 @@ It is probably the fastest pure-Ruby Markdown converter available (September 2014), being about 3x faster than [Maruku] and about 4.5x faster than [BlueFeather]. -Version **1.10.0**{:itemprop="softwareVersion"} released on -**2016-03-02**{:itemprop="datePublished"}, [more news](news.html) +Version **1.11.1**{:itemprop="softwareVersion"} released on +**2016-05-01**{:itemprop="datePublished"}, [more news](news.html) {: style="text-align: center; font-size: 80%"} </div> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/installation.page new/doc/installation.page --- old/doc/installation.page 2016-03-02 18:45:04.000000000 +0100 +++ new/doc/installation.page 2016-05-01 22:18:00.000000000 +0200 @@ -8,7 +8,7 @@ ## Dependencies Since kramdown is written in Ruby, you just need the [Ruby interpreter](http://www.ruby-lang.org), -version 1.8.5, 1.8.6, 1.8.7, 1.9.2, 1.9.3 or 2.0.0. There are no other dependencies. +version 1.8.5, 1.8.6, 1.8.7, 1.9.2, 1.9.3 or 2.x. There are no other dependencies. ## Compatibility Notes @@ -16,7 +16,7 @@ kramdown should work on any platform which supports Ruby. It has been successfully tested on the following platforms: -* Linux with Ruby 1.8.5, 1.8.6, 1.8.7, 1.9.2, 1.9.3, 2.0.0 and jruby 1.7.3. +* Linux with Ruby 1.8.7, 1.9.3, 2.x, jruby 1.7.19 and jruby 9.0.0.0. See the platform specific installation notes for more information! diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/kramdown/compatibility.rb new/lib/kramdown/compatibility.rb --- old/lib/kramdown/compatibility.rb 2016-03-02 18:45:04.000000000 +0100 +++ new/lib/kramdown/compatibility.rb 2016-05-01 22:18:00.000000000 +0200 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # #-- -# Copyright (C) 2009-2015 Thomas Leitner <[email protected]> +# Copyright (C) 2009-2016 Thomas Leitner <[email protected]> # # This file is part of kramdown which is licensed under the MIT. #++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/kramdown/converter/base.rb new/lib/kramdown/converter/base.rb --- old/lib/kramdown/converter/base.rb 2016-03-02 18:45:04.000000000 +0100 +++ new/lib/kramdown/converter/base.rb 2016-05-01 22:18:00.000000000 +0200 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # #-- -# Copyright (C) 2009-2015 Thomas Leitner <[email protected]> +# Copyright (C) 2009-2016 Thomas Leitner <[email protected]> # # This file is part of kramdown which is licensed under the MIT. #++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/kramdown/converter/hash_ast.rb new/lib/kramdown/converter/hash_ast.rb --- old/lib/kramdown/converter/hash_ast.rb 2016-03-02 18:45:04.000000000 +0100 +++ new/lib/kramdown/converter/hash_ast.rb 2016-05-01 22:18:00.000000000 +0200 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # #-- -# Copyright (C) 2009-2015 Thomas Leitner <[email protected]> +# Copyright (C) 2009-2016 Thomas Leitner <[email protected]> # # This file is part of kramdown which is licensed under the MIT. #++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/kramdown/converter/html.rb new/lib/kramdown/converter/html.rb --- old/lib/kramdown/converter/html.rb 2016-03-02 18:45:04.000000000 +0100 +++ new/lib/kramdown/converter/html.rb 2016-05-01 22:18:00.000000000 +0200 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # #-- -# Copyright (C) 2009-2015 Thomas Leitner <[email protected]> +# Copyright (C) 2009-2016 Thomas Leitner <[email protected]> # # This file is part of kramdown which is licensed under the MIT. #++ @@ -92,11 +92,11 @@ def convert_codeblock(el, indent) attr = el.attr.dup lang = extract_code_language!(attr) - lang = el.options[:lang] if el.options.has_key?(:lang) - highlighted_code = highlight_code(el.value, lang, :block) + hl_opts = {} + highlighted_code = highlight_code(el.value, el.options[:lang] || lang, :block, hl_opts) if highlighted_code - add_syntax_highlighter_to_class_attr(attr) + add_syntax_highlighter_to_class_attr(attr, lang || hl_opts[:default_lang]) "#{' '*indent}<div#{html_attributes(attr)}>#{highlighted_code}#{' '*indent}</div>\n" else result = escape_html(el.value) @@ -113,7 +113,7 @@ end end code_attr = {} - code_attr['class'] = "language-#{lang.sub(/\?.*$/, '')}" if lang + code_attr['class'] = "language-#{lang}" if lang "#{' '*indent}<pre#{html_attributes(attr)}><code#{html_attributes(code_attr)}>#{result}\n</code></pre>\n" end end @@ -253,9 +253,10 @@ def convert_codespan(el, indent) attr = el.attr.dup lang = extract_code_language(attr) - result = highlight_code(el.value, lang, :span) + hl_opts = {} + result = highlight_code(el.value, lang, :span, hl_opts) if result - add_syntax_highlighter_to_class_attr(attr) + add_syntax_highlighter_to_class_attr(attr, hl_opts[:default_lang]) else result = escape_html(el.value) end @@ -363,9 +364,11 @@ "#{' '*indent}<#{name}#{html_attributes(attr)}>\n#{body}#{' '*indent}</#{name}>\n" end - # Add the syntax highlighter name to the 'class' attribute of the given attribute hash. - def add_syntax_highlighter_to_class_attr(attr) + # Add the syntax highlighter name to the 'class' attribute of the given attribute hash. And + # overwrites or add a "language-LANG" part using the +lang+ parameter if +lang+ is not nil. + def add_syntax_highlighter_to_class_attr(attr, lang = nil) (attr['class'] = (attr['class'] || '') + " highlighter-#{@options[:syntax_highlighter]}").lstrip! + attr['class'].sub!(/\blanguage-\S+|(^)/) { "language-#{lang}#{$1 ? ' ' : ''}" } if lang end # Generate and return an element tree for the table of contents. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/kramdown/converter/kramdown.rb new/lib/kramdown/converter/kramdown.rb --- old/lib/kramdown/converter/kramdown.rb 2016-03-02 18:45:04.000000000 +0100 +++ new/lib/kramdown/converter/kramdown.rb 2016-05-01 22:18:00.000000000 +0200 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # #-- -# Copyright (C) 2009-2015 Thomas Leitner <[email protected]> +# Copyright (C) 2009-2016 Thomas Leitner <[email protected]> # # This file is part of kramdown which is licensed under the MIT. #++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/kramdown/converter/latex.rb new/lib/kramdown/converter/latex.rb --- old/lib/kramdown/converter/latex.rb 2016-03-02 18:45:04.000000000 +0100 +++ new/lib/kramdown/converter/latex.rb 2016-05-01 22:18:00.000000000 +0200 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # #-- -# Copyright (C) 2009-2015 Thomas Leitner <[email protected]> +# Copyright (C) 2009-2016 Thomas Leitner <[email protected]> # # This file is part of kramdown which is licensed under the MIT. #++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/kramdown/converter/math_engine/itex2mml.rb new/lib/kramdown/converter/math_engine/itex2mml.rb --- old/lib/kramdown/converter/math_engine/itex2mml.rb 2016-03-02 18:45:04.000000000 +0100 +++ new/lib/kramdown/converter/math_engine/itex2mml.rb 2016-05-01 22:18:00.000000000 +0200 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # #-- -# Copyright (C) 2009-2015 Thomas Leitner <[email protected]> +# Copyright (C) 2009-2016 Thomas Leitner <[email protected]> # # This file is part of kramdown which is licensed under the MIT. #++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/kramdown/converter/math_engine/mathjax.rb new/lib/kramdown/converter/math_engine/mathjax.rb --- old/lib/kramdown/converter/math_engine/mathjax.rb 2016-03-02 18:45:04.000000000 +0100 +++ new/lib/kramdown/converter/math_engine/mathjax.rb 2016-05-01 22:18:00.000000000 +0200 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # #-- -# Copyright (C) 2009-2015 Thomas Leitner <[email protected]> +# Copyright (C) 2009-2016 Thomas Leitner <[email protected]> # # This file is part of kramdown which is licensed under the MIT. #++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/kramdown/converter/math_engine/mathjaxnode.rb new/lib/kramdown/converter/math_engine/mathjaxnode.rb --- old/lib/kramdown/converter/math_engine/mathjaxnode.rb 2016-03-02 18:45:04.000000000 +0100 +++ new/lib/kramdown/converter/math_engine/mathjaxnode.rb 2016-05-01 22:18:00.000000000 +0200 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # #-- -# Copyright (C) 2009-2015 Thomas Leitner <[email protected]> +# Copyright (C) 2009-2016 Thomas Leitner <[email protected]> # # This file is part of kramdown which is licensed under the MIT. #++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/kramdown/converter/math_engine/ritex.rb new/lib/kramdown/converter/math_engine/ritex.rb --- old/lib/kramdown/converter/math_engine/ritex.rb 2016-03-02 18:45:04.000000000 +0100 +++ new/lib/kramdown/converter/math_engine/ritex.rb 2016-05-01 22:18:00.000000000 +0200 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # #-- -# Copyright (C) 2009-2015 Thomas Leitner <[email protected]> +# Copyright (C) 2009-2016 Thomas Leitner <[email protected]> # # This file is part of kramdown which is licensed under the MIT. #++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/kramdown/converter/pdf.rb new/lib/kramdown/converter/pdf.rb --- old/lib/kramdown/converter/pdf.rb 2016-03-02 18:45:04.000000000 +0100 +++ new/lib/kramdown/converter/pdf.rb 2016-05-01 22:18:00.000000000 +0200 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # #-- -# Copyright (C) 2009-2015 Thomas Leitner <[email protected]> +# Copyright (C) 2009-2016 Thomas Leitner <[email protected]> # # This file is part of kramdown which is licensed under the MIT. #++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/kramdown/converter/remove_html_tags.rb new/lib/kramdown/converter/remove_html_tags.rb --- old/lib/kramdown/converter/remove_html_tags.rb 2016-03-02 18:45:04.000000000 +0100 +++ new/lib/kramdown/converter/remove_html_tags.rb 2016-05-01 22:18:00.000000000 +0200 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # #-- -# Copyright (C) 2009-2015 Thomas Leitner <[email protected]> +# Copyright (C) 2009-2016 Thomas Leitner <[email protected]> # # This file is part of kramdown which is licensed under the MIT. #++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/kramdown/converter/syntax_highlighter/coderay.rb new/lib/kramdown/converter/syntax_highlighter/coderay.rb --- old/lib/kramdown/converter/syntax_highlighter/coderay.rb 2016-03-02 18:45:04.000000000 +0100 +++ new/lib/kramdown/converter/syntax_highlighter/coderay.rb 2016-05-01 22:18:00.000000000 +0200 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # #-- -# Copyright (C) 2009-2015 Thomas Leitner <[email protected]> +# Copyright (C) 2009-2016 Thomas Leitner <[email protected]> # # This file is part of kramdown which is licensed under the MIT. #++ @@ -21,14 +21,14 @@ AVAILABLE = false # :nodoc: end - def self.call(converter, text, lang, type, _unused_opts) + def self.call(converter, text, lang, type, call_opts) return nil unless converter.options[:enable_coderay] if type == :span && lang ::CodeRay.scan(text, lang.to_sym).html(options(converter, :span)).chomp elsif type == :block && (lang || options(converter, :default_lang)) - lang = (lang || options(converter, :default_lang)).to_s.gsub(/-/, '_').to_sym - ::CodeRay.scan(text, lang).html(options(converter, :block)).chomp << "\n" + lang ||= call_opts[:default_lang] = options(converter, :default_lang) + ::CodeRay.scan(text, lang.to_s.gsub(/-/, '_').to_sym).html(options(converter, :block)).chomp << "\n" else nil end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/kramdown/converter/syntax_highlighter/minted.rb new/lib/kramdown/converter/syntax_highlighter/minted.rb --- old/lib/kramdown/converter/syntax_highlighter/minted.rb 2016-03-02 18:45:04.000000000 +0100 +++ new/lib/kramdown/converter/syntax_highlighter/minted.rb 2016-05-01 22:18:00.000000000 +0200 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # #-- -# Copyright (C) 2009-2015 Thomas Leitner <[email protected]> +# Copyright (C) 2009-2016 Thomas Leitner <[email protected]> # # This file is part of kramdown which is licensed under the MIT. #++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/kramdown/converter/syntax_highlighter/rouge.rb new/lib/kramdown/converter/syntax_highlighter/rouge.rb --- old/lib/kramdown/converter/syntax_highlighter/rouge.rb 2016-03-02 18:45:04.000000000 +0100 +++ new/lib/kramdown/converter/syntax_highlighter/rouge.rb 2016-05-01 22:18:00.000000000 +0200 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # #-- -# Copyright (C) 2009-2015 Thomas Leitner <[email protected]> +# Copyright (C) 2009-2016 Thomas Leitner <[email protected]> # # This file is part of kramdown which is licensed under the MIT. #++ @@ -21,8 +21,9 @@ AVAILABLE = false # :nodoc: end - def self.call(converter, text, lang, type, _unused_opts) + def self.call(converter, text, lang, type, call_opts) opts = options(converter, type) + call_opts[:default_lang] = opts[:default_lang] lexer = ::Rouge::Lexer.find_fancy(lang || opts[:default_lang], text) return nil if opts[:disable] || !lexer diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/kramdown/converter/syntax_highlighter.rb new/lib/kramdown/converter/syntax_highlighter.rb --- old/lib/kramdown/converter/syntax_highlighter.rb 2016-03-02 18:45:04.000000000 +0100 +++ new/lib/kramdown/converter/syntax_highlighter.rb 2016-05-01 22:18:00.000000000 +0200 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # #-- -# Copyright (C) 2009-2015 Thomas Leitner <[email protected]> +# Copyright (C) 2009-2016 Thomas Leitner <[email protected]> # # This file is part of kramdown which is licensed under the MIT. #++ @@ -46,6 +46,9 @@ # :block type text correctly wrapped (i.e. normally inside a pre-tag, but may # also be a table-tag or just a div-tag) but :span type text *without* a # code-tag! + # + # Also, a syntax highlighter should store the default highlighting language for + # the invocation in the +opts+ hash under the key :default_lang. module SyntaxHighlighter end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/kramdown/converter/toc.rb new/lib/kramdown/converter/toc.rb --- old/lib/kramdown/converter/toc.rb 2016-03-02 18:45:04.000000000 +0100 +++ new/lib/kramdown/converter/toc.rb 2016-05-01 22:18:00.000000000 +0200 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # #-- -# Copyright (C) 2009-2015 Thomas Leitner <[email protected]> +# Copyright (C) 2009-2016 Thomas Leitner <[email protected]> # # This file is part of kramdown which is licensed under the MIT. #++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/kramdown/converter.rb new/lib/kramdown/converter.rb --- old/lib/kramdown/converter.rb 2016-03-02 18:45:04.000000000 +0100 +++ new/lib/kramdown/converter.rb 2016-05-01 22:18:00.000000000 +0200 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # #-- -# Copyright (C) 2009-2015 Thomas Leitner <[email protected]> +# Copyright (C) 2009-2016 Thomas Leitner <[email protected]> # # This file is part of kramdown which is licensed under the MIT. #++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/kramdown/document.rb new/lib/kramdown/document.rb --- old/lib/kramdown/document.rb 2016-03-02 18:45:04.000000000 +0100 +++ new/lib/kramdown/document.rb 2016-05-01 22:18:00.000000000 +0200 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # #-- -# Copyright (C) 2009-2015 Thomas Leitner <[email protected]> +# Copyright (C) 2009-2016 Thomas Leitner <[email protected]> # # This file is part of kramdown which is licensed under the MIT. #++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/kramdown/element.rb new/lib/kramdown/element.rb --- old/lib/kramdown/element.rb 2016-03-02 18:45:04.000000000 +0100 +++ new/lib/kramdown/element.rb 2016-05-01 22:18:00.000000000 +0200 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # #-- -# Copyright (C) 2009-2015 Thomas Leitner <[email protected]> +# Copyright (C) 2009-2016 Thomas Leitner <[email protected]> # # This file is part of kramdown which is licensed under the MIT. #++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/kramdown/error.rb new/lib/kramdown/error.rb --- old/lib/kramdown/error.rb 2016-03-02 18:45:04.000000000 +0100 +++ new/lib/kramdown/error.rb 2016-05-01 22:18:00.000000000 +0200 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # #-- -# Copyright (C) 2009-2015 Thomas Leitner <[email protected]> +# Copyright (C) 2009-2016 Thomas Leitner <[email protected]> # # This file is part of kramdown which is licensed under the MIT. #++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/kramdown/options.rb new/lib/kramdown/options.rb --- old/lib/kramdown/options.rb 2016-03-02 18:45:04.000000000 +0100 +++ new/lib/kramdown/options.rb 2016-05-01 22:18:00.000000000 +0200 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # #-- -# Copyright (C) 2009-2015 Thomas Leitner <[email protected]> +# Copyright (C) 2009-2016 Thomas Leitner <[email protected]> # # This file is part of kramdown which is licensed under the MIT. #++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/kramdown/parser/base.rb new/lib/kramdown/parser/base.rb --- old/lib/kramdown/parser/base.rb 2016-03-02 18:45:04.000000000 +0100 +++ new/lib/kramdown/parser/base.rb 2016-05-01 22:18:00.000000000 +0200 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # #-- -# Copyright (C) 2009-2015 Thomas Leitner <[email protected]> +# Copyright (C) 2009-2016 Thomas Leitner <[email protected]> # # This file is part of kramdown which is licensed under the MIT. #++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/kramdown/parser/gfm.rb new/lib/kramdown/parser/gfm.rb --- old/lib/kramdown/parser/gfm.rb 2016-03-02 18:45:04.000000000 +0100 +++ new/lib/kramdown/parser/gfm.rb 2016-05-01 22:18:00.000000000 +0200 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # #-- -# Copyright (C) 2009-2015 Thomas Leitner <[email protected]> +# Copyright (C) 2009-2016 Thomas Leitner <[email protected]> # # This file is part of kramdown which is licensed under the MIT. #++ @@ -61,7 +61,7 @@ ATX_HEADER_START = /^\#{1,6}\s/ define_parser(:atx_header_gfm, ATX_HEADER_START, nil, 'parse_atx_header') - FENCED_CODEBLOCK_MATCH = /^(([~`]){3,})\s*?((\S+)(?:\?\S*)?)?\s*?\n(.*?)^\1\2*\s*?\n/m + FENCED_CODEBLOCK_MATCH = /^(([~`]){3,})\s*?((\S+?)(?:\?\S*)?)?\s*?\n(.*?)^\1\2*\s*?\n/m define_parser(:codeblock_fenced_gfm, /^[~`]{3,}/, nil, 'parse_codeblock_fenced') STRIKETHROUGH_DELIM = /~~/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/kramdown/parser/html.rb new/lib/kramdown/parser/html.rb --- old/lib/kramdown/parser/html.rb 2016-03-02 18:45:04.000000000 +0100 +++ new/lib/kramdown/parser/html.rb 2016-05-01 22:18:00.000000000 +0200 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # #-- -# Copyright (C) 2009-2015 Thomas Leitner <[email protected]> +# Copyright (C) 2009-2016 Thomas Leitner <[email protected]> # # This file is part of kramdown which is licensed under the MIT. #++ @@ -59,6 +59,12 @@ figcaption footer form h1 h2 h3 h4 h5 h6 header hgroup hr html head iframe legend menu li map nav ol optgroup p pre section summary table tbody td th thead tfoot tr ul} HTML_ELEMENTS_WITHOUT_BODY = %w{area base br col command embed hr img input keygen link meta param source track wbr} + + HTML_ELEMENT = Hash.new(false) + (HTML_SPAN_ELEMENTS + HTML_BLOCK_ELEMENTS + HTML_ELEMENTS_WITHOUT_BODY + + HTML_CONTENT_MODEL.keys).each do |a| + HTML_ELEMENT[a] = true + end end @@ -77,9 +83,10 @@ # element is already closed, ie. contains no body; the third parameter specifies whether the # body - and the end tag - need to be handled in case closed=false). def handle_html_start_tag(line = nil) # :yields: el, closed, handle_body - name = @src[1].downcase + name = @src[1] + name.downcase! if HTML_ELEMENT[name.downcase] closed = !@src[4].nil? - attrs = parse_html_attributes(@src[2], line) + attrs = parse_html_attributes(@src[2], line, HTML_ELEMENT[name]) el = Element.new(:html_element, name, attrs, :category => :block) el.options[:location] = line if line @@ -99,10 +106,13 @@ # Parses the given string for HTML attributes and returns the resulting hash. # # If the optional +line+ parameter is supplied, it is used in warning messages. - def parse_html_attributes(str, line = nil) + # + # If the optional +in_html_tag+ parameter is set to +false+, attributes are not modified to + # contain only lowercase letters. + def parse_html_attributes(str, line = nil, in_html_tag = true) attrs = Utils::OrderedHash.new str.scan(HTML_ATTRIBUTE_RE).each do |attr, sep, val| - attr.downcase! + attr.downcase! if in_html_tag if attrs.has_key?(attr) warning("Duplicate HTML attribute '#{attr}' on line #{line || '?'} - overwriting previous one") end @@ -155,10 +165,11 @@ handle_html_start_tag(&block) # DEPRECATED: method needs to accept line number in 2.0 end elsif @src.scan(HTML_TAG_CLOSE_RE) - if @tree.value == @src[1].downcase + if @tree.value == (HTML_ELEMENT[@tree.value] ? @src[1].downcase : @src[1]) done = true else - warning("Found invalidly used HTML closing tag for '#{@src[1].downcase}' on line #{line} - ignoring it") + add_text(@src.matched, @tree, :text) + warning("Found invalidly used HTML closing tag for '#{@src[1]}' on line #{line} - ignoring it") end else add_text(@src.getch, @tree, :text) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/kramdown/parser/kramdown/abbreviation.rb new/lib/kramdown/parser/kramdown/abbreviation.rb --- old/lib/kramdown/parser/kramdown/abbreviation.rb 2016-03-02 18:45:04.000000000 +0100 +++ new/lib/kramdown/parser/kramdown/abbreviation.rb 2016-05-01 22:18:00.000000000 +0200 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # #-- -# Copyright (C) 2009-2015 Thomas Leitner <[email protected]> +# Copyright (C) 2009-2016 Thomas Leitner <[email protected]> # # This file is part of kramdown which is licensed under the MIT. #++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/kramdown/parser/kramdown/autolink.rb new/lib/kramdown/parser/kramdown/autolink.rb --- old/lib/kramdown/parser/kramdown/autolink.rb 2016-03-02 18:45:04.000000000 +0100 +++ new/lib/kramdown/parser/kramdown/autolink.rb 2016-05-01 22:18:00.000000000 +0200 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # #-- -# Copyright (C) 2009-2015 Thomas Leitner <[email protected]> +# Copyright (C) 2009-2016 Thomas Leitner <[email protected]> # # This file is part of kramdown which is licensed under the MIT. #++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/kramdown/parser/kramdown/blank_line.rb new/lib/kramdown/parser/kramdown/blank_line.rb --- old/lib/kramdown/parser/kramdown/blank_line.rb 2016-03-02 18:45:04.000000000 +0100 +++ new/lib/kramdown/parser/kramdown/blank_line.rb 2016-05-01 22:18:00.000000000 +0200 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # #-- -# Copyright (C) 2009-2015 Thomas Leitner <[email protected]> +# Copyright (C) 2009-2016 Thomas Leitner <[email protected]> # # This file is part of kramdown which is licensed under the MIT. #++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/kramdown/parser/kramdown/block_boundary.rb new/lib/kramdown/parser/kramdown/block_boundary.rb --- old/lib/kramdown/parser/kramdown/block_boundary.rb 2016-03-02 18:45:04.000000000 +0100 +++ new/lib/kramdown/parser/kramdown/block_boundary.rb 2016-05-01 22:18:00.000000000 +0200 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # #-- -# Copyright (C) 2009-2015 Thomas Leitner <[email protected]> +# Copyright (C) 2009-2016 Thomas Leitner <[email protected]> # # This file is part of kramdown which is licensed under the MIT. #++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/kramdown/parser/kramdown/blockquote.rb new/lib/kramdown/parser/kramdown/blockquote.rb --- old/lib/kramdown/parser/kramdown/blockquote.rb 2016-03-02 18:45:04.000000000 +0100 +++ new/lib/kramdown/parser/kramdown/blockquote.rb 2016-05-01 22:18:00.000000000 +0200 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # #-- -# Copyright (C) 2009-2015 Thomas Leitner <[email protected]> +# Copyright (C) 2009-2016 Thomas Leitner <[email protected]> # # This file is part of kramdown which is licensed under the MIT. #++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/kramdown/parser/kramdown/codeblock.rb new/lib/kramdown/parser/kramdown/codeblock.rb --- old/lib/kramdown/parser/kramdown/codeblock.rb 2016-03-02 18:45:04.000000000 +0100 +++ new/lib/kramdown/parser/kramdown/codeblock.rb 2016-05-01 22:18:00.000000000 +0200 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # #-- -# Copyright (C) 2009-2015 Thomas Leitner <[email protected]> +# Copyright (C) 2009-2016 Thomas Leitner <[email protected]> # # This file is part of kramdown which is licensed under the MIT. #++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/kramdown/parser/kramdown/codespan.rb new/lib/kramdown/parser/kramdown/codespan.rb --- old/lib/kramdown/parser/kramdown/codespan.rb 2016-03-02 18:45:04.000000000 +0100 +++ new/lib/kramdown/parser/kramdown/codespan.rb 2016-05-01 22:18:00.000000000 +0200 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # #-- -# Copyright (C) 2009-2015 Thomas Leitner <[email protected]> +# Copyright (C) 2009-2016 Thomas Leitner <[email protected]> # # This file is part of kramdown which is licensed under the MIT. #++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/kramdown/parser/kramdown/emphasis.rb new/lib/kramdown/parser/kramdown/emphasis.rb --- old/lib/kramdown/parser/kramdown/emphasis.rb 2016-03-02 18:45:04.000000000 +0100 +++ new/lib/kramdown/parser/kramdown/emphasis.rb 2016-05-01 22:18:00.000000000 +0200 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # #-- -# Copyright (C) 2009-2015 Thomas Leitner <[email protected]> +# Copyright (C) 2009-2016 Thomas Leitner <[email protected]> # # This file is part of kramdown which is licensed under the MIT. #++ @@ -22,7 +22,7 @@ element = (result.length == 2 ? :strong : :em) type = result[0..0] - if (type == '_' && @src.pre_match =~ /[[:alnum:]]\z/) || @src.check(/\s/) || + if (type == '_' && @src.pre_match =~ /[[:alpha:]-]\z/) || @src.check(/\s/) || @tree.type == element || @stack.any? {|el, _| el.type == element} add_text(result) return diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/kramdown/parser/kramdown/eob.rb new/lib/kramdown/parser/kramdown/eob.rb --- old/lib/kramdown/parser/kramdown/eob.rb 2016-03-02 18:45:04.000000000 +0100 +++ new/lib/kramdown/parser/kramdown/eob.rb 2016-05-01 22:18:00.000000000 +0200 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # #-- -# Copyright (C) 2009-2015 Thomas Leitner <[email protected]> +# Copyright (C) 2009-2016 Thomas Leitner <[email protected]> # # This file is part of kramdown which is licensed under the MIT. #++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/kramdown/parser/kramdown/escaped_chars.rb new/lib/kramdown/parser/kramdown/escaped_chars.rb --- old/lib/kramdown/parser/kramdown/escaped_chars.rb 2016-03-02 18:45:04.000000000 +0100 +++ new/lib/kramdown/parser/kramdown/escaped_chars.rb 2016-05-01 22:18:00.000000000 +0200 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # #-- -# Copyright (C) 2009-2015 Thomas Leitner <[email protected]> +# Copyright (C) 2009-2016 Thomas Leitner <[email protected]> # # This file is part of kramdown which is licensed under the MIT. #++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/kramdown/parser/kramdown/extensions.rb new/lib/kramdown/parser/kramdown/extensions.rb --- old/lib/kramdown/parser/kramdown/extensions.rb 2016-03-02 18:45:04.000000000 +0100 +++ new/lib/kramdown/parser/kramdown/extensions.rb 2016-05-01 22:18:00.000000000 +0200 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # #-- -# Copyright (C) 2009-2015 Thomas Leitner <[email protected]> +# Copyright (C) 2009-2016 Thomas Leitner <[email protected]> # # This file is part of kramdown which is licensed under the MIT. #++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/kramdown/parser/kramdown/footnote.rb new/lib/kramdown/parser/kramdown/footnote.rb --- old/lib/kramdown/parser/kramdown/footnote.rb 2016-03-02 18:45:04.000000000 +0100 +++ new/lib/kramdown/parser/kramdown/footnote.rb 2016-05-01 22:18:00.000000000 +0200 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # #-- -# Copyright (C) 2009-2015 Thomas Leitner <[email protected]> +# Copyright (C) 2009-2016 Thomas Leitner <[email protected]> # # This file is part of kramdown which is licensed under the MIT. #++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/kramdown/parser/kramdown/header.rb new/lib/kramdown/parser/kramdown/header.rb --- old/lib/kramdown/parser/kramdown/header.rb 2016-03-02 18:45:04.000000000 +0100 +++ new/lib/kramdown/parser/kramdown/header.rb 2016-05-01 22:18:00.000000000 +0200 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # #-- -# Copyright (C) 2009-2015 Thomas Leitner <[email protected]> +# Copyright (C) 2009-2016 Thomas Leitner <[email protected]> # # This file is part of kramdown which is licensed under the MIT. #++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/kramdown/parser/kramdown/horizontal_rule.rb new/lib/kramdown/parser/kramdown/horizontal_rule.rb --- old/lib/kramdown/parser/kramdown/horizontal_rule.rb 2016-03-02 18:45:04.000000000 +0100 +++ new/lib/kramdown/parser/kramdown/horizontal_rule.rb 2016-05-01 22:18:00.000000000 +0200 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # #-- -# Copyright (C) 2009-2015 Thomas Leitner <[email protected]> +# Copyright (C) 2009-2016 Thomas Leitner <[email protected]> # # This file is part of kramdown which is licensed under the MIT. #++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/kramdown/parser/kramdown/html.rb new/lib/kramdown/parser/kramdown/html.rb --- old/lib/kramdown/parser/kramdown/html.rb 2016-03-02 18:45:04.000000000 +0100 +++ new/lib/kramdown/parser/kramdown/html.rb 2016-05-01 22:18:00.000000000 +0200 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # #-- -# Copyright (C) 2009-2015 Thomas Leitner <[email protected]> +# Copyright (C) 2009-2016 Thomas Leitner <[email protected]> # # This file is part of kramdown which is licensed under the MIT. #++ @@ -113,14 +113,15 @@ warning("Found invalidly used HTML closing tag for '#{@src[1]}' on line #{line}") add_text(result) elsif result = @src.scan(HTML_TAG_RE) - tag_name = @src[1].downcase + tag_name = @src[1] + tag_name.downcase! if HTML_ELEMENT[tag_name.downcase] if HTML_BLOCK_ELEMENTS.include?(tag_name) warning("Found block HTML tag '#{tag_name}' in span-level text on line #{line}") add_text(result) return end - attrs = parse_html_attributes(@src[2], line) + attrs = parse_html_attributes(@src[2], line, HTML_ELEMENT[tag_name]) attrs.each {|name, value| value.gsub!(/\n+/, ' ')} do_parsing = (HTML_CONTENT_MODEL[tag_name] == :raw || @tree.options[:content_model] == :raw ? false : @options[:parse_span_html]) @@ -139,7 +140,8 @@ el = Element.new(:html_element, tag_name, attrs, :category => :span, :location => line, :content_model => (do_parsing ? :span : :raw), :is_closed => !!@src[4]) @tree.children << el - stop_re = /<\/#{Regexp.escape(tag_name)}\s*>/i + stop_re = /<\/#{Regexp.escape(tag_name)}\s*>/ + stop_re = Regexp.new(stop_re.source, Regexp::IGNORECASE) if HTML_ELEMENT[tag_name] if !@src[4] && !HTML_ELEMENTS_WITHOUT_BODY.include?(el.value) if parse_spans(el, stop_re, (do_parsing ? nil : [:span_html])) @src.scan(stop_re) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/kramdown/parser/kramdown/html_entity.rb new/lib/kramdown/parser/kramdown/html_entity.rb --- old/lib/kramdown/parser/kramdown/html_entity.rb 2016-03-02 18:45:04.000000000 +0100 +++ new/lib/kramdown/parser/kramdown/html_entity.rb 2016-05-01 22:18:00.000000000 +0200 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # #-- -# Copyright (C) 2009-2015 Thomas Leitner <[email protected]> +# Copyright (C) 2009-2016 Thomas Leitner <[email protected]> # # This file is part of kramdown which is licensed under the MIT. #++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/kramdown/parser/kramdown/line_break.rb new/lib/kramdown/parser/kramdown/line_break.rb --- old/lib/kramdown/parser/kramdown/line_break.rb 2016-03-02 18:45:04.000000000 +0100 +++ new/lib/kramdown/parser/kramdown/line_break.rb 2016-05-01 22:18:00.000000000 +0200 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # #-- -# Copyright (C) 2009-2015 Thomas Leitner <[email protected]> +# Copyright (C) 2009-2016 Thomas Leitner <[email protected]> # # This file is part of kramdown which is licensed under the MIT. #++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/kramdown/parser/kramdown/link.rb new/lib/kramdown/parser/kramdown/link.rb --- old/lib/kramdown/parser/kramdown/link.rb 2016-03-02 18:45:04.000000000 +0100 +++ new/lib/kramdown/parser/kramdown/link.rb 2016-05-01 22:18:00.000000000 +0200 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # #-- -# Copyright (C) 2009-2015 Thomas Leitner <[email protected]> +# Copyright (C) 2009-2016 Thomas Leitner <[email protected]> # # This file is part of kramdown which is licensed under the MIT. #++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/kramdown/parser/kramdown/list.rb new/lib/kramdown/parser/kramdown/list.rb --- old/lib/kramdown/parser/kramdown/list.rb 2016-03-02 18:45:04.000000000 +0100 +++ new/lib/kramdown/parser/kramdown/list.rb 2016-05-01 22:18:00.000000000 +0200 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # #-- -# Copyright (C) 2009-2015 Thomas Leitner <[email protected]> +# Copyright (C) 2009-2016 Thomas Leitner <[email protected]> # # This file is part of kramdown which is licensed under the MIT. #++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/kramdown/parser/kramdown/math.rb new/lib/kramdown/parser/kramdown/math.rb --- old/lib/kramdown/parser/kramdown/math.rb 2016-03-02 18:45:04.000000000 +0100 +++ new/lib/kramdown/parser/kramdown/math.rb 2016-05-01 22:18:00.000000000 +0200 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # #-- -# Copyright (C) 2009-2015 Thomas Leitner <[email protected]> +# Copyright (C) 2009-2016 Thomas Leitner <[email protected]> # # This file is part of kramdown which is licensed under the MIT. #++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/kramdown/parser/kramdown/paragraph.rb new/lib/kramdown/parser/kramdown/paragraph.rb --- old/lib/kramdown/parser/kramdown/paragraph.rb 2016-03-02 18:45:04.000000000 +0100 +++ new/lib/kramdown/parser/kramdown/paragraph.rb 2016-05-01 22:18:00.000000000 +0200 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # #-- -# Copyright (C) 2009-2015 Thomas Leitner <[email protected]> +# Copyright (C) 2009-2016 Thomas Leitner <[email protected]> # # This file is part of kramdown which is licensed under the MIT. #++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/kramdown/parser/kramdown/smart_quotes.rb new/lib/kramdown/parser/kramdown/smart_quotes.rb --- old/lib/kramdown/parser/kramdown/smart_quotes.rb 2016-03-02 18:45:04.000000000 +0100 +++ new/lib/kramdown/parser/kramdown/smart_quotes.rb 2016-05-01 22:18:00.000000000 +0200 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # #-- -# Copyright (C) 2009-2015 Thomas Leitner <[email protected]> +# Copyright (C) 2009-2016 Thomas Leitner <[email protected]> # # This file is part of kramdown which is licensed under the MIT. #++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/kramdown/parser/kramdown/table.rb new/lib/kramdown/parser/kramdown/table.rb --- old/lib/kramdown/parser/kramdown/table.rb 2016-03-02 18:45:04.000000000 +0100 +++ new/lib/kramdown/parser/kramdown/table.rb 2016-05-01 22:18:00.000000000 +0200 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # #-- -# Copyright (C) 2009-2015 Thomas Leitner <[email protected]> +# Copyright (C) 2009-2016 Thomas Leitner <[email protected]> # # This file is part of kramdown which is licensed under the MIT. #++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/kramdown/parser/kramdown/typographic_symbol.rb new/lib/kramdown/parser/kramdown/typographic_symbol.rb --- old/lib/kramdown/parser/kramdown/typographic_symbol.rb 2016-03-02 18:45:04.000000000 +0100 +++ new/lib/kramdown/parser/kramdown/typographic_symbol.rb 2016-05-01 22:18:00.000000000 +0200 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # #-- -# Copyright (C) 2009-2015 Thomas Leitner <[email protected]> +# Copyright (C) 2009-2016 Thomas Leitner <[email protected]> # # This file is part of kramdown which is licensed under the MIT. #++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/kramdown/parser/kramdown.rb new/lib/kramdown/parser/kramdown.rb --- old/lib/kramdown/parser/kramdown.rb 2016-03-02 18:45:04.000000000 +0100 +++ new/lib/kramdown/parser/kramdown.rb 2016-05-01 22:18:00.000000000 +0200 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # #-- -# Copyright (C) 2009-2015 Thomas Leitner <[email protected]> +# Copyright (C) 2009-2016 Thomas Leitner <[email protected]> # # This file is part of kramdown which is licensed under the MIT. #++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/kramdown/parser/markdown.rb new/lib/kramdown/parser/markdown.rb --- old/lib/kramdown/parser/markdown.rb 2016-03-02 18:45:04.000000000 +0100 +++ new/lib/kramdown/parser/markdown.rb 2016-05-01 22:18:00.000000000 +0200 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # #-- -# Copyright (C) 2009-2015 Thomas Leitner <[email protected]> +# Copyright (C) 2009-2016 Thomas Leitner <[email protected]> # # This file is part of kramdown which is licensed under the MIT. #++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/kramdown/parser.rb new/lib/kramdown/parser.rb --- old/lib/kramdown/parser.rb 2016-03-02 18:45:04.000000000 +0100 +++ new/lib/kramdown/parser.rb 2016-05-01 22:18:00.000000000 +0200 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # #-- -# Copyright (C) 2009-2015 Thomas Leitner <[email protected]> +# Copyright (C) 2009-2016 Thomas Leitner <[email protected]> # # This file is part of kramdown which is licensed under the MIT. #++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/kramdown/utils/configurable.rb new/lib/kramdown/utils/configurable.rb --- old/lib/kramdown/utils/configurable.rb 2016-03-02 18:45:04.000000000 +0100 +++ new/lib/kramdown/utils/configurable.rb 2016-05-01 22:18:00.000000000 +0200 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # #-- -# Copyright (C) 2009-2015 Thomas Leitner <[email protected]> +# Copyright (C) 2009-2016 Thomas Leitner <[email protected]> # # This file is part of kramdown which is licensed under the MIT. #++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/kramdown/utils/entities.rb new/lib/kramdown/utils/entities.rb --- old/lib/kramdown/utils/entities.rb 2016-03-02 18:45:04.000000000 +0100 +++ new/lib/kramdown/utils/entities.rb 2016-05-01 22:18:00.000000000 +0200 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # #-- -# Copyright (C) 2009-2015 Thomas Leitner <[email protected]> +# Copyright (C) 2009-2016 Thomas Leitner <[email protected]> # # This file is part of kramdown which is licensed under the MIT. #++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/kramdown/utils/html.rb new/lib/kramdown/utils/html.rb --- old/lib/kramdown/utils/html.rb 2016-03-02 18:45:04.000000000 +0100 +++ new/lib/kramdown/utils/html.rb 2016-05-01 22:18:00.000000000 +0200 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # #-- -# Copyright (C) 2009-2015 Thomas Leitner <[email protected]> +# Copyright (C) 2009-2016 Thomas Leitner <[email protected]> # # This file is part of kramdown which is licensed under the MIT. #++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/kramdown/utils/ordered_hash.rb new/lib/kramdown/utils/ordered_hash.rb --- old/lib/kramdown/utils/ordered_hash.rb 2016-03-02 18:45:04.000000000 +0100 +++ new/lib/kramdown/utils/ordered_hash.rb 2016-05-01 22:18:00.000000000 +0200 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # #-- -# Copyright (C) 2009-2015 Thomas Leitner <[email protected]> +# Copyright (C) 2009-2016 Thomas Leitner <[email protected]> # # This file is part of kramdown which is licensed under the MIT. #++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/kramdown/utils/string_scanner.rb new/lib/kramdown/utils/string_scanner.rb --- old/lib/kramdown/utils/string_scanner.rb 2016-03-02 18:45:04.000000000 +0100 +++ new/lib/kramdown/utils/string_scanner.rb 2016-05-01 22:18:00.000000000 +0200 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # #-- -# Copyright (C) 2009-2015 Thomas Leitner <[email protected]> +# Copyright (C) 2009-2016 Thomas Leitner <[email protected]> # # This file is part of kramdown which is licensed under the MIT. #++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/kramdown/utils/unidecoder.rb new/lib/kramdown/utils/unidecoder.rb --- old/lib/kramdown/utils/unidecoder.rb 2016-03-02 18:45:04.000000000 +0100 +++ new/lib/kramdown/utils/unidecoder.rb 2016-05-01 22:18:00.000000000 +0200 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # #-- -# Copyright (C) 2009-2015 Thomas Leitner <[email protected]> +# Copyright (C) 2009-2016 Thomas Leitner <[email protected]> # # This file is part of kramdown which is licensed under the MIT. #++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/kramdown/utils.rb new/lib/kramdown/utils.rb --- old/lib/kramdown/utils.rb 2016-03-02 18:45:04.000000000 +0100 +++ new/lib/kramdown/utils.rb 2016-05-01 22:18:00.000000000 +0200 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # #-- -# Copyright (C) 2009-2015 Thomas Leitner <[email protected]> +# Copyright (C) 2009-2016 Thomas Leitner <[email protected]> # # This file is part of kramdown which is licensed under the MIT. #++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/kramdown/version.rb new/lib/kramdown/version.rb --- old/lib/kramdown/version.rb 2016-03-02 18:45:04.000000000 +0100 +++ new/lib/kramdown/version.rb 2016-05-01 22:18:00.000000000 +0200 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # #-- -# Copyright (C) 2009-2015 Thomas Leitner <[email protected]> +# Copyright (C) 2009-2016 Thomas Leitner <[email protected]> # # This file is part of kramdown which is licensed under the MIT. #++ @@ -10,6 +10,6 @@ module Kramdown # The kramdown version. - VERSION = '1.10.0' + VERSION = '1.11.1' end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/kramdown.rb new/lib/kramdown.rb --- old/lib/kramdown.rb 2016-03-02 18:45:04.000000000 +0100 +++ new/lib/kramdown.rb 2016-05-01 22:18:00.000000000 +0200 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # #-- -# Copyright (C) 2009-2015 Thomas Leitner <[email protected]> +# Copyright (C) 2009-2016 Thomas Leitner <[email protected]> # # This file is part of kramdown which is licensed under the MIT. #++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/metadata new/metadata --- old/metadata 2016-03-02 18:45:04.000000000 +0100 +++ new/metadata 2016-05-01 22:18:00.000000000 +0200 @@ -1,14 +1,14 @@ --- !ruby/object:Gem::Specification name: kramdown version: !ruby/object:Gem::Version - version: 1.10.0 + version: 1.11.1 platform: ruby authors: - Thomas Leitner autorequire: bindir: bin cert_chain: [] -date: 2016-03-02 00:00:00.000000000 Z +date: 2016-05-01 00:00:00.000000000 Z dependencies: - !ruby/object:Gem::Dependency name: minitest @@ -81,6 +81,20 @@ - !ruby/object:Gem::Version version: '2.0' - !ruby/object:Gem::Dependency + name: prawn-table + requirement: !ruby/object:Gem::Requirement + requirements: + - - "~>" + - !ruby/object:Gem::Version + version: 0.2.2 + type: :development + prerelease: false + version_requirements: !ruby/object:Gem::Requirement + requirements: + - - "~>" + - !ruby/object:Gem::Version + version: 0.2.2 +- !ruby/object:Gem::Dependency name: ritex requirement: !ruby/object:Gem::Requirement requirements: @@ -428,6 +442,8 @@ - test/testcases/block/09_html/simple.text - test/testcases/block/09_html/textarea.html - test/testcases/block/09_html/textarea.text +- test/testcases/block/09_html/xml.html +- test/testcases/block/09_html/xml.text - test/testcases/block/10_ald/simple.html - test/testcases/block/10_ald/simple.text - test/testcases/block/11_ial/auto_id_and_ial.html @@ -555,6 +571,7 @@ - test/testcases/span/02_emphasis/nesting.html - test/testcases/span/02_emphasis/nesting.text - test/testcases/span/02_emphasis/normal.html +- test/testcases/span/02_emphasis/normal.options - test/testcases/span/02_emphasis/normal.text - test/testcases/span/03_codespan/empty.html - test/testcases/span/03_codespan/empty.text @@ -611,6 +628,8 @@ - test/testcases/span/05_html/normal.text - test/testcases/span/05_html/raw_span_elements.html - test/testcases/span/05_html/raw_span_elements.text +- test/testcases/span/05_html/xml.html +- test/testcases/span/05_html/xml.text - test/testcases/span/abbreviations/abbrev.html - test/testcases/span/abbreviations/abbrev.text - test/testcases/span/abbreviations/abbrev_defs.html diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/run_tests.rb new/test/run_tests.rb --- old/test/run_tests.rb 2016-03-02 18:45:04.000000000 +0100 +++ new/test/run_tests.rb 2016-05-01 22:18:00.000000000 +0200 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # #-- -# Copyright (C) 2009-2015 Thomas Leitner <[email protected]> +# Copyright (C) 2009-2016 Thomas Leitner <[email protected]> # # This file is part of kramdown which is licensed under the MIT. #++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/test_files.rb new/test/test_files.rb --- old/test/test_files.rb 2016-03-02 18:45:04.000000000 +0100 +++ new/test/test_files.rb 2016-05-01 22:18:00.000000000 +0200 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # #-- -# Copyright (C) 2009-2015 Thomas Leitner <[email protected]> +# Copyright (C) 2009-2016 Thomas Leitner <[email protected]> # # This file is part of kramdown which is licensed under the MIT. #++ @@ -65,6 +65,8 @@ 'test/testcases/block/15_math/mathjax_preview.html', # bc of mathjax preview 'test/testcases/block/15_math/mathjax_preview_simple.html', # bc of mathjax preview 'test/testcases/span/05_html/mark_element.html', # bc of tidy + 'test/testcases/block/09_html/xml.html', # bc of tidy + 'test/testcases/span/05_html/xml.html', # bc of tidy ].compact EXCLUDE_HTML_TEXT_FILES = ['test/testcases/block/09_html/parse_as_span.htmlinput', 'test/testcases/block/09_html/parse_as_raw.htmlinput', @@ -169,6 +171,8 @@ 'test/testcases/span/math/mathjaxnode.text', # bc of tidy 'test/testcases/span/01_link/link_defs_with_ial.text', # bc of attribute ordering 'test/testcases/span/05_html/mark_element.text', # bc of tidy + 'test/testcases/block/09_html/xml.text', # bc of tidy + 'test/testcases/span/05_html/xml.text', # bc of tidy ].compact Dir[File.dirname(__FILE__) + '/testcases/**/*.text'].each do |text_file| next if EXCLUDE_TEXT_FILES.any? {|f| text_file =~ /#{f}$/} @@ -219,6 +223,8 @@ 'test/testcases/block/15_math/mathjax_preview_simple.html', # bc of mathjax preview 'test/testcases/span/01_link/link_defs_with_ial.html', # bc of attribute ordering 'test/testcases/span/05_html/mark_element.html', # bc of tidy + 'test/testcases/block/09_html/xml.html', # bc of tidy + 'test/testcases/span/05_html/xml.html', # bc of tidy ].compact Dir[File.dirname(__FILE__) + '/testcases/**/*.{html,html.19}'].each do |html_file| next if EXCLUDE_HTML_KD_FILES.any? {|f| html_file =~ /#{f}(\.19)?$/} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/test_location.rb new/test/test_location.rb --- old/test/test_location.rb 2016-03-02 18:45:04.000000000 +0100 +++ new/test/test_location.rb 2016-05-01 22:18:00.000000000 +0200 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # #-- -# Copyright (C) 2009-2015 Thomas Leitner <[email protected]> +# Copyright (C) 2009-2016 Thomas Leitner <[email protected]> # # This file is part of kramdown which is licensed under the MIT. #++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/test_string_scanner_kramdown.rb new/test/test_string_scanner_kramdown.rb --- old/test/test_string_scanner_kramdown.rb 2016-03-02 18:45:04.000000000 +0100 +++ new/test/test_string_scanner_kramdown.rb 2016-05-01 22:18:00.000000000 +0200 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # #-- -# Copyright (C) 2009-2015 Thomas Leitner <[email protected]> +# Copyright (C) 2009-2016 Thomas Leitner <[email protected]> # # This file is part of kramdown which is licensed under the MIT. #++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/testcases/block/06_codeblock/highlighting-opts.html new/test/testcases/block/06_codeblock/highlighting-opts.html --- old/test/testcases/block/06_codeblock/highlighting-opts.html 2016-03-02 18:45:04.000000000 +0100 +++ new/test/testcases/block/06_codeblock/highlighting-opts.html 2016-05-01 22:18:00.000000000 +0200 @@ -1,6 +1,6 @@ -<div class="highlighter-coderay"><span class="CodeRay">x = <span class="constant">Class</span>.new +<div class="language-ruby highlighter-coderay"><span class="CodeRay">x = <span class="constant">Class</span>.new </span> </div> -<div class="highlighter-coderay"><span class="CodeRay"><span class="tag"><a></span>href<span class="tag"></a></span> +<div class="language-html highlighter-coderay"><span class="CodeRay"><span class="tag"><a></span>href<span class="tag"></a></span> </span> </div> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/testcases/block/06_codeblock/highlighting.html new/test/testcases/block/06_codeblock/highlighting.html --- old/test/testcases/block/06_codeblock/highlighting.html 2016-03-02 18:45:04.000000000 +0100 +++ new/test/testcases/block/06_codeblock/highlighting.html 2016-05-01 22:18:00.000000000 +0200 @@ -1,6 +1,6 @@ -<div class="highlighter-coderay"><span class="CodeRay">x = <span class="constant">Class</span>.new +<div class="language-ruby highlighter-coderay"><span class="CodeRay">x = <span class="constant">Class</span>.new </span> </div> -<div class="highlighter-coderay"><span class="CodeRay"><span class="tag"><a></span>href<span class="tag"></a></span> +<div class="language-html highlighter-coderay"><span class="CodeRay"><span class="tag"><a></span>href<span class="tag"></a></span> </span> </div> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/testcases/block/06_codeblock/rouge/simple.html new/test/testcases/block/06_codeblock/rouge/simple.html --- old/test/testcases/block/06_codeblock/rouge/simple.html 2016-03-02 18:45:04.000000000 +0100 +++ new/test/testcases/block/06_codeblock/rouge/simple.html 2016-05-01 22:18:00.000000000 +0200 @@ -1,10 +1,10 @@ -<div class="highlighter-rouge"><pre class="highlight"><code><span class="n">x</span> <span class="o">=</span> <span class="no">Class</span><span class="p">.</span><span class="nf">new</span> +<div class="language-ruby highlighter-rouge"><pre class="highlight"><code><span class="n">x</span> <span class="o">=</span> <span class="no">Class</span><span class="p">.</span><span class="nf">new</span> </code></pre> </div> -<div class="highlighter-rouge"><pre class="highlight"><code><span class="nt"><a></span>href<span class="nt"></a></span> +<div class="language-html highlighter-rouge"><pre class="highlight"><code><span class="nt"><a></span>href<span class="nt"></a></span> </code></pre> </div> -<div class="highlighter-rouge"><pre class="highlight"><code><span class="nv">$foo</span> <span class="o">=</span> <span class="k">new</span> <span class="nx">Bar</span><span class="p">;</span> +<div class="language-php highlighter-rouge"><pre class="highlight"><code><span class="nv">$foo</span> <span class="o">=</span> <span class="k">new</span> <span class="nx">Bar</span><span class="p">;</span> </code></pre> </div> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/testcases/block/09_html/not_parsed.html new/test/testcases/block/09_html/not_parsed.html --- old/test/testcases/block/09_html/not_parsed.html 2016-03-02 18:45:04.000000000 +0100 +++ new/test/testcases/block/09_html/not_parsed.html 2016-05-01 22:18:00.000000000 +0200 @@ -7,7 +7,7 @@ </div></div> <div> - +</p> </div> <div> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/testcases/block/09_html/simple.html new/test/testcases/block/09_html/simple.html --- old/test/testcases/block/09_html/simple.html 2016-03-02 18:45:04.000000000 +0100 +++ new/test/testcases/block/09_html/simple.html 2016-05-01 22:18:00.000000000 +0200 @@ -49,10 +49,6 @@ <p>Another para.</p> </div> -<webgen:block name="test" /> - -<some:url name:spac="hallo">doit</some:url> - <p><em>Test</em></p> <p><em>Test</em></p> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/testcases/block/09_html/simple.html.19 new/test/testcases/block/09_html/simple.html.19 --- old/test/testcases/block/09_html/simple.html.19 2016-03-02 18:45:04.000000000 +0100 +++ new/test/testcases/block/09_html/simple.html.19 2016-05-01 22:18:00.000000000 +0200 @@ -49,10 +49,6 @@ <p>Another para.</p> </div> -<webgen:block name="test" /> - -<some:url name:spac="hallo">doit</some:url> - <p><em>Test</em></p> <p><em>Test</em></p> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/testcases/block/09_html/simple.text new/test/testcases/block/09_html/simple.text --- old/test/testcases/block/09_html/simple.text 2016-03-02 18:45:04.000000000 +0100 +++ new/test/testcases/block/09_html/simple.text 2016-05-01 22:18:00.000000000 +0200 @@ -40,14 +40,10 @@ para6 -<div><div cLASs="clear"></div> +<div><DiV cLASs="clear"></dIv> Another para. </div> -<webgen:block name="test" /> - -<some:url name:spac='hallo'>doit</some:url> - <em>Test</em> <p><em>Test</em></p> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/testcases/block/09_html/xml.html new/test/testcases/block/09_html/xml.html --- old/test/testcases/block/09_html/xml.html 1970-01-01 01:00:00.000000000 +0100 +++ new/test/testcases/block/09_html/xml.html 2016-05-01 22:18:00.000000000 +0200 @@ -0,0 +1,8 @@ +<webgen:block name="test" /> + +<some:url name:spac="hallo">doit</some:url> + +<SoMe:UrL NamE:SpAC="test">doit</SoMe:UrL> + +<SoMe>doit</some> +</SoMe> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/testcases/block/09_html/xml.text new/test/testcases/block/09_html/xml.text --- old/test/testcases/block/09_html/xml.text 1970-01-01 01:00:00.000000000 +0100 +++ new/test/testcases/block/09_html/xml.text 2016-05-01 22:18:00.000000000 +0200 @@ -0,0 +1,7 @@ +<webgen:block name="test" /> + +<some:url name:spac='hallo'>doit</some:url> + +<SoMe:UrL NamE:SpAC='test'>doit</SoMe:UrL> + +<SoMe>doit</some> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/testcases/block/12_extension/options3.html new/test/testcases/block/12_extension/options3.html --- old/test/testcases/block/12_extension/options3.html 2016-03-02 18:45:04.000000000 +0100 +++ new/test/testcases/block/12_extension/options3.html 2016-05-01 22:18:00.000000000 +0200 @@ -1,7 +1,7 @@ -<div class="highlighter-coderay"><span class="CodeRay">x = <span class="constant">Class</span>.new +<div class="language-ruby highlighter-coderay"><span class="CodeRay">x = <span class="constant">Class</span>.new </span> </div> -<div class="highlighter-coderay"><span class="CodeRay">x = <span class="constant">Class</span>.new +<div class="language-ruby highlighter-coderay"><span class="CodeRay">x = <span class="constant">Class</span>.new </span> </div> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/testcases/span/02_emphasis/normal.html new/test/testcases/span/02_emphasis/normal.html --- old/test/testcases/span/02_emphasis/normal.html 2016-03-02 18:45:04.000000000 +0100 +++ new/test/testcases/span/02_emphasis/normal.html 2016-05-01 22:18:00.000000000 +0200 @@ -46,3 +46,16 @@ Or that *<em>that*</em> way</p> <p><a href="http://blah.com/blah_%28";>http://blah.com/blah_%28</a></p> + +<p><a href="A_-B">A-_B</a></p> + +<ul> + <li><em>test</em></li> + <li>‘<em>test</em>’</li> + <li>“<em>test</em>”</li> + <li>(“<em>test</em>”)</li> + <li>(<em>test</em>)</li> + <li>“<em>test</em>”</li> + <li>`<em>test</em>’</li> + <li>„<em>test</em>“</li> +</ul> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/testcases/span/02_emphasis/normal.options new/test/testcases/span/02_emphasis/normal.options --- old/test/testcases/span/02_emphasis/normal.options 1970-01-01 01:00:00.000000000 +0100 +++ new/test/testcases/span/02_emphasis/normal.options 2016-05-01 22:18:00.000000000 +0200 @@ -0,0 +1 @@ +:entity_output: :numeric diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/testcases/span/02_emphasis/normal.text new/test/testcases/span/02_emphasis/normal.text --- old/test/testcases/span/02_emphasis/normal.text 2016-03-02 18:45:04.000000000 +0100 +++ new/test/testcases/span/02_emphasis/normal.text 2016-05-01 22:18:00.000000000 +0200 @@ -46,3 +46,14 @@ Or that \**that\** way [http://blah.com/blah_%28](http://blah.com/blah_%28) + +[A-_B](A_-B) + +- _test_ +- '_test_' +- "_test_" +- ("_test_") +- (_test_) +- “_test_” +- \`_test_' +- „_test_“ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/testcases/span/05_html/xml.html new/test/testcases/span/05_html/xml.html --- old/test/testcases/span/05_html/xml.html 1970-01-01 01:00:00.000000000 +0100 +++ new/test/testcases/span/05_html/xml.html 2016-05-01 22:18:00.000000000 +0200 @@ -0,0 +1,5 @@ +<p>This <some:url name:spac="hallo">doit</some:url> test</p> + +<p>This <SoMe:UrL NamE:SpAC="test">doit</SoMe:UrL> test</p> + +<p>This <SoMe>doit</some> test</SoMe></p> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/testcases/span/05_html/xml.text new/test/testcases/span/05_html/xml.text --- old/test/testcases/span/05_html/xml.text 1970-01-01 01:00:00.000000000 +0100 +++ new/test/testcases/span/05_html/xml.text 2016-05-01 22:18:00.000000000 +0200 @@ -0,0 +1,5 @@ +This <some:url name:spac='hallo'>doit</some:url> test + +This <SoMe:UrL NamE:SpAC='test'>doit</SoMe:UrL> test + +This <SoMe>doit</some> test diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/testcases_gfm/backticks_syntax.html new/test/testcases_gfm/backticks_syntax.html --- old/test/testcases_gfm/backticks_syntax.html 2016-03-02 18:45:04.000000000 +0100 +++ new/test/testcases_gfm/backticks_syntax.html 2016-05-01 22:18:00.000000000 +0200 @@ -7,13 +7,13 @@ <pre><code>Unbalanced bottom heavy </code></pre> -<div class="highlighter-coderay"><div class="CodeRay"> +<div class="language-ruby highlighter-coderay"><div class="CodeRay"> <div class="code"><pre><span class="line-numbers"><a href="#n1" name="n1">1</a></span>language no space </pre></div> </div> </div> -<div class="highlighter-coderay"><div class="CodeRay"> +<div class="language-ruby highlighter-coderay"><div class="CodeRay"> <div class="code"><pre><span class="line-numbers"><a href="#n1" name="n1">1</a></span>language with space </pre></div> </div>
