add eps to languages for images, add -Tx11 as alias for -Txlib, mod plugin graph...

diff --git a/lib/gvc/plugins.tcl b/lib/gvc/plugins.tcl
index 406ae304fedf1c9be194389ab32ca3bee0b8ed99..7ac73600d9af112444ea8d3a38e31cc73a244fc1 100755 (executable)
--- a/lib/gvc/plugins.tcl
+++ b/lib/gvc/plugins.tcl
@@ -1,6 +1,7 @@
 #!/usr/bin/tclsh
 
 set fn /usr/lib64/graphviz/config5
+#set fn $env(PREFIX)/lib/graphviz/config5
 set f [open $fn r]
 set d [read $f [file size $fn]]
 close $f
@@ -10,6 +11,7 @@ regsub -all -line {^#.*$} $d {} d
 proc mergealias {format} {
     switch $format {
        jpg - jpeg - jpe {return jpg/jpe/jpeg}
+       ps - eps {return ps/eps}
        default {return $format}
     }
 }
@@ -82,11 +84,13 @@ foreach {name} [array names LIB] {
 }
 foreach {name_iformat} [lsort [array names INAMEFORMAT]] {
     foreach {name iformat} $name_iformat {break}
-    if {[string equal $iformat svg]} {set color red} {set color black}
+    if {[string equal $iformat ps/eps]} {set color red} {set color black}
     puts $f "\t\"i-$iformat\" -> \"i-$name-$iformat\" \[color=$color\]"
     foreach {irender} [lsort -unique $INAMEFORMAT($name_iformat)] {
        puts $f "\t\"i-$name-$iformat\" -> \"r-$irender\" \[color=$color\]"
-       set RENDERCOLOR($irender) $color
+        if {! [string equal $color black]} {
+           set RENDERCOLOR($irender) $color
+        }
     }
 }
 foreach {name_oformat} [lsort [array names ONAMEFORMAT]] {

diff --git a/plugin/core/gvloadimage_core.c b/plugin/core/gvloadimage_core.c
index 8c6771a3b2442f7acb4722d9624850663202b9e8..8d6932dc83cb7f29fb64404f0de5c571e4d5e897 100644 (file)
--- a/plugin/core/gvloadimage_core.c
+++ b/plugin/core/gvloadimage_core.c
@@ -284,6 +284,8 @@ gvplugin_installed_t gvloadimage_core_types[] = {
     {FORMAT_JPEG_VRML, "jpe:vrml", 1, &engine_vrml, NULL},
     {FORMAT_JPEG_VRML, "jpg:vrml", 1, &engine_vrml, NULL},
 
+    {FORMAT_PS_PS, "eps:ps", 1, &engine_ps, NULL},
+    {FORMAT_PS_PS, "eps:lasi", 1, &engine_ps, NULL},
     {FORMAT_PS_PS, "ps:ps", 1, &engine_ps, NULL},
     {FORMAT_PS_PS, "ps:lasi", 1, &engine_ps, NULL},
     {FORMAT_PSLIB_PS, "(lib):ps", 1, &engine_pslib, NULL},  /* for pslib */
@@ -294,6 +296,7 @@ gvplugin_installed_t gvloadimage_core_types[] = {
     {FORMAT_JPEG_MAP, "jpe:map", 1, &engine_null, NULL},
     {FORMAT_JPEG_MAP, "jpg:map", 1, &engine_null, NULL},
     {FORMAT_PS_MAP, "ps:map", 1, &engine_null, NULL},
+    {FORMAT_PS_MAP, "eps:map", 1, &engine_null, NULL},
     {FORMAT_SVG_MAP, "svg:map", 1, &engine_null, NULL},
 
     {FORMAT_PNG_DOT, "png:dot", 1, &engine_null, NULL},
@@ -302,6 +305,7 @@ gvplugin_installed_t gvloadimage_core_types[] = {
     {FORMAT_JPEG_DOT, "jpe:dot", 1, &engine_null, NULL},
     {FORMAT_JPEG_DOT, "jpg:dot", 1, &engine_null, NULL},
     {FORMAT_PS_DOT, "ps:dot", 1, &engine_null, NULL},
+    {FORMAT_PS_DOT, "eps:dot", 1, &engine_null, NULL},
     {FORMAT_SVG_DOT, "svg:dot", 1, &engine_null, NULL},
 
     {FORMAT_PNG_XDOT, "png:xdot", 1, &engine_xdot, NULL},
@@ -310,6 +314,7 @@ gvplugin_installed_t gvloadimage_core_types[] = {
     {FORMAT_JPEG_XDOT, "jpe:xdot", 1, &engine_xdot, NULL},
     {FORMAT_JPEG_XDOT, "jpg:xdot", 1, &engine_xdot, NULL},
     {FORMAT_PS_XDOT, "ps:xdot", 1, &engine_xdot, NULL},
+    {FORMAT_PS_XDOT, "eps:xdot", 1, &engine_xdot, NULL},
     {FORMAT_SVG_XDOT, "svg:xdot", 1, &engine_xdot, NULL},
 
     {FORMAT_SVG_SVG, "svg:svg", 1, &engine_svg, NULL},

diff --git a/plugin/xlib/gvdevice_xlib.c b/plugin/xlib/gvdevice_xlib.c
index 4e03c0772b3b4d092a0280fab5d172196b34c1a2..70970fbe909256a0f30cc0aca7506ff2ec920874 100644 (file)
--- a/plugin/xlib/gvdevice_xlib.c
+++ b/plugin/xlib/gvdevice_xlib.c
@@ -616,6 +616,7 @@ static gvdevice_engine_t device_engine_xlib = {
 gvplugin_installed_t gvdevice_types_xlib[] = {
 #ifdef CAIRO_HAS_XLIB_SURFACE
     {0, "xlib:cairo", 0, &device_engine_xlib, &device_features_xlib},
+    {0, "x11:cairo", 0, &device_engine_xlib, &device_features_xlib},
 #endif
     {0, NULL, 0, NULL, NULL}
 };