tioga 1.5 → 1.6

data/Tioga_README

@@ -1,4 +1,4 @@
-This is the README for the Tioga kernel, version 1.5, March 17, 2007.
+This is the README for the Tioga kernel, version 1.6, March 17, 2007.
 
     Copyright (C) 2005, 2006, 2007  Bill Paxton
     
@@ -20,35 +20,15 @@ This is the README for the Tioga kernel, version 1.5, March 17, 2007.
 
 << What's new >>
 
-	Version 1.5 is mainly Vincent's work, so my part of this release message
-will be short.  Remember how I killed off the Mac GUI last time?  Turns out there
-was one user who couldn't live without it -- me!  So it's back, but I'm still not
-making any promises about keeping it alive if Apple does something stupid in
-coming releases.  If you're interested in playing with it in spite of that warning,
-it's available from my website (http://theory.kitp.ucsb.edu/~paxton/Tioga-1.5.dmg).
+   Version 1.6 adds numeric label "frequency" and "phase" attributes for
+both axes.  Previously Tioga assumed that every major tick mark got a numeric
+label.  Now the i'th major tick on the axis gets a label only if
+mod(i+j,k)==0 where j is the phase and k is the frequency.  The default
+frequency is naturally 1 so that every major tick gets a label.
+The full names for these attributes are xaxis_numeric_label_frequency,
+xaxis_numeric_label_phase, and similar for yaxis.
 
-	Cheers, Bill
 
-	[Vincent] Version 1.5 has seen a not-so-s�mall change inthe structure of the 
-tutorial, which now has local links to images. So the images are now included in the
-tarball (though the -without-images don't have them, for those who have sparse 
-disk space or bandwidth). To get a local copy of the tutorial, just run rdoc 
-and then link doc/images to images using the following commands:
-
-cd doc; ln -s ../images .
-
-There are just a few new functions this time: 
-  * FigureMaker#create_figure_temp_files has been made part of the public 
-interface of tioga, it produces only the intermediate pdf and TeX files but 
-doesn't run pdflatex (used by ctioga)
-  * a Function#derivative method has been added, that does what you think it 
-does.
-
-The C code has been heavily tweaked to prevent segfaults on some 
-architectures/distributions, and some samples were added, notably one for 
-insets (I'll let you find it !).
-
-	Cheers, Vincent
   
 
 << Quick Installation of Tioga >>
@@ -196,6 +176,41 @@ Bill Paxton
 
 Here are the old release messages:
 
+
+--------------------------
+
+	Version 1.5 is mainly Vincent's work, so my part of this release message
+will be short.  Remember how I killed off the Mac GUI last time?  Turns out there
+was one user who couldn't live without it -- me!  So it's back, but I'm still not
+making any promises about keeping it alive if Apple does something stupid in
+coming releases.  If you're interested in playing with it in spite of that warning,
+it's available from my website (http://theory.kitp.ucsb.edu/~paxton/Tioga-1.5.dmg).
+
+	Cheers, Bill
+
+	[Vincent] Version 1.5 has seen a not-so-s�mall change inthe structure of the 
+tutorial, which now has local links to images. So the images are now included in the
+tarball (though the -without-images don't have them, for those who have sparse 
+disk space or bandwidth). To get a local copy of the tutorial, just run rdoc 
+and then link doc/images to images using the following commands:
+
+cd doc; ln -s ../images .
+
+There are just a few new functions this time: 
+  * FigureMaker#create_figure_temp_files has been made part of the public 
+interface of tioga, it produces only the intermediate pdf and TeX files but 
+doesn't run pdflatex (used by ctioga)
+  * a Function#derivative method has been added, that does what you think it 
+does.
+
+The C code has been heavily tweaked to prevent segfaults on some 
+architectures/distributions, and some samples were added, notably one for 
+insets (I'll let you find it !).
+
+	Cheers, Vincent
+
+--------------------------
+
 	Version 1.4 is a major overhaul with particular emphasis on the tioga user interface.
 Please take a moment to go through the new section of the tutorial titled, CommandLine.
 It gives a detailed discussion of the new tioga command line interface that replaces
@@ -226,7 +241,8 @@ Additionnally, some more classical functionalities have been added:
   the markers, see the plot samples/figures/figures.rb: Arrows_second_take
   * a function Dvector.write has been added that does exactly the
   reverse of Dvector.(fancy_)read.
-	
+
+--------------------------	
 
 	  Version 1.3.1 is as usual a bug-fix release, although bugs
 were not that obvious this time. Among other things,
@@ -255,6 +271,8 @@ uses that as its default;  the previous algorithm, CONREC, is still available as
 However, the new one seems superior -- especially if you'd like to be able to fill the contour
 rather than simply stroke it.  In addition, you can optionally provide it with a "mask" of flags
 indicating which entries in the table are valid for use in forming the contours.  Neat stuff.
+
+--------------------------
 	
 		Version 1.3.0 will automatically remove the tex temporary files it creates
 (unless the autocleanup attribute is set false).  Commands that used to have
@@ -312,10 +330,12 @@ about the change in my model of what Tioga is really doing:
 
 	--Bill
 
-	
+--------------------------
 
 	Version 1.2.1 is as usual a bug-fix release fixing some installation problems...
 
+--------------------------
+
 	Version 1.2.0 brings in a lot of new features. First and most important, we came up with a
 proper design for a real-size scheme. Now, you can use the page_setup function to ask Tioga to
 produce a preview PDF of the exact size requested, so that you can include the PDF directly in
@@ -323,19 +343,29 @@ your documents (not only LaTeX, then). A whole bunch of debugging tools have bee
 now set tracing tools with the (enter|exit)_(show_plot|subplot|subfigure) functions. As usual,
 there is a whole bunch of small improvements and new functions to Dvector and Function.
 
+--------------------------
+
 	Version 1.1.7 fixes a nasty runtime bug on MacOS X.
 
+--------------------------
+
 	Version 1.1.6 provides marshalling for Dtable and Dvector. You can now use Marshal.dump and
 Marshal.load with Dvectors. Dvectors and Function now have a bounds function, which return both the
 minima and the maxima. Ruby is no longer complaining about Tioga when used with the -w switch.
 
+--------------------------
+
 	Version 1.1.5 is a bug-fix release - updated to the latest mkmf2.rb to make sure all
 necessary files are generated during make.
 
+--------------------------
+
 	Version 1.1.4 is a bug-fix release - a nasty symbol clash was preventing Tioga from running
 on MacOS X.3. This should now be fixed. Moreover, the load time should improve a little bit on few 
 architectures.
 
+--------------------------
+
 	Version 1.1.3 provides a better integration of output within LaTeX
 documents. A tioga.sty file is now available, with many macros for figure
 inclusion and color names like the ones provided by Tioga.
@@ -353,6 +383,8 @@ X,Y data. Not many features for now, but there's room for plenty more work.
 		convert_inches_to_output, convert_output_to_inches,
 		convert_mm_to_output, convert_output_to_mm
 
+--------------------------
+
 	Version 1.1.2 provides more complete control over page layout and font
 selection.  Here's a list of new features:
 
@@ -380,6 +412,8 @@ selection.  Here's a list of new features:
 			tex_preview_fontseries
 			tex_preview_fontshape
 
+--------------------------
+
 	Version 1.1.1 is the first Tioga to be called a "beta" release.  You can
 interpret that anyway you'd like, but to me it means Tioga has been around long
 enough and had enough use to justify inviting more folks to give it a try.
@@ -387,21 +421,27 @@ The "alpha" label is a warning to "proceed at your own risk", and only brave
 souls go ahead when they see that.  I think Tioga has gotten stable enough
 that we can drop the "threat level" down a notch.  (Fingers crossed of course!)
 
+--------------------------
 
 	Version 1.1.0 splits off the Dvector & Dtable modules from the FigureMaker so
 that they can be used in other packages (Vincent Fourmond both suggested this and
 did the work to make it happen).
 
+--------------------------
 
     Version 1.0.M no longer raises error for calls on 'stroke', 'fill', and such with an empty path.
 It has also been reconfigured to support the new Mac GUI which now works with both PowerPC and Intel
 processors.
 
+--------------------------
+
     Version 1.0.L adds 'transparency' as a synonym for (1.0 - opacity).  So
 now you can set 'fill_transparency' to 0.3 instead of setting 'fill_opacity'
 to 0.7.  I'm sure that makes your day.  The documentation has also been
 updated of course.
 
+--------------------------
+
     Version 1.0.K was Vincent Fourmond's fault!  The same day that J was released,
 he sent me an email pointing out an oversight in the legend functionality.
 Not only that, he sent along an implementation to fix the problem!  What could I do?

data/split/Dtable/defs.h

@@ -31,3 +31,9 @@
 #define isnan(x) ((x) != (x))
 /* yes, as funny as it may look  NaN != NaN, and that's the only one */
 #endif
+
+/* Fix old versions of ruby.h */
+#ifndef RSTRING_PTR
+# define RSTRING_PTR(x) (RSTRING(x)->ptr)
+# define RSTRING_LEN(x) (RSTRING(x)->len)
+#endif

data/split/Dtable/dtable.c

@@ -1531,9 +1531,10 @@ PRIVATE
 /*======================================================================*/ VALUE Read_Dtable(VALUE dest, char *filename, int skip_lines) {
    FILE *file = NULL;
    long num_cols, num_rows;
-   int i, j, k;
+   int i, j, k, len;
    const int buff_len = 10000;
-   char c, buff[buff_len], *p, *pend;
+   const int err_len = 100;
+   char c, buff[buff_len], *p, *pend, err_str[err_len];
    double *data, **ptr = Dtable_Ptr(dest, &num_cols, &num_rows);
    if ((file=fopen(filename,"r")) == NULL)
       rb_raise(rb_eArgError, "failed to open %s", filename);
@@ -1571,9 +1572,12 @@ PRIVATE
          }
          if (!is_okay_number(data[j])) {
             fclose(file);
+            len = (pend-buff < err_len-1)? pend-buff : err_len-1;
+            printf("len %i\n", len);
+            strncpy(err_str,buff,len);
             rb_raise(rb_eArgError,
-               "reached end of file before reading requested amount of data in %s (asked for %i xs and %i ys; found only %i and %i)",
-               filename, num_cols, num_rows, i+1, j);
+               "failed to read requested amount of data in %s (asked for %i xs and %i ys; found only %i and %i). last attempt to read got %g from string starting with: %s",
+               filename, num_cols, num_rows, i+1, j, data[j], err_str);
          }
       }
    }
@@ -1664,9 +1668,10 @@ VALUE dtable_dump(VALUE ary, VALUE limit)
     + 8 /* 2 * length */
     + cols * rows * 8 ;
   unsigned u_len;
-  VALUE str = rb_str_buf_new(target_len);
+  VALUE str = rb_str_new2("");
+  rb_str_resize(str,target_len); /* This seems to do the trick */
   /* \begin{playing with ruby's internals} */
-  unsigned char * ptr = (unsigned char *) RSTRING(str)->ptr;
+  unsigned char * ptr = (unsigned char *) RSTRING_PTR(str);
   /* signature byte */
   (*ptr++) = DTABLE_DUMP_VERSION;
   u_len = (unsigned) rows; /* limits to 4 billions rows */
@@ -1682,7 +1687,7 @@ VALUE dtable_dump(VALUE ary, VALUE limit)
 	  ptr += 8;
 	}
     }
-  RSTRING(str)->len = target_len;
+  /*  RSTRING_LEN(str) = target_len;*/
   return str;
   /* \end{playing with ruby's internals} */
 }
@@ -1697,7 +1702,7 @@ VALUE dtable_load(VALUE klass, VALUE str)
   VALUE ret = Qnil;
   VALUE s = StringValue(str);
   unsigned char * buf = (unsigned char *) StringValuePtr(s);
-  unsigned char * dest = buf + RSTRING(s)->len;
+  unsigned char * dest = buf + RSTRING_LEN(s);
   unsigned i; /* for GET_UNSIGNED */
   unsigned tmp = 0;
   long rows, cols;

data/split/Dvector/defs.h

@@ -31,3 +31,9 @@
 #define isnan(x) ((x) != (x))
 /* yes, as funny as it may look  NaN != NaN, and that's the only one */
 #endif
+
+/* Fix old versions of ruby.h */
+#ifndef RSTRING_PTR
+# define RSTRING_PTR(x) (RSTRING(x)->ptr)
+# define RSTRING_LEN(x) (RSTRING(x)->len)
+#endif

data/split/Dvector/dvector.c

@@ -78,6 +78,17 @@ static void dvector_free(Dvector *d);
 
 PRIVATE bool Is_Dvector(VALUE obj) { return is_a_dvector(obj); }
 
+PRIVATE 
+/* Checks if the given object is a Dvector. Mainly here for testing
+   purposes, as it corresponds to the internal +is_a_dvector+.
+*/
+VALUE dvector_is_a_dvector(VALUE self, VALUE obj)
+{
+  if(Is_Dvector(obj))
+    return Qtrue;
+  return Qfalse;
+}
+
 static inline void dvector_mem_clear(double *mem, int size) {
    while (size--) {
       *mem++ = 0.0;
@@ -662,7 +673,8 @@ PRIVATE
  *     a.first   -> 1
  *     a.first(1)   -> Dvector[ 1 ]
  *     a.first(3)   -> Dvector[ 1, 2, 3 ]
- */ VALUE dvector_first(int argc, VALUE *argv, VALUE ary) {
+ */ 
+VALUE dvector_first(int argc, VALUE *argv, VALUE ary) {
    VALUE nv, result;
    long n, i;
    Dvector *d = Get_Dvector(ary);
@@ -1414,7 +1426,7 @@ PRIVATE VALUE dvector_join(VALUE ary, VALUE sep) {
    len += d->len * 10;
    if (!NIL_P(sep)) {
       StringValue(sep);
-      len += RSTRING(sep)->len * (d->len - 1);
+      len += RSTRING_LEN(sep) * (d->len - 1); /* So it works for ruby 1.9 */
    }
    result = rb_str_buf_new(len);
    for (i=0; i < d->len; i++) {
@@ -1437,7 +1449,8 @@ PRIVATE
  *     
  *     Dvector[ 1, 2, 3 ].join        -> "1 2 3"
  *     Dvector[ 1, 2, 3 ].join("-")   -> "1-2-3"
- */ VALUE dvector_join_m(int argc, VALUE *argv, VALUE ary) {
+ */ 
+VALUE dvector_join_m(int argc, VALUE *argv, VALUE ary) {
    VALUE sep;
    rb_scan_args(argc, argv, "01", &sep);
    if (NIL_P(sep)) sep = dvector_output_fs;
@@ -4405,7 +4418,7 @@ VALUE Read_Dvectors(char *filename, VALUE destinations, int first_row_of_file, i
          
          if (!is_okay_number(v)) {
             fclose(file);
-            rb_raise(rb_eArgError, "ERROR: read found non-numeric value in line %i of %s -- %s", i, filename, num_str);
+            rb_raise(rb_eArgError, "ERROR: bad value %g in line %i of %s -- %s", v, i, filename, num_str);
          }
          if (row >= d->capa) 
             Dvector_Store_Double(col_obj, row, v);
@@ -4516,7 +4529,7 @@ VALUE Read_Rows_of_Dvectors(char *filename, VALUE destinations, int first_row_of
 
          if (!is_okay_number(v)) {
             fclose(file);
-            rb_raise(rb_eArgError, "ERROR: non-finite value in file %s", filename);
+            rb_raise(rb_eArgError, "ERROR: bad value %g in line i% of file %s", v, i, filename);
          }
          if (col < d->capa) { row_data[col] = v; d->len = col+1; }
          else {
@@ -4609,7 +4622,7 @@ VALUE Read_Row(char *filename, int row, VALUE row_ary) {
 
       if (!is_okay_number(v)) {
          fclose(file);
-         rb_raise(rb_eArgError, "ERROR: non-finite value in file %s", filename);
+         rb_raise(rb_eArgError, "ERROR: bad value %g in line %i of file %s", v, i, filename);
       }
       Dvector_Store_Double(row_ary, col, v);
    }
@@ -4991,11 +5004,13 @@ VALUE dvector_dump(VALUE ary, VALUE limit)
     + len * 8 ;
   unsigned u_len = (unsigned) len; /* this is bad, I know, but it
 				      won't hurt before it is common
-				      that computers have 64 GB of RAM...
+				      that computers have 32 GB of RAM...
 				   */
-  VALUE str = rb_str_buf_new(target_len);
+
+  VALUE str = rb_str_new2("");
+  rb_str_resize(str,target_len); /* This seems to do the trick */
   /* \begin{playing with ruby's internals} */
-  unsigned char * ptr = (unsigned char *) RSTRING(str)->ptr;
+  unsigned char * ptr = (unsigned char *) RSTRING_PTR(str);
   /* signature byte */
   (*ptr++) = DVECTOR_DUMP_VERSION;
   STORE_UNSIGNED(u_len, ptr); /* destroys u_len */
@@ -5004,7 +5019,7 @@ VALUE dvector_dump(VALUE ary, VALUE limit)
       store_double(*(data++), ptr);
       ptr += 8;
     }
-  RSTRING(str)->len = target_len;
+  /*   RSTRING_LEN(str) = target_len; */
   return str;
   /* \end{playing with ruby's internals} */
 }
@@ -5019,7 +5034,7 @@ VALUE dvector_load(VALUE klass, VALUE str)
   VALUE ret = Qnil;
   VALUE s = StringValue(str);
   unsigned char * buf = (unsigned char *) StringValuePtr(s);
-  unsigned char * dest = buf + RSTRING(s)->len;
+  unsigned char * dest = buf + RSTRING_LEN(s);
   unsigned i; /* for GET_UNSIGNED */
   unsigned tmp = 0;
   double * data;
@@ -5217,6 +5232,9 @@ void Init_Dvector() {
    rb_define_singleton_method(cDvector, "linear_interpolate", dvector_linear_interpolate, -1);
    rb_define_singleton_method(cDvector, "min_of_many", dvector_min_of_many, 1);
    rb_define_singleton_method(cDvector, "max_of_many", dvector_max_of_many, 1);
+
+   rb_define_singleton_method(cDvector, "is_a_dvector", dvector_is_a_dvector, 1);
+
    
    rb_define_method(cDvector, "make_bezier_control_points_for_cubic_in_x", dvector_make_bezier_control_points_for_cubic_in_x, 6);
    

data/split/Flate/defs.h

@@ -31,3 +31,9 @@
 #define isnan(x) ((x) != (x))
 /* yes, as funny as it may look  NaN != NaN, and that's the only one */
 #endif
+
+/* Fix old versions of ruby.h */
+#ifndef RSTRING_PTR
+# define RSTRING_PTR(x) (RSTRING(x)->ptr)
+# define RSTRING_LEN(x) (RSTRING(x)->len)
+#endif

data/split/Flate/flate.c

@@ -5,6 +5,8 @@
 #include "../symbols.c"
 #include "zlib.h"
 #include "flate_intern.h"
+
+#include <defs.h>
 /*
    Copyright (C) 2005  Bill Paxton
 
@@ -65,8 +67,8 @@ PRIVATE
  */
 VALUE do_compress(VALUE klass, VALUE str) {
    str = rb_String(str);
-   unsigned char *ptr = (unsigned char *)RSTRING(str)->ptr;
-   long len = RSTRING(str)->len;
+   unsigned char *ptr = (unsigned char *)RSTRING_PTR(str);
+   long len = RSTRING_LEN(str);
    unsigned long new_len = (len * 11) / 10 + 100;
    unsigned char *new_ptr = ALLOC_N(unsigned char, new_len);
    if (flate_compress(new_ptr, &new_len, ptr, len) != Z_OK) {
@@ -94,8 +96,8 @@ PRIVATE
  
 VALUE do_expand(VALUE klass, VALUE str) {
    str = rb_String(str);
-   unsigned char *ptr = (unsigned char *)RSTRING(str)->ptr;
-   long len = RSTRING(str)->len;
+   unsigned char *ptr = (unsigned char *)RSTRING_PTR(str);
+   long len = RSTRING_LEN(str);
    unsigned long new_len = len * 4 + 100;
    unsigned char *new_ptr = ALLOC_N(unsigned char, new_len);
    if (flate_expand(&new_ptr, &new_len, ptr, len) != Z_OK) {

data/split/Function/defs.h

@@ -31,3 +31,9 @@
 #define isnan(x) ((x) != (x))
 /* yes, as funny as it may look  NaN != NaN, and that's the only one */
 #endif
+
+/* Fix old versions of ruby.h */
+#ifndef RSTRING_PTR
+# define RSTRING_PTR(x) (RSTRING(x)->ptr)
+# define RSTRING_LEN(x) (RSTRING(x)->len)
+#endif

data/split/Function/function.c

@@ -157,6 +157,8 @@ static VALUE function_initialize(VALUE self, VALUE x, VALUE y)
 	set_x_vector(self, x);
 	set_y_vector(self, y);
 	/* fine, this could have been written in pure Ruby...*/
+	set_spline_vector(self,Qnil);
+	/* We initialize the @spline_cache var */
       }
       else
 	rb_raise(rb_eArgError,"both vectors must have the same size");
@@ -638,7 +640,7 @@ static VALUE function_strip_nan(VALUE self)
 }
 
 /*
-  Splits the function into monotonic sub-functions.
+  Splits the function into strictly monotonic sub-functions.
   Returns the array of the subfunctions. The returned values are
   necessarily new values.
 */
@@ -678,7 +680,7 @@ static VALUE function_split_monotonic(VALUE self)
 
   for(i = 2; i < size; i++) 
     {
-      if(direction * (x[i] - last_x) < 0) 
+      if(direction * (x[i] - last_x) <= 0) 
 	{
 	  /* we need to add a new set of Dvectors */
 	  f = Function_Create(cur_x, cur_y);

data/split/Tioga/axes.c

@@ -46,6 +46,8 @@ typedef struct {
    double numeric_label_angle;
    int numeric_label_alignment;
    int numeric_label_justification;
+   int numeric_label_frequency;
+   int numeric_label_phase;
    int numeric_label_decimal_digits; // set to 0 to use default
    double *majors; /* if not NULL, then points to array of places where major ticks should appear (in figure coords) */
    int nmajors; /* if majors != NULL, then this tells how many entries it contains */
@@ -125,6 +127,8 @@ static void Get_xaxis_Specs(FM *p, PlotAxis *s)
    s->numeric_label_angle = p->xaxis_numeric_label_angle;
    s->numeric_label_alignment = p->xaxis_numeric_label_alignment;
    s->numeric_label_justification = p->xaxis_numeric_label_justification;
+   s->numeric_label_frequency = p->xaxis_numeric_label_frequency;
+   s->numeric_label_phase = p->xaxis_numeric_label_phase;
 }
 
 static void Get_yaxis_Specs(FM *p, PlotAxis *s)
@@ -154,6 +158,8 @@ static void Get_yaxis_Specs(FM *p, PlotAxis *s)
    s->numeric_label_angle = p->yaxis_numeric_label_angle;
    s->numeric_label_alignment = p->yaxis_numeric_label_alignment;
    s->numeric_label_justification = p->yaxis_numeric_label_justification;
+   s->numeric_label_frequency = p->yaxis_numeric_label_frequency;
+   s->numeric_label_phase = p->yaxis_numeric_label_phase;
 }
 
 /*======================================================================*/
@@ -381,18 +387,24 @@ static char **Get_Labels(FM *p, PlotAxis *s)
 {
    char **labels = (char **)ALLOC_N(char *, s->nmajors);
    char postfix[50], *ps;
-   int i;
+   int i, k, j;
+   k = s->numeric_label_frequency;
+   j = s->numeric_label_phase;
    if (s->tick_labels==Qnil) { // create label strings
       int mode, prec, scale;
       Pick_Label_Precision(s->axis_min, s->axis_max, s->interval, s->use_fixed_pt, &mode, &prec, s->digits_max, &scale);
-      int i, upper_right = (s->reversed)? 0 : s->nmajors-1, lower_left = (s->reversed)? s->nmajors-1 : 0;
+      int i;
+      int upper_right = (s->reversed)? 0 : s->nmajors-1;
+      int lower_left = (s->reversed)? s->nmajors-1 : 0;
       for (i = 0; i < s->nmajors; i++) {
          ps = NULL;
          if (i == upper_right && !s->log_values && mode && scale)
             sprintf(ps = postfix, 
                 (s->vertical)? "$\\times$\\tiogayaxisnumericlabel{10^{%d}}" : "$\\times$\\tiogaxaxisnumericlabel{10^{%d}}", 
                 scale);
-         if (i == lower_left && s->nmajors >= 2 && s->vertical && 
+         if ((i+j) % k != 0) {
+            labels[i] = NULL;
+         } else if (i == lower_left && s->nmajors >= 2 && s->vertical && 
                 (s->majors[i] == ((s->reversed)? s->axis_max : s->axis_min)) &&
                 (s->other_axis_type == AXIS_WITH_MAJOR_TICKS_AND_NUMERIC_LABELS ||
                  s->other_axis_type == AXIS_WITH_TICKS_AND_NUMERIC_LABELS)) {

data/split/Tioga/defs.h

@@ -31,3 +31,9 @@
 #define isnan(x) ((x) != (x))
 /* yes, as funny as it may look  NaN != NaN, and that's the only one */
 #endif
+
+/* Fix old versions of ruby.h */
+#ifndef RSTRING_PTR
+# define RSTRING_PTR(x) (RSTRING(x)->ptr)
+# define RSTRING_LEN(x) (RSTRING(x)->len)
+#endif

data/split/Tioga/figures.c

@@ -202,6 +202,8 @@ FM *Get_FM(VALUE fmkr) {
    DBL_ATTR(xaxis_numeric_label_angle)
    INT_ATTR(xaxis_numeric_label_alignment)
    INT_ATTR(xaxis_numeric_label_justification)
+   INT_ATTR(xaxis_numeric_label_frequency)
+   INT_ATTR(xaxis_numeric_label_phase)
    INT_ATTR(top_edge_type)
    RO_BOOL_ATTR(top_edge_visible)
    INT_ATTR(bottom_edge_type)
@@ -234,6 +236,8 @@ FM *Get_FM(VALUE fmkr) {
    DBL_ATTR(yaxis_numeric_label_angle)
    INT_ATTR(yaxis_numeric_label_alignment)
    INT_ATTR(yaxis_numeric_label_justification)
+   INT_ATTR(yaxis_numeric_label_frequency)
+   INT_ATTR(yaxis_numeric_label_phase)
    INT_ATTR(left_edge_type)
    RO_BOOL_ATTR(left_edge_visible)
    INT_ATTR(right_edge_type)
@@ -575,6 +579,8 @@ void Init_FigureMaker(void) {
    attr_accessors(xaxis_numeric_label_angle)
    attr_accessors(xaxis_numeric_label_alignment)
    attr_accessors(xaxis_numeric_label_justification)
+   attr_accessors(xaxis_numeric_label_frequency)
+   attr_accessors(xaxis_numeric_label_phase)
    attr_accessors(top_edge_type)
    attr_reader(top_edge_visible)
    attr_accessors(bottom_edge_type)
@@ -607,6 +613,8 @@ void Init_FigureMaker(void) {
    attr_accessors(yaxis_numeric_label_angle)
    attr_accessors(yaxis_numeric_label_alignment)
    attr_accessors(yaxis_numeric_label_justification)
+   attr_accessors(yaxis_numeric_label_frequency)
+   attr_accessors(yaxis_numeric_label_phase)
    attr_accessors(left_edge_type)
    attr_reader(left_edge_visible)
    attr_accessors(right_edge_type)

data/split/Tioga/figures.h

@@ -32,6 +32,8 @@
 #include "ruby.h"
 #include "intern.h"
 
+#include <defs.h>
+
 // Axes
 
 #define NO_TICKS 0
@@ -231,6 +233,8 @@ typedef struct {
     double xaxis_numeric_label_angle;
     int xaxis_numeric_label_alignment;
     int xaxis_numeric_label_justification;
+    int xaxis_numeric_label_frequency;
+    int xaxis_numeric_label_phase;
     // note that the top and bottom edges and drawn in addition to the x axis.
     // if the edge type specifies ticks, the ticks match those of the x axis.
     bool top_edge_visible;
@@ -268,6 +272,8 @@ typedef struct {
     double yaxis_numeric_label_angle;
     int yaxis_numeric_label_alignment;
     int yaxis_numeric_label_justification;
+    int yaxis_numeric_label_frequency;
+    int yaxis_numeric_label_phase;
     // note that the left and right edges and drawn in addition to the y axis.
     // if the edge type specifies ticks, the ticks match those of the y axis.
     int left_edge_type;

data/split/Tioga/init.c

@@ -228,6 +228,8 @@ void Initialize_Figure(VALUE fmkr) {
    p->xaxis_numeric_label_angle = 0.0;
    p->xaxis_numeric_label_alignment = ALIGNED_AT_MIDHEIGHT;
    p->xaxis_numeric_label_justification = CENTERED;
+   p->xaxis_numeric_label_frequency = 1;
+   p->xaxis_numeric_label_phase = 0;
    p->top_edge_type = EDGE_WITH_TICKS;
    p->top_edge_visible = true;
    p->bottom_edge_type = EDGE_WITH_TICKS;
@@ -263,6 +265,8 @@ void Initialize_Figure(VALUE fmkr) {
    p->yaxis_numeric_label_angle = 0.0;
    p->yaxis_numeric_label_alignment = ALIGNED_AT_MIDHEIGHT;
    p->yaxis_numeric_label_justification = CENTERED;
+   p->yaxis_numeric_label_frequency = 1;
+   p->yaxis_numeric_label_phase = 0;
    p->left_edge_type = EDGE_WITH_TICKS;
    p->left_edge_visible = true;
    p->right_edge_type = EDGE_WITH_TICKS;

data/split/Tioga/lib/FigMkr.rb

@@ -33,7 +33,7 @@ class FigureMaker
     
 
     # The tag used for cvs export 
-    CVS_TAG = "rel_1_5"         # now manually cheating...
+    CVS_TAG = "rel_1_6"         # now manually cheating...
     
     # Version now uses the CVS_TAG to create the version number. CVS_TAG should
     # look like 'rel_1_1_0' for the 1.1.0 release. 
@@ -43,10 +43,11 @@ class FigureMaker
       if version.length > 0
         return version
       else
-        return "SNV $Revision: 348 $"    # Can't do better than that.
+        return "SVN $Revision: 385 $"    # Can't do better than that.
       end
     end
 
+
     def FigureMaker.default
         @@default_figure_maker = FigureMaker.new if @@default_figure_maker == nil
         @@default_figure_maker
@@ -335,7 +336,6 @@ class FigureMaker
     def figure_pdf(name)
         if name.kind_of?(Integer)
             num = name
-            name = @figure_names[num]
         else
             num = @figure_names.index(name)
         end

data/split/Tioga/lib/TeX_Text.rb

@@ -434,8 +434,12 @@ link:images/Framebox.png
 #               tex_xaxis_numeric_label = a_string
 #
 # The string for a numeric label is put in this TeX command string to be formatted.
-# For example, `$#1$' will give the numbers in math mode, while `$\mathsf{#1}$' will 
-# show the label using the math sans-serif font.   Alias for xaxis_numeric_label_tex.
+# For example,
+#   $#1$
+# will give the numbers in math mode, while
+#   $\mathsf{#1}$
+# will  show the label using the math sans-serif font.
+# Alias for xaxis_numeric_label_tex.
    def tex_xaxis_numeric_label
    end
 
@@ -444,8 +448,12 @@ link:images/Framebox.png
 #               tex_yaxis_numeric_label = a_string
 #
 # The string for a numeric label is put in this TeX command string to be formatted.
-# For example, `$#1$' will give the numbers in math mode, while `$\mathsf{#1}$' will 
-# show the label using the math sans-serif font.   Alias for yaxis_numeric_label_tex.
+# For example, 
+#   $#1$
+# will give the numbers in math mode, while 
+#   $\mathsf{#1}$
+# will show the label using the math sans-serif font.
+# Alias for yaxis_numeric_label_tex.
    def tex_yaxis_numeric_label
    end
 

data/split/Tioga/lib/X_and_Y_Axes.rb

@@ -468,6 +468,63 @@ class X_and_Y_Axes < Doc < FigureMaker
    def xaxis_numeric_label_justification
    end
 
+
+
+
+# :call-seq:
+#               xaxis_numeric_label_frequency
+#               xaxis_numeric_label_frequency = an_integer
+#
+# The #frequency setting for numeric labels on the x axis.
+# Major ticks are numbered from 0 at the small x end of the axis.  Tick number k gets a
+# label only if mod(i+j,k)==0 where j=xaxis_numeric_label_phase
+# and k=xaxis_numeric_label_frequency.
+# The default for xaxis_numeric_label_frequency is 1 so that
+# every major tick gets a label.
+# See also xaxis_numeric_label_phase.
+   def xaxis_numeric_label_frequency
+   end
+
+# :call-seq:
+#               xaxis_numeric_label_phase
+#               xaxis_numeric_label_phase = an_integer
+#
+# The #phase setting for numeric labels on the x axis.
+# The default phase is 0.
+# See xaxis_numeric_label_frequency for details.
+   def xaxis_numeric_label_phase
+   end
+
+
+
+
+# :call-seq:
+#               yaxis_numeric_label_frequency
+#               yaxis_numeric_label_frequency = an_integer
+#
+# The #frequency setting for numeric labels on the y axis.
+# Major ticks are numbered from 0 at the small y end of the axis.  Tick number k gets a
+# label only if mod(i+j,k)==0 where j=yaxis_numeric_label_phase
+# and k=yaxis_numeric_label_frequency.
+# The default for yaxis_numeric_label_frequency is 1 so that
+# every major tick gets a label.
+# See also yaxis_numeric_label_phase.
+   def yaxis_numeric_label_frequency
+   end
+
+# :call-seq:
+#               yaxis_numeric_label_phase
+#               yaxis_numeric_label_phase = an_integer
+#
+# The #phase setting for numeric labels on the y axis.
+# The default phase is 0.
+# See yaxis_numeric_label_frequency for details.
+   def yaxis_numeric_label_phase
+   end
+
+
+
+
 # :call-seq:
 #               yaxis_visible
 #               yaxis_visible = false
@@ -737,8 +794,8 @@ link:images/Special_Y.png
    end
 
 # :call-seq:
-#               yaxis_tick_interval
-#               yaxis_tick_interval = a_float
+#               xaxis_tick_interval
+#               xaxis_tick_interval = a_float
 #
 # If 0, then tioga will pick the interval between major tick marks on the x axis.
 # Otherwise, this will be used as the interval in x coordinates for the spacing between major ticks.

data/split/Tioga/lib/maker.rb

@@ -113,8 +113,8 @@ def command_loop
                 if fname == nil
                     puts "must give file name as argument for make_portfolio command"
                 else
-                    fm.require_all
-                    fm.make_portfolio_pdf(fname)
+                    result = fm.make_portfolio(fname,nil,true)
+                    puts result
                     puts "####00" # GUI uses this
                 end
             end
@@ -142,8 +142,8 @@ def command_loop
             if !have_loaded
                 puts "must load a file before make_all"
             else
-                puts "make_all"
-                fm.num_figures.times {|i| fm.make_preview_pdf(i) }
+                fm.require_all(nil, true)
+                #fm.num_figures.times {|i| fm.make_preview_pdf(i) }
             end
             puts "####00" # GUI uses this
         elsif cmd == "name"

data/split/Tioga/pdfcolor.c

@@ -233,7 +233,7 @@ VALUE FM_private_axial_shading(VALUE fmkr, VALUE x0, VALUE y0, VALUE x1, VALUE y
    lookup = rb_String(lookup);
    c_axial_shading(p, convert_figure_to_output_x(p,NUM2DBL(x0)), convert_figure_to_output_y(p,NUM2DBL(y0)),
       convert_figure_to_output_x(p,NUM2DBL(x1)), convert_figure_to_output_y(p,NUM2DBL(y1)),
-      NUM2INT(hival), RSTRING(lookup)->len, (unsigned char *)(RSTRING(lookup)->ptr),
+      NUM2INT(hival), RSTRING_LEN(lookup), (unsigned char *)(RSTRING_PTR(lookup)),
       extend_start == Qtrue, extend_end == Qtrue);
    return fmkr;
 }
@@ -291,7 +291,7 @@ VALUE FM_private_radial_shading(VALUE fmkr,
    c_radial_shading(p,
       NUM2DBL(x0), NUM2DBL(y0), NUM2DBL(r0),
       NUM2DBL(x1), NUM2DBL(y1), NUM2DBL(r1), 
-      NUM2INT(hival), RSTRING(lookup)->len, (unsigned char *)(RSTRING(lookup)->ptr),
+      NUM2INT(hival), RSTRING_LEN(lookup), (unsigned char *)(RSTRING_PTR(lookup)),
       convert_figure_to_output_dx(p,NUM2DBL(a)), convert_figure_to_output_dy(p,NUM2DBL(b)),
       convert_figure_to_output_dx(p,NUM2DBL(c)), convert_figure_to_output_dy(p,NUM2DBL(d)),
       convert_figure_to_output_x(p,0.0), convert_figure_to_output_y(p,0.0),
@@ -356,8 +356,8 @@ VALUE FM_get_color_from_colormap(VALUE fmkr, VALUE color_map, VALUE color_positi
    color_position = rb_Float(color_position);
    double x = NUM2DBL(color_position);
    color_map = rb_String(color_map);
-   unsigned char *buff = (unsigned char *)(RSTRING(color_map)->ptr), r, g, b, i;
-   int len = RSTRING(color_map)->len;
+   unsigned char *buff = (unsigned char *)(RSTRING_PTR(color_map)), r, g, b, i;
+   int len = RSTRING_LEN(color_map);
    if (len % 3 != 0) rb_raise(rb_eArgError, "Sorry: color_map length must be a multiple of 3 (for R G B components)");
    i = 3 * ROUND(x * ((len/3)-1));
    r = buff[i]; g = buff[i+1]; b = buff[i+2];

data/split/Tioga/pdfimage.c

@@ -260,7 +260,7 @@ VALUE FM_private_show_jpg(VALUE fmkr, VALUE filename, VALUE width, VALUE height,
    height = rb_Integer(height);
    mask_obj_num = rb_Integer(mask_obj_num);
    filename = rb_String(filename);
-   c_show_jpg(p, RSTRING(filename)->ptr, NUM2INT(width), NUM2INT(height), dest, NUM2INT(mask_obj_num));
+   c_show_jpg(p, RSTRING_PTR(filename), NUM2INT(width), NUM2INT(height), dest, NUM2INT(mask_obj_num));
    return fmkr;
 }
 
@@ -487,8 +487,8 @@ static VALUE private_show_image(int image_type, VALUE fmkr, VALUE llx, VALUE lly
       hival = rb_Integer(hival);
       hivalue = NUM2INT(hival);
       lookup = rb_String(lookup);
-      lookup_str = (unsigned char *)(RSTRING(lookup)->ptr);
-      lookup_len = RSTRING(lookup)->len;
+      lookup_str = (unsigned char *)(RSTRING_PTR(lookup));
+      lookup_len = RSTRING_LEN(lookup);
    }
    dest[0] = convert_figure_to_output_x(p,NUM2DBL(llx));
    dest[1] = convert_figure_to_output_y(p,NUM2DBL(lly));
@@ -497,7 +497,7 @@ static VALUE private_show_image(int image_type, VALUE fmkr, VALUE llx, VALUE lly
    dest[4] = convert_figure_to_output_x(p,NUM2DBL(ulx));
    dest[5] = convert_figure_to_output_y(p,NUM2DBL(uly));
    int obj_num = c_private_show_image(p, image_type, dest, (interpolate != Qfalse), (reversed == Qtrue), NUM2INT(w), NUM2INT(h), 
-      (unsigned char *)RSTRING(data)->ptr, RSTRING(data)->len, mask_min, mask_max, hivalue, lookup_str, lookup_len, NUM2INT(mask_obj_num));
+      (unsigned char *)RSTRING_PTR(data), RSTRING_LEN(data), mask_min, mask_max, hivalue, lookup_str, lookup_len, NUM2INT(mask_obj_num));
    return INT2FIX(obj_num);
 }
 

data/split/Tioga/pdfpath.c

@@ -34,7 +34,6 @@ static void croak_on_nonok(FM *p, const char * function)
 }
 
 /* small macro to check if a number is ok to be output */
-#define is_okay_number(x) ((x) - (x) == 0.0)
 
 #define CROAK_ON_NONOK(p) croak_on_nonok(p, __FUNCTION__)
 #define ARE_OK_NUMBERS(x,y) if(! is_okay_number(x) || ! is_okay_number(y)) {\

data/split/Tioga/pdftext.c

@@ -149,7 +149,7 @@ static int c_register_font(char *font_name)
 VALUE FM_register_font(VALUE fmkr, VALUE font_name)
 {
    font_name = rb_String(font_name);
-   int font_num = c_register_font(RSTRING(font_name)->ptr);
+   int font_num = c_register_font(RSTRING_PTR(font_name));
    return INT2FIX(font_num); 
 }
 
@@ -253,7 +253,7 @@ VALUE FM_marker_string_info(VALUE fmkr, VALUE font_number, VALUE string, VALUE s
    FM *p = Get_FM(fmkr);
    font_number = rb_Integer(font_number);
    string = rb_String(string);
-   unsigned char *text = (unsigned char *)(RSTRING(string)->ptr);
+   unsigned char *text = (unsigned char *)(RSTRING_PTR(string));
    scale = rb_Float(scale);
    double ft_ht = p->default_text_scale * NUM2DBL(scale) * p->default_font_size * ENLARGE;
    int ft_height = ROUND(ft_ht);
@@ -277,9 +277,6 @@ VALUE FM_marker_string_info(VALUE fmkr, VALUE font_number, VALUE string, VALUE s
 
 #define TRANSFORM_VEC(dx,dy) tmp = dx; dx = (dx) * a + (dy) * c; dy = tmp * b + (dy) * d;
 
-/* This macro checks that it's a real number we're looking at */
-#define is_okay_number(x) ((x) - (x) == 0.0)
-
 void c_rotated_string_at_points(FM *p, double rotation, int font_number, unsigned char *text, double scale,
    int n, double *xs, double *ys, int alignment, int justification, double horizontal_scaling, double vertical_scaling,
    double italic_angle, double ascent_angle)
@@ -403,7 +400,7 @@ VALUE FM_private_show_marker(VALUE fmkr, VALUE integer_args, VALUE stroke_width,
       }
    } else {
       string = rb_String(string);
-      text = (unsigned char *)(RSTRING(string)->ptr);
+      text = (unsigned char *)(RSTRING_PTR(string));
    }
    fprintf(TF, "%d Tr\n", mode);
    if (stroke_color != Qnil && stroke_color != p->stroke_color &&

data/split/Tioga/texout.c

@@ -151,7 +151,7 @@ VALUE FM_show_rotated_text(VALUE fmkr, VALUE text, VALUE frame_side, VALUE shift
    angle = rb_Float(angle);
    justification = rb_Integer(justification);
    alignment = rb_Integer(alignment);
-   c_show_rotated_text(p, RSTRING(text)->ptr, NUM2INT(frame_side), NUM2DBL(shift),
+   c_show_rotated_text(p, RSTRING_PTR(text), NUM2INT(frame_side), NUM2DBL(shift),
       NUM2DBL(fraction), NUM2DBL(scale), NUM2DBL(angle), NUM2INT(justification), NUM2INT(alignment));
    return fmkr;
 }
@@ -174,7 +174,7 @@ VALUE FM_show_rotated_label(VALUE fmkr, VALUE text,
    angle = rb_Float(angle);
    justification = rb_Integer(justification);
    alignment = rb_Integer(alignment);
-   c_show_rotated_label(p, RSTRING(text)->ptr, NUM2DBL(xloc), NUM2DBL(yloc),
+   c_show_rotated_label(p, RSTRING_PTR(text), NUM2DBL(xloc), NUM2DBL(yloc),
       NUM2DBL(scale), NUM2DBL(angle), NUM2INT(justification), NUM2INT(alignment));
    return fmkr;
 }

data/split/defs.h

@@ -31,3 +31,9 @@
 #define isnan(x) ((x) != (x))
 /* yes, as funny as it may look  NaN != NaN, and that's the only one */
 #endif
+
+/* Fix old versions of ruby.h */
+#ifndef RSTRING_PTR
+# define RSTRING_PTR(x) (RSTRING(x)->ptr)
+# define RSTRING_LEN(x) (RSTRING(x)->len)
+#endif

data/split/mkmf2.rb

@@ -78,7 +78,7 @@ module Mkmf2
   include Config
 
   # The CVS tag used for the release.
-  CVS_TAG = '$Name$'
+  CVS_TAG = '$Name:  $'
 
   # The module version; it is computed from CVS_TAG
   VERSION = CVS_TAG.match(/\D+(.*?)\s*\$?$/)[1].tr('_-','..')
@@ -616,7 +616,7 @@ module Mkmf2
       MAKEFILE_CONFIG["INCLUDE_INSTALL_DIR"] = 
         "$(DESTDIR)$(includedir)"
       MAKEFILE_CONFIG["EXEC_INSTALL_DIR"] = 
-        File.join("$(prefix)", "bin")
+        File.join("$(DESTDIR)$(prefix)", "bin")
 
     when "local"
       MAKEFILE_CONFIG["RUBYLIB_INSTALL_DIR"] = 

data/tests/tc_Dvector.rb

@@ -16,6 +16,13 @@ class TestDvector < Test::Unit::TestCase
         return "#{dir}/#{file_name}"
       end
     end
+
+    # Checks if the internal Is_Dvector is working properly,
+    # as it seems problematic in Ruby 1.9
+    def test_isa_dvector
+      a = Dvector.new
+      assert(Dvector.is_a_dvector(a))
+    end
     
     def test_read_nasty_fortran_data
         row = Dvector.read_row(real_file_name("dvector_read_test.data"))
@@ -771,6 +778,19 @@ EOT
       assert_equal(v, v_bis)
     end
 
+    NB_NUMBERS = 10000
+    def test_stress_marshall
+      1.times do 
+        v = Dvector.new
+        1.upto(NB_NUMBERS) do 
+          v << rand * 10 ** (100 - 100 * rand)
+        end
+        s = Marshal.dump(v)
+        v_bis = Marshal.restore(s)
+        assert_equal(v, v_bis)
+      end
+    end
+
     def test_bounds
       v = Dvector[0.0/0.0, 0.0/0.0, 1,2,4,5,9,0.0/0.0,0.1]
       assert_equal(v.bounds, [0.1, 9])
@@ -787,5 +807,6 @@ EOT
       assert_equal(a,c)
       assert_equal(b,d)
     end
+
     
 end

data/tests/tc_Flate.rb

@@ -1,8 +1,9 @@
-#  tc_Dtable.rb
+#  tc_Flate.rb
 
 require 'test/unit'
+require 'Flate'
 
-class TestDtable < Test::Unit::TestCase
+class TestFlate < Test::Unit::TestCase
 
   def make_data(size = 10000) 
     srand # intitialize the random seed...

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: tioga
 version: !ruby/object:Gem::Version 
-  version: "1.5"
-date: 2007-03-17 00:00:00 +01:00
+  version: "1.6"
+date: 2007-05-23 00:00:00 +02:00
 summary: Tioga - a powerful scientific plotting library
 require_paths: 
 - lib