diff --git a/xfig-3.2.4-mkstemp.dif b/xfig-3.2.5-mkstemp.dif
similarity index 74%
rename from xfig-3.2.4-mkstemp.dif
rename to xfig-3.2.5-mkstemp.dif
index 916f594..73c7e36 100644
--- a/xfig-3.2.4-mkstemp.dif
+++ b/xfig-3.2.5-mkstemp.dif
@@ -1,6 +1,10 @@
---- xfig.3.2.4/f_readeps.c
-+++ xfig.3.2.4/f_readeps.c	2003-05-06 12:07:54.000000000 +0200
-@@ -258,7 +258,7 @@
+--- f_readeps.c
++++ f_readeps.c	2007-05-07 15:27:12.135432181 +0200
+@@ -250,11 +250,10 @@ bitmap_from_gs(file, filetype, pic, urx,
+     int         urx, llx, ury, lly;
+     int         pdf_flag;
+ {
+-    static	tempseq = 0;
      char        buf[300];
      FILE       *tmpfp, *pixfile, *gsfile;
      char       *psnam, *driver;
@@ -9,48 +13,48 @@
      char        tmpfile[PATH_MAX],
  		pixnam[PATH_MAX],
  		errnam[PATH_MAX],
-@@ -274,8 +274,12 @@
+@@ -270,8 +269,12 @@ bitmap_from_gs(file, filetype, pic, urx,
  	/* re-open the pipe */
  	close_picfile(file, filetype);
- 	file = open_picfile(file, &filetype, PIPEOK, pixnam);
+ 	file = open_picfile(tmpfile, &filetype, PIPEOK, pixnam);
 -	sprintf(tmpfile, "%s/%s%06d", TMPDIR, "xfig-eps", getpid());
 -	if ((tmpfp = fopen(tmpfile, "wb")) == NULL) {
-+   snprintf(tmpfile, sizeof(tmpfile), "%s/xfig-eps.XXXXXX", TMPDIR);
-+   if ((fd = mkstemp(tmpfile)) == -1 || (tmpfp = fdopen(fd, "wb")) == NULL) {
-+      if (fd != -1) {
-+         unlink(tmpfile);
-+         close(fd);
-+      }
++	snprintf(tmpfile, sizeof(tmpfile), "%s/xfig-eps.XXXXXX", TMPDIR);
++	if ((fd = mkstemp(tmpfile)) == -1 || (tmpfp = fdopen(fd, "wb")) == NULL) {
++	    if (fd != -1) {
++		unlink(tmpfile);
++		close(fd);
++	    }
  	    file_msg("Couldn't open tmp file %s, %s", tmpfile, strerror(errno));
  	    return False;
  	}
-@@ -284,9 +288,21 @@
+@@ -280,10 +283,20 @@ bitmap_from_gs(file, filetype, pic, urx,
  	fclose(tmpfp);
      }
-     /* make name /TMPDIR/xfig-pic.pix */
--    sprintf(pixnam, "%s/%s%06d.pix", TMPDIR, "xfig-pic", getpid());
-+	snprintf(pixnam, sizeof(pixnam), "%s/xfig-pic.XXXXXX", TMPDIR);
-+	if ((fd = mkstemp(pixnam)) == -1) {
-+	    file_msg("Couldn't open tmp file %s, %s", pixnam, strerror(errno));
-+	    return False;
-+	}
-+	close(fd);
+     /* make name /TMPDIR/xfig-pic######.pix */
+-    sprintf(pixnam, "%s/%s%06d.pix", TMPDIR, "xfig-pic", tempseq);
++    snprintf(pixnam, sizeof(pixnam), "%s/xfig-pic.XXXXXX", TMPDIR);
++    if ((fd = mkstemp(pixnam)) == -1) {
++	file_msg("Couldn't open tmp file %s, %s", pixnam, strerror(errno));
++	return False;
++    }
++    close(fd);
 +
      /* and file name for any error messages from gs */
--    sprintf(errnam, "%s/%s%06d.err", TMPDIR, "xfig-pic", getpid());
+-    sprintf(errnam, "%s/%s%06d.err", TMPDIR, "xfig-pic", tempseq);
+-    tempseq++;
 +    snprintf(errnam, sizeof(errnam), "%s/xfig-picerr.XXXXXX", TMPDIR);
-+	if ((fd = mkstemp(errnam)) == -1) {
-+	    file_msg("Couldn't open tmp file %s, %s", errnam, strerror(errno));
-+	    return False;
-+	}
-+	close(fd);
-+
++    if ((fd = mkstemp(errnam)) == -1) {
++	file_msg("Couldn't open tmp file %s, %s", errnam, strerror(errno));
++	return False;
++    }
++    close(fd);
+ 
      /* generate gs command line */
      /* for monochrome, use pbm */
-     if (tool_cells <= 2 || appres.monochrome) {
---- xfig.3.2.4/f_readgif.c
-+++ xfig.3.2.4/f_readgif.c	2003-05-06 11:56:53.000000000 +0200
-@@ -75,7 +75,7 @@
+--- f_readgif.c
++++ f_readgif.c	2003-05-06 11:56:53.000000000 +0200
+@@ -76,7 +76,7 @@ read_gif(FILE *file, int filetype, F_pic
  	char		buf[BUFLEN],pcxname[PATH_MAX];
  	FILE		*giftopcx;
  	struct Cmap 	localColorMap[MAX_COLORMAP_SIZE];
@@ -59,7 +63,7 @@
  	int		useGlobalColormap;
  	unsigned int	bitPixel, red, green, blue;
  	unsigned char	c;
-@@ -172,7 +172,13 @@
+@@ -173,7 +173,13 @@ read_gif(FILE *file, int filetype, F_pic
  	/* now call giftopnm and ppmtopcx */
  
  	/* make name for temp output file */
@@ -74,9 +78,9 @@
  	/* make command to convert gif to pcx into temp file */
  	sprintf(buf, "giftopnm | ppmtopcx > %s 2> /dev/null", pcxname);
  	if ((giftopcx = popen(buf,"w" )) == 0) {
---- xfig.3.2.4/f_readppm.c
-+++ xfig.3.2.4/f_readppm.c	2003-05-06 11:56:53.000000000 +0200
-@@ -33,10 +33,16 @@
+--- f_readppm.c
++++ f_readppm.c	2003-05-06 11:56:53.000000000 +0200
+@@ -34,10 +34,16 @@ read_ppm(FILE *file, int filetype, F_pic
  {
  	char	 buf[BUFLEN],pcxname[PATH_MAX];
  	FILE	*giftopcx;
@@ -95,9 +99,9 @@
  	/* make command to convert gif to pcx into temp file */
  	sprintf(buf, "ppmtopcx > %s 2> /dev/null", pcxname);
  	if ((giftopcx = popen(buf,"w" )) == 0) {
---- xfig.3.2.4/f_readtif.c
-+++ xfig.3.2.4/f_readtif.c	2003-05-06 11:56:53.000000000 +0200
-@@ -32,11 +32,16 @@
+--- f_readtif.c
++++ f_readtif.c	2003-05-06 11:56:53.000000000 +0200
+@@ -33,11 +33,16 @@ read_tif(char *filename, int filetype, F
  {
  	char	 buf[2*PATH_MAX+40],pcxname[PATH_MAX];
  	FILE	*tiftopcx;
@@ -117,10 +121,10 @@
  	/* make command to convert tif to pnm then to pcx into temp file */
  	/* for some reason, tifftopnm requires a file and can't work in a pipe */
  	sprintf(buf, "tifftopnm %s 2> /dev/null | ppmtopcx > %s 2> /dev/null",
---- xfig.3.2.4/f_util.c
-+++ xfig.3.2.4/f_util.c	2003-05-06 12:13:22.000000000 +0200
-@@ -902,14 +902,20 @@
-     char	*name;
+--- f_util.c
++++ f_util.c	2003-05-06 12:13:22.000000000 +0200
+@@ -906,14 +906,20 @@ void update_xfigrc(char *name, char *str
+ int strain_out(char *name)
  {
      char    line[RC_BUFSIZ+1], *tok;
 +    int fd;
@@ -145,9 +149,9 @@
      }
      /* read the .xfigrc file and write all to temp file except file names */
      xfigrc = fopen(xfigrc_name,"r");
---- xfig.3.2.4/main.c
-+++ xfig.3.2.4/main.c	2003-05-06 11:56:53.000000000 +0200
-@@ -621,8 +621,10 @@
+--- main.c
++++ main.c	2003-05-06 11:56:53.000000000 +0200
+@@ -671,8 +671,10 @@ void main(int argc, char **argv)
      update_figs = False;
  
      /* get the TMPDIR environment variable for temporary files */
@@ -160,7 +164,7 @@
  
      /* first check args to see if user wants to scale the figure as it is
  	read in and make sure it is a resonable (positive) number */
-@@ -1631,7 +1633,14 @@
+@@ -1687,7 +1689,14 @@ make_cut_buf_name(void)
      if (userhome != NULL && *strcpy(cut_buf_name, userhome) != '\0') {
  	strcat(cut_buf_name, "/.xfig");
      } else {
@@ -176,9 +180,9 @@
      }
  }
  
---- xfig.3.2.4/mode.c
-+++ xfig.3.2.4/mode.c	2003-05-06 11:56:53.000000000 +0200
-@@ -93,7 +93,7 @@
+--- mode.c
++++ mode.c	2003-05-06 11:56:53.000000000 +0200
+@@ -86,7 +86,7 @@ int		min_num_points;
  
  int		cur_exp_lang;		/* gets initialized in main.c */
  Boolean		batch_exists = False;
@@ -187,9 +191,9 @@
  
  /*******************************************************************/
  /* If you change the order of the lang_items[] you must change the */
---- xfig.3.2.4/u_print.c
-+++ xfig.3.2.4/u_print.c	2003-05-06 12:18:47.000000000 +0200
-@@ -85,9 +85,16 @@
+--- u_print.c
++++ u_print.c	2007-05-07 15:29:17.948727463 +0200
+@@ -92,9 +92,16 @@ void print_to_printer(char *printer, cha
      char	    syspr[2*PATH_MAX+200];
      char	    tmpfile[PATH_MAX];
      char	   *name;
@@ -207,31 +211,30 @@
      init_write_tmpfile();
      if (write_file(tmpfile, False)) {
        end_write_tmpfile();
-@@ -166,14 +173,21 @@
-     char	    tmp_name[PATH_MAX];
+@@ -190,12 +197,21 @@ int print_to_file(char *file, char *lang
      char	    tmp_fig_file[PATH_MAX];
      char	   *outfile, *name, *real_lang;
-+    int     fd;
+     char	   *suf;
++    int		   fd;
  
      /* if file exists, ask if ok */
      if (!ok_to_write(file, "EXPORT"))
  	return (1);
  
 -    sprintf(tmp_fig_file, "%s/%s%06d", TMPDIR, "xfig-fig", getpid());
--    /* write the fig objects to a temporary file */
++    
 +    snprintf(tmp_fig_file, sizeof(tmp_fig_file), "%s/xfig-fig.XXXXXX", TMPDIR);
-     warnexist = False;
 +    if ((fd = mkstemp(tmp_fig_file)) == -1) {
-+      file_msg("Can't open temp file %s: %s\n", tmp_fig_file,
-+             strerror(errno));
-+      return 1;
++	file_msg("Can't open temp file %s: %s\n", tmp_fig_file,
++		 strerror(errno));
++	return 1;
 +    }
 +    close(fd);
 +
+     /* write the fig objects to a temporary file */
+     warnexist = False;
      init_write_tmpfile();
-     if (write_file(tmp_fig_file, False)) {
-       end_write_tmpfile();
-@@ -491,10 +505,16 @@
+@@ -648,10 +664,16 @@ exec_prcmd(char *command, char *msg)
      char   errfname[PATH_MAX];
      FILE  *errfile;
      char   str[400];
@@ -250,10 +253,10 @@
      /* direct any output from fig2dev to this file */
      strcat(command, " 2> "); 
      strcat(command, errfname); 
---- xfig.3.2.4/w_print.c
-+++ xfig.3.2.4/w_print.c	2003-05-06 12:20:46.000000000 +0200
-@@ -289,9 +289,10 @@
-     Widget	    w;
+--- w_print.c
++++ w_print.c	2003-05-06 12:20:46.000000000 +0200
+@@ -294,9 +294,10 @@ void
+ do_print_batch(Widget w)
  {
  	FILE	   *infp,*outfp;
 -	char	    tmp_exp_file[32];
@@ -264,7 +267,7 @@
  
  	if (writing_batch || emptyfigure_msg(print_msg))
  		return;
-@@ -300,11 +301,20 @@
+@@ -305,11 +306,20 @@ do_print_batch(Widget w)
  	/* this could happen if the user presses the button too fast */
  	writing_batch = True;
  
@@ -289,7 +292,7 @@
  	if (!print_popup) 
  		create_print_panel(w);
  
-@@ -317,6 +327,12 @@
+@@ -322,6 +332,12 @@ do_print_batch(Widget w)
  	/* make a #rrggbb string from the background color */
  	make_rgb_string(export_background_color, backgrnd);
  
@@ -300,11 +303,11 @@
 +	close(fd);
 +
  	/* get grid params and assemble into fig2dev parm */
- 	get_grid_spec(grid, print_grid_minor_text);
+ 	get_grid_spec(grid, print_grid_minor_text, print_grid_major_text);
  
---- xfig.3.2.4/w_srchrepl.c
-+++ xfig.3.2.4/w_srchrepl.c	2003-05-06 11:56:53.000000000 +0200
-@@ -795,7 +795,7 @@
+--- w_srchrepl.c
++++ w_srchrepl.c	2003-05-06 11:56:53.000000000 +0200
+@@ -787,7 +787,7 @@ spell_check(void)
    char	 *cmd;
    char	  str[300];
    FILE	 *fp;
@@ -313,7 +316,7 @@
    Boolean done = FALSE;
    static int lines = 0;
  
-@@ -811,9 +811,12 @@
+@@ -803,9 +803,12 @@ spell_check(void)
    }
    lines = 0;
  
diff --git a/xfig.3.2.3d-xcolor.dif b/xfig.3.2.3d-xcolor.dif
deleted file mode 100644
index 660b6ee..0000000
--- a/xfig.3.2.3d-xcolor.dif
+++ /dev/null
@@ -1,10 +0,0 @@
---- w_color.c
-+++ w_color.c
-@@ -1288,6 +1288,7 @@
- 
- create_cell(indx, color)
-     int		indx;
-+    XColor      color;
- {
-     char	labl[5];
- 
diff --git a/xfig.3.2.3d-xim.dif b/xfig.3.2.3d-xim.dif
deleted file mode 100644
index f5c552d..0000000
--- a/xfig.3.2.3d-xim.dif
+++ /dev/null
@@ -1,33 +0,0 @@
---- xfig.3.2.3d/d_text.c
-+++ xfig.3.2.3d/d_text.c
-@@ -1485,6 +1485,7 @@
-   int i;
-   XVaNestedList preedit_att, status_att;
-   XPoint spot;
-+  char *modifier_list;
- 
-   preferred_style = style_notuseful;
-   if (strncasecmp(appres.xim_input_style, "OverTheSpot", 3) == 0)
-@@ -1501,6 +1502,10 @@
-   if (preferred_style == style_notuseful) return;
- 
-   if (appres.DEBUG) fprintf(stderr, "initialize_input_method()...\n");
-+  
-+  if((modifier_list = XSetLocaleModifiers("")) == NULL) {
-+	  /* printf("Warning: XSetLocaleModifiers() failed.\n"); */
-+  }
- 
-   xim_im = XOpenIM(XtDisplay(w), NULL, NULL, NULL);
-   if (xim_im == NULL) {
-@@ -1517,7 +1522,10 @@
-       if (xim_style == 0) xim_style = style_root;
-     }
-   }
--  if (xim_style != preferred_style) {
-+  if (xim_style != preferred_style
-+      && *modifier_list != '\0'
-+      && ! strstr(modifier_list,"@im=local")
-+      && ! strstr(modifier_list,"@im=none")) {
-     fprintf(stderr, "xfig: this input-method doesn't support %s input style\n",
- 	    appres.xim_input_style);
-     if (xim_style == 0) {
diff --git a/xfig.3.2.4-gcc4.dif b/xfig.3.2.4-gcc4.dif
deleted file mode 100644
index 2668f0a..0000000
--- a/xfig.3.2.4-gcc4.dif
+++ /dev/null
@@ -1,11 +0,0 @@
---- w_color.c
-+++ w_color.c	2005/08/31 10:42:32
-@@ -1057,7 +1057,7 @@
- {
-     F_compound  *c;
-     int		 i, count;
--    char	 buf[10];
-+    char	 buf[11];
- 
-     /* keep array of counts of each color */
-     for (i=0; i<num_usr_cols; i++)
diff --git a/xfig.3.2.4-locale.dif b/xfig.3.2.4-locale.dif
deleted file mode 100644
index 0e56868..0000000
--- a/xfig.3.2.4-locale.dif
+++ /dev/null
@@ -1,117 +0,0 @@
---- main.c
-+++ main.c	2006-07-31 17:56:25.000000000 +0200
-@@ -62,6 +62,7 @@
- #ifdef I18N
- #include <X11/keysym.h>
- #include <locale.h>
-+#include <langinfo.h>
- #endif  /* I18N */
- 
- /* EXPORTS */
-@@ -709,11 +710,6 @@ main(argc, argv)
- 	}
-     }
- 
--#ifdef I18N
--    setlocale(LC_ALL, "");
--    XtSetLanguageProc(NULL, NULL, NULL);
--#endif  /* I18N */
--
-     /*
-      * save the command line arguments
-      */
-@@ -807,6 +803,10 @@ main(argc, argv)
-     }
- 
- #ifdef I18N
-+    if (NULL == strcasestr(nl_langinfo(CODESET),"ANSI") &&
-+	 NULL == strcasestr(nl_langinfo(CODESET),"ISO-8859-1"))
-+	appres.international = True;
-+
-     /************************************************************/
-     /* if the international option has been set, set the locale */
-     /************************************************************/
-@@ -1523,6 +1523,11 @@ setup_visual(argc_p, argv, args)
- 	 */
- 	tool = XtAppInitialize (&tool_app, "Fig", options, XtNumber (options), argc_p, argv,
- 			       (String *) NULL, args, 0);
-+#ifdef I18N
-+	setlocale(LC_ALL, "");
-+	setlocale(LC_NUMERIC, "C");
-+	XtSetLanguageProc(tool_app, NULL, NULL);
-+#endif  /* I18N */
- 	/* save important info */
- 	tool_d = XtDisplay(tool);
- 	tool_s = XtScreen(tool);
---- u_print.c
-+++ u_print.c	2006-11-16 12:45:46.000000000 +0000
-@@ -15,6 +15,7 @@
-  *
-  */
- 
-+#include <locale.h>
- #include "fig.h"
- #include "resources.h"
- #include "mode.h"
-@@ -75,6 +76,7 @@ char *shell_protect_string(string)
-     return(buf);
- }
- 
-+void
- print_to_printer(printer, backgrnd, mag, print_all_layers, grid, params)
-     char	    printer[];
-     char	   *backgrnd;
-@@ -111,6 +113,8 @@ print_to_printer(printer, backgrnd, mag,
- 	name = shell_protect_string(cur_filename);
- 
- #ifdef I18N
-+    /* set the numeric locale to C so we set decimal points for numbers */
-+    setlocale(LC_NUMERIC, "C");
-     sprintf(tmpcmd, "%s %s -L ps -z %s -m %f %s -n %s",
- 	    fig2dev_cmd, appres.international ? appres.fig2dev_localize_option : "",
- #else
-@@ -119,6 +123,10 @@ print_to_printer(printer, backgrnd, mag,
- #endif /* I18N */
- 	    paper_sizes[appres.papersize].sname, mag/100.0,
- 	    appres.landscape ? "-l xxx" : "-p xxx", name);
-+#ifdef I18N
-+    /* reset to original locale */
-+    setlocale(LC_NUMERIC, "");
-+#endif /* I18N */
- 
-     if (appres.correct_font_size)
- 	strcat(tmpcmd," -F ");
-@@ -223,9 +231,13 @@ print_to_file(file, lang, mag, xoff, yof
- 
-     /* start with the command, language and internationalization, if applicable */
- #ifdef I18N
-+    /* set the numeric locale to C so we set decimal points for numbers */
-+    setlocale(LC_NUMERIC, "C");
-     sprintf(prcmd, "%s %s -L %s -m %f ", 
- 		fig2dev_cmd, appres.international ? appres.fig2dev_localize_option : "",
- 		real_lang, mag/100.0);
-+    /* reset to original locale */
-+    setlocale(LC_NUMERIC, "");
- #else
-     sprintf(prcmd, "%s -L %s -m %f ", fig2dev_cmd, real_lang, mag/100.0);
- #endif  /* I18N */
-@@ -324,6 +336,8 @@ print_to_file(file, lang, mag, xoff, yof
- 	strcat(tmp_name,"_t");
- 	/* make it automatically input the postscript/pdf part (-p option) */
- #ifdef I18N
-+	/* set the numeric locale to C so we set decimal points for numbers */
-+	setlocale(LC_NUMERIC, "C");
- 	sprintf(prcmd, "%s %s -L %s -E %d -p %s -m %f ",
- 		fig2dev_cmd, appres.international ? appres.fig2dev_localize_option : "",
- #else
-@@ -332,6 +346,10 @@ print_to_file(file, lang, mag, xoff, yof
- #endif  /* I18N */
- 		!strcmp(lang,"pstex")? "pstex_t": "pdftex_t",
- 		appres.encoding, outfile, mag/100.0);
-+#ifdef I18N
-+	/* reset to original locale */
-+	setlocale(LC_NUMERIC, "");
-+#endif  /* I18N */
- 	/* add the -D +list if user doesn't want all layers printed */
- 	if (!print_all_layers)
- 	    strcat(prcmd, layers);
diff --git a/xfig.3.2.4-quiet.dif b/xfig.3.2.4-quiet.dif
deleted file mode 100644
index 210b184..0000000
--- a/xfig.3.2.4-quiet.dif
+++ /dev/null
@@ -1,183 +0,0 @@
---- main.c
-+++ main.c	2004-08-25 14:21:34.000000000 +0200
-@@ -1018,6 +1018,11 @@
- 	setup_sizes(init_canv_wd, init_canv_ht);
-     }
- 
-+    (void) init_tool_menus();
-+    (void) init_tool_style_panel();
-+    (void) init_tool_ind_pannel();
-+    (void) init_tool_canvas();
-+
-     (void) init_main_menus(tool_form, arg_filename);
-     (void) init_msg(tool_form);
-     (void) init_mousefun(tool_form);
---- w_canvas.c
-+++ w_canvas.c	2004-08-25 14:20:40.000000000 +0200
-@@ -173,6 +173,13 @@
-     ~Meta<Key>:EventCanv()\n\
-     <Expose>:ExposeCanv()\n";
- 
-+void
-+init_tool_canvas(void)
-+{
-+    XtAppAddActions(tool_app, canvas_actions, XtNumber(canvas_actions));
-+}
-+
-+int
- init_canvas(tool)
-     Widget	   tool;
- {
-@@ -193,7 +200,6 @@
-     canvas_middlebut_proc = null_proc;
-     canvas_rightbut_proc = null_proc;
-     canvas_kbd_proc = canvas_locmove_proc = null_proc;
--    XtAppAddActions(tool_app, canvas_actions, XtNumber(canvas_actions));
-     XtAugmentTranslations(canvas_sw,
- 			   XtParseTranslationTable(canvas_translations));
- #ifndef NO_COMPKEYDB
-@@ -204,13 +210,14 @@
- }
- 
- /* at this point, the canvas widget is realized so we can get the window from it */
--
-+void
- setup_canvas()
- {
-     init_grid();
-     reset_clip_window();
- }
- 
-+void
- canvas_selected(tool, event, params, nparams)
-     Widget	    tool;
-     XButtonEvent   *event;
---- w_canvas.h
-+++ w_canvas.h	2004-08-25 14:21:18.000000000 +0200
-@@ -35,9 +35,12 @@
- extern void	toggle_show_borders();
- extern void	clear_canvas();
- 
--extern		canvas_selected();
-+extern void	canvas_selected();
- extern void	paste_primary_selection();
- 
-+extern void	init_tool_canvas(void);
-+extern int	init_canvas(Widget tool);
-+
- extern int	clip_xmin, clip_ymin, clip_xmax, clip_ymax;
- extern int	clip_width, clip_height;
- extern int	cur_x, cur_y;
---- w_cmdpanel.c
-+++ w_cmdpanel.c	2004-08-25 14:26:00.000000000 +0200
-@@ -204,6 +204,13 @@
- 
- /* command panel */
- void
-+init_tool_menus(void)
-+{
-+    /* add actions to position the menus if the user uses an accelerator */
-+    XtAppAddActions(tool_app, menu_actions, XtNumber(menu_actions));
-+}
-+
-+void
- init_main_menus(tool, filename)
-     Widget	    tool;
-     char	   *filename;
-@@ -212,6 +219,7 @@
-     Widget	    beside = NULL;
-     DeclareArgs(11);
- 
-+
-     FirstArg(XtNborderWidth, 0);
-     NextArg(XtNcolormap, tool_cm);
-     NextArg(XtNdefaultDistance, 0);
-@@ -246,8 +254,6 @@
- 		      filename_balloon_trigger, (XtPointer) name_panel);
-     XtAddEventHandler(name_panel, LeaveWindowMask, False,
- 		      filename_unballoon, (XtPointer) name_panel);
--    /* add actions to position the menus if the user uses an accelerator */
--    XtAppAddActions(tool_app, menu_actions, XtNumber(menu_actions));
-     refresh_view_menu();
- }
- 
---- w_cmdpanel.h
-+++ w_cmdpanel.h	2004-08-25 14:10:45.000000000 +0200
-@@ -33,6 +33,8 @@
- extern int	num_main_menus();
- extern Widget	create_menu_item();
- extern void	refresh_view_menu();
-+extern void	init_tool_menus(void);
-+extern void	init_main_menus(Widget tool, char* filename);
- 
- /* def for menu */
- 
---- w_indpanel.c
-+++ w_indpanel.c	2004-08-25 14:12:57.000000000 +0200
-@@ -476,6 +476,12 @@
- static ind_sw_info upd_sw_info, upd_set_sw_info, upd_clr_sw_info, upd_tog_sw_info;
- 
- void
-+init_tool_ind_pannel(void)
-+{
-+	XtAppAddActions(tool_app, ind_actions, XtNumber(ind_actions));
-+}
-+
-+void
- init_ind_panel(tool)
-     Widget	    tool;
- {
-@@ -626,8 +632,6 @@
-     ind_box = XtCreateManagedWidget("ind_box", boxWidgetClass, ind_panel,
- 			       Args, ArgCount);
- 
--    XtAppAddActions(tool_app, ind_actions, XtNumber(ind_actions));
--
-     for (i = 0; i < NUM_IND_SW; ++i) {
- 	sw = &ind_switches[i];
- 	sw->panel = (Widget) NULL;	/* not created yet */
---- w_indpanel.h
-+++ w_indpanel.h	2004-08-25 14:14:07.000000000 +0200
-@@ -34,6 +34,9 @@
- extern void	wheel_inc_zoom(), wheel_dec_zoom();
- #endif /* WHEELMOUSE */
- 
-+extern void	init_tool_ind_pannel(void);
-+extern void	init_ind_panel(Widget tool);
-+
- /* size of buttons in indicator panel */
- #define		DEF_IND_SW_HT		34
- #define		DEF_IND_SW_WD		64
---- w_style.c
-+++ w_style.c	2004-08-25 14:05:33.000000000 +0200
-@@ -759,6 +759,12 @@
- /**********************************/
- 
- void
-+init_tool_style_panel(void)
-+{
-+    XtAppAddActions (tool_app, style_actions, XtNumber (style_actions));
-+}
-+
-+void
- init_manage_style_panel (void)
- {
-     char    buf[50];
-@@ -966,7 +972,6 @@
-     XtAddCallback (style_close_style, XtNcallback,
- 		   (XtCallbackProc) close_style, (XtPointer) NULL);
- 
--    XtAppAddActions (tool_app, style_actions, XtNumber (style_actions));
-     style_update ();
- }
- 
---- w_style.h
-+++ w_style.h	2004-08-25 14:06:27.000000000 +0200
-@@ -14,6 +14,7 @@
-  *
-  */
- 
-+extern void	init_tool_style_panel(void);
- extern void	init_manage_style_panel(void);
- extern void	setup_manage_style_panel(void);
- extern void	popup_manage_style_panel(void);
diff --git a/xfig.3.2.4.dif b/xfig.3.2.4.dif
deleted file mode 100644
index e775505..0000000
--- a/xfig.3.2.4.dif
+++ /dev/null
@@ -1,535 +0,0 @@
---- Fig-color.ad
-+++ Fig-color.ad	2006-07-31 17:56:25.000000000 +0200
-@@ -76,6 +76,12 @@ Fig*MenuButton*background: 		gray83
- ! in the color editor popup
- Fig*mixedEdit.background: 		gray83
- 
-+Fig*mode_panel.background:		gray67
-+Fig*mode_panel*topShadow::		white
-+Fig*mode_panel*bottomShadow:		gray17
-+Fig*mode_panel*topShadowPixel:		white
-+Fig*mode_panel*bottomShadowPixel:	gray17
-+
- Fig*cancel.background: 			gray88
- Fig*dismiss.background: 		gray88
- Fig*commands*background: 		gray88
-@@ -85,12 +91,35 @@ Fig*horizontal.background: 		gray88
- 
- Fig*topruler.background: 		gray95
- Fig*sideruler.background: 		gray95
-+Fig*topruler.foreground: 		black
-+Fig*sideruler.foreground: 		black
- 
- ! file panel and scrollbar
- 
- Fig*FigList*background: 		gray95
- Fig*List*background: 			gray95
--Fig*Scrollbar.background: 		gray95
-+Fig*Scrollbar.background: 		gray77
-+Fig*Scrollbar.foreground: 		gray37
-+Fig*ScrollbarBackground:		gray67
-+Fig*ScrollbarForeground:		gray37
-+
-+Fig*horizontal.shadowWidth:		2
-+Fig*horizontal.topShadowPixel:		gray95
-+Fig*horizontal.bottomShadowPixel:	gray37
-+Fig*horizontal.topShadow:		gray95
-+Fig*horizontal.bottomShadow:		gray37
-+
-+Fig*Scrollbar.shadowWidth:		2
-+Fig*Scrollbar.topShadow:		gray95
-+Fig*Scrollbar.bottomShadow:		gray37
-+Fig*Scrollbar.topShadowPixel:		gray95
-+Fig*Scrollbar.bottomShadowPixel:	gray37
-+
-+Fig*stdColor.shadowWidth:		2
-+Fig*stdColor.topShadow:			gray95
-+Fig*stdColor.bottomShadow:		gray37
-+Fig*stdColor.topShadowPixel:		gray95
-+Fig*stdColor.bottomShadowPixel:		gray37
- 
- Fig*Label.background: 			gray80
- Fig*ind_box.background:			gray80
---- Fig.ad
-+++ Fig.ad	2006-07-31 17:56:25.000000000 +0200
-@@ -10,6 +10,8 @@ Fig.version:			3.2.4
- 
- Fig*AllowShellResize: false
- 
-+Fig.inches: false
-+
- ! Image editor - can edit imported image
- Fig.image_editor:		xv
- 
-@@ -20,7 +22,7 @@ Fig.ghostscript:		gs
- ! 		This is for viewing the xfig html reference.
- ! For netscape, this command will open the help pages in a running netscape,
- !     or start a new netscape if one isn't already running
--Fig.browser:	netscape -remote 'openFile(%f)' || netscape %f
-+Fig.browser:	/usr/X11R6/lib/X11/xfig/browser %f
- 
- ! pdfviewer - put your favorite pdf viewer here.  
- !		This is for viewing the xfig how-to guide and man pages
-@@ -99,60 +101,62 @@ Fig.internalborderwidth:	1
- ! I include both for compatibility.  Be sure to change both values when
- ! modifying them.
- 
--	Fig*horizontal.shadowWidth: 0
--	Fig*horizontal.topShadowPixel: black
--	Fig*horizontal.bottomShadowPixel: white
--	Fig*horizontal.topShadow: black
--	Fig*horizontal.bottomShadow: white
-+Fig*horizontal.shadowWidth:		0
-+Fig*horizontal.topShadowPixel:		black
-+Fig*horizontal.bottomShadowPixel:	white
-+Fig*horizontal.topShadow:		black
-+Fig*horizontal.bottomShadow:		white
- 
- ! the following is done so the widget set doesn't try to make shades of
- ! the scrollbar shadows (even though the width is 0 it takes more colors)
--	Fig*Scrollbar.shadowWidth: 0
--	Fig*Scrollbar.topShadow: black
--	Fig*Scrollbar.bottomShadow: white
--	Fig*Scrollbar.topShadowPixel: black
--	Fig*Scrollbar.bottomShadowPixel: white
-+
-+Fig*Scrollbar.shadowWidth:		0
-+Fig*Scrollbar.topShadow:		black
-+Fig*Scrollbar.bottomShadow:		white
-+Fig*Scrollbar.topShadowPixel:		black
-+Fig*Scrollbar.bottomShadowPixel:	white
- 
- ! this is for the standard color buttons in the color panel
--	Fig*stdColor.shadowWidth: 2
--	Fig*stdColor.topShadow: black
--	Fig*stdColor.bottomShadow: white
--	Fig*stdColor.topShadowPixel: black
--	Fig*stdColor.bottomShadowPixel: white
-+
-+Fig*stdColor.shadowWidth:		2
-+Fig*stdColor.topShadow:			black
-+Fig*stdColor.bottomShadow:		white
-+Fig*stdColor.topShadowPixel:		black
-+Fig*stdColor.bottomShadowPixel:		white
- 
- ! turn off any shadows for the user color cells
--	Fig*colorMemory.shadowWidth: 0
-+Fig*colorMemory.shadowWidth:		0
- 
- ! You may need or want to adjust the highlight thickness for the mode
- ! and indicator panels depending on the results.  If it is too thick
- ! it will erase part of the button graphics.
--	Fig*mode_panel*highlightThickness: 1
--	Fig*ind_panel.ind_box.button_form.button.highlightThickness: 1
-+Fig*mode_panel*highlightThickness:	1
-+Fig*ind_panel.ind_box.button_form.button.highlightThickness: 1
- ! Same for the popup panels from the indicator panel
--	Fig*set_indicator_panel*Command.highlightThickness: 1
-+Fig*set_indicator_panel*Command.highlightThickness:	1
- 
- ! If you use the 3D Athena widget set and the small icons for the mode panel
- ! (because you have a small screen; see Imakefile) you may want to reduce
- ! the shadow width to 1 or 0.  Uncomment the following in that case:
--!	Fig*mode_panel*shadowWidth: 1
-+Fig*mode_panel*shadowWidth:		1
- 
- ! The following is for the update marker in the upper-right corner of the
- ! indicator buttons.  You may not want any highlight thickness because
- ! the boxes are so small.
--	Fig*ind_panel.ind_box.button_form.update.highlightThickness: 0
-+Fig*ind_panel.ind_box.button_form.update.highlightThickness:	1
- 
- ! This sets the shadows for the spinner arrows
--	Fig*spinup.shadowWidth:   2
--	Fig*spindown.shadowWidth: 2
-+Fig*spinup.shadowWidth:			0
-+Fig*spindown.shadowWidth:		0
- 
- ! This gets rid of that funny black line that sometimes borders the canvas
- 
--	Fig*canvas.shadowWidth:  0
-+Fig*canvas.shadowWidth:			0
- 
- !if on monochrome server, or no Fig-color app-defaults file
- !  This background resource shows between the buttons like a border
--	Fig*mode_panel.background:	black
--	Fig*mode_panel.foreground:	black
-+Fig*mode_panel.background:		black
-+Fig*mode_panel.foreground:		black
- 
- ! Specify a private Compose key database file.  If this resource contains a "/"
- ! then the wired-in name of the xfig global directory won't be prefixed to it.
---- Imakefile
-+++ Imakefile	2006-07-31 18:20:06.000000000 +0200
-@@ -49,7 +49,7 @@ XCOMM Redefine the following if your PNG
- XCOMM are in different places
- 
- PNGLIBDIR = $(USRLIBDIR)
--PNGINC = -I/usr/local/include
-+PNGINC = -I/usr/include
- 
- XCOMM If don't want JPEG support, comment out the #define USEJPEG line
- XCOMM Uncomment the #define for USEJPEG if you want to be able to import
-@@ -68,8 +68,8 @@ XCOMM You must have version 5b or newer 
- 
- #ifdef USEJPEG
- #ifdef USEINSTALLEDJPEG
--JPEGLIBDIR = /usr/local/lib
--JPEGINC = -I/usr/include/X11
-+JPEGLIBDIR = /usr/lib
-+JPEGINC = -I/usr/include
- #else
- JPEGLIBDIR = ../jpeg
- JPEGINC = -I$(JPEGLIBDIR)
-@@ -87,8 +87,8 @@ XCOMM   in /contrib/libraries.
- XCOMM Change XPMLIBDIR if necessary to point to the xpm library (libXpm)
- XCOMM Change XPMINC if necessary to point to the include file for xpm (xpm.h)
- 
--XCOMM #define USEXPM
--XCOMM #define USEXPM_ICON
-+#define USEXPM
-+#define USEXPM_ICON
- 
- #ifdef USEXPM
- XPMLIBDIR = $(USRLIBDIR)
-@@ -105,17 +105,20 @@ XCOMM the 3d Athena Widget Set (highly r
- XCOMM Then be sure to change the XAW3DINC to point to the directory where your
- XCOMM 3D Athena widget headers are located
- 
--XCOMM #define XAW3D
-+#define XAW3D
- 
- #ifdef XAW3D
- XAW3DINC = -I/usr/include/X11/Xaw3d
- DUSEXAW3D = -DXAW3D
- XAWLIB = -lXaw3d
-+#else
-+XAWSRC = SmeBSB.c SimpleMenu.c
-+XAWOBJ = SmeBSB.o SimpleMenu.o
- #endif
- 
- XCOMM Uncomment the following if you have a wheel mouse.  See docs for description.
- 
--XCOMM #define WHEELMOUSE
-+#define WHEELMOUSE
- 
- #ifdef WHEELMOUSE
- DUSEWHEELMOUSE = -DWHEELMOUSE
-@@ -154,7 +157,7 @@ XCOMM uncomment the following line if yo
- XCOMM inline functions. With the "INLINE" keyword, you should notice that
- XCOMM the display will be a bit faster in complex figures
- 
--XCOMM USEINLINE = -DUSE_INLINE
-+USEINLINE = -DUSE_INLINE
- 
- XCOMM use (and change) the following if you want the multi-key data base file
- XCOMM somewhere other than the standard X11 library directory
-@@ -162,11 +165,11 @@ XCOMM be sure to comment out the second 
- XCOMM XFIGLIBDIR = /usr/local/lib/xfig
- 
- XCOMM use this if you want the multi-key data base file in the standard X11 tree
--XFIGLIBDIR = $(LIBDIR)/xfig
-+XFIGLIBDIR = _DATA/xfig
- 
- XCOMM XFIGDOCDIR tells where the html and pdf documentation should go
- XCOMM XFIGDOCDIR = $(DOCDIR)/xfig
--XFIGDOCDIR = /usr/share/doc/xfig
-+XFIGDOCDIR = /usr/share/doc/packages/xfig
- 
- XCOMM MANDIR tells where the standard man pages should go (no need to change it
- XCOMM if you want the man pages installed in the standard place on your system
-@@ -200,7 +203,7 @@ XCOMM   instead.
- XCOMM   Add `-DCACHE_SIZE_LIMIT=xxxx' where xxxx is the cache size in kilobytes.
- XCOMM   A cache size of zero turns caching off.
- 
--CACHE = -DCACHE_BITMAPS -DCACHE_SIZE_LIMIT=300
-+CACHE = -DCACHE_BITMAPS -DCACHE_SIZE_LIMIT=512 -DMAXNUMPTS=50000 -DBSDLPR
- 
- XCOMM For SYSV systems with BSD-style printer command which use lpr instead of
- XCOMM lp (SGI is one such machine), add -DBSDLPR to the DEFINES variable
-@@ -214,6 +217,7 @@ XCOMM number of vertices.
- XCOMM If you want a compiler other than "cc", define it here
- 
- XCOMM CC = /opt/SUNWspro/bin/cc
-+CC = gcc
- 
- XCOMM *****************************************************
- XCOMM *****************************************************
-@@ -234,7 +238,7 @@ DEPLIBJPEG = $(JPEGLIBDIR)/libjpeg.a
- #endif /* USEJPEG */
- 
- #ifdef I18N
--I18N_DEFS = -DI18N -DSETLOCALE
-+I18N_DEFS = -DI18N
- I18N_SRC = w_i18n.c
- I18N_OBJ = w_i18n.o
- #endif
-@@ -304,7 +308,7 @@ XFIGSRC =	d_arc.c d_arcbox.c d_box.c d_e
- 		w_export.c w_file.c w_fontbits.c w_fontpanel.c w_grid.c w_icons.c \
- 		w_indpanel.c w_library.c w_modepanel.c w_mousefun.c w_msgpanel.c \
- 		w_print.c w_rottext.c w_rulers.c w_setup.c w_style.c w_util.c w_zoom.c \
--		$(I18N_SRC) SmeCascade.c SmeBSB.c SimpleMenu.c
-+		$(I18N_SRC) SmeCascade.c $(XAWSRC)
- 
- XFIGOBJ =	d_arc.o d_arcbox.o d_box.o d_ellipse.o d_picobj.o \
- 		d_subspline.o d_line.o d_regpoly.o d_spline.o d_text.o \
-@@ -326,7 +330,7 @@ XFIGOBJ =	d_arc.o d_arcbox.o d_box.o d_e
- 		w_export.o w_file.o w_fontbits.o w_fontpanel.o w_grid.o w_icons.o \
- 		w_indpanel.o w_library.o w_modepanel.o w_mousefun.o w_msgpanel.o \
- 		w_print.o w_rottext.o w_rulers.o w_setup.o w_style.o w_util.o w_zoom.o \
--		$(I18N_OBJ) SmeCascade.o SmeBSB.o SimpleMenu.o
-+		$(I18N_OBJ) SmeCascade.o $(XAWOBJ)
- 
- XCOMM Other dependencies should be handled by "make depend"
- 
---- e_addpt.c
-+++ e_addpt.c	2006-07-31 17:56:25.000000000 +0200
-@@ -52,6 +52,7 @@ point_adding_selected()
-     force_nopositioning();
-     force_anglegeom();
-     constrained = MOVE_ARB;
-+    reset_action_on();
- }
- 
- static void
---- e_align.c
-+++ e_align.c	2006-07-31 17:56:25.000000000 +0200
-@@ -63,6 +63,7 @@ align_selected()
-     canvas_middlebut_proc = init_align_canvas;
-     canvas_rightbut_proc = null_proc;
-     set_cursor(pick15_cursor);
-+    reset_action_on();
- }
- 
- /* align objects to the whole canvas */
---- e_arrow.c
-+++ e_arrow.c	2006-07-31 17:56:25.000000000 +0200
-@@ -47,6 +47,7 @@ arrow_head_selected()
-     canvas_middlebut_proc = point_search_middle;
-     canvas_rightbut_proc = null_proc;
-     set_cursor(pick9_cursor);
-+    reset_action_on();
- }
- 
- static void
---- e_break.c
-+++ e_break.c	2006-07-31 17:56:25.000000000 +0200
-@@ -43,6 +43,7 @@ break_selected()
-     canvas_middlebut_proc = object_search_middle;
-     canvas_rightbut_proc = null_proc;
-     set_cursor(pick15_cursor);
-+    reset_action_on();
- }
- 
- static void
-@@ -82,8 +83,10 @@ init_break(p, type, x, y, px, py, loc_ta
-     list_delete_compound(&objects.compounds, cur_c);
-     tail(&objects, &object_tails);
-     append_objects(&objects, cur_c, &object_tails);
-+#if 0
-     /* add the depths from this compound */
-     add_compound_depth(cur_c);
-+#endif
-     toggle_markers_in_compound(cur_c);
-     set_tags(cur_c, loc_tag);
-     set_action(F_BREAK);
---- e_convert.c
-+++ e_convert.c	2006-07-31 17:56:25.000000000 +0200
-@@ -47,6 +47,7 @@ convert_selected()
-     canvas_middlebut_proc = null_proc;
-     canvas_rightbut_proc = point_search_right;
-     set_cursor(pick15_cursor);
-+    reset_action_on();
- }
- 
- static void
---- e_deletept.c
-+++ e_deletept.c	2006-07-31 17:56:25.000000000 +0200
-@@ -43,6 +43,7 @@ delete_point_selected()
-     canvas_middlebut_proc = null_proc;
-     canvas_rightbut_proc = null_proc;
-     set_cursor(pick9_cursor);
-+    reset_action_on();
- }
- 
- static void
---- e_flip.c
-+++ e_flip.c	2006-07-31 17:56:25.000000000 +0200
-@@ -61,6 +61,7 @@ flip_ud_selected()
-     setcenter = 0;
-     setanchor = 0;
-     flip_selected();
-+    reset_action_on();
- }
- 
- void
-@@ -76,6 +77,7 @@ flip_lr_selected()
-     setcenter = 0;
-     setanchor = 0;
-     flip_selected();
-+    reset_action_on();
- }
- 
- static void
---- e_movept.c
-+++ e_movept.c	2006-07-31 17:56:25.000000000 +0200
-@@ -80,6 +80,7 @@ move_point_selected()
-     canvas_rightbut_proc = null_proc;
-     set_cursor(pick9_cursor);
-     force_anglegeom();
-+    reset_action_on();
- }
- 
- static void
---- e_rotate.c
-+++ e_rotate.c	2006-07-31 17:56:25.000000000 +0200
-@@ -94,6 +94,7 @@ rotate_selected()
-     canvas_middlebut_proc = object_search_middle;
-     canvas_rightbut_proc = set_unset_center;
-     set_cursor(pick15_cursor);
-+    reset_action_on();
- }
- 
- static void
---- e_update.c
-+++ e_update.c	2006-07-31 17:56:25.000000000 +0200
-@@ -64,6 +64,7 @@ update_selected()
-     set_cursor(pick9_cursor);
-     /* manage on the update buttons */
-     manage_update_buts();
-+    reset_action_on();
- }
- 
- static int
---- fig.h
-+++ fig.h	2006-07-31 17:56:25.000000000 +0200
-@@ -26,6 +26,7 @@ extern	char	*my_strdup();
- #if defined(ultrix) || defined(__bsdi__) || defined(Mips) || defined(apollo)
- #include <sys/types.h>	/* for stat structure */
- #endif
-+#include <sys/param.h>
- #include <sys/stat.h>
- 
- #if defined(__convex__) && defined(__STDC__)
---- mode.h
-+++ mode.h	2006-07-31 17:56:25.000000000 +0200
-@@ -19,7 +19,7 @@
- #define MODE_H
- 
- #define		F_NULL			0
--#define	    FIRST_DRAW_MODE	    F_CIRCLE_BY_RAD
-+#define		FIRST_DRAW_MODE		F_CIRCLE_BY_RAD
- #define		F_CIRCLE_BY_RAD		1
- #define		F_CIRCLE_BY_DIA		2
- #define		F_ELLIPSE_BY_RAD	3
-@@ -38,7 +38,7 @@
- #define		F_PICOBJ		16
- #define		F_PLACE_LIB_OBJ		17
- 
--#define	    FIRST_EDIT_MODE	    F_GLUE
-+#define		FIRST_EDIT_MODE		F_GLUE
- #define		F_GLUE			30
- #define		F_BREAK			31
- #define		F_SCALE			32
---- w_canvas.c
-+++ w_canvas.c	2006-07-31 17:56:25.000000000 +0200
-@@ -529,6 +529,7 @@ reset_click_counter(widget, closure, eve
- 
- /* clear the canvas - this can't be called to clear a pixmap, only a window */
- 
-+void
- clear_canvas()
- {
-     /* clear the splash graphic if it is still on the screen */
---- w_canvas.h
-+++ w_canvas.h	2006-07-31 17:56:25.000000000 +0200
-@@ -33,6 +33,7 @@ extern void	toggle_show_balloons();
- extern void	toggle_show_lengths();
- extern void	toggle_show_vertexnums();
- extern void	toggle_show_borders();
-+extern void	clear_canvas();
- 
- extern		canvas_selected();
- extern void	paste_primary_selection();
---- w_menuentry.c
-+++ w_menuentry.c	2006-07-31 17:56:25.000000000 +0200
-@@ -170,7 +170,8 @@ Region region;
- 	gc = entry->sme_bsb.norm_gray_gc;
-     }
-     
--    if (entry->sme_bsb.label != NULL) {
-+/*    if (entry->sme_bsb.label != NULL) { */
-+      if (entry->sme_bsb.label == XtName((Widget)(entry))) {
- 	int x_loc = entry->sme_bsb.left_margin;
- 	int len = strlen(entry->sme_bsb.label);
- 	char * label = entry->sme_bsb.label;
---- w_srchrepl.c
-+++ w_srchrepl.c	2006-07-31 17:56:25.000000000 +0200
-@@ -56,7 +56,6 @@ There is currently no way to undo replac
- #include "w_util.h"
- #include "u_create.h"
- #include <stdarg.h>
--
- #define MAX_MISSPELLED_WORDS	200
- #define	SEARCH_WIDTH		496	/* width of search message and results */
- 
---- w_util.c
-+++ w_util.c	2006-07-31 17:56:25.000000000 +0200
-@@ -1102,7 +1102,7 @@ check_action_on()
- 	    finish_text_input(0,0,0);/* finish up any text input */
- 	else {
- 	    if (cur_mode == F_PLACE_LIB_OBJ)
--		cancel_place_lib_obj();	      
-+		cancel_place_lib_obj(0, 0, 0);	      
- 	    else {
- 		put_msg("Finish (or cancel) the current operation before changing modes");
- 		beep();
---- Doc/xfig.html
-+++ Doc/xfig.html	2006-07-31 17:56:25.000000000 +0200
-@@ -848,6 +848,20 @@ between all buttons and panels (default 
- </DL>
- <P>
- 
-+<B>-international</B>
-+
-+<DL COMPACT>
-+<DT><DD>
-+Switch  on  international  support (mainly Japanese
-+and Korean), users of  ISO  Latin  1  (ISO-8859-1)
-+probably should not use this, therefore the international
-+support is switched off by default for locales using ISO-8859-1*
-+codesets. For all other locales this option is already used
-+by default.
-+</DL>
-+
-+<P>
-+
- 
- <B>-jpeg</B>[<B>_quality</B>]
- 
-@@ -2208,6 +2222,7 @@ inches              boolean true        
-                                             -metric (false)
- installowncmap      boolean false           -installowncmap
- internalborderwidth integer 1               -internalBW
-+international       boolean false           -international
- jpeg_quality        integer 75              -jpeg_quality
- justify             boolean false           -left (false),
-                                             -right (true)
---- Doc/xfig.man
-+++ Doc/xfig.man	2006-07-31 17:56:25.000000000 +0200
-@@ -531,6 +531,15 @@ Use lines of width
- between all buttons and panels (default = 1).
- .\"-------
- .At
-+.BR \-international
-+.Ap
-+Switch on international support (mainly Japanese and Korean),
-+users of ISO Latin 1 (ISO-8859-1) probably should not use this,
-+therefore the international support is switched off by default
-+for locales using ISO-8859-1* codesets. For all other locales this
-+option is already used by default. 
-+.\"-------
-+.At
- .BR \-jpeg [ _quality ]
- .I quality
- .Ap
diff --git a/xfig.3.2.4.tar.bz2 b/xfig.3.2.4.tar.bz2
deleted file mode 100644
index 5147c9f..0000000
--- a/xfig.3.2.4.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cd29a4aa94f842c954c8c7edb9ff11576ea2f5bddac0923fa9aec6621404e3b2
-size 4784794
diff --git a/xfig.3.2.5-fixes.dif b/xfig.3.2.5-fixes.dif
new file mode 100644
index 0000000..2c8fb01
--- /dev/null
+++ b/xfig.3.2.5-fixes.dif
@@ -0,0 +1,547 @@
+--- w_drawprim.c
++++ w_drawprim.c	2007-05-07 17:11:31.189166000 +0200
+@@ -512,7 +512,9 @@ void init_gc(void)
+     gccache[ERASE] = makegc(ERASE, x_fg_color.pixel, x_bg_color.pixel);
+     gccache[INV_PAINT] = makegc(INV_PAINT, x_fg_color.pixel, x_bg_color.pixel);
+     /* parse any grid color spec */
++#if 0
+ fprintf(stderr,"color = '%s'\n",appres.grid_color);
++#endif
+     XParseColor(tool_d, tool_cm, appres.grid_color, &tmp_color);
+     if (XAllocColor(tool_d, tool_cm, &tmp_color)==0) {
+ 	fprintf(stderr,"Can't allocate color for grid \n");
+--- w_layers.c
++++ w_layers.c	2007-05-11 16:19:02.691772247 +0200
+@@ -118,9 +118,27 @@ init_depth_panel(Widget parent)
+ {
+     Widget	 label, below;
+     Widget	 layer_viewform;
++    Dimension	 ind_ht = 0, snap_ht = 0, mouse_ht;
+ 
+-    /* MOUSEFUN_HT and ind_panel height aren't known yet */
+-    LAYER_HT = TOPRULER_HT + CANVAS_HT;	
++    if (XtIsManaged(ind_panel)) {
++	/* get height of indicator panel */
++	FirstArg(XtNheight, &ind_ht);
++	GetValues(ind_panel);
++	ind_ht += INTERNAL_BW*2;
++    }
++
++    if (XtIsManaged(snap_indicator_panel)) {
++	/* get height of snap panel */
++	FirstArg(XtNheight, &snap_ht);
++	GetValues(snap_indicator_panel);
++	snap_ht += INTERNAL_BW*4;
++    }
++
++    /* MOUSEFUN_HT height aren't known yet */
++    mouse_ht = MSGPANEL_HT + CMDFORM_HT + INTERNAL_BW;
++
++    /* now that the bitmaps have been created, put the checkmark in the proper toggle */
++    LAYER_HT = mouse_ht + TOPRULER_HT + CANVAS_HT + ind_ht + INTERNAL_BW*2 - snap_ht;	
+ 
+     /* main form to hold all the layer stuff */
+ 
+@@ -366,11 +384,21 @@ init_depth_panel(Widget parent)
+ void
+ setup_depth_panel(void)
+ {
+-    Dimension	 ind_ht;
+-    /* get height of indicator panel */
+-    FirstArg(XtNheight, &ind_ht);
+-    GetValues(ind_panel);
+-    LAYER_HT = MOUSEFUN_HT + TOPRULER_HT + CANVAS_HT + ind_ht + INTERNAL_BW*4;
++    Dimension	 ind_ht = 0, snap_ht = 0;
++
++    if (XtIsManaged(ind_panel)) {
++	/* get height of indicator panel */
++	FirstArg(XtNheight, &ind_ht);
++	GetValues(ind_panel);
++	ind_ht += INTERNAL_BW*2;
++    }
++    if (XtIsManaged(snap_indicator_panel)) {
++	FirstArg(XtNheight, &snap_ht);
++	GetValues(snap_indicator_panel);
++	snap_ht += INTERNAL_BW*4;
++    }
++
++    LAYER_HT = MOUSEFUN_HT + TOPRULER_HT + CANVAS_HT + ind_ht + INTERNAL_BW*2 - snap_ht;
+ 
+     /* now that the bitmaps have been created, put the checkmark in the proper toggle */
+     FirstArg(XtNbitmap, (gray_layers? sm_check_pm : sm_null_check_pm));
+--- w_library.c
++++ w_library.c	2007-05-07 16:06:15.423107000 +0200
+@@ -1029,9 +1029,9 @@ make_library_menu(Widget parent, char *n
+     Widget	     menu, entry;
+ #ifndef XAW3D1_5E
+     Widget	     submenu;
+-    char	     submenu_name[200];
+ #endif /* XAW3D1_5E */
+     char	     menu_name[200];
++    char	     submenu_name[200];
+     int		     i;
+ 
+     menu = XtCreatePopupShell(name, simpleMenuWidgetClass, 
+--- w_icons.c
++++ w_icons.c	2007-07-25 11:53:51.693851855 +0200
+@@ -3013,237 +3013,156 @@ char * fig_reduced_c_icon_X[] = {
+ 
+ /* bitmap of letters for splash screen ("3.2.X") */
+ 
+-#define letters_width 243
+-#define letters_height 110
++#define letters_width 231
++#define letters_height 76
+ static char letters_bits[] = {
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
++ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
++ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x00,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
++ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x88,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
++ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x88,0x00,0x00,0x80,0xff,
++ 0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0x03,0x00,0x00,
++ 0x00,0x00,0x00,0x00,0xc0,0xff,0x07,0x00,0xf8,0x8f,0x00,0x00,0x80,0xff,0xff,
++ 0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0x03,0x00,0x00,0x00,
++ 0x00,0x00,0x00,0xc0,0xff,0x07,0x00,0xf8,0x8f,0x00,0x00,0xf0,0xff,0xff,0x7f,
++ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,
++ 0x00,0x00,0xc0,0xff,0xff,0xff,0xff,0x87,0x00,0x00,0xfc,0xff,0xff,0xff,0x03,
++ 0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,
++ 0x00,0xc0,0xff,0xff,0xff,0xff,0x87,0x00,0x00,0xfe,0x07,0xf8,0xff,0x07,0x00,
++ 0x00,0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,
++ 0xe0,0xff,0xff,0xff,0xff,0x87,0x00,0x00,0xfe,0x07,0xf8,0xff,0x07,0x00,0x00,
++ 0x00,0x00,0x00,0xc0,0xff,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,
++ 0xff,0xff,0xff,0xff,0x87,0x00,0xc0,0x7f,0x00,0xc0,0xff,0x1f,0x00,0x00,0x00,
++ 0x00,0x00,0xf8,0x01,0x00,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,
++ 0xff,0xff,0xff,0x81,0x00,0xc0,0x7f,0x00,0xc0,0xff,0x1f,0x00,0x00,0x00,0x00,
++ 0x00,0xf8,0x01,0x00,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0xff,
++ 0xff,0xff,0x81,0x00,0xc0,0x7f,0x00,0x80,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,
++ 0xfc,0x00,0x00,0xfe,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,
++ 0xff,0x81,0x00,0xc0,0x7f,0x00,0x80,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0xfc,
++ 0x00,0x00,0xfe,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0xff,
++ 0x81,0x00,0xe0,0xff,0x01,0x00,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x7e,0x00,
++ 0x00,0xfc,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0x1f,0x80,
++ 0x00,0xe0,0xff,0x01,0x00,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x7e,0x00,0x00,
++ 0xfc,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0x1f,0x80,0x00,
++ 0xf0,0xff,0x07,0x00,0xff,0x7f,0x00,0x00,0x00,0x00,0x80,0x7f,0x00,0x00,0xf0,
++ 0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0x07,0x80,0x00,0xf0,
++ 0xff,0x0f,0x00,0xff,0x7f,0x00,0x00,0x00,0x00,0x80,0x7f,0x00,0x00,0xf0,0xff,
++ 0x0f,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0xff,0x01,0x80,0x00,0xf0,0xff,
++ 0x0f,0x00,0xff,0x7f,0x00,0x00,0x00,0x00,0xc0,0xff,0x01,0x00,0xf0,0xff,0x0f,
++ 0x00,0x00,0x00,0x00,0x00,0xfc,0xe1,0xff,0x1f,0x00,0x80,0x00,0xf0,0xff,0x0f,
++ 0x00,0xff,0x7f,0x00,0x00,0x00,0x00,0xc0,0xff,0x01,0x00,0xf0,0xff,0x0f,0x00,
++ 0x00,0x00,0x00,0x00,0xfc,0xe1,0xff,0x1f,0x00,0x80,0x00,0xe0,0xff,0x0f,0x00,
++ 0xff,0x7f,0x00,0x00,0x00,0x00,0xc0,0xff,0x1f,0x00,0xf0,0xff,0x0f,0x00,0x00,
++ 0x00,0x00,0x00,0x7e,0x00,0x00,0x00,0x00,0x80,0x00,0xe0,0xff,0x0f,0x00,0xff,
++ 0x7f,0x00,0x00,0x00,0x00,0xc0,0xff,0x1f,0x00,0xf0,0xff,0x0f,0x00,0x00,0x00,
++ 0x00,0x00,0x7e,0x00,0x00,0x00,0x00,0x80,0x00,0xe0,0xff,0x0f,0x80,0xff,0x7f,
++ 0x00,0x00,0x00,0x00,0xc0,0xff,0x3f,0x00,0xf0,0xff,0x0f,0x00,0x00,0x00,0x00,
++ 0x00,0x7e,0x00,0x00,0x00,0x00,0x80,0x00,0xe0,0xff,0x0f,0x80,0xff,0x7f,0x00,
++ 0x00,0x00,0x00,0xc0,0xff,0x3f,0x00,0xf0,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,
++ 0x7e,0x00,0x00,0x00,0x00,0x80,0x00,0xc0,0xff,0x01,0x80,0xff,0x3f,0x00,0x00,
++ 0x00,0x00,0xc0,0xff,0xff,0x00,0xfc,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x3e,
++ 0x00,0x00,0x00,0x00,0x80,0x00,0xc0,0xff,0x01,0x80,0xff,0x3f,0x00,0x00,0x00,
++ 0x00,0xc0,0xff,0xff,0x00,0xfc,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x3e,0x00,
++ 0x00,0x00,0x00,0x80,0x00,0x00,0xfe,0x00,0xc0,0xff,0x1f,0x00,0x00,0x00,0x00,
++ 0xc0,0xff,0xff,0x00,0xfc,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x3f,0x00,0x00,
++ 0x00,0x00,0x80,0x00,0x00,0x00,0x00,0xc0,0xff,0x1f,0x00,0x00,0x00,0x00,0xc0,
++ 0xff,0xff,0x00,0xfc,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x3f,0x00,0x00,0x00,
++ 0x00,0x80,0x00,0x00,0x00,0x00,0xe0,0xff,0x07,0x00,0x00,0x00,0x00,0x80,0xff,
++ 0xff,0x00,0xfe,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x1f,0xf8,0x7f,0x00,0x00,
++ 0x80,0x00,0x00,0x00,0x00,0xe0,0xff,0x07,0x00,0x00,0x00,0x00,0x80,0xff,0xff,
++ 0x00,0xfe,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x1f,0xf8,0x7f,0x00,0x00,0x80,
++ 0x00,0x00,0x00,0x00,0xfc,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0xfe,0x3f,0x00,
++ 0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0x7f,0x00,0x80,0x00,
++ 0x00,0x00,0x00,0xfc,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0xfe,0x3f,0x00,0xff,
++ 0xff,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0x7f,0x00,0x80,0x00,0x00,
++ 0x00,0x00,0xfe,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x1f,0x80,0xff,0xff,
++ 0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0x00,0x80,0x00,0x00,0x00,
++ 0x00,0xfe,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x1f,0x80,0xff,0xff,0x00,
++ 0x00,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0xff,0x00,0x80,0x00,0x00,0xf8,0xff,
++ 0xff,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0x3f,0x00,0x00,
++ 0x00,0x00,0x00,0xf0,0x7f,0x80,0xff,0xff,0x07,0x80,0x00,0x00,0xf8,0xff,0xff,
++ 0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0x3f,0x00,0x00,0x00,
++ 0x00,0x00,0xf0,0x7f,0x80,0xff,0xff,0x07,0x80,0x00,0x00,0xfc,0xff,0x7f,0x00,
++ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0x0f,0x00,0x00,0x00,0x00,
++ 0x00,0xf8,0x1f,0x00,0xfe,0xff,0x07,0x80,0x00,0x00,0xfc,0xff,0x3f,0x00,0x00,
++ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0x07,0x00,0x00,0x00,0x00,0x00,
++ 0xf8,0x03,0x00,0xf8,0xff,0x07,0x80,0x00,0x00,0xf8,0xff,0xff,0x01,0x00,0x00,
++ 0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0xfc,
++ 0x03,0x00,0xf8,0xff,0x1f,0x80,0x00,0x00,0xf8,0xff,0xff,0x01,0x00,0x00,0x00,
++ 0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0xfc,0x03,
++ 0x00,0xf8,0xff,0x1f,0x80,0x00,0x00,0x00,0x00,0xff,0x1f,0x00,0x00,0x00,0x00,
++ 0x00,0x00,0x00,0x00,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0x01,0x00,
++ 0xe0,0xff,0x3f,0x80,0x00,0x00,0x00,0x00,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,
++ 0x00,0x00,0x00,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0x01,0x00,0xe0,
++ 0xff,0x3f,0x80,0x00,0x00,0x00,0x00,0xfe,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,
++ 0x00,0xc0,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x70,0x00,0x00,0xe0,0xff,
++ 0x3f,0x80,0x00,0x00,0x00,0x00,0xfe,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
++ 0xe0,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0x3f,
++ 0x80,0x00,0x00,0x00,0x00,0xfc,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,
++ 0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0x3f,0x80,
++ 0x00,0x00,0x00,0x00,0xfc,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,
++ 0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0x3f,0x80,0x00,
++ 0x00,0x00,0x00,0xfc,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0x7f,0x00,
++ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0x3f,0x80,0x00,0x00,
++ 0x00,0x00,0xfc,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0x3f,0x00,0x00,
++ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0x3f,0x80,0x80,0x1f,0x00,
++ 0x00,0xfc,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x07,0x00,0x38,0x00,
++ 0x00,0x00,0x00,0x00,0x30,0x00,0x00,0xc0,0xff,0x3f,0x80,0x80,0x1f,0x00,0x00,
++ 0xfc,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x07,0x00,0x38,0x00,0x00,
++ 0x00,0x00,0x00,0x30,0x00,0x00,0xc0,0xff,0x3f,0x80,0xf0,0xff,0x01,0x00,0xfc,
++ 0xff,0x03,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0x00,0x00,0xfc,0x00,0x00,0x00,
++ 0x00,0xc0,0xff,0x03,0x00,0xc0,0xff,0x3f,0x80,0xf0,0xff,0x01,0x00,0xfc,0xff,
++ 0x03,0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,
++ 0xc0,0xff,0x03,0x00,0xc0,0xff,0x3f,0x80,0xf0,0xff,0x03,0x00,0xfc,0xff,0x03,
++ 0x00,0x00,0x00,0x00,0x00,0xf8,0x1f,0x00,0x00,0x7c,0x00,0x00,0x00,0x00,0xe0,
++ 0xff,0x0f,0x00,0xc0,0xff,0x1f,0x80,0xf0,0xff,0x03,0x00,0xfc,0xff,0x03,0x00,
++ 0x00,0x00,0x00,0x00,0xfc,0x0f,0x00,0x00,0x7f,0x00,0x00,0x00,0x00,0xe0,0xff,
++ 0x0f,0x00,0xe0,0xff,0x1f,0x80,0xfc,0xff,0x03,0x00,0xfe,0xff,0x03,0x00,0x00,
++ 0x00,0x00,0x00,0xfe,0x01,0x00,0x00,0x7f,0x00,0x00,0x00,0x00,0xf0,0xff,0x1f,
++ 0x00,0xe0,0xff,0x1f,0x80,0xfc,0xff,0x03,0x00,0xfe,0xff,0x03,0x00,0x00,0x00,
++ 0x00,0x00,0xfe,0x01,0x00,0x00,0x7f,0x00,0x00,0x00,0x00,0xf0,0xff,0x1f,0x00,
++ 0xe0,0xff,0x1f,0x80,0xfc,0xff,0x03,0x00,0xfe,0xff,0x03,0x00,0x00,0x00,0x00,
++ 0x80,0x7f,0x00,0x00,0x00,0x3f,0x00,0x00,0x00,0x00,0xf0,0xff,0x1f,0x00,0xe0,
++ 0xff,0x1f,0x80,0xfc,0xff,0x03,0x00,0xfe,0xff,0x01,0x00,0x7c,0x00,0x00,0xc0,
++ 0x3f,0x00,0x00,0xc0,0x3f,0x00,0xc0,0x0f,0x00,0xf0,0xff,0x1f,0x00,0xe0,0xff,
++ 0x07,0x80,0xfc,0xff,0x03,0x00,0xfe,0xff,0x01,0x80,0xff,0x01,0x00,0xe0,0x0f,
++ 0x00,0x00,0xf0,0x0f,0x00,0xf0,0x3f,0x00,0xf0,0xff,0x0f,0x00,0xf8,0xff,0x07,
++ 0x80,0xfc,0xff,0x03,0x00,0xfe,0xff,0x01,0x80,0xff,0x01,0x00,0xe0,0x0f,0x00,
++ 0x00,0xf0,0x0f,0x00,0xf0,0x3f,0x00,0xf0,0xff,0x0f,0x00,0xf8,0xff,0x07,0x80,
++ 0xfc,0xff,0x01,0x00,0xff,0x7f,0x00,0xe0,0xff,0x07,0x00,0xf8,0xff,0xff,0xff,
++ 0xff,0x0f,0x00,0xfc,0xff,0x00,0xf0,0xff,0x03,0x00,0xf8,0xff,0x07,0x80,0xfc,
++ 0xff,0x01,0x00,0xff,0x7f,0x00,0xe0,0xff,0x07,0x00,0xf8,0xff,0xff,0xff,0xff,
++ 0x0f,0x00,0xfc,0xff,0x00,0xf0,0xff,0x03,0x00,0xf8,0xff,0x07,0x80,0xfc,0x3f,
++ 0x00,0xc0,0xff,0x7f,0x00,0xf0,0xff,0x1f,0x00,0xfe,0xff,0xff,0xff,0xff,0x07,
++ 0x00,0xff,0xff,0x03,0xf0,0xff,0x01,0x00,0xf8,0xff,0x01,0x80,0xf0,0x0f,0x00,
++ 0xc0,0xff,0x7f,0x00,0xf0,0xff,0x1f,0x00,0xff,0xff,0xff,0xff,0xff,0x07,0x00,
++ 0xff,0xff,0x03,0xe0,0xff,0x00,0x00,0xfe,0xff,0x00,0x80,0xf0,0x0f,0x00,0xe0,
++ 0xff,0x1f,0x00,0xf0,0xff,0x1f,0x80,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0xff,
++ 0xff,0x03,0xe0,0x3f,0x00,0x00,0xff,0x7f,0x00,0x80,0xf0,0x0f,0x00,0xe0,0xff,
++ 0x1f,0x00,0xf0,0xff,0x1f,0x80,0xff,0xff,0xff,0xff,0xff,0x07,0x00,0xff,0xff,
++ 0x03,0xe0,0x3f,0x00,0x00,0xff,0x7f,0x00,0x80,0xf0,0x0f,0x00,0xf0,0xff,0x0f,
++ 0x00,0xf0,0xff,0x1f,0xe0,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0xff,0xff,0x03,
++ 0xc0,0x3f,0x00,0x80,0xff,0x1f,0x00,0x80,0xf0,0x1f,0x00,0xf8,0xff,0x07,0x00,
++ 0xf0,0xff,0x1f,0xe0,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0xff,0xff,0x03,0xc0,
++ 0x7f,0x00,0xf0,0xff,0x1f,0x00,0x80,0xc0,0xff,0x00,0xff,0xff,0x01,0x00,0xf0,
++ 0xff,0x1f,0xe0,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0xff,0xff,0x03,0x80,0xff,
++ 0x01,0xfc,0xff,0x07,0x00,0x80,0xc0,0xff,0x00,0xff,0xff,0x01,0x00,0xf0,0xff,
++ 0x1f,0xe0,0xff,0xff,0xff,0xff,0xff,0x03,0x00,0xff,0xff,0x03,0x80,0xff,0x01,
++ 0xfc,0xff,0x07,0x00,0x80,0x00,0xfc,0xff,0xff,0x3f,0x00,0x00,0xe0,0xff,0x07,
++ 0xf8,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0xfc,0xff,0x00,0x00,0xfc,0xff,0xff,
++ 0x3f,0x00,0x00,0x80,0x00,0xfc,0xff,0xff,0x3f,0x00,0x00,0xe0,0xff,0x07,0xf8,
++ 0xff,0xff,0xff,0xff,0xff,0x00,0x00,0xfc,0xff,0x00,0x00,0xfc,0xff,0xff,0x3f,
++ 0x00,0x00,0x80,0x00,0xf0,0xff,0xff,0x07,0x00,0x00,0x80,0xff,0x07,0xf8,0xff,
++ 0xff,0xff,0xff,0xff,0x00,0x00,0xf8,0xff,0x00,0x00,0xf0,0xff,0xff,0x07,0x00,
++ 0x00,0x80,0x00,0x00,0xff,0x3f,0x00,0x00,0x00,0x80,0xff,0x00,0x00,0x00,0x00,
++ 0x00,0x00,0x00,0x00,0x00,0xf0,0x1f,0x00,0x00,0x00,0xff,0xff,0x00,0x00,0x00,
++ 0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
++ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xff,0x01,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0xfc,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x7c,0x00,0x00,
+- 0xc0,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xff,0x0f,0x00,
+- 0x00,0x00,0x00,0x00,0x80,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0xfc,0x1f,
+- 0x00,0xfc,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3f,
+- 0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,0xfc,
+- 0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0xff,
+- 0xff,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,
+- 0xfc,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0x1f,
+- 0xf0,0xff,0x01,0x00,0x00,0x00,0x00,0xfc,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,
+- 0x00,0xfe,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,
+- 0x07,0xc0,0xff,0x03,0x00,0x00,0x00,0x00,0x7f,0x80,0xff,0x3f,0x00,0x00,0x00,
+- 0x00,0x00,0xfe,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0xf8,0x03,0xc0,0xff,0x03,0x00,0x00,0x00,0x00,0x1f,0x00,0xfe,0x7f,0x00,0x00,
+- 0x00,0x00,0x00,0xfe,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0xf8,0x03,0x80,0xff,0x07,0x00,0x00,0x00,0x80,0x0f,0x00,0xfc,0x7f,0x00,
+- 0x00,0x00,0x00,0x00,0xff,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0xfc,0x07,0x00,0xff,0x07,0x00,0x00,0x00,0xc0,0x07,0x00,0xf8,0xff,
+- 0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0xfc,0x0f,0x00,0xff,0x0f,0x00,0x00,0x00,0xc0,0x07,0x00,0xf8,
+- 0xff,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0x07,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0xfe,0x1f,0x00,0xff,0x0f,0x00,0x00,0x00,0xe0,0x07,0x00,
+- 0xf0,0xff,0x01,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0x03,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0xfe,0x3f,0x00,0xff,0x0f,0x00,0x00,0x00,0xe0,0x07,
+- 0x00,0xf0,0xff,0x01,0x00,0x00,0x00,0x80,0xff,0xff,0xff,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0x3f,0x00,0xff,0x0f,0x00,0x00,0x00,0xf0,
+- 0x1f,0x00,0xf0,0xff,0x01,0x00,0x00,0x00,0x80,0x0f,0xff,0x0f,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0x3f,0x00,0xff,0x0f,0x00,0x00,0x00,
+- 0xf0,0x7f,0x00,0xf0,0xff,0x01,0x00,0x00,0x00,0x80,0x0f,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x3f,0x00,0xff,0x0f,0x00,0x00,
+- 0x00,0xf0,0xff,0x00,0xf0,0xff,0x01,0x00,0x00,0x00,0xc0,0x07,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x3f,0x80,0xff,0x0f,0x00,
+- 0x00,0x00,0xf0,0xff,0x01,0xf0,0xff,0x01,0x00,0x00,0x00,0xc0,0x07,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0x1f,0x80,0xff,0x07,
+- 0x00,0x00,0x00,0xf0,0xff,0x03,0xf0,0xff,0x01,0x00,0x00,0x00,0xc0,0x07,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0x0f,0x80,0xff,
+- 0x07,0x00,0x00,0x00,0xf0,0xff,0x03,0xf8,0xff,0x01,0x00,0x00,0x00,0xc0,0x03,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0x07,0xc0,
+- 0xff,0x03,0x00,0x00,0x00,0xf0,0xff,0x03,0xf8,0xff,0x00,0x00,0x00,0x00,0xe0,
+- 0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0xc0,0xff,0x03,0x00,0x00,0x00,0xf0,0xff,0x03,0xf8,0xff,0x00,0x00,0x00,0x00,
+- 0xe0,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0xe0,0xff,0x01,0x00,0x00,0x00,0xe0,0xff,0x03,0xfc,0xff,0x00,0x00,0x00,
+- 0x00,0xe0,0xc1,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0xf0,0xff,0x00,0x00,0x00,0x00,0xe0,0xff,0x01,0xfc,0x7f,0x00,0x00,
+- 0x00,0x00,0xf0,0xf9,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0xf8,0x7f,0x00,0x00,0x00,0x00,0xc0,0xff,0x01,0xfe,0x3f,0x00,
+- 0x00,0x00,0x00,0xf0,0xff,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0xfc,0x3f,0x00,0x00,0x00,0x00,0x80,0xff,0x00,0xff,0x3f,
+- 0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x07,0xfe,0x0f,0x00,0x00,0x00,0x00,0x00,0x3e,0x00,0xff,
+- 0x1f,0x00,0x00,0x00,0x00,0xf0,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x80,0xff,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x80,
+- 0xff,0x0f,0x00,0x00,0x00,0x00,0xfc,0x07,0xfe,0xff,0x01,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0xc0,0xff,0x07,0x00,0x00,0x00,0x00,0xfe,0x01,0xf8,0xff,0x03,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0xe0,0xff,0x03,0x00,0x00,0x00,0x00,0x7e,0x00,0xf0,0xff,0x03,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0xff,0x01,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0xf0,0xff,0x01,0x00,0x00,0x00,0x00,0x7f,0x00,0xe0,0xff,0x07,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x07,0xff,0x07,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0xf8,0xff,0x00,0x00,0x00,0x00,0x00,0x3f,0x00,0xc0,0xff,0x07,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0x0f,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0xfc,0x7f,0x00,0x00,0x00,0x00,0x00,0x3e,0x00,0xc0,0xff,
+- 0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x1f,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0xfe,0x1f,0x00,0x00,0x00,0x00,0x00,0x0c,0x00,0xc0,
+- 0xff,0x0f,0xf0,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0xfc,0x3f,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x80,0xff,0x0f,0xf0,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0xf8,
+- 0x7f,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0x03,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x80,0xff,0x0f,0xf0,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,
+- 0xf8,0x7f,0x00,0x00,0x00,0x00,0x00,0xc0,0xff,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x80,0xff,0x0f,0xf0,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0x00,0x00,
+- 0x00,0xf8,0x7f,0x00,0x00,0x00,0x00,0x00,0xe0,0x7f,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x80,0xff,0x0f,0xf0,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,0xe0,
+- 0x03,0x00,0xf8,0xff,0x00,0x00,0x00,0x00,0x00,0xf0,0x1f,0x00,0x0c,0x00,0x00,
+- 0x00,0x00,0x04,0x00,0x80,0xff,0x0f,0xf0,0xff,0xff,0xff,0xff,0x1f,0x00,0x00,
+- 0xf0,0x0f,0x00,0xf8,0xff,0x00,0x00,0x00,0x00,0x00,0xfc,0x07,0x00,0x3c,0x00,
+- 0x00,0x00,0x80,0x3f,0x00,0x80,0xff,0x0f,0xf0,0xff,0xff,0xff,0xff,0x1f,0x00,
+- 0x00,0xf8,0x1f,0x00,0xf8,0xff,0x00,0x00,0x00,0x00,0x00,0xfe,0x03,0x00,0x3e,
+- 0x00,0x00,0x00,0xe0,0x7f,0x00,0x80,0xff,0x0f,0xf0,0xff,0xff,0xff,0xff,0x1f,
+- 0x00,0x00,0xfc,0x3f,0x00,0xf8,0xff,0x00,0x00,0x00,0x00,0x00,0xff,0x00,0x00,
+- 0x1e,0x00,0x00,0x00,0xf0,0xff,0x00,0x80,0xff,0x07,0xf0,0xff,0xff,0xff,0xff,
+- 0x1f,0x00,0x00,0xfc,0x3f,0x00,0xf8,0xff,0x00,0x00,0x00,0x00,0x80,0x7f,0x00,
+- 0x00,0x1f,0x00,0x00,0x00,0xf0,0xff,0x00,0xc0,0xff,0x07,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0xfe,0x3f,0x00,0xfc,0xff,0x00,0x00,0x00,0x00,0xc0,0x1f,
+- 0x00,0x00,0x1f,0x00,0x00,0x00,0xf8,0xff,0x01,0xc0,0xff,0x07,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0xfe,0x3f,0x00,0xfc,0xff,0x00,0x00,0x00,0x00,0xe0,
+- 0x07,0x00,0x80,0x0f,0x00,0x00,0x00,0xf8,0xff,0x01,0xc0,0xff,0x07,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0x3f,0x00,0xfc,0x7f,0x00,0xe0,0x01,0x00,
+- 0xf0,0x03,0x00,0xc0,0x0f,0x00,0x3c,0x00,0xf8,0xff,0x01,0xc0,0xff,0x03,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0x3f,0x00,0xfc,0x7f,0x00,0xf8,0x07,
+- 0x00,0xf8,0x01,0x00,0xf0,0x07,0x00,0xff,0x00,0xf8,0xff,0x00,0xe0,0xff,0x03,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0x1f,0x00,0xfe,0x7f,0x00,0xfc,
+- 0x0f,0x00,0xfc,0xff,0xff,0xff,0x07,0x80,0xff,0x01,0xf8,0xff,0x00,0xe0,0xff,
+- 0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0x1f,0x00,0xfe,0x3f,0x00,
+- 0xfe,0x1f,0x00,0xfe,0xff,0xff,0xff,0x07,0xc0,0xff,0x03,0xf8,0x7f,0x00,0xf0,
+- 0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0x07,0x00,0xff,0x3f,
+- 0x00,0xff,0x3f,0x00,0xff,0xff,0xff,0xff,0x03,0xe0,0xff,0x07,0xf8,0x3f,0x00,
+- 0xf0,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x01,0x00,0xff,
+- 0x1f,0x00,0xff,0x3f,0x80,0xff,0xff,0xff,0xff,0x03,0xe0,0xff,0x07,0xf0,0x1f,
+- 0x00,0xf8,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x01,0x80,
+- 0xff,0x0f,0x00,0xff,0x3f,0xc0,0xff,0xff,0xff,0xff,0x03,0xe0,0xff,0x07,0xf0,
+- 0x07,0x00,0xfc,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0x01,
+- 0xc0,0xff,0x07,0x00,0xff,0x3f,0xe0,0xff,0xff,0xff,0xff,0x01,0xe0,0xff,0x07,
+- 0xe0,0x07,0x00,0xfe,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,
+- 0x03,0xe0,0xff,0x03,0x00,0xff,0x3f,0xf0,0xff,0xff,0xff,0xff,0x01,0xe0,0xff,
+- 0x07,0xe0,0x0f,0x80,0xff,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0xf0,0x0f,0xf8,0xff,0x01,0x00,0xff,0x3f,0xf0,0xff,0xff,0xff,0xff,0x01,0xe0,
+- 0xff,0x07,0xc0,0x3f,0xe0,0xff,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0xe0,0xff,0xff,0xff,0x00,0x00,0xfe,0x1f,0xf8,0xff,0xff,0xff,0xff,0x00,
+- 0xc0,0xff,0x03,0x80,0xff,0xff,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x80,0xff,0xff,0x3f,0x00,0x00,0xfe,0x1f,0xf8,0xff,0xff,0xff,0xff,
+- 0x00,0xc0,0xff,0x03,0x00,0xff,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0xfe,0xff,0x0f,0x00,0x00,0xfc,0x0f,0xf8,0xff,0xff,0xff,
+- 0x7f,0x00,0x80,0xff,0x01,0x00,0xfc,0xff,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0xf0,0xff,0x00,0x00,0x00,0xf8,0x03,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x7f,0x00,0x00,0xe0,0xff,0x03,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0x07,0x00,0x00,0xe0,0x1f,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x07,0x00,0x00,0xf0,0x1f,
+- 0x00,0x00,0x00,0x00,0xf0,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0x07,0x00,0x00,0x80,
+- 0x1f,0x00,0x00,0x00,0x00,0xf0,0xff,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0x03,0x00,0x00,
+- 0x80,0x1f,0x00,0x00,0x00,0x00,0xf0,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0x03,0x00,
+- 0x00,0x80,0x0f,0x00,0x00,0x00,0x00,0xf8,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0x03,
+- 0x00,0x00,0xc0,0x0f,0x00,0x00,0x00,0x00,0xf8,0x3f,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,
+- 0x01,0x00,0x00,0xc0,0x0f,0x00,0x00,0x00,0x00,0x18,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0xf0,0x01,0x00,0x00,0xc0,0x07,0x00,0x00,0x00,0x00,0x1c,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0xf8,0x01,0x00,0x00,0xe0,0x07,0x00,0x00,0x00,0x00,0x0c,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x3f,0x0f,0xf8,0xe1,0xdf,0x1f,0xe0,0xe7,0x07,0x80,0x9f,0x07,0xec,0x07,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0xc0,0xff,0x1f,0xf8,0xe0,0xff,0x3f,0xe0,0xfb,0x0f,0xe0,0xff,0x0f,0xfe,0x1f,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0xe0,0xe3,0x0f,0xfc,0x00,0x3f,0x7e,0xf0,0xff,0x0f,0xf0,0xf1,0x07,0x1e,
+- 0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0xf0,0xc1,0x0f,0xfc,0x80,0x1f,0x7c,0xf0,0x8f,0x0f,0xf8,0xe0,0x07,
+- 0x07,0x7e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0xf8,0xc0,0x0f,0x7c,0x80,0x1f,0x7c,0xf0,0xc7,0x0f,0x7c,0xe0,
+- 0x07,0x03,0x7e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0xf8,0xc0,0x07,0x7e,0x80,0x0f,0x7c,0xf0,0xc3,0x07,0x7c,
+- 0xe0,0x03,0x00,0x7c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0xfc,0xe0,0x07,0x7e,0xc0,0x0f,0x7e,0xf8,0xe1,0x07,
+- 0x7e,0xf0,0x03,0x00,0x7c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0xe0,0x07,0x3e,0xc0,0x0f,0x7e,0xf8,0xe1,
+- 0x07,0x7e,0xf0,0x83,0x07,0x7c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7c,0xe0,0x03,0x3e,0xc0,0x07,0x7e,0xf8,
+- 0xe0,0x03,0x3e,0xf0,0xc1,0x0f,0x7c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7c,0xf0,0x23,0x3f,0xc1,0x07,0x3e,
+- 0xfc,0xf0,0x13,0x3e,0xf8,0xd1,0x0f,0x3e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7c,0xf0,0x33,0x3f,0xe3,0x07,
+- 0x3f,0xfc,0xf0,0x31,0x3e,0xf8,0xd9,0x0f,0x3e,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7c,0xf8,0x19,0x9f,0xe1,
+- 0x07,0x1f,0x7c,0xf0,0x19,0x3e,0xfc,0xcc,0x07,0x1f,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xfc,0x0f,0xdf,
+- 0xe0,0x8f,0x0f,0x7e,0xf0,0x0d,0x7c,0xfe,0xc7,0xc1,0x0f,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0xff,0x07,
+- 0xff,0xf0,0xff,0x07,0x7e,0xf0,0x07,0xfc,0xff,0x83,0xff,0x07,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0xe3,
+- 0x03,0x3e,0xf0,0xfb,0x01,0x3e,0xe0,0x03,0xf0,0xf1,0x01,0xfe,0x01,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0xf0,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0xf0,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0xf8,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x07,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x07,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00};
++ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80};
+ 
+ /* splash background in XPM */
+ 
+--- w_setup.c
++++ w_setup.c	2007-05-11 13:44:57.656325000 +0200
+@@ -44,7 +44,7 @@ int		SW_PER_ROW, SW_PER_COL;
+ 
+ void setup_sizes(int new_canv_wd, int new_canv_ht)
+ {
+-    int		    NUM_CMD_MENUS;
++    int		    NUM_CMD_MENUS, NUM_DRAW, NUM_EDIT;
+ 
+     /*
+      * make the width of the mousefun panel about 1/3 of the size of the
+@@ -93,9 +93,11 @@ void setup_sizes(int new_canv_wd, int ne
+     INDPANEL_WD = MODEPANEL_WD + CANVAS_WD + SIDERULER_WD;
+ 
+     /* space for both modepanel titles (Drawing modes and Editing modes) */
++    NUM_DRAW = (int)(ceil((double)NUM_DRAW_SW/SW_PER_ROW)) - 1;
++    NUM_EDIT = (int)(ceil((double)(NUM_MODE_SW-(NUM_DRAW*SW_PER_ROW))/SW_PER_ROW)) + 1;
+     MODEPANEL_SPACE = 1 + CANVAS_HT + RULER_WD - 
+-	(MODE_SW_HT + INTERNAL_BW) * (ceil((double)NUM_DRAW_SW/SW_PER_ROW) +
+-			ceil((double)(NUM_MODE_SW-NUM_DRAW_SW)/SW_PER_ROW));
++	(MODE_SW_HT + INTERNAL_BW) * (NUM_DRAW + NUM_EDIT);
++
+     if (MODEPANEL_SPACE < 2)
+ 	MODEPANEL_SPACE = 2;
+ }
+--- w_setup.h
++++ w_setup.h	2007-05-11 13:44:57.680328000 +0200
+@@ -29,12 +29,12 @@
+ #define DISPLAY_PIX_PER_INCH 80
+ 
+ /* Portrait dimensions */
+-#define		DEF_CANVAS_HT_PORT	9.5*DISPLAY_PIX_PER_INCH+1
+-#define		DEF_CANVAS_WD_PORT	8.5*DISPLAY_PIX_PER_INCH+1
++#define		DEF_CANVAS_HT_PORT	9.5*DISPLAY_PIX_PER_INCH+1.0
++#define		DEF_CANVAS_WD_PORT	8.5*DISPLAY_PIX_PER_INCH+1.0
+ 
+ /* Landscape dimensions */
+-#define		DEF_CANVAS_HT_LAND	8.5*DISPLAY_PIX_PER_INCH+1
+-#define		DEF_CANVAS_WD_LAND	11*DISPLAY_PIX_PER_INCH+1
++#define		DEF_CANVAS_HT_LAND	9.0*DISPLAY_PIX_PER_INCH+1.0
++#define		DEF_CANVAS_WD_LAND	11.0*DISPLAY_PIX_PER_INCH+1.0
+ 
+ #define		DEF_RULER_WD		24
+ #define		UNITBOX_WD		95
+--- w_snap.c
++++ w_snap.c	2007-05-11 16:15:09.419022454 +0200
+@@ -1373,9 +1373,8 @@ init_snap_panel(parent)
+   Widget dlabel;
+   DeclareArgs(10);
+   
+-
+-  /* MOUSEFUN_HT and ind_panel height aren't known yet */
+-  LAYER_HT = TOPRULER_HT + CANVAS_HT;
++  /* MOUSEFUN_HT height aren't known yet */
++  LAYER_HT = MSGPANEL_HT + CMDFORM_HT + INTERNAL_BW;
+ 
+   /* main form to hold all the layer stuff */
+ 
+--- w_util.c
++++ w_util.c	2007-05-11 16:24:36.343207872 +0200
+@@ -34,6 +34,7 @@
+ #include "w_print.h"
+ #include "w_util.h"
+ #include "w_setup.h"
++#include "w_snap.h"
+ 
+ #include <X11/IntrinsicP.h> /* XtResizeWidget() */
+ 
+@@ -1518,8 +1519,10 @@ void resize_all(int width, int height)
+     GetValues(msg_panel);
+     XtUnmanageChild(mousefun);	/* unmanage the mouse function... */
+     XtUnmanageChild(layer_form);/* and the layer form */
++    XtUnmanageChild(snap_indicator_panel);/* also snap ind panel *
+     XtResizeWidget(msg_panel, MSGPANEL_WD, MSGPANEL_HT, b);
+     XtManageChild(mousefun);	/* so that they shift with msg_panel */
++    XtManageChild(snap_indicator_panel);
+ 
+     /* now redo the center area */
+     XtUnmanageChild(mode_panel);
diff --git a/xfig.3.2.5-locale.dif b/xfig.3.2.5-locale.dif
new file mode 100644
index 0000000..09bf5c9
--- /dev/null
+++ b/xfig.3.2.5-locale.dif
@@ -0,0 +1,62 @@
+--- main.c
++++ main.c	2007-05-07 15:39:50.847599259 +0200
+@@ -61,11 +61,13 @@
+ 
+ /* input extensions for an input tablet */
+ #ifdef USE_TAB
+-#include "X11/extensions/XInput.h"
++#include <X11/extensions/XInput.h>
+ #endif /* USE_TAB */
+ 
+ #ifdef I18N
+ #include <X11/keysym.h>
++#include <locale.h>
++#include <langinfo.h>
+ #endif  /* I18N */
+ 
+ /* EXPORTS */
+@@ -765,11 +767,6 @@ void main(int argc, char **argv)
+ 	}
+     }
+ 
+-#ifdef I18N
+-    setlocale(LC_ALL, "");
+-    XtSetLanguageProc(NULL, NULL, NULL);
+-#endif  /* I18N */
+-
+     /*
+      * save the command line arguments
+      */
+@@ -860,6 +857,10 @@ void main(int argc, char **argv)
+     }
+ 
+ #ifdef I18N
++    if (NULL == strcasestr(nl_langinfo(CODESET),"ANSI") &&
++	 NULL == strcasestr(nl_langinfo(CODESET),"ISO-8859-1"))
++	appres.international = True;
++
+     /************************************************************/
+     /* if the international option has been set, set the locale */
+     /************************************************************/
+@@ -1581,6 +1582,11 @@ setup_visual(int *argc_p, char **argv, A
+ 	 */
+ 	tool = XtAppInitialize (&tool_app, "Fig", options, XtNumber (options), argc_p, argv,
+ 			       (String *) NULL, args, 0);
++#ifdef I18N
++	setlocale(LC_ALL, "");
++	setlocale(LC_NUMERIC, "C");
++	XtSetLanguageProc(tool_app, NULL, NULL);
++#endif  /* I18N */
+ 	/* save important info */
+ 	tool_d = XtDisplay(tool);
+ 	tool_s = XtScreen(tool);
+--- u_print.c
++++ u_print.c	2006-11-16 13:45:46.000000000 +0100
+@@ -15,6 +15,7 @@
+  *
+  */
+ 
++#include <locale.h>
+ #include "fig.h"
+ #include "resources.h"
+ #include "object.h"
diff --git a/xfig.3.2.4-urw-fonts.dif b/xfig.3.2.5-urw-fonts.dif
similarity index 68%
rename from xfig.3.2.4-urw-fonts.dif
rename to xfig.3.2.5-urw-fonts.dif
index bd251be..ca0c3be 100644
--- a/xfig.3.2.4-urw-fonts.dif
+++ b/xfig.3.2.5-urw-fonts.dif
@@ -11,7 +11,7 @@
      {"-*-times-medium-r-normal--", (struct xfont*) NULL},
      {"-*-times-medium-i-normal--", (struct xfont*) NULL},
      {"-*-times-bold-r-normal--", (struct xfont*) NULL},
-@@ -59,6 +61,44 @@
+@@ -59,6 +61,44 @@ struct _xfstruct x_fontinfo[NUM_FONTS] =
      {"-*-itc zapf dingbats-*-*-*--", (struct xfont*) NULL},
  };
  
@@ -57,33 +57,26 @@
   * These come with the Open Group X distribution so they should be a common set.
   *
 --- u_fonts.h
-+++ u_fonts.h	2005-10-06 19:19:30.000000000 +0200
-@@ -32,9 +32,6 @@
++++ u_fonts.h	2007-05-07 15:12:49.772318545 +0200
+@@ -58,9 +58,12 @@ struct _xfstruct {
+ extern int		psfontnum(char *font);
+ extern int		latexfontnum(char *font);
  
- extern int		psfontnum();
- extern int		latexfontnum();
 -extern struct _xfstruct	x_fontinfo[], x_backup_fontinfo[];
 -extern struct _fstruct	ps_fontinfo[];
 -extern struct _fstruct	latex_fontinfo[];
++extern struct _xfstruct        x_fontinfo[];
++extern struct _xfstruct        x_urw_fontinfo[];
++extern struct _xfstruct        x_adobe_fontinfo[];
++extern struct _xfstruct        x_backup_fontinfo[];
++extern struct _fstruct ps_fontinfo[];
++extern struct _fstruct latex_fontinfo[];
  
- /* element of linked list for each font
-    The head of list is for the different font NAMES,
-@@ -61,5 +58,12 @@
- 				 * sizes */
- };
- 
-+extern struct _xfstruct	x_fontinfo[];
-+extern struct _xfstruct	x_urw_fontinfo[];
-+extern struct _xfstruct	x_adobe_fontinfo[];
-+extern struct _xfstruct	x_backup_fontinfo[];
-+extern struct _fstruct	ps_fontinfo[];
-+extern struct _fstruct	latex_fontinfo[];
-+
- int		x_fontnum();
+ int		x_fontnum(int psflag, int fnum);
  #endif /* U_FONTS_H */
 --- w_drawprim.c
 +++ w_drawprim.c	2005-10-06 19:12:02.000000000 +0200
-@@ -99,6 +99,22 @@
+@@ -117,6 +117,22 @@ void init_font(void)
  		appres.buttonFont, appres.normalFont);
  	button_font = XLoadQueryFont(tool_d, appres.normalFont);
      }
@@ -106,47 +99,3 @@
      /*
       * Now initialize the font structure for the X fonts corresponding to the
       * Postscript fonts for the canvas.	 OpenWindows can use any LaserWriter
-@@ -119,8 +135,8 @@
- 	    strcpy(template,x_fontinfo[0].template);  /* nope, check for font size 0 */
- 	    strcat(template,"0-0-*-*-*-*-");
- 	    /* add ISO8859 (if not Symbol font or ZapfDingbats) to font name */
--	    if (strstr(template,"symbol") == NULL &&
--		strstr(template,"zapf dingbats") == NULL)
-+	    if (strstr(template,"ymbol") == NULL &&
-+		strstr(template,"ingbats") == NULL)
- 		    strcat(template,"ISO8859-*");
- 	    else
- 		strcat(template,"*-*");
-@@ -139,8 +155,8 @@
- 	    strcpy(template,x_fontinfo[f].template);
- 	    strcat(template,"*-*-*-*-*-*-");
- 	    /* add ISO8859 (if not Symbol font or ZapfDingbats) to font name */
--	    if (strstr(template,"symbol") == NULL &&
--		strstr(template,"zapf dingbats") == NULL)
-+	    if (strstr(template,"ymbol") == NULL &&
-+		strstr(template,"ingbats") == NULL)
- 		    strcat(template,"ISO8859-*");
- 	    else
- 		strcat(template,"*-*");
-@@ -287,8 +303,8 @@
- 		/* attach pointsize to font name */
- 		strcat(template,"%d-*-*-*-*-*-");
- 		/* add ISO8859 (if not Symbol font or ZapfDingbats) to font name */
--		if (strstr(template,"symbol") == NULL &&
--		    strstr(template,"zapf dingbats") == NULL)
-+		if (strstr(template,"ymbol") == NULL &&
-+		    strstr(template,"ingbats") == NULL)
- 			strcat(template,"ISO8859-*");
- 	        else
- 			strcat(template,"*-*");
-@@ -299,8 +315,8 @@
- 		strcpy(template,x_backup_fontinfo[fnum].template);
- 		strcat(template,"%d-*-*-*-*-*-");
- 		/* add ISO8859 (if not Symbol font or ZapfDingbats) to font name */
--		if (strstr(template,"symbol") == NULL &&
--		    strstr(template,"zapf dingbats") == NULL)
-+		if (strstr(template,"ymbol") == NULL &&
-+		    strstr(template,"ingbats") == NULL)
- 			strcat(template,"ISO8859-*");
- 	        else
- 			strcat(template,"*-*");
diff --git a/xfig.3.2.5-xim.dif b/xfig.3.2.5-xim.dif
new file mode 100644
index 0000000..6fa3a62
--- /dev/null
+++ b/xfig.3.2.5-xim.dif
@@ -0,0 +1,14 @@
+--- d_text.c
++++ d_text.c	2007-05-07 00:00:00.000000000 +0200
+@@ -1973,7 +1973,10 @@ xim_initialize(w)
+       if (xim_style == 0) xim_style = style_root;
+     }
+   }
+-  if (xim_style != preferred_style) {
++  if (xim_style != preferred_style
++      && *modifier_list != '\0'
++      && ! strstr(modifier_list,"@im=local")
++      && ! strstr(modifier_list,"@im=none")) {
+     fprintf(stderr, "xfig: this input-method doesn't support %s input style\n",
+ 	    appres.xim_input_style);
+     if (xim_style == 0) {
diff --git a/xfig.3.2.5.dif b/xfig.3.2.5.dif
new file mode 100644
index 0000000..5eb39e0
--- /dev/null
+++ b/xfig.3.2.5.dif
@@ -0,0 +1,287 @@
+--- Fig-color.ad
++++ Fig-color.ad	2006-07-31 17:56:25.000000000 +0200
+@@ -79,6 +79,12 @@ Fig*MenuButton*background: 		gray83
+ ! in the color editor popup
+ Fig*mixedEdit.background: 		gray83
+ 
++Fig*mode_panel.background:		gray67
++Fig*mode_panel*topShadow::		white
++Fig*mode_panel*bottomShadow:		gray17
++Fig*mode_panel*topShadowPixel:		white
++Fig*mode_panel*bottomShadowPixel:	gray17
++
+ Fig*cancel.background: 			gray88
+ Fig*dismiss.background: 		gray88
+ Fig*commands*background: 		gray88
+@@ -88,12 +94,35 @@ Fig*horizontal.background: 		gray88
+ 
+ Fig*topruler.background: 		gray95
+ Fig*sideruler.background: 		gray95
++Fig*topruler.foreground: 		black
++Fig*sideruler.foreground: 		black
+ 
+ ! file panel and scrollbar
+ 
+ Fig*FigList*background: 		gray95
+ Fig*List*background: 			gray95
+-Fig*Scrollbar.background: 		gray95
++Fig*Scrollbar.background: 		gray77
++Fig*Scrollbar.foreground: 		gray37
++Fig*ScrollbarBackground:		gray67
++Fig*ScrollbarForeground:		gray37
++
++Fig*horizontal.shadowWidth:		2
++Fig*horizontal.topShadowPixel:		gray95
++Fig*horizontal.bottomShadowPixel:	gray37
++Fig*horizontal.topShadow:		gray95
++Fig*horizontal.bottomShadow:		gray37
++
++Fig*Scrollbar.shadowWidth:		2
++Fig*Scrollbar.topShadow:		gray95
++Fig*Scrollbar.bottomShadow:		gray37
++Fig*Scrollbar.topShadowPixel:		gray95
++Fig*Scrollbar.bottomShadowPixel:	gray37
++
++Fig*stdColor.shadowWidth:		2
++Fig*stdColor.topShadow:			gray95
++Fig*stdColor.bottomShadow:		gray37
++Fig*stdColor.topShadowPixel:		gray95
++Fig*stdColor.bottomShadowPixel:		gray37
+ 
+ Fig*Label.background: 			gray80
+ Fig*ind_box.background:			gray80
+--- Fig.ad
++++ Fig.ad	2006-07-31 17:56:25.000000000 +0200
+@@ -10,6 +10,8 @@ Fig.version:			3.2.5-alpha6
+ 
+ Fig*AllowShellResize: false
+ 
++Fig.inches: false
++
+ ! Image editor - can edit imported image
+ Fig.image_editor:		xv
+ 
+@@ -20,7 +22,7 @@ Fig.ghostscript:		gs
+ ! 		This is for viewing the xfig html reference.
+ ! For netscape, this command will open the help pages in a running netscape,
+ !     or start a new netscape if one isn't already running
+-Fig.browser:	netscape -remote 'openFile(%f)' || netscape %f
++Fig.browser:	/usr/X11R6/lib/X11/xfig/browser %f
+ 
+ ! pdfviewer - put your favorite pdf viewer here.  
+ !		This is for viewing the xfig how-to guide and man pages
+@@ -110,60 +112,62 @@ Fig.internalborderwidth:	1
+ ! I include both for compatibility.  Be sure to change both values when
+ ! modifying them.
+ 
+-	Fig*horizontal.shadowWidth: 0
+-	Fig*horizontal.topShadowPixel: black
+-	Fig*horizontal.bottomShadowPixel: white
+-	Fig*horizontal.topShadow: black
+-	Fig*horizontal.bottomShadow: white
++Fig*horizontal.shadowWidth:		0
++Fig*horizontal.topShadowPixel:		black
++Fig*horizontal.bottomShadowPixel:	white
++Fig*horizontal.topShadow:		black
++Fig*horizontal.bottomShadow:		white
+ 
+ ! the following is done so the widget set doesn't try to make shades of
+ ! the scrollbar shadows (even though the width is 0 it takes more colors)
+-	Fig*Scrollbar.shadowWidth: 0
+-	Fig*Scrollbar.topShadow: black
+-	Fig*Scrollbar.bottomShadow: white
+-	Fig*Scrollbar.topShadowPixel: black
+-	Fig*Scrollbar.bottomShadowPixel: white
++
++Fig*Scrollbar.shadowWidth:		0
++Fig*Scrollbar.topShadow:		black
++Fig*Scrollbar.bottomShadow:		white
++Fig*Scrollbar.topShadowPixel:		black
++Fig*Scrollbar.bottomShadowPixel:	white
+ 
+ ! this is for the standard color buttons in the color panel
+-	Fig*stdColor.shadowWidth: 2
+-	Fig*stdColor.topShadow: black
+-	Fig*stdColor.bottomShadow: white
+-	Fig*stdColor.topShadowPixel: black
+-	Fig*stdColor.bottomShadowPixel: white
++
++Fig*stdColor.shadowWidth:		2
++Fig*stdColor.topShadow:			black
++Fig*stdColor.bottomShadow:		white
++Fig*stdColor.topShadowPixel:		black
++Fig*stdColor.bottomShadowPixel:		white
+ 
+ ! turn off any shadows for the user color cells
+-	Fig*colorMemory.shadowWidth: 0
++Fig*colorMemory.shadowWidth:		0
+ 
+ ! You may need or want to adjust the highlight thickness for the mode
+ ! and indicator panels depending on the results.  If it is too thick
+ ! it will erase part of the button graphics.
+-	Fig*mode_panel*highlightThickness: 1
+-	Fig*ind_panel.ind_box.button_form.button.highlightThickness: 1
++Fig*mode_panel*highlightThickness:	1
++Fig*ind_panel.ind_box.button_form.button.highlightThickness: 1
+ ! Same for the popup panels from the indicator panel
+-	Fig*set_indicator_panel*Command.highlightThickness: 1
++Fig*set_indicator_panel*Command.highlightThickness:	1
+ 
+ ! If you use the 3D Athena widget set and the small icons for the mode panel
+ ! (because you have a small screen; see Imakefile) you may want to reduce
+ ! the shadow width to 1 or 0.  Uncomment the following in that case:
+-!	Fig*mode_panel*shadowWidth: 1
++Fig*mode_panel*shadowWidth:		1
+ 
+ ! The following is for the update marker in the upper-right corner of the
+ ! indicator buttons.  You may not want any highlight thickness because
+ ! the boxes are so small.
+-	Fig*ind_panel.ind_box.button_form.update.highlightThickness: 0
++Fig*ind_panel.ind_box.button_form.update.highlightThickness:	1
+ 
+ ! This sets the shadows for the spinner arrows
+-	Fig*spinup.shadowWidth:   2
+-	Fig*spindown.shadowWidth: 2
++Fig*spinup.shadowWidth:			0
++Fig*spindown.shadowWidth:		0
+ 
+ ! This gets rid of that funny black line that sometimes borders the canvas
+ 
+-	Fig*canvas.shadowWidth:  0
++Fig*canvas.shadowWidth:			0
+ 
+ !if on monochrome server, or no Fig-color app-defaults file
+ !  This background resource shows between the buttons like a border
+-	Fig*mode_panel.background:	black
+-	Fig*mode_panel.foreground:	black
++Fig*mode_panel.background:		black
++Fig*mode_panel.foreground:		black
+ 
+ ! Specify a private Compose key database file.  If this resource contains a "/"
+ ! then the wired-in name of the xfig global directory won't be prefixed to it.
+--- Imakefile
++++ Imakefile	2007-05-07 16:44:13.756022210 +0200
+@@ -55,11 +55,11 @@ XCOMM the 3d Athena Widget Set (highly r
+ XCOMM Uncomment the following if you have David Hawkey's Xaw3D version 1.5E which has
+ XCOMM some new features, including "Tips", which replace xfig's "help balloons"
+ 
+-XCOMM #define XAW3D1_5E
++#define XAW3D1_5E
+ 
+ #ifdef XAW3D1_5E
+     DUSEXAW3D = -DXAW3D -DXAW3D1_5E
+-    XAWLIB = -lXaw3d15e
++    XAWLIB = -lXaw3d
+ #else
+     XAW_SRC = w_menuentry.c SmeCascade.c SmeBSB.c SimpleMenu.c
+     XAW_OBJ = w_menuentry.o SmeCascade.o SmeBSB.o SimpleMenu.o
+@@ -73,7 +73,7 @@ XCOMM Redefine the following if your PNG
+ XCOMM are in different places
+ 
+ PNGLIBDIR = $(USRLIBDIR)
+-PNGINC = -I/usr/local/include
++PNGINC = -I/usr/include
+ ZLIBDIR = $(USRLIBDIR)
+ 
+ XCOMM If don't want JPEG support, comment out the #define USEJPEG line
+@@ -93,8 +93,8 @@ XCOMM You must have version 5b or newer 
+ 
+ #ifdef USEJPEG
+ #ifdef USEINSTALLEDJPEG
+-JPEGLIBDIR = /usr/local/lib
+-JPEGINC = -I/usr/include/X11
++JPEGLIBDIR = /usr/lib
++JPEGINC = -I/usr/include
+ #else
+ JPEGLIBDIR = ../jpeg
+ JPEGINC = -I$(JPEGLIBDIR)
+@@ -116,8 +116,8 @@ XCOMM Change XPMINC if necessary to poin
+ #define USEXPM_ICON
+ 
+ #ifdef USEXPM
+-XPMLIBDIR = /usr/local/lib
+-XPMINC = -I/usr/local/include/X11
++XPMLIBDIR = $(USRLIBDIR)
++XPMINC = -I$(USRLIBDIR)
+ #endif
+ 
+ XCOMM Uncomment the following definiton if you want to use the small icons
+@@ -158,7 +158,7 @@ XCOMM uncomment the following line if yo
+ XCOMM inline functions. With the "INLINE" keyword, you should notice that
+ XCOMM the display will be a bit faster in complex figures
+ 
+-XCOMM USEINLINE = -DUSE_INLINE
++USEINLINE = -DUSE_INLINE
+ 
+ XCOMM use (and change) the following if you want the multi-key data base file
+ XCOMM somewhere other than the standard X11 library directory
+@@ -166,16 +166,18 @@ XCOMM be sure to comment out the second 
+ XCOMM XFIGLIBDIR = $(LIBDIR)
+ 
+ XCOMM use this if you want the multi-key data base file in the standard X11 tree
+-XFIGLIBDIR = $(LIBDIR)/xfig
++XCOMM XFIGLIBDIR = $(LIBDIR)/xfig
++XFIGLIBDIR = _DATA/xfig
+ 
+ XCOMM XFIGDOCDIR tells where the html and pdf documentation should go
+ XCOMM XFIGDOCDIR = $(DOCDIR)/xfig
+-XFIGDOCDIR = /usr/local/xfig/doc
++XCOMM XFIGDOCDIR = /usr/local/xfig/doc
++XFIGDOCDIR = /usr/share/doc/packages/xfig
+ 
+ XCOMM MANDIR tells where the standard man pages should go (no need to change it
+ XCOMM if you want the man pages installed in the standard place on your system
+ XCOMM MANDIR = $(MANSOURCEPATH)$(MANSUFFIX)
+-MANDIR = /usr/local/xfig/man
++MANDIR = /usr/share/man/man1
+ 
+ XCOMM If your system doesn't have strstr undefine the following definition
+ XCOMM HAVE_NO_NOSTRSTR = -DNOSTRSTR
+@@ -205,7 +207,7 @@ XCOMM   instead.
+ XCOMM   Add `-DCACHE_SIZE_LIMIT=xxxx' where xxxx is the cache size in kilobytes.
+ XCOMM   A cache size of zero turns caching off.
+ 
+-CACHE = -DCACHE_BITMAPS -DCACHE_SIZE_LIMIT=300
++CACHE = -DCACHE_BITMAPS -DCACHE_SIZE_LIMIT=512 -DMAXNUMPTS=50000 -DBSDLPR
+ 
+ XCOMM For SYSV systems with BSD-style printer command which use lpr instead of
+ XCOMM lp (SGI is one such machine), add -DBSDLPR to the DEFINES variable
+@@ -219,6 +221,7 @@ XCOMM number of vertices.
+ XCOMM If you want a compiler other than "cc", define it here
+ 
+ XCOMM CC = /opt/SUNWspro/bin/cc
++CC = gcc
+ 
+ XCOMM *****************************************************
+ XCOMM *****************************************************
+@@ -241,7 +244,7 @@ DEPLIBJPEG = $(JPEGLIBDIR)/libjpeg.a
+ #endif /* USEJPEG */
+ 
+ #ifdef I18N
+-I18N_DEFS = -DI18N -DSETLOCALE
++I18N_DEFS = -DI18N
+ I18N_SRC = w_i18n.c
+ I18N_OBJ = w_i18n.o
+ #endif
+--- fig.h
++++ fig.h	2006-07-31 17:56:25.000000000 +0200
+@@ -29,6 +29,7 @@ extern	char	*my_strdup(char *str);
+ #endif 
+ #include <sys/types.h>	/* for stat structure */
+ #endif
++#include <sys/param.h>
+ #include <sys/stat.h>
+ 
+ #if defined(__convex__) && defined(__STDC__)
+--- w_menuentry.c
++++ w_menuentry.c	2006-07-31 17:56:25.000000000 +0200
+@@ -169,7 +169,8 @@ Redisplay(Widget w, XEvent *event, Regio
+ 	gc = entry->sme_bsb.norm_gray_gc;
+     }
+     
+-    if (entry->sme_bsb.label != NULL) {
++/*    if (entry->sme_bsb.label != NULL) { */
++      if (entry->sme_bsb.label == XtName((Widget)(entry))) {
+ 	int x_loc = entry->sme_bsb.left_margin;
+ 	int len = strlen(entry->sme_bsb.label);
+ 	char * label = entry->sme_bsb.label;
diff --git a/xfig.3.2.5.tar.bz2 b/xfig.3.2.5.tar.bz2
new file mode 100644
index 0000000..4fa0fb0
--- /dev/null
+++ b/xfig.3.2.5.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:86b0c277a1d37039da3f37668caf988214ffc70990e8a900761df709a5ffcf09
+size 5349446
diff --git a/xfig.changes b/xfig.changes
index dd383ab..1be858e 100644
--- a/xfig.changes
+++ b/xfig.changes
@@ -1,3 +1,289 @@
+-------------------------------------------------------------------
+Mon May  7 16:44:45 CEST 2007 - werner@suse.de
+
+- Make it work as it should:
+  * Be sure that horizontal sidebar ruler and other elements are
+    visible all the time.  This requires small modifications in the
+    calculations of the positions of a lot of elements/classes.
+  * Make splash screen show `3.2.5' instead of `3.2.5 - alpha5'
+  * Supress not wanted debug message
+- Update to xfig 3.2.5 including various bug fixes, from the
+  CHANGES file (bug #267840):
+  * Shift-U accelerator added to popup units panel
+  * The library menu button sizes with the library panel, to show longer
+    path names if the user wants.
+  * The cursor for drawing lines, splines, etc. is a crosshair now instead
+    of an arrow.
+  * Snap features to allow snapping points to endpoints, midpoints and
+    intersections of other objects.
+    From Chris Moller.
+  * Keyboard input of object coordinates for precise positioning.
+    From Chris Moller.
+  * Can grab arc anywhere along the curve instead of just at grab points
+    From Chris Moller.
+  * Added -noflipvisualhints for cases where, due to "different" pointer
+    devices, they aren't really flipped, but the mapping indicates they are.
+  * Export to all of PS, PDF and LaTeX in one operation
+    From Alistair Ramsey
+  * Reorganized Networks library and new devices: ASX-200, 1000, and 4000
+    by Bill Chimiak
+  * New figures "betty.fig" (Betty Boop) and "nikke.fig" (German detective
+    Nick Knatter) in Libraries/Examples drawn by Markku Reunanen
+  * Can finish text input by pressing Escape.  This removes the cancellation
+    of a compose sequence (e.g. a-umlaut)
+  * Actually a bug fix, import of PDF files is now possible.  The code was
+    there since version 3.2.3, but the user interface was not.
+  * Nearly-full ANSI protoization of code by Harald Koenig
+  * Installation of Libraries and doc files faster with tar instead of shell loop
+  * New Gregorian chant music symbols from Bill Chimiak.  Also, Music library
+    divided into "chant" and "modern"
+  * Popup edit panel slightly more compact vertically
+  * New library "Fasteners" containing various bolts and screws
+    From Jim Yuzwalk
+  * Increased size of numeric entry fields in indicator panels
+  * N-channel IGBT in Electronic/Schematics Library from Art Blair
+  * starting values for arrow type, width, length, thickness may be specified
+    on command-line or in X resources:
+    -startarrowtype, -startarrowwidth, -startarrowlength, -startarrowthick
+  * xfig would crash on 64-bit processors because of a missing include, which 
+    causes new_string() to be declared implicitly as returning an integer.
+    This may cause the top 32 bits to get lost and hence the crash.
+  * Blanks not preserved in imported picture filename when reading Fig file
+  * When in metric mode, decimal precision was ignored for dimension lines
+  * When showing vertex numbers on objects, first vertex is now 0 to match
+    edit window vertex numbers
+  * Also, vertex numbers are not shown on inactive (grayed) layers
+  * Widget shadow resources moved from Fig-color to Fig because they don't
+    really have anything to do with color. There was a problem when running
+    KDE because it set a global resource *Scrollbar*height: which made xfig 
+    freeze when *customization: -color was NOT used.
+  * The point positioning indicator is turned on when editing a compound
+    object to show the user that it is used
+  * Increased the maximum size of images that can be imported.  There was
+    a limit in the PostScript image encoder of 4096x4096 pixels.  This was
+    increased to 8192x8192.
+  * Centered text was changed to left-justified when flipped horizontally
+    inside a compound object.
+  * With -v option, after reporting the version, xfig would say that -v
+    was an unknown option 
+  * Local locale was being used when writing the xfig cut buffer file
+    instead of switching to "C" locale.  This created commas instead of
+    decimal (.) for numbers in those particular locales.
+    From Dirk Osswald 
+  * Local locale was used when forming command for calling fig2dev,
+    resulting in commas instead of decimals for floating point numbers.
+  * count_user_colors buffer overflow fixed
+  * Under Cygwin, temporary file stayed around after unlink(), causing
+    error when importing more than one ps/eps/pdf file
+  * Segfault when using -update because appres resources were NULL
+  * -update option failed when not first option passed to xfig
+  * Clicking window manager "close window" button in library titlebar
+    didn't close the window
+  * Wasn't distributing objects in compounds when there were only 2 objects
+  * Some compilers complain about the order of declaration in u_fonts.h - fixed
+  * Northern part of map of India was incorrect (Libraries/Maps/Asia/india.fig)
+  * Map of Serbia was misnamed "yugoslavia.fig" (Libraries/Maps/Europe/yugoslavia.fig)
+  * Map of Central Europe had old Yugoslavia instead of Croatia, Serbia, Bosnia-
+    Herzegovina, and Macedonia (also, Slovenia was mistakenly inside the border)
+  * Editing a compound object with more than 200 texts would crash xfig
+  * Added note to README and FAQ html file:
+    If the Xaw or Xaw3d Athena widget sets are compiled with the
+    ARROW_SCROLLBAR style of scrollbars, there is no StartScroll action
+    and you won't be able to scroll using the wheel on the mouse.  
+    If you want to be able to scroll using the wheel, you must recompile
+    the Xaw library from sources, disabling the ARROW_SCROLLBAR option.
+  * Astrological symbols for planets in Miscellaneous/Astrology by Andrew Collier
+  * Added key bindings to text dialogs to be more like modern systems (the
+    Athena Widget Set that xfig uses is very old):
+      Home:  beginning-of-line
+      End:   end-of-line
+      Del:   delete-character-right
+  * Added *.jpeg* to picture browse options
+  * New libraries for electronics from Fabio González in
+    Libraries/Electronics/Schematic/More 
+  * typo in latex_and_xfig.html and LATEX_AND_XFIG files. Text should be:
+    \convertMPtoPDF{foo.0}{1}{1}
+    It was missing parameters {1}{1}
+  * -correct_font_size missing from -help option list and man pages
+  * -help and -version didn't work unless they were first in the options
+  * -O option wasn't passed to fig2dev for overlapping pages in multiple
+    page mode for PostScript export
+  * Introduction.html and installation.html updated to include Macintosh
+    port of xfig
+  * Button to collapse depths of a compound object (make all same depth)
+    in popup object editor
+  * Grid changed from dotted line to light red solid line
+  * Candle in Libraries/Miscellaneous by Dr. Lyman Hazelton
+  * Right-click on depth checkbox sets current depth in indicator panel
+    to that depth
+  * Library of symbols used when diagramming folding instructions to make
+    origami models and example contributed by Marc Vigo
+  * Can adjust width and height directly in popup editor for picture
+    objects
+  * Support for David Hawkey's Xaw3D version 1.5E
+    (http://www.visi.com/~hawkeyd/xaw3d.html)
+  * When loading a library object, if it contained only a compound and
+    nothing else, when xfig promoted that compound to the toplevel the
+    main comment was lost
+  * Incorrect header files used for SmeBSB resulted in either segfault or
+    none of the command panel entries being underlined
+  * Drawing very large splines (e.g. at zoom = 0.01) caused integer
+    roundoff errors, making xfig loop indefinitely
+  * Bug where a line that had a zero width or length arrowhead was not
+    redrawn after being moved, copied, canvas redraw, etc.
+  * The page border and axis lines would obscure Fig objects when moving,
+    copying etc. other objects on the canvas.
+  * In the popup picture editor, if the relative position of the corners
+    of the picture were changed, the rotation field was not updated
+    (this bug was in 3.2.5-alpha3 only)
+  * line, arc, ellipse length tool was reporting 0 length
+  * URL for information about the color optimization code (written by
+    Anthony Dekker) has changed to:
+    http://members.ozemail.com.au/~dekker/NEUQUANT.HTML
+  * -autorefresh command-line option (resource: Fig.autorefresh) which
+    will make xfig look at the timestamp on the .fig file and
+    automatically load it and display it everytime it changes.
+  * Removed requirement to compile with WHEELMOUSE when using wheelmouse
+  * New tower computers (Libraries/Computers/AOpenKF45E.fig and
+    AOpenKF45E.fig from Dirko van Schalkwyk)
+  * New 10/100 8port hub (Libraries/Networks/3Com3C16750.fig also from
+    Dirko van Schalkwyk)
+  * When placing library objects, the name and comments are displayed in
+    message window
+  * New flags (Libraries/Flags): Africa/Eritrea, Africa/Zimbabwe,
+    Asia/Myanmar, Asia/Tajikstan, Asia/Kyrgystan, Europe/Croatia
+  * non-polar capacitor added to Libraries/Electronic/Schematic
+  * Mouse wheel can be used to scroll through filename lists in File and
+    Export panels and icons or object lists in Library panel
+  * Thickness of ticks in dimension lines are user-adjustable now
+  * For attribute popup dialogs with only one text entry, keyboard now
+    focuses on the entry as long as the pointer is anywhere in the dialog
+  * When using the "Open compound, keep rest visible", the other objects
+    are drawn in shades of gray similar to the inactive layers feature.
+  * New library objects: adder, multiplier, sine-source and voltage-source
+    in Electronic/Schematic by Hubert Lam
+  * Zooming in or out with the Z or z key respectively will keep the canvas
+    centered on the mouse pointer
+  * Full version and patchlevel is included in Fig file header for
+    diagnostics
+  * Can explicitly set the rotation of imported pictures in edit panel
+    after importing
+  * Export option to produce both EPS and PDF (in two files) in one step.
+    Useful for those who both use LaTeX and PDFLaTeX
+  * "Epoch" added to rpm spec
+  * New HP/GL2 (fig2dev) driver from Glenn Burkhardt with paper size
+    selection, offset, centering and orientation options
+  * New library object "atom" in Libraries/Miscellaneous is the classic
+    drawing of an atom with electrons circling
+    From Andrew B. Collier
+  * Missing #ifdef XAW3D in SimpleMenu.c
+  * Bug when breaking a compound object - depths were added twice to the
+    counts
+  * When implicitly cancelling the placement of a library object by
+    choosing another mode, xfig would do one of two things:
+      1. tell user to cancel or finish the current operation, but there
+         was no way to do that
+      2. create the object that was being cancelled with extremely large,
+         negative coordinates
+  * Picture Reread button was active before file was read the first time
+  * Rereading picture in edit popup produced bad colors
+  * When using multiple copies of an imported picture, h/w ratio was not
+    computed for copies
+  * Importing PCX images were incorrect when bytes per line different from
+    width*bpp
+  * When passed a filename containing a directory name for a Fig object
+    library using -library_dir, and that directory only contains Fig files
+    and no subdirectories with Fig files, xfig segfaulted
+  * Several checks for memory allocation failure added to the library
+    loading procs
+  * Forgot to free allocated memory when return abnormally from loading
+    libraries
+  * Path length check in loading libraries fixed
+  * Missing include for put_msg prototype in e_measeure.c
+  * Needed #ifdef for XtVersion in SmeBSB.c (X11R5 doesn't have
+    international fontset)
+  * Added SIGPIPE signal to ignore in case an external program dies when we're
+    using pipes
+  * Screen capture on an MSBFirst X server with 24/32 bits per pixel was
+    incorrect.
+  * Importing any image file on such a server was incorrect (bytes/bits
+    reversed).
+  * Reading GIF or PCX files on 24-bit server *and* on big-endian machine
+    (e.g. Sparcstation) resulted in bytes being swapped and funny colors
+  * Could popup unit dialog when drawing/editing objects
+  * Embedded whitespace in filenames in recently loaded files weren't
+    parsed properly (.xfigrc)
+  * When pasting an object on the canvas, point positioning grid wasn't used
+  * Bug when reading a compressed eps file (file handle was passed to open
+    proc instead of name)
+  * Minor grid spec used twice instead of minor/major when passed to fig2dev
+  * Fixed conversions of export/print grid values when switching to/from
+    metric, decimal or fraction
+  * When loading or merging a file, xfig appended ".fig" to the name if
+    there wasn't ".fig" in the name. Now it only appends ".fig" if there
+    is no suffix (no ".").
+  * When appending the ".fig" before the previous change, xfig would segfault
+  * Libraries/Electronic/Schematic/transformer and transformer_ironcore
+    aligned to 1/16" grid
+  * Bugs in indicator panel display of text flags, dimension line params
+    and arrow size params when cycling through settings with middle or
+    right mouse button
+  * Bug in callbacks for dimension line checkboxes that select actual
+    length or user text
+  * When exporting to Combined PDF/LaTeX it uses ".pdf" and ".pdf_t"
+    suffixes because LaTeX doesn't recognize ".pdftex" as a PDF file
+  * Better clipping around arrowheads on thick lines (lines that are
+    thicker than the arrowhead is wide)
+  * Checks for open splines of < 2 points when reading figure file and
+    removes them
+  * Clicking middle mouse button after creating first point of closed
+    spline switched to freehand mode
+  * Export panel sections would get messed up when changing export
+    languages
+  * Now checks whether scrollbars support StartScroll before trying to use
+    it for the wheel scrolling.  When the Xaw widgets are compiled with
+    ARROW_SCROLLBAR, there is no such action.
+  * pstex_t export lacked border option (-b) to align LaTeX text when
+    pstex figure specified border (also fixed in fig2dev)
+  * Create one picture object with no filename, then create another and
+    xfig crashed
+  * Some bugs when freeing dimension line components
+  * Bad choices for grid dot spacing in metric mode in the 5mm grid, and
+    decimal inch mode in the 0.5 and 1.0 inch grids
+  * -international flag missing from xfig.html and xfig.man docs
+  * Added call to XsetLocaleModifiers() when initializing input method
+    (-international mode only)
+  * xfig was limiting arrowhead lengths to 50 pixels instead of 50 inches,
+    and the width to 10 pixels instead of 10 inches.
+  * edit panel for circles shouldn't have "angle" entry
+  * edit panel wasn't allowing typing in of negative angles for text and
+    ellipses
+  * Objects were sometimes drawn with a wild point when zooming
+  * Full path was being added to default export filename and wasn't
+    changing when user changed directories
+  * When drawing a box or rounded box with the "show line lengths" on, the
+    sizes were in Fig units (1200ppi) instead of user units.
+  * Spacing cedilla (ISO 0xB8 / octal 270) was missing from CompKeyDB file
+  * Changing the units in the popup edit panel for a text object caused a
+    segfault.
+  * Rulers and grid didn't change scale when user scale was != 1.0.  Even
+    though the message window showed the correct user scale when drawing
+    objects, the rulers and grid still showed the unscaled values.
+  * Axis lines through 0,0 now drawn after page border so it remains
+    visible when there is a grid
+  * Segfault if current directory was deleted after starting xfig
+  * Positioning grid was set to "ANY" when editing a compound object,
+    causing the original bounding box to be lost
+  * Bug in arc drawing caused arcs to be drawn as circles at high zoom
+  * Computing the area of a polygon larger than 38x38 inches overflowed
+    calculation
+  * Bug in bounds calculation for ellipses and circles that increased
+    bounding box even with line width = 1
+  * Limit on number of styles in a family wasn't checked
+  * If all depths were turned off and any edit operation was attempted on
+    the canvas such as move object, delete object, xfig would hang,
+    searching for objects indefinitely.
+
 -------------------------------------------------------------------
 Fri Jun  1 17:15:10 CEST 2007 - dmueller@suse.de
 
diff --git a/xfig.spec b/xfig.spec
index 5ca9801..553ec40 100644
--- a/xfig.spec
+++ b/xfig.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package xfig (Version 3.2.4)
+# spec file for package xfig (Version 3.2.5)
 #
 # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -11,14 +11,14 @@
 # norootforbuild
 
 Name:           xfig
-BuildRequires:  libjpeg-devel libpng-devel netpbm update-desktop-files xaw3d-devel xorg-x11 xorg-x11-devel
+BuildRequires:  flex freetype2-devel libjpeg-devel libpng-devel netpbm update-desktop-files xaw3d-devel xorg-x11 xorg-x11-devel
 License:        Any permissive
 Group:          Productivity/Graphics/Vector Editors
 Provides:       xfig.3.2.3d
 Requires:       transfig netpbm ghostscript-fonts-std
 Autoreqprov:    on
-Version:        3.2.4
-Release:        145
+Version:        3.2.5
+Release:        1
 Summary:        Facility for Interactive Generation of Figures under the X Window System
 Url:            http://www.xfig.org/
 Source:         xfig.%{version}.tar.bz2
@@ -28,14 +28,12 @@ Source3:        xfig.sh
 Source4:        xfig.desktop
 Patch0:         xfig.%{version}.dif
 Patch1:         xfig.%{version}-urw-fonts.dif
-Patch2:         xfig.3.2.3d-xim.dif
+Patch2:         xfig.%{version}-xim.dif
 Patch3:         xfig.3.2.3d-international-std-fonts.dif
-Patch4:         xfig.3.2.3d-xcolor.dif
-Patch5:         xfig-%{version}-mkstemp.dif
-Patch6:         xfig.%{version}-null.dif
-Patch7:         xfig.%{version}-quiet.dif
-Patch8:         xfig.%{version}-gcc4.dif
-Patch9:         xfig.%{version}-locale.dif
+Patch4:         xfig-%{version}-mkstemp.dif
+Patch5:         xfig.3.2.4-null.dif
+Patch6:         xfig.%{version}-locale.dif
+Patch7:         xfig.%{version}-fixes.dif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %{expand: %%global _exec_prefix %(type -p pkg-config &>/dev/null && pkg-config --variable prefix x11 || echo /usr/X11R6)}
 %if "%_exec_prefix" == "/usr/X11R6"
@@ -73,21 +71,22 @@ Authors:
 
 %prep
 %setup -q -n xfig.%{version}
+find -type f | xargs -r chmod a-x,go-w
 %patch0  -p0
 %patch1  -p0 -b .urw-fonts
-%patch2  -p1 -b .xim
+%patch2  -p0 -b .xim
 %patch3  -p1 -b .international-std-fonts
-%patch4  -p0 -b .xcolor
-%patch5  -p1 -b .security
-%patch6  -p0 -b .null
-%patch7  -p0 -b .quiet
-%patch8  -p0 -b .gcc4
-%patch9  -p0 -b .locale
+%patch4  -p0 -b .security
+%patch5  -p0 -b .null
+%patch6  -p0 -b .locale
+%patch7  -p0 -b .fixes
 cp $RPM_SOURCE_DIR/font-test.fig .
-xmkmf -a -D_DATA='%{_data}'
+xmkmf -a -D_DATA='%{_data}' -DStandardDefines=''
 
 %build
-make CCOPTIONS="-fno-strict-aliasing $RPM_OPT_FLAGS -w"
+CCOPTIONS="-fno-strict-aliasing $RPM_OPT_FLAGS -w -D_GNU_SOURCE -std=gnu99"
+CCOPTIONS="$CCOPTIONS -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
+make CCOPTIONS="$CCOPTIONS"
 
 %install
 mkdir -p %{buildroot}%{_bindir}
@@ -101,7 +100,7 @@ ln -sf   %{_defaultdocdir}/%{name}/Libraries		\
          %{buildroot}%{_x11data}/xfig/Libraries
 ln -sf   %{_defaultdocdir}/%{name}/html			\
          %{buildroot}%{_x11data}/xfig/
-ln -sf   %{_defaultdocdir}/%{name}/xfig.html		\
+ln -sf   %{_defaultdocdir}/%{name}/xfig_man.html	\
          %{buildroot}%{_x11data}/xfig/
 ln -sf   %{_defaultdocdir}/%{name}/xfig-howto.pdf	\
          %{buildroot}%{_x11data}/xfig/
@@ -121,6 +120,7 @@ chmod 0755 %{SOURCE3} %{buildroot}%{_bindir}/xfig
 install -d %{buildroot}/usr/share/applications
 sed 's|@@BINDIR@@|%{_bindir}|' < %{SOURCE4} > %{buildroot}/usr/share/applications/xfig.desktop
 chmod 0644 %{buildroot}/usr/share/applications/xfig.desktop
+find %{buildroot}/%{_docdir}/%{name} -name '*.orig' | xargs -r rm -f
 %suse_update_desktop_file xfig VectorGraphics &> /dev/null
 
 %files
@@ -137,6 +137,289 @@ chmod 0644 %{buildroot}/usr/share/applications/xfig.desktop
 %changelog
 * Fri Jun 01 2007 - dmueller@suse.de
 - fix buildrequires
+* Mon May 07 2007 - werner@suse.de
+- Make it work as it should:
+  * Be sure that horizontal sidebar ruler and other elements are
+  visible all the time.  This requires small modifications in the
+  calculations of the positions of a lot of elements/classes.
+  * Make splash screen show `3.2.5' instead of `3.2.5 - alpha5'
+  * Supress not wanted debug message
+- Update to xfig 3.2.5 including various bug fixes, from the
+  CHANGES file (bug #267840):
+  * Shift-U accelerator added to popup units panel
+  * The library menu button sizes with the library panel, to show longer
+  path names if the user wants.
+  * The cursor for drawing lines, splines, etc. is a crosshair now instead
+  of an arrow.
+  * Snap features to allow snapping points to endpoints, midpoints and
+  intersections of other objects.
+  From Chris Moller.
+  * Keyboard input of object coordinates for precise positioning.
+  From Chris Moller.
+  * Can grab arc anywhere along the curve instead of just at grab points
+  From Chris Moller.
+  * Added -noflipvisualhints for cases where, due to "different" pointer
+  devices, they aren't really flipped, but the mapping indicates they are.
+  * Export to all of PS, PDF and LaTeX in one operation
+  From Alistair Ramsey
+  * Reorganized Networks library and new devices: ASX-200, 1000, and 4000
+  by Bill Chimiak
+  * New figures "betty.fig" (Betty Boop) and "nikke.fig" (German detective
+  Nick Knatter) in Libraries/Examples drawn by Markku Reunanen
+  * Can finish text input by pressing Escape.  This removes the cancellation
+  of a compose sequence (e.g. a-umlaut)
+  * Actually a bug fix, import of PDF files is now possible.  The code was
+  there since version 3.2.3, but the user interface was not.
+  * Nearly-full ANSI protoization of code by Harald Koenig
+  * Installation of Libraries and doc files faster with tar instead of shell loop
+  * New Gregorian chant music symbols from Bill Chimiak.  Also, Music library
+  divided into "chant" and "modern"
+  * Popup edit panel slightly more compact vertically
+  * New library "Fasteners" containing various bolts and screws
+  From Jim Yuzwalk
+  * Increased size of numeric entry fields in indicator panels
+  * N-channel IGBT in Electronic/Schematics Library from Art Blair
+  * starting values for arrow type, width, length, thickness may be specified
+  on command-line or in X resources:
+    -startarrowtype, -startarrowwidth, -startarrowlength, -startarrowthick
+  * xfig would crash on 64-bit processors because of a missing include, which
+  causes new_string() to be declared implicitly as returning an integer.
+  This may cause the top 32 bits to get lost and hence the crash.
+  * Blanks not preserved in imported picture filename when reading Fig file
+  * When in metric mode, decimal precision was ignored for dimension lines
+  * When showing vertex numbers on objects, first vertex is now 0 to match
+  edit window vertex numbers
+  * Also, vertex numbers are not shown on inactive (grayed) layers
+  * Widget shadow resources moved from Fig-color to Fig because they don't
+  really have anything to do with color. There was a problem when running
+  KDE because it set a global resource *Scrollbar*height: which made xfig
+  freeze when *customization: -color was NOT used.
+  * The point positioning indicator is turned on when editing a compound
+  object to show the user that it is used
+  * Increased the maximum size of images that can be imported.  There was
+  a limit in the PostScript image encoder of 4096x4096 pixels.  This was
+  increased to 8192x8192.
+  * Centered text was changed to left-justified when flipped horizontally
+  inside a compound object.
+  * With -v option, after reporting the version, xfig would say that -v
+  was an unknown option
+  * Local locale was being used when writing the xfig cut buffer file
+  instead of switching to "C" locale.  This created commas instead of
+  decimal (.) for numbers in those particular locales.
+  From Dirk Osswald
+  * Local locale was used when forming command for calling fig2dev,
+  resulting in commas instead of decimals for floating point numbers.
+  * count_user_colors buffer overflow fixed
+  * Under Cygwin, temporary file stayed around after unlink(), causing
+  error when importing more than one ps/eps/pdf file
+  * Segfault when using -update because appres resources were NULL
+  * -update option failed when not first option passed to xfig
+  * Clicking window manager "close window" button in library titlebar
+  didn't close the window
+  * Wasn't distributing objects in compounds when there were only 2 objects
+  * Some compilers complain about the order of declaration in u_fonts.h - fixed
+  * Northern part of map of India was incorrect (Libraries/Maps/Asia/india.fig)
+  * Map of Serbia was misnamed "yugoslavia.fig" (Libraries/Maps/Europe/yugoslavia.fig)
+  * Map of Central Europe had old Yugoslavia instead of Croatia, Serbia, Bosnia-
+  Herzegovina, and Macedonia (also, Slovenia was mistakenly inside the border)
+  * Editing a compound object with more than 200 texts would crash xfig
+  * Added note to README and FAQ html file:
+  If the Xaw or Xaw3d Athena widget sets are compiled with the
+  ARROW_SCROLLBAR style of scrollbars, there is no StartScroll action
+  and you won't be able to scroll using the wheel on the mouse.
+  If you want to be able to scroll using the wheel, you must recompile
+  the Xaw library from sources, disabling the ARROW_SCROLLBAR option.
+  * Astrological symbols for planets in Miscellaneous/Astrology by Andrew Collier
+  * Added key bindings to text dialogs to be more like modern systems (the
+  Athena Widget Set that xfig uses is very old):
+  Home:  beginning-of-line
+  End:   end-of-line
+  Del:   delete-character-right
+  * Added *.jpeg* to picture browse options
+  * New libraries for electronics from Fabio González in
+  Libraries/Electronics/Schematic/More
+  * typo in latex_and_xfig.html and LATEX_AND_XFIG files. Text should be:
+  \convertMPtoPDF{foo.0}{1}{1}
+  It was missing parameters {1}{1}
+  * -correct_font_size missing from -help option list and man pages
+  * -help and -version didn't work unless they were first in the options
+  * -O option wasn't passed to fig2dev for overlapping pages in multiple
+  page mode for PostScript export
+  * Introduction.html and installation.html updated to include Macintosh
+  port of xfig
+  * Button to collapse depths of a compound object (make all same depth)
+  in popup object editor
+  * Grid changed from dotted line to light red solid line
+  * Candle in Libraries/Miscellaneous by Dr. Lyman Hazelton
+  * Right-click on depth checkbox sets current depth in indicator panel
+  to that depth
+  * Library of symbols used when diagramming folding instructions to make
+  origami models and example contributed by Marc Vigo
+  * Can adjust width and height directly in popup editor for picture
+  objects
+  * Support for David Hawkey's Xaw3D version 1.5E
+  (http://www.visi.com/~hawkeyd/xaw3d.html)
+  * When loading a library object, if it contained only a compound and
+  nothing else, when xfig promoted that compound to the toplevel the
+  main comment was lost
+  * Incorrect header files used for SmeBSB resulted in either segfault or
+  none of the command panel entries being underlined
+  * Drawing very large splines (e.g. at zoom = 0.01) caused integer
+  roundoff errors, making xfig loop indefinitely
+  * Bug where a line that had a zero width or length arrowhead was not
+  redrawn after being moved, copied, canvas redraw, etc.
+  * The page border and axis lines would obscure Fig objects when moving,
+  copying etc. other objects on the canvas.
+  * In the popup picture editor, if the relative position of the corners
+  of the picture were changed, the rotation field was not updated
+  (this bug was in 3.2.5-alpha3 only)
+  * line, arc, ellipse length tool was reporting 0 length
+  * URL for information about the color optimization code (written by
+  Anthony Dekker) has changed to:
+  http://members.ozemail.com.au/~dekker/NEUQUANT.HTML
+  * -autorefresh command-line option (resource: Fig.autorefresh) which
+  will make xfig look at the timestamp on the .fig file and
+  automatically load it and display it everytime it changes.
+  * Removed requirement to compile with WHEELMOUSE when using wheelmouse
+  * New tower computers (Libraries/Computers/AOpenKF45E.fig and
+  AOpenKF45E.fig from Dirko van Schalkwyk)
+  * New 10/100 8port hub (Libraries/Networks/3Com3C16750.fig also from
+  Dirko van Schalkwyk)
+  * When placing library objects, the name and comments are displayed in
+  message window
+  * New flags (Libraries/Flags): Africa/Eritrea, Africa/Zimbabwe,
+  Asia/Myanmar, Asia/Tajikstan, Asia/Kyrgystan, Europe/Croatia
+  * non-polar capacitor added to Libraries/Electronic/Schematic
+  * Mouse wheel can be used to scroll through filename lists in File and
+  Export panels and icons or object lists in Library panel
+  * Thickness of ticks in dimension lines are user-adjustable now
+  * For attribute popup dialogs with only one text entry, keyboard now
+  focuses on the entry as long as the pointer is anywhere in the dialog
+  * When using the "Open compound, keep rest visible", the other objects
+  are drawn in shades of gray similar to the inactive layers feature.
+  * New library objects: adder, multiplier, sine-source and voltage-source
+  in Electronic/Schematic by Hubert Lam
+  * Zooming in or out with the Z or z key respectively will keep the canvas
+  centered on the mouse pointer
+  * Full version and patchlevel is included in Fig file header for
+  diagnostics
+  * Can explicitly set the rotation of imported pictures in edit panel
+  after importing
+  * Export option to produce both EPS and PDF (in two files) in one step.
+  Useful for those who both use LaTeX and PDFLaTeX
+  * "Epoch" added to rpm spec
+  * New HP/GL2 (fig2dev) driver from Glenn Burkhardt with paper size
+  selection, offset, centering and orientation options
+  * New library object "atom" in Libraries/Miscellaneous is the classic
+  drawing of an atom with electrons circling
+  From Andrew B. Collier
+  * Missing #ifdef XAW3D in SimpleMenu.c
+  * Bug when breaking a compound object - depths were added twice to the
+  counts
+  * When implicitly cancelling the placement of a library object by
+  choosing another mode, xfig would do one of two things:
+  1. tell user to cancel or finish the current operation, but there
+  was no way to do that
+  2. create the object that was being cancelled with extremely large,
+  negative coordinates
+  * Picture Reread button was active before file was read the first time
+  * Rereading picture in edit popup produced bad colors
+  * When using multiple copies of an imported picture, h/w ratio was not
+  computed for copies
+  * Importing PCX images were incorrect when bytes per line different from
+  width*bpp
+  * When passed a filename containing a directory name for a Fig object
+  library using -library_dir, and that directory only contains Fig files
+  and no subdirectories with Fig files, xfig segfaulted
+  * Several checks for memory allocation failure added to the library
+  loading procs
+  * Forgot to free allocated memory when return abnormally from loading
+  libraries
+  * Path length check in loading libraries fixed
+  * Missing include for put_msg prototype in e_measeure.c
+  * Needed #ifdef for XtVersion in SmeBSB.c (X11R5 doesn't have
+  international fontset)
+  * Added SIGPIPE signal to ignore in case an external program dies when we're
+  using pipes
+  * Screen capture on an MSBFirst X server with 24/32 bits per pixel was
+  incorrect.
+  * Importing any image file on such a server was incorrect (bytes/bits
+  reversed).
+  * Reading GIF or PCX files on 24-bit server *and* on big-endian machine
+  (e.g. Sparcstation) resulted in bytes being swapped and funny colors
+  * Could popup unit dialog when drawing/editing objects
+  * Embedded whitespace in filenames in recently loaded files weren't
+  parsed properly (.xfigrc)
+  * When pasting an object on the canvas, point positioning grid wasn't used
+  * Bug when reading a compressed eps file (file handle was passed to open
+  proc instead of name)
+  * Minor grid spec used twice instead of minor/major when passed to fig2dev
+  * Fixed conversions of export/print grid values when switching to/from
+  metric, decimal or fraction
+  * When loading or merging a file, xfig appended ".fig" to the name if
+  there wasn't ".fig" in the name. Now it only appends ".fig" if there
+  is no suffix (no ".").
+  * When appending the ".fig" before the previous change, xfig would segfault
+  * Libraries/Electronic/Schematic/transformer and transformer_ironcore
+  aligned to 1/16" grid
+  * Bugs in indicator panel display of text flags, dimension line params
+  and arrow size params when cycling through settings with middle or
+  right mouse button
+  * Bug in callbacks for dimension line checkboxes that select actual
+  length or user text
+  * When exporting to Combined PDF/LaTeX it uses ".pdf" and ".pdf_t"
+  suffixes because LaTeX doesn't recognize ".pdftex" as a PDF file
+  * Better clipping around arrowheads on thick lines (lines that are
+  thicker than the arrowhead is wide)
+  * Checks for open splines of < 2 points when reading figure file and
+  removes them
+  * Clicking middle mouse button after creating first point of closed
+  spline switched to freehand mode
+  * Export panel sections would get messed up when changing export
+  languages
+  * Now checks whether scrollbars support StartScroll before trying to use
+  it for the wheel scrolling.  When the Xaw widgets are compiled with
+  ARROW_SCROLLBAR, there is no such action.
+  * pstex_t export lacked border option (-b) to align LaTeX text when
+  pstex figure specified border (also fixed in fig2dev)
+  * Create one picture object with no filename, then create another and
+  xfig crashed
+  * Some bugs when freeing dimension line components
+  * Bad choices for grid dot spacing in metric mode in the 5mm grid, and
+  decimal inch mode in the 0.5 and 1.0 inch grids
+  * -international flag missing from xfig.html and xfig.man docs
+  * Added call to XsetLocaleModifiers() when initializing input method
+  (-international mode only)
+  * xfig was limiting arrowhead lengths to 50 pixels instead of 50 inches,
+  and the width to 10 pixels instead of 10 inches.
+  * edit panel for circles shouldn't have "angle" entry
+  * edit panel wasn't allowing typing in of negative angles for text and
+  ellipses
+  * Objects were sometimes drawn with a wild point when zooming
+  * Full path was being added to default export filename and wasn't
+  changing when user changed directories
+  * When drawing a box or rounded box with the "show line lengths" on, the
+  sizes were in Fig units (1200ppi) instead of user units.
+  * Spacing cedilla (ISO 0xB8 / octal 270) was missing from CompKeyDB file
+  * Changing the units in the popup edit panel for a text object caused a
+  segfault.
+  * Rulers and grid didn't change scale when user scale was != 1.0.  Even
+  though the message window showed the correct user scale when drawing
+  objects, the rulers and grid still showed the unscaled values.
+  * Axis lines through 0,0 now drawn after page border so it remains
+  visible when there is a grid
+  * Segfault if current directory was deleted after starting xfig
+  * Positioning grid was set to "ANY" when editing a compound object,
+  causing the original bounding box to be lost
+  * Bug in arc drawing caused arcs to be drawn as circles at high zoom
+  * Computing the area of a polygon larger than 38x38 inches overflowed
+  calculation
+  * Bug in bounds calculation for ellipses and circles that increased
+  bounding box even with line width = 1
+  * Limit on number of styles in a family wasn't checked
+  * If all depths were turned off and any edit operation was attempted on
+  the canvas such as move object, delete object, xfig would hang,
+  searching for objects indefinitely.
 * Thu Nov 16 2006 - werner@suse.de
 - Set LC_NUMERIC to POSIX before print or export data (bug #213942)
 * Tue Nov 07 2006 - ro@suse.de