X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=doc%2Fpspp.texi;h=14e97b07bdeff41d55584f815d7d7ba78f7b7131;hb=f1141d27ca616a8c8edc2a1f18067085ceaaf448;hp=d5844a5a3485c5371b6512f62190bbaee6de802e;hpb=0df9cdd3df66caf4353128feff3008289cda8115;p=pspp

diff --git a/doc/pspp.texi b/doc/pspp.texi
index d5844a5a34..14e97b07bd 100644
--- a/doc/pspp.texi
+++ b/doc/pspp.texi
@@ -1,4 +1,13 @@
 \input texinfo @c -*- texinfo -*-
+@c PSPP - a program for statistical analysis.
+@c Copyright (C) 2017, 2019, 2020 Free Software Foundation, Inc.
+@c Permission is granted to copy, distribute and/or modify this document
+@c under the terms of the GNU Free Documentation License, Version 1.3
+@c or any later version published by the Free Software Foundation;
+@c with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
+@c A copy of the license is included in the section entitled "GNU
+@c Free Documentation License".
+
 @c %**start of header
 @setfilename pspp.info
 @settitle PSPP
@@ -6,6 +15,38 @@
 @c @setchapternewpage odd
 @c %**end of header
 
+@macro gui
+graphic user interface
+@end macro
+
+@macro psppsyntax{FILE}
+@html
+<div class="pspp-syntax">
+@end html
+@cartouche
+@verbatiminclude \FILE\
+@end cartouche
+@html
+</div>
+@end html
+@end macro
+
+@macro psppoutput{FILE}
+@ifnothtml
+@verbatiminclude \FILE\.out
+@end ifnothtml
+@ifhtml
+@cartouche
+@html
+
+<div class="pspp">
+@include \FILE\.html
+</div>
+
+@end html
+@end cartouche
+@end ifhtml
+@end macro
 
 @macro note{param1}
 @quotation
@@ -13,9 +54,15 @@
 @end quotation
 @end macro
 
+@c A macro to indicate variable names used in examples.
+@c NOT metasyntactical variables - for that use @var
+@macro exvar{VAR}
+@b{\VAR\}
+@end macro
+
 @include version.texi
 
-@c This macro should be used for marking command names.  For the purposes of markup, 
+@c This macro should be used for marking command names.  For the purposes of markup,
 @c  no distinction is made between ``commands'' and ``procedures''.
 @macro cmd{CMDNAME}
 @code{\CMDNAME\}
@@ -54,7 +101,7 @@
 This manual is for GNU PSPP version @value{VERSION},
 software for statistical analysis.
 
-Copyright @copyright{} 1997, 1998, 2004, 2005, 2009, 2012, 2013, 2014 Free Software Foundation, Inc.
+Copyright @copyright{} 1997, 1998, 2004, 2005, 2009, 2012, 2013, 2014, 2016, 2019 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -75,13 +122,6 @@ Free Documentation License".
 @insertcopying
 @end titlepage
 
-@c @chapheading Acknowledgements
-The authors wish to thank Network Theory Ltd 
-@url{http://www.network-theory.co.uk}
-for their financial support 
-in the production of this manual.
-
-
 @contents
 
 
@@ -113,6 +153,7 @@ in the production of this manual.
 * Utilities::                   Other commands.
 
 * Invoking pspp-convert::       Utility for converting among file formats.
+* Invoking pspp-output::        Utility for working with viewer (SPV) files.
 * Invoking pspp-dump-sav::      Utility for examining raw .sav files.
 * Not Implemented::             What's not here yet
 * Bugs::                        Known problems; submitting bug reports.
@@ -142,6 +183,7 @@ in the production of this manual.
 @include utilities.texi
 
 @include pspp-convert.texi
+@include pspp-output.texi
 @include pspp-dump-sav.texi
 @include not-implemented.texi
 @include bugs.texi
@@ -153,8 +195,3 @@ in the production of this manual.
 @include fdl.texi
 
 @bye
-
-@c Local Variables:
-@c use (texinfo-multiple-files-update "pspp.texi")  in emacs to keep these files consistent
-@c compile-command: "makeinfo pspp.texi"
-@c End: