move postscript preamble to utils.c so that is can be shared

diff --git a/lib/common/psgen.c b/lib/common/psgen.c
index 5520a34c740662fe216e3f5fcd5d4525a7b35a17..7307508672c3108150f139acaae80b35b0207058 100644 (file)
--- a/lib/common/psgen.c
+++ b/lib/common/psgen.c
@@ -22,7 +22,6 @@
 #define        PDFMAX  14400           /*  Maximum size of PDF page  */
 
 #include "render.h"
-#include "ps.h"
 #include "agxbuf.h"
 
 #ifdef HAVE_LIBGD
@@ -39,6 +38,7 @@ extern void epsf_define(FILE * of);
 void epsf_emit_body(ps_image_t *img, FILE *of);
 extern void ps_freeusershapes(void);
 extern ps_image_t *ps_usershape_to_image(char *shapeimagefile);
+extern char **ps_txt;
 
 static int N_pages, Cur_page;
 /* static      point   Pages; */

diff --git a/lib/common/utils.c b/lib/common/utils.c
index 71ebbc49595e57c14adbb8b0369d6eb3cab296e6..e33d178bee3a76a286513adfc991c25105d40de4 100644 (file)
--- a/lib/common/utils.c
+++ b/lib/common/utils.c
@@ -18,6 +18,7 @@
 #include "agxbuf.h"
 #include "htmltable.h"
 #include "entities.h"
+#include "ps.h"
 
 #ifndef MSWIN32
 #include <unistd.h>

diff --git a/plugin/core/gvrender_core_ps.c b/plugin/core/gvrender_core_ps.c
index 2557d7b3257282d419c147922d7414d7e0584136..b639399d5613023b97375671fc5d76d27ebadd2b 100644 (file)
--- a/plugin/core/gvrender_core_ps.c
+++ b/plugin/core/gvrender_core_ps.c
@@ -33,10 +33,6 @@
 
 #include "gvplugin_render.h"
 #include "graph.h"
-#if 0
-/* FIXME - gv_ps_txt collides in multiple ps renderers */
-#include "gv_ps.h"
-#endif
 #ifdef HAVE_LIBGD
 #include "gd.h"
 #endif
@@ -44,6 +40,7 @@
 extern void cat_libfile(FILE * ofp, char **arglib, char **stdlib);
 extern void epsf_define(FILE * of);
 extern char *ps_string(char *ins, int latin);
+extern char **ps_txt;
 
 typedef enum { FORMAT_PS, FORMAT_PS2, } format_type;
 
@@ -90,10 +87,7 @@ static void psgen_begin_graph(GVJ_t * job)
         if (job->common->show_boxes == NULL)
             fprintf(job->output_file, "%%%%BoundingBox: (atend)\n");
         fprintf(job->output_file, "%%%%EndComments\nsave\n");
-#if 0
-/* FIXME - gv_ps_txt collides in multiple ps renderers */
-        cat_libfile(job->output_file, job->common->lib, gv_ps_txt);
-#endif
+        cat_libfile(job->output_file, job->common->lib, ps_txt);
         epsf_define(job->output_file);
     }
 #ifdef FIXME