origami 1.2.5 → 1.2.6

data/lib/origami/graphics/xobject.rb

@@ -441,6 +441,127 @@ module Origami
     
   end #class ContentStream
 
+  class Page < Dictionary
+
+    def render(engine) #:nodoc:
+      contents = self.Contents
+      contents = [ contents ] unless contents.is_a? Array
+      
+      contents.each do |stream|
+        stream = stream.cast_to(ContentStream) unless stream.is_a? ContentStream
+
+        stream.render(engine)
+      end
+    end
+
+    # TODO :nodoc:
+    def draw_image
+      raise NotImplementedError
+    end
+
+    # See ContentStream#draw_line.
+    def draw_line(from, to, attr = {})
+      last_content_stream.draw_line(from, to, attr); self
+    end
+
+    # See ContentStream#draw_polygon.
+    def draw_polygon(coords = [], attr = {})
+      last_content_stream.draw_polygon(coords, attr); self
+    end
+    
+    # See ContentStream#draw_rectangle.
+    def draw_rectangle(x, y, width, height, attr = {})
+      last_content_stream.draw_rectangle(x, y, width, height, attr); self
+    end
+
+    # See ContentStream#write.
+    def write(text, attr = {})
+      last_content_stream.write(text, attr); self
+    end
+
+    # TODO :nodoc:
+    def paint_shading(shade)
+      raise NotImplementedError
+    end
+
+    # TODO :nodoc:
+    def set_text_font(font, size)
+      raise NotImplementedError
+    end
+
+    # See ContentStream#set_text_pos.
+    def set_text_pos(tx, ty)
+      last_content_stream.set_text_pos(tx, ty); self
+    end
+
+    # See ContentStream#set_text_leading.
+    def set_text_leading(leading)
+      last_content_stream.set_text_leading(leading); self
+    end
+
+    # See ContentStream#set_text_rendering.
+    def set_text_rendering(rendering)
+      last_content_stream.set_text_rendering(rendering); self
+    end
+
+    # See ContentStream#set_text_rise.
+    def set_text_rise(rise)
+      last_content_stream.set_text_rise(rise); self
+    end
+
+    # See ContentStream#set_text_scale.
+    def set_text_scale(scaling)
+      last_content_stream.set_text_scale(scaling); self
+    end
+
+    # See ContentStream#set_text_word_spacing.
+    def set_text_word_spacing(word_spacing)
+      last_content_stream.set_text_word_spacing(word_spacing); self
+    end
+
+    # See ContentStream#set_text_char_spacing.
+    def set_text_char_spacing(char_spacing)
+      last_content_stream.set_text_char_spacing(char_spacing); self
+    end
+
+    # See ContentStream#set_fill_color.
+    def set_fill_color(color)
+      last_content_stream.set_fill_color(color); self
+    end
+    
+    # See ContentStream#set_stroke_color.
+    def set_stroke_color(color)
+      last_content_stream.set_stroke_color(color); self
+    end
+
+    # See ContentStream#set_dash_pattern.
+    def set_dash_pattern(pattern)
+      last_content_stream.set_dash_pattern(pattern); self
+    end
+
+    # See ContentStream#set_line_width.
+    def set_line_width(width)
+      last_content_stream.set_line_width(width); self
+    end
+
+    # See ContentStream#set_line_cap.
+    def set_line_cap(cap)
+      last_content_stream.set_line_cap(cap); self
+    end
+    
+    # See ContentStream#set_line_join.
+    def set_line_join(join)
+      last_content_stream.set_line_join(join); self
+    end
+
+    private
+
+    def last_content_stream #:nodoc:
+      contents = (self.Contents ||= ContentStream.new)
+      contents.is_a?(Array) ? contents.last : contents
+    end
+  end # class Page
+
   module Graphics
 
     module XObject
@@ -451,12 +572,13 @@ module Origami
 
     class FormXObject < ContentStream
       include XObject
+      include ResourcesHolder
 
       field   :Subtype,       :Type => Name, :Default => :Form, :Required => true
       field   :FormType,      :Type => Integer, :Default => 1
       field   :BBox,          :Type => Array, :Required => true
       field   :Matrix,        :Type => Array, :Default => [1, 0, 0, 1, 0, 0]
-      field   :Resources,     :Type => Dictionary, :Version => "1.2"
+      field   :Resources,     :Type => Resources, :Version => "1.2"
       field   :Group,         :Type => Dictionary, :Version => "1.4"
       field   :Ref,           :Type => Dictionary, :Version => "1.4"
       field   :Metadata,      :Type => Stream, :Version => "1.4"

data/lib/origami/javascript.rb

@@ -273,7 +273,8 @@ module Origami
             def modDate; @doc.mod_date.to_s end
           end
 
-          def initialize(engine, pdf)
+          def initialize(*args)
+            engine, pdf = args # XXX: Bypass therubyracer bug #238. Temporary.
             super(engine)
 
             @pdf = pdf

data/lib/origami/name.rb

@@ -107,7 +107,7 @@ module Origami
       super(TOKENS.first + Name.expand(@value))
     end
     
-    def self.parse(stream) #:nodoc:
+    def self.parse(stream, parser = nil) #:nodoc:
 
       offset = stream.pos
       
@@ -163,7 +163,7 @@ module Origami
       end
     end
     
-    def real_type ; Name end
+    def self.native_type ; Name end
 
   end
 

data/lib/origami/null.rb

@@ -43,7 +43,7 @@ module Origami
       super
     end
     
-    def self.parse(stream) #:nodoc:
+    def self.parse(stream, parser = nil) #:nodoc:
 
       offset = stream.pos
       
@@ -68,7 +68,7 @@ module Origami
       super(TOKENS.first)
     end
 
-    def real_type ; Null end
+    def self.native_type ; Null end
     
   end
   

data/lib/origami/numeric.rb

@@ -92,7 +92,15 @@ module Origami
       super(value.to_s)
     end
     
-    def real_type ; Number end
+    module ClassMethods #:nodoc:all
+      def native_type; Number end
+    end
+
+    def self.included(receiver) #:nodoc:
+      receiver.extend(ClassMethods)
+    end
+    
+    def self.native_type; Number end #:nodoc:
   end
   
   #
@@ -121,7 +129,7 @@ module Origami
       super(i)
     end
       
-    def self.parse(stream) #:nodoc:
+    def self.parse(stream, parser = nil) #:nodoc:
 
       offset = stream.pos
 
@@ -169,7 +177,7 @@ module Origami
       super(f)
     end
   
-    def self.parse(stream) #:nodoc:
+    def self.parse(stream, parser = nil) #:nodoc:
 
       offset = stream.pos
       

data/lib/origami/object.rb

@@ -39,14 +39,6 @@ class Array #:nodoc:
   def to_o
     Origami::Array.new(self)
   end
-  
-  def shuffle
-    sort_by { rand }
-  end
-  
-  def shuffle!
-    self.replace shuffle
-  end  
 end
 
 class Float #:nodoc:
@@ -110,7 +102,7 @@ module Origami
   #
   module StandardObject #:nodoc:
 
-    DEFAULT_ATTRIBUTES = { :Type => Object, :Version => "1.1" } #:nodoc:
+    DEFAULT_ATTRIBUTES = { :Type => Object, :Version => "1.2" } #:nodoc:
 
     def self.included(receiver) #:nodoc:
       receiver.instance_variable_set(:@fields, Hash.new(DEFAULT_ATTRIBUTES))
@@ -126,8 +118,11 @@ module Origami
       def fields
         @fields
       end
-      
+
       def field(name, attributes)
+        if attributes[:Required] == true and attributes.has_key?(:Default) and attributes[:Type] == Name
+          self.add_type_info(self, name, attributes[:Default])
+        end
       
         if not @fields.has_key?(name)
           @fields[name] = attributes
@@ -160,6 +155,11 @@ module Origami
         fields
       end
 
+      def hint_type(name)
+        if @fields.has_key?(name)
+          @fields[name][:Type] 
+        end
+      end
     end
 
     def pre_build #:nodoc:
@@ -168,7 +168,7 @@ module Origami
       do_type_check if Origami::OPTIONS[:enable_type_checking] == true
       
       super
-    end
+     end
     
     #
     # Check if an attribute is set in the current Object.
@@ -218,7 +218,7 @@ module Origami
         
         if not self[field].nil? and not attributes[:Type].nil?
           types = attributes[:Type].is_a?(::Array) ? attributes[:Type] : [ attributes[:Type] ]
-          if not self[field].is_a?(Reference) and types.all? {|type| not self[field].is_a?(type)}
+          if not self[field].is_a?(Reference) and types.all? {|type| not self[field].is_a?(type.native_type)}
             puts "Warning: in object #{self.class}, field `#{field.to_s}' has unexpected type #{self[field].class}" 
           end
         end
@@ -289,6 +289,7 @@ module Origami
         @no = @generation = 0
         @pdf = nil
       end
+
       @indirect = bool
       self
     end
@@ -329,6 +330,8 @@ module Origami
     def copy
       saved_pdf = @pdf
       saved_parent = @parent
+      
+      saved_xref_cache = @xref_cache
       @pdf = @parent = nil # do not process parent object and document in the copy
 
       # Perform the recursive copy (quite dirty).
@@ -337,7 +340,8 @@ module Origami
       # restore saved values
       @pdf = saved_pdf
       @parent = saved_parent
-      copyobj.set_pdf(saved_pdf)
+
+      copyobj.set_pdf(saved_pdf) if copyobj.is_indirect?
       copyobj.parent = parent
 
       copyobj
@@ -403,6 +407,7 @@ module Origami
       exported_obj.no = exported_obj.generation = 0
       exported_obj.set_pdf(nil) if exported_obj.is_indirect?
       exported_obj.parent = nil
+      exported_obj.xref_cache.clear
       
       exported_obj
     end
@@ -539,7 +544,7 @@ module Origami
         nil
       end
         
-      def parse(stream) #:nodoc:
+      def parse(stream, parser = nil) #:nodoc:
         offset = stream.pos
 
         #
@@ -562,7 +567,7 @@ module Origami
         end
           
         begin
-          newObj = type.parse(stream)
+          newObj = type.parse(stream, parser)
         rescue Exception => e
           raise InvalidObjectError, 
             "Failed to parse object (no:#{no},gen:#{gen})\n\t -> [#{e.class}] #{e.message}"
@@ -602,7 +607,23 @@ module Origami
     def type
       self.class.to_s.split("::").last.to_sym
     end
-    alias real_type type
+
+    def self.native_type; Origami::Object end #:nodoc:
+
+    #
+    # Returns the native PDF type of this Object.
+    #
+    def native_type
+      self.class.native_type
+    end
+
+    def cast_to(type) #:nodoc:
+      if type.native_type != self.native_type
+        raise TypeError, "Incompatible cast from #{self.class} to #{type}"
+      end
+
+      self
+    end
     
     #
     # Outputs this object into PDF code.

data/lib/origami/page.rb

@@ -27,6 +27,9 @@ module Origami
 
   class PDF
 
+    #
+    # Appends a page or list of pages to the end of the page tree.
+    #
     def append_page(page = Page.new, *more)
       raise InvalidPDFError, "Invalid page tree" if not self.Catalog or not self.Catalog.Pages or not self.Catalog.Pages.is_a?(PageTreeNode)
       
@@ -52,6 +55,9 @@ module Origami
       self
     end
 
+    #
+    # Inserts a page at position _index_ into the document.
+    #
     def insert_page(index, page)
       raise InvalidPDFError, "Invalid page tree" if not self.Catalog or not self.Catalog.Pages or not self.Catalog.Pages.is_a?(PageTreeNode)
 
@@ -108,69 +114,105 @@ module Origami
   
   module ResourcesHolder
 
-    def add_extgstate(name, extgstate)
-      target = self.is_a?(Resources) ? self : (self.Resources ||= Resources.new)
-
-      target.ExtGState ||= {}
-      target.ExtGState[name] = extgstate
-
-      self
+    def add_extgstate(extgstate, name = nil)
+      add_resource(Resources::EXTGSTATE, extgstate, name)
     end
 
-    def add_colorspace(name, colorspace)
-      target = self.is_a?(Resources) ? self : (self.Resources ||= Resources.new)
-
-      csdir = target[:ColorSpace] ||= {}
-      (csdir.is_a?(Reference) ? csdir.solve : csdir)[name] = colorspace
+    def add_colorspace(colorspace, name = nil)
+      add_resource(Resources::COLORSPACE, colorspace, name)
+    end
     
-      self
+    def add_pattern(pattern, name = nil)
+      add_resource(Resources::PATTERN, pattern, name)
     end
     
-    def add_pattern(name, pattern)
-      target = self.is_a?(Resources) ? self : (self.Resources ||= Resources.new)
+    def add_shading(shading, name = nil)
+      add_resource(Resources::SHADING, shading, name)
+    end
 
-      target.Pattern ||= {}
-      target.Pattern[name] = pattern
-    
-      self
+    def add_xobject(xobject, name = nil)
+      add_resource(Resources::XOBJECT, xobject, name)
     end
     
-    def add_shading(name, shading)
-      target = self.is_a?(Resources) ? self : (self.Resources ||= Resources.new)
+    def add_font(font, name = nil)
+      add_resource(Resources::FONT, font, name)
+    end
 
-      target.Shading ||= {}
-      target.Shading[name] = shading
-    
-      self
+    def add_properties(properties, name = nil)
+      add_resource(Resources::PROPERTIES, properties, name)
     end
 
-    def add_xobject(name, xobject)
-      target = self.is_a?(Resources) ? self : (self.Resources ||= Resources.new)
+    def add_resource(type, rsrc, name = nil)
+      return existing if not name and existing = ls_resources(type).key(rsrc)
 
-      target.XObject ||= {}
-      target.XObject[name] = xobject
-    
-      self
-    end
-    
-    def add_font(name, font)
+      name = new_id(type) unless name
       target = self.is_a?(Resources) ? self : (self.Resources ||= Resources.new)
 
-      target.Font ||= {}
-      target.Font[name] = font
-      
-      self
+      rsrc_dict = target.send(type) || (target[type] = Dictionary.new)
+      rsrc_dict[name] = rsrc
+
+      name
     end
 
-    def add_properties(name, properties)
+    def ls_resources(type)
       target = self.is_a?(Resources) ? self : (self.Resources ||= Resources.new)
+      
+      rsrc = {}
+      (target.send(type) || {}).each_pair do |name, obj|
+        rsrc[name.value] = obj.solve
+      end
 
-      target.Properties ||= {}
-      target.Properties[name] = properties
-    
-      self
+      rsrc
+    end
+
+    def extgstates; ls_resources(Resources::EXTGSTATE) end
+    def colorspaces; ls_resources(Resources::COLORSPACE) end
+    def patterns; ls_resources(Resources::PATTERN) end
+    def shadings; ls_resources(Resources::SHADING) end
+    def xobjects; ls_resources(Resources::XOBJECT) end
+    def fonts; ls_resources(Resources::FONT) end
+    def properties; ls_resources(Resources::PROPERTIES) end
+    def resources;
+      self.extgstates.
+        merge self.colorspaces.
+        merge self.patterns.
+        merge self.shadings.
+        merge self.xobjects.
+        merge self.fonts.
+        merge self.properties
+    end 
+
+    private
+
+    def new_id(type, prefix = nil) #:nodoc:
+      prefix ||= 
+      {
+        Resources::EXTGSTATE  => 'ExtG',
+        Resources::COLORSPACE => 'CS',
+        Resources::PATTERN    => 'P',
+        Resources::SHADING    => 'Sh',
+        Resources::XOBJECT    => 'Im',
+        Resources::FONT       => 'F',
+        Resources::PROPERTIES => 'Pr'
+      }[type]
+
+      rsrc = ls_resources(type)
+      n = '1'
+
+      while rsrc.include? (prefix + n).to_sym
+        n.next!
+      end
+
+      (prefix + n).to_sym
     end
-    
+
+    def new_extgstate_id; new_id(Resources::EXTGSTATE) end
+    def new_colorspace_id; new_id(Resources::COLORSPACE) end
+    def new_pattern_id; new_id(Resources::PATTERN) end
+    def new_shading_id; new_id(Resources::SHADING) end
+    def new_xobject_id; new_id(Resources::XOBJECT) end
+    def new_font_id; new_name(Resources::FONT) end
+    def new_properties_id; new_name(Resources::PROPERTIES) end       
   end
 
   #
@@ -181,22 +223,25 @@ module Origami
     include StandardObject
     include ResourcesHolder
 
-    field   :ExtGState,   :Type => Dictionary
-    field   :ColorSpace,  :Type => Dictionary
-    field   :Pattern,     :Type => Dictionary
-    field   :Shading,     :Type => Dictionary, :Version => "1.3"
-    field   :XObject,     :Type => Dictionary
-    field   :Font,        :Type => Dictionary
+    EXTGSTATE     = :ExtGState
+    COLORSPACE    = :ColorSpace
+    PATTERN       = :Pattern
+    SHADING       = :Shading
+    XOBJECT       = :XObject
+    FONT          = :Font
+    PROPERTIES    = :Properties 
+
+    field   EXTGSTATE,    :Type => Dictionary
+    field   COLORSPACE,   :Type => Dictionary
+    field   PATTERN,      :Type => Dictionary
+    field   SHADING,      :Type => Dictionary, :Version => "1.3"
+    field   XOBJECT,      :Type => Dictionary
+    field   FONT,         :Type => Dictionary
     field   :ProcSet,     :Type => Array
-    field   :Properties,  :Type => Dictionary, :Version => "1.2"
+    field   PROPERTIES,   :Type => Dictionary, :Version => "1.2"
 
     def pre_build
-      unless self.Font
-        fnt = Font::Type1::Standard::Helvetica.new.pre_build
-        fnt.Name = :F1
-        
-        add_font(fnt.Name, fnt)
-      end
+      add_font(Font::Type1::Standard::Helvetica.new.pre_build) unless self.Font
       
       super
     end
@@ -347,6 +392,9 @@ module Origami
       end
     end
   end
+
+  # Forward declaration.
+  class ContentStream < Stream; end
     
   #
   # Class representing a Page in the PDF document.
@@ -355,18 +403,44 @@ module Origami
     
     include StandardObject
     include ResourcesHolder
+
+    module Format
+      A0 = Rectangle[:width => 2384, :height => 3370]
+      A1 = Rectangle[:width => 1684, :height => 2384]
+      A2 = Rectangle[:width => 1191, :height => 1684]
+      A3 = Rectangle[:width => 842, :height => 1191]
+      A4 = Rectangle[:width => 595, :height => 842]
+      A5 = Rectangle[:width => 420, :height => 595]
+      A6 = Rectangle[:width => 298, :height => 420]
+      A7 = Rectangle[:width => 210, :height => 298]
+      A8 = Rectangle[:width => 147, :height => 210]
+      A9 = Rectangle[:width => 105, :height => 147]
+      A10 = Rectangle[:width => 74, :height => 105]
+
+      B0 = Rectangle[:width => 2836, :height => 4008]
+      B1 = Rectangle[:width => 2004, :height => 2835]
+      B2 = Rectangle[:width => 1417, :height => 2004]
+      B3 = Rectangle[:width => 1001, :height => 1417]
+      B4 = Rectangle[:width => 709, :height => 1001]
+      B5 = Rectangle[:width => 499, :height => 709]
+      B6 = Rectangle[:width => 354, :height => 499]
+      B7 = Rectangle[:width => 249, :height => 354]
+      B8 = Rectangle[:width => 176, :height => 249]
+      B9 = Rectangle[:width => 125, :height => 176]
+      B10 = Rectangle[:width => 88, :height => 125]
+    end
    
     field   :Type,                  :Type => Name, :Default => :Page, :Required => true
     field   :Parent,                :Type => Dictionary, :Required => true
     field   :LastModified,          :Type => String, :Version => "1.3"
-    field   :Resources,             :Type => Dictionary, :Required => true 
-    field   :MediaBox,              :Type => Array, :Default => Rectangle[ :llx => 0, :lly => 0, :urx => 795, :ury => 842 ], :Required => true
+    field   :Resources,             :Type => Resources, :Required => true 
+    field   :MediaBox,              :Type => Array, :Default => Format::A4, :Required => true
     field   :CropBox,               :Type => Array
     field   :BleedBox,              :Type => Array, :Version => "1.3"
     field   :TrimBox,               :Type => Array, :Version => "1.3"
     field   :ArtBox,                :Type => Array, :Version => "1.3"
     field   :BoxColorInfo,          :Type => Dictionary, :Version => "1.4"
-    field   :Contents,              :Type => [ Stream, Array ]
+    field   :Contents,              :Type => [ ContentStream, Array ]
     field   :Rotate,                :Type => Integer, :Default => 0
     field   :Group,                 :Type => Dictionary, :Version => "1.4"
     field   :Thumb,                 :Type => Stream
@@ -393,17 +467,6 @@ module Origami
       set_indirect(true)
     end
 
-    def render(engine) #:nodoc:
-      contents = self.Contents
-      return unless contents.is_a? Stream
-      
-      unless contents.is_a? ContentStream
-        contents = ContentStream.new(contents.data)
-      end
-
-      contents.render(engine)
-    end
-
     def pre_build
       self.Resources = Resources.new.pre_build unless self.has_key?(:Resources)
 
@@ -594,3 +657,4 @@ module Origami
   end
   
 end
+

data/lib/origami/parser.rb

@@ -134,6 +134,9 @@ module Origami
     attr_accessor :options
     
     def initialize(options = {}) #:nodoc:
+
+      # Type information for indirect objects.
+      @deferred_casts = {}
       
       #Default options values
       @options = 
@@ -178,12 +181,12 @@ module Origami
       @data.pos = pos
       
       begin
-        obj = Object.parse(@data)
+        obj = Object.parse(@data, self)
         return if obj.nil?
         
         trace "Read #{obj.type} object#{
-          if obj.type != obj.real_type
-            " (" + obj.real_type.to_s.split('::').last + ")" 
+          if obj.class != obj.native_type
+            " (" + obj.native_type.to_s.split('::').last + ")" 
           end
         }, #{obj.reference}"
 
@@ -237,7 +240,7 @@ module Origami
 
       begin
         info "...Parsing trailer..."
-        trailer = Trailer.parse(@data)
+        trailer = Trailer.parse(@data, self)
 
         @options[:callback].call(trailer)
         trailer
@@ -252,6 +255,10 @@ module Origami
       end
     end
 
+    def defer_type_cast(reference, type) #:nodoc:
+      @deferred_casts[reference] = type
+    end
+
     def target_filename
       @filename
     end