prawn 0.13.0 → 2.4.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +5 -5
- checksums.yaml.gz.sig +0 -0
- data/.yardopts +10 -0
- data/GPLv2 +20 -21
- data/Gemfile +3 -16
- data/Rakefile +17 -39
- data/lib/prawn/document/bounding_box.rb +85 -42
- data/lib/prawn/document/column_box.rb +21 -11
- data/lib/prawn/document/internals.rb +40 -147
- data/lib/prawn/document/span.rb +25 -17
- data/lib/prawn/document.rb +286 -245
- data/lib/prawn/encoding.rb +68 -101
- data/lib/prawn/errors.rb +47 -43
- data/lib/prawn/font.rb +204 -155
- data/lib/prawn/font_metric_cache.rb +25 -21
- data/lib/prawn/fonts/afm.rb +292 -0
- data/lib/prawn/{font → fonts}/dfont.rb +7 -13
- data/lib/prawn/fonts/otf.rb +11 -0
- data/lib/prawn/fonts/ttc.rb +36 -0
- data/lib/prawn/{font → fonts}/ttf.rb +142 -80
- data/lib/prawn/graphics/blend_mode.rb +65 -0
- data/lib/prawn/graphics/cap_style.rb +6 -5
- data/lib/prawn/graphics/color.rb +47 -44
- data/lib/prawn/graphics/dash.rb +30 -13
- data/lib/prawn/graphics/join_style.rb +13 -6
- data/lib/prawn/graphics/patterns.rb +221 -90
- data/lib/prawn/graphics/transformation.rb +21 -12
- data/lib/prawn/graphics/transparency.rb +21 -17
- data/lib/prawn/graphics.rb +155 -128
- data/lib/prawn/{layout/grid.rb → grid.rb} +110 -47
- data/lib/prawn/image_handler.rb +16 -2
- data/lib/prawn/images/image.rb +4 -2
- data/lib/prawn/images/jpg.rb +39 -30
- data/lib/prawn/images/png.rb +132 -169
- data/lib/prawn/images.rb +70 -62
- data/lib/prawn/measurement_extensions.rb +15 -10
- data/lib/prawn/measurements.rb +22 -23
- data/lib/prawn/outline.rb +301 -13
- data/lib/prawn/repeater.rb +19 -17
- data/lib/prawn/security/arcfour.rb +54 -0
- data/lib/prawn/security.rb +108 -86
- data/lib/prawn/soft_mask.rb +40 -41
- data/lib/prawn/stamp.rb +29 -12
- data/lib/prawn/text/box.rb +27 -29
- data/lib/prawn/text/formatted/arranger.rb +110 -67
- data/lib/prawn/text/formatted/box.rb +233 -165
- data/lib/prawn/text/formatted/fragment.rb +27 -27
- data/lib/prawn/text/formatted/line_wrap.rb +137 -97
- data/lib/prawn/text/formatted/parser.rb +149 -127
- data/lib/prawn/text/formatted/wrap.rb +57 -37
- data/lib/prawn/text/formatted.rb +6 -4
- data/lib/prawn/text.rb +105 -73
- data/lib/prawn/transformation_stack.rb +44 -0
- data/lib/prawn/utilities.rb +11 -21
- data/lib/prawn/version.rb +5 -0
- data/lib/prawn/view.rb +101 -0
- data/lib/prawn.rb +42 -68
- data/{data/images/fractal.jpg → manual/absolute_position.pdf} +0 -0
- data/manual/basic_concepts/adding_pages.rb +9 -10
- data/manual/basic_concepts/basic_concepts.rb +33 -24
- data/manual/basic_concepts/creation.rb +10 -11
- data/manual/basic_concepts/cursor.rb +9 -10
- data/manual/basic_concepts/measurement.rb +10 -11
- data/manual/basic_concepts/origin.rb +8 -9
- data/manual/basic_concepts/other_cursor_helpers.rb +17 -18
- data/manual/basic_concepts/view.rb +48 -0
- data/manual/bounding_box/bounding_box.rb +31 -29
- data/manual/bounding_box/bounds.rb +17 -18
- data/manual/bounding_box/canvas.rb +8 -9
- data/manual/bounding_box/creation.rb +8 -9
- data/manual/bounding_box/indentation.rb +22 -23
- data/manual/bounding_box/nesting.rb +32 -25
- data/manual/bounding_box/russian_boxes.rb +19 -19
- data/manual/bounding_box/stretchy.rb +18 -20
- data/manual/contents.rb +35 -0
- data/manual/cover.rb +43 -0
- data/manual/document_and_page_options/background.rb +16 -14
- data/manual/document_and_page_options/document_and_page_options.rb +26 -23
- data/manual/document_and_page_options/metadata.rb +21 -19
- data/manual/document_and_page_options/page_margins.rb +20 -22
- data/manual/document_and_page_options/page_size.rb +15 -15
- data/manual/document_and_page_options/print_scaling.rb +23 -0
- data/manual/example_helper.rb +5 -408
- data/manual/graphics/blend_mode.rb +52 -0
- data/manual/graphics/circle_and_ellipse.rb +8 -9
- data/manual/graphics/color.rb +11 -13
- data/manual/graphics/common_lines.rb +13 -12
- data/manual/graphics/fill_and_stroke.rb +10 -11
- data/manual/graphics/fill_rules.rb +13 -12
- data/manual/graphics/gradients.rb +28 -22
- data/manual/graphics/graphics.rb +52 -46
- data/manual/graphics/helper.rb +20 -10
- data/manual/graphics/line_width.rb +13 -12
- data/manual/graphics/lines_and_curves.rb +13 -14
- data/manual/graphics/polygon.rb +10 -12
- data/manual/graphics/rectangle.rb +7 -8
- data/manual/graphics/rotate.rb +9 -12
- data/manual/graphics/scale.rb +19 -18
- data/manual/graphics/soft_masks.rb +5 -7
- data/manual/graphics/stroke_cap.rb +10 -11
- data/manual/graphics/stroke_dash.rb +16 -17
- data/manual/graphics/stroke_join.rb +10 -11
- data/manual/graphics/translate.rb +13 -13
- data/manual/graphics/transparency.rb +11 -13
- data/manual/{manual/how_to_read_this_manual.rb → how_to_read_this_manual.rb} +23 -25
- data/manual/images/absolute_position.rb +9 -10
- data/manual/images/fit.rb +9 -10
- data/manual/images/horizontal.rb +13 -14
- data/manual/images/images.rb +31 -30
- data/manual/images/plain_image.rb +6 -7
- data/manual/images/scale.rb +12 -13
- data/manual/images/vertical.rb +19 -17
- data/manual/images/width_and_height.rb +13 -14
- data/manual/layout/boxes.rb +14 -15
- data/manual/layout/content.rb +12 -13
- data/manual/layout/layout.rb +19 -20
- data/manual/layout/simple_grid.rb +8 -9
- data/manual/outline/add_subsection_to.rb +26 -27
- data/manual/outline/insert_section_after.rb +19 -20
- data/manual/outline/outline.rb +23 -22
- data/manual/outline/sections_and_pages.rb +24 -25
- data/manual/repeatable_content/alternate_page_numbering.rb +36 -0
- data/manual/repeatable_content/page_numbering.rb +20 -19
- data/manual/repeatable_content/repeatable_content.rb +26 -22
- data/manual/repeatable_content/repeater.rb +18 -19
- data/manual/repeatable_content/stamp.rb +18 -19
- data/manual/security/encryption.rb +8 -11
- data/manual/security/permissions.rb +20 -15
- data/manual/security/security.rb +20 -20
- data/manual/table.rb +16 -0
- data/manual/text/alignment.rb +17 -18
- data/manual/text/color.rb +13 -13
- data/manual/text/column_box.rb +10 -12
- data/manual/text/fallback_fonts.rb +29 -25
- data/manual/text/font.rb +17 -18
- data/manual/text/font_size.rb +21 -22
- data/manual/text/font_style.rb +12 -10
- data/manual/text/formatted_callbacks.rb +36 -26
- data/manual/text/formatted_text.rb +41 -34
- data/manual/text/free_flowing_text.rb +28 -29
- data/manual/text/inline.rb +23 -26
- data/manual/text/kerning_and_character_spacing.rb +20 -21
- data/manual/text/leading.rb +10 -11
- data/manual/text/line_wrapping.rb +40 -21
- data/manual/text/paragraph_indentation.rb +17 -12
- data/manual/text/positioned_text.rb +19 -20
- data/manual/text/registering_families.rb +33 -30
- data/manual/text/rendering_and_color.rb +11 -12
- data/manual/text/right_to_left_text.rb +31 -20
- data/manual/text/rotation.rb +36 -27
- data/manual/text/single_usage.rb +13 -14
- data/manual/text/text.rb +62 -62
- data/manual/text/text_box_excess.rb +22 -19
- data/manual/text/text_box_extensions.rb +21 -18
- data/manual/text/text_box_overflow.rb +28 -21
- data/manual/text/utf8.rb +16 -17
- data/manual/text/win_ansi_charset.rb +29 -26
- data/prawn.gemspec +45 -43
- data/spec/extensions/encoding_helpers.rb +4 -3
- data/spec/prawn/document/bounding_box_spec.rb +550 -0
- data/spec/prawn/document/column_box_spec.rb +75 -0
- data/spec/prawn/document/security_spec.rb +176 -0
- data/spec/prawn/document_annotations_spec.rb +76 -0
- data/spec/prawn/document_destinations_spec.rb +15 -0
- data/spec/prawn/document_grid_spec.rb +99 -0
- data/spec/prawn/document_reference_spec.rb +27 -0
- data/spec/prawn/document_span_spec.rb +44 -0
- data/spec/prawn/document_spec.rb +805 -0
- data/spec/prawn/font_metric_cache_spec.rb +54 -0
- data/spec/prawn/font_spec.rb +544 -0
- data/spec/prawn/graphics/blend_mode_spec.rb +63 -0
- data/spec/prawn/graphics/transparency_spec.rb +81 -0
- data/spec/prawn/graphics_spec.rb +872 -0
- data/spec/prawn/graphics_stroke_styles_spec.rb +229 -0
- data/spec/prawn/image_handler_spec.rb +53 -0
- data/spec/prawn/images/jpg_spec.rb +20 -0
- data/spec/prawn/images/png_spec.rb +283 -0
- data/spec/prawn/images_spec.rb +229 -0
- data/spec/prawn/measurements_extensions_spec.rb +24 -0
- data/spec/prawn/outline_spec.rb +512 -0
- data/spec/prawn/repeater_spec.rb +166 -0
- data/spec/prawn/soft_mask_spec.rb +74 -0
- data/spec/prawn/stamp_spec.rb +173 -0
- data/spec/prawn/text/box_spec.rb +1110 -0
- data/spec/prawn/text/formatted/arranger_spec.rb +466 -0
- data/spec/prawn/text/formatted/box_spec.rb +849 -0
- data/spec/prawn/text/formatted/fragment_spec.rb +343 -0
- data/spec/prawn/text/formatted/line_wrap_spec.rb +495 -0
- data/spec/prawn/text/formatted/parser_spec.rb +697 -0
- data/spec/prawn/text_draw_text_spec.rb +150 -0
- data/spec/prawn/text_rendering_mode_spec.rb +48 -0
- data/spec/prawn/text_spacing_spec.rb +95 -0
- data/spec/prawn/text_spec.rb +603 -0
- data/spec/prawn/text_with_inline_formatting_spec.rb +35 -0
- data/spec/prawn/transformation_stack_spec.rb +66 -0
- data/spec/prawn/view_spec.rb +63 -0
- data/spec/prawn_manual_spec.rb +35 -0
- data/spec/spec_helper.rb +22 -21
- data.tar.gz.sig +0 -0
- metadata +168 -307
- metadata.gz.sig +0 -0
- data/README.md +0 -109
- data/data/encodings/win_ansi.txt +0 -29
- data/data/images/16bit.alpha +0 -0
- data/data/images/16bit.dat +0 -0
- data/data/images/16bit.png +0 -0
- data/data/images/arrow.png +0 -0
- data/data/images/arrow2.png +0 -0
- data/data/images/barcode_issue.png +0 -0
- data/data/images/dice.alpha +0 -0
- data/data/images/dice.dat +0 -0
- data/data/images/dice.png +0 -0
- data/data/images/dice_interlaced.png +0 -0
- data/data/images/indexed_color.dat +0 -0
- data/data/images/indexed_color.png +0 -0
- data/data/images/letterhead.jpg +0 -0
- data/data/images/page_white_text.alpha +0 -0
- data/data/images/page_white_text.dat +0 -0
- data/data/images/page_white_text.png +0 -0
- data/data/images/pigs.jpg +0 -0
- data/data/images/prawn.png +0 -0
- data/data/images/ruport.png +0 -0
- data/data/images/ruport_data.dat +0 -0
- data/data/images/ruport_transparent.png +0 -0
- data/data/images/ruport_type0.png +0 -0
- data/data/images/stef.jpg +0 -0
- data/data/images/tru256.bmp +0 -0
- data/data/images/web-links.dat +0 -1
- data/data/images/web-links.png +0 -0
- data/data/pdfs/complex_template.pdf +0 -0
- data/data/pdfs/contains_ttf_font.pdf +0 -0
- data/data/pdfs/encrypted.pdf +0 -0
- data/data/pdfs/form.pdf +1 -819
- data/data/pdfs/hexagon.pdf +0 -61
- data/data/pdfs/indirect_reference.pdf +0 -86
- data/data/pdfs/multipage_template.pdf +0 -127
- data/data/pdfs/nested_pages.pdf +0 -118
- data/data/pdfs/page_without_mediabox.pdf +0 -193
- data/data/pdfs/resources_as_indirect_object.pdf +0 -83
- data/data/pdfs/two_hexagons.pdf +0 -90
- data/data/pdfs/version_1_6.pdf +0 -61
- data/data/shift_jis_text.txt +0 -1
- data/lib/pdf/core/annotations.rb +0 -60
- data/lib/pdf/core/byte_string.rb +0 -9
- data/lib/pdf/core/destinations.rb +0 -90
- data/lib/pdf/core/document_state.rb +0 -78
- data/lib/pdf/core/filter_list.rb +0 -51
- data/lib/pdf/core/filters.rb +0 -36
- data/lib/pdf/core/graphics_state.rb +0 -68
- data/lib/pdf/core/literal_string.rb +0 -16
- data/lib/pdf/core/name_tree.rb +0 -177
- data/lib/pdf/core/object_store.rb +0 -320
- data/lib/pdf/core/outline.rb +0 -315
- data/lib/pdf/core/page.rb +0 -212
- data/lib/pdf/core/page_geometry.rb +0 -126
- data/lib/pdf/core/pdf_object.rb +0 -124
- data/lib/pdf/core/reference.rb +0 -103
- data/lib/pdf/core/stream.rb +0 -98
- data/lib/pdf/core/text.rb +0 -275
- data/lib/pdf/core.rb +0 -35
- data/lib/prawn/compatibility.rb +0 -91
- data/lib/prawn/document/graphics_state.rb +0 -73
- data/lib/prawn/document/snapshot.rb +0 -89
- data/lib/prawn/font/afm.rb +0 -203
- data/lib/prawn/layout.rb +0 -20
- data/lib/prawn/table/cell/image.rb +0 -70
- data/lib/prawn/table/cell/in_table.rb +0 -27
- data/lib/prawn/table/cell/span_dummy.rb +0 -92
- data/lib/prawn/table/cell/subtable.rb +0 -65
- data/lib/prawn/table/cell/text.rb +0 -153
- data/lib/prawn/table/cell.rb +0 -770
- data/lib/prawn/table/cells.rb +0 -295
- data/lib/prawn/table.rb +0 -643
- data/manual/example_file.rb +0 -116
- data/manual/example_package.rb +0 -53
- data/manual/example_section.rb +0 -46
- data/manual/manual/cover.rb +0 -35
- data/manual/manual/foreword.rb +0 -85
- data/manual/manual/manual.rb +0 -35
- data/manual/syntax_highlight.rb +0 -52
- data/manual/table/basic_block.rb +0 -53
- data/manual/table/before_rendering_page.rb +0 -26
- data/manual/table/cell_border_lines.rb +0 -24
- data/manual/table/cell_borders_and_bg.rb +0 -31
- data/manual/table/cell_dimensions.rb +0 -30
- data/manual/table/cell_text.rb +0 -38
- data/manual/table/column_widths.rb +0 -30
- data/manual/table/content_and_subtables.rb +0 -39
- data/manual/table/creation.rb +0 -27
- data/manual/table/filtering.rb +0 -36
- data/manual/table/flow_and_header.rb +0 -17
- data/manual/table/image_cells.rb +0 -33
- data/manual/table/position.rb +0 -29
- data/manual/table/row_colors.rb +0 -20
- data/manual/table/span.rb +0 -30
- data/manual/table/style.rb +0 -22
- data/manual/table/table.rb +0 -52
- data/manual/table/width.rb +0 -27
- data/manual/templates/full_template.rb +0 -25
- data/manual/templates/page_template.rb +0 -48
- data/manual/templates/templates.rb +0 -27
- data/manual/text/group.rb +0 -29
- data/spec/acceptance/png.rb +0 -23
- data/spec/annotations_spec.rb +0 -74
- data/spec/bounding_box_spec.rb +0 -493
- data/spec/cell_spec.rb +0 -628
- data/spec/column_box_spec.rb +0 -33
- data/spec/destinations_spec.rb +0 -15
- data/spec/document_spec.rb +0 -761
- data/spec/extensions/mocha.rb +0 -44
- data/spec/filters_spec.rb +0 -34
- data/spec/font_metric_cache_spec.rb +0 -52
- data/spec/font_spec.rb +0 -464
- data/spec/formatted_text_arranger_spec.rb +0 -421
- data/spec/formatted_text_box_spec.rb +0 -650
- data/spec/formatted_text_fragment_spec.rb +0 -298
- data/spec/graphics_spec.rb +0 -651
- data/spec/grid_spec.rb +0 -85
- data/spec/image_handler_spec.rb +0 -42
- data/spec/images_spec.rb +0 -157
- data/spec/inline_formatted_text_parser_spec.rb +0 -564
- data/spec/jpg_spec.rb +0 -25
- data/spec/line_wrap_spec.rb +0 -333
- data/spec/measurement_units_spec.rb +0 -23
- data/spec/name_tree_spec.rb +0 -112
- data/spec/object_store_spec.rb +0 -170
- data/spec/outline_spec.rb +0 -448
- data/spec/pdf_object_spec.rb +0 -172
- data/spec/png_spec.rb +0 -240
- data/spec/reference_spec.rb +0 -82
- data/spec/repeater_spec.rb +0 -158
- data/spec/security_spec.rb +0 -158
- data/spec/snapshot_spec.rb +0 -186
- data/spec/soft_mask_spec.rb +0 -117
- data/spec/span_spec.rb +0 -44
- data/spec/stamp_spec.rb +0 -158
- data/spec/stream_spec.rb +0 -58
- data/spec/stroke_styles_spec.rb +0 -211
- data/spec/table/span_dummy_spec.rb +0 -17
- data/spec/table_spec.rb +0 -1355
- data/spec/template_spec.rb +0 -351
- data/spec/text_at_spec.rb +0 -130
- data/spec/text_box_spec.rb +0 -1030
- data/spec/text_rendering_mode_spec.rb +0 -45
- data/spec/text_spacing_spec.rb +0 -93
- data/spec/text_spec.rb +0 -425
- data/spec/text_with_inline_formatting_spec.rb +0 -35
- data/spec/transparency_spec.rb +0 -89
@@ -1,4 +1,4 @@
|
|
1
|
-
#
|
1
|
+
# frozen_string_literal: true
|
2
2
|
|
3
3
|
# core/text/formatted/arranger.rb : Implements a data structure for 2-stage
|
4
4
|
# processing of lines of formatted text
|
@@ -10,11 +10,32 @@
|
|
10
10
|
module Prawn
|
11
11
|
module Text
|
12
12
|
module Formatted #:nodoc:
|
13
|
+
# @private
|
13
14
|
|
14
15
|
class Arranger #:nodoc:
|
16
|
+
class NotFinalized < StandardError
|
17
|
+
DEFAULT_MESSAGE = 'Lines must be finalized'
|
18
|
+
MESSAGE_WITH_METHOD = 'Lines must be finalized before calling #%<method>s'
|
19
|
+
|
20
|
+
def initialize(message = DEFAULT_MESSAGE, method: nil)
|
21
|
+
if method && message == DEFAULT_MESSAGE
|
22
|
+
super format(MESSAGE_WITH_METHOD, method: method)
|
23
|
+
else
|
24
|
+
super message
|
25
|
+
end
|
26
|
+
end
|
27
|
+
end
|
28
|
+
|
29
|
+
class BadFontFamily < StandardError
|
30
|
+
def initialize(message = 'Bad font family')
|
31
|
+
super
|
32
|
+
end
|
33
|
+
end
|
34
|
+
|
15
35
|
attr_reader :max_line_height
|
16
36
|
attr_reader :max_descender
|
17
37
|
attr_reader :max_ascender
|
38
|
+
attr_reader :finalized
|
18
39
|
attr_accessor :consumed
|
19
40
|
|
20
41
|
# The following present only for testing purposes
|
@@ -22,7 +43,7 @@ module Prawn
|
|
22
43
|
attr_reader :fragments
|
23
44
|
attr_reader :current_format_state
|
24
45
|
|
25
|
-
def initialize(document, options={})
|
46
|
+
def initialize(document, options = {})
|
26
47
|
@document = document
|
27
48
|
@fragments = []
|
28
49
|
@unconsumed = []
|
@@ -30,50 +51,55 @@ module Prawn
|
|
30
51
|
end
|
31
52
|
|
32
53
|
def space_count
|
33
|
-
|
34
|
-
raise
|
54
|
+
unless finalized
|
55
|
+
raise NotFinalized.new(method: 'space_count')
|
35
56
|
end
|
36
|
-
|
57
|
+
|
58
|
+
@fragments.reduce(0) do |sum, fragment|
|
37
59
|
sum + fragment.space_count
|
38
60
|
end
|
39
61
|
end
|
40
62
|
|
41
63
|
def line_width
|
42
|
-
|
43
|
-
raise
|
64
|
+
unless finalized
|
65
|
+
raise raise NotFinalized.new(method: 'line_width')
|
44
66
|
end
|
45
|
-
|
67
|
+
|
68
|
+
@fragments.reduce(0) do |sum, fragment|
|
46
69
|
sum + fragment.width
|
47
70
|
end
|
48
71
|
end
|
49
72
|
|
50
73
|
def line
|
51
|
-
|
52
|
-
raise
|
74
|
+
unless finalized
|
75
|
+
raise NotFinalized.new(method: 'line')
|
53
76
|
end
|
54
|
-
|
55
|
-
|
56
|
-
|
57
|
-
|
58
|
-
|
59
|
-
|
77
|
+
|
78
|
+
@fragments.map do |fragment|
|
79
|
+
fragment.text.dup.encode(::Encoding::UTF_8)
|
80
|
+
rescue ::Encoding::InvalidByteSequenceError,
|
81
|
+
::Encoding::UndefinedConversionError
|
82
|
+
fragment.text.dup.force_encoding(::Encoding::UTF_8)
|
60
83
|
end.join
|
61
84
|
end
|
62
85
|
|
63
86
|
def finalize_line
|
64
|
-
@
|
87
|
+
@finalized = true
|
88
|
+
|
65
89
|
omit_trailing_whitespace_from_line_width
|
66
90
|
@fragments = []
|
67
91
|
@consumed.each do |hash|
|
68
92
|
text = hash[:text]
|
69
93
|
format_state = hash.dup
|
70
94
|
format_state.delete(:text)
|
71
|
-
fragment = Prawn::Text::Formatted::Fragment.new(
|
72
|
-
|
73
|
-
|
95
|
+
fragment = Prawn::Text::Formatted::Fragment.new(
|
96
|
+
text,
|
97
|
+
format_state,
|
98
|
+
@document
|
99
|
+
)
|
74
100
|
@fragments << fragment
|
75
|
-
|
76
|
-
|
101
|
+
self.fragment_measurements = fragment
|
102
|
+
self.line_measurement_maximums = fragment
|
77
103
|
end
|
78
104
|
end
|
79
105
|
|
@@ -82,13 +108,13 @@ module Prawn
|
|
82
108
|
@unconsumed = []
|
83
109
|
array.each do |hash|
|
84
110
|
hash[:text].scan(/[^\n]+|\n/) do |line|
|
85
|
-
@unconsumed << hash.merge(:
|
111
|
+
@unconsumed << hash.merge(text: line)
|
86
112
|
end
|
87
113
|
end
|
88
114
|
end
|
89
115
|
|
90
116
|
def initialize_line
|
91
|
-
@
|
117
|
+
@finalized = false
|
92
118
|
@max_line_height = 0
|
93
119
|
@max_descender = 0
|
94
120
|
@max_ascender = 0
|
@@ -98,28 +124,30 @@ module Prawn
|
|
98
124
|
end
|
99
125
|
|
100
126
|
def finished?
|
101
|
-
@unconsumed.
|
127
|
+
@unconsumed.empty?
|
102
128
|
end
|
103
129
|
|
104
130
|
def next_string
|
105
|
-
|
106
|
-
raise
|
131
|
+
if finalized
|
132
|
+
raise NotFinalized.new(method: 'next_string')
|
107
133
|
end
|
108
|
-
|
109
|
-
|
110
|
-
|
111
|
-
|
112
|
-
@consumed <<
|
113
|
-
@current_format_state =
|
134
|
+
|
135
|
+
next_unconsumed_hash = @unconsumed.shift
|
136
|
+
|
137
|
+
if next_unconsumed_hash
|
138
|
+
@consumed << next_unconsumed_hash.dup
|
139
|
+
@current_format_state = next_unconsumed_hash.dup
|
114
140
|
@current_format_state.delete(:text)
|
115
|
-
|
141
|
+
|
142
|
+
next_unconsumed_hash[:text]
|
116
143
|
end
|
117
144
|
end
|
118
145
|
|
119
146
|
def preview_next_string
|
120
|
-
|
121
|
-
|
122
|
-
|
147
|
+
next_unconsumed_hash = @unconsumed.first
|
148
|
+
|
149
|
+
if next_unconsumed_hash
|
150
|
+
next_unconsumed_hash[:text]
|
123
151
|
end
|
124
152
|
end
|
125
153
|
|
@@ -137,26 +165,28 @@ module Prawn
|
|
137
165
|
end
|
138
166
|
end
|
139
167
|
|
140
|
-
def apply_font_settings(fragment=nil, &block)
|
168
|
+
def apply_font_settings(fragment = nil, &block)
|
141
169
|
if fragment.nil?
|
142
170
|
font = current_format_state[:font]
|
143
171
|
size = current_format_state[:size]
|
144
172
|
character_spacing = current_format_state[:character_spacing] ||
|
145
|
-
|
173
|
+
@document.character_spacing
|
146
174
|
styles = current_format_state[:styles]
|
147
|
-
font_style = font_style(styles)
|
148
175
|
else
|
149
176
|
font = fragment.font
|
150
177
|
size = fragment.size
|
151
178
|
character_spacing = fragment.character_spacing
|
152
179
|
styles = fragment.styles
|
153
|
-
font_style = font_style(styles)
|
154
180
|
end
|
181
|
+
font_style = font_style(styles)
|
155
182
|
|
156
183
|
@document.character_spacing(character_spacing) do
|
157
184
|
if font || font_style != :normal
|
158
|
-
raise
|
159
|
-
|
185
|
+
raise BadFontFamily unless @document.font.family
|
186
|
+
|
187
|
+
@document.font(
|
188
|
+
font || @document.font.family, style: font_style
|
189
|
+
) do
|
160
190
|
apply_font_size(size, styles, &block)
|
161
191
|
end
|
162
192
|
else
|
@@ -165,8 +195,9 @@ module Prawn
|
|
165
195
|
end
|
166
196
|
end
|
167
197
|
|
168
|
-
def update_last_string(printed, unprinted, normalized_soft_hyphen=nil)
|
198
|
+
def update_last_string(printed, unprinted, normalized_soft_hyphen = nil)
|
169
199
|
return if printed.nil?
|
200
|
+
|
170
201
|
if printed.empty?
|
171
202
|
@consumed.pop
|
172
203
|
else
|
@@ -177,32 +208,34 @@ module Prawn
|
|
177
208
|
end
|
178
209
|
|
179
210
|
unless unprinted.empty?
|
180
|
-
@unconsumed.unshift(@current_format_state.merge(:
|
211
|
+
@unconsumed.unshift(@current_format_state.merge(text: unprinted))
|
181
212
|
end
|
182
213
|
|
183
214
|
load_previous_format_state if printed.empty?
|
184
215
|
end
|
185
216
|
|
186
217
|
def retrieve_fragment
|
187
|
-
|
188
|
-
raise
|
218
|
+
unless finalized
|
219
|
+
raise NotFinalized, 'Lines must be finalized before fragments can be retrieved'
|
189
220
|
end
|
221
|
+
|
190
222
|
@fragments.shift
|
191
223
|
end
|
192
224
|
|
193
225
|
def repack_unretrieved
|
194
226
|
new_unconsumed = []
|
227
|
+
# rubocop: disable Lint/AssignmentInCondition
|
195
228
|
while fragment = retrieve_fragment
|
229
|
+
# rubocop: enable Lint/AssignmentInCondition
|
196
230
|
fragment.include_trailing_white_space!
|
197
|
-
new_unconsumed << fragment.format_state.merge(:
|
231
|
+
new_unconsumed << fragment.format_state.merge(text: fragment.text)
|
198
232
|
end
|
199
233
|
@unconsumed = new_unconsumed.concat(@unconsumed)
|
200
234
|
end
|
201
235
|
|
202
236
|
def font_style(styles)
|
203
|
-
|
204
|
-
|
205
|
-
elsif styles.include?(:bold) && styles.include?(:italic)
|
237
|
+
styles = Array(styles)
|
238
|
+
if styles.include?(:bold) && styles.include?(:italic)
|
206
239
|
:bold_italic
|
207
240
|
elsif styles.include?(:bold)
|
208
241
|
:bold
|
@@ -225,19 +258,20 @@ module Prawn
|
|
225
258
|
end
|
226
259
|
end
|
227
260
|
|
228
|
-
def apply_font_size(size, styles)
|
261
|
+
def apply_font_size(size, styles, &block)
|
229
262
|
if subscript?(styles) || superscript?(styles)
|
230
263
|
relative_size = 0.583
|
231
|
-
|
232
|
-
size
|
233
|
-
|
234
|
-
|
235
|
-
|
264
|
+
size =
|
265
|
+
if size.nil?
|
266
|
+
@document.font_size * relative_size
|
267
|
+
else
|
268
|
+
size * relative_size
|
269
|
+
end
|
236
270
|
end
|
237
271
|
if size.nil?
|
238
272
|
yield
|
239
273
|
else
|
240
|
-
@document.font_size(size)
|
274
|
+
@document.font_size(size, &block)
|
241
275
|
end
|
242
276
|
end
|
243
277
|
|
@@ -269,24 +303,33 @@ module Prawn
|
|
269
303
|
end
|
270
304
|
end
|
271
305
|
|
272
|
-
def
|
306
|
+
def fragment_measurements=(fragment)
|
273
307
|
apply_font_settings(fragment) do
|
274
|
-
fragment.width = @document.width_of(
|
275
|
-
|
308
|
+
fragment.width = @document.width_of(
|
309
|
+
fragment.text,
|
310
|
+
kerning: @kerning
|
311
|
+
)
|
276
312
|
fragment.line_height = @document.font.height
|
277
313
|
fragment.descender = @document.font.descender
|
278
314
|
fragment.ascender = @document.font.ascender
|
279
315
|
end
|
280
316
|
end
|
281
317
|
|
282
|
-
def
|
283
|
-
@max_line_height = [
|
284
|
-
|
285
|
-
|
318
|
+
def line_measurement_maximums=(fragment)
|
319
|
+
@max_line_height = [
|
320
|
+
defined?(@max_line_height) && @max_line_height,
|
321
|
+
fragment.line_height
|
322
|
+
].compact.max
|
323
|
+
@max_descender = [
|
324
|
+
defined?(@max_descender) && @max_descender,
|
325
|
+
fragment.descender
|
326
|
+
].compact.max
|
327
|
+
@max_ascender = [
|
328
|
+
defined?(@max_ascender) && @max_ascender,
|
329
|
+
fragment.ascender
|
330
|
+
].compact.max
|
286
331
|
end
|
287
|
-
|
288
332
|
end
|
289
|
-
|
290
333
|
end
|
291
334
|
end
|
292
335
|
end
|