prawn-format 0.1.1 → 0.2.0.1

data/Rakefile

@@ -6,7 +6,7 @@ rescue LoadError
   abort "You'll need to have `echoe' installed to use Prawn::Format's Rakefile"
 end
 
-version = Prawn::Format::Version::STRING.dup
+version = Prawn::Format::VERSION.dup
 if ENV['SNAPSHOT'].to_i == 1
   version << "." << Time.now.utc.strftime("%Y%m%d%H%M%S")
 end
@@ -20,7 +20,7 @@ Echoe.new('prawn-format', version) do |p|
   p.url              = "http://rubyforge.org/projects/prawn"
   p.project          = "prawn"
 
-  p.runtime_dependencies += ["prawn >=0.4", "prawn <0.5"]
+  p.runtime_dependencies << "prawn-core"
 
   p.need_zip         = true
   p.include_rakefile = true

data/lib/prawn/format.rb

@@ -9,6 +9,9 @@ module Prawn
       mod.send :alias_method, :text_without_formatting, :text
       mod.send :alias_method, :text, :text_with_formatting
 
+      mod.send :alias_method, :width_of_without_formatting, :width_of
+      mod.send :alias_method, :width_of, :width_of_with_formatting
+
       mod.send :alias_method, :height_of_without_formatting, :height_of
       mod.send :alias_method, :height_of, :height_of_with_formatting
     end
@@ -33,6 +36,16 @@ module Prawn
       end
     end
 
+    # Overloaded version of #width_of. Call via #width_of, rather than
+    # #width_of_with_formatting (see above, where it aliased to #width_of).
+    def width_of_with_formatting(string, options={}) #:nodoc:
+      if unformatted?(string, options)
+        width_of_without_formatting(string, options)
+      else
+        formatted_width(string, options)
+      end
+    end
+
     DEFAULT_TAGS = {
       :a      => { :meta => { :name => :anchor, :href => :target }, :color => "0000ff", :text_decoration => :underline },
       :b      => { :font_weight => :bold },
@@ -200,10 +213,15 @@ module Prawn
       end
 
       def formatted_height(string, line_width, size=font_size, options={})
-        helper = layout(string, options.merge(:size => font_size))
+        helper = layout(string, options.merge(:size => size))
         lines = helper.word_wrap(line_width)
         return lines.inject(0) { |s, line| s + line.height }
       end
+
+      def formatted_width(string, options={})
+        helper = layout(string, options)
+        helper.next.width
+      end
   end
 end
 

data/lib/prawn/format/effects/link.rb

@@ -6,7 +6,7 @@ module Prawn
 
       class Link
         def initialize(target, x)
-          @target = target.sub(/^#/, "")
+          @target = target
           @x = x
         end
 
@@ -16,7 +16,11 @@ module Prawn
           y  = draw_state[:real_y] + draw_state[:dy]
 
           rect = [x1, y + draw_state[:line].descent, x2, y + draw_state[:line].ascent]
-          document.link_annotation(rect, :Dest => @target, :Border => [0,0,0])
+          if @target.match(/^#/)
+	    document.link_annotation(rect, :Dest => @target.sub(/^#/,""), :Border => [0,0,0])
+	  else
+	    document.link_annotation(rect, :Border => [0,0,0], :A => { :Type => :Action, :S => :URI, :URI => Prawn::LiteralString.new(@target) } )
+	  end #new
         end
 
         def wrap(document, draw_state)

data/lib/prawn/format/instructions/text.rb

@@ -57,7 +57,7 @@ module Prawn
         end
 
         def width(type=:all)
-          @width ||= @state.font.width_of(@text, :size => @state.font_size, :kerning => @state.kerning?)
+          @width ||= @state.font.compute_width_of(@text, :size => @state.font_size, :kerning => @state.kerning?)
 
           case type
           when :discardable then discardable? ? @width : 0

data/lib/prawn/format/version.rb

@@ -1,11 +1,5 @@
 module Prawn
   module Format
-    module Version
-      MAJOR = 0
-      MINOR = 1
-      TINY  = 1
-
-      STRING = [MAJOR, MINOR, TINY].join(".")
-    end
+    VERSION = "0.2.0.1"
   end
 end

data/prawn-format.gemspec

@@ -1,39 +1,37 @@
+# -*- encoding: utf-8 -*-
+
 Gem::Specification.new do |s|
   s.name = %q{prawn-format}
-  s.version = "0.1.1"
+  s.version = "0.2.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jamis Buck"]
-  s.date = %q{2009-01-27}
+  s.date = %q{2009-06-15}
   s.description = %q{an extension of Prawn that allows inline formatting}
   s.email = %q{jamis@jamisbuck.org}
   s.extra_rdoc_files = ["lib/prawn/format/effects/link.rb", "lib/prawn/format/effects/underline.rb", "lib/prawn/format/instructions/base.rb", "lib/prawn/format/instructions/tag_close.rb", "lib/prawn/format/instructions/tag_open.rb", "lib/prawn/format/instructions/text.rb", "lib/prawn/format/layout_builder.rb", "lib/prawn/format/lexer.rb", "lib/prawn/format/line.rb", "lib/prawn/format/parser.rb", "lib/prawn/format/state.rb", "lib/prawn/format/text_object.rb", "lib/prawn/format/version.rb", "lib/prawn/format.rb"]
   s.files = ["examples/basic-formatting.rb", "examples/christmas-carol.txt", "examples/document.rb", "examples/flowing.rb", "examples/style-classes.rb", "examples/syntax-highlighting.rb", "examples/tags.rb", "lib/prawn/format/effects/link.rb", "lib/prawn/format/effects/underline.rb", "lib/prawn/format/instructions/base.rb", "lib/prawn/format/instructions/tag_close.rb", "lib/prawn/format/instructions/tag_open.rb", "lib/prawn/format/instructions/text.rb", "lib/prawn/format/layout_builder.rb", "lib/prawn/format/lexer.rb", "lib/prawn/format/line.rb", "lib/prawn/format/parser.rb", "lib/prawn/format/state.rb", "lib/prawn/format/text_object.rb", "lib/prawn/format/version.rb", "lib/prawn/format.rb", "manual/html.rb", "manual/include/basics.rb", "manual/include/breaks.rb", "manual/include/custom-tags.rb", "manual/include/custom-tags2.rb", "manual/include/indent.rb", "manual/include/options.rb", "manual/include/style-classes.rb", "manual/manual.txt", "manual/pdf.rb", "Rakefile", "spec/layout_builder_spec.rb", "spec/lexer_spec.rb", "spec/parser_spec.rb", "spec/spec_helper.rb", "Manifest", "prawn-format.gemspec"]
-  s.has_rdoc = true
   s.homepage = %q{http://rubyforge.org/projects/prawn}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Prawn-format"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{prawn}
-  s.rubygems_version = %q{1.2.0}
+  s.rubygems_version = %q{1.3.4}
   s.summary = %q{an extension of Prawn that allows inline formatting}
   s.test_files = ["spec/layout_builder_spec.rb", "spec/lexer_spec.rb", "spec/parser_spec.rb"]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
+    s.specification_version = 3
 
-    if current_version >= 3 then
-      s.add_runtime_dependency(%q<prawn>, [">= 0.4"])
-      s.add_runtime_dependency(%q<prawn>, ["< 0.5"])
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<prawn-core>, [">= 0"])
       s.add_development_dependency(%q<echoe>, [">= 0"])
     else
-      s.add_dependency(%q<prawn>, [">= 0.4"])
-      s.add_dependency(%q<prawn>, ["< 0.5"])
+      s.add_dependency(%q<prawn-core>, [">= 0"])
       s.add_dependency(%q<echoe>, [">= 0"])
     end
   else
-    s.add_dependency(%q<prawn>, [">= 0.4"])
-    s.add_dependency(%q<prawn>, ["< 0.5"])
+    s.add_dependency(%q<prawn-core>, [">= 0"])
     s.add_dependency(%q<echoe>, [">= 0"])
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: prawn-format
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.2.0.1
 platform: ruby
 authors: 
 - Jamis Buck
@@ -9,28 +9,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-27 00:00:00 -07:00
+date: 2009-06-15 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: prawn
+  name: prawn-core
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0.4"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: prawn
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - <
-      - !ruby/object:Gem::Version 
-        version: "0.5"
+        version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
   name: echoe
@@ -104,6 +94,8 @@ files:
 - prawn-format.gemspec
 has_rdoc: true
 homepage: http://rubyforge.org/projects/prawn
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --line-numbers
@@ -127,9 +119,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: prawn
-rubygems_version: 1.2.0
+rubygems_version: 1.3.4
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: an extension of Prawn that allows inline formatting
 test_files: 
 - spec/layout_builder_spec.rb