tioga 1.7 → 1.8

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

@@ -28,7 +28,9 @@
 #define Get_pdf_xoffset()  5.0
 #define Get_pdf_yoffset()  5.0
 
-char *predefined_Fonts[] = { /* must match the font numbers in FigureConstants.rb */
+
+/* must match the font numbers in FigureConstants.rb */
+char *predefined_Fonts[] = { 
    NULL,
    "Times-Roman",
    "Times-Italic", // 2
@@ -44,12 +46,14 @@ char *predefined_Fonts[] = { /* must match the font numbers in FigureConstants.r
    "Courier-BoldOblique",
    "Symbol",
    "ZapfDingbats" // 14
-   };
+};
 int num_predefined_fonts = 14;
 int num_pdf_standard_fonts = 14;
 
-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 *obj_offsets, capacity_obj_offsets, stream_start, stream_end;
+long length_offset, xref_offset;
+long num_objects, next_available_object_number, next_available_gs_number;
+long 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;
@@ -61,24 +65,35 @@ Old_Font_Dictionary *old_font_dictionaries = NULL;
 FILE *OF = NULL; // for the PDF file
 FILE *TF = NULL; // for the temp file
 
+
 /* PDF File Management */
 
-static void Free_XObjects(int *ierr)
+static void
+Free_XObjects(int *ierr)
 {
    XObject_Info *xo;
    while (xobj_list != NULL) {
       xo = xobj_list;
       xobj_list = xo->next;
       switch (xo->xobj_subtype) {
-         case JPG_SUBTYPE: Free_JPG((JPG_Info *)xo); break;
-         case SAMPLED_SUBTYPE: Free_Sampled((Sampled_Info *)xo); break;
-         default: RAISE_ERROR_i("Invalid XObject subtype (%i)", xo->xobj_subtype, ierr); return;
+      case JPG_SUBTYPE:
+         Free_JPG((JPG_Info *)xo);
+         break;
+      case SAMPLED_SUBTYPE:
+         Free_Sampled((Sampled_Info *)xo);
+         break;
+      default:
+         RAISE_ERROR_i("Invalid XObject subtype (%i)",
+                       xo->xobj_subtype, ierr);
+         return;
       }
       free(xo);
    }
 }
 
-void Init_pdf(int *ierr)
+
+void
+Init_pdf(int *ierr)
 {
    int i;
    writing_file = false;
@@ -88,7 +103,9 @@ void Init_pdf(int *ierr)
    for (i=0; i < capacity_obj_offsets; i++) obj_offsets[i] = 0;
 }
 
-void Record_Object_Offset(int obj_number)
+
+void
+Record_Object_Offset(int obj_number)
 {
    long int offset = ftell(OF);
    if (obj_number >= capacity_obj_offsets) {
@@ -101,22 +118,30 @@ void Record_Object_Offset(int obj_number)
    if (obj_number >= num_objects) num_objects = obj_number + 1;
 }
 
-static void Write_XObjects(int *ierr)
+
+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, ierr); break;
-         case SAMPLED_SUBTYPE: Write_Sampled((Sampled_Info *)xo, ierr); break;
-         default: RAISE_ERROR_i("Invalid XObject subtype (%i)", xo->xobj_subtype, ierr);
+      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");
    }
 }
 
+
 #define INFO_OBJ 1
 #define PAGES_OBJ 2
 #define STREAM_OBJ 3
@@ -124,24 +149,38 @@ static void Write_XObjects(int *ierr)
 #define CATALOG_OBJ 5
 #define FIRST_OTHER_OBJ 6
 
-static void Free_Records(int *ierr)
+
+static void
+Free_Records(int *ierr)
 {
-   Free_Stroke_Opacities(); Free_Fill_Opacities(); Free_XObjects(ierr); 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)
+
+static void
+Get_pdf_name(char *ofile, char *filename, int maxlen)
 {
    char *dot;
    strncpy(ofile, filename, maxlen);
-   dot = strrchr(ofile,'.');
+   dot = strrchr(ofile, '.');
    if (dot != NULL) dot[0] = '\0';
    strcat(ofile, "_figure.pdf");
 }
 
-void Open_pdf(OBJ_PTR fmkr, FM *p, char *filename, bool quiet_mode, int *ierr) {
+
+void
+Open_pdf(OBJ_PTR fmkr, FM *p, char *filename, bool quiet_mode, int *ierr)
+{
    int i;
    if (writing_file) {
-      RAISE_ERROR("Sorry: cannot start a new output file until finish current one.", ierr); return; }
+      RAISE_ERROR("Sorry: cannot start a new output file until finish "
+                  "current one.", ierr);
+      return;
+   }
    Clear_Fonts_In_Use_Flags();
    Free_Records(ierr);
    if (*ierr != 0) return;
@@ -155,18 +194,27 @@ void Open_pdf(OBJ_PTR fmkr, FM *p, char *filename, bool quiet_mode, int *ierr) {
    char ofile[300], timestring[100];
    Get_pdf_name(ofile, filename, 300);
    if ((OF = fopen(ofile, "w")) == NULL) {
-       RAISE_ERROR_s("Sorry: can't open %s.\n", filename, ierr); return; }
+      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; }
+      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));
    i = strlen(timestring);
    if (i > 0) timestring[i-1] = '\0';
    Record_Object_Offset(INFO_OBJ);
-   fprintf(OF, "%i 0 obj <<\n/Creator (Tioga)\n/CreationDate (%s)\n>>\nendobj\n", INFO_OBJ, timestring);
+   fprintf(OF,
+           "%i 0 obj <<\n/Creator (Tioga)\n/CreationDate (%s)\n>>\nendobj\n",
+           INFO_OBJ, timestring);
    Record_Object_Offset(PAGES_OBJ);
-   fprintf(OF, "%i 0 obj <<\n/Type /Pages\n/Kids [%i 0 R]\n/Count 1\n>> endobj\n", PAGES_OBJ, PAGE_OBJ);
+   fprintf(OF,
+           "%i 0 obj <<\n/Type /Pages\n/Kids [%i 0 R]\n/Count 1\n>> endobj\n",
+           PAGES_OBJ, PAGE_OBJ);
    Record_Object_Offset(STREAM_OBJ);
    if (FLATE_ENCODE)
       fprintf(OF, "%i 0 obj <<\t/Filter /FlateDecode   /Length ", STREAM_OBJ);
@@ -176,7 +224,7 @@ void Open_pdf(OBJ_PTR fmkr, FM *p, char *filename, bool quiet_mode, int *ierr) {
    fprintf(OF, "             \n>>\nstream\n");
    stream_start = ftell(OF);
    fprintf(TF, "%.2f 0 0 %.2f %.2f %.2f cm\n", 1.0/ENLARGE, 1.0/ENLARGE,
-      Get_pdf_xoffset(), Get_pdf_yoffset());
+           Get_pdf_xoffset(), Get_pdf_yoffset());
    /* set stroke and fill colors to black */
    have_current_point = constructing_path = false;
    c_line_width_set(fmkr, p, p->line_width, ierr);
@@ -184,14 +232,20 @@ void Open_pdf(OBJ_PTR fmkr, FM *p, char *filename, bool quiet_mode, int *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);
+   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(OBJ_PTR fmkr, FM *p, double r, double g, double b, double line_width, int *ierr) {
+
+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(fmkr, p, line_width, ierr);
    c_stroke_color_set_RGB(fmkr, p, r, g, b, ierr);
@@ -199,31 +253,56 @@ void Start_Axis_Standard_State(OBJ_PTR fmkr, FM *p, double r, double g, double b
    /* set stroke and fill colors to black.  set line type to solid */
 }
 
-void End_Axis_Standard_State(void) { Write_grestore(); }
 
-void Write_gsave(void)
+void
+End_Axis_Standard_State(void)
+{
+   Write_grestore();
+}
+
+
+void
+Write_gsave(void)
 {
    fprintf(TF, "q\n");
 }
 
-void Write_grestore(void)
+
+void
+Write_grestore(void)
 {
    fprintf(TF, "Q\n");
 }
 
-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) {
+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;
    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(int *ierr)
+static void
+Write_Stream(int *ierr)
 {
    long int len = ftell(TF);
    unsigned long int new_len = (len * 11) / 10 + 100;
@@ -240,29 +319,43 @@ static void Write_Stream(int *ierr)
          return;
       }
       fwrite(dest_buffer, 1, new_len, OF);
-   } else {
+   }
+   else {
       fwrite(buffer, 1, len, OF);
-   } 
-   free(buffer); free(dest_buffer);
+   }
+   free(buffer);
+   free(dest_buffer);
 }
 
-void Close_pdf(OBJ_PTR fmkr, FM *p, bool quiet_mode, int *ierr)
+
+void
+Close_pdf(OBJ_PTR fmkr, FM *p, bool quiet_mode, int *ierr)
 {
    int i;
    double llx, lly, urx, ury, xoff, yoff;
-   if (!writing_file) { RAISE_ERROR("Sorry: cannot End_Output if not writing file.", ierr); return; }
+   if (!writing_file) {
+      RAISE_ERROR("Sorry: cannot End_Output if not writing file.", ierr);
+      return;
+   }
    writing_file = false;
-   if (constructing_path) { RAISE_ERROR("Sorry: must finish with current path before ending file", ierr); return; }
+   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);
-   fprintf(OF, "%i 0 obj <<\n/Type /Page\n/Parent %i 0 R\n/MediaBox [ ", PAGE_OBJ, PAGES_OBJ);
+   fprintf(OF, "%i 0 obj <<\n/Type /Page\n/Parent %i 0 R\n/MediaBox [ ",
+           PAGE_OBJ, PAGES_OBJ);
    if (bbox_llx < p->page_left) bbox_llx = p->page_left;
    if (bbox_lly < p->page_bottom) bbox_lly = p->page_bottom;
-   if (bbox_urx > p->page_left + p->page_width) bbox_urx = p->page_left + p->page_width;
-   if (bbox_ury > p->page_bottom + p->page_height) bbox_ury = p->page_bottom + p->page_height;
+   if (bbox_urx > p->page_left + p->page_width)
+      bbox_urx = p->page_left + p->page_width;
+   if (bbox_ury > p->page_bottom + p->page_height)
+      bbox_ury = p->page_bottom + p->page_height;
 //#define MARGIN 3
 #define MARGIN 0
    xoff = Get_pdf_xoffset();
@@ -271,9 +364,13 @@ void Close_pdf(OBJ_PTR fmkr, FM *p, bool quiet_mode, int *ierr)
    lly = bbox_lly / ENLARGE + yoff - MARGIN;
    urx = bbox_urx / ENLARGE + xoff + MARGIN;
    ury = bbox_ury / ENLARGE + yoff + MARGIN;
-   if (urx < llx || ury < lly) { RAISE_ERROR("Sorry: Empty plot!", ierr); return; }
+   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);
+   fprintf(OF, " ]\n/Contents %i 0 R\n/Resources << "
+           "/ProcSet [/PDF /Text /ImageB /ImageC /ImageI]\n", STREAM_OBJ);
    if (Used_Any_Fonts()) {
       Font_Dictionary *f;      
       fprintf(OF, "    /Font <<\n     ");
@@ -283,7 +380,8 @@ void Close_pdf(OBJ_PTR fmkr, FM *p, bool quiet_mode, int *ierr)
       }
       fprintf(OF, "    >>\n"); // end of /Font
    }
-   if (fill_opacities != NULL || stroke_opacities != NULL) { // ExtGstate objects go here
+   if (fill_opacities != NULL || stroke_opacities != NULL) {
+      // ExtGstate objects go here
       Fill_Opacity_State *pf;
       Stroke_Opacity_State *ps;
       fprintf(OF, "    /ExtGState <<\n");
@@ -295,7 +393,8 @@ void Close_pdf(OBJ_PTR fmkr, FM *p, bool quiet_mode, int *ierr)
       }
       fprintf(OF, "    >>\n"); // end of /ExtGState
    }
-   if (xobj_list != NULL) { // Xobjects go here
+   if (xobj_list != NULL) {
+      // Xobjects go here
       XObject_Info *xo;
       fprintf(OF, "    /XObject <<\n");
       for (xo = xobj_list; xo != NULL; xo = xo->next) {
@@ -303,7 +402,8 @@ void Close_pdf(OBJ_PTR fmkr, FM *p, bool quiet_mode, int *ierr)
       }
       fprintf(OF, "    >>\n"); // end of /XObject
    }
-   if (shades_list != NULL) { // Shadings go here
+   if (shades_list != NULL) {
+      // Shadings go here
       Shading_Info *so;
       fprintf(OF, "    /Shading <<\n");
       for (so = shades_list; so != NULL; so = so->next) {
@@ -314,7 +414,8 @@ void Close_pdf(OBJ_PTR fmkr, FM *p, bool quiet_mode, int *ierr)
    fprintf(OF, "  >>\n"); // end of /Resources
    fprintf(OF, ">> endobj\n");
    Record_Object_Offset(CATALOG_OBJ);
-   fprintf(OF, "%i 0 obj <<\n/Type /Catalog\n/Pages %i 0 R\n>> endobj\n", CATALOG_OBJ, PAGES_OBJ);
+   fprintf(OF, "%i 0 obj <<\n/Type /Catalog\n/Pages %i 0 R\n>> endobj\n",
+           CATALOG_OBJ, PAGES_OBJ);
    Write_Font_Dictionaries();
    Write_Font_Descriptors();
    Write_Font_Widths();
@@ -326,17 +427,21 @@ void Close_pdf(OBJ_PTR fmkr, FM *p, bool quiet_mode, int *ierr)
    if (*ierr != 0) return;
    Write_Shadings();
    xref_offset = ftell(OF);
-   fprintf(OF, "xref\n0 %i\n0000000000 65535 f \n", num_objects);
-   for (i = 1; i < num_objects; i++) Print_Xref(obj_offsets[i]); // NB: DONT USE OBJECT 0
-   fprintf(OF, "trailer\n<<\n/Size %i\n/Root %i 0 R\n/Info %i 0 R\n>>\nstartxref\n%li\n%%%%EOF\n",
-      num_objects, CATALOG_OBJ, INFO_OBJ, xref_offset);
+   fprintf(OF, "xref\n0 %li\n0000000000 65535 f \n", num_objects);
+   for (i = 1; i < num_objects; i++)
+      Print_Xref(obj_offsets[i]); // NB: DONT USE OBJECT 0
+   fprintf(OF, "trailer\n<<\n/Size %li\n/Root %i 0 R\n/Info %i 0 "
+           "R\n>>\nstartxref\n%li\n%%%%EOF\n",
+           num_objects, CATALOG_OBJ, INFO_OBJ, xref_offset);
    fseek(OF, length_offset, SEEK_SET);
    fprintf(OF, "%li", stream_end - stream_start);
    fclose(OF);
    Free_Records(ierr);
 }
 
-void Rename_pdf(char *oldname, char *newname)
+
+void
+Rename_pdf(char *oldname, char *newname)
 {
    char old_ofile[300], new_ofile[300];
    Get_pdf_name(old_ofile, oldname, 300);

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

@@ -76,18 +76,23 @@
 */     
    
 
-void Free_JPG(JPG_Info *xo)
+void
+Free_JPG(JPG_Info *xo)
 {
    if (xo->filename != NULL) free(xo->filename);
 }
 
-void Free_Sampled(Sampled_Info *xo)
+
+void
+Free_Sampled(Sampled_Info *xo)
 {
    if (xo->image_data != NULL) free(xo->image_data);
    if (xo->lookup != NULL) free(xo->lookup);
 }
 
-static bool Is_monochrome(int obj_num)
+
+static bool
+Is_monochrome(int obj_num)
 {
    XObject_Info *xo;
    for (xo = xobj_list; xo != NULL; xo = xo->next) {
@@ -99,21 +104,32 @@ static bool Is_monochrome(int obj_num)
    return false;
 }
 
-static void Write_Image_From_File(char *filename, int width, int height, char *out_info, int mask_obj_num, int *ierr)
+
+static void
+Write_Image_From_File(char *filename, int width, int height, char *out_info,
+                      int mask_obj_num, int *ierr)
 {
    FILE *jpg = fopen(filename, "r");
-   if (jpg == NULL) { RAISE_ERROR_s("Sorry: cannot open file for showing image (%s)\n", filename, ierr); return; }
+   if (jpg == NULL) {
+      RAISE_ERROR_s("Sorry: cannot open file for showing image (%s)\n",
+                    filename, ierr);
+      return;
+   }
    unsigned char *buff;
    int len, rd_len;
    int buff_len = 256000;
    buff = ALLOC_N_unsigned_char(buff_len);
    len = 0;
-   while ((rd_len = fread(buff, 1, buff_len, jpg)) == buff_len) len += buff_len;
+   while ((rd_len = fread(buff, 1, buff_len, jpg)) == buff_len) {
+      len += buff_len;
+   }
    len += rd_len;
    fprintf(OF, "\t/Subtype /Image\n");
    if (mask_obj_num > 0) {
-      if (!Is_monochrome(mask_obj_num)) fprintf(OF, "\t/SMask %i 0 R\n", mask_obj_num);
-      else fprintf(OF, "\t/Mask %i 0 R\n", mask_obj_num);
+      if (!Is_monochrome(mask_obj_num))
+         fprintf(OF, "\t/SMask %i 0 R\n", mask_obj_num);
+      else
+         fprintf(OF, "\t/Mask %i 0 R\n", mask_obj_num);
    }
    fprintf(OF, "\t/Width %i\n", width);
    fprintf(OF, "\t/Height %i\n", height);
@@ -122,23 +138,32 @@ static void Write_Image_From_File(char *filename, int width, int height, char *o
    if (len < buff_len) fwrite(buff, 1, len, OF);
    else {
       rewind(jpg);
-      while ((rd_len = fread(buff, 1, buff_len, jpg)) == buff_len) fwrite(buff, 1, buff_len, OF);
+      while ((rd_len = fread(buff, 1, buff_len, jpg)) == buff_len) {
+         fwrite(buff, 1, buff_len, OF);
+      }
       fwrite(buff, 1, rd_len, OF);
    }
    fprintf(OF, "\nendstream\n");
    fclose(jpg);
 }
 
-void Write_JPG(JPG_Info *xo, int *ierr)
+
+void
+Write_JPG(JPG_Info *xo, int *ierr)
 {
    Write_Image_From_File(xo->filename, xo->width, xo->height, 
-      "\t/Filter /DCTDecode\n\t/ColorSpace /DeviceRGB\n\t/BitsPerComponent 8\n", xo->mask_obj_num, ierr);
+                         "\t/Filter /DCTDecode\n\t/ColorSpace "
+                         "/DeviceRGB\n\t/BitsPerComponent 8\n",
+                         xo->mask_obj_num, ierr);
 }
 
-void Write_Sampled(Sampled_Info *xo, int *ierr)
+
+void
+Write_Sampled(Sampled_Info *xo, int *ierr)
 {
    fprintf(OF, "\n\t/Subtype /Image\n");
-   fprintf(OF, "\t/Filter /FlateDecode\n\t/Interpolate %s\n", (xo->interpolate)? "true":"false");
+   fprintf(OF, "\t/Filter /FlateDecode\n\t/Interpolate %s\n",
+           (xo->interpolate)? "true":"false");
    fprintf(OF, "\t/Height %i\n", xo->height);
    fprintf(OF, "\t/Width %i\n", xo->width);
    int i, len;
@@ -177,16 +202,22 @@ void Write_Sampled(Sampled_Info *xo, int *ierr)
    }
    if (xo->mask_obj_num > 0) {
       if (xo->image_type == MONO_IMAGE) {
-         RAISE_ERROR("Sorry: monochrome images must not have masks", ierr); return; }
-      if (!Is_monochrome(xo->mask_obj_num)) fprintf(OF, "\t/SMask %i 0 R\n", xo->mask_obj_num);
-      else fprintf(OF, "\t/Mask %i 0 R\n", xo->mask_obj_num);
+         RAISE_ERROR("Sorry: monochrome images must not have masks", ierr);
+         return;
+      }
+      if (!Is_monochrome(xo->mask_obj_num))
+         fprintf(OF, "\t/SMask %i 0 R\n", xo->mask_obj_num);
+      else
+         fprintf(OF, "\t/Mask %i 0 R\n", xo->mask_obj_num);
    }
-   if (xo->value_mask_min >= 0 && xo->value_mask_max >= 0 &&
-      xo->value_mask_min <= 255 && xo->value_mask_max <= 255 && xo->value_mask_min <= xo->value_mask_max)
+   if (xo->value_mask_min >= 0 && xo->value_mask_max >= 0
+       && xo->value_mask_min <= 255 && xo->value_mask_max <= 255
+       && xo->value_mask_min <= xo->value_mask_max)
       fprintf(OF, "\t/Mask [%i %i]\n", xo->value_mask_min, xo->value_mask_max);
    new_len = (xo->length * 11)/10 + 100;
    buffer = ALLOC_N_unsigned_char(new_len);
-   if (do_flate_compress(buffer, &new_len, xo->image_data, xo->length) != FLATE_OK) {
+   if (do_flate_compress(buffer, &new_len, xo->image_data, xo->length)
+       != FLATE_OK) {
       free(buffer);
       RAISE_ERROR("Error compressing image data", ierr); 
       return;
@@ -194,25 +225,35 @@ void Write_Sampled(Sampled_Info *xo, int *ierr)
    fprintf(OF, "\t/Length %li\n", new_len);
    fprintf(OF, "\t>>\nstream\n");
    if (fwrite(buffer, 1, new_len, OF) < new_len) {
-      RAISE_ERROR("Error writing image data", ierr);  return; }
+      RAISE_ERROR("Error writing image data", ierr);
+      return;
+   }
    free(buffer);
    fprintf(OF, "\nendstream\nendobj\n");
 }
 
-static void Create_Transform_from_Points( // transform maps (0,0), (1,0), and (0,1) to the given points
-   double llx, double lly, double lrx, double lry, double ulx, double uly,
-   double *a, double *b, double *c, double *d, double *e, double *f)
+
+// transform maps (0,0), (1,0), and (0,1) to the given points
+static void
+Create_Transform_from_Points(double llx, double lly, double lrx, double lry,
+                             double ulx, double uly, double *a, double *b,
+                             double *c, double *d, double *e, double *f)
 {
    *e = llx; *f = lly; lrx -= llx; ulx -= llx; lry -= lly; uly -= lly;
    *a = lrx; *b = lry; *c = ulx; *d = uly;
 }
 
-static void Get_Image_Dest(FM *p, OBJ_PTR image_destination, double *dest, int *ierr)
+
+static void
+Get_Image_Dest(FM *p, OBJ_PTR image_destination, double *dest, int *ierr)
 {
    int len = Array_Len(image_destination,ierr);
    if (*ierr != 0) return;
    if (len != 6) {
-      RAISE_ERROR("Sorry: invalid image destination array: must have 6 entries", ierr); return; }
+      RAISE_ERROR("Sorry: invalid image destination array: "
+                  "must have 6 entries", ierr);
+      return;
+   }
    int i;
    for (i = 0; i < 6; i++) {
       OBJ_PTR entry = Array_Entry(image_destination, i, ierr);
@@ -225,11 +266,15 @@ static void Get_Image_Dest(FM *p, OBJ_PTR image_destination, double *dest, int *
    }
 }
 
-static void Show_JPEG(FM *p, char *filename, int width, int height, double *dest, int subtype, int mask_obj_num)
+
+static void
+Show_JPEG(FM *p, char *filename, int width, int height, double *dest,
+          int subtype, int mask_obj_num)
 {
    JPG_Info *xo = (JPG_Info *)calloc(1,sizeof(JPG_Info));
    xo->xobj_subtype = subtype;
-   double llx = dest[0], lly = dest[1], lrx = dest[2], lry = dest[3], ulx = dest[4],  uly = dest[5];
+   double llx = dest[0], lly = dest[1], lrx = dest[2], lry = dest[3],
+      ulx = dest[4], uly = dest[5];
    double a, b, c, d, e, f; // the transform to position the image
    xo->next = xobj_list;
    xobj_list = (XObject_Info *)xo;
@@ -240,54 +285,79 @@ static void Show_JPEG(FM *p, char *filename, int width, int height, double *dest
    xo->width = width;
    xo->height = height;
    xo->mask_obj_num = mask_obj_num;
-   Create_Transform_from_Points(llx, lly, lrx, lry, ulx, uly, &a, &b, &c, &d, &e, &f);
-   fprintf(TF, "q %0.2f %0.2f %0.2f %0.2f %0.2f %0.2f cm /XObj%i Do Q\n", a, b, c, d, e, f, xo->xo_num);
+   Create_Transform_from_Points(llx, lly, lrx, lry, ulx, uly,
+                                &a, &b, &c, &d, &e, &f);
+   fprintf(TF, "q %0.2f %0.2f %0.2f %0.2f %0.2f %0.2f cm /XObj%i Do Q\n",
+           a, b, c, d, e, f, xo->xo_num);
    update_bbox(p, llx, lly);
    update_bbox(p, lrx, lry);
    update_bbox(p, ulx, uly);
    update_bbox(p, lrx+ulx-llx, lry+uly-lly);
 }
 
-void c_private_show_jpg(OBJ_PTR fmkr, FM *p, char *filename, 
-   int width, int height, OBJ_PTR image_destination, int mask_obj_num, int *ierr) {
+
+void
+c_private_show_jpg(OBJ_PTR fmkr, FM *p, char *filename, 
+                   int width, int height, OBJ_PTR image_destination,
+                   int mask_obj_num, int *ierr)
+{
    double dest[6];
    if (constructing_path) {
-      RAISE_ERROR("Sorry: must finish with current path before calling show_jpg", ierr); return; }
+      RAISE_ERROR("Sorry: must finish with current path before "
+                  "calling show_jpg", ierr);
+      return;
+   }
    Get_Image_Dest(p, image_destination, dest, ierr);
    if (*ierr != 0) return;
    Show_JPEG(p, filename, width, height, dest, JPG_SUBTYPE, mask_obj_num);
 }
 
-OBJ_PTR c_private_create_image_data(OBJ_PTR fmkr, FM *p, OBJ_PTR table,
-            int first_row, int last_row, int first_column, int last_column,
-            double min_val, double max_val, int max_code, int if_below_range, int if_above_range, int *ierr)
+
+OBJ_PTR
+c_private_create_image_data(OBJ_PTR fmkr, FM *p, OBJ_PTR table,
+                            int first_row, int last_row, int first_column,
+                            int last_column, double min_val, double max_val,
+                            int max_code, int if_below_range,
+                            int if_above_range, int *ierr)
 {
    long num_cols, num_rows;
    double **data = Table_Data_for_Read(table, &num_cols, &num_rows, ierr);
    if (*ierr != 0) RETURN_NIL;
    if (first_column < 0) first_column += num_cols;
    if (first_column < 0 || first_column >= num_cols)
-      RAISE_ERROR_i("Sorry: invalid first_column specification (%i)", first_column, ierr);
+      RAISE_ERROR_i("Sorry: invalid first_column specification (%i)",
+                    first_column, ierr);
    if (last_column < 0) last_column += num_cols;
    if (last_column < 0 || last_column >= num_cols)
-      RAISE_ERROR_i("Sorry: invalid last_column specification (%i)", last_column, ierr);
+      RAISE_ERROR_i("Sorry: invalid last_column specification (%i)",
+                    last_column, ierr);
    if (first_row < 0) first_row += num_rows;
    if (first_row < 0 || first_row >= num_rows)
-      RAISE_ERROR_i("Sorry: invalid first_row specification (%i)", first_row, ierr);
+      RAISE_ERROR_i("Sorry: invalid first_row specification (%i)",
+                    first_row, ierr);
    if (last_row < 0) last_row += num_rows;
    if (last_row < 0 || last_row >= num_rows)
-      RAISE_ERROR_i("Sorry: invalid last_row specification (%i)", last_row, ierr);
+      RAISE_ERROR_i("Sorry: invalid last_row specification (%i)",
+                    last_row, ierr);
    if (min_val >= max_val)
-      RAISE_ERROR_gg("Sorry: invalid range specification: min %g max %g", min_val, max_val, ierr);
+      RAISE_ERROR_gg("Sorry: invalid range specification: min %g max %g",
+                     min_val, max_val, ierr);
    if (max_code <= 0 || max_code > 255)
-      RAISE_ERROR_i("Sorry: invalid max_code specification (%i)", max_code, ierr);
+      RAISE_ERROR_i("Sorry: invalid max_code specification (%i)",
+                    max_code, ierr);
    if (if_below_range < 0 || if_below_range > 255)
-      RAISE_ERROR_i("Sorry: invalid if_below_range specification (%i)", if_below_range, ierr);
+      RAISE_ERROR_i("Sorry: invalid if_below_range specification (%i)",
+                    if_below_range, ierr);
    if (if_above_range < 0 || if_above_range > 255)
-      RAISE_ERROR_i("Sorry: invalid if_above_range specification (%i)", if_above_range, ierr);
-   int i, j, k, width = last_column - first_column + 1, height = last_row - first_row + 1;
+      RAISE_ERROR_i("Sorry: invalid if_above_range specification (%i)",
+                    if_above_range, ierr);
+   int i, j, k;
+   int width = last_column - first_column + 1;
+   int height = last_row - first_row + 1;
    int sz = width * height;
-   if (sz <= 0) RAISE_ERROR_ii("Sorry: invalid data specification: width (%i) height (%i)", width, height, ierr);
+   if (sz <= 0)
+      RAISE_ERROR_ii("Sorry: invalid data specification: width (%i) "
+                     "height (%i)", width, height, ierr);
    if (*ierr != 0) RETURN_NIL;
    char *buff = ALLOC_N_char(sz);
    for (k = 0, i = first_row; i <= last_row; i++) {
@@ -308,30 +378,43 @@ OBJ_PTR c_private_create_image_data(OBJ_PTR fmkr, FM *p, OBJ_PTR table,
 }
 
 
-OBJ_PTR c_private_create_monochrome_image_data(OBJ_PTR fmkr, FM *p, OBJ_PTR table,
-            int first_row, int last_row, int first_column, int last_column,
-            double boundary, bool reversed, int *ierr)
+OBJ_PTR
+c_private_create_monochrome_image_data(OBJ_PTR fmkr, FM *p, OBJ_PTR table,
+                                       int first_row, int last_row,
+                                       int first_column, int last_column,
+                                       double boundary, bool reversed,
+                                       int *ierr)
 {
    long num_cols, num_rows;
    double **data = Table_Data_for_Read(table, &num_cols, &num_rows, ierr);
    if (*ierr != 0) RETURN_NIL;
    if (first_column < 0) first_column += num_cols;
    if (first_column < 0 || first_column >= num_cols)
-      RAISE_ERROR_i("Sorry: invalid first_column specification (%i)", first_column, ierr);
+      RAISE_ERROR_i("Sorry: invalid first_column specification (%i)",
+                    first_column, ierr);
    if (last_column < 0) last_column += num_cols;
    if (last_column < 0 || last_column >= num_cols)
-      RAISE_ERROR_i("Sorry: invalid last_column specification (%i)", last_column, ierr);
+      RAISE_ERROR_i("Sorry: invalid last_column specification (%i)",
+                    last_column, ierr);
    if (first_row < 0) first_row += num_rows;
    if (first_row < 0 || first_row >= num_rows)
-      RAISE_ERROR_i("Sorry: invalid first_row specification (%i)", first_row, ierr);
+      RAISE_ERROR_i("Sorry: invalid first_row specification (%i)",
+                    first_row, ierr);
    if (last_row < 0) last_row += num_rows;
    if (last_row < 0 || last_row >= num_rows)
-      RAISE_ERROR_i("Sorry: invalid last_row specification (%i)", last_row, ierr);
-   int i, j, k, width = last_column - first_column + 1, height = last_row - first_row + 1, bytes_per_row = (width+7)/8;
+      RAISE_ERROR_i("Sorry: invalid last_row specification (%i)",
+                    last_row, ierr);
+   int i, j, k;
+   int width = last_column - first_column + 1;
+   int height = last_row - first_row + 1;
+   int bytes_per_row = (width+7)/8;
    int sz = bytes_per_row * 8 * height;
-   if (sz <= 0) RAISE_ERROR_ii("Sorry: invalid data specification: width (%i) height (%i)", width, height, ierr);
+   if (sz <= 0)
+      RAISE_ERROR_ii("Sorry: invalid data specification: width (%i) "
+                     "height (%i)", width, height, ierr);
    if (*ierr != 0) RETURN_NIL;
-   // to simplify the process, do it in two stages: first get the values and then pack the bits
+   // to simplify the process, do it in two stages: first get the
+   // values and then pack the bits
    char *buff = ALLOC_N_char(sz);
    for (k = 0, i = first_row; i <= last_row; i++) {
       double *row = data[i];
@@ -362,13 +445,21 @@ OBJ_PTR c_private_create_monochrome_image_data(OBJ_PTR fmkr, FM *p, OBJ_PTR tabl
 }
 
 
-OBJ_PTR c_private_show_image(OBJ_PTR fmkr, FM *p, int image_type, double llx, double lly, double lrx, double lry,
-    double ulx, double uly, bool interpolate, bool reversed, int w, int h, unsigned char* data, long len, 
-    OBJ_PTR mask_min, OBJ_PTR mask_max, OBJ_PTR hivalue, OBJ_PTR lookup_data, int mask_obj_num, int *ierr)
+OBJ_PTR
+c_private_show_image(OBJ_PTR fmkr, FM *p, int image_type, double llx,
+                     double lly, double lrx, double lry, double ulx,
+                     double uly, bool interpolate, bool reversed,
+                     int w, int h, unsigned char* data, long len, 
+                     OBJ_PTR mask_min, OBJ_PTR mask_max, OBJ_PTR hivalue,
+                     OBJ_PTR lookup_data, int mask_obj_num, int *ierr)
 {
-   unsigned char *lookup=NULL;
-   int value_mask_min = 256, value_mask_max = 256, lookup_len=0, hival=0;
-   if (constructing_path) { RAISE_ERROR("Sorry: must finish with current path before calling show_image", ierr); RETURN_NIL; }
+   unsigned char *lookup = NULL;
+   int value_mask_min = 256, value_mask_max = 256, lookup_len = 0, hival = 0;
+   if (constructing_path) {
+      RAISE_ERROR("Sorry: must finish with current path before calling "
+                  "show_image", ierr);
+      RETURN_NIL;
+   }
    if (image_type == COLORMAP_IMAGE) {
       value_mask_min = Number_to_int(mask_min, ierr);
       value_mask_max = Number_to_int(mask_max, ierr);
@@ -378,17 +469,17 @@ OBJ_PTR c_private_show_image(OBJ_PTR fmkr, FM *p, int image_type, double llx, do
       if (*ierr != 0) RETURN_NIL;
    }
    
-   llx = convert_figure_to_output_x(p,llx);
-   lly = convert_figure_to_output_y(p,lly);
-   lrx = convert_figure_to_output_x(p,lrx);
-   lry = convert_figure_to_output_y(p,lry);
-   ulx = convert_figure_to_output_x(p,ulx);
-   uly = convert_figure_to_output_y(p,uly);
-
-   Sampled_Info *xo = (Sampled_Info *)calloc(1,sizeof(Sampled_Info));
+   llx = convert_figure_to_output_x(p, llx);
+   lly = convert_figure_to_output_y(p, lly);
+   lrx = convert_figure_to_output_x(p, lrx);
+   lry = convert_figure_to_output_y(p, lry);
+   ulx = convert_figure_to_output_x(p, ulx);
+   uly = convert_figure_to_output_y(p, uly);
+
+   Sampled_Info *xo = (Sampled_Info *)calloc(1, sizeof(Sampled_Info));
    xo->xobj_subtype = SAMPLED_SUBTYPE;
    double a, b, c, d, e, f; // the transform to position the image
-   int ir, ic, id;
+   //int ir, ic, id;
    xo->next = xobj_list;
    xobj_list = (XObject_Info *)xo;
    xo->xo_num = next_available_xo_number++;
@@ -402,7 +493,9 @@ OBJ_PTR c_private_show_image(OBJ_PTR fmkr, FM *p, int image_type, double llx, do
    if (image_type != COLORMAP_IMAGE) xo->lookup = NULL;
    else {
       if ((hival+1)*3 > lookup_len) {
-         RAISE_ERROR_ii("Sorry: color space hival (%i) is too large for length of lookup table (%i)", hival, lookup_len, ierr);
+         RAISE_ERROR_ii("Sorry: color space hival (%i) is too large for "
+                        "length of lookup table (%i)", hival, lookup_len,
+                        ierr);
          RETURN_NIL;
       }
       xo->hival = hival;
@@ -416,9 +509,13 @@ OBJ_PTR c_private_show_image(OBJ_PTR fmkr, FM *p, int image_type, double llx, do
    xo->value_mask_min = value_mask_min;
    xo->value_mask_max = value_mask_max;
    xo->mask_obj_num = mask_obj_num;
-   if (mask_obj_num == -1) return Integer_New(xo->obj_num); // this image is being used as an opacity mask
-   Create_Transform_from_Points(llx, lly, lrx, lry, ulx, uly, &a, &b, &c, &d, &e, &f);
-   fprintf(TF, "q %0.2f %0.2f %0.2f %0.2f %0.2f %0.2f cm /XObj%i Do Q\n", a, b, c, d, e, f, xo->xo_num);
+   if (mask_obj_num == -1)
+      return Integer_New(xo->obj_num); // this image is being used as
+                                       // an opacity mask
+   Create_Transform_from_Points(llx, lly, lrx, lry, ulx, uly,
+                                &a, &b, &c, &d, &e, &f);
+   fprintf(TF, "q %0.2f %0.2f %0.2f %0.2f %0.2f %0.2f cm /XObj%i Do Q\n",
+           a, b, c, d, e, f, xo->xo_num);
    update_bbox(p, llx, lly);
    update_bbox(p, lrx, lry);
    update_bbox(p, ulx, uly);