[DRE-commits] [ruby-prawn] 05/15: Merge tag 'upstream/1.2.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-prawn.

commit bd2efe48b07097e28fef41ec3b6e6f1941964dd6
Merge: 7897739 c77b4f7
Author: Cédric Boutillier <boutil at debian.org>
Date:   Wed Aug 6 00:06:53 2014 +0200

    Merge tag 'upstream/1.2.1'
    
    Upstream version 1.2.1
    
    # gpg: Signature faite le mer. 06 août 2014 00:06:50 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 +
 README.md                                  |    1 -
 VERSION                                    |    2 +-
 data/fonts/DejaVuSans.ttf                  |  Bin 0 -> 606452 bytes
 data/fonts/Dustismo_Roman.ttf              |  Bin 0 -> 105340 bytes
 data/fonts/gkai00mp.ttf                    |  Bin 0 -> 4633128 bytes
 data/images/16bit.alpha                    |  Bin 0 -> 2080 bytes
 data/images/16bit.color                    |  Bin 0 -> 6176 bytes
 data/images/16bit.png                      |  Bin 0 -> 3435 bytes
 data/images/arrow.png                      |  Bin 0 -> 1059 bytes
 data/images/arrow2.png                     |  Bin 0 -> 197 bytes
 data/images/dice.alpha                     |  Bin 0 -> 77040 bytes
 data/images/dice.color                     |  Bin 0 -> 230640 bytes
 data/images/dice.png                       |  Bin 0 -> 58618 bytes
 data/images/dice_interlaced.png            |  Bin 0 -> 77786 bytes
 data/images/fractal.jpg                    |  Bin 16342 -> 37174 bytes
 data/images/letterhead.jpg                 |  Bin 0 -> 11415 bytes
 data/images/page_white_text.alpha          |  Bin 0 -> 272 bytes
 data/images/page_white_text.color          |  Bin 0 -> 272 bytes
 data/images/page_white_text.png            |  Bin 0 -> 342 bytes
 data/images/pigs.jpg                       |  Bin 9706 -> 79767 bytes
 data/images/ruport.png                     |  Bin 0 -> 11780 bytes
 data/images/ruport_data.dat                |  Bin 0 -> 10994 bytes
 data/images/ruport_transparent.png         |  Bin 0 -> 13038 bytes
 data/images/ruport_type0.png               |  Bin 0 -> 5771 bytes
 data/images/stef.jpg                       |  Bin 2406 -> 4520 bytes
 data/images/tru256.bmp                     |  Bin 0 -> 49206 bytes
 data/images/web-links.dat                  |    1 +
 data/images/web-links.png                  |  Bin 0 -> 228 bytes
 lib/prawn.rb                               |    4 +-
 lib/prawn/table.rb                         |  644 ------------
 lib/prawn/table/cell.rb                    |  772 --------------
 lib/prawn/table/cell/image.rb              |   69 --
 lib/prawn/table/cell/in_table.rb           |   33 -
 lib/prawn/table/cell/span_dummy.rb         |   93 --
 lib/prawn/table/cell/subtable.rb           |   66 --
 lib/prawn/table/cell/text.rb               |  154 ---
 lib/prawn/table/cells.rb                   |  255 -----
 lib/prawn/table/column_width_calculator.rb |  182 ----
 lib/prawn/text/box.rb                      |    2 +
 lib/prawn/text/formatted/box.rb            |   67 +-
 lib/prawn/text/formatted/line_wrap.rb      |   10 +-
 lib/prawn/text/formatted/wrap.rb           |    4 +-
 manual/contents.rb                         |    2 +-
 manual/example_helper.rb                   |    1 -
 manual/table.rb                            |   16 +
 manual/table/basic_block.rb                |   53 -
 manual/table/before_rendering_page.rb      |   26 -
 manual/table/cell_border_lines.rb          |   24 -
 manual/table/cell_borders_and_bg.rb        |   31 -
 manual/table/cell_dimensions.rb            |   30 -
 manual/table/cell_text.rb                  |   38 -
 manual/table/column_widths.rb              |   30 -
 manual/table/content_and_subtables.rb      |   39 -
 manual/table/creation.rb                   |   27 -
 manual/table/filtering.rb                  |   36 -
 manual/table/flow_and_header.rb            |   17 -
 manual/table/image_cells.rb                |   33 -
 manual/table/position.rb                   |   29 -
 manual/table/row_colors.rb                 |   20 -
 manual/table/span.rb                       |   30 -
 manual/table/style.rb                      |   22 -
 manual/table/table.rb                      |   52 -
 manual/table/width.rb                      |   27 -
 manual/text/text_box_overflow.rb           |    4 +
 prawn.gemspec                              |    5 +-
 spec/cell_spec.rb                          |  629 ------------
 spec/formatted_text_box_spec.rb            |   22 +
 spec/line_wrap_spec.rb                     |    4 +
 spec/table/span_dummy_spec.rb              |   17 -
 spec/table_spec.rb                         | 1527 ----------------------------
 spec/text_box_spec.rb                      |   28 +
 spec/text_spec.rb                          |   19 +
 73 files changed, 161 insertions(+), 5038 deletions(-)

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