origami 1.0.4 → 1.1.1

data/origami/graphics.rb

@@ -30,4 +30,5 @@ require 'origami/graphics/xobject'
 require 'origami/graphics/patterns'
 require 'origami/graphics/text'
 require 'origami/graphics/state'
+require 'origami/graphics/render'
 

data/origami/graphics/colors.rb

@@ -24,7 +24,7 @@
 =end
 
 begin
-  require 'color'
+  require 'color' 
 rescue LoadError
 end
 
@@ -118,73 +118,73 @@ module Origami
 
   class PDF::Instruction
 
-    insn  'CS', Name do |gs, cs| gs.stroking_colorspace = cs end
-    insn  'cs', Name do |gs, cs| gs.nonstroking_colorspace = cs end
-    insn  'SC', '*' do |gs, *c| gs.stroking_color = c end
-    insn  'sc', '*' do |gs, *c| gs.nonstroking_color = c end
+    insn  'CS', Name do |canvas, cs| canvas.gs.stroking_colorspace = cs end
+    insn  'cs', Name do |canvas, cs| canvas.gs.nonstroking_colorspace = cs end
+    insn  'SC', '*' do |canvas, *c| canvas.gs.stroking_color = c end
+    insn  'sc', '*' do |canvas, *c| canvas.gs.nonstroking_color = c end
     
-    insn  'G', Real do |gs, c|
+    insn  'G', Real do |canvas, c|
       unless (0..1).include? c
         raise Graphics::InvalidColorError, 
           "Not a valid color for DeviceGray: #{c}"
       end
 
-      gs.stroking_colorspace = Graphics::Color::Space::DEVICE_GRAY
-      gs.stroking_color = [ c ]
+      canvas.gs.stroking_colorspace = Graphics::Color::Space::DEVICE_GRAY
+      canvas.gs.stroking_color = [ c ]
     end
     
-    insn  'g', Real do |gs, c|
+    insn  'g', Real do |canvas, c|
       unless (0..1).include? c
         raise Graphics::InvalidColorError, 
           "Not a valid color for DeviceGray: #{c}"
       end
 
-      gs.nonstroking_colorspace = Graphics::Color::Space::DEVICE_GRAY
-      gs.nonstroking_color = [ c ]
+      canvas.gs.nonstroking_colorspace = Graphics::Color::Space::DEVICE_GRAY
+      canvas.gs.nonstroking_color = [ c ]
     end
 
-    insn  'RG', Real, Real, Real do |gs, r,g,b|
+    insn  'RG', Real, Real, Real do |canvas, r,g,b|
       c = [ r, g, b ]
       unless c.all? {|b| (0..1).include? b}
         raise Graphics::InvalidColorError, 
           "Not a valid color for DeviceRGB: #{c.inspect}"
       end
 
-      gs.stroking_colorspace = Graphics::Color::Space::DEVICE_RGB
-      gs.stroking_color = c
+      canvas.gs.stroking_colorspace = Graphics::Color::Space::DEVICE_RGB
+      canvas.gs.stroking_color = c
     end
 
-    insn  'rg', Real, Real, Real do |gs, r,g,b|
+    insn  'rg', Real, Real, Real do |canvas, r,g,b|
       c = [ r, g, b ]
       unless c.all? {|b| (0..1).include? b}
         raise Graphics::InvalidColorError, 
           "Not a valid color for DeviceRGB: #{c.inspect}"
       end
 
-      gs.nonstroking_colorspace = Graphics::Color::Space::DEVICE_RGB
-      gs.nonstroking_color = c
+      canvas.gs.nonstroking_colorspace = Graphics::Color::Space::DEVICE_RGB
+      canvas.gs.nonstroking_color = c
     end
 
-    insn  'K', Real, Real, Real, Real do |gs, c,m,y,k|
+    insn  'K', Real, Real, Real, Real do |canvas, c,m,y,k|
       c = [ c, m, y, k ]
       unless c.all? {|b| (0..1).include? b}
         raise Graphics::InvalidColorError, 
           "Not a valid color for DeviceCMYK: #{c.inspect}"
       end
 
-      gs.stroking_colorspace = Graphics::Color::Space::DEVICE_CMYK
-      gs.stroking_color = c
+      canvas.gs.stroking_colorspace = Graphics::Color::Space::DEVICE_CMYK
+      canvas.gs.stroking_color = c
     end
 
-    insn  'k', Real, Real, Real, Real do |gs, c,m,y,k|
+    insn  'k', Real, Real, Real, Real do |canvas, c,m,y,k|
       c = [ c, m, y, k ]
       unless c.all? {|b| (0..1).include? b}
         raise Graphics::InvalidColorError, 
           "Not a valid color for DeviceCMYK: #{c.inspect}"
       end
 
-      gs.nonstroking_colorspace = Graphics::Color::Space::DEVICE_CMYK
-      gs.nonstroking_color = c
+      canvas.gs.nonstroking_colorspace = Graphics::Color::Space::DEVICE_CMYK
+      canvas.gs.nonstroking_color = c
     end
   end
 

data/origami/graphics/instruction.rb

@@ -31,7 +31,7 @@ module Origami
     attr_accessor :operands
 
     @@regexp = Regexp.new('([^ \\t\\r\\n\\0\\[\\]<>()%\\/]+)')
-    @insns = Hash.new(:operands => [], :proc => lambda{}, :callback => lambda{})
+    @insns = Hash.new(:operands => [], :render => lambda{})
 
     def initialize(operator, *operands)
       @operator = operator
@@ -47,17 +47,8 @@ module Origami
       end
     end
 
-    def update_state(gs)
-      self.class.get_proc(@operator)[gs, *operands] if self.class.has_proc?(@operator)
-      self
-    end
-
-    def render
-    end
-
-    def exec(gs)
-      update_state(gs)
-      self.class.get_callback(@operator)[gs] if self.class.has_callback?(@operator)
+    def render(canvas)
+      self.class.get_render_proc(@operator)[canvas, *@operands]
 
       self
     end
@@ -67,31 +58,18 @@ module Origami
     end
 
     class << self
-      def insn(operator, *operands, &p)
+      def insn(operator, *operands, &render_proc)
         @insns[operator] = {}
         @insns[operator][:operands] = operands
-        @insns[operator][:proc] = p if block_given?
+        @insns[operator][:render] = render_proc || lambda{}
       end
 
       def has_op?(operator)
         @insns.has_key? operator
       end
 
-      def has_proc?(operator)
-        self.has_op?(operator) and @insns[operator].has_key?(:proc)
-      end
-
-      def has_callback?(operator)
-        self.has_op?(operator) and @insns[operator].has_key?(:callback)
-      end
-
-      def set_callback(operator, &b)
-        raise RuntimeError, "Operator `#{operator}' does not exist" unless @insns.has_key?(operator)
-        @insns[operator][:callback] = b
-      end
-
-      def get_proc(operator)
-        @insns[operator][:proc]
+      def get_render_proc(operator)
+        @insns[operator][:render]
       end
 
       def get_operands(operator)

data/origami/graphics/path.rb

@@ -105,49 +105,83 @@ module Origami
   end
 
   class PDF::Instruction
-    insn  'm', Real, Real do |gs, x,y|
-      gs.current_path << (subpath = Graphics::Path.new)
+    insn  'm', Real, Real do |canvas, x,y|
+      canvas.gs.current_path << (subpath = Graphics::Path.new)
       subpath.current_point = [x,y]
     end
 
-    insn  'l', Real, Real do |gs, x,y|
-      if gs.current_path.empty? 
+    insn  'l', Real, Real do |canvas, x,y|
+      if canvas.gs.current_path.empty? 
         raise InvalidPathError, "No current point is defined"
       end
 
-      subpath = gs.current_path.last
+      subpath = canvas.gs.current_path.last
 
       from = subpath.current_point
       to = [x,y]
       subpath.add_segment(Graphics::Path::Line.new(from, to))
     end
 
-    insn  'h' do |gs|
-      unless gs.current_path.empty?
-        subpath = gs.current_path.last
+    insn  'h' do |canvas|
+      unless canvas.gs.current_path.empty?
+        subpath = canvas.gs.current_path.last
         subpath.close! unless subpath.is_closed?
       end
     end
 
-    insn  're', Real, Real, Real, Real do |gs, x,y,width,height|
+    insn  're', Real, Real, Real, Real do |canvas, x,y,width,height|
       tx = x + width
       ty = y + height
-      gs.current_path << (subpath = Graphics::Path.new)
+      canvas.gs.current_path << (subpath = Graphics::Path.new)
       subpath.segments << Graphics::Path::Line.new([x,y], [tx,y])
       subpath.segments << Graphics::Path::Line.new([tx,y], [tx, ty])
       subpath.segments << Graphics::Path::Line.new([tx, ty], [x, ty])
       subpath.close!
     end
 
-    insn  'S'
-    insn  's' do |gs| gs.current_path.last.close! end
-    insn  'f'
-    insn  'F'
-    insn  'f*'
-    insn  'B'
-    insn  'B*'
-    insn  'b' do |gs| gs.current_path.last.close! end
-    insn  'b*' do |gs| gs.current_path.last.close! end
+    insn  'S' do |canvas|
+      canvas.stroke_path
+    end
+
+    insn  's' do |canvas| 
+      canvas.gs.current_path.last.close! 
+      canvas.stroke_path
+    end
+
+    insn  'f' do |canvas|
+      canvas.fill_path
+    end
+
+    insn  'F' do |canvas|
+      canvas.fill_path
+    end
+
+    insn  'f*' do |canvas|
+      canvas.fill_path
+    end
+
+    insn  'B' do |canvas|
+      canvas.fill_path
+      canvas.stroke_path
+    end
+
+    insn  'B*' do |canvas|
+      canvas.fill_path
+      canvas.stroke_path
+    end
+
+    insn  'b' do |canvas| 
+      canvas.gs.current_path.last.close! 
+      canvas.fill_path
+      canvas.stroke_path
+    end
+    
+    insn  'b*' do |canvas| 
+      canvas.gs.current_path.last.close! 
+      canvas.fill_path
+      canvas.stroke_path
+    end
+    
     insn  'n'
   end
 

data/origami/graphics/render.rb

@@ -0,0 +1,69 @@
+=begin
+
+= File
+	graphics/render.rb
+
+= Info
+	This file is part of Origami, PDF manipulation framework for Ruby
+	Copyright (C) 2010	Guillaume Delugré <guillaume@security-labs.org>
+	All right reserved.
+	
+  Origami is free software: you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  Origami is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with Origami.  If not, see <http://www.gnu.org/licenses/>.
+
+=end
+
+module Origami
+  
+  module Graphics
+
+    module Canvas
+      attr_reader :gs
+
+      def initialize
+        @gs = Graphics::State.new
+      end
+
+      def clear
+        @gs.reset
+      end
+
+      def write_text(s); end
+      def stroke_path; end
+      def fill_path; end
+    end
+
+    class DummyCanvas
+      include Canvas
+    end
+
+    class TextCanvas
+      include Canvas
+
+      def initialize(output = STDOUT, columns = 80, lines = 25)
+        super()
+
+        @output = output
+        @columns, @lines = columns, lines
+      end
+
+      def write_text(s)
+        @output.print(s)  
+      end
+
+    end
+
+  end
+
+end
+

data/origami/graphics/state.rb

@@ -147,18 +147,18 @@ module Origami
   end #module Graphics 
  
   class PDF::Instruction
-    insn  'q' do |gs| gs.save; gs.reset end
-    insn  'Q' do |gs| gs.restore end
-    insn  'w', Real do |gs, lw| gs.line_width = lw end
-    insn  'J', Real do |gs, lc| gs.line_cap = lc end
-    insn  'j', Real do |gs, lj| gs.line_join = lj end
-    insn  'M', Real do |gs, ml| gs.miter_limit = ml end
+    insn  'q' do |canvas| canvas.gs.save; canvas.gs.reset end
+    insn  'Q' do |canvas| canvas.gs.restore end
+    insn  'w', Real do |canvas, lw| canvas.gs.line_width = lw end
+    insn  'J', Real do |canvas, lc| canvas.gs.line_cap = lc end
+    insn  'j', Real do |canvas, lj| canvas.gs.line_join = lj end
+    insn  'M', Real do |canvas, ml| canvas.gs.miter_limit = ml end
     
-    insn  'd', Array, Integer do |gs, array, phase| 
-      gs.dash_pattern = Graphics::DashPattern.new array, phase
+    insn  'd', Array, Integer do |canvas, array, phase| 
+      canvas.gs.dash_pattern = Graphics::DashPattern.new array, phase
     end
 
-    insn  'ri', Name do |gs, ri| gs.rendering_intent = ri end
+    insn  'ri', Name do |canvas, ri| canvas.gs.rendering_intent = ri end
   end
 end
 

data/origami/graphics/text.rb

@@ -119,106 +119,124 @@ module Origami
 
   class PDF::Instruction
     # Text instructions definitions
-    insn  'Tc', Real do |gs, cS| gs.text_state.char_spacing = cS end
-    insn  'Tw', Real do |gs, wS| gs.text_state.word_spacing = wS end
-    insn  'Tz', Real do |gs, s| gs.text_state.scaling = s end
-    insn  'TL', Real do |gs, l| gs.text_state.leading = l end
+    insn  'Tc', Real do |canvas, cS| canvas.gs.text_state.char_spacing = cS end
+    insn  'Tw', Real do |canvas, wS| canvas.gs.text_state.word_spacing = wS end
+    insn  'Tz', Real do |canvas, s| canvas.gs.text_state.scaling = s end
+    insn  'TL', Real do |canvas, l| canvas.gs.text_state.leading = l end
     
-    insn  'Tf', Name, Real do |gs, font, size|
-      gs.text_state.font = font
-      gs.text_state.font_size = size
+    insn  'Tf', Name, Real do |canvas, font, size|
+      canvas.gs.text_state.font = font
+      canvas.gs.text_state.font_size = size
     end
 
-    insn  'Tr', Integer do |gs, r| gs.text_state.rendering_mode = r end
-    insn  'Ts', Real do |gs, s| gs.text_state.text_rise = s end
-    insn  'BT' do |gs| gs.text_state.begin_text_object end
-    insn  'ET' do |gs| gs.text_state.end_text_object end
+    insn  'Tr', Integer do |canvas, r| canvas.gs.text_state.rendering_mode = r end
+    insn  'Ts', Real do |canvas, s| canvas.gs.text_state.text_rise = s end
+    insn  'BT' do |canvas| canvas.gs.text_state.begin_text_object end
+    insn  'ET' do |canvas| canvas.gs.text_state.end_text_object end
     
-    insn  'Td', Real, Real do |gs, tx, ty|
-      unless gs.text_state.is_in_text_object?
+    insn  'Td', Real, Real do |canvas, tx, ty|
+      unless canvas.gs.text_state.is_in_text_object?
         raise TextStateError, 
           "Must be in a text object to use operator : Td"
       end
 
-      gs.text_state.text_matrix =
-      gs.text_state.text_line_matrix =
-      Matrix.rows([[1,0,0],[0,1,0],[tx, ty, 1]]) * gs.text_state.text_line_matrix
+      canvas.gs.text_state.text_matrix =
+      canvas.gs.text_state.text_line_matrix =
+      Matrix.rows([[1,0,0],[0,1,0],[tx, ty, 1]]) * canvas.gs.text_state.text_line_matrix
     end
 
-    insn  'TD', Real, Real do |gs, tx, ty|
-      unless gs.text_state.is_in_text_object?
+    insn  'TD', Real, Real do |canvas, tx, ty|
+      unless canvas.gs.text_state.is_in_text_object?
         raise TextStateError, 
           "Must be in a text object to use operator : TD"
       end
 
-      gs.text_state.leading = -ty
+      canvas.gs.text_state.leading = -ty
 
-      gs.text_state.text_matrix =
-      gs.text_state.text_line_matrix =
-      Matrix.rows([[1,0,0],[0,1,0],[tx,ty,1]]) * gs.text_state.text_line_matrix
+      canvas.gs.text_state.text_matrix =
+      canvas.gs.text_state.text_line_matrix =
+      Matrix.rows([[1,0,0],[0,1,0],[tx,ty,1]]) * canvas.gs.text_state.text_line_matrix
     end
 
-    insn  'Tm', Real, Real, Real, Real, Real, Real do |gs, a,b,c,d,e,f,g|
-      unless gs.text_state.is_in_text_object?
+    insn  'Tm', Real, Real, Real, Real, Real, Real do |canvas, a,b,c,d,e,f,g|
+      unless canvas.gs.text_state.is_in_text_object?
         raise TextStateError, 
           "Must be in a text object to use operator : Tm"
       end
 
-      gs.text_state.text_matrix =
-      gs.text_state.text_line_matrix = 
+      canvas.gs.text_state.text_matrix =
+      canvas.gs.text_state.text_line_matrix = 
       Matrix.rows([[a,b,0],[c,d,0],[e,f,1]])
     end
 
-    insn  'T*' do |gs|
-      unless gs.text_state.is_in_text_object?
+    insn  'T*' do |canvas|
+      unless canvas.gs.text_state.is_in_text_object?
         raise TextStateError, 
           "Must be in a text object to use operator : T*"
       end
 
-      tx, ty = 0, -gs.text_state.leading
+      tx, ty = 0, -canvas.gs.text_state.leading
 
-      gs.text_state.text_matrix =
-      gs.text_state.text_line_matrix =
-      Matrix.rows([[1,0,0],[0,1,0],[tx, ty, 1]]) * gs.text_state.text_line_matrix
+      canvas.gs.text_state.text_matrix =
+      canvas.gs.text_state.text_line_matrix =
+      Matrix.rows([[1,0,0],[0,1,0],[tx, ty, 1]]) * canvas.gs.text_state.text_line_matrix
     end
 
-    insn  'Tj', String do |gs, s|
-      unless gs.text_state.is_in_text_object?
+    insn  'Tj', String do |canvas, s|
+      unless canvas.gs.text_state.is_in_text_object?
         raise TextStateError, 
           "Must be in a text object to use operator : Tj"
       end
+
+      canvas.write_text(s)
     end
 
-    insn  "'", String do |gs, s|
-      unless gs.text_state.is_in_text_object?
+    insn  "'", String do |canvas, s|
+      unless canvas.gs.text_state.is_in_text_object?
         raise TextStateError, 
           "Must be in a text object to use operator : '"
       end
       
-      tx, ty = 0, -gs.text_state.leading
+      tx, ty = 0, -canvas.gs.text_state.leading
+
+      canvas.gs.text_state.text_matrix =
+      canvas.gs.text_state.text_line_matrix =
+      Matrix.rows([[1,0,0],[0,1,0],[tx, ty, 1]]) * canvas.gs.text_state.text_line_matrix
 
-      gs.text_state.text_matrix =
-      gs.text_state.text_line_matrix =
-      Matrix.rows([[1,0,0],[0,1,0],[tx, ty, 1]]) * gs.text_state.text_line_matrix
+      canvas.write_text(s)
     end 
 
-    insn  '"', Real, Real, String do |gs, w, c, s|
-      unless gs.text_state.is_in_text_object?
+    insn  '"', Real, Real, String do |canvas, w, c, s|
+      unless canvas.gs.text_state.is_in_text_object?
         raise TextStateError, 
           "Must be in a text object to use operator : \""
       end
       
-      gs.text_state.word_spacing = w
-      gs.text_state.char_spacing = c
+      canvas.gs.text_state.word_spacing = w
+      canvas.gs.text_state.char_spacing = c
 
       tx, ty = 0, -gs.text_state.leading
 
-      gs.text_state.text_matrix =
-      gs.text_state.text_line_matrix =
-      Matrix.rows([[1,0,0],[0,1,0],[tx, ty, 1]]) * gs.text_state.text_line_matrix
+      canvas.gs.text_state.text_matrix =
+      canvas.gs.text_state.text_line_matrix =
+      Matrix.rows([[1,0,0],[0,1,0],[tx, ty, 1]]) * canvas.gs.text_state.text_line_matrix
+
+      canvas.write_text(s)
     end
     
-    insn  'TJ', Array
+    insn  'TJ', Array do |canvas, arr|
+      arr.each do |g|
+        case g
+          when Fixnum,Float then
+            # XXX: handle this in text space ?
+          when ::String then
+            canvas.write_text(g)
+          else
+            raise InvalidPDFInstructionError, 
+              "Invalid component type `#{g.class}` in TJ operand"
+        end
+      end
+    end
   end
 
 end