projects / pspp-builds.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6704782)
Addressed some of the issues raised by John McCabe-Dansted when building
authorJohn Darrington <john@darrington.wattle.id.au>
Wed, 7 Feb 2007 02:12:57 +0000 (02:12 +0000)
committerJohn Darrington <john@darrington.wattle.id.au>
Wed, 7 Feb 2007 02:12:57 +0000 (02:12 +0000)
native w32 target.

src/ui/gui/data-editor.c patch | blob | history
src/ui/gui/data-editor.glade patch | blob | history
src/ui/gui/data-sheet.c patch | blob | history
src/ui/gui/missing-val-dialog.c patch | blob | history
src/ui/gui/syntax-editor.glade patch | blob | history
src/ui/gui/var-sheet.c patch | blob | history
tests/command/npar-binomial.sh patch | blob | history
tests/command/npar-chisquare.sh patch | blob | history
tests/command/very-long-strings.sh patch | blob | history

diff --git a/src/ui/gui/data-editor.c b/src/ui/gui/data-editor.c
index 4d7d6b5c5deec4bbcc81d5ab409b7191777f5407..fd5e491f1676294879bdf1047ac23761ff0b281b 100644 (file)
--- a/src/ui/gui/data-editor.c
+++ b/src/ui/gui/data-editor.c
@@ -135,6 +135,8 @@ new_data_editor (void)
 
   vs = PSPPIRE_VAR_STORE (gtk_sheet_get_model (var_sheet));
 
+  g_assert(vs); /* Traps a possible bug in win32 build */
+
   g_signal_connect (vs->dict, "weight-changed",
                    G_CALLBACK (on_weight_change),
                    de);
diff --git a/src/ui/gui/data-editor.glade b/src/ui/gui/data-editor.glade
index 6ce94bb253f32669f7cc01f6ac62e9f22f7e206b..ffca70121dc24bf39faab6fa543a0b01e2e3fb00 100644 (file)
--- a/src/ui/gui/data-editor.glade
+++ b/src/ui/gui/data-editor.glade
@@ -98,7 +98,6 @@
                         <property name="label">gtk-quit</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
-                        <signal name="activate" handler="on_quit1_activate"/>
                       </widget>
                     </child>
                   </widget>
@@ -256,7 +255,6 @@
                         <property name="sensitive">False</property>
                         <property name="label" translatable="yes">Insert Variable</property>
                         <property name="use_underline">True</property>
-                        <signal name="activate" handler="on_insert_variable"/>
                       </widget>
                     </child>
                     <child>
@@ -265,7 +263,6 @@
                         <property name="sensitive">False</property>
                         <property name="label" translatable="yes">Insert Cases</property>
                         <property name="use_underline">True</property>
-                        <signal name="activate" handler="on_insert_cases"/>
                       </widget>
                     </child>
                     <child>
@@ -274,7 +271,6 @@
                         <property name="sensitive">False</property>
                         <property name="label" translatable="yes">Go To Case</property>
                         <property name="use_underline">True</property>
-                        <signal name="activate" handler="on_go_to_case_activate"/>
                       </widget>
                     </child>
                     <child>
@@ -289,7 +285,6 @@
                         <property name="sensitive">False</property>
                         <property name="label" translatable="yes">Sort Cases</property>
                         <property name="use_underline">True</property>
-                        <signal name="activate" handler="on_sort_cases_activate"/>
                       </widget>
                     </child>
                     <child>
@@ -362,7 +357,6 @@
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">_Windows</property>
                 <property name="use_underline">True</property>
-                <signal name="activate" handler="on_Windows_activate"/>
                 <child>
                   <widget class="GtkMenu" id="Windows_menu">
                     <child>
@@ -370,7 +364,6 @@
                         <property name="visible">True</property>
                         <property name="label" translatable="yes">_Minimise All Windows</property>
                         <property name="use_underline">True</property>
-                        <signal name="activate" handler="on_minimiseall_activate"/>
                       </widget>
                     </child>
                   </widget>
@@ -396,7 +389,6 @@
                         <property name="visible">True</property>
                         <property name="label" translatable="yes">_About</property>
                         <property name="use_underline">True</property>
-                        <signal name="activate" handler="on_about1_activate"/>
                       </widget>
                     </child>
                   </widget>
@@ -431,7 +423,6 @@
                     <property name="visible">True</property>
                     <property name="tooltip" translatable="yes">Save</property>
                     <property name="stock_id">gtk-save</property>
-                    <signal name="clicked" handler="on_save1_activate"/>
                   </widget>
                   <packing>
                     <property name="expand">False</property>
@@ -494,7 +485,6 @@
                     <property name="sensitive">False</property>
                     <property name="tooltip" translatable="yes">Go To Case</property>
                     <property name="stock_id">gtk-jump-to</property>
-                    <signal name="clicked" handler="on_go_to_case_activate"/>
                   </widget>
                   <packing>
                     <property name="expand">False</property>
@@ -548,7 +538,6 @@
                     <property name="tooltip" translatable="yes">Insert Case</property>
                     <property name="use_underline">True</property>
                     <property name="stock_id">pspp-insert-case</property>
-                    <signal name="clicked" handler="on_insert_case_clicked"/>
                   </widget>
                   <packing>
                     <property name="expand">False</property>
@@ -625,7 +614,6 @@
                     <property name="tooltip" translatable="yes">Value Labels</property>
                     <property name="use_underline">True</property>
                     <property name="stock_id">pspp-value-labels</property>
-                    <signal name="toggled" handler="on_togglebutton_value_labels_toggled"/>
                   </widget>
                   <packing>
                     <property name="expand">False</property>
@@ -1307,7 +1295,6 @@
                 <property name="can_default">True</property>
                 <property name="label">gtk-cancel</property>
                 <property name="use_stock">True</property>
-                <signal name="clicked" handler="on_var_type_cancel_clicked" object="var_type_dialog"/>
               </widget>
               <packing>
                 <property name="position">1</property>
@@ -1537,7 +1524,6 @@
                 <property name="can_default">True</property>
                 <property name="label">gtk-ok</property>
                 <property name="use_stock">True</property>
-                <signal name="clicked" handler="gtk_widget_hide" object="val_labs_dialog"/>
               </widget>
             </child>
             <child>
@@ -1547,7 +1533,6 @@
                 <property name="can_default">True</property>
                 <property name="label">gtk-cancel</property>
                 <property name="use_stock">True</property>
-                <signal name="clicked" handler="gtk_widget_hide" object="val_labs_dialog"/>
               </widget>
               <packing>
                 <property name="position">1</property>
@@ -1844,7 +1829,6 @@
                 <property name="can_default">True</property>
                 <property name="label">gtk-ok</property>
                 <property name="use_stock">True</property>
-                <signal name="clicked" handler="gtk_widget_hide" object="val_labs_dialog"/>
                       </widget>
                     </child>
                     <child>
@@ -1854,7 +1838,6 @@
                 <property name="can_default">True</property>
                 <property name="label">gtk-cancel</property>
                 <property name="use_stock">True</property>
-                <signal name="clicked" handler="gtk_widget_hide" object="val_labs_dialog"/>
                   </widget>
                   <packing>
                     <property name="position">1</property>
diff --git a/src/ui/gui/data-sheet.c b/src/ui/gui/data-sheet.c
index 0fdba1164c27c6934ed7e764bb3d5d41e6f10748..18b4e3597818811578b14d4e3caffb7105e8ccdf 100644 (file)
--- a/src/ui/gui/data-sheet.c
+++ b/src/ui/gui/data-sheet.c
@@ -158,7 +158,7 @@ font_change_callback (GObject *obj, gpointer data)
 
 
 
-GtkWidget*
+G_MODULE_EXPORT GtkWidget*
 psppire_data_sheet_create (gchar *widget_name, gchar *string1, gchar *string2,
                           gint int1, gint int2)
 {
diff --git a/src/ui/gui/missing-val-dialog.c b/src/ui/gui/missing-val-dialog.c
index 58ff43dafbab326d3d709188d75a9a15b3b7dbc4..63403d92ae30de2033d5b37e648ab2abf03171fa 100644 (file)
--- a/src/ui/gui/missing-val-dialog.c
+++ b/src/ui/gui/missing-val-dialog.c
@@ -207,6 +207,20 @@ range (GtkToggleButton *button, gpointer data)
 }
 
 
+
+/* Callback for when the Missing Value dialog is closed using
+   the window delete button.*/
+static gint
+on_delete (GtkWidget *w, GdkEvent *e, gpointer data)
+{
+  struct missing_val_dialog *dialog = data;
+
+  gtk_widget_hide (dialog->window);
+
+  return TRUE;
+}
+
+
 /* Creates the dialog structure from the xml */
 struct missing_val_dialog *
 missing_val_dialog_create (GladeXML *xml)
@@ -228,6 +242,8 @@ missing_val_dialog_create (GladeXML *xml)
   g_signal_connect (get_widget_assert (xml, "missing_val_ok"),
                   "clicked", G_CALLBACK (missing_val_dialog_accept), dialog);
 
+  g_signal_connect (GTK_OBJECT (dialog->window), "delete-event",
+                   G_CALLBACK (on_delete), dialog);
 
   dialog->mv[0] = get_widget_assert (xml, "mv0");
   dialog->mv[1] = get_widget_assert (xml, "mv1");
diff --git a/src/ui/gui/syntax-editor.glade b/src/ui/gui/syntax-editor.glade
index c27eef445283e8527d6439375d326f8af8d93c70..64cdeabec3c43f5901fc48139fd0eb185cfcdcac 100644 (file)
--- a/src/ui/gui/syntax-editor.glade
+++ b/src/ui/gui/syntax-editor.glade
@@ -86,7 +86,6 @@
                              <property name="visible">True</property>
                              <property name="label" translatable="yes">_Syntax</property>
                              <property name="use_underline">True</property>
-                             <signal name="activate" handler="on_syntax4_activate" last_modification_time="Tue, 05 Dec 2006 01:43:21 GMT"/>
                            </widget>
                          </child>
 
@@ -233,7 +232,6 @@
              <property name="visible">True</property>
              <property name="label" translatable="yes">_Windows</property>
              <property name="use_underline">True</property>
-             <signal name="activate" handler="on_windows_activate" last_modification_time="Thu, 28 Dec 2006 00:31:09 GMT"/>
 
              <child>
                <widget class="GtkMenu" id="windows_menu">
diff --git a/src/ui/gui/var-sheet.c b/src/ui/gui/var-sheet.c
index 4ca2cf2975bddcde9e79d85015df1f6dfeb7fed6..3c26fcd1778b8f92235338ce49c431a5476f1d31 100644 (file)
--- a/src/ui/gui/var-sheet.c
+++ b/src/ui/gui/var-sheet.c
@@ -410,7 +410,7 @@ extern PsppireVarStore *the_var_store;
 
 
 /* Create the var sheet */
-GtkWidget*
+G_MODULE_EXPORT GtkWidget*
 psppire_variable_sheet_create (gchar *widget_name,
                               gchar *string1,
                               gchar *string2,
diff --git a/tests/command/npar-binomial.sh b/tests/command/npar-binomial.sh
index 5fd38156b2859942e1492036e6a22bf99773d4c8..db7b9763197da9e35cdd31553ec510195f3edb79 100755 (executable)
--- a/tests/command/npar-binomial.sh
+++ b/tests/command/npar-binomial.sh
@@ -216,9 +216,9 @@ $SUPERVISOR $PSPP --testing-mode -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare output 1"
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
 diff $TEMPDIR/pspp.list - << EOF
 P < 0.5; N1/N2 < 1
-
 1.1 NPAR TESTS.  Binomial Test
 +-+------#--------+--+--------------+----------+---------------------+
 | |      #Category| N|Observed Prop.|Test Prop.|Exact Sig. (1-tailed)|
@@ -227,9 +227,7 @@ P < 0.5; N1/N2 < 1
 | |Group2#    2.00|15|          .714|          |                     |
 | |Total #        |21|          1.00|          |                     |
 +-+------#--------+--+--------------+----------+---------------------+
-
 P < 0.5; N1/N2 > 1
-
 2.1 NPAR TESTS.  Binomial Test
 +-+------#--------+--+--------------+----------+---------------------+
 | |      #Category| N|Observed Prop.|Test Prop.|Exact Sig. (1-tailed)|
@@ -238,9 +236,7 @@ P < 0.5; N1/N2 > 1
 | |Group2#    2.00| 6|          .462|          |                     |
 | |Total #        |13|          1.00|          |                     |
 +-+------#--------+--+--------------+----------+---------------------+
-
 P < 0.5; N1/N2 = 1
-
 3.1 NPAR TESTS.  Binomial Test
 +-+------#--------+--+--------------+----------+---------------------+
 | |      #Category| N|Observed Prop.|Test Prop.|Exact Sig. (1-tailed)|
@@ -249,9 +245,7 @@ P < 0.5; N1/N2 = 1
 | |Group2#    2.00| 8|          .500|          |                     |
 | |Total #        |16|          1.00|          |                     |
 +-+------#--------+--+--------------+----------+---------------------+
-
 P > 0.5; N1/N2 < 1
-
 4.1 NPAR TESTS.  Binomial Test
 +-+------#--------+--+--------------+----------+---------------------+
 | |      #Category| N|Observed Prop.|Test Prop.|Exact Sig. (1-tailed)|
@@ -260,9 +254,7 @@ P > 0.5; N1/N2 < 1
 | |Group2#    2.00|12|          .522|          |                     |
 | |Total #        |23|          1.00|          |                     |
 +-+------#--------+--+--------------+----------+---------------------+
-
 P > 0.5; N1/N2 > 1
-
 5.1 NPAR TESTS.  Binomial Test
 +-+------#--------+--+--------------+----------+---------------------+
 | |      #Category| N|Observed Prop.|Test Prop.|Exact Sig. (1-tailed)|
@@ -271,9 +263,7 @@ P > 0.5; N1/N2 > 1
 | |Group2#    2.00| 9|          .450|          |                     |
 | |Total #        |20|          1.00|          |                     |
 +-+------#--------+--+--------------+----------+---------------------+
-
 P > 0.5; N1/N2 == 1
-
 6.1 NPAR TESTS.  Binomial Test
 +-+------#--------+--+--------------+----------+---------------------+
 | |      #Category| N|Observed Prop.|Test Prop.|Exact Sig. (1-tailed)|
@@ -282,9 +272,7 @@ P > 0.5; N1/N2 == 1
 | |Group2#    2.00|11|          .500|          |                     |
 | |Total #        |22|          1.00|          |                     |
 +-+------#--------+--+--------------+----------+---------------------+
-
 P == 0.5; N1/N2 < 1
-
 7.1 NPAR TESTS.  Binomial Test
 +-+------#--------+--+--------------+----------+---------------------+
 | |      #Category| N|Observed Prop.|Test Prop.|Exact Sig. (2-tailed)|
@@ -293,9 +281,7 @@ P == 0.5; N1/N2 < 1
 | |Group2#    2.00|15|          .652|          |                     |
 | |Total #        |23|          1.00|          |                     |
 +-+------#--------+--+--------------+----------+---------------------+
-
 P == 0.5; N1/N2 > 1
-
 8.1 NPAR TESTS.  Binomial Test
 +-+------#--------+--+--------------+----------+---------------------+
 | |      #Category| N|Observed Prop.|Test Prop.|Exact Sig. (2-tailed)|
@@ -304,9 +290,7 @@ P == 0.5; N1/N2 > 1
 | |Group2#    2.00| 6|          .333|          |                     |
 | |Total #        |18|          1.00|          |                     |
 +-+------#--------+--+--------------+----------+---------------------+
-
 P == 0.5; N1/N2 == 1
-
 9.1 NPAR TESTS.  Binomial Test
 +-+------#--------+--+--------------+----------+---------------------+
 | |      #Category| N|Observed Prop.|Test Prop.|Exact Sig. (2-tailed)|
@@ -315,7 +299,6 @@ P == 0.5; N1/N2 == 1
 | |Group2#    2.00|10|          .500|          |                     |
 | |Total #        |20|          1.00|          |                     |
 +-+------#--------+--+--------------+----------+---------------------+
-
 EOF
 if [ $? -ne 0 ] ; then fail ; fi
 
diff --git a/tests/command/npar-chisquare.sh b/tests/command/npar-chisquare.sh
index 5e2e45cf2ef7015f2bf588f0172b431425c4088b..60503a9c67a5b2034ebb6124005d324776ea06d4 100755 (executable)
--- a/tests/command/npar-chisquare.sh
+++ b/tests/command/npar-chisquare.sh
@@ -95,6 +95,7 @@ $SUPERVISOR $PSPP --testing-mode -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare output 1"
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
 diff $TEMPDIR/pspp.list - << EOF
 1.1 NPAR TESTS.  x
 +--------#----------+----------+--------+
@@ -108,7 +109,6 @@ diff $TEMPDIR/pspp.list - << EOF
 |    5.00#         1|      2.33|   -1.33|
 |Total   #        14|          |        |
 +--------#----------+----------+--------+
-
 1.2 NPAR TESTS.  y
 +--------#----------+----------+--------+
 |        #Observed N|Expected N|Residual|
@@ -119,7 +119,6 @@ diff $TEMPDIR/pspp.list - << EOF
 |    4.00#         2|      3.50|   -1.50|
 |Total   #        14|          |        |
 +--------#----------+----------+--------+
-
 1.3 NPAR TESTS.  Test Statistics
 +-----------#-----+-----+
 |           #  x  |  y  |
@@ -128,7 +127,6 @@ diff $TEMPDIR/pspp.list - << EOF
 |df         #    5|    3|
 |Asymp. Sig.# .678| .112|
 +-----------#-----+-----+
-
 2.1 NPAR TESTS.  y
 +--------#----------+----------+--------+
 |        #Observed N|Expected N|Residual|
@@ -139,7 +137,6 @@ diff $TEMPDIR/pspp.list - << EOF
 |    4.00#         2|      3.50|   -1.50|
 |Total   #        14|          |        |
 +--------#----------+----------+--------+
-
 2.2 NPAR TESTS.  Test Statistics
 +-----------#------+
 |           #   y  |
@@ -148,7 +145,6 @@ diff $TEMPDIR/pspp.list - << EOF
 |df         #     3|
 |Asymp. Sig.#  .014|
 +-----------#------+
-
 3.1 NPAR TESTS.  Frequencies
 +-----#---------------------------------------#---------------------------------------+
 |     #                   x                   #                   y                   |
@@ -160,7 +156,6 @@ diff $TEMPDIR/pspp.list - << EOF
 |3    #    4.00|         2|      1.58|     .42#    4.00|         2|      1.11|     .89|
 |Total#        |        10|          |        #        |         7|          |        |
 +-----#--------+----------+----------+--------#--------+----------+----------+--------+
-
 3.2 NPAR TESTS.  Test Statistics
 +-----------#----+-----+
 |           #  x |  y  |
@@ -169,7 +164,6 @@ diff $TEMPDIR/pspp.list - << EOF
 |df         #   2|    2|
 |Asymp. Sig.#.936| .127|
 +-----------#----+-----+
-
 EOF
 if [ $? -ne 0 ] ; then fail ; fi
 
@@ -202,6 +196,7 @@ $SUPERVISOR $PSPP --testing-mode -o raw-ascii $TESTFILE  > $TEMPDIR/output
 if [ $? -eq 0 ] ; then no_result ; fi
 
 activity="compare errors 2"
+perl -pi -e 's/^\s*$//g' $TEMPDIR/output
 diff  $TEMPDIR/output - << EOF
 error: CHISQUARE test specified 6 expected values, but 4 distinct values were encountered in variable y.
 EOF
@@ -241,6 +236,7 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="compare output 3"
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
 diff $TEMPDIR/pspp.list - <<EOF
 1.1 NPAR TESTS.  Frequencies
 +-----#---------------------------------------#---------------------------------------+
@@ -258,7 +254,6 @@ diff $TEMPDIR/pspp.list - <<EOF
 |8    #    5.00|         1|      1.50|    -.50#    5.00|         1|      1.88|    -.88|
 |Total#        |        12|          |        #        |        15|          |        |
 +-----#--------+----------+----------+--------#--------+----------+----------+--------+
-
 1.2 NPAR TESTS.  Test Statistics
 +-----------#------+------+
 |           #   x  |   y  |
@@ -267,7 +262,6 @@ diff $TEMPDIR/pspp.list - <<EOF
 |df         #     7|     7|
 |Asymp. Sig.#  .015|  .002|
 +-----------#------+------+
-
 1.3 NPAR TESTS.  Descriptive Statistics
 +-#--+-----+-----+-----+-----+
 | # N| Mean| Std.|Minim|Maxim|
@@ -276,7 +270,6 @@ diff $TEMPDIR/pspp.list - <<EOF
 |x#12|2.467|1.193|1.000|5.000|
 |y#15|2.067|1.335|1.000|5.000|
 +-#--+-----+-----+-----+-----+
-
 EOF
 if [ $? -ne 0 ] ; then fail ; fi
 
@@ -314,6 +307,7 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="compare output 4"
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
 diff $TEMPDIR/pspp.list - <<EOF
 1.1 NPAR TESTS.  Frequencies
 +-----#---------------------------------------#---------------------------------------+
@@ -331,7 +325,6 @@ diff $TEMPDIR/pspp.list - <<EOF
 |8    #    5.00|         1|      1.75|    -.75#    5.00|         0|      1.75|   -1.75|
 |Total#        |        14|          |        #        |        14|          |        |
 +-----#--------+----------+----------+--------#--------+----------+----------+--------+
-
 1.2 NPAR TESTS.  Test Statistics
 +-----------#------+------+
 |           #   x  |   y  |
@@ -340,7 +333,6 @@ diff $TEMPDIR/pspp.list - <<EOF
 |df         #     7|     7|
 |Asymp. Sig.#  .062|  .001|
 +-----------#------+------+
-
 1.3 NPAR TESTS.  Descriptive Statistics
 +-#--+-----+-----+-----+-----+
 | # N| Mean| Std.|Minim|Maxim|
@@ -349,7 +341,6 @@ diff $TEMPDIR/pspp.list - <<EOF
 |x#14|2.686|1.231|1.000|5.000|
 |y#14|1.857|1.099|1.000|4.000|
 +-#--+-----+-----+-----+-----+
-
 EOF
 if [ $? -ne 0 ] ; then fail ; fi
 
diff --git a/tests/command/very-long-strings.sh b/tests/command/very-long-strings.sh
index 020c2ffa4143e3aee49d63f80622a6266d8b2916..2cc9e0ef9927a42a985d7fc033f1af82250e74a0 100755 (executable)
--- a/tests/command/very-long-strings.sh
+++ b/tests/command/very-long-strings.sh
@@ -75,6 +75,7 @@ $SUPERVISOR $PSPP --testing-mode -o raw-ascii -e /dev/null $TESTFILE
 if [ $? -ne 0 ] ; then fail ; fi
 
 activity="compare variable display 0"
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
 diff $TEMPDIR/pspp.list - <<EOF
 1.1 DISPLAY.  
 +--------+-------------------------------------------+--------+
@@ -88,12 +89,10 @@ diff $TEMPDIR/pspp.list - <<EOF
 +--------+-------------------------------------------+--------+
 |A2000   |Format: A2000                              |       4|
 +--------+-------------------------------------------+--------+
-
        N                                                                                                                                                                                                                                                            A255                                                                                                                                                                                                                                                               A258                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            A2000
 -------- --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
     1.00 a1AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA b1BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB c1CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC 
     2.00 a2XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX b2YYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYY c2ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ 
-
 2.1 DISPLAY.  
 +--------+-------------------------------------------+--------+
 |Variable|Description                                |Position|
@@ -106,11 +105,9 @@ diff $TEMPDIR/pspp.list - <<EOF
 +--------+-------------------------------------------+--------+
 |vl2000  |Format: A2000                              |       4|
 +--------+-------------------------------------------+--------+
-
                                                                                                                                                                                                                                                           vl255                                                                                                                                                                                                                                                            vl256                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  vl1335                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           vl2000
 --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM 
-
 EOF
 if [ $? -ne 0 ] ; then fail ; fi
 
@@ -175,6 +172,7 @@ if [ $? -ne 0 ] ; then fail ; fi
 
 
 activity="compare variable display"
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
 diff $TEMPDIR/pspp.list - <<EOF
 1.1 DISPLAY.  
 +--------+-------------------------------------------+--------+
@@ -188,7 +186,6 @@ diff $TEMPDIR/pspp.list - <<EOF
 +--------+-------------------------------------------+--------+
 |d       |Format: A32767                             |       4|
 +--------+-------------------------------------------+--------+
-
 EOF
 if [ $? -ne 0 ] ; then fail ; fi
 
PSPP build tags.