* src/include/lib.h: Include getopt.h if groff-getopt.h can't be

included.
Handle CYGWIN properly.

* font/devlbp/Makefile.sub (DEVFILES): Add some missing fonts.
* tmac/lbp.tmac: Add some font translations.

5 files changed, 45 insertions, 23 deletions

diff --git a/ChangeLog b/ChangeLog
index 45d7edd6..a3969506 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,23 @@
+2002-03-07  Werner LEMBERG  <wl@gnu.org>
+
+	* src/include/lib.h: Include getopt.h if groff-getopt.h can't be
+	included.
+	Handle CYGWIN properly.
+
+2002-03-07  Paco Andrés Verdú  <pandres@dragonet.es>
+
+	* font/devlbp/Makefile.sub (DEVFILES): Add some missing fonts.
+	* tmac/lbp.tmac: Add some font translations.
+
 2002-03-02  Werner LEMBERG  <wl@gnu.org>
 
-	* fonts/devcp1047/R.proto, fonts/devlatin1/R.proto,
-	fonts/devhtml/R.proto: Remove `charXXX'	entries.
+	* font/devcp1047/R.proto, font/devlatin1/R.proto,
+	font/devhtml/R.proto: Remove `charXXX'	entries.
 	* tmac/tty.tmac, tmac/html.tmac: Load latin1.tmac or cp1047.tmac
 	where appropriate.
 
-	* fonts/devlj4/generate/text.map: Remove `charXXX' entries.
-	* fonts/devlj4/*: Regenerated all font definition files.
+	* font/devlj4/generate/text.map: Remove `charXXX' entries.
+	* font/devlj4/*: Regenerated all font definition files.
 	* tmac/lj4.tmac: Load latin1.tmac.
 
 	* src/utils/hpftodit/hpftodit.cc (do_file): Partially undo change
@@ -31,14 +42,14 @@
 
 	* tmac/ec.tmac: Don't load latin1.tmac again.
 
-	* fonts/devps/generate/lgreekmap, fonts/devps/generate/symbolchars,
-	fonts/devps/generate/dingbats.map,
-	fonts/devps/generate/dingbats.rmap, fonts/devps/text.enc,
-	fonts/devps/generate/Makefile (symbolmap): Add header comment.
-	* fonts/devps/generate/textmap: Ditto.
+	* font/devps/generate/lgreekmap, font/devps/generate/symbolchars,
+	font/devps/generate/dingbats.map,
+	font/devps/generate/dingbats.rmap, font/devps/text.enc,
+	font/devps/generate/Makefile (symbolmap): Add header comment.
+	* font/devps/generate/textmap: Ditto.
 	Remove `charXXX' entries.
-	* fonts/devps/symbolmap: Regenerated.
-	* fonts/devps/*: Regenerated all font definition files.
+	* font/devps/symbolmap: Regenerated.
+	* font/devps/*: Regenerated all font definition files.
 
 2002-02-28  Werner LEMBERG  <wl@gnu.org>
 
@@ -4392,7 +4403,7 @@ Version 1.16.1 released
 	src/roff/groff/groff.cc: Use it.
 	* Makefile.in, configure: Updated.
 
-2000-06-07  Paco Andres Verdu  <pandres@dragonet.es>
+2000-06-07  Paco Andrés Verdú  <pandres@dragonet.es>
 
 	* src/devides/grolbp/lbp.h: Removed unused variables.
 
@@ -4886,7 +4897,7 @@ Version 1.16 released
 
 	* src/roff/grog/grog.man: Updated copyright date.
 
-2000-03-14  Francisco Andres Verdu  <pandres@dragonet.es>
+2000-03-14  Francisco Andrés Verdú  <pandres@dragonet.es>
 
 	* configure.in: Added test for strdup.
 
@@ -4971,7 +4982,7 @@ Version 1.16 released
 	Implement it.
 	* src/roff/troff/env.h: Add prototype.
 
-2000-03-05  Francisco Andres Verdu  <pandres@dragonet.es>
+2000-03-05  Francisco Andrés Verdú  <pandres@dragonet.es>
 
 	Adding strsep() -- Solaris 8 doesn't have it.
 
@@ -4995,7 +5006,7 @@ Version 1.16 released
 
 	* tmac/troffrc: Add tmac.lbp.
 
-2000-03-03  Francisco Andres Verdu  <pandres@dragonet.es>
+2000-03-03  Francisco Andrés Verdú  <pandres@dragonet.es>
 
 	* tmac/tmac.lbp: New file.
 	* src/devices/grolbp/grolbp.man: Add documentation of `lbpname'
@@ -5080,7 +5091,7 @@ Version 1.16 released
 
 	Adding a new driver, grolbp, for Canon CAPSL printers (LBP-4 and
 	LBP-8 series laser printers).  This code has been contributed by
-	Francisco Andres Verdu <pandres@dragonet.es>.
+	Francisco Andrés Verdú <pandres@dragonet.es>.
 
 	* src/devices/grolbp/*: The grolbp output device.
 	* font/devlpb/*: The font description files.
diff --git a/doc/groff.texinfo b/doc/groff.texinfo
index a64f0b68..66f9c7a9 100644
--- a/doc/groff.texinfo
+++ b/doc/groff.texinfo
@@ -4,6 +4,8 @@
 @c Please convert this manual with `texi2dvi -e groff.texinfo' due to a bug
 @c in texinfo regarding expansion of user-defined macros.
 @c
+@c You need texinfo 4.1 to format this document!
+@c
 
 @c %**start of header (This is for running Texinfo on a region.)
 @setfilename  groff
@@ -2737,7 +2739,7 @@ Defines the length of a footnote.
 
 Effective: next footnote.
 
-Default: @math{@code{\n[LL]} * 5 / 6}.
+Default: @math{\code{\rawbackslashxx n[LL]} * 5 / 6}.
 @endDefmpreg
 
 @Defmpreg {FI, ms}
@@ -7869,7 +7871,7 @@ command in font files or with the @code{fspecial} request).
 @cindex @code{ps} request, and constant character space mode
 @Defreq {cs, font [@Var{width} [@Var{em-size}]]}
 Switch to and from constant character space mode.  If activated, the
-width of every character is @math{@var{width}/36} ems.  The em size is
+width of every character is @math{\var{width}/36} ems.  The em size is
 given absolutely by @var{em-size}; if this argument is missing, the em
 value is taken from the current font size (as set with the @code{ps}
 request) when the font is effectively in use.  Without second and
@@ -8018,7 +8020,7 @@ isn't used widely.
 q\f[I]f
     @result{} @r{q}@i{f}
 q\,\f[I]f
-    @result{} @r{q}@math{@ptexcomma}@i{f}
+    @result{} @r{q}@math{\ptexcomma}@i{f}
 @end group
 @end example
 @end iftex
@@ -8229,7 +8231,7 @@ spacing; it is associated with the current environment
 @cindex @code{tkf} request, with fractional type sizes
 @cindex @code{\H}, with fractional type sizes
 @cindex @code{\s}, with fractional type sizes
-A @dfn{scaled point} is equal to @math{1/@var{sizescale}} points,
+A @dfn{scaled point} is equal to @math{1/\var{sizescale}} points,
 where @var{sizescale} is specified in the @file{DESC} file (1@w{ }by
 default).  There is a new scale indicator @samp{z} which has the
 effect of multiplying by @var{sizescale}.  Requests and escape
@@ -9034,7 +9036,7 @@ The @code{als} request can make a macro have more than one name.
 This would be called as
 
 @Example
-.vl $Id: groff.texinfo,v 1.102 2002/02/25 14:53:39 wlemb Exp $
+.vl $Id: groff.texinfo,v 1.103 2002/03/08 07:33:48 wlemb Exp $
 @endExample
 @endDefesc
 
diff --git a/font/devlbp/Makefile.sub b/font/devlbp/Makefile.sub
index 6959b25f..16335d33 100644
--- a/font/devlbp/Makefile.sub
+++ b/font/devlbp/Makefile.sub
@@ -2,7 +2,10 @@ DEV=lbp
 LBPPRINT=$(PSPRINT)
 DEVFILES=DESC \
   HB HBI HI HR \
-  TB TBI TI TR 
+  HNB HNBI HNI HNR \
+  TB TBI TI TR \
+  CR CB CI \
+  ER EB EI
 
 CLEANADD=DESC
 
diff --git a/src/include/lib.h b/src/include/lib.h
index 443ca11b..c6468e0b 100644
--- a/src/include/lib.h
+++ b/src/include/lib.h
@@ -32,12 +32,16 @@ extern "C" {
 }
 
 /* stdio.h on IRIX, OSF/1, emx, and UWIN include getopt.h */
+/* unistd.h on CYGWIN includes getopt.h */
 
 #if !(defined(__sgi) \
       || (defined(__osf__) && defined(__alpha)) \
       || defined(_UWIN) \
-      || defined(__EMX__))
+      || defined(__EMX__) \
+      || defined(__CYGWIN__))
 #include <groff-getopt.h>
+#else
+#include <getopt.h>
 #endif
 
 char *strsave(const char *s);
diff --git a/tmac/lbp.tmac b/tmac/lbp.tmac
index 0d17b631..7a56668d 100644
--- a/tmac/lbp.tmac
+++ b/tmac/lbp.tmac
@@ -12,4 +12,6 @@
 .ftr Hi HNI
 .ftr Hb HNB
 .ftr Hx HNBI
+.ftr EBI EI
+.ftr CBI CI
 .cp \n(_C