Index: mttroot/mtt/bin/trans/m/figfig.m
==================================================================
--- mttroot/mtt/bin/trans/m/figfig.m
+++ mttroot/mtt/bin/trans/m/figfig.m
@@ -11,10 +11,13 @@
   ###############################################################
   ## Version control history
   ###############################################################
   ## $Id$
   ## $Log$
+  ## Revision 1.4  2001/05/08 15:18:12  gawthrop
+  ## Added trig and hyperbolic functions to argument exclusion list
+  ##
   ## Revision 1.3  2001/04/10 12:54:50  gawthrop
   ## Minor fixes for sensitivity versions
   ##
   ## Revision 1.2  2000/12/27 16:06:02  peterg
   ## *** empty log message ***
@@ -22,11 +25,11 @@
   ## Revision 1.1  2000/11/03 10:43:10  peterg
   ## Initial revision
   ###############################################################
 
   if nargin<3
-    boxed=1
+    boxed=1;
   endif
   
   figfilename = sprintf("%s.fig",filename);
   
   eval(sprintf("gset output \"%s\" ",figfilename));

Index: mttroot/mtt/bin/trans/m/pol2root2tex.m
==================================================================
--- mttroot/mtt/bin/trans/m/pol2root2tex.m
+++ mttroot/mtt/bin/trans/m/pol2root2tex.m
@@ -1,19 +1,29 @@
-function tex = pol2root2tex(pol)
+function tex = pol2root2tex(pol,name,f)
   ## pol2tex: converts polynomial into LaTeX form as (s-z_1)..(s-z_n)
-  ## tex = pol2root2tex(pol)
+  ## tex = pol2root2tex(pol,[name,f])
   
   ###############################################################
   ## Version control history
   ###############################################################
   ## $Id$
   ## $Log$
+  ## Revision 1.1  2001/05/10 11:44:40  gawthrop
+  ## Useful conversion functions
+  ##
   ## Revision 1.1  1999/05/24 22:05:53  peterg
   ## Initial revision
   ##
   ###############################################################
 
+  if nargin<2
+    name = "s"
+  endif
+  
+  if nargin<3
+    f = "%2.2f";
+  endif
 
   n = length(pol)-1;
 
   if n>0
     r = sort(roots(pol));
@@ -20,23 +30,41 @@
   endif
   
   gain = pol(1);
 
   complex=0;
-  tex = sprintf("%g", gain);
+  if ((gain==1)&&(n>0))
+    tex="";
+  else
+    tex = sprintf("%g", gain);
+  endif
+  
   for i=1:n
+    if real(r(i))<0
+      r_plusminus = '+';
+    else
+      r_plusminus = '-';
+    endif
+    if imag(r(i))<0
+      i_plusminus = '+';
+    else
+      i_plusminus = '-';
+    endif
+
     if complex
       complex=0
     else
-      if imag(r(i))<eps
-	tex = sprintf("%s (s + %g)", tex, -r(i));
+      if abs(imag(r(i)))<1e-5
+	ff = sprintf("%%s (%s %%s %s)",name, f);
+	tex = sprintf(ff, tex, r_plusminus, abs(r(i)));
       else
-	tex = sprintf("%s (s + %g \\pm %g)", tex, -real(r(i)), imag(r(i)));
+	ff = sprintf("%%s (%s %%s %s \\pm j %s)", name, f, f)
+	tex = sprintf(ff, tex, r_plusminus, abs(real(r(i))), imag(r(i)));
 	complex=1;
       endif
     endif
   endfor
   
 endfunction
 
 
 

Index: mttroot/mtt/bin/trans/m/pol2tex.m
==================================================================
--- mttroot/mtt/bin/trans/m/pol2tex.m
+++ mttroot/mtt/bin/trans/m/pol2tex.m
@@ -1,36 +1,51 @@
-function tex = pol2tex(pol)
+function tex = pol2tex(pol,name,f)
   ## pol2tex: converts polynomial into LaTeX form.
-  ## tex = pol2tex(pol)
+  ## tex = pol2tex(pol,[name,f])
   
+  ## pol  polynomial (row vector)
+  ## name name of the variable (eg s or z)
+  ## f    format of the coefficients (eg %2.4f)
 
   ###############################################################
   ## Version control history
   ###############################################################
   ## $Id$
   ## $Log$
+  ## Revision 1.1  2001/05/10 11:44:40  gawthrop
+  ## Useful conversion functions
+  ##
   ## Revision 1.1  1999/03/25 01:33:51  peterg
   ## Initial revision
   ##
   ###############################################################
 
+  if nargin<2
+    name = "s"
+  endif
+  
+  if nargin<3
+    f = "%2.2f";
+  endif
+  
   n = length(pol);
   
   if pol(1) == 1
     if n>1
       tex = '';
     else
       tex = '1';
     endif
   else
-    tex = sprintf(" %1.2f", pol(1));
+    ff = sprintf(" %s",f);
+    tex = sprintf(ff, pol(1));
   endif
   
   if n>2
-    tex = sprintf("%ss^%1.f", tex, n-1);
+    tex = sprintf("%s{%s}^%i", tex, name, n-1);
   elseif n==2
-    tex = sprintf("%ss", tex);
+    tex = sprintf("%s{%s}", tex, name);
   else
     tex = sprintf("%s", tex);
   endif
 
   for i=2:n
@@ -37,18 +52,19 @@
     if pol(i)<0
       plusminus = '-';
     else
       plusminus = '+';
     endif
-    tex = sprintf("%s %s %1.2f", tex, plusminus, abs(pol(i)));
+    ff = sprintf("%%s %%s %s",f);
+    tex = sprintf(ff, tex, plusminus, abs(pol(i)));
     if i<n-1
-      tex = sprintf("%ss^%1.0f", tex, n-i);
+      tex = sprintf("%s{%s}^%i", tex, name, n-i);
     elseif i==n-1
-      tex = sprintf("%ss", tex); 
+      tex = sprintf("%s{%s}", tex, name); 
     else
       tex = sprintf("%s", tex);
     endif
   endfor
 endfunction