From 10c96787fe3e5095e183b95ff0d4d3224bc86674 Mon Sep 17 00:00:00 2001 From: ru Date: Mon, 23 Jun 2003 12:03:22 +0000 Subject: We use modernized version of soelim(1) shipped with Groff. --- usr.bin/soelim/Makefile | 6 -- usr.bin/soelim/soelim.1 | 91 ------------------------- usr.bin/soelim/soelim.c | 172 ------------------------------------------------ 3 files changed, 269 deletions(-) delete mode 100644 usr.bin/soelim/Makefile delete mode 100644 usr.bin/soelim/soelim.1 delete mode 100644 usr.bin/soelim/soelim.c (limited to 'usr.bin') diff --git a/usr.bin/soelim/Makefile b/usr.bin/soelim/Makefile deleted file mode 100644 index 57beb11..0000000 --- a/usr.bin/soelim/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -# @(#)Makefile 8.1 (Berkeley) 6/6/93 -# $FreeBSD$ - -PROG= soelim - -.include diff --git a/usr.bin/soelim/soelim.1 b/usr.bin/soelim/soelim.1 deleted file mode 100644 index 2f85895..0000000 --- a/usr.bin/soelim/soelim.1 +++ /dev/null @@ -1,91 +0,0 @@ -.\" Copyright (c) 1980, 1990, 1993 -.\" The Regents of the University of California. All rights reserved. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" 3. All advertising materials mentioning features or use of this software -.\" must display the following acknowledgement: -.\" This product includes software developed by the University of -.\" California, Berkeley and its contributors. -.\" 4. Neither the name of the University nor the names of its contributors -.\" may be used to endorse or promote products derived from this software -.\" without specific prior written permission. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. -.\" -.\" @(#)soelim.1 8.1 (Berkeley) 6/6/93 -.\" $FreeBSD$ -.\" -.Dd June 6, 1993 -.Dt SOELIM 1 -.Os -.Sh NAME -.Nm soelim -.Nd eliminate \&.so's from nroff input -.Sh SYNOPSIS -.Nm -.Op Ar -.Sh DESCRIPTION -The -.Nm -utility -reads the specified files or the standard input and performs the textual -inclusion implied by the -.Xr nroff 1 -directives of the form: -.Pp -.Dl \&.so somefile -.Pp -The directives need to appear at the beginning of input lines. -This is useful since programs such as -.Xr tbl 1 -do not normally do this; it allows the placement of individual tables -in separate files to be run as a part of a large document. -.Pp -An argument consisting of a single minus -.Sq Fl -is taken to be -a file name corresponding to the standard input. -.Pp -Note that inclusion can be suppressed by using -.Ql \e' -instead of -.Ql \e. , -i.e.\& -.Pp -.Dl \'so /usr/lib/tmac.s -.Pp -A sample usage of -.Nm -would be -.Pp -.Bd -literal -offset indent -compact -soelim exum?.n \&| tbl \&| nroff \-ms \&| col \&| lpr -.Ed -.Sh SEE ALSO -.Xr colcrt 1 , -.Xr more 1 -.Sh BUGS -The format of the source commands must involve no strangeness \- -exactly one blank must precede and no blanks follow the file name. -.Sh HISTORY -The -.Nm -command appeared in -.Bx 3.0 . diff --git a/usr.bin/soelim/soelim.c b/usr.bin/soelim/soelim.c deleted file mode 100644 index 4ef28a3..0000000 --- a/usr.bin/soelim/soelim.c +++ /dev/null @@ -1,172 +0,0 @@ -/* - * Copyright (c) 1980, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#ifndef lint -static const char copyright[] = -"@(#) Copyright (c) 1980, 1993\n\ - The Regents of the University of California. All rights reserved.\n"; -#endif /* not lint */ - -#ifndef lint -#if 0 -static char sccsid[] = "@(#)soelim.c 8.1 (Berkeley) 6/6/93"; -#endif -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ - -#include -#include -#include -#include -/* - * soelim - a filter to process n/troff input eliminating .so's - * - * Author: Bill Joy UCB July 8, 1977 - * - * This program eliminates .so's from a n/troff input stream. - * It can be used to prepare safe input for submission to the - * phototypesetter since the software supporting the operator - * doesn't let him do chdir. - * - * This is a kludge and the operator should be given the - * ability to do chdir. - * - * This program is more generally useful, it turns out, because - * the program tbl doesn't understand ".so" directives. - */ -#define STDIN_NAME "-" - -int process(const char *); - -int -main(int argc, char *argv[]) -{ - - argc--; - argv++; - if (argc == 0) { - (void)process(STDIN_NAME); - exit(0); - } - do { - (void)process(argv[0]); - argv++; - argc--; - } while (argc > 0); - exit(0); -} - -int -process(const char *file) -{ - char *cp; - int c; - char fname[BUFSIZ]; - FILE *soee; - int isfile; - int line = 1; - - if (!strcmp(file, STDIN_NAME)) { - soee = stdin; - } else { - soee = fopen(file, "r"); - if (soee == NULL) { - warn("%s", file); - return(-1); - } - } - printf (".lf %d %s\n", line, file); - for (;;) { - line++; - c = getc(soee); - if (c == EOF) - break; - if (c != '.') - goto simple; - c = getc(soee); - if (c != 's') { - putchar('.'); - goto simple; - } - c = getc(soee); - if (c != 'o') { - printf(".s"); - goto simple; - } - do - c = getc(soee); - while (c == ' ' || c == '\t'); - cp = fname; - isfile = 0; - for (;;) { - switch (c) { - - case ' ': - case '\t': - case '\n': - case EOF: - goto donename; - - default: - *cp++ = c; - c = getc(soee); - isfile++; - continue; - } - } -donename: - if (cp == fname) { - printf(".so"); - goto simple; - } - *cp = 0; - if (process(fname) < 0) - if (isfile) - printf(".so %s\n", fname); - printf (".lf %d %s\n", line, file); - continue; -simple: - if (c == EOF) - break; - putchar(c); - if (c != '\n') { - c = getc(soee); - goto simple; - } - } - if (soee != stdin) { - fclose(soee); - } - return(0); -} -- cgit v1.1