X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=doc%2Fpspp.texi;h=204feada5862577aad02fbdf37cbf51b6c870e80;hb=refs%2Fheads%2Fctables10;hp=69146976918fb69789ea732ce0ceaa2e2ed98a1e;hpb=6014da385d5f3f2a3971f0049d2d54c0dc6e95f8;p=pspp
diff --git a/doc/pspp.texi b/doc/pspp.texi
index 6914697691..204feada58 100644
--- a/doc/pspp.texi
+++ b/doc/pspp.texi
@@ -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
-@include \FILE\.texi
-@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
-@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}
@@ -58,6 +90,15 @@ graphic user interface
@end quotation
@end macro
+@ifnottex
+@macro times{}
+Ã
+@end macro
+@macro ne{}
+â
+@end macro
+@end ifnottex
+
@c A macro to indicate variable names used in examples.
@c NOT metasyntactical variables - for that use @var
@macro exvar{VAR}
@@ -83,14 +124,6 @@ graphic user interface
@sc{pspp}
@end macro
-
-@ifset MISSING_CLICKSEQUENCE
-@alias clicksequence = asis
-@macro click {}
-->
-@end macro
-@end ifset
-
@iftex
@finalout
@end iftex
@@ -149,11 +182,12 @@ 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.
* Statistics:: Basic statistical procedures.
+* Matrices:: Matrix operations and transformations.
* Utilities:: Other commands.
* Invoking pspp-convert:: Utility for converting among file formats.
@@ -184,6 +218,7 @@ Free Documentation License".
@include data-selection.texi
@include flow-control.texi
@include statistics.texi
+@include matrices.texi
@include utilities.texi
@include pspp-convert.texi