Change make_format_description_string, make_c_width_description_string to

not emit a space.

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index db7d1cc6c2d22d3f87eaf2576be8ee5a7c68b7e5..fe9ea423e4593938a48867d23d6a4deb7b804178 100644 (file)
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,10 @@
+2006-11-26  Bruno Haible  <bruno@clisp.org>
+
+       * write-po.c (make_format_description_string,
+       make_c_width_description_string): Strip off the leading space.
+       (message_print_comment_flags): Print the space here.
+       * write-stringtable.c (write_message): Print the space here.
+
 2006-11-26  Bruno Haible  <bruno@clisp.org>
 
        * write-po.c: Include write-catalog.h instead of write-properties.h,

diff --git a/gettext-tools/src/write-po.c b/gettext-tools/src/write-po.c
index 43cad659ff00a4aba12dba54f59cf8d5f3de867e..801040a94f61ca67561de3277b7f68f4b8c26d44 100644 (file)
--- a/gettext-tools/src/write-po.c
+++ b/gettext-tools/src/write-po.c
@@ -74,16 +74,16 @@ make_format_description_string (enum is_format is_format, const char *lang,
     case possible:
       if (debug)
        {
-         sprintf (result, " possible-%s-format", lang);
+         sprintf (result, "possible-%s-format", lang);
          break;
        }
       /* FALLTHROUGH */
     case yes_according_to_context:
     case yes:
-      sprintf (result, " %s-format", lang);
+      sprintf (result, "%s-format", lang);
       break;
     case no:
-      sprintf (result, " no-%s-format", lang);
+      sprintf (result, "no-%s-format", lang);
       break;
     default:
       /* The others have already been filtered out by significant_format_p.  */
@@ -127,10 +127,10 @@ make_c_width_description_string (enum is_wrap do_wrap)
   switch (do_wrap)
     {
     case yes:
-      result = " wrap";
+      result = "wrap";
       break;
     case no:
-      result = " no-wrap";
+      result = "no-wrap";
       break;
     default:
       abort ();
@@ -299,6 +299,7 @@ message_print_comment_flags (const message_ty *mp, ostream_t stream, bool debug)
            if (!first_flag)
              ostream_write_str (stream, ",");
 
+           ostream_write_str (stream, " ");
            ostream_write_str (stream,
                               make_format_description_string (mp->is_format[i],
                                                               format_language[i],
@@ -311,6 +312,7 @@ message_print_comment_flags (const message_ty *mp, ostream_t stream, bool debug)
          if (!first_flag)
            ostream_write_str (stream, ",");
 
+         ostream_write_str (stream, " ");
          ostream_write_str (stream,
                             make_c_width_description_string (mp->do_wrap));
          first_flag = false;

diff --git a/gettext-tools/src/write-stringtable.c b/gettext-tools/src/write-stringtable.c
index cd4709b60c746dc5e2bd0b5f4cfab9d5c087305f..283828bef2fbf6a9f99d94caf864a65dadb06b71 100644 (file)
--- a/gettext-tools/src/write-stringtable.c
+++ b/gettext-tools/src/write-stringtable.c
@@ -216,7 +216,7 @@ write_message (ostream_t stream, const message_ty *mp,
     for (i = 0; i < NFORMATS; i++)
       if (significant_format_p (mp->is_format[i]))
        {
-         ostream_write_str (stream, "/* Flag:");
+         ostream_write_str (stream, "/* Flag: ");
          ostream_write_str (stream,
                             make_format_description_string (mp->is_format[i],
                                                             format_language[i],