Mercurial > octave-nkf

changeset 7215:dd88d61d443f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2007-11-29 16:44:45 by jwe]
author jwe
date Thu, 29 Nov 2007 16:46:40 +0000
parents 86d0b16f2bb2
children 5389a52df87b
files scripts/ChangeLog scripts/plot/__axes_limits__.m scripts/plot/__bar__.m scripts/plot/__plt_get_axis_arg__.m scripts/plot/area.m scripts/plot/axis.m scripts/plot/caxis.m scripts/plot/contour.m scripts/plot/contour3.m scripts/plot/contourf.m scripts/plot/cylinder.m scripts/plot/fill.m scripts/plot/grid.m scripts/plot/meshz.m scripts/plot/patch.m scripts/plot/pie.m scripts/plot/plot.m scripts/plot/plotyy.m scripts/plot/polar.m scripts/plot/quiver.m scripts/plot/quiver3.m scripts/plot/scatter.m scripts/plot/scatter3.m scripts/plot/sphere.m scripts/plot/surf.m scripts/plot/surface.m scripts/plot/surfnorm.m scripts/plot/xlabel.m scripts/plot/ylabel.m scripts/plot/zlabel.m src/ChangeLog src/pr-output.cc src/pr-output.h
diffstat 33 files changed, 436 insertions(+), 592 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/ChangeLog	Thu Nov 29 03:40:04 2007 +0000
+++ b/scripts/ChangeLog	Thu Nov 29 16:46:40 2007 +0000
@@ -1,3 +1,16 @@
+2007-11-28  David Bateman  <dbateman@free.fr>
+
+	* __plt_get_axis_handle__.m: Also allow hggroup and return axes
+	ancestor. If leading argument is logical set variable nogca to see
+	if gca() should be called if there is no active handle found.
+	* __bar__.m, caxis.m, scatter.m, contourf.m, __axes_limits__.m,
+	fill.m,  surf.m, meshz.m, axis.m, pie.m, contour.m,
+	quiver.m, area.m, grid.m, cylinder.m, contour3.m, surface.m,
+	patch.m, scatter3.m, plot.m, sphere.m, quiver3.m, plotyy.m,
+	xlabel.m, ylabel.m, surfnorm.m, zlabel.m: Adapt to use
+	__plt__get_axis_arg__ to find axis handle.
+	* polar.m: Typo.
+
 2007-11-28  John W. Eaton  <jwe@octave.org>
 
 	* plot/__go_draw_axes__.m (get_data_limits): Delete unused arg TX.
--- a/scripts/plot/__axes_limits__.m	Thu Nov 29 03:40:04 2007 +0000
+++ b/scripts/plot/__axes_limits__.m	Thu Nov 29 16:46:40 2007 +0000
@@ -22,21 +22,12 @@
   retval = [];
   fcnmode = sprintf("%smode", fcn);
 
-  if (nargin > 1 && isscalar (varargin{1}) && ishandle (varargin{1}))
-    h = varargin{1};
-    off = 1;
-    if (! strcmp (get (h, "type"), "axes"))
-      error ("%s: expecting first argument to be an axes object", fcn);
-    endif
-  else
-    off = 0;
-    h = gca ();
-  endif
+  [h, varargin, nargin] = __plt_get_axis_arg__ (fcn, varargin{:});
 
-  if (nargin == off + 1)
+  if (nargin == 0)
     retval = get (h, fcn);
   else
-    arg = varargin{off + 1};
+    arg = varargin{1};
 
     if (ischar (arg))
       arg = tolower (arg);
--- a/scripts/plot/__bar__.m	Thu Nov 29 03:40:04 2007 +0000
+++ b/scripts/plot/__bar__.m	Thu Nov 29 16:46:40 2007 +0000
@@ -22,36 +22,17 @@
 
 function varargout = __bar__ (vertical, func, varargin)
 
-  varargout = cell (nargout, 1);
-  if (isscalar (varargin{1}) && ishandle (varargin{1}))
-    h = varargin{1};
-    if (! strcmp (get (h, "type"), "axes"))
-      error ("%s: expecting first argument to be an axes object", func);
-    endif
-    oldh = gca ();
-    unwind_protect
-      axes (h);
-      [varargout{:}] = __bar2__ (h, vertical, func, varargin{2:end});
-    unwind_protect_cleanup
-      axes (oldh);
-    end_unwind_protect
-  else
-    [varargout{:}] = __bar2__ (gca (), vertical, func, varargin{:});
-  endif
-
-endfunction
-
-function varargout = __bar2__ (h, vertical, func, varargin)
+  [h, varargin] = __plt_get_axis_arg__ ((nargout > 1), func, varargin{:});
 
   ## Slightly smaller than 0.8 to avoid clipping issue in gnuplot 4.0
   width = 0.8 - 10 * eps; 
   group = true;
 
-  if (nargin < 4)
+  if (nargin < 3)
     print_usage ();
   endif
 
-  if (nargin > 4 && isnumeric (varargin{2}))
+  if (nargin > 3 && isnumeric (varargin{2}))
     x = varargin{1};
     if (isvector (x))
       x = x(:);
@@ -84,7 +65,7 @@
       
   newargs = {};
   have_line_spec = false;
-  while (idx <= nargin - 3)
+  while (idx <= nargin - 2)
     if (isstr (varargin{idx}) && strcmp (varargin{idx}, "grouped"))
       group = true;
       idx++;
@@ -104,7 +85,7 @@
       endif
       if (isscalar(varargin{idx}))
 	width = varargin{idx++};
-      elseif (idx == nargin - 3)
+      elseif (idx == nargin - 2)
 	newargs = [newargs,varargin(idx++)];
       else
 	newargs = [newargs,varargin(idx:idx+1)];
@@ -158,12 +139,19 @@
   yb = reshape (yb, [4, numel(yb) / 4 / ycols, ycols]);
 
   if (nargout < 2)
-    newplot ();
-    tmp = __bars__ (h, vertical, x, y, xb, yb, width, group,
-		    have_line_spec, newargs{:});
-    if (nargout == 1)
-      varargout{1} = tmp;
-    endif
+    oldh = gca ();
+    unwind_protect
+      axes (h);
+      newplot ();
+
+      tmp = __bars__ (h, vertical, x, y, xb, yb, width, group,
+		      have_line_spec, newargs{:});
+      if (nargout == 1)
+	varargout{1} = tmp;
+      endif
+    unwind_protect_cleanup
+      axes (oldh);
+    end_unwind_protect
   else
     if (vertical)
       varargout{1} = xb;
--- a/scripts/plot/__plt_get_axis_arg__.m	Thu Nov 29 03:40:04 2007 +0000
+++ b/scripts/plot/__plt_get_axis_arg__.m	Thu Nov 29 16:46:40 2007 +0000
@@ -20,13 +20,21 @@
 
 ## Author: jwe
 
-function [h, varargin] = __plt_get_axis_arg__ (caller, varargin)
+function [h, varargin, narg] = __plt_get_axis_arg__ (caller, varargin)
+
+  if (islogical (caller))
+    nogca = caller;
+    caller = varargin{1};
+    varargin(1) = [];
+  else
+    nogca = false;
+  endif
 
   if (nargin > 1 && length (varargin) > 0 && ishandle (varargin{1}))
     tmp = varargin{1};
     obj = get (tmp);
-    if (strcmp (obj.type, "axes"))
-      h = tmp;
+    if (strcmp (obj.type, "axes") || strcmp (obj.type, "hggroup"))
+      h = ancestor (tmp, "axes");
       varargin(1) = [];
       if (isempty (varargin))
 	varargin = {};
@@ -35,10 +43,19 @@
       error ("%s: expecting first argument to be axes handle", caller);
     endif
   else
-    h = gca ();
+    f = get (0, "currentfigure");
+    if (! isempty (f))
+      h = get (f, 'currentaxes');
+    elseif (nogca)
+      h = NaN;
+    else
+      h = gca ();
+    endif
     if (nargin < 2)
       varargin = {};
     endif
   endif
 
+  narg = length (varargin);
+
 endfunction
--- a/scripts/plot/area.m	Thu Nov 29 03:40:04 2007 +0000
+++ b/scripts/plot/area.m	Thu Nov 29 16:46:40 2007 +0000
@@ -40,18 +40,13 @@
 
 function h = area (varargin)
 
+  [ax, varargin, nargin] = __plt_get_axis_arg__ ("area", varargin{:});
+
   if (nargin > 0)
     idx = 1;
-    ax = [];
     x = y = [];
     bv = 0;
     args = {};
-    ## Check for axes parent.
-    if (ishandle (varargin{idx})
-	&& strcmp (get (varargin{idx}, "type"), "axes"))
-      ax = varargin{idx};
-      idx++;
-    endif
     ## Check for (X) or (X,Y) arguments and possible base value.
     if (nargin >= idx && ismatrix (varargin{idx}))
       y = varargin{idx};
@@ -87,11 +82,13 @@
       x = repmat (x(:),  1, size (y, 2));
     endif
 
-    if (isempty (ax))
-      tmp = __area__ (gca (), x, y, bv, args{:});
-    else
+    oldax = gca ();
+    unwind_protect
+      axes (ax);
       tmp = __area__ (ax, x, y, bv, args{:});
-    endif
+    unwind_protect_cleanup
+      axes (oldax);
+    end_unwind_protect
 
     if (nargout > 0)
       h = tmp;
--- a/scripts/plot/axis.m	Thu Nov 29 03:40:04 2007 +0000
+++ b/scripts/plot/axis.m	Thu Nov 29 16:46:40 2007 +0000
@@ -118,31 +118,19 @@
 
 function varargout = axis (varargin)
 
-  if (nargin > 0 && isscalar (varargin{1}) && ishandle (varargin{1}))
-    h = varargin{1};
-    if (! strcmp (get (h, "type"), "axes"))
-      error ("axis: expecting first argument to be an axes object");
-    endif
-    oldh = gca ();
-    unwind_protect
-      axes (h);
-      varargout = cell (max (nargin == 1, nargout), 1);
-      if (isempty (varargout))
-	__axis__ (h, varargin{2:end});
-      else
-        [varargout{:}] = __axis__ (h, varargin{2:end});
-      endif
-    unwind_protect_cleanup
-      axes (oldh);
-    end_unwind_protect
-  else
+  [h, varargin, nargin] = __plt_get_axis_arg__ ("axis", varargin{:});
+  oldh = gca ();
+  unwind_protect
+    axes (h);
     varargout = cell (max (nargin == 0, nargout), 1);
     if (isempty (varargout))
-      __axis__ (gca (), varargin{:});
+      __axis__ (h, varargin{:});
     else
-      [varargout{:}] = __axis__ (gca (), varargin{:});
+      [varargout{:}] = __axis__ (h, varargin{:});
     endif
-  endif
+  unwind_protect_cleanup
+    axes (oldh);
+  end_unwind_protect
 
 endfunction
 
--- a/scripts/plot/caxis.m	Thu Nov 29 03:40:04 2007 +0000
+++ b/scripts/plot/caxis.m	Thu Nov 29 16:46:40 2007 +0000
@@ -39,31 +39,19 @@
 
 function varargout = caxis (varargin)
 
-  if (nargin > 0 && isscalar (varargin{1}) && ishandle (varargin{1}))
-    h = varargin{1};
-    if (! strcmp (get (h, "type"), "axes"))
-      error ("caxis: expecting first argument to be an axes object");
-    endif
-    oldh = gca ();
-    unwind_protect
-      axes (h);
-      varargout = cell (max (nargin == 1, nargout), 1);
-      if (isempty (varargout))
-	__caxis__ (h, varargin{2:end});
-      else
-        [varargout{:}] = __caxis__ (h, varargin{2:end});
-      endif
-    unwind_protect_cleanup
-      axes (oldh);
-    end_unwind_protect
-  else
+  [h, varargin, nargin] = __plt_get_axis_arg__ ("caxis", varargin{:});
+  oldh = gca ();
+  unwind_protect
+    axes (h);
     varargout = cell (max (nargin == 0, nargout), 1);
     if (isempty (varargout))
-      __caxis__ (gca (), varargin{:});
+      __caxis__ (h, varargin{:});
     else
-      [varargout{:}] = __caxis__ (gca (), varargin{:});
+      [varargout{:}] = __caxis__ (h, varargin{:});
     endif
-  endif
+  unwind_protect_cleanup
+    axes (oldh);
+  end_unwind_protect
 
 endfunction
 
--- a/scripts/plot/contour.m	Thu Nov 29 03:40:04 2007 +0000
+++ b/scripts/plot/contour.m	Thu Nov 29 16:46:40 2007 +0000
@@ -49,23 +49,15 @@
 
 function [c, h] = contour (varargin)
 
-  if (isscalar (varargin{1}) && ishandle (varargin{1}))
-    h = varargin{1};
-    if (! strcmp (get (h, "type"), "axes"))
-      error ("contour: expecting first argument to be an axes object");
-    endif
-    oldh = gca ();
-    unwind_protect
-      axes (h);
-      newplot ();
-      [ctmp, htmp] = __contour__ (h, varargin{2:end});
-    unwind_protect_cleanup
-      axes (oldh);
-    end_unwind_protect
-  else
+  [h, varargin] = __plt_get_axis_arg__ ("contour", varargin{:});
+  oldh = gca ();
+  unwind_protect
+    axes (h);
     newplot ();
-    [ctmp, htmp] = __contour__ (gca (), NaN, varargin{:});
-  endif
+    [ctmp, htmp] = __contour__ (h, NaN, varargin{:});
+  unwind_protect_cleanup
+    axes (oldh);
+  end_unwind_protect
 
   if (nargout > 0)
     c = ctmp;
--- a/scripts/plot/contour3.m	Thu Nov 29 03:40:04 2007 +0000
+++ b/scripts/plot/contour3.m	Thu Nov 29 16:46:40 2007 +0000
@@ -46,27 +46,18 @@
 
 function [c, h] = contour3 (varargin)
 
-  if (isscalar (varargin{1}) && ishandle (varargin{1}))
-    ax = varargin{1};
-    if (! strcmp (get (ax, "type"), "axes"))
-      error ("contour: expecting first argument to be an axes object");
-    endif
-    oldh = gca ();
-    unwind_protect
-      axes (ax);
-      newplot ();
-      [ctmp, htmp] = __contour__ (ax, varargin{2:end});
-    unwind_protect_cleanup
-      axes (oldh);
-    end_unwind_protect
-  else
+  [h, varargin, nargin] = __plt_get_axis_arg__ ("contour3", varargin{:});
+  oldh = gca ();
+  unwind_protect
+    axes (h);
     newplot ();
-    ax = gca ();
-    [ctmp, htmp] = __contour__ (ax, "level", varargin{:});
-  endif
+    [ctmp, htmp] = __contour__ (h, "level", varargin{:});
+  unwind_protect_cleanup
+    axes (oldh);
+  end_unwind_protect
 
   if (! ishold ())
-    set (ax, "view", [-37.5, 30]);
+    set (h, "view", [-37.5, 30]);
   endif
 
   if (nargout > 0)
--- a/scripts/plot/contourf.m	Thu Nov 29 03:40:04 2007 +0000
+++ b/scripts/plot/contourf.m	Thu Nov 29 16:46:40 2007 +0000
@@ -59,7 +59,8 @@
 
 function varargout = contourf (varargin)
 
-  [X, Y, Z, lvl, ax, patch_props] = parse_args (varargin);
+  [ax, varargin] = __plt_get_axis_arg__ ("contourf", varargin{:});
+  [X, Y, Z, lvl, patch_props] = parse_args (varargin);
   [nr, nc] = size (Z);
   [minx, maxx] = deal (min (X(:)), max (X(:)));
   [miny, maxy] = deal (min (Y(:)), max (Y(:)));
@@ -183,19 +184,11 @@
 
 endfunction
 
-function [X, Y, Z, lvl, ax, patch_props] = parse_args (arg)
+function [X, Y, Z, lvl, patch_props] = parse_args (arg)
 
   patch_props = {};
   nolvl = false;
 
-  if (isinteger (arg{1}) && ishandle (arg{1})
-      && strncmpi (get (arg{1}, "type"), "axis", 4))
-    ax = arg{1};
-    arg{1} = [];
-  else
-    ax = gca ();
-  endif
-
   for n = 1:numel (arg)
     if (ischar (arg{n}))
       patch_props = arg(n:end);
--- a/scripts/plot/cylinder.m	Thu Nov 29 03:40:04 2007 +0000
+++ b/scripts/plot/cylinder.m	Thu Nov 29 16:46:40 2007 +0000
@@ -45,18 +45,8 @@
 
 function [xx, yy, zz] = cylinder (varargin)
 
-  nargs = nargin;
-  args = varargin;
-  ax = [];
-
-  if (nargs > 0 && isscalar (args{1}) && ishandle (args{1}))
-    if (! strcmp (get (args{1}, "type"), "axes"))
-      error ("cylinder: expecting first argument to be an axes object");
-    endif
-    ax = args{1};
-    nargs--;
-    args(1) = [];
-  endif
+  [ax, args, nargs] = __plt_get_axis_arg__ ((nargout > 0), "cylinder", 
+					    varargin{:});
 
   if (nargs == 0)
     n = 20;
@@ -87,10 +77,7 @@
     yy = y;
     zz = z;
   else
-    if (! isempty (ax))
-      axes (ax);
-    endif
-    surf (x, y, z);
+    surf (ax, x, y, z);
   endif
 
 endfunction
--- a/scripts/plot/fill.m	Thu Nov 29 03:40:04 2007 +0000
+++ b/scripts/plot/fill.m	Thu Nov 29 16:46:40 2007 +0000
@@ -27,37 +27,13 @@
 
 function h = fill (varargin)
 
+  [h, varargin] = __plt_get_axis_arg__ ("fill", varargin{:});
   htmp = [];
-
-  if (isscalar (varargin{1}) && ishandle (varargin{1}))
-    h = varargin{1};
-    if (! strcmp (get (h, "type"), "axes"))
-      error ("fill: expecting first argument to be an axes object");
-    endif
-
-    iargs = __find_patches__ (varargin{:}) + 1;
-    oldh = gca ();
-    unwind_protect
-      axes (h);
+  iargs = __find_patches__ (varargin{:});
+  oldh = gca ();
+  unwind_protect
+    axes (h);
 
-      for i = 1 : length (iargs)
-	if (i == length (iargs))
-	  args = varargin (iargs(i):end);
-        else
-	  args = varargin (iargs(i):iargs(i+1)-1);
-	endif
-	newplot ();
-	[tmp, fail] = __patch__ (h, args{:});
-	if (fail)
-	  print_usage();
-	endif
-	htmp (end + 1) = tmp;
-      endfor
-    unwind_protect_cleanup
-      axes (oldh);
-    end_unwind_protect
-  else
-    iargs = __find_patches__ (varargin{:});
     for i = 1 : length (iargs)
       if (i == length (iargs))
 	args = varargin (iargs(i):end);
@@ -65,16 +41,20 @@
         args = varargin (iargs(i):iargs(i+1)-1);
       endif
       newplot ();
-      [tmp, fail] = __patch__ (gca (), args{:});
+      [tmp, fail] = __patch__ (h, args{:});
       if (fail)
 	print_usage();
       endif
       htmp (end + 1) = tmp;
     endfor
-  endif
+  unwind_protect_cleanup
+    axes (oldh);
+  end_unwind_protect
+
   if (nargout > 0)
     h = htmp;
   endif
+
 endfunction
 
 function iargs = __find_patches__ (varargin)
--- a/scripts/plot/grid.m	Thu Nov 29 03:40:04 2007 +0000
+++ b/scripts/plot/grid.m	Thu Nov 29 16:46:40 2007 +0000
@@ -35,31 +35,18 @@
 
 ## PKG_ADD: mark_as_command grid
 
-function grid (x, y)
+function grid (varargin)
 
   persistent grid_on = false;
   persistent minor_on = false;
 
-  nargs = nargin;
-
-  if (nargs == 2)
-    if (ishandle (x))
-      ax = x;
-      x = y;
-      nargs--;
-      if (! strcmp (get (ax, "type"), "axes"))
-	error ("grid: expecting first argument to be an axes object");
-      endif
-    else
-      print_usage ();
-    endif
+  [ax, varargin, nargs] = __plt_get_axis_arg__ ("grid", varargin{:});
+  if (nargs > 1)
+    print_usage ();
+  elseif (nargs == 0)
+    grid_on = ! grid_on;
   else
-    ax = gca ();
-  endif
-
-  if (nargs == 0)
-    grid_on = ! grid_on;
-  elseif (nargs == 1)
+    x = varargin{1};
     if (ischar (x))
       if (strcmp ("off", x))
 	grid_on = false;
@@ -76,8 +63,6 @@
     else
       error ("grid: argument must be a string");
     endif
-  else
-    print_usage ();
   endif
 
   if (grid_on)
--- a/scripts/plot/meshz.m	Thu Nov 29 03:40:04 2007 +0000
+++ b/scripts/plot/meshz.m	Thu Nov 29 16:46:40 2007 +0000
@@ -29,29 +29,7 @@
  
 function retval = meshz (varargin)
 
-  if (isscalar (varargin{1}) && ishandle (varargin{1}))
-    h = varargin{1};
-    if (! strcmp (get (h, "type"), "axes"))
-      error ("meshz: expecting first argument to be an axes object");
-    endif
-    oldh = gca ();
-    unwind_protect
-      axes (h);
-      tmp = __meshz__ (varargin{2:end});
-    unwind_protect_cleanup
-      axes (oldh);
-    end_unwind_protect
-  else
-    tmp = __meshz__ (varargin{:});
-  endif
-
-  if (nargout > 0)
-    retval = tmp;
-  endif
-
-endfunction
-
-function h = __meshz__ (varargin)
+  [h, varargin, nargin] = __plt_get_axis_arg__ ("meshz", varargin{:});
 
   ioff = nargin + 1;
   for i = 1 : nargin
@@ -95,6 +73,16 @@
        zref .* ones(size(z, 1), 1), z, zref .* ones(size(z, 1), 1); 
        zref.* ones(1, size(z, 2) + 2)];
 
-  h = mesh (x, y, z, varargin{ioff:end});
+  oldh = gca ();
+  unwind_protect
+    axes (h);
+    tmp = mesh (x, y, z, varargin{ioff:end});
+  unwind_protect_cleanup
+    axes (oldh);
+  end_unwind_protect
+
+  if (nargout > 0)
+    retval = tmp;
+  endif
 
 endfunction
--- a/scripts/plot/patch.m	Thu Nov 29 03:40:04 2007 +0000
+++ b/scripts/plot/patch.m	Thu Nov 29 16:46:40 2007 +0000
@@ -36,21 +36,17 @@
 
 function h = patch (varargin)
 
-  if (isscalar (varargin{1}) && ishandle (varargin{1}))
-    h = varargin{1};
-    if (! strcmp (get (h, "type"), "axes") && ! strcmp (get (h, "type"), "hggroup"))
-      error ("patch: expecting first argument to be an axes or hggroup object");
-    endif
-    oldh = gca ();
-    unwind_protect
-      axes (ancestor (h, "axes"));
-      [tmp, fail] = __patch__ (h, varargin{2:end});
-    unwind_protect_cleanup
-      axes (oldh);
-    end_unwind_protect
-  else
-    [tmp, fail] = __patch__ (gca (), varargin{:});
+  [h, varargin] = __plt_get_axis_arg__ ("patch", varargin{:});
+  oldh = gca ();
+  if (isnan(h))
+    h = oldh;
   endif
+  unwind_protect
+    axes (h);
+    [tmp, fail] = __patch__ (h, varargin{:});
+  unwind_protect_cleanup
+    axes (oldh);
+  end_unwind_protect
 
   if (fail)
     print_usage ();
--- a/scripts/plot/pie.m	Thu Nov 29 03:40:04 2007 +0000
+++ b/scripts/plot/pie.m	Thu Nov 29 16:46:40 2007 +0000
@@ -44,26 +44,22 @@
 
 function retval = pie (varargin)
 
+  [h, varargin] = __plt_get_axis_arg__ ("pie", varargin{:});
+
   if (nargin < 1)
     print_usage ();
-  elseif (isscalar (varargin{1}) && ishandle (varargin{1}))
-    h = varargin{1};
-    if (! strcmp (get (h, "type"), "axes"))
-      error ("pie: expecting first argument to be an axes object");
-    endif
+  else
     oldh = gca ();
     unwind_protect
       axes (h);
       newplot ();
-      tmp = __pie__ (h, varargin{2:end});
+      tmp = __pie__ (h, varargin{:});
     unwind_protect_cleanup
       axes (oldh);
     end_unwind_protect
-  else
-    newplot ();
-    tmp = __pie__ (gca (), varargin{:});
   endif
 
+
   if (nargout > 0)
     retval = tmp;
   endif
--- a/scripts/plot/plot.m	Thu Nov 29 03:40:04 2007 +0000
+++ b/scripts/plot/plot.m	Thu Nov 29 16:46:40 2007 +0000
@@ -178,23 +178,15 @@
 
 function retval = plot (varargin)
 
-  if (isscalar (varargin{1}) && ishandle (varargin{1}))
-    h = varargin{1};
-    if (! strcmp (get (h, "type"), "axes"))
-      error ("plot: expecting first argument to be an axes object");
-    endif
-    oldh = gca ();
-    unwind_protect
-      axes (h);
-      newplot ();
-      tmp = __plt__ ("plot", h, varargin{2:end});
-    unwind_protect_cleanup
-      axes (oldh);
-    end_unwind_protect
-  else
+  [h, varargin] = __plt_get_axis_arg__ ("plot", varargin{:});
+  oldh = gca ();
+  unwind_protect
+    axes (h);
     newplot ();
-    tmp = __plt__ ("plot", gca (), varargin{:});
-  endif
+    tmp = __plt__ ("plot", h, varargin{:});
+  unwind_protect_cleanup
+    axes (oldh);
+  end_unwind_protect
 
   if (nargout > 0)
     retval = tmp;
--- a/scripts/plot/plotyy.m	Thu Nov 29 03:40:04 2007 +0000
+++ b/scripts/plot/plotyy.m	Thu Nov 29 16:46:40 2007 +0000
@@ -55,29 +55,19 @@
 
 function [Ax, H1, H2] = plotyy (varargin)
 
-  if (isscalar (varargin{1}) && ishandle (varargin{1}))
-    ax = varargin{1};
-    if (! strcmp (get (ax, "type"), "axes"))
-      error ("plotyy: expecting first argument to be an axes object");
-    endif
-    if (nargin < 5)
-      print_usage ();
-    endif
-    oldh = gca ();
-    unwind_protect
-      axes (ax);
-      newplot ();
-      [ax, h1, h2] = __plotyy__ (ax, varargin{2:end});
-    unwind_protect_cleanup
-      axes (oldh);
-    end_unwind_protect
-  else
-    if (nargin < 4)
-      print_usage ();
-    endif
+  [ax, varargin] = __plt_get_axis_arg__ ("plotyy", varargin{:});
+
+  if (nargin < 4)
+    print_usage ();
+  endif
+  oldh = gca ();
+  unwind_protect
+    axes (ax);
     newplot ();
-    [ax, h1, h2] = __plotyy__ (gca (), varargin{:});
-  endif
+    [ax, h1, h2] = __plotyy__ (ax, varargin{:});
+  unwind_protect_cleanup
+    axes (oldh);
+  end_unwind_protect
 
   if (nargout > 0)
     Ax = ax;
--- a/scripts/plot/polar.m	Thu Nov 29 03:40:04 2007 +0000
+++ b/scripts/plot/polar.m	Thu Nov 29 16:46:40 2007 +0000
@@ -30,7 +30,7 @@
 
 function retval = polar (varargin)
 
-  [h, varargin] = __plt_get_axis_arg__ ("loglogerr", varargin{:});
+  [h, varargin] = __plt_get_axis_arg__ ("polar", varargin{:});
   oldh = gca ();
   unwind_protect
     axes (h);
--- a/scripts/plot/quiver.m	Thu Nov 29 03:40:04 2007 +0000
+++ b/scripts/plot/quiver.m	Thu Nov 29 16:46:40 2007 +0000
@@ -58,24 +58,19 @@
 
 function retval = quiver (varargin)
 
+  [h, varargin, nargin] = __plt_get_axis_arg__ ("quiver", varargin{:});
+
   if (nargin < 2)
     print_usage ();
-  elseif (isscalar (varargin{1}) && ishandle (varargin{1}))
-    h = varargin{1};
-    if (! strcmp (get (h, "type"), "axes"))
-      error ("quiver: expecting first argument to be an axes object");
-    endif
+  else
     oldh = gca ();
     unwind_protect
       axes (h);
       newplot ();
-      tmp = __quiver__ (h, 0, varargin{2:end});
+      tmp = __quiver__ (h, 0, varargin{:});
     unwind_protect_cleanup
       axes (oldh);
     end_unwind_protect
-  else
-    newplot ();
-    tmp = __quiver__ (gca (), 0, varargin{:});
   endif
 
   if (nargout > 0)
--- a/scripts/plot/quiver3.m	Thu Nov 29 03:40:04 2007 +0000
+++ b/scripts/plot/quiver3.m	Thu Nov 29 16:46:40 2007 +0000
@@ -61,24 +61,19 @@
 
 function retval = quiver3 (varargin)
 
+  [h, varargin, nargin] = __plt_get_axis_arg__ ("quiver3", varargin{:});
+
   if (nargin < 2)
     print_usage ();
-  elseif (isscalar (varargin{1}) && ishandle (varargin{1}))
-    h = varargin{1};
-    if (! strcmp (get (h, "type"), "axes"))
-      error ("quiver: expecting first argument to be an axes object");
-    endif
+  else
     oldh = gca ();
     unwind_protect
       axes (h);
       newplot ();
-      tmp = __quiver__ (h, 1, varargin{2:end});
+      tmp = __quiver__ (h, 1, varargin{:});
     unwind_protect_cleanup
       axes (oldh);
     end_unwind_protect
-  else
-    newplot ();
-    tmp = __quiver__ (gca (), 1, varargin{:});
   endif
 
   if (nargout > 0)
--- a/scripts/plot/scatter.m	Thu Nov 29 03:40:04 2007 +0000
+++ b/scripts/plot/scatter.m	Thu Nov 29 16:46:40 2007 +0000
@@ -56,24 +56,19 @@
 
 function retval = scatter (varargin)
 
+  [h, varargin, nargin] = __plt_get_axis_arg__ ("scatter", varargin{:});
+
   if (nargin < 2)
     print_usage ();
-  elseif (isscalar (varargin{1}) && ishandle (varargin{1}))
-    h = varargin{1};
-    if (! strcmp (get (h, "type"), "axes"))
-      error ("scatter: expecting first argument to be an axes object");
-    endif
+  else
     oldh = gca ();
     unwind_protect
       axes (h);
       newplot ();
-      tmp = __scatter__ (h, 2, "scatter", varargin{2:end});
+      tmp = __scatter__ (h, 2, "scatter", varargin{:});
     unwind_protect_cleanup
       axes (oldh);
     end_unwind_protect
-  else
-    newplot ();
-    tmp = __scatter__ (gca (), 2, "scatter", varargin{:});
   endif
 
   if (nargout > 0)
--- a/scripts/plot/scatter3.m	Thu Nov 29 03:40:04 2007 +0000
+++ b/scripts/plot/scatter3.m	Thu Nov 29 16:46:40 2007 +0000
@@ -55,24 +55,19 @@
 
 function retval = scatter3 (varargin)
 
+  [h, varargin, nargin] = __plt_get_axis_arg__ ("scatter3", varargin{:});
+
   if (nargin < 2)
     print_usage ();
-  elseif (isscalar (varargin{1}) && ishandle (varargin{1}))
-    h = varargin{1};
-    if (! strcmp (get (h, "type"), "axes"))
-      error ("scatter3: expecting first argument to be an axes object");
-    endif
+  else
     oldh = gca ();
     unwind_protect
       axes (h);
       newplot ();
-      tmp = __scatter__ (h, 3, "scatter3", varargin{2:end});
+      tmp = __scatter__ (h, 3, "scatter3", varargin{:});
     unwind_protect_cleanup
       axes (oldh);
     end_unwind_protect
-  else
-    newplot ();
-    tmp = __scatter__ (gca (), 3, "scatter3", varargin{:});
   endif
 
   if (! ishold ())
--- a/scripts/plot/sphere.m	Thu Nov 29 03:40:04 2007 +0000
+++ b/scripts/plot/sphere.m	Thu Nov 29 16:46:40 2007 +0000
@@ -29,19 +29,14 @@
 ## @seealso{peaks}
 ## @end deftypefn
 
-function [xx, yy, zz] = sphere (h, n)
+function [xx, yy, zz] = sphere (varargin)
 
-  have_h = false;
-  if (nargin > 1 && isscalar (h) && ishandle (h))
-    if (! strcmp (get (h, "type"), "axes"))
-      error ("sphere: expecting first argument to be an axes object");
-    endif
-    if (nargin == 1)
-      n = 20;
-    endif
-    have_h = true;
+  [h, varargin, nargin] = __plt_get_axis_arg__ ((nargout > 0), "sphere", 
+						varargin{:});
+  if (nargin > 1)
+    print_usage ();
   elseif (nargin == 1)
-    n = h;
+    n = varargin{1};
   else
     n = 20;
   endif
@@ -59,17 +54,7 @@
     yy = y;
     zz = z;
   else
-    if (have_h)
-      oldh = gca ();
-      unwind_protect
-	axes (h);
-	surf (x, y, z);
-      unwind_protect_cleanup
-	axes (oldh);
-      end_unwind_protect
-    else
-      surf (x, y, z);
-    endif
+    surf (h, x, y, z);
   endif
 
 endfunction
--- a/scripts/plot/surf.m	Thu Nov 29 03:40:04 2007 +0000
+++ b/scripts/plot/surf.m	Thu Nov 29 16:46:40 2007 +0000
@@ -31,16 +31,21 @@
 
 function h = surf (varargin)
 
-  newplot ();
+  [h, varargin] = __plt_get_axis_arg__ ("surf", varargin{:});
 
-  tmp = surface (varargin{:});
+  oldh = gca ();
+  unwind_protect
+    axes (h);
+    newplot ();
+    tmp = surface (varargin{:});
 
-  ax = get (tmp, "parent");
-
-  set (tmp, "facecolor", "flat");
-  if (! ishold ())
-    set (ax, "view", [-37.5, 30]);
-  endif
+    set (tmp, "facecolor", "flat");
+    if (! ishold ())
+      set (h, "view", [-37.5, 30]);
+    endif
+  unwind_protect_cleanup
+    axes (oldh);
+  end_unwind_protect
 
   if (nargout > 0)
     h = tmp;
--- a/scripts/plot/surface.m	Thu Nov 29 03:40:04 2007 +0000
+++ b/scripts/plot/surface.m	Thu Nov 29 16:46:40 2007 +0000
@@ -41,21 +41,15 @@
 
 function h = surface (varargin)
 
-  if (isscalar (varargin{1}) && ishandle (varargin{1}))
-    h = varargin{1};
-    if (! strcmp (get (h, "type"), "axes"))
-      error ("surface: expecting first argument to be an axes object");
-    endif
-    oldh = gca ();
-    unwind_protect
-      axes (h);
-      [tmp, bad_usage] = __surface__ (h, varargin{2:end});
-    unwind_protect_cleanup
-      axes (oldh);
-    end_unwind_protect
-  else
-    [tmp, bad_usage] = __surface__ (gca (), varargin{:});
-  endif
+  [h, varargin] = __plt_get_axis_arg__ ("surface", varargin{:});
+
+  oldh = gca ();
+  unwind_protect
+    axes (h);
+    [tmp, bad_usage] = __surface__ (h, varargin{:});
+  unwind_protect_cleanup
+    axes (oldh);
+  end_unwind_protect
 
   if (bad_usage)
     print_usage ();
--- a/scripts/plot/surfnorm.m	Thu Nov 29 03:40:04 2007 +0000
+++ b/scripts/plot/surfnorm.m	Thu Nov 29 16:46:40 2007 +0000
@@ -49,40 +49,16 @@
 ## @seealso{surf, quiver3}
 ## @end deftypefn
 
-function varargout = surfnorm (varargin)
+function [Nx, Ny, Nz] = surfnorm (varargin)
 
-  if (nargout > 0)
-    varargout = cell (nargout, 1);
-  else
-    varargout = cell (0, 0);
-  endif
-  if (isscalar (varargin{1}) && ishandle (varargin{1}))
-    h = varargin{1};
-    if (! strcmp (get (h, "type"), "axes"))
-      error ("surfnorm: expecting first argument to be an axes object");
-    endif
-    if (nargin != 2 && nargin != 4)
-      print_usage ();
-    endif
-    oldh = gca ();
-    unwind_protect
-      axes (h);
-      [varargout{:}] = __surfnorm__ (h, varargin{2:end});
-    unwind_protect_cleanup
-      axes (oldh);
-    end_unwind_protect
-  else
-    if (nargin != 1 && nargin != 3)
-      print_usage ();
-    endif
-    [varargout{:}] = __surfnorm__ (gca (), varargin{:});
+  [h, varargin, nargin] = __plt_get_axis_arg__ ((nargout != 0), "surfnorm", 
+						varargin{:});
+
+  if (nargin != 1 && nargin != 3)
+    print_usage ();
   endif
 
-endfunction
-
-function [Nx, Ny, Nz] = __surfnorm__ (h, varargin)
-
-  if (nargin == 2)
+  if (nargin == 1)
     z = varargin{1};
     [x, y] = meshgrid (1:size(z,1), 1:size(z,2));
     ioff = 2;
@@ -94,9 +70,6 @@
   endif
 
   if (nargout == 0)
-    newplot ();
-    surf (x, y, z, varargin{ioff:end});
-    hold on;
   endif
 
   ## Make life easier, and avoid having to do the extrapolation later, do
@@ -136,10 +109,19 @@
   nz = nz ./ len;
 
   if (nargout == 0)
-    plot3 ([x(:)'; x(:).' + nx(:).' ; NaN(size(x(:).'))](:),
-	   [y(:)'; y(:).' + ny(:).' ; NaN(size(y(:).'))](:),
-	   [z(:)'; z(:).' + nz(:).' ; NaN(size(z(:).'))](:), 
-	   varargin{ioff:end});
+    oldh = gca ();
+    unwind_protect
+      axes (h);
+      newplot ();
+      surf (x, y, z, varargin{ioff:end});
+      hold on;
+      plot3 ([x(:)'; x(:).' + nx(:).' ; NaN(size(x(:).'))](:),
+	     [y(:)'; y(:).' + ny(:).' ; NaN(size(y(:).'))](:),
+	     [z(:)'; z(:).' + nz(:).' ; NaN(size(z(:).'))](:), 
+	     varargin{ioff:end});
+    unwind_protect_cleanup
+      axes (oldh);
+    end_unwind_protect
   else
     Nx = nx;
     Ny = ny;
--- a/scripts/plot/xlabel.m	Thu Nov 29 03:40:04 2007 +0000
+++ b/scripts/plot/xlabel.m	Thu Nov 29 16:46:40 2007 +0000
@@ -30,32 +30,24 @@
 
 ## Author: jwe
 
-function h = xlabel (varargin)
+function retval = xlabel (varargin)
 
-  if (isscalar (varargin{1}) && ishandle (varargin{1}))
-    ax = varargin{1};
-    if (! strcmp (get (ax, "type"), "axes"))
-      error ("xlabel: expecting first argument to be an axes object");
-    endif
-    if (rem (nargin, 2) == 1)
-      print_usage ();
-    endif
-    oldh = gca ();
-    unwind_protect
-      axes (ax);
-      tmp = __axis_label__ ("xlabel", varargin{2:end});
-    unwind_protect_cleanup
-      axes (oldh);
-    end_unwind_protect
-  else
-    if (rem (nargin, 2) != 1)
-      print_usage ();
-    endif
-    tmp = __axis_label__ ("xlabel", varargin{1:end});
+  [h, varargin, nargin] = __plt_get_axis_arg__ ("xlabel", varargin{:});
+
+  if (rem (nargin, 2) != 1)
+    print_usage ();
   endif
 
+  oldh = gca ();
+  unwind_protect
+    axes (h);
+    tmp = __axis_label__ ("xlabel", varargin{:});
+  unwind_protect_cleanup
+    axes (oldh);
+  end_unwind_protect
+
   if (nargout > 0)
-    h = tmp;
+    retval = h;
   endif
 
 endfunction
--- a/scripts/plot/ylabel.m	Thu Nov 29 03:40:04 2007 +0000
+++ b/scripts/plot/ylabel.m	Thu Nov 29 16:46:40 2007 +0000
@@ -25,32 +25,24 @@
 
 ## Author: jwe
 
-function h = ylabel (varargin)
+function retval = ylabel (varargin)
 
-  if (isscalar (varargin{1}) && ishandle (varargin{1}))
-    ax = varargin{1};
-    if (! strcmp (get (ax, "type"), "axes"))
-      error ("ylabel: expecting first argument to be an axes object");
-    endif
-    if (rem (nargin, 2) == 1)
-      print_usage ();
-    endif
-    oldh = gca ();
-    unwind_protect
-      axes (ax);
-      tmp = __axis_label__ ("ylabel", varargin{2:end});
-    unwind_protect_cleanup
-      axes (oldh);
-    end_unwind_protect
-  else
-    if (rem (nargin, 2) != 1)
-      print_usage ();
-    endif
-    tmp = __axis_label__ ("ylabel", varargin{1:end});
+  [h, varargin, nargin] = __plt_get_axis_arg__ ("ylabel", varargin{:});
+
+  if (rem (nargin, 2) != 1)
+    print_usage ();
   endif
 
+  oldh = gca ();
+  unwind_protect
+    axes (h);
+    tmp = __axis_label__ ("ylabel", varargin{:});
+  unwind_protect_cleanup
+    axes (oldh);
+  end_unwind_protect
+
   if (nargout > 0)
-    h = tmp;
+    retval = h;
   endif
 
 endfunction
--- a/scripts/plot/zlabel.m	Thu Nov 29 03:40:04 2007 +0000
+++ b/scripts/plot/zlabel.m	Thu Nov 29 16:46:40 2007 +0000
@@ -25,32 +25,24 @@
 
 ## Author: jwe
 
-function h = zlabel (varargin)
+function retval = zlabel (varargin)
 
-  if (isscalar (varargin{1}) && ishandle (varargin{1}))
-    ax = varargin{1};
-    if (! strcmp (get (ax, "type"), "axes"))
-      error ("zlabel: expecting first argument to be an axes object");
-    endif
-    if (rem (nargin, 2) == 1)
-      print_usage ();
-    endif
-    oldh = gca ();
-    unwind_protect
-      axes (ax);
-      tmp = __axis_label__ ("zlabel", varargin{2:end});
-    unwind_protect_cleanup
-      axes (oldh);
-    end_unwind_protect
-  else
-    if (rem (nargin, 2) != 1)
-      print_usage ();
-    endif
-    tmp = __axis_label__ ("zlabel", varargin{1:end});
+  [h, varargin, nargin] = __plt_get_axis_arg__ ("zlabel", varargin{:});
+
+  if (rem (nargin, 2) != 1)
+    print_usage ();
   endif
 
+  oldh = gca ();
+  unwind_protect
+    axes (h);
+    tmp = __axis_label__ ("zlabel", varargin{:});
+  unwind_protect_cleanup
+    axes (oldh);
+  end_unwind_protect
+
   if (nargout > 0)
-    h = tmp;
+    retval = h;
   endif
 
 endfunction
--- a/src/ChangeLog	Thu Nov 29 03:40:04 2007 +0000
+++ b/src/ChangeLog	Thu Nov 29 16:46:40 2007 +0000
@@ -1,3 +1,18 @@
+2007-11-29  John W. Eaton  <jwe@octave.org>
+
+	* pr-output.cc (octave_print_internal_template (std::ostream&,
+	const octave_int<T>&, bool)): Rename from octave_print_internal.
+	(PRINT_INT_SCALAR_INTERNAL): New macro.  Use it to define
+	non-template functions for printing scalar octave_int values.
+	(octave_print_internal_template (std::ostream&, const intNDArray<T>&,
+	bool, int)): Rename from octave_print_internal.
+	(PRINT_INT_ARRAY_INTERNAL): New macro.  Use it to define
+	non-template functions for printing scalar octave_int values.
+	* pr-output.h: Declare non-template functions for printing
+	octave_int scalar and array values.
+	Delete declarations of template funtions for printing octave_int
+	scalar and array values.
+
 2007-11-28  John W. Eaton  <jwe@octave.org>
 
 	* graphics.cc (base_properties::update_axis_limits,
--- a/src/pr-output.cc	Thu Nov 29 03:40:04 2007 +0000
+++ b/src/pr-output.cc	Thu Nov 29 16:46:40 2007 +0000
@@ -2396,10 +2396,68 @@
 SPECIALIZE_UABS(long)
 SPECIALIZE_UABS(long long)
 
+template void
+pr_int (std::ostream&, const octave_int8&, int);
+
+template void
+pr_int (std::ostream&, const octave_int16&, int);
+
+template void
+pr_int (std::ostream&, const octave_int32&, int);
+
+template void
+pr_int (std::ostream&, const octave_int64&, int);
+
+template void
+pr_int (std::ostream&, const octave_uint8&, int);
+
+template void
+pr_int (std::ostream&, const octave_uint16&, int);
+
+template void
+pr_int (std::ostream&, const octave_uint32&, int);
+
+template void
+pr_int (std::ostream&, const octave_uint64&, int);
+
 template <class T>
 void
-octave_print_internal (std::ostream& os, const intNDArray<T>& nda,
-		       bool pr_as_read_syntax, int extra_indent)
+octave_print_internal_template (std::ostream& os, const octave_int<T>& val,
+				bool)
+{
+  if (plus_format)
+    {
+      pr_plus_format (os, val);
+    }
+  else
+    {
+      if (free_format)
+	os << typename octave_print_conv<octave_int<T> >::print_conv_type (val);
+      else
+	pr_int (os, val);
+    }
+}
+
+#define PRINT_INT_SCALAR_INTERNAL(TYPE) \
+  OCTINTERP_API void \
+  octave_print_internal (std::ostream& os, const octave_int<TYPE>& val, bool dummy) \
+  { \
+    octave_print_internal_template (os, val, dummy); \
+  }
+
+PRINT_INT_SCALAR_INTERNAL (int8_t)
+PRINT_INT_SCALAR_INTERNAL (uint8_t)
+PRINT_INT_SCALAR_INTERNAL (int16_t)
+PRINT_INT_SCALAR_INTERNAL (uint16_t)
+PRINT_INT_SCALAR_INTERNAL (int32_t)
+PRINT_INT_SCALAR_INTERNAL (uint32_t)
+PRINT_INT_SCALAR_INTERNAL (int64_t)
+PRINT_INT_SCALAR_INTERNAL (uint64_t)
+
+template <class T>
+/* static */ inline void
+octave_print_internal_template (std::ostream& os, const intNDArray<T>& nda,
+				bool pr_as_read_syntax, int extra_indent)
 {
   // FIXME -- this mostly duplicates the code in the
   // PRINT_ND_ARRAY macro.
@@ -2407,7 +2465,7 @@
   if (nda.is_empty ())
     print_empty_nd_array (os, nda.dims (), pr_as_read_syntax);
   else if (nda.length () == 1)
-    octave_print_internal (os, nda (0), pr_as_read_syntax);
+    octave_print_internal_template (os, nda(0), pr_as_read_syntax);
   else if (plus_format && ! pr_as_read_syntax)
     {
       int ndims = nda.ndims ();
@@ -2618,106 +2676,22 @@
     }
 }
 
-// FIXME -- this is not the right spot for this...
-
-template void
-pr_int (std::ostream&, const octave_int8&, int);
-
-template void
-pr_int (std::ostream&, const octave_int16&, int);
-
-template void
-pr_int (std::ostream&, const octave_int32&, int);
-
-template void
-pr_int (std::ostream&, const octave_int64&, int);
-
-template void
-pr_int (std::ostream&, const octave_uint8&, int);
-
-template void
-pr_int (std::ostream&, const octave_uint16&, int);
-
-template void
-pr_int (std::ostream&, const octave_uint32&, int);
-
-template void
-pr_int (std::ostream&, const octave_uint64&, int);
-
-template OCTINTERP_API void
-octave_print_internal (std::ostream&, const intNDArray<octave_int8>&,
-		       bool, int);
-
-template OCTINTERP_API void
-octave_print_internal (std::ostream&, const intNDArray<octave_int16>&,
-		       bool, int);
-
-template OCTINTERP_API void
-octave_print_internal (std::ostream&, const intNDArray<octave_int32>&,
-		       bool, int);
-
-template OCTINTERP_API void
-octave_print_internal (std::ostream&, const intNDArray<octave_int64>&,
-		       bool, int);
-
-template OCTINTERP_API void
-octave_print_internal (std::ostream&, const intNDArray<octave_uint8>&,
-		       bool, int);
-
-template OCTINTERP_API void
-octave_print_internal (std::ostream&, const intNDArray<octave_uint16>&,
-		       bool, int);
-
-template OCTINTERP_API void
-octave_print_internal (std::ostream&, const intNDArray<octave_uint32>&,
-		       bool, int);
-
-template OCTINTERP_API void
-octave_print_internal (std::ostream&, const intNDArray<octave_uint64>&,
-		       bool, int);
-
-template <class T>
-void
-octave_print_internal (std::ostream& os, const octave_int<T>& val, bool)
-{
-  if (plus_format)
-    {
-      pr_plus_format (os, val);
-    }
-  else
-    {
-      if (free_format)
-	os << typename octave_print_conv<octave_int<T> >::print_conv_type (val);
-      else
-	pr_int (os, val);
-    }
-}
-
-// FIXME -- this is not the right spot for this...
-
-template OCTINTERP_API void
-octave_print_internal (std::ostream&, const octave_int8&, bool);
-
-template OCTINTERP_API void
-octave_print_internal (std::ostream&, const octave_int16&, bool);
-
-template OCTINTERP_API void
-octave_print_internal (std::ostream&, const octave_int32&, bool);
-
-template OCTINTERP_API void
-octave_print_internal (std::ostream&, const octave_int64&, bool);
-
-template OCTINTERP_API void
-octave_print_internal (std::ostream&, const octave_uint8&, bool);
-
-template OCTINTERP_API void
-octave_print_internal (std::ostream&, const octave_uint16&, bool);
-
-template OCTINTERP_API void
-octave_print_internal (std::ostream&, const octave_uint32&, bool);
-
-template OCTINTERP_API void
-octave_print_internal (std::ostream&, const octave_uint64&, bool);
+#define PRINT_INT_ARRAY_INTERNAL(TYPE) \
+  OCTINTERP_API void \
+  octave_print_internal (std::ostream& os, const intNDArray<TYPE>& nda, \
+			 bool pr_as_read_syntax, int extra_indent) \
+  { \
+    octave_print_internal_template (os, nda, pr_as_read_syntax, extra_indent); \
+  }
+
+PRINT_INT_ARRAY_INTERNAL (octave_int8)
+PRINT_INT_ARRAY_INTERNAL (octave_uint8)
+PRINT_INT_ARRAY_INTERNAL (octave_int16)
+PRINT_INT_ARRAY_INTERNAL (octave_uint16)
+PRINT_INT_ARRAY_INTERNAL (octave_int32)
+PRINT_INT_ARRAY_INTERNAL (octave_uint32)
+PRINT_INT_ARRAY_INTERNAL (octave_int64)
+PRINT_INT_ARRAY_INTERNAL (octave_uint64)
 
 extern void
 octave_print_internal (std::ostream&, const Cell&, bool, int, bool)
--- a/src/pr-output.h	Thu Nov 29 03:40:04 2007 +0000
+++ b/src/pr-output.h	Thu Nov 29 16:46:40 2007 +0000
@@ -108,15 +108,76 @@
 		       bool pr_as_read_syntax = false,
 		       int extra_indent = 0);
 
-template <class T>
-extern void
-octave_print_internal (std::ostream& os, const intNDArray<T>& sa,
+extern OCTINTERP_API void
+octave_print_internal (std::ostream& os, const intNDArray<octave_int8>& sa,
+		       bool pr_as_read_syntax = false,
+		       int extra_indent = 0);
+
+extern OCTINTERP_API void
+octave_print_internal (std::ostream& os, const intNDArray<octave_uint8>& sa,
+		       bool pr_as_read_syntax = false,
+		       int extra_indent = 0);
+
+extern OCTINTERP_API void
+octave_print_internal (std::ostream& os, const intNDArray<octave_int16>& sa,
+		       bool pr_as_read_syntax = false,
+		       int extra_indent = 0);
+
+extern OCTINTERP_API void
+octave_print_internal (std::ostream& os, const intNDArray<octave_uint16>& sa,
+		       bool pr_as_read_syntax = false,
+		       int extra_indent = 0);
+
+extern OCTINTERP_API void
+octave_print_internal (std::ostream& os, const intNDArray<octave_int32>& sa,
+		       bool pr_as_read_syntax = false,
+		       int extra_indent = 0);
+
+extern OCTINTERP_API void
+octave_print_internal (std::ostream& os, const intNDArray<octave_uint32>& sa,
+		       bool pr_as_read_syntax = false,
+		       int extra_indent = 0);
+
+extern OCTINTERP_API void
+octave_print_internal (std::ostream& os, const intNDArray<octave_int64>& sa,
 		       bool pr_as_read_syntax = false,
 		       int extra_indent = 0);
 
-template <class T>
-extern void
-octave_print_internal (std::ostream& os, const octave_int<T>& sa,
+extern OCTINTERP_API void
+octave_print_internal (std::ostream& os, const intNDArray<octave_uint64>& sa,
+		       bool pr_as_read_syntax = false,
+		       int extra_indent = 0);
+
+extern OCTINTERP_API void
+octave_print_internal (std::ostream& os, const octave_int<int8_t>& sa,
+		       bool pr_as_read_syntax = false);
+
+extern OCTINTERP_API void
+octave_print_internal (std::ostream& os, const octave_int<uint8_t>& sa,
+		       bool pr_as_read_syntax = false);
+
+extern OCTINTERP_API void
+octave_print_internal (std::ostream& os, const octave_int<int16_t>& sa,
+		       bool pr_as_read_syntax = false);
+
+extern OCTINTERP_API void
+octave_print_internal (std::ostream& os, const octave_int<uint16_t>& sa,
+		       bool pr_as_read_syntax = false);
+
+extern OCTINTERP_API void
+octave_print_internal (std::ostream& os, const octave_int<int32_t>& sa,
+		       bool pr_as_read_syntax = false);
+
+extern OCTINTERP_API void
+octave_print_internal (std::ostream& os, const octave_int<uint32_t>& sa,
+		       bool pr_as_read_syntax = false);
+
+extern OCTINTERP_API void
+octave_print_internal (std::ostream& os, const octave_int<int64_t>& sa,
+		       bool pr_as_read_syntax = false);
+
+extern OCTINTERP_API void
+octave_print_internal (std::ostream& os, const octave_int<uint64_t>& sa,
 		       bool pr_as_read_syntax = false);
 
 extern OCTINTERP_API void