X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=doc%2Fpspp.texi;h=e107be4aa12ae8fc79fa3e05a65698391e2ba5a6;hb=37cbc94c3ed75eb0ac345c7ada138ef4662f1433;hp=14e97b07bdeff41d55584f815d7d7ba78f7b7131;hpb=f1141d27ca616a8c8edc2a1f18067085ceaaf448;p=pspp
diff --git a/doc/pspp.texi b/doc/pspp.texi
index 14e97b07bd..e107be4aa1 100644
--- a/doc/pspp.texi
+++ b/doc/pspp.texi
@@ -24,28 +24,64 @@ graphic user interface
@end html
@cartouche
-@verbatiminclude \FILE\
+@smallexample
+@verbatiminclude pspp-figures/\FILE\
+@end smallexample
@end cartouche
@html
@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
-@verbatiminclude \FILE\.out
-@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
-@include \FILE\.html
+@include pspp-figures/\FILE\.html
@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}
@@ -79,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
@@ -101,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
@@ -145,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.