pdf-reader 1.2.0 → 1.3.0

data/lib/pdf/reader/width_calculator.rb

@@ -0,0 +1,11 @@
+# coding: utf-8
+
+# PDF files may define fonts in a number of ways. Each approach means we must
+# calculate glyph widths differently, so this set of classes conform to an
+# interface that will perform the appropriate calculations.
+
+require 'pdf/reader/width_calculator/built_in'
+require 'pdf/reader/width_calculator/composite'
+require 'pdf/reader/width_calculator/true_type'
+require 'pdf/reader/width_calculator/type_zero'
+require 'pdf/reader/width_calculator/type_one_or_three'

data/lib/pdf/reader/width_calculator/built_in.rb

@@ -0,0 +1,50 @@
+# coding: utf-8
+
+require 'afm'
+require 'pdf/reader/synchronized_cache'
+
+module AFM
+  # this is a monkey patch for the AFM gem. hopefully my patch will be accepted
+  # upstream and I can drop this
+  class Font
+    def metrics_for_name(name)
+      @char_metrics[name.to_s]
+    end
+  end
+end
+
+class PDF::Reader
+  module WidthCalculator
+
+    # Type1 fonts can be one of 14 "built in" standard fonts. In these cases,
+    # the reader is expected to have it's own copy of the font metrics.
+    # see Section 9.6.2.2, PDF 32000-1:2008, pp 256
+    class BuiltIn
+
+      def initialize(font)
+        @font = font
+        @@all_metrics ||= PDF::Reader::SynchronizedCache.new
+
+        metrics_path = File.join(File.dirname(__FILE__), "..","afm","#{font.basefont}.afm")
+
+        if File.file?(metrics_path)
+          @metrics = @@all_metrics[metrics_path] ||= AFM::Font.new(metrics_path)
+        else
+          raise ArgumentError, "No built-in metrics for #{font.basefont}"
+        end
+      end
+
+      def glyph_width(code_point)
+        return 0 if code_point.nil? || code_point < 0
+
+        m = @metrics.metrics_for(code_point)
+        if m.nil?
+          name = @font.encoding.int_to_name(code_point)
+          m = @metrics.metrics_for_name(name)
+        end
+        m[:wx]
+      end
+
+    end
+  end
+end

data/lib/pdf/reader/width_calculator/composite.rb

@@ -0,0 +1,27 @@
+# coding: utf-8
+
+class PDF::Reader
+  module WidthCalculator
+    # CIDFontType0 or CIDFontType2 use DW (integer) and W (array) to determine
+    # codepoint widths, note that CIDFontType2 will contain a true type font
+    # program which could be used to calculate width, however, a conforming writer
+    # is supposed to convert the widths for the codepoints used into the W array
+    # so that it can be used.
+    # see Section 9.7.4.1, PDF 32000-1:2008, pp 269-270
+    class Composite
+
+      def initialize(font)
+        @font = font
+        @widths = PDF::Reader::CidWidths.new(@font.cid_default_width, @font.cid_widths)
+      end
+
+      def glyph_width(code_point)
+        return 0 if code_point.nil? || code_point < 0
+
+        w = @widths[code_point]
+        # 0 is a valid width
+        return w.to_f unless w.nil?
+      end
+    end
+  end
+end

data/lib/pdf/reader/width_calculator/true_type.rb

@@ -0,0 +1,56 @@
+# coding: utf-8
+
+class PDF::Reader
+  module WidthCalculator
+    # Calculates the width of a glyph in a TrueType font
+    class TrueType
+
+      def initialize(font)
+        @font = font
+
+        if @font.font_descriptor
+          @missing_width = @font.font_descriptor.missing_width
+        else
+          @missing_width = 0
+        end
+      end
+
+      def glyph_width(code_point)
+        return 0 if code_point.nil? || code_point < 0
+
+        glyph_width_from_font(code_point) || glyph_width_from_descriptor(code_point)
+      end
+
+      private
+
+      #TODO convert Type3 units 1000 units => 1 text space unit
+      def glyph_width_from_font(code_point)
+        return if @font.widths.nil? || @font.widths.count == 0
+
+        # in ruby a negative index is valid, and will go from the end of the array
+        # which is undesireable in this case.
+        if @font.first_char <= code_point
+          @font.widths.fetch(code_point - @font.first_char, @missing_width).to_f
+        else
+          @missing_width.to_f
+        end
+      end
+
+      def glyph_width_from_descriptor(code_point)
+        return unless @font.font_descriptor
+
+        # true type fonts will have most of their information contained
+        # with-in a program inside the font descriptor, however the widths
+        # may not be in standard PDF glyph widths (1000 units => 1 text space unit)
+        # so this width will need to be scaled
+        w = @font.font_descriptor.find_glyph_width(code_point)
+        if w
+          w.to_f * @font.font_descriptor.glyph_to_pdf_scale_factor
+        else
+          nil
+        end
+      end
+    end
+  end
+end
+

data/lib/pdf/reader/width_calculator/type_one_or_three.rb

@@ -0,0 +1,32 @@
+# coding: utf-8
+
+class PDF::Reader
+  module WidthCalculator
+    # Calculates the width of a glyph in a Type One or Type Three
+    class TypeOneOrThree
+
+      def initialize(font)
+        @font = font
+
+        if @font.font_descriptor
+          @missing_width = @font.font_descriptor.missing_width
+        else
+          @missing_width = 0
+        end
+      end
+
+      def glyph_width(code_point)
+        return 0 if code_point.nil? || code_point < 0
+        return 0 if @font.widths.nil? || @font.widths.count == 0
+
+        # in ruby a negative index is valid, and will go from the end of the array
+        # which is undesireable in this case.
+        if @font.first_char <= code_point
+          @font.widths.fetch(code_point - @font.first_char, @missing_width).to_f
+        else
+          @missing_width.to_f
+        end
+      end
+    end
+  end
+end

data/lib/pdf/reader/width_calculator/type_zero.rb

@@ -0,0 +1,24 @@
+# coding: utf-8
+
+class PDF::Reader
+  module WidthCalculator
+    # Type0 (or Composite) fonts are a "root font" that rely on a "descendant font"
+    # to do the heavy lifting. The "descendant font" is a CID-Keyed font.
+    # see Section 9.7.1, PDF 32000-1:2008, pp 267
+    # so if we are calculating a Type0 font width, we just pass off to
+    # the descendant font
+    class TypeZero
+
+      def initialize(font)
+        @font = font
+        @descendant_font = @font.descendantfonts.first
+      end
+
+      def glyph_width(code_point)
+        return 0 if code_point.nil? || code_point < 0
+
+        @descendant_font.glyph_width(code_point).to_f
+      end
+    end
+  end
+end

data/lib/pdf/reader/xref.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 ################################################################################
 #
 # Copyright (C) 2006 Peter J Jones (pjones@pmade.com)
@@ -111,7 +113,8 @@ class PDF::Reader
         return load_xref_stream(stream)
       end
 
-      raise PDF::Reader::MalformedPDFError, "xref table not found at offset #{offset} (#{tok_one} != xref)"
+      raise PDF::Reader::MalformedPDFError,
+        "xref table not found at offset #{offset} (#{tok_one} != xref)"
     end
     ################################################################################
     # Assumes the underlying buffer is positioned at the start of a traditional
@@ -137,7 +140,9 @@ class PDF::Reader
 
       trailer = Parser.new(buf, self).parse_token
 
-      raise MalformedPDFError, "PDF malformed, trailer should be a dictionary" unless trailer.kind_of?(Hash)
+      unless trailer.kind_of?(Hash)
+        raise MalformedPDFError, "PDF malformed, trailer should be a dictionary"
+      end
 
       load_offsets(trailer[:XRefStm])   if trailer.has_key?(:XRefStm)
       load_offsets(trailer[:Prev].to_i) if trailer.has_key?(:Prev)
@@ -232,6 +237,8 @@ class PDF::Reader
       end
       io.rewind
       offset < 50 ? offset : nil
+    rescue EOFError
+      return nil
     end
   end
   ################################################################################

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pdf-reader
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-30 00:00:00.000000000 Z
+date: 2012-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -28,29 +28,29 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: roodi
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: ZenTest
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: 4.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,15 +58,15 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: 4.4.2
 - !ruby/object:Gem::Dependency
-  name: ZenTest
+  name: cane
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.4.2
+        version: 2.2.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,55 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.4.2
+        version: 2.2.3
+- !ruby/object:Gem::Dependency
+  name: morecane
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ir_b
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: Ascii85
   requirement: !ruby/object:Gem::Requirement
@@ -123,6 +171,38 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: ttfunk
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: afm
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 description: The PDF::Reader library implements a PDF parser conforming as much as
   possible to the PDF specification from Adobe
 email:
@@ -151,17 +231,26 @@ files:
 - examples/version.rb
 - lib/pdf/hash.rb
 - lib/pdf/reader.rb
+- lib/pdf/reader/width_calculator/built_in.rb
+- lib/pdf/reader/width_calculator/type_zero.rb
+- lib/pdf/reader/width_calculator/true_type.rb
+- lib/pdf/reader/width_calculator/composite.rb
+- lib/pdf/reader/width_calculator/type_one_or_three.rb
 - lib/pdf/reader/xref.rb
 - lib/pdf/reader/page.rb
+- lib/pdf/reader/transformation_matrix.rb
 - lib/pdf/reader/encoding.rb
+- lib/pdf/reader/page_layout.rb
 - lib/pdf/reader/font.rb
 - lib/pdf/reader/print_receiver.rb
 - lib/pdf/reader/lzw.rb
 - lib/pdf/reader/buffer.rb
+- lib/pdf/reader/synchronized_cache.rb
 - lib/pdf/reader/object_stream.rb
 - lib/pdf/reader/cmap.rb
 - lib/pdf/reader/text_receiver.rb
 - lib/pdf/reader/register_receiver.rb
+- lib/pdf/reader/cid_widths.rb
 - lib/pdf/reader/page_text_receiver.rb
 - lib/pdf/reader/encodings/mac_roman.txt
 - lib/pdf/reader/encodings/zapf_dingbats.txt
@@ -181,19 +270,36 @@ files:
 - lib/pdf/reader/object_hash.rb
 - lib/pdf/reader/reference.rb
 - lib/pdf/reader/glyphlist.txt
+- lib/pdf/reader/afm/Courier-BoldOblique.afm
+- lib/pdf/reader/afm/Symbol.afm
+- lib/pdf/reader/afm/Times-Italic.afm
+- lib/pdf/reader/afm/Courier-Oblique.afm
+- lib/pdf/reader/afm/Helvetica-Bold.afm
+- lib/pdf/reader/afm/Courier-Bold.afm
+- lib/pdf/reader/afm/Times-BoldItalic.afm
+- lib/pdf/reader/afm/Helvetica-BoldOblique.afm
+- lib/pdf/reader/afm/Helvetica.afm
+- lib/pdf/reader/afm/ZapfDingbats.afm
+- lib/pdf/reader/afm/Helvetica-Oblique.afm
+- lib/pdf/reader/afm/Times-Bold.afm
+- lib/pdf/reader/afm/Times-Roman.afm
+- lib/pdf/reader/afm/Courier.afm
 - lib/pdf/reader/token.rb
 - lib/pdf/reader/parser.rb
 - lib/pdf/reader/page_state.rb
 - lib/pdf/reader/error.rb
 - lib/pdf/reader/glyph_hash.rb
+- lib/pdf/reader/width_calculator.rb
 - lib/pdf/reader/resource_methods.rb
 - lib/pdf/reader/standard_security_handler.rb
+- lib/pdf/reader/text_run.rb
 - lib/pdf/reader/form_xobject.rb
 - lib/pdf/reader/stream.rb
 - lib/pdf/reader/pages_strategy.rb
 - lib/pdf/reader/abstract_strategy.rb
 - lib/pdf/reader/metadata_strategy.rb
 - lib/pdf/reader/object_cache.rb
+- lib/pdf/reader/font_descriptor.rb
 - lib/pdf-reader.rb
 - Rakefile
 - README.rdoc