tioga 1.8 → 1.9

data/split/Tioga/lib/Figures_and_Plots.rb

@@ -17,6 +17,13 @@ class Figures_and_Plots < Doc < FigureMaker
     def show_plot(bounds=nil,&cmd)
     end
 
+# :call-seq:
+#   show_plot_without_clipping(bounds) do ... end
+#
+# This is identical to show_plot except it doesn't do #clip_to_frame before calling the plot command.
+    def show_plot_without_clipping(bounds=nil,&cmd)
+    end
+
 # :call-seq:
 #   context do ... end
 #

data/split/Tioga/lib/Images.rb

@@ -44,11 +44,19 @@ grayscale images is stored using one byte per sample.  The routine create_monoch
 a handy way to create such data from a table of values.
 
 Grayscale images can also be used as a "soft mask" for other images.  In this case, the grayscale samples
-are interpreted as relative opacities (a stencil mask, on the other hand, is "hard" in that each sample is either totally opaque or totally transparent).  To use such soft masking, create a dictionary for the grayscale
+are interpreted as relative opacities (a stencil mask, on the other hand, is "hard" in that each 
+sample is either totally opaque or totally transparent).  To use such soft masking, create a dictionary for the grayscale
 image and provide it as the 'opacity_mask' entry for the image be be masked.
 
 The 'color_space' entry is 'RGB' or 'rgb' for an image using the red-green-blue representation.  Samples
-are stored as three bytes, corresponding to red, green, and blue intensities.
+are stored as three bytes, corresponding to red, green, and blue intensities 
+(e.g., red intensity in range 0.0 to 1.0 is stored as round(red*255)).
+
+If the 'color_space' entry is 'HLS' or 'hls', then samples
+are stored as three bytes, corresponding to hue, lightness, and saturation 
+(the hue angle in the range 0.0 to 360.0 is stored as round(hue*256/360)).
+[Note: internally, the hls data is copied and converted to rgb -- see string_hls_to_rgb.]
+
 In 4-color printing, as in ink-jet printers, images are painted using cyan, magenta, yellow, and black inks.
 The corresponding 'color_space' is 'CMYK' or 'cmyk'.  For this case, samples are stored as four bytes,
 corresponding to cyan, magenta, yellow, and black intensitites.

data/split/Tioga/lib/Legends.rb

@@ -25,10 +25,14 @@ class Legends < Doc < FigureMaker
     end
 
 # :call-seq:
-#               show_legend                         
+#               show_legend(legend_background_function=nil)                        
 #                   
-# Shows the legend in the current frame.
-    def show_legend
+# Shows the legend in the current frame.  If given a function arguement,
+# it calls the function with bounds [left, right, top, bottom] for the
+# rectangle where the legend will be shown.  You can use this opportunity
+# to provide a background for the legend info and a frame around it too
+# if you'd like.
+    def show_legend(legend_background_function=nil)
     end
 
 =begin rdoc

data/split/Tioga/lib/Markers.rb

@@ -65,6 +65,13 @@ Dictionary Entries
     'stroke_width'      => a_float               # to be used for stroked markers
     'mode'                                       # alias for 'rendering_mode'
     'legend'            => a_dict or a_string    # for adding marker to legend
+    
+You can provide a list of markers as the value of the 'marker' entry in the dictionary.  In this
+case, the show_marker routine will go through the list of markers using one per point.  If there
+are more points than markers, it will cycle through the list of markers repeatedly.  Similarly,
+you can provide a list of colors for 'color', 'fill_color', or 'stroke_color', and a list of
+numbers for 'font', 'angle', 'scale', 'horizontal_scale', 'vertical_scale', 'italic_angle', 'ascent_angle',
+or 'stroke_width'.  
 
 
 Examples

data/split/Tioga/lib/TexPreamble.rb

@@ -170,38 +170,6 @@ module Tioga
 End_of_preamble
     COLOR_PREAMBLE = <<'End_of_preamble'
 % Color constants, generated from ColorConstants.rb
-\definecolor{CornflowerBlue}{rgb}{0.392,0.585,0.930}
-\definecolor{NavajoWhite}{rgb}{1.000,0.870,0.680}
-\definecolor{Fuchsia}{rgb}{1.000,0.000,1.000}
-\definecolor{Seashell}{rgb}{1.000,0.960,0.932}
-\definecolor{LightPlum}{rgb}{0.800,0.600,0.800}
-\definecolor{Lime}{rgb}{0.000,1.000,0.000}
-\definecolor{DarkOliveGreen}{rgb}{0.332,0.420,0.185}
-\definecolor{Periwinkle}{rgb}{0.600,0.000,1.000}
-\definecolor{IndianRed}{rgb}{0.804,0.360,0.360}
-\definecolor{Aqua}{rgb}{0.000,1.000,1.000}
-\definecolor{Thistle}{rgb}{0.848,0.750,0.848}
-\definecolor{MediumSpringGreen}{rgb}{0.000,0.980,0.604}
-\definecolor{DarkViolet}{rgb}{0.580,0.000,0.828}
-\definecolor{RoyalBlue}{rgb}{0.255,0.410,0.884}
-\definecolor{LightDullGreen}{rgb}{0.400,1.000,0.600}
-\definecolor{Brown}{rgb}{0.648,0.165,0.165}
-\definecolor{DarkChocolate}{rgb}{0.400,0.200,0.000}
-\definecolor{Orange}{rgb}{1.000,0.648,0.000}
-\definecolor{Goldenrod}{rgb}{0.855,0.648,0.125}
-\definecolor{SlateGray}{rgb}{0.440,0.500,0.565}
-\definecolor{LightSienna}{rgb}{0.800,0.400,0.000}
-\definecolor{DarkRed}{rgb}{0.545,0.000,0.000}
-\definecolor{Pumpkin}{rgb}{1.000,0.600,0.200}
-\definecolor{LavenderBlue}{rgb}{0.400,0.200,1.000}
-\definecolor{Bisque}{rgb}{1.000,0.894,0.770}
-\definecolor{Wheat}{rgb}{0.960,0.870,0.700}
-\definecolor{Mauve}{rgb}{0.800,0.200,0.400}
-\definecolor{MintCream}{rgb}{0.960,1.000,0.980}
-\definecolor{DodgerBlue}{rgb}{0.116,0.565,1.000}
-\definecolor{Salmon}{rgb}{0.980,0.500,0.448}
-\definecolor{LightGrey}{rgb}{0.828,0.828,0.828}
-\definecolor{Chartreuse}{rgb}{0.498,1.000,0.000}
 \definecolor{PaleTurquoise}{rgb}{0.688,0.932,0.932}
 \definecolor{GreenYellow}{rgb}{0.680,1.000,0.185}
 \definecolor{SpringGreen}{rgb}{0.000,1.000,0.498}
@@ -212,11 +180,11 @@ End_of_preamble
 \definecolor{LightBrightGreen}{rgb}{0.000,0.800,0.200}
 \definecolor{BlueViolet}{rgb}{0.540,0.170,0.888}
 \definecolor{MediumOrchid}{rgb}{0.730,0.332,0.828}
+\definecolor{Navy}{rgb}{0.000,0.000,0.500}
 \definecolor{Gainsboro}{rgb}{0.864,0.864,0.864}
 \definecolor{Sienna}{rgb}{0.628,0.320,0.176}
 \definecolor{LightRose}{rgb}{1.000,0.600,0.800}
 \definecolor{Cornsilk}{rgb}{1.000,0.972,0.864}
-\definecolor{Navy}{rgb}{0.000,0.000,0.500}
 \definecolor{Peru}{rgb}{0.804,0.520,0.248}
 \definecolor{Indigo}{rgb}{0.294,0.000,0.510}
 \definecolor{Aquamarine}{rgb}{0.498,1.000,0.830}
@@ -233,12 +201,12 @@ End_of_preamble
 \definecolor{LightSkyBlue}{rgb}{0.530,0.808,0.980}
 \definecolor{DarkCyan}{rgb}{0.000,0.545,0.545}
 \definecolor{OrangeRed}{rgb}{1.000,0.270,0.000}
+\definecolor{Purple}{rgb}{0.500,0.000,0.500}
 \definecolor{LavenderBlush}{rgb}{1.000,0.940,0.960}
 \definecolor{Black}{rgb}{0.000,0.000,0.000}
 \definecolor{White}{rgb}{1.000,1.000,1.000}
 \definecolor{MediumAquamarine}{rgb}{0.400,0.804,0.668}
 \definecolor{DarkRoyalBlue}{rgb}{0.000,0.200,0.800}
-\definecolor{Purple}{rgb}{0.500,0.000,0.500}
 \definecolor{SalmonRed}{rgb}{1.000,0.400,0.400}
 \definecolor{LightMustard}{rgb}{1.000,0.800,0.400}
 \definecolor{Chiffon}{rgb}{0.980,0.980,0.824}
@@ -254,17 +222,17 @@ End_of_preamble
 \definecolor{MediumPurple}{rgb}{0.576,0.440,0.860}
 \definecolor{DarkSlateGrey}{rgb}{0.185,0.310,0.310}
 \definecolor{RedOrange}{rgb}{0.800,0.200,0.000}
+\definecolor{Silver}{rgb}{0.752,0.752,0.752}
 \definecolor{LightSalmon}{rgb}{1.000,0.628,0.480}
 \definecolor{Crimson}{rgb}{0.800,0.000,0.200}
 \definecolor{OldLace}{rgb}{0.992,0.960,0.900}
 \definecolor{GhostWhite}{rgb}{0.972,0.972,1.000}
-\definecolor{Silver}{rgb}{0.752,0.752,0.752}
+\definecolor{Avocado}{rgb}{0.600,0.600,0.000}
 \definecolor{Turquoise}{rgb}{0.250,0.880,0.815}
 \definecolor{Linen}{rgb}{0.980,0.940,0.900}
 \definecolor{DarkOrchid}{rgb}{0.600,0.196,0.800}
 \definecolor{Pink}{rgb}{1.000,0.752,0.796}
 \definecolor{Ivory}{rgb}{1.000,1.000,0.940}
-\definecolor{Avocado}{rgb}{0.600,0.600,0.000}
 \definecolor{BurlyWood}{rgb}{0.870,0.720,0.530}
 \definecolor{MediumVioletRed}{rgb}{0.780,0.084,0.520}
 \definecolor{DeepSkyBlue}{rgb}{0.000,0.750,1.000}
@@ -275,48 +243,48 @@ End_of_preamble
 \definecolor{Orchid}{rgb}{0.855,0.440,0.840}
 \definecolor{Gray}{rgb}{0.500,0.500,0.500}
 \definecolor{Smoke}{rgb}{0.950,0.950,0.950}
+\definecolor{WhiteSmoke}{rgb}{0.970,0.970,0.970}
 \definecolor{MediumBlue}{rgb}{0.000,0.000,0.804}
 \definecolor{DarkSalmon}{rgb}{0.912,0.590,0.480}
 \definecolor{PurpleBlue}{rgb}{0.400,0.200,0.800}
 \definecolor{LawnGreen}{rgb}{0.488,0.990,0.000}
 \definecolor{BlanchedAlmond}{rgb}{1.000,0.920,0.804}
-\definecolor{WhiteSmoke}{rgb}{0.970,0.970,0.970}
 \definecolor{Chocolate}{rgb}{0.824,0.410,0.116}
-\definecolor{LightOliveGreen}{rgb}{0.600,0.800,0.600}
 \definecolor{Moccasin}{rgb}{1.000,0.894,0.710}
 \definecolor{FloralWhite}{rgb}{1.000,0.980,0.940}
 \definecolor{SandyBrown}{rgb}{0.956,0.644,0.376}
-\definecolor{LightYellowGreen}{rgb}{0.800,0.800,0.200}
-\definecolor{AliceBlue}{rgb}{0.940,0.972,1.000}
-\definecolor{Honeydew}{rgb}{0.940,1.000,0.940}
+\definecolor{LightOliveGreen}{rgb}{0.600,0.800,0.600}
 \definecolor{DarkLavender}{rgb}{0.400,0.200,0.600}
 \definecolor{PapayaWhip}{rgb}{1.000,0.936,0.835}
+\definecolor{Honeydew}{rgb}{0.940,1.000,0.940}
+\definecolor{AliceBlue}{rgb}{0.940,0.972,1.000}
 \definecolor{Tan}{rgb}{0.824,0.705,0.550}
-\definecolor{BrightBlue}{rgb}{0.000,0.400,1.000}
-\definecolor{LightCrimson}{rgb}{0.864,0.080,0.235}
-\definecolor{DarkSmoke}{rgb}{0.920,0.920,0.920}
+\definecolor{LightYellowGreen}{rgb}{0.800,0.800,0.200}
 \definecolor{MediumSeaGreen}{rgb}{0.235,0.700,0.444}
+\definecolor{DarkSmoke}{rgb}{0.920,0.920,0.920}
 \definecolor{Rose}{rgb}{1.000,0.400,0.600}
-\definecolor{Cyan}{rgb}{0.000,1.000,1.000}
-\definecolor{LightSandyBrown}{rgb}{1.000,0.800,0.600}
-\definecolor{Gold}{rgb}{1.000,0.844,0.000}
+\definecolor{LightCrimson}{rgb}{0.864,0.080,0.235}
+\definecolor{BrightBlue}{rgb}{0.000,0.400,1.000}
 \definecolor{Olive}{rgb}{0.500,0.500,0.000}
+\definecolor{Gold}{rgb}{1.000,0.844,0.000}
 \definecolor{SkyBlue}{rgb}{0.530,0.808,0.920}
+\definecolor{LightSandyBrown}{rgb}{1.000,0.800,0.600}
+\definecolor{Cyan}{rgb}{0.000,1.000,1.000}
 \definecolor{DarkPeriwinkle}{rgb}{0.400,0.400,1.000}
-\definecolor{Azure}{rgb}{0.940,1.000,1.000}
-\definecolor{Khaki}{rgb}{0.940,0.900,0.550}
-\definecolor{Magenta}{rgb}{1.000,0.000,1.000}
 \definecolor{Plum}{rgb}{0.868,0.628,0.868}
+\definecolor{Khaki}{rgb}{0.940,0.900,0.550}
+\definecolor{Azure}{rgb}{0.940,1.000,1.000}
 \definecolor{Violet}{rgb}{0.932,0.510,0.932}
-\definecolor{CadetBlue}{rgb}{0.372,0.620,0.628}
-\definecolor{LightGray}{rgb}{0.828,0.828,0.828}
+\definecolor{Magenta}{rgb}{1.000,0.000,1.000}
 \definecolor{DimGray}{rgb}{0.410,0.410,0.410}
-\definecolor{YellowGreen}{rgb}{0.800,0.800,0.000}
 \definecolor{LightChartreuse}{rgb}{0.800,1.000,0.400}
+\definecolor{LightGray}{rgb}{0.828,0.828,0.828}
+\definecolor{CadetBlue}{rgb}{0.372,0.620,0.628}
+\definecolor{YellowGreen}{rgb}{0.800,0.800,0.000}
 \definecolor{DarkGray}{rgb}{0.664,0.664,0.664}
 \definecolor{LightSlateGrey}{rgb}{0.468,0.532,0.600}
-\definecolor{GrayBlue}{rgb}{0.000,0.400,0.600}
 \definecolor{PaleGoldenrod}{rgb}{0.932,0.910,0.668}
+\definecolor{GrayBlue}{rgb}{0.000,0.400,0.600}
 \definecolor{Snow}{rgb}{1.000,0.980,0.980}
 \definecolor{DarkSeaGreen}{rgb}{0.560,0.736,0.560}
 \definecolor{Blue}{rgb}{0.000,0.000,1.000}
@@ -324,9 +292,9 @@ End_of_preamble
 \definecolor{MediumGreen}{rgb}{0.000,0.600,0.000}
 \definecolor{PurpleGray}{rgb}{0.600,0.600,0.800}
 \definecolor{Yellow}{rgb}{1.000,1.000,0.000}
-\definecolor{ForestGreen}{rgb}{0.132,0.545,0.132}
 \definecolor{Coral}{rgb}{1.000,0.498,0.312}
 \definecolor{LightOrchid}{rgb}{0.600,0.400,0.800}
+\definecolor{ForestGreen}{rgb}{0.132,0.545,0.132}
 \definecolor{MustardSeed}{rgb}{0.800,0.600,0.000}
 \definecolor{SeaGreen}{rgb}{0.180,0.545,0.340}
 \definecolor{DarkMagenta}{rgb}{0.545,0.000,0.545}
@@ -345,9 +313,9 @@ End_of_preamble
 \definecolor{LightSeaGreen}{rgb}{0.125,0.698,0.668}
 \definecolor{OliveDrab}{rgb}{0.420,0.556,0.136}
 \definecolor{SlateBlue}{rgb}{0.415,0.352,0.804}
-\definecolor{Lavender}{rgb}{0.900,0.900,0.980}
 \definecolor{DarkPurpleBlue}{rgb}{0.400,0.000,0.800}
 \definecolor{Beige}{rgb}{0.960,0.960,0.864}
+\definecolor{Lavender}{rgb}{0.900,0.900,0.980}
 \definecolor{Maroon}{rgb}{0.500,0.000,0.000}
 \definecolor{PowderBlue}{rgb}{0.690,0.880,0.900}
 \definecolor{WarmGray}{rgb}{0.678,0.660,0.562}
@@ -366,6 +334,38 @@ End_of_preamble
 \definecolor{BlueGreen}{rgb}{0.000,0.600,0.400}
 \definecolor{MediumOrange}{rgb}{1.000,0.400,0.000}
 \definecolor{Red}{rgb}{1.000,0.000,0.000}
+\definecolor{Fuchsia}{rgb}{1.000,0.000,1.000}
+\definecolor{CornflowerBlue}{rgb}{0.392,0.585,0.930}
+\definecolor{LightPlum}{rgb}{0.800,0.600,0.800}
+\definecolor{NavajoWhite}{rgb}{1.000,0.870,0.680}
+\definecolor{Seashell}{rgb}{1.000,0.960,0.932}
+\definecolor{Aqua}{rgb}{0.000,1.000,1.000}
+\definecolor{IndianRed}{rgb}{0.804,0.360,0.360}
+\definecolor{DarkOliveGreen}{rgb}{0.332,0.420,0.185}
+\definecolor{Lime}{rgb}{0.000,1.000,0.000}
+\definecolor{Periwinkle}{rgb}{0.600,0.000,1.000}
+\definecolor{Thistle}{rgb}{0.848,0.750,0.848}
+\definecolor{Brown}{rgb}{0.648,0.165,0.165}
+\definecolor{LightDullGreen}{rgb}{0.400,1.000,0.600}
+\definecolor{DarkViolet}{rgb}{0.580,0.000,0.828}
+\definecolor{MediumSpringGreen}{rgb}{0.000,0.980,0.604}
+\definecolor{RoyalBlue}{rgb}{0.255,0.410,0.884}
+\definecolor{LightSienna}{rgb}{0.800,0.400,0.000}
+\definecolor{Goldenrod}{rgb}{0.855,0.648,0.125}
+\definecolor{DarkChocolate}{rgb}{0.400,0.200,0.000}
+\definecolor{Orange}{rgb}{1.000,0.648,0.000}
+\definecolor{SlateGray}{rgb}{0.440,0.500,0.565}
+\definecolor{Bisque}{rgb}{1.000,0.894,0.770}
+\definecolor{LavenderBlue}{rgb}{0.400,0.200,1.000}
+\definecolor{DarkRed}{rgb}{0.545,0.000,0.000}
+\definecolor{Mauve}{rgb}{0.800,0.200,0.400}
+\definecolor{Pumpkin}{rgb}{1.000,0.600,0.200}
+\definecolor{Wheat}{rgb}{0.960,0.870,0.700}
+\definecolor{Chartreuse}{rgb}{0.498,1.000,0.000}
+\definecolor{LightGrey}{rgb}{0.828,0.828,0.828}
+\definecolor{DodgerBlue}{rgb}{0.116,0.565,1.000}
+\definecolor{MintCream}{rgb}{0.960,1.000,0.980}
+\definecolor{Salmon}{rgb}{0.980,0.500,0.448}
 
 End_of_preamble
   end

data/split/Tioga/lib/Utils.rb

@@ -43,6 +43,13 @@ module Tioga
       end
       return a
     end
+    module_function :tex_quote_text
+
+    class ::String
+      def quotex
+        Tioga::Utils.tex_quote_text(self)
+      end      
+    end
 
     # Dimension conversion constants taken straight from the TeXbook
     DIMENSION_CONVERSION = {

data/split/Tioga/lib/maker.rb

@@ -18,6 +18,7 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 =end
 
+require 'rubygems' rescue nil
 require 'Tioga/tioga.rb'
 require 'scanf'
 

data/split/Tioga/lib/tioga_ui_cmds.rb

@@ -326,10 +326,11 @@ class TiogaUI
     $figures_font = 'system 12'
 =end
     
-    tiogainit_name = ENV['HOME'] + '/.tiogainit'
-    if File.exist?(tiogainit_name)
-      load(tiogainit_name)
+    tiogainit_names = %w[ .tiogarc .tiogainit ].map do |f|
+      File.join(ENV['HOME'], f)
     end
+    tiogainit_name = tiogainit_names.find {|f| test ?e, f}
+    load(tiogainit_name) unless tiogainit_name.nil?
     
     @pdf_name = nil
     @have_loaded = false    
@@ -443,8 +444,8 @@ class TiogaUI
         return
       end
       make_portfolio(true, parse_figs($tioga_args[argnum]))
-    else # unrecognized command
-      show_help(filename,cmd)
+    #else # unrecognized command
+    #  show_help(filename,cmd)
     end
   rescue
   end

data/split/Tioga/namespace.h

@@ -21,27 +21,35 @@
 #ifndef _NAMESPACE_H
 #define _NAMESPACE_H
 
-/* This header file provides two OS-specific macros for the definition of
-   extern symbols:
+/* This header file provides three OS-specific macros for the definition of
+   extern (or NOT extern) symbols:
 
    * PUBLIC, which has to be used to mark objects that will be used
-   outside the module
+     outside the module
 
-   * PRIVATE, for symbols which are "extern" but intern to the module
+   * INTERN, for symbols which are shared among compilation units within a
+     module, but are NOT exported to other modules.
+
+   * PRIVATE, for symbols which are visible only within the containing
+     compilation unit (i.e. C source file) and, of course, are not exported to
+     other modules.
 
    Please don't add "extern" after the PRIVATE or PUBLIC declaration
    as this would break compilation on Darwin.
 */
 
-#ifdef __APPLE__
+#if __GNUC__ >= 4 /* we have the visibility attribute */
+# define INTERN __attribute__ ((visibility ("hidden")))
+# define PUBLIC __attribute__ ((visibility ("default"))) 
+# define INTERN_EXTERN extern
+#elif defined __APPLE__
 # define INTERN __private_extern__
 # define PUBLIC 
-#elif __GNUC__ >= 4 /* we have the visibility attribute */
-# define INTERN __attribute__ ((visibility ("hidden"))) 
-# define PUBLIC __attribute__ ((visibility ("default"))) 
+# define INTERN_EXTERN
 #else /* not really good */
 # define INTERN
 # define PUBLIC 
+# define INTERN_EXTERN
 #endif /* __APPLE__  and __GNU_C_ >= 4*/
 
 /* In any case, PRIVATE is static */

data/split/Tioga/pdfcolor.c

@@ -362,7 +362,8 @@ clr_value(double n1, double n2, double hue)  // from plplot plctrl.c
 }
 
 
-static void
+// this is also used for converting images
+void
 convert_hls_to_rgb(double h, double l, double s, double *p_r, double *p_g,
                    double *p_b)  // from plplot plctrl.c
 {
@@ -510,16 +511,31 @@ c_get_color_from_colormap(OBJ_PTR fmkr, FM *p, OBJ_PTR color_map, double x,
                           int *ierr)
 {  // x is from 0 to 1.  this returns a vector for the RGB color from
    // the given colormap
-   unsigned char *buff = (unsigned char *)(String_Ptr(color_map,ierr));
-   unsigned char r, g, b, i;
-   int len = String_Len(color_map,ierr);
+   OBJ_PTR cm_len_obj;
+   OBJ_PTR lookup_obj;
+   unsigned char *buff;
+   unsigned char r, g, b;
+   int i, cm_len, lu_len;
+
+   cm_len_obj = Array_Entry(color_map, 0, ierr);
+   if (*ierr != 0) RETURN_NIL;
+   cm_len = Number_to_int(cm_len_obj, ierr) + 1;
+   if (*ierr != 0) RETURN_NIL;
+   lookup_obj = Array_Entry(color_map, 1, ierr);
+   if (*ierr != 0) RETURN_NIL;
+   buff = (unsigned char *)(String_Ptr(lookup_obj,ierr));
    if (*ierr != 0) RETURN_NIL;
-   if (len % 3 != 0) {
-      RAISE_ERROR("Sorry: color_map length must be a multiple of 3 "
+   lu_len = String_Len(lookup_obj,ierr);
+   if (*ierr != 0) RETURN_NIL;
+
+   if (3*cm_len != lu_len) {
+      RAISE_ERROR("Sorry: lookup length must be 3 times colormap length "
                   "(for R G B components)", ierr);
       RETURN_NIL;
    }
-   i = 3 * ROUND(x * ((len/3)-1));
+   // Make sure x is non-negative
+   if (x < 0.0) x = -x;
+   i = 3 * (ROUND(x * (cm_len-1)) % cm_len);
    r = buff[i]; g = buff[i+1]; b = buff[i+2];
    OBJ_PTR result = Array_New(3);
    Array_Store(result, 0, Float_New(r/255.0), ierr);
@@ -785,3 +801,43 @@ c_yaxis_stroke_color_get(OBJ_PTR fmkr, FM *p, int *ierr)
    Array_Store(result, 2, Float_New(b), ierr);
    return result;
 }
+
+
+
+void
+str_hls_to_rgb_bang(unsigned char* str, long len)
+{
+   double r,g,b,h,l,s;  
+   long n, j; 
+   // convert HLS triples to RGB triples
+   n = len/3;
+   for (j=0; j<n; j++) {
+      // 360/256 = 1.40625
+      h = str[0]*1.40625; l = str[1]/255.0; s = str[2]/255.0;
+      convert_hls_to_rgb(h,l,s,&r,&g,&b);
+      *str++ = round(r*255.0); *str++ = round(g*255.0); *str++ = round(b*255.0); 
+   }
+}
+
+
+void
+c_string_hls_to_rgb_bang(OBJ_PTR fmkr, FM *p, unsigned char* str, long len, int *ierr)
+{ str_hls_to_rgb_bang(str,len); }
+
+void
+c_string_rgb_to_hls_bang(OBJ_PTR fmkr, FM *p, unsigned char* str, long len, int *ierr)
+{
+   double r,g,b,h,l,s;  
+   long n, j; 
+   // convert RGB triples to HLS triples
+   n = len/3;
+   for (j=0; j<n; j++) {
+      // 360/256 = 1.40625
+      r = str[0]/255.0; g = str[1]/255.0; b = str[2]/255.0;
+      convert_rgb_to_hls(r, g, b, &h, &l, &s);
+      *str++ = round(h/1.40625); *str++ = round(l*255.0); *str++ = round(s*255.0); 
+   }
+}
+
+
+