macro: Allow positional arguments to be empty.

[pspp] / doc / pspp.texi

diff --git a/doc/pspp.texi b/doc/pspp.texi
index 6b3b64e05174fc09423197d402f908168f55c1a6..e107be4aa12ae8fc79fa3e05a65698391e2ba5a6 100644 (file)
--- a/doc/pspp.texi
+++ b/doc/pspp.texi
@@ -33,12 +33,33 @@ 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 pspp-figures/\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
@@ -50,6 +71,17 @@ graphic user interface
 @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