prawn 0.3.0 → 0.4.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (87) hide show
  1. data/Rakefile +3 -1
  2. data/data/fonts/Action Man.dfont +0 -0
  3. data/examples/general/measurement_units.rb +2 -2
  4. data/examples/graphics/image_flow.rb +2 -2
  5. data/examples/graphics/stroke_bounds.rb +1 -1
  6. data/examples/m17n/win_ansi_charset.rb +3 -3
  7. data/examples/text/dfont.rb +49 -0
  8. data/examples/text/flowing_text_with_header_and_footer.rb +2 -48
  9. data/examples/text/font_calculations.rb +7 -6
  10. data/examples/text/font_size.rb +4 -4
  11. data/examples/text/text_flow.rb +1 -1
  12. data/lib/prawn.rb +6 -3
  13. data/lib/prawn/compatibility.rb +12 -17
  14. data/lib/prawn/document.rb +10 -10
  15. data/lib/prawn/document/internals.rb +8 -3
  16. data/lib/prawn/document/text.rb +39 -57
  17. data/lib/prawn/document/text/box.rb +1 -2
  18. data/lib/prawn/document/text/wrapping.rb +59 -0
  19. data/lib/prawn/errors.rb +0 -8
  20. data/lib/prawn/font.rb +192 -277
  21. data/lib/prawn/font/afm.rb +199 -0
  22. data/lib/prawn/font/dfont.rb +31 -0
  23. data/lib/prawn/font/ttf.rb +318 -0
  24. data/lib/prawn/graphics.rb +7 -2
  25. data/lib/prawn/images/png.rb +1 -1
  26. data/lib/prawn/reference.rb +7 -4
  27. data/spec/font_spec.rb +154 -61
  28. data/spec/text_spec.rb +47 -6
  29. data/vendor/pdf-inspector/lib/pdf/inspector.rb +1 -1
  30. data/vendor/ttfunk/example.rb +42 -2
  31. data/vendor/ttfunk/lib/ttfunk.rb +96 -42
  32. data/vendor/ttfunk/lib/ttfunk/directory.rb +17 -0
  33. data/vendor/ttfunk/lib/ttfunk/encoding/mac_roman.rb +88 -0
  34. data/vendor/ttfunk/lib/ttfunk/encoding/windows_1252.rb +69 -0
  35. data/vendor/ttfunk/lib/ttfunk/reader.rb +44 -0
  36. data/vendor/ttfunk/lib/ttfunk/resource_file.rb +78 -0
  37. data/vendor/ttfunk/lib/ttfunk/subset.rb +18 -0
  38. data/vendor/ttfunk/lib/ttfunk/subset/base.rb +141 -0
  39. data/vendor/ttfunk/lib/ttfunk/subset/mac_roman.rb +46 -0
  40. data/vendor/ttfunk/lib/ttfunk/subset/unicode.rb +48 -0
  41. data/vendor/ttfunk/lib/ttfunk/subset/unicode_8bit.rb +63 -0
  42. data/vendor/ttfunk/lib/ttfunk/subset/windows_1252.rb +51 -0
  43. data/vendor/ttfunk/lib/ttfunk/subset_collection.rb +72 -0
  44. data/vendor/ttfunk/lib/ttfunk/table.rb +37 -18
  45. data/vendor/ttfunk/lib/ttfunk/table/cmap.rb +24 -84
  46. data/vendor/ttfunk/lib/ttfunk/table/cmap/format00.rb +54 -0
  47. data/vendor/ttfunk/lib/ttfunk/table/cmap/format04.rb +126 -0
  48. data/vendor/ttfunk/lib/ttfunk/table/cmap/subtable.rb +79 -0
  49. data/vendor/ttfunk/lib/ttfunk/table/glyf.rb +64 -0
  50. data/vendor/ttfunk/lib/ttfunk/table/glyf/compound.rb +81 -0
  51. data/vendor/ttfunk/lib/ttfunk/table/glyf/simple.rb +37 -0
  52. data/vendor/ttfunk/lib/ttfunk/table/head.rb +38 -19
  53. data/vendor/ttfunk/lib/ttfunk/table/hhea.rb +35 -21
  54. data/vendor/ttfunk/lib/ttfunk/table/hmtx.rb +40 -13
  55. data/vendor/ttfunk/lib/ttfunk/table/kern.rb +69 -38
  56. data/vendor/ttfunk/lib/ttfunk/table/kern/format0.rb +62 -0
  57. data/vendor/ttfunk/lib/ttfunk/table/loca.rb +43 -0
  58. data/vendor/ttfunk/lib/ttfunk/table/maxp.rb +34 -11
  59. data/vendor/ttfunk/lib/ttfunk/table/name.rb +109 -42
  60. data/vendor/ttfunk/lib/ttfunk/table/os2.rb +78 -0
  61. data/vendor/ttfunk/lib/ttfunk/table/post.rb +91 -0
  62. data/vendor/ttfunk/lib/ttfunk/table/post/format10.rb +43 -0
  63. data/vendor/ttfunk/lib/ttfunk/table/post/format20.rb +35 -0
  64. data/vendor/ttfunk/lib/ttfunk/table/post/format25.rb +23 -0
  65. data/vendor/ttfunk/lib/ttfunk/table/post/format30.rb +17 -0
  66. data/vendor/ttfunk/lib/ttfunk/table/post/format40.rb +17 -0
  67. data/vendor/ttfunk/lib/ttfunk/table/simple.rb +14 -0
  68. metadata +54 -25
  69. data/examples/table/addressbook.csv +0 -6
  70. data/examples/table/cell.rb +0 -40
  71. data/examples/table/currency.csv +0 -1834
  72. data/examples/table/fancy_table.rb +0 -62
  73. data/examples/table/ruport_formatter.rb +0 -53
  74. data/examples/table/table.rb +0 -51
  75. data/examples/table/table_alignment.rb +0 -18
  76. data/examples/table/table_border_color.rb +0 -17
  77. data/examples/table/table_colspan.rb +0 -19
  78. data/examples/table/table_header_color.rb +0 -19
  79. data/examples/table/table_header_underline.rb +0 -15
  80. data/lib/prawn/document/table.rb +0 -338
  81. data/lib/prawn/font/cmap.rb +0 -59
  82. data/lib/prawn/font/metrics.rb +0 -378
  83. data/lib/prawn/font/wrapping.rb +0 -47
  84. data/lib/prawn/graphics/cell.rb +0 -264
  85. data/spec/metrics_spec.rb +0 -62
  86. data/spec/table_spec.rb +0 -179
  87. data/vendor/ttfunk/lib/ttfunk/table/directory.rb +0 -25
@@ -1,27 +1,46 @@
1
- require "ttfunk/table/directory"
2
-
3
- %w[cmap head hhea hmtx name kern maxp].each do |lib|
4
- require "ttfunk/table/" + lib
5
- TTFunk::File.has_table lib
6
- end
1
+ require 'ttfunk/reader'
7
2
 
8
3
  module TTFunk
9
4
  class Table
10
- def method_missing(*args, &block)
11
- var = "@#{args.first}"
12
- if instance_variables.map { |e| e.to_s }.include?(var)
13
- instance_variable_get(var)
5
+ include Reader
6
+
7
+ attr_reader :file
8
+ attr_reader :offset
9
+ attr_reader :length
10
+
11
+ def initialize(file)
12
+ @file = file
13
+
14
+ info = file.directory_info(tag)
15
+
16
+ if info
17
+ @offset = info[:offset]
18
+ @length = info[:length]
19
+
20
+ parse_from(@offset) { parse! }
21
+ end
22
+ end
23
+
24
+ def exists?
25
+ !@offset.nil?
26
+ end
27
+
28
+ def raw
29
+ if exists?
30
+ parse_from(offset) { io.read(length) }
14
31
  else
15
- super
32
+ nil
16
33
  end
17
34
  end
18
-
19
- private
20
-
21
- def to_signed(n, length=16)
22
- max = 2**length-1
23
- mid = 2**(length-1)
24
- (n>=mid) ? -((n ^ max) + 1) : n
35
+
36
+ def tag
37
+ self.class.name.split(/::/).last.downcase
25
38
  end
39
+
40
+ private
41
+
42
+ def parse!
43
+ # do nothing, by default
44
+ end
26
45
  end
27
46
  end
@@ -1,94 +1,34 @@
1
1
  module TTFunk
2
2
  class Table
3
3
  class Cmap < Table
4
- def initialize(fh, font, info)
5
- @file = fh
6
- @file.pos = info[:offset]
7
-
8
- @version, @table_count = @file.read(4).unpack("n2")
9
-
10
- process_subtables(info[:offset])
4
+ attr_reader :version
5
+ attr_reader :tables
6
+
7
+ def self.encode(charmap, encoding)
8
+ result = Cmap::Subtable.encode(charmap, encoding)
9
+
10
+ # pack 'version' and 'table-count'
11
+ result[:table] = [0, 1, result.delete(:subtable)].pack("nnA*")
12
+ return result
11
13
  end
12
-
13
- private
14
-
15
- def process_subtables(table_start)
16
- @sub_tables = {}
17
- @formats = {}
18
- @table_count.times do
19
- platform_id, encoding_id, offset = @file.read(8).unpack("n2N")
20
- @sub_tables[[platform_id, encoding_id]] = offset
21
- end
22
-
23
- @sub_tables.each do |ident, offset|
24
- @file.pos = table_start + offset
25
- format = @file.read(2).unpack("n").first
26
- case format
27
- when 0
28
- read_format0
29
- when 4
30
- read_format4(table_start)
31
- else
32
- if $DEBUG
33
- warn "TTFunk: Format #{format} not implemented, skipping"
34
- end
35
- end
36
- end
14
+
15
+ def unicode
16
+ @unicode ||= @tables.select { |table| table.unicode? }
37
17
  end
38
-
39
- def read_segment
40
- @file.read(@segcount_x2).unpack("n#{@segcount_x2 / 2}")
41
- end
42
-
43
- def read_format0
44
- @file.read(4) # skip length, language for now
45
- glyph_ids = @file.read(256).unpack("C256")
46
- @formats[0] = glyph_ids
47
- end
48
-
49
- def read_format4(table_start)
50
- @formats[4] = {}
51
-
52
- length, language = @file.read(4).unpack("n2")
53
- @segcount_x2, search_range, entry_selector, range_shift =
54
- @file.read(8).unpack("n4")
55
-
56
- extract_format4_glyph_ids(table_start)
57
- end
58
-
59
- def extract_format4_glyph_ids(table_start)
60
- end_count = read_segment
61
-
62
- @file.read(2) # skip reserved value
63
-
64
- start_count = read_segment
65
- id_delta = read_segment.map { |e| to_signed(e) }
66
- id_range_offset = read_segment
67
-
68
- remaining_shorts = (@file.pos - table_start) / 2
69
- glyph_ids = @file.read(remaining_shorts*2).unpack("n#{remaining_shorts}")
70
-
71
- start_count.each_with_index do |start, i|
72
- end_i = end_count[i]
73
- delta = id_delta[i]
74
- range = id_range_offset[i]
75
-
76
- start.upto(end_i) do |char|
77
- if range.zero?
78
- gid = char + delta
79
- else
80
- gindex = range / 2 + (char - start_count[i]) -
81
- (segcount_x2 / 2 - i)
82
- gid = glyph_ids[gindex] || 0
83
- gid += id_delta[i] if gid != 0
84
- end
85
- gid %= 65536
86
-
87
- @formats[4][char] = gid
18
+
19
+ private
20
+
21
+ def parse!
22
+ @version, table_count = read(4, "nn")
23
+ @tables = []
24
+
25
+ table_count.times do
26
+ @tables << Cmap::Subtable.new(file, offset)
88
27
  end
89
28
  end
90
- end
91
29
  end
92
30
 
93
31
  end
94
- end
32
+ end
33
+
34
+ require 'ttfunk/table/cmap/subtable'
@@ -0,0 +1,54 @@
1
+ require 'ttfunk/encoding/mac_roman'
2
+ require 'ttfunk/encoding/windows_1252'
3
+
4
+ module TTFunk
5
+ class Table
6
+ class Cmap
7
+
8
+ module Format00
9
+ attr_reader :language
10
+ attr_reader :code_map
11
+
12
+ # Expects a hash mapping character codes to glyph ids (where the
13
+ # glyph ids are from the original font). Returns a hash including
14
+ # a new map (:charmap) that maps the characters in charmap to a
15
+ # another hash containing both the old (:old) and new (:new) glyph
16
+ # ids. The returned hash also includes a :subtable key, which contains
17
+ # the encoded subtable for the given charmap.
18
+ def self.encode(charmap)
19
+ next_id = 0
20
+ glyph_indexes = Array.new(256, 0)
21
+ glyph_map = { 0 => 0 }
22
+
23
+ new_map = charmap.keys.sort.inject({}) do |map, code|
24
+ glyph_map[charmap[code]] ||= next_id += 1
25
+ map[code] = { :old => charmap[code], :new => glyph_map[charmap[code]] }
26
+ glyph_indexes[code] = glyph_map[charmap[code]]
27
+ map
28
+ end
29
+
30
+ # format, length, language, indices
31
+ subtable = [0, 262, 0, *glyph_indexes].pack("nnnC*")
32
+
33
+ { :charmap => new_map, :subtable => subtable, :max_glyph_id => next_id+1 }
34
+ end
35
+
36
+ def [](code)
37
+ @code_map[code] || 0
38
+ end
39
+
40
+ def supported?
41
+ true
42
+ end
43
+
44
+ private
45
+
46
+ def parse_cmap!
47
+ length, @language = read(4, "nn")
48
+ @code_map = read(256, "C*")
49
+ end
50
+ end
51
+
52
+ end
53
+ end
54
+ end
@@ -0,0 +1,126 @@
1
+ module TTFunk
2
+ class Table
3
+ class Cmap
4
+
5
+ module Format04
6
+ attr_reader :language
7
+ attr_reader :code_map
8
+
9
+ # Expects a hash mapping character codes to glyph ids (where the
10
+ # glyph ids are from the original font). Returns a hash including
11
+ # a new map (:charmap) that maps the characters in charmap to a
12
+ # another hash containing both the old (:old) and new (:new) glyph
13
+ # ids. The returned hash also includes a :subtable key, which contains
14
+ # the encoded subtable for the given charmap.
15
+ def self.encode(charmap)
16
+ end_codes = []
17
+ start_codes = []
18
+ next_id = 0
19
+ last = difference = nil
20
+
21
+ glyph_map = { 0 => 0 }
22
+ new_map = charmap.keys.sort.inject({}) do |map, code|
23
+ old = charmap[code]
24
+ glyph_map[old] ||= next_id += 1
25
+ map[code] = { :old => old, :new => glyph_map[old] }
26
+
27
+ delta = glyph_map[old] - code
28
+ if last.nil? || delta != difference
29
+ end_codes << last if last
30
+ start_codes << code
31
+ difference = delta
32
+ end
33
+ last = code
34
+
35
+ map
36
+ end
37
+
38
+ end_codes << last if last
39
+ end_codes << 0xFFFF
40
+ start_codes << 0xFFFF
41
+ segcount = start_codes.length
42
+
43
+ # build the conversion tables
44
+ deltas = []
45
+ range_offsets = []
46
+ glyph_indices = []
47
+
48
+ offset = 0
49
+ start_codes.zip(end_codes).each_with_index do |(a, b), segment|
50
+ if a == 0xFFFF
51
+ deltas << 0
52
+ range_offsets << 0
53
+ break
54
+ end
55
+
56
+ start_glyph_id = new_map[a][:new]
57
+ if a - start_glyph_id >= 0x8000
58
+ deltas << 0
59
+ range_offsets << 2 * (glyph_indices.length + segcount - segment)
60
+ a.upto(b) { |code| glyph_indices << new_map[code][:new] }
61
+ else
62
+ deltas << -a + start_glyph_id
63
+ range_offsets << 0
64
+ end
65
+ offset += 2
66
+ end
67
+
68
+ # format, length, language
69
+ subtable = [4, 16 + 8 * segcount + 2 * glyph_indices.length, 0].pack("nnn")
70
+
71
+ search_range = 2 * 2 ** (Math.log(segcount) / Math.log(2)).to_i
72
+ entry_selector = (Math.log(search_range / 2) / Math.log(2)).to_i
73
+ range_shift = (2 * segcount) - search_range
74
+ subtable << [segcount * 2, search_range, entry_selector, range_shift].pack("nnnn")
75
+
76
+ subtable << end_codes.pack("n*") << "\0\0" << start_codes.pack("n*")
77
+ subtable << deltas.pack("n*") << range_offsets.pack("n*") << glyph_indices.pack("n*")
78
+
79
+ { :charmap => new_map, :subtable => subtable, :max_glyph_id => next_id+1 }
80
+ end
81
+
82
+ def [](code)
83
+ @code_map[code] || 0
84
+ end
85
+
86
+ def supported?
87
+ true
88
+ end
89
+
90
+ private
91
+
92
+ def parse_cmap!
93
+ length, @language, segcount_x2 = read(6, "nnn")
94
+ segcount = segcount_x2 / 2
95
+
96
+ io.read(6) # skip searching hints
97
+
98
+ end_code = read(segcount_x2, "n*")
99
+ io.read(2) # skip reserved value
100
+ start_code = read(segcount_x2, "n*")
101
+ id_delta = read_signed(segcount)
102
+ id_range_offset = read(segcount_x2, "n*")
103
+
104
+ glyph_ids = read(length - io.pos + @offset, "n*")
105
+
106
+ @code_map = {}
107
+
108
+ end_code.each_with_index do |tail, i|
109
+ start_code[i].upto(tail) do |code|
110
+ if id_range_offset[i].zero?
111
+ glyph_id = code + id_delta[i]
112
+ else
113
+ index = id_range_offset[i] / 2 + (code - start_code[i]) - (segcount - i)
114
+ glyph_id = glyph_ids[index] || 0 # because some TTF fonts are broken
115
+ glyph_id += id_delta[i] if glyph_id != 0
116
+ end
117
+
118
+ @code_map[code] = glyph_id & 0xFFFF
119
+ end
120
+ end
121
+ end
122
+ end
123
+
124
+ end
125
+ end
126
+ end
@@ -0,0 +1,79 @@
1
+ require 'ttfunk/reader'
2
+
3
+ module TTFunk
4
+ class Table
5
+ class Cmap
6
+ class Subtable
7
+ include Reader
8
+
9
+ attr_reader :platform_id
10
+ attr_reader :encoding_id
11
+ attr_reader :format
12
+
13
+ ENCODING_MAPPINGS = {
14
+ :mac_roman => { :platform_id => 1, :encoding_id => 0 },
15
+ # use microsoft unicode, instead of generic unicode, for optimal windows support
16
+ :unicode => { :platform_id => 3, :encoding_id => 1 }
17
+ }
18
+
19
+ def self.encode(charmap, encoding)
20
+ case encoding
21
+ when :mac_roman
22
+ result = Format00.encode(charmap)
23
+ when :unicode
24
+ result = Format04.encode(charmap)
25
+ else
26
+ raise NotImplementedError, "encoding #{encoding.inspect} is not supported"
27
+ end
28
+
29
+ mapping = ENCODING_MAPPINGS[encoding]
30
+
31
+ # platform-id, encoding-id, offset
32
+ result[:subtable] = [mapping[:platform_id], mapping[:encoding_id],
33
+ 12, result[:subtable]].pack("nnNA*")
34
+
35
+ return result
36
+ end
37
+
38
+ def initialize(file, table_start)
39
+ @file = file
40
+ @platform_id, @encoding_id, @offset = read(8, "nnN")
41
+ @offset += table_start
42
+
43
+ parse_from(@offset) do
44
+ @format = read(2, "n").first
45
+
46
+ case @format
47
+ when 0 then extend(TTFunk::Table::Cmap::Format00)
48
+ when 4 then extend(TTFunk::Table::Cmap::Format04)
49
+ end
50
+
51
+ parse_cmap!
52
+ end
53
+ end
54
+
55
+ def unicode?
56
+ platform_id == 3 && encoding_id == 1 && format == 4 ||
57
+ platform_id == 0 && format == 4
58
+ end
59
+
60
+ def supported?
61
+ false
62
+ end
63
+
64
+ def [](code)
65
+ raise NotImplementedError, "cmap format #{@format} is not supported"
66
+ end
67
+
68
+ private
69
+
70
+ def parse_cmap!
71
+ # do nothing...
72
+ end
73
+ end
74
+ end
75
+ end
76
+ end
77
+
78
+ require 'ttfunk/table/cmap/format00'
79
+ require 'ttfunk/table/cmap/format04'
@@ -0,0 +1,64 @@
1
+ require 'ttfunk/table'
2
+
3
+ module TTFunk
4
+ class Table
5
+ class Glyf < Table
6
+ # Accepts a hash mapping (old) glyph-ids to glyph objects, and a hash
7
+ # mapping old glyph-ids to new glyph-ids.
8
+ #
9
+ # Returns a hash containing:
10
+ #
11
+ # * :table - a string representing the encoded 'glyf' table containing
12
+ # the given glyphs.
13
+ # * :offsets - an array of offsets for each glyph
14
+ def self.encode(glyphs, new2old, old2new)
15
+ result = { :table => "", :offsets => [] }
16
+
17
+ new2old.keys.sort.each do |new_id|
18
+ glyph = glyphs[new2old[new_id]]
19
+ result[:offsets] << result[:table].length
20
+ result[:table] << glyph.recode(old2new) if glyph
21
+ end
22
+
23
+ # include an offset at the end of the table, for use in computing the
24
+ # size of the last glyph
25
+ result[:offsets] << result[:table].length
26
+ return result
27
+ end
28
+
29
+ def for(glyph_id)
30
+ return @cache[glyph_id] if @cache.key?(glyph_id)
31
+
32
+ index = file.glyph_locations.index_of(glyph_id)
33
+ size = file.glyph_locations.size_of(glyph_id)
34
+
35
+ if size.zero? # blank glyph, e.g. space character
36
+ @cache[glyph_id] = nil
37
+ return nil
38
+ end
39
+
40
+ parse_from(offset + index) do
41
+ raw = io.read(size)
42
+ number_of_contours, x_min, y_min, x_max, y_max = raw.unpack("n5").map { |i| to_signed(i) }
43
+
44
+ @cache[glyph_id] = if number_of_contours == -1
45
+ Compound.new(raw, x_min, y_min, x_max, y_max)
46
+ else
47
+ Simple.new(raw, number_of_contours, x_min, y_min, x_max, y_max)
48
+ end
49
+ end
50
+ end
51
+
52
+ private
53
+
54
+ def parse!
55
+ # because the glyf table is rather complex to parse, we defer
56
+ # the parse until we need a specific glyf, and then cache it.
57
+ @cache = {}
58
+ end
59
+ end
60
+ end
61
+ end
62
+
63
+ require 'ttfunk/table/glyf/compound'
64
+ require 'ttfunk/table/glyf/simple'