shorten some core and gd renderer names

diff --git a/plugin/core/gvplugin_core.c b/plugin/core/gvplugin_core.c
index 80a086b7b6b19d1e4a19e2df94a0d91805c9cbcd..d52934b5e15812b13f0798e91e7d1cd17836eda0 100644 (file)
--- a/plugin/core/gvplugin_core.c
+++ b/plugin/core/gvplugin_core.c
@@ -16,33 +16,33 @@
 
 #include "gvplugin.h"
 
-extern gvplugin_installed_t gvdevice_core_dot_types;
-extern gvplugin_installed_t gvdevice_core_ps_types;
-extern gvplugin_installed_t gvdevice_core_fig_types;
-extern gvplugin_installed_t gvdevice_core_svg_types;
-extern gvplugin_installed_t gvdevice_core_vml_types;
-extern gvplugin_installed_t gvdevice_core_map_types;
-extern gvplugin_installed_t gvrender_core_dot_types;
-extern gvplugin_installed_t gvrender_core_ps_types;
-extern gvplugin_installed_t gvrender_core_fig_types;
-extern gvplugin_installed_t gvrender_core_svg_types;
-extern gvplugin_installed_t gvrender_core_vml_types;
-extern gvplugin_installed_t gvrender_core_map_types;
+extern gvplugin_installed_t gvdevice_dot_types;
+extern gvplugin_installed_t gvdevice_ps_types;
+extern gvplugin_installed_t gvdevice_fig_types;
+extern gvplugin_installed_t gvdevice_svg_types;
+extern gvplugin_installed_t gvdevice_vml_types;
+extern gvplugin_installed_t gvdevice_map_types;
+extern gvplugin_installed_t gvrender_dot_types;
+extern gvplugin_installed_t gvrender_ps_types;
+extern gvplugin_installed_t gvrender_fig_types;
+extern gvplugin_installed_t gvrender_svg_types;
+extern gvplugin_installed_t gvrender_vml_types;
+extern gvplugin_installed_t gvrender_map_types;
 extern gvplugin_installed_t gvloadimage_core_types;
 
 static gvplugin_api_t apis[] = {
-    {API_device, &gvdevice_core_dot_types},
-    {API_device, &gvdevice_core_ps_types},
-    {API_device, &gvdevice_core_fig_types},
-    {API_device, &gvdevice_core_svg_types},
-    {API_device, &gvdevice_core_vml_types},
-    {API_device, &gvdevice_core_map_types},
-    {API_render, &gvrender_core_dot_types},
-    {API_render, &gvrender_core_ps_types},
-    {API_render, &gvrender_core_fig_types},
-    {API_render, &gvrender_core_svg_types},
-    {API_render, &gvrender_core_vml_types},
-    {API_render, &gvrender_core_map_types},
+    {API_device, &gvdevice_dot_types},
+    {API_device, &gvdevice_ps_types},
+    {API_device, &gvdevice_fig_types},
+    {API_device, &gvdevice_svg_types},
+    {API_device, &gvdevice_vml_types},
+    {API_device, &gvdevice_map_types},
+    {API_render, &gvrender_dot_types},
+    {API_render, &gvrender_ps_types},
+    {API_render, &gvrender_fig_types},
+    {API_render, &gvrender_svg_types},
+    {API_render, &gvrender_vml_types},
+    {API_render, &gvrender_map_types},
     {API_loadimage, &gvloadimage_core_types},
     {(api_t)0, 0},
 };

diff --git a/plugin/core/gvrender_core_dot.c b/plugin/core/gvrender_core_dot.c
index 8138088ede08ef97ddddc806c471dfc23547d7ca..23d4290c62c071175998368dac858996e0b75714 100644 (file)
--- a/plugin/core/gvrender_core_dot.c
+++ b/plugin/core/gvrender_core_dot.c
@@ -505,17 +505,17 @@ gvdevice_features_t device_features_dot = {
     {72.,72.},                 /* default dpi */
 };
 
-gvplugin_installed_t gvrender_core_dot_types[] = {
-    {FORMAT_DOT, "core_dot", 1, &dot_engine, &render_features_dot},
-    {FORMAT_XDOT, "core_xdot", 1, &xdot_engine, &render_features_xdot},
+gvplugin_installed_t gvrender_dot_types[] = {
+    {FORMAT_DOT, "dot", 1, &dot_engine, &render_features_dot},
+    {FORMAT_XDOT, "xdot", 1, &xdot_engine, &render_features_xdot},
     {0, NULL, 0, NULL, NULL}
 };
 
-gvplugin_installed_t gvdevice_core_dot_types[] = {
-    {FORMAT_DOT, "dot:core_dot", 1, NULL, &device_features_dot},
-    {FORMAT_CANON, "canon:core_dot", 1, NULL, &device_features_canon},
-    {FORMAT_PLAIN, "plain:core_dot", 1, NULL, &device_features_dot},
-    {FORMAT_PLAIN_EXT, "plain-ext:core_dot", 1, NULL, &device_features_dot},
-    {FORMAT_XDOT, "xdot:core_xdot", 1, NULL, &device_features_dot},
+gvplugin_installed_t gvdevice_dot_types[] = {
+    {FORMAT_DOT, "dot:dot", 1, NULL, &device_features_dot},
+    {FORMAT_CANON, "canon:dot", 1, NULL, &device_features_canon},
+    {FORMAT_PLAIN, "plain:dot", 1, NULL, &device_features_dot},
+    {FORMAT_PLAIN_EXT, "plain-ext:dot", 1, NULL, &device_features_dot},
+    {FORMAT_XDOT, "xdot:xdot", 1, NULL, &device_features_dot},
     {0, NULL, 0, NULL, NULL}
 };

diff --git a/plugin/core/gvrender_core_fig.c b/plugin/core/gvrender_core_fig.c
index a3e3345e7d12d3ef6b0ba57085161e640beca286..7725fb99bc4886757b102c69a5a4236a5b3715de 100644 (file)
--- a/plugin/core/gvrender_core_fig.c
+++ b/plugin/core/gvrender_core_fig.c
@@ -539,12 +539,12 @@ gvdevice_features_t device_features_fig = {
          *    but that doesn't explain what the 1200 is? */
 };
 
-gvplugin_installed_t gvrender_core_fig_types[] = {
-    {FORMAT_FIG, "core_fig", 1, &fig_engine, &render_features_fig},
+gvplugin_installed_t gvrender_fig_types[] = {
+    {FORMAT_FIG, "fig", 1, &fig_engine, &render_features_fig},
     {0, NULL, 0, NULL, NULL}
 };
 
-gvplugin_installed_t gvdevice_core_fig_types[] = {
-    {FORMAT_FIG, "fig:core_fig", 1, NULL, &device_features_fig},
+gvplugin_installed_t gvdevice_fig_types[] = {
+    {FORMAT_FIG, "fig:fig", 1, NULL, &device_features_fig},
     {0, NULL, 0, NULL, NULL}
 };

diff --git a/plugin/core/gvrender_core_map.c b/plugin/core/gvrender_core_map.c
index 7455f0e69c1ca6314ba82bbc175bc31d12c60a51..48bb08aad945865617c1b35e74a00ce150dab5ce 100644 (file)
--- a/plugin/core/gvrender_core_map.c
+++ b/plugin/core/gvrender_core_map.c
@@ -315,17 +315,17 @@ static gvdevice_features_t device_features_map_nopoly = {
     {96.,96.},                 /* default dpi */
 };
 
-gvplugin_installed_t gvrender_core_map_types[] = {
-    {FORMAT_ISMAP, "core_map", 1, &map_engine, &render_features_map},
+gvplugin_installed_t gvrender_map_types[] = {
+    {FORMAT_ISMAP, "map", 1, &map_engine, &render_features_map},
     {0, NULL, 0, NULL, NULL}
 };
 
-gvplugin_installed_t gvdevice_core_map_types[] = {
-    {FORMAT_ISMAP, "ismap:core_map", 1, NULL, &device_features_map_nopoly},
-    {FORMAT_CMAP, "cmap:core_map", 1, NULL, &device_features_map},
-    {FORMAT_IMAP, "imap:core_map", 1, NULL, &device_features_map},
-    {FORMAT_CMAPX, "cmapx:core_map", 1, NULL, &device_features_map},
-    {FORMAT_IMAP, "imap_np:core_map", 1, NULL, &device_features_map_nopoly},
-    {FORMAT_CMAPX, "cmapx_np:core_map", 1, NULL, &device_features_map_nopoly},
+gvplugin_installed_t gvdevice_map_types[] = {
+    {FORMAT_ISMAP, "ismap:map", 1, NULL, &device_features_map_nopoly},
+    {FORMAT_CMAP, "cmap:map", 1, NULL, &device_features_map},
+    {FORMAT_IMAP, "imap:map", 1, NULL, &device_features_map},
+    {FORMAT_CMAPX, "cmapx:map", 1, NULL, &device_features_map},
+    {FORMAT_IMAP, "imap_np:map", 1, NULL, &device_features_map_nopoly},
+    {FORMAT_CMAPX, "cmapx_np:map", 1, NULL, &device_features_map_nopoly},
     {0, NULL, 0, NULL, NULL}
 };

diff --git a/plugin/core/gvrender_core_ps.c b/plugin/core/gvrender_core_ps.c
index 26fc3a5d47575c8b88667effd3c2c891a1968088..40b9b9d5edf94236882e70fefb5689affac2e835 100644 (file)
--- a/plugin/core/gvrender_core_ps.c
+++ b/plugin/core/gvrender_core_ps.c
@@ -475,13 +475,13 @@ static gvdevice_features_t device_features_ps = {
     {72.,72.},                 /* default dpi */
 };
 
-gvplugin_installed_t gvrender_core_ps_types[] = {
-    {FORMAT_PS, "core_ps", 1, &psgen_engine, &render_features_ps},
+gvplugin_installed_t gvrender_ps_types[] = {
+    {FORMAT_PS, "ps", 1, &psgen_engine, &render_features_ps},
     {0, NULL, 0, NULL, NULL}
 };
 
-gvplugin_installed_t gvdevice_core_ps_types[] = {
-    {FORMAT_PS, "ps:core_ps", 1, NULL, &device_features_ps},
-    {FORMAT_PS2, "ps2:core_ps", 1, NULL, &device_features_ps},
+gvplugin_installed_t gvdevice_ps_types[] = {
+    {FORMAT_PS, "ps:ps", 1, NULL, &device_features_ps},
+    {FORMAT_PS2, "ps2:ps", 1, NULL, &device_features_ps},
     {0, NULL, 0, NULL, NULL}
 };

diff --git a/plugin/core/gvrender_core_svg.c b/plugin/core/gvrender_core_svg.c
index 55f5d47e9b39aa606d8031a8d900f1d0419f39ab..e67874bdfa7ba38e0405e917745536f4136902eb 100644 (file)
--- a/plugin/core/gvrender_core_svg.c
+++ b/plugin/core/gvrender_core_svg.c
@@ -496,15 +496,15 @@ gvdevice_features_t device_features_svg = {
     {72.,72.},                 /* default dpi */
 };
 
-gvplugin_installed_t gvrender_core_svg_types[] = {
-    {FORMAT_SVG, "core_svg", 1, &svg_engine, &render_features_svg},
+gvplugin_installed_t gvrender_svg_types[] = {
+    {FORMAT_SVG, "svg", 1, &svg_engine, &render_features_svg},
     {0, NULL, 0, NULL, NULL}
 };
 
-gvplugin_installed_t gvdevice_core_svg_types[] = {
-    {FORMAT_SVG, "svg:core_svg", 1, NULL, &device_features_svg},
+gvplugin_installed_t gvdevice_svg_types[] = {
+    {FORMAT_SVG, "svg:svg", 1, NULL, &device_features_svg},
 #if HAVE_LIBZ
-    {FORMAT_SVGZ, "svgz:core_svg", 1, NULL, &device_features_svg},
+    {FORMAT_SVGZ, "svgz:svg", 1, NULL, &device_features_svg},
 #endif
     {0, NULL, 0, NULL, NULL}
 };

diff --git a/plugin/core/gvrender_core_vml.c b/plugin/core/gvrender_core_vml.c
index fb0b94c6a8ff130c3748a7ccf6f5f4795b81e666..821a49fcc81dd393d7d4522338849857b83c1ade 100644 (file)
--- a/plugin/core/gvrender_core_vml.c
+++ b/plugin/core/gvrender_core_vml.c
@@ -437,15 +437,15 @@ gvdevice_features_t device_features_vml = {
     {96.,96.},                 /* default dpi */
 };
 
-gvplugin_installed_t gvrender_core_vml_types[] = {
-    {FORMAT_VML, "core_vml", 1, &vml_engine, &render_features_vml},
+gvplugin_installed_t gvrender_vml_types[] = {
+    {FORMAT_VML, "vml", 1, &vml_engine, &render_features_vml},
     {0, NULL, 0, NULL, NULL}
 };
 
-gvplugin_installed_t gvdevice_core_vml_types[] = {
-    {FORMAT_VML, "vml:core_vml", 1, NULL, &device_features_vml},
+gvplugin_installed_t gvdevice_vml_types[] = {
+    {FORMAT_VML, "vml:vml", 1, NULL, &device_features_vml},
 #if HAVE_LIBZ
-    {FORMAT_VMLZ, "vmlz:core_vml", 1, NULL, &device_features_vml},
+    {FORMAT_VMLZ, "vmlz:vml", 1, NULL, &device_features_vml},
 #endif
     {0, NULL, 0, NULL, NULL}
 };