[DRE-commits] [ruby-kramdown] 01/06: Merge tag 'upstream/1.12.0'

[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 7baebdabf17ca1f3dfe1f456e9a5cea20d321ceb
Merge: 7755ed3 03e5ba5
Author: Cédric Boutillier <boutil at debian.org>
Date:   Sat Aug 27 10:13:45 2016 +0200

    Merge tag 'upstream/1.12.0'
    
    Upstream version 1.12.0
    
    # gpg: Signature faite le sam. 27 août 2016 10:13:44 CEST
    # gpg:                avec la clef RSA 0x89AF82B739CD217A
    # gpg: Bonne signature de « Cédric Boutillier <boutil at debian.org> » [ultime]
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at upmc.fr> » [ultime]
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at polytechnique.org> » [ultime]
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at gmail.com> » [ultime]
    # Empreinte de clef principale : 3041 4D81 DC28 290C 2568  6DE3 DA49 58F6 11E1 49E9
    #    Empreinte de la sous-clef : 9CCD 6B31 9DBF 8E40 AB1A  BD1A 89AF 82B7 39CD 217A

 CONTRIBUTERS                                       |  5 +-
 Rakefile                                           |  2 +-
 VERSION                                            |  2 +-
 doc/index.page                                     |  4 +-
 doc/syntax.page                                    | 53 +++++++++++++++++++++-
 kramdown.gemspec                                   |  6 +--
 lib/kramdown/compatibility.rb                      | 12 +++++
 lib/kramdown/converter/base.rb                     | 15 ++++--
 lib/kramdown/converter/html.rb                     | 28 +++++++-----
 lib/kramdown/converter/kramdown.rb                 | 12 ++++-
 lib/kramdown/converter/syntax_highlighter/rouge.rb |  2 +-
 lib/kramdown/document.rb                           |  2 +-
 lib/kramdown/options.rb                            | 35 ++++++++++++--
 lib/kramdown/parser/gfm.rb                         | 35 +++++++++++++-
 lib/kramdown/parser/html.rb                        |  6 +--
 lib/kramdown/parser/kramdown.rb                    | 17 +++----
 lib/kramdown/parser/kramdown/list.rb               |  5 ++
 lib/kramdown/parser/kramdown/paragraph.rb          |  6 ++-
 lib/kramdown/version.rb                            |  2 +-
 man/man1/kramdown.1                                | 27 +++++++++++
 test/test_files.rb                                 | 30 +++++++++++-
 .../block/06_codeblock/rouge/multiple.html         | 11 +++++
 .../block/06_codeblock/rouge/multiple.options      |  4 ++
 .../block/06_codeblock/rouge/multiple.text         | 11 +++++
 .../block/13_definition_list/auto_ids.html         | 15 ++++++
 .../block/13_definition_list/auto_ids.text         | 18 ++++++++
 .../block/13_definition_list/item_ial.html         |  5 ++
 .../block/13_definition_list/item_ial.text         |  8 ++++
 test/testcases/block/15_math/no_engine.html        |  3 ++
 test/testcases/block/15_math/no_engine.options     |  1 +
 test/testcases/block/15_math/no_engine.text        |  2 +
 test/testcases/span/autolinks/url_links.html       | 10 ++--
 test/testcases/span/math/no_engine.html            |  1 +
 test/testcases/span/math/no_engine.options         |  1 +
 test/testcases/span/math/no_engine.text            |  1 +
 test/testcases_gfm/paragraph_end-disabled.html     | 31 +++++++++++++
 test/testcases_gfm/paragraph_end-disabled.options  |  1 +
 test/testcases_gfm/paragraph_end-disabled.text     | 27 +++++++++++
 test/testcases_gfm/paragraph_end.html              | 38 ++++++++++++++++
 test/testcases_gfm/paragraph_end.text              | 27 +++++++++++
 40 files changed, 468 insertions(+), 53 deletions(-)

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