tioga 1.6 → 1.7

data/split/Tioga/shared/pdfcoords.c

@@ -0,0 +1,443 @@
+/* pdfcoords.c */
+/*
+   Copyright (C) 2005  Bill Paxton
+
+   This file is part of Tioga.
+
+   Tioga is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Library Public License as published
+   by the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   Tioga is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public License
+   along with Tioga; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*/
+
+#include "figures.h"
+#include "pdfs.h"
+
+/* Frame and Bounds */
+void Recalc_Font_Hts(FM *p)
+{
+   double dx, dy;
+   dx = dy = ENLARGE * p->default_font_size * p->default_text_scale;  // font height in output coords
+   dx = convert_output_to_page_dx(p,dx);
+   dx = convert_page_to_frame_dx(p,dx);
+   p->default_text_height_dx = convert_frame_to_figure_dx(p,dx);
+   dy = convert_output_to_page_dy(p,dy);
+   dy = convert_page_to_frame_dy(p,dy);
+   p->default_text_height_dy = convert_frame_to_figure_dy(p,dy);
+}
+
+void c_set_subframe(OBJ_PTR fmkr, FM *p, 
+   double left_margin, double right_margin, double top_margin, double bottom_margin, int *ierr)
+{
+   double x, y, w, h;
+   if (left_margin < 0 || right_margin < 0 || top_margin < 0 || bottom_margin < 0) {
+      RAISE_ERROR("Sorry: margins for set_subframe must be non-negative", ierr); return; }
+   if (left_margin + right_margin >= 1.0) {
+      RAISE_ERROR_gg("Sorry: margins too large: left_margin (%g) right_margin (%g)", left_margin, right_margin, ierr); return; }
+   if (top_margin + bottom_margin >= 1.0) {
+      RAISE_ERROR_gg("Sorry: margins too large: top_margin (%g) bottom_margin (%g)", top_margin, bottom_margin, ierr); return; }
+   x = p->frame_left += left_margin * p->frame_width;
+   p->frame_right -= right_margin * p->frame_width;
+   p->frame_top -= top_margin * p->frame_height;
+   y = p->frame_bottom += bottom_margin * p->frame_height;
+   w = p->frame_width = p->frame_right - p->frame_left;
+   h = p->frame_height = p->frame_top - p->frame_bottom;
+   Recalc_Font_Hts(p);
+}
+
+
+
+static void c_set_bounds(FM *p, double left, double right, double top, double bottom, int *ierr)
+{
+   if (constructing_path) {
+      RAISE_ERROR("Sorry: must finish with current path before calling set_bounds", ierr); return; }
+   p->bounds_left = left; p->bounds_right = right;
+   p->bounds_bottom = bottom; p->bounds_top = top;
+   if (left < right) {
+      p->xaxis_reversed = false;
+      p->bounds_xmin = left; p->bounds_xmax = right;
+   } else if (right < left) {
+      p->xaxis_reversed = true;
+      p->bounds_xmin = right; p->bounds_xmax = left;
+   } else { // left == right
+      p->xaxis_reversed = false;
+      if (left > 0.0) {
+        p->bounds_xmin = left * (1.0 - 1e-6); p->bounds_xmax = left * (1.0 + 1e-6);
+      } else if (left < 0.0) {
+        p->bounds_xmin = left * (1.0 + 1e-6); p->bounds_xmax = left * (1.0 - 1e-6);
+      } else {
+        p->bounds_xmin = -1e-6; p->bounds_xmax = 1e-6;
+      }
+   }
+   if (bottom < top) {
+      p->yaxis_reversed = false;
+      p->bounds_ymin = bottom; p->bounds_ymax = top;
+   } else if (top < bottom) {
+      p->yaxis_reversed = true;
+      p->bounds_ymin = top; p->bounds_ymax = bottom;
+   } else { // top == bottom
+      p->yaxis_reversed = false;
+      if (bottom > 0.0) {
+        p->bounds_ymin = bottom * (1.0 - 1e-6); p->bounds_ymax = bottom * (1.0 + 1e-6);
+      } else if (bottom < 0.0) {
+        p->bounds_ymin = bottom * (1.0 + 1e-6); p->bounds_ymax = bottom * (1.0 - 1e-6);
+      } else {
+        p->bounds_xmin = -1e-6; p->bounds_xmax = 1e-6;
+      }
+   }
+   p->bounds_width = p->bounds_xmax - p->bounds_xmin;
+   p->bounds_height = p->bounds_ymax - p->bounds_ymin;
+   Recalc_Font_Hts(p);
+}
+
+void c_private_set_bounds(OBJ_PTR fmkr, FM *p, 
+         double left, double right, double top, double bottom, int *ierr)
+{
+   if (constructing_path) {
+      RAISE_ERROR("Sorry: must finish with current path before calling set_bounds", ierr); return; }
+   p->bounds_left = left; p->bounds_right = right;
+   p->bounds_bottom = bottom; p->bounds_top = top;
+   if (left < right) {
+      p->xaxis_reversed = false;
+      p->bounds_xmin = left; p->bounds_xmax = right;
+   } else if (right < left) {
+      p->xaxis_reversed = true;
+      p->bounds_xmin = right; p->bounds_xmax = left;
+   } else { // left == right
+      p->xaxis_reversed = false;
+      if (left > 0.0) {
+        p->bounds_xmin = left * (1.0 - 1e-6); p->bounds_xmax = left * (1.0 + 1e-6);
+      } else if (left < 0.0) {
+        p->bounds_xmin = left * (1.0 + 1e-6); p->bounds_xmax = left * (1.0 - 1e-6);
+      } else {
+        p->bounds_xmin = -1e-6; p->bounds_xmax = 1e-6;
+      }
+   }
+   if (bottom < top) {
+      p->yaxis_reversed = false;
+      p->bounds_ymin = bottom; p->bounds_ymax = top;
+   } else if (top < bottom) {
+      p->yaxis_reversed = true;
+      p->bounds_ymin = top; p->bounds_ymax = bottom;
+   } else { // top == bottom
+      p->yaxis_reversed = false;
+      if (bottom > 0.0) {
+        p->bounds_ymin = bottom * (1.0 - 1e-6); p->bounds_ymax = bottom * (1.0 + 1e-6);
+      } else if (bottom < 0.0) {
+        p->bounds_ymin = bottom * (1.0 + 1e-6); p->bounds_ymax = bottom * (1.0 - 1e-6);
+      } else {
+        p->bounds_xmin = -1e-6; p->bounds_xmax = 1e-6;
+      }
+   }
+   p->bounds_width = p->bounds_xmax - p->bounds_xmin;
+   p->bounds_height = p->bounds_ymax - p->bounds_ymin;
+   Recalc_Font_Hts(p);
+}
+
+
+// Conversions
+
+
+OBJ_PTR c_convert_to_degrees(OBJ_PTR fmkr, FM *p, double dx, double dy, int *ierr) { // dx and dy in figure coords
+   double angle;
+   if (dx == 0.0 && dy == 0.0) angle = 0.0;
+   else if (dx > 0.0 && dy == 0.0) angle = (p->bounds_left > p->bounds_right)? 180.0 : 0.0;
+   else if (dx < 0.0 && dy == 0.0) angle = (p->bounds_left > p->bounds_right)? 0.0 : 180.0;
+   else if (dx == 0.0 && dy > 0.0) angle = (p->bounds_bottom > p->bounds_top)? -90.0 : 90.0;
+   else if (dx == 0.0 && dy < 0.0) angle = (p->bounds_bottom > p->bounds_top)? 90.0 : -90.0;
+   else angle = atan2(convert_figure_to_output_dy(p,dy),convert_figure_to_output_dx(p,dx))*RADIANS_TO_DEGREES;
+   return Float_New(angle);
+}
+
+OBJ_PTR c_convert_inches_to_output(OBJ_PTR fmkr, FM *p, double val, int *ierr)
+{
+   val = convert_inches_to_output(val);
+   return Float_New(val);
+}
+
+OBJ_PTR c_convert_output_to_inches(OBJ_PTR fmkr, FM *p, double val, int *ierr)
+{
+   val = convert_output_to_inches(val);
+   return Float_New(val);
+}
+
+OBJ_PTR c_convert_mm_to_output(OBJ_PTR fmkr, FM *p, double val, int *ierr)
+{
+   val = convert_mm_to_output(val);
+   return Float_New(val);
+}
+
+OBJ_PTR c_convert_output_to_mm(OBJ_PTR fmkr, FM *p, double val, int *ierr)
+{
+   val = convert_output_to_mm(val);
+   return Float_New(val);
+}
+
+OBJ_PTR c_convert_page_to_output_x(OBJ_PTR fmkr, FM *p, double val, int *ierr)
+{
+   val = convert_page_to_output_x(p,val);
+   return Float_New(val);
+}
+
+OBJ_PTR c_convert_page_to_output_y(OBJ_PTR fmkr, FM *p, double val, int *ierr)
+{
+   val = convert_page_to_output_y(p,val);
+   return Float_New(val);
+}
+
+OBJ_PTR c_convert_page_to_output_dx(OBJ_PTR fmkr, FM *p, double val, int *ierr)
+{
+   val = convert_page_to_output_dx(p,val);
+   return Float_New(val);
+}
+
+OBJ_PTR c_convert_page_to_output_dy(OBJ_PTR fmkr, FM *p, double val, int *ierr)
+{
+   val = convert_page_to_output_dy(p,val);
+   return Float_New(val);
+}
+
+OBJ_PTR c_convert_output_to_page_x(OBJ_PTR fmkr, FM *p, double val, int *ierr)
+{
+   val = convert_output_to_page_x(p,val);
+   return Float_New(val);
+}
+
+OBJ_PTR c_convert_output_to_page_y(OBJ_PTR fmkr, FM *p, double val, int *ierr)
+{
+   val = convert_output_to_page_y(p,val);
+   return Float_New(val);
+}
+
+OBJ_PTR c_convert_output_to_page_dx(OBJ_PTR fmkr, FM *p, double val, int *ierr)
+{
+   val = convert_output_to_page_dx(p,val);
+   return Float_New(val);
+}
+
+OBJ_PTR c_convert_output_to_page_dy(OBJ_PTR fmkr, FM *p, double val, int *ierr)
+{
+   val = convert_output_to_page_dy(p,val);
+   return Float_New(val);
+}
+
+OBJ_PTR c_convert_frame_to_page_x(OBJ_PTR fmkr, FM *p, double val, int *ierr)
+{
+   val = convert_frame_to_page_x(p,val);
+   return Float_New(val);
+}
+
+OBJ_PTR c_convert_frame_to_page_y(OBJ_PTR fmkr, FM *p, double val, int *ierr)
+{
+   val = convert_frame_to_page_y(p,val);
+   return Float_New(val);
+}
+
+OBJ_PTR c_convert_frame_to_page_dx(OBJ_PTR fmkr, FM *p, double val, int *ierr)
+{
+   val = convert_frame_to_page_dx(p,val);
+   return Float_New(val);
+}
+
+OBJ_PTR c_convert_frame_to_page_dy(OBJ_PTR fmkr, FM *p, double val, int *ierr)
+{
+   val = convert_frame_to_page_dy(p,val);
+   return Float_New(val);
+}
+
+OBJ_PTR c_convert_page_to_frame_x(OBJ_PTR fmkr, FM *p, double val, int *ierr)
+{
+   val = convert_page_to_frame_x(p,val);
+   return Float_New(val);
+}
+
+OBJ_PTR c_convert_page_to_frame_y(OBJ_PTR fmkr, FM *p, double val, int *ierr)
+{
+   val = convert_page_to_frame_y(p,val);
+   return Float_New(val);
+}
+
+OBJ_PTR c_convert_page_to_frame_dx(OBJ_PTR fmkr, FM *p, double val, int *ierr)
+{
+   val = convert_page_to_frame_dx(p,val);
+   return Float_New(val);
+}
+
+OBJ_PTR c_convert_page_to_frame_dy(OBJ_PTR fmkr, FM *p, double val, int *ierr)
+{
+   val = convert_page_to_frame_dy(p,val);
+   return Float_New(val);
+}
+
+OBJ_PTR c_convert_figure_to_frame_x(OBJ_PTR fmkr, FM *p, double val, int *ierr)
+{
+   val = convert_figure_to_frame_x(p,val);
+   return Float_New(val);
+}
+
+OBJ_PTR c_convert_figure_to_frame_y(OBJ_PTR fmkr, FM *p, double val, int *ierr)
+{
+   val = convert_figure_to_frame_y(p,val);
+   return Float_New(val);
+}
+
+OBJ_PTR c_convert_figure_to_frame_dx(OBJ_PTR fmkr, FM *p, double val, int *ierr)
+{
+   val = convert_figure_to_frame_dx(p,val);
+   return Float_New(val);
+}
+
+OBJ_PTR c_convert_figure_to_frame_dy(OBJ_PTR fmkr, FM *p, double val, int *ierr)
+{
+   val = convert_figure_to_frame_dy(p,val);
+   return Float_New(val);
+}
+
+OBJ_PTR c_convert_frame_to_figure_x(OBJ_PTR fmkr, FM *p, double val, int *ierr)
+{
+   val = convert_frame_to_figure_x(p,val);
+   return Float_New(val);
+}
+
+OBJ_PTR c_convert_frame_to_figure_y(OBJ_PTR fmkr, FM *p, double val, int *ierr)
+{
+   val = convert_frame_to_figure_y(p,val);
+   return Float_New(val);
+}
+
+OBJ_PTR c_convert_frame_to_figure_dx(OBJ_PTR fmkr, FM *p, double val, int *ierr)
+{
+   val = convert_frame_to_figure_dx(p,val);
+   return Float_New(val);
+}
+
+OBJ_PTR c_convert_frame_to_figure_dy(OBJ_PTR fmkr, FM *p, double val, int *ierr)
+{
+   val = convert_frame_to_figure_dy(p,val);
+   return Float_New(val);
+}
+
+double convert_figure_to_output_x(FM *p, double x)
+{
+   x = convert_figure_to_frame_x(p,x);
+   x = convert_frame_to_page_x(p,x);
+   x = convert_page_to_output_x(p,x);
+   return x;
+}
+
+double convert_figure_to_output_dy(FM *p, double dy)
+{
+   dy = convert_figure_to_frame_dy(p,dy);
+   dy = convert_frame_to_page_dy(p,dy);
+   dy = convert_page_to_output_dy(p,dy);
+   return dy;
+}
+
+double convert_figure_to_output_dx(FM *p, double dx)
+{
+   dx = convert_figure_to_frame_dx(p,dx);
+   dx = convert_frame_to_page_dx(p,dx);
+   dx = convert_page_to_output_dx(p,dx);
+   return dx;
+}
+
+double convert_figure_to_output_y(FM *p, double y)
+{
+   y = convert_figure_to_frame_y(p,y);
+   y = convert_frame_to_page_y(p,y);
+   y = convert_page_to_output_y(p,y);
+   return y;
+}
+
+OBJ_PTR c_convert_figure_to_output_x(OBJ_PTR fmkr, FM *p, double val, int *ierr)
+{
+   return Float_New(convert_figure_to_output_x(p,val));
+}
+
+OBJ_PTR c_convert_figure_to_output_y(OBJ_PTR fmkr, FM *p, double val, int *ierr)
+{
+   return Float_New(convert_figure_to_output_y(p,val));
+}
+
+OBJ_PTR c_convert_figure_to_output_dx(OBJ_PTR fmkr, FM *p, double val, int *ierr)
+{
+   return Float_New(convert_figure_to_output_dx(p,val));
+}
+
+OBJ_PTR c_convert_figure_to_output_dy(OBJ_PTR fmkr, FM *p, double val, int *ierr)
+{
+   return Float_New(convert_figure_to_output_dy(p,val));
+}
+
+double convert_output_to_figure_x(FM *p, double x)
+{
+   x = convert_output_to_page_x(p,x);
+   x = convert_page_to_frame_x(p,x);
+   x = convert_frame_to_figure_x(p,x);
+   return x;
+}
+
+double convert_output_to_figure_dy(FM *p, double dy)
+{
+   dy = convert_output_to_page_dy(p,dy);
+   dy = convert_page_to_frame_dy(p,dy);
+   dy = convert_frame_to_figure_dy(p,dy);
+   return dy;
+}
+
+double convert_output_to_figure_dx(FM *p, double dx)
+{
+   dx = convert_output_to_page_dx(p,dx);
+   dx = convert_page_to_frame_dx(p,dx);
+   dx = convert_frame_to_figure_dx(p,dx);
+   return dx;
+}
+
+double convert_output_to_figure_y(FM *p, double y)
+{
+   y = convert_output_to_page_y(p,y);
+   y = convert_page_to_frame_y(p,y);
+   y = convert_frame_to_figure_y(p,y);
+   return y;
+}
+
+OBJ_PTR c_convert_output_to_figure_x(OBJ_PTR fmkr, FM *p, double val, int *ierr)
+{
+   return Float_New(convert_output_to_figure_x(p,val));
+}
+
+OBJ_PTR c_convert_output_to_figure_y(OBJ_PTR fmkr, FM *p, double val, int *ierr)
+{
+   return Float_New(convert_output_to_figure_y(p,val));
+}
+
+OBJ_PTR c_convert_output_to_figure_dx(OBJ_PTR fmkr, FM *p, double val, int *ierr)
+{ return Float_New(convert_output_to_figure_dx(p,val)); }
+
+OBJ_PTR c_convert_output_to_figure_dy(OBJ_PTR fmkr, FM *p, double val, int *ierr)
+{ return Float_New(convert_output_to_figure_dy(p,val)); }
+
+void c_private_set_default_font_size(OBJ_PTR fmkr, FM *p, double size, int *ierr) {
+    p->default_font_size = size;
+    Recalc_Font_Hts(p);
+}
+
+void c_doing_subplot(OBJ_PTR fmkr, FM *p, int *ierr)
+{
+   p->in_subplot = true;
+}
+
+void c_doing_subfigure(OBJ_PTR fmkr, FM *p, int *ierr)
+{
+   p->root_figure = false;
+}
+

data/split/Tioga/{pdffile.c → shared/pdffile.c}

@@ -48,9 +48,9 @@ char *predefined_Fonts[] = { /* must match the font numbers in FigureConstants.r
 int num_predefined_fonts = 14;
 int num_pdf_standard_fonts = 14;
 
-long int *obj_offsets, capacity_obj_offsets, stream_start, stream_end, length_offset, xref_offset;
-int num_objects, next_available_object_number, next_available_gs_number, next_available_xo_number;
-int next_available_shade_number, next_available_font_number;
+long *obj_offsets, capacity_obj_offsets, stream_start, stream_end, length_offset, xref_offset;
+long num_objects, next_available_object_number, next_available_gs_number, next_available_xo_number;
+long next_available_shade_number, next_available_font_number;
 Stroke_Opacity_State *stroke_opacities = NULL;
 Fill_Opacity_State *fill_opacities = NULL;
 XObject_Info *xobj_list = NULL;
@@ -63,7 +63,7 @@ FILE *TF = NULL; // for the temp file
 
 /* PDF File Management */
 
-void Free_XObjects(void)
+static void Free_XObjects(int *ierr)
 {
    XObject_Info *xo;
    while (xobj_list != NULL) {
@@ -72,19 +72,19 @@ void Free_XObjects(void)
       switch (xo->xobj_subtype) {
          case JPG_SUBTYPE: Free_JPG((JPG_Info *)xo); break;
          case SAMPLED_SUBTYPE: Free_Sampled((Sampled_Info *)xo); break;
-         default: rb_raise(rb_eArgError, "Invalid XObject subtype (%i)", xo->xobj_subtype);
+         default: RAISE_ERROR_i("Invalid XObject subtype (%i)", xo->xobj_subtype, ierr); return;
       }
       free(xo);
    }
 }
 
-void Init_pdf(void)
+void Init_pdf(int *ierr)
 {
    int i;
    writing_file = false;
    capacity_obj_offsets = 1000;
    num_objects = 0;
-   obj_offsets = ALLOC_N(long int, capacity_obj_offsets);
+   obj_offsets = ALLOC_N_long(capacity_obj_offsets);
    for (i=0; i < capacity_obj_offsets; i++) obj_offsets[i] = 0;
 }
 
@@ -93,7 +93,7 @@ void Record_Object_Offset(int obj_number)
    long int offset = ftell(OF);
    if (obj_number >= capacity_obj_offsets) {
       int size_increment = 50, i;
-      REALLOC_N(obj_offsets, long int, obj_number + size_increment);
+      REALLOC_long(&obj_offsets, obj_number + size_increment);
       capacity_obj_offsets = obj_number + size_increment;
       for (i=num_objects; i < capacity_obj_offsets; i++) obj_offsets[i] = 0;
    }
@@ -101,17 +101,18 @@ void Record_Object_Offset(int obj_number)
    if (obj_number >= num_objects) num_objects = obj_number + 1;
 }
 
-static void Write_XObjects(void)
+static void Write_XObjects(int *ierr)
 {
    XObject_Info *xo;
    for (xo = xobj_list; xo != NULL; xo = xo->next) {
       Record_Object_Offset(xo->obj_num);
       fprintf(OF, "%i 0 obj << /Type /XObject ", xo->obj_num);
       switch (xo->xobj_subtype) {
-         case JPG_SUBTYPE: Write_JPG((JPG_Info *)xo); break;
-         case SAMPLED_SUBTYPE: Write_Sampled((Sampled_Info *)xo); break;
-         default: rb_raise(rb_eArgError, "Invalid XObject subtype (%i)", xo->xobj_subtype);
+         case JPG_SUBTYPE: Write_JPG((JPG_Info *)xo, ierr); break;
+         case SAMPLED_SUBTYPE: Write_Sampled((Sampled_Info *)xo, ierr); break;
+         default: RAISE_ERROR_i("Invalid XObject subtype (%i)", xo->xobj_subtype, ierr);
       }
+      if (*ierr != 0) return;
       fprintf(OF, ">> endobj\n");
    }
 }
@@ -123,9 +124,9 @@ static void Write_XObjects(void)
 #define CATALOG_OBJ 5
 #define FIRST_OTHER_OBJ 6
 
-static void Free_Records()
+static void Free_Records(int *ierr)
 {
-   Free_Stroke_Opacities(); Free_Fill_Opacities(); Free_XObjects(); Free_Shadings(); Free_Functions();
+   Free_Stroke_Opacities(); Free_Fill_Opacities(); Free_XObjects(ierr); Free_Shadings(); Free_Functions();
 }
 
 static void Get_pdf_name(char *ofile, char *filename, int maxlen)
@@ -137,13 +138,13 @@ static void Get_pdf_name(char *ofile, char *filename, int maxlen)
    strcat(ofile, "_figure.pdf");
 }
 
-void Open_pdf(VALUE fmkr, char *filename, bool quiet_mode)
-{
-   FM *p = Get_FM(fmkr);
+void Open_pdf(OBJ_PTR fmkr, FM *p, char *filename, bool quiet_mode, int *ierr) {
    int i;
-   if (writing_file) rb_raise(rb_eArgError, "Sorry: cannot start a new output file until finish current one.");
+   if (writing_file) {
+      RAISE_ERROR("Sorry: cannot start a new output file until finish current one.", ierr); return; }
    Clear_Fonts_In_Use_Flags();
-   Free_Records(); 
+   Free_Records(ierr);
+   if (*ierr != 0) return;
    next_available_object_number = FIRST_OTHER_OBJ;
    next_available_font_number = num_predefined_fonts + 1;
    next_available_gs_number = 1;
@@ -153,10 +154,10 @@ void Open_pdf(VALUE fmkr, char *filename, bool quiet_mode)
    time_t now = time(NULL);
    char ofile[300], timestring[100];
    Get_pdf_name(ofile, filename, 300);
-   if ((OF = fopen(ofile, "w")) == NULL)
-       rb_raise(rb_eArgError, "Sorry: can't open %s.\n", filename);
-   if ((TF = tmpfile()) == NULL)
-       rb_raise(rb_eArgError, "Sorry: can't create temp file for writing PDF file %s.\n", filename);
+   if ((OF = fopen(ofile, "w")) == NULL) {
+       RAISE_ERROR_s("Sorry: can't open %s.\n", filename, ierr); return; }
+   if ((TF = tmpfile()) == NULL) {
+       RAISE_ERROR_s("Sorry: can't create temp file for writing PDF file %s.\n", filename, ierr); return; }
    /* open PDF file and write header */
    fprintf(OF, "%%PDF-1.4\n");
    strcpy(timestring, ctime(&now));
@@ -178,25 +179,22 @@ void Open_pdf(VALUE fmkr, char *filename, bool quiet_mode)
       Get_pdf_xoffset(), Get_pdf_yoffset());
    /* set stroke and fill colors to black */
    have_current_point = constructing_path = false;
-   c_line_width_set(p, p->line_width);
-   c_line_cap_set(p, p->line_cap);
-   c_line_join_set(p, p->line_join);
-   c_miter_limit_set(p, p->miter_limit);
-   FM_line_type_set(fmkr, p->line_type);
-   FM_stroke_color_set(fmkr, p->stroke_color);
-   FM_fill_color_set(fmkr, p->fill_color);
+   c_line_width_set(fmkr, p, p->line_width, ierr);
+   c_line_cap_set(fmkr, p, p->line_cap, ierr);
+   c_line_join_set(fmkr, p, p->line_join, ierr);
+   c_miter_limit_set(fmkr, p, p->miter_limit, ierr);
+   c_line_type_set(fmkr, p, Get_line_type(fmkr, ierr), ierr);
+   c_stroke_color_set_RGB(fmkr, p, p->stroke_color_R, p->stroke_color_G, p->stroke_color_B, ierr);
+   c_fill_color_set_RGB(fmkr, p, p->fill_color_R, p->fill_color_G, p->fill_color_B, ierr);
    // initialize clip region
    bbox_llx = bbox_lly = 1e5;
    bbox_urx = bbox_ury = -1e5;
 }
 
-void Start_Axis_Standard_State(FM *p, VALUE color, double line_width) {
+void Start_Axis_Standard_State(OBJ_PTR fmkr, FM *p, double r, double g, double b, double line_width, int *ierr) {
    fprintf(TF, "q 2 J [] 0 d\n");
-   c_line_width_set(p, line_width);
-   if (color != Qnil)
-      FM_stroke_color_set(p->fm, color);
-   else
-      fprintf(TF, "0 0 0 RG\n"); // black
+   c_line_width_set(fmkr, p, line_width, ierr);
+   c_stroke_color_set_RGB(fmkr, p, r, g, b, ierr);
    /* 2 J sets the line cap style to square cap */
    /* set stroke and fill colors to black.  set line type to solid */
 }
@@ -213,29 +211,33 @@ void Write_grestore(void)
    fprintf(TF, "Q\n");
 }
 
-void Print_Xref(long int offset) {
+void c_pdf_gsave(OBJ_PTR fmkr, FM *p, int *ierr) { Write_gsave(); }
+void c_pdf_grestore(OBJ_PTR fmkr, FM *p, int *ierr) { Write_grestore(); }
+
+static void Print_Xref(long int offset) {
    char line[80];
    int i, len;
-   sprintf(line, "%li", offset);
+   snprintf(line,sizeof(line), "%li", offset);
    len = strlen(line);
    for (i=0; i < 10-len; i++) fputc('0', OF);
    fprintf(OF, "%s 00000 n \n", line);
    }
 
-static void Write_Stream(void)
+static void Write_Stream(int *ierr)
 {
    long int len = ftell(TF);
    unsigned long int new_len = (len * 11) / 10 + 100;
    unsigned char *buffer, *dest_buffer;
    rewind(TF);
-   buffer = ALLOC_N(unsigned char, len+1);
-   dest_buffer = ALLOC_N(unsigned char, new_len+1);
+   buffer = ALLOC_N_unsigned_char(len+1);
+   dest_buffer = ALLOC_N_unsigned_char(new_len+1);
    fread(buffer, 1, len, TF);
    fclose(TF);
    if (FLATE_ENCODE) {
-      if (flate_compress(dest_buffer, &new_len, buffer, len) != FLATE_OK) {
+      if (do_flate_compress(dest_buffer, &new_len, buffer, len) != FLATE_OK) {
          free(buffer); free(dest_buffer);
-         rb_raise(rb_eArgError, "Error compressing PDF stream data");
+         RAISE_ERROR("Error compressing PDF stream data", ierr); 
+         return;
       }
       fwrite(dest_buffer, 1, new_len, OF);
    } else {
@@ -244,15 +246,15 @@ static void Write_Stream(void)
    free(buffer); free(dest_buffer);
 }
 
-void Close_pdf(VALUE fmkr, bool quiet_mode)
+void Close_pdf(OBJ_PTR fmkr, FM *p, bool quiet_mode, int *ierr)
 {
-   FM *p = Get_FM(fmkr);
    int i;
    double llx, lly, urx, ury, xoff, yoff;
-   if (!writing_file) rb_raise(rb_eArgError, "Sorry: cannot End_Output if not writing file.");
+   if (!writing_file) { RAISE_ERROR("Sorry: cannot End_Output if not writing file.", ierr); return; }
    writing_file = false;
-   if (constructing_path) rb_raise(rb_eArgError, "Sorry: must finish with current path before ending file");
-   Write_Stream();
+   if (constructing_path) { RAISE_ERROR("Sorry: must finish with current path before ending file", ierr); return; }
+   Write_Stream(ierr);
+   if (*ierr != 0) return;
    stream_end = ftell(OF);
    fprintf(OF, "endstream\nendobj\n");
    Record_Object_Offset(PAGE_OBJ);
@@ -269,7 +271,7 @@ void Close_pdf(VALUE fmkr, bool quiet_mode)
    lly = bbox_lly / ENLARGE + yoff - MARGIN;
    urx = bbox_urx / ENLARGE + xoff + MARGIN;
    ury = bbox_ury / ENLARGE + yoff + MARGIN;
-   if (urx < llx || ury < lly) rb_raise(rb_eArgError, "Sorry: Empty plot!");
+   if (urx < llx || ury < lly) { RAISE_ERROR("Sorry: Empty plot!", ierr); return; }
    fprintf(OF, "%d %d %d %d", ROUND(llx), ROUND(lly), ROUND(urx), ROUND(ury));
    fprintf(OF, " ]\n/Contents %i 0 R\n/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]\n", STREAM_OBJ);
    if (Used_Any_Fonts()) {
@@ -318,8 +320,10 @@ void Close_pdf(VALUE fmkr, bool quiet_mode)
    Write_Font_Widths();
    Write_Stroke_Opacity_Objects();
    Write_Fill_Opacity_Objects();
-   Write_XObjects();
-   Write_Functions();
+   Write_XObjects(ierr);
+   if (*ierr != 0) return;
+   Write_Functions(ierr);
+   if (*ierr != 0) return;
    Write_Shadings();
    xref_offset = ftell(OF);
    fprintf(OF, "xref\n0 %i\n0000000000 65535 f \n", num_objects);
@@ -329,7 +333,7 @@ void Close_pdf(VALUE fmkr, bool quiet_mode)
    fseek(OF, length_offset, SEEK_SET);
    fprintf(OF, "%li", stream_end - stream_start);
    fclose(OF);
-   Free_Records(); 
+   Free_Records(ierr);
 }
 
 void Rename_pdf(char *oldname, char *newname)