-F/--force-define and relative %define/-D/--define priorities.

* NEWS (2.5): Add documentation to -D/--define entry.
* build-aux/cross-options.pl: Hard-code association of
--force-define with %define.
* doc/bison.texinfo (Decl Summary): In %define entry,
cross-reference command-line options.
(Bison Options): Add documentation to -D/--define entry.
(Option Cross Key): Widen column for --force-define row.
* src/getargs.c (usage): Document -F/--force-define.  Realign
options in output.
(short_options, long_options, getargs): Parse -F/--force-define,
and update muscle_percent_define_insert invocations.
* src/muscle-tab.h (muscle_percent_define_how): New enum type.
(muscle_percent_define_insert): Add argument with that type.
* src/muscle-tab.c (muscle_percent_define_insert): Implement
-F/--force-define behavior and priorities.
(muscle_percent_define_ensure): Update
muscle_percent_define_insert invocation.
* src/parse-gram.y (prologue_declaration): Update
muscle_percent_define_insert invocations.
* tests/input.at (`%define, --define'): Rename to...
(`%define, --define, --force-define'): ... this and extend.
(cherry picked from commit 34d419381579dd30642e5646aaeaece36207be94)

Conflicts:

	src/getargs.c
	src/parse-gram.c
	src/parse-gram.h
	src/parse-gram.y

1 files changed, 5 insertions, 1 deletions

diff --git a/build-aux/cross-options.pl b/build-aux/cross-options.pl
index 241c741b..7762e276 100755
--- a/build-aux/cross-options.pl
+++ b/build-aux/cross-options.pl
@@ -22,7 +22,11 @@ while (<STDIN>)
 	$short = '' if ! defined $short;
 	$short = '-d' if $long eq '--defines' && ! $short;
 	my $dir = '%' . substr($long, 2);
-	$dir = '' if index ($scanner, "\"$dir\"") < 0;
+	if (index ($scanner, "\"$dir\"") < 0)
+	{
+	  if ($long eq '--force-define') { $dir = '%define'; }
+	  else { $dir = ''; }
+	}
 	if ($arg)
 	{
             # if $opt, $arg contains the closing ].