[DRE-commits] [ruby-kramdown] 01/07: Merge tag 'upstream/1.11.1'

[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 1415123f14b312946e3ef517a3255ce3c96b3629
Merge: fa4e33f 5b63dc2
Author: Cédric Boutillier <boutil at debian.org>
Date:   Wed Jun 8 22:32:40 2016 +0200

    Merge tag 'upstream/1.11.1'
    
    Upstream version 1.11.1
    
    # gpg: Signature faite le mer. 08 juin 2016 22:32:39 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                                       |  2 +-
 Rakefile                                           |  3 ++-
 VERSION                                            |  2 +-
 doc/default.template                               |  4 ++--
 doc/index.page                                     |  4 ++--
 doc/installation.page                              |  4 ++--
 kramdown.gemspec                                   |  9 +++++---
 lib/kramdown.rb                                    |  2 +-
 lib/kramdown/compatibility.rb                      |  2 +-
 lib/kramdown/converter.rb                          |  2 +-
 lib/kramdown/converter/base.rb                     |  2 +-
 lib/kramdown/converter/hash_ast.rb                 |  2 +-
 lib/kramdown/converter/html.rb                     | 21 ++++++++++--------
 lib/kramdown/converter/kramdown.rb                 |  2 +-
 lib/kramdown/converter/latex.rb                    |  2 +-
 lib/kramdown/converter/math_engine/itex2mml.rb     |  2 +-
 lib/kramdown/converter/math_engine/mathjax.rb      |  2 +-
 lib/kramdown/converter/math_engine/mathjaxnode.rb  |  2 +-
 lib/kramdown/converter/math_engine/ritex.rb        |  2 +-
 lib/kramdown/converter/pdf.rb                      |  2 +-
 lib/kramdown/converter/remove_html_tags.rb         |  2 +-
 lib/kramdown/converter/syntax_highlighter.rb       |  5 ++++-
 .../converter/syntax_highlighter/coderay.rb        |  8 +++----
 .../converter/syntax_highlighter/minted.rb         |  2 +-
 lib/kramdown/converter/syntax_highlighter/rouge.rb |  5 +++--
 lib/kramdown/converter/toc.rb                      |  2 +-
 lib/kramdown/document.rb                           |  2 +-
 lib/kramdown/element.rb                            |  2 +-
 lib/kramdown/error.rb                              |  2 +-
 lib/kramdown/options.rb                            |  2 +-
 lib/kramdown/parser.rb                             |  2 +-
 lib/kramdown/parser/base.rb                        |  2 +-
 lib/kramdown/parser/gfm.rb                         |  4 ++--
 lib/kramdown/parser/html.rb                        | 25 ++++++++++++++++------
 lib/kramdown/parser/kramdown.rb                    |  2 +-
 lib/kramdown/parser/kramdown/abbreviation.rb       |  2 +-
 lib/kramdown/parser/kramdown/autolink.rb           |  2 +-
 lib/kramdown/parser/kramdown/blank_line.rb         |  2 +-
 lib/kramdown/parser/kramdown/block_boundary.rb     |  2 +-
 lib/kramdown/parser/kramdown/blockquote.rb         |  2 +-
 lib/kramdown/parser/kramdown/codeblock.rb          |  2 +-
 lib/kramdown/parser/kramdown/codespan.rb           |  2 +-
 lib/kramdown/parser/kramdown/emphasis.rb           |  4 ++--
 lib/kramdown/parser/kramdown/eob.rb                |  2 +-
 lib/kramdown/parser/kramdown/escaped_chars.rb      |  2 +-
 lib/kramdown/parser/kramdown/extensions.rb         |  2 +-
 lib/kramdown/parser/kramdown/footnote.rb           |  2 +-
 lib/kramdown/parser/kramdown/header.rb             |  2 +-
 lib/kramdown/parser/kramdown/horizontal_rule.rb    |  2 +-
 lib/kramdown/parser/kramdown/html.rb               | 10 +++++----
 lib/kramdown/parser/kramdown/html_entity.rb        |  2 +-
 lib/kramdown/parser/kramdown/line_break.rb         |  2 +-
 lib/kramdown/parser/kramdown/link.rb               |  2 +-
 lib/kramdown/parser/kramdown/list.rb               |  2 +-
 lib/kramdown/parser/kramdown/math.rb               |  2 +-
 lib/kramdown/parser/kramdown/paragraph.rb          |  2 +-
 lib/kramdown/parser/kramdown/smart_quotes.rb       |  2 +-
 lib/kramdown/parser/kramdown/table.rb              |  2 +-
 lib/kramdown/parser/kramdown/typographic_symbol.rb |  2 +-
 lib/kramdown/parser/markdown.rb                    |  2 +-
 lib/kramdown/utils.rb                              |  2 +-
 lib/kramdown/utils/configurable.rb                 |  2 +-
 lib/kramdown/utils/entities.rb                     |  2 +-
 lib/kramdown/utils/html.rb                         |  2 +-
 lib/kramdown/utils/ordered_hash.rb                 |  2 +-
 lib/kramdown/utils/string_scanner.rb               |  2 +-
 lib/kramdown/utils/unidecoder.rb                   |  2 +-
 lib/kramdown/version.rb                            |  4 ++--
 test/run_tests.rb                                  |  2 +-
 test/test_files.rb                                 |  8 ++++++-
 test/test_location.rb                              |  2 +-
 test/test_string_scanner_kramdown.rb               |  2 +-
 .../block/06_codeblock/highlighting-opts.html      |  4 ++--
 .../testcases/block/06_codeblock/highlighting.html |  4 ++--
 .../testcases/block/06_codeblock/rouge/simple.html |  6 +++---
 test/testcases/block/09_html/not_parsed.html       |  2 +-
 test/testcases/block/09_html/simple.html           |  4 ----
 test/testcases/block/09_html/simple.html.19        |  4 ----
 test/testcases/block/09_html/simple.text           |  6 +-----
 test/testcases/block/09_html/xml.html              |  8 +++++++
 test/testcases/block/09_html/xml.text              |  7 ++++++
 test/testcases/block/12_extension/options3.html    |  4 ++--
 test/testcases/span/02_emphasis/normal.html        | 13 +++++++++++
 test/testcases/span/02_emphasis/normal.options     |  1 +
 test/testcases/span/02_emphasis/normal.text        | 11 ++++++++++
 test/testcases/span/05_html/xml.html               |  5 +++++
 test/testcases/span/05_html/xml.text               |  5 +++++
 test/testcases_gfm/backticks_syntax.html           |  4 ++--
 88 files changed, 194 insertions(+), 126 deletions(-)

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