octave-nkf: scripts/plot/print.m comparison

comparison scripts/plot/print.m @ 9107:d0d507cbd123

Improvements to printing functionality.

author	Ben Abbott <bpabbott@mac.com>
date	Fri, 10 Apr 2009 12:11:14 -0400
parents	b06dc393ac42
children	4c9aff0c9a61

comparison

equal deleted inserted replaced

-:1eb5b24186b6
+:d0d507cbd123
 ##   @itemx epslatex
 ##   @itemx epslatexstandalone
 ##   @itemx pstex
 ##   @itemx pslatex
 ##     Generate a LaTeX (or TeX) file for labels, and eps/ps for
-##     graphics.  The file produced by @code{epslatexstandalone} can be
+## graphics.  The file produced by @code{epslatexstandalone} can be
-##     processed directly by LaTeX.  The other formats are intended to
+## processed directly by LaTeX.  The other formats are intended to
-##     be included in a LaTeX (or TeX) document.  The @code{tex} device
+## be included in a LaTeX (or TeX) document.  The @code{tex} device
-##     is the same as the @code{epslatex} device.
+## is the same as the @code{epslatex} device.
 ##   @item ill
 ##   @itemx aifm
 ##     Adobe Illustrator
 ##   @item cdr
 ##   @itemx corel
 ##     CorelDraw
 ##   @item dxf
 ##     AutoCAD
 ##   @item emf
+##   @itemx meta
 ##     Microsoft Enhanced Metafile
 ##   @item fig
 ##     XFig.  If this format is selected the additional options
 ##     @code{-textspecial} or @code{-textnormal} can be used to control
-##     whether the special flag should be set for the text in the figure
+##     whether the special flag should be set for the text in
-##     (default is @code{-textnormal}).
+##     the figure (default is @code{-textnormal}).
 ##   @item hpgl
 ##     HP plotter language
 ##   @item mf
 ##     Metafont
 ##   @item png
 ##   @item pdf
 ##     Portable document format
 ##   @end table
 ##
 ##   Other devices are supported by "convert" from ImageMagick.  Type
-##   system("convert") to see what formats are available.
+## system("convert") to see what formats are available.
 ##
 ##   If the device is omitted, it is inferred from the file extension,
-##   or if there is no filename it is sent to the printer as postscript.
+## or if there is no filename it is sent to the printer as postscript.
 ##
 ## @itemx -r@var{NUM}
-##   Resolution of bitmaps in pixels per inch.
+##   Resolution of bitmaps in pixels per inch. For both metafiles and
+## SVG the default is the screen resolution, for other it is 150 dpi.
+## To specify screen resolution, use "-r0".
 ##
 ## @itemx -S@var{xsize},@var{ysize}
-##   Plot size in pixels for PNG and SVG.  If using the command form of
+##   Plot size in pixels for EMF, GIF, JPEG, PBM, PNG and SVG. If
-##   the print function, you must quote the @var{xsize},@var{ysize}
+## using the command form of the print function, you must quote the
-##   option.  For example, by writing @code{"-S640,480"}.
+## @var{xsize},@var{ysize} option.  For example, by writing
+## @code{"-S640,480"}.  The size defaults to that specified by the
+## figure's paperposition property.
 ##
 ## @item -F@var{fontname}
 ## @itemx -F@var{fontname}:@var{size}
 ## @itemx -F:@var{size}
 ##   @var{fontname} set the postscript font (for use with postscript,
-##   aifm, corel and fig).  By default, 'Helvetica' is set for PS/Aifm,
+## aifm, corel and fig).  By default, 'Helvetica' is set for PS/Aifm,
-##   and 'SwitzerlandLight' for Corel.  It can also be 'Times-Roman'.
+## and 'SwitzerlandLight' for Corel.  It can also be 'Times-Roman'.
-##   @var{size} is given in points.  @var{fontname} is ignored for the
+## @var{size} is given in points.  @var{fontname} is ignored for the
-##   fig device.
+## fig device.
 ## @end table
 ##
 ## The filename and options can be given in any order.
 ## @end deftypefn
 orientation = orient ();
 use_color = 0; # 0=default, -1=mono, +1=color
 force_solid = 0; # 0=default, -1=dashed, +1=solid
 fontsize = "";
 font = "";
-size = "";
+canvas_size = "";
 name = "";
 devopt = "";
 printer = "";
 debug = false;
 debug_file = "octave-print-commands.log";
 for i = 1:nargin
 arg = varargin{i};
 if (ischar (arg))
 if (strcmp (arg, "-color"))
-	use_color = 1;
+	  use_color = 1;
 elseif (strcmp (arg, "-mono"))
 	  use_color = -1;
 elseif (strcmp (arg, "-solid"))
 force_solid = 1;
 elseif (strcmp (arg, "-dashed"))
 	  debug = true;
 	  if (length (arg) > 7)
 	    debug_file = arg(8:end);
 	  endif
 elseif (length (arg) > 2 && arg(1:2) == "-d")
-	  devopt = arg(3:end);
+	  devopt = tolower(arg(3:end));
 elseif (length (arg) > 2 && arg(1:2) == "-P")
 	  printer = arg;
 elseif (length (arg) > 2 && arg(1:2) == "-F")
 	  idx = rindex (arg, ":");
 	  if (idx)
 	    fontsize = arg(idx+1:length(arg));
 	  else
 	    font = arg(3:length(arg));
 	  endif
 elseif (length (arg) > 2 && arg(1:2) == "-S")
-	  size = arg(3:length(arg));
+	  canvas_size = arg(3:length(arg));
 elseif (length (arg) > 2 && arg(1:2) == "-r")
 	  resolution = arg(3:length(arg));
 elseif (length (arg) >= 1 && arg(1) == "-")
 	  error ("print: unknown option `%s'", arg);
 	elseif (length (arg) > 0)
 endif
 elseif (strcmp (dev, "ill"))
 dev = "aifm";
 elseif (strcmp (dev, "cdr"))
 dev = "corel";
-endif
+elseif (strcmp (dev, "meta"))
+dev = "emf";
-## check if we have to use convert
+elseif (strcmp (dev, "jpg"))
-dev_list = {"aifm", "corel", "fig", "png", "jpg", "jpeg", ...
+dev = "jpeg";
-	      "gif", "pbm", "dxf", "mf", "svg", "hpgl", ...
+endif
-	      "ps", "ps2", "psc", "psc2", "eps", "eps2", ...
-	      "epsc", "epsc2", "emf", "pdf", "pslatex", ...
+## Check if the specified device is one that is supported by
-	      "epslatex", "epslatexstandalone", "pstex"};
+## gnuplot. If not assume it is one supported by ImageMagick's
-convertname = "";
+## "convert" utility.
-[idx, errmsg] = cellidx (dev_list, dev);
+dev_list = {"aifm", "corel", "fig", "png", "jpeg", ...
-if (! idx)
+		"gif", "pbm", "dxf", "mf", "svg", "hpgl", ...
+		"ps", "ps2", "psc", "psc2", "eps", "eps2", ...
+		"epsc", "epsc2", "emf", "pdf", "pslatex", ...
+		"epslatex", "epslatexstandalone", "pstex"};
+if (! any (strcmp (dev, dev_list)))
 if (! isempty (devopt))
-convertname = cstrcat (devopt, ":", name);
+	## Device has been specified but is not supported by gnuplot.
-else
+convert_name = cstrcat (devopt, ":", name);
-convertname = name;
+else
+	## Device has *not* been specified and is not supported by gnuplot.
+convert_name = name;
 endif
 dev = "epsc";
 name = cstrcat (tmpnam, ".eps");
-endif
+else
+convert_name = "";
-if (strcmp (dev, "ps") || strcmp (dev, "ps2")
+endif
-|| strcmp (dev, "psc")  || strcmp (dev, "psc2")
-|| strcmp (dev, "epsc") || strcmp (dev, "epsc2")
+termn = dev;
-|| strcmp (dev, "eps")  || strcmp (dev, "eps2")
-|| strcmp (dev, "pstex")|| strcmp (dev, "pslatex")
+## SVG isn't actually a bitmap, but gnuplot treats its size option as it
-|| strcmp (dev, "epslatex") || strcmp (dev, "epslatexstandalone"))
+## does the bitmap terminals.
+bitmap_devices = {"emf", "gif", "jpeg", "pbm", "png", "svg"};
+if (any (strcmp (dev, {"ps", "ps2", "psc", "psc2", "epsc", "epsc2", ...
+"eps", "eps2", "pstex", "pslatex", "epslatex", ...
+"epslatexstandalone"})))
 ## Various postscript options
-if (strcmp (dev, "pstex")|| strcmp (dev, "pslatex")
+if (any (strcmp (dev, {"pstex", "pslatex", "epslatex"})))
-	|| strcmp (dev, "epslatex"))
-termn = dev;
 options = "";
 elseif (strcmp (dev, "epslatexstandalone"))
 if (__gnuplot_has_feature__ ("epslatexstandalone_terminal"))
-	termn = "epslatex";
+	  termn = "epslatex";
-	options = "standalone ";
+	  options = "standalone ";
 else
-	error ("print: epslatexstandalone needs gnuplot 4.2 or higher");
+	  error ("print: epslatexstandalone needs gnuplot 4.2 or higher");
 endif
 else
 if (dev(1) == "e")
-	options = "eps ";
+	  options = "eps ";
 else
-	options = cstrcat (orientation, " ");
+	  options = cstrcat (orientation, " ");
 endif
 termn = "postscript";
 endif
 if (any (dev == "c") || use_color > 0)
 endif
 if (! isempty (fontsize))
 options = cstrcat (options, " ", fontsize);
 endif
-new_terminal = cstrcat (dev, " ", options);
 elseif (strcmp (dev, "fig"))
 ## XFig
 options = orientation;
 if (use_color >= 0)
 options = " color";
 options = cstrcat (options, " ", special_flag);
 if (! isempty (fontsize))
 options = cstrcat (options, " fontsize ", fontsize);
 endif
-new_terminal = cstrcat ("fig ", options);
 elseif (strcmp (dev, "emf"))
 ## Enhanced Metafile format
 options = " ";
 if (use_color >= 0)
 options = " color";
 endif
 if (! isempty (fontsize))
 options = cstrcat (options, " ", fontsize);
 endif
-new_terminal = cstrcat ("emf ", options);
+elseif (any (strcmp (dev, bitmap_devices)))
-elseif (strcmp (dev, "png") || strcmp (dev, "gif")
+if (isempty (canvas_size) && isempty (resolution)
-	  || strcmp (dev, "jpg") || strcmp (dev, "jpeg")
+	  && any (strcmp (dev, {"pbm", "gif", "jpeg", "png"})))
-	  || strcmp (dev, "pbm"))
+options = "large";
-if (strcmp (dev, "jpg"))
+elseif (strcmp (dev, "svg"))
-dev = "jpeg";
+	## Referring to size, either "dynamic" or "fixed"
-endif
+	options = "fixed";
-## Portable network graphics, PBMplus
-## FIXME -- New PNG interface takes color as "xRRGGBB"
-## where x is the literal character 'x' and 'RRGGBB' are the red,
-## green and blue components in hex.  For now we just ignore it
-## and use default.  The png terminal now is so rich with options,
-## that one perhaps has to write a separate printpng.m function.
-## DAS
-if (isempty (size) && isempty (resolution))
-options = " large";
-elseif (! isempty (size))
-options = cstrcat (" size ", size);
 else
 	options = "";
-endif
+end
-new_terminal = cstrcat (dev, options);
+if (! isempty (canvas_size))
+options = cstrcat (options, " size ", canvas_size);
-elseif (strcmp (dev, "dxf") || strcmp (dev, "mf") || strcmp (dev, "hpgl"))
+endif
+elseif (any (strcmp (dev, {"dxf", "mf", "hpgl"})))
 ## AutoCad DXF, METAFONT, HPGL
-new_terminal = dev;
-elseif (strcmp (dev, "svg"))
-## SVG
 options = "";
-if (! isempty (size))
-options = cstrcat (" size ", size);
-endif
-new_terminal = cstrcat ("svg", options);
 elseif (strcmp (dev, "pdf"))
 ## Portable Document format
 options = " ";
 if (use_color >= 0)
 options = "color";
 else
 options = "mono";
 endif
-if (force_solid > 0)
+if (force_solid >= 0)
 options = cstrcat (options, " solid");
 elseif (force_solid < 0)
 options = cstrcat (options, " dashed");
 endif
 if (! isempty (font))
 options = cstrcat (options, "\"", font, "\" ");
 endif
 if (! isempty (fontsize))
 options = cstrcat (options, " ", fontsize);
 endif
-new_terminal = cstrcat ("pdf ", options);
+endif
-endif
+if (__gnuplot_has_feature__ ("variable_GPVAL_TERMINALS"))
+available_terminals = __gnuplot_get_var__ (gcf, "GPVAL_TERMINALS");
+available_terminals = regexp (available_terminals, "\\b\\w+\\b", "match");
+gnuplot_supports_term = any (strcmp (available_terminals, termn));
+elseif (isunix () && strcmp (termn, "pdf"))
+## Some Linux variants do not include a "pdf" capable gnuplot.
+## To be safe, use "convert".
+[status, output] = system ("which convert");
+have_convert = (status == 0);
+if (have_convert)
+gnuplot_supports_term = false;
+else
+gnuplot_supports_term = true;
+endif
+else
+gnuplot_supports_term = true;
+endif
+if (! gnuplot_supports_term)
+## If the terminal is not supported by the local gnuplot, try "convert".
+if (strcmp (termn, "pdf"))
+	if (strfind (name, ".pdf") == numel (name) - 3)
+convert_name = name;
+	else
+	  convert_name = strcat (name, ".pdf");
+	endif
+name = cstrcat (tmpnam, ".ps");
+termn = "postscript";
+	options = cstrcat (options, " portrait");
+	## All "options" for pdf work for postscript as well.
+else
+error ("print: the gnuplot terminal, \"%s\", is not available.", termn)
+endif
+endif
+new_terminal = cstrcat (termn, " ", options);
 mono = use_color < 0;
 if (isempty (resolution))
-resolution = get (0, "screenpixelsperinch");
+if (any (strcmp (termn, {"emf", "svg"})))
+resolution = get (0, "screenpixelsperinch");
+else
+resolution = 150;
+endif
 else
 resolution = str2num (resolution);
+if (resolution == 0)
+resolution = get (0, "screenpixelsperinch");
+endif
 endif
 figure_properties = get (gcf);
 if (! isfield (figure_properties, "__pixels_per_inch__"))
 addproperty ("__pixels_per_inch__", gcf, "double", resolution);
 endif
 set (gcf, "__pixels_per_inch__", resolution)
 unwind_protect
-if (! isempty (size) || any (strfind (dev, "eps") == 1))
+paper_position_mode = get (gcf, "paperpositionmode");
+term_for_prn = {"postscript", "pdf"};
+restore_properties = false;
+if (! any (strncmp (termn, term_for_prn, numel(termn)))
+	  || strncmp (dev, "eps", 3))
+	## If not pdf and not plain postscript, render an image the size of
+	## the paperposition box.
+restore_properties = true;
 p.paperunits = get (gcf, "paperunits");
 p.papertype = get (gcf, "papertype");
 p.papersize = get (gcf, "papersize");
 p.paperposition = get (gcf, "paperposition");
 p.paperpositionmode = get (gcf, "paperpositionmode");
 set (gcf, "paperunits", "inches");
-if (any (strfind (dev, "eps") == 1))
+	if (! isempty (canvas_size))
-paperposition_in_inches = get (gcf, "paperposition") + 1/72;
+size_in_pixels = sscanf (canvas_size ,"%d, %d");
-paperposition_in_inches(1:2) = 0;
-papersize_in_inches = paperposition_in_inches(3:4);
-else
-size_in_pixels = sscanf (size ,"%d, %d");
 size_in_pixels = reshape (size_in_pixels, [1, numel(size_in_pixels)]);
 papersize_in_inches = size_in_pixels ./ resolution;
 paperposition_in_inches = [0, 0, papersize_in_inches];
+	else
+paperposition_in_inches = get (gcf, "paperposition");
+paperposition_in_inches(1:2) = 0;
+papersize_in_inches = paperposition_in_inches(3:4);
 endif
 set (gcf, "papertype", "<custom>");
 set (gcf, "papersize", papersize_in_inches);
 set (gcf, "paperposition", paperposition_in_inches);
 set (gcf, "paperpositionmode", "manual");
 else
 drawnow (new_terminal, name, mono);
 endif
 unwind_protect_cleanup
 ## FIXME - it would be nice to delete "__pixels_per_inch__" property here.
-if (! isempty (size) || any (strfind (dev, "eps") == 1))
+if (restore_properties)
 props = fieldnames (p);
 for n = 1:numel(props)
 set (gcf, props{n}, p.(props{n}))
 endfor
 endif
 end_unwind_protect
-if (! isempty (convertname))
+if (! isempty (convert_name))
-command = sprintf ("convert '%s' '%s'", name, convertname);
+command = sprintf ("convert '%s' '%s'", name, convert_name);
 [errcode, output] = system (command);
 unlink (name);
 if (errcode)
-error ("print: could not convert");
+error ("print: could not convert; %s -> %s.", name, convert_name);
 endif
 endif
 ## FIXME -- This looks like a dirty, Unix-specific hack.
 ## DAS

Mercurial > hg > octave-nkf

comparison scripts/plot/print.m @ 9107:d0d507cbd123