From MAILER-DAEMON Sat Apr 02 08:10:19 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DHiLF-0006xl-Ni
	for mharc-groff-commit@gnu.org; Sat, 02 Apr 2005 08:07:11 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DHiJv-000608-M1
	for groff-commit@gnu.org; Sat, 02 Apr 2005 08:05:48 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DHiJq-0005xQ-OH
	for groff-commit@gnu.org; Sat, 02 Apr 2005 08:05:43 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DHiJ2-000539-K4
	for groff-commit@gnu.org; Sat, 02 Apr 2005 08:04:52 -0500
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DHi41-0002av-8Q
	for groff-commit@gnu.org; Sat, 02 Apr 2005 07:49:21 -0500
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DHi3s-0002lb-00
	for <groff-commit@gnu.org>; Sat, 02 Apr 2005 07:49:12 -0500
To: groff-commit@gnu.org
From: Werner LEMBERG <wl@gnu.org>
Message-Id: <E1DHi3s-0002lb-00@savannah.gnu.org>
Date: Sat, 02 Apr 2005 07:49:12 -0500
Subject: [Groff-commit] groff ./ChangeLog src/devices/grohtml/post-html...
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: groff-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/groff-commit>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 02 Apr 2005 13:07:07 -0000

CVSROOT:	/cvsroot/groff
Module name:	groff
Branch: 	
Changes by:	Werner LEMBERG <wl@savannah.gnu.org>	05/04/02 12:49:11

Modified files:
	.              : ChangeLog 
	src/devices/grohtml: post-html.cpp 
	src/include    : Makefile.sub lib.h nonposix.h 
	src/libs/libgroff: Makefile.sub font.cpp maxfilename.cpp 
	                   searchpath.cpp 
Added files:
	src/include    : relocate.h 
	src/libs/libgroff: maxpathname.cpp relocate.cpp 

Log message:
	Add binary relocation support for Windows platforms.
	
	* src/include/Makefile.sub (defs.h): Add `INSTALLPATH'.
	
	* src/include/relocate.h, src/libs/libgroff/relocate.cpp: New files.
	
	* src/libs/libgroff/searchpath.cpp: Handle `relocate'.
	(search_path::search_path, search_path::open_file_cautious): Use
	`relocate'.
	
	* src/libs/libgroff/Makefile.sub (OBJS, CCSRCS),
	src/include/Makefile.sub (HDRS): Updated.
	
	* src/devices/grohtml/post-html.cpp: Don't use strdup/free but
	strsave/a_delete.
	
	* src/libs/libgroff/font.cpp: Replace strdup with strsave.
	
	* src/libs/libgroff/maxfilename.cpp: Don't include limits.h since
	lib.h already does it.
	
	* src/libs/libgroff/maxpathname.cpp: New file, defining
	path_name_max.
	
	* src/include/lib.h: Add prototype for path_name_max.
	
	* src/libs/libgroff/Makefile.sub (OBJS, CCSRCS): Updated.
	
	* src/include/nonposix.h (PATH_EXT): New macro.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/ChangeLog.diff?tr1=1.809&tr2=1.810&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/src/devices/grohtml/post-html.cpp.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/src/include/relocate.h?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/src/include/Makefile.sub.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/src/include/lib.h.diff?tr1=1.36&tr2=1.37&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/src/include/nonposix.h.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/src/libs/libgroff/maxpathname.cpp?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/src/libs/libgroff/relocate.cpp?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/src/libs/libgroff/Makefile.sub.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/src/libs/libgroff/font.cpp.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/src/libs/libgroff/maxfilename.cpp.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/src/libs/libgroff/searchpath.cpp.diff?tr1=1.3&tr2=1.4&r1=text&r2=text

Patches:
Index: groff/ChangeLog
diff -u groff/ChangeLog:1.809 groff/ChangeLog:1.810
--- groff/ChangeLog:1.809	Mon Mar 28 09:16:04 2005
+++ groff/ChangeLog	Sat Apr  2 12:49:10 2005
@@ -1,3 +1,38 @@
+2005-04-01  Kees Zeelenberg  <kzlg@users.sourceforge.net>
+            Werner LEMBERG  <wl@gnu.org>
+
+	Add binary relocation support for Windows platforms.
+
+	* src/include/Makefile.sub (defs.h): Add `INSTALLPATH'.
+
+	* src/include/relocate.h, src/libs/libgroff/relocate.cpp: New files.
+
+	* src/libs/libgroff/searchpath.cpp: Handle `relocate'.
+	(search_path::search_path, search_path::open_file_cautious): Use
+	`relocate'.
+
+	* src/libs/libgroff/Makefile.sub (OBJS, CCSRCS),
+	src/include/Makefile.sub (HDRS): Updated.
+
+2005-04-01  Werner LEMBERG  <wl@gnu.org>
+
+	* src/devices/grohtml/post-html.cpp: Don't use strdup/free but
+	strsave/a_delete.
+
+	* src/libs/libgroff/font.cpp: Replace strdup with strsave.
+
+	* src/libs/libgroff/maxfilename.cpp: Don't include limits.h since
+	lib.h already does it.
+
+	* src/libs/libgroff/maxpathname.cpp: New file, defining
+	path_name_max.
+
+	* src/include/lib.h: Add prototype for path_name_max.
+
+	* src/libs/libgroff/Makefile.sub (OBJS, CCSRCS): Updated.
+
+	* src/include/nonposix.h (PATH_EXT): New macro.
+
 2005-03-28  Werner LEMBERG  <wl@gnu.org>
 
 	Add support for double- and zero-width characters in grotty.
Index: groff/src/devices/grohtml/post-html.cpp
diff -u groff/src/devices/grohtml/post-html.cpp:1.21 groff/src/devices/grohtml/post-html.cpp:1.22
--- groff/src/devices/grohtml/post-html.cpp:1.21	Tue Mar 15 22:07:46 2005
+++ groff/src/devices/grohtml/post-html.cpp	Sat Apr  2 12:49:11 2005
@@ -1740,9 +1740,9 @@
     }
     t->id = i;
     t->val = v;
-    free((void *)c);
-    free((void *)f);
-    free((void *)l);
+    a_delete c;
+    a_delete f;
+    a_delete l;
   }
 }
 
@@ -1797,7 +1797,7 @@
 const char *replace_negate_str (const char *before, char *after)
 {
   if (before != NULL)
-    free((void *)before);
+    a_delete before;
 
   if (strlen(after) > 0) {
     int d = atoi(after);
@@ -1818,7 +1818,7 @@
 const char *replace_str (const char *before, const char *after)
 {
   if (before != NULL)
-    free((void *)before);
+    a_delete before;
   return after;
 }
 
@@ -1833,29 +1833,29 @@
   // fprintf(stderr, "%s:%s:setting %s to %s\n", f, l, c, v);
   if (strcmp(c, "sp") == 0) {
     check_sp_flag = 1;
-    val_sp = replace_str(val_sp, strdup(v));
-    file_sp = replace_str(file_sp, strdup(f));
-    line_sp = replace_str(line_sp, strdup(l));
+    val_sp = replace_str(val_sp, strsave(v));
+    file_sp = replace_str(file_sp, strsave(f));
+    line_sp = replace_str(line_sp, strsave(l));
   } else if (strcmp(c, "br") == 0) {
     check_br_flag = 1;
-    val_br = replace_str(val_br, strdup(v));
-    file_br = replace_str(file_br, strdup(f));
-    line_br = replace_str(line_br, strdup(l));
+    val_br = replace_str(val_br, strsave(v));
+    file_br = replace_str(file_br, strsave(f));
+    line_br = replace_str(line_br, strsave(l));
   } else if (strcmp(c, "fi") == 0) {
     check_fi_flag = 1;
-    val_fi = replace_str(val_fi, strdup(v));
-    file_fi = replace_str(file_fi, strdup(f));
-    line_fi = replace_str(line_fi, strdup(l));
+    val_fi = replace_str(val_fi, strsave(v));
+    file_fi = replace_str(file_fi, strsave(f));
+    line_fi = replace_str(line_fi, strsave(l));
   } else if (strcmp(c, "nf") == 0) {
     check_fi_flag = 1;
-    val_fi = replace_negate_str(val_fi, strdup(v));
-    file_fi = replace_str(file_fi, strdup(f));
-    line_fi = replace_str(line_fi, strdup(l));
+    val_fi = replace_negate_str(val_fi, strsave(v));
+    file_fi = replace_str(file_fi, strsave(f));
+    line_fi = replace_str(line_fi, strsave(l));
   } else if (strcmp(c, "ce") == 0) {
     check_ce_flag = 1;
-    val_ce = replace_str(val_ce, strdup(v));
-    file_ce = replace_str(file_ce, strdup(f));
-    line_ce = replace_str(line_ce, strdup(l));
+    val_ce = replace_str(val_ce, strsave(v));
+    file_ce = replace_str(file_ce, strsave(f));
+    line_ce = replace_str(line_ce, strsave(l));
   }
 }
 
@@ -4751,7 +4751,7 @@
     char buf[30];
 
     sprintf(buf, "%d", v);
-    return strdup(buf);
+    return strsave(buf);
   }
   else {
     /*
Index: groff/src/include/Makefile.sub
diff -u groff/src/include/Makefile.sub:1.12 groff/src/include/Makefile.sub:1.13
--- groff/src/include/Makefile.sub:1.12	Tue Jun  1 10:46:52 2004
+++ groff/src/include/Makefile.sub	Sat Apr  2 12:49:11 2005
@@ -21,6 +21,7 @@
   printer.h \
   ptable.h \
   refid.h \
+  relocate.h \
   search.h \
   searchpath.h \
   stringclass.h \
@@ -35,6 +36,7 @@
 	@$(SHELL) $(top_srcdir)/gendef.sh defs.h \
 	"PROG_PREFIX=\"$(g)\"" \
 	"DEVICE=\"$(DEVICE)\"" \
+	"INSTALLPATH=\"$(prefix)\"" \
 	"BINPATH=\"$(bindir)\"" \
 	"FONTPATH=\"$(fontpath)\"" \
 	"MACROPATH=\"$(tmacpath)\"" \
Index: groff/src/include/lib.h
diff -u groff/src/include/lib.h:1.36 groff/src/include/lib.h:1.37
--- groff/src/include/lib.h:1.36	Fri Mar 18 07:04:47 2005
+++ groff/src/include/lib.h	Sat Apr  2 12:49:11 2005
@@ -101,6 +101,7 @@
 #endif /* NEED_DECLARATION_PCLOSE */
 
 size_t file_name_max(const char *fname);
+size_t path_name_max();
 
 int interpret_lf_args(const char *p);
 
Index: groff/src/include/nonposix.h
diff -u groff/src/include/nonposix.h:1.18 groff/src/include/nonposix.h:1.19
--- groff/src/include/nonposix.h:1.18	Sun Feb 29 00:07:07 2004
+++ groff/src/include/nonposix.h	Sat Apr  2 12:49:11 2005
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005
+   Free Software Foundation, Inc.
      Written by Eli Zaretskii (eliz@is.elta.co.il)
 
 This file is part of groff.
@@ -101,6 +102,9 @@
 /* The executable extension.  */
 # define EXE_EXT	".exe"
 
+/* Possible executable extensions.  */
+# define PATH_EXT	".com;.exe;.bat;.cmd"
+
 /* The system null device.  */
 # define NULL_DEV	"NUL"
 
@@ -209,6 +213,9 @@
 #ifndef EXE_EXT
 # define EXE_EXT	""
 #endif
+#ifndef PATH_EXT
+# define PATH_EXT	""
+#endif
 #ifndef NULL_DEV
 # define NULL_DEV	"/dev/null"
 #endif
Index: groff/src/libs/libgroff/Makefile.sub
diff -u groff/src/libs/libgroff/Makefile.sub:1.22 groff/src/libs/libgroff/Makefile.sub:1.23
--- groff/src/libs/libgroff/Makefile.sub:1.22	Fri Mar 18 07:00:51 2005
+++ groff/src/libs/libgroff/Makefile.sub	Sat Apr  2 12:49:11 2005
@@ -26,6 +26,7 @@
   macropath.$(OBJEXT) \
   matherr.$(OBJEXT) \
   maxfilename.$(OBJEXT) \
+  maxpathname.$(OBJEXT) \
   mksdir.$(OBJEXT) \
   nametoindex.$(OBJEXT) \
   new.$(OBJEXT) \
@@ -34,6 +35,7 @@
   progname.$(OBJEXT) \
   ptable.$(OBJEXT) \
   quotearg.$(OBJEXT) \
+  relocate.$(OBJEXT) \
   searchpath.$(OBJEXT) \
   spawnvp.$(OBJEXT) \
   string.$(OBJEXT) \
@@ -68,6 +70,7 @@
   $(srcdir)/lineno.cpp \
   $(srcdir)/macropath.cpp \
   $(srcdir)/maxfilename.cpp \
+  $(srcdir)/maxpathname.cpp \
   $(srcdir)/mksdir.cpp \
   $(srcdir)/mkstemp.cpp \
   $(srcdir)/nametoindex.cpp \
@@ -75,6 +78,7 @@
   $(srcdir)/paper.cpp \
   $(srcdir)/prime.cpp \
   $(srcdir)/ptable.cpp \
+  $(srcdir)/relocate.cpp \
   $(srcdir)/searchpath.cpp \
   $(srcdir)/string.cpp \
   $(srcdir)/strsave.cpp \
Index: groff/src/libs/libgroff/font.cpp
diff -u groff/src/libs/libgroff/font.cpp:1.5 groff/src/libs/libgroff/font.cpp:1.6
--- groff/src/libs/libgroff/font.cpp:1.5	Fri Oct  8 07:08:08 2004
+++ groff/src/libs/libgroff/font.cpp	Sat Apr  2 12:49:11 2005
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2002, 2003, 2004
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2002, 2003, 2004, 2005
    Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
@@ -999,7 +999,7 @@
 	t.error("image_generator command requires an argument");
 	return 0;
       }
-      image_generator = strdup(p);
+      image_generator = strsave(p);
     }
     else if (strcmp("charset", p) == 0)
       break;
Index: groff/src/libs/libgroff/maxfilename.cpp
diff -u groff/src/libs/libgroff/maxfilename.cpp:1.1 groff/src/libs/libgroff/maxfilename.cpp:1.2
--- groff/src/libs/libgroff/maxfilename.cpp:1.1	Tue Apr 15 15:13:38 2003
+++ groff/src/libs/libgroff/maxfilename.cpp	Sat Apr  2 12:49:11 2005
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-/* Copyright (C) 1992, 2001, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 1992, 2001, 2003, 2005 Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
 This file is part of groff.
@@ -37,10 +37,6 @@
 
 #else /* not _POSIX_VERSION */
 
-#ifdef HAVE_CC_LIMITS_H
-#include <limits.h>
-#endif /* HAVE_CC_LIMITS_H */
-
 #ifdef HAVE_DIRENT_H
 #include <dirent.h>
 #else /* not HAVE_DIRENT_H */
Index: groff/src/libs/libgroff/searchpath.cpp
diff -u groff/src/libs/libgroff/searchpath.cpp:1.3 groff/src/libs/libgroff/searchpath.cpp:1.4
--- groff/src/libs/libgroff/searchpath.cpp:1.3	Sat Dec  6 13:09:41 2003
+++ groff/src/libs/libgroff/searchpath.cpp	Sat Apr  2 12:49:11 2005
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2003
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2003, 2005
    Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
@@ -28,6 +28,12 @@
 #include "searchpath.h"
 #include "nonposix.h"
 
+#ifdef _WIN32
+# include "relocate.h"
+#else
+# define relocate(path) strsave(path)
+#endif
+
 search_path::search_path(const char *envvar, const char *standard,
 			 int add_home, int add_current)
 {
@@ -108,11 +114,16 @@
     if (!end)
       end = strchr(p, '\0');
     int need_slash = end > p && strchr(DIR_SEPS, end[-1]) == 0;
-    char *path = new char[(end - p) + need_slash + namelen + 1];
-    memcpy(path, p, end - p);
+    char *origpath = new char[(end - p) + need_slash + namelen + 1];
+    memcpy(origpath, p, end - p);
     if (need_slash)
-      path[end - p] = '/';
-    strcpy(path + (end - p) + need_slash, name);
+      origpath[end - p] = '/';
+    strcpy(origpath + (end - p) + need_slash, name);
+#if 0
+    fprintf(stderr, "origpath `%s'\n", origpath);
+#endif
+    char *path = relocate(origpath);
+    a_delete origpath;
 #if 0
     fprintf(stderr, "trying `%s'\n", path);
 #endif
@@ -160,11 +171,16 @@
     if (!end)
       end = strchr(p, '\0');
     int need_slash = end > p && strchr(DIR_SEPS, end[-1]) == 0;
-    char *path = new char[(end - p) + need_slash + namelen + 1];
-    memcpy(path, p, end - p);
+    char *origpath = new char[(end - p) + need_slash + namelen + 1];
+    memcpy(origpath, p, end - p);
     if (need_slash)
-      path[end - p] = '/';
-    strcpy(path + (end - p) + need_slash, name);
+      origpath[end - p] = '/';
+    strcpy(origpath + (end - p) + need_slash, name);
+#if 0
+    fprintf(stderr, "origpath `%s'\n", origpath);
+#endif
+    char *path = relocate(origpath);
+    a_delete origpath;
 #if 0
     fprintf(stderr, "trying `%s'\n", path);
 #endif



From MAILER-DAEMON Wed Apr 13 01:34:53 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DLaRL-0000DT-IU
	for mharc-groff-commit@gnu.org; Wed, 13 Apr 2005 01:29:27 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DLaRD-0000BQ-6k
	for groff-commit@gnu.org; Wed, 13 Apr 2005 01:29:19 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DLaR8-00008d-9k
	for groff-commit@gnu.org; Wed, 13 Apr 2005 01:29:14 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DLaR5-00007P-Dm
	for groff-commit@gnu.org; Wed, 13 Apr 2005 01:29:11 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DLart-0000M4-1V
	for groff-commit@gnu.org; Wed, 13 Apr 2005 01:56:53 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DLarZ-00008a-00
	for <groff-commit@gnu.org>; Wed, 13 Apr 2005 01:56:33 -0400
To: groff-commit@gnu.org
From: Werner LEMBERG <wl@gnu.org>
Message-Id: <E1DLarZ-00008a-00@savannah.gnu.org>
Date: Wed, 13 Apr 2005 01:56:33 -0400
Subject: [Groff-commit] groff ./ChangeLog src/roff/nroff/nroff.man src/...
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: groff-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/groff-commit>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 13 Apr 2005 05:29:23 -0000

CVSROOT:	/cvsroot/groff
Module name:	groff
Branch: 	
Changes by:	Werner LEMBERG <wl@savannah.gnu.org>	05/04/13 05:56:32

Modified files:
	.              : ChangeLog 
	src/roff/nroff : nroff.man nroff.sh 

Log message:
	* src/roff/nroff/nroff.man: Document option `-M'.
	
	* src/roff/nroff/nroff.sh: Make the script accept option `-M'.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/ChangeLog.diff?tr1=1.810&tr2=1.811&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/src/roff/nroff/nroff.man.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/src/roff/nroff/nroff.sh.diff?tr1=1.16&tr2=1.17&r1=text&r2=text

Patches:
Index: groff/ChangeLog
diff -u groff/ChangeLog:1.810 groff/ChangeLog:1.811
--- groff/ChangeLog:1.810	Sat Apr  2 12:49:10 2005
+++ groff/ChangeLog	Wed Apr 13 05:56:32 2005
@@ -1,3 +1,11 @@
+2005-04-13  Werner LEMBERG  <wl@gnu.org>
+
+	* src/roff/nroff/nroff.man: Document option `-M'.
+
+2005-04-13  Bruce Lilly  <blilly@erols.com>
+
+	* src/roff/nroff/nroff.sh: Make the script accept option `-M'.
+
 2005-04-01  Kees Zeelenberg  <kzlg@users.sourceforge.net>
             Werner LEMBERG  <wl@gnu.org>
 
Index: groff/src/roff/nroff/nroff.man
diff -u groff/src/roff/nroff/nroff.man:1.16 groff/src/roff/nroff/nroff.man:1.17
--- groff/src/roff/nroff/nroff.man:1.16	Mon Jan  5 22:49:10 2004
+++ groff/src/roff/nroff/nroff.man	Wed Apr 13 05:56:32 2005
@@ -1,5 +1,5 @@
 .ig
-Copyright (C) 1989-2001, 2002, 2003 Free Software Foundation, Inc.
+Copyright (C) 1989-2001, 2002, 2003, 2005 Free Software Foundation, Inc.
 
 Permission is granted to make and distribute verbatim copies of
 this manual provided the copyright notice and this permission notice
@@ -16,9 +16,12 @@
 translations approved by the Free Software Foundation instead of in
 the original English.
 ..
+.
 .TH @G@NROFF @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@"
+.
 .SH NAME
 @g@nroff \- emulate nroff command with groff
+.
 .SH SYNOPSIS
 .nr a \n(.j
 .ad l
@@ -30,8 +33,10 @@
 .ie \\n(.$-1 .RI "[\ \fB\\$1\fP" "\\$2" "\ ]"
 .el .RB "[\ " "\\$1" "\ ]"
 ..
+.
 .OP \-CchipStUv
 .OP \-d cs
+.OP \-M dir
 .OP \-m name
 .OP \-n num
 .OP \-o list
@@ -40,6 +45,7 @@
 .RI "[\ " "file" "\ .\|.\|.\ ]"
 .br
 .ad \na
+.
 .SH DESCRIPTION
 The
 .B @g@nroff
@@ -89,6 +95,7 @@
 .BR \-d ,
 .BR \-C ,
 .BR \-i ,
+.BR \-M ,
 .BR \-m ,
 .BR \-n ,
 .BR \-o ,
@@ -117,6 +124,7 @@
 .BR groff . 
 .B \-v
 shows the version number.
+.
 .SH ENVIRONMENT
 .TP
 .SM
@@ -130,6 +138,7 @@
 so warnings are suppressed.
 nroff-style character definitions (in the file tty-char.tmac) are also
 loaded to emulate unrepresentable glyphs.
+.
 .SH "SEE ALSO"
 .BR groff (@MAN1EXT@),
 .BR @g@troff (@MAN1EXT@),
Index: groff/src/roff/nroff/nroff.sh
diff -u groff/src/roff/nroff/nroff.sh:1.16 groff/src/roff/nroff/nroff.sh:1.17
--- groff/src/roff/nroff/nroff.sh:1.16	Tue Jan 25 20:39:15 2005
+++ groff/src/roff/nroff/nroff.sh	Wed Apr 13 05:56:32 2005
@@ -47,10 +47,10 @@
     -[eq] | -s*)
       # ignore these options
       ;;
-    -[dmrnoT])
+    -[dMmrnoT])
       echo "$prog: option $1 requires an argument" >&2
       exit 1 ;;
-    -[iptSUC] | -[dmrno]*)
+    -[iptSUC] | -[dMmrno]*)
       opts="$opts $1" ;;
     -Tascii | -Tlatin1 | -Tutf8 | -Tcp1047)
       T=$1 ;;
@@ -67,8 +67,8 @@
       echo "GNU nroff (groff) version @VERSION@"
       exit 0 ;;
     --help)
-      echo "usage: nroff [-CchipStUv] [-dCS] [-mNAME] [-nNUM] [-oLIST] [-rCN]"
-      echo "       [-Tname] [FILE...]"
+      echo "usage: nroff [-CchipStUv] [-dCS] [-MDIR] [-mNAME] [-nNUM] [-oLIST]"
+      echo "             [-rCN] [-Tname] [FILE...]"
       exit 0 ;;
     --)
       shift



From MAILER-DAEMON Mon Apr 18 20:04:18 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DNgDy-0007v4-Jr
	for mharc-groff-commit@gnu.org; Mon, 18 Apr 2005 20:04:18 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DNgDx-0007ur-6s
	for groff-commit@gnu.org; Mon, 18 Apr 2005 20:04:17 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DNgDw-0007uc-Nq
	for groff-commit@gnu.org; Mon, 18 Apr 2005 20:04:16 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DNgDw-0007ZY-Kr
	for groff-commit@gnu.org; Mon, 18 Apr 2005 20:04:16 -0400
Received: from [199.232.41.67] (helo=mx20.gnu.org)
	by monty-python.gnu.org with esmtp (TLS-1.0:RSA_ARCFOUR_SHA:16)
	(Exim 4.34) id 1DNgEx-0006by-Ff
	for groff-commit@gnu.org; Mon, 18 Apr 2005 20:05:19 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by mx20.gnu.org with esmtp (Exim 4.34) id 1DNdwW-0005kQ-N1
	for groff-commit@gnu.org; Mon, 18 Apr 2005 17:38:08 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DNdwG-0001bt-00
	for <groff-commit@gnu.org>; Mon, 18 Apr 2005 17:37:52 -0400
To: groff-commit@gnu.org
From: Werner LEMBERG <wl@gnu.org>
Message-Id: <E1DNdwG-0001bt-00@savannah.gnu.org>
Date: Mon, 18 Apr 2005 17:37:52 -0400
Subject: [Groff-commit] groff ./ChangeLog src/roff/groff/pipeline.c
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: groff-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/groff-commit>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 19 Apr 2005 00:04:17 -0000

CVSROOT:	/cvsroot/groff
Module name:	groff
Branch: 	
Changes by:	Werner LEMBERG <wl@savannah.gnu.org>	05/04/18 21:37:52

Modified files:
	.              : ChangeLog 
	src/roff/groff : pipeline.c 

Log message:
	* src/roff/groff/pipeline.c: Don't include ctype.h.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/ChangeLog.diff?tr1=1.811&tr2=1.812&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/src/roff/groff/pipeline.c.diff?tr1=1.26&tr2=1.27&r1=text&r2=text

Patches:
Index: groff/ChangeLog
diff -u groff/ChangeLog:1.811 groff/ChangeLog:1.812
--- groff/ChangeLog:1.811	Wed Apr 13 05:56:32 2005
+++ groff/ChangeLog	Mon Apr 18 21:37:52 2005
@@ -1,3 +1,7 @@
+2005-04-18  Werner LEMBERG  <wl@gnu.org>
+
+	* src/roff/groff/pipeline.c: Don't include ctype.h.
+
 2005-04-13  Werner LEMBERG  <wl@gnu.org>
 
 	* src/roff/nroff/nroff.man: Document option `-M'.
Index: groff/src/roff/groff/pipeline.c
diff -u groff/src/roff/groff/pipeline.c:1.26 groff/src/roff/groff/pipeline.c:1.27
--- groff/src/roff/groff/pipeline.c:1.26	Mon Apr 19 06:17:46 2004
+++ groff/src/roff/groff/pipeline.c	Mon Apr 18 21:37:52 2005
@@ -1,4 +1,4 @@
-/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2002, 2003, 2004
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2002, 2003, 2004, 2005
    Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
@@ -101,7 +101,6 @@
 
 #include <process.h>
 #include <fcntl.h>
-#include <ctype.h>
 #include <string.h>
 #include <stdlib.h>
 



From MAILER-DAEMON Sun Apr 24 02:22:49 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DPaW0-0001T2-Ps
	for mharc-groff-commit@gnu.org; Sun, 24 Apr 2005 02:22:48 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DPaVy-0001Sc-5r
	for groff-commit@gnu.org; Sun, 24 Apr 2005 02:22:46 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DPaVw-0001Rw-IP
	for groff-commit@gnu.org; Sun, 24 Apr 2005 02:22:44 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DPaVv-00010k-Fi
	for groff-commit@gnu.org; Sun, 24 Apr 2005 02:22:43 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DPaTy-0003p3-0O
	for groff-commit@gnu.org; Sun, 24 Apr 2005 02:20:42 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DPaKV-0004jk-00
	for <groff-commit@gnu.org>; Sun, 24 Apr 2005 02:10:55 -0400
To: groff-commit@gnu.org
From: Werner LEMBERG <wl@gnu.org>
Message-Id: <E1DPaKV-0004jk-00@savannah.gnu.org>
Date: Sun, 24 Apr 2005 02:10:55 -0400
Subject: [Groff-commit] groff ./ChangeLog src/utils/xtotroff/xtotroff.c
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: groff-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/groff-commit>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 24 Apr 2005 06:22:47 -0000

CVSROOT:	/cvsroot/groff
Module name:	groff
Branch: 	
Changes by:	Werner LEMBERG <wl@savannah.gnu.org>	05/04/24 06:10:55

Modified files:
	.              : ChangeLog 
	src/utils/xtotroff: xtotroff.c 

Log message:
	* src/utils/xtotroff/xtotroff.c (MapFont): Fix variable declaration.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/ChangeLog.diff?tr1=1.812&tr2=1.813&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/src/utils/xtotroff/xtotroff.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: groff/ChangeLog
diff -u groff/ChangeLog:1.812 groff/ChangeLog:1.813
--- groff/ChangeLog:1.812	Mon Apr 18 21:37:52 2005
+++ groff/ChangeLog	Sun Apr 24 06:10:55 2005
@@ -1,3 +1,7 @@
+2005-04-23  Larry Jones  <lawrence.jones@ugs.com>
+
+	* src/utils/xtotroff/xtotroff.c (MapFont): Fix variable declaration.
+
 2005-04-18  Werner LEMBERG  <wl@gnu.org>
 
 	* src/roff/groff/pipeline.c: Don't include ctype.h.
Index: groff/src/utils/xtotroff/xtotroff.c
diff -u groff/src/utils/xtotroff/xtotroff.c:1.2 groff/src/utils/xtotroff/xtotroff.c:1.3
--- groff/src/utils/xtotroff/xtotroff.c:1.2	Thu Nov 25 08:08:33 2004
+++ groff/src/utils/xtotroff/xtotroff.c	Sun Apr 24 06:10:55 2005
@@ -176,10 +176,11 @@
   for (c = fi->min_char_or_byte2; c <= fi->max_char_or_byte2; c++) {
     const char *name = DviCharName(char_map, c, 0);
     if (charExists(fi, c)) {
+      int param[5];
+
       wid = charWidth(fi, c);
 
       fprintf(out, "%s\t%d", name ? name : "---", wid);
-      int param[5];
       param[0] = charHeight(fi, c);
       param[1] = charDepth(fi, c);
       param[2] = 0;		/* charRBearing (fi, c) - wid */



From MAILER-DAEMON Mon Apr 25 03:32:05 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DPy4b-0002j2-3w
	for mharc-groff-commit@gnu.org; Mon, 25 Apr 2005 03:32:05 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DPy4X-0002gM-8c
	for groff-commit@gnu.org; Mon, 25 Apr 2005 03:32:01 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DPy4U-0002eP-TY
	for groff-commit@gnu.org; Mon, 25 Apr 2005 03:31:59 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DPy4S-0001oY-JM
	for groff-commit@gnu.org; Mon, 25 Apr 2005 03:31:57 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DPxse-0007Ox-12
	for groff-commit@gnu.org; Mon, 25 Apr 2005 03:19:44 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DPxpM-0007q1-00
	for <groff-commit@gnu.org>; Mon, 25 Apr 2005 03:16:20 -0400
To: groff-commit@gnu.org
From: Werner LEMBERG <wl@gnu.org>
Message-Id: <E1DPxpM-0007q1-00@savannah.gnu.org>
Date: Mon, 25 Apr 2005 03:16:20 -0400
Subject: [Groff-commit] groff/contrib/pdfmark ChangeLog pdfmark.ms pdfm...
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: groff-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/groff-commit>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 25 Apr 2005 07:32:02 -0000

CVSROOT:	/cvsroot/groff
Module name:	groff
Branch: 	
Changes by:	Werner LEMBERG <wl@savannah.gnu.org>	05/04/25 07:16:20

Modified files:
	contrib/pdfmark: ChangeLog pdfmark.ms pdfmark.tmac 

Log message:
	Add support for folded outlines in PDF documents.
	
	* pdfmark.tmac (PDFOUTLINE.FOLDLEVEL): New register.
	(pdf:bm.emit): Use it.
	
	* pdfmark.ms: Document it.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/pdfmark/ChangeLog.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/pdfmark/pdfmark.ms.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/pdfmark/pdfmark.tmac.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: groff/contrib/pdfmark/ChangeLog
diff -u groff/contrib/pdfmark/ChangeLog:1.7 groff/contrib/pdfmark/ChangeLog:1.8
--- groff/contrib/pdfmark/ChangeLog:1.7	Fri Mar 25 01:46:25 2005
+++ groff/contrib/pdfmark/ChangeLog	Mon Apr 25 07:16:20 2005
@@ -1,3 +1,12 @@
+2005-04-24  Keith Marshall  <keith.d.marshall@ntlworld.com>
+
+	Add support for folded outlines in PDF documents.
+
+	* pdfmark.tmac (PDFOUTLINE.FOLDLEVEL): New register.
+	(pdf:bm.emit): Use it.
+
+	* pdfmark.ms: Document it.
+
 2005-03-25  Werner LEMBERG  <wl@gnu.org>
 
 	* Makefile.in: Removed.
@@ -10,7 +19,7 @@
 2005-03-22  Keith Marshall  <keith.d.marshall@ntlworld.com>
 
 	* pdfroff.sh: Eliminate invalid program reference to $AWK, when
-	invoked with `--no-reference-dictionary-option'.
+	invoked with `--no-reference-dictionary' option.
 
 2005-03-02  Keith Marshall  <keith.d.marshall@ntlworld.com>
 
Index: groff/contrib/pdfmark/pdfmark.ms
diff -u groff/contrib/pdfmark/pdfmark.ms:1.1 groff/contrib/pdfmark/pdfmark.ms:1.2
--- groff/contrib/pdfmark/pdfmark.ms:1.1	Wed Dec  8 08:31:17 2004
+++ groff/contrib/pdfmark/pdfmark.ms	Mon Apr 25 07:16:20 2005
@@ -10,6 +10,11 @@
 .\"
 .pdfview /PageMode /UseOutlines
 .\"
+.\" Initialise the outline view to show only three heading levels,
+.\" with additional subordinate level headings folded.
+.\"
+.nr PDFOUTLINE.FOLDLEVEL 3
+.\"
 .\" Add document identification meta-data
 .\"
 .pdfinfo /Title     Portable Document Format Publishing with GNU Troff
@@ -844,6 +849,79 @@
 .CW pdfhref
 macro.
 .NH 3
+.XN -N outline-folding -- Folding the Outline to Conceal Less Significant Headings
+.LP
+When a document incorporates many subheadings,
+at deeply nested levels,
+it may be desirable to \(lqfold\(rq the outline
+such that only the major heading levels are initially visible,
+yet making the inferior subheadings accessible,
+by allowing the reader to expand the view of any heading branch on demand.
+.LP
+The
+.CW pdfmark
+macros support this capability,
+through the setting of the
+.CW PDFOUTLINE.FOLDLEVEL
+register.
+This register should be set to the number of heading levels
+which it is desired to show in expanded form, in the
+.EM initial
+document outline display;
+all subheadings at deeper levels will still be added to the outline,
+but will not become visible until the outline branch containing them is expanded.
+'ne 5
+For example, the setting used in this document:
+.QS
+.LD
+.fam C
+\&.\e" Initialise the outline view to show only three heading levels,
+\&.\e" with additional subordinate level headings folded.
+\&.\e"
+\&.nr PDFOUTLINE.FOLDLEVEL 3
+.DE
+.QE
+.LP
+results in only the first three levels of headings being displayed
+in the document outline,
+.EM until
+the reader chooses to expand the view,
+and so reveal the lower level headings in any outline branch.
+.LP
+The initial default setting of
+.CW PDFOUTLINE.FOLDLEVEL ,
+if the document author does not choose to change it,
+is 10,000.
+This is orders of magnitude greater than the maximum heading level
+which is likely to be used in any document;
+thus the default behaviour will be to show document outlines fully expanded,
+to display all headings defined,
+at all levels within each document.
+.LP
+The setting of
+.CW PDFOUTLINE.FOLDLEVEL
+may be changed at any time;
+however, the effect of each such change may be difficult to predict,
+since it is applied not only to outline entries which are defined
+.EM after
+the setting is changed,
+but also to any entries which remain in the outline cache,
+.EM at
+this time.
+Therefore, it is recommended that
+.CW PDFOUTLINE.FOLDLEVEL
+should be set
+.EM once ,
+at the start of each document;
+if it
+.EM is
+deemed necessary to change it at any other time,
+the outline cache should be flushed,
+.XR pdfsync ), (
+.EM immediately
+before the change,
+which should immediately preceed a level one heading.
+.NH 3
 .XN -N multipart-outline -- Outlines for Multipart Documents
 .LP
 When a document outline is created, using the
Index: groff/contrib/pdfmark/pdfmark.tmac
diff -u groff/contrib/pdfmark/pdfmark.tmac:1.2 groff/contrib/pdfmark/pdfmark.tmac:1.3
--- groff/contrib/pdfmark/pdfmark.tmac:1.2	Mon Feb 28 13:56:45 2005
+++ groff/contrib/pdfmark/pdfmark.tmac	Mon Apr 25 07:16:20 2005
@@ -272,6 +272,15 @@
 .\"
 .ds PDFBOOKMARK.VIEW /FitH \\n[PDFPAGE.Y] u
 .\"
+.\" "PDFOUTLINE.FOLDLEVEL" controls how the document outline will be
+.\" displayed.  It is a number, defining the maximum heading level
+.\" which will be visible, without outline expansion by the user, in
+.\" the initial view of the document outline.  Assuming that no sane
+.\" document will ever extend to 10,000 levels of nested headings,
+.\" this initial default value causes outlines to be fully expanded.
+.\"
+.nr PDFOUTLINE.FOLDLEVEL 10000
+.\"
 .\" The actual job of creating an outline reference
 .\" is performed by the "pdfbookmark" macro.
 .\"
@@ -390,7 +399,12 @@
 .nr pdf:bm.ic +1
 .nr pdf:bm.lc +1
 .pdf:pop nr pdf:bm.rc pdf:bm.c\\n[pdf:bm.lc]
-.if \\n[pdf:bm.rc] .as pdf:bm\\n[pdf:bm.ic] " /Count \\n[pdf:bm.rc]
+.if \\n[pdf:bm.rc] \{\
+.   ds pdf:bm.fold
+.   if \\n[pdf:bm.lc]>\\n[PDFOUTLINE.FOLDLEVEL] .ds pdf:bm.fold -
+.   as pdf:bm\\n[pdf:bm.ic] " /Count \\*[pdf:bm.fold]\\n[pdf:bm.rc]
+.   rm pdf:bm.fold
+.   \}
 .pdfmark \\*[pdf:bm\\n[pdf:bm.ic]] /OUT
 .rm pdf:bm\\n[pdf:bm.ic]
 .\"



From MAILER-DAEMON Wed Apr 27 16:56:46 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DQtaP-0007Eq-Uh
	for mharc-groff-commit@gnu.org; Wed, 27 Apr 2005 16:56:46 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DQtaN-0007Cd-51
	for groff-commit@gnu.org; Wed, 27 Apr 2005 16:56:43 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DQtaM-0007C0-4p
	for groff-commit@gnu.org; Wed, 27 Apr 2005 16:56:42 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DQtaL-0005wC-SZ
	for groff-commit@gnu.org; Wed, 27 Apr 2005 16:56:41 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DQtaF-0003ZZ-Rj
	for groff-commit@gnu.org; Wed, 27 Apr 2005 16:56:35 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DQtWN-0006lp-00
	for <groff-commit@gnu.org>; Wed, 27 Apr 2005 16:52:35 -0400
To: groff-commit@gnu.org
From: Werner LEMBERG <wl@gnu.org>
Message-Id: <E1DQtWN-0006lp-00@savannah.gnu.org>
Date: Wed, 27 Apr 2005 16:52:35 -0400
Subject: [Groff-commit] groff ./ChangeLog doc/pic.ms src/preproc/pic/pic.y
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: groff-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/groff-commit>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 27 Apr 2005 20:56:43 -0000

CVSROOT:	/cvsroot/groff
Module name:	groff
Branch: 	
Changes by:	Werner LEMBERG <wl@savannah.gnu.org>	05/04/27 20:52:34

Modified files:
	.              : ChangeLog 
	doc            : pic.ms 
	src/preproc/pic: pic.y 

Log message:
	Implement the rule
	
	position: '(' position ')'
	
	in pic.
	
	* src/preproc/pic/pic.y (position, position_not_place): Handle
	additional parentheses.
	
	* doc/pic.ms: Updated.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/ChangeLog.diff?tr1=1.813&tr2=1.814&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/doc/pic.ms.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/src/preproc/pic/pic.y.diff?tr1=1.16&tr2=1.17&r1=text&r2=text

Patches:
Index: groff/ChangeLog
diff -u groff/ChangeLog:1.813 groff/ChangeLog:1.814
--- groff/ChangeLog:1.813	Sun Apr 24 06:10:55 2005
+++ groff/ChangeLog	Wed Apr 27 20:52:33 2005
@@ -1,3 +1,16 @@
+2005-04-27  Werner LEMBERG  <wl@gnu.org>
+
+	Implement the rule
+
+	  position: '(' position ')'
+
+	in pic.
+
+	* src/preproc/pic/pic.y (position, position_not_place): Handle
+	additional parentheses.
+
+	* doc/pic.ms: Updated.
+
 2005-04-23  Larry Jones  <lawrence.jones@ugs.com>
 
 	* src/utils/xtotroff/xtotroff.c (MapFont): Fix variable declaration.
Index: groff/doc/pic.ms
diff -u groff/doc/pic.ms:1.28 groff/doc/pic.ms:1.29
--- groff/doc/pic.ms:1.28	Sat Feb 19 04:23:40 2005
+++ groff/doc/pic.ms	Wed Apr 27 20:52:34 2005
@@ -10,7 +10,7 @@
 .\" This document was written for free use and redistribution by
 .\" Eric S. Raymond <esr@thyrsus.com> in August 1995.
 .\"
-.\"	$Id: pic.ms,v 1.28 2005/02/19 04:23:40 wl Exp $	
+.\"	$Id: pic.ms,v 1.29 2005/04/27 20:52:34 wl Exp $	
 .\"
 .\" Set a proper TeX and LaTeX
 .ie t \{\
@@ -2688,6 +2688,7 @@
 <position> ::=
   <position-not-place>
   <place>
+  ( <position> )
 .R
 .DE
 .DS
Index: groff/src/preproc/pic/pic.y
diff -u groff/src/preproc/pic/pic.y:1.16 groff/src/preproc/pic/pic.y:1.17
--- groff/src/preproc/pic/pic.y:1.16	Thu Apr  8 20:43:24 2004
+++ groff/src/preproc/pic/pic.y	Wed Apr 27 20:52:34 2005
@@ -1,4 +1,4 @@
-/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2002, 2003, 2004
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2002, 2003, 2004, 2005
    Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
@@ -1135,6 +1135,12 @@
 		  $$.x = pos.x;
 		  $$.y = pos.y;
 		}
+	| '(' place ')'
+		{
+		  position pos = $2;
+		  $$.x = pos.x;
+		  $$.y = pos.y;
+		}
 	;
 
 position_not_place:
@@ -1145,11 +1151,21 @@
 		  $$.x = $1.x + $3.x;
 		  $$.y = $1.y + $3.y;
 		}
+	| '(' position '+' expr_pair ')'
+		{
+		  $$.x = $2.x + $4.x;
+		  $$.y = $2.y + $4.y;
+		}
 	| position '-' expr_pair
 		{
 		  $$.x = $1.x - $3.x;
 		  $$.y = $1.y - $3.y;
 		}
+	| '(' position '-' expr_pair ')'
+		{
+		  $$.x = $2.x - $4.x;
+		  $$.y = $2.y - $4.y;
+		}
 	| '(' position ',' position ')'
 		{
 		  $$.x = $2.x;
@@ -1160,11 +1176,21 @@
 		  $$.x = (1.0 - $1)*$3.x + $1*$5.x;
 		  $$.y = (1.0 - $1)*$3.y + $1*$5.y;
 		}
+	| '(' expr between position AND position ')'
+		{
+		  $$.x = (1.0 - $2)*$4.x + $2*$6.x;
+		  $$.y = (1.0 - $2)*$4.y + $2*$6.y;
+		}
 	| expr '<' position ',' position '>'
 		{
 		  $$.x = (1.0 - $1)*$3.x + $1*$5.x;
 		  $$.y = (1.0 - $1)*$3.y + $1*$5.y;
 		}
+	| '(' expr '<' position ',' position '>' ')'
+		{
+		  $$.x = (1.0 - $2)*$4.x + $2*$6.x;
+		  $$.y = (1.0 - $2)*$4.y + $2*$6.y;
+		}
 	;
 
 between:



From MAILER-DAEMON Thu Apr 28 01:54:06 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DR1yQ-0002Je-Hc
	for mharc-groff-commit@gnu.org; Thu, 28 Apr 2005 01:54:06 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DR1yP-0002Iz-4m
	for groff-commit@gnu.org; Thu, 28 Apr 2005 01:54:05 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DR1yO-0002Ia-GH
	for groff-commit@gnu.org; Thu, 28 Apr 2005 01:54:04 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DR1yO-0001Te-Bx
	for groff-commit@gnu.org; Thu, 28 Apr 2005 01:54:04 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DR217-00065v-Lr
	for groff-commit@gnu.org; Thu, 28 Apr 2005 01:56:53 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DR1xA-0000U8-00
	for <groff-commit@gnu.org>; Thu, 28 Apr 2005 01:52:48 -0400
To: groff-commit@gnu.org
From: Werner LEMBERG <wl@gnu.org>
Message-Id: <E1DR1xA-0000U8-00@savannah.gnu.org>
Date: Thu, 28 Apr 2005 01:52:48 -0400
Subject: [Groff-commit] groff ./ChangeLog doc/Makefile.sub
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: groff-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/groff-commit>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 28 Apr 2005 05:54:05 -0000

CVSROOT:	/cvsroot/groff
Module name:	groff
Branch: 	
Changes by:	Werner LEMBERG <wl@savannah.gnu.org>	05/04/28 05:52:48

Modified files:
	.              : ChangeLog 
	doc            : Makefile.sub 

Log message:
	Correct `gnu.eps' handling for build from distribution tarball, with
	separate source and build directories.
	
	* doc/Makefile.sub: (examples.stamp): New target; forces copy of
	grnexmpl.g, groff.css and gnu.eps from source to build directory;
	generate gnu.eps from gnu.xpm if required; touch examples.stamp.
	(prepare_examples): Make it depend on examples.stamp.
	(CLEANADD): Add examples.stamp.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/ChangeLog.diff?tr1=1.814&tr2=1.815&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/doc/Makefile.sub.diff?tr1=1.17&tr2=1.18&r1=text&r2=text

Patches:
Index: groff/ChangeLog
diff -u groff/ChangeLog:1.814 groff/ChangeLog:1.815
--- groff/ChangeLog:1.814	Wed Apr 27 20:52:33 2005
+++ groff/ChangeLog	Thu Apr 28 05:52:47 2005
@@ -1,3 +1,14 @@
+2005-04-28  Keith Marshall  <keith.d.marshall@ntlworld.com>
+
+	Correct `gnu.eps' handling for build from distribution tarball, with
+	separate source and build directories.
+
+	* doc/Makefile.sub: (examples.stamp): New target; forces copy of
+	grnexmpl.g, groff.css and gnu.eps from source to build directory;
+	generate gnu.eps from gnu.xpm if required; touch examples.stamp.
+	(prepare_examples): Make it depend on examples.stamp.
+	(CLEANADD): Add examples.stamp.
+
 2005-04-27  Werner LEMBERG  <wl@gnu.org>
 
 	Implement the rule
Index: groff/doc/Makefile.sub
diff -u groff/doc/Makefile.sub:1.17 groff/doc/Makefile.sub:1.18
--- groff/doc/Makefile.sub:1.17	Fri Mar 18 06:45:21 2005
+++ groff/doc/Makefile.sub	Thu Apr 28 05:52:48 2005
@@ -95,7 +95,8 @@
   $(HTMLDOCFILESALL) \
   groff.aux groff.cp* groff.dvi groff.es* groff.fn* groff.html groff.ky* \
   groff.log groff.ma* groff.op* groff.pdf groff.pg* groff.ps groff.rq* \
-  groff.st* groff.toc groff.tp groff.vr*
+  groff.st* groff.toc groff.tp groff.vr* \
+  examples.stamp
 
 CLEANDIRADD=\
   $(imagedir)
@@ -126,9 +127,19 @@
 
 html: $(HTMLDOCFILES) $(HTMLEXAMPLEFILES)
 
-prepare_examples: grnexmpl.g groff.css
+prepare_examples: examples.stamp
+
+examples.stamp: grnexmpl.g groff.css gnu.eps
 	test -f grnexmpl.g || cp $(srcdir)/grnexmpl.g .
 	test -f groff.css || cp $(srcdir)/groff.css .
+	if test ! -f gnu.eps; then \
+	  if test -f $(srcdir)/gnu.eps; then \
+	    cp $(srcdir)/gnu.eps .; \
+	  elif test -f $(top_builddir)/contrib/pdfmark/gnu.eps; then \
+	    cp $(top_builddir)/contrib/pdfmark/gnu.eps .; \
+	  fi; \
+	fi
+	echo timestamp > $@
 
 groff: groff.texinfo
 	$(MAKEINFO) --enable-encoding -I$(srcdir) $(srcdir)/groff.texinfo
@@ -136,6 +147,7 @@
 gnu.eps: gnu.xpm
 	xpmtoppm $(srcdir)/gnu.xpm | pnmdepth 15 | \
           $(pnmtops_nosetpage) -noturn -rle >$@
+
 gnu.png: gnu.xpm
 	xpmtoppm $(srcdir)/gnu.xpm | pnmdepth 15 | pnmtopng >$@
 



