New option --no-wrap.

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 0f6d74fb2c214c93fe3c591243db1e3ede10efa2..c9df294e8fb63d45e6e425f25be53d25eecf7d21 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2002-04-23  Bruno Haible  <bruno@clisp.org>
+
+       * msg*.texi, xgettext.texi: Document option --no-wrap.
+
 2002-04-22  Bruno Haible  <bruno@clisp.org>
 
        * gettext.texi (Preparing Strings): New section.

diff --git a/doc/msgattrib.texi b/doc/msgattrib.texi
index 49eb4fdfda0e04c646988c10c24e19df3aabebed..ce89de4ac3b4e5173a28748a02becf89c50c1212 100644 (file)
--- a/doc/msgattrib.texi
+++ b/doc/msgattrib.texi
@@ -144,6 +144,12 @@ Set the output page width.  Long strings in the output files will be
 split across multiple lines in order to ensure that each line's width
 (= number of screen columns) is less or equal to the given @var{number}.
 
+@item --no-wrap
+@opindex --no-wrap@r{, @code{msgattrib} option}
+Do not break long message lines.  Message lines whose width exceeds the
+output page width will not be split into several lines.  Only file reference
+lines which are wider than the output page width will be split.
+
 @item -s
 @itemx --sort-output
 @opindex -s@r{, @code{msgattrib} option}

diff --git a/doc/msgcat.texi b/doc/msgcat.texi
index 23d78b299765dbd520d631ed9fdb2dbff273a18d..795ced53ff1dc09d4f6a508f3a1b17d4b3815939 100644 (file)
--- a/doc/msgcat.texi
+++ b/doc/msgcat.texi
@@ -132,6 +132,12 @@ Set the output page width.  Long strings in the output files will be
 split across multiple lines in order to ensure that each line's width
 (= number of screen columns) is less or equal to the given @var{number}.
 
+@item --no-wrap
+@opindex --no-wrap@r{, @code{msgcat} option}
+Do not break long message lines.  Message lines whose width exceeds the
+output page width will not be split into several lines.  Only file reference
+lines which are wider than the output page width will be split.
+
 @item -s
 @itemx --sort-output
 @opindex -s@r{, @code{msgcat} option}

diff --git a/doc/msgcomm.texi b/doc/msgcomm.texi
index e65bd0731277d124fa2aa8912948104ad7f85214..79786193e3176be580e3ad89f8384333345bf15b 100644 (file)
--- a/doc/msgcomm.texi
+++ b/doc/msgcomm.texi
@@ -119,6 +119,12 @@ Set the output page width.  Long strings in the output files will be
 split across multiple lines in order to ensure that each line's width
 (= number of screen columns) is less or equal to the given @var{number}.
 
+@item --no-wrap
+@opindex --no-wrap@r{, @code{msgcomm} option}
+Do not break long message lines.  Message lines whose width exceeds the
+output page width will not be split into several lines.  Only file reference
+lines which are wider than the output page width will be split.
+
 @item -s
 @itemx --sort-output
 @opindex -s@r{, @code{msgcomm} option}

diff --git a/doc/msgconv.texi b/doc/msgconv.texi
index 5a9c227ec17586714f9efabd5f254f459202c967..c850263ef642986bc060997b96ff8b8116e3638e 100644 (file)
--- a/doc/msgconv.texi
+++ b/doc/msgconv.texi
@@ -90,6 +90,12 @@ Set the output page width.  Long strings in the output files will be
 split across multiple lines in order to ensure that each line's width
 (= number of screen columns) is less or equal to the given @var{number}.
 
+@item --no-wrap
+@opindex --no-wrap@r{, @code{msgconv} option}
+Do not break long message lines.  Message lines whose width exceeds the
+output page width will not be split into several lines.  Only file reference
+lines which are wider than the output page width will be split.
+
 @item -s
 @itemx --sort-output
 @opindex -s@r{, @code{msgconv} option}

diff --git a/doc/msgen.texi b/doc/msgen.texi
index 770e055f703b348ded02dd6fd981af2f928a6676..429407c67c3de20cf854657a9e0c975cee253226 100644 (file)
--- a/doc/msgen.texi
+++ b/doc/msgen.texi
@@ -83,6 +83,12 @@ Set the output page width.  Long strings in the output files will be
 split across multiple lines in order to ensure that each line's width
 (= number of screen columns) is less or equal to the given @var{number}.
 
+@item --no-wrap
+@opindex --no-wrap@r{, @code{msgen} option}
+Do not break long message lines.  Message lines whose width exceeds the
+output page width will not be split into several lines.  Only file reference
+lines which are wider than the output page width will be split.
+
 @item -s
 @itemx --sort-output
 @opindex -s@r{, @code{msgen} option}

diff --git a/doc/msgfilter.texi b/doc/msgfilter.texi
index 42bbd43b65c2510a125ca57a065d9d3a7f12dc20..1431c15b777566df0ccf00a5d91c9787f7c81797 100644 (file)
--- a/doc/msgfilter.texi
+++ b/doc/msgfilter.texi
@@ -135,6 +135,12 @@ Set the output page width.  Long strings in the output files will be
 split across multiple lines in order to ensure that each line's width
 (= number of screen columns) is less or equal to the given @var{number}.
 
+@item --no-wrap
+@opindex --no-wrap@r{, @code{msgfilter} option}
+Do not break long message lines.  Message lines whose width exceeds the
+output page width will not be split into several lines.  Only file reference
+lines which are wider than the output page width will be split.
+
 @item -s
 @itemx --sort-output
 @opindex -s@r{, @code{msgfilter} option}

diff --git a/doc/msggrep.texi b/doc/msggrep.texi
index 85a71d3cd87c4754a9e30cca4b56d530510b70f8..e66391a7fd76bcfdd1a84e62696e4311946cffe7 100644 (file)
--- a/doc/msggrep.texi
+++ b/doc/msggrep.texi
@@ -162,6 +162,12 @@ Set the output page width.  Long strings in the output files will be
 split across multiple lines in order to ensure that each line's width
 (= number of screen columns) is less or equal to the given @var{number}.
 
+@item --no-wrap
+@opindex --no-wrap@r{, @code{msggrep} option}
+Do not break long message lines.  Message lines whose width exceeds the
+output page width will not be split into several lines.  Only file reference
+lines which are wider than the output page width will be split.
+
 @item --sort-output
 @opindex --sort-output@r{, @code{msggrep} option}
 Generate sorted output.  Note that using this option makes it much harder

diff --git a/doc/msginit.texi b/doc/msginit.texi
index 9eb9806033a35f73022407173de96d9078330521..96aa34a87c20b24ce8b19c145484011a988978c0 100644 (file)
--- a/doc/msginit.texi
+++ b/doc/msginit.texi
@@ -62,6 +62,12 @@ Set the output page width.  Long strings in the output files will be
 split across multiple lines in order to ensure that each line's width
 (= number of screen columns) is less or equal to the given @var{number}.
 
+@item --no-wrap
+@opindex --no-wrap@r{, @code{msginit} option}
+Do not break long message lines.  Message lines whose width exceeds the
+output page width will not be split into several lines.  Only file reference
+lines which are wider than the output page width will be split.
+
 @end table
 
 @subsection Informative output

diff --git a/doc/msgmerge.texi b/doc/msgmerge.texi
index a670255f0ba750350e3cf3d9df95d58fabb0ee68..e07365581580595efa2b9b7dac655071d26e5202 100644 (file)
--- a/doc/msgmerge.texi
+++ b/doc/msgmerge.texi
@@ -159,6 +159,12 @@ Set the output page width.  Long strings in the output files will be
 split across multiple lines in order to ensure that each line's width
 (= number of screen columns) is less or equal to the given @var{number}.
 
+@item --no-wrap
+@opindex --no-wrap@r{, @code{msgmerge} option}
+Do not break long message lines.  Message lines whose width exceeds the
+output page width will not be split into several lines.  Only file reference
+lines which are wider than the output page width will be split.
+
 @item -s
 @itemx --sort-output
 @opindex -s@r{, @code{msgmerge} option}

diff --git a/doc/msgunfmt.texi b/doc/msgunfmt.texi
index 353f839a5464133565daa3a01de80094c7cd7eff..a0051bbb48338f02ad5d7a7be7a77697212de578 100644 (file)
--- a/doc/msgunfmt.texi
+++ b/doc/msgunfmt.texi
@@ -118,6 +118,12 @@ Set the output page width.  Long strings in the output files will be
 split across multiple lines in order to ensure that each line's width
 (= number of screen columns) is less or equal to the given @var{number}.
 
+@item --no-wrap
+@opindex --no-wrap@r{, @code{msgunfmt} option}
+Do not break long message lines.  Message lines whose width exceeds the
+output page width will not be split into several lines.  Only file reference
+lines which are wider than the output page width will be split.
+
 @item -s
 @itemx --sort-output
 @opindex -s@r{, @code{msgunfmt} option}

diff --git a/doc/msguniq.texi b/doc/msguniq.texi
index 9d3073096b0f83c5e0b46b61eeb49c5c8a1a7572..eb3707f016dc6e52b201faf8b9e6b8982f5135dd 100644 (file)
--- a/doc/msguniq.texi
+++ b/doc/msguniq.texi
@@ -116,6 +116,12 @@ Set the output page width.  Long strings in the output files will be
 split across multiple lines in order to ensure that each line's width
 (= number of screen columns) is less or equal to the given @var{number}.
 
+@item --no-wrap
+@opindex --no-wrap@r{, @code{msguniq} option}
+Do not break long message lines.  Message lines whose width exceeds the
+output page width will not be split into several lines.  Only file reference
+lines which are wider than the output page width will be split.
+
 @item -s
 @itemx --sort-output
 @opindex -s@r{, @code{msguniq} option}

diff --git a/doc/xgettext.texi b/doc/xgettext.texi
index 2ec9280e5b4200dc7689f4d36d4b03460c050486..9143679f8d99847b373eeef59352814022158b92 100644 (file)
--- a/doc/xgettext.texi
+++ b/doc/xgettext.texi
@@ -204,6 +204,12 @@ Set the output page width.  Long strings in the output files will be
 split across multiple lines in order to ensure that each line's width
 (= number of screen columns) is less or equal to the given @var{number}.
 
+@item --no-wrap
+@opindex --no-wrap@r{, @code{xgettext} option}
+Do not break long message lines.  Message lines whose width exceeds the
+output page width will not be split into several lines.  Only file reference
+lines which are wider than the output page width will be split.
+
 @item -s
 @itemx --sort-output
 @opindex -s@r{, @code{xgettext} option}

diff --git a/src/ChangeLog b/src/ChangeLog
index 8e9a7d0ee7a60c7b23903c740f03a8d4781a5525..70a52ad9aab701fe3a1634a62d51eeb69b38d029 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,24 @@
+2002-04-23  Bruno Haible  <bruno@clisp.org>
+
+       * write-po.h (message_page_width_ignore): New declaration.
+       * write-po.c (wrap_strings): New variable.
+       (message_page_width_ignore): New function.
+       (wrap): Ignore the do_wrap argument if wrap_strings is false.
+       * msgattrib.c (long_options): Add --no-wrap option.
+       (main): Handle option --no-wrap.
+       (usage): Document option --no-wrap.
+       * msgcat.c: Likewise.
+       * msgcomm.c: Likewise.
+       * msgconv.c: Likewise.
+       * msgen.c: Likewise.
+       * msgfilter.c: Likewise.
+       * msggrep.c: Likewise.
+       * msginit.c: Likewise.
+       * msgmerge.c: Likewise.
+       * msgunfmt.c: Likewise.
+       * msguniq.c: Likewise.
+       * xgettext.c: Likewise.
+
 2002-04-19  Bruno Haible  <bruno@clisp.org>
 
        * msginit.c (catalogname_for_locale): Add wa_BE. Change Javanese from

diff --git a/src/msgattrib.c b/src/msgattrib.c
index cb319ce86a539abf9b81ea18051a25ff53036611..05622a3288d724347f2deb9a937725cb98b9600d 100644 (file)
--- a/src/msgattrib.c
+++ b/src/msgattrib.c
@@ -81,6 +81,7 @@ static const struct option long_options[] =
   { "no-fuzzy", no_argument, NULL, CHAR_MAX + 3 },
   { "no-location", no_argument, &line_comment, 0 },
   { "no-obsolete", no_argument, NULL, CHAR_MAX + 5 },
+  { "no-wrap", no_argument, NULL, CHAR_MAX + 13 },
   { "obsolete", no_argument, NULL, CHAR_MAX + 12 },
   { "only-fuzzy", no_argument, NULL, CHAR_MAX + 4 },
   { "only-obsolete", no_argument, NULL, CHAR_MAX + 6 },
@@ -251,6 +252,10 @@ main (argc, argv)
        to_change |= RESET_OBSOLETE;
        break;
 
+      case CHAR_MAX + 13: /* --no-wrap */
+       message_page_width_ignore ();
+       break;
+
       default:
        usage (EXIT_FAILURE);
        /* NOTREACHED */
@@ -388,6 +393,8 @@ Output details:\n\
   -n, --add-location          generate '#: filename:line' lines (default)\n\
       --strict                write out strict Uniforum conforming .po file\n\
   -w, --width=NUMBER          set output page width\n\
+      --no-wrap               do not break long message lines, longer than\n\
+                              the output page width, into several lines\n\
   -s, --sort-output           generate sorted output\n\
   -F, --sort-by-file          sort output by file location\n\
 "));

diff --git a/src/msgcat.c b/src/msgcat.c
index e0d403e1810bff829ea0fda3f834311ca42410a0..35b94e0aa58afe4c6815cb040d249554b1a692de 100644 (file)
--- a/src/msgcat.c
+++ b/src/msgcat.c
@@ -61,6 +61,7 @@ static const struct option long_options[] =
   { "indent", no_argument, NULL, 'i' },
   { "no-escape", no_argument, NULL, 'e' },
   { "no-location", no_argument, &line_comment, 0 },
+  { "no-wrap", no_argument, NULL, CHAR_MAX + 2 },
   { "output-file", required_argument, NULL, 'o' },
   { "sort-by-file", no_argument, NULL, 'F' },
   { "sort-output", no_argument, NULL, 's' },
@@ -216,6 +217,10 @@ main (argc, argv)
        use_first = true;
        break;
 
+      case CHAR_MAX + 2: /* --no-wrap */
+       message_page_width_ignore ();
+       break;
+
       default:
        usage (EXIT_FAILURE);
        /* NOTREACHED */
@@ -357,6 +362,8 @@ Output details:\n\
   -n, --add-location             generate '#: filename:line' lines (default)\n\
       --strict                   write out strict Uniforum conforming .po file\n\
   -w, --width=NUMBER             set output page width\n\
+      --no-wrap                  do not break long message lines, longer than\n\
+                                 the output page width, into several lines\n\
   -s, --sort-output              generate sorted output\n\
   -F, --sort-by-file             sort output by file location\n\
 "));

diff --git a/src/msgcomm.c b/src/msgcomm.c
index 84e20e0da34047ab29f220cb115315f389284738..92542c0beed072d02263d70b107c745092319124 100644 (file)
--- a/src/msgcomm.c
+++ b/src/msgcomm.c
@@ -63,6 +63,7 @@ static const struct option long_options[] =
   { "indent", no_argument, NULL, 'i' },
   { "no-escape", no_argument, NULL, 'e' },
   { "no-location", no_argument, &line_comment, 0 },
+  { "no-wrap", no_argument, NULL, CHAR_MAX + 2 },
   { "omit-header", no_argument, NULL, CHAR_MAX + 1 },
   { "output", required_argument, NULL, 'o' }, /* for backward compatibility */
   { "output-file", required_argument, NULL, 'o' },
@@ -219,6 +220,10 @@ main (argc, argv)
        omit_header = true;
        break;
 
+      case CHAR_MAX + 2: /* --no-wrap */
+       message_page_width_ignore ();
+       break;
+
       default:
        usage (EXIT_FAILURE);
        /* NOTREACHED */
@@ -369,6 +374,8 @@ Output details:\n\
   -n, --add-location             generate '#: filename:line' lines (default)\n\
       --strict                   write out strict Uniforum conforming .po file\n\
   -w, --width=NUMBER             set output page width\n\
+      --no-wrap                  do not break long message lines, longer than\n\
+                                 the output page width, into several lines\n\
   -s, --sort-output              generate sorted output\n\
   -F, --sort-by-file             sort output by file location\n\
       --omit-header              don't write header with `msgid \"\"' entry\n\

diff --git a/src/msgconv.c b/src/msgconv.c
index 8fb98cd1f774c60f927beb37f11331bf165ecea7..49c2ccc08d7ffb39af2c326efcfa185b2a5822f9 100644 (file)
--- a/src/msgconv.c
+++ b/src/msgconv.c
@@ -22,6 +22,7 @@
 #endif
 
 #include <getopt.h>
+#include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <locale.h>
@@ -59,6 +60,7 @@ static const struct option long_options[] =
   { "indent", no_argument, NULL, 'i' },
   { "no-escape", no_argument, NULL, 'e' },
   { "no-location", no_argument, &line_comment, 0 },
+  { "no-wrap", no_argument, NULL, CHAR_MAX + 1 },
   { "output-file", required_argument, NULL, 'o' },
   { "sort-by-file", no_argument, NULL, 'F' },
   { "sort-output", no_argument, NULL, 's' },
@@ -169,6 +171,10 @@ main (argc, argv)
        }
        break;
 
+      case CHAR_MAX + 1: /* --no-wrap */
+       message_page_width_ignore ();
+       break;
+
       default:
        usage (EXIT_FAILURE);
        break;
@@ -291,6 +297,8 @@ Output details:\n\
       --add-location          preserve '#: filename:line' lines (default)\n\
       --strict                strict Uniforum output style\n\
   -w, --width=NUMBER          set output page width\n\
+      --no-wrap               do not break long message lines, longer than\n\
+                              the output page width, into several lines\n\
   -s, --sort-output           generate sorted output\n\
   -F, --sort-by-file          sort output by file location\n\
 "));

diff --git a/src/msgen.c b/src/msgen.c
index ce5e7ef63463bfc4de6750b02457b6db81727522..be800b4d71faf529e0b4efa68527bba9fb56d1d9 100644 (file)
--- a/src/msgen.c
+++ b/src/msgen.c
@@ -22,6 +22,7 @@
 #endif
 
 #include <getopt.h>
+#include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <locale.h>
@@ -54,6 +55,7 @@ static const struct option long_options[] =
   { "indent", no_argument, NULL, 'i' },
   { "no-escape", no_argument, NULL, 'e' },
   { "no-location", no_argument, &line_comment, 0 },
+  { "no-wrap", no_argument, NULL, CHAR_MAX + 1 },
   { "output-file", required_argument, NULL, 'o' },
   { "sort-by-file", no_argument, NULL, 'F' },
   { "sort-output", no_argument, NULL, 's' },
@@ -157,6 +159,10 @@ main (argc, argv)
        }
        break;
 
+      case CHAR_MAX + 1: /* --no-wrap */
+       message_page_width_ignore ();
+       break;
+
       default:
        usage (EXIT_FAILURE);
        break;
@@ -272,6 +278,8 @@ Output details:\n\
       --add-location          preserve '#: filename:line' lines (default)\n\
       --strict                strict Uniforum output style\n\
   -w, --width=NUMBER          set output page width\n\
+      --no-wrap               do not break long message lines, longer than\n\
+                              the output page width, into several lines\n\
   -s, --sort-output           generate sorted output\n\
   -F, --sort-by-file          sort output by file location\n\
 "));

diff --git a/src/msgfilter.c b/src/msgfilter.c
index fdca4bdbffd098dae0788be0fa8070bb8509cdf0..7391b69f1aa4ab163c9c1f23f4872fccab51b6c3 100644 (file)
--- a/src/msgfilter.c
+++ b/src/msgfilter.c
@@ -101,6 +101,7 @@ static const struct option long_options[] =
   { "keep-header", no_argument, &keep_header, 1 },
   { "no-escape", no_argument, NULL, CHAR_MAX + 2 },
   { "no-location", no_argument, &line_comment, 0 },
+  { "no-wrap", no_argument, NULL, CHAR_MAX + 3 },
   { "output-file", required_argument, NULL, 'o' },
   { "sort-by-file", no_argument, NULL, 'F' },
   { "sort-output", no_argument, NULL, 's' },
@@ -235,6 +236,10 @@ main (argc, argv)
        message_print_style_escape (false);
        break;
 
+      case CHAR_MAX + 3: /* --no-wrap */
+       message_page_width_ignore ();
+       break;
+
       default:
        usage (EXIT_FAILURE);
        break;
@@ -405,6 +410,8 @@ Output details:\n\
       --add-location          preserve '#: filename:line' lines (default)\n\
       --strict                strict Uniforum output style\n\
   -w, --width=NUMBER          set output page width\n\
+      --no-wrap               do not break long message lines, longer than\n\
+                              the output page width, into several lines\n\
   -s, --sort-output           generate sorted output\n\
   -F, --sort-by-file          sort output by file location\n\
 "));

diff --git a/src/msggrep.c b/src/msggrep.c
index 014f583885e322d7b3b7496cba8d8c7b81501673..0b8fbdbd7bdeb9e01354ff59ff2fc49de33ed150 100644 (file)
--- a/src/msggrep.c
+++ b/src/msggrep.c
@@ -94,6 +94,7 @@ static const struct option long_options[] =
   { "msgstr", no_argument, NULL, 'T' },
   { "no-escape", no_argument, NULL, CHAR_MAX + 3 },
   { "no-location", no_argument, &line_comment, 0 },
+  { "no-wrap", no_argument, NULL, CHAR_MAX + 6 },
   { "output-file", required_argument, NULL, 'o' },
   { "regexp", required_argument, NULL, 'e' },
   { "sort-by-file", no_argument, NULL, CHAR_MAX + 4 },
@@ -273,6 +274,10 @@ main (argc, argv)
        sort_by_msgid = true;
        break;
 
+      case CHAR_MAX + 6: /* --no-wrap */
+       message_page_width_ignore ();
+       break;
+
       default:
        usage (EXIT_FAILURE);
        break;
@@ -471,6 +476,8 @@ Output details:\n\
       --add-location          preserve '#: filename:line' lines (default)\n\
       --strict                strict Uniforum output style\n\
   -w, --width=NUMBER          set output page width\n\
+      --no-wrap               do not break long message lines, longer than\n\
+                              the output page width, into several lines\n\
       --sort-output           generate sorted output\n\
       --sort-by-file          sort output by file location\n\
 "));

diff --git a/src/msginit.c b/src/msginit.c
index 277d060c431d14ff9ee0900aed89c0fee2a01b0d..d1c4536fd4d11f56b84761e430c829107b8dc9ec 100644 (file)
--- a/src/msginit.c
+++ b/src/msginit.c
@@ -116,6 +116,7 @@ static const struct option long_options[] =
   { "input", required_argument, NULL, 'i' },
   { "locale", required_argument, NULL, 'l' },
   { "no-translator", no_argument, NULL, CHAR_MAX + 1 },
+  { "no-wrap", no_argument, NULL, CHAR_MAX + 2 },
   { "output-file", required_argument, NULL, 'o' },
   { "version", no_argument, NULL, 'V' },
   { "width", required_argument, NULL, 'w' },
@@ -238,6 +239,10 @@ main (argc, argv)
        no_translator = true;
        break;
 
+      case CHAR_MAX + 2: /* --no-wrap */
+       message_page_width_ignore ();
+       break;
+
       default:
        usage (EXIT_FAILURE);
        break;
@@ -381,6 +386,8 @@ Output details:\n\
   -l, --locale=LL_CC          set target locale\n\
       --no-translator         assume the PO file is automatically generated\n\
   -w, --width=NUMBER          set output page width\n\
+      --no-wrap               do not break long message lines, longer than\n\
+                              the output page width, into several lines\n\
 "));
       printf ("\n");
       /* xgettext: no-wrap */

diff --git a/src/msgmerge.c b/src/msgmerge.c
index 30716bb04ba027f14f90c2cd45cc60049315f022..bf45a2b2cc7194274825afcf3bb07fffacdf1aaa 100644 (file)
--- a/src/msgmerge.c
+++ b/src/msgmerge.c
@@ -87,6 +87,7 @@ static const struct option long_options[] =
   { "multi-domain", no_argument, NULL, 'm' },
   { "no-escape", no_argument, NULL, 'e' },
   { "no-location", no_argument, &line_comment, 0 },
+  { "no-wrap", no_argument, NULL, CHAR_MAX + 4 },
   { "output-file", required_argument, NULL, 'o' },
   { "quiet", no_argument, NULL, 'q' },
   { "sort-by-file", no_argument, NULL, 'F' },
@@ -252,6 +253,10 @@ main (argc, argv)
        backup_suffix_string = optarg;
        break;
 
+      case CHAR_MAX + 4: /* --no-wrap */
+       message_page_width_ignore ();
+       break;
+
       default:
        usage (EXIT_FAILURE);
        break;
@@ -462,6 +467,8 @@ Output details:\n\
       --add-location          preserve '#: filename:line' lines (default)\n\
       --strict                strict Uniforum output style\n\
   -w, --width=NUMBER          set output page width\n\
+      --no-wrap               do not break long message lines, longer than\n\
+                              the output page width, into several lines\n\
   -s, --sort-output           generate sorted output\n\
   -F, --sort-by-file          sort output by file location\n\
 "));

diff --git a/src/msgunfmt.c b/src/msgunfmt.c
index 0dbce68ae195bac552bad0f63d812f3ea4515d6d..fcfbabd9abedf709cce1f4b0481c5bc69612ef49 100644 (file)
--- a/src/msgunfmt.c
+++ b/src/msgunfmt.c
@@ -68,6 +68,7 @@ static const struct option long_options[] =
   { "java", no_argument, NULL, 'j' },
   { "locale", required_argument, NULL, 'l' },
   { "no-escape", no_argument, NULL, 'e' },
+  { "no-wrap", no_argument, NULL, CHAR_MAX + 2 },
   { "output-file", required_argument, NULL, 'o' },
   { "resource", required_argument, NULL, 'r' },
   { "sort-output", no_argument, NULL, 's' },
@@ -186,6 +187,10 @@ main (argc, argv)
        tcl_mode = true;
        break;
 
+      case CHAR_MAX + 2: /* --no-wrap */
+       message_page_width_ignore ();
+       break;
+
       default:
        usage (EXIT_FAILURE);
        break;
@@ -374,6 +379,8 @@ Output details:\n\
   -i, --indent             write indented output style\n\
       --strict             write strict uniforum style\n\
   -w, --width=NUMBER       set output page width\n\
+      --no-wrap            do not break long message lines, longer than\n\
+                           the output page width, into several lines\n\
   -s, --sort-output        generate sorted output\n\
 "));
       printf ("\n");

diff --git a/src/msguniq.c b/src/msguniq.c
index f17e008985a953b7f1df1ec1148b607142c66f7b..bc88e7eeb0a307058bdb6b1377f1940e50c2cb4a 100644 (file)
--- a/src/msguniq.c
+++ b/src/msguniq.c
@@ -59,6 +59,7 @@ static const struct option long_options[] =
   { "indent", no_argument, NULL, 'i' },
   { "no-escape", no_argument, NULL, 'e' },
   { "no-location", no_argument, &line_comment, 0 },
+  { "no-wrap", no_argument, NULL, CHAR_MAX + 2 },
   { "output-file", required_argument, NULL, 'o' },
   { "repeated", no_argument, NULL, 'd' },
   { "sort-by-file", no_argument, NULL, 'F' },
@@ -194,6 +195,10 @@ main (argc, argv)
        use_first = true;
        break;
 
+      case CHAR_MAX + 2: /* --no-wrap */
+       message_page_width_ignore ();
+       break;
+
       default:
        usage (EXIT_FAILURE);
        /* NOTREACHED */
@@ -329,6 +334,8 @@ Output details:\n\
   -n, --add-location             generate '#: filename:line' lines (default)\n\
       --strict                   write out strict Uniforum conforming .po file\n\
   -w, --width=NUMBER             set output page width\n\
+      --no-wrap                  do not break long message lines, longer than\n\
+                                 the output page width, into several lines\n\
   -s, --sort-output              generate sorted output\n\
   -F, --sort-by-file             sort output by file location\n\
 "));

diff --git a/src/write-po.c b/src/write-po.c
index 43a32ae301cb31bee288fd22aa1bbfe10fe2276e..521b741b051b8f927ba8739def52c4ad7b20e6f8 100644 (file)
--- a/src/write-po.c
+++ b/src/write-po.c
@@ -103,6 +103,18 @@ message_page_width_set (n)
 }
 
 
+/* This variable controls the extent to which the page width applies.
+   True means it applies to message strings and file reference lines.
+   False means it applies to file reference lines only.  */
+static bool wrap_strings = true;
+
+void
+message_page_width_ignore ()
+{
+  wrap_strings = false;
+}
+
+
 /* These three variables control the output style of the message_print
    function.  Interface functions for them are to be used.  */
 static bool indent = false;
@@ -487,7 +499,7 @@ internationalized messages should not contain the `\\%c' escape sequence"),
       startcol_after_break++;
 
       /* The line width.  Allow room for the closing quote character.  */
-      width = (do_wrap == no ? INT_MAX : page_width) - 1;
+      width = (wrap_strings && do_wrap != no ? page_width : INT_MAX) - 1;
       /* Adjust for indentation of subsequent lines.  */
       width -= startcol_after_break;
 

diff --git a/src/write-po.h b/src/write-po.h
index 1a655273947084114ef82d4983b6af363d54df04..3896c97b557614a09e51c5227c6fb4669b02d6a5 100644 (file)
--- a/src/write-po.h
+++ b/src/write-po.h
@@ -1,5 +1,5 @@
 /* GNU gettext - internationalization aids
-   Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1995-1998, 2000-2002 Free Software Foundation, Inc.
 
    This file was written by Peter Miller <millerp@canb.auug.org.au>
 
@@ -26,7 +26,8 @@
 
 extern void
        message_page_width_set PARAMS ((size_t width));
-
+extern void
+       message_page_width_ignore PARAMS ((void));
 extern void
        message_print_style_indent PARAMS ((void));
 extern void

diff --git a/src/xgettext.c b/src/xgettext.c
index 07bd3e90b0215dc237408f1081295bbf7142416f..eed8f628fbcf16608e65419d2d65eb6627395bfd 100644 (file)
--- a/src/xgettext.c
+++ b/src/xgettext.c
@@ -135,6 +135,7 @@ static const struct option long_options[] =
   { "msgstr-suffix", optional_argument, NULL, 'M' },
   { "no-escape", no_argument, NULL, 'e' },
   { "no-location", no_argument, &line_comment, 0 },
+  { "no-wrap", no_argument, NULL, CHAR_MAX + 3 },
   { "omit-header", no_argument, &xgettext_omit_header, 1 },
   { "output", required_argument, NULL, 'o' },
   { "output-dir", required_argument, NULL, 'p' },
@@ -361,6 +362,9 @@ main (argc, argv)
       case CHAR_MAX + 2:       /* --foreign-user */
        copyright_holder = "";
        break;
+      case CHAR_MAX + 3:       /* --no-wrap */
+       message_page_width_ignore ();
+       break;
       default:
        usage (EXIT_FAILURE);
        /* NOTREACHED */
@@ -601,6 +605,8 @@ Output details:\n\
   -n, --add-location             generate '#: filename:line' lines (default)\n\
       --strict                   write out strict Uniforum conforming .po file\n\
   -w, --width=NUMBER             set output page width\n\
+      --no-wrap                  do not break long message lines, longer than\n\
+                                 the output page width, into several lines\n\
   -s, --sort-output              generate sorted output\n\
   -F, --sort-by-file             sort output by file location\n\
       --omit-header              don't write header with `msgid \"\"' entry\n\