diff options
author | ru <ru@FreeBSD.org> | 2005-10-20 10:53:15 +0000 |
---|---|---|
committer | ru <ru@FreeBSD.org> | 2005-10-20 10:53:15 +0000 |
commit | f02b0e02f7db01fa9e18cd3bd91e845183cddae1 (patch) | |
tree | cb81a3419183979fbe9998073980adbb3b8ce752 /contrib/groff | |
parent | 64e9e998a91149cb68cd884b45afd4ad65f13549 (diff) | |
download | FreeBSD-src-f02b0e02f7db01fa9e18cd3bd91e845183cddae1.zip FreeBSD-src-f02b0e02f7db01fa9e18cd3bd91e845183cddae1.tar.gz |
Merge Groff 1.19.2 changes.
Diffstat (limited to 'contrib/groff')
-rw-r--r-- | contrib/groff/src/devices/grotty/grotty.man | 6 | ||||
-rw-r--r-- | contrib/groff/src/libs/libgroff/cmap.cpp | 2 | ||||
-rw-r--r-- | contrib/groff/src/libs/libgroff/cset.cpp | 6 | ||||
-rw-r--r-- | contrib/groff/src/libs/libgroff/invalid.cpp | 2 | ||||
-rw-r--r-- | contrib/groff/src/preproc/eqn/neqn.sh | 6 | ||||
-rw-r--r-- | contrib/groff/src/roff/groff/groff.man | 145 | ||||
-rw-r--r-- | contrib/groff/src/roff/nroff/nroff.man | 11 | ||||
-rwxr-xr-x | contrib/groff/src/roff/nroff/nroff.sh | 42 | ||||
-rw-r--r-- | contrib/groff/tmac/troffrc | 6 | ||||
-rw-r--r-- | contrib/groff/tmac/tty-char.tmac | 9 | ||||
-rw-r--r-- | contrib/groff/tmac/tty.tmac | 4 |
11 files changed, 183 insertions, 56 deletions
diff --git a/contrib/groff/src/devices/grotty/grotty.man b/contrib/groff/src/devices/grotty/grotty.man index 7e59569..d626376 100644 --- a/contrib/groff/src/devices/grotty/grotty.man +++ b/contrib/groff/src/devices/grotty/grotty.man @@ -1,6 +1,6 @@ .ig $FreeBSD$ -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 @@ -18,6 +18,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 @@ -429,6 +431,8 @@ cell, affecting all subsequent operations. .BR man (1), .BR less (1) . +.cp \n[grotty_C] +. .\" Local Variables: .\" mode: nroff .\" End: diff --git a/contrib/groff/src/libs/libgroff/cmap.cpp b/contrib/groff/src/libs/libgroff/cmap.cpp index a637991..91a42f3 100644 --- a/contrib/groff/src/libs/libgroff/cmap.cpp +++ b/contrib/groff/src/libs/libgroff/cmap.cpp @@ -16,7 +16,7 @@ for more details. You should have received a copy of the GNU General Public License along with groff; see the file COPYING. If not, write to the Free Software -Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301, USA. */ /* $FreeBSD$ */ diff --git a/contrib/groff/src/libs/libgroff/cset.cpp b/contrib/groff/src/libs/libgroff/cset.cpp index 68564c4..6d79d7e 100644 --- a/contrib/groff/src/libs/libgroff/cset.cpp +++ b/contrib/groff/src/libs/libgroff/cset.cpp @@ -1,5 +1,5 @@ // -*- C++ -*- -/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc. +/* Copyright (C) 1989, 1990, 1991, 1992, 2004 Free Software Foundation, Inc. Written by James Clark (jjc@jclark.com) This file is part of groff. @@ -16,7 +16,7 @@ for more details. You should have received a copy of the GNU General Public License along with groff; see the file COPYING. If not, write to the Free Software -Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301, USA. */ /* $FreeBSD$ */ @@ -24,6 +24,8 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #ifdef __FreeBSD__ #include <locale.h> #endif + +#include "lib.h" #include "cset.h" cset csalpha(CSET_BUILTIN); diff --git a/contrib/groff/src/libs/libgroff/invalid.cpp b/contrib/groff/src/libs/libgroff/invalid.cpp index 63b3cc2..ac0c71d 100644 --- a/contrib/groff/src/libs/libgroff/invalid.cpp +++ b/contrib/groff/src/libs/libgroff/invalid.cpp @@ -15,7 +15,7 @@ for more details. You should have received a copy of the GNU General Public License along with groff; see the file COPYING. If not, write to the Free Software -Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301, USA. */ /* $FreeBSD$ */ diff --git a/contrib/groff/src/preproc/eqn/neqn.sh b/contrib/groff/src/preproc/eqn/neqn.sh index dcea2ff..5390bba 100644 --- a/contrib/groff/src/preproc/eqn/neqn.sh +++ b/contrib/groff/src/preproc/eqn/neqn.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#! /bin/sh # Provision of this shell script should not be taken to imply that use of # GNU eqn with groff -Tascii|-Tlatin1|-Tkoi8-r|-Tutf8|-Tcp1047 is supported. # $FreeBSD$ @@ -17,8 +17,8 @@ case "${LC_ALL-${LC_CTYPE-${LANG}}}" in T=ascii ;; esac -: ${GROFF_BIN_PATH=@BINDIR@} -PATH=$GROFF_BIN_PATH@SEP@$PATH +@GROFF_BIN_PATH_SETUP@ +PATH="$GROFF_RUNTIME$PATH" export PATH exec @g@eqn -T${T} ${1+"$@"} diff --git a/contrib/groff/src/roff/groff/groff.man b/contrib/groff/src/roff/groff/groff.man index 347fec2..23f3fab 100644 --- a/contrib/groff/src/roff/groff/groff.man +++ b/contrib/groff/src/roff/groff/groff.man @@ -1,9 +1,9 @@ .ig groff.man -Last update: 18 Mar 2003 +Last update: 01 Jul 2005 -Copyright (C) 1989, 2002, 2003 Free Software Foundation, Inc. +Copyright (C) 1989, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. Rewritten in 2002 by Bernd Warken <bwarken@mayn.de> Permission is granted to copy, distribute and/or modify this document @@ -23,6 +23,9 @@ $FreeBSD$ .\" Setup .\" -------------------------------------------------------------------- . +.do nr groff_C \n[.C] +.cp 0 +. .mso www.tmac . .\" set adjust to both @@ -188,7 +191,7 @@ $FreeBSD$ .c Environment variable .de EnvVar . SM -. BR \$1 \$2 +. BR \%\$1 \$2 .. .c -------------------------------------------------------------------- .c a shell command line @@ -376,8 +379,20 @@ Print a help message. . . .OptDef I "" dir -Add search directory for -.BR \%@g@soelim (@MAN1EXT@). +This option may be used to specify a directory to search for +files (both those on the command line and those named in +.B \&.psbb +and +.B \&.so +requests, and +.B \eX'ps: import' +and +.B \eX'ps: file' +escapes). +The current directory is always searched first. +This option may be specified more than once; +the directories will be searched in the order specified. +No directory search is performed for files specified using an absolute path. This option implies the .ShortOpt s option. @@ -449,7 +464,7 @@ or because groff does not prepend any dashes before passing it to the postprocessor. . -For example, to pass a title to the gxditview postprocessor, the shell +For example, to pass a title to the \%gxditview postprocessor, the shell command .IP .ShellCommand groff \*[@-]X \*[@-]P \*[@-]title \*[@-]P 'groff it' \f[I]foo\f[] @@ -508,12 +523,21 @@ Preprocess with .OptDef T "" dev Set output device to .IR dev . -Contrary to -.BR @g@troff , +For this device, +.B @g@troff +generates the +.I intermediate +.IR output ; +see +.BR \%groff_out (@MAN5EXT@). +. +Then .B groff calls a postprocessor to convert .BR @g@troff 's -intermediate output to its final format. +.I intermediate output +to its final format. +. Real devices in .B groff are @@ -564,7 +588,7 @@ Unicode character set in \%UTF-8 encoding. . .IP The following arguments select -.B gxditview +.B \%gxditview as the `postprocessor' (it is rather a viewing program): . .RS @@ -604,12 +628,14 @@ to all subprograms. .OptDef V Output the pipeline that would be run by .BR groff -(as a wrapper program), but do not execute it. +(as a wrapper program) on the standard output, but do not execute it. +If given more than once, +the commands will be both printed on the standard error and run. . . .OptDef X Use -.B gxditview +.B \%gxditview instead of using the usual postprocessor to (pre)view a document. . The printing spooler behavior as outlined with options @@ -641,7 +667,7 @@ The default resolution for previewing output is 75\|dpi; this can be changed by passing the .ShortOpt resolution option to -.BR gxditview , +.BR \%gxditview , for example . .IP @@ -655,13 +681,19 @@ Only error messages will be printed. . . .OptDef Z -Do not postprocess the output of -.B @g@troff -that is normally -called automatically by -.BR groff . -This will print the intermediate output to standard output; see +Print the +.I groff intermediate output +to standard output; see .BR \%groff_out (@MAN5EXT@). +Normally +.BR groff +calls automatically a postprocessor. +. +With this option, the output of +.B @g@troff +for the device, the so-called +.I intermediate output +is issued without postprocessing. . . .\" -------------------------------------------------------------------- @@ -685,6 +717,10 @@ backtrace on error or warning. .OptDef c disable color output. . +Please consult the +.BR \%grotty (@MAN1EXT@) +man page for more details. +. .OptDef C enable compatibility mode. . @@ -762,6 +798,48 @@ the groff system. . . .\" -------------------------------------------------------------------- +.SS Paper Size +.\" -------------------------------------------------------------------- +. +The +.I virtual +paper size used by +.B troff +to format the input is controlled globally with the requests +.BR .po , +.BR .pl , +and +.BR .ll . +See +.BR groff_tmac (@MAN5EXT@) +for the `papersize' macro package which provides a convenient interface. +. +.P +The +.I physical +paper size, giving the actual dimensions of the paper sheets, is +controlled by output devices like +.BR grops +with the command line options +.B \-p +and +.BR \-l . +See +.BR groff_font (@MAN5EXT@) +and the man pages of the output devices for more details. +.B groff +uses the command line option +.B \-P +to pass options to output devices; for example, the following selects +A4 paper in landscape orientation for the PS device: +. +.RS +.P +groff -Tps -P-pa4 -P-l .\|.\|. +.RE +. +. +.\" -------------------------------------------------------------------- .SS Front-ends .\" -------------------------------------------------------------------- . @@ -925,7 +1003,9 @@ HTML-like macros for inclusion in arbitrary groff documents; see .P Details on the naming of macro files and their placement can be found in -.BR \%groff_tmac (@MAN5EXT@). +.BR \%groff_tmac (@MAN5EXT@); +this man page also documents some other, minor auxiliary macro packages +not mentioned here. . . .\" -------------------------------------------------------------------- @@ -1041,7 +1121,7 @@ encoding; see .TP .B X75 75dpi X Window System output suitable for the previewers -.BR xditview (1x) +.BR \%xditview (1x) and .BR \%gxditview (@MAN1EXT@). A variant for a 12\|pt document base font is @@ -1050,7 +1130,7 @@ A variant for a 12\|pt document base font is .TP .B X100 100dpi X Window System output suitable for the previewers -.BR xditview (1x) +.BR \%xditview (1x) and .BR \%gxditview (@MAN1EXT@). A variant for a 12\|pt document base font is @@ -1274,8 +1354,16 @@ If this is not set but the environment variable .EnvVar TMPDIR instead, temporary files will be created in the directory .EnvVar $TMPDIR . +On MS-DOS and Windows\ 32 platforms, the environment variables +.EnvVar TMP +and +.EnvVar TEMP +(in that order) are searched also, after +.EnvVar GROFF_TMPDIR +and +.EnvVar TMPDIR . . -Otherwise temporary files will be created in +Otherwise, temporary files will be created in .BR /tmp . The .BR \%@g@refer (@MAN1EXT@), @@ -1501,7 +1589,7 @@ This is the only grap version supported by groff. .SH AUTHORS .\" -------------------------------------------------------------------- . -Copyright \(co 1989, 2002, 2003 Free Software Foundation, Inc. +Copyright \(co 1989, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. . .P This document is distributed under the terms of the FDL (GNU Free @@ -1516,7 +1604,7 @@ This document is based on the original groff man page written by .MTO jjc@jclark.com "James Clark" . . It was rewritten, enhanced, and put under the FDL license by -.MTO bwarken@mayn.de "Bernd Warken" . +\m[blue]Bernd Warken\m[]. . It is maintained by .MTO wl@gnu.org "Werner Lemberg" . @@ -1596,7 +1684,9 @@ Roff formatter programs: .BR ditroff (@MAN7EXT@). . .TP -The intermediate output language: +The +.I intermediate output +language: .BR \%groff_out (@MAN7EXT@). . .TP @@ -1605,6 +1695,7 @@ Postprocessors for the output devices: .BR \%grohtml (@MAN1EXT@), .BR \%grolbp (@MAN1EXT@), .BR \%grolj4 (@MAN1EXT@), +.BR \%lj4_font (@MAN5EXT@), .BR \%grops (@MAN1EXT@), .BR \%grotty (@MAN1EXT@). . @@ -1627,6 +1718,7 @@ The following utilities are available: .BR \%addftinfo (@MAN1EXT@), .BR \%afmtodit (@MAN1EXT@), .BR \%eqn2graph (@MAN1EXT@), +.BR \%grap2graph (@MAN1EXT@), .BR \%groffer (@MAN1EXT@), .BR \%gxditview (@MAN1EXT@), .BR \%hpftodit (@MAN1EXT@), @@ -1636,6 +1728,7 @@ The following utilities are available: .BR \%pic2graph (@MAN1EXT@), .BR \%tfmtodit (@MAN1EXT@). . +.cp \n[groff_C] . .\" -------------------------------------------------------------------- .\" Emacs setup diff --git a/contrib/groff/src/roff/nroff/nroff.man b/contrib/groff/src/roff/nroff/nroff.man index 4b81a78..f169229 100644 --- a/contrib/groff/src/roff/nroff/nroff.man +++ b/contrib/groff/src/roff/nroff/nroff.man @@ -1,5 +1,5 @@ .ig -Copyright (C) 1989-2001, 2002 Free Software Foundation, Inc. +Copyright (C) 1989-2001, 2002, 2003, 2005 Free Software Foundation, Inc. Permission is granted to make and distribute verbatim copies of this manual provided the copyright notice and this permission notice @@ -19,9 +19,12 @@ the original English. $FreeBSD$ .. +. .TH @G@NROFF @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@" +. .SH NAME @g@nroff \- emulate nroff command with groff +. .SH SYNOPSIS .nr a \n(.j .ad l @@ -33,8 +36,10 @@ the original English. .ie \\n(.$-1 .RI "[\ \fB\\$1\fP" "\\$2" "\ ]" .el .RB "[\ " "\\$1" "\ ]" .. +. .OP \-CchipStUv .OP \-d cs +.OP \-M dir .OP \-m name .OP \-n num .OP \-o list @@ -43,6 +48,7 @@ the original English. .RI "[\ " "file" "\ .\|.\|.\ ]" .br .ad \na +. .SH DESCRIPTION The .B @g@nroff @@ -93,6 +99,7 @@ The .BR \-d , .BR \-C , .BR \-i , +.BR \-M , .BR \-m , .BR \-n , .BR \-o , @@ -121,6 +128,7 @@ Options .BR groff . .B \-v shows the version number. +. .SH ENVIRONMENT .TP .SM @@ -134,6 +142,7 @@ This shell script is basically intended for use with so warnings are suppressed. nroff-style character definitions (in the file tty-char.tmac) are also loaded to emulate unrepresentable glyphs. +. .SH "SEE ALSO" .BR groff (@MAN1EXT@), .BR @g@troff (@MAN1EXT@), diff --git a/contrib/groff/src/roff/nroff/nroff.sh b/contrib/groff/src/roff/nroff/nroff.sh index e8feb04..4342019 100755 --- a/contrib/groff/src/roff/nroff/nroff.sh +++ b/contrib/groff/src/roff/nroff/nroff.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#! /bin/sh # Emulate nroff with groff. # $FreeBSD$ @@ -6,33 +6,34 @@ prog="$0" # Default device. # First try the "locale charmap" command, because it's most reliable. # On systems where it doesn't exist, look at the environment variables. -case "`locale charmap 2>/dev/null`" in +case "`exec 2>/dev/null ; locale charmap`" in + UTF-8) + T=-Tutf8 ;; ISO*8859-1 | ISO*8859-15) T=-Tlatin1 ;; KOI8-R) T=-Tkoi8-r ;; - UTF-8) - T=-Tutf8 ;; IBM-1047) T=-Tcp1047 ;; *) case "${LC_ALL-${LC_CTYPE-${LANG}}}" in - iso_8859_1 | *.ISO*8859-1 | *.ISO*8859-15) + *.UTF-8) + T=-Tutf8 ;; + iso_8859_1 | *.ISO-8859-1 | *.ISO8859-1 | \ + iso_8859_15 | *.ISO-8859-15 | *.ISO8859-15) T=-Tlatin1 ;; *.KOI8-R) T=-Tkoi8-r ;; - *.UTF-8) - T=-Tutf8 ;; *.IBM-1047) T=-Tcp1047 ;; *) case "$LESSCHARSET" in + utf-8) + T=-Tutf8 ;; latin1) T=-Tlatin1 ;; koi8-r) T=-Tkoi8-r ;; - utf-8) - T=-Tutf8 ;; cp1047) T=-Tcp1047 ;; *) @@ -54,10 +55,10 @@ for i -[eq] | -s*) # ignore these options ;; - -[dmrnoT]) + -[dMmrnoT]) echo "$prog: option $1 requires an argument" >&2 exit 1 ;; - -[iptSUC] | -[dmrno]*) + -[iptSUC] | -[dMmrno]*) opts="$opts $1" ;; -Tascii | -Tlatin1 | -Tkoi8-r | -Tutf8 | -Tcp1047) T=$1 ;; @@ -65,14 +66,17 @@ for i # ignore other devices ;; -u*) - # Solaris 2.2 `man' uses -u0; ignore it, + # Solaris 2.2 through at least Solaris 9 `man' invokes + # `nroff -u0 ... | col -x'. Ignore the -u0, # since `less' and `more' can use the emboldening info. - ;; + # However, disable SGR, since Solaris `col' mishandles it. + opts="$opts -P-c" ;; -v | --version) echo "GNU nroff (groff) version @VERSION@" exit 0 ;; --help) - echo "usage: nroff [-CchipStUv] [-dCS] [-mNAME] [-nNUM] [-oLIST] [-rCN] [-Tname] [FILE...]" + echo "usage: nroff [-CchipStUv] [-dCS] [-MDIR] [-mNAME] [-nNUM] [-oLIST]" + echo " [-rCN] [-Tname] [FILE...]" exit 0 ;; --) shift @@ -88,11 +92,15 @@ for i shift done +# Set up the `GROFF_BIN_PATH' variable +# to be exported in the current `GROFF_RUNTIME' environment. + +@GROFF_BIN_PATH_SETUP@ +export GROFF_BIN_PATH + # This shell script is intended for use with man, so warnings are # probably not wanted. Also load nroff-style character definitions. -: ${GROFF_BIN_PATH=@BINDIR@} -export GROFF_BIN_PATH -PATH=$GROFF_BIN_PATH@SEP@$PATH groff -mtty-char $T $opts ${1+"$@"} +PATH="$GROFF_RUNTIME$PATH" groff -mtty-char $T $opts ${1+"$@"} # eof diff --git a/contrib/groff/tmac/troffrc b/contrib/groff/tmac/troffrc index 231a66c..5defe8a 100644 --- a/contrib/groff/tmac/troffrc +++ b/contrib/groff/tmac/troffrc @@ -4,6 +4,9 @@ .\" This is tested by pic. .nr 0p 0 . +.\" Load composite mappings. +.do mso composite.tmac +. .\" Use .do here, so that it works with -C. .\" The groff command defines the .X string if the -X option was given. .ie r.X .do ds troffrc!ps Xps.tmac @@ -44,9 +47,6 @@ troffrc!X100 troffrc!X100-12 troffrc!lj4 troff!lbp troffrc!html .if '\*[.T]'koi8-r' \ . do hpfa hyphen.ru . -.\" Load composite mappings. -.do mso composite.tmac -. .\" Handle paper formats .do mso papersize.tmac . diff --git a/contrib/groff/tmac/tty-char.tmac b/contrib/groff/tmac/tty-char.tmac index b7cf2e3..58f8fdb 100644 --- a/contrib/groff/tmac/tty-char.tmac +++ b/contrib/groff/tmac/tty-char.tmac @@ -1,4 +1,5 @@ .\" tty-char.tmac +.\" $FreeBSD$ .\" .\" This file defines standard troff characters and some groff characters for .\" use with -Tascii, -Tlatin1, -Tutf8, and -Tcp1047. @@ -141,7 +142,7 @@ .tty-char \[rk] } .tty-char \[lt] ,- .tty-char \[rt] -. -.\" Latin-1 characters +.\" Latin characters .tty-char \[r!] \z,i .tty-char \[Po] \z-L .tty-char \[Cs] \zox @@ -168,6 +169,7 @@ .tty-char \[:A] \z"A .tty-char \[oA] \zoA .tty-char \[,C] \z,C +.tty-char "\[S ,]" \z,S .tty-char \[`E] \z`E .tty-char \['E] \z'E .tty-char \[^E] \z^E @@ -197,6 +199,7 @@ .tty-char \[:a] \z"a .tty-char \[oa] \zoa .tty-char \[,c] \z,c +.tty-char "\[s ,]" \z,s .tty-char \[`e] \z`e .tty-char \['e] \z'e .tty-char \[^e] \z^e @@ -220,6 +223,10 @@ .tty-char \['y] \z'y .tty-char \[Tp] \zpb .tty-char \[:y] \z"y +.\" for Turkish +.tty-char "\[G ab]" G +.tty-char "\[g ab]" g +.tty-char "\[I .]" I .\"tty-char \[:y] \ij .tty-char \[arrowvertex] | .tty-char \[mc] \z,u diff --git a/contrib/groff/tmac/tty.tmac b/contrib/groff/tmac/tty.tmac index 34fa11d..6e6a856 100644 --- a/contrib/groff/tmac/tty.tmac +++ b/contrib/groff/tmac/tty.tmac @@ -1,4 +1,5 @@ .\" tty.tmac +.\" $FreeBSD$ .\" .nr _C \n(.C .cp 0 @@ -65,6 +66,9 @@ .fchar \[.i] i .fchar \[bq] , . +.if '\*[.T]'utf8' \ +. mso unicode.tmac +. .\" color definitions .defcolor black rgb #000000 .defcolor red rgb #ff0000 |