d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix conflicts which arose during import, also add $FreeBSD$.

Browse Source
This commit is contained in:
Jeroen Ruigrok van der Werven 2000-01-12 10:26:36 +00:00
parent 2a7a0de6a7
commit 49cdd23549
14 changed files with 169 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
contrib/groff/groff/groff.man
View File

@ -1,5 +1,5 @@
.ig \"-*- nroff -*-
Copyright (C) 1989-1995 Free Software Foundation, Inc.
Copyright (C) 1999 Free Software Foundation, Inc.
Permission is granted to make and distribute verbatim copies of
this manual provided the copyright notice and this permission notice
@ -15,6 +15,9 @@ manual into another language, under the above conditions for modified
versions, except that this permission notice may be included in
translations approved by the Free Software Foundation instead of in
the original English.
$FreeBSD$
..
.de TQ
.br
@ -33,7 +36,7 @@ groff \- front end for the groff document formatting system
.SH SYNOPSIS
.B groff
[
.B \-tpeszaivhblCENRSVXZ
.B \-abehilpstvzCENRSUVXZ
]
[
.BI \-w name
@ -48,6 +51,9 @@ groff \- front end for the groff document formatting system
.BI \-F dir
]
[
.BI \-I dir
]
[
.BI \-T dev
]
[
@ -72,6 +78,9 @@ groff \- front end for the groff document formatting system
.BI \-P arg
]
[
.BI \-L arg
]
[
.IR files \|.\|.\|.\|
]
.SH DESCRIPTION
@ -87,16 +96,16 @@ Available devices are:
For PostScript printers and previewers
.TP
.B dvi
For TeX dvi format
For TeX dvi format.
.TP
.B X75
For a 75 dpi X11 previewer
For a 75 dpi X11 previewer.
.TP
.B X100
For a 100dpi X11 previewer
For a 100dpi X11 previewer.
.TP
.B ascii
For typewriter-like devices
For typewriter-like devices.
.TP
.B latin1
For typewriter-like devices using the ISO Latin-1 character set.
@ -106,6 +115,9 @@ For an HP LaserJet4-compatible (or other PCL5-compatible) printer.
.TP
.B koi8-r
For typewriter-like devices using the russian KOI8-R character set.
.TP
.B html
To produce HTML output.
.LP
The postprocessor to be used for a device is specified by the
.B postpro
@ -151,6 +163,13 @@ Preprocess with @g@pic.
.B \-s
Preprocess with @g@soelim.
.TP
.BI \-I dir
This option is as described in
.BR @g@soelim (@MAN1EXT@) .
This option implies the
.B \-s
option.
.TP
.B \-R
Preprocess with @g@refer.
No mechanism is provided for passing arguments to
@ -258,6 +277,10 @@ and use the
.B \%\-msafer
macros with
.BR @g@troff .
(enabled by default)
.TP
.B \-U
Unsafe mode. Reverts to the old unsafe behaviour.
.TP
.B \-a
.TQ
@ -306,13 +329,15 @@ This also applies to
.BR tbl ,
.BR pic ,
.BR eqn ,
.B refer
.BR refer ,
and
.BR soelim .
It does not apply to
.BR grops ,
.BR grodvi ,
.BR grotty
.BR grotty ,
.BR grolj4 ,
.BR grohtml ,
and
.BR gxditview .
.TP
@ -364,12 +389,12 @@ of device
.SH AUTHOR
James Clark <jjc@jclark.com>
.SH BUGS
Report bugs to bug-groff@prep.ai.mit.edu.
Report bugs to bug-groff@gnu.org.
Include a complete, self-contained example
that will allow the bug to be reproduced,
and say which version of groff you are using.
.SH COPYRIGHT
Copyright \(co 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
Copyright \(co 1989, 1990, 1991, 1992, 1999 Free Software Foundation, Inc.
.LP
groff is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
@ -386,10 +411,9 @@ with groff; see the file COPYING. If not, write to the Free Software
Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
.SH AVAILABILITY
The most recent released version of groff is always available for
anonymous ftp from prep.ai.mit.edu (18.71.0.38) in the directory
pub/gnu.
anonymous ftp from ftp.gnu.org in the directory gnu/groff.
.SH "SEE ALSO"
.\" .BR grog (@MAN1EXT@),
.BR grog (@MAN1EXT@),
.BR @g@troff (@MAN1EXT@),
.BR @g@tbl (@MAN1EXT@),
.BR @g@pic (@MAN1EXT@),
@ -399,10 +423,12 @@ pub/gnu.
.BR grops (@MAN1EXT@),
.BR grodvi (@MAN1EXT@),
.BR grotty (@MAN1EXT@),
.\" .BR gxditview (@MAN1EXT@),
.BR grohtml (@MAN1EXT@),
.BR grohtml (@MAN1EXT@),
.BR groff_font (@MAN5EXT@),
.BR groff_out (@MAN5EXT@),
.BR groff_man (@MAN7EXT@),
.BR groff_ms (@MAN7EXT@),
.BR me (@MAN7EXT@),
.BR groff_me (@MAN7EXT@),
.BR groff_char (@MAN7EXT@),
.BR msafer (@MAN7EXT@)
.BR groff_msafer (@MAN7EXT@)

12
contrib/groff/libgroff/font.cc
View File

@ -18,6 +18,8 @@ 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. */
/* $FreeBSD$ */
#include <stdio.h>
#include <string.h>
#include <ctype.h>
@ -734,9 +736,9 @@ int font::load_desc()
while (t.next()) {
char *p = strtok(t.buf, WS);
int found = 0;
int i;
for (i = 0; !found && i < sizeof(table)/sizeof(table[0]); i++)
if (strcmp(table[i].command, p) == 0)
int idx;
for (idx = 0; !found && idx < sizeof(table)/sizeof(table[0]); idx++)
if (strcmp(table[idx].command, p) == 0)
found = 1;
if (found) {
char *q = strtok(0, WS);
@ -744,8 +746,8 @@ int font::load_desc()
t.error("missing value for command `%1'", p);
return 0;
}
//int *ptr = &(this->*(table[i-1].ptr));
int *ptr = table[i-1].ptr;
//int *ptr = &(this->*(table[idx-1].ptr));
int *ptr = table[idx-1].ptr;
if (sscanf(q, "%d", ptr) != 1) {
t.error("bad number `%1'", q);
return 0;

5
contrib/groff/man/groff_out.man
View File

@ -1,6 +1,6 @@
'\" e
.ig \"-*- nroff -*-
Copyright (C) 1989-1995 Free Software Foundation, Inc.
Copyright (C) 1989-1999 Free Software Foundation, Inc.
Permission is granted to make and distribute verbatim copies of
this manual provided the copyright notice and this permission notice
@ -16,6 +16,9 @@ manual into another language, under the above conditions for modified
versions, except that this permission notice may be included in
translations approved by the Free Software Foundation instead of in
the original English.
$FreeBSD$
..
.\" This man page must be preprocessed with eqn.
.ie \n(.g .ds ic \/

9
contrib/groff/nroff/nroff.man
View File

@ -1,5 +1,5 @@
.ig \"-*- nroff -*-
Copyright (C) 1989-1995 Free Software Foundation, Inc.
Copyright (C) 1989-1999 Free Software Foundation, Inc.
Permission is granted to make and distribute verbatim copies of
this manual provided the copyright notice and this permission notice
@ -94,6 +94,13 @@ silently ignores options of
.B \-q
or
.BR \-s .
Options
.B \-S
(safer) and
.B \-U
(unsafe) are passed to groff.
.B \-S
is passed by default.
.SH "SEE ALSO"
.BR groff (@MAN1EXT@),
.BR @g@troff (@MAN1EXT@),

11
contrib/groff/nroff/nroff.sh
View File

@ -17,6 +17,7 @@ else
fi
fi
opts=
safer=-S
for i
do
@ -41,6 +42,14 @@ do
-T*)
# ignore other devices
;;
-S)
# safer behaviour
safer=-S
;;
-U)
# unsafe behaviour
safer=-U
;;
-u*)
# Solaris 2.2 `man' uses -u0; ignore it,
# since `less' and `more' can use the emboldening info.
@ -65,4 +74,4 @@ done
# This shell script is intended for use with man, so warnings are
# probably not wanted. Also load nroff-style character definitions.
exec groff -S -Wall -mtty-char $T $opts ${1+"$@"}
exec groff $safer -Wall -mtty-char $T $opts ${1+"$@"}

58
contrib/groff/src/roff/groff/groff.man
View File

@ -1,5 +1,5 @@
.ig \"-*- nroff -*-
Copyright (C) 1989-1995 Free Software Foundation, Inc.
Copyright (C) 1999 Free Software Foundation, Inc.
Permission is granted to make and distribute verbatim copies of
this manual provided the copyright notice and this permission notice
@ -15,6 +15,9 @@ manual into another language, under the above conditions for modified
versions, except that this permission notice may be included in
translations approved by the Free Software Foundation instead of in
the original English.
$FreeBSD$
..
.de TQ
.br
@ -33,7 +36,7 @@ groff \- front end for the groff document formatting system
.SH SYNOPSIS
.B groff
[
.B \-tpeszaivhblCENRSVXZ
.B \-abehilpstvzCENRSUVXZ
]
[
.BI \-w name
@ -48,6 +51,9 @@ groff \- front end for the groff document formatting system
.BI \-F dir
]
[
.BI \-I dir
]
[
.BI \-T dev
]
[
@ -72,6 +78,9 @@ groff \- front end for the groff document formatting system
.BI \-P arg
]
[
.BI \-L arg
]
[
.IR files \|.\|.\|.\|
]
.SH DESCRIPTION
@ -87,16 +96,16 @@ Available devices are:
For PostScript printers and previewers
.TP
.B dvi
For TeX dvi format
For TeX dvi format.
.TP
.B X75
For a 75 dpi X11 previewer
For a 75 dpi X11 previewer.
.TP
.B X100
For a 100dpi X11 previewer
For a 100dpi X11 previewer.
.TP
.B ascii
For typewriter-like devices
For typewriter-like devices.
.TP
.B latin1
For typewriter-like devices using the ISO Latin-1 character set.
@ -106,6 +115,9 @@ For an HP LaserJet4-compatible (or other PCL5-compatible) printer.
.TP
.B koi8-r
For typewriter-like devices using the russian KOI8-R character set.
.TP
.B html
To produce HTML output.
.LP
The postprocessor to be used for a device is specified by the
.B postpro
@ -151,6 +163,13 @@ Preprocess with @g@pic.
.B \-s
Preprocess with @g@soelim.
.TP
.BI \-I dir
This option is as described in
.BR @g@soelim (@MAN1EXT@) .
This option implies the
.B \-s
option.
.TP
.B \-R
Preprocess with @g@refer.
No mechanism is provided for passing arguments to
@ -258,6 +277,10 @@ and use the
.B \%\-msafer
macros with
.BR @g@troff .
(enabled by default)
.TP
.B \-U
Unsafe mode. Reverts to the old unsafe behaviour.
.TP
.B \-a
.TQ
@ -306,13 +329,15 @@ This also applies to
.BR tbl ,
.BR pic ,
.BR eqn ,
.B refer
.BR refer ,
and
.BR soelim .
It does not apply to
.BR grops ,
.BR grodvi ,
.BR grotty
.BR grotty ,
.BR grolj4 ,
.BR grohtml ,
and
.BR gxditview .
.TP
@ -364,12 +389,12 @@ of device
.SH AUTHOR
James Clark <jjc@jclark.com>
.SH BUGS
Report bugs to bug-groff@prep.ai.mit.edu.
Report bugs to bug-groff@gnu.org.
Include a complete, self-contained example
that will allow the bug to be reproduced,
and say which version of groff you are using.
.SH COPYRIGHT
Copyright \(co 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
Copyright \(co 1989, 1990, 1991, 1992, 1999 Free Software Foundation, Inc.
.LP
groff is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
@ -386,10 +411,9 @@ with groff; see the file COPYING. If not, write to the Free Software
Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
.SH AVAILABILITY
The most recent released version of groff is always available for
anonymous ftp from prep.ai.mit.edu (18.71.0.38) in the directory
pub/gnu.
anonymous ftp from ftp.gnu.org in the directory gnu/groff.
.SH "SEE ALSO"
.\" .BR grog (@MAN1EXT@),
.BR grog (@MAN1EXT@),
.BR @g@troff (@MAN1EXT@),
.BR @g@tbl (@MAN1EXT@),
.BR @g@pic (@MAN1EXT@),
@ -399,10 +423,12 @@ pub/gnu.
.BR grops (@MAN1EXT@),
.BR grodvi (@MAN1EXT@),
.BR grotty (@MAN1EXT@),
.\" .BR gxditview (@MAN1EXT@),
.BR grohtml (@MAN1EXT@),
.BR grohtml (@MAN1EXT@),
.BR groff_font (@MAN5EXT@),
.BR groff_out (@MAN5EXT@),
.BR groff_man (@MAN7EXT@),
.BR groff_ms (@MAN7EXT@),
.BR me (@MAN7EXT@),
.BR groff_me (@MAN7EXT@),
.BR groff_char (@MAN7EXT@),
.BR msafer (@MAN7EXT@)
.BR groff_msafer (@MAN7EXT@)

9
contrib/groff/src/roff/nroff/nroff.man
View File

@ -1,5 +1,5 @@
.ig \"-*- nroff -*-
Copyright (C) 1989-1995 Free Software Foundation, Inc.
Copyright (C) 1989-1999 Free Software Foundation, Inc.
Permission is granted to make and distribute verbatim copies of
this manual provided the copyright notice and this permission notice
@ -94,6 +94,13 @@ silently ignores options of
.B \-q
or
.BR \-s .
Options
.B \-S
(safer) and
.B \-U
(unsafe) are passed to groff.
.B \-S
is passed by default.
.SH "SEE ALSO"
.BR groff (@MAN1EXT@),
.BR @g@troff (@MAN1EXT@),

11
contrib/groff/src/roff/nroff/nroff.sh
View File

@ -17,6 +17,7 @@ else
fi
fi
opts=
safer=-S
for i
do
@ -41,6 +42,14 @@ do
-T*)
# ignore other devices
;;
-S)
# safer behaviour
safer=-S
;;
-U)
# unsafe behaviour
safer=-U
;;
-u*)
# Solaris 2.2 `man' uses -u0; ignore it,
# since `less' and `more' can use the emboldening info.
@ -65,4 +74,4 @@ done
# This shell script is intended for use with man, so warnings are
# probably not wanted. Also load nroff-style character definitions.
exec groff -S -Wall -mtty-char $T $opts ${1+"$@"}
exec groff $safer -Wall -mtty-char $T $opts ${1+"$@"}

4
contrib/groff/tmac/doc-common
View File

@ -119,6 +119,7 @@
.nr Xc 3
.nr Xo 1
.nr Xr 10n
.nr Yr \n(yr+1900
.ds sV \& \&
.ds hV \&\ \&
.ds iV \& \&
@ -284,8 +285,7 @@
. if "\\n(mo"10" .ds dD October
. if "\\n(mo"11" .ds dD November
. if "\\n(mo"12" .ds dD December
. nr _y \\n(yr+1900
. as dD \&\ \\n(dy, \\n(_y
. as dD \&\ \\n(dy, \\n(Yr
. \}
.\}
.el \{\

6
contrib/groff/tmac/doc-syms
View File

@ -398,11 +398,13 @@
. \}
. if "\\*(A\\n(aP"-iso8802-3" \{\
. ie \\n(sT==1 \{\
. ds b1 \&\\*(tNISO \\*(aa8802-3: 1989\\*(sV
. ds b1 \&\\*(tNISO \\*(aa8802-3: 1989
.\" . ds b1 \&\\*(tNISO \\*(aa8802-3: 1989\\*(sV
.\" . as b1 (``\\*(tNANSI C\\*(aa'')
. \}
. el \{\
. ds b1 \&\\*(tNISO \\*(aa8802-3: 1989\\*(sV
. ds b1 \&\\*(tNISO \\*(aa8802-3: 1989
.\" . ds b1 \&\\*(tNISO \\*(aa8802-3: 1989\\*(sV
.\" . as b1 (``\\*(tNANSI C\\*(aa'')
. \}
. \}

11
contrib/groff/tmac/eqnrc
View File

@ -1,4 +1,5 @@
.\" Startup file for eqn.
.\" $FreeBSD$
.EQ
sdefine << %{ < back 20 < }%
sdefine >> %{ > back 20 > }%
@ -15,10 +16,11 @@ ifdef X100 ! define X %1% !
ifdef X75-12 ! define X %1% !
ifdef X100-12 ! define X %1% !
ifdef ps ! define ps|X %1% !
ifdef X ! define ps|X %1% !
ifdef ps ! define ps|X|html %1% !
ifdef X ! define ps|X|html %1% !
ifdef html ! define ps|X|html %1% !
ifdef ps|X ! sdefine inf %"\s[\En[.s]*13u/10u]\v'12M'\(if\v'-12M'\s0"% !
ifdef ps|X|html ! sdefine inf %"\s[\En[.s]*13u/10u]\v'12M'\(if\v'-12M'\s0"% !
ifdef dvi !
sdefine int %{type "operator" vcenter \(is}%
@ -46,7 +48,7 @@ set big_op_spacing5 10
ifdef X ! set axis_height 32 !
ifdef ps|X ! set draw_lines 1 !
ifdef ps|X|html ! set draw_lines 1 !
ifdef ascii ! define n %1% !
ifdef latin1 ! define n %1% !
@ -58,4 +60,5 @@ set nroff 1
undef X
undef ps|X
undef n
undef html
.EN

8
contrib/groff/tmac/tmac.e
View File

@ -39,6 +39,8 @@
.\" to provide variant functions.
.\" --- an internal macro.
.\"
.\" $FreeBSD$
.\"
.if !\n(.g .ig
.de @R \" --- initialize number register to 0, if undefined
.if !r\\$1 .nr \\$1 0
@ -1519,8 +1521,10 @@ in \\f2\\*([B\\f1, \c
.if \n(dw=5 .ds dw Thursday
.if \n(dw=6 .ds dw Friday
.if \n(dw=7 .ds dw Saturday
.nr _y \n(yr+1900
.ds td \*(mo \n(dy, \n(_y
.nr y2 \n(yr%100
.af y2 00
.nr y4 \n(yr+1900
.ds td \*(mo \n(dy, \n(y4
.\" *** PARAMETRIC INITIALIZATIONS ***
.rr x
.nr $v \n(.v00+\n(.sp-1/\n(.sp \" vs as percentage of ps for .sz request

3
contrib/groff/tmac/troffrc
View File

@ -15,10 +15,11 @@
.do ds troffrc!latin1 tmac.tty
.do ds troffrc!koi8-r tmac.tty
.do ds troffrc!lj4 tmac.lj4
.do ds troffrc!html tmac.html
.do if d troffrc!\*[.T] \
. do mso \*[troffrc!\*[.T]]
.do rm troffrc!ps troffrc!Xps troffrc!dvi troffrc!X75 troffrc!X75-12 \
troffrc!X100 troffrc!X100-12 troffrc!lj4
troffrc!X100 troffrc!X100-12 troffrc!lj4 troffrc!html
.ie "\*[.T]"koi8-r" .do tr \[char154]
.el .do tr \[char160]
.\" Set the hyphenation language to `us' unless we're using koi8-r (russian)

20
contrib/groff/troff/troff.man
View File

@ -1,5 +1,5 @@
.ig \"-*- nroff -*-
Copyright (C) 1989-1995 Free Software Foundation, Inc.
Copyright (C) 1989-1999 Free Software Foundation, Inc.
Permission is granted to make and distribute verbatim copies of
this manual provided the copyright notice and this permission notice
@ -15,6 +15,9 @@ manual into another language, under the above conditions for modified
versions, except that this permission notice may be included in
translations approved by the Free Software Foundation instead of in
the original English.
$FreeBSD$
..
.\" define a string tx for the TeX logo
.ie t .ds tx T\h'-.1667m'\v'.224m'E\v'-.224m'\h'-.125m'X
@ -47,7 +50,7 @@ the original English.
.ie \\n(.$-1 .RI "[\ \fB\\$1\fP" "\\$2" "\ ]"
.el .RB "[\ " "\\$1" "\ ]"
..
.OP \-abivzCER
.OP \-abivzCERU
.OP \-w name
.OP \-W name
.OP \-d cs
@ -80,7 +83,9 @@ approximation of the typeset output.
.B \-b
Print a backtrace with each warning or error message. This backtrace
should help track down the cause of the error. The line numbers given
in the backtrace may not always correct: troff's idea of line numbers
in the backtrace may not always be correct:
.B troff 's
idea of line numbers
gets confused by
.B as
or
@ -140,6 +145,14 @@ as the default font family.
Read in the file
.BI tmac. name\fR.
Normally this will be searched for in @MACRODIR@.
By default is used the
.I safer
macro (reverted using -U ).
.TP
.B \-U
Unsafe option, avoids default use of
.I safer
macro.
.TP
.B \-R
Don't load
@ -2046,6 +2059,7 @@ of device
.BR grops (@MAN1EXT@),
.BR grodvi (@MAN1EXT@),
.BR grotty (@MAN1EXT@),
.BR grohtml (@MAN1EXT@),
.BR groff_font (@MAN5EXT@),
.BR groff_out (@MAN5EXT@),
.BR groff_char (@MAN7EXT@)