Mercurial > octave-nkf

changeset 3069:db6d57d718f7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 1997-07-10 23:34:03 by jwe]
author jwe
date Thu, 10 Jul 1997 23:34:07 +0000
parents 17e2f90e0d3b
children 2726500a6793
files Announce ChangeLog PROJECTS aclocal.m4 configure.in doc/ChangeLog doc/interpreter/Makefile.in doc/interpreter/install.texi doc/interpreter/var.texi doc/refcard/Makefile.in emacs/octave-mod.el liboctave/ChangeLog liboctave/CmplxQR.cc liboctave/dbleQR.cc liboctave/lo-mappers.cc liboctave/lo-sysdep.cc octMakefile.in readline/ChangeLog readline/acconfig.h readline/config.h.in scripts/polynomial/polyfit.m src/DLD-FUNCTIONS/qr.cc
diffstat 22 files changed, 188 insertions(+), 103 deletions(-) [+]
line wrap: on
line diff
--- a/Announce	Tue Jul 08 02:18:21 1997 +0000
+++ b/Announce	Thu Jul 10 23:34:07 1997 +0000
@@ -1,22 +1,24 @@
-Subject: ANNOUNCE: Octave Version 2.0.8 released
+Subject: ANNOUNCE: Octave Version 2.0.9 released
 
-Octave version 2.0.8 is now available for ftp from ftp.che.wisc.edu
+Octave version 2.0.9 is now available for ftp from ftp.che.wisc.edu
 in the directory /pub/octave.  Diffs from the previous release are
 also available in the same directory.
 
-  -rw-r--r--   1 jwe  3369407 Jun 23 15:44 octave-2.0.8.tar.gz
-  -rw-r--r--   1 jwe    41993 Jun 23 14:47 octave-2.0.7-2.0.8.patch.gz
+  -rw-r--r--   1 jwe  3371863 Jul  9 20:54 octave-2.0.9.tar.gz
+  -rw-r--r--   1 jwe    10971 Jul  9 20:54 octave-2.0.8-2.0.9.patch.gz
 
 Most bugs reported since the release of version 2.0 have been fixed.
 
-This is a bug-fixing release.  There are only a few new features:
+This is a bug-fixing release, but there is one new user-visible
+feature:
 
-  * If the argument to eig() is symmetric, Octave uses the specialized
-    Lapack subroutine for symmetric matrices for a significant
-    increase in performance.
+  * It is now possible to specify a label for lines in the plot key
+    when using the plot function.  For example,
 
-  * It is now possible to use the mkoctfile script to create .oct
-    files from multiple source and object files.
+      plot (x, y, "-*;sin(x);")
+
+    plots y vs. x using the linespoints style and sets the title of
+    the line in the key to be `sin(x)'.
 
 Octave is a high-level interactive language primarily intended for
 numerical computations.  It is mostly compatible with MATLAB.
--- a/ChangeLog	Tue Jul 08 02:18:21 1997 +0000
+++ b/ChangeLog	Thu Jul 10 23:34:07 1997 +0000
@@ -1,3 +1,17 @@
+Wed Jul  9 19:27:38 1997  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* configure.in: Also check for getwd.
+
+Tue Jul  8 17:47:11 1997  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* aclocal.m4 (OCTAVE_FLIBS): Avoid grabbing an argument starting
+	with a - as an option for another argument.
+
+Wed Jul  2 21:34:15 1997  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* emacs/octave-mod.el (octave-auto-indent): New variable.
+	(octave-electric-semi, octave-electric-space): Use it.
+
 Thu Jun 26 22:16:59 1997  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* configure.in: Only set GCC_IEEE_FP_FLAG to -mieee-fp on Intel
--- a/PROJECTS	Tue Jul 08 02:18:21 1997 +0000
+++ b/PROJECTS	Thu Jul 10 23:34:07 1997 +0000
@@ -492,6 +492,8 @@
 
   * Should --enable-lite-kernel imply --enable-shared?
 
+  * Should --enable-dl imply --enable-shared?
+
   * Make it possible to configure without readline.
 
   * Makefile changes:
@@ -505,6 +507,8 @@
 
   * Make installation of the static libraries optional.
 
+  * Create a docs-only distribution?
+
 ------------------------------
 Documentation and On-Line Help:
 ------------------------------
--- a/aclocal.m4	Tue Jul 08 02:18:21 1997 +0000
+++ b/aclocal.m4	Thu Jul 10 23:34:07 1997 +0000
@@ -108,6 +108,17 @@
 for arg in $foutput; do
   old_want_arg=$want_arg
   want_arg=
+dnl
+dnl None of the options that take arguments expect the argument to
+dnl start with a -, so pretend we didn't see anything special.
+dnl
+  if test -n "$old_want_arg"; then
+    case "$arg" in
+      -*)
+	old_want_arg=
+      ;;
+    esac
+  fi
   case "$old_want_arg" in
     '')
       case $arg in
@@ -178,6 +189,7 @@
 	;;
 	-u)
 	  want_arg=$arg
+	  arg=
 	;;
 	-Y)
 	  want_arg=$arg
@@ -191,6 +203,9 @@
     -[lLR])
       arg="$old_want_arg $arg"
     ;;
+    -u)
+      arg="-u $arg"
+    ;;
     -Y)
 dnl
 dnl Should probably try to ensure unique directory options here too.
--- a/configure.in	Tue Jul 08 02:18:21 1997 +0000
+++ b/configure.in	Thu Jul 10 23:34:07 1997 +0000
@@ -21,7 +21,7 @@
 ### Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 ### 02111-1307, USA. 
 
-AC_REVISION($Revision: 1.281 $)
+AC_REVISION($Revision: 1.282 $)
 AC_PREREQ(2.9)
 AC_INIT(src/octave.cc)
 AC_CONFIG_HEADER(config.h)
@@ -733,11 +733,11 @@
 AC_CHECK_FUNCS(atexit bcopy bzero dup2 endgrent endpwent execvp fcntl \
   fork getcwd getegid geteuid getgid getgrent getgrgid getgrnam \
   gethostname getpgrp getpid getppid getpwent getpwnam getpwuid \
-  gettimeofday getuid lstat memmove mkdir mkfifo on_exit pipe putenv \
-  rename rindex rmdir setgrent setpwent setvbuf sigaction sigpending \
-  sigprocmask sigsuspend stat strcasecmp strdup strerror stricmp \
-  strncasecmp strnicmp tempnam umask unlink usleep vfprintf vsprintf \
-  waitpid)
+  gettimeofday getuid getwd lstat memmove mkdir mkfifo on_exit pipe \
+  putenv rename rindex rmdir setgrent setpwent setvbuf sigaction \
+  sigpending sigprocmask sigsuspend stat strcasecmp strdup strerror \
+  stricmp strncasecmp strnicmp tempnam umask unlink usleep vfprintf \
+  vsprintf waitpid)
 
 OCTAVE_SMART_PUTENV
 
--- a/doc/ChangeLog	Tue Jul 08 02:18:21 1997 +0000
+++ b/doc/ChangeLog	Thu Jul 10 23:34:07 1997 +0000
@@ -1,3 +1,10 @@
+Wed Jul  2 16:41:04 1997  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* refcard/Makefile.in: Remove .tex files from binary distributions.
+
+	* interpreter/Makefile.in: Add DVI and Postscript files to binary
+	distributions.
+
 Fri Apr 18 02:51:00 1997  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* faq/Octave-FAQ.texi: Rename from faq/FAQ.texi.
--- a/doc/interpreter/Makefile.in	Tue Jul 08 02:18:21 1997 +0000
+++ b/doc/interpreter/Makefile.in	Thu Jul 10 23:34:07 1997 +0000
@@ -35,10 +35,9 @@
 DISTFILES = Makefile.in dir octave.1 $(TEXINFO) $(FORMATTED)
 
 ifeq ($(wildcard octave.info), )
-  BINDISTFILES = $(srcdir)/octave.1 $(srcdir)/octave.info \
-	$(wildcard $(srcdir)/octave.info-[0-9]*)
+  BINDISTFILES = $(addprefix $(srcdir)/, octave.1 $(FORMATTED))
 else
-  BINDISTFILES = $(srcdir)/octave.1 octave.info octave.info-[0-9]*
+  BINDISTFILES = $(srcdir)/octave.1 $(FORMATTED)
 endif
 
 # Look for version.h to get version information.
--- a/doc/interpreter/install.texi	Tue Jul 08 02:18:21 1997 +0000
+++ b/doc/interpreter/install.texi	Thu Jul 10 23:34:07 1997 +0000
@@ -56,7 +56,8 @@
 Create shared libraries.  If you are planning to use
 @code{--enable-lite-kernelel} or the dynamic loading features, you will
 probably want to use this option.  It will make your @file{.oct} files
-much smaller.
+much smaller and on some systems it may be necessary to build shared
+libraries in order to use dynamically linked functions.
 
 You may also want to build a shared version of @code{libg++}, if your
 system doesn't already have one.  Note that a patch is needed to build
--- a/doc/interpreter/var.texi	Tue Jul 08 02:18:21 1997 +0000
+++ b/doc/interpreter/var.texi	Thu Jul 10 23:34:07 1997 +0000
@@ -247,9 +247,10 @@
 @end deffn
 
 @deftypefn {Built-in Function} {} exist (@var{name})
-Return 1 if the name exists as a variable, and 2 if the name (after
-appending @samp{.m}) is a function file in the path.  Otherwise, return
-0.
+Return 1 if the name exists as a variable, 2 if the name (after
+appending @samp{.m}) is a function file in the path, 3 if the name is a
+@samp{.oct} file in the path, or 5 if the name is a built-in function.
+Otherwise, return 0.
 @end deftypefn
 
 @deftypefn {Built-in Function} {} document (@var{symbol}, @var{text})
--- a/doc/refcard/Makefile.in	Tue Jul 08 02:18:21 1997 +0000
+++ b/doc/refcard/Makefile.in	Thu Jul 10 23:34:07 1997 +0000
@@ -26,7 +26,11 @@
 
 DISTFILES := Makefile.in $(TEX) $(FORMATTED)
 
-BINDISTFILES = $(addprefix $(srcdir)/, $(TEX) $(FORMATTED))
+ifeq ($(wildcard refcard-letter.ps), )
+  BINDISTFILES = $(addprefix $(srcdir)/, $(FORMATTED))
+else
+  BINDISTFILES = $(FORMATTED)
+endif
 
 all: $(FORMATTED)
 
--- a/emacs/octave-mod.el	Tue Jul 08 02:18:21 1997 +0000
+++ b/emacs/octave-mod.el	Thu Jul 10 23:34:07 1997 +0000
@@ -295,6 +295,9 @@
     (modify-syntax-entry ?\n ">"  table)
     (setq octave-mode-syntax-table table)))
 
+(defvar octave-auto-indent nil
+  "*Non-nil means automatically indent line after a semicolon or space.")
+
 (defvar octave-auto-newline nil
   "*Non-nil means automatically newline after a semicolon in Octave mode.")
 
@@ -401,6 +404,10 @@
 Variables you can use to customize Octave mode
 ==============================================
 
+octave-auto-indent
+  Non-nil means indent current line after a semicolon or space.
+  Default is nil.
+
 octave-auto-newline
   Non-nil means auto-insert a newline and indent after a semicolon.
   Default is nil.
@@ -1193,7 +1200,8 @@
     (if abbrev-mode (expand-abbrev))
     (if octave-blink-matching-block
 	(octave-blink-matching-block-open))
-    (indent-according-to-mode)    
+    (if octave-auto-indent
+	(indent-according-to-mode))
     (insert ";")
     (if octave-auto-newline
 	(newline-and-indent))))
@@ -1210,9 +1218,10 @@
     (if abbrev-mode (expand-abbrev))
     (if octave-blink-matching-block
 	(octave-blink-matching-block-open))
-    (if (save-excursion
-	  (skip-syntax-backward " ")
-	  (not (bolp)))
+    (if (and octave-auto-indent
+	     (save-excursion
+	       (skip-syntax-backward " ")
+	       (not (bolp))))
 	(indent-according-to-mode))
     (self-insert-command 1)))
 
@@ -1394,6 +1403,7 @@
     octave-maintainer-address
     (concat "Emacs version " emacs-version)
     (list
+     'octave-auto-indent
      'octave-auto-newline
      'octave-blink-matching-block
      'octave-block-offset
--- a/liboctave/ChangeLog	Tue Jul 08 02:18:21 1997 +0000
+++ b/liboctave/ChangeLog	Thu Jul 10 23:34:07 1997 +0000
@@ -1,5 +1,13 @@
+Wed Jul  9 19:40:23 1997  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* lo-sysdep.cc (octave_getcwd): If getwd is available, use it.
+	Call error handler if we can't find the current directory.
+
 Mon Jul  7 21:14:41 1997  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
+	* lo-mappers.cc (xisnan (double)): Return only 1 or 0.
+	(xfinite (double)): Ditto.
+
 	* dbleQR.cc (QR::init): Don't forget to initialize Q when type is raw.
 	* CmplxQR.cc (ComplexQR::init): Ditto.
 
--- a/liboctave/CmplxQR.cc	Tue Jul 08 02:18:21 1997 +0000
+++ b/liboctave/CmplxQR.cc	Thu Jul 10 23:34:07 1997 +0000
@@ -99,7 +99,10 @@
 		A_fact.elem (i, j) *= tau.elem (j);
 	    }
 
-	  q = A_fact;
+	  r = A_fact;
+
+	  if (m > n)
+	    r.resize (m, n);
 	}
       else
 	{
--- a/liboctave/dbleQR.cc	Tue Jul 08 02:18:21 1997 +0000
+++ b/liboctave/dbleQR.cc	Thu Jul 10 23:34:07 1997 +0000
@@ -97,7 +97,10 @@
 		A_fact.elem (i, j) *= tau.elem (j);
 	    }
 
-	  q = A_fact;
+	  r = A_fact;
+
+	  if (m > n)
+	    r.resize (m, n);
 	}
       else
 	{
--- a/liboctave/lo-mappers.cc	Tue Jul 08 02:18:21 1997 +0000
+++ b/liboctave/lo-mappers.cc	Thu Jul 10 23:34:07 1997 +0000
@@ -150,7 +150,7 @@
 xisnan (double x)
 {
 #if defined (HAVE_ISNAN)
-  return isnan (x);
+  return isnan (x) != 0;
 #else
   return 0;
 #endif
@@ -160,7 +160,7 @@
 xfinite (double x)
 {
 #if defined (HAVE_FINITE)
-  return finite (x);
+  return finite (x) != 0;
 #elif defined (HAVE_ISINF) && defined (HAVE_ISNAN)
   return (! isinf (x) && ! isnan (x));
 #else
--- a/liboctave/lo-sysdep.cc	Tue Jul 08 02:18:21 1997 +0000
+++ b/liboctave/lo-sysdep.cc	Thu Jul 10 23:34:07 1997 +0000
@@ -47,22 +47,30 @@
 #include <sys/utsname.h>
 #endif
 
+#include "lo-error.h"
 #include "pathlen.h"
 
 string
 octave_getcwd (void)
 {
   string retval;
+
   char buf[MAXPATHLEN];
 
+  char *tmp = 0;
+
 #if defined (__EMX__)
-  char *tmp = _getcwd2 (buf, MAXPATHLEN);
-#else
-  char *tmp = getcwd (buf, MAXPATHLEN);
+  tmp = _getcwd2 (buf, MAXPATHLEN);
+#elif defined (HAVE_GETWD)
+  tmp = getwd (buf);
+#elif defined (HAVE_GETCWD)
+  tmp = getcwd (buf, MAXPATHLEN);
 #endif
 
   if (tmp)
     retval = tmp;
+  else
+    (*current_liboctave_error_handler) ("unable to find current directory");
 
   return retval;
 }
--- a/octMakefile.in	Tue Jul 08 02:18:21 1997 +0000
+++ b/octMakefile.in	Thu Jul 10 23:34:07 1997 +0000
@@ -31,7 +31,7 @@
 	ChangeLog ChangeLog.[0-9]
 
 # Complete directory trees to distribute.
-DISTDIRS = glob kpathsea kpathsea # plplot
+DISTDIRS = glob kpathsea # plplot
 
 # Subdirectories in which to run `make all'.
 SUBDIRS = @INFO_DIR@ @PLPLOT_DIR@ @READLINE_DIR@ @DLFCN_DIR@ glob \
--- a/readline/ChangeLog	Tue Jul 08 02:18:21 1997 +0000
+++ b/readline/ChangeLog	Thu Jul 10 23:34:07 1997 +0000
@@ -1,3 +1,11 @@
+Thu Jul 10 18:26:56 1997  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* acconfig.h: Add #undefs for FIONREAD_IN_SYS_IOCTL,
+	HAVE_BSD_SIGNALS, HAVE_LSTAT, HAVE_POSIX_SIGNALS,
+	HAVE_POSIX_SIGSETJMP, HAVE_USG_SIGHOLD,
+	MUST_REINSTALL_SIGHANDLERS, SPEED_T_IN_SYS_TYPES, STRCOLL_BROKEN,
+	STRUCT_DIRENT_HAS_D_FILENO, and STRUCT_DIRENT_HAS_D_INO.
+
 Thu May 22 16:00:10 1997  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* history.h, readline.h [__cplusplus]: Add extern "C" declarations.
--- a/readline/acconfig.h	Tue Jul 08 02:18:21 1997 +0000
+++ b/readline/acconfig.h	Thu Jul 10 23:34:07 1997 +0000
@@ -23,6 +23,28 @@
 
 #undef HAVE_GETPW_DECLS
 
+#undef FIONREAD_IN_SYS_IOCTL
+
+#undef HAVE_BSD_SIGNALS
+
+#undef HAVE_LSTAT
+
+#undef HAVE_POSIX_SIGNALS
+
+#undef HAVE_POSIX_SIGSETJMP
+
+#undef HAVE_USG_SIGHOLD
+
+#undef MUST_REINSTALL_SIGHANDLERS
+
+#undef SPEED_T_IN_SYS_TYPES
+
+#undef STRCOLL_BROKEN
+
+#undef STRUCT_DIRENT_HAS_D_FILENO
+
+#undef STRUCT_DIRENT_HAS_D_INO
+
 
 /* Leave that blank line there!!  Autoheader needs it.
    If you're adding to this file, keep in mind:
--- a/readline/config.h.in	Tue Jul 08 02:18:21 1997 +0000
+++ b/readline/config.h.in	Thu Jul 10 23:34:07 1997 +0000
@@ -1,14 +1,44 @@
 /* config.h.in.  Generated automatically from configure.in by autoheader.  */
 
+/* Define if you have the strcoll function and it is properly defined.  */
+#undef HAVE_STRCOLL
+
 /* Define as the return type of signal handlers (int or void).  */
 #undef RETSIGTYPE
 
 /* Define if the `S_IS*' macros in <sys/stat.h> do not work properly.  */
 #undef STAT_MACROS_BROKEN
 
+/* Definitions pulled in from aclocal.m4. */
 #undef VOID_SIGHANDLER
 
-/* Define if you have the lstat function. */
+#undef TIOCSTAT_IN_SYS_IOCTL
+
+#undef HAVE_GETPW_DECLS
+
+#undef FIONREAD_IN_SYS_IOCTL
+
+#undef HAVE_BSD_SIGNALS
+
+#undef HAVE_LSTAT
+
+#undef HAVE_POSIX_SIGNALS
+
+#undef HAVE_POSIX_SIGSETJMP
+
+#undef HAVE_USG_SIGHOLD
+
+#undef MUST_REINSTALL_SIGHANDLERS
+
+#undef SPEED_T_IN_SYS_TYPES
+
+#undef STRCOLL_BROKEN
+
+#undef STRUCT_DIRENT_HAS_D_FILENO
+
+#undef STRUCT_DIRENT_HAS_D_INO
+
+/* Define if you have the lstat function.  */
 #undef HAVE_LSTAT
 
 /* Define if you have the putenv function.  */
@@ -20,26 +50,27 @@
 /* Define if you have the setenv function.  */
 #undef HAVE_SETENV
 
+/* Define if you have the setlocale function.  */
+#undef HAVE_SETLOCALE
+
 /* Define if you have the strcasecmp function.  */
 #undef HAVE_STRCASECMP
 
-/* Define if you have the setlocale function. */
-#undef HAVE_SETLOCALE
-
 /* Define if you have the tcgetattr function.  */
 #undef HAVE_TCGETATTR
 
-/* Define if you have the strcoll function.  */
-#undef HAVE_STRCOLL
-
-#undef STRCOLL_BROKEN
-
 /* Define if you have the <dirent.h> header file.  */
 #undef HAVE_DIRENT_H
 
+/* Define if you have the <locale.h> header file.  */
+#undef HAVE_LOCALE_H
+
 /* Define if you have the <ndir.h> header file.  */
 #undef HAVE_NDIR_H
 
+/* Define if you have the <stdarg.h> header file.  */
+#undef HAVE_STDARG_H
+
 /* Define if you have the <stdlib.h> header file.  */
 #undef HAVE_STDLIB_H
 
@@ -81,58 +112,3 @@
 
 /* Define if you have the <varargs.h> header file.  */
 #undef HAVE_VARARGS_H
-
-/* Define if you have the <stdarg.h> header file.  */
-#undef HAVE_STDARG_H
-
-#undef HAVE_LOCALE_H
-
-/* Definitions pulled in from aclocal.m4. */
-#undef VOID_SIGHANDLER
-
-#undef GWINSZ_IN_SYS_IOCTL
-
-#undef TIOCSTAT_IN_SYS_IOCTL
-
-#undef FIONREAD_IN_SYS_IOCTL
-
-#undef SPEED_T_IN_SYS_TYPES
-
-#undef HAVE_GETPW_DECLS
-
-#undef STRUCT_DIRENT_HAS_D_INO
-
-#undef STRUCT_DIRENT_HAS_D_FILENO
-
-#undef HAVE_BSD_SIGNALS
-
-#undef HAVE_POSIX_SIGNALS
-
-#undef HAVE_USG_SIGHOLD
-
-#undef MUST_REINSTALL_SIGHANDLERS
-
-#undef HAVE_POSIX_SIGSETJMP
-
-/* config.h.bot */
-/* modify settings or make new ones based on what autoconf tells us. */
-
-/* Ultrix botches type-ahead when switching from canonical to
-   non-canonical mode, at least through version 4.3 */
-#if !defined (HAVE_TERMIOS_H) || !defined (HAVE_TCGETATTR) || defined (ultrix)
-#  define TERMIOS_MISSING
-#endif
-
-#if defined (STRCOLL_BROKEN)
-#  undef HAVE_STRCOLL
-#endif
-
-#if defined (__STDC__) && defined (HAVE_STDARG_H)
-#  define PREFER_STDARG
-#  define USE_VARARGS
-#else
-#  if defined (HAVE_VARARGS_H)
-#    define PREFER_VARARGS
-#    define USE_VARARGS
-#  endif
-#endif
--- a/scripts/polynomial/polyfit.m	Tue Jul 08 02:18:21 1997 +0000
+++ b/scripts/polynomial/polyfit.m	Thu Jul 10 23:34:07 1997 +0000
@@ -61,7 +61,7 @@
 
   X = (x * ones (1, n+1)) .^ (ones (l, 1) * (0 : n));
 
-  p = (X' * X) \ (X' * y);
+  p = flipud ((X' * X) \ (X' * y));
 
   if (! prefer_column_vectors)
     p = p';
--- a/src/DLD-FUNCTIONS/qr.cc	Tue Jul 08 02:18:21 1997 +0000
+++ b/src/DLD-FUNCTIONS/qr.cc	Thu Jul 10 23:34:07 1997 +0000
@@ -87,7 +87,7 @@
 	    case 1:
 	      {
 		QR fact (m, type);
-		retval(0) = fact.Q ();
+		retval(0) = fact.R ();
 	      }
 	      break;
 
@@ -122,7 +122,7 @@
 	    case 1:
 	      {
 		ComplexQR fact (m, type);
-		retval(0) = fact.Q ();
+		retval(0) = fact.R ();
 	      }
 	      break;