From 1d447973271c2dbeedf5d5c3fad3b932038f9cec Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Sun, 20 Dec 2020 15:38:21 -0800 Subject: [PATCH] doc: Add .png output to the Info manual. --- NEWS | 3 +++ doc/automake.mk | 40 ++++++++++++++++++++++++++++-------- doc/pspp.texi | 26 +++++++++++++++++++----- doc/tutorial.stt | 53 ++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 109 insertions(+), 13 deletions(-) create mode 100644 doc/tutorial.stt diff --git a/NEWS b/NEWS index 98b24a4fef..6bae984900 100644 --- a/NEWS +++ b/NEWS @@ -18,6 +18,9 @@ Changes from 1.4.1 to 1.5.2: The new interface provides the user with a preview of the data to be imported and interactive methods to select the desired ranges. + * The user manual, in its Info and HTML versions, now includes + graphical output examples and screenshots. + * Output driver changes: - New drivers for output to TeX source files and to PNG files. diff --git a/doc/automake.mk b/doc/automake.mk index 066b229e15..75e2e7ff02 100644 --- a/doc/automake.mk +++ b/doc/automake.mk @@ -92,7 +92,7 @@ dist_docbook_DATA = doc/pspp.xml CLEANFILES += pspp-dev.dvi $(docbook_DATA) doc/pspp.info* doc/pspp.xml -doc: $(INFO_DEPS) $(DVIS) $(PDFS) $(PSS) $(HTMLS) $(dist_docbook_DATA) +doc: $(INFO_DEPS) $(DVIS) $(PDFS) $(PNGS) $(HTMLS) $(dist_docbook_DATA) PHONY += doc doc/help-pages-list: $(UI_FILES) @@ -150,23 +150,36 @@ FIGURE_TXTS = $(FIGURE_SPVS:.spv=.txt) FIGURE_TEXIS = $(FIGURE_TXTS:.txt=.texi) FIGURE_HTMLS = $(FIGURE_SPVS:.spv=.html) FIGURE_PDFS = $(FIGURE_SPVS:.spv=.pdf) +FIGURE_PNGS = $(FIGURE_SPVS:.spv=.png) figure-spvs: $(FIGURE_SPVS) figure-txts: $(FIGURE_TXTS) figure-texis: $(FIGURE_TEXIS) figure-htmls: $(FIGURE_HTMLS) figure-pdfs: $(FIGURE_PDFS) -PHONY += figure-spv figure-txts figure-texis figure-htmls figure-pdfs - -$(top_builddir)/doc/pspp.info: $(FIGURE_TEXIS) +figure-pngs: $(FIGURE_PNGS) +PHONY += \ + figure-spv \ + figure-txts \ + figure-texis \ + figure-htmls \ + figure-pdfs \ + figure-pngs + +$(top_builddir)/doc/pspp.info: $(FIGURE_PNGS) $(top_builddir)/doc/pspp.ps: $(FIGURE_TEXIS) $(top_builddir)/doc/pspp.dvi: $(FIGURE_TEXIS) $(top_builddir)/doc/pspp.html: $(FIGURE_HTMLS) $(top_builddir)/doc/pspp.pdf: $(FIGURE_TEXIS) $(top_builddir)/doc/pspp.xml: $(FIGURE_TEXIS) -CLEANFILES += $(FIGURE_TXTS) $(FIGURE_SPVS) $(FIGURE_TEXIS) $(FIGURE_HTMLS) -SUFFIXES += .sps .spv .txt .html .texi .pdf +CLEANFILES += \ + $(FIGURE_TXTS) \ + $(FIGURE_SPVS) \ + $(FIGURE_TEXIS) \ + $(FIGURE_HTMLS) \ + $(FIGURE_PNGS) +SUFFIXES += .sps .spv .txt .html .texi .pdf .png # Use pspp to process a syntax file into an output file. if cross_compiling @@ -216,7 +229,10 @@ $(FIGURE_TXTS) $(FIGURE_HTMLS): $(pspp_output) .spv.txt: $(convert) .spv.pdf: - $(convert) -O left-margin=0pt -O right-margin=0pt -O top-margin=0pt -O bottom-margin=0pt -O paper-size=6x20in -O font-size=12000 --table-look=$(HOME)/pspp/spss15/Looks/report.tlo + $(convert) -O trim=true -O left-margin=0in -O right-margin=0in -O top-margin=0in -O bottom-margin=0in -O paper-size=7.5x99in --table-look=$(srcdir)/doc/tutorial.stt +.spv.png: + $(convert) -O trim=true -O left-margin=0in -O right-margin=0in -O top-margin=0in -O bottom-margin=0in -O paper-size=7.5x99in --table-look=$(srcdir)/doc/tutorial.stt +EXTRA_DIST += doc/tutorial.stt .spv.html: $(convert) -O format=html -O bare=true @@ -299,17 +315,25 @@ doc-make: doc/doc-make.in Makefile # Install all the PNG files so that info readers can recognise them -install-info-local: +install-info-local: $(FIGURE_PNGS) $(MKDIR_P) $(DESTDIR)$(infodir)/screenshots for p in $(INFO_SCREENSHOTS); do \ $(INSTALL_DATA) $$p $(DESTDIR)$(infodir)/screenshots ;\ done + $(INSTALL) -d $(DESTDIR)$(infodir)/pspp-figures + for p in $(FIGURE_PNGS); do \ + $(INSTALL_DATA) $$p $(DESTDIR)$(infodir)/pspp-figures ;\ + done uninstall-local: for p in $(INFO_SCREENSHOTS); do \ f=`basename $$p ` ; \ rm -f $(DESTDIR)$(infodir)/screenshots/$$f ; \ done + for p in $(FIGURE_PNGS); do \ + f=`basename $$p ` ; \ + rm -f $(DESTDIR)$(infodir)/pspp-figures/$$f ; \ + done EXTRA_DIST+= $(SCREENSHOTS) doc/doc-make.in doc/screengrab diff --git a/doc/pspp.texi b/doc/pspp.texi index 1394150289..618a27a1b8 100644 --- a/doc/pspp.texi +++ b/doc/pspp.texi @@ -48,11 +48,18 @@ graphic user interface @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 @@ -64,6 +71,15 @@ 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 +@include pspp-figures/\FILE\.texi +@end ifnothtml +@end ifnotplaintext +@end ifnotinfo @end macro @macro note{param1} diff --git a/doc/tutorial.stt b/doc/tutorial.stt new file mode 100644 index 0000000000..130ae9b23b --- /dev/null +++ b/doc/tutorial.stt @@ -0,0 +1,53 @@ + + + + + + + <vizml:style color="#000000" color2="#ffffff" font-family="Sans Serif" font-size="10pt" font-weight="bold" font-underline="none" labelLocationVertical="center" margin-bottom="6pt" margin-left="6pt" margin-right="8pt" margin-top="0pt" textAlignment="center"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- 2.30.2