Patched in the diffs from 02-February-2006 to 02-March-2006, because I'd trashed

them when checking in the new directory structure.

diff --git a/README b/README
index 298f70df90cddcd554088d2068ace2b4d1bcf92f..fcb7dff460669f362b7086a035c2502995ec755c 100644 (file)
--- a/README
+++ b/README
@@ -15,10 +15,10 @@ ftp://ftp.gnu.org/pub/gnu/pspp/.  Older versions may be obtained from
 ftp://alpha.gnu.org/gnu/pspp/.  Development sources are available from
 CVS at http://savannah.gnu.org/projects/pspp
    
 ftp://alpha.gnu.org/gnu/pspp/.  Development sources are available from
 CVS at http://savannah.gnu.org/projects/pspp
    

-Questions and comments regarding PSPP can be sent to pspp-dev@gnu.org.
-PSPP bug reports may be sent to bug-gnu-pspp@gnu.org or filed in the
-bug-tracking system at http://savannah.gnu.org/bugs/?group=pspp
-according to your preference.
+Questions and comments about using PSPP may be sent to pspp-users@gnu.org.
+Bug reports may be filed at http://savannah.gnu.org/bugs/?group=pspp
+or emailed to bug-gnu-pspp@gnu.org.  (We prefer the web-based system
+because it makes it more difficult for us to lose track of bugs.)

 
 The long term goals for PSPP are ambitious.  We wish to provide the
 following support to users:
 
 The long term goals for PSPP are ambitious.  We wish to provide the
 following support to users:

diff --git a/TODO b/TODO
index 8a798cf2aa38be74f995ad4044ab9c8e9cc424c7..198bf210d1283b712d27739bd5f077066167c56d 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,13 +1,10 @@
-Time-stamp: <2005-08-02 10:24:25 blp>
+Time-stamp: <2006-02-17 22:06:31 blp>

 
 Get rid of need for GNU diff in `make check'.
 
 Get rid of need for file name canonicalization.
 
 
 Get rid of need for GNU diff in `make check'.
 
 Get rid of need for file name canonicalization.
 

-Use getsubopt()?
-
-Format specifier and missing values code needs to be rewritten for lowered
-crappiness.
+Format specifier code needs to be rewritten for lowered crappiness.

 
 CROSSTABS needs to be re-examined.
 
 
 CROSSTABS needs to be re-examined.
 


@@ -23,17 +20,8 @@ Add NOT_REACHED() macro.
 
 Add compression to casefiles.
 
 
 Add compression to casefiles.
 

-There needs to be another layer onto the lexer, which should probably be
-entirely rewritten anyway.  The lexer needs to read entire *commands* at a
-time, not just a *line* at a time.  It also needs to support arbitrary putback,
-probably by just backing up the "current position" in the command buffer.
-

 Scratch variables should not be available for use following TEMPORARY.
 
 Scratch variables should not be available for use following TEMPORARY.
 

-Details of N OF CASES, SAMPLE, FILTER, PROCESS IF, TEMPORARY, etc., need to be
-checked against the documentation.  See notes on these at end of file for a
-start.
-

 Check our results against the NIST StRD benchmark results at
 strd.itl.nist.gov/div898/strd
 
 Check our results against the NIST StRD benchmark results at
 strd.itl.nist.gov/div898/strd
 


@@ -54,8 +42,6 @@ Cell footnotes.
 PostScript driver should emit thin lines, then thick lines, to optimize time
 and space.
 
 PostScript driver should emit thin lines, then thick lines, to optimize time
 and space.
 

-New functions?  var_name_or_label(), tab_value_or_label()
-

 Should be able to bottom-justify cells.  It'll be expensive, though, by
 requiring an extra metrics call.
 
 Should be able to bottom-justify cells.  It'll be expensive, though, by
 requiring an extra metrics call.
 


@@ -69,8 +55,6 @@ bottom borders on middle pages.)
 
 Support multi-line titles on tables. (For the first page only, presumably.)
 
 
 Support multi-line titles on tables. (For the first page only, presumably.)
 

-Rewrite the convert_F() function in data-out.c to be nicer code.
-

 In addition to searching the source directory, we should search the current
 directory (for data files).  (Yuck!)
 
 In addition to searching the source directory, we should search the current
 directory (for data files).  (Yuck!)
 


@@ -79,8 +63,6 @@ setlinecap is *not* a proper solution.
 
 Fix som_columns().
 
 
 Fix som_columns().
 

-Has glob.c been pared down enough?
-

 Improve interactivity of output by allowing a `commit' function for a page.
 This will also allow for infinite-length pages.
 
 Improve interactivity of output by allowing a `commit' function for a page.
 This will also allow for infinite-length pages.
 


@@ -92,16 +74,9 @@ created or modified by a previous transformation.
 
 The manual: add text, add index entries, add examples.
 
 
 The manual: add text, add index entries, add examples.
 

-The inline file should be improved: There should be *real* detection of whether
-it is used (in dfm.c:cmd_begin_data), not after-the-fact detection.
-

 Figure out a stylesheet for messages displayed by PSPP: i.e., what quotation
 marks around filenames, etc.
 
 Figure out a stylesheet for messages displayed by PSPP: i.e., what quotation
 marks around filenames, etc.
 

-New SET subcommand: OUTPUT.  i.e., SET OUTPUT="filename" to send output to that
-file; SET OUTPUT="filename"(APPEND) to append to that file; SET OUTPUT=DEFAULT
-to reset everything.  There might be a better approach, though--think about it.
-

 From Zvi Grauer <z.grauer@csuohio.edu> and <zvi@mail.ohio.net>:
 
    1. design of experiments software, specifically Factorial, response surface
 From Zvi Grauer <z.grauer@csuohio.edu> and <zvi@mail.ohio.net>:
 
    1. design of experiments software, specifically Factorial, response surface


@@ -120,44 +95,6 @@ From Zvi Grauer <z.grauer@csuohio.edu> and <zvi@mail.ohio.net>:
 
    6. Categorical data analsys ?
 
 
    6. Categorical data analsys ?
 

-IDEAS
------
-
-In addition to an "infinite journal", we should keep a number of
-individual-session journals, pspp.jnl-1 through pspp.jnl-X, renaming and
-deleting as needed.  All of the journals should have date/time comments.
-
-Qualifiers for variables giving type--categorical, ordinal, ...
-
-Analysis Wizard
-
-Consider consequences of xmalloc(), fail(), hcf() in interactive
-use:
-a. Can we safely just use setjmp()/longjmp()?
-b. Will that leak memory?
-i. I don't think so: all procedure-created memory is either
-garbage-collected or globally-accessible.
-ii. But you never know... esp. w/o Checker.
-c. Is this too early to worry? too late?
-
-Need to implement a shared buffer for funny functions that require relatively
-large permanent transient buffers (1024 bytes or so), that is, buffers that are
-permanent in the sense that they probably shouldn't be deallocated but are only
-used from time to time, buffers that can't be allocated on the stack because
-they are of variable and unpredictable but usually relatively small (usually
-line buffers).  There are too many of these lurking around; can save a sizeable
-amount of space at very little overhead and with very little effort by merging
-them.
-
-Clever multiplatform GUI idea (due partly to John Williams): write a GUI in
-Java where each statistical procedure dialog box could be downloaded from the
-server independently.  The statistical procedures would run on (the/a) server
-and results would be reported through HTML tables viewed with the user's choice
-of web browsers.  Help could be implemented through the browser as well.
-
-HOWTOs
-------
-

 MORE NOTES/IDEAS/BUGS
 ---------------------
 
 MORE NOTES/IDEAS/BUGS
 ---------------------
 

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 2973f49bfbebff700d0e817e5bb109a5b577461f..47a0d9574764cb31c97b0eba95e77109e9b60c8e 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,15 @@
+Wed Feb 15 21:53:12 2006  Ben Pfaff  <blp@gnu.org>
+
+       * data-file-format.texi: Fix values for "measure" in Auxiliary
+       Variable Parameter Record.  Thanks to Oliver Bock <oliver@g7.org>
+       for reporting this bug.  Fixes bug #15763.
+
+Tue Feb 14 21:34:06 2006  Ben Pfaff  <blp@gnu.org>
+
+       * data-file-format.texi: Fix description of "count" in Auxiliary
+       Variable Parameter Record.  Thanks to Oliver Bock <oliver@g7.org>
+       for reporting this bug.  Fixes bug #15756. 
+

 Sun Sep 25 16:10:36 2005  Ben Pfaff  <blp@gnu.org>
 
        * Makefile.am: Make ni.texi a prereq for HTML output.  Thanks to
 Sun Sep 25 16:10:36 2005  Ben Pfaff  <blp@gnu.org>
 
        * Makefile.am: Make ni.texi a prereq for HTML output.  Thanks to

diff --git a/doc/data-file-format.texi b/doc/data-file-format.texi
index 6307ae17e7e57c9aeb943ef36ee5402ce94557f5..c6b0c9653aa7e2aa27c95beb074eae1bfe942fa7 100644 (file)
--- a/doc/data-file-format.texi
+++ b/doc/data-file-format.texi
@@ -43,7 +43,7 @@ described below:
 * Document Record::             
 * Machine int32 Info Record::   
 * Machine flt64 Info Record::   
 * Document Record::             
 * Machine int32 Info Record::   
 * Machine flt64 Info Record::   

-* Auxilliary Variable Parameter Record::
+* Auxiliary Variable Parameter Record::

 * Long Variable Names Record::
 * Miscellaneous Informational Records::  
 * Dictionary Termination Record::  
 * Long Variable Names Record::
 * Miscellaneous Informational Records::  
 * Dictionary Termination Record::  


@@ -472,7 +472,7 @@ Character code.  1 indicates EBCDIC, 2 indicates 7-bit ASCII, 3
 indicates 8-bit ASCII, 4 indicates DEC Kanji.
 @end table
 
 indicates 8-bit ASCII, 4 indicates DEC Kanji.
 @end table
 

-@node Machine flt64 Info Record, Auxilliary Variable Parameter Record, Machine int32 Info Record, Data File Format
+@node Machine flt64 Info Record, Auxiliary Variable Parameter Record, Machine int32 Info Record, Data File Format

 @section Machine @code{flt64} Info Record
 
 There must be no more than one machine @code{flt64} info record per
 @section Machine @code{flt64} Info Record
 
 There must be no more than one machine @code{flt64} info record per


@@ -518,10 +518,10 @@ The value used for HIGHEST in missing values.
 The value used for LOWEST in missing values.
 @end table
 
 The value used for LOWEST in missing values.
 @end table
 

-@node Auxilliary Variable Parameter Record, Long Variable Names Record, Machine flt64 Info Record, Data File Format
-@section Auxilliary Variable Parameter Record
+@node Auxiliary Variable Parameter Record, Long Variable Names Record, Machine flt64 Info Record, Data File Format
+@section Auxiliary Variable Parameter Record

 
 

-There must be no more than one auxilliary variable parameter record per
+There must be no more than one auxiliary variable parameter record per

 system file.  This  record must follow the variable
 records and precede the dictionary termination record.
 
 system file.  This  record must follow the variable
 records and precede the dictionary termination record.
 


@@ -550,7 +550,7 @@ Record subtype.  Always set to 11.
 The size  @code{int32}. Always set to 4.
 
 @item int32 count;
 The size  @code{int32}. Always set to 4.
 
 @item int32 count;

-The total number of bytes in @code{aux_params} divided by 3.
+The total number of records in @code{aux_params}, multiplied by 3.

 
 @item struct aux_params aux_params[];
 An array of @code{struct aux_params}.   The order of the elements corresponds 
 
 @item struct aux_params aux_params[];
 An array of @code{struct aux_params}.   The order of the elements corresponds 


@@ -569,11 +569,11 @@ struct aux_params
 @item int32 measure
 The measurement type of the variable:  
 @table @asis
 @item int32 measure
 The measurement type of the variable:  
 @table @asis

-@item 0
-Nominal Scale

 @item 1
 @item 1

-Ordinal Scale
+Nominal Scale

 @item 2
 @item 2

+Ordinal Scale
+@item 3

 Continuous Scale
 @end table
 
 Continuous Scale
 @end table
 


@@ -600,7 +600,7 @@ Centre aligned
 
 
 
 
 
 

-@node Long Variable Names Record, Miscellaneous Informational Records, Auxilliary Variable Parameter Record,  Data File Format
+@node Long Variable Names Record, Miscellaneous Informational Records, Auxiliary Variable Parameter Record,  Data File Format

 @section Long Variable Names Record
 
 There must be no more than one long variable names record per
 @section Long Variable Names Record
 
 There must be no more than one long variable names record per

diff --git a/src/ChangeLog b/src/ChangeLog
index 26e0a91e1d119a91b5c22cf5f767c4baab5e8623..e649e8032833c271256f7d5261cf6c4d096d9c47 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -599,6 +599,10 @@ Sat Feb 11 21:44:50 2006  Ben Pfaff  <blp@gnu.org>
 
        * start-date.h: New file.
 
 
        * start-date.h: New file.
 

+Fri Feb  3 20:34:52 2006  Ben Pfaff  <blp@gnu.org>
+ 
+       * font.h: (struct font_set) Removed, because unused.
+ 

 Sat Jan 28 17:45:36 2006  Ben Pfaff  <blp@gnu.org>
 
        Cleaner (faster?) way to compact cases.
 Sat Jan 28 17:45:36 2006  Ben Pfaff  <blp@gnu.org>
 
        Cleaner (faster?) way to compact cases.