Fix PR 11628.

diff --git a/doc/data-selection.texi b/doc/data-selection.texi
index c20337ae4de8c3597d8fe0229fb75a3a61d4259d..3ea91c8d7d9d14e016834553fad7d7baac1a0fe2 100644 (file)
--- a/doc/data-selection.texi
+++ b/doc/data-selection.texi
@@ -212,9 +212,8 @@ When @cmd{SELECT IF} is specified following @cmd{TEMPORARY}
 @vindex SPLIT FILE
 
 @display
-Two possible syntaxes:
-        SPLIT FILE BY var_list.
-        SPLIT FILE OFF.
+SPLIT FILE [{LAYERED, SEPARATE}] BY var_list.
+SPLIT FILE OFF.
 @end display
 
 @cmd{SPLIT FILE} allows multiple sets of data present in one data
@@ -227,6 +226,10 @@ variables are analyzed by statistical procedure commands as one group.
 An independent analysis is carried out for each group of cases, and the
 variable values for the group are printed along with the analysis.
 
+When a list of variable names is specified, one of the keywords
+LAYERED or SEPARATE may also be specified.  If provided, either
+keyword are ignored.
+
 Groups are formed only by @emph{adjacent} cases.  To create a split 
 using a variable where like values are not adjacent in the working file,
 you should first sort the data by that variable (@pxref{SORT CASES}).

diff --git a/src/ChangeLog b/src/ChangeLog
index 6073c81b355d1d35a4eaf681ec993612a4e89f1e..e8f7a6c7900f636c5d461d9dd63fe816a2ca7492 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+Sat Mar 12 13:29:21 2005  Ben Pfaff  <blp@gnu.org>
+
+       * split-file.c: (cmd_split_file) Ignore LAYERED and SEPARATE
+       keywords (PR 11628).
+
 Sat Mar 12 13:17:12 2005  Ben Pfaff  <blp@gnu.org>
 
        * vfm.c: (procedure_with_splits) Fix PR 11492: end_func() must be

diff --git a/src/split-file.c b/src/split-file.c
index 733aa9fbd31c89f5548ebe4ea5c7b4b4a9649d01..4ff62e178b7ef8a0156c34adad449f6bf1ccad2e 100644 (file)
--- a/src/split-file.c
+++ b/src/split-file.c
@@ -37,6 +37,9 @@ cmd_split_file (void)
       struct variable **v;
       int n;
 
+      /* For now, ignore SEPARATE and LAYERED. */
+      lex_match_id ("SEPARATE") || lex_match_id ("LAYERED");
+      
       lex_match (T_BY);
       if (!parse_variables (default_dict, &v, &n, PV_NO_DUPLICATE))
        return CMD_FAILURE;