doc: Add .png output to the Info manual.

diff --git a/NEWS b/NEWS
index 98b24a4fef8e3b1291d3adcf1b2dcfd556b24e12..6bae9849004851a14d8d75efaa8fe8039d692c90 100644 (file)
--- 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 066b229e1534a239dddecc7c7e459ccd0cd60d1f..75e2e7ff025145d09fb944423a4f2c7606b077cd 100644 (file)
--- 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 1394150289d83a609766fc936898558e57ba3d74..618a27a1b8a5878dc361fa614d4e0f35fd27785d 100644 (file)
--- 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 (file)
index 0000000..130ae9b
--- /dev/null
+++ b/doc/tutorial.stt
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tableProperties xmlns="http://www.ibm.com/software/analytics/spss/xml/table-looks" xmlns:vizml="http://www.ibm.com/software/analytics/spss/xml/visualization" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.ibm.com/software/analytics/spss/xml/table-looks http://www.ibm.com/software/analytics/spss/xml/table-looks/table-looks-1.4.xsd">
+    <generalProperties hideEmptyRows="false" maximumColumnWidth="72" maximumRowWidth="120" minimumColumnWidth="36" minimumRowWidth="36" rowDimensionLabels="inCorner"/>
+    <footnoteProperties markerPosition="subscript" numberFormat="alphabetic"/>
+    <cellFormatProperties>
+        <title>
+            <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"/>
+        </title>
+        <caption>
+            <vizml:style color="#000000" color2="#ffffff" font-family="Sans Serif" font-size="10pt" font-weight="regular" font-underline="none" labelLocationVertical="positive" margin-bottom="0pt" margin-left="6pt" margin-right="8pt" margin-top="0pt" textAlignment="left"/>
+        </caption>
+        <footnotes>
+            <vizml:style color="#000000" color2="#ffffff" font-family="Sans Serif" font-size="10pt" font-weight="regular" font-underline="none" labelLocationVertical="positive" margin-bottom="2pt" margin-left="8pt" margin-right="6pt" margin-top="1pt" textAlignment="left"/>
+        </footnotes>
+        <cornerLabels>
+            <vizml:style color="#000000" color2="#ffffff" font-family="Sans Serif" font-size="10pt" font-weight="regular" font-underline="none" labelLocationVertical="negative" margin-bottom="0pt" margin-left="6pt" margin-right="8pt" margin-top="0pt" textAlignment="left"/>
+        </cornerLabels>
+        <columnLabels>
+            <vizml:style color="#000000" color2="#ffffff" font-family="Sans Serif" font-size="10pt" font-weight="regular" font-underline="none" labelLocationVertical="negative" margin-bottom="2pt" margin-left="6pt" margin-right="8pt" margin-top="0pt" textAlignment="center"/>
+        </columnLabels>
+        <rowLabels>
+            <vizml:style color="#000000" color2="#ffffff" font-family="Sans Serif" font-size="10pt" font-weight="regular" font-underline="none" labelLocationVertical="positive" margin-bottom="2pt" margin-left="6pt" margin-right="8pt" margin-top="0pt" textAlignment="left"/>
+        </rowLabels>
+        <data>
+            <vizml:style color="#000000" color2="#ffffff" font-family="Sans Serif" font-size="10pt" font-weight="regular" font-underline="none" labelLocationVertical="positive" margin-bottom="0pt" margin-left="6pt" margin-right="8pt" margin-top="0pt" textAlignment="mixed"/>
+        </data>
+        <layers>
+            <vizml:style color="#000000" color2="#ffffff" font-family="Sans Serif" font-size="10pt" font-weight="regular" font-underline="none" labelLocationVertical="negative" margin-bottom="2pt" margin-left="6pt" margin-right="8pt" margin-top="0pt" textAlignment="left"/>
+        </layers>
+    </cellFormatProperties>
+    <borderProperties>
+        <titleLayerSeparator borderStyleType="none" color="#000000"/>
+        <leftOuterFrame borderStyleType="none" color="#000000"/>
+        <topOuterFrame borderStyleType="none" color="#000000"/>
+        <rightOuterFrame borderStyleType="none" color="#000000"/>
+        <bottomOuterFrame borderStyleType="none" color="#000000"/>
+        <leftInnerFrame borderStyleType="thick" color="#000000"/>
+        <topInnerFrame borderStyleType="thick" color="#000000"/>
+        <rightInnerFrame borderStyleType="thick" color="#000000"/>
+        <bottomInnerFrame borderStyleType="thick" color="#000000"/>
+        <dataAreaLeft borderStyleType="thick" color="#000000"/>
+        <dataAreaTop borderStyleType="thick" color="#000000"/>
+        <horizontalDimensionBorderRows borderStyleType="solid" color="#000000"/>
+        <verticalDimensionBorderRows borderStyleType="none" color="#000000"/>
+        <horizontalDimensionBorderColumns borderStyleType="solid" color="#000000"/>
+        <verticalDimensionBorderColumns borderStyleType="solid" color="#000000"/>
+        <horizontalCategoryBorderRows borderStyleType="none" color="#000000"/>
+        <verticalCategoryBorderRows borderStyleType="none" color="#000000"/>
+        <horizontalCategoryBorderColumns borderStyleType="solid" color="#000000"/>
+        <verticalCategoryBorderColumns borderStyleType="solid" color="#000000"/>
+    </borderProperties>
+    <printingProperties printAllLayers="false" rescaleLongTableToFitPage="false" rescaleWideTableToFitPage="false" windowOrphanLines="0"/>
+</tableProperties>