[DRE-commits] [ruby-prawn] 03/09: Merge tag 'upstream/1.3.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 58ca1d09c7195e0334bb97cf5dfa28a8777a26cd
Merge: ad009dd 64d9240
Author: Cédric Boutillier <boutil at debian.org>
Date:   Sun Sep 28 22:44:17 2014 +0200

    Merge tag 'upstream/1.3.0+dfsg'
    
    Upstream version 1.3.0+dfsg
    
    # gpg: Signature faite le dim. 28 sept. 2014 22:44:12 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> »

 .rubocop.yml                            |   2 +
 .travis.yml                             |   2 +-
 Rakefile                                |   7 +-
 VERSION                                 |   1 -
 data/images/fractal.jpg                 | Bin 16342 -> 6644 bytes
 data/images/stef.jpg                    | Bin 2406 -> 2256 bytes
 lib/prawn.rb                            |   9 +-
 lib/prawn/document.rb                   |  35 +---
 lib/prawn/document/graphics_state.rb    |  73 -------
 lib/prawn/document/internals.rb         | 173 +++-------------
 lib/prawn/font.rb                       |  25 +--
 lib/prawn/font/ttf.rb                   |   2 +-
 lib/prawn/graphics.rb                   |  24 +--
 lib/prawn/graphics/cap_style.rb         |   2 +-
 lib/prawn/graphics/color.rb             |   6 +-
 lib/prawn/graphics/dash.rb              |   2 +-
 lib/prawn/graphics/join_style.rb        |   2 +-
 lib/prawn/graphics/patterns.rb          |   2 +-
 lib/prawn/graphics/transformation.rb    |   2 +-
 lib/prawn/graphics/transparency.rb      |   4 +-
 lib/prawn/grid.rb                       |  10 +-
 lib/prawn/images.rb                     |   4 +-
 lib/prawn/security.rb                   |   2 +-
 lib/prawn/soft_mask.rb                  |   6 +-
 lib/prawn/stamp.rb                      |   2 +-
 lib/prawn/text.rb                       |   8 +
 lib/prawn/text/formatted/fragment.rb    |  27 ++-
 lib/prawn/version.rb                    |   5 +
 lib/prawn/view.rb                       |  91 +++++++++
 manual/basic_concepts/basic_concepts.rb |   4 +-
 manual/basic_concepts/view.rb           |  42 ++++
 prawn.gemspec                           |  13 +-
 spec/document_spec.rb                   |  33 ++-
 spec/graphics_spec.rb                   |  22 +-
 spec/line_wrap_spec.rb                  |  17 +-
 spec/view_spec.rb                       |  43 ++++
 www/index.html                          | 196 ------------------
 www/media/bounding_boxes.pdf            | 146 -------------
 www/media/bounding_boxes.png            | Bin 43727 -> 0 bytes
 www/media/bounding_boxes_out.png        | Bin 15634 -> 0 bytes
 www/media/fancy_table.pdf               | 350 --------------------------------
 www/media/image.pdf                     | Bin 157917 -> 0 bytes
 www/media/images.png                    | Bin 27729 -> 0 bytes
 www/media/prawn_logo.png                | Bin 29635 -> 0 bytes
 www/media/tables.png                    | Bin 36211 -> 0 bytes
 www/media/utf8.pdf                      | Bin 374909 -> 0 bytes
 www/media/utf8.png                      | Bin 16890 -> 0 bytes
 www/prawn-Chinese.html                  | 113 -----------
 www/prawn.css                           |  86 --------
 www/twilight.css                        | 266 ------------------------
 50 files changed, 337 insertions(+), 1522 deletions(-)

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