[DRE-commits] [ruby-prawn] 01/08: Merge tag 'upstream/2.0.1+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 a4bd45c2754740cbceb9239ce487fb55925861b1
Merge: 8795048 feceeb2
Author: Cédric Boutillier <boutil at debian.org>
Date:   Wed Apr 29 10:58:53 2015 +0200

    Merge tag 'upstream/2.0.1+dfsg'
    
    Upstream version 2.0.1+dfsg
    
    # gpg: Signature faite le mer. 29 avril 2015 10:58:49 CEST avec la clef RSA d'identifiant 39CD217A
    # gpg: Bonne signature de « Cédric Boutillier <boutil at debian.org> »
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at upmc.fr> »
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at polytechnique.org> »
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at gmail.com> »

 .mailmap                                           |   1 +
 .rubocop.yml                                       |  40 +-
 .travis.yml                                        |  10 +-
 .yardopts                                          |   1 +
 CHANGELOG.md                                       | 483 +++++++++++++++++++++
 CONTRIBUTING.md                                    |  30 --
 Gemfile                                            |   2 +-
 README.md                                          |  14 +-
 Rakefile                                           |   4 +-
 data/encodings/win_ansi.txt                        |  29 --
 data/images/fractal.jpg                            | Bin 6644 -> 6640 bytes
 data/images/pal_bk.png                             | Bin 0 -> 1152 bytes
 data/images/pigs.jpg                               | Bin 9706 -> 9693 bytes
 data/images/stef.jpg                               | Bin 2256 -> 2256 bytes
 lib/prawn.rb                                       |   1 -
 lib/prawn/document.rb                              |   4 +-
 lib/prawn/document/internals.rb                    |   3 +-
 lib/prawn/encoding.rb                              |  33 --
 lib/prawn/font/afm.rb                              |  31 +-
 lib/prawn/font/ttf.rb                              |   4 +
 lib/prawn/font_metric_cache.rb                     |   3 +-
 lib/prawn/graphics.rb                              |  19 +-
 lib/prawn/graphics/dash.rb                         |   5 +
 lib/prawn/images.rb                                |   5 +-
 lib/prawn/images/png.rb                            |  15 +-
 lib/prawn/text.rb                                  |  22 +-
 lib/prawn/text/box.rb                              |  10 +-
 lib/prawn/text/formatted/box.rb                    |  20 +-
 lib/prawn/text/formatted/line_wrap.rb              |   5 +
 lib/prawn/version.rb                               |   2 +-
 manual/basic_concepts/measurement.rb               |   2 +-
 manual/bounding_box/bounds.rb                      |   2 +-
 manual/cover.rb                                    |   5 +-
 manual/example_helper.rb                           |   1 +
 manual/how_to_read_this_manual.rb                  |   4 +-
 .../repeatable_content/alternate_page_numbering.rb |  32 ++
 manual/repeatable_content/repeatable_content.rb    |   1 +
 manual/security/security.rb                        |   2 +-
 manual/text/paragraph_indentation.rb               |   8 +
 manual/text/positioned_text.rb                     |   2 +-
 manual/text/right_to_left_text.rb                  |   4 +
 manual/text/text.rb                                |   2 +-
 manual/text/text_box_overflow.rb                   |   2 +-
 manual/text/utf8.rb                                |   8 +-
 manual/text/win_ansi_charset.rb                    |   3 +-
 prawn.gemspec                                      |  23 +-
 spec/document_spec.rb                              |  25 +-
 spec/font_spec.rb                                  |  25 ++
 spec/formatted_text_box_spec.rb                    | 110 +++--
 spec/graphics_spec.rb                              |  38 +-
 spec/line_wrap_spec.rb                             |  36 +-
 spec/png_spec.rb                                   |  10 +-
 spec/soft_mask_spec.rb                             |   2 +-
 spec/spec_helper.rb                                |   4 +-
 spec/text_at_spec.rb                               |  30 +-
 spec/text_box_spec.rb                              |  23 +-
 spec/text_spacing_spec.rb                          |   4 +-
 spec/text_spec.rb                                  | 103 ++++-
 58 files changed, 1010 insertions(+), 297 deletions(-)

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