[DRE-commits] [ruby-prawn] 01/06: Merge tag 'upstream/2.1.0+dfsg'

[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-prawn.

commit 0e260acd5ef14de9c72adaba1b3bc83a26ead38f
Merge: e7345aa bd4607c
Author: Cédric Boutillier <boutil at debian.org>
Date:   Tue Jun 7 12:04:12 2016 +0200

    Merge tag 'upstream/2.1.0+dfsg'
    
    Upstream version 2.1.0+dfsg
    
    # gpg: Signature faite le mar. 07 juin 2016 12:04:11 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

 .gitignore                                 |   5 +-
 .travis.yml                                |  20 +-
 CHANGELOG.md                               |  42 ++++
 README.md                                  |   7 +-
 data/images/blend_modes_bottom_layer.jpg   | Bin 0 -> 49718 bytes
 data/images/blend_modes_top_layer.jpg      | Bin 0 -> 115767 bytes
 data/images/fractal.jpg                    | Bin 6640 -> 6643 bytes
 data/images/indexed_transparency.png       | Bin 0 -> 494 bytes
 data/images/indexed_transparency_alpha.dat | Bin 0 -> 253 bytes
 data/images/indexed_transparency_color.dat | Bin 0 -> 206 bytes
 data/images/pal_bk.png                     | Bin 1152 -> 0 bytes
 data/images/pigs.jpg                       | Bin 9693 -> 9698 bytes
 data/images/stef.jpg                       | Bin 2256 -> 2260 bytes
 lib/prawn.rb                               |   3 +-
 lib/prawn/document.rb                      |   1 +
 lib/prawn/document/internals.rb            |  12 +-
 lib/prawn/font.rb                          |  15 +-
 lib/prawn/graphics.rb                      |   2 +
 lib/prawn/graphics/blend_mode.rb           |  64 ++++++
 lib/prawn/graphics/patterns.rb             |  68 ++++--
 lib/prawn/graphics/transformation.rb       |   3 +
 lib/prawn/images/png.rb                    |  48 ++++-
 lib/prawn/text/formatted/arranger.rb       |  42 ++--
 lib/prawn/text/formatted/line_wrap.rb      |   5 +-
 lib/prawn/transformation_stack.rb          |  42 ++++
 lib/prawn/version.rb                       |   2 +-
 manual/graphics/blend_mode.rb              |  49 +++++
 manual/graphics/graphics.rb                |   1 +
 manual/graphics/soft_masks.rb              |   2 +-
 prawn.gemspec                              |   9 +-
 spec/acceptance/png.rb                     |  24 ---
 spec/acceptance/png_spec.rb                |  35 +++
 spec/blend_mode_spec.rb                    |  71 +++++++
 spec/document_spec.rb                      | 148 +++++++------
 spec/extensions/mocha.rb                   |  45 ----
 spec/font_spec.rb                          |  22 +-
 spec/formatted_text_arranger_spec.rb       | 327 ++++++++++++++++-------------
 spec/formatted_text_box_spec.rb            |  46 ++--
 spec/graphics_spec.rb                      |  95 ++++++---
 spec/image_handler_spec.rb                 |  14 +-
 spec/images_spec.rb                        |   2 +-
 spec/png_spec.rb                           |  30 ++-
 spec/repeater_spec.rb                      |  18 +-
 spec/spec_helper.rb                        |   5 +-
 spec/text_at_spec.rb                       |   4 +-
 spec/text_box_spec.rb                      |  36 ++--
 spec/text_spec.rb                          |  22 +-
 spec/transformation_stack_spec.rb          |  63 ++++++
 spec/view_spec.rb                          |  20 +-
 49 files changed, 983 insertions(+), 486 deletions(-)

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