[DRE-commits] [ruby-kramdown] 01/04: Merge tag 'upstream/1.4.2'

[Cédric Boutillier]

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

boutil pushed a commit to branch master
in repository ruby-kramdown.

commit 4efb4fe265425c2a2ab1328d41fafa301755d863
Merge: 2418771 7aca451
Author: Cédric Boutillier <boutil at debian.org>
Date:   Mon Sep 29 23:12:03 2014 +0200

    Merge tag 'upstream/1.4.2'
    
    Upstream version 1.4.2
    
    Conflicts:
    	CONTRIBUTERS
    	VERSION
    	checksums.yaml.gz
    	doc/sidebar.template
    	lib/kramdown/parser/kramdown/link.rb
    	lib/kramdown/parser/kramdown/table.rb
    	lib/kramdown/version.rb
    	metadata.yml

 CONTRIBUTERS                                       |   2 +-
 VERSION                                            |   2 +-
 checksums.yaml.gz                                  | Bin 267 -> 0 bytes
 data/kramdown/document.latex                       |   2 +
 doc/index.page                                     |   4 +-
 doc/sidebar.template                               |   4 +-
 doc/tests.page                                     |  85 ++++++++++-----------
 lib/kramdown/converter/html.rb                     |   8 +-
 lib/kramdown/converter/kramdown.rb                 |   1 +
 lib/kramdown/converter/latex.rb                    |   2 -
 lib/kramdown/parser/base.rb                        |   7 +-
 lib/kramdown/parser/gfm.rb                         |   2 +-
 lib/kramdown/parser/html.rb                        |   6 +-
 lib/kramdown/parser/kramdown.rb                    |   2 +-
 lib/kramdown/parser/kramdown/abbreviation.rb       |  10 ++-
 lib/kramdown/parser/kramdown/codespan.rb           |   4 +-
 lib/kramdown/parser/kramdown/emphasis.rb           |   9 ++-
 lib/kramdown/parser/kramdown/extensions.rb         |  12 +--
 lib/kramdown/parser/kramdown/footnote.rb           |   2 +-
 lib/kramdown/parser/kramdown/header.rb             |   2 +-
 lib/kramdown/parser/kramdown/line_break.rb         |   2 +-
 lib/kramdown/parser/kramdown/link.rb               |  11 +--
 lib/kramdown/parser/kramdown/math.rb               |   4 +-
 lib/kramdown/parser/kramdown/paragraph.rb          |   2 +-
 lib/kramdown/parser/kramdown/smart_quotes.rb       |   3 +-
 lib/kramdown/parser/kramdown/table.rb              |   7 +-
 lib/kramdown/utils/string_scanner.rb               |  39 +++++-----
 lib/kramdown/version.rb                            |   2 +-
 metadata.yml                                       |  80 +++++++++----------
 test/test_location.rb                              |  34 +++++++++
 test/testcases/block/04_header/atx_header.html     |   2 +
 test/testcases/block/04_header/atx_header.text     |   1 +
 .../span/04_footnote/inside_footnote.html          |  17 +++++
 .../span/04_footnote/inside_footnote.text          |   9 +++
 test/testcases_gfm/hard_line_breaks_off.html       |   4 +-
 test/testcases_gfm/hard_line_breaks_off.text       |   4 +-
 test/testcases_gfm/two_para_hard_line_breaks.html  |   2 +-
 test/testcases_gfm/two_para_hard_line_breaks.text  |   2 +-
 38 files changed, 237 insertions(+), 154 deletions(-)

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