* format.c (fmt_dollar_template): Use user's decimal point

	character.  Add assertion.

diff --git a/src/data/ChangeLog b/src/data/ChangeLog
index 44cd03eef9ded68572e429c183c56902ff9c24c7..4f72a217e864169d464c9129f3708e1f6957e135 100644 (file)
--- a/src/data/ChangeLog
+++ b/src/data/ChangeLog
@@ -1,3 +1,8 @@
+Sat Dec  9 20:04:22 2006  Ben Pfaff  <blp@gnu.org>
+
+       * format.c (fmt_dollar_template): Use user's decimal point
+       character.  Add assertion.
+
 Sat Dec  9 20:02:25 2006  Ben Pfaff  <blp@gnu.org>
 
        * format.c (fmt_dollar_template): New function, based on

diff --git a/src/data/format.c b/src/data/format.c
index e2b163a5097549625637954087e1688a740f56ca..fef7c1c3e4d6aa0d7210118584fb38d183a86439 100644 (file)
--- a/src/data/format.c
+++ b/src/data/format.c
@@ -597,6 +597,8 @@ fmt_dollar_template (const struct fmt_spec *fmt)
   struct string s = DS_EMPTY_INITIALIZER;
   int c;
 
+  assert (fmt->type == FMT_DOLLAR);
+
   ds_put_char (&s, '$');
   for (c = MAX (fmt->w - fmt->d - 1, 0); c > 0; )
     {
@@ -609,7 +611,7 @@ fmt_dollar_template (const struct fmt_spec *fmt)
     }
   if (fmt->d > 0) 
     {
-      ds_put_char (&s, '.');
+      ds_put_char (&s, fmt_decimal_char (fmt->type));
       ds_put_char_multiple (&s, '#', fmt->d);
     }