Hello community,
here is the log from the commit of package rubygem-kramdown for openSUSE:Factory checked in at 2015-10-06 13:26:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 2015-09-19 08:33:20.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.rubygem-kramdown.new/rubygem-kramdown.changes 2015-10-06 13:26:10.000000000 +0200
@@ -1,0 +2,6 @@
+Fri Oct 2 04:29:17 UTC 2015 - coolo@suse.com
+
+- updated to version 1.9.0
+ see installed news.feed
+
+-------------------------------------------------------------------
Old:
----
kramdown-1.8.0.gem
New:
----
kramdown-1.9.0.gem
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rubygem-kramdown.spec ++++++
--- /var/tmp/diff_new_pack.AhCvtq/_old 2015-10-06 13:26:10.000000000 +0200
+++ /var/tmp/diff_new_pack.AhCvtq/_new 2015-10-06 13:26:10.000000000 +0200
@@ -24,7 +24,7 @@
#
Name: rubygem-kramdown
-Version: 1.8.0
+Version: 1.9.0
Release: 0
%define mod_name kramdown
%define mod_full_name %{mod_name}-%{version}
++++++ kramdown-1.8.0.gem -> kramdown-1.9.0.gem ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CONTRIBUTERS new/CONTRIBUTERS
--- old/CONTRIBUTERS 2015-07-04 13:34:29.000000000 +0200
+++ new/CONTRIBUTERS 2015-10-01 21:41:43.000000000 +0200
@@ -1,6 +1,6 @@
Count Name
======= ====
- 772 Thomas Leitner
+ 781 Thomas Leitner
6 Gioele Barabucci
4 Ted Pak
4 Arne Brasseur
@@ -29,12 +29,14 @@
1 myqlarson
1 Michal Till
1 Matt Hickford
+ 1 Marek Tuchowski
1 Marcus Stollsteimer
1 Luca Barbato
1 l3kn
1 John Croisant
1 Joe Fiorini
1 Jens Kraemer
+ 1 Hector Correa
1 Floreal Morandat florealm@gmail.com
1 Damien Pollet
1 Alex Tomlins
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/README.md new/README.md
--- old/README.md 2015-07-04 13:34:29.000000000 +0200
+++ new/README.md 2015-10-01 21:41:43.000000000 +0200
@@ -34,6 +34,9 @@
in the version number where the major number changes on backwards-incompatible changes, the minor
number on the introduction of new features and the patch number on everything else.
+For information about changes between versions, have a look at
+http://kramdown.gettalong.org/news.html or the commit history!
+
## Usage
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Rakefile new/Rakefile
--- old/Rakefile 2015-07-04 13:34:29.000000000 +0200
+++ new/Rakefile 2015-10-01 21:41:43.000000000 +0200
@@ -75,7 +75,7 @@
if defined?(Webgen)
desc "Generate the HTML documentation"
task :htmldoc do
- ruby "-Ilib -S webgen"
+ ruby "-S webgen"
end
CLOBBER << "htmldoc/"
CLOBBER << "webgen-tmp"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/VERSION new/VERSION
--- old/VERSION 2015-07-04 13:34:29.000000000 +0200
+++ new/VERSION 2015-10-01 21:41:43.000000000 +0200
@@ -1 +1 @@
-1.8.0
+1.9.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/benchmark/testing.sh new/benchmark/testing.sh
--- old/benchmark/testing.sh 2015-07-04 13:34:29.000000000 +0200
+++ new/benchmark/testing.sh 2015-10-01 21:41:43.000000000 +0200
@@ -1,6 +1,6 @@
#!/bin/bash
-source ~/.bashrc
+source ~/.profile
COMMAND="$@"
if [[ -z "$COMMAND" ]]; then COMMAND="rake test"; fi
Files old/checksums.yaml.gz and new/checksums.yaml.gz differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/index.page new/doc/index.page
--- old/doc/index.page 2015-07-04 13:34:29.000000000 +0200
+++ new/doc/index.page 2015-10-01 21:41:44.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.8.0**{:itemprop="softwareVersion"} released on
-**2015-07-04**{:itemprop="datePublished"}, [more news](news.html)
+Version **1.9.0**{:itemprop="softwareVersion"} released on
+**2015-10-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/lib/kramdown/converter/hash_ast.rb new/lib/kramdown/converter/hash_ast.rb
--- old/lib/kramdown/converter/hash_ast.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/lib/kramdown/converter/hash_ast.rb 2015-10-01 21:41:44.000000000 +0200
@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+#
+#--
+# Copyright (C) 2009-2015 Thomas Leitner
+#
+# This file is part of kramdown which is licensed under the MIT.
+#++
+#
+
+require 'kramdown/parser'
+require 'kramdown/converter'
+require 'kramdown/utils'
+
+module Kramdown
+
+ module Converter
+
+ # Converts a Kramdown::Document to a nested hash for further processing or debug output.
+ class HashAST < Base
+
+ def convert(el)
+ hash = {:type => el.type}
+ hash[:attr] = el.attr unless el.attr.empty?
+ hash[:value] = el.value unless el.value.nil?
+ hash[:options] = el.options unless el.options.empty?
+ unless el.children.empty?
+ hash[:children] = []
+ el.children.each {|child| hash[:children] << convert(child)}
+ end
+ hash
+ end
+
+ end
+
+ end
+end
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 2015-07-04 13:34:29.000000000 +0200
+++ new/lib/kramdown/converter/html.rb 2015-10-01 21:41:44.000000000 +0200
@@ -444,9 +444,11 @@
insert_space = false
end
- para.children << Element.new(:raw, FOOTNOTE_BACKLINK_FMT % [insert_space ? ' ' : '', name, backlink_text])
- (1..repeat).each do |index|
- para.children << Element.new(:raw, FOOTNOTE_BACKLINK_FMT % [" ", "#{name}:#{index}", "#{backlink_text}<sup>#{index+1}</sup>"])
+ unless @options[:footnote_backlink].empty?
+ para.children << Element.new(:raw, FOOTNOTE_BACKLINK_FMT % [insert_space ? ' ' : '', name, backlink_text])
+ (1..repeat).each do |index|
+ para.children << Element.new(:raw, FOOTNOTE_BACKLINK_FMT % [" ", "#{name}:#{index}", "#{backlink_text}<sup>#{index+1}</sup>"])
+ end
end
ol.children << Element.new(:raw, convert(li, 4))
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 2015-07-04 13:34:29.000000000 +0200
+++ new/lib/kramdown/converter/syntax_highlighter/rouge.rb 2015-10-01 21:41:44.000000000 +0200
@@ -22,16 +22,37 @@
end
def self.call(converter, text, lang, type, _unused_opts)
- opts = converter.options[:syntax_highlighter_opts].dup
+ opts = options(converter, type)
lexer = ::Rouge::Lexer.find_fancy(lang || opts[:default_lang], text)
- return nil unless lexer
-
- opts[:wrap] = false if type == :span
+ return nil if opts[:disable] || !lexer
formatter = (opts.delete(:formatter) || ::Rouge::Formatters::HTML).new(opts)
formatter.format(lexer.lex(text))
end
+ def self.options(converter, type)
+ prepare_options(converter)
+ converter.data[:syntax_highlighter_rouge][type]
+ end
+
+ def self.prepare_options(converter)
+ return if converter.data.key?(:syntax_highlighter_rouge)
+
+ cache = converter.data[:syntax_highlighter_rouge] = {}
+
+ opts = converter.options[:syntax_highlighter_opts].dup
+ span_opts = (opts.delete(:span) || {}).dup
+ block_opts = (opts.delete(:block) || {}).dup
+ [span_opts, block_opts].each do |hash|
+ hash.keys.each do |k|
+ hash[k.kind_of?(String) ? Kramdown::Options.str_to_sym(k) : k] = hash.delete(k)
+ end
+ end
+
+ cache[:span] = opts.merge(span_opts).update(:wrap => false)
+ cache[:block] = opts.merge(block_opts)
+ end
+
end
end
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 2015-07-04 13:34:29.000000000 +0200
+++ new/lib/kramdown/converter.rb 2015-10-01 21:41:44.000000000 +0200
@@ -26,6 +26,7 @@
autoload :Toc, 'kramdown/converter/toc'
autoload :RemoveHtmlTags, 'kramdown/converter/remove_html_tags'
autoload :Pdf, 'kramdown/converter/pdf'
+ autoload :HashAST, 'kramdown/converter/hash_ast'
extend ::Kramdown::Utils::Configurable
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 2015-07-04 13:34:29.000000000 +0200
+++ new/lib/kramdown/options.rb 2015-10-01 21:41:44.000000000 +0200
@@ -586,6 +586,9 @@
The footnote backlink is just text, so any special HTML characters will
be escaped.
+If the footnote backlint text is an empty string, no footnote backlinks
+will be generated.
+
Default: '&8617;'
Used by: HTML converter
EOF
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 2015-07-04 13:34:29.000000000 +0200
+++ new/lib/kramdown/parser/gfm.rb 2015-10-01 21:41:44.000000000 +0200
@@ -38,8 +38,10 @@
omit_trailing_br = (Kramdown::Element.category(element) == :block && element.children[-1] == child &&
lines[-1].empty?)
lines.each_with_index do |line, index|
- children << Element.new(:text, (index > 0 ? "\n#{line}" : line))
- children << Element.new(:br) if index < lines.size - 2 ||
+ new_element_options = { :location => child.options[:location] + index }
+
+ children << Element.new(:text, (index > 0 ? "\n#{line}" : line), nil, new_element_options)
+ children << Element.new(:br, nil, nil, new_element_options) if index < lines.size - 2 ||
(index == lines.size - 2 && !omit_trailing_br)
end
children
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 2015-07-04 13:34:29.000000000 +0200
+++ new/lib/kramdown/utils/ordered_hash.rb 2015-10-01 21:41:44.000000000 +0200
@@ -43,6 +43,11 @@
@data.has_key?(key)
end
+ # Return +true+ if the hash contains no keys.
+ def empty?
+ @data.empty?
+ end
+
# Set the value for the +key+ to +val+.
def []=(key, val)
@order << key if !@data.has_key?(key)
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 2015-07-04 13:34:29.000000000 +0200
+++ new/lib/kramdown/version.rb 2015-10-01 21:41:44.000000000 +0200
@@ -10,6 +10,6 @@
module Kramdown
# The kramdown version.
- VERSION = '1.8.0'
+ VERSION = '1.9.0'
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/man/man1/kramdown.1 new/man/man1/kramdown.1
--- old/man/man1/kramdown.1 2015-07-04 13:34:29.000000000 +0200
+++ new/man/man1/kramdown.1 2015-10-01 21:41:44.000000000 +0200
@@ -189,6 +189,9 @@
The footnote backlink is just text, so any special HTML characters will
be escaped.
+If the footnote backlint text is an empty string, no footnote backlinks
+will be generated.
+
Default: '&8617;'
Used by: HTML converter
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/metadata new/metadata
--- old/metadata 2015-07-04 13:34:29.000000000 +0200
+++ new/metadata 2015-10-01 21:41:43.000000000 +0200
@@ -1,14 +1,14 @@
--- !ruby/object:Gem::Specification
name: kramdown
version: !ruby/object:Gem::Version
- version: 1.8.0
+ version: 1.9.0
platform: ruby
authors:
- Thomas Leitner
autorequire:
bindir: bin
cert_chain: []
-date: 2015-07-04 00:00:00.000000000 Z
+date: 2015-10-01 00:00:00.000000000 Z
dependencies:
- !ruby/object:Gem::Dependency
name: minitest
@@ -156,6 +156,7 @@
- lib/kramdown/compatibility.rb
- lib/kramdown/converter.rb
- lib/kramdown/converter/base.rb
+- lib/kramdown/converter/hash_ast.rb
- lib/kramdown/converter/html.rb
- lib/kramdown/converter/kramdown.rb
- lib/kramdown/converter/latex.rb
@@ -285,9 +286,6 @@
- test/testcases/block/06_codeblock/highlighting-opts.html
- test/testcases/block/06_codeblock/highlighting-opts.options
- test/testcases/block/06_codeblock/highlighting-opts.text
-- test/testcases/block/06_codeblock/highlighting-rouge.html
-- test/testcases/block/06_codeblock/highlighting-rouge.options
-- test/testcases/block/06_codeblock/highlighting-rouge.text
- test/testcases/block/06_codeblock/highlighting.html
- test/testcases/block/06_codeblock/highlighting.options
- test/testcases/block/06_codeblock/highlighting.text
@@ -301,6 +299,12 @@
- test/testcases/block/06_codeblock/no_newline_at_end_1.text
- test/testcases/block/06_codeblock/normal.html
- test/testcases/block/06_codeblock/normal.text
+- test/testcases/block/06_codeblock/rouge/disabled.html
+- test/testcases/block/06_codeblock/rouge/disabled.options
+- test/testcases/block/06_codeblock/rouge/disabled.text
+- test/testcases/block/06_codeblock/rouge/simple.html
+- test/testcases/block/06_codeblock/rouge/simple.options
+- test/testcases/block/06_codeblock/rouge/simple.text
- test/testcases/block/06_codeblock/tilde_syntax.html
- test/testcases/block/06_codeblock/tilde_syntax.text
- test/testcases/block/06_codeblock/whitespace.html
@@ -556,13 +560,16 @@
- test/testcases/span/03_codespan/highlighting-minted.latex
- test/testcases/span/03_codespan/highlighting-minted.options
- test/testcases/span/03_codespan/highlighting-minted.text
-- test/testcases/span/03_codespan/highlighting-rouge.html
-- test/testcases/span/03_codespan/highlighting-rouge.options
-- test/testcases/span/03_codespan/highlighting-rouge.text
- test/testcases/span/03_codespan/highlighting.html
- test/testcases/span/03_codespan/highlighting.text
- test/testcases/span/03_codespan/normal.html
- test/testcases/span/03_codespan/normal.text
+- test/testcases/span/03_codespan/rouge/disabled.html
+- test/testcases/span/03_codespan/rouge/disabled.options
+- test/testcases/span/03_codespan/rouge/disabled.text
+- test/testcases/span/03_codespan/rouge/simple.html
+- test/testcases/span/03_codespan/rouge/simple.options
+- test/testcases/span/03_codespan/rouge/simple.text
- test/testcases/span/04_footnote/backlink_text.html
- test/testcases/span/04_footnote/backlink_text.options
- test/testcases/span/04_footnote/backlink_text.text
@@ -582,6 +589,9 @@
- test/testcases/span/04_footnote/placement.text
- test/testcases/span/04_footnote/regexp_problem.html
- test/testcases/span/04_footnote/regexp_problem.text
+- test/testcases/span/04_footnote/without_backlink.html
+- test/testcases/span/04_footnote/without_backlink.options
+- test/testcases/span/04_footnote/without_backlink.text
- test/testcases/span/05_html/across_lines.html
- test/testcases/span/05_html/across_lines.text
- test/testcases/span/05_html/button.html
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 2015-07-04 13:34:29.000000000 +0200
+++ new/test/test_files.rb 2015-10-01 21:41:44.000000000 +0200
@@ -17,14 +17,14 @@
class TestFiles < Minitest::Test
EXCLUDE_KD_FILES = [('test/testcases/block/04_header/with_auto_ids.text' if RUBY_VERSION <= '1.8.6'), # bc of dep stringex not working
- ('test/testcases/span/03_codespan/highlighting-rouge.text' if RUBY_VERSION < '2.0'), #bc of rouge
- ('test/testcases/block/06_codeblock/highlighting-rouge.text' if RUBY_VERSION < '2.0'), #bc of rouge
+ ('test/testcases/span/03_codespan/rouge/' if RUBY_VERSION < '2.0'), #bc of rouge
+ ('test/testcases/block/06_codeblock/rouge/' if RUBY_VERSION < '2.0'), #bc of rouge
].compact
# Generate test methods for kramdown-to-xxx conversion
Dir[File.dirname(__FILE__) + '/testcases/**/*.text'].each do |text_file|
- next if EXCLUDE_KD_FILES.any? {|f| text_file =~ /#{f}$/}
+ next if EXCLUDE_KD_FILES.any? {|f| text_file =~ /#{f}/}
basename = text_file.sub(/\.text$/, '')
opts_file = text_file.sub(/\.text$/, '.options')
(Dir[basename + ".*"] - [text_file, opts_file]).each do |output_file|
@@ -51,8 +51,9 @@
'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/06_codeblock/highlighting-rouge.html', # bc of double surrounding <div>
- ('test/testcases/span/03_codespan/highlighting-rouge.html' if RUBY_VERSION < '2.0'),
+ 'test/testcases/block/06_codeblock/rouge/simple.html', # bc of double surrounding <div>
+ ('test/testcases/span/03_codespan/rouge/simple.html' if RUBY_VERSION < '2.0'),
+ ('test/testcases/span/03_codespan/rouge/disabled.html' if RUBY_VERSION < '2.0'),
'test/testcases/block/15_math/ritex.html', # bc of tidy
'test/testcases/span/math/ritex.html', # bc of tidy
'test/testcases/block/15_math/itex2mml.html', # bc of tidy
@@ -153,8 +154,9 @@
'test/testcases/span/extension/comment.text', # bc of comment text modifications (can this be avoided?)
'test/testcases/block/04_header/header_type_offset.text', # bc of header_offset being applied twice
('test/testcases/block/04_header/with_auto_ids.text' if RUBY_VERSION <= '1.8.6'), # bc of dep stringex not working
- ('test/testcases/span/03_codespan/highlighting-rouge.text' if RUBY_VERSION < '2.0'),
- ('test/testcases/block/06_codeblock/highlighting-rouge.text' if RUBY_VERSION < '2.0'), #bc of rouge
+ ('test/testcases/span/03_codespan/rouge/simple.text' if RUBY_VERSION < '2.0'), #bc of rouge
+ ('test/testcases/span/03_codespan/rouge/disabled.text' if RUBY_VERSION < '2.0'), #bc of rouge
+ ('test/testcases/block/06_codeblock/rouge/simple.text' if RUBY_VERSION < '2.0'), #bc of rouge
'test/testcases/block/15_math/ritex.text', # bc of tidy
'test/testcases/span/math/ritex.text', # bc of tidy
'test/testcases/block/15_math/itex2mml.text', # bc of tidy
@@ -193,14 +195,15 @@
'test/testcases/block/09_html/markdown_attr.html', # bc of markdown attr
'test/testcases/block/09_html/html_to_native/table_simple.html', # bc of invalidly converted simple table
'test/testcases/block/06_codeblock/whitespace.html', # bc of entity to char conversion
- 'test/testcases/block/06_codeblock/highlighting-rouge.html', # bc of double surrounding <div>
+ 'test/testcases/block/06_codeblock/rouge/simple.html', # bc of double surrounding <div>
'test/testcases/block/11_ial/simple.html', # bc of change of ordering of attributes in header
'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
'test/testcases/span/autolinks/url_links.html', # bc of quot entity being converted to char
- ('test/testcases/span/03_codespan/highlighting-rouge.html' if RUBY_VERSION < '2.0'),
+ ('test/testcases/span/03_codespan/rouge/simple.html' if RUBY_VERSION < '2.0'),
+ ('test/testcases/span/03_codespan/rouge/disabled.html' if RUBY_VERSION < '2.0'),
'test/testcases/block/15_math/ritex.html', # bc of tidy
'test/testcases/span/math/ritex.html', # bc of tidy
'test/testcases/block/15_math/itex2mml.html', # bc of tidy
@@ -284,8 +287,10 @@
'test/testcases/span/text_substitutions/entities_as_char.text',
'test/testcases/span/text_substitutions/entities.text',
'test/testcases/span/text_substitutions/typography.text',
- ('test/testcases/span/03_codespan/highlighting-rouge.text' if RUBY_VERSION < '2.0'),
- ('test/testcases/block/06_codeblock/highlighting-rouge.text' if RUBY_VERSION < '2.0'), #bc of rouge
+ ('test/testcases/span/03_codespan/rouge/simple.text' if RUBY_VERSION < '2.0'),
+ ('test/testcases/span/03_codespan/rouge/disabled.text' if RUBY_VERSION < '2.0'),
+ ('test/testcases/block/06_codeblock/rouge/simple.text' if RUBY_VERSION < '2.0'), #bc of rouge
+ ('test/testcases/block/06_codeblock/rouge/disabled.text' if RUBY_VERSION < '2.0'), #bc of rouge
].compact
# Generate test methods for gfm-to-html conversion
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 2015-07-04 13:34:29.000000000 +0200
+++ new/test/test_location.rb 2015-10-01 21:41:44.000000000 +0200
@@ -216,4 +216,14 @@
end
end
+ it 'handles hard wrapped paragraphs with the GFM parser' do
+ str = "A*b*C\nA*b*C\nA*b*C"
+ doc = Kramdown::Document.new(str, :input => 'GFM', :hard_wrap => true)
+ para = doc.root.children.first
+ 1.upto(3) do |line|
+ 0.upto(line == 3 ? 2 : 3) do |element|
+ assert_equal(line, para.children[4*(line - 1) + element].options[:location])
+ end
+ end
+ end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/testcases/block/06_codeblock/highlighting-rouge.html new/test/testcases/block/06_codeblock/highlighting-rouge.html
--- old/test/testcases/block/06_codeblock/highlighting-rouge.html 2015-07-04 13:34:29.000000000 +0200
+++ new/test/testcases/block/06_codeblock/highlighting-rouge.html 1970-01-01 01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-<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>
-</code></pre>
-</div>
-<div class="highlighter-rouge"><pre class="highlight"><code><span class="nt"><a></span>href<span class="nt"></a></span>
-</code></pre>
-</div>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/testcases/block/06_codeblock/highlighting-rouge.options new/test/testcases/block/06_codeblock/highlighting-rouge.options
--- old/test/testcases/block/06_codeblock/highlighting-rouge.options 2015-07-04 13:34:29.000000000 +0200
+++ new/test/testcases/block/06_codeblock/highlighting-rouge.options 1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-:syntax_highlighter: rouge
-:syntax_highlighter_opts:
- default_lang: ruby
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/testcases/block/06_codeblock/highlighting-rouge.text new/test/testcases/block/06_codeblock/highlighting-rouge.text
--- old/test/testcases/block/06_codeblock/highlighting-rouge.text 2015-07-04 13:34:29.000000000 +0200
+++ new/test/testcases/block/06_codeblock/highlighting-rouge.text 1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
- x = Class.new
-^
- <a>href</a>
-{: .language-html}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/testcases/block/06_codeblock/rouge/disabled.html new/test/testcases/block/06_codeblock/rouge/disabled.html
--- old/test/testcases/block/06_codeblock/rouge/disabled.html 1970-01-01 01:00:00.000000000 +0100
+++ new/test/testcases/block/06_codeblock/rouge/disabled.html 2015-10-01 21:41:44.000000000 +0200
@@ -0,0 +1,2 @@
+<pre><code>x = Class.new
+</code></pre>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/testcases/block/06_codeblock/rouge/disabled.options new/test/testcases/block/06_codeblock/rouge/disabled.options
--- old/test/testcases/block/06_codeblock/rouge/disabled.options 1970-01-01 01:00:00.000000000 +0100
+++ new/test/testcases/block/06_codeblock/rouge/disabled.options 2015-10-01 21:41:44.000000000 +0200
@@ -0,0 +1,4 @@
+:syntax_highlighter: rouge
+:syntax_highlighter_opts:
+ block:
+ disable: true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/testcases/block/06_codeblock/rouge/disabled.text new/test/testcases/block/06_codeblock/rouge/disabled.text
--- old/test/testcases/block/06_codeblock/rouge/disabled.text 1970-01-01 01:00:00.000000000 +0100
+++ new/test/testcases/block/06_codeblock/rouge/disabled.text 2015-10-01 21:41:44.000000000 +0200
@@ -0,0 +1 @@
+ x = Class.new
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 1970-01-01 01:00:00.000000000 +0100
+++ new/test/testcases/block/06_codeblock/rouge/simple.html 2015-10-01 21:41:44.000000000 +0200
@@ -0,0 +1,6 @@
+<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>
+</code></pre>
+</div>
+<div class="highlighter-rouge"><pre class="highlight"><code><span class="nt"><a></span>href<span class="nt"></a></span>
+</code></pre>
+</div>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/testcases/block/06_codeblock/rouge/simple.options new/test/testcases/block/06_codeblock/rouge/simple.options
--- old/test/testcases/block/06_codeblock/rouge/simple.options 1970-01-01 01:00:00.000000000 +0100
+++ new/test/testcases/block/06_codeblock/rouge/simple.options 2015-10-01 21:41:44.000000000 +0200
@@ -0,0 +1,3 @@
+:syntax_highlighter: rouge
+:syntax_highlighter_opts:
+ default_lang: ruby
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/testcases/block/06_codeblock/rouge/simple.text new/test/testcases/block/06_codeblock/rouge/simple.text
--- old/test/testcases/block/06_codeblock/rouge/simple.text 1970-01-01 01:00:00.000000000 +0100
+++ new/test/testcases/block/06_codeblock/rouge/simple.text 2015-10-01 21:41:44.000000000 +0200
@@ -0,0 +1,4 @@
+ x = Class.new
+^
+ <a>href</a>
+{: .language-html}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/testcases/span/03_codespan/highlighting-rouge.html new/test/testcases/span/03_codespan/highlighting-rouge.html
--- old/test/testcases/span/03_codespan/highlighting-rouge.html 2015-07-04 13:34:29.000000000 +0200
+++ new/test/testcases/span/03_codespan/highlighting-rouge.html 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-<p>You can say <code class="language-ruby highlighter-rouge"><span class="n">x</span> <span class="o">=</span> <span class="no">Class</span><span class="p">.</span><span class="nf">new</span></code>, for example.</p>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/testcases/span/03_codespan/highlighting-rouge.options new/test/testcases/span/03_codespan/highlighting-rouge.options
--- old/test/testcases/span/03_codespan/highlighting-rouge.options 2015-07-04 13:34:29.000000000 +0200
+++ new/test/testcases/span/03_codespan/highlighting-rouge.options 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-:syntax_highlighter: rouge
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/testcases/span/03_codespan/highlighting-rouge.text new/test/testcases/span/03_codespan/highlighting-rouge.text
--- old/test/testcases/span/03_codespan/highlighting-rouge.text 2015-07-04 13:34:29.000000000 +0200
+++ new/test/testcases/span/03_codespan/highlighting-rouge.text 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-You can say `x = Class.new`{:.language-ruby}, for example.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/testcases/span/03_codespan/rouge/disabled.html new/test/testcases/span/03_codespan/rouge/disabled.html
--- old/test/testcases/span/03_codespan/rouge/disabled.html 1970-01-01 01:00:00.000000000 +0100
+++ new/test/testcases/span/03_codespan/rouge/disabled.html 2015-10-01 21:41:44.000000000 +0200
@@ -0,0 +1 @@
+<p>You can say <code class="language-ruby">Class</code>.</p>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/testcases/span/03_codespan/rouge/disabled.options new/test/testcases/span/03_codespan/rouge/disabled.options
--- old/test/testcases/span/03_codespan/rouge/disabled.options 1970-01-01 01:00:00.000000000 +0100
+++ new/test/testcases/span/03_codespan/rouge/disabled.options 2015-10-01 21:41:44.000000000 +0200
@@ -0,0 +1,4 @@
+:syntax_highlighter: rouge
+:syntax_highlighter_opts:
+ span:
+ disable: true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/testcases/span/03_codespan/rouge/disabled.text new/test/testcases/span/03_codespan/rouge/disabled.text
--- old/test/testcases/span/03_codespan/rouge/disabled.text 1970-01-01 01:00:00.000000000 +0100
+++ new/test/testcases/span/03_codespan/rouge/disabled.text 2015-10-01 21:41:44.000000000 +0200
@@ -0,0 +1 @@
+You can say `Class`{:.language-ruby}.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/testcases/span/03_codespan/rouge/simple.html new/test/testcases/span/03_codespan/rouge/simple.html
--- old/test/testcases/span/03_codespan/rouge/simple.html 1970-01-01 01:00:00.000000000 +0100
+++ new/test/testcases/span/03_codespan/rouge/simple.html 2015-10-01 21:41:44.000000000 +0200
@@ -0,0 +1 @@
+<p>You can say <code class="language-ruby highlighter-rouge"><span class="n">x</span> <span class="o">=</span> <span class="no">Class</span><span class="p">.</span><span class="nf">new</span></code>, for example.</p>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/testcases/span/03_codespan/rouge/simple.options new/test/testcases/span/03_codespan/rouge/simple.options
--- old/test/testcases/span/03_codespan/rouge/simple.options 1970-01-01 01:00:00.000000000 +0100
+++ new/test/testcases/span/03_codespan/rouge/simple.options 2015-10-01 21:41:44.000000000 +0200
@@ -0,0 +1 @@
+:syntax_highlighter: rouge
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/testcases/span/03_codespan/rouge/simple.text new/test/testcases/span/03_codespan/rouge/simple.text
--- old/test/testcases/span/03_codespan/rouge/simple.text 1970-01-01 01:00:00.000000000 +0100
+++ new/test/testcases/span/03_codespan/rouge/simple.text 2015-10-01 21:41:44.000000000 +0200
@@ -0,0 +1 @@
+You can say `x = Class.new`{:.language-ruby}, for example.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/testcases/span/04_footnote/without_backlink.html new/test/testcases/span/04_footnote/without_backlink.html
--- old/test/testcases/span/04_footnote/without_backlink.html 1970-01-01 01:00:00.000000000 +0100
+++ new/test/testcases/span/04_footnote/without_backlink.html 2015-10-01 21:41:44.000000000 +0200
@@ -0,0 +1,9 @@
+<p>Some footnote here<sup id="fnref:fn"><a href="#fn:fn" class="footnote">1</a></sup></p>
+
+<div class="footnotes">
+ <ol>
+ <li id="fn:fn">
+ <p>Some text here</p>
+ </li>
+ </ol>
+</div>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/testcases/span/04_footnote/without_backlink.options new/test/testcases/span/04_footnote/without_backlink.options
--- old/test/testcases/span/04_footnote/without_backlink.options 1970-01-01 01:00:00.000000000 +0100
+++ new/test/testcases/span/04_footnote/without_backlink.options 2015-10-01 21:41:44.000000000 +0200
@@ -0,0 +1 @@
+:footnote_backlink: ''
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/testcases/span/04_footnote/without_backlink.text new/test/testcases/span/04_footnote/without_backlink.text
--- old/test/testcases/span/04_footnote/without_backlink.text 1970-01-01 01:00:00.000000000 +0100
+++ new/test/testcases/span/04_footnote/without_backlink.text 2015-10-01 21:41:44.000000000 +0200
@@ -0,0 +1,3 @@
+Some footnote here[^fn]
+
+[^fn]: Some text here
