spv-file-format: Improve description of file format.

[pspp] / doc / automake.mk

diff --git a/doc/automake.mk b/doc/automake.mk
index d3c91a26417e712e00c5522f62113212e82d929d..c571a236d2fc240d8bd841a2ade937ae2791158d 100644 (file)
--- a/doc/automake.mk
+++ b/doc/automake.mk
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in  -*- makefile -*-
 
-info_TEXINFOS = doc/pspp.texinfo doc/pspp-dev.texinfo
+info_TEXINFOS = doc/pspp.texi doc/pspp-dev.texi
 
 doc_pspp_TEXINFOS = doc/version.texi \
        doc/bugs.texi \
@@ -18,6 +18,8 @@ doc_pspp_TEXINFOS = doc/version.texi \
        doc/invoking.texi \
        doc/language.texi \
        doc/license.texi \
+       doc/pspp-convert.texi \
+       doc/pspp-dump-sav.texi \
        doc/ni.texi \
        doc/not-implemented.texi \
        doc/statistics.texi \
@@ -37,25 +39,33 @@ doc_pspp_dev_TEXINFOS = doc/version-dev.texi \
        doc/dev/i18n.texi \
        doc/dev/output.texi \
        doc/dev/system-file-format.texi \
+       doc/dev/pc+-file-format.texi \
        doc/dev/portable-file-format.texi \
+       doc/dev/spv-file-format.texi \
+       doc/dev/encrypted-file-wrappers.texi \
        doc/dev/q2c.texi
 
-EXTRA_DIST += doc/pspp.man \
-       doc/get-commands.pl
+dist_man_MANS += doc/pspp.1 \
+                 doc/psppire.1
+
+EXTRA_DIST += doc/get-commands.pl doc/help-pages-list
 
 $(srcdir)/doc/ni.texi: $(top_srcdir)/src/language/command.def doc/get-commands.pl
        @$(MKDIR_P)  doc
-       $(PERL) $(top_srcdir)/doc/get-commands.pl $(top_srcdir)/src/language/command.def > $@
+       $(AM_V_GEN)$(PERL) $(top_srcdir)/doc/get-commands.pl $(top_srcdir)/src/language/command.def > $@
 
 $(srcdir)/doc/tut.texi:
        @$(MKDIR_P) doc
-       echo "@set example-dir $(examplesdir)" > $@
+       $(AM_V_GEN)echo "@set example-dir $(examplesdir)" > $@
 
 
-$(srcdir)/doc/pspp.xml: doc/pspp.texinfo $(doc_pspp_TEXINFOS)
+# The SED and AWK filters in this rule, are to work-around some nasty bugs in 
+# makeinfo version 4.13, which produces broken docbook xml.  These workarounds 
+# are rather horrible and must be removed asap.
+$(srcdir)/doc/pspp.xml: doc/pspp.texi $(doc_pspp_TEXINFOS) $(top_srcdir)/doc/help-pages-list
        @$(MKDIR_P)  doc
-       $(MAKEINFO) $(AM_MAKEINFOFLAGS) --docbook -I $(top_srcdir) \
-               $(top_srcdir)/doc/pspp.texinfo -o - \
+       $(AM_V_GEN)$(MAKEINFO) $(AM_MAKEINFOFLAGS) --docbook -I $(top_srcdir) \
+               $(top_srcdir)/doc/pspp.texi -o - \
                | $(SED) -e 's/Time-&-Date/Time-\&-Date/g' \
                -e 's/“/\“/g' \
                -e 's/”/\”/g' \
@@ -63,15 +73,27 @@ $(srcdir)/doc/pspp.xml: doc/pspp.texinfo $(doc_pspp_TEXINFOS)
                -e 's/’/\’/g' \
                -e 's/—/\—/g' \
                -e 's/–/\′/g' \
+                -e 's/é/\é/g' \
                -e 's/©/\©/g' \
                -e 's/−/\−/g' \
                -e 's/…/\…/g' \
+               -e 's/•/\ߦ/g' \
                -e 's/././g' \
-               > $@
-       $(XMLLINT) --output /dev/null $@ 2>&1 2> /dev/null || ( $(RM) $@ && false )
+               -e 's%\(<figure [^>]*\)>%\1/>%g' \
+        | $(AWK) '/<para>.*<table.*>.*<\/para>/{x=sub("</para>",""); print; s=1;next}/<\/table>/{print; if (s==1) print "</para>"; s=0; next}1' \
+       > $@,tmp
+       $(AM_V_at)$(XMLLINT) --output /dev/null $@,tmp
+       $(AM_V_at)cat $(top_srcdir)/doc/help-pages-list | while read node ; do \
+        $(XMLLINT) --xpath "$$node" $@,tmp > /dev/null; \
+        if test $$? -ne 0 ; then  echo "$$node does not appear in $@" ; exit 1; fi ; \
+        done 
+       mv $@,tmp $@
 
 docbookdir = $(docdir)
 dist_docbook_DATA = doc/pspp.xml
 
-EXTRA_DIST += doc/OChangeLog
+
 CLEANFILES += pspp-dev.dvi $(docbook_DATA)
+
+doc: $(INFO_DEPS) $(DVIS) $(PDFS) $(PSS) $(HTMLS) $(dist_docbook_DATA)
+.PHONY: doc