restore -Tpic

diff --git a/plugin/core/Makefile.am b/plugin/core/Makefile.am
index a125cd1fd2fef7a15dd96fe0aa87a2b89b4dbb2d..5e4a34f61de93783cb7b0cb5587a917777e10fba 100644 (file)
--- a/plugin/core/Makefile.am
+++ b/plugin/core/Makefile.am
@@ -33,6 +33,7 @@ libgvplugin_core_C_la_SOURCES = \
        gvrender_core_tk.c \
        gvrender_core_vml.c \
        gvrender_core_pov.c \
+       gvrender_core_pic.c \
        gvloadimage_core.c \
        ps.txt
 

diff --git a/plugin/core/gvplugin_core.c b/plugin/core/gvplugin_core.c
index 00cbc119d437b002ece00775005cbee65228395c..705f849c45e1d5df0ff2db5353a1346d5b0ccf37 100644 (file)
--- a/plugin/core/gvplugin_core.c
+++ b/plugin/core/gvplugin_core.c
@@ -20,6 +20,7 @@ extern gvplugin_installed_t gvdevice_ps_types[];
 extern gvplugin_installed_t gvdevice_svg_types[];
 extern gvplugin_installed_t gvdevice_tk_types[];
 extern gvplugin_installed_t gvdevice_vml_types[];
+extern gvplugin_installed_t gvdevice_pic_types[];
 extern gvplugin_installed_t gvdevice_pov_types[];
 
 extern gvplugin_installed_t gvrender_dot_types[];
@@ -29,6 +30,7 @@ extern gvplugin_installed_t gvrender_ps_types[];
 extern gvplugin_installed_t gvrender_svg_types[];
 extern gvplugin_installed_t gvrender_tk_types[];
 extern gvplugin_installed_t gvrender_vml_types[];
+extern gvplugin_installed_t gvrender_pic_types[];
 extern gvplugin_installed_t gvrender_pov_types[];
 
 extern gvplugin_installed_t gvloadimage_core_types[];
@@ -44,6 +46,7 @@ static gvplugin_api_t apis[] = {
     {API_device, gvdevice_svg_types},
     {API_device, gvdevice_tk_types},
     {API_device, gvdevice_vml_types},
+    {API_device, gvdevice_pic_types},
     {API_device, gvdevice_pov_types},
 
     {API_render, gvrender_dot_types},
@@ -53,6 +56,7 @@ static gvplugin_api_t apis[] = {
     {API_render, gvrender_svg_types},
     {API_render, gvrender_tk_types},
     {API_render, gvrender_vml_types},
+    {API_render, gvrender_pic_types},
     {API_render, gvrender_pov_types},
 
     {API_loadimage, gvloadimage_core_types},

diff --git a/plugin/core/gvrender_core_pic.c b/plugin/core/gvrender_core_pic.c
index 6ef7c18718b3bdf817a44c0367f98bc208355a83..7ecf884f46de0521e69603e08debd335f822f529 100644 (file)
--- a/plugin/core/gvrender_core_pic.c
+++ b/plugin/core/gvrender_core_pic.c
@@ -15,21 +15,20 @@
 #include "config.h"
 #endif
 
-#include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
+#include <stdarg.h>
 #include <ctype.h>
 
-#include "macros.h"
-#include "const.h"
-
-#include "gvio.h"
 #include "gvplugin_render.h"
 #include "gvplugin_device.h"
+#include "gvio.h"
 #include "agxbuf.h"
 #include "utils.h"
 #include "color.h"
 
+#include "const.h"
+
 /* Number of points to split splines into */
 #define BEZIERSUBDIVISION 6
 
@@ -122,7 +121,7 @@ static char *picfontname(char *psname)
     fontinfo *p;
 
     for (p = fonttab; p->psname; p++)
-        if (streq(p->psname, psname))
+        if (strcmp(p->psname, psname) == 0)
             break;
     if (p->psname)
         rv = p->trname;
@@ -298,7 +297,7 @@ static void pic_begin_graph(GVJ_t * job)
 
     gvprintf(job, "%s Creator: %s version %s (%s)\n",
        EscComment, job->common->info[0], job->common->info[1], job->common->info[2]);
-    gvprintf(job, "%s Title: %s\n", EscComment, obj->u.g->name);
+    gvprintf(job, "%s Title: %s\n", EscComment, agnameof(obj->u.g));
     gvprintf(job,
             "%s save point size and font\n.nr .S \\n(.s\n.nr DF \\n(.f\n",
             EscComment);