summaryrefslogtreecommitdiffstats
path: root/gnu/usr.bin/groff
diff options
context:
space:
mode:
authorrgrimes <rgrimes@FreeBSD.org>1995-05-30 05:05:38 +0000
committerrgrimes <rgrimes@FreeBSD.org>1995-05-30 05:05:38 +0000
commit2ad6f3dee6bc54535003f4ab26bbc587b7efa38c (patch)
treea3959baf797787918878bec6d58d6a0fb743ad0a /gnu/usr.bin/groff
parent4f960dd75f181e9fa2edc44324f15f0ab5c64b37 (diff)
downloadFreeBSD-src-2ad6f3dee6bc54535003f4ab26bbc587b7efa38c.zip
FreeBSD-src-2ad6f3dee6bc54535003f4ab26bbc587b7efa38c.tar.gz
Remove trailing whitespace.
Diffstat (limited to 'gnu/usr.bin/groff')
-rw-r--r--gnu/usr.bin/groff/Makefile2
-rw-r--r--gnu/usr.bin/groff/Makefile.comm10
-rw-r--r--gnu/usr.bin/groff/Makefile.in12
-rw-r--r--gnu/usr.bin/groff/Makefile.init8
-rw-r--r--gnu/usr.bin/groff/addftinfo/guess.h2
-rw-r--r--gnu/usr.bin/groff/devascii/Makefile2
-rw-r--r--gnu/usr.bin/groff/doc/Makefile2
-rw-r--r--gnu/usr.bin/groff/eqn/Makefile2
-rw-r--r--gnu/usr.bin/groff/include/cset.h2
-rw-r--r--gnu/usr.bin/groff/include/stringclass.h10
-rw-r--r--gnu/usr.bin/groff/libgroff/Makefile2
-rw-r--r--gnu/usr.bin/groff/libgroff/iftoa.c2
-rw-r--r--gnu/usr.bin/groff/libgroff/strtol.c4
-rw-r--r--gnu/usr.bin/groff/mm/Makefile2
-rw-r--r--gnu/usr.bin/groff/mm/Makefile.sub2
-rw-r--r--gnu/usr.bin/groff/pic/Makefile.sub2
-rw-r--r--gnu/usr.bin/groff/pic/pic.h2
-rw-r--r--gnu/usr.bin/groff/psbb/psbb.c2
-rw-r--r--gnu/usr.bin/groff/tbl/table.h8
-rw-r--r--gnu/usr.bin/groff/troff/charinfo.h2
-rw-r--r--gnu/usr.bin/groff/troff/env.h8
-rw-r--r--gnu/usr.bin/groff/troff/token.h10
-rw-r--r--gnu/usr.bin/groff/xditview/Dvi.c12
-rw-r--r--gnu/usr.bin/groff/xditview/DviChar.c2
-rw-r--r--gnu/usr.bin/groff/xditview/DviP.h4
-rw-r--r--gnu/usr.bin/groff/xditview/Makefile2
-rw-r--r--gnu/usr.bin/groff/xditview/XFontName.c2
-rw-r--r--gnu/usr.bin/groff/xditview/device.c30
-rw-r--r--gnu/usr.bin/groff/xditview/draw.c44
-rw-r--r--gnu/usr.bin/groff/xditview/font.c14
-rw-r--r--gnu/usr.bin/groff/xditview/lex.c12
-rw-r--r--gnu/usr.bin/groff/xditview/parse.c14
-rw-r--r--gnu/usr.bin/groff/xditview/xditview.c12
-rw-r--r--gnu/usr.bin/groff/xditview/xtotroff.c6
34 files changed, 126 insertions, 126 deletions
diff --git a/gnu/usr.bin/groff/Makefile b/gnu/usr.bin/groff/Makefile
index 23d24f6..5cb5306 100644
--- a/gnu/usr.bin/groff/Makefile
+++ b/gnu/usr.bin/groff/Makefile
@@ -7,7 +7,7 @@ SUBDIR= libgroff libdriver libbib\
devX100 devX100-12 devX75 devX75-12 devascii devdvi devlatin1 \
devkoi8-r devps tmac mm man xditview
-# BSD already provides soelim
+# BSD already provides soelim
MISC= soelim
.include <bsd.subdir.mk>
diff --git a/gnu/usr.bin/groff/Makefile.comm b/gnu/usr.bin/groff/Makefile.comm
index 63c80ab..b3d24af 100644
--- a/gnu/usr.bin/groff/Makefile.comm
+++ b/gnu/usr.bin/groff/Makefile.comm
@@ -1,18 +1,18 @@
# Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
# Written by James Clark (jjc@jclark.com)
-#
+#
# This file is part of groff.
-#
+#
# 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
# Software Foundation; either version 2, or (at your option) any later
# version.
-#
+#
# groff is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# 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, 675 Mass Ave, Cambridge, MA 02139, USA.
@@ -187,7 +187,7 @@ install_prog:
.PHONY: uninstall_prog
uninstall_prog:
- -rm -f $(bindir)/$(NAMEPREFIX)$(PROG)
+ -rm -f $(bindir)/$(NAMEPREFIX)$(PROG)
.PHONY: install_dev
install_dev:
diff --git a/gnu/usr.bin/groff/Makefile.in b/gnu/usr.bin/groff/Makefile.in
index 59dc524..321fc2e 100644
--- a/gnu/usr.bin/groff/Makefile.in
+++ b/gnu/usr.bin/groff/Makefile.in
@@ -1,18 +1,18 @@
# Copyright (C) 1989, 1990, 1991, 1992, 1993 Free Software Foundation, Inc.
# Written by James Clark (jjc@jclark.com)
-#
+#
# This file is part of groff.
-#
+#
# 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
# Software Foundation; either version 2, or (at your option) any later
# version.
-#
+#
# groff is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# 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, 675 Mass Ave, Cambridge, MA 02139, USA.
@@ -161,7 +161,7 @@ man7dir=$(manroot)/man$(man7ext)
# (Reiser) preprocessor.
# -DLONG_FOR_TIME_T if localtime() takes a long * not a time_t *
# -DHAVE_STRUCT_EXCEPTION if <math.h> defines struct exception
-# -DRETSIGTYPE=int if signal handlers return int not void
+# -DRETSIGTYPE=int if signal handlers return int not void
DEFINES=@DEFS@
# Include fmod.o, strtol.o, getcwd.o, strerror.o, putenv.o in LIBOBJS if
@@ -260,7 +260,7 @@ $(TARGETS):
dot: FORCE
@$(MAKE) $(MDEFINES) srcdir=$(srcdir) VPATH=$(srcdir) \
-f $(srcdir)/Makefile.comm -f $(srcdir)/Makefile.sub $(do)
-
+
$(LIBDIRS): FORCE
@if test $(srcdir) = .; \
then srcdir=.; \
diff --git a/gnu/usr.bin/groff/Makefile.init b/gnu/usr.bin/groff/Makefile.init
index 8d93c93..dfcf0dd 100644
--- a/gnu/usr.bin/groff/Makefile.init
+++ b/gnu/usr.bin/groff/Makefile.init
@@ -1,18 +1,18 @@
# Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
# Written by James Clark (jjc@jclark.com)
-#
+#
# This file is part of groff.
-#
+#
# 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
# Software Foundation; either version 2, or (at your option) any later
# version.
-#
+#
# groff is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# 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, 675 Mass Ave, Cambridge, MA 02139, USA.
diff --git a/gnu/usr.bin/groff/addftinfo/guess.h b/gnu/usr.bin/groff/addftinfo/guess.h
index 6712045..f13767c 100644
--- a/gnu/usr.bin/groff/addftinfo/guess.h
+++ b/gnu/usr.bin/groff/addftinfo/guess.h
@@ -40,5 +40,5 @@ struct char_metric {
int left_ic;
int sk;
};
-
+
void guess(const char *s, const font_params &param, char_metric *metric);
diff --git a/gnu/usr.bin/groff/devascii/Makefile b/gnu/usr.bin/groff/devascii/Makefile
index 47057d8..b57a34d 100644
--- a/gnu/usr.bin/groff/devascii/Makefile
+++ b/gnu/usr.bin/groff/devascii/Makefile
@@ -1,4 +1,4 @@
-# Makefile for devascii
+# Makefile for devascii
DEVICE= ascii
diff --git a/gnu/usr.bin/groff/doc/Makefile b/gnu/usr.bin/groff/doc/Makefile
index 0d4088d..2d9ae08 100644
--- a/gnu/usr.bin/groff/doc/Makefile
+++ b/gnu/usr.bin/groff/doc/Makefile
@@ -43,7 +43,7 @@ meref.PS: meref.dit
meintro.PS: meintro.dit
install:
-
+
clean:
-rm -f *.PS *.dit core
diff --git a/gnu/usr.bin/groff/eqn/Makefile b/gnu/usr.bin/groff/eqn/Makefile
index ff5500d..fa1784b 100644
--- a/gnu/usr.bin/groff/eqn/Makefile
+++ b/gnu/usr.bin/groff/eqn/Makefile
@@ -3,7 +3,7 @@
PROG= eqn
SRCS= main.cc lex.cc box.cc limit.cc list.cc over.cc text.cc\
script.cc mark.cc other.cc delim.cc sqrt.cc pile.cc special.cc
-OBJS= eqn.o
+OBJS= eqn.o
CFLAGS+= -I. -I${.CURDIR}/../include
LDADD+= ${LIBGROFF}
DPADD+= ${LIBGROFF}
diff --git a/gnu/usr.bin/groff/include/cset.h b/gnu/usr.bin/groff/include/cset.h
index f454cc5..b160782 100644
--- a/gnu/usr.bin/groff/include/cset.h
+++ b/gnu/usr.bin/groff/include/cset.h
@@ -24,7 +24,7 @@ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#ifndef UCHAR_MAX
#define UCHAR_MAX 255
#endif
-#endif /* not HAVE_CC_LIMITS_H */
+#endif /* not HAVE_CC_LIMITS_H */
enum cset_builtin { CSET_BUILTIN };
diff --git a/gnu/usr.bin/groff/include/stringclass.h b/gnu/usr.bin/groff/include/stringclass.h
index cf4da4b..9f85233 100644
--- a/gnu/usr.bin/groff/include/stringclass.h
+++ b/gnu/usr.bin/groff/include/stringclass.h
@@ -44,7 +44,7 @@ public:
string(char);
~string();
-
+
string &operator=(const string &);
string &operator=(const char *);
string &operator=(char);
@@ -53,7 +53,7 @@ public:
string &operator+=(const char *);
string &operator+=(char);
void append(const char *, int);
-
+
int length() const;
int empty() const;
int operator*() const;
@@ -75,7 +75,7 @@ public:
friend string operator+(const char *, const string &);
friend string operator+(const string &, char);
friend string operator+(char, const string &);
-
+
friend int operator==(const string &, const string &);
friend int operator!=(const string &, const string &);
friend int operator<=(const string &, const string &);
@@ -158,13 +158,13 @@ inline string operator+(char c, const string &s)
inline int operator==(const string &s1, const string &s2)
{
- return (s1.len == s2.len
+ return (s1.len == s2.len
&& (s1.len == 0 || memcmp(s1.ptr, s2.ptr, s1.len) == 0));
}
inline int operator!=(const string &s1, const string &s2)
{
- return (s1.len != s2.len
+ return (s1.len != s2.len
|| (s1.len != 0 && memcmp(s1.ptr, s2.ptr, s1.len) != 0));
}
diff --git a/gnu/usr.bin/groff/libgroff/Makefile b/gnu/usr.bin/groff/libgroff/Makefile
index ba150356..7463a60 100644
--- a/gnu/usr.bin/groff/libgroff/Makefile
+++ b/gnu/usr.bin/groff/libgroff/Makefile
@@ -10,7 +10,7 @@ SRCS+= iftoa.c itoa.c matherr.c
CFLAGS+= -I$(.CURDIR)/../include
NOMAN= noman
-NOPROFILE= noprofile
+NOPROFILE= noprofile
CLEANFILES+= version.cc
version.cc: $(.CURDIR)/../VERSION
diff --git a/gnu/usr.bin/groff/libgroff/iftoa.c b/gnu/usr.bin/groff/libgroff/iftoa.c
index ac37183..2b16ab2 100644
--- a/gnu/usr.bin/groff/libgroff/iftoa.c
+++ b/gnu/usr.bin/groff/libgroff/iftoa.c
@@ -23,7 +23,7 @@ char *iftoa(i, decimal_point)
int i, decimal_point;
{
/* room for a -, INT_DIGITS digits, a decimal point, and a terminating '\0' */
- static char buf[INT_DIGITS + 3];
+ static char buf[INT_DIGITS + 3];
char *p = buf + INT_DIGITS + 2;
int point = 0;
buf[INT_DIGITS + 2] = '\0';
diff --git a/gnu/usr.bin/groff/libgroff/strtol.c b/gnu/usr.bin/groff/libgroff/strtol.c
index ffe354e..3caf4e2 100644
--- a/gnu/usr.bin/groff/libgroff/strtol.c
+++ b/gnu/usr.bin/groff/libgroff/strtol.c
@@ -94,7 +94,7 @@ long strtol(str, ptr, base)
}
if (neg)
val = -val;
-
+
while (*++str != '\0') {
int n;
@@ -123,7 +123,7 @@ long strtol(str, ptr, base)
val = val*base + n;
}
}
-
+
if (ptr)
*ptr = str;
diff --git a/gnu/usr.bin/groff/mm/Makefile b/gnu/usr.bin/groff/mm/Makefile
index 3091676..f2ea0b3 100644
--- a/gnu/usr.bin/groff/mm/Makefile
+++ b/gnu/usr.bin/groff/mm/Makefile
@@ -3,7 +3,7 @@ TMACGRP?= bin
TMACMODE?= 444
TMACDIR?= /usr/share/tmac
-FILES= 0.MT 5.MT 4.MT ms.cov se_ms.cov
+FILES= 0.MT 5.MT 4.MT ms.cov se_ms.cov
LOCALE= locale se_locale
MAN7= groff_mm.7 groff_mmse.7
diff --git a/gnu/usr.bin/groff/mm/Makefile.sub b/gnu/usr.bin/groff/mm/Makefile.sub
index 25b5ba0..7ca7eed 100644
--- a/gnu/usr.bin/groff/mm/Makefile.sub
+++ b/gnu/usr.bin/groff/mm/Makefile.sub
@@ -1,6 +1,6 @@
#
MAN7=groff_mm.n groff_mmse.n
-FILES=0.MT 5.MT 4.MT ms.cov se_ms.cov
+FILES=0.MT 5.MT 4.MT ms.cov se_ms.cov
# Local configuration files with default values.
LOCALE = locale se_locale
CLEANADD=temp
diff --git a/gnu/usr.bin/groff/pic/Makefile.sub b/gnu/usr.bin/groff/pic/Makefile.sub
index 06d1975..d8ed426 100644
--- a/gnu/usr.bin/groff/pic/Makefile.sub
+++ b/gnu/usr.bin/groff/pic/Makefile.sub
@@ -2,7 +2,7 @@ PROG=pic
MAN1=pic.n
XLIBS=$(LIBGROFF)
MLIB=$(LIBM)
-OBJS=pic.o lex.o main.o object.o common.o troff.o tex.o # fig.o
+OBJS=pic.o lex.o main.o object.o common.o troff.o tex.o # fig.o
CCSRCS=lex.cc main.cc object.cc common.cc troff.cc tex.cc
HDRS=common.h object.h output.h pic.h position.h text.h
GRAM=pic.y
diff --git a/gnu/usr.bin/groff/pic/pic.h b/gnu/usr.bin/groff/pic/pic.h
index 30c2cd5..11979d9 100644
--- a/gnu/usr.bin/groff/pic/pic.h
+++ b/gnu/usr.bin/groff/pic/pic.h
@@ -94,7 +94,7 @@ void lex_cleanup();
extern int flyback_flag;
extern int command_char;
-// zero_length_line_flag is non-zero if zero-length lines are drawn
+// zero_length_line_flag is non-zero if zero-length lines are drawn
// as dots by the output device
extern int zero_length_line_flag;
extern int driver_extension_flag;
diff --git a/gnu/usr.bin/groff/psbb/psbb.c b/gnu/usr.bin/groff/psbb/psbb.c
index 4df1562..8879cc8 100644
--- a/gnu/usr.bin/groff/psbb/psbb.c
+++ b/gnu/usr.bin/groff/psbb/psbb.c
@@ -65,7 +65,7 @@ char **argv;
printf("%d %d %d %d\n", bb.llx, bb.lly, bb.urx, bb.ury);
exit(0);
}
-
+
/* If the bounding box was found return NULL, and store the bounding box
in bb. If the bounding box was not found return a string suitable for
giving to printf with the filename as an argument saying why not. */
diff --git a/gnu/usr.bin/groff/tbl/table.h b/gnu/usr.bin/groff/tbl/table.h
index f97ab7b..3912d9a 100644
--- a/gnu/usr.bin/groff/tbl/table.h
+++ b/gnu/usr.bin/groff/tbl/table.h
@@ -49,12 +49,12 @@ struct entry_modifier {
};
enum format_type {
- FORMAT_LEFT,
- FORMAT_CENTER,
- FORMAT_RIGHT,
+ FORMAT_LEFT,
+ FORMAT_CENTER,
+ FORMAT_RIGHT,
FORMAT_NUMERIC,
FORMAT_ALPHABETIC,
- FORMAT_SPAN,
+ FORMAT_SPAN,
FORMAT_VSPAN,
FORMAT_HLINE,
FORMAT_DOUBLE_HLINE
diff --git a/gnu/usr.bin/groff/troff/charinfo.h b/gnu/usr.bin/groff/troff/charinfo.h
index 38e9e8f..3dc131b 100644
--- a/gnu/usr.bin/groff/troff/charinfo.h
+++ b/gnu/usr.bin/groff/troff/charinfo.h
@@ -34,7 +34,7 @@ class charinfo {
char transparent_translate; // non-zero means translation applies to
// to transparent throughput
public:
- enum {
+ enum {
ENDS_SENTENCE = 1,
BREAK_BEFORE = 2,
BREAK_AFTER = 4,
diff --git a/gnu/usr.bin/groff/troff/env.h b/gnu/usr.bin/groff/troff/env.h
index 14441e1..40ce6b8 100644
--- a/gnu/usr.bin/groff/troff/env.h
+++ b/gnu/usr.bin/groff/troff/env.h
@@ -199,7 +199,7 @@ public:
unsigned char control_char;
unsigned char no_break_control_char;
charinfo *hyphen_indicator_char;
-
+
environment(symbol);
environment(const environment *); // for temporary environment
~environment();
@@ -231,7 +231,7 @@ public:
hunits get_prev_char_skew();
vunits get_prev_char_height();
vunits get_prev_char_depth();
- hunits get_text_length(); // .k
+ hunits get_text_length(); // .k
hunits get_prev_text_length(); // .n
hunits get_space_width() { return env_space_width(this); }
int get_space_size() { return space_size; } // in ems/36
@@ -277,7 +277,7 @@ public:
const char *get_point_size_string();
const char *get_requested_point_size_string();
void output_pending_lines();
-
+
friend void title_length();
friend void space_size();
friend void fill();
@@ -314,7 +314,7 @@ public:
friend void widow_control_request();
#endif /* WIDOW_CONTROL */
};
-
+
extern environment *curenv;
extern void pop_env();
extern void push_env(int);
diff --git a/gnu/usr.bin/groff/troff/token.h b/gnu/usr.bin/groff/troff/token.h
index f8a319a..2c160e5 100644
--- a/gnu/usr.bin/groff/troff/token.h
+++ b/gnu/usr.bin/groff/troff/token.h
@@ -51,7 +51,7 @@ class token {
TOKEN_RIGHT_BRACE,
TOKEN_SPACE, // ` ' -- ordinary space
TOKEN_SPECIAL, // a special character -- \' \` \- \(xx
- TOKEN_SPREAD, // \p -- break and spread output line
+ TOKEN_SPREAD, // \p -- break and spread output line
TOKEN_TAB, // tab
TOKEN_TRANSPARENT, // \!
TOKEN_EOF // end of file
@@ -114,12 +114,12 @@ void interpolate_number_reg(symbol, int);
const char *asciify(int c);
inline int token::newline()
-{
- return type == TOKEN_NEWLINE;
+{
+ return type == TOKEN_NEWLINE;
}
inline int token::space()
-{
+{
return type == TOKEN_SPACE;
}
@@ -149,7 +149,7 @@ inline int token::page_ejector()
inline unsigned char token::ch()
{
return type == TOKEN_CHAR ? c : 0;
-}
+}
inline int token::eof()
{
diff --git a/gnu/usr.bin/groff/xditview/Dvi.c b/gnu/usr.bin/groff/xditview/Dvi.c
index 1748509..86bb511 100644
--- a/gnu/usr.bin/groff/xditview/Dvi.c
+++ b/gnu/usr.bin/groff/xditview/Dvi.c
@@ -56,7 +56,7 @@ SS -adobe-symbol-medium-r-normal--*-100-*-*-*-*-adobe-fontspecific\n\
#define MY_WIDTH(dw) ((int)(dw->dvi.paperwidth * dw->dvi.scale_factor + .5))
#define MY_HEIGHT(dw) ((int)(dw->dvi.paperlength * dw->dvi.scale_factor + .5))
-static XtResource resources[] = {
+static XtResource resources[] = {
{XtNfontMap, XtCFontMap, XtRString, sizeof (char *),
offset(dvi.font_map_string), XtRString, default_font_map},
{XtNforeground, XtCForeground, XtRPixel, sizeof (unsigned long),
@@ -96,7 +96,7 @@ static void SaveToFile ();
DviClassRec dviClassRec = {
{
- &widgetClassRec, /* superclass */
+ &widgetClassRec, /* superclass */
"Dvi", /* class_name */
sizeof(DviRec), /* size */
ClassInitialize, /* class_initialize */
@@ -254,7 +254,7 @@ Redisplay(w, event, region)
{
DviWidget dw = (DviWidget) w;
XRectangle extents;
-
+
XClipBox (region, &extents);
dw->dvi.extents.x1 = extents.x;
dw->dvi.extents.y1 = extents.y;
@@ -430,7 +430,7 @@ ShowDvi (dw)
}
FindPage (dw);
-
+
dw->dvi.display_enable = 1;
ParseInput (dw);
if (dw->dvi.last_page && dw->dvi.requested_page > dw->dvi.last_page)
@@ -465,7 +465,7 @@ FindPage (dw)
FileSeek (dw, file_position);
dw->dvi.current_page = i;
-
+
dw->dvi.display_enable = 0;
while (dw->dvi.current_page != dw->dvi.requested_page) {
dw->dvi.current_page = ParseInput (dw);
@@ -531,7 +531,7 @@ void ClassPartInitialize(widget_class)
if (wc->command_class.save == InheritSaveToFile)
wc->command_class.save = super->command_class.save;
}
-
+
/*
Local Variables:
c-indent-level: 8
diff --git a/gnu/usr.bin/groff/xditview/DviChar.c b/gnu/usr.bin/groff/xditview/DviChar.c
index cd84d35..f6d2569 100644
--- a/gnu/usr.bin/groff/xditview/DviChar.c
+++ b/gnu/usr.bin/groff/xditview/DviChar.c
@@ -110,7 +110,7 @@ compute_hash (map)
h->name = map->dvi_names[c][s];
h->position = c;
}
-
+
}
int
diff --git a/gnu/usr.bin/groff/xditview/DviP.h b/gnu/usr.bin/groff/xditview/DviP.h
index c3b7d2c..a1c3495 100644
--- a/gnu/usr.bin/groff/xditview/DviP.h
+++ b/gnu/usr.bin/groff/xditview/DviP.h
@@ -2,7 +2,7 @@
* $XConsortium: DviP.h,v 1.5 89/07/22 19:44:08 keith Exp $
*/
-/*
+/*
* DviP.h - Private definitions for Dvi widget
*/
@@ -51,7 +51,7 @@ extern DviClassRec dviClassRec;
/***************************************
*
- * Instance (widget) structure
+ * Instance (widget) structure
*
**************************************/
diff --git a/gnu/usr.bin/groff/xditview/Makefile b/gnu/usr.bin/groff/xditview/Makefile
index c646258..24bf879 100644
--- a/gnu/usr.bin/groff/xditview/Makefile
+++ b/gnu/usr.bin/groff/xditview/Makefile
@@ -15,7 +15,7 @@ CFLAGS+= -I${X11BASE}/include -DFONTPATH=\"$(fontpath)\"
SRCS+= xditview.c Dvi.c draw.c font.c lex.c page.c parse.c \
XFontName.c DviChar.c device.c
LDDESTDIR+= -L${X11BASE}/lib
-LDADD+= -lXaw -lXmu -lXt -lXext -lX11 -lm
+LDADD+= -lXaw -lXmu -lXt -lXext -lX11 -lm
DPADD+= ${X11BASE}/lib/libXaw.a ${X11BASE}/lib/libXmu.a \
${X11BASE}/lib/libXt.a ${X11BASE}/lib/libXext.a \
${X11BASE}/lib/libX11.a
diff --git a/gnu/usr.bin/groff/xditview/XFontName.c b/gnu/usr.bin/groff/xditview/XFontName.c
index 5ca9bb8..0aa7618 100644
--- a/gnu/usr.bin/groff/xditview/XFontName.c
+++ b/gnu/usr.bin/groff/xditview/XFontName.c
@@ -143,7 +143,7 @@ XFormatFontName (fontName, fontNameAttributes, fontNameString)
return False; \
while (*f) \
if ((*name++ = *f++) == '-') \
- return False;
+ return False;
#define PutHyphen()\
if (--left < 0) \
return False; \
diff --git a/gnu/usr.bin/groff/xditview/device.c b/gnu/usr.bin/groff/xditview/device.c
index d14c538..6410472 100644
--- a/gnu/usr.bin/groff/xditview/device.c
+++ b/gnu/usr.bin/groff/xditview/device.c
@@ -89,7 +89,7 @@ void device_destroy(dev)
Device *dev;
{
DeviceFont *f;
-
+
if (!dev)
return;
f = dev->fonts;
@@ -98,7 +98,7 @@ void device_destroy(dev)
f = f->next;
delete_font(tem);
}
-
+
XtFree(dev->name);
XtFree((char *)dev);
}
@@ -138,7 +138,7 @@ Device *device_load(name)
np = &dev->paperwidth;
else if (strcmp(p, "paperlength") == 0)
np = &dev->paperlength;
-
+
if (np) {
q = strtok((char *)0, WS);
if (!q || sscanf(q, "%d", np) != 1 || *np <= 0) {
@@ -146,7 +146,7 @@ Device *device_load(name)
err = 1;
break;
}
- }
+ }
}
}
fclose(fp);
@@ -387,7 +387,7 @@ int device_font_special(f)
{
return f->special;
}
-
+
static
struct charinfo *add_char(f, name, width, code)
DeviceFont *f;
@@ -396,18 +396,18 @@ struct charinfo *add_char(f, name, width, code)
{
struct charinfo **pp;
struct charinfo *ci;
-
+
name = canonicalize_name(name);
if (strcmp(name, "---") == 0)
name = "";
ci = (struct charinfo *)XtMalloc(XtOffsetOf(struct charinfo, name[0])
+ strlen(name) + 1);
-
+
strcpy(ci->name, name);
ci->width = width;
ci->code = code;
-
+
if (*name != '\0') {
pp = &f->char_table[hash_name(name) % CHAR_TABLE_SIZE];
ci->next = *pp;
@@ -486,30 +486,30 @@ FILE *find_file(file, path, result)
int bufsiz = 0;
int flen;
FILE *fp;
-
+
*result = NULL;
-
+
if (file == NULL)
return NULL;
if (*file == '\0')
return NULL;
-
+
if (*file == '/') {
fp = fopen(file, "r");
if (fp)
*result = XtNewString(file);
return fp;
}
-
+
flen = strlen(file);
-
+
if (!path)
return NULL;
-
+
while (*path) {
int len;
char *start, *end;
-
+
start = path;
end = strchr(path, ':');
if (end)
diff --git a/gnu/usr.bin/groff/xditview/draw.c b/gnu/usr.bin/groff/xditview/draw.c
index 7715cde..04f76c8 100644
--- a/gnu/usr.bin/groff/xditview/draw.c
+++ b/gnu/usr.bin/groff/xditview/draw.c
@@ -102,7 +102,7 @@ FlushCharCache (dw)
XDrawText (XtDisplay (dw), XtWindow (dw), dw->dvi.normal_GC,
dw->dvi.cache.start_x, dw->dvi.cache.start_y,
dw->dvi.cache.cache, dw->dvi.cache.index + 1);
- }
+ }
dw->dvi.cache.index = 0;
dw->dvi.cache.max = DVI_TEXT_CACHE_SIZE;
#if 0
@@ -135,7 +135,7 @@ Word (dw)
:\
(fi)->max_bounds.width\
)
-
+
static
int charExists (fi, c)
@@ -161,7 +161,7 @@ DoCharacter (dw, c, wid)
register XFontStruct *font;
register XTextItem *text;
int x, y;
-
+
x = XPos(dw);
y = YPos(dw);
@@ -176,7 +176,7 @@ DoCharacter (dw, c, wid)
#endif
))
return;
-
+
if (y != dw->dvi.cache.y
|| dw->dvi.cache.char_index >= DVI_CHAR_CACHE_SIZE) {
FlushCharCache (dw);
@@ -362,7 +362,7 @@ PutNumberedCharacter (dw, c)
dw->dvi.device_font
= QueryDeviceFont (dw, dw->dvi.device_font_number);
}
-
+
if (dw->dvi.device_font == 0
|| !device_code_width (dw->dvi.device_font,
dw->dvi.state->font_size, c, &wid))
@@ -398,14 +398,14 @@ setGC (dw)
DviWidget dw;
{
int desired_line_width;
-
+
if (dw->dvi.line_thickness < 0)
desired_line_width = (int)(((double)dw->dvi.device_resolution
* dw->dvi.state->font_size)
/ (10.0*72.0*dw->dvi.sizescale));
else
desired_line_width = dw->dvi.line_thickness;
-
+
if (desired_line_width != dw->dvi.line_width) {
XGCValues values;
values.line_width = DeviceToX(dw, desired_line_width);
@@ -422,7 +422,7 @@ setFillGC (dw)
DviWidget dw;
{
int fill_type;
-
+
if (dw->dvi.fill == DVI_FILL_MAX)
fill_type = DVI_FILL_BLACK;
else if (dw->dvi.fill == 0)
@@ -528,11 +528,11 @@ DrawArc (dw, x0, y0, x1, y1)
return;
angle1 = (int)(atan2 ((double)y0, (double)-x0)*180.0*64.0/M_PI);
angle2 = (int)(atan2 ((double)-y1, (double)x1)*180.0*64.0/M_PI);
-
+
angle2 -= angle1;
if (angle2 < 0)
angle2 += 64*360;
-
+
AdjustCacheDeltas (dw);
setGC (dw);
@@ -551,9 +551,9 @@ DrawPolygon (dw, v, n)
XPoint *p;
int i;
int dx, dy;
-
+
n /= 2;
-
+
AdjustCacheDeltas (dw);
setGC (dw);
p = (XPoint *)XtMalloc((n + 2)*sizeof(XPoint));
@@ -583,11 +583,11 @@ DrawFilledPolygon (dw, v, n)
XPoint *p;
int i;
int dx, dy;
-
+
n /= 2;
if (n < 2)
return;
-
+
AdjustCacheDeltas (dw);
setFillGC (dw);
p = (XPoint *)XtMalloc((n + 1)*sizeof(XPoint));
@@ -633,10 +633,10 @@ flattenCurve(points, pointi, x2, y2, x3, y3, x4, y4)
x1 = points[*pointi - 1].x;
y1 = points[*pointi - 1].y;
-
+
dx = x4 - x1;
dy = y4 - y1;
-
+
n1 = dy*(x2 - x1) - dx*(y2 - y1);
n2 = dy*(x3 - x1) - dx*(y3 - y1);
if (n1 < 0)
@@ -670,7 +670,7 @@ DrawSpline (dw, v, n)
int i;
int pointi;
XPoint points[POINTS_MAX];
-
+
if (n == 0 || (n & 1) != 0)
return;
AdjustCacheDeltas (dw);
@@ -683,12 +683,12 @@ DrawSpline (dw, v, n)
sy = oy;
tx = sx + DeviceToX (dw, dx);
ty = sy + DeviceToX (dw, dy);
-
+
pointi = 0;
-
+
appendPoint (points, &pointi, sx, sy);
appendPoint (points, &pointi, (sx + tx)/2, (sy + ty)/2);
-
+
for (i = 2; i < n; i += 2) {
int ux = ox + DeviceToX (dw, dx += v[i]);
int uy = oy + DeviceToX (dw, dy += v[i+1]);
@@ -701,9 +701,9 @@ DrawSpline (dw, v, n)
tx = ux;
ty = uy;
}
-
+
appendPoint (points, &pointi, tx, ty);
-
+
XDrawLines (XtDisplay (dw), XtWindow (dw), dw->dvi.normal_GC,
points, pointi, CoordModeOrigin);
}
diff --git a/gnu/usr.bin/groff/xditview/font.c b/gnu/usr.bin/groff/xditview/font.c
index ecfba4e..3778eec 100644
--- a/gnu/usr.bin/groff/xditview/font.c
+++ b/gnu/usr.bin/groff/xditview/font.c
@@ -66,7 +66,7 @@ LookupFontSizeBySize (dw, f, size)
unsigned int fontNameAttributes;
char fontNameString[2048];
int decipointsize;
-
+
if (f->scalable) {
decipointsize = (10*size)/dw->dvi.sizescale;
for (best = f->sizes; best; best = best->next)
@@ -251,7 +251,7 @@ InstallFont (dw, position, dvi_name, x_name)
f->char_map = DviFindMap (encoding);
} else
f->char_map = 0;
- /*
+ /*
* force requery of fonts
*/
dw->dvi.font = 0;
@@ -267,7 +267,7 @@ ForgetFonts (dw)
DviWidget dw;
{
DviFontList *f = dw->dvi.fonts;
-
+
while (f) {
DviFontList *tem = f;
@@ -280,8 +280,8 @@ ForgetFonts (dw)
f = f->next;
XtFree ((char *) tem);
}
-
- /*
+
+ /*
* force requery of fonts
*/
dw->dvi.font = 0;
@@ -300,7 +300,7 @@ MapDviNameToXName (dw, dvi_name)
char *dvi_name;
{
DviFontMap *fm;
-
+
for (fm = dw->dvi.font_map; fm; fm=fm->next)
if (!strcmp (fm->dvi_name, dvi_name))
return fm->x_name;
@@ -314,7 +314,7 @@ MapXNameToDviName (dw, x_name)
char *x_name;
{
DviFontMap *fm;
-
+
for (fm = dw->dvi.font_map; fm; fm=fm->next)
if (!strcmp (fm->x_name, x_name))
return fm->dvi_name;
diff --git a/gnu/usr.bin/groff/xditview/lex.c b/gnu/usr.bin/groff/xditview/lex.c
index 32831bd..854f7cb 100644
--- a/gnu/usr.bin/groff/xditview/lex.c
+++ b/gnu/usr.bin/groff/xditview/lex.c
@@ -27,9 +27,9 @@ GetLine(dw, Buffer, Length)
int Length;
{
int i = 0, c;
-
+
Length--; /* Save room for final '\0' */
-
+
while (DviGetC (dw, &c) != EOF) {
if (Buffer && i < Length)
Buffer[i++] = c;
@@ -41,7 +41,7 @@ GetLine(dw, Buffer, Length)
if (Buffer)
Buffer[i] = '\0';
return Buffer;
-}
+}
char *
GetWord(dw, Buffer, Length)
@@ -50,7 +50,7 @@ GetWord(dw, Buffer, Length)
int Length;
{
int i = 0, c;
-
+
Length--; /* Save room for final '\0' */
while (DviGetC(dw, &c) == ' ' || c == '\n')
;
@@ -65,7 +65,7 @@ GetWord(dw, Buffer, Length)
if (Buffer)
Buffer[i] = '\0';
return Buffer;
-}
+}
GetNumber(dw)
DviWidget dw;
@@ -90,7 +90,7 @@ GetNumber(dw)
DviUngetC(dw, c);
return i;
}
-
+
/*
Local Variables:
c-indent-level: 8
diff --git a/gnu/usr.bin/groff/xditview/parse.c b/gnu/usr.bin/groff/xditview/parse.c
index 8367c17..58928f0 100644
--- a/gnu/usr.bin/groff/xditview/parse.c
+++ b/gnu/usr.bin/groff/xditview/parse.c
@@ -37,7 +37,7 @@ ParseInput(dw)
push_env (dw);
for (;;) {
switch (DviGetC(dw, &c)) {
- case '\n':
+ case '\n':
break;
case ' ': /* when input is text */
case 0: /* occasional noise creeps in */
@@ -206,13 +206,13 @@ char *buf;
int v[DRAW_ARGS_MAX];
int i;
char *ptr;
-
+
v[0] = v[1] = v[2] = v[3] = 0;
-
+
if (buf[0] == '\0')
return;
ptr = buf+1;
-
+
for (i = 0; i < DRAW_ARGS_MAX; i++) {
if (sscanf(ptr, "%d", v + i) != 1)
break;
@@ -221,7 +221,7 @@ char *buf;
while (*ptr != '\0' && *ptr != ' ')
ptr++;
}
-
+
switch (buf[0]) {
case 'l': /* draw a line */
DrawLine(dw, v[0], v[1]);
@@ -263,7 +263,7 @@ char *buf;
#endif
break;
}
-
+
if (buf[0] == 'e') {
if (i > 0)
dw->dvi.state->x += v[0];
@@ -276,7 +276,7 @@ char *buf;
dw->dvi.state->x += v[i];
}
}
-}
+}
static
ParseDeviceControl(dw) /* Parse the x commands */
diff --git a/gnu/usr.bin/groff/xditview/xditview.c b/gnu/usr.bin/groff/xditview/xditview.c
index 6894cee..f800d09 100644
--- a/gnu/usr.bin/groff/xditview/xditview.c
+++ b/gnu/usr.bin/groff/xditview/xditview.c
@@ -20,7 +20,7 @@
*
*/
/*
- * xditview --
+ * xditview --
*
* Display ditroff output in an X window
*/
@@ -189,11 +189,11 @@ void main(argc, argv)
XCreateBitmapFromData (XtDisplay (toplevel),
XtScreen(toplevel)->root,
xdit_bits, xdit_width, xdit_height));
-
+
XtSetArg (topLevelArgs[1], XtNiconMask,
XCreateBitmapFromData (XtDisplay (toplevel),
XtScreen(toplevel)->root,
- xdit_mask_bits,
+ xdit_mask_bits,
xdit_mask_width, xdit_mask_height));
XtSetValues (toplevel, topLevelArgs, 2);
if (argc > 1)
@@ -205,7 +205,7 @@ void main(argc, argv)
simpleMenu = XtCreatePopupShell ("menu", simpleMenuWidgetClass, toplevel,
NULL, 0);
for (i = 0; i < XtNumber (menuEntries); i++) {
- entry = XtCreateManagedWidget(menuEntries[i].name,
+ entry = XtCreateManagedWidget(menuEntries[i].name,
smeBSBObjectClass, simpleMenu,
NULL, (Cardinal) 0);
XtAddCallback(entry, XtNcallback, menuEntries[i].function, NULL);
@@ -413,7 +413,7 @@ RerasterizeAction()
if (current_file_name[0] == 0) {
/* XXX display an error message */
return;
- }
+ }
XtSetArg (args[0], XtNpageNumber, &number);
XtGetValues (dvi, args, 1);
NewFile(current_file_name);
@@ -525,7 +525,7 @@ char *def;
Dimension center_width, center_height;
Dimension prompt_width, prompt_height;
Widget valueWidget;
-
+
CancelAction ((Widget)NULL, (XEvent *) 0, (String *) 0, (Cardinal *) 0);
promptShell = XtCreatePopupShell ("promptShell", transientShellWidgetClass,
toplevel, NULL, (Cardinal) 0);
diff --git a/gnu/usr.bin/groff/xditview/xtotroff.c b/gnu/usr.bin/groff/xditview/xtotroff.c
index 16e8c26..15841f8 100644
--- a/gnu/usr.bin/groff/xditview/xtotroff.c
+++ b/gnu/usr.bin/groff/xditview/xtotroff.c
@@ -12,7 +12,7 @@
#ifdef X_NOT_STDC_ENV
char *malloc();
-#else
+#else
#include <stdlib.h>
#endif
@@ -145,7 +145,7 @@ MapFont (font_name, troff_name)
fprintf (stderr, "font does not exist: %s\n", names[0]);
return 0;
}
-
+
printf ("%s -> %s\n", names[0], troff_name);
(void) unlink (troff_name);
@@ -189,7 +189,7 @@ MapFont (font_name, troff_name)
fprintf (out, ",%d", param[k]);
}
fprintf (out, "\t0\t0%o\n", c);
-
+
if (name) {
for (k = 1; DviCharName(char_map,c,k); k++) {
fprintf (out, "%s\t\"\n",
OpenPOWER on IntegriCloud