data/encodings/win_ansi.txt examples/euro.rb lib/prawn/encoding.rb @@ -1,73 +1,3 @@ -1 -2 -3 -4 -5 -6 -7 -8 -9 -10 -11 -12 -13 -14 -15 -16 -17 -18 -19 -20 -21 -22 -23 -24 -25 -26 -27 -28 -29 -30 -31 -32 -33 -34 -35 -36 -37 -38 -39 -40 -41 -42 -43 -44 -45 -46 -47 -48 -49 -50 -51 -52 -53 -54 -55 -56 -57 -58 -59 -60 -61 -62 -63 -64 -65 -66 -67 - - - # encoding: utf-8 # prawn.rb : A library for PDF generation in Ruby @@ -76,11 +6,11 @@ # # This is free software. Please see the LICENSE and COPYING files for details. -%w[font_ttf].each do |dep| +%w[ttfunk/lib].each do |dep| $LOAD_PATH.unshift(File.dirname(__FILE__) + "/../vendor/#{dep}") end -require 'ttf' +require 'ttfunk' module Prawn file = __FILE__ lib/prawn.rb @@ -237,16 +237,11 @@ module Prawn # built-in fonts only work with latin encoding, so translate the string def normalize_builtin_encoding(text) - if text.respond_to?(:encode!) - text.encode!("ISO-8859-1") - else - require 'iconv' - text.replace Iconv.conv('ISO-8859-1//TRANSLIT', 'utf-8', text) - end - rescue - raise Prawn::Errors::IncompatibleStringEncoding, "When using a " + - "builtin font, only characters that exist in " + - "WinAnsi/ISO-8859-1 are allowed." + enc = Prawn::Encoding::WinAnsi.new + text.replace text.unpack("U*").collect { |i| enc[i] }.pack("C*") + rescue + raise Prawn::Errors::IncompatibleStringEncoding, "The string you " + + "are attempting to render is not encoded in valid UTF-8." end def normalize_ttf_encoding(text) lib/prawn/font.rb 65d093dd500a9feda913fc0ec304faae9b573bd6 James Healy jimmy@deefa.com http://github.com/sandal/prawn/commit/bb13bce6cd82db2b681b6acbe84d8d070d141cda bb13bce6cd82db2b681b6acbe84d8d070d141cda 2008-12-02T08:18:42-08:00 2008-09-28T03:06:37-07:00 Handle the conversion from UTF-8 to WinAnsi ourselves - using iconv was convenient, but there are enough differences between ISO-8859-1 andthe PDF WinAnsiEncoding that it was worth doing things ourselves (From Greg: I changed the implementation a little, class variables are evil, and behave different on different versions of Ruby) df2d8ce3f1d727c36a752d9da7a6053c7a1da3b2 Gregory Brown gregory.t.brown@gmail.com