Re: [PATCH] -F/--force-define and relative %define/-D/--define priorities.

[Joel E. Denny]

On Wed, 17 Jun 2009, Akim Demaille wrote:

> We tried to stick to the so called Gnits standards, which are stronger
> than the GNU standards, and that "mandate" a two-space column
> separation by set of options (there is no need to align them all, just
> by group).  Visually, I think it is really too large here.

Ok, thanks.  I reverted the realignment in the otherwise unmodified 
groups.

> Not to mention the additional work for translators here.

Before my previous change, the last group had a three-space column, so I 
reverted to that to avoid making work for the translators.

I pushed this to branch-2.5 and master.

>From 620b2e3691598e057e24a7965fd268d0495cf9f5 Mon Sep 17 00:00:00 2001
From: Joel E. Denny <address@hidden>
Date: Wed, 15 Jul 2009 04:21:00 -0400
Subject: [PATCH] Revert unnecessary column realignment in --help output.

Reported by Akim Demaille at
<http://lists.gnu.org/archive/html/bison-patches/2009-06/msg00010.html>.
* src/getargs.c (usage): Here.

diff --git a/src/getargs.c b/src/getargs.c
index 322e0b4..876130e 100644
--- a/src/getargs.c
+++ b/src/getargs.c
@@ -272,12 +272,12 @@ The same is true for optional arguments.\n\
       fputs (_("\
 \n\
 Operation modes:\n\
-  -h, --help                       display this help and exit\n\
-  -V, --version                    output version information and exit\n\
-      --print-localedir            output directory of locale-dependent data\n\
-      --print-datadir              output directory of skeletons and XSLT\n\
-  -y, --yacc                       emulate POSIX Yacc\n\
-  -W, --warnings[=CATEGORY]        report the warnings falling in CATEGORY\n\
+  -h, --help                 display this help and exit\n\
+  -V, --version              output version information and exit\n\
+      --print-localedir      output directory containing locale-dependent 
data\n\
+      --print-datadir        output directory containing skeletons and XSLT\n\
+  -y, --yacc                 emulate POSIX Yacc\n\
+  -W, --warnings[=CATEGORY]  report the warnings falling in CATEGORY\n\
 \n\
 "), stdout);
 
@@ -300,16 +300,16 @@ Parser:\n\
        * won't assume that -d also takes an argument.  */
       fputs (_("\
 Output:\n\
-      --defines[=FILE]             also produce a header file\n\
-  -d                               likewise but cannot specify FILE (for 
POSIX)\n\
-  -r, --report=THINGS              also produce details on the automaton\n\
-      --report-file=FILE           write report to FILE\n\
-  -v, --verbose                    same as `--report=state'\n\
-  -b, --file-prefix=PREFIX         specify a PREFIX for output files\n\
-  -o, --output=FILE                leave output to FILE\n\
-  -g, --graph[=FILE]               also output a graph of the automaton\n\
-  -x, --xml[=FILE]                 also output an XML report of the 
automaton\n\
-                                   (the XML schema is experimental)\n\
+      --defines[=FILE]       also produce a header file\n\
+  -d                         likewise but cannot specify FILE (for POSIX 
Yacc)\n\
+  -r, --report=THINGS        also produce details on the automaton\n\
+      --report-file=FILE     write report to FILE\n\
+  -v, --verbose              same as `--report=state'\n\
+  -b, --file-prefix=PREFIX   specify a PREFIX for output files\n\
+  -o, --output=FILE          leave output to FILE\n\
+  -g, --graph[=FILE]         also output a graph of the automaton\n\
+  -x, --xml[=FILE]           also output an XML report of the automaton\n\
+                             (the XML schema is experimental)\n\
 \n\
 "), stdout);
 
-- 
1.5.4.3