summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--PROBLEMS79
-rw-r--r--contrib/groffer/groffer.man10
-rw-r--r--contrib/mom/groff_mom.man7
-rw-r--r--man/groff.man6
-rw-r--r--man/groff_char.man7
-rw-r--r--man/groff_diff.man6
-rw-r--r--man/groff_font.man15
-rw-r--r--man/groff_out.man7
-rw-r--r--man/groff_tmac.man7
-rw-r--r--man/roff.man6
-rw-r--r--src/devices/grodvi/grodvi.man4
-rw-r--r--src/devices/grops/grops.man5
-rw-r--r--src/devices/grotty/grotty.man6
-rw-r--r--src/preproc/grn/grn.man21
-rw-r--r--src/roff/groff/groff.man6
-rw-r--r--src/roff/troff/troff.man10
-rw-r--r--tmac/groff_ms.man7
-rw-r--r--tmac/groff_trace.man4
-rw-r--r--tmac/groff_www.man5
20 files changed, 199 insertions, 26 deletions
diff --git a/ChangeLog b/ChangeLog
index e952506b..8f163415 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-07-18 Werner LEMBERG <wl@gnu.org>
+
+ * *.man: Switch to non-compatibility mode temporarily if GNU
+ syntax extensions are used in the particular man page.
+
+ * PROBLEMS: Add solutions for SGR problems.
+
2003-07-17 Werner LEMBERG <wl@gnu.org>
Don't ignore grotty's command line options if \X'tty: sgr ...' is
diff --git a/PROBLEMS b/PROBLEMS
index c287a9c9..26d98463 100644
--- a/PROBLEMS
+++ b/PROBLEMS
@@ -11,6 +11,85 @@ Generic Problems
+* Displaying a man page on a terminal with/without my favourite pager
+ only gives garbage.
+
+groff by default now uses SGR escape sequences (`ANSI color') to
+control the display attributes (bold, underlined, colour) on TTYs.
+Some terminals (e.g. `kterm') don't understand SGR, and some pagers
+(e.g. older versions of `less' or `less' without the -R option) don't
+understand SGR either. There are three solutions to fix this, in order
+of preference; please read the grotty man page for more details.
+
+The fourth and probably best option is to update your terminal program
+and pager to versions which can handle SGR.
+
+ 1. Set the GROFF_NO_SGR environment variable.
+
+ 2. Pass option -c to grotty.
+
+ 3. Append the following fragment to the `troffrc' file:
+
+
+--- start ---
+.if n \{\
+. nr _C \n(.C
+. cp 0
+.
+. \" The following code sets a top-of-page trap to disable grotty's TTY
+. \" mode. Since neither \X nor .output can be used before the first
+. \" page has started, we must use a trap. To make it work with troff's
+. \" -o option, we wait until the first printed page.
+.
+. de sgr@dummy
+. .
+.
+. rn wh wh@old
+.
+. \" The stand-alone version. If no other trap is set, we can safely
+. \" insert the truncated vertical space caused by the trap (if any).
+. \" Otherwise we assume that the document's main macro package takes
+. \" care of that. As soon as the trap has been executed, it is removed.
+. de1 no@sgr
+. if \\n[.P] \{\
+. if (\\n[.t] == \\n[.p]) \{\
+. rn wh@old wh
+. rm no@sgr
+. wh 0
+. sp \\n[.trunc]
+. nop \X'tty: sgr 0'
+. sp -1
+. \}\}
+. .
+.
+. wh@old 0 no@sgr
+.
+. \" The piggyback version to be appended to macros planted with the
+. \" modified h' request.
+. de1 no@sgr1
+. if \\n[.P] \{\
+. rn wh@old wh
+. ds no@sgr1
+. nop \X'tty: sgr 0'
+. sp -1
+. \}
+. .
+.
+. \" We redefine the h' request so that o@sgr1' is appended to
+. \" the trap macro.
+. de1 wh
+. am1 \\$2 sgr@dummy
+. no@sgr1
+. sgr@dummy
+. wh@old \\$1 \\$2
+. .
+.
+. cp \n[_C]
+.\}
+--- end ---
+
+----------------------------------------------------------------------
+
* My document says that the current year is 19100, not 2000.
In groff, as in traditional troff, the yr number register yields the
diff --git a/contrib/groffer/groffer.man b/contrib/groffer/groffer.man
index da6a5325..6d76db41 100644
--- a/contrib/groffer/groffer.man
+++ b/contrib/groffer/groffer.man
@@ -16,11 +16,11 @@ Source file position: <groff_source_top>/contrib/groffer/groffer.man
Installed position: $prefix/share/man/man1/groffer.1
Version : groffer 0.9.2
-Last update : 13 Oct 2002
+Last update : 17 Jul 2003
This file is part of groff, the GNU roff type-setting system.
-Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
Written by Bernd Warken <bwarken@mayn.de>
Permission is granted to copy, distribute and/or modify this document
@@ -37,6 +37,9 @@ FDL in the main directory of the groff source package.
.\" Setup
.\" --------------------------------------------------------------------
.
+.do nr groffer_C \n[.C]
+.cp 0
+.
.mso www.tmac
.
.if n \{\
@@ -2711,7 +2714,7 @@ supported by groffer.
.SH "AUTHOR"
.\" --------------------------------------------------------------------
.
-Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
.
.P
This document is distributed under the terms of the FDL (GNU Free
@@ -2729,6 +2732,7 @@ the GNU roff distribution.
It was written by
.MTO bwarken@mayn.de "Bernd Warken" .
.
+.cp \n[groffer_C]
.
\" --------------------------------------------------------------------
.\" Emacs settings
diff --git a/contrib/mom/groff_mom.man b/contrib/mom/groff_mom.man
index dea6a91d..e3db758f 100644
--- a/contrib/mom/groff_mom.man
+++ b/contrib/mom/groff_mom.man
@@ -1,7 +1,7 @@
.ig
This file is part of groff, the GNU roff type-setting system.
-Copyright (C) 2002 Free Software Foundation, Inc.
+Copyright (C) 2002, 2003 Free Software Foundation, Inc.
written by Werner Lemberg <wl@gnu.org>
Permission is granted to copy, distribute and/or modify this document
@@ -14,6 +14,9 @@ A copy of the Free Documentation License is included as a file called
FDL in the main directory of the groff source package.
..
.
+.do nr groff_mom_C \n[.C]
+.cp 0
+.
.mso www.tmac
.
.de TQ
@@ -90,6 +93,8 @@ Please send bug reports to the
.MTO bug-groff@gnu.org "groff bug mailing list"
or directly to the author.
.
+.cp \n[groff_mom_C]
+.
.\" Local Variables:
.\" mode: nroff
.\" End:
diff --git a/man/groff.man b/man/groff.man
index 7ee821e6..fa35aa09 100644
--- a/man/groff.man
+++ b/man/groff.man
@@ -2,7 +2,7 @@
.ig
groff.man
-Last update: 15 May 2003
+Last update: 15 Jul 2003
This file is part of groff, the GNU roff type-setting system.
@@ -24,6 +24,9 @@ FDL in the main directory of the groff source package.
.\" Setup
.\" --------------------------------------------------------------------
.
+.do nr groff_C \n[.C]
+.cp 0
+.
.mso www.tmac
.
.if n \{\
@@ -3492,6 +3495,7 @@ pointers to further documentation.
"Nroff/\:Troff User's Manual by Osanna & Kernighan"
\[em] the bible for classical troff.
.
+.cp \n[groff_C]
.
.\" --------------------------------------------------------------------
.\" Emacs Setup
diff --git a/man/groff_char.man b/man/groff_char.man
index ed078e52..ce67220a 100644
--- a/man/groff_char.man
+++ b/man/groff_char.man
@@ -17,7 +17,7 @@ groff_char(7)
This file is part of groff (GNU roff).
File position: <groff_src_top>/man/groff_char.man
-Last update: 24 Feb 2003
+Last update: 15 Jul 2003
Copyright (C) 1989-2000, 2001, 2002, 2003 Free Software Foundation, Inc.
written by Werner Lemberg <wl@gnu.org>
@@ -37,6 +37,9 @@ FDL in the main directory of the groff source package.
.\" Setup Part 1
.\" --------------------------------------------------------------------
.
+.do nr groff_char_C \n[.C]
+.cp 0
+.
.\" groff only
.if \n(.g .mso www.tmac
.\".if \n(.g .ne 2v
@@ -1407,6 +1410,8 @@ No. 2, Summer 1989
.ie \n(.g .URL http://\:www.unicode.org "The Unicode Standard"
.el The Unicode Standard <http://www.unicode.org>
.
+.cp \n[groff_char_C]
+.
.\" --------------------------------------------------------------------
.\" Emacs settings
.\" --------------------------------------------------------------------
diff --git a/man/groff_diff.man b/man/groff_diff.man
index e231d486..4ddfb920 100644
--- a/man/groff_diff.man
+++ b/man/groff_diff.man
@@ -3,7 +3,7 @@
.ig
groff_diff.man
-Last update : 03 Jun 2003
+Last update : 15 Jul 2003
This file is part of groff, the GNU roff type-setting system.
It is the source of the man-page groff_diff(7).
@@ -28,6 +28,9 @@ FDL in the main directory of the groff source package.
.\" Setup
.\" --------------------------------------------------------------------
.
+.do nr groff_diff_C \n[.C]
+.cp 0
+.
.mso www.tmac
.
.if n \{\
@@ -3743,6 +3746,7 @@ of 1992, being the
.URL http://\:cm.bell-labs.com/\:cm/\:cs/\:cstr/\:54.ps.gz \
"classical troff documentation" .
.
+.cp \n[groff_diff_C]
.
.\" --------------------------------------------------------------------
.\" Emacs variables
diff --git a/man/groff_font.man b/man/groff_font.man
index 462baeb0..2b9316a7 100644
--- a/man/groff_font.man
+++ b/man/groff_font.man
@@ -17,17 +17,20 @@ translations approved by the Free Software Foundation instead of in
the original English.
..
.
+.do nr groff_font_C \n[.C]
+.cp 0
+.
.de TQ
-.br
-.ns
-.TP \\$1
+. br
+. ns
+. TP \\$1
..
.
.\" Like TP, but if specified indent is more than half
.\" the current line-length - indent, use the default indent.
.de Tp
-.ie \\n(.$=0:((0\\$1)*2u>(\\n(.lu-\\n(.iu)) .TP
-.el .TP "\\$1"
+. ie \\n(.$=0:((0\\$1)*2u>(\\n(.lu-\\n(.iu)) .TP
+. el .TP "\\$1"
..
.
.
@@ -627,6 +630,8 @@ of device
.BR groff_out (@MAN5EXT@),
.BR @g@troff (@MAN1EXT@).
.
+.cp \n[groff_font_C]
+.
.\" Local Variables:
.\" mode: nroff
.\" End:
diff --git a/man/groff_out.man b/man/groff_out.man
index b45e82f2..76e36bad 100644
--- a/man/groff_out.man
+++ b/man/groff_out.man
@@ -3,7 +3,7 @@
.ig
groff_out.5
-Last update: 13 Apr 2003
+Last update: 15 Jul 2003
This file is part of groff, the GNU roff type-setting system.
@@ -24,6 +24,9 @@ FDL in the main directory of the groff source package.
.\" Setup
.\" --------------------------------------------------------------------
.
+.do nr groff_out_C \n[.C]
+.cp 0
+.
.mso www.tmac
.
.if n \{\
@@ -1888,6 +1891,8 @@ It has been rewritten 2002 by
and is maintained by
.MTO wl@gnu.org "Werner Lemberg" .
.
+.cp \n[groff_out_C]
+.
.\" --------------------------------------------------------------------
.\" Emacs settings
.\" --------------------------------------------------------------------
diff --git a/man/groff_tmac.man b/man/groff_tmac.man
index c1d8006a..53ae3e73 100644
--- a/man/groff_tmac.man
+++ b/man/groff_tmac.man
@@ -14,7 +14,7 @@ groff_tmac.5
File position: <groff-source>/man/groff_tmac.man
-Last update: 13 Mar 2003
+Last update: 15 Jul 2003
This file is part of groff, the GNU roff type-setting system.
@@ -36,6 +36,9 @@ FDL in the main directory of the groff source package.
.\" Setup
.\" --------------------------------------------------------------------
.
+.do nr groff_tmac_C \n[.C]
+.cp 0
+.
.mso www.tmac
.
.if n \{\
@@ -1239,6 +1242,8 @@ the groff language.
The Filesystem Hierarchy Standard is available at the
.URL http://\:www.pathname.com/\:fhs/ "FHS web site" .
.
+.cp \n[groff_tmac_C]
+.
.\" Local Variables:
.\" mode: nroff
.\" End:
diff --git a/man/roff.man b/man/roff.man
index 621b362a..02f3b3c5 100644
--- a/man/roff.man
+++ b/man/roff.man
@@ -1,7 +1,7 @@
.ig
roff.man
-Last update: 3 Apr 2003
+Last update: 15 Jul 2003
This file is part of groff, the GNU roff type-setting system.
@@ -23,6 +23,9 @@ FDL in the main directory of the groff source package.
.\" Setup
.\" --------------------------------------------------------------------
.
+.do nr roff_C \n[.C]
+.cp 0
+.
.mso www.tmac
.
.if n \{\
@@ -1264,6 +1267,7 @@ It was written by
it is maintained by
.MTO wl@gnu.org "Werner Lemberg".
.
+.cp \n[roff_C]
.
.\" --------------------------------------------------------------------
.\" Emacs setup
diff --git a/src/devices/grodvi/grodvi.man b/src/devices/grodvi/grodvi.man
index 793bfe27..b5cc6d44 100644
--- a/src/devices/grodvi/grodvi.man
+++ b/src/devices/grodvi/grodvi.man
@@ -17,6 +17,8 @@ translations approved by the Free Software Foundation instead of in
the original English.
..
.
+.do nr grodvi_C \n[.C]
+.cp 0
.
.ie t .ds tx T\h'-.1667m'\v'.224m'E\v'-.224m'\h'-.125m'X
.el .ds tx TeX
@@ -425,6 +427,8 @@ and widths of rules be rounded.
.BR groff_char (@MAN7EXT@),
.BR groff_tmac (@MAN5EXT@)
.
+.cp \n[grodvi_C]
+.
.\" Local Variables:
.\" mode: nroff
.\" End:
diff --git a/src/devices/grops/grops.man b/src/devices/grops/grops.man
index e9f8f02a..7596864d 100644
--- a/src/devices/grops/grops.man
+++ b/src/devices/grops/grops.man
@@ -17,6 +17,9 @@ translations approved by the Free Software Foundation instead of in
the original English.
..
.
+.do nr grops_C \n[.C]
+.cp 0
+.
.mso www.tmac
.
.
@@ -1103,6 +1106,8 @@ Temporary file.
.BR groff_char (@MAN7EXT@),
.BR groff_tmac (@MAN5EXT@)
.
+.cp \n[grops_C]
+.
.\" Local Variables:
.\" mode: nroff
.\" End:
diff --git a/src/devices/grotty/grotty.man b/src/devices/grotty/grotty.man
index 198ca473..6c564570 100644
--- a/src/devices/grotty/grotty.man
+++ b/src/devices/grotty/grotty.man
@@ -1,5 +1,5 @@
.ig
-Copyright (C) 1989-2000, 2001, 2002 Free Software Foundation, Inc.
+Copyright (C) 1989-2000, 2001, 2002, 2003 Free Software Foundation, Inc.
Permission is granted to make and distribute verbatim copies of
this manual provided the copyright notice and this permission notice
@@ -17,6 +17,8 @@ translations approved by the Free Software Foundation instead of in
the original English.
..
.
+.do nr grotty_C \n[.C]
+.cp 0
.
.TH GROTTY @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@"
.SH NAME
@@ -414,6 +416,8 @@ cell, affecting all subsequent operations.
.BR man (1),
.BR less (1)
.
+.cp \n[grotty_C]
+.
.\" Local Variables:
.\" mode: nroff
.\" End:
diff --git a/src/preproc/grn/grn.man b/src/preproc/grn/grn.man
index 9722145b..b9bf60a3 100644
--- a/src/preproc/grn/grn.man
+++ b/src/preproc/grn/grn.man
@@ -1,6 +1,6 @@
'\" t
.ig
-Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
+Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
Permission is granted to make and distribute verbatim copies of
this manual provided the copyright notice and this permission notice
@@ -17,17 +17,24 @@ versions, except that this permission notice may be included in
translations approved by the Free Software Foundation instead of in
the original English.
..
+.
+.do nr grn_C \n[.C]
+.cp 0
+.
.de TQ
-.br
-.ns
-.TP \\$1
+. br
+. ns
+. TP \\$1
..
+.
.\" Like TP, but if specified indent is more than half
.\" the current line-length - indent, use the default indent.
.de Tp
-.ie \\n(.$=0:((0\\$1)*2u>(\\n(.lu-\\n(.iu)) .TP
-.el .TP "\\$1"
+. ie \\n(.$=0:((0\\$1)*2u>(\\n(.lu-\\n(.iu)) .TP
+. el .TP "\\$1"
..
+.
+.
.TH @G@GRN @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@"
.SH NAME
@g@grn \- groff preprocessor for gremlin files
@@ -635,6 +642,8 @@ David Slattengren and Barry Roitblat wrote the original Berkeley
Daniel Senderowicz and Werner Lemberg modified it for
.IR groff .
.
+.cp \n[grn_C]
+.
.\" Local Variables:
.\" mode: nroff
.\" End:
diff --git a/src/roff/groff/groff.man b/src/roff/groff/groff.man
index cde8bec6..9d0d5c3e 100644
--- a/src/roff/groff/groff.man
+++ b/src/roff/groff/groff.man
@@ -1,7 +1,7 @@
.ig
groff.man
-Last update: 01 Jul 2003
+Last update: 18 Jul 2003
Copyright (C) 1989, 2002, 2003 Free Software Foundation, Inc.
Rewritten in 2002 by Bernd Warken <bwarken@mayn.de>
@@ -20,6 +20,9 @@ FDL in the main directory of the groff source package.
.\" Setup
.\" --------------------------------------------------------------------
.
+.do nr groff_C \n[.C]
+.cp 0
+.
.mso www.tmac
.
.\" set adjust to both
@@ -1630,6 +1633,7 @@ The following utilities are available:
.BR \%pic2graph (@MAN1EXT@),
.BR \%tfmtodit (@MAN1EXT@).
.
+.cp \n[groff_C]
.
.\" --------------------------------------------------------------------
.\" Emacs setup
diff --git a/src/roff/troff/troff.man b/src/roff/troff/troff.man
index dce81dd4..e91f8dc4 100644
--- a/src/roff/troff/troff.man
+++ b/src/roff/troff/troff.man
@@ -2,11 +2,11 @@
.ig
troff.man
-Last update : 09 Dec 2002
+Last update : 18 Jul 2003
This file is part of groff, the GNU roff type-setting system.
-Copyright (C) 1989, 2000, 2001, 2002 Free Software Foundation, Inc.
+Copyright (C) 1989, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
written by James Clark
@@ -28,6 +28,9 @@ FDL in the main directory of the groff source package.
.\" Setup
.\" --------------------------------------------------------------------
.
+.do nr troff_C \n[.C]
+.cp 0
+.
.mso www.tmac
.
.if n \{\
@@ -607,7 +610,7 @@ necessary.
.SH AUTHOR
.\" --------------------------------------------------------------------
.
-Copyright (C) 1989, 2001, 2002 Free Software Foundation, Inc.
+Copyright (C) 1989, 2001, 2002, 2003 Free Software Foundation, Inc.
.
.P
This document is distributed under the terms of the FDL (GNU Free
@@ -679,6 +682,7 @@ cf.\&
.BR info (@MAN1EXT@),
presents all groff documentation within a single document.
.
+.cp \n[troff_C]
.
.\" --------------------------------------------------------------------
.\" Emacs variables
diff --git a/tmac/groff_ms.man b/tmac/groff_ms.man
index 50dc9c86..8d62e8de 100644
--- a/tmac/groff_ms.man
+++ b/tmac/groff_ms.man
@@ -17,6 +17,10 @@ versions, except that this permission notice may be included in
translations approved by the Free Software Foundation instead of in
the original English.
..
+.
+.do nr groff_ms_C \n[.C]
+.cp 0
+.
.TH GROFF_MS @MAN7EXT@ "@MDATE@" "Groff Version @VERSION@"
.SH NAME
groff_ms \- groff ms macros
@@ -1102,6 +1106,9 @@ Original manual page by James Clark
.IR "et al" ;
rewritten by Larry Kollar
(\fIlkollar@despammed.com\fR).
+.
+.cp \n[groff_ms_C]
+.
.\" Local Variables:
.\" mode: nroff
.\" End:
diff --git a/tmac/groff_trace.man b/tmac/groff_trace.man
index f7f1ae87..bc1c98c1 100644
--- a/tmac/groff_trace.man
+++ b/tmac/groff_trace.man
@@ -36,6 +36,9 @@ FDL in the main directory of the groff source package.
.\" Setup
.\" --------------------------------------------------------------------
.
+.do nr groff_trace_C \n[.C]
+.cp 0
+.
.mso www.tmac
.
.if n \{\
@@ -540,6 +543,7 @@ groff
.BR info (1)
file.
.
+.cp \n[groff_trace_C]
.
.\" Local Variables:
.\" mode: nroff
diff --git a/tmac/groff_www.man b/tmac/groff_www.man
index b1f1c5dd..7ab19a97 100644
--- a/tmac/groff_www.man
+++ b/tmac/groff_www.man
@@ -21,6 +21,9 @@
.\" user level guide to using the -mwww macroset
.\"
.
+.do nr groff_www_C \n[.C]
+.cp 0
+.
.do mso www.tmac
.
.\" we need the .LK here as we use it in the middle as an example --
@@ -419,6 +422,8 @@ Report bugs to the
Include a complete, self-contained example that will allow the bug to be
reproduced, and say which version of groff you are using.
.
+.cp \n[groff_www_C]
+.
.\" Local Variables:
.\" mode: nroff
.\" End: