[DRE-commits] [ruby-kramdown] 01/05: Merge tag 'upstream/1.3.1'

[Youhei SASAKI]

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

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

commit 501fc01d0c418397572d1e7cc8ba3703742fb107
Merge: ee19bfa 6069d15
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date:   Mon Feb 10 01:49:39 2014 +0900

    Merge tag 'upstream/1.3.1'
    
    Upstream version 1.3.1
    
    Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
    
    Conflicts:
    	CONTRIBUTERS
    	VERSION
    	checksums.yaml.gz
    	doc/sidebar.template
    	doc/syntax.page
    	lib/kramdown/converter/base.rb
    	lib/kramdown/parser/gfm.rb
    	lib/kramdown/parser/kramdown/codeblock.rb
    	lib/kramdown/version.rb
    	metadata.yml

 CONTRIBUTERS                                       |   6 +-
 README.md                                          |   6 +-
 Rakefile                                           |   9 +-
 VERSION                                            |   2 +-
 benchmark/generate_data.rb                         |   2 +-
 checksums.yaml.gz                                  | Bin 270 -> 270 bytes
 doc/default.template                               |   4 +-
 doc/index.page                                     |  18 +-
 doc/news.feed                                      |   2 +-
 doc/quickref.page                                  |   8 +-
 doc/sidebar.template                               |  15 +-
 doc/syntax.page                                    |  13 +-
 doc/tests.page                                     |  90 +--
 lib/kramdown/converter.rb                          |   1 +
 lib/kramdown/converter/base.rb                     |  66 ++-
 lib/kramdown/converter/kramdown.rb                 |   6 +-
 lib/kramdown/converter/pdf.rb                      | 619 +++++++++++++++++++++
 lib/kramdown/document.rb                           |   2 +-
 lib/kramdown/element.rb                            |   4 +
 lib/kramdown/options.rb                            |  52 +-
 lib/kramdown/parser/base.rb                        |   6 +-
 lib/kramdown/parser/gfm.rb                         |  43 +-
 lib/kramdown/parser/html.rb                        |   4 +-
 lib/kramdown/parser/kramdown.rb                    |  26 +-
 lib/kramdown/parser/kramdown/abbreviation.rb       |   5 +-
 lib/kramdown/parser/kramdown/autolink.rb           |   3 +-
 lib/kramdown/parser/kramdown/blockquote.rb         |   3 +-
 lib/kramdown/parser/kramdown/codeblock.rb          |   6 +-
 lib/kramdown/parser/kramdown/codespan.rb           |   3 +-
 lib/kramdown/parser/kramdown/emphasis.rb           |   3 +-
 lib/kramdown/parser/kramdown/extensions.rb         |   9 +-
 lib/kramdown/parser/kramdown/footnote.rb           |  10 +-
 lib/kramdown/parser/kramdown/header.rb             |   6 +-
 lib/kramdown/parser/kramdown/horizontal_rule.rb    |   3 +-
 lib/kramdown/parser/kramdown/html_entity.rb        |   6 +-
 lib/kramdown/parser/kramdown/link.rb               |   5 +-
 lib/kramdown/parser/kramdown/list.rb               |  14 +-
 lib/kramdown/parser/kramdown/math.rb               |   8 +-
 lib/kramdown/parser/kramdown/paragraph.rb          |   3 +-
 lib/kramdown/parser/kramdown/table.rb              |   8 +-
 lib/kramdown/parser/kramdown/typographic_symbol.rb |  15 +-
 lib/kramdown/utils.rb                              |   1 +
 lib/kramdown/utils/string_scanner.rb               |  61 ++
 lib/kramdown/version.rb                            |   2 +-
 man/man1/kramdown.1                                |  47 +-
 metadata.yml                                       |  44 +-
 test/test_files.rb                                 |   4 +-
 test/test_location.rb                              | 158 ++++++
 test/test_string_scanner_kramdown.rb               |  22 +
 .../block/04_header/with_auto_id_stripping.html    |   1 +
 .../block/04_header/with_auto_id_stripping.options |   1 +
 .../block/04_header/with_auto_id_stripping.text    |   1 +
 test/testcases/span/math/normal.html               |   3 +-
 test/testcases/span/math/normal.text               |   3 +-
 test/testcases_gfm/hard_line_breaks_off.html       |   2 +
 test/testcases_gfm/hard_line_breaks_off.options    |   1 +
 test/testcases_gfm/hard_line_breaks_off.text       |   2 +
 57 files changed, 1290 insertions(+), 177 deletions(-)

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