render: Center and emphasize table titles.

[pspp] / doc / invoking.texi

diff --git a/doc/invoking.texi b/doc/invoking.texi
index 2080a3e2259b3202e54280c05537f3b848db57eb..ea839fb1feca9c7020947b7a9a54161cf5630c0a 100644 (file)
--- a/doc/invoking.texi
+++ b/doc/invoking.texi
@@ -1,12 +1,12 @@
 @node Invoking PSPP
 @chapter Invoking @command{pspp}
 @cindex invocation
 @node Invoking PSPP
 @chapter Invoking @command{pspp}
 @cindex invocation

-@cindex PSPP, invoking
+@cindex @pspp{}, invoking

 
 

-PSPP has two separate user interfaces.  This chapter describes
-@command{pspp}, PSPP's command-line driven text-based user interface.
+@pspp{} has two separate user interfaces.  This chapter describes
+@command{pspp}, @pspp{}'s command-line driven text-based user interface.

 The following chapter briefly describes PSPPIRE, the graphical user
 The following chapter briefly describes PSPPIRE, the graphical user

-interface to PSPP.
+interface to @pspp{}.

 
 The sections below describe the @command{pspp} program's command-line
 interface.
 
 The sections below describe the @command{pspp} program's command-line
 interface.


@@ -49,10 +49,12 @@ corresponding short options.
 @example
 -I, --include=@var{dir}
 -I-, --no-include
 @example
 -I, --include=@var{dir}
 -I-, --no-include

+-b, --batch

 -i, --interactive
 -r, --no-statrc
 -a, --algorithm=@{compatible|enhanced@}
 -x, --syntax=@{compatible|enhanced@}
 -i, --interactive
 -r, --no-statrc
 -a, --algorithm=@{compatible|enhanced@}
 -x, --syntax=@{compatible|enhanced@}

+--syntax-encoding=@var{encoding}

 @end example
 
 @item Informational options
 @end example
 
 @item Informational options


@@ -68,53 +70,54 @@ corresponding short options.
 @end example
 @end table
 
 @end example
 @end table
 

-@table @code
+@table @asis

 @item @var{syntax-file}
 Read and execute the named syntax file.  If no syntax files are
 @item @var{syntax-file}
 Read and execute the named syntax file.  If no syntax files are

-specified, PSPP prompts for commands.  If any syntax files are
-specified, PSPP by default exits after it runs them, but you may make
+specified, @pspp{} prompts for commands.  If any syntax files are
+specified, @pspp{} by default exits after it runs them, but you may make

 it prompt for commands by specifying @samp{-} as an additional syntax
 file.
 
 it prompt for commands by specifying @samp{-} as an additional syntax
 file.
 

-@item -o @var{output-file}
-Write output to @var{output-file}.  PSPP has several different output
+@item @option{-o @var{output-file}}
+Write output to @var{output-file}.  @pspp{} has several different output

 drivers that support output in various formats (use @option{--help} to
 list the available formats).  Specify this option more than once to
 produce multiple output files, presumably in different formats.
 
 Use @samp{-} as @var{output-file} to write output to standard output.
 
 drivers that support output in various formats (use @option{--help} to
 list the available formats).  Specify this option more than once to
 produce multiple output files, presumably in different formats.
 
 Use @samp{-} as @var{output-file} to write output to standard output.
 

-If no @option{-o} option is used, then PSPP writes output to standard
-output in plain text format.
+If no @option{-o} option is used, then @pspp{} writes text and CSV
+output to standard output and other kinds of output to whose name is
+based on the format, e.g.@: @file{pspp.pdf} for PDF output.

 
 

-@item -O @var{option}=@var{value}
+@item @option{-O @var{option}=@var{value}}

 Sets an option for the output file configured by a preceding
 @option{-o}.  Most options are specific to particular output formats.
 A few options that apply generically are listed below.
 
 Sets an option for the output file configured by a preceding
 @option{-o}.  Most options are specific to particular output formats.
 A few options that apply generically are listed below.
 

-@item -O format=@var{format}
-PSPP uses the extension of the file name given on @option{-o} to
+@item @option{-O format=@var{format}}
+@pspp{} uses the extension of the file name given on @option{-o} to

 select an output format.  Use this option to override this choice by
 specifying an alternate format, e.g.@: @option{-o pspp.out -O html} to
 write HTML to a file named @file{pspp.out}.  Use @option{--help} to
 list the available formats.
 
 select an output format.  Use this option to override this choice by
 specifying an alternate format, e.g.@: @option{-o pspp.out -O html} to
 write HTML to a file named @file{pspp.out}.  Use @option{--help} to
 list the available formats.
 

-@item -O device=@{terminal|listing@}
-Sets whether PSPP considers the output device configured by the
+@item @option{-O device=@{terminal|listing@}}
+Sets whether @pspp{} considers the output device configured by the

 preceding @option{-o} to be a terminal or a listing device.  This
 affects what output will be sent to the device, as configured by the
 SET command's output routing subcommands (@pxref{SET}).  By default,
 output written to standard output is considered a terminal device and
 other output is considered a listing device.
 
 preceding @option{-o} to be a terminal or a listing device.  This
 affects what output will be sent to the device, as configured by the
 SET command's output routing subcommands (@pxref{SET}).  By default,
 output written to standard output is considered a terminal device and
 other output is considered a listing device.
 

-@item --no-output
+@item @option{--no-output}

 Disables output entirely, if neither @option{-o} nor @option{-O} is
 also used.  If one of those options is used, @option{--no-output} has
 no effect.
 
 Disables output entirely, if neither @option{-o} nor @option{-O} is
 also used.  If one of those options is used, @option{--no-output} has
 no effect.
 

-@item -e @var{error-file}
-@itemx --error-file=@var{error-file}
-Configures a file to receive PSPP error, warning, and note messages in
+@item @option{-e @var{error-file}}
+@itemx @option{--error-file=@var{error-file}}
+Configures a file to receive @pspp{} error, warning, and note messages in

 plain text format.  Use @samp{-} as @var{error-file} to write messages
 to standard output.  The default error file is standard output in the
 absence of these options, but this is suppressed if an output device
 plain text format.  Use @samp{-} as @var{error-file} to write messages
 to standard output.  The default error file is standard output in the
 absence of these options, but this is suppressed if an output device


@@ -122,84 +125,95 @@ writes to standard output (or another terminal), to avoid printing
 every message twice.  Use @samp{none} as @var{error-file} to
 explicitly suppress the default.
 
 every message twice.  Use @samp{none} as @var{error-file} to
 explicitly suppress the default.
 

-@item -I @var{dir}
-@itemx --include=@var{dir}
-Appends @var{dir} to the set of directories searched by INCLUDE
-(@pxref{INCLUDE}) and INSERT (@pxref{INSERT}).
+@item @option{-I @var{dir}}
+@itemx @option{--include=@var{dir}}
+Appends @var{dir} to the set of directories searched by the @cmd{INCLUDE}
+(@pxref{INCLUDE}) and @cmd{INSERT} (@pxref{INSERT}) commands.

 
 

-@item -I-
-@itemx --no-include
+@item @option{-I-}
+@itemx @option{--no-include}

 Clears all directories from the include path, including directories
 inserted in the include path by default.  The default include path is
 @file{.} (the current directory), followed by @file{.pspp} in the
 Clears all directories from the include path, including directories
 inserted in the include path by default.  The default include path is
 @file{.} (the current directory), followed by @file{.pspp} in the

-user's home directory, followed by PSPP's system configuration
+user's home directory, followed by @pspp{}'s system configuration

 directory (usually @file{/etc/pspp} or @file{/usr/local/etc/pspp}).
 
 directory (usually @file{/etc/pspp} or @file{/usr/local/etc/pspp}).
 

-@item -i
-@itemx --interactive
-This option forces syntax files to be interpreted in interactive
-mode, rather than the default batch mode.  @xref{Syntax Variants}, for
-a description of the differences.
-
-@item -r
-@itemx --no-statrc
-Disables running @file{rc} at PSPP startup time.
-
-@item -a @{enhanced|compatible@}
-@itemx --algorithm=@{enhanced|compatible@}
-With @code{enhanced}, the default, PSPP uses the best implemented
+@item @option{-b}
+@item @option{--batch}
+@item @option{-i}
+@itemx @option{--interactive}
+These options forces syntax files to be interpreted in batch mode or
+interactive mode, respectively, rather than the default ``auto'' mode.
+@xref{Syntax Variants}, for a description of the differences.
+
+@item @option{-r}
+@itemx @option{--no-statrc}
+Disables running @file{rc} at @pspp{} startup time.
+
+@item @option{-a @{enhanced|compatible@}}
+@itemx @option{--algorithm=@{enhanced|compatible@}}
+With @code{enhanced}, the default, @pspp{} uses the best implemented

 algorithms for statistical procedures.  With @code{compatible},
 algorithms for statistical procedures.  With @code{compatible},

-however, PSPP will in some cases use inferior algorithms to produce
+however, @pspp{} will in some cases use inferior algorithms to produce

 the same results as the proprietary program SPSS.
 
 Some commands have subcommands that override this setting on a per
 command basis.
 
 the same results as the proprietary program SPSS.
 
 Some commands have subcommands that override this setting on a per
 command basis.
 

-@item -x @{enhanced|compatible@}
-@itemx --syntax=@{enhanced|compatible@}
-With @code{enhanced}, the default, PSPP accepts its own extensions
+@item @option{-x @{enhanced|compatible@}}
+@itemx @option{--syntax=@{enhanced|compatible@}}
+With @code{enhanced}, the default, @pspp{} accepts its own extensions

 beyond those compatible with the proprietary program SPSS.  With
 beyond those compatible with the proprietary program SPSS.  With

-@code{compatible}, PSPP rejects syntax that uses these extensions.
+@code{compatible}, @pspp{} rejects syntax that uses these extensions.

 
 

-@item -?
-@itemx --help
-Prints a message describing PSPP command-line syntax and the available
+@item @option{--syntax-encoding=@var{encoding}}
+Specifies @var{encoding} as the encoding for syntax files named on the
+command line.  The @var{encoding} also becomes the default encoding
+for other syntax files read during the @pspp{} session by the
+@cmd{INCLUDE} and @cmd{INSERT} commands.  @xref{INSERT}, for the
+accepted forms of @var{encoding}.
+
+@item @option{--help}
+Prints a message describing @pspp{} command-line syntax and the available

 device formats, then exits.
 
 device formats, then exits.
 

-@item -V
-@itemx --version
-Prints a brief message listing PSPP's version, warranties you don't
+@item @option{-V}
+@itemx @option{--version}
+Prints a brief message listing @pspp{}'s version, warranties you don't

 have, copying conditions and copyright, and e-mail address for bug
 reports, then exits.
 
 have, copying conditions and copyright, and e-mail address for bug
 reports, then exits.
 

-@item -s
-@itemx --safer
-Disables certain unsafe operations.  This includes the ERASE and
-HOST commands, as well as use of pipes as input and output files.
+@item @option{-s}
+@itemx @option{--safer}
+Disables certain unsafe operations.  This includes the @subcmd{ERASE} and
+@subcmd{HOST} commands, as well as use of pipes as input and output files.

 
 

-@item --testing-mode
-Invoke heuristics to assist with testing PSPP.  For use by @code{make
-check} and similar scripts.
+@item @option{--testing-mode}
+Invoke heuristics to assist with testing @pspp{}.  For use
+by @command{make check} and similar scripts.

 @end table
 
 @node PDF PostScript and SVG Output Options
 @section PDF, PostScript, and SVG Output Options
 @end table
 
 @node PDF PostScript and SVG Output Options
 @section PDF, PostScript, and SVG Output Options

+@cindex PDF
+@cindex Postscript
+@cindex SVG

 
 To produce output in PDF, PostScript, and SVG formats, specify
 
 To produce output in PDF, PostScript, and SVG formats, specify

-@option{-o @var{file}} on the PSPP command line, optionally followed
+@option{-o @var{file}} on the @pspp{} command line, optionally followed

 by any of the options shown in the table below to customize the output
 format.
 
 PDF, PostScript, and SVG output is only available if your installation
 by any of the options shown in the table below to customize the output
 format.
 
 PDF, PostScript, and SVG output is only available if your installation

-of PSPP was compiled with the Cairo library.
+of @pspp{} was compiled with the Cairo library.

 
 

-@table @code
-@item -O format=@{pdf|ps|svg@}
+@table @asis
+@item @option{-O format=@{pdf|ps|svg@}}

 Specify the output format.  This is only necessary if the file name
 given on @option{-o} does not end in @file{.pdf}, @file{.ps}, or
 @file{.svg}.
 
 Specify the output format.  This is only necessary if the file name
 given on @option{-o} does not end in @file{.pdf}, @file{.ps}, or
 @file{.svg}.
 

-@item -O paper-size=@var{paper-size}
+@item @option{-O paper-size=@var{paper-size}}

 Paper size, as a name (e.g.@: @code{a4}, @code{letter}) or
 measurements (e.g.@: @code{210x297}, @code{8.5x11in}).
 
 Paper size, as a name (e.g.@: @code{a4}, @code{letter}) or
 measurements (e.g.@: @code{210x297}, @code{8.5x11in}).
 


@@ -211,19 +225,26 @@ taken from the locale.  Otherwise, if @file{/etc/papersize} exists,
 the default paper size is read from it.  As a last resort, A4 paper is
 assumed.
 
 the default paper size is read from it.  As a last resort, A4 paper is
 assumed.
 

-@item -O orientation=@var{orientation}
+@item @option{-O foreground-color=@var{color}}
+@itemx @option{-O background-color=@var{color}}
+Sets @var{color} as the color to be used for the background or foreground.
+Color should be given in the format @code{#@var{RRRR}@var{GGGG}@var{BBBB}},
+where @var{RRRR}, @var{GGGG} and @var{BBBB} are 4 character hexadecimal
+representations of the red, green and blue components respectively.
+
+@item @option{-O orientation=@var{orientation}}

 Either @code{portrait} or @code{landscape}.  Default: @code{portrait}.
 
 Either @code{portrait} or @code{landscape}.  Default: @code{portrait}.
 

-@item -O left-margin=@var{dimension}
-@itemx -O right-margin=@var{dimension}
-@itemx -O top-margin=@var{dimension}
-@itemx -O bottom-margin=@var{dimension}
+@item @option{-O left-margin=@var{dimension}}
+@itemx @option{-O right-margin=@var{dimension}}
+@itemx @option{-O top-margin=@var{dimension}}
+@itemx @option{-O bottom-margin=@var{dimension}}

 Sets the margins around the page.  See
 below for the allowed forms of @var{dimension} Default: @code{0.5in}.
 
 Sets the margins around the page.  See
 below for the allowed forms of @var{dimension} Default: @code{0.5in}.
 

-@item -O prop-font=@var{font-name}
-@itemx -O emph-font=@var{font-name}
-@itemx -O fixed-font=@var{font-name}
+@item @option{-O prop-font=@var{font-name}}
+@itemx @option{-O emph-font=@var{font-name}}
+@itemx @option{-O fixed-font=@var{font-name}}

 Sets the font used for proportional, emphasized, or fixed-pitch text.
 Most systems support CSS-like font names such as ``serif'' and
 ``monospace'', but a wide range of system-specific font are likely to
 Sets the font used for proportional, emphasized, or fixed-pitch text.
 Most systems support CSS-like font names such as ``serif'' and
 ``monospace'', but a wide range of system-specific font are likely to


@@ -232,19 +253,19 @@ be supported as well.
 Default: proportional font @code{serif}, emphasis font @code{serif
 italic}, fixed-pitch font @code{monospace}.
 
 Default: proportional font @code{serif}, emphasis font @code{serif
 italic}, fixed-pitch font @code{monospace}.
 

-@item -O font-size=@var{font-size}
+@item @option{-O font-size=@var{font-size}}

 Sets the size of the default fonts, in thousandths of a point.  Default:
 10000 (10 point).
 
 Sets the size of the default fonts, in thousandths of a point.  Default:
 10000 (10 point).
 

-@item -O line-gutter=@var{dimension}
+@item @option{-O line-gutter=@var{dimension}}

 Sets the width of white space on either side of lines that border text
 or graphics objects.  Default: @code{1pt}.
 
 Sets the width of white space on either side of lines that border text
 or graphics objects.  Default: @code{1pt}.
 

-@item -O line-spacing=@var{dimension}
+@item @option{-O line-spacing=@var{dimension}}

 Sets the spacing between the lines in a double line in a table.
 Default: @code{1pt}.
 
 Sets the spacing between the lines in a double line in a table.
 Default: @code{1pt}.
 

-@item -O line-width=@var{dimension}
+@item @option{-O line-width=@var{dimension}}

 Sets the width of the lines used in tables.  Default: @code{0.5pt}.
 @end table
 
 Sets the width of the lines used in tables.  Default: @code{0.5pt}.
 @end table
 


@@ -257,18 +278,20 @@ millimeters.
 @node Plain Text Output Options
 @section Plain Text Output Options
 
 @node Plain Text Output Options
 @section Plain Text Output Options
 

-PSPP can produce plain text output, drawing boxes using ASCII or
+@pspp{} can produce plain text output, drawing boxes using ASCII or

 Unicode line drawing characters.  To produce plain text output,
 Unicode line drawing characters.  To produce plain text output,

-specify @option{-o @var{file}} on the PSPP command line, optionally
+specify @option{-o @var{file}} on the @pspp{} command line, optionally

 followed by options from the table below to customize the output
 format.
 
 followed by options from the table below to customize the output
 format.
 

-@table @code
-@item -O format=txt
+Plain text output is encoded in UTF-8.
+
+@table @asis
+@item @option{-O format=txt}

 Specify the output format.  This is only necessary if the file name
 given on @option{-o} does not end in @file{.txt} or @file{.list}.
 
 Specify the output format.  This is only necessary if the file name
 given on @option{-o} does not end in @file{.txt} or @file{.list}.
 

-@item -O charts=@{@var{template}.png|none@}
+@item @option{-O charts=@{@var{template}.png|none@}}

 Name for chart files included in output.  The value should be a file
 name that includes a single @samp{#} and ends in @file{png}.  When a
 chart is output, the @samp{#} is replaced by the chart number.  The
 Name for chart files included in output.  The value should be a file
 name that includes a single @samp{#} and ends in @file{png}.  When a
 chart is output, the @samp{#} is replaced by the chart number.  The


@@ -276,61 +299,59 @@ default is the file name specified on @option{-o} with the extension
 stripped off and replaced by @file{-#.png}.
 
 Specify @code{none} to disable chart output.  Charts are always
 stripped off and replaced by @file{-#.png}.
 
 Specify @code{none} to disable chart output.  Charts are always

-disabled if your installation of PSPP was compiled without the
+disabled if your installation of @pspp{} was compiled without the

 Cairo library.
 
 Cairo library.
 

-@item -O paginate=@var{boolean}
-If set, PSPP writes an ASCII formfeed the end of every page.  Default:
+@item @option{-O foreground-color=@var{color}}
+@itemx @option{-O background-color=@var{color}}
+Sets @var{color} as the color to be used for the background or foreground to 
+be used for charts.
+Color should be given in the format @code{#@var{RRRR}@var{GGGG}@var{BBBB}},
+where @var{RRRR}, @var{GGGG} and @var{BBBB} are 4 character hexadecimal
+representations of the red, green and blue components respectively.
+If charts are disabled, this option has no effect.
+
+
+@item @option{-O paginate=@var{boolean}}
+If set, @pspp{} writes an ASCII formfeed the end of every page.  Default:

 @code{off}.
 
 @code{off}.
 

-@item -O headers=@var{boolean}
-If enabled, PSPP prints two lines of header information giving title
-and subtitle, page number, date and time, and PSPP version are printed
+@item @option{-O headers=@var{boolean}}
+If enabled, @pspp{} prints two lines of header information giving title
+and subtitle, page number, date and time, and @pspp{} version are printed

 at the top of every page.  These two lines are in addition to any top
 margin requested.  Default: @code{off}.
 
 at the top of every page.  These two lines are in addition to any top
 margin requested.  Default: @code{off}.
 

-@item -O length=@var{line-count}
+@item @option{-O length=@var{line-count}}

 Physical length of a page.  Headers and margins are subtracted from
 this value.  You may specify the number of lines as a number, or for
 screen output you may specify @code{auto} to track the height of the
 terminal as it changes.  Default: @code{66}.
 
 Physical length of a page.  Headers and margins are subtracted from
 this value.  You may specify the number of lines as a number, or for
 screen output you may specify @code{auto} to track the height of the
 terminal as it changes.  Default: @code{66}.
 

-@item -O width=@var{character-count}
+@item @option{-O width=@var{character-count}}

 Width of a page, in characters.  Margins are subtracted from this
 value.  For screen output you may specify @code{auto} in place of a
 number to track the width of the terminal as it changes.  Default:
 @code{79}.
 
 Width of a page, in characters.  Margins are subtracted from this
 value.  For screen output you may specify @code{auto} in place of a
 number to track the width of the terminal as it changes.  Default:
 @code{79}.
 

-@item -O top-margin=@var{top-margin-lines}
-Length of the top margin, in lines.  PSPP subtracts this value from
+@item @option{-O top-margin=@var{top-margin-lines}}
+Length of the top margin, in lines.  @pspp{} subtracts this value from

 the page length.  Default: @code{0}.
 
 the page length.  Default: @code{0}.
 

-@item -O bottom-margin=@var{bottom-margin-lines}
-Length of the bottom margin, in lines.  PSPP subtracts this value from
+@item @option{-O bottom-margin=@var{bottom-margin-lines}}
+Length of the bottom margin, in lines.  @pspp{} subtracts this value from

 the page length.  Default: @code{0}.
 
 the page length.  Default: @code{0}.
 

-@item -O box[@var{line-type}]=@var{box-chars}
-Sets the characters used for lines in tables.  @var{line-type} is a
-4-digit number that indicates the type of line to change, in the order
-`right', `bottom', `left', `top'.  Each digit is 0 for ``no line'', 1
-for a single line, and 2 for a double line.  @var{box-chars} is the
-character or string of characters to use for this type of line.
-
-For example, @code{box[0101]="|"} sets @samp{|} as the character to
-use for a single-width vertical line, and @code{box[1100]="\xda"} sets
-@samp{"\xda"}, which on MS-DOS is suitable for the top-left corner of
-a box, as the character for the intersection of two single-width
-lines, one each from the right and bottom.
-
-The defaults use @samp{-}, @samp{|}, and @samp{+} for single-width
-lines and @samp{=} and @samp{#} for double-width lines.
+@item @option{-O box=@{ascii|unicode@}}
+Sets the characters used for lines in tables.  
+If set to 
+@code{ascii} the characters @samp{-}, @samp{|}, and @samp{+} for single-width
+lines and @samp{=} and @samp{#} for double-width lines are used.
+If set to @code{unicode} then  Unicode box drawing characters will be used.
+The default is @code{unicode} if the locale's character encoding is "UTF-8"
+or @code{ascii} otherwise.

 
 

-@item -O init=@var{init-string}
-If set, this string is written at the beginning of each output file.
-It can be used to initialize device features, e.g.@: to enable VT100
-line-drawing characters.
-
-@item -O emphasis=@{none|bold|underline@}
+@item @option{-O emphasis=@{none|bold|underline@}}

 How to emphasize text.  Bold and underline emphasis are achieved with
 overstriking, which may not be supported by all the software to which
 you might pass the output.  Default: @code{none}.
 How to emphasize text.  Bold and underline emphasis are achieved with
 overstriking, which may not be supported by all the software to which
 you might pass the output.  Default: @code{none}.


@@ -338,29 +359,39 @@ you might pass the output.  Default: @code{none}.
 
 @node HTML Output Options
 @section HTML Output Options
 
 @node HTML Output Options
 @section HTML Output Options

-
+@cindex HTML

 To produce output in HTML format, specify @option{-o @var{file}} on
 To produce output in HTML format, specify @option{-o @var{file}} on

-the PSPP command line, optionally followed by any of the options shown
+the @pspp{} command line, optionally followed by any of the options shown

 in the table below to customize the output format.
 
 in the table below to customize the output format.
 

-@table @code
-@item -O format=html
+@table @asis
+@item @option{-O format=html}

 Specify the output format.  This is only necessary if the file name
 given on @option{-o} does not end in @file{.html}.
 
 Specify the output format.  This is only necessary if the file name
 given on @option{-o} does not end in @file{.html}.
 

-@item -O charts=@{@var{template}.png|none@}
+@item @option{-O charts=@{@var{template}.png|none@}}

 Sets the name used for chart files.  @xref{Plain Text Output Options},
 for details.
 Sets the name used for chart files.  @xref{Plain Text Output Options},
 for details.

+
+@item @option{-O borders=@var{boolean}}
+Decorate the tables with borders.  If set to false, the tables produced
+will have no borders.  The default value is true.
+
+@item @option{-O css=@var{boolean}}
+Use cascading style sheets.  Cascading style sheets give an improved appearance
+and can be used to produce pages which fit a certain web site's style.
+The default value is true.
+

 @end table
 
 @node OpenDocument Output Options
 @section OpenDocument Output Options
 
 To produce output as an OpenDocument text (ODT) document, specify
 @end table
 
 @node OpenDocument Output Options
 @section OpenDocument Output Options
 
 To produce output as an OpenDocument text (ODT) document, specify

-@option{-o @var{file}} on the PSPP command line.  If @var{file} does
+@option{-o @var{file}} on the @pspp{} command line.  If @var{file} does

 not end in @file{.odt}, you must also specify @option{-O format=odt}.
 
 not end in @file{.odt}, you must also specify @option{-O format=odt}.
 

-ODT support is only available if your installation of PSPP was
+ODT support is only available if your installation of @pspp{} was

 compiled with the libxml2 library.
 
 The OpenDocument output format does not have any configurable options.
 compiled with the libxml2 library.
 
 The OpenDocument output format does not have any configurable options.


@@ -369,18 +400,34 @@ The OpenDocument output format does not have any configurable options.
 @section Comma-Separated Value Output Options
 
 To produce output in comma-separated value (CSV) format, specify
 @section Comma-Separated Value Output Options
 
 To produce output in comma-separated value (CSV) format, specify

-@option{-o @var{file}} on the PSPP command line, optionally followed
+@option{-o @var{file}} on the @pspp{} command line, optionally followed

 by any of the options shown in the table below to customize the output
 format.
 
 by any of the options shown in the table below to customize the output
 format.
 

-@table @code
-@item -O format=csv
+@table @asis
+@item @option{-O format=csv}

 Specify the output format.  This is only necessary if the file name
 given on @option{-o} does not end in @file{.csv}.
 
 Specify the output format.  This is only necessary if the file name
 given on @option{-o} does not end in @file{.csv}.
 

-@item -O separator=@var{field-separator}
-Sets the character used to separate fields.  The default is a comma
+@item @option{-O separator=@var{field-separator}}
+Sets the character used to separate fields.  Default: a comma

 (@samp{,}).
 (@samp{,}).

+
+@item @option{-O quote=@var{qualifier}}
+Sets @var{qualifier} as the character used to quote fields that
+contain white space, the separator (or any of the characters in the
+separator, if it contains more than one character), or the quote
+character itself.  If @var{qualifier} is longer than one character,
+only the first character is used; if @var{qualifier} is the empty
+string, then fields are never quoted.
+
+@item @option{-O titles=@var{boolean}}
+Whether table titles (brief descriptions) should be printed.  Default:
+@code{on}.
+
+@item @option{-O captions=@var{boolean}}
+Whether table captions (more extensive descriptions) should be
+printed.  Default: on.

 @end table
 
 The CSV format used is an extension to that specified in RFC 4180:
 @end table
 
 The CSV format used is an extension to that specified in RFC 4180:


@@ -390,8 +437,24 @@ The CSV format used is an extension to that specified in RFC 4180:
 Each table row is output on a separate line, and each column is output
 as a field.  The contents of a cell that spans multiple rows or
 columns is output only for the top-left row and column; the rest are
 Each table row is output on a separate line, and each column is output
 as a field.  The contents of a cell that spans multiple rows or
 columns is output only for the top-left row and column; the rest are

-output as empty fields.  When a table has a caption, it is output just
-above the table as a single field prefixed by @samp{Table:}.
+output as empty fields.
+
+@item Titles
+When a table has a title and titles are enabled, the title is output
+just above the table as a single field prefixed by @samp{Table:}.
+
+@item Captions
+When a table has a caption and captions are enabled, the caption is
+output just below the table as a single field prefixed by
+@samp{Caption:}.
+
+@item Footnotes
+Within a table, footnote markers are output as bracketed letters
+following the cell's contents, e.g.@tie{}@samp{[a]}, @samp{[b]},
+@enddots{}  The footnotes themselves are output following the body of
+the table, as a separate two-column table introduced with a line that
+says @samp{Footnotes:}.  Each row in the table represent one footnote:
+the first column is the marker, the second column is the text.

 
 @item Text
 Text in output is printed as a field on a line by itself.  The TITLE
 
 @item Text
 Text in output is printed as a field on a line by itself.  The TITLE


@@ -413,7 +476,7 @@ Successive output items are separated by a blank line.
 @cindex Graphic user interface
 @cindex PSPPIRE
 
 @cindex Graphic user interface
 @cindex PSPPIRE
 

-The PSPPIRE graphic user interface for PSPP can perform all
+The PSPPIRE graphic user interface for @pspp{} can perform all

 functionality of the command line interface.  In addition it gives an
 instantaneous view of the data, variables and statistical output.
 
 functionality of the command line interface.  In addition it gives an
 instantaneous view of the data, variables and statistical output.
 


@@ -422,6 +485,6 @@ command prompt.
 Alternatively many systems have a system of interactive menus or buttons 
 from which @command{psppire} can be started by a series of mouse clicks.
 
 Alternatively many systems have a system of interactive menus or buttons 
 from which @command{psppire} can be started by a series of mouse clicks.
 

-Once the principles of the PSPP system are understood, 
+Once the principles of the @pspp{} system are understood, 

 the graphic user interface is designed to be largely intuitive, and
 for this reason is covered only very briefly by this manual.
 the graphic user interface is designed to be largely intuitive, and
 for this reason is covered only very briefly by this manual.