@@ -15,5 +15,13 @@ Prawn::Document.generate "font_size.pdf", :page_size => "A4" do text 'Font at 9 point' end + font("Times-Roman", :style => :italic, :size => 12) do + text "Font in times at 12" + font.size(16) { text "Font in Times at 16" } + end + text 'Font at 16 point' -end + + font "Courier", :size => 40 + text "40 pt!" +end \ No newline at end of file examples/font_size.rb @@ -22,6 +22,11 @@ module Prawn # more portable. # def font(name=nil, options={}) + if block_given? + original_name = font.name + original_size = font.size + end + if name if font_families.key?(name) ff = name @@ -34,7 +39,16 @@ module Prawn Prawn::Font.register("Helvetica", :for => self, :family => "Helvetica") @font_name = "Helvetica" end - font_registry[@font_name] + + font_obj = font_registry[@font_name] + font_obj.size = options[:size] if options[:size] + + if block_given? + yield + font(original_name, :size => original_size) + else + font_obj + end end # Hash of Font objects keyed by names @@ -134,7 +148,11 @@ module Prawn end add_to_current_page - end + end + + def inspect + "Prawn::Font< #{name}: #{size} >" + end # Sets the default font size for use within a block. Individual overrides # can be used as desired. The previous font size will be restored after the lib/prawn/font.rb @@ -70,6 +70,28 @@ describe "font style support" do end +describe "Transactional font handling" do + before(:each) { create_pdf } + + it "should allow setting of size directly when font is created" do + @pdf.font "Courier", :size => 16 + @pdf.font.size.should == 16 + end + + it "should allow temporary setting of a new font using a transaction" do + original = @pdf.font + + @pdf.font "Courier", :size => 16 do + @pdf.font.name.should == "Courier" + @pdf.font.size.should == 16 + end + + @pdf.font.should == original + end + +end + + describe "Document#page_fonts" do before(:each) { create_pdf } spec/font_spec.rb 6ca21044092ec8078a3f63e8b7333999166da992 Gregory Brown gregory.t.brown@gmail.com http://github.com/sandal/prawn/commit/50e53a09409d600d000d1e4f7b45ba9539138fab 50e53a09409d600d000d1e4f7b45ba9539138fab 2008-10-26T10:11:16-07:00 2008-10-26T10:11:16-07:00 Add new font features 85844d75c18f2732da9040c50dbeff2f46ac381d Gregory Brown gregory.t.brown@gmail.com