prawn 0.11.1 → 0.15.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +7 -0
- data/.yardopts +10 -0
- data/COPYING +2 -2
- data/GPLv2 +340 -0
- data/GPLv3 +674 -0
- data/Gemfile +11 -0
- data/LICENSE +1 -1
- data/Rakefile +29 -38
- data/data/images/16bit.alpha +0 -0
- data/data/images/16bit.color +0 -0
- data/data/images/dice.alpha +0 -0
- data/data/images/dice.color +0 -0
- data/data/images/indexed_color.dat +0 -0
- data/data/images/indexed_color.png +0 -0
- data/data/images/page_white_text.alpha +0 -0
- data/data/images/page_white_text.color +0 -0
- data/data/pdfs/nested_pages.pdf +13 -13
- data/lib/prawn/document/bounding_box.rb +87 -12
- data/lib/prawn/document/column_box.rb +57 -28
- data/lib/prawn/document/graphics_state.rb +11 -74
- data/lib/prawn/document/internals.rb +25 -23
- data/lib/prawn/document/snapshot.rb +11 -8
- data/lib/prawn/document/span.rb +12 -10
- data/lib/prawn/document.rb +250 -194
- data/lib/prawn/encoding.rb +9 -10
- data/lib/prawn/errors.rb +18 -29
- data/lib/prawn/font/afm.rb +52 -41
- data/lib/prawn/font/dfont.rb +4 -3
- data/lib/prawn/font/ttf.rb +44 -48
- data/lib/prawn/font.rb +138 -88
- data/lib/prawn/font_metric_cache.rb +47 -0
- data/lib/prawn/graphics/cap_style.rb +4 -3
- data/lib/prawn/graphics/color.rb +13 -5
- data/lib/prawn/graphics/dash.rb +53 -31
- data/lib/prawn/graphics/join_style.rb +9 -7
- data/lib/prawn/graphics/patterns.rb +138 -0
- data/lib/prawn/graphics/transformation.rb +10 -9
- data/lib/prawn/graphics/transparency.rb +3 -1
- data/lib/prawn/graphics.rb +316 -61
- data/lib/prawn/image_handler.rb +36 -0
- data/lib/prawn/images/image.rb +49 -0
- data/lib/prawn/images/jpg.rb +21 -15
- data/lib/prawn/images/png.rb +62 -119
- data/lib/prawn/images.rb +89 -108
- data/lib/prawn/layout/grid.rb +66 -54
- data/lib/prawn/layout.rb +10 -15
- data/lib/prawn/measurement_extensions.rb +10 -6
- data/lib/prawn/measurements.rb +27 -21
- data/lib/prawn/outline.rb +6 -308
- data/lib/prawn/repeater.rb +11 -9
- data/lib/prawn/security/arcfour.rb +1 -0
- data/lib/prawn/security.rb +55 -33
- data/lib/prawn/soft_mask.rb +96 -0
- data/lib/prawn/stamp.rb +5 -3
- data/lib/prawn/table/cell/image.rb +69 -0
- data/lib/prawn/table/cell/in_table.rb +4 -2
- data/lib/prawn/table/cell/span_dummy.rb +93 -0
- data/lib/prawn/table/cell/subtable.rb +2 -2
- data/lib/prawn/table/cell/text.rb +44 -26
- data/lib/prawn/table/cell.rb +302 -50
- data/lib/prawn/table/cells.rb +147 -49
- data/lib/prawn/table/column_width_calculator.rb +61 -0
- data/lib/prawn/table.rb +297 -118
- data/lib/prawn/text/box.rb +21 -5
- data/lib/prawn/text/formatted/arranger.rb +290 -0
- data/lib/prawn/text/formatted/box.rb +103 -59
- data/lib/prawn/text/formatted/fragment.rb +34 -23
- data/lib/prawn/text/formatted/line_wrap.rb +266 -0
- data/lib/prawn/text/formatted/parser.rb +15 -5
- data/lib/prawn/text/formatted/wrap.rb +150 -0
- data/lib/prawn/text/formatted.rb +5 -4
- data/lib/prawn/text.rb +38 -24
- data/lib/prawn/utilities.rb +46 -0
- data/lib/prawn.rb +85 -20
- data/manual/basic_concepts/adding_pages.rb +27 -0
- data/manual/basic_concepts/basic_concepts.rb +34 -0
- data/manual/basic_concepts/creation.rb +39 -0
- data/manual/basic_concepts/cursor.rb +33 -0
- data/manual/basic_concepts/measurement.rb +25 -0
- data/manual/basic_concepts/origin.rb +38 -0
- data/manual/basic_concepts/other_cursor_helpers.rb +40 -0
- data/manual/bounding_box/bounding_box.rb +39 -0
- data/manual/bounding_box/bounds.rb +49 -0
- data/manual/bounding_box/canvas.rb +24 -0
- data/manual/bounding_box/creation.rb +23 -0
- data/manual/bounding_box/indentation.rb +46 -0
- data/manual/bounding_box/nesting.rb +45 -0
- data/manual/bounding_box/russian_boxes.rb +40 -0
- data/manual/bounding_box/stretchy.rb +31 -0
- data/manual/document_and_page_options/background.rb +27 -0
- data/manual/document_and_page_options/document_and_page_options.rb +32 -0
- data/manual/document_and_page_options/metadata.rb +23 -0
- data/manual/document_and_page_options/page_margins.rb +38 -0
- data/manual/document_and_page_options/page_size.rb +34 -0
- data/manual/document_and_page_options/print_scaling.rb +20 -0
- data/manual/example_file.rb +111 -0
- data/manual/example_helper.rb +411 -0
- data/manual/example_package.rb +53 -0
- data/manual/example_section.rb +46 -0
- data/manual/graphics/circle_and_ellipse.rb +22 -0
- data/manual/graphics/color.rb +24 -0
- data/manual/graphics/common_lines.rb +30 -0
- data/manual/graphics/fill_and_stroke.rb +42 -0
- data/manual/graphics/fill_rules.rb +37 -0
- data/manual/graphics/gradients.rb +37 -0
- data/manual/graphics/graphics.rb +58 -0
- data/manual/graphics/helper.rb +24 -0
- data/manual/graphics/line_width.rb +35 -0
- data/manual/graphics/lines_and_curves.rb +41 -0
- data/manual/graphics/polygon.rb +29 -0
- data/manual/graphics/rectangle.rb +21 -0
- data/manual/graphics/rotate.rb +28 -0
- data/manual/graphics/scale.rb +41 -0
- data/manual/graphics/soft_masks.rb +46 -0
- data/manual/graphics/stroke_cap.rb +31 -0
- data/manual/graphics/stroke_dash.rb +48 -0
- data/manual/graphics/stroke_join.rb +30 -0
- data/manual/graphics/translate.rb +29 -0
- data/manual/graphics/transparency.rb +35 -0
- data/manual/images/absolute_position.rb +23 -0
- data/manual/images/fit.rb +21 -0
- data/manual/images/horizontal.rb +25 -0
- data/manual/images/images.rb +40 -0
- data/manual/images/plain_image.rb +18 -0
- data/manual/images/scale.rb +22 -0
- data/manual/images/vertical.rb +28 -0
- data/manual/images/width_and_height.rb +25 -0
- data/manual/layout/boxes.rb +27 -0
- data/manual/layout/content.rb +25 -0
- data/manual/layout/layout.rb +28 -0
- data/manual/layout/simple_grid.rb +23 -0
- data/manual/manual/cover.rb +36 -0
- data/manual/manual/foreword.rb +85 -0
- data/manual/manual/how_to_read_this_manual.rb +41 -0
- data/manual/manual/manual.rb +34 -0
- data/manual/outline/add_subsection_to.rb +61 -0
- data/manual/outline/insert_section_after.rb +47 -0
- data/manual/outline/outline.rb +32 -0
- data/manual/outline/sections_and_pages.rb +67 -0
- data/manual/repeatable_content/page_numbering.rb +54 -0
- data/manual/repeatable_content/repeatable_content.rb +31 -0
- data/manual/repeatable_content/repeater.rb +55 -0
- data/manual/repeatable_content/stamp.rb +41 -0
- data/manual/security/encryption.rb +31 -0
- data/manual/security/permissions.rb +38 -0
- data/manual/security/security.rb +28 -0
- data/manual/syntax_highlight.rb +52 -0
- data/manual/table/basic_block.rb +53 -0
- data/manual/table/before_rendering_page.rb +26 -0
- data/manual/table/cell_border_lines.rb +24 -0
- data/manual/table/cell_borders_and_bg.rb +31 -0
- data/manual/table/cell_dimensions.rb +30 -0
- data/manual/table/cell_text.rb +38 -0
- data/manual/table/column_widths.rb +30 -0
- data/manual/table/content_and_subtables.rb +39 -0
- data/manual/table/creation.rb +27 -0
- data/manual/table/filtering.rb +36 -0
- data/manual/table/flow_and_header.rb +17 -0
- data/manual/table/image_cells.rb +33 -0
- data/manual/table/position.rb +29 -0
- data/manual/table/row_colors.rb +20 -0
- data/manual/table/span.rb +30 -0
- data/manual/table/style.rb +22 -0
- data/manual/table/table.rb +52 -0
- data/manual/table/width.rb +27 -0
- data/manual/text/alignment.rb +44 -0
- data/manual/text/color.rb +24 -0
- data/manual/text/column_box.rb +32 -0
- data/manual/text/fallback_fonts.rb +37 -0
- data/manual/text/font.rb +41 -0
- data/manual/text/font_size.rb +45 -0
- data/manual/text/font_style.rb +23 -0
- data/manual/text/formatted_callbacks.rb +60 -0
- data/manual/text/formatted_text.rb +54 -0
- data/manual/text/free_flowing_text.rb +51 -0
- data/manual/text/group.rb +31 -0
- data/manual/text/inline.rb +43 -0
- data/manual/text/kerning_and_character_spacing.rb +39 -0
- data/manual/text/leading.rb +25 -0
- data/manual/text/line_wrapping.rb +41 -0
- data/manual/text/paragraph_indentation.rb +26 -0
- data/manual/text/positioned_text.rb +38 -0
- data/manual/text/registering_families.rb +48 -0
- data/manual/text/rendering_and_color.rb +37 -0
- data/manual/text/right_to_left_text.rb +43 -0
- data/manual/text/rotation.rb +43 -0
- data/manual/text/single_usage.rb +37 -0
- data/manual/text/text.rb +75 -0
- data/manual/text/text_box_excess.rb +32 -0
- data/manual/text/text_box_extensions.rb +45 -0
- data/manual/text/text_box_overflow.rb +44 -0
- data/manual/text/utf8.rb +28 -0
- data/{examples/m17n → manual/text}/win_ansi_charset.rb +14 -10
- data/prawn.gemspec +27 -17
- data/spec/acceptance/png.rb +23 -0
- data/spec/annotations_spec.rb +16 -32
- data/spec/bounding_box_spec.rb +284 -2
- data/spec/cell_spec.rb +169 -38
- data/spec/column_box_spec.rb +65 -0
- data/spec/data/curves.pdf +66 -0
- data/spec/destinations_spec.rb +5 -5
- data/spec/document_spec.rb +212 -113
- data/spec/extensions/encoding_helpers.rb +9 -0
- data/spec/extensions/mocha.rb +2 -3
- data/spec/font_metric_cache_spec.rb +52 -0
- data/spec/font_spec.rb +205 -95
- data/spec/formatted_text_arranger_spec.rb +43 -43
- data/spec/formatted_text_box_spec.rb +63 -24
- data/spec/formatted_text_fragment_spec.rb +8 -8
- data/spec/graphics_spec.rb +175 -68
- data/spec/grid_spec.rb +26 -15
- data/spec/image_handler_spec.rb +54 -0
- data/spec/images_spec.rb +58 -30
- data/spec/inline_formatted_text_parser_spec.rb +73 -19
- data/spec/jpg_spec.rb +4 -4
- data/spec/line_wrap_spec.rb +28 -28
- data/spec/measurement_units_spec.rb +6 -6
- data/spec/object_store_spec.rb +17 -106
- data/spec/outline_spec.rb +103 -63
- data/spec/png_spec.rb +25 -25
- data/spec/reference_spec.rb +8 -65
- data/spec/repeater_spec.rb +25 -11
- data/spec/security_spec.rb +44 -12
- data/spec/snapshot_spec.rb +38 -6
- data/spec/soft_mask_spec.rb +117 -0
- data/spec/span_spec.rb +10 -15
- data/spec/spec_helper.rb +32 -8
- data/spec/stamp_spec.rb +29 -30
- data/spec/stroke_styles_spec.rb +36 -18
- data/spec/table/span_dummy_spec.rb +17 -0
- data/spec/table_spec.rb +850 -104
- data/spec/text_at_spec.rb +19 -33
- data/spec/text_box_spec.rb +117 -64
- data/spec/text_rendering_mode_spec.rb +5 -5
- data/spec/text_spacing_spec.rb +20 -2
- data/spec/text_spec.rb +111 -59
- data/spec/transparency_spec.rb +5 -5
- metadata +477 -328
- data/HACKING +0 -50
- data/README +0 -141
- data/data/fonts/Action Man.dfont +0 -0
- data/data/fonts/Activa.ttf +0 -0
- data/data/fonts/Chalkboard.ttf +0 -0
- data/data/fonts/DejaVuSans.ttf +0 -0
- data/data/fonts/Dustismo_Roman.ttf +0 -0
- data/data/fonts/comicsans.ttf +0 -0
- data/data/fonts/gkai00mp.ttf +0 -0
- data/data/images/16bit.dat +0 -0
- data/data/images/dice.dat +0 -0
- data/data/images/page_white_text.dat +0 -0
- data/data/images/rails.dat +0 -0
- data/data/images/rails.png +0 -0
- data/examples/bounding_box/bounding_boxes.rb +0 -44
- data/examples/bounding_box/indentation.rb +0 -35
- data/examples/bounding_box/russian_boxes.rb +0 -37
- data/examples/bounding_box/stretched_nesting.rb +0 -68
- data/examples/example_helper.rb +0 -8
- data/examples/general/background.rb +0 -24
- data/examples/general/canvas.rb +0 -16
- data/examples/general/context_sensitive_headers.rb +0 -38
- data/examples/general/float.rb +0 -12
- data/examples/general/margin.rb +0 -37
- data/examples/general/measurement_units.rb +0 -52
- data/examples/general/metadata-info.rb +0 -17
- data/examples/general/multi_page_layout.rb +0 -19
- data/examples/general/outlines.rb +0 -67
- data/examples/general/page_geometry.rb +0 -32
- data/examples/general/page_numbering.rb +0 -40
- data/examples/general/page_templates.rb +0 -20
- data/examples/general/repeaters.rb +0 -48
- data/examples/general/stamp.rb +0 -42
- data/examples/general/templates.rb +0 -14
- data/examples/graphics/basic_images.rb +0 -24
- data/examples/graphics/cmyk.rb +0 -13
- data/examples/graphics/curves.rb +0 -12
- data/examples/graphics/gradient.rb +0 -23
- data/examples/graphics/hexagon.rb +0 -14
- data/examples/graphics/image_fit.rb +0 -16
- data/examples/graphics/image_flow.rb +0 -38
- data/examples/graphics/image_position.rb +0 -18
- data/examples/graphics/line.rb +0 -33
- data/examples/graphics/png_types.rb +0 -23
- data/examples/graphics/polygons.rb +0 -17
- data/examples/graphics/remote_images.rb +0 -13
- data/examples/graphics/rounded_polygons.rb +0 -20
- data/examples/graphics/rounded_rectangle.rb +0 -21
- data/examples/graphics/ruport_style_helpers.rb +0 -20
- data/examples/graphics/stroke_bounds.rb +0 -21
- data/examples/graphics/stroke_cap_and_join.rb +0 -46
- data/examples/graphics/stroke_dash.rb +0 -43
- data/examples/graphics/transformations.rb +0 -53
- data/examples/graphics/transparency.rb +0 -27
- data/examples/grid/bounding_boxes.rb +0 -22
- data/examples/grid/column_gutter_grid.rb +0 -21
- data/examples/grid/multi_boxes.rb +0 -52
- data/examples/grid/show_grid.rb +0 -14
- data/examples/grid/simple_grid.rb +0 -21
- data/examples/m17n/chinese_text_wrapping.rb +0 -18
- data/examples/m17n/euro.rb +0 -16
- data/examples/m17n/full_win_ansi_character_list.rb +0 -20
- data/examples/m17n/sjis.rb +0 -29
- data/examples/m17n/utf8.rb +0 -14
- data/examples/security/hello_foo.rb +0 -9
- data/examples/table/bill.rb +0 -54
- data/examples/table/borders.rb +0 -25
- data/examples/table/cell.rb +0 -13
- data/examples/table/checkerboard.rb +0 -23
- data/examples/table/header.rb +0 -15
- data/examples/table/inline_format_table.rb +0 -13
- data/examples/table/multi_page_table.rb +0 -10
- data/examples/table/simple_table.rb +0 -25
- data/examples/table/subtable.rb +0 -13
- data/examples/table/widths.rb +0 -21
- data/examples/text/alignment.rb +0 -19
- data/examples/text/character_spacing.rb +0 -13
- data/examples/text/dfont.rb +0 -49
- data/examples/text/family_based_styling.rb +0 -25
- data/examples/text/font_calculations.rb +0 -92
- data/examples/text/font_size.rb +0 -34
- data/examples/text/hyphenation.rb +0 -45
- data/examples/text/indent_paragraphs.rb +0 -24
- data/examples/text/inline_format.rb +0 -104
- data/examples/text/kerning.rb +0 -31
- data/examples/text/rendering_mode.rb +0 -21
- data/examples/text/rotated.rb +0 -99
- data/examples/text/shaped_text_box.rb +0 -32
- data/examples/text/simple_text.rb +0 -18
- data/examples/text/simple_text_ttf.rb +0 -18
- data/examples/text/span.rb +0 -30
- data/examples/text/text_box.rb +0 -90
- data/examples/text/text_box_returning_excess.rb +0 -52
- data/examples/text/text_flow.rb +0 -68
- data/lib/prawn/compatibility.rb +0 -51
- data/lib/prawn/core/annotations.rb +0 -61
- data/lib/prawn/core/byte_string.rb +0 -9
- data/lib/prawn/core/destinations.rb +0 -90
- data/lib/prawn/core/document_state.rb +0 -78
- data/lib/prawn/core/literal_string.rb +0 -16
- data/lib/prawn/core/name_tree.rb +0 -165
- data/lib/prawn/core/object_store.rb +0 -264
- data/lib/prawn/core/page.rb +0 -213
- data/lib/prawn/core/pdf_object.rb +0 -108
- data/lib/prawn/core/reference.rb +0 -112
- data/lib/prawn/core/text/formatted/arranger.rb +0 -293
- data/lib/prawn/core/text/formatted/line_wrap.rb +0 -272
- data/lib/prawn/core/text/formatted/wrap.rb +0 -149
- data/lib/prawn/core/text.rb +0 -268
- data/lib/prawn/core.rb +0 -85
- data/lib/prawn/document/page_geometry.rb +0 -136
- data/lib/prawn/graphics/gradient.rb +0 -84
- data/spec/name_tree_spec.rb +0 -112
- data/spec/pdf_object_spec.rb +0 -170
- data/spec/template_spec.rb +0 -291
data/lib/prawn/table/cells.rb
CHANGED
@@ -8,14 +8,6 @@
|
|
8
8
|
|
9
9
|
module Prawn
|
10
10
|
class Table
|
11
|
-
|
12
|
-
# Returns a Cells object that can be used to select and style cells. See
|
13
|
-
# the Cells documentation for things you can do with cells.
|
14
|
-
#
|
15
|
-
def cells
|
16
|
-
@cell_proxy ||= Cells.new(@cells)
|
17
|
-
end
|
18
|
-
|
19
11
|
# Selects the given rows (0-based) for styling. Returns a Cells object --
|
20
12
|
# see the documentation on Cells for things you can do with cells.
|
21
13
|
#
|
@@ -45,6 +37,8 @@ module Prawn
|
|
45
37
|
#
|
46
38
|
class Cells < Array
|
47
39
|
|
40
|
+
# @group Experimental API
|
41
|
+
|
48
42
|
# Limits selection to the given row or rows. +row_spec+ can be anything
|
49
43
|
# that responds to the === operator selecting a set of 0-based row
|
50
44
|
# numbers; most commonly a number or a range.
|
@@ -53,12 +47,21 @@ module Prawn
|
|
53
47
|
# table.rows(3..4) # selects rows four and five
|
54
48
|
#
|
55
49
|
def rows(row_spec)
|
56
|
-
index_cells unless @indexed
|
57
|
-
row_spec = transform_spec(row_spec, @row_count)
|
58
|
-
Cells.new(@rows[row_spec] ||= select{ |c|
|
50
|
+
index_cells unless defined?(@indexed) && @indexed
|
51
|
+
row_spec = transform_spec(row_spec, @first_row, @row_count)
|
52
|
+
Cells.new(@rows[row_spec] ||= select { |c|
|
53
|
+
row_spec.respond_to?(:include?) ?
|
54
|
+
row_spec.include?(c.row) : row_spec === c.row })
|
59
55
|
end
|
60
56
|
alias_method :row, :rows
|
61
|
-
|
57
|
+
|
58
|
+
# Returns the number of rows in the list.
|
59
|
+
#
|
60
|
+
def row_count
|
61
|
+
index_cells unless defined?(@indexed) && @indexed
|
62
|
+
@row_count
|
63
|
+
end
|
64
|
+
|
62
65
|
# Limits selection to the given column or columns. +col_spec+ can be
|
63
66
|
# anything that responds to the === operator selecting a set of 0-based
|
64
67
|
# column numbers; most commonly a number or a range.
|
@@ -67,12 +70,21 @@ module Prawn
|
|
67
70
|
# table.columns(3..4) # selects columns four and five
|
68
71
|
#
|
69
72
|
def columns(col_spec)
|
70
|
-
index_cells unless @indexed
|
71
|
-
col_spec = transform_spec(col_spec, @column_count)
|
72
|
-
Cells.new(@columns[col_spec] ||= select{ |c|
|
73
|
+
index_cells unless defined?(@indexed) && @indexed
|
74
|
+
col_spec = transform_spec(col_spec, @first_column, @column_count)
|
75
|
+
Cells.new(@columns[col_spec] ||= select { |c|
|
76
|
+
col_spec.respond_to?(:include?) ?
|
77
|
+
col_spec.include?(c.column) : col_spec === c.column })
|
73
78
|
end
|
74
79
|
alias_method :column, :columns
|
75
80
|
|
81
|
+
# Returns the number of columns in the list.
|
82
|
+
#
|
83
|
+
def column_count
|
84
|
+
index_cells unless defined?(@indexed) && @indexed
|
85
|
+
@column_count
|
86
|
+
end
|
87
|
+
|
76
88
|
# Allows you to filter the given cells by arbitrary properties.
|
77
89
|
#
|
78
90
|
# table.column(4).filter { |cell| cell.content =~ /Yes/ }.
|
@@ -84,11 +96,37 @@ module Prawn
|
|
84
96
|
|
85
97
|
# Retrieves a cell based on its 0-based row and column. Returns an
|
86
98
|
# individual Cell, not a Cells collection.
|
87
|
-
#
|
99
|
+
#
|
88
100
|
# table.cells[0, 0].content # => "First cell content"
|
89
101
|
#
|
90
102
|
def [](row, col)
|
91
|
-
|
103
|
+
return nil if empty?
|
104
|
+
index_cells unless defined?(@indexed) && @indexed
|
105
|
+
row_array, col_array = @rows[@first_row + row] || [], @columns[@first_column + col] || []
|
106
|
+
if row_array.length < col_array.length
|
107
|
+
row_array.find { |c| c.column == @first_column + col }
|
108
|
+
else
|
109
|
+
col_array.find { |c| c.row == @first_row + row }
|
110
|
+
end
|
111
|
+
end
|
112
|
+
|
113
|
+
# Puts a cell in the collection at the given position. Internal use only.
|
114
|
+
#
|
115
|
+
def []=(row, col, cell) # :nodoc:
|
116
|
+
cell.extend(Cell::InTable)
|
117
|
+
cell.row = row
|
118
|
+
cell.column = col
|
119
|
+
|
120
|
+
if defined?(@indexed) && @indexed
|
121
|
+
(@rows[row] ||= []) << cell
|
122
|
+
(@columns[col] ||= []) << cell
|
123
|
+
@first_row = row if !@first_row || row < @first_row
|
124
|
+
@first_column = col if !@first_column || col < @first_column
|
125
|
+
@row_count = @rows.size
|
126
|
+
@column_count = @columns.size
|
127
|
+
end
|
128
|
+
|
129
|
+
self << cell
|
92
130
|
end
|
93
131
|
|
94
132
|
# Supports setting multiple properties at once.
|
@@ -106,51 +144,42 @@ module Prawn
|
|
106
144
|
# table.cells.style { |cell| cell.border_width += 12 }
|
107
145
|
#
|
108
146
|
def style(options={}, &block)
|
109
|
-
each
|
147
|
+
each do |cell|
|
148
|
+
next if cell.is_a?(Cell::SpanDummy)
|
149
|
+
cell.style(options, &block)
|
150
|
+
end
|
110
151
|
end
|
111
152
|
|
112
153
|
# Returns the total width of all columns in the selected set.
|
113
154
|
#
|
114
155
|
def width
|
115
|
-
|
116
|
-
each do |cell|
|
117
|
-
|
118
|
-
|
156
|
+
widths = {}
|
157
|
+
each do |cell|
|
158
|
+
per_cell_width = cell.width_ignoring_span.to_f / cell.colspan
|
159
|
+
cell.colspan.times do |n|
|
160
|
+
widths[cell.column+n] = [widths[cell.column+n], per_cell_width].
|
161
|
+
compact.max
|
162
|
+
end
|
119
163
|
end
|
120
|
-
|
164
|
+
widths.values.inject(0, &:+)
|
121
165
|
end
|
122
166
|
|
123
167
|
# Returns minimum width required to contain cells in the set.
|
124
168
|
#
|
125
169
|
def min_width
|
126
|
-
|
127
|
-
each do |cell|
|
128
|
-
column_min_widths[cell.column] =
|
129
|
-
[column_min_widths[cell.column], cell.min_width].compact.max
|
130
|
-
end
|
131
|
-
column_min_widths.values.inject(0) { |sum, width| sum + width }
|
170
|
+
aggregate_cell_values(:column, :avg_spanned_min_width, :max)
|
132
171
|
end
|
133
172
|
|
134
173
|
# Returns maximum width that can contain cells in the set.
|
135
174
|
#
|
136
175
|
def max_width
|
137
|
-
|
138
|
-
each do |cell|
|
139
|
-
column_max_widths[cell.column] =
|
140
|
-
[column_max_widths[cell.column], cell.max_width].compact.min
|
141
|
-
end
|
142
|
-
column_max_widths.values.inject(0) { |sum, width| sum + width }
|
176
|
+
aggregate_cell_values(:column, :max_width_ignoring_span, :max)
|
143
177
|
end
|
144
178
|
|
145
179
|
# Returns the total height of all rows in the selected set.
|
146
180
|
#
|
147
181
|
def height
|
148
|
-
|
149
|
-
each do |cell|
|
150
|
-
row_heights[cell.row] =
|
151
|
-
[row_heights[cell.row], cell.height].compact.max
|
152
|
-
end
|
153
|
-
row_heights.values.inject(0) { |sum, width| sum + width }
|
182
|
+
aggregate_cell_values(:row, :height_ignoring_span, :max)
|
154
183
|
end
|
155
184
|
|
156
185
|
# Supports setting arbitrary properties on a group of cells.
|
@@ -158,17 +187,21 @@ module Prawn
|
|
158
187
|
# table.cells.row(3..6).background_color = 'cc0000'
|
159
188
|
#
|
160
189
|
def method_missing(id, *args, &block)
|
161
|
-
|
190
|
+
if id.to_s =~ /=\z/
|
191
|
+
each { |c| c.send(id, *args, &block) if c.respond_to?(id) }
|
192
|
+
else
|
193
|
+
super
|
194
|
+
end
|
162
195
|
end
|
163
196
|
|
164
197
|
protected
|
165
|
-
|
198
|
+
|
166
199
|
# Defers indexing until rows() or columns() is actually called on the
|
167
200
|
# Cells object. Without this, we would needlessly index the leaf nodes of
|
168
201
|
# the object graph, the ones that are only there to be iterated over.
|
169
202
|
#
|
170
203
|
# Make sure to call this before using @rows or @columns.
|
171
|
-
#
|
204
|
+
#
|
172
205
|
def index_cells
|
173
206
|
@rows = {}
|
174
207
|
@columns = {}
|
@@ -181,24 +214,89 @@ module Prawn
|
|
181
214
|
@columns[cell.column] << cell
|
182
215
|
end
|
183
216
|
|
217
|
+
@first_row = @rows.keys.min
|
218
|
+
@first_column = @columns.keys.min
|
219
|
+
|
184
220
|
@row_count = @rows.size
|
185
221
|
@column_count = @columns.size
|
186
222
|
|
187
223
|
@indexed = true
|
188
224
|
end
|
189
225
|
|
226
|
+
# Sum up a min/max value over rows or columns in the cells selected.
|
227
|
+
# Takes the min/max (per +aggregate+) of the result of sending +meth+ to
|
228
|
+
# each cell, grouped by +row_or_column+.
|
229
|
+
#
|
230
|
+
def aggregate_cell_values(row_or_column, meth, aggregate)
|
231
|
+
values = {}
|
232
|
+
|
233
|
+
#calculate values for all cells that do not span accross multiple cells
|
234
|
+
#this ensures that we don't have a problem if the first line includes
|
235
|
+
#a cell that spans across multiple cells
|
236
|
+
each do |cell|
|
237
|
+
#don't take spanned cells
|
238
|
+
if cell.colspan == 1 and cell.class != Prawn::Table::Cell::SpanDummy
|
239
|
+
index = cell.send(row_or_column)
|
240
|
+
values[index] = [values[index], cell.send(meth)].compact.send(aggregate)
|
241
|
+
end
|
242
|
+
end
|
243
|
+
|
244
|
+
#if there are only colspanned or rowspanned cells in a table
|
245
|
+
spanned_width_needs_fixing = true
|
246
|
+
|
247
|
+
each do |cell|
|
248
|
+
index = cell.send(row_or_column)
|
249
|
+
if cell.colspan > 1
|
250
|
+
#calculate current (old) return value before we do anything
|
251
|
+
old_sum = 0
|
252
|
+
cell.colspan.times { |i|
|
253
|
+
old_sum += values[index+i] unless values[index+i].nil?
|
254
|
+
}
|
255
|
+
|
256
|
+
#calculate future return value
|
257
|
+
new_sum = cell.send(meth) * cell.colspan
|
258
|
+
|
259
|
+
#due to float rounding errors we need to ignore a small difference in the new
|
260
|
+
#and the old sum the same had to be done in
|
261
|
+
#the column_width_calculator#natural_width
|
262
|
+
spanned_width_needs_fixing = ((new_sum - old_sum) > Prawn::FLOAT_PRECISION)
|
263
|
+
|
264
|
+
if spanned_width_needs_fixing
|
265
|
+
#not entirely sure why we need this line, but with it the tests pass
|
266
|
+
values[index] = [values[index], cell.send(meth)].compact.send(aggregate)
|
267
|
+
#overwrite the old values with the new ones, but only if all entries existed
|
268
|
+
entries_exist = true
|
269
|
+
cell.colspan.times { |i| entries_exist = false if values[index+i].nil? }
|
270
|
+
cell.colspan.times { |i|
|
271
|
+
values[index+i] = cell.send(meth) if entries_exist
|
272
|
+
}
|
273
|
+
end
|
274
|
+
else
|
275
|
+
if spanned_width_needs_fixing && cell.class == Prawn::Table::Cell::SpanDummy
|
276
|
+
values[index] = [values[index], cell.send(meth)].compact.send(aggregate)
|
277
|
+
end
|
278
|
+
end
|
279
|
+
end
|
280
|
+
values.values.inject(0, &:+)
|
281
|
+
end
|
282
|
+
|
190
283
|
# Transforms +spec+, a column / row specification, into an object that
|
191
284
|
# can be compared against a row or column number using ===. Normalizes
|
192
|
-
# negative indices to be positive, given a total size of +total+.
|
285
|
+
# negative indices to be positive, given a total size of +total+. The
|
286
|
+
# first row/column is indicated by +first+; this value is considered row
|
287
|
+
# or column 0.
|
193
288
|
#
|
194
|
-
def transform_spec(spec, total)
|
289
|
+
def transform_spec(spec, first, total)
|
195
290
|
case spec
|
196
291
|
when Range
|
197
|
-
transform_spec(spec.begin,
|
292
|
+
transform_spec(spec.begin, first, total) ..
|
293
|
+
transform_spec(spec.end, first, total)
|
198
294
|
when Integer
|
199
|
-
spec < 0 ? (total + spec) : spec
|
295
|
+
spec < 0 ? (first + total + spec) : first + spec
|
296
|
+
when Enumerable
|
297
|
+
spec.map { |x| first + x }
|
200
298
|
else # pass through
|
201
|
-
spec
|
299
|
+
raise "Don't understand spec #{spec.inspect}"
|
202
300
|
end
|
203
301
|
end
|
204
302
|
end
|
@@ -0,0 +1,61 @@
|
|
1
|
+
module Prawn
|
2
|
+
class Table
|
3
|
+
# @private
|
4
|
+
class ColumnWidthCalculator
|
5
|
+
def initialize(cells)
|
6
|
+
@cells = cells
|
7
|
+
|
8
|
+
@widths_by_column = Hash.new(0)
|
9
|
+
@rows_with_a_span_dummy = Hash.new(false)
|
10
|
+
end
|
11
|
+
|
12
|
+
def natural_widths
|
13
|
+
@cells.each do |cell|
|
14
|
+
@rows_with_a_span_dummy[cell.row] = true if cell.is_a?(Cell::SpanDummy)
|
15
|
+
end
|
16
|
+
|
17
|
+
#calculate natural column width for all rows that do not include a span dummy
|
18
|
+
@cells.each do |cell|
|
19
|
+
unless @rows_with_a_span_dummy[cell.row]
|
20
|
+
@widths_by_column[cell.column] =
|
21
|
+
[@widths_by_column[cell.column], cell.width.to_f].max
|
22
|
+
end
|
23
|
+
end
|
24
|
+
|
25
|
+
#integrate natural column widths for all rows that do include a span dummy
|
26
|
+
@cells.each do |cell|
|
27
|
+
next unless @rows_with_a_span_dummy[cell.row]
|
28
|
+
#the width of a SpanDummy cell will be calculated by the "mother" cell
|
29
|
+
next if cell.is_a?(Cell::SpanDummy)
|
30
|
+
|
31
|
+
if cell.colspan == 1
|
32
|
+
@widths_by_column[cell.column] =
|
33
|
+
[@widths_by_column[cell.column], cell.width.to_f].max
|
34
|
+
else
|
35
|
+
#calculate the current with of all cells that will be spanned by the current cell
|
36
|
+
current_width_of_spanned_cells =
|
37
|
+
@widths_by_column.to_a[cell.column..(cell.column + cell.colspan - 1)]
|
38
|
+
.collect{|key, value| value}.inject(0, :+)
|
39
|
+
|
40
|
+
#update the Hash only if the new with is at least equal to the old one
|
41
|
+
#due to arithmetic errors we need to ignore a small difference in the new and the old sum
|
42
|
+
#the same had to be done in the column_widht_calculator#natural_width
|
43
|
+
update_hash = ((cell.width.to_f - current_width_of_spanned_cells) >
|
44
|
+
Prawn::FLOAT_PRECISION)
|
45
|
+
|
46
|
+
if update_hash
|
47
|
+
# Split the width of colspanned cells evenly by columns
|
48
|
+
width_per_column = cell.width.to_f / cell.colspan
|
49
|
+
# Update the Hash
|
50
|
+
cell.colspan.times do |i|
|
51
|
+
@widths_by_column[cell.column + i] = width_per_column
|
52
|
+
end
|
53
|
+
end
|
54
|
+
end
|
55
|
+
end
|
56
|
+
|
57
|
+
@widths_by_column.sort_by { |col, _| col }.map { |_, w| w }
|
58
|
+
end
|
59
|
+
end
|
60
|
+
end
|
61
|
+
end
|