prawn 0.11.1 → 0.15.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (353) hide show
  1. checksums.yaml +7 -0
  2. data/.yardopts +10 -0
  3. data/COPYING +2 -2
  4. data/GPLv2 +340 -0
  5. data/GPLv3 +674 -0
  6. data/Gemfile +11 -0
  7. data/LICENSE +1 -1
  8. data/Rakefile +29 -38
  9. data/data/images/16bit.alpha +0 -0
  10. data/data/images/16bit.color +0 -0
  11. data/data/images/dice.alpha +0 -0
  12. data/data/images/dice.color +0 -0
  13. data/data/images/indexed_color.dat +0 -0
  14. data/data/images/indexed_color.png +0 -0
  15. data/data/images/page_white_text.alpha +0 -0
  16. data/data/images/page_white_text.color +0 -0
  17. data/data/pdfs/nested_pages.pdf +13 -13
  18. data/lib/prawn/document/bounding_box.rb +87 -12
  19. data/lib/prawn/document/column_box.rb +57 -28
  20. data/lib/prawn/document/graphics_state.rb +11 -74
  21. data/lib/prawn/document/internals.rb +25 -23
  22. data/lib/prawn/document/snapshot.rb +11 -8
  23. data/lib/prawn/document/span.rb +12 -10
  24. data/lib/prawn/document.rb +250 -194
  25. data/lib/prawn/encoding.rb +9 -10
  26. data/lib/prawn/errors.rb +18 -29
  27. data/lib/prawn/font/afm.rb +52 -41
  28. data/lib/prawn/font/dfont.rb +4 -3
  29. data/lib/prawn/font/ttf.rb +44 -48
  30. data/lib/prawn/font.rb +138 -88
  31. data/lib/prawn/font_metric_cache.rb +47 -0
  32. data/lib/prawn/graphics/cap_style.rb +4 -3
  33. data/lib/prawn/graphics/color.rb +13 -5
  34. data/lib/prawn/graphics/dash.rb +53 -31
  35. data/lib/prawn/graphics/join_style.rb +9 -7
  36. data/lib/prawn/graphics/patterns.rb +138 -0
  37. data/lib/prawn/graphics/transformation.rb +10 -9
  38. data/lib/prawn/graphics/transparency.rb +3 -1
  39. data/lib/prawn/graphics.rb +316 -61
  40. data/lib/prawn/image_handler.rb +36 -0
  41. data/lib/prawn/images/image.rb +49 -0
  42. data/lib/prawn/images/jpg.rb +21 -15
  43. data/lib/prawn/images/png.rb +62 -119
  44. data/lib/prawn/images.rb +89 -108
  45. data/lib/prawn/layout/grid.rb +66 -54
  46. data/lib/prawn/layout.rb +10 -15
  47. data/lib/prawn/measurement_extensions.rb +10 -6
  48. data/lib/prawn/measurements.rb +27 -21
  49. data/lib/prawn/outline.rb +6 -308
  50. data/lib/prawn/repeater.rb +11 -9
  51. data/lib/prawn/security/arcfour.rb +1 -0
  52. data/lib/prawn/security.rb +55 -33
  53. data/lib/prawn/soft_mask.rb +96 -0
  54. data/lib/prawn/stamp.rb +5 -3
  55. data/lib/prawn/table/cell/image.rb +69 -0
  56. data/lib/prawn/table/cell/in_table.rb +4 -2
  57. data/lib/prawn/table/cell/span_dummy.rb +93 -0
  58. data/lib/prawn/table/cell/subtable.rb +2 -2
  59. data/lib/prawn/table/cell/text.rb +44 -26
  60. data/lib/prawn/table/cell.rb +302 -50
  61. data/lib/prawn/table/cells.rb +147 -49
  62. data/lib/prawn/table/column_width_calculator.rb +61 -0
  63. data/lib/prawn/table.rb +297 -118
  64. data/lib/prawn/text/box.rb +21 -5
  65. data/lib/prawn/text/formatted/arranger.rb +290 -0
  66. data/lib/prawn/text/formatted/box.rb +103 -59
  67. data/lib/prawn/text/formatted/fragment.rb +34 -23
  68. data/lib/prawn/text/formatted/line_wrap.rb +266 -0
  69. data/lib/prawn/text/formatted/parser.rb +15 -5
  70. data/lib/prawn/text/formatted/wrap.rb +150 -0
  71. data/lib/prawn/text/formatted.rb +5 -4
  72. data/lib/prawn/text.rb +38 -24
  73. data/lib/prawn/utilities.rb +46 -0
  74. data/lib/prawn.rb +85 -20
  75. data/manual/basic_concepts/adding_pages.rb +27 -0
  76. data/manual/basic_concepts/basic_concepts.rb +34 -0
  77. data/manual/basic_concepts/creation.rb +39 -0
  78. data/manual/basic_concepts/cursor.rb +33 -0
  79. data/manual/basic_concepts/measurement.rb +25 -0
  80. data/manual/basic_concepts/origin.rb +38 -0
  81. data/manual/basic_concepts/other_cursor_helpers.rb +40 -0
  82. data/manual/bounding_box/bounding_box.rb +39 -0
  83. data/manual/bounding_box/bounds.rb +49 -0
  84. data/manual/bounding_box/canvas.rb +24 -0
  85. data/manual/bounding_box/creation.rb +23 -0
  86. data/manual/bounding_box/indentation.rb +46 -0
  87. data/manual/bounding_box/nesting.rb +45 -0
  88. data/manual/bounding_box/russian_boxes.rb +40 -0
  89. data/manual/bounding_box/stretchy.rb +31 -0
  90. data/manual/document_and_page_options/background.rb +27 -0
  91. data/manual/document_and_page_options/document_and_page_options.rb +32 -0
  92. data/manual/document_and_page_options/metadata.rb +23 -0
  93. data/manual/document_and_page_options/page_margins.rb +38 -0
  94. data/manual/document_and_page_options/page_size.rb +34 -0
  95. data/manual/document_and_page_options/print_scaling.rb +20 -0
  96. data/manual/example_file.rb +111 -0
  97. data/manual/example_helper.rb +411 -0
  98. data/manual/example_package.rb +53 -0
  99. data/manual/example_section.rb +46 -0
  100. data/manual/graphics/circle_and_ellipse.rb +22 -0
  101. data/manual/graphics/color.rb +24 -0
  102. data/manual/graphics/common_lines.rb +30 -0
  103. data/manual/graphics/fill_and_stroke.rb +42 -0
  104. data/manual/graphics/fill_rules.rb +37 -0
  105. data/manual/graphics/gradients.rb +37 -0
  106. data/manual/graphics/graphics.rb +58 -0
  107. data/manual/graphics/helper.rb +24 -0
  108. data/manual/graphics/line_width.rb +35 -0
  109. data/manual/graphics/lines_and_curves.rb +41 -0
  110. data/manual/graphics/polygon.rb +29 -0
  111. data/manual/graphics/rectangle.rb +21 -0
  112. data/manual/graphics/rotate.rb +28 -0
  113. data/manual/graphics/scale.rb +41 -0
  114. data/manual/graphics/soft_masks.rb +46 -0
  115. data/manual/graphics/stroke_cap.rb +31 -0
  116. data/manual/graphics/stroke_dash.rb +48 -0
  117. data/manual/graphics/stroke_join.rb +30 -0
  118. data/manual/graphics/translate.rb +29 -0
  119. data/manual/graphics/transparency.rb +35 -0
  120. data/manual/images/absolute_position.rb +23 -0
  121. data/manual/images/fit.rb +21 -0
  122. data/manual/images/horizontal.rb +25 -0
  123. data/manual/images/images.rb +40 -0
  124. data/manual/images/plain_image.rb +18 -0
  125. data/manual/images/scale.rb +22 -0
  126. data/manual/images/vertical.rb +28 -0
  127. data/manual/images/width_and_height.rb +25 -0
  128. data/manual/layout/boxes.rb +27 -0
  129. data/manual/layout/content.rb +25 -0
  130. data/manual/layout/layout.rb +28 -0
  131. data/manual/layout/simple_grid.rb +23 -0
  132. data/manual/manual/cover.rb +36 -0
  133. data/manual/manual/foreword.rb +85 -0
  134. data/manual/manual/how_to_read_this_manual.rb +41 -0
  135. data/manual/manual/manual.rb +34 -0
  136. data/manual/outline/add_subsection_to.rb +61 -0
  137. data/manual/outline/insert_section_after.rb +47 -0
  138. data/manual/outline/outline.rb +32 -0
  139. data/manual/outline/sections_and_pages.rb +67 -0
  140. data/manual/repeatable_content/page_numbering.rb +54 -0
  141. data/manual/repeatable_content/repeatable_content.rb +31 -0
  142. data/manual/repeatable_content/repeater.rb +55 -0
  143. data/manual/repeatable_content/stamp.rb +41 -0
  144. data/manual/security/encryption.rb +31 -0
  145. data/manual/security/permissions.rb +38 -0
  146. data/manual/security/security.rb +28 -0
  147. data/manual/syntax_highlight.rb +52 -0
  148. data/manual/table/basic_block.rb +53 -0
  149. data/manual/table/before_rendering_page.rb +26 -0
  150. data/manual/table/cell_border_lines.rb +24 -0
  151. data/manual/table/cell_borders_and_bg.rb +31 -0
  152. data/manual/table/cell_dimensions.rb +30 -0
  153. data/manual/table/cell_text.rb +38 -0
  154. data/manual/table/column_widths.rb +30 -0
  155. data/manual/table/content_and_subtables.rb +39 -0
  156. data/manual/table/creation.rb +27 -0
  157. data/manual/table/filtering.rb +36 -0
  158. data/manual/table/flow_and_header.rb +17 -0
  159. data/manual/table/image_cells.rb +33 -0
  160. data/manual/table/position.rb +29 -0
  161. data/manual/table/row_colors.rb +20 -0
  162. data/manual/table/span.rb +30 -0
  163. data/manual/table/style.rb +22 -0
  164. data/manual/table/table.rb +52 -0
  165. data/manual/table/width.rb +27 -0
  166. data/manual/text/alignment.rb +44 -0
  167. data/manual/text/color.rb +24 -0
  168. data/manual/text/column_box.rb +32 -0
  169. data/manual/text/fallback_fonts.rb +37 -0
  170. data/manual/text/font.rb +41 -0
  171. data/manual/text/font_size.rb +45 -0
  172. data/manual/text/font_style.rb +23 -0
  173. data/manual/text/formatted_callbacks.rb +60 -0
  174. data/manual/text/formatted_text.rb +54 -0
  175. data/manual/text/free_flowing_text.rb +51 -0
  176. data/manual/text/group.rb +31 -0
  177. data/manual/text/inline.rb +43 -0
  178. data/manual/text/kerning_and_character_spacing.rb +39 -0
  179. data/manual/text/leading.rb +25 -0
  180. data/manual/text/line_wrapping.rb +41 -0
  181. data/manual/text/paragraph_indentation.rb +26 -0
  182. data/manual/text/positioned_text.rb +38 -0
  183. data/manual/text/registering_families.rb +48 -0
  184. data/manual/text/rendering_and_color.rb +37 -0
  185. data/manual/text/right_to_left_text.rb +43 -0
  186. data/manual/text/rotation.rb +43 -0
  187. data/manual/text/single_usage.rb +37 -0
  188. data/manual/text/text.rb +75 -0
  189. data/manual/text/text_box_excess.rb +32 -0
  190. data/manual/text/text_box_extensions.rb +45 -0
  191. data/manual/text/text_box_overflow.rb +44 -0
  192. data/manual/text/utf8.rb +28 -0
  193. data/{examples/m17n → manual/text}/win_ansi_charset.rb +14 -10
  194. data/prawn.gemspec +27 -17
  195. data/spec/acceptance/png.rb +23 -0
  196. data/spec/annotations_spec.rb +16 -32
  197. data/spec/bounding_box_spec.rb +284 -2
  198. data/spec/cell_spec.rb +169 -38
  199. data/spec/column_box_spec.rb +65 -0
  200. data/spec/data/curves.pdf +66 -0
  201. data/spec/destinations_spec.rb +5 -5
  202. data/spec/document_spec.rb +212 -113
  203. data/spec/extensions/encoding_helpers.rb +9 -0
  204. data/spec/extensions/mocha.rb +2 -3
  205. data/spec/font_metric_cache_spec.rb +52 -0
  206. data/spec/font_spec.rb +205 -95
  207. data/spec/formatted_text_arranger_spec.rb +43 -43
  208. data/spec/formatted_text_box_spec.rb +63 -24
  209. data/spec/formatted_text_fragment_spec.rb +8 -8
  210. data/spec/graphics_spec.rb +175 -68
  211. data/spec/grid_spec.rb +26 -15
  212. data/spec/image_handler_spec.rb +54 -0
  213. data/spec/images_spec.rb +58 -30
  214. data/spec/inline_formatted_text_parser_spec.rb +73 -19
  215. data/spec/jpg_spec.rb +4 -4
  216. data/spec/line_wrap_spec.rb +28 -28
  217. data/spec/measurement_units_spec.rb +6 -6
  218. data/spec/object_store_spec.rb +17 -106
  219. data/spec/outline_spec.rb +103 -63
  220. data/spec/png_spec.rb +25 -25
  221. data/spec/reference_spec.rb +8 -65
  222. data/spec/repeater_spec.rb +25 -11
  223. data/spec/security_spec.rb +44 -12
  224. data/spec/snapshot_spec.rb +38 -6
  225. data/spec/soft_mask_spec.rb +117 -0
  226. data/spec/span_spec.rb +10 -15
  227. data/spec/spec_helper.rb +32 -8
  228. data/spec/stamp_spec.rb +29 -30
  229. data/spec/stroke_styles_spec.rb +36 -18
  230. data/spec/table/span_dummy_spec.rb +17 -0
  231. data/spec/table_spec.rb +850 -104
  232. data/spec/text_at_spec.rb +19 -33
  233. data/spec/text_box_spec.rb +117 -64
  234. data/spec/text_rendering_mode_spec.rb +5 -5
  235. data/spec/text_spacing_spec.rb +20 -2
  236. data/spec/text_spec.rb +111 -59
  237. data/spec/transparency_spec.rb +5 -5
  238. metadata +477 -328
  239. data/HACKING +0 -50
  240. data/README +0 -141
  241. data/data/fonts/Action Man.dfont +0 -0
  242. data/data/fonts/Activa.ttf +0 -0
  243. data/data/fonts/Chalkboard.ttf +0 -0
  244. data/data/fonts/DejaVuSans.ttf +0 -0
  245. data/data/fonts/Dustismo_Roman.ttf +0 -0
  246. data/data/fonts/comicsans.ttf +0 -0
  247. data/data/fonts/gkai00mp.ttf +0 -0
  248. data/data/images/16bit.dat +0 -0
  249. data/data/images/dice.dat +0 -0
  250. data/data/images/page_white_text.dat +0 -0
  251. data/data/images/rails.dat +0 -0
  252. data/data/images/rails.png +0 -0
  253. data/examples/bounding_box/bounding_boxes.rb +0 -44
  254. data/examples/bounding_box/indentation.rb +0 -35
  255. data/examples/bounding_box/russian_boxes.rb +0 -37
  256. data/examples/bounding_box/stretched_nesting.rb +0 -68
  257. data/examples/example_helper.rb +0 -8
  258. data/examples/general/background.rb +0 -24
  259. data/examples/general/canvas.rb +0 -16
  260. data/examples/general/context_sensitive_headers.rb +0 -38
  261. data/examples/general/float.rb +0 -12
  262. data/examples/general/margin.rb +0 -37
  263. data/examples/general/measurement_units.rb +0 -52
  264. data/examples/general/metadata-info.rb +0 -17
  265. data/examples/general/multi_page_layout.rb +0 -19
  266. data/examples/general/outlines.rb +0 -67
  267. data/examples/general/page_geometry.rb +0 -32
  268. data/examples/general/page_numbering.rb +0 -40
  269. data/examples/general/page_templates.rb +0 -20
  270. data/examples/general/repeaters.rb +0 -48
  271. data/examples/general/stamp.rb +0 -42
  272. data/examples/general/templates.rb +0 -14
  273. data/examples/graphics/basic_images.rb +0 -24
  274. data/examples/graphics/cmyk.rb +0 -13
  275. data/examples/graphics/curves.rb +0 -12
  276. data/examples/graphics/gradient.rb +0 -23
  277. data/examples/graphics/hexagon.rb +0 -14
  278. data/examples/graphics/image_fit.rb +0 -16
  279. data/examples/graphics/image_flow.rb +0 -38
  280. data/examples/graphics/image_position.rb +0 -18
  281. data/examples/graphics/line.rb +0 -33
  282. data/examples/graphics/png_types.rb +0 -23
  283. data/examples/graphics/polygons.rb +0 -17
  284. data/examples/graphics/remote_images.rb +0 -13
  285. data/examples/graphics/rounded_polygons.rb +0 -20
  286. data/examples/graphics/rounded_rectangle.rb +0 -21
  287. data/examples/graphics/ruport_style_helpers.rb +0 -20
  288. data/examples/graphics/stroke_bounds.rb +0 -21
  289. data/examples/graphics/stroke_cap_and_join.rb +0 -46
  290. data/examples/graphics/stroke_dash.rb +0 -43
  291. data/examples/graphics/transformations.rb +0 -53
  292. data/examples/graphics/transparency.rb +0 -27
  293. data/examples/grid/bounding_boxes.rb +0 -22
  294. data/examples/grid/column_gutter_grid.rb +0 -21
  295. data/examples/grid/multi_boxes.rb +0 -52
  296. data/examples/grid/show_grid.rb +0 -14
  297. data/examples/grid/simple_grid.rb +0 -21
  298. data/examples/m17n/chinese_text_wrapping.rb +0 -18
  299. data/examples/m17n/euro.rb +0 -16
  300. data/examples/m17n/full_win_ansi_character_list.rb +0 -20
  301. data/examples/m17n/sjis.rb +0 -29
  302. data/examples/m17n/utf8.rb +0 -14
  303. data/examples/security/hello_foo.rb +0 -9
  304. data/examples/table/bill.rb +0 -54
  305. data/examples/table/borders.rb +0 -25
  306. data/examples/table/cell.rb +0 -13
  307. data/examples/table/checkerboard.rb +0 -23
  308. data/examples/table/header.rb +0 -15
  309. data/examples/table/inline_format_table.rb +0 -13
  310. data/examples/table/multi_page_table.rb +0 -10
  311. data/examples/table/simple_table.rb +0 -25
  312. data/examples/table/subtable.rb +0 -13
  313. data/examples/table/widths.rb +0 -21
  314. data/examples/text/alignment.rb +0 -19
  315. data/examples/text/character_spacing.rb +0 -13
  316. data/examples/text/dfont.rb +0 -49
  317. data/examples/text/family_based_styling.rb +0 -25
  318. data/examples/text/font_calculations.rb +0 -92
  319. data/examples/text/font_size.rb +0 -34
  320. data/examples/text/hyphenation.rb +0 -45
  321. data/examples/text/indent_paragraphs.rb +0 -24
  322. data/examples/text/inline_format.rb +0 -104
  323. data/examples/text/kerning.rb +0 -31
  324. data/examples/text/rendering_mode.rb +0 -21
  325. data/examples/text/rotated.rb +0 -99
  326. data/examples/text/shaped_text_box.rb +0 -32
  327. data/examples/text/simple_text.rb +0 -18
  328. data/examples/text/simple_text_ttf.rb +0 -18
  329. data/examples/text/span.rb +0 -30
  330. data/examples/text/text_box.rb +0 -90
  331. data/examples/text/text_box_returning_excess.rb +0 -52
  332. data/examples/text/text_flow.rb +0 -68
  333. data/lib/prawn/compatibility.rb +0 -51
  334. data/lib/prawn/core/annotations.rb +0 -61
  335. data/lib/prawn/core/byte_string.rb +0 -9
  336. data/lib/prawn/core/destinations.rb +0 -90
  337. data/lib/prawn/core/document_state.rb +0 -78
  338. data/lib/prawn/core/literal_string.rb +0 -16
  339. data/lib/prawn/core/name_tree.rb +0 -165
  340. data/lib/prawn/core/object_store.rb +0 -264
  341. data/lib/prawn/core/page.rb +0 -213
  342. data/lib/prawn/core/pdf_object.rb +0 -108
  343. data/lib/prawn/core/reference.rb +0 -112
  344. data/lib/prawn/core/text/formatted/arranger.rb +0 -293
  345. data/lib/prawn/core/text/formatted/line_wrap.rb +0 -272
  346. data/lib/prawn/core/text/formatted/wrap.rb +0 -149
  347. data/lib/prawn/core/text.rb +0 -268
  348. data/lib/prawn/core.rb +0 -85
  349. data/lib/prawn/document/page_geometry.rb +0 -136
  350. data/lib/prawn/graphics/gradient.rb +0 -84
  351. data/spec/name_tree_spec.rb +0 -112
  352. data/spec/pdf_object_spec.rb +0 -170
  353. data/spec/template_spec.rb +0 -291
@@ -0,0 +1,96 @@
1
+ # encoding: utf-8
2
+ #
3
+ # soft_mask.rb : Implements soft-masking
4
+ #
5
+ # Copyright September 2012, Alexander Mankuta. All Rights Reserved.
6
+ #
7
+ # This is free software. Please see the LICENSE and COPYING files for details.
8
+ #
9
+
10
+ module Prawn
11
+
12
+ # The Prawn::SoftMask module is used to create arbitrary transparency in
13
+ # document. Using a soft mask allows creating more visually rich documents.
14
+ #
15
+ # You must group soft mask and graphics it's applied to under
16
+ # save_graphics_state because soft mask is a part of graphic state in PDF.
17
+ #
18
+ # Example:
19
+ # pdf.save_graphics_state do
20
+ # pdf.soft_mask do
21
+ # pdf.fill_color "444444"
22
+ # pdf.fill_polygon [0, 40], [60, 10], [120, 40], [60, 68]
23
+ # end
24
+ # pdf.fill_color '000000'
25
+ # pdf.fill_rectangle [0, 50], 120, 68
26
+ # end
27
+ #
28
+ module SoftMask
29
+ # @group Stable API
30
+
31
+ def soft_mask(&block)
32
+ min_version(1.4)
33
+
34
+ group_attrs = ref!({
35
+ :Type => :Group,
36
+ :S => :Transparency,
37
+ :CS => :DeviceRGB,
38
+ :I => false,
39
+ :K => false
40
+ })
41
+
42
+ group = ref!({
43
+ :Type => :XObject,
44
+ :Subtype => :Form,
45
+ :BBox => state.page.dimensions,
46
+ :Group => group_attrs,
47
+ })
48
+
49
+ state.page.stamp_stream(group, &block)
50
+
51
+ mask = ref!({
52
+ :Type => :Mask,
53
+ :S => :Luminosity,
54
+ :G => group
55
+ })
56
+
57
+ g_state = ref!({
58
+ :Type => :ExtGState,
59
+ :SMask => mask,
60
+
61
+ :AIS => false,
62
+ :BM => :Normal,
63
+ :OP => false,
64
+ :op => false,
65
+ :OPM => 1,
66
+ :SA => true,
67
+ })
68
+
69
+ registry_key = {
70
+ :bbox => state.page.dimensions,
71
+ :mask => [group.stream.filters.normalized, group.stream.filtered_stream],
72
+ :page => state.page_count,
73
+ }.hash
74
+
75
+ if soft_mask_registry[registry_key]
76
+ [g_state, mask, group, group_attrs].each { |ref| ref.live = false }
77
+
78
+ add_content "/#{soft_mask_registry[registry_key]} gs"
79
+ else
80
+ masks = page.resources[:ExtGState] ||= {}
81
+ id = masks.empty? ? 'GS1' : masks.keys.sort.last.succ
82
+ masks[id] = g_state
83
+
84
+ soft_mask_registry[registry_key] = id
85
+
86
+ add_content "/#{id} gs"
87
+ end
88
+ end
89
+
90
+ private
91
+
92
+ def soft_mask_registry
93
+ @soft_mask_registry ||= {}
94
+ end
95
+ end
96
+ end
data/lib/prawn/stamp.rb CHANGED
@@ -28,6 +28,8 @@ module Prawn
28
28
  #
29
29
  module Stamp
30
30
 
31
+ # @group Stable API
32
+
31
33
  # Renders the stamp named <tt>name</tt> to the page
32
34
  # raises <tt>Prawn::Errors::InvalidName</tt> if name.empty?
33
35
  # raises <tt>Prawn::Errors::UndefinedObjectName</tt> if no stamp
@@ -80,7 +82,7 @@ module Prawn
80
82
 
81
83
  state.page.stamp_stream(dictionary, &block)
82
84
  end
83
-
85
+
84
86
  private
85
87
 
86
88
  def stamp_dictionary_registry
@@ -121,12 +123,12 @@ module Prawn
121
123
  :stamp_dictionary => dictionary }
122
124
  dictionary
123
125
  end
124
-
126
+
125
127
  def freeze_stamp_graphics
126
128
  update_colors
127
129
  write_line_width
128
130
  write_stroke_cap_style
129
- write_stroke_join_style
131
+ write_stroke_join_style
130
132
  write_stroke_dash
131
133
  end
132
134
 
@@ -0,0 +1,69 @@
1
+ # encoding: utf-8
2
+
3
+ # image.rb: Table image cells.
4
+ #
5
+ # Copyright September 2010, Brad Ediger. All Rights Reserved.
6
+ #
7
+ # This is free software. Please see the LICENSE and COPYING files for details.
8
+ module Prawn
9
+ class Table
10
+ class Cell
11
+
12
+ # @private
13
+ class Image < Cell
14
+
15
+ def initialize(pdf, point, options={})
16
+ @image_options = {}
17
+ super
18
+
19
+ @pdf_object, @image_info = @pdf.build_image_object(@file)
20
+ @natural_width, @natural_height = @image_info.calc_image_dimensions(
21
+ @image_options)
22
+ end
23
+
24
+ def image=(file)
25
+ @file = file
26
+ end
27
+
28
+ def scale=(s)
29
+ @image_options[:scale] = s
30
+ end
31
+
32
+ def fit=(f)
33
+ @image_options[:fit] = f
34
+ end
35
+
36
+ def image_height=(h)
37
+ @image_options[:height] = h
38
+ end
39
+
40
+ def image_width=(w)
41
+ @image_options[:width] = w
42
+ end
43
+
44
+ def position=(p)
45
+ @image_options[:position] = p
46
+ end
47
+
48
+ def vposition=(vp)
49
+ @image_options[:vposition] = vp
50
+ end
51
+
52
+ def natural_content_width
53
+ @natural_width
54
+ end
55
+
56
+ def natural_content_height
57
+ @natural_height
58
+ end
59
+
60
+ # Draw the image on the page.
61
+ #
62
+ def draw_content
63
+ @pdf.embed_image(@pdf_object, @image_info, @image_options)
64
+ end
65
+
66
+ end
67
+ end
68
+ end
69
+ end
@@ -3,7 +3,9 @@
3
3
  # Accessors for using a Cell inside a Table.
4
4
 
5
5
  module Prawn
6
- class Table
6
+ class Table
7
+
8
+ # @private
7
9
  class Cell
8
10
 
9
11
  # This module extends Cell objects when they are used in a table (as
@@ -15,7 +17,7 @@ module Prawn
15
17
  # Row number (0-based).
16
18
  #
17
19
  attr_accessor :row
18
-
20
+
19
21
  # Column number (0-based).
20
22
  #
21
23
  attr_accessor :column
@@ -0,0 +1,93 @@
1
+ # encoding: utf-8
2
+
3
+ # span_dummy.rb: Placeholder for non-master spanned cells.
4
+ #
5
+ # Copyright December 2011, Brad Ediger. All Rights Reserved.
6
+ #
7
+ # This is free software. Please see the LICENSE and COPYING files for details.
8
+ module Prawn
9
+ class Table
10
+ class Cell
11
+
12
+ # A Cell object used to represent all but the topmost cell in a span
13
+ # group.
14
+ #
15
+ # @private
16
+ class SpanDummy < Cell
17
+ def initialize(pdf, master_cell)
18
+ super(pdf, [0, pdf.cursor])
19
+ @master_cell = master_cell
20
+ @padding = [0, 0, 0, 0]
21
+ end
22
+
23
+ # By default, a span dummy will never increase the height demand.
24
+ #
25
+ def natural_content_height
26
+ 0
27
+ end
28
+
29
+ # By default, a span dummy will never increase the width demand.
30
+ #
31
+ def natural_content_width
32
+ 0
33
+ end
34
+
35
+ def avg_spanned_min_width
36
+ @master_cell.avg_spanned_min_width
37
+ end
38
+
39
+ # Dummy cells have nothing to draw.
40
+ #
41
+ def draw_borders(pt)
42
+ end
43
+
44
+ # Dummy cells have nothing to draw.
45
+ #
46
+ def draw_bounded_content(pt)
47
+ end
48
+
49
+ def padding_right=(val)
50
+ @master_cell.padding_right = val if rightmost?
51
+ end
52
+
53
+ def padding_bottom=(val)
54
+ @master_cell.padding_bottom = val if bottommost?
55
+ end
56
+
57
+ def border_right_color=(val)
58
+ @master_cell.border_right_color = val if rightmost?
59
+ end
60
+
61
+ def border_bottom_color=(val)
62
+ @master_cell.border_bottom_color = val if bottommost?
63
+ end
64
+
65
+ def border_right_width=(val)
66
+ @master_cell.border_right_width = val if rightmost?
67
+ end
68
+
69
+ def border_bottom_width=(val)
70
+ @master_cell.border_bottom_width = val if bottommost?
71
+ end
72
+
73
+ def background_color
74
+ @master_cell.background_color
75
+ end
76
+
77
+ private
78
+
79
+ # Are we on the right border of the span?
80
+ #
81
+ def rightmost?
82
+ @column == @master_cell.column + @master_cell.colspan - 1
83
+ end
84
+
85
+ # Are we on the bottom border of the span?
86
+ #
87
+ def bottommost?
88
+ @row == @master_cell.row + @master_cell.rowspan - 1
89
+ end
90
+ end
91
+ end
92
+ end
93
+ end
@@ -1,4 +1,4 @@
1
- # encoding: utf-8
1
+ # encoding: utf-8
2
2
 
3
3
  # subtable.rb: Yo dawg.
4
4
  #
@@ -47,7 +47,7 @@ module Prawn
47
47
  @subtable.cells.max_width
48
48
  end
49
49
 
50
- # Proxied to subtable.
50
+ # Proxied to subtable.
51
51
  #
52
52
  def natural_content_height
53
53
  @subtable.cells.height
@@ -1,4 +1,4 @@
1
- # encoding: utf-8
1
+ # encoding: utf-8
2
2
 
3
3
  # text.rb: Text table cells.
4
4
  #
@@ -47,7 +47,7 @@ module Prawn
47
47
  # from the final width if the text is long.
48
48
  #
49
49
  def natural_content_width
50
- [styled_width_of(@content), @pdf.bounds.width].min
50
+ @natural_content_width ||= [styled_width_of(@content), @pdf.bounds.width].min
51
51
  end
52
52
 
53
53
  # Returns the natural height of this block of text, wrapped to the
@@ -55,7 +55,7 @@ module Prawn
55
55
  #
56
56
  def natural_content_height
57
57
  with_font do
58
- b = text_box(:width => content_width + FPTolerance)
58
+ b = text_box(:width => spanned_content_width + FPTolerance)
59
59
  b.render(:dry_run => true)
60
60
  b.height + b.line_gap
61
61
  end
@@ -64,52 +64,64 @@ module Prawn
64
64
  # Draws the text content into its bounding box.
65
65
  #
66
66
  def draw_content
67
- with_font do
67
+ with_font do
68
68
  @pdf.move_down((@pdf.font.line_gap + @pdf.font.descender)/2)
69
69
  with_text_color do
70
- text_box(:width => content_width + FPTolerance,
71
- :height => content_height + FPTolerance,
70
+ text_box(:width => spanned_content_width + FPTolerance,
71
+ :height => spanned_content_height + FPTolerance,
72
72
  :at => [0, @pdf.cursor]).render
73
73
  end
74
74
  end
75
75
  end
76
76
 
77
- protected
78
-
79
77
  def set_width_constraints
80
78
  # Sets a reasonable minimum width. If the cell has any content, make
81
79
  # sure we have enough width to be at least one character wide. This is
82
80
  # a bit of a hack, but it should work well enough.
83
- min_content_width = [natural_content_width, styled_width_of("M")].min
84
- @min_width ||= padding_left + padding_right + min_content_width
85
- super
81
+ unless defined?(@min_width) && @min_width
82
+ min_content_width = [natural_content_width, styled_width_of_single_character].min
83
+ @min_width = padding_left + padding_right + min_content_width
84
+ super
85
+ end
86
86
  end
87
87
 
88
+ protected
89
+
88
90
  def with_font
89
91
  @pdf.save_font do
90
92
  options = {}
91
93
  options[:style] = @text_options[:style] if @text_options[:style]
94
+ options[:style] ||= @pdf.font.options[:style] if @pdf.font.options[:style]
92
95
 
93
- @pdf.font(@font || @pdf.font.name, options)
96
+ @pdf.font(defined?(@font) && @font || @pdf.font.family, options)
94
97
 
95
98
  yield
96
99
  end
97
100
  end
98
101
 
99
102
  def with_text_color
100
- old_color = @pdf.fill_color || '000000'
101
- @pdf.fill_color(@text_color) if @text_color
102
- yield
103
- ensure
104
- @pdf.fill_color(old_color)
103
+ if defined?(@text_color) && @text_color
104
+ begin
105
+ old_color = @pdf.fill_color || '000000'
106
+ @pdf.fill_color(@text_color)
107
+ yield
108
+ ensure
109
+ @pdf.fill_color(old_color)
110
+ end
111
+ else
112
+ yield
113
+ end
105
114
  end
106
-
115
+
107
116
  def text_box(extra_options={})
108
- if @text_options[:inline_format]
117
+ if p = @text_options[:inline_format]
118
+ p = [] unless p.is_a?(Array)
109
119
  options = @text_options.dup
110
120
  options.delete(:inline_format)
121
+ options.merge!(extra_options)
122
+ options[:document] = @pdf
111
123
 
112
- array = ::Prawn::Text::Formatted::Parser.to_array(@content)
124
+ array = @pdf.text_formatter.format(@content, *p)
113
125
  ::Prawn::Text::Formatted::Box.new(array,
114
126
  options.merge(extra_options).merge(:document => @pdf))
115
127
  else
@@ -121,14 +133,20 @@ module Prawn
121
133
  # Returns the width of +text+ under the given text options.
122
134
  #
123
135
  def styled_width_of(text)
124
- with_font do
125
- options = {}
126
- options[:size] = @text_options[:size] if @text_options[:size]
127
-
128
- @pdf.font.compute_width_of(text, options)
129
- end
136
+ @pdf.width_of(text, @text_options)
130
137
  end
131
138
 
139
+ private
140
+
141
+ # Returns the greatest possible width of any single character
142
+ # under the given text options.
143
+ # (We use this to determine the minimum width of a table cell)
144
+ # (Although we currently determine this by measuring "M", it should really
145
+ # use whichever character is widest under the current font)
146
+ #
147
+ def styled_width_of_single_character
148
+ styled_width_of("M")
149
+ end
132
150
  end
133
151
  end
134
152
  end