From: Mark Hansen Date: Mon, 12 Sep 2022 11:03:46 +0000 (+1000) Subject: Remove references to dead HP Graphics Language X-Git-Tag: 6.0.2~41^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b418fb1304184e461856c13c43ca99c405eade66;p=graphviz Remove references to dead HP Graphics Language Was deleted about a year ago. Closes https://gitlab.com/graphviz/graphviz.gitlab.io/-/issues/162 --- diff --git a/contrib/webdot.cgi b/contrib/webdot.cgi index 6baf9f5f6..c99f14b0e 100755 --- a/contrib/webdot.cgi +++ b/contrib/webdot.cgi @@ -85,7 +85,6 @@ my %KnownTypes = ( gif => 'image/gif', png => 'image/png', mif => 'application/x-mif', - hpgl => 'application/x-hpgl', pcl => 'application/x-pcl', vrml => 'x-world/x-vrml', vtx => 'application/x-vtx', diff --git a/doc/Dot.ref b/doc/Dot.ref index 4d9b0991b..da7633107 100644 --- a/doc/Dot.ref +++ b/doc/Dot.ref @@ -687,7 +687,6 @@ The output format is specified with the -Tlang flag on the command line, gd gd2 GD/GD2 formats gif GIF - hpgl HP-GL/2 imap Server-side imagemap ismap Server-side imagemap (deprecated) jpg @@ -737,8 +736,6 @@ gd2 used by the gd library. The latter is compressed. gif Outputs GIF bitmap images. -hpgl - Produces output in the HP-GL/2 vector graphic printer language. imap cmap Produces map files for server-side and client-side image maps, diff --git a/doc/docbook/src/graphviz_plugins.xml b/doc/docbook/src/graphviz_plugins.xml index c43b5ae83..bc7ddcd98 100644 --- a/doc/docbook/src/graphviz_plugins.xml +++ b/doc/docbook/src/graphviz_plugins.xml @@ -252,7 +252,7 @@ available plugins for all the apis. /home/ellson/FIX/Linux.i686/lib/graphviz/config was successfully loaded. render : canon cmap cmapx dia dot fig gd gd2 gif gtk - hpgl imap ismap jpeg jpg mif mp pcl pdf pic plain + imap ismap jpeg jpg mif mp pcl pdf pic plain plain-ext png ps ps2 svg svgz vrml vtx wbmp xdot xlib layout : circo dot fdp neato twopi textlayout : cairo diff --git a/doc/neato/neato.tex b/doc/neato/neato.tex index d6d52ed8d..cc90ed2a9 100644 --- a/doc/neato/neato.tex +++ b/doc/neato/neato.tex @@ -81,7 +81,7 @@ Since the file format includes both undirected and directed graphs, Both programs have the same options for setting labels, colors, shapes, text fonts, and pagination, and for generating code in common graphics languages (PostScript, raster formats such as GIF and PNG, SVG, -FrameMaker MIF, HPGL/2, and web click maps). +FrameMaker MIF, and web click maps). Both work with \dotty, an interactive graph viewer for X windows. (The {\tt lneato} command script runs neato from an interactive window.) diff --git a/doc/schema/arguments.xml b/doc/schema/arguments.xml index 3487284b5..9942d0aab 100644 --- a/doc/schema/arguments.xml +++ b/doc/schema/arguments.xml @@ -25,7 +25,6 @@ - @@ -40,4 +39,4 @@ - \ No newline at end of file + diff --git a/graphs/directed/Makefile.am b/graphs/directed/Makefile.am index 6741ac3fd..8dc14c76c 100644 --- a/graphs/directed/Makefile.am +++ b/graphs/directed/Makefile.am @@ -76,10 +76,6 @@ gv dot: for i in $(GRAPHS); do echo "dot $$i"; \ $(DOT) -Tgv -o$$i.gv $(top_srcdir)/graphs/directed/$$i; done -hpgl: - for i in $(GRAPHS); do echo "dot $$i"; \ - $(DOT) -Thpgl -o$$i.hpgl $(top_srcdir)/graphs/directed/$$i; done - ismap: for i in $(GRAPHS); do echo "dot $$i"; \ $(DOT) -Tismap -o$$i.ismap $(top_srcdir)/graphs/directed/$$i; done diff --git a/graphs/undirected/Makefile.am b/graphs/undirected/Makefile.am index e2758600b..6993e7c30 100644 --- a/graphs/undirected/Makefile.am +++ b/graphs/undirected/Makefile.am @@ -57,10 +57,6 @@ gv dot: for i in $(GRAPHS); do echo "neato $$i"; \ $(DOT) -Kneato -Tgv -o$$i.gv $(top_srcdir)/graphs/undirected/$$i; done -hpgl: - for i in $(GRAPHS); do echo "neato $$i"; \ - $(DOT) -Kneato -Thpgl -o$$i.hpgl $(top_srcdir)/graphs/undirected/$$i; done - ismap: for i in $(GRAPHS); do echo "neato $$i"; \ $(DOT) -Kneato -Tismap -o$$i.ismap $(top_srcdir)/graphs/undirected/$$i; done diff --git a/lib/common/const.h b/lib/common/const.h index c58aeb287..b14b99e64 100644 --- a/lib/common/const.h +++ b/lib/common/const.h @@ -126,7 +126,6 @@ #define CLST 3 /* output languages */ -#define HPGL 2 /* HP Graphics Language */ #define PCL 3 /* Printer Control Language */ #define MIF 4 /* Adobe FrameMaker */ #define PIC_format 5 /* symbol PIC is used by compilers for diff --git a/lib/common/emit.c b/lib/common/emit.c index dfc1449e5..b807b9bca 100644 --- a/lib/common/emit.c +++ b/lib/common/emit.c @@ -3111,7 +3111,7 @@ static void init_job_margin(GVJ_t *job) case GVRENDER_PLUGIN: job->margin = job->device.features->default_margin; break; - case HPGL: case PCL: case MIF: case METAPOST: case VTX: case QPDF: + case PCL: case MIF: case METAPOST: case VTX: case QPDF: job->margin.x = job->margin.y = DEFAULT_PRINT_MARGIN; break; default: diff --git a/tclpkg/tcldot/demo/doted.tcl b/tclpkg/tcldot/demo/doted.tcl index f7e752ce8..31796ebc2 100755 --- a/tclpkg/tcldot/demo/doted.tcl +++ b/tclpkg/tcldot/demo/doted.tcl @@ -217,7 +217,6 @@ proc saveFileAs {type} { set fig {{{FIG Image Files} {.fig}} {{All Files} *}} set gif {{{GIF Image Files} {.gif}} {{All Files} *}} set gv {{{GV Graph Files} {.gv}} {{All Files} *}} - set hpgl {{{HPGL Image Files} {.hpgl}} {{All Files} *}} set jpg {{{JPG Image Files} {.jpg}} {{All Files} *}} set mif {{{MIF Image Files} {.mif}} {{All Files} *}} set pcl {{{PCL Image Files} {.pcl}} {{All Files} *}} @@ -661,8 +660,6 @@ menu .m.file.m.export -command "saveFileAs fig" .m.file.m.export add command -label "GIF ..." -underline 0 \ -command "saveFileAs gif" -.m.file.m.export add command -label "HPGL ..." -underline 0 \ - -command "saveFileAs hpgl" .m.file.m.export add command -label "MIF ..." -underline 0 \ -command "saveFileAs mif" .m.file.m.export add command -label "PDF ..." -underline 0 \ diff --git a/tclpkg/tcldot/examples/neatoed b/tclpkg/tcldot/examples/neatoed index 9c00c7479..b55f2f640 100755 --- a/tclpkg/tcldot/examples/neatoed +++ b/tclpkg/tcldot/examples/neatoed @@ -643,8 +643,6 @@ menu .m.file.m.export -command "saveFileAs gif" .m.file.m.export add command -label "ISMAP ..." -underline 0 \ -command "saveFileAs ismap" -.m.file.m.export add command -label "HPGL ..." -underline 0 \ - -command "saveFileAs hpgl" .m.file.m.export add command -label "MIF ..." -underline 0 \ -command "saveFileAs mif" .m.file.m.export add command -label "PCL ..." -underline 1 \ diff --git a/tclpkg/tcldot/tcldot.3tcl b/tclpkg/tcldot/tcldot.3tcl index f1e63bf31..5988468e4 100644 --- a/tclpkg/tcldot/tcldot.3tcl +++ b/tclpkg/tcldot/tcldot.3tcl @@ -432,7 +432,7 @@ in a specific .I format. Possible .I formats -are: "ps" "mif" "hpgl" "plain" "dot" "gif" "ismap" +are: "ps" "mif" "plain" "dot" "gif" "ismap" If the layout hasn't been already done, then it will be done as part of this operation using the same rules for selecting the layout engine as for the layout command. diff --git a/tclpkg/tcldot/tcldot.html b/tclpkg/tcldot/tcldot.html index a402d370f..331268b19 100644 --- a/tclpkg/tcldot/tcldot.html +++ b/tclpkg/tcldot/tcldot.html @@ -178,7 +178,7 @@ Write graph to file 
         graphHandle write filehandle format
 
-	format:= (ps|mif|hpgl|gif|plain|dot)
+	format:= (ps|mif|gif|plain|dot)
Render graph to existing or new gifImage (see: gdTcl) diff --git a/tests/doted b/tests/doted index 7f6d8be2b..95b2abe59 100755 --- a/tests/doted +++ b/tests/doted @@ -640,8 +640,6 @@ menu .m.file.m.export -command "saveFileAs gif" .m.file.m.export add command -label "ISMAP ..." -underline 0 \ -command "saveFileAs ismap" -.m.file.m.export add command -label "HPGL ..." -underline 0 \ - -command "saveFileAs hpgl" .m.file.m.export add command -label "MIF ..." -underline 0 \ -command "saveFileAs mif" .m.file.m.export add command -label "PCL ..." -underline 1 \ diff --git a/windows/cmd/gvui/frmLayoutControl.frm b/windows/cmd/gvui/frmLayoutControl.frm index 67d484cc1..5911ad723 100644 --- a/windows/cmd/gvui/frmLayoutControl.frm +++ b/windows/cmd/gvui/frmLayoutControl.frm @@ -556,7 +556,6 @@ Private Sub Form_Load() optOutputType.AddItem "ps" optOutputType.AddItem "ps2" - optOutputType.AddItem "hpgl" optOutputType.AddItem "pcl" optOutputType.AddItem "mif" optOutputType.AddItem "pic" diff --git a/windows/gvedit/USettings.dfm b/windows/gvedit/USettings.dfm index ac641e3cf..a0407120c 100644 --- a/windows/gvedit/USettings.dfm +++ b/windows/gvedit/USettings.dfm @@ -135,7 +135,6 @@ object frmSettings: TfrmSettings 'gd' 'gd2' 'gif' - 'hpgl' 'imap' 'jpg' 'mif'