* src/include/nonposix.h (fileno) [_MSC_VER]: Removed.

* font/devlbp/Makefile.sub (CLEANADD): Set it.
* tmac/Makefile.sub (CLEANADD): Add tmac.local-s.
* Makefile.in (dist): Don't remove src/xditview/Imakefile, but ...
* Makefile.sub (DISTCLEANFILES): Here.

* libs/libgroff/new.cc: Include `nonposix.h'.
* win32-diffs: Updated.

When inside displays, an empty input line warning should be
suppressed.  If another macro call is put inside a display,
all subsequent empty lines found in that display caused a
warning to be emitted.

(doc-empty-line): Check the `doc-display-depth' register to
determine whether we are inside display or not.
the only change is that `.Fn' and `.Fc' put a final semicolon after
a function declaration in the SYNOPSIS section).

10 files changed, 37 insertions, 15 deletions

diff --git a/ChangeLog b/ChangeLog
index b0f00c29..4d93b072 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,33 @@
+2001-04-11  Blake McBride  <blake@florida-software.com>
+
+	* src/include/nonposix.h (fileno) [_MSC_VER]: Removed.
+
+2001-04-11  Werner LEMBERG  <wl@gnu.org>
+
+	* font/devlbp/Makefile.sub (CLEANADD): Set it.
+	* tmac/Makefile.sub (CLEANADD): Add tmac.local-s.
+	* Makefile.in (dist): Don't remove src/xditview/Imakefile, but ...
+	* Makefile.sub (DISTCLEANFILES): Here.
+
+	* libs/libgroff/new.cc: Include `nonposix.h'.
+	* win32-diffs: Updated.
+
 2001-04-10  Ruslan Ermilov  <ru@FreeBSD.org>
 
 	Added skeleton macro for defunct macros.
 
 	Updated documentation.
 
+	When inside displays, an empty input line warning should be
+	suppressed.  If another macro call is put inside a display,
+	all subsequent empty lines found in that display caused a
+	warning to be emitted.
+
 	* tmac/doc.tmac (doc-defunct-macro): New macro.
 	(Db, Ds, Ex, Or, Sf): Reimplemented using this macro.
 	(doc-restore-global-vars): Fixed typo.
+	(doc-empty-line): Check the `doc-display-depth' register to
+	determine whether we are inside display or not.
 
 	* tmac/doc-common: Removed `Or' and `Sf' registers.
 	Moved obsolete `Ds' macro to doc.tmac.
@@ -86,8 +107,8 @@
 	Fix indentation in SYNOPSIS.
 
 	Updated to include changes of latest BSD mdoc version (basically,
-	`.Fn' and `.Fc' put a final semicolon after a function declaration
-	in the SYNOPSIS section.
+	the only change is that `.Fn' and `.Fc' put a final semicolon after
+	a function declaration in the SYNOPSIS section).
 
 	* tmac/doc.tmac (doc-in-synopsis-count): Replaced with ...
 	(doc-in-synopsis-section): New variable.  Updated all related
diff --git a/Makefile.in b/Makefile.in
index 602a812e..05f94832 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -491,7 +491,6 @@ $(INCDIRS) $(OTHERDIRS): FORCE
 dist:
 	-rm -fr tmp
 	rm -f groff-$(version)$(revision).tar.gz
-	rm -f src/xditview/Imakefile;
 	mkdir tmp
 	for d in $(DISTDIRS); do \
 	  $(mkinstalldirs) tmp/$$d; \
diff --git a/Makefile.sub b/Makefile.sub
index ab72a5f7..77c701f9 100644
--- a/Makefile.sub
+++ b/Makefile.sub
@@ -1,4 +1,5 @@
-DISTCLEANFILES=config.status config.log config.cache Makefile
+DISTCLEANFILES=config.status config.log config.cache Makefile \
+               src/xditview/Imakefile
 CLEANADD=Makefile.cfg conftest*
 
 distfiles: configure
diff --git a/font/devlbp/Makefile.sub b/font/devlbp/Makefile.sub
index 64d9ebd6..6959b25f 100644
--- a/font/devlbp/Makefile.sub
+++ b/font/devlbp/Makefile.sub
@@ -4,6 +4,8 @@ DEVFILES=DESC \
   HB HBI HI HR \
   TB TBI TI TR 
 
+CLEANADD=DESC
+
 DESC: DESC.in
 	-rm -f DESC
 	cat $(srcdir)/DESC.in >>DESC
diff --git a/src/include/nonposix.h b/src/include/nonposix.h
index e4b02da3..51449832 100644
--- a/src/include/nonposix.h
+++ b/src/include/nonposix.h
@@ -25,7 +25,6 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
 #  define _WIN32
 # endif
 # define setmode(f,m) _setmode(f,m)
-# define fileno(f)    _fileno(f)
 #endif
 
 #if defined(__MSDOS__) || (defined(_WIN32) && !defined(__CYGWIN32__))
diff --git a/src/libs/libgroff/new.cc b/src/libs/libgroff/new.cc
index d26db2f5..8d98591a 100644
--- a/src/libs/libgroff/new.cc
+++ b/src/libs/libgroff/new.cc
@@ -22,6 +22,7 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
 #include <string.h>
 
 #include "posix.h"
+#include "nonposix.h"
 
 extern const char *program_name;
 
diff --git a/src/roff/troff/input.cc b/src/roff/troff/input.cc
index 472298d7..b5e17eb4 100644
--- a/src/roff/troff/input.cc
+++ b/src/roff/troff/input.cc
@@ -6159,11 +6159,11 @@ int main(int argc, char **argv)
       safer_flag = 0;	// unsafe behaviour
       break;
     case CHAR_MAX + 1: // --help
-      usage(stdout,argv[0]);
+      usage(stdout, argv[0]);
       exit(0);
       break;
     case '?':
-      usage(stderr,argv[0]);
+      usage(stderr, argv[0]);
       exit(1);
       break;		// never reached
     default:
diff --git a/tmac/Makefile.sub b/tmac/Makefile.sub
index edaee6fe..db9bad27 100644
--- a/tmac/Makefile.sub
+++ b/tmac/Makefile.sub
@@ -31,7 +31,7 @@ mdocdir=$(tmacdir)/mdoc
 CLEANADD=\
   stamp-wrap stamp-sed *-wrap man.tmac-sed ms.tmac-sed \
   stamp-strip e.tmac-s doc.tmac-s doc-old.tmac-s \
-  doc-common-s doc-ditroff-s doc-nroff-s doc-syms-s
+  doc-common-s doc-ditroff-s doc-nroff-s doc-syms-s mdoc.local-s
 tmac_s_prefix=
 tmac_an_prefix=
 tmac_wrap=
diff --git a/tmac/doc.tmac b/tmac/doc.tmac
index a280a099..815e3d46 100644
--- a/tmac/doc.tmac
+++ b/tmac/doc.tmac
@@ -6172,7 +6172,7 @@
 .\" NS   emit warning and print empty line
 .
 .de doc-empty-line
-.  if !"\*[doc-macro-name]"Bd" \
+.  if !\n[doc-display-depth] \
 .    tm mdoc warning: Empty input line #\n[.c]
 .  sp
 ..
diff --git a/win32-diffs b/win32-diffs
index 055c7335..f00f1b9e 100644
--- a/win32-diffs
+++ b/win32-diffs
@@ -1,7 +1,7 @@
 diff -aruN groff/Makefile.msc groff.win32/Makefile.msc
 --- groff/Makefile.msc	Thu Jan  1 00:00:00 1970
 +++ groff.win32/Makefile.msc	Wed May 17 09:15:07 2000
-@@ -0,0 +1,37 @@
+@@ -0,0 +1,36 @@
 +
 +
 +MAKECMD = $(MAKE) -nologo -f makefile.msc
@@ -38,7 +38,6 @@ diff -aruN groff/Makefile.msc groff.win32/Makefile.msc
 +	copy src\preproc\pic\pic.exe bin
 +	copy src\preproc\tbl\tbl.exe bin
 +	copy src\roff\troff\troff.exe bin
-+	copy src\roff\troff\hyphen.us tmac
 diff -aruN groff/bin/gs.cmd groff.win32/bin/gs.cmd
 --- groff/bin/gs.cmd	Thu Jan  1 00:00:00 1970
 +++ groff.win32/bin/gs.cmd	Wed May 17 08:57:48 2000
@@ -2891,9 +2890,9 @@ diff -aruN groff/src/libs/libgroff/version.cc groff.win32/src/libs/libgroff/vers
 --- groff/src/libs/libgroff/version.cc	Thu Jan  1 00:00:00 1970
 +++ groff.win32/src/libs/libgroff/version.cc	Wed May 17 08:57:48 2000
 @@ -0,0 +1,3 @@
-+const char *version_string = "1.16";
-+const char *revision_string = "1";
-+const char *Version_string = "1.16";
++const char *version_string = "1.17";
++const char *revision_string = "0";
++const char *Version_string = "1.17";
 diff -aruN groff/src/preproc/eqn/Makefile.msc groff.win32/src/preproc/eqn/Makefile.msc
 --- groff/src/preproc/eqn/Makefile.msc	Thu Jan  1 00:00:00 1970
 +++ groff.win32/src/preproc/eqn/Makefile.msc	Wed May 17 08:57:48 2000
@@ -3045,5 +3044,5 @@ diff -aruN groff/src/roff/troff/majorminor.cc groff.win32/src/roff/troff/majormi
 +++ groff.win32/src/roff/troff/majorminor.cc	Wed May 17 08:57:48 2000
 @@ -0,0 +1,3 @@
 +const char *major_version = "1";
-+const char *minor_version = "16";
++const char *minor_version = "17";
 +const char *revision = "0";