[DRE-commits] [ruby-kramdown] 02/05: Merge tag 'upstream/1.9.0'

[Youhei SASAKI]

This is an automated email from the git hooks/post-receive script.

uwabami-guest pushed a commit to annotated tag debian/1.9.0-1
in repository ruby-kramdown.

commit 7fe3db2be98f75c66eeb799a4bbe46f4a51b0247
Merge: 8427b03 17f66b4
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date:   Sun Nov 22 15:53:46 2015 +0900

    Merge tag 'upstream/1.9.0'
    
    Upstream version 1.9.0

 CONTRIBUTERS                                       |  4 ++-
 README.md                                          |  3 ++
 Rakefile                                           |  2 +-
 VERSION                                            |  2 +-
 benchmark/testing.sh                               |  2 +-
 doc/index.page                                     |  4 +--
 lib/kramdown/converter.rb                          |  1 +
 lib/kramdown/converter/hash_ast.rb                 | 36 ++++++++++++++++++++++
 lib/kramdown/converter/html.rb                     |  8 +++--
 lib/kramdown/converter/syntax_highlighter/rouge.rb | 29 ++++++++++++++---
 lib/kramdown/options.rb                            |  3 ++
 lib/kramdown/parser/gfm.rb                         |  6 ++--
 lib/kramdown/utils/ordered_hash.rb                 |  5 +++
 lib/kramdown/version.rb                            |  2 +-
 man/man1/kramdown.1                                |  3 ++
 metadata.yml                                       | 26 +++++++++++-----
 test/test_files.rb                                 | 27 +++++++++-------
 test/test_location.rb                              | 10 ++++++
 .../block/06_codeblock/rouge/disabled.html         |  2 ++
 .../disabled.options}                              |  3 +-
 .../block/06_codeblock/rouge/disabled.text         |  1 +
 .../{highlighting-rouge.html => rouge/simple.html} |  0
 .../simple.options}                                |  0
 .../{highlighting-rouge.text => rouge/simple.text} |  0
 .../testcases/span/03_codespan/rouge/disabled.html |  1 +
 .../03_codespan/rouge/disabled.options}            |  3 +-
 .../testcases/span/03_codespan/rouge/disabled.text |  1 +
 .../{highlighting-rouge.html => rouge/simple.html} |  0
 .../simple.options}                                |  0
 .../{highlighting-rouge.text => rouge/simple.text} |  0
 .../span/04_footnote/without_backlink.html         |  9 ++++++
 .../span/04_footnote/without_backlink.options      |  1 +
 .../span/04_footnote/without_backlink.text         |  3 ++
 33 files changed, 160 insertions(+), 37 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-kramdown.git