Change text box to return remaining text as UTF-8, improve Win1252 handling internally, raise errors or warnings rather than silently replacing invalid glyphs

lib/prawn/font/afm.rb

@@ -101,6 +101,10 @@ def normalize_encoding(text)
           "Arguments to text methods must be UTF-8 encoded"
       end
 
+      def to_utf8(text)
+        text.bytes.pack("U*")
+      end
+
       # Returns the number of characters in +str+ (a WinAnsi-encoded string).
       #
       def character_count(str)

lib/prawn/font/ttf.rb

@@ -173,6 +173,10 @@ def normalize_encoding(text)
         end
       end
 
+      def to_utf8(text)
+        text.encode("UTF-8")
+      end
+
       def glyph_present?(char)
         code = char.codepoints.first
         cmap[code] > 0

lib/prawn/text/formatted/box.rb

@@ -229,7 +229,9 @@ def render(flags={})
             end
           end
 
-          unprinted_text
+          unprinted_text.map do |e| 
+            e.merge(:text => @document.font.to_utf8(e[:text])) 
+          end
         end
 
         # The width available at this point in the box

spec/text_box_spec.rb

@@ -676,19 +676,9 @@
   end
 
   describe "when using an AFM font" do
-    it "unprinted text should be in WinAnsi encoding" do
-      remaining_text = @text_box.render
-      remaining_text.should == @pdf.font.normalize_encoding(@text)
-    end
-    it "subsequent calls to Text::Box must include the" +
-       " :skip_encoding => true option" do
+    it "unprinted text should be in UTF-8 encoding" do
       remaining_text = @text_box.render
-      lambda {
-        @pdf.text_box(remaining_text, :document => @pdf)
-      }.should raise_error(Prawn::Errors::IncompatibleStringEncoding)
-
-      @pdf.text_box(remaining_text, :skip_encoding => true,
-                                    :document => @pdf)
+      remaining_text.should == @text
     end
   end
 end