## 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 \
# 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.texinfo $(doc_pspp_TEXINFOS)
+$(srcdir)/doc/pspp.xml: doc/pspp.texi $(doc_pspp_TEXINFOS)
@$(MKDIR_P) doc
$(MAKEINFO) $(AM_MAKEINFOFLAGS) --docbook -I $(top_srcdir) \
- $(top_srcdir)/doc/pspp.texinfo -o - \
+ $(top_srcdir)/doc/pspp.texi -o - \
| $(SED) -e 's/Time-&-Date/Time-\&-Date/g' \
-e 's/“/\“/g' \
-e 's/”/\”/g' \
--- /dev/null
+\input texinfo @c -*- texinfo -*-
+@c %**start of header
+@setfilename pspp-dev.info
+@settitle PSPP
+@c For double-sided printing, uncomment:
+@c @setchapternewpage odd
+@c %**end of header
+
+@include version-dev.texi
+
+@macro cmd{CMDNAME}
+\CMDNAME\
+@end macro
+@macro struct{TAG}
+@code{struct \TAG\}
+@end macro
+@macro union{TAG}
+@code{union \TAG\}
+@end macro
+@macro enum{TAG}
+@code{enum \TAG\}
+@end macro
+@macro func{NAME}
+@code{\NAME\}
+@end macro
+
+@iftex
+@finalout
+@end iftex
+
+@dircategory Math
+@direntry
+* PSPP Developers Guide: (pspp-dev). Tutorial and reference for PSPP developers.
+@end direntry
+
+@copying
+This manual is for GNU PSPP version @value{VERSION},
+software for statistical analysis.
+
+Copyright @copyright{} 1997, 1998, 2004, 2005, 2007, 2010, 2014 Free Software Foundation, Inc.
+
+@quotation
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.3
+or any later version published by the Free Software Foundation;
+with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
+A copy of the license is included in the section entitled "GNU
+Free Documentation License".
+@end quotation
+@end copying
+
+@titlepage
+@title PSPP Developers Guide
+@subtitle GNU PSPP Statistical Analysis Software
+@subtitle Release @value{VERSION}
+@author
+@page
+@vskip 0pt plus 1filll
+@insertcopying
+@end titlepage
+
+@contents
+
+
+@ifnottex
+@node Top
+@top GNU PSPP Developers Guide
+
+@insertcopying
+@end ifnottex
+
+@menu
+* Introduction:: Introduction to PSPP development.
+* Basic Concepts:: Data structures and concepts.
+* Parsing Command Syntax:: How to parse command syntax.
+* Processing Data:: Data input, output, and processing.
+* Presenting Output:: Producing machine- and human-readable output.
+* Internationalisation:: Dealing with locale issues.
+
+* Function Index:: Index of PSPP functions.
+* Concept Index:: Index of concepts.
+
+* Portable File Format:: Format of PSPP portable files.
+* System File Format:: Format of PSPP system files.
+* q2c Input Format:: Format of syntax accepted by q2c.
+
+* GNU Free Documentation License:: License for copying this manual.
+@end menu
+
+@include dev/intro.texi
+@include dev/concepts.texi
+@include dev/syntax.texi
+@include dev/data.texi
+@include dev/output.texi
+@include dev/i18n.texi
+
+@include function-index.texi
+@include concept-index.texi
+
+@include dev/portable-file-format.texi
+@include dev/system-file-format.texi
+@include dev/q2c.texi
+
+@include fdl.texi
+
+@bye
+
+@c Local Variables:
+@c compile-command: "makeinfo pspp-dev.texi"
+@c End:
+++ /dev/null
-\input texinfo @c -*- texinfo -*-
-@c %**start of header
-@setfilename pspp-dev.info
-@settitle PSPP
-@c For double-sided printing, uncomment:
-@c @setchapternewpage odd
-@c %**end of header
-
-@include version-dev.texi
-
-@macro cmd{CMDNAME}
-\CMDNAME\
-@end macro
-@macro struct{TAG}
-@code{struct \TAG\}
-@end macro
-@macro union{TAG}
-@code{union \TAG\}
-@end macro
-@macro enum{TAG}
-@code{enum \TAG\}
-@end macro
-@macro func{NAME}
-@code{\NAME\}
-@end macro
-
-@iftex
-@finalout
-@end iftex
-
-@dircategory Math
-@direntry
-* PSPP Developers Guide: (pspp-dev). Tutorial and reference for PSPP developers.
-@end direntry
-
-@copying
-This manual is for GNU PSPP version @value{VERSION},
-software for statistical analysis.
-
-Copyright @copyright{} 1997, 1998, 2004, 2005, 2007, 2010 Free Software Foundation, Inc.
-
-@quotation
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.3
-or any later version published by the Free Software Foundation;
-with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
-A copy of the license is included in the section entitled "GNU
-Free Documentation License".
-@end quotation
-@end copying
-
-@titlepage
-@title PSPP Developers Guide
-@subtitle GNU PSPP Statistical Analysis Software
-@subtitle Release @value{VERSION}
-@author
-@page
-@vskip 0pt plus 1filll
-@insertcopying
-@end titlepage
-
-@contents
-
-
-@ifnottex
-@node Top
-@top GNU PSPP Developers Guide
-
-@insertcopying
-@end ifnottex
-
-@menu
-* Introduction:: Introduction to PSPP development.
-* Basic Concepts:: Data structures and concepts.
-* Parsing Command Syntax:: How to parse command syntax.
-* Processing Data:: Data input, output, and processing.
-* Presenting Output:: Producing machine- and human-readable output.
-* Internationalisation:: Dealing with locale issues.
-
-* Function Index:: Index of PSPP functions.
-* Concept Index:: Index of concepts.
-
-* Portable File Format:: Format of PSPP portable files.
-* System File Format:: Format of PSPP system files.
-* q2c Input Format:: Format of syntax accepted by q2c.
-
-* GNU Free Documentation License:: License for copying this manual.
-@end menu
-
-@include dev/intro.texi
-@include dev/concepts.texi
-@include dev/syntax.texi
-@include dev/data.texi
-@include dev/output.texi
-@include dev/i18n.texi
-
-@include function-index.texi
-@include concept-index.texi
-
-@include dev/portable-file-format.texi
-@include dev/system-file-format.texi
-@include dev/q2c.texi
-
-@include fdl.texi
-
-@bye
-
-@c Local Variables:
-@c compile-command: "makeinfo pspp-dev.texinfo"
-@c End:
--- /dev/null
+\input texinfo @c -*- texinfo -*-
+@c %**start of header
+@setfilename pspp.info
+@settitle PSPP
+@c For double-sided printing, uncomment:
+@c @setchapternewpage odd
+@c %**end of header
+
+
+@macro note{param1}
+@quotation
+@strong{Please note:} \param1\
+@end quotation
+@end macro
+
+@include version.texi
+
+@c This macro should be used for marking command names. For the purposes of markup,
+@c no distinction is made between ``commands'' and ``procedures''.
+@macro cmd{CMDNAME}
+@code{\CMDNAME\}
+@end macro
+
+@c This macro is used for fragments of command syntax that are not in themselves command names.
+@c It does not necessarily have to be a subcommand.
+@macro subcmd{CMDNAME}
+@code{\CMDNAME\}
+@end macro
+
+@c Use this macro to refer to PSPP itself . Not when giving a shell command line example.
+@macro pspp
+@sc{pspp}
+@end macro
+
+
+@ifset MISSING_CLICKSEQUENCE
+@alias clicksequence = asis
+@macro click {}
+->
+@end macro
+@end ifset
+
+@iftex
+@finalout
+@end iftex
+
+@dircategory Math
+@direntry
+* PSPP: (pspp). Statistical analysis package.
+* PSPPIRE: (pspp). Graphical user interface to @pspp{}.
+@end direntry
+
+@copying
+This manual is for GNU PSPP version @value{VERSION},
+software for statistical analysis.
+
+Copyright @copyright{} 1997, 1998, 2004, 2005, 2009, 2012, 2013, 2014 Free Software Foundation, Inc.
+
+@quotation
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.3
+or any later version published by the Free Software Foundation;
+with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
+A copy of the license is included in the section entitled "GNU
+Free Documentation License".
+@end quotation
+@end copying
+
+@titlepage
+@title PSPP Users' Guide
+@subtitle GNU PSPP Statistical Analysis Software
+@subtitle Release @value{VERSION}
+@page
+@vskip 0pt plus 1filll
+@insertcopying
+@end titlepage
+
+@c @chapheading Acknowledgements
+The authors wish to thank Network Theory Ltd
+@url{http://www.network-theory.co.uk}
+for their financial support
+in the production of this manual.
+
+
+@contents
+
+
+@ifnottex
+@node Top
+@top GNU PSPP
+
+@insertcopying
+@end ifnottex
+
+@menu
+* Introduction:: Description of the package.
+* License:: Your rights and obligations.
+
+* Invoking PSPP:: Starting the PSPP text-based interface.
+* Invoking PSPPIRE:: Starting the PSPP graphical user interface.
+* Using PSPP:: How to use PSPP --- A brief tutorial.
+* Language:: Basics of the PSPP command language.
+* Expressions:: Numeric and string expression syntax.
+
+* 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.
+* 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.
+* Utilities:: Other commands.
+
+* Invoking pspp-convert:: Utility for converting among file formats.
+* Not Implemented:: What's not here yet
+* Bugs:: Known problems; submitting bug reports.
+
+* Function Index:: Index of PSPP functions for expressions.
+* Command Index:: Index of PSPP procedures.
+* Concept Index:: Index of concepts.
+
+* GNU Free Documentation License:: License for copying this manual.
+@end menu
+
+@include introduction.texi
+@include license.texi
+
+@include invoking.texi
+@include tutorial.texi
+@include language.texi
+@include expressions.texi
+@include data-io.texi
+@include files.texi
+@include combining.texi
+@include variables.texi
+@include transformation.texi
+@include data-selection.texi
+@include flow-control.texi
+@include statistics.texi
+@include utilities.texi
+
+@include pspp-convert.texi
+@include not-implemented.texi
+@include bugs.texi
+
+@include function-index.texi
+@include command-index.texi
+@include concept-index.texi
+
+@include fdl.texi
+
+@bye
+
+@c Local Variables:
+@c use (texinfo-multiple-files-update "pspp.texi") in emacs to keep these files consistent
+@c compile-command: "makeinfo pspp.texi"
+@c End:
+++ /dev/null
-\input texinfo @c -*- texinfo -*-
-@c %**start of header
-@setfilename pspp.info
-@settitle PSPP
-@c For double-sided printing, uncomment:
-@c @setchapternewpage odd
-@c %**end of header
-
-
-@macro note{param1}
-@quotation
-@strong{Please note:} \param1\
-@end quotation
-@end macro
-
-@include version.texi
-
-@c This macro should be used for marking command names. For the purposes of markup,
-@c no distinction is made between ``commands'' and ``procedures''.
-@macro cmd{CMDNAME}
-@code{\CMDNAME\}
-@end macro
-
-@c This macro is used for fragments of command syntax that are not in themselves command names.
-@c It does not necessarily have to be a subcommand.
-@macro subcmd{CMDNAME}
-@code{\CMDNAME\}
-@end macro
-
-@c Use this macro to refer to PSPP itself . Not when giving a shell command line example.
-@macro pspp
-@sc{pspp}
-@end macro
-
-
-@ifset MISSING_CLICKSEQUENCE
-@alias clicksequence = asis
-@macro click {}
-->
-@end macro
-@end ifset
-
-@iftex
-@finalout
-@end iftex
-
-@dircategory Math
-@direntry
-* PSPP: (pspp). Statistical analysis package.
-* PSPPIRE: (pspp). Graphical user interface to @pspp{}.
-@end direntry
-
-@copying
-This manual is for GNU PSPP version @value{VERSION},
-software for statistical analysis.
-
-Copyright @copyright{} 1997, 1998, 2004, 2005, 2009, 2012, 2013 Free Software Foundation, Inc.
-
-@quotation
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.3
-or any later version published by the Free Software Foundation;
-with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
-A copy of the license is included in the section entitled "GNU
-Free Documentation License".
-@end quotation
-@end copying
-
-@titlepage
-@title PSPP Users' Guide
-@subtitle GNU PSPP Statistical Analysis Software
-@subtitle Release @value{VERSION}
-@page
-@vskip 0pt plus 1filll
-@insertcopying
-@end titlepage
-
-@c @chapheading Acknowledgements
-The authors wish to thank Network Theory Ltd
-@url{http://www.network-theory.co.uk}
-for their financial support
-in the production of this manual.
-
-
-@contents
-
-
-@ifnottex
-@node Top
-@top GNU PSPP
-
-@insertcopying
-@end ifnottex
-
-@menu
-* Introduction:: Description of the package.
-* License:: Your rights and obligations.
-
-* Invoking PSPP:: Starting the PSPP text-based interface.
-* Invoking PSPPIRE:: Starting the PSPP graphical user interface.
-* Using PSPP:: How to use PSPP --- A brief tutorial.
-* Language:: Basics of the PSPP command language.
-* Expressions:: Numeric and string expression syntax.
-
-* 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.
-* 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.
-* Utilities:: Other commands.
-
-* Invoking pspp-convert:: Utility for converting among file formats.
-* Not Implemented:: What's not here yet
-* Bugs:: Known problems; submitting bug reports.
-
-* Function Index:: Index of PSPP functions for expressions.
-* Command Index:: Index of PSPP procedures.
-* Concept Index:: Index of concepts.
-
-* GNU Free Documentation License:: License for copying this manual.
-@end menu
-
-@include introduction.texi
-@include license.texi
-
-@include invoking.texi
-@include tutorial.texi
-@include language.texi
-@include expressions.texi
-@include data-io.texi
-@include files.texi
-@include combining.texi
-@include variables.texi
-@include transformation.texi
-@include data-selection.texi
-@include flow-control.texi
-@include statistics.texi
-@include utilities.texi
-
-@include pspp-convert.texi
-@include not-implemented.texi
-@include bugs.texi
-
-@include function-index.texi
-@include command-index.texi
-@include concept-index.texi
-
-@include fdl.texi
-
-@bye
-
-@c Local Variables:
-@c use (texinfo-multiple-files-update "pspp.texinfo") in emacs to keep these files consistent
-@c compile-command: "makeinfo pspp.texinfo"
-@c End:
projects / pspp / commitdiff