--- a/src/ov-cell.cc	Sat Sep 13 07:53:55 2003 +0000
+++ b/src/ov-cell.cc	Fri Sep 19 21:41:21 2003 +0000
@@ -327,47 +327,66 @@
 void
 octave_cell::print_raw (std::ostream& os, bool) const
 {
-  int nr = rows ();
-  int nc = columns ();
+  int ndims = matrix.ndims ();
+
+  if (ndims == 2)
+    {
+      int nr = rows ();
+      int nc = columns ();
+
+      if (nr > 0 && nc > 0)
+	{
+	  indent (os);
+	  os << "{";
+	  newline (os);
+
+	  increment_indent_level ();
+
+	  for (int j = 0; j < nc; j++)
+	    {
+	      for (int i = 0; i < nr; i++)
+		{
+		  OCTAVE_QUIT;
+
+		  OSSTREAM buf;
+		  buf << "[" << i+1 << "," << j+1 << "]" << OSSTREAM_ENDS;
 
-  if (nr > 0 && nc > 0)
+		  octave_value val = matrix(i,j);
+
+		  val.print_with_name (os, OSSTREAM_STR (buf));
+
+		  OSSTREAM_FREEZE (buf);
+		}
+	    }
+
+	  decrement_indent_level ();
+
+	  indent (os);
+	  os << "}";
+	  newline (os);
+	}
+      else
+	{
+	  os << "{}";
+	  if (nr > 0 || nc > 0)
+	    os << "(" << nr << "x" << nc << ")";
+	  os << "\n";
+	}
+    }
+  else
     {
       indent (os);
       os << "{";
-      newline (os);
-
-      increment_indent_level ();
-
-      for (int j = 0; j < nc; j++)
+      dim_vector dv = matrix.dims ();
+      for (int i = 0; i < ndims; i++)
 	{
-	  for (int i = 0; i < nr; i++)
-	    {
-	      OCTAVE_QUIT;
-
-	      OSSTREAM buf;
-	      buf << "[" << i+1 << "," << j+1 << "]" << OSSTREAM_ENDS;
-
-	      octave_value val = matrix(i,j);
-
-	      val.print_with_name (os, OSSTREAM_STR (buf));
-
-	      OSSTREAM_FREEZE (buf);
-	    }
+	  if (i > 0)
+	    os << "x";
+	  os << dv(i);
 	}
-
-      decrement_indent_level ();
-
-      indent (os);
-      os << "}";
+      os << " Cell Array}";
       newline (os);
     }
-  else
-    {
-      os << "{}";
-      if (nr > 0 || nc > 0)
-	os << "(" << nr << "x" << nc << ")";
-      os << "\n";
-    }
 }
 
 bool