diff options
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | contrib/pdfmark/Makefile.sub | 2 | ||||
| -rw-r--r-- | src/devices/grolbp/lbp.cpp | 10 | ||||
| -rw-r--r-- | src/devices/grolbp/lbp.h | 18 | ||||
| -rw-r--r-- | src/preproc/eqn/Makefile.sub | 1 | ||||
| -rw-r--r-- | src/preproc/html/Makefile.sub | 1 | ||||
| -rw-r--r-- | src/preproc/soelim/Makefile.sub | 1 | ||||
| -rw-r--r-- | src/preproc/tbl/Makefile.sub | 1 |
8 files changed, 31 insertions, 15 deletions
@@ -1,3 +1,15 @@ +2005-05-28 Werner LEMBERG <wl@gnu.org> + + * contrib/pdfmark/Makefile.sub (.ms.pdf): Use `--stylesheet', not + `--style'. + + * src/devices/grolbp/lbp.cpp, src/devices/grolbp/lbp.h: Remove + redundant semicolons. + + * src/preproc/eqn/Makefile.sub, src/preproc/html/Makefile.sub, + src/preproc/soelim/Makefile.sub, src/preproc/tbl/Makefile.sub: + Define `MLIB'. Some compilers need this for linking with libgroff. + 2005-05-27 Werner LEMBERG <wl@gnu.org> * MANIFEST, README, doc/webpage.ms: Updated. diff --git a/contrib/pdfmark/Makefile.sub b/contrib/pdfmark/Makefile.sub index 0240c6a7..8c28385c 100644 --- a/contrib/pdfmark/Makefile.sub +++ b/contrib/pdfmark/Makefile.sub @@ -55,7 +55,7 @@ PDFROFF=\ .SUFFIXES: .ms .pdf .ms.pdf: $(RM) $@ - $(PDFROFF) -mspdf --style=$(srcdir)/cover.ms $< >$@ + $(PDFROFF) -mspdf --stylesheet=$(srcdir)/cover.ms $< >$@ all: pdfroff $(make_pdfdoc) diff --git a/src/devices/grolbp/lbp.cpp b/src/devices/grolbp/lbp.cpp index 89bba09d..081ab998 100644 --- a/src/devices/grolbp/lbp.cpp +++ b/src/devices/grolbp/lbp.cpp @@ -1,5 +1,5 @@ // -*- C++ -*- -/* Copyright (C) 1994, 2000, 2001, 2002, 2003, 2004 +/* Copyright (C) 1994, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. Written by Francisco Andrés Verdú <pandres@dragonet.es> with many ideas taken from the other groff drivers. @@ -214,7 +214,7 @@ inline void lbp_printer::set_line_thickness(int size,const environment *env) /* fprintf(stderr, "thickness: %d == %d, size %d, %d \n", size, line_thickness, env->size,req_linethickness); */ return; -}; // lbp_printer::set_line_thickness +} // lbp_printer::set_line_thickness void lbp_printer::begin_page(int) { @@ -424,9 +424,9 @@ void lbp_printer::draw(int code, int *p, int np, const environment *env) if (np != 1 && np != 2) { error("0 or 1 argument required for thickness"); break; - }; + } set_line_thickness(p[0],env); - }; + } break; case 'l': // Line if (np != 2) { @@ -680,7 +680,7 @@ int main(int argc, char **argv) orientation = 1; else error("unknown orientation '%1'", optarg); - }; + } break; case 'c': { diff --git a/src/devices/grolbp/lbp.h b/src/devices/grolbp/lbp.h index a0b1906f..b3171cf0 100644 --- a/src/devices/grolbp/lbp.h +++ b/src/devices/grolbp/lbp.h @@ -324,7 +324,7 @@ vdmpolyline(int numpoints, int *points) for (i = 1; i < numpoints ; i++) { vdmprintf("%s%s",vdmnum(*p,xcoord),vdmnum(*(p+1),ycoord)); p += 2; - }; /* for */ + } /* for */ vdmprintf("\x1e\n"); } @@ -341,7 +341,7 @@ vdmpolygon(int numpoints, int *points) for (i = 1; i < numpoints ; i++) { vdmprintf("%s%s",vdmnum(*p,xcoord),vdmnum(*(p+1),ycoord)); p += 2; - }; /* for */ + } /* for */ vdmprintf("\x1e\n"); } @@ -384,7 +384,7 @@ splinerel(double px,double py,int flush) char xcoord[4],ycoord[4]; double npend ; - if (flush == -1) {lx = (int)px; ly = (int)py; return;}; + if (flush == -1) {lx = (int)px; ly = (int)py; return;} if (flush == 0) { dxnew = (int)px -lx; @@ -396,7 +396,7 @@ splinerel(double px,double py,int flush) despx = dxnew; if ((sg == sigpend) && (dy == 0)){ return; - }; + } dy = 0; } else { @@ -407,9 +407,9 @@ splinerel(double px,double py,int flush) else { sigpend = sg; pend = npend; - }; /* else (( npend == pend) && ... */ - }; /* else (if (dynew == 0)) */ - }; /* if (!flush ) */ + } /* else (( npend == pend) && ... */ + } /* else (if (dynew == 0)) */ + } /* if (!flush ) */ /* if we've changed direction we must draw the line */ /* fprintf(stderr," (%d) %.2f,%.2f\n",flush,(float)px,(float)py);*/ @@ -420,7 +420,7 @@ splinerel(double px,double py,int flush) if (flush) { dxnew = dy = despx = despy = 0; return; - }; /* if (flush) */ + } /* if (flush) */ dxnew -= despx; dynew -= despy; if ((dxnew != 0) || (dynew != 0)) vdmprintf("%s%s",vdmnum(dxnew,xcoord),\ @@ -467,7 +467,7 @@ quadratic_spline(double a_1, double b_1, double a_2, double b_2, \ quadratic_spline(x_mid, y_mid, ((a_2+3.0*a_3)/4.0), ((b_2+3.0*b_3)/4.0), ((a_3+x_4)/2.0), ((b_3+y_4)/2.0), x_4, y_4); - }; + } } diff --git a/src/preproc/eqn/Makefile.sub b/src/preproc/eqn/Makefile.sub index c1f59727..9028f94c 100644 --- a/src/preproc/eqn/Makefile.sub +++ b/src/preproc/eqn/Makefile.sub @@ -1,6 +1,7 @@ PROG=eqn$(EXEEXT) MAN1=eqn.n neqn.n XLIBS=$(LIBGROFF) +MLIB=$(LIBM) OBJS=\ eqn.$(OBJEXT) \ main.$(OBJEXT) \ diff --git a/src/preproc/html/Makefile.sub b/src/preproc/html/Makefile.sub index 6a9a7570..0763537a 100644 --- a/src/preproc/html/Makefile.sub +++ b/src/preproc/html/Makefile.sub @@ -2,5 +2,6 @@ PROG=pre-grohtml$(EXEEXT) # MAN1=pre-grohtml.n MAN1= XLIBS=$(LIBGROFF) +MLIB=$(LIBM) OBJS=pre-html.$(OBJEXT) pushback.$(OBJEXT) CCSRCS=$(srcdir)/pre-html.cpp $(srcdir)/pushback.cpp diff --git a/src/preproc/soelim/Makefile.sub b/src/preproc/soelim/Makefile.sub index a43dfc28..2e15c008 100644 --- a/src/preproc/soelim/Makefile.sub +++ b/src/preproc/soelim/Makefile.sub @@ -1,6 +1,7 @@ PROG=soelim$(EXEEXT) MAN1=soelim.n XLIBS=$(LIBGROFF) +MLIB=$(LIBM) OBJS=soelim.$(OBJEXT) CCSRCS=$(srcdir)/soelim.cpp NAMEPREFIX=$(g) diff --git a/src/preproc/tbl/Makefile.sub b/src/preproc/tbl/Makefile.sub index 8decd310..bea28b35 100644 --- a/src/preproc/tbl/Makefile.sub +++ b/src/preproc/tbl/Makefile.sub @@ -1,6 +1,7 @@ PROG=tbl$(EXEEXT) MAN1=tbl.n XLIBS=$(LIBGROFF) +MLIB=$(LIBM) OBJS=\ main.$(OBJEXT) \ table.$(OBJEXT) |