tioga 1.8 → 1.9

data/split/Tioga/dvector.h

@@ -31,6 +31,13 @@
 
 /* functions for handling Dvectors: */
 
+DECLARE_SYMBOL(bool, isa_Dvector, (VALUE obj));
+ /* returns true if the obj is a Dvector */
+DECLARE_SYMBOL(long, len_Dvector, (VALUE dvector));
+ /* returns length of the dvector */
+DECLARE_SYMBOL(double, access_Dvector, (VALUE dvector, long idx));
+ /* returns the value of entry idx in dvector */
+
 DECLARE_SYMBOL(double *, Dvector_Data_for_Read, (VALUE dvector, long *len_ptr));
  /* returns pointer to the dvector's data (which may be shared) */
 DECLARE_SYMBOL(double *, Dvector_Data_Copy, (VALUE dvector, long *len_ptr)); 
@@ -46,6 +53,7 @@ DECLARE_SYMBOL(void, Dvector_Store_Double, (VALUE ary, long idx, double val));
 /* pushes one element onto the vector */
 DECLARE_SYMBOL(void, Dvector_Push_Double, (VALUE ary, double val));
 
+
 /* functions for interpolation */
 DECLARE_SYMBOL(double, c_dvector_spline_interpolate,
 	       (double x, int n_pts_data, double *Xs, double *Ys, 

data/split/Tioga/figures.c

@@ -230,6 +230,10 @@ FM *Get_FM(OBJ_PTR fmkr, int *ierr) {
    RO_BOOL_ATTR(left_edge_visible)
    INT_ATTR(right_edge_type)
    RO_BOOL_ATTR(right_edge_visible)
+
+/* Major ticks picking algorithm */
+   BOOL_ATTR(vincent_or_bill)
+
     
 /* Legend */
    DBL_ATTR(legend_text_width)
@@ -382,6 +386,8 @@ void Init_FigureMaker(void) {
 /* colors */
    rb_define_method(cFM, "hls_to_rgb", FM_hls_to_rgb, 1);
    rb_define_method(cFM, "rgb_to_hls", FM_rgb_to_hls, 1);
+   rb_define_method(cFM, "string_hls_to_rgb!", FM_string_hls_to_rgb_bang, 1);
+   rb_define_method(cFM, "string_rgb_to_hls!", FM_string_rgb_to_hls_bang, 1);
 /* coordinate system conversions */
    rb_define_method(cFM, "convert_inches_to_output", FM_convert_inches_to_output, 1);
    rb_define_method(cFM, "convert_output_to_inches", FM_convert_output_to_inches, 1);
@@ -487,12 +493,13 @@ void Init_FigureMaker(void) {
    rb_define_method(cFM, "private_radial_shading", FM_private_radial_shading, 13);
 /* markers */
    rb_define_method(cFM, "register_font", FM_register_font, 1);
-   rb_define_method(cFM, "private_show_marker", FM_private_show_marker, 15);
+   rb_define_method(cFM, "private_show_marker", FM_private_show_marker, 1);
    rb_define_method(cFM, "marker_string_info", FM_marker_string_info, 3);
 /* images */
    rb_define_method(cFM, "private_show_jpg", FM_private_show_jpg, 5);
    rb_define_method(cFM, "private_show_rgb_image", FM_private_show_rgb_image, 11);
-   rb_define_method(cFM, "private_show_cmyk_image", FM_private_show_rgb_image, 11);
+   rb_define_method(cFM, "private_show_hls_image", FM_private_show_hls_image, 11);
+   rb_define_method(cFM, "private_show_cmyk_image", FM_private_show_cmyk_image, 11);
    rb_define_method(cFM, "private_show_grayscale_image", FM_private_show_grayscale_image, 11);
    rb_define_method(cFM, "private_show_monochrome_image", FM_private_show_monochrome_image, 12);
    rb_define_method(cFM, "private_show_image", FM_private_show_image, 15);
@@ -617,6 +624,10 @@ void Init_FigureMaker(void) {
    attr_reader(left_edge_visible)
    attr_accessors(right_edge_type)
    attr_reader(right_edge_visible)
+
+
+/* Major ticks algorithm */
+   attr_accessors(vincent_or_bill)
     
 /* Legend */
    attr_accessors(legend_text_width)
@@ -644,6 +655,9 @@ void Init_FigureMaker(void) {
    RB_IMPORT_SYMBOL(cDvector, Dvector_Create);
    RB_IMPORT_SYMBOL(cDvector, Dvector_Data_Resize);
    RB_IMPORT_SYMBOL(cDvector, Dvector_Data_Replace);
+   RB_IMPORT_SYMBOL(cDvector, isa_Dvector);
+   RB_IMPORT_SYMBOL(cDvector, len_Dvector);
+   RB_IMPORT_SYMBOL(cDvector, access_Dvector);
    RB_IMPORT_SYMBOL(cDvector, Dvector_Data_for_Read);
    RB_IMPORT_SYMBOL(cDvector, Dvector_Data_for_Write);
    RB_IMPORT_SYMBOL(cDvector, Dvector_Store_Double);
@@ -665,6 +679,9 @@ void Init_FigureMaker(void) {
 IMPLEMENT_SYMBOL(Dvector_Create);
 IMPLEMENT_SYMBOL(Dvector_Data_Resize);
 IMPLEMENT_SYMBOL(Dvector_Data_Replace);
+IMPLEMENT_SYMBOL(isa_Dvector);
+IMPLEMENT_SYMBOL(len_Dvector);
+IMPLEMENT_SYMBOL(access_Dvector);
 IMPLEMENT_SYMBOL(Dvector_Data_for_Read);
 IMPLEMENT_SYMBOL(Dvector_Data_for_Write);
 IMPLEMENT_SYMBOL(Dvector_Store_Double);

data/split/Tioga/figures.h

@@ -281,7 +281,10 @@ typedef struct {
     bool left_edge_visible;
     int right_edge_type;
     bool right_edge_visible;
-    
+
+    /* General axis stuff*/
+    bool vincent_or_bill;
+
     /* Legend */
     // units are text heights for x and y for locations and sizes
     double legend_line_x0; // x location of start of line
@@ -454,6 +457,8 @@ extern void c_xaxis_stroke_color_set(OBJ_PTR fmkr, FM *p, OBJ_PTR valc_hls_to_rg
 extern OBJ_PTR c_xaxis_stroke_color_get(OBJ_PTR fmkr, FM *pc_hls_to_rgb, int *ierr); // value is array of [r, g, b] intensities from 0 to 1
 extern void c_yaxis_stroke_color_set(OBJ_PTR fmkr, FM *p, OBJ_PTR valc_hls_to_rgb, int *ierr);
 extern OBJ_PTR c_yaxis_stroke_color_get(OBJ_PTR fmkr, FM *pc_hls_to_rgb, int *ierr); // value is array of [r, g, b] intensities from 0 to 1
+extern void c_string_hls_to_rgb_bang(OBJ_PTR fmkr, FM *p, unsigned char* hls_str, long len, int *ierr);
+extern void c_string_rgb_to_hls_bang(OBJ_PTR fmkr, FM *p, unsigned char* rgb_str, long len, int *ierr);
 
 /*======================================================================*/
 // pdfcoords.c
@@ -643,11 +648,7 @@ extern void Write_Font_Widths(void);
 
 extern OBJ_PTR c_register_font(OBJ_PTR fmkr, FM *p, char *font_name, int *ierr);
 extern OBJ_PTR c_marker_string_info(OBJ_PTR fmkr, FM *p, int fnt, unsigned char *text, double scale, int *ierr);
-extern void c_private_show_marker(
-   OBJ_PTR fmkr, FM *p, int int_args, OBJ_PTR stroke_width, OBJ_PTR string,
-   OBJ_PTR x, OBJ_PTR y, OBJ_PTR x_vec, OBJ_PTR y_vec,
-   double h_scale, double v_scale, double scale, double it_angle, double ascent_angle, double angle,
-   OBJ_PTR fill_color, OBJ_PTR stroke_color, int *ierr);
+extern void c_private_show_marker(OBJ_PTR fmkr, FM *p, OBJ_PTR args, int *ierr);
 
 /*======================================================================*/
 // texout.c

data/split/Tioga/generic.c

@@ -20,6 +20,7 @@
 */
 
 #include <ctype.h>
+
 #include "dvector.h"
 #include "dtable.h"
 #include "ruby.h"
@@ -30,6 +31,7 @@
 #include "flate.h"
 
 
+
 static OBJ_PTR rb_Integer_class, rb_Numeric_class;
 
 void Init_generic(void) {
@@ -73,7 +75,8 @@ char *CString_Ptr(OBJ_PTR obj, int *ierr) {
 
 OBJ_PTR Array_New(long len) { return rb_ary_new2(len); }
 
-long Array_Len(OBJ_PTR obj, int *ierr) { return (RARRAY(rb_Array(obj))->len); }
+long Array_Len(OBJ_PTR obj, int *ierr) { 
+   return isa_Dvector(obj)? len_Dvector(obj) : (RARRAY(rb_Array(obj))->len); }
 
 OBJ_PTR Array_Entry(OBJ_PTR obj, long indx, int *ierr) { return rb_ary_entry(obj,indx); }
 
@@ -81,6 +84,16 @@ void Array_Store(OBJ_PTR obj, long indx, OBJ_PTR val, int *ierr) { rb_ary_store(
 
 void Array_Push(OBJ_PTR obj, OBJ_PTR val, int *ierr) { rb_ary_push(obj,val); }
 
+double Array_Entry_double(OBJ_PTR obj, long indx, int *ierr) {
+   return isa_Dvector(obj)? access_Dvector(obj,indx) : Number_to_double(rb_ary_entry(obj,indx),ierr);
+}
+
+long Array_Entry_int(OBJ_PTR obj, long indx, int *ierr) {
+   return isa_Dvector(obj)? round(access_Dvector(obj,indx)) : Number_to_int(rb_ary_entry(obj,indx),ierr);
+}
+
+
+
 ID_PTR ID_Get(char *name) { return rb_intern(name); }
 
 char *ID_Name(ID_PTR id, int *ierr) { return rb_id2name(id); }

data/split/Tioga/generic.h

@@ -153,6 +153,19 @@ extern void Array_Store(OBJ_PTR obj, long indx, OBJ_PTR val, int *ierr);
 extern void Array_Push(OBJ_PTR obj, OBJ_PTR val, int *ierr);
     // pushes val onto the end of array obj.
     // raises error if obj not a kind of array
+    
+    
+extern double Array_Entry_double(OBJ_PTR obj, long indx, int *ierr);
+    // returns a C double
+    // tries to convert obj to array if necessary
+    // raises error if obj not a kind of array and cannot be converted to one
+    // or if entry is not a number and cannot be converted to one.
+    
+extern long Array_Entry_int(OBJ_PTR obj, long indx, int *ierr);
+    // returns a C long int
+    // tries to convert obj to array if necessary
+    // raises error if obj not a kind of array and cannot be converted to one
+    // or if entry is not a number and cannot be converted to one.
 
 
 extern ID_PTR ID_Get(char *name);

data/split/Tioga/init.c

@@ -54,9 +54,6 @@ static ID_PTR tex_fontfamily_ID;
 static ID_PTR tex_fontseries_ID;
 static ID_PTR tex_fontshape_ID;
 static ID_PTR line_type_ID;
-static ID_PTR title_ID;
-static ID_PTR xlabel_ID;
-static ID_PTR ylabel_ID;
 static ID_PTR xaxis_locations_for_major_ticks_ID;
 static ID_PTR xaxis_locations_for_minor_ticks_ID;
 static ID_PTR xaxis_tick_labels_ID;
@@ -313,8 +310,8 @@ static bool Get_quiet_mode(OBJ_PTR fmkr, int *ierr) {
 
 static void Make_Save_Fname(OBJ_PTR fmkr, char *full_name, char *f_name,
    bool with_save_dir, bool with_pdf_extension, int *ierr) {
-   int i, j, k, len, mod_len, mod_num, did_mod_num = false;
-   char c, *fmt, model[STRLEN], *save=NULL;
+   int i, j, len;
+   char c, *save=NULL;
    if (with_save_dir) { save = Get_save_dir(fmkr,ierr); if (*ierr != 0) return; }
    if (with_save_dir && save != NULL && strlen(save) > 0) { 
       sprintf(full_name, "%s/", save); j = strlen(full_name); }
@@ -346,8 +343,7 @@ OBJ_PTR c_get_save_filename(OBJ_PTR fmkr, FM *p, OBJ_PTR name, int *ierr) {
    
    
 void c_private_make(OBJ_PTR fmkr, FM *p, OBJ_PTR name, OBJ_PTR cmd, int *ierr) {
-   char full_name[STRLEN], mod_num_name[STRLEN];
-   OBJ_PTR result;
+   char full_name[STRLEN];
    bool quiet = Get_quiet_mode(fmkr, ierr);
    if (*ierr != 0) return;
    if (!Get_initialized()) {
@@ -369,7 +365,6 @@ void c_private_make(OBJ_PTR fmkr, FM *p, OBJ_PTR name, OBJ_PTR cmd, int *ierr) {
    Call_Function(fmkr, make_page_ID, cmd, ierr);
    if (*ierr != 0) return;
    Write_grestore();
-   if (result == OBJ_FALSE) quiet = true;
    Close_pdf(fmkr, p, quiet, ierr);
    if (*ierr != 0) return;
    Close_tex(fmkr, quiet, ierr);
@@ -578,10 +573,11 @@ void c_private_init_fm_data(OBJ_PTR fmkr, FM *p, int *ierr) {
    p->left_edge_visible = true;
    p->right_edge_type = EDGE_WITH_TICKS;
    p->right_edge_visible = true;
+
    /* Legend */
    p->legend_line_x0 = 0.5;
    p->legend_line_x1 = 2.0;
-   p->legend_line_dy = 0.4;
+   p->legend_line_dy = 0.25;
    p->legend_text_width = -1;
    p->legend_text_xstart = 2.8;
    p->legend_text_ystart = 2.0;

data/split/Tioga/lib/Colormaps.rb

@@ -90,16 +90,47 @@ Dictionary Entries
    end
 
 # Returns a vector of [ red, green, blue ] intensities corresponding to the
-# <i>hls_vec</i> color given as [ hue, lightness, saturation].  See also rgb_to_hls.
+# <i>hls_vec</i> color given as [ hue, lightness, saturation ].  See also rgb_to_hls.
     def hls_to_rgb(hls_vec)
     end
     
 # Returns a vector of [ hue, lightness, saturation ] corresponding to the
-# <i>rgb_vec</i> color given as [ red, green, blue] intensities.  See also hls_to_rgb.
+# <i>rgb_vec</i> color given as [ red, green, blue ] intensities.  See also hls_to_rgb.
     def rgb_to_hls(rgb_vec)
     end
 
 
+# Returns a new string of [ red, green, blue ] byte triples corresponding to the
+# colors given in <i>str</i> as triples of [ hue, lightness, saturation ].
+# For representation as a byte, intensities in range 0.0 to 1.0 are multiplied by 255 and rounded;
+# hue angles in the range 0.0 to 360.0 are divided by 360, multiplied by 255, and rounded.
+# See also string_hls_to_rgb!.
+    def string_hls_to_rgb(str)
+    end
+
+# Modifies in-place the string of [ red, green, blue ] byte triples to give the corresponding
+# colors as triples of [ hue, lightness, saturation ].  
+# See also string_hls_to_rgb.
+    def string_hls_to_rgb!(str)
+    end
+    
+# Returns a new string of [ hue, lightness, saturation ] byte triples corresponding to the
+# colors given in <i>str</i> as triples of [ red, green, blue ].  
+# For representation as a byte, intensities in range 0.0 to 1.0 are multiplied by 255 and rounded;
+# hue angles in the range 0.0 to 360.0 are divided by 360, multiplied by 255, and rounded.
+# See also string_rgb_to_hls!.
+    def string_rgb_to_hls(str)
+    end
+    
+# Modifies in-place the string of [ hue, lightness, saturation ] byte triples to give the corresponding
+# colors as triples of [ red, green, blue ].  
+# See also string_rgb_to_hls.
+    def string_rgb_to_hls!(str)
+    end
+
+
+
+
 
 end # class
 end # module Tioga

data/split/Tioga/lib/Doc.rb

@@ -77,6 +77,36 @@ class FigureMaker
     def FigureMaker.default=(fm)
     end
     
+# :call-seq:
+#               FigureMaker.exec do |t| ... end
+#
+# Executes the block with FigureMaker.default as argument.
+    def FigureMaker.exec(&cmd)
+    end
+    
+# :call-seq:
+#               FigureMaker.make_pdf(name) do |t| ... end
+#
+# Executes the block to create a pdf with the given name.
+# The argument for the block is FigureMaker.default.
+    def FigureMaker.make_pdf(name,&cmd)
+    end
+    
+# :call-seq:
+#               FigureMaker.def_enter_page_function do |t| ... end
+#
+# Defines the block to be the enter_page_function for FigureMaker.default.
+    def FigureMaker.def_enter_page_function(&cmd)
+    end
+    
+# :call-seq:
+#               FigureMaker.page_style do |t| ... end
+#
+# Alias for FigureMaker.def_enter_page_function.
+# Defines the block to be the enter_page_function for FigureMaker.default.
+    def FigureMaker.page_style(&cmd)
+    end
+    
 # :call-seq:
 #               FigureMaker.version
 #

data/split/Tioga/lib/Executive.rb

@@ -58,14 +58,16 @@ class Executive < Doc < FigureMaker
     end
 
 # :call-seq:
+#   make_pdf(name) do |t| ... end
 #   make_pdf(name)
 #   make_pdf(number)
 #
-# Executes the corresponding code that was previously saved by def_figure.
+# First, if there is a command block given, def_figure is called to save it.
+# Then make_pdf executes the command corresponding to the given name or number.
 # Output is written to the currently specified save_dir directory.
 # See also require_pdf.
 #
-    def make_pdf(n)
+    def make_pdf(n,&cmd)
     end
 
 # :call-seq:

data/split/Tioga/lib/FigMkr.rb

@@ -34,7 +34,7 @@ class FigureMaker
 
     # This URL will contain tioga-(...) when it is exported from the
     # SVN repository. This is where we'll look for version information.
-    SVN_URL = '$HeadURL: svn+ssh://rubyforge.org/var/svn/tioga/tags/tioga/Tioga%201.8/split/Tioga/lib/FigMkr.rb $'
+    SVN_URL = '$HeadURL: svn+ssh://rubyforge.org/var/svn/tioga/trunk/tioga/split/Tioga/lib/FigMkr.rb $'
 
     TIOGA_VERSION = if SVN_URL =~ /tags\/tioga\/Tioga%20([^\/]+)/
                        $1
@@ -66,14 +66,28 @@ class FigureMaker
       @@which_pdflatex = s
     end
     
-    
     def FigureMaker.make_name_lookup_hash(ary)
         dict = Hash.new
         ary.each { |name| dict[name] = true }
         return dict
     end
-
-
+    
+    def FigureMaker.make_pdf(name='immediate', &block)
+      self.default.make_pdf(name, &block)
+    end
+    
+    def FigureMaker.def_enter_page_function(&cmd)
+      self.default.def_enter_page_function(&cmd)
+    end
+    
+    def FigureMaker.page_style(&cmd) 
+      FigureMaker.def_enter_page_function(&cmd)
+    end
+    
+    def FigureMaker.exec(&cmd) 
+      cmd.call(self.default)
+    end
+    
 
     attr_accessor :title
     attr_accessor :xlabel
@@ -128,7 +142,7 @@ class FigureMaker
     
     attr_accessor :num_error_lines
 
-    # Whether or not to create +save_dir+ if it doesn't exist
+    # Whether or not to create _save_dir_ if it doesn't exist
     attr_accessor :create_save_dir
 
     # Whether or not do do automatic cleanup of the files
@@ -140,6 +154,13 @@ class FigureMaker
     # An accessor for @measures_info:
     attr_accessor :measures_info
 
+
+
+    # If we want to use #legend_bounding_box. It is off by default
+    # as it causes a systematic second run of pdflatex.
+    attr_accessor :measure_legends
+
+
     # old preview attributes -- to be removed later
     
             attr_accessor :model_number
@@ -229,6 +250,7 @@ class FigureMaker
             'plot_left_margin' => 0.0,
             'plot_right_margin' => 0.18,
             'plot_scale' => 1,
+            'legend_background_function' => false,
             'legend_scale' => 1 }
         
         @marker_defaults = { 
@@ -279,6 +301,12 @@ class FigureMaker
 
         # We *must* initialize the measures_info hash.
         @measures_info = {}
+
+        # We don't measure legends by default.
+        @measure_legends = false
+
+        # By default, we use Bill's algorithm for major ticks positions
+        self.vincent_or_bill = false
     end
     
 
@@ -611,6 +639,7 @@ class FigureMaker
       'marker_scale' => nil,
     }
 
+
     def save_legend_info(arg)
         if arg.kind_of?String
             dict = { 'text' => arg }
@@ -625,8 +654,9 @@ class FigureMaker
         end
         @legend_info << dict
     end
+    
 
-    def show_legend
+    def show_legend(legend_background_function=nil)
         char_dx = self.default_text_height_dx
         char_dy = self.default_text_height_dy
         line_ht_x = char_dx * self.legend_scale
@@ -641,20 +671,48 @@ class FigureMaker
             end
         end
         xright = x + ltw*line_ht_x
+
         y = 1.0 - self.legend_text_ystart*line_ht_y
         update_bbox(xright, y)
-        dy = -self.legend_text_dy*line_ht_y
         line_x0 = self.legend_line_x0*line_ht_x
         line_x1 = self.legend_line_x1*line_ht_x
         line_dy = self.legend_line_dy*line_ht_y
+
+        # If we are measuring legends, we come up with a more
+        # accurate version of xright:
+        if @measure_legends
+          xright = x + convert_output_to_figure_dx(legend_text_width)
+          xright += line_x0     # To leave a symetric space around
+          # the legend !
+        end
+
         self.label_left_margin = self.label_right_margin = self.label_top_margin = self.label_bottom_margin = -1e99
+        unless legend_background_function == nil || legend_background_function == false
+           ybot = y
+          # we need to remove the first element ;-)...
+           @legend_info[1..-1].each do |dict|
+                dy = dict['dy']; dy = 1 if dy == nil
+                ybot -= line_ht_y * dy
+           end
+           # We add half a line below to look good
+           ybot -= line_ht_y * 0.5
+           ytop = y + @legend_info.first['dy'] * line_ht_y * 0.5
+           legend_background_function.call([ 0, xright, ytop, ybot ])
+        end
+        legend_index = 0
         @legend_info.each do |dict|
             text = dict['text']
             if text != nil
-                show_text('text' => text,
-                    'x' => x, 'y' => y, 'scale' => self.legend_scale,
-                    'justification' => self.legend_justification,
-                    'alignment' => self.legend_alignment)
+                # We prepare a dictionnary:
+                dct = { 'text' => text,
+                         'x' => x, 'y' => y, 'scale' => self.legend_scale,
+                         'justification' => self.legend_justification,
+                         'alignment' => self.legend_alignment }
+                if @measure_legends
+                  dct['measure'] = "legend-#{legend_index}"
+                  legend_index += 1
+                end
+                show_text(dct)
             end
             line_width = dict['line_width']
             line_type = dict['line_type']
@@ -683,6 +741,20 @@ class FigureMaker
         end
     end
 
+    # Returns the exact length of the text width in output
+    # coordinates
+    def legend_text_width
+      index = 0
+      width = 0.0
+      while h = get_text_size("legend-#{index}") and h.key?('width')
+        if width < h['width'] 
+          width = h['width'] 
+        end
+        index += 1
+      end
+      return 10 * width
+    end
+
     def legend_height
         height = 0.0
         @legend_info.each { |dict| height += dict['dy'] }
@@ -808,17 +880,17 @@ class FigureMaker
         
         unless entry_function == nil 
             begin
-                entry_function.call
+                entry_function.call(self)
             rescue Exception => er
                 report_error(er, nil)
             end
         end
         
-        result = cmd.call
+        result = cmd.call(self)
         
         unless exit_function == nil 
             begin
-                exit_function.call
+                exit_function.call(self)
             rescue Exception => er
                 report_error(er, nil)
             end
@@ -839,7 +911,7 @@ class FigureMaker
             end
         end
         
-        result = cmd.call
+        result = cmd.call(self)
         
         unless exit_function == nil 
             begin
@@ -857,14 +929,24 @@ class FigureMaker
     def show_plot(bounds=nil,&cmd)       
         trace_cmd_one_arg(@enter_show_plot_function, @exit_show_plot_function, bounds) {        
             set_bounds(bounds)
-            context { clip_to_frame; cmd.call }
+            context { clip_to_frame; cmd.call(self) }
             show_plot_box
         }      
     end
     
+    
+    def show_plot_without_clipping(bounds=nil,&cmd)       
+        trace_cmd_one_arg(@enter_show_plot_function, @exit_show_plot_function, bounds) {        
+            set_bounds(bounds)
+            context { cmd.call(self) }
+            show_plot_box
+        }      
+    end
+    
+    
     def subfigure(margins=nil,&cmd)
         trace_cmd_one_arg(@enter_subfigure_function, @exit_subfigure_function, margins) {        
-            context { doing_subfigure; set_subframe(margins); cmd.call }
+            context { doing_subfigure; set_subframe(margins); cmd.call(self) }
         }      
     end
     
@@ -879,7 +961,7 @@ class FigureMaker
     def subplot(margins=nil,&cmd)
         trace_cmd_one_arg(@enter_subplot_function, @exit_subplot_function, margins) {        
             reset_legend_info
-            context { doing_subplot; set_subframe(margins); cmd.call }
+            context { doing_subplot; set_subframe(margins); cmd.call(self) }
         }      
     end
     
@@ -957,7 +1039,7 @@ class FigureMaker
            save_fm_data = Dvector.new(@@fm_data_size).replace(@fm_data)
            pdf_gsave
            begin
-               cmd.call       
+               cmd.call(self)       
            ensure
                pdf_grestore
                self.title = save_title
@@ -1066,10 +1148,92 @@ class FigureMaker
         end
     end
     
+    @@keys_for_show_grid = %w[
+      stroke_color line_type rescale_lines line_width stroke_opacity stroke_transparency
+    ]
+
+    # Draws the gridlines associated with the X and Y axis.
+    #
+    # The following list shows the keys that cen be used in +dict+.  In the
+    # list, 'A' stands for either 'x' or 'y', and 'M' stands for 'major' or
+    # 'minor'.  Keys can also be specified without the "A_M_" prefix to specify
+    # "grid-global" defaults.  The +grid+ key, if true, enables both major and
+    # minor gridlines for both x and y axes.
+    #
+    # * A_M_grid
+    # * A_M_line_type
+    # * A_M_line_width
+    # * A_M_stroke_opacity
+    # * A_M_stroke_transparency
+    # * A_M_stroke_color
+    def show_grid(dict={})
+      dict = {
+        'line_type' => Line_Type_Dot,
+        'rescale_lines' => 0.25,
+        'stroke_color' => Gray,
+        'major_grid' => true,
+        'minor_grid' => false,
+        'x_minor_rescale_lines' => 0.5,
+        'y_minor_rescale_lines' => 0.5,
+      }.merge(dict)
+
+      # "grid-global" context
+      context do
+        @@keys_for_show_grid.each do |k|
+          next unless val = dict[k]
+          k += '=' if respond_to? "#{k}="
+          next unless respond_to? k
+          send(k, val)
+        end
+
+        if dict['x_major_grid'] || dict['x_minor_grid'] ||
+           dict[  'major_grid'] || dict[  'minor_grid'] || dict['grid']
+          top = axis_information(TOP)
+          bottom = axis_information(BOTTOM)
+          y0 = bottom['y0']
+          y1 = top['y1']
+          # Do minor and major grid lines in same context so minor lines will
+          # inherit properties from major lines.
+          context do
+            %w[ major minor ].each do |m|
+              next unless dict["x_#{m}_grid"] || dict["#{m}_grid"] || dict["grid"]
+              @@keys_for_show_grid.each do |k|
+                next unless val = dict["x_#{m}_#{k}"]
+                k += '=' if respond_to? "#{k}="
+                send(k, val)
+              end
+              bottom[m].each {|x| stroke_line(x, y0, x, y1)}
+            end
+          end
+        end
+
+        if dict['y_major_grid'] || dict['y_minor_grid'] ||
+           dict[  'major_grid'] || dict[  'minor_grid'] || dict['grid']
+          left = axis_information(LEFT)
+          right = axis_information(RIGHT)
+          x0 = left['x0']
+          x1 = right['x1']
+          # Do minor and major grid lines in same context so minor lines will
+          # inherit properties from major lines.
+          context do
+            %w[ major minor ].each do |m|
+              next unless dict["y_#{m}_grid"] || dict["#{m}_grid"] || dict["grid"]
+              @@keys_for_show_grid.each do |k|
+                next unless val = dict["y_#{m}_#{k}"]
+                k += '=' if respond_to? "#{k}="
+                send(k, val)
+              end
+              left[m].each {|y| stroke_line(x0, y, x1, y)}
+            end
+          end
+        end
+      end
+    end
+
     @@keys_for_show_plot_with_legend = FigureMaker.make_name_lookup_hash([
         'legend_top_margin', 'legend_bottom_margin', 'legend_left_margin', 'legend_right_margin',
         'plot_top_margin', 'plot_bottom_margin', 'plot_left_margin', 'plot_right_margin',
-        'plot_scale', 'legend_scale' ])
+        'plot_scale', 'legend_scale', 'legend_background_function' ])
     def show_plot_with_legend(dict=nil, &cmd)
         check_dict(dict, @@keys_for_show_plot_with_legend, 'show_plot_with_legend') if dict != nil
         legend_top_margin = get_if_given_else_use_default_dict(dict, 'legend_top_margin', @legend_defaults)
@@ -1082,13 +1246,18 @@ class FigureMaker
         plot_left_margin = get_if_given_else_use_default_dict(dict, 'plot_left_margin', @legend_defaults)
         plot_right_margin = get_if_given_else_use_default_dict(dict, 'plot_right_margin', @legend_defaults)
         plot_scale = get_if_given_else_use_default_dict(dict, 'plot_scale', @legend_defaults)
+        legend_background_function = get_if_given_else_default(dict, 'legend_background_function', nil)
+        @legend_subframe = [legend_left_margin, legend_right_margin, 
+                            legend_top_margin, legend_bottom_margin]
         reset_legend_info
         rescale(plot_scale)
-        subplot([plot_left_margin, plot_right_margin, plot_top_margin, plot_bottom_margin]) { cmd.call }
-        set_subframe([legend_left_margin, legend_right_margin, legend_top_margin, legend_bottom_margin])
+        subplot([plot_left_margin, plot_right_margin, plot_top_margin, plot_bottom_margin]) { cmd.call(self) }
+        # We temporary store the legend information in @legend_subframes
+        set_subframe(@legend_subframe)
         rescale(legend_scale) # note that legend_scale is an addition to the plot_scale, not a replacement
         @pr_margin = plot_right_margin
-        show_legend
+        show_legend(legend_background_function)
+        @legend_subframe = nil
     end
     
     def append_points_with_gaps_to_path(xs, ys, gaps, close_subpaths = false)
@@ -1439,6 +1608,17 @@ class FigureMaker
             extend_start, extend_end)
     end
     
+    
+    def string_hls_to_rgb(str)
+      string_hls_to_rgb!(String.new(str))
+    end
+    
+    
+    def string_rgb_to_hls(str)
+      string_rgb_to_hls!(String.new(str))
+    end
+    
+    
     @@keys_for_show_image = FigureMaker.make_name_lookup_hash([
         'll', 'lr', 'ul', 'w', 'width', 'height', 'h',
         'opacity_mask', 'stencil_mask', 
@@ -1624,27 +1804,7 @@ class FigureMaker
         if (marker != nil && string != nil)
             raise "Sorry: Must give either 'marker' or 'string' for show_marker, but not both"
         end
-        if (marker == nil)
-            glyph = stroke_width = nil
-        else
-            if !(marker.kind_of?Array) && marker.size >= 2 && marker.size <= 3
-                raise "Sorry: 'marker' for show_marker must be array of [font_number, char_code] or [font_number, char_code, rendering_mode]"
-            end
-            font = marker[0]
-            glyph = marker[1]
-            if marker.size == 3
-                mode = STROKE if mode == nil
-                stroke_width = marker[2]
-            else
-                mode = FILL if mode == nil
-                stroke_width = nil
-            end
-        end
-        mode = FILL if mode == nil
-        font = Times_Roman if (font == nil && string != nil)
-        if (font != nil && !(font.kind_of? Integer))
-            raise "Sorry: 'font' for show_marker must be an integer font number (see FigureConstants list)"
-        end
+        
         stroke_width = get_if_given_else_default(dict, 'stroke_width', stroke_width)
         angle = get_if_given_else_use_default_dict(dict, 'angle', @marker_defaults)
         scale = get_if_given_else_use_default_dict(dict, 'scale', @marker_defaults)
@@ -1655,10 +1815,11 @@ class FigureMaker
         it_angle = get_if_given_else_use_default_dict(dict, 'italic_angle', @marker_defaults)
         ascent_angle = get_if_given_else_use_default_dict(dict, 'ascent_angle', @marker_defaults)
         glyph = 0 if glyph == nil
-        int_args = glyph*100000 + font*1000 + mode*100 + align*10 + (just+1) # min value for just is -1 
-            # Ruby limits us to 15 args, so pack some small integers together                
-        private_show_marker(int_args, stroke_width, string, x, y, xs, ys,
-            h_scale, v_scale, scale, it_angle, ascent_angle, angle, fill_color, stroke_color)                
+                     
+        args = [marker, font, mode, align, just, stroke_width, string, x, y, xs, ys,
+                h_scale, v_scale, scale, it_angle, ascent_angle, angle, fill_color, stroke_color]
+        private_show_marker(args)       
+                     
         legend_arg = dict['legend']
         if legend_arg != nil
             if legend_arg.kind_of?Hash
@@ -1784,7 +1945,6 @@ class FigureMaker
     end
     
     
-    
     def def_enter_page_function(&cmd)
         if cmd == nil
             raise "Sorry: must provide a command block for def_enter_page_function"
@@ -1950,7 +2110,8 @@ class FigureMaker
     
     # We wrap the call so that if the keys of @measures
     # did change during the call, we call it again.
-    def make_pdf(num) # returns pdf name if successful, false if failed.
+    def make_pdf(num,&cmd) # returns pdf name if successful, false if failed.
+        def_figure(num,&cmd) if Kernel.block_given?
         old_measure_keys = @measures.keys
         num = get_num_for_pdf(num)
         result = start_making_pdf(num)
@@ -1963,6 +2124,7 @@ class FigureMaker
         end
           
         if @measures.keys != old_measure_keys
+          # we dont need to pass &cmd since it has now been defined
           make_pdf(num)
         end
         return @figure_pdfs[num]
@@ -2259,6 +2421,10 @@ class FigureMaker
             private_show_rgb_image(ll[0], ll[1], lr[0], lr[1], ul[0], ul[1], interpolate, w, h, data, mask_xo_num)
             return self
         end
+        if color_space == 'HLS' || color_space == 'hls'
+            private_show_hls_image(ll[0], ll[1], lr[0], lr[1], ul[0], ul[1], interpolate, w, h, data, mask_xo_num)
+            return self
+        end
         if color_space == 'CMYK' || color_space == 'cmyk'
             private_show_cmyk_image(ll[0], ll[1], lr[0], lr[1], ul[0], ul[1], interpolate, w, h, data, mask_xo_num)
             return self
@@ -2310,7 +2476,7 @@ class FigureMaker
         exit_function = @exit_page_function
         unless entry_function == nil 
             begin
-                entry_result = entry_function.call
+                entry_result = entry_function.call(self)
             rescue Exception => er
                 report_error(er, nil)
             end
@@ -2318,7 +2484,7 @@ class FigureMaker
         result = do_cmd(cmd)       
         unless result == false or exit_function == nil 
             begin
-                exit_result = exit_function.call
+                exit_result = exit_function.call(self)
             rescue Exception => er
                 report_error(er, nil)
             end
@@ -2329,7 +2495,7 @@ class FigureMaker
 
     def do_cmd(cmd)  # the C implementation uses this to call Ruby commands
         begin
-            cmd.call
+            cmd.call(self)
             return true
         rescue Exception => er
             report_error(er, nil)