Index: mttroot/mtt/bin/mttrc
==================================================================
--- mttroot/mtt/bin/mttrc
+++ mttroot/mtt/bin/mttrc
@@ -13,10 +13,14 @@
 ###############################################################
 ## Version control history
 ###############################################################
 ## $Id$
 ## $Log$
+## Revision 1.27  2002/04/28 18:41:26  geraint
+## Fixed [ 549658 ] awk should be gawk.
+## Replaced calls to awk with call to gawk.
+##
 ## Revision 1.26  2002/04/26 16:16:33  geraint
 ## Removed unnecessary variables PLAT and GCCVERS.
 ##
 ## Revision 1.25  2002/04/02 09:16:39  geraint
 ## Tidied up library search paths, now assumes that system libraries are set up correctly.
@@ -195,12 +199,12 @@
     IOCTAVE="-I${PREFIX}/include/octave/ -I${PREFIX}/include/octave/octave"
 
     # library paths
 
     OCTAVEVERS=`octave --version | gawk '{ print $4 }'`
-    LOCTAVE="-L${PREFIX}/lib/octave-${OCTAVEVERS} -loctave -lcruft -loctinterp"
-    LSYSTEM="-ldl -lm -lncurses -lkpathsea -lreadline -lblas -llapack -lfftw -lg2c"
+    LOCTAVE="-L${PREFIX}/lib/octave-${OCTAVEVERS} -loctave -lcruft"
+    LSYSTEM="-ldl -lm -lkpathsea -lreadline -lblas -llapack -lfftw -lg2c"
 
     # compiler options
 
     DEBUG="-g"
     OPTIM="-O3"

Index: mttroot/mtt/bin/trans/make_ode2odes
==================================================================
--- mttroot/mtt/bin/trans/make_ode2odes
+++ mttroot/mtt/bin/trans/make_ode2odes
@@ -7,10 +7,15 @@
 ###############################################################
 ## Version control history
 ###############################################################
 ## $Id$
 ## $Log$
+## Revision 1.71  2002/04/30 23:27:00  geraint
+## Replaced octave_map with columnvector in simpar.cc. Not quite as descriptive but
+## standardises the interfaces somewhat and reduces the dependency on liboctinterp
+## (and thus libreadline, libkpathsea, libncurses, etc).
+##
 ## Revision 1.70  2002/04/28 18:41:27  geraint
 ## Fixed [ 549658 ] awk should be gawk.
 ## Replaced calls to awk with call to gawk.
 ##
 ## Revision 1.69  2002/04/17 13:46:58  geraint
@@ -404,21 +409,18 @@
 # get octave version
 case `$MATRIX --version | gawk -F\. '{print $2}'` in
     0) # stable
 	vector_value=vector_value
 	feval_header=toplev.h
-	save_ascii_data_function=save_ascii_data
 	;;
     1) # development
 	vector_value=column_vector_value
 	feval_header=parse.h
-	save_ascii_data_function=save_ascii_data_for_plotting
 	;;
     *)
 	vector_value=column_vector_value
 	feval_header=parse.h
-	save_ascii_data_function=save_ascii_data_for_plotting
 	;;
 esac
 
 cat <<EOF  > $filename
 #include <octave/oct.h>
@@ -919,11 +921,16 @@
   if (dump_data)
     {
        if (row > 0)
          {
            Matrix written_data = data.extract (0, 0, row-1, data.cols ()-1);
-           $save_ascii_data_function (file, written_data, "mtt_data");
+	   file << "# name: mtt_dump" << std::endl
+		<< "# type: matrix" << std::endl
+		<< "# rows: " << written_data.rows () << std::endl
+		<< "# columns: " << written_data.columns () << std::endl
+		<< written_data;
+	   file.flush ();
 	 }
        return;
     }
 
   const int nx = x.length (), ny = y.length ();
@@ -951,12 +958,16 @@
   cputime1 = cputime;
 
   if (nrows == row)
     {
 #ifdef STANDALONE
-      $save_ascii_data_function (file, data, "mtt_data");
-//    std::cout << data << std::endl;
+      file << "# name: mtt_dump" << std::endl
+	   << "# type: matrix" << std::endl
+	   << "# rows: " << data.rows () << std::endl
+	   << "# columns: " << data.columns () << std::endl
+	   << data;
+      file.flush ();
 #else // ! STANDALONE
   set_global_value ("MTT_data", data);
 #endif
     row = 0;
     fcputime.close();

Index: mttroot/mtt/debian/control
==================================================================
--- mttroot/mtt/debian/control
+++ mttroot/mtt/debian/control
@@ -6,11 +6,11 @@
 Standards-Version: 3.5.2
 
 Package: mtt
 Architecture: all
 Depends: gawk, octave, xfig
-Recommends: blas-dev, fftw-dev, c-compiler, g++, gnuplot, info-browser, lapack-dev, latex2html, libkpathsea-dev, libncurses5-dev, libreadline4-dev, pdf-viewer, postscript-viewer, octave-headers, octave-info, octave-sp, p2c, transfig, xterm, www-browser, wish
+Recommends: blas-dev, fftw-dev, c-compiler, g++, gnuplot, info-browser, lapack-dev, latex2html, libkpathsea-dev, libreadline4-dev, pdf-viewer, postscript-viewer, octave-headers, octave-info, p2c, transfig, xterm, www-browser, wish
 Suggests: scigraphica
 Description: Model Transformation Tools.
  A set of tools for modelling dynamic physical systems using the bond-graph
  methodology and transforming these models into representations suitable for
  analysis, control and simulation. These tools use, and generate m files for,