[Groff-commit] groff ./ChangeLog contrib/pdfmark/Makefile.sub ...

[Werner LEMBERG]

CVSROOT:        /cvsroot/groff
Module name:    groff
Branch:         
Changes by:     Werner LEMBERG <address@hidden> 05/05/28 07:10:16

Modified files:
        .              : ChangeLog 
        contrib/pdfmark: Makefile.sub 
        src/devices/grolbp: lbp.cpp lbp.h 
        src/preproc/eqn: Makefile.sub 
        src/preproc/html: Makefile.sub 
        src/preproc/soelim: Makefile.sub 
        src/preproc/tbl: Makefile.sub 

Log message:
        * 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.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/ChangeLog.diff?tr1=1.829&tr2=1.830&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/pdfmark/Makefile.sub.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/src/devices/grolbp/lbp.cpp.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/src/devices/grolbp/lbp.h.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/src/preproc/eqn/Makefile.sub.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/src/preproc/html/Makefile.sub.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/src/preproc/soelim/Makefile.sub.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/src/preproc/tbl/Makefile.sub.diff?tr1=1.4&tr2=1.5&r1=text&r2=text

Patches:
Index: groff/ChangeLog
diff -u groff/ChangeLog:1.829 groff/ChangeLog:1.830
--- groff/ChangeLog:1.829       Fri May 27 07:10:53 2005
+++ groff/ChangeLog     Sat May 28 07:10:16 2005
@@ -1,3 +1,15 @@
+2005-05-28  Werner LEMBERG  <address@hidden>
+
+       * 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  <address@hidden>
 
        * MANIFEST, README, doc/webpage.ms: Updated.
Index: groff/contrib/pdfmark/Makefile.sub
diff -u groff/contrib/pdfmark/Makefile.sub:1.5 
groff/contrib/pdfmark/Makefile.sub:1.6
--- groff/contrib/pdfmark/Makefile.sub:1.5      Thu May 26 21:01:57 2005
+++ groff/contrib/pdfmark/Makefile.sub  Sat May 28 07:10:16 2005
@@ -55,7 +55,7 @@
 .SUFFIXES: .ms .pdf
 .ms.pdf:
        $(RM) $@
-       $(PDFROFF) -mspdf --style=$(srcdir)/cover.ms $< >$@
+       $(PDFROFF) -mspdf --stylesheet=$(srcdir)/cover.ms $< >$@
 
 all: pdfroff $(make_pdfdoc)
 
Index: groff/src/devices/grolbp/lbp.cpp
diff -u groff/src/devices/grolbp/lbp.cpp:1.7 
groff/src/devices/grolbp/lbp.cpp:1.8
--- groff/src/devices/grolbp/lbp.cpp:1.7        Thu May 26 21:01:58 2005
+++ groff/src/devices/grolbp/lbp.cpp    Sat May 28 07:10:16 2005
@@ -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ú <address@hidden> with many ideas
      taken from the other groff drivers.
@@ -214,7 +214,7 @@
       /*  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 @@
       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 @@
          orientation = 1;
        else
          error("unknown orientation '%1'", optarg);
-      };
+      }
       break;
     case 'c':
       {
Index: groff/src/devices/grolbp/lbp.h
diff -u groff/src/devices/grolbp/lbp.h:1.12 groff/src/devices/grolbp/lbp.h:1.13
--- groff/src/devices/grolbp/lbp.h:1.12 Thu May 26 21:01:59 2005
+++ groff/src/devices/grolbp/lbp.h      Sat May 28 07:10:16 2005
@@ -324,7 +324,7 @@
   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 @@
   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 @@
   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 @@
          despx = dxnew; 
          if ((sg == sigpend) && (dy == 0)){
                  return;
-         };
+         }
        dy = 0;
   }
   else {
@@ -407,9 +407,9 @@
        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 @@
   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(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);
-       };
+       }
 }
 
 
Index: groff/src/preproc/eqn/Makefile.sub
diff -u groff/src/preproc/eqn/Makefile.sub:1.13 
groff/src/preproc/eqn/Makefile.sub:1.14
--- groff/src/preproc/eqn/Makefile.sub:1.13     Wed Apr  7 17:46:00 2004
+++ groff/src/preproc/eqn/Makefile.sub  Sat May 28 07:10:16 2005
@@ -1,6 +1,7 @@
 PROG=eqn$(EXEEXT)
 MAN1=eqn.n neqn.n
 XLIBS=$(LIBGROFF)
+MLIB=$(LIBM)
 OBJS=\
   eqn.$(OBJEXT) \
   main.$(OBJEXT) \
Index: groff/src/preproc/html/Makefile.sub
diff -u groff/src/preproc/html/Makefile.sub:1.6 
groff/src/preproc/html/Makefile.sub:1.7
--- groff/src/preproc/html/Makefile.sub:1.6     Tue Apr 15 15:13:45 2003
+++ groff/src/preproc/html/Makefile.sub Sat May 28 07:10:16 2005
@@ -2,5 +2,6 @@
 # MAN1=pre-grohtml.n
 MAN1=
 XLIBS=$(LIBGROFF)
+MLIB=$(LIBM)
 OBJS=pre-html.$(OBJEXT) pushback.$(OBJEXT)
 CCSRCS=$(srcdir)/pre-html.cpp $(srcdir)/pushback.cpp
Index: groff/src/preproc/soelim/Makefile.sub
diff -u groff/src/preproc/soelim/Makefile.sub:1.4 
groff/src/preproc/soelim/Makefile.sub:1.5
--- groff/src/preproc/soelim/Makefile.sub:1.4   Tue Apr 15 15:14:01 2003
+++ groff/src/preproc/soelim/Makefile.sub       Sat May 28 07:10:16 2005
@@ -1,6 +1,7 @@
 PROG=soelim$(EXEEXT)
 MAN1=soelim.n
 XLIBS=$(LIBGROFF)
+MLIB=$(LIBM)
 OBJS=soelim.$(OBJEXT)
 CCSRCS=$(srcdir)/soelim.cpp
 NAMEPREFIX=$(g)
Index: groff/src/preproc/tbl/Makefile.sub
diff -u groff/src/preproc/tbl/Makefile.sub:1.4 
groff/src/preproc/tbl/Makefile.sub:1.5
--- groff/src/preproc/tbl/Makefile.sub:1.4      Tue Apr 15 15:14:02 2003
+++ groff/src/preproc/tbl/Makefile.sub  Sat May 28 07:10:16 2005
@@ -1,6 +1,7 @@
 PROG=tbl$(EXEEXT)
 MAN1=tbl.n
 XLIBS=$(LIBGROFF)
+MLIB=$(LIBM)
 OBJS=\
   main.$(OBJEXT) \
   table.$(OBJEXT)