Use type:dependency:library syntax for loadimage plugins as well

Show full plugin details with "dot -v2" and abbreviated detail with "dot -v"

diff --git a/lib/gvc/gvplugin.c b/lib/gvc/gvplugin.c
index ad83f504684c07dc0f7d1e34edefce59cc0b5c93..65674aac4644bad4b2af88fd4a404fc17267ba0a 100644 (file)
--- a/lib/gvc/gvplugin.c
+++ b/lib/gvc/gvplugin.c
@@ -266,7 +266,8 @@ gvplugin_available_t *gvplugin_load(GVC_t * gvc, api_t api, char *str)
     if (api < 0)
        return NULL;
 
-    if (api == API_device) /* api dependencies - FIXME - find better way to code these *s */
+    if (api == API_device
+       || api == API_loadimage) /* api dependencies - FIXME - find better way to code these *s */
 
         apidep = API_render;   
     else
@@ -392,8 +393,8 @@ const char *gvplugin_list(GVC_t * gvc, api_t api, char *str)
             q = strdup((*pnext)->typestr);
            if ((p = strchr(q, ':')))
                 *p++ = '\0';
-           /* list only the matching type */
-           if (strcasecmp(s, q) == 0) {
+           /* list only the matching type, or all types if s is an empty string */
+           if (!s[0] || strcasecmp(s, q) == 0) {
                /* list each member of the matching type as "type:path" */
                append_buf(' ', (*pnext)->typestr, new);
                buf = append_buf(':', (*pnext)->packagename, FALSE);
@@ -446,6 +447,10 @@ void gvplugin_write_status(GVC_t * gvc)
 #endif
 
     for (api = 0; api < ARRAY_SIZE(api_names); api++) {
-       fprintf(stderr,"    %s\t: %s\n", api_names[api], gvplugin_list(gvc, api, ":"));
+       if (gvc->common.verbose >= 2) 
+           fprintf(stderr,"    %s\t: %s\n", api_names[api], gvplugin_list(gvc, api, ":"));
+       else
+           fprintf(stderr,"    %s\t: %s\n", api_names[api], gvplugin_list(gvc, api, "?"));
     }
+
 }

diff --git a/lib/gvc/gvrender.c b/lib/gvc/gvrender.c
index e3ddf82736109b127ce0f1c4ca8035f95ab057c4..33253f20f53eb2956c0baafe7a98a1e387f1c76c 100644 (file)
--- a/lib/gvc/gvrender.c
+++ b/lib/gvc/gvrender.c
@@ -989,8 +989,7 @@ void gvrender_usershape(GVJ_t * job, char *name, pointf * a, int n,
        b.UR.y = d;
     }
     if (gvre) {
-       if (job->render.features->imageloader)
-           gvloadimage(job, us, b, filled, job->render.features->imageloader);
+       gvloadimage(job, us, b, filled, job->render.type);
     }
 #ifdef WITH_CODEGENS
     else {

diff --git a/lib/gvc/gvusershape.c b/lib/gvc/gvusershape.c
index 328c34eefd793e40ae9b98ff8a92b93df063b148..e01da654ff4f70c586fc70fcbbcab89a00672b6e 100644 (file)
--- a/lib/gvc/gvusershape.c
+++ b/lib/gvc/gvusershape.c
@@ -71,7 +71,7 @@ static int imagetype (usershape_t *us)
            }
         }
     }
-    us->stringtype = "";
+    us->stringtype = "(lib)";
     us->type = FT_NULL;
     return FT_NULL;
 }

diff --git a/plugin/core/gvloadimage_core.c b/plugin/core/gvloadimage_core.c
index 2de117eece00ffb0a288aca6d36c00d90914386d..b641c47b665e1247cfb3b7734764f94033abc5fa 100644 (file)
--- a/plugin/core/gvloadimage_core.c
+++ b/plugin/core/gvloadimage_core.c
@@ -48,7 +48,7 @@ typedef enum {
     FORMAT_PNG_XDOT, FORMAT_GIF_XDOT, FORMAT_JPEG_XDOT,
     FORMAT_PNG_FIG, FORMAT_GIF_FIG, FORMAT_JPEG_FIG,
     FORMAT_PNG_VRML, FORMAT_GIF_VRML, FORMAT_JPEG_VRML,
-    FORMAT_PS_PS, FORMAT__PS,
+    FORMAT_PS_PS, FORMAT_PSLIB_PS,
 } format_type;
 
 static void core_loadimage_svg(GVJ_t * job, usershape_t *us, boxf b, boolean filled)
@@ -281,19 +281,27 @@ static gvloadimage_engine_t engine_xdot = {
 };
 
 gvplugin_installed_t gvloadimage_core_types[] = {
-    {FORMAT_PNG_SVG, "png2svg", 1, &engine_svg, NULL},
-    {FORMAT_GIF_SVG, "gif2svg", 1, &engine_svg, NULL},
-    {FORMAT_JPEG_SVG, "jpeg2svg", 1, &engine_svg, NULL},
-    {FORMAT_PNG_FIG, "png2fig", 1, &engine_fig, NULL},
-    {FORMAT_GIF_FIG, "gif2fig", 1, &engine_fig, NULL},
-    {FORMAT_JPEG_FIG, "jpeg2fig", 1, &engine_fig, NULL},
-    {FORMAT_PNG_VRML, "png2vrml", 1, &engine_vrml, NULL},
-    {FORMAT_GIF_VRML, "gif2vrml", 1, &engine_vrml, NULL},
-    {FORMAT_JPEG_VRML, "jpeg2vrml", 1, &engine_vrml, NULL},
-    {FORMAT_PS_PS, "ps2ps", 1, &engine_ps, NULL},
-    {FORMAT__PS, "2ps", 1, &engine_pslib, NULL},
-    {FORMAT_PNG_XDOT, "png2xdot", 1, &engine_xdot, NULL},
-    {FORMAT_GIF_XDOT, "gif2xdot", 1, &engine_xdot, NULL},
-    {FORMAT_JPEG_XDOT, "jpeg2xdot", 1, &engine_xdot, NULL},
+    {FORMAT_PNG_SVG, "png:svg", 1, &engine_svg, NULL},
+    {FORMAT_GIF_SVG, "gif:svg", 1, &engine_svg, NULL},
+    {FORMAT_JPEG_SVG, "jpeg:svg", 1, &engine_svg, NULL},
+    {FORMAT_JPEG_SVG, "jpe:svg", 1, &engine_svg, NULL},
+    {FORMAT_JPEG_SVG, "jpg:svg", 1, &engine_svg, NULL},
+    {FORMAT_PNG_FIG, "png:fig", 1, &engine_fig, NULL},
+    {FORMAT_GIF_FIG, "gif:fig", 1, &engine_fig, NULL},
+    {FORMAT_JPEG_FIG, "jpeg:fig", 1, &engine_fig, NULL},
+    {FORMAT_JPEG_FIG, "jpe:fig", 1, &engine_fig, NULL},
+    {FORMAT_JPEG_FIG, "jpg:fig", 1, &engine_fig, NULL},
+    {FORMAT_PNG_VRML, "png:vrml", 1, &engine_vrml, NULL},
+    {FORMAT_GIF_VRML, "gif:vrml", 1, &engine_vrml, NULL},
+    {FORMAT_JPEG_VRML, "jpeg:vrml", 1, &engine_vrml, NULL},
+    {FORMAT_JPEG_VRML, "jpe:vrml", 1, &engine_vrml, NULL},
+    {FORMAT_JPEG_VRML, "jpg:vrml", 1, &engine_vrml, NULL},
+    {FORMAT_PS_PS, "ps:ps", 1, &engine_ps, NULL},
+    {FORMAT_PSLIB_PS, "(lib):ps", 1, &engine_pslib, NULL},  /* for pslib */
+    {FORMAT_PNG_XDOT, "png:xdot", 1, &engine_xdot, NULL},
+    {FORMAT_GIF_XDOT, "gif:xdot", 1, &engine_xdot, NULL},
+    {FORMAT_JPEG_XDOT, "jpeg:xdot", 1, &engine_xdot, NULL},
+    {FORMAT_JPEG_XDOT, "jpe:xdot", 1, &engine_xdot, NULL},
+    {FORMAT_JPEG_XDOT, "jpg:xdot", 1, &engine_xdot, NULL},
     {0, NULL, 0, NULL, NULL}
 };

diff --git a/plugin/gd/gvloadimage_gd.c b/plugin/gd/gvloadimage_gd.c
index c848a4bd4f4747a15bbb8b12ab368f751e4d1afb..4d3a82173a899b0ea15f0415820a70d62f3159ef 100644 (file)
--- a/plugin/gd/gvloadimage_gd.c
+++ b/plugin/gd/gvloadimage_gd.c
@@ -35,8 +35,8 @@
 #include "gd.h"
 
 typedef enum {
-    FORMAT_PNG_GD, FORMAT_GIF_GD, FORMAT_JPG_GD, FORMAT_GD_GD, FORMAT_GD2_GD, FORMAT_XPM_GD, FORMAT_WBMP_GD,
-    FORMAT_PNG_PS, FORMAT_GIF_PS, FORMAT_JPG_PS, FORMAT_GD_PS, FORMAT_GD2_PS, FORMAT_XPM_PS, FORMAT_WBMP_PS,
+    FORMAT_PNG_GD, FORMAT_GIF_GD, FORMAT_JPG_GD, FORMAT_GD_GD, FORMAT_GD2_GD, FORMAT_XPM_GD, FORMAT_WBMP_GD, FORMAT_XBM_GD,
+    FORMAT_PNG_PS, FORMAT_GIF_PS, FORMAT_JPG_PS, FORMAT_GD_PS, FORMAT_GD2_PS, FORMAT_XPM_PS, FORMAT_WBMP_PS, FORMAT_XBM_PS,
 } format_type;
 
 
@@ -197,47 +197,43 @@ static gvloadimage_engine_t engine_ps = {
 
 gvplugin_installed_t gvloadimage_gd_types[] = {
 #ifdef HAVE_LIBGD
-#if 0
-    {FORMAT_GD_GD, "gd2gd", 1, &engine, NULL},
-    {FORMAT_GD2_GD, "gd22gd", 1, &engine, NULL},
-#endif
+    {FORMAT_GD_GD, "gd:gd", 1, &engine, NULL},
+    {FORMAT_GD2_GD, "gd2:gd", 1, &engine, NULL},
 #ifdef HAVE_GD_GIF
-    {FORMAT_GIF_GD, "gif2gd", 1, &engine, NULL},
+    {FORMAT_GIF_GD, "gif:gd", 1, &engine, NULL},
 #endif
 #ifdef HAVE_GD_JPEG
-    {FORMAT_JPG_GD, "jpeg2gd", 1, &engine, NULL},
+    {FORMAT_JPG_GD, "jpeg:gd", 1, &engine, NULL},
+    {FORMAT_JPG_GD, "jpe:gd", 1, &engine, NULL},
+    {FORMAT_JPG_GD, "jpg:gd", 1, &engine, NULL},
 #endif
 #ifdef HAVE_GD_PNG
-    {FORMAT_PNG_GD, "png2gd", 1, &engine, NULL},
+    {FORMAT_PNG_GD, "png:gd", 1, &engine, NULL},
 #endif
-#if 0
 #ifdef HAVE_GD_WBMP
-    {FORMAT_WBMP_GD, "wbmp2gd", 1, &engine, NULL},
+    {FORMAT_WBMP_GD, "wbmp:gd", 1, &engine, NULL},
 #endif
 #ifdef HAVE_GD_XPM
-    {FORMAT_XBM_GD, "xbm2gd", 1, &engine, NULL},
-#endif
-#endif
-#if 0
-    {FORMAT_GD_PS, "gd2ps", 1, &engine_ps, NULL},
-    {FORMAT_GD2_PS, "gd22ps", 1, &engine_ps, NULL},
+    {FORMAT_XBM_GD, "xbm:gd", 1, &engine, NULL},
 #endif
+    {FORMAT_GD_PS, "gd:ps", 1, &engine_ps, NULL},
+    {FORMAT_GD2_PS, "gd2:ps", 1, &engine_ps, NULL},
 #ifdef HAVE_GD_GIF
-    {FORMAT_GIF_PS, "gif2ps", 1, &engine_ps, NULL},
+    {FORMAT_GIF_PS, "gif:ps", 1, &engine_ps, NULL},
 #endif
 #ifdef HAVE_GD_JPEG
-    {FORMAT_JPG_PS, "jpeg2ps", 1, &engine_ps, NULL},
+    {FORMAT_JPG_PS, "jpeg:ps", 1, &engine_ps, NULL},
+    {FORMAT_JPG_PS, "jpg:ps", 1, &engine_ps, NULL},
+    {FORMAT_JPG_PS, "jpe:ps", 1, &engine_ps, NULL},
 #endif
 #ifdef HAVE_GD_PNG
-    {FORMAT_PNG_PS, "png2ps", 1, &engine_ps, NULL},
+    {FORMAT_PNG_PS, "png:ps", 1, &engine_ps, NULL},
 #endif
-#if 0
 #ifdef HAVE_GD_WBMP
-    {FORMAT_WBMP_PS, "wbmp2ps", 1, &engine_ps, NULL},
+    {FORMAT_WBMP_PS, "wbmp:ps", 1, &engine_ps, NULL},
 #endif
 #ifdef HAVE_GD_XPM
-    {FORMAT_XBM_PS, "xbm2ps", 1, &engine_ps, NULL},
-#endif
+    {FORMAT_XBM_PS, "xbm:ps", 1, &engine_ps, NULL},
 #endif
 #endif
     {0, NULL, 0, NULL, NULL}

diff --git a/plugin/pango/gvloadimage_pango.c b/plugin/pango/gvloadimage_pango.c
index d3c7c0f5d410f39e1dc6e7a2806a8861d673040b..9db827da7aef523fa30b3696bfab4e1a041971e6 100644 (file)
--- a/plugin/pango/gvloadimage_pango.c
+++ b/plugin/pango/gvloadimage_pango.c
@@ -159,8 +159,8 @@ static gvloadimage_engine_t engine_ps = {
 
 gvplugin_installed_t gvloadimage_pango_types[] = {
 #ifdef HAVE_PANGOCAIRO
-    {FORMAT_PNG_CAIRO, "png2cairo", 1, &engine_cairo, NULL},
-    {FORMAT_PNG_PS, "png2ps", 2, &engine_ps, NULL},
+    {FORMAT_PNG_CAIRO, "png:cairo", 1, &engine_cairo, NULL},
+    {FORMAT_PNG_PS, "png:ps", 2, &engine_ps, NULL},
 #endif
     {0, NULL, 0, NULL, NULL}
 };