X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=doc%2Fpspp.texi;h=e107be4aa12ae8fc79fa3e05a65698391e2ba5a6;hb=1a4157b70706720aae18ede547a8ba12db54e748;hp=cc503aa26a677240f5ad03a1d33a77e06e984c6a;hpb=1fbf08a161e2e71fed5e6fc3e6671da8b6cae940;p=pspp

diff --git a/doc/pspp.texi b/doc/pspp.texi
index cc503aa26a..e107be4aa1 100644
--- a/doc/pspp.texi
+++ b/doc/pspp.texi
@@ -25,7 +25,7 @@ graphic user interface
 @end html
 @cartouche
 @smallexample
-@verbatiminclude \FILE\
+@verbatiminclude pspp-figures/\FILE\
 @end smallexample
 @end cartouche
 @html
@@ -33,23 +33,55 @@ graphic user interface
 @end html
 @end macro
 
+@macro psppimage{FILE}
+@cartouche
+@ifhtml
+@image{screenshots/\FILE\-ad} @c Adwaita theme is better for web pages.
+@end ifhtml
+@iftex
+@image{screenshots/\FILE\-hc,433.62pt} @c High Contrast theme, width \\the\\hsize
+@end iftex
+@ifinfo
+@image{screenshots/\FILE\-ad} @c Adwaita theme for stand aloneinfo
+@end ifinfo
+@end cartouche
+@end macro
+
 @macro psppoutput{FILE}
-@ifnothtml
-@smallexample
-@verbatiminclude \FILE\.out
-@end smallexample
-@end ifnothtml
+@c Use @image for Info and for plaintext output.
+@ifinfo
+
+@noindent @image{pspp-figures/\FILE\}
+
+@end ifinfo
+@ifplaintext
+
+@noindent @image{pspp-figures/\FILE\}
+
+@end ifplaintext
+@c Use HTML for HTML output.
 @ifhtml
 @cartouche
 @html
 
 <div class="pspp">
-@include \FILE\.html
+@include pspp-figures/\FILE\.html
 </div>
 
 @end html
 @end cartouche
 @end ifhtml
+@c Use the Texi-fied version of the plaintext output for other output formats.
+@c Some of these could do better, but we have not yet implemented it.
+@ifnotinfo
+@ifnotplaintext
+@ifnothtml
+@smallexample
+@include pspp-figures/\FILE\.texi
+@end smallexample
+@end ifnothtml
+@end ifnotplaintext
+@end ifnotinfo
 @end macro
 
 @macro note{param1}
@@ -83,14 +115,6 @@ graphic user interface
 @sc{pspp}
 @end macro
 
-
-@ifset MISSING_CLICKSEQUENCE
-@alias clicksequence = asis
-@macro click {}
-->
-@end macro
-@end ifset
-
 @iftex
 @finalout
 @end iftex
@@ -105,7 +129,7 @@ graphic user interface
 This manual is for GNU PSPP version @value{VERSION},
 software for statistical analysis.
 
-Copyright @copyright{} 1997, 1998, 2004, 2005, 2009, 2012, 2013, 2014, 2016, 2019 Free Software Foundation, Inc.
+Copyright @copyright{} 1997, 1998, 2004, 2005, 2009, 2012, 2013, 2014, 2016, 2019, 2020 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -149,7 +173,7 @@ Free Documentation License".
 * Data Input and Output::       Reading data from user files.
 * System and Portable File IO:: Reading and writing system & portable files.
 * Combining Data Files::        Combining data from multiple files.
-* Variable Attributes::         Adjusting and examining variables.
+* Manipulating Variables::      Adjusting and examining variables.
 * Data Manipulation::           Simple operations on data.
 * Data Selection::              Select certain cases for analysis.
 * Conditionals and Looping::    Doing things many times or not at all.