csv: Change footnote format.

diff --git a/src/output/csv.c b/src/output/csv.c
index bde8711314f7384c44906c7cc4f05cb0fa4ea218..4940d3c18cf1a212df3b610214d085b9c349dce2 100644 (file)
--- a/src/output/csv.c
+++ b/src/output/csv.c
@@ -264,13 +264,11 @@ csv_submit (struct output_driver *driver,
       size_t n_footnotes = table_collect_footnotes (table_item, &f);
       if (n_footnotes)
         {
-          fputs ("\nFootnotes:\n", csv->file);
-
           for (size_t i = 0; i < n_footnotes; i++)
             {
-              csv_output_field (csv, f[i]->marker);
-              fputs (csv->separator, csv->file);
-              csv_output_field (csv, f[i]->content);
+              char *s = xasprintf ("Footnote: %s. %s", f[i]->marker, f[i]->content);
+              csv_output_field (csv, s);
+              free (s);
               putc ('\n', csv->file);
             }
 

diff --git a/tests/language/stats/correlations.at b/tests/language/stats/correlations.at
index 1662ee7499673dd8e41cee50f081470859932ded..9a24da63f2287ce6847a9f83599e40d0e605aab1 100644 (file)
--- a/tests/language/stats/correlations.at
+++ b/tests/language/stats/correlations.at
@@ -61,9 +61,7 @@ wiz,Pearson Correlation,.890[a],.519,1.000,-.344
 ,Sig. (2-tailed),.017,.291,,.505
 bang,Pearson Correlation,-.308,.118,-.344,1.000
 ,Sig. (2-tailed),.553,.824,.505,
-
-Footnotes:
-a,Significant at .05 level
+Footnote: a. Significant at .05 level
 
 Table: Correlations
 ,,bar,wiz
@@ -86,9 +84,7 @@ wiz,Pearson Correlation,.883[a],.497,1.000,-.337
 bang,Pearson Correlation,-.308,.164,-.337,1.000
 ,Sig. (2-tailed),.553,.725,.460,
 ,N,6,7,7,7
-
-Footnotes:
-a,Significant at .05 level
+Footnote: a. Significant at .05 level
 ]])
 AT_CLEANUP
 
@@ -357,9 +353,7 @@ var2,Pearson Correlation,.3792[a],-.0407
 var3,Pearson Correlation,.3699[a],-.0543
 ,Sig. (2-tailed),.000,.603
 ,N,95,94
-
-Footnotes:
-a,Significant at .05 level
+Footnote: a. Significant at .05 level
 
 Table: Correlations
 ,,var1,var2
@@ -372,9 +366,7 @@ var4,Pearson Correlation,.5693[a],.3792[a]
 var5,Pearson Correlation,-.0519,-.0407
 ,Sig. (2-tailed),.623,.698
 ,N,92,93
-
-Footnotes:
-a,Significant at .05 level
+Footnote: a. Significant at .05 level
 ]])
 
 AT_CLEANUP

diff --git a/tests/language/stats/examine.at b/tests/language/stats/examine.at
index f22a4f5ce4d59c27df83446653397d9a018c98b7..6c76b62d6da04079236f72dfa6fd3590db48a9b4 100644 (file)
--- a/tests/language/stats/examine.at
+++ b/tests/language/stats/examine.at
@@ -860,9 +860,7 @@ x,.,4,100.0%,0,.0%,4,100.0%
 ,2,9,100.0%,0,.0%,9,100.0%
 ,9[a],4,100.0%,0,.0%,4,100.0%
 ,99[a],5,100.0%,0,.0%,5,100.0%
-
-Footnotes:
-a,User-missing value.
+Footnote: a. User-missing value.
 
 Table: Extreme Values
 ,g,,,Case Number,Value
@@ -916,9 +914,7 @@ x,.,Highest,1,31,4004
 ,,,3,25,701
 ,,,4,26,801
 ,,,5,27,901
-
-Footnotes:
-a,User-missing value.
+Footnote: a. User-missing value.
 ]])
 
 AT_CLEANUP

diff --git a/tests/output/render.at b/tests/output/render.at
index 67e3290b76cb552387c4c612894d8d97be8b285f..2bdac10f4602ddf03914137ecf23569bd7b91da5 100644 (file)
--- a/tests/output/render.at
+++ b/tests/output/render.at
@@ -262,13 +262,11 @@ f[b]"
 h
 i[c][d][e]",j,
 ,klm,
-
-Footnotes:
-a,Approximation.
-b,This is a very long footnote that will have to wrap from one line to the next.  Let's see if the rendering engine does it acceptably.
-c,One
-d,Two
-e,Three
+Footnote: a. Approximation.
+Footnote: b. This is a very long footnote that will have to wrap from one line to the next.  Let's see if the rendering engine does it acceptably.
+Footnote: c. One
+Footnote: d. Two
+Footnote: e. Three
 ]])
 AT_CLEANUP
 

diff --git a/tests/perl-module.at b/tests/perl-module.at
index 58b3900cdfe1d04d4b4b57860bbf8445b2737c6e..5466dbc8b68cdb39e72eee19ec735b2c5054fc39 100644 (file)
--- a/tests/perl-module.at
+++ b/tests/perl-module.at
@@ -479,9 +479,7 @@ A Short String Variable,1111,ones
 A Numeric Variable,1,Unity
 ,2,Duality
 ,3,Thripality
-
-Footnotes:
-a,User-missing value
+Footnote: a. User-missing value
 
 Table: Variable and Dataset Attributes
 Variable and Name,,Value
@@ -516,9 +514,7 @@ A Short String Variable,1111,ones
 A Numeric Variable,1,Unity
 ,2,Duality
 ,3,Thripality
-
-Footnotes:
-a,User-missing value
+Footnote: a. User-missing value
 
 Table: Variable and Dataset Attributes
 Variable and Name,,Value