Remove redundant test in lex_is_idn().

[pspp] / doc / data-io.texi

diff --git a/doc/data-io.texi b/doc/data-io.texi
index 335d6c46030060d8d4ed8cd04a4dfc02ec17366a..b7bfda9c98d0c5b020a35957cb897fcaf1734d35 100644 (file)
--- a/doc/data-io.texi
+++ b/doc/data-io.texi
@@ -130,7 +130,7 @@ elements numbered higher than the deleted element are shifted down,
 filling the vacated position.
 
 To associate custom attributes with particular variables, instead of
 filling the vacated position.
 
 To associate custom attributes with particular variables, instead of

-with the entire active file, use @cmd{VARIABLE ATTRIBUTE} instead.
+with the entire active file, use @cmd{VARIABLE ATTRIBUTE} (@pxref{VARIABLE ATTRIBUTE}) instead.

 
 @cmd{DATAFILE ATTRIBUTE} takes effect immediately.  It is not affected
 by conditional and looping structures such as @cmd{DO IF} or
 
 @cmd{DATAFILE ATTRIBUTE} takes effect immediately.  It is not affected
 by conditional and looping structures such as @cmd{DO IF} or


@@ -178,7 +178,7 @@ situations.
 @display
 DATA LIST [FIXED]
         @{TABLE,NOTABLE@}
 @display
 DATA LIST [FIXED]
         @{TABLE,NOTABLE@}

-        [FILE='file-name']
+        [FILE='file-name' [ENCODING='encoding']]

         [RECORDS=record_count]
         [END=end_var]
         [SKIP=record_count]
         [RECORDS=record_count]
         [END=end_var]
         [SKIP=record_count]


@@ -198,6 +198,8 @@ external file.  It may be used to specify a file name as a string or a
 file handle (@pxref{File Handles}).  If the FILE subcommand is not used,
 then input is assumed to be specified within the command file using
 @cmd{BEGIN DATA}@dots{}@cmd{END DATA} (@pxref{BEGIN DATA}).
 file handle (@pxref{File Handles}).  If the FILE subcommand is not used,
 then input is assumed to be specified within the command file using
 @cmd{BEGIN DATA}@dots{}@cmd{END DATA} (@pxref{BEGIN DATA}).

+The ENCODING subcommand may only be used if the FILE subcommand is also used.
+It specifies the character encoding of the file.

 
 The optional RECORDS subcommand, which takes a single integer as an
 argument, is used to specify the number of lines per record.  If RECORDS
 
 The optional RECORDS subcommand, which takes a single integer as an
 argument, is used to specify the number of lines per record.  If RECORDS


@@ -391,7 +393,7 @@ This example shows keywords abbreviated to their first 3 letters.
 DATA LIST FREE
         [(@{TAB,'c'@}, @dots{})]
         [@{NOTABLE,TABLE@}]
 DATA LIST FREE
         [(@{TAB,'c'@}, @dots{})]
         [@{NOTABLE,TABLE@}]

-        [FILE='file-name']
+        [FILE='file-name' [ENCODING='encoding']]

         [SKIP=record_cnt]
         /var_spec@dots{}
 
         [SKIP=record_cnt]
         /var_spec@dots{}
 


@@ -443,7 +445,7 @@ on field width apply, but they are honored on output.
 DATA LIST LIST
         [(@{TAB,'c'@}, @dots{})]
         [@{NOTABLE,TABLE@}]
 DATA LIST LIST
         [(@{TAB,'c'@}, @dots{})]
         [@{NOTABLE,TABLE@}]

-        [FILE='file-name']
+        [FILE='file-name' [ENCODING='encoding']]

         [SKIP=record_count]
         /var_spec@dots{}
 
         [SKIP=record_count]
         /var_spec@dots{}
 


@@ -1142,4 +1144,3 @@ specified output format, whereas @cmd{WRITE} outputs the
 system-missing value as a field filled with spaces.  Binary formats
 are an exception.
 @end itemize
 system-missing value as a field filled with spaces.  Binary formats
 are an exception.
 @end itemize

-@setfilename ignored