diff options
| author | wlemb <wlemb> | 2000-05-29 20:52:56 +0000 |
|---|---|---|
| committer | wlemb <wlemb> | 2000-05-29 20:52:56 +0000 |
| commit | bbc23036e5152f165a47f9247c4bfbed293bfd31 (patch) | |
| tree | a3dd29c6e3d17e4360329a59c1cf4592062816ae | |
| parent | c344c74cdc296735c98653c64e5a8511b0f4f3e9 (diff) | |
| download | groff-bbc23036e5152f165a47f9247c4bfbed293bfd31.tar.gz | |
* src/preproc/grn/Makefile.sub: Add MLIB.
* Makefile.in: Use @datadir@ and @mandir@ appropriately.
* src/devices/grolbp/lbp.cc: Various small fixes.
* src/roff/nroff/nroff.sh: Fix infinite loop syntax.
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | Makefile.in | 4 | ||||
| -rw-r--r-- | src/devices/grolbp/lbp.cc | 8 | ||||
| -rw-r--r-- | src/preproc/grn/Makefile.sub | 1 |
4 files changed, 18 insertions, 7 deletions
@@ -1,12 +1,22 @@ +2000-05-29 Andrej Borsenkow <Andrej.Borsenkow@mow.siemens.ru> + + * src/preproc/grn/Makefile.sub: Add MLIB. + +2000-05-29 Nix <nix@esperi.demon.co.uk> + + * Makefile.in: Use @datadir@ and @mandir@ appropriately. + 2000-05-29 Werner LEMBERG <wl@gnu.org> * src/roff/grog/Makefile.sub, src/roff/grog/grog.sh: Add `@g@'. * PROBLEMS: Small update. + * src/devices/grolbp/lbp.cc: Various small fixes. + 2000-05-28 Keith Thompson <kst@sdsc.edu> - * src/roff/nroff/nroff.sh: Fix infinite loop. + * src/roff/nroff/nroff.sh: Fix infinite loop syntax. * src/utils/indxbib/indxbib.cc: Add declaration of mkstemp(). diff --git a/Makefile.in b/Makefile.in index ca510084..5eeeb34b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -78,7 +78,7 @@ exec_prefix=@exec_prefix@ bindir=$(exec_prefix)/bin # datasubdir says where to install data files -datadir=$(prefix)/share +datadir=@datadir@ datasubdir=$(datadir)/groff # fontdir says where to install dev*/*. @@ -135,7 +135,7 @@ indexname=Ind common_words_file=$(datasubdir)/eign # manroot is the root of the man page directory tree. -manroot=$(prefix)/man +manroot=@mandir@ # man1ext is the man section for user commands. man1ext=1 diff --git a/src/devices/grolbp/lbp.cc b/src/devices/grolbp/lbp.cc index e434bb48..faab20e4 100644 --- a/src/devices/grolbp/lbp.cc +++ b/src/devices/grolbp/lbp.cc @@ -66,8 +66,8 @@ private: void vdmstart(); void vdmflush(); // the name vdmend was already used in lbp.h void setfillmode(int mode); - void lbp_printer::polygon( int hpos,int vpos,int np,int *p); - char *lbp_printer::font_name(const lbp_font *f, const int siz); + void polygon( int hpos,int vpos,int np,int *p); + char *font_name(const lbp_font *f, const int siz); int fill_pattern; int fill_mode; @@ -422,8 +422,8 @@ void lbp_printer::draw(int code, int *p, int np, const environment *env) if (vdminited()) vdmlinewidth(line_thickness); // fprintf(stderr,"\nthickness: %d == %d, size %d\n", // p[0],line_thickness,env->size ); - break; } // else + break; case 'l': // Line if (np != 2) { @@ -490,7 +490,7 @@ void lbp_printer::draw(int code, int *p, int np, const environment *env) // We must compensate for that, exchanging the starting and // ending points vdmvarc(env->hpos + p[0],env->vpos+p[1],\ - int(sqrt( (p[0]*p[0])+(p[1]*p[1]))),\ + int(sqrt( double((p[0]*p[0])+(p[1]*p[1])))),\ p[2],p[3],\ (-p[0]),(-p[1]),1,2); break; diff --git a/src/preproc/grn/Makefile.sub b/src/preproc/grn/Makefile.sub index 0e2aa79d..ffa0ad20 100644 --- a/src/preproc/grn/Makefile.sub +++ b/src/preproc/grn/Makefile.sub @@ -1,5 +1,6 @@ PROG=grn MAN1=grn.n +MLIB=$(LIBM) XLIBS=$(LIBGROFF) OBJS=\ hdb.o \ |