# HG changeset patch
# User jwe
# Date 945900711 0
# Node ID e665633c76aff0f35a949f8106e28dda9f0b4b91
# Parent  0f515bc984607765537f85d9728d8d08b95ff043
[project @ 1999-12-22 22:11:50 by jwe]

diff -r 0f515bc98460 -r e665633c76af scripts/ChangeLog
--- a/scripts/ChangeLog	Sat Dec 18 04:21:52 1999 +0000
+++ b/scripts/ChangeLog	Wed Dec 22 22:11:51 1999 +0000
@@ -1,3 +1,7 @@
+1999-12-22  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* control/DEMOcontrol.m: Formatting tweaks.
+
 1999-12-17  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* mkdoc: Only delete spaces before @ characters at the beginning
diff -r 0f515bc98460 -r e665633c76af scripts/control/DEMOcontrol.m
--- a/scripts/control/DEMOcontrol.m	Sat Dec 18 04:21:52 1999 +0000
+++ b/scripts/control/DEMOcontrol.m	Wed Dec 22 22:11:51 1999 +0000
@@ -46,36 +46,35 @@
 
 function DEMOcontrol ()
 
-  disp(' O C T A V E    C O N T R O L   S Y S T E M S   T O O L B O X')
+  puts ("O C T A V E    C O N T R O L   S Y S T E M S   T O O L B O X")
 
   while (1)
-    clc
+
+    clc ();
+
     k = 0;
+
     while (k > 8 || k < 1),
-      k = menu("Octave Controls System Toolbox Demo", ...
-	'System representation', ...
-    	'Block diagram manipulations ', ...
-    	'Frequency response functions ', ...
-    	'State space analysis functions ', ...
-    	'Root locus functions ', ...
-	'LQG/H2/Hinfinity functions ', ...
-    	'End');
-
+      k = menu ("Octave Controls System Toolbox Demo",
+		"System representation",
+    		"Block diagram manipulations",
+    		"Frequency response functions",
+    		"State space analysis functions",
+    		"Root locus functions",
+		"LQG/H2/Hinfinity functions",
+    		"End");
     endwhile
-    if(k == 1)
-      sysrepdemo
-    elseif (k == 2)
-      bddemo
-    elseif (k == 3)
-      frdemo
-    elseif (k == 4)
-      analdemo
-    elseif (k == 5)
-      rldemo
-    elseif (k == 6)
-      dgkfdemo
-    elseif (k == 7)
-      return
-    endif
+
+    switch (k)
+      case (1) sysrepdemo ();
+      case (2) bddemo ();
+      case (3) frdemo ();
+      case (4) analdemo ();
+      case (5) rldemo ();
+      case (6) dgkfdemo ();
+      case (7) return;
+    endswitch
+
   endwhile
+
 endfunction
diff -r 0f515bc98460 -r e665633c76af src/ChangeLog
--- a/src/ChangeLog	Sat Dec 18 04:21:52 1999 +0000
+++ b/src/ChangeLog	Wed Dec 22 22:11:51 1999 +0000
@@ -1,3 +1,7 @@
+1999-12-20  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* mkbuiltins: Add #undef quad to generated file.
+
 1999-12-15  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* lex.l (Vwarn_separator_insert): New variable.
diff -r 0f515bc98460 -r e665633c76af src/mkbuiltins
--- a/src/mkbuiltins	Sat Dec 18 04:21:52 1999 +0000
+++ b/src/mkbuiltins	Wed Dec 22 22:11:51 1999 +0000
@@ -29,6 +29,10 @@
 #include "oct-obj.h"
 #include "variables.h"
 
+#if defined (quad)
+#undef quad
+#endif
+
 #if defined (OCTAVE_LITE) && defined (WITH_DYNAMIC_LINKING)
 #define XDEFUN_DLD_INTERNAL(name, args_name, nargout_name, is_text_fcn, doc)
 #else