--- a/scripts/plot/__plt2mm__.m
+++ b/scripts/plot/__plt2mm__.m
@@ -18,45 +18,42 @@
 ## 02110-1301, USA.
 
 ## -*- texinfo -*-
-## @deftypefn {Function File} {} __plt2mm__ (@var{h}, @var{x}, @var{y}, @var{fmt}, @var{key})
+## @deftypefn {Function File} {} __plt2mm__ (@var{h}, @var{x}, @var{y}, @var{options})
 ## @end deftypefn
 
 ## Author: jwe
 
-function __plt2mm__ (h, x, y, fmt, key)
+function __plt2mm__ (h, x, y, options)
 
-  if (nargin < 3 || nargin > 5)
+  if (nargin < 3 || nargin > 4)
     print_usage ();
   endif
 
-  if (nargin < 4 || isempty (fmt))
-    fmt = {""};
-  endif
-
-  if (nargin < 5 || isempty (key))
-    key = {""};
+  if (nargin < 4 || isempty (options))
+    options = __default_plot_options__ ();
   endif
 
   [x_nr, x_nc] = size (x);
   [y_nr, y_nc] = size (y);
 
   k = 1;
-  fmt_nr = rows (fmt);
   if (x_nr == y_nr && x_nc == y_nc)
     if (x_nc > 0)
-      if (rows (fmt) == 1)
-	fmt = repmat (fmt, x_nc, 1);
-      endif
-      if (rows (key) == 1)
-	key = repmat (key, x_nc, 1);
+      if (numel (options) == 1)
+	options = repmat (options(:), x_nc, 1);
       endif
       for i = 1:x_nc
-	## FIXME -- need to handle labels and line format.
-	tkey = key{i};
+	tkey = options(i).key;
 	if (! isempty (tkey))
 	  set (h, "key", "on");
 	endif
-	line (x(:,i), y(:,i), "keylabel", tkey);
+	color = options(i).color;
+	if (isempty (color))
+	  color = __next_line_color__ ();
+	endif
+	line (x(:,i), y(:,i), "keylabel", tkey, "color", color,
+	      "linestyle", options(i).linestyle,
+	      "marker", options(i).marker);
       endfor
     else
       error ("__plt2mm__: arguments must be a matrices");