hexapdf 0.21.1 → 0.24.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (253) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +137 -0
  3. data/LICENSE +1 -1
  4. data/Rakefile +1 -1
  5. data/examples/016-frame_automatic_box_placement.rb +7 -2
  6. data/examples/017-frame_text_flow.rb +10 -18
  7. data/examples/020-column_box.rb +20 -37
  8. data/examples/021-list_box.rb +26 -0
  9. data/lib/hexapdf/cli/batch.rb +1 -1
  10. data/lib/hexapdf/cli/command.rb +1 -1
  11. data/lib/hexapdf/cli/files.rb +1 -1
  12. data/lib/hexapdf/cli/fonts.rb +1 -1
  13. data/lib/hexapdf/cli/form.rb +31 -4
  14. data/lib/hexapdf/cli/image2pdf.rb +1 -1
  15. data/lib/hexapdf/cli/images.rb +1 -1
  16. data/lib/hexapdf/cli/info.rb +2 -2
  17. data/lib/hexapdf/cli/inspect.rb +19 -6
  18. data/lib/hexapdf/cli/merge.rb +1 -1
  19. data/lib/hexapdf/cli/modify.rb +24 -4
  20. data/lib/hexapdf/cli/optimize.rb +1 -1
  21. data/lib/hexapdf/cli/split.rb +1 -1
  22. data/lib/hexapdf/cli/watermark.rb +1 -1
  23. data/lib/hexapdf/cli.rb +1 -1
  24. data/lib/hexapdf/composer.rb +66 -125
  25. data/lib/hexapdf/configuration.rb +17 -1
  26. data/lib/hexapdf/content/canvas.rb +1 -1
  27. data/lib/hexapdf/content/color_space.rb +1 -1
  28. data/lib/hexapdf/content/graphic_object/arc.rb +1 -1
  29. data/lib/hexapdf/content/graphic_object/endpoint_arc.rb +1 -1
  30. data/lib/hexapdf/content/graphic_object/geom2d.rb +2 -1
  31. data/lib/hexapdf/content/graphic_object/solid_arc.rb +1 -1
  32. data/lib/hexapdf/content/graphic_object.rb +1 -1
  33. data/lib/hexapdf/content/graphics_state.rb +1 -1
  34. data/lib/hexapdf/content/operator.rb +1 -1
  35. data/lib/hexapdf/content/parser.rb +1 -1
  36. data/lib/hexapdf/content/processor.rb +1 -1
  37. data/lib/hexapdf/content/transformation_matrix.rb +1 -1
  38. data/lib/hexapdf/content.rb +1 -1
  39. data/lib/hexapdf/data_dir.rb +1 -1
  40. data/lib/hexapdf/dictionary.rb +1 -1
  41. data/lib/hexapdf/dictionary_fields.rb +2 -2
  42. data/lib/hexapdf/document/destinations.rb +396 -0
  43. data/lib/hexapdf/document/files.rb +1 -1
  44. data/lib/hexapdf/document/fonts.rb +1 -1
  45. data/lib/hexapdf/document/images.rb +1 -1
  46. data/lib/hexapdf/document/layout.rb +397 -0
  47. data/lib/hexapdf/document/pages.rb +17 -1
  48. data/lib/hexapdf/document/signatures.rb +5 -4
  49. data/lib/hexapdf/document.rb +46 -90
  50. data/lib/hexapdf/encryption/aes.rb +1 -1
  51. data/lib/hexapdf/encryption/arc4.rb +1 -1
  52. data/lib/hexapdf/encryption/fast_aes.rb +1 -1
  53. data/lib/hexapdf/encryption/fast_arc4.rb +30 -21
  54. data/lib/hexapdf/encryption/identity.rb +1 -1
  55. data/lib/hexapdf/encryption/ruby_aes.rb +1 -1
  56. data/lib/hexapdf/encryption/ruby_arc4.rb +1 -1
  57. data/lib/hexapdf/encryption/security_handler.rb +1 -1
  58. data/lib/hexapdf/encryption/standard_security_handler.rb +1 -1
  59. data/lib/hexapdf/encryption.rb +1 -1
  60. data/lib/hexapdf/error.rb +1 -1
  61. data/lib/hexapdf/filter/ascii85_decode.rb +1 -1
  62. data/lib/hexapdf/filter/ascii_hex_decode.rb +1 -1
  63. data/lib/hexapdf/filter/crypt.rb +1 -1
  64. data/lib/hexapdf/filter/encryption.rb +1 -1
  65. data/lib/hexapdf/filter/flate_decode.rb +1 -1
  66. data/lib/hexapdf/filter/lzw_decode.rb +1 -1
  67. data/lib/hexapdf/filter/pass_through.rb +1 -1
  68. data/lib/hexapdf/filter/predictor.rb +1 -1
  69. data/lib/hexapdf/filter/run_length_decode.rb +1 -1
  70. data/lib/hexapdf/filter.rb +1 -1
  71. data/lib/hexapdf/font/cmap/parser.rb +1 -1
  72. data/lib/hexapdf/font/cmap/writer.rb +1 -1
  73. data/lib/hexapdf/font/cmap.rb +1 -1
  74. data/lib/hexapdf/font/encoding/base.rb +1 -1
  75. data/lib/hexapdf/font/encoding/difference_encoding.rb +1 -1
  76. data/lib/hexapdf/font/encoding/glyph_list.rb +2 -2
  77. data/lib/hexapdf/font/encoding/mac_expert_encoding.rb +1 -1
  78. data/lib/hexapdf/font/encoding/mac_roman_encoding.rb +1 -1
  79. data/lib/hexapdf/font/encoding/standard_encoding.rb +1 -1
  80. data/lib/hexapdf/font/encoding/symbol_encoding.rb +1 -1
  81. data/lib/hexapdf/font/encoding/win_ansi_encoding.rb +1 -1
  82. data/lib/hexapdf/font/encoding/zapf_dingbats_encoding.rb +1 -1
  83. data/lib/hexapdf/font/encoding.rb +1 -1
  84. data/lib/hexapdf/font/invalid_glyph.rb +1 -1
  85. data/lib/hexapdf/font/true_type/builder.rb +1 -1
  86. data/lib/hexapdf/font/true_type/font.rb +1 -1
  87. data/lib/hexapdf/font/true_type/optimizer.rb +1 -1
  88. data/lib/hexapdf/font/true_type/subsetter.rb +1 -1
  89. data/lib/hexapdf/font/true_type/table/cmap.rb +1 -1
  90. data/lib/hexapdf/font/true_type/table/cmap_subtable.rb +1 -1
  91. data/lib/hexapdf/font/true_type/table/directory.rb +1 -1
  92. data/lib/hexapdf/font/true_type/table/glyf.rb +1 -1
  93. data/lib/hexapdf/font/true_type/table/head.rb +1 -1
  94. data/lib/hexapdf/font/true_type/table/hhea.rb +1 -1
  95. data/lib/hexapdf/font/true_type/table/hmtx.rb +1 -1
  96. data/lib/hexapdf/font/true_type/table/kern.rb +1 -1
  97. data/lib/hexapdf/font/true_type/table/loca.rb +1 -1
  98. data/lib/hexapdf/font/true_type/table/maxp.rb +1 -1
  99. data/lib/hexapdf/font/true_type/table/name.rb +1 -1
  100. data/lib/hexapdf/font/true_type/table/os2.rb +1 -1
  101. data/lib/hexapdf/font/true_type/table/post.rb +1 -1
  102. data/lib/hexapdf/font/true_type/table.rb +1 -1
  103. data/lib/hexapdf/font/true_type.rb +1 -1
  104. data/lib/hexapdf/font/true_type_wrapper.rb +1 -1
  105. data/lib/hexapdf/font/type1/afm_parser.rb +1 -1
  106. data/lib/hexapdf/font/type1/character_metrics.rb +1 -1
  107. data/lib/hexapdf/font/type1/font.rb +1 -1
  108. data/lib/hexapdf/font/type1/font_metrics.rb +1 -1
  109. data/lib/hexapdf/font/type1/pfb_parser.rb +1 -1
  110. data/lib/hexapdf/font/type1.rb +1 -1
  111. data/lib/hexapdf/font/type1_wrapper.rb +1 -1
  112. data/lib/hexapdf/font_loader/from_configuration.rb +1 -1
  113. data/lib/hexapdf/font_loader/from_file.rb +1 -1
  114. data/lib/hexapdf/font_loader/standard14.rb +1 -1
  115. data/lib/hexapdf/font_loader.rb +1 -1
  116. data/lib/hexapdf/image_loader/jpeg.rb +1 -1
  117. data/lib/hexapdf/image_loader/pdf.rb +1 -1
  118. data/lib/hexapdf/image_loader/png.rb +1 -1
  119. data/lib/hexapdf/image_loader.rb +1 -1
  120. data/lib/hexapdf/importer.rb +1 -1
  121. data/lib/hexapdf/layout/box.rb +121 -22
  122. data/lib/hexapdf/layout/box_fitter.rb +136 -0
  123. data/lib/hexapdf/layout/column_box.rb +168 -89
  124. data/lib/hexapdf/layout/frame.rb +155 -140
  125. data/lib/hexapdf/layout/image_box.rb +19 -4
  126. data/lib/hexapdf/layout/inline_box.rb +1 -1
  127. data/lib/hexapdf/layout/line.rb +1 -1
  128. data/lib/hexapdf/layout/list_box.rb +355 -0
  129. data/lib/hexapdf/layout/numeric_refinements.rb +1 -1
  130. data/lib/hexapdf/layout/style.rb +285 -8
  131. data/lib/hexapdf/layout/text_box.rb +30 -11
  132. data/lib/hexapdf/layout/text_fragment.rb +3 -2
  133. data/lib/hexapdf/layout/text_layouter.rb +23 -3
  134. data/lib/hexapdf/layout/text_shaper.rb +1 -1
  135. data/lib/hexapdf/layout/width_from_polygon.rb +12 -7
  136. data/lib/hexapdf/layout.rb +4 -1
  137. data/lib/hexapdf/name_tree_node.rb +1 -1
  138. data/lib/hexapdf/number_tree_node.rb +1 -1
  139. data/lib/hexapdf/object.rb +1 -1
  140. data/lib/hexapdf/parser.rb +1 -8
  141. data/lib/hexapdf/pdf_array.rb +1 -1
  142. data/lib/hexapdf/rectangle.rb +1 -1
  143. data/lib/hexapdf/reference.rb +1 -1
  144. data/lib/hexapdf/revision.rb +9 -2
  145. data/lib/hexapdf/revisions.rb +152 -51
  146. data/lib/hexapdf/serializer.rb +1 -1
  147. data/lib/hexapdf/stream.rb +1 -1
  148. data/lib/hexapdf/task/dereference.rb +1 -1
  149. data/lib/hexapdf/task/optimize.rb +22 -12
  150. data/lib/hexapdf/task.rb +1 -1
  151. data/lib/hexapdf/tokenizer.rb +1 -1
  152. data/lib/hexapdf/type/acro_form/appearance_generator.rb +1 -1
  153. data/lib/hexapdf/type/acro_form/button_field.rb +1 -1
  154. data/lib/hexapdf/type/acro_form/choice_field.rb +1 -1
  155. data/lib/hexapdf/type/acro_form/field.rb +1 -1
  156. data/lib/hexapdf/type/acro_form/form.rb +12 -6
  157. data/lib/hexapdf/type/acro_form/signature_field.rb +1 -1
  158. data/lib/hexapdf/type/acro_form/text_field.rb +9 -1
  159. data/lib/hexapdf/type/acro_form/variable_text_field.rb +1 -1
  160. data/lib/hexapdf/type/acro_form.rb +1 -1
  161. data/lib/hexapdf/type/action.rb +1 -1
  162. data/lib/hexapdf/type/actions/go_to.rb +1 -1
  163. data/lib/hexapdf/type/actions/go_to_r.rb +1 -1
  164. data/lib/hexapdf/type/actions/launch.rb +1 -1
  165. data/lib/hexapdf/type/actions/uri.rb +1 -1
  166. data/lib/hexapdf/type/actions.rb +1 -1
  167. data/lib/hexapdf/type/annotation.rb +1 -1
  168. data/lib/hexapdf/type/annotations/link.rb +1 -1
  169. data/lib/hexapdf/type/annotations/markup_annotation.rb +1 -1
  170. data/lib/hexapdf/type/annotations/text.rb +1 -1
  171. data/lib/hexapdf/type/annotations/widget.rb +1 -1
  172. data/lib/hexapdf/type/annotations.rb +1 -1
  173. data/lib/hexapdf/type/catalog.rb +10 -2
  174. data/lib/hexapdf/type/cid_font.rb +1 -1
  175. data/lib/hexapdf/type/embedded_file.rb +1 -1
  176. data/lib/hexapdf/type/file_specification.rb +1 -1
  177. data/lib/hexapdf/type/font.rb +1 -1
  178. data/lib/hexapdf/type/font_descriptor.rb +1 -1
  179. data/lib/hexapdf/type/font_simple.rb +1 -1
  180. data/lib/hexapdf/type/font_true_type.rb +1 -1
  181. data/lib/hexapdf/type/font_type0.rb +1 -1
  182. data/lib/hexapdf/type/font_type1.rb +1 -1
  183. data/lib/hexapdf/type/font_type3.rb +1 -1
  184. data/lib/hexapdf/type/form.rb +1 -1
  185. data/lib/hexapdf/type/graphics_state_parameter.rb +1 -1
  186. data/lib/hexapdf/type/icon_fit.rb +1 -1
  187. data/lib/hexapdf/type/image.rb +48 -4
  188. data/lib/hexapdf/type/info.rb +1 -1
  189. data/lib/hexapdf/type/names.rb +14 -1
  190. data/lib/hexapdf/type/object_stream.rb +1 -1
  191. data/lib/hexapdf/type/page.rb +1 -1
  192. data/lib/hexapdf/type/page_tree_node.rb +19 -2
  193. data/lib/hexapdf/type/resources.rb +1 -1
  194. data/lib/hexapdf/type/signature/adbe_pkcs7_detached.rb +1 -1
  195. data/lib/hexapdf/type/signature/adbe_x509_rsa_sha1.rb +1 -1
  196. data/lib/hexapdf/type/signature/handler.rb +1 -1
  197. data/lib/hexapdf/type/signature/verification_result.rb +1 -1
  198. data/lib/hexapdf/type/signature.rb +1 -1
  199. data/lib/hexapdf/type/trailer.rb +2 -2
  200. data/lib/hexapdf/type/viewer_preferences.rb +1 -1
  201. data/lib/hexapdf/type/xref_stream.rb +3 -2
  202. data/lib/hexapdf/type.rb +1 -1
  203. data/lib/hexapdf/utils/bit_field.rb +1 -1
  204. data/lib/hexapdf/utils/bit_stream.rb +1 -1
  205. data/lib/hexapdf/utils/graphics_helpers.rb +1 -1
  206. data/lib/hexapdf/utils/lru_cache.rb +1 -1
  207. data/lib/hexapdf/utils/math_helpers.rb +1 -1
  208. data/lib/hexapdf/utils/object_hash.rb +1 -1
  209. data/lib/hexapdf/utils/pdf_doc_encoding.rb +1 -1
  210. data/lib/hexapdf/utils/sorted_tree_node.rb +4 -2
  211. data/lib/hexapdf/version.rb +2 -2
  212. data/lib/hexapdf/writer.rb +23 -8
  213. data/lib/hexapdf/xref_section.rb +1 -1
  214. data/lib/hexapdf.rb +1 -1
  215. data/test/hexapdf/content/graphic_object/test_geom2d.rb +1 -1
  216. data/test/hexapdf/document/test_destinations.rb +338 -0
  217. data/test/hexapdf/document/test_images.rb +1 -1
  218. data/test/hexapdf/document/test_layout.rb +264 -0
  219. data/test/hexapdf/document/test_pages.rb +9 -0
  220. data/test/hexapdf/document/test_signatures.rb +10 -3
  221. data/test/hexapdf/encryption/test_security_handler.rb +3 -3
  222. data/test/hexapdf/font/encoding/test_glyph_list.rb +4 -0
  223. data/test/hexapdf/layout/test_box.rb +53 -3
  224. data/test/hexapdf/layout/test_box_fitter.rb +62 -0
  225. data/test/hexapdf/layout/test_column_box.rb +159 -0
  226. data/test/hexapdf/layout/test_frame.rb +114 -39
  227. data/test/hexapdf/layout/test_image_box.rb +1 -1
  228. data/test/hexapdf/layout/test_list_box.rb +249 -0
  229. data/test/hexapdf/layout/test_text_box.rb +33 -2
  230. data/test/hexapdf/layout/test_text_fragment.rb +1 -1
  231. data/test/hexapdf/layout/test_text_layouter.rb +49 -17
  232. data/test/hexapdf/layout/test_width_from_polygon.rb +13 -0
  233. data/test/hexapdf/task/test_optimize.rb +17 -4
  234. data/test/hexapdf/test_composer.rb +35 -1
  235. data/test/hexapdf/test_dictionary_fields.rb +10 -10
  236. data/test/hexapdf/test_document.rb +33 -136
  237. data/test/hexapdf/test_filter.rb +1 -1
  238. data/test/hexapdf/test_parser.rb +1 -3
  239. data/test/hexapdf/test_revision.rb +14 -0
  240. data/test/hexapdf/test_revisions.rb +137 -29
  241. data/test/hexapdf/test_serializer.rb +1 -5
  242. data/test/hexapdf/test_writer.rb +99 -15
  243. data/test/hexapdf/type/acro_form/test_form.rb +2 -1
  244. data/test/hexapdf/type/acro_form/test_text_field.rb +17 -0
  245. data/test/hexapdf/type/test_catalog.rb +8 -0
  246. data/test/hexapdf/type/test_image.rb +45 -9
  247. data/test/hexapdf/type/test_names.rb +20 -0
  248. data/test/hexapdf/type/test_page_tree_node.rb +21 -1
  249. data/test/hexapdf/type/test_trailer.rb +3 -3
  250. data/test/hexapdf/type/test_xref_stream.rb +2 -1
  251. data/test/hexapdf/utils/test_sorted_tree_node.rb +11 -1
  252. data/test/test_helper.rb +5 -1
  253. metadata +29 -3
@@ -34,132 +34,211 @@
34
34
  # commercial licenses are available at <https://gettalong.at/hexapdf/>.
35
35
  #++
36
36
  require 'hexapdf/layout/box'
37
+ require 'hexapdf/layout/box_fitter'
37
38
 
38
39
  module HexaPDF
39
40
  module Layout
40
41
 
41
42
  # A ColumnBox arranges boxes in one or more columns.
42
43
  #
43
- # The number of columns as well as the size of the gap between the columns can be modified.
44
+ # The number and width of the columns as well as the size of the gap between the columns can be
45
+ # modified. Additionally, the contents can either fill the columns one after the other or the
46
+ # columns can be made equally high.
47
+ #
48
+ # If the column box has padding and/or borders specified, they are handled like with any other
49
+ # box. This means they are around all columns and their contents and are not used separately for
50
+ # each column.
51
+ #
52
+ # The following style properties are used (additionally to those used by the parent class):
53
+ #
54
+ # Style#position::
55
+ # If this is set to :flow, the frames created for the columns will take the shape of the
56
+ # frame into account. This also means that the +available_width+ and +available_height+
57
+ # arguments are ignored.
44
58
  class ColumnBox < Box
45
59
 
46
- # The child boxes of this ColumnBox.
60
+ # The child boxes of this ColumnBox. They need to be finalized before #fit is called.
47
61
  attr_reader :children
48
62
 
49
- # The number of columns.
50
- # TODO: allow array with column widths later like [100, :*, :*]; same for gaps
63
+ # The columns definition.
64
+ #
65
+ # This is an array containing the widths of the columns. The size of the array is the number
66
+ # of columns.
67
+ #
68
+ # If a negative integer is used for the width, the column is auto-sized. Such columns split
69
+ # the remaining width (after substracting the widths of the fixed columns) proportionally
70
+ # among them. For example, if the definition is [-1, -2, -2], the first column is a fifth of
71
+ # the width and the other columns are each two fifth of the width.
72
+ #
73
+ # Examples:
74
+ #
75
+ # #>pdf-composer
76
+ # composer.box(:column, columns: 2, gaps: 10,
77
+ # children: [composer.document.layout.lorem_ipsum_box])
78
+ #
79
+ # ---
80
+ #
81
+ # #>pdf-composer
82
+ # composer.box(:column, columns: [50, -2, -1], gaps: [10, 5],
83
+ # children: [composer.document.layout.lorem_ipsum_box])
51
84
  attr_reader :columns
52
85
 
53
- # The size of the gap between the columns.
54
- attr_reader :gap
86
+ # The size of the gaps between the columns.
87
+ #
88
+ # This is an array containing the width of the gaps. If there are more gaps than numbers in
89
+ # the array, the array is cycled.
90
+ #
91
+ # Examples: see #columns
92
+ attr_reader :gaps
93
+
94
+ # Determines whether the columns should all be equally high or not.
95
+ #
96
+ # Examples:
97
+ #
98
+ # #>pdf-composer
99
+ # composer.box(:column, children: [composer.document.layout.lorem_ipsum_box])
100
+ #
101
+ # ---
102
+ #
103
+ # #>pdf-composer
104
+ # composer.box(:column, equal_height: false,
105
+ # children: [composer.document.layout.lorem_ipsum_box])
106
+ attr_reader :equal_height
55
107
 
56
- # Creates a new ColumnBox object for the given +children+ boxes.
57
- def initialize(children = [], columns = 2, gap: 36, **kwargs)
108
+ # Creates a new ColumnBox object for the given child boxes in +children+.
109
+ #
110
+ # +columns+::
111
+ #
112
+ # Can either simply integer specify the number of columns or be a full column definition
113
+ # (see #columns for details).
114
+ #
115
+ # +gaps+::
116
+ # Can either be a simply integer specifying the width between two columns or a full gap
117
+ # definition (see #gap for details).
118
+ #
119
+ # +equal_height+::
120
+ # If +true+, the #fit method tries to balance the columns in terms of their height.
121
+ # Otherwise the columns are filled from the left.
122
+ def initialize(children: [], columns: 2, gaps: 36, equal_height: true, **kwargs)
58
123
  super(**kwargs)
59
124
  @children = children
60
- @columns = columns
61
- @gap = gap
125
+ @columns = (columns.kind_of?(Array) ? columns : [-1] * columns)
126
+ @gaps = (gaps.kind_of?(Array) ? gaps : [gaps])
127
+ @equal_height = equal_height
128
+ end
129
+
130
+ # Returns +true+ as the 'position' style property value :flow is supported.
131
+ def supports_position_flow?
132
+ true
62
133
  end
63
134
 
64
135
  # Fits the column box into the available space.
136
+ #
137
+ # If the style property 'position' is set to :flow, the columns might not be rectangles but
138
+ # arbitrary (sets of) polygons since the +frame+s shape is taken into account.
65
139
  def fit(available_width, available_height, frame)
66
- last_height_difference = 1_000_000
140
+ initial_fit_successful = (@equal_height ? nil : false)
141
+ tries = 0
142
+ @width = if style.position == :flow
143
+ (@initial_width > 0 ? @initial_width : frame.width) - reserved_width
144
+ else
145
+ (@initial_width > 0 ? @initial_width : available_width) - reserved_width
146
+ end
67
147
  height = if style.position == :flow
68
- frame.height
148
+ (@initial_height > 0 ? @initial_height : frame.height) - reserved_height
69
149
  else
70
150
  (@initial_height > 0 ? @initial_height : available_height) - reserved_height
71
151
  end
152
+
153
+ columns = calculate_columns(@width)
154
+ return false if columns.empty?
155
+
156
+ left = (style.position == :flow ? frame.left : frame.x) + reserved_width_left
157
+ top = (style.position == :flow ? frame.bottom + frame.height : frame.y) - reserved_height_top
158
+ successful_height = height
159
+ unsuccessful_height = 0
160
+
72
161
  while true
73
- p '-'*100
74
- @frames = []
75
- if style.position == :flow
76
- column_width = (frame.width - gap * (@columns - 1)).to_f / @columns
77
- @columns.times do |col_nr|
78
- left = (column_width + gap) * col_nr + frame.left
79
- bottom = frame.bottom
80
- rect = Geom2D::Polygon([left, bottom],
81
- [left + column_width, bottom],
82
- [left + column_width, bottom + height],
83
- [left, bottom + height])
162
+ @box_fitter = BoxFitter.new
163
+
164
+ columns.each do |col_x, column_width|
165
+ column_left = left + col_x
166
+ column_bottom = top - height
167
+ if style.position == :flow
168
+ rect = Geom2D::Polygon([column_left, column_bottom],
169
+ [column_left + column_width, column_bottom],
170
+ [column_left + column_width, column_bottom + height],
171
+ [column_left, column_bottom + height])
84
172
  shape = Geom2D::Algorithms::PolygonOperation.run(frame.shape, rect, :intersection)
85
- col_frame = Frame.new(left, bottom, column_width, height)
86
- col_frame.shape = shape
87
- @frames << col_frame
88
- end
89
- @frame_index = 0
90
- @results = @children.map {|child_box| fit_box(child_box) }
91
- @width = frame.width
92
- @height = frame.height - @frames.min_by(&:y).y
93
- else
94
- width = (@initial_width > 0 ? @initial_width : available_width) - reserved_width
95
- column_width = (width - gap * (@columns - 1)).to_f / @columns
96
- @columns.times do |col_nr|
97
- @frames << Frame.new((column_width + gap) * col_nr, 0, column_width, height)
98
173
  end
99
- @frame_index = 0
100
- @results = @children.map {|child_box| fit_box(child_box) }
101
- @width = width
102
- @height = height - @frames.min_by(&:y).y
174
+ column_frame = Frame.new(column_left, column_bottom, column_width, height, shape: shape)
175
+ @box_fitter << column_frame
103
176
  end
104
- min_y, max_y = @frames.minmax_by(&:y).map(&:y)
105
- p [height, @frames.map(&:y), last_height_difference, min_y, max_y]
106
- # TOOD: @result.any?(&:empty?) only for the first run!!!! if the first run fails, we
107
- # cannot balance the columns because there is too much content.
108
- # TODO: another break condition is if the @results didn't change since the last run
109
- p [:maybe_redo, min_y, max_y, height, last_height_difference]
110
- p [@results.map {|arr| arr.all? {|r| r.status }}]
111
- break if max_y != height && @results.all? {|arr| !arr.empty? && arr.all? {|r| r.success? }} &&
112
- (@results.any?(&:empty?) ||
113
- max_y - min_y >= last_height_difference ||
114
- max_y - min_y < 0.5)
115
- if max_y == 0 && min_y == 0
116
- height += last_height_difference / 4.0
117
- else
118
- last_height_difference = max_y - min_y
119
- height -= last_height_difference / 2.0
177
+
178
+ children.each {|box| @box_fitter.fit(box) }
179
+
180
+ fit_successful = @box_fitter.fit_successful?
181
+ initial_fit_successful = fit_successful if initial_fit_successful.nil?
182
+
183
+ if fit_successful
184
+ successful_height = height if successful_height > height
185
+ elsif unsuccessful_height < height
186
+ unsuccessful_height = height
120
187
  end
188
+
189
+ break if !initial_fit_successful || tries > 40 ||
190
+ (fit_successful && successful_height - unsuccessful_height < 10)
191
+
192
+ height = if successful_height - unsuccessful_height <= 5
193
+ successful_height
194
+ else
195
+ (successful_height + unsuccessful_height) / 2.0
196
+ end
197
+ tries += 1
121
198
  end
122
- @results.all? {|res| res.length == 1 }
199
+
200
+ @width = columns[-1].sum + reserved_width
201
+ @height = @box_fitter.content_heights.max + reserved_height
202
+
203
+ @box_fitter.fit_successful?
123
204
  end
124
205
 
125
206
  private
126
207
 
127
- def fit_box(box)
128
- cur_frame = @frames[@frame_index]
129
- fit_results = []
130
- while cur_frame
131
- result = cur_frame.fit(box)
132
- if result.success?
133
- cur_frame.remove_area(result.mask)
134
- fit_results << result
135
- break
136
- elsif cur_frame.full?
137
- @frame_index += 1
138
- break if @frame_index == @frames.length
139
- cur_frame = @frames[@frame_index]
140
- else
141
- draw_box, box = cur_frame.split(result)
142
- if draw_box
143
- cur_frame.remove_area(result.mask)
144
- fit_results << result
145
- elsif !cur_frame.find_next_region
146
- @frame_index += 1
147
- break if @frame_index == @frames.length
148
- cur_frame = @frames[@frame_index]
149
- end
150
- end
208
+ # Calculates the x-coordinates and widths of all columns based on the given total available
209
+ # width.
210
+ #
211
+ # If it is not possible to fit all columns into the given +width+, an empty array is returned.
212
+ def calculate_columns(width)
213
+ number_of_columns = @columns.size
214
+ gaps = @gaps.cycle.take(number_of_columns - 1)
215
+ fixed_width, variable_width = @columns.partition(&:positive?).map {|c| c.sum(&:abs) }
216
+ rest_width = width - fixed_width - gaps.sum
217
+ return [] if rest_width <= 0
218
+
219
+ variable_width_unit = rest_width / variable_width.to_f
220
+ position = 0
221
+ @columns.map.with_index do |column, index|
222
+ result = if column > 0
223
+ [position, column]
224
+ else
225
+ [position, column.abs * variable_width_unit]
226
+ end
227
+ position += result[1] + (gaps[index] || 0)
228
+ result
151
229
  end
152
- fit_results
230
+ end
231
+
232
+ # Splits the content of the column box. This method is called from Box#split.
233
+ def split_content(_available_width, _available_height, _frame)
234
+ box = create_split_box
235
+ box.instance_variable_set(:@children, @box_fitter.remaining_boxes)
236
+ [self, box]
153
237
  end
154
238
 
155
239
  # Draws the child boxes onto the canvas at position [x, y].
156
- def draw_content(canvas, x, y)
157
- x = y = 0 if style.position == :flow
158
- @results.each do |result_boxes|
159
- result_boxes.each do |result|
160
- result.box.draw(canvas, x + result.x, y + result.y)
161
- end
162
- end
240
+ def draw_content(canvas, _x, _y)
241
+ @box_fitter.fit_results.each {|result| result.draw(canvas) }
163
242
  end
164
243
 
165
244
  end