* groffer.sh:

Fix `source' mode.

* groffer.man:
Fix some indentations.

4 files changed, 30 insertions, 12 deletions

diff --git a/contrib/groffer/ChangeLog b/contrib/groffer/ChangeLog
index 2b8a3b71..d69e8a72 100644
--- a/contrib/groffer/ChangeLog
+++ b/contrib/groffer/ChangeLog
@@ -1,3 +1,11 @@
+2002-06-25  Bernd Warken  <bwarken@mayn.de>
+
+	* groffer.sh:
+	Fix `source' mode.
+
+	* groffer.man:
+	Fix some indentations.
+
 2002-06-23  Bernd Warken  <bwarken@mayn.de>
 	________________________________________________________________
 	* release of groffer 0.8
diff --git a/contrib/groffer/TODO b/contrib/groffer/TODO
index a4475809..550ca7d1 100644
--- a/contrib/groffer/TODO
+++ b/contrib/groffer/TODO
@@ -2,7 +2,7 @@
 
 # File position: <groff-source>/contrib/groffer/TODO
 
-# Last update: 23 June 2002
+# Last update: 25 June 2002
 
 # Copyright (C) 2001,2002 Free Software Foundation, Inc.
 # Written by Bernd Warken <bwarken@mayn.de>
@@ -38,6 +38,7 @@ Features:
 - Consider using `shopt' (OOP for `sh').
 - Revise option handling of `grog'.
 - `gxditview' needs a complete shower.
+- Write an interface for choosing between different calling shells.
 
 Revision:
 - Should there be a native implementation for `--apropos'?
@@ -46,6 +47,7 @@ Revision:
   but it is good enough for the script so far.
 - Consider to replace string_sed_s() and friends in favor of native sed
   commands or to write suitable C++ utils.
+- The debug function stack is buggy (no effect on normal operation).
 
 Documentation:
 - Write a README file.
diff --git a/contrib/groffer/groffer.man b/contrib/groffer/groffer.man
index 09e1cb9b..a3938848 100644
--- a/contrib/groffer/groffer.man
+++ b/contrib/groffer/groffer.man
@@ -15,7 +15,7 @@ groffer.1 - man page for groffer (section 1).
 File position: <groff_source_top>/contrib/groffer/groffer.man
 
 Version     : groffer 0.8
-Last update : 23 June 2002
+Last update : 25 June 2002
 
 This file is part of groff, the GNU roff type-setting system.
 
@@ -642,8 +642,9 @@ If none of these options is used groffer tries to find a suitable
 display mode automatically.
 .
 .
-.P
 .RS
+.
+.P
 .Opt_[alt] - Q -- source
 .Opt_[alt] - T -- device device
 .Opt_[alt] -- debug
@@ -671,7 +672,6 @@ Toolkit options with a single leading minus; see
 .
 .
 .P
-.RS
 .Opt_[alt] -- bd
 .Opt_[alt] -- bg -- background
 .Opt_[alt] -- bw
@@ -683,6 +683,7 @@ Toolkit options with a single leading minus; see
 .Opt_[alt] -- rv
 .Opt_[alt] -- title string
 .Opt_[alt] -- xrm X_resource
+.
 .RE
 .
 .
@@ -696,7 +697,9 @@ groffer are transparently passed to groff.
 Due to the automatism in groffer, none of these groff options should
 be necessary, except for advanced usage.
 .
+.
 .RS
+.
 .P
 Because of the special outputting behavior of the groff options
 .Opt_short V,
@@ -720,6 +723,7 @@ Useful groff formatting options include
 .I tty
 and
 .IR x ).
+.
 .RE
 .
 .
@@ -732,8 +736,9 @@ They are compatible with the long options of the
 program.
 .
 .
-.P
 .RS
+.
+.P
 .Opt_[alt] -- all
 .Opt_[alt] -- ascii
 .Opt_[alt] -- apropos
@@ -749,8 +754,9 @@ program.
 .Opt_[alt] -- systems sys1,sys2,\*[Ellipsis]
 .Opt_[alt] -- troff-device device
 .Opt_[alt] -- whatis
-.RE
 .
+.
+.P
 The GNU
 .I man
 long options that are not mentioned are recognized, but they are just
@@ -763,6 +769,8 @@ see
 .BR man (1)
 if your system has GNU man installed.
 .
+.RE
+.
 .
 .TP
 .I filespec
@@ -1005,7 +1013,7 @@ This behavior can be changed by setting the environment variable
 to a non-empty value; in this case, option processing is stopped as
 soon as the first non-option argument is found.
 .
-For example, in POSIXLY_CORRECT mode, the command line
+For example, in posixly correct mode, the command line
 .Shell_cmd "groffer file1 -a -o arg file 2"
 is equivalent to
 .Shell_cmd "groffer -- file1 -a -o arg file 2"
@@ -2633,7 +2641,7 @@ mode.
 .BR gv (1)
 .TP+
 .BR ghostview (1)
-.TP
+.TP+
 .BR gs (1)
 Viewers for groffer's
 .I ps
@@ -2642,7 +2650,7 @@ mode.
 .TP
 .BR gxditview (@MAN1EXT@)
 .TP+
-.BR xditview (1)
+.BR xditview (1x)
 Viewers for groffer's
 .I x
 mode.
diff --git a/contrib/groffer/groffer.sh b/contrib/groffer/groffer.sh
index 1269b11b..af844f45 100644
--- a/contrib/groffer/groffer.sh
+++ b/contrib/groffer/groffer.sh
@@ -30,7 +30,7 @@ export _LAST_UPDATE;
 
 _PROGRAM_NAME='groffer';
 _PROGRAM_VERSION='0.8';
-_LAST_UPDATE='23 June 2002';
+_LAST_UPDATE='25 June 2002';
 
 export _DEBUG;
 _DEBUG='no';			# disable debugging information
@@ -3940,8 +3940,8 @@ main_set_mode()
     eval "${return_ok}";
   fi;
 
-  if is_equal "${_DISPLAY_MODE}" 'source'; then
-    _DISPLAY_MODE="${_OPT_MODE}";
+  if is_equal "${_OPT_MODE}" 'source'; then
+    _DISPLAY_MODE='source';
     eval "${return_ok}";
   fi;