From: Bruno Haible <bruno@clisp.org>
Date: Mon, 27 Nov 2006 12:49:05 +0000 (+0000)
Subject: Change make_format_description_string, make_c_width_description_string to
X-Git-Tag: v0.17~630
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4fa8d6f3a3f23a7b5757a6c9d17bcb9b039d8e7b;p=thirdparty%2Fgettext.git

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 db7d1cc6c..fe9ea423e 100644
--- 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 43cad659f..801040a94 100644
--- 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 cd4709b60..283828bef 100644
--- 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],