rubypost 0.0.1 → 0.0.2

data/lib/objects.rb

@@ -1,132 +1,166 @@
 module RubyPost
 
-#base class for rubypost
-class Object
-  #returns the string of metapost commmands
-  def compile
-    '%compile not implemented for ' + self.class.to_s
+  #base class for rubypost
+  class Object
+    #returns the string of metapost commmands
+    def compile
+      '%compile not implemented for ' + self.class.to_s
+    end
   end
-end
 
-#stores the macros that particular drawbles need.
-#This should really be a private class.
-class Macros < Object
+  #stores the macros that particular drawbles need.
+  #This should really be a private class.
+  class Macros < Object
   
-  def initialize
-    @inputs = Hash.new
-  end
+    def initialize
+      @inputs = Hash.new
+    end
   
-  #uses hash to make sure we never input same thing twice 
-  def add_input(s)
-    @inputs[s] = nil
-  end
+    #uses hash to make sure we never input same thing twice 
+    def add_input(s)
+      @inputs[s] = nil
+    end
   
-  def compile
-    str = String.new
-    @inputs.each_key do
-      |k| str = str + "input " + k + ";\n"
+    def compile
+      str = String.new
+      @inputs.each_key do
+        |k| str = str + "input " + k + ";\n"
+      end
+      str
     end
-    str
+  
   end
+
+  #stores the macros that particular drawbles need.
+  #This should really be a private class.
+  class PicturePrecompiler < Object
   
-end
+    def initialize
+      @pictures = Array.new
+    end
+  
+    def add_picture(s)
+      @pictures.push(s)
+    end
+  
+    def compile
+      str = "picture " + @@org_picture + ";\n" + @@org_picture + " := currentpicture;\n"
+      @pictures.each do
+        |p| str = str + p.precompile + "\n"
+      end
+      str
+    end
+  
+  end
+
+  #module variable to be altered by drawables that
+  #need a particular metapost macro input.  
+  @@picture_precompiler = PicturePrecompiler.new
+
+  #module variable to be altered by drawables that
+  #need a particular metapost macro input.  
+  @@Inputs = Macros.new
 
-#global module variable to be altered by drawables that
-#need a particular metapost macro input.  
-$Inputs = Macros.new
+  #this is the origninal metapost picture that is
+  #what actually gets displayed.  You shouldn't use
+  #this name for any other picture!
+  @@org_picture = "ORIGINAL_PICTURE"
 
-#metapost file
-#A metapost file can contain many figures.
-#Notes: Filenames cannot contain underscores for view to work! <br>
-#compile_to_str has a dodgy backspace handler.
-class File < Object
+  #metapost file
+  #A metapost file can contain many figures.
+  #Notes: Filenames cannot contain underscores for view to work! <br>
+  #compile_to_str has a dodgy backspace handler.
+  class File < Object
   
-  attr_writer :fname
+    attr_writer :fname
   
-  @@start_of_file = "prologues := 2;\n"
+    @@start_of_file = "prologues := 2;\n"
   
-  #input 'sarith' so that metapost can read exponential notation
-  def initialize(fname = nil)
-     @figures = Array.new
-     @fname = fname
-  end
+    #input 'sarith' so that metapost can read exponential notation
+    def initialize(fname = nil)
+      @figures = Array.new
+      @fname = fname
+    end
   
-  #add a new figure to this mpost file
-  def add_figure(f)
-    @figures.push(f)
-  end
+    #add a new figure to this mpost file
+    def add_figure(f)
+      @figures.push(f)
+    end
   
-  #returns the mp file as a str
-  def compile_to_string
-    str = @@start_of_file + $Inputs.compile
-    @figures.each_index do
-      |i| str = str + 'beginfig(' + (i+1).to_s + ");\n" + @figures[i].compile + "\n"
+    #returns the mp file as a str
+    def compile_to_string
+      str = @@start_of_file + @@Inputs.compile
+      #save the original metapost picture
+      str = str + @@picture_precompiler.compile
+      @figures.each_index do
+        |i| str = str + 'beginfig(' + (i+1).to_s + ");\n" + @figures[i].compile + "\n"
+      end
+      str = str + "end;\n"
+      #remove the backspaces
+      strback = str.gsub(/.[\b]/, '')
+      if (strback==nil) 
+        return str
+      else 
+        return strback 
+      end
     end
-    str = str + "end;\n"
-    #remove the backspaces
-    strback = str.gsub(/.[\b]/, '')
-    if (strback==nil) 
-      return str
-    else 
-      return strback 
+  
+    #writes the string of metapost commands to a file named 'fname.mp'
+    def compile_to_file(fname=@fname)
+      @fname = fname
+      IO::File.open(fname + '.mp','w') { |f| f.puts self.compile_to_string }
     end
-  end
   
-  #writes the string of metapost commands to a file named 'fname.mp'
-  def compile_to_file(fname=@fname)
-    @fname = fname
-    IO::File.open(fname + '.mp','w') { |f| f.puts self.compile_to_string }
-  end
+    #calls compile_to_file and writes the
+    #and copmiles the metapost commands if mpost is in the path
+    def compile(fname=@fname)
+      compile_to_file(fname)
+      system('mpost -quiet ' + fname + '.mp')
+    end
   
-  #calls compile_to_file and writes the
-  #and copmiles the metapost commands if mpost is in the path
-  def compile(fname=@fname)
-    compile_to_file(fname)
-    system('mpost -quiet ' + fname + '.mp')
-  end
+    #default view command is view_dvi
+    def view
+      view_dvi
+    end
   
-  #default view command is view_dvi
-  def view
-    view_dvi
-  end
+    #assumes that the file has already been compiled by metapost.  ie compile_to_ps
+    #has already been called.  This assumes that the yap viewer and tex is in your path. Install
+    #miktex to get these by default. <p>
+    #Notes: Filenames cannot contain underscores for view_dvi to work.  The "tex mproof" will
+    #not work with underscores
+    def view_dvi
+      str = 'tex mproof'
+      @figures.each_index { |i| str = str + ' ' + @fname + '.' + (i+1).to_s }
+      system(str)
+      system('yap mproof.dvi')
+    end
   
-  #assumes that the file has already been compiled by metapost.  ie compile_to_ps
-  #has already been called.  This assumes that the yap viewer and tex is in your path. Install
-  #miktex to get these by default. <p>
-  #Notes: Filenames cannot contain underscores for view_dvi to work.  The "tex mproof" will
-  #not work with underscores
-  def view_dvi
-    str = 'tex mproof'
-    @figures.each_index { |i| str = str + ' ' + @fname + '.' + (i+1).to_s }
-    system(str)
-    system('yap mproof.dvi')
   end
-  
-end
 
-#wrapper for the metapost figure
-#Figures actually become the figures that will to be viewed
-class Figure < Object
+  #wrapper for the metapost figure
+  #Figures actually become the figures that will to be viewed
+  class Figure < Object
   
-  def initialize
-    @drawables = Array.new
-  end
+    def initialize
+      @draw_commands = Array.new
+    end
   
-  def add_drawable(d)
-    @drawables.push(d)
-  end
+    def add_drawable(d)
+      @draw_commands.push(d)
+    end
   
-  def compile
-     str = String.new
-    @drawables.each do |d| 
-      str = str + d.draw_type + ' ' + d.compile +  "\n"
+    def compile
+      str = String.new
+      @draw_commands.each do |d| 
+        str = str + d.compile +  "\n"
+      end
+      str = str + "endfig;\n"
+      return str
     end
-    str = str + "endfig;\n"
-    return str
-  end
   
-end
+  end
 
+  #end module RubyPost
 end
 
 #Add the compile functionality to Ruby Numeric.  Calling

data/lib/options.rb

@@ -1,177 +1,177 @@
 
 module RubyPost
 
-#return the string s wrapped in btex etex
-def latex(s)
-  'btex ' + s + ' etex'
-end
-
-#options for rubypost drawables.  These wrap metapose commands 
-#such as 'withpen', 'scaled' and etc
-class Option < Object
-end
-
-#Can insert pure metapost option commands here.
-class CustomOption < Option
-  def initialize
-    @command = String.new
+  #return the string s wrapped in btex etex
+  def latex(s)
+    'btex ' + s + ' etex'
   end
-  
-  def initialize(c=Sting.new)
-    @command = c
+
+  #options for rubypost drawables.  These wrap metapose commands 
+  #such as 'withpen', 'scaled' and etc
+  class Option < Object
   end
+
+  #Can insert pure metapost option commands here.
+  class CustomOption < Option
+    def initialize
+      @command = String.new
+    end
   
-  def compile
-    @command.compile
-  end
+    def initialize(c=Sting.new)
+      @command = c
+    end
+  
+    def compile
+      @command.compile
+    end
   
-end
+  end
 
-#wrapper for the metapost withcolor command
-#Except colour is now spelt correctly.
-class Colour < Option
+  #wrapper for the metapost withcolor command
+  #Except colour is now spelt correctly.
+  class Colour < Option
   
-  attr :r
-  attr :g
-  attr :b
+    attr :r
+    attr :g
+    attr :b
   
-  def initialize(r=0,g=0,b=0)
-    @r = r
-    @g = g
-    @b = b
-  end
+    def initialize(r=0,g=0,b=0)
+      @r = r
+      @g = g
+      @b = b
+    end
   
-  def compile
-    'withcolor' + '(' + @r.to_s + ',' + @g.to_s + ',' + @b.to_s + ')'
-  end
+    def compile
+      'withcolor' + '(' + @r.to_s + ',' + @g.to_s + ',' + @b.to_s + ')'
+    end
   
-end
+  end
 
-#incorrectly spelt Colour alias
-class Color < Colour
-end
+  #incorrectly spelt Colour alias
+  class Color < Colour
+  end
 
 
-#wraps the metapost withpen command
-class Pen < Option
+  #wraps the metapost withpen command
+  class Pen < Option
   
-  attr_writer :pen_type, :scale
+    attr_writer :pen_type, :scale
   
-  def initialize(pt='pencircle', scale  = 1)
-    @pen_type = pt
-    @scale = scale
-  end
+    def initialize(pt='pencircle', scale  = 1)
+      @pen_type = pt
+      @scale = scale
+    end
   
-  def compile
-    'withpen ' + @pen_type + ' scaled ' + @scale.compile
-  end
+    def compile
+      'withpen ' + @pen_type + ' scaled ' + @scale.compile
+    end
   
-end
+  end
 
-#base class for options related to paths
-class PathOption < Option
-end
+  #base class for options related to paths
+  class PathOption < Option
+  end
 
-#dased path
-#there are a plethora of dashing options.  Only implemented
-#evenly at present.
-class Dashed < PathOption
+  #dased path
+  #there are a plethora of dashing options.  Only implemented
+  #evenly at present.
+  class Dashed < PathOption
   
-  def initialize(t='evenly')
+    def initialize(t='evenly')
       @type = t
-  end
+    end
   
-  #evenly dashed line
-  def evenly
-    @type = 'evenly'
-    self
-  end
+    #evenly dashed line
+    def evenly
+      @type = 'evenly'
+      self
+    end
   
-  #dahed line with dots inbetween dashes
-  def withdots
-    @type = 'withdots'
-    self
-  end
+    #dahed line with dots inbetween dashes
+    def withdots
+      @type = 'withdots'
+      self
+    end
   
-  #set the type with the metapost command s.
-  def type(s)
-    @type = s
-    self
-  end
+    #set the type with the metapost command s.
+    def type(s)
+      @type = s
+      self
+    end
   
-  def compile
-    'dashed ' + @type
-  end
+    def compile
+      'dashed ' + @type
+    end
   
-end
+  end
 
-#Wrapped the scaled metapost command.
-#Resizes the drawable.
-class Scale < Option
+  #Wrapped the scaled metapost command.
+  #Resizes the drawable.
+  class Scale < Option
   
-  attr_writer :scale
+    attr_writer :scale
   
-  def initialize(scale=1)
-    @scale = scale
-  end
+    def initialize(scale=1)
+      @scale = scale
+    end
   
-  def compile
-    'scaled ' + @scale.compile
-  end
+    def compile
+      'scaled ' + @scale.compile
+    end
   
-end
+  end
 
-#Scale alias
-class Scaled < Scale
-end
+  #Scale alias
+  class Scaled < Scale
+  end
 
-#Wraps the rotated metapost command
-class Rotate < Option
+  #Wraps the rotated metapost command
+  class Rotate < Option
   
-  attr_writer :degrees
+    attr_writer :degrees
   
-  def initialize(degrees=0)
-    @degrees = degrees
-  end
+    def initialize(degrees=0)
+      @degrees = degrees
+    end
   
-  #set the angle in radiians
-  def radians=(rads)
-    @degrees = 180.0*rads/Math::PI
-    self
-  end
+    #set the angle in radiians
+    def radians=(rads)
+      @degrees = 180.0*rads/Math::PI
+      self
+    end
   
-  def compile
-    'rotated ' + @degrees.to_s
-  end
+    def compile
+      'rotated ' + @degrees.to_s
+    end
   
-end
+  end
 
-#Rotate alias
-class Rotated < Rotate
-end
+  #Rotate alias
+  class Rotated < Rotate
+  end
 
-#Wraps the metapose shifted command. <br>
-#The translation @t is specifed by a Pair
-class Translate < Option
+  #Wraps the metapose shifted command. <br>
+  #The translation @t is specifed by a Pair
+  class Translate < Option
   
-  attr_writer :t
+    attr_writer :t
   
-  def initialize(p=Pair.new)
-    @t = p
-  end
+    def initialize(p=Pair.new)
+      @t = p
+    end
   
-  def compile
-    'shifted ' + @t.compile
-  end
+    def compile
+      'shifted ' + @t.compile
+    end
   
-end
+  end
 
-#Translate alias
-class Shifted < Translate
-end
+  #Translate alias
+  class Shifted < Translate
+  end
   
-#Translate alias
-class Shift < Translate
-end
+  #Translate alias
+  class Shift < Translate
+  end
 
 end

data/lib/revert_float_to_s.rb

@@ -1,6 +1,6 @@
-  #puts Float#to_s back to it's original state
-  class Float
-    def to_s
-      orig_to_s
-    end
-  end
+#puts Float#to_s back to it's original state
+class Float
+  def to_s
+    orig_to_s
+  end
+end

data/lib/rubypost.rb

@@ -1,5 +1,6 @@
 #load the rest of rubypost
 require 'objects'
 require 'drawable'
+require 'draw'
 require 'options'
 require 'graph'

data/tests/{test_cricle.rb → test_circle.rb}

@@ -1,10 +1,9 @@
-#require 'rubygems'
-#gem 'rubypost'
+#code to generate a plot of the data in metapost format
 #require 'rubypost'
 
-#load the rest of rubypost
 require '../lib/objects'
 require '../lib/drawable'
+require '../lib/draw'
 require '../lib/options'
 
 include RubyPost
@@ -16,8 +15,8 @@ file = RubyPost::File.new('testcircle')
 #draw a circle
 fig1 = Figure.new
 file.add_figure(fig1)
-circle1 = RubyPost::Circle.new.scale(1.cm)
-fig1.add_drawable(circle1)
+circle1 = RubyPost::Circle.new
+fig1.add_drawable(Draw.new(circle1).scale(1.cm))
 
 puts file.compile_to_string
 file.compile

data/tests/test_graph.rb

@@ -1,8 +1,11 @@
 #code to generate a plot of the data in metapost format
-require 'rubypost'
-require 'drawable'
-require 'options'
-require 'graph'
+#require 'rubypost'
+
+require '../lib/objects'
+require '../lib/drawable'
+require '../lib/draw'
+require '../lib/options'
+require '../lib/graph'
 
 include RubyPost
 
@@ -11,11 +14,11 @@ fig = Figure.new
 file.add_figure(fig)
 
 graph = Graph.new
-graph.add_option(XLabel.new(latex('x label')))
-graph.add_option(GraphTitle.new(latex('A graph title')))
-graph.add_option(YLabel.new(latex('the y label')))
-graph.add_option(YLabelRight.new(latex('the y label on the right')))
-fig.add_drawable(graph)
+graph.add_graph_option(XLabel.new(latex('x label')))
+graph.add_graph_option(GraphTitle.new(latex('A graph title')))
+graph.add_graph_option(YLabel.new(latex('the y label')))
+graph.add_graph_option(YLabelRight.new(latex('the y label on the right')))
+fig.add_drawable(Draw.new(graph))
 
 #plot y = x^2
 x = (1..20).to_a
@@ -25,6 +28,6 @@ gd = GraphData.new(x, y)
 gd.add_option(RubyPost::Colour.new(0.0,1.0,0.0))
 graph.add_data(gd)
 
-file.compile('figures')
+file.compile('testgraph')
 
 file.view

data/tests/test_pair.rb

@@ -1,13 +1,11 @@
 require 'test/unit'
 
-#require 'rubygems'
-#gem 'rubypost'
 #require 'rubypost'
 
-#load the rest of rubypost
 require '../lib/objects'
 require '../lib/drawable'
-require '../lib/options'
+
+
 
 include RubyPost