From MAILER-DAEMON Tue Nov 16 04:24:50 2004
Received: from mailman by lists.gnu.org with archive (Exim 4.33)
	id 1CTzZx-0001Mk-RH
	for mharc-groff-commit@gnu.org; Tue, 16 Nov 2004 04:24:49 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1CTzZv-0001KL-Rx
	for groff-commit@gnu.org; Tue, 16 Nov 2004 04:24:48 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1CTzZu-0001Hm-8i
	for groff-commit@gnu.org; Tue, 16 Nov 2004 04:24:46 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1CTzZt-0001Fs-Fm
	for groff-commit@gnu.org; Tue, 16 Nov 2004 04:24:45 -0500
Received: from [199.232.41.5] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.34) id 1CTzQZ-0004gF-4v
	for groff-commit@gnu.org; Tue, 16 Nov 2004 04:15:07 -0500
Received: from localhost ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 4.34) id 1CTzU2-0007gI-3F
	for groff-commit@gnu.org; Tue, 16 Nov 2004 04:18:42 -0500
To: groff-commit@gnu.org
From: Werner LEMBERG <wl@gnu.org>
Message-Id: <E1CTzZu-0001Hm-8i@lists.gnu.org>
Date: Tue, 16 Nov 2004 04:24:46 -0500
Subject: [Groff-commit] groff/contrib/groffer ChangeLog README_SH groff...
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, 16 Nov 2004 09:24:48 -0000

CVSROOT:	/cvsroot/groff
Module name:	groff
Branch: 	
Changes by:	Werner LEMBERG <wl@gnu.org>	04/11/16 09:18:42

Modified files:
	contrib/groffer: ChangeLog README_SH groffer.sh 

Log message:
	* release of groffer 0.9.12
	
	* groffer.sh:
	- main_init(): Rewriting of the creation of the temporary
	directory to ensure that it cannot be made writable apart from the
	user.  If the directory already exists and cannot be removed then
	append `X' to the directory name.
	- is_non_empty_file(): fix it to use POSIX `test -s'.
	- is_existing(): new function.
	- POSIX `rm -f -r': use this in `clean_up()' and `main_init()'.
	- `--macro-file': remove this unused long option.
	- `-V', `--source', `--device': move these from groff options
	to groffer options.
	- `$_TMP_DIR_SUB': remove this unused variable.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/groffer/ChangeLog.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/groffer/README_SH.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/groffer/groffer.sh.diff?tr1=1.21&tr2=1.22&r1=text&r2=text

Patches:
Index: groff/contrib/groffer/ChangeLog
diff -u groff/contrib/groffer/ChangeLog:1.22 groff/contrib/groffer/ChangeLog:1.23
--- groff/contrib/groffer/ChangeLog:1.22	Sat Jun 19 20:47:47 2004
+++ groff/contrib/groffer/ChangeLog	Tue Nov 16 09:18:41 2004
@@ -1,3 +1,20 @@
+2004-11-15  Bernd Warken
+	________________________________________________________________
+	* release of groffer 0.9.12
+
+	* groffer.sh:
+	- main_init(): Rewriting of the creation of the temporary
+	directory to ensure that it cannot be made writable apart from the
+	user.  If the directory already exists and cannot be removed then
+	append `X' to the directory name.
+	- is_non_empty_file(): fix it to use POSIX `test -s'.
+	- is_existing(): new function.
+	- POSIX `rm -f -r': use this in `clean_up()' and `main_init()'.
+	- `--macro-file': remove this unused long option.
+	- `-V', `--source', `--device': move these from groff options
+	to groffer options.
+	- `$_TMP_DIR_SUB': remove this unused variable.
+
 2004-06-15  Bernd Warken
 	________________________________________________________________
 	* release of groffer 0.9.11
Index: groff/contrib/groffer/README_SH
diff -u groff/contrib/groffer/README_SH:1.2 groff/contrib/groffer/README_SH:1.3
--- groff/contrib/groffer/README_SH:1.2	Fri Jun  4 22:42:34 2004
+++ groff/contrib/groffer/README_SH	Tue Nov 16 09:18:41 2004
@@ -98,6 +98,7 @@
 is_dir (<name>)
 is_empty (<string>)
 is_equal (<string1> <string2>)
+is_existing (<name>)
 is_file (<name>)
 is_non_empty_file (<name>)
 is_not_dir (<name>)
@@ -108,6 +109,7 @@
 is_not_writable (<name>)
 is_not_yes (<string>)
 is_prog (<name>)
+is_writable (<name>)
 is_yes (<string>)
 leave ()
 landmark (<text>)
@@ -127,6 +129,10 @@
 manpath_add_system()
 manpath_from_path ()
 normalize_args (<shortopts> <longopts> <arg>*)
+obj (<object> <call_name> <arg>...)
+obj_data (<object>)
+obj_from_output (<object> <call_name> <arg>...)
+obj_set (<object> <data>)
 path_chop (<path>)
 path_clean (<path>)
 path_contains (<path> <dir>)
Index: groff/contrib/groffer/groffer.sh
diff -u groff/contrib/groffer/groffer.sh:1.21 groff/contrib/groffer/groffer.sh:1.22
--- groff/contrib/groffer/groffer.sh:1.21	Sat Jun 19 20:47:47 2004
+++ groff/contrib/groffer/groffer.sh	Tue Nov 16 09:18:41 2004
@@ -25,8 +25,8 @@
 # Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 _PROGRAM_NAME='groffer';
-_PROGRAM_VERSION='0.9.11';
-_LAST_UPDATE='15 June 2004';
+_PROGRAM_VERSION='0.9.12';
+_LAST_UPDATE='15 November 2004';
 
 
 ########################################################################
@@ -334,18 +334,18 @@
 
 _OPTS_GROFFER_LONG_ARG="\
 'apropos' 'apropos-data' 'apropos-devel' 'apropos-progs' \
-'default-modes' 'dvi-viewer' 'extension' 'fg' 'fn' 'font' \
+'default-modes' 'device' 'dvi-viewer' 'extension' 'fg' 'fn' 'font' \
 'foreground' 'html-viewer' 'mode' 'pdf-viewer' 'ps-viewer' 'shell' \
 'tty-viewer' 'www-viewer' 'x-viewer' 'X-viewer'";
 
 ##### groffer options inhereted from groff
 
 _OPTS_GROFF_SHORT_NA="'a' 'b' 'c' 'C' 'e' 'E' 'g' 'G' 'i' 'l' 'N' 'p' \
-'R' 's' 'S' 't' 'U' 'V' 'z'";
+'R' 's' 'S' 't' 'U' 'z'";
 _OPTS_GROFF_SHORT_ARG="'d' 'f' 'F' 'I' 'L' 'm' 'M' 'n' 'o' 'P' 'r' \
 'w' 'W'";
-_OPTS_GROFF_LONG_NA="'source'";
-_OPTS_GROFF_LONG_ARG="'device' 'macro-file'";
+_OPTS_GROFF_LONG_NA="";
+_OPTS_GROFF_LONG_ARG="";
 
 ##### groffer options inhereted from the X Window toolkit
 
@@ -473,8 +473,7 @@
 export _OPT_XRM;		# specify X resource.
 export _OPT_Z;			# groff option -Z.
 # _TMP_* temporary files
-export _TMP_DIR;		# groff directory for temporary files
-export _TMP_DIR_SUB;		# groffer directory for temporary files
+export _TMP_DIR;		# groffer directory for temporary files
 export _TMP_CAT;		# stores concatenation of everything
 export _TMP_STDIN;		# stores stdin, if any
 
@@ -533,7 +532,6 @@
 
 # _TMP_* temporary files
 _TMP_DIR='';
-_TMP_DIR_SUB='';
 _TMP_CAT='';
 _TMP_STDIN='';
 
@@ -653,8 +651,7 @@
 clean_up()
 {
   if test -d "${_TMP_DIR}"; then
-    rm -f "${_TMP_DIR}"/*;
-    rmdir "${_TMP_DIR}";
+    rm -f -r "${_TMP_DIR}";
   fi;
 }
 
@@ -1459,6 +1456,24 @@
 
 
 ########################################################################
+# is_existing (<name>)
+#
+# Test whether `name' is an existing file or directory.
+#
+# Arguments : 1
+# Return    : `0' if arg1 exists, `1' otherwise.
+#
+is_existing()
+{
+  func_check is_existing = 1 "$@";
+  if test -e "$1"; then
+    eval "${return_yes}";
+  fi;
+  eval "${return_no}";
+}
+
+
+########################################################################
 # is_file (<name>)
 #
 # Test whether `name' is a readable file.
@@ -1488,11 +1503,9 @@
 #
 is_non_empty_file()
 {
-  func_check is_empty = 1 "$@";
-  if is_file "$1"; then
-    if is_not_empty "$(cat "$1" | sed -e '/./q')"; then
-      eval "${return_yes}";
-    fi;
+  func_check is_non_empty_file = 1 "$@";
+  if is_file "$1" && test -s "$1"; then
+    eval "${return_yes}";
   fi;
   eval "${return_no}";
 }
@@ -3211,7 +3224,7 @@
 #
 # set exit trap and create temporary files
 #
-# Globals: $_TMP_CAT, $_TMP_STDIN
+# Globals: $_TMP_DIR, $_TMP_CAT, $_TMP_STDIN
 #
 landmark '13: main_init()';
 main_init()
@@ -3220,32 +3233,52 @@
   # call clean_up() on any signal
   trap_set clean_up;
 
-  # determine temporary directory
-  umask 000;
+  # create temporary directory
+  umask 0022;
   _TMP_DIR='';
   for d in "${GROFF_TMPDIR}" "${TMPDIR}" "${TMP}" "${TEMP}" \
            "${TEMPDIR}" "${HOME}"'/tmp' '/tmp' "${HOME}" '.';
   do
-    if is_not_empty "$d"; then
-      if obj d is_dir && obj d is_writable; then
-        _TMP_DIR="${d}/${_PROGRAM_NAME}${_PROCESS_ID}";
-        if obj _TMP_DIR is_dir; then
-	  rm -f "${_TMP_DIR}"/*;
-          break;
-        else
-          mkdir "${_TMP_DIR}";
-          if obj _TMP_DIR is_not_dir; then
-            _TMP_DIR='';
-	    continue;
-          fi;
-          break;
-  	fi;
+    if obj d is_empty || obj d is_not_dir || obj d is_not_writable; then
+      continue;
+    fi;
+    case "$d" in
+    */)
+      _TMP_DIR="${d}";
+      ;;
+    *)
+      _TMP_DIR="${d}"'/';
+      ;;
+    esac;
+    _TMP_DIR="${_TMP_DIR}${_PROGRAM_NAME}${_PROCESS_ID}";
+    while obj _TMP_DIR is_existing; do
+      rm -f -r "${_TMP_DIR}" 2>/dev/null;
+      if obj _TMP_DIR is_existing; then
+        # $_TMP_DIR could not be removed
+        _TMP_DIR="${_TMP_DIR}"'X';
+        continue;
+      else
+        # $_TMP_DIR was removed
+        break;
       fi;
-      if obj _TMP_DIR is_not_writable; then
-	_TMP_DIR='';
-	continue;
+    done;
+    mkdir "${_TMP_DIR}";
+    if is_not_equal "$?" 0; then
+      if obj _TMP_DIR is_existing; then
+        rm -f -r "${_TMP_DIR}" 2>/dev/null;
       fi;
+      _TMP_DIR='';
+      continue;
+    fi;
+    if obj _TMP_DIR is_dir && obj _TMP_DIR is_writable; then
+      # $_TMP_DIR can now be used as temporary directory
+      break;
+    fi;
+    if obj _TMP_DIR is_existing; then
+      rm -f -r "${_TMP_DIR}" 2>/dev/null;
     fi;
+    _TMP_DIR='';
+    continue;
   done;
   unset d;
   if obj _TMP_DIR is_empty; then



From MAILER-DAEMON Tue Nov 16 07:54:30 2004
Received: from mailman by lists.gnu.org with archive (Exim 4.33)
	id 1CU2qs-0005OF-Fj
	for mharc-groff-commit@gnu.org; Tue, 16 Nov 2004 07:54:30 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1CU2qq-0005Nr-Lq
	for groff-commit@gnu.org; Tue, 16 Nov 2004 07:54:28 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1CU2qp-0005Nf-WB
	for groff-commit@gnu.org; Tue, 16 Nov 2004 07:54:28 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1CU2qp-0005Nc-Sq
	for groff-commit@gnu.org; Tue, 16 Nov 2004 07:54:27 -0500
Received: from [199.232.41.5] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.34) id 1CU2hy-0003b5-8y
	for groff-commit@gnu.org; Tue, 16 Nov 2004 07:45:18 -0500
Received: from localhost ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 4.34) id 1CU2lP-0000nE-9O
	for groff-commit@gnu.org; Tue, 16 Nov 2004 07:48:51 -0500
To: groff-commit@gnu.org
From: Werner LEMBERG <wl@gnu.org>
Message-Id: <E1CU2qp-0005Nf-WB@lists.gnu.org>
Date: Tue, 16 Nov 2004 07:54:28 -0500
Subject: [Groff-commit] groff ./ChangeLog ./NEWS ./README doc/webpage.m...
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, 16 Nov 2004 12:54:28 -0000

CVSROOT:	/cvsroot/groff
Module name:	groff
Branch: 	
Changes by:	Werner LEMBERG <wl@gnu.org>	04/11/16 12:48:50

Modified files:
	.              : ChangeLog NEWS README 
	doc            : webpage.ms 
	tmac           : www.tmac 

Log message:
	* README, doc/webpage.ms: Updated.
	
	* tmac/www.tmac (HTML, HTML-TAG): Minor clean-ups.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/ChangeLog.diff?tr1=1.755&tr2=1.756&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/NEWS.diff?tr1=1.193&tr2=1.194&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/README.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/doc/webpage.ms.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/tmac/www.tmac.diff?tr1=1.32&tr2=1.33&r1=text&r2=text

Patches:
Index: groff/ChangeLog
diff -u groff/ChangeLog:1.755 groff/ChangeLog:1.756
--- groff/ChangeLog:1.755	Sat Oct 30 11:10:59 2004
+++ groff/ChangeLog	Tue Nov 16 12:48:49 2004
@@ -1,3 +1,9 @@
+2004-11-15  Werner LEMBERG  <wl@gnu.org>
+
+	* README, doc/webpage.ms: Updated.
+
+	* tmac/www.tmac (HTML, HTML-TAG): Minor clean-ups.
+
 2004-10-30  Gaius Mulley  <gaius@glam.ac.uk>
 
 	* src/include/printer.h (printer): Remove virtual function
Index: groff/NEWS
diff -u groff/NEWS:1.193 groff/NEWS:1.194
--- groff/NEWS:1.193	Wed Sep 29 06:49:37 2004
+++ groff/NEWS	Tue Nov 16 12:48:49 2004
@@ -35,6 +35,11 @@
 o This program to create font definition files for xditview isn't new but
   hasn't been installed previously.
 
+Groffer
+-------
+
+o A security problem (reported as CAN-2004-0969) has been fixed.
+
 Macro packages
 --------------
 
Index: groff/README
diff -u groff/README:1.8 groff/README:1.9
--- groff/README:1.8	Sun May 16 22:33:09 2004
+++ groff/README	Tue Nov 16 12:48:49 2004
@@ -4,7 +4,7 @@
 Included in this release are implementations of troff, pic, eqn, tbl,
 grn, refer, -man, -mdoc, -mom, and -ms macros, and drivers for PostScript,
 TeX dvi format, HP LaserJet 4 printers, Canon CAPSL printers, HTML format
-(still alpha), and typewriter-like devices.  Also included is a modified
+(beta status), and typewriter-like devices.  Also included is a modified
 version of the Berkeley -me macros, an enhanced version of the X11
 xditview previewer, and an implementation of the -mm macros contributed
 by Joergen Haegg (jh@axis.se).
@@ -22,29 +22,30 @@
 The most recent released version of groff is always available by
 anonymous ftp from ftp.gnu.org in the directory pub/gnu/groff.
 
-A CVS repository is available, containing the current development
-version of groff.  You can access it with the commands
+A CVS repository is available (http://savannah.gnu.org/cvs/?group=groff),
+containing the current development version of groff.  You can access it
+with the commands
 
-  export CVSROOT=:pserver:anoncvs@anoncvs.ffii.org:/var/cvs
-  cvs login
+  export CVSROOT=:ext:anoncvs@savannah.gnu.org:/cvsroot/groff
+  export CVS_RSH=ssh
   cvs -z9 co groff
 
-(if the prompt for the password appears, just press the enter key).
-After a successful login you no longer need the first two commands; an
-update of a checked out repository should be done with
+Note that you need an SSH client for security reasons.
 
-  cvs -z9 update -dP
+An update of a checked out repository should be done with
+
+  CVS_RSH=ssh cvs -z9 update -dP
 
 Please read the info pages of cvs for further details.
 
 Alternatively, you can download snapshots (which are updated twice a
 day) from
 
-  ftp://ftp.ffii.org/pub/groff/devel/groff-current.tar.gz
+  http://groff.ffii.org/groff/groff-current.tar.gz
 
 or a diff file relative to the latest official groff release as
 
-  ftp://ftp.ffii.org/pub/groff/devel/groff-<version>-current.diff.gz
+  http://groff.ffii.org/groff/groff-<version>-current.diff.gz
 
 Assuming that groff-<version>.tar.gz and
 groff-<version>-current.diff.gz are in the same directory, do the
@@ -57,7 +58,7 @@
 Finally, it is possible to access the CVS with a browser by pointing it
 to
 
-  http://www.ffii.org/cgi-bin/viewcvs.cgi/groff
+  http://savannah.gnu.org/cvs/?group=groff
 
 Please report bugs using the form in the file BUG-REPORT; the idea of
 this is to make sure that FSF has all the information it needs to fix
@@ -69,19 +70,18 @@
 Three mailing lists are available:
 
   bug-groff@gnu.org          for reporting bugs
-  groff@ffii.org             for general discussion of groff
-  groff-commit@ffii.org      a read-only list showing logs of
-                             commitments to the CVS repository
+  groff@gnu.org              for general discussion of groff
+  groff-commit@gnu.org       a read-only list showing commitments
+                             to the CVS repository
 
-Note that groff@gnu.org is an alias for groff@ffii.org; you must be
-subscribed to the `groff' list to send mails.
+You must be subscribed to the `groff' list to send mails.
 
 To subscribe, send a mail to <list>-request@<domain> (example:
-groff-request@ffii.org) with the word `subscribe' in either the subject
+groff-request@gnu.org) with the word `subscribe' in either the subject
 or body of the email (don't include the quotes) or have a look at the
 groff mailing list web page at
 
-  http://ffii.org/mailman/listinfo/groff
+  http://list.gnu.org/mailman/listinfo/groff
 
 GNU groff was written by James Clark <jjc@jclark.com>.  It is now
 maintained by Ted Harding <ted.harding@nessie.mcc.ac.uk> and Werner
Index: groff/doc/webpage.ms
diff -u groff/doc/webpage.ms:1.15 groff/doc/webpage.ms:1.16
--- groff/doc/webpage.ms:1.15	Wed Oct 13 07:24:46 2004
+++ groff/doc/webpage.ms	Tue Nov 16 12:48:50 2004
@@ -46,13 +46,11 @@
 .
 .HnS 1
 .HR
-GNU Troff
-.URL http://\:groff.ffii.org/ (Groff)
+GNU Troff (\c
+.URL http://\:groff.ffii.org/ Groff )
 \[em] a
 .URL http://\:www.gnu.org/ GNU
 project.
-Hosted by
-.URL http://\:ffii.org/ FFII .
 .HR
 .HnE
 .LK
@@ -70,18 +68,18 @@
 
 The source code of the currently released versions of groff is
 available at the 
-.URL "ftp://\:groff.ffii.org/\:pub/\:groff/" "FFII host (Germany)" ,
+.URL "http://\:groff.ffii.org/\:groff/" "FFII host (Germany)" ,
 .URL "ftp://\:ftp.gnu.org/\:gnu/\:groff/" "GNU host (USA)" ,
 and its mirrors.
 .
-The USA site also contains more old, obsolete versions.
+The USA site also contains older, obsolete versions.
 
 The most actual pre-release, development version is available from a
 CVS repository, see below.
 .
 Development snapshots (produced twice a day from the CVS repository)
-can be downloaded with FTP from
-.URL "ftp://\:groff.ffii.org/\:pub/\:groff/devel" here .
+can be downloaded from
+.URL "http://\:groff.ffii.org/\:groff/\:devel" here .
 
 For a special version of groff on the Microsoft operating systems, see
 .URL "http://\:gnuwin32.sf.net/\:packages/\:groffl.htm" "Groff for Windows" .
@@ -90,10 +88,10 @@
 .URL http://\:www.gnu.org/\:copyleft/\:gpl.html "GNU Copyright License" .
 
 User issues lead:
-.MTO Ted.Harding@\:nessie.mcc.ac.uk "Ted Harding"
+.MTO Ted.Harding@\:nessie.mcc.ac.uk "Ted Harding" .
 .br
 Technical issues lead:
-.MTO wl@\:gnu.org "Werner Lemberg"
+.MTO wl@\:gnu.org "Werner Lemberg" .
 .
 .
 .SH
@@ -104,8 +102,8 @@
 
 Included in this release are implementations of troff, pic, eqn, tbl,
 grn, refer, \-man, \-mdoc, and \-ms macros, and drivers for PostScript,
-TeX dvi format, HP LaserJet 4 printers, Canon CAPSL printers, HTML format
-(still alpha), and typewriter-like devices.
+TeX dvi format, HP LaserJet\~4 printers, Canon CAPSL printers, HTML format
+(beta status), and typewriter-like devices.
 Also included is a modified version of the Berkeley \-me macros, an enhanced
 version of the X11 xditview previewer, and an implementation of the \-mm
 macros contributed by
@@ -125,27 +123,28 @@
 The most recent released version of groff is always available by anonymous
 ftp from ftp.gnu.org in the directory pub/\:gnu/\:groff.
 
-A CVS repository is available, containing the current development
-version of groff.
+A
+.URL "http://\:savannah.gnu.org/\:cvs/\:?group=groff" "CVS repository"
+is available, containing the current development version of groff.
 You can access it with the commands
 
 .in 2m
 .nf
 .ft C
-export CVSROOT=:pserver:anoncvs@anoncvs.ffii.org:/var/cvs
-cvs login
+export CVSROOT=:ext:anoncvs@savannah.gnu.org:/cvsroot/groff
+export CVS_RSH=ssh
 cvs -z9 co groff
 .ft P
 .fi
 .in
 
-(if the prompt for the password appears, just press the enter key).
-After a successful login you no longer need the first two commands; an
-update of a checked out repository should be done with
+Note that you need an SSH client for security reasons.    
+
+An update of a checked out repository should be done with
 
 .in 2m
 .ft C
-cvs -z9 update -dP
+CVS_RSH=ssh cvs -z9 update -dP
 .ft P
 .in
 
@@ -153,12 +152,12 @@
 
 Alternatively, you can download snapshots (which are updated twice a day)
 from
-.URL ftp://\:ftp.ffii.org/\:pub/\:groff/\:devel/\:groff-current.tar.gz here
+.URL http://\:groff.ffii.org/\:groff/\:devel/\:groff-current.tar.gz here
 or a diff file relative to the latest official groff release as
 
 .in 2m
 .ft C
-ftp://ftp.ffii.org/pub/groff/devel/groff-\[la]version\[ra]-current.diff.gz
+http://groff.ffii.org/groff/devel/groff-\[la]version\[ra]-current.diff.gz
 .ft P
 .in
 
@@ -180,8 +179,8 @@
 to
 
 .in 2m
-.URL http://www.ffii.org/cgi-bin/viewcvs.cgi/groff \
-     http://www.ffii.org/cgi-bin/viewcvs.cgi/groff
+.URL http://savannah.gnu.org/cvs/?group=groff \
+     http://savannah.gnu.org/cvs/?group=groff
 .in
 
 Please report bugs using the form in the file BUG-REPORT; the idea of this
@@ -200,25 +199,23 @@
 for reporting bugs
 
 .LI
-.MTO groff@ffii.org groff@ffii.org
+.MTO groff@gnu.org groff@gnu.org
 for general discussion of groff
 
 .LI
-.MTO groff-commit@ffii.org groff-commit@ffii.org
-a read-only list showing logs of commitments to the CVS repository
+.MTO groff-commit@gnu.org groff-commit@gnu.org
+a read-only list showing commitments to the CVS repository
 .ULE
 
-Note that groff@gnu.org is an alias for
-.MTO groff@\:ffii.org groff@\:ffii.org ;
-you must be subscribed to the `groff' list to send mails.
+You must be subscribed to the `groff' list to send mails.
 
 To subscribe, send e-mail to \[la]list\[ra]-request@\[la]domain\[ra]
 (example:
-.MTO groff-request@\:ffii.org groff-request@\:ffii.org )
+.MTO groff-request@\:gnu.org groff-request@\:gnu.org )
 with the word `subscribe' in either the
 subject or body of the e-mail (don't include the quotes) or have a look
 at the
-.URL http://\:ffii.org/\:mailman/\:listinfo/\:groff/ \
+.URL http://\:lists.gnu.org/\:mailman/\:listinfo/\:groff/ \
      "groff mailing list webpage" .
 
 GNU groff was written by
Index: groff/tmac/www.tmac
diff -u groff/tmac/www.tmac:1.32 groff/tmac/www.tmac:1.33
--- groff/tmac/www.tmac:1.32	Wed Oct 13 07:24:46 2004
+++ groff/tmac/www.tmac	Tue Nov 16 12:48:50 2004
@@ -256,15 +256,14 @@
 .\" --------------------------------------------------------------------
 .
 .\" --------------------------------------------------------------------
-.\" HTML (<address> <description> [<punctuation>])
+.\" HTML
 .\"
 .\" the main auxiliary macro for the HTML interface
 .\"
 .de HTML
 .  if \\n[www-html] \{\
-.    \" the following line makes the vertical mode leave, so to say
-.    nop \&
-.    nop \X^html:\\$*^
+.    \" the `\&' makes the vertical mode leave, so to say
+.    nop \&\X^html:\\$*^
 .  \}
 ..
 .\"
@@ -413,9 +412,8 @@
 .\"
 .de HTML-TAG
 .  if \\n[www-html] \{\
-.    \" the following line makes the vertical mode leave, so to say
-.    nop \&
-.    nop \X^html-tag:\\$*^
+.    \" the `\&' makes the vertical mode leave, so to say
+.    nop \&\X^html-tag:\\$*^
 .  \}
 ..
 .\" --------------------------------------------------------------------
@@ -711,7 +709,7 @@
 .\" HTL
 .\"
 .\"   Generate an HTML title only.  This differs from the -ms .TL macro
-.\"   which generates both an HTML title and a H1 heading.
+.\"   which generates both an HTML title and an H1 heading.
 .\"
 .\"   This is useful when an author wishes to use a HTML title as search
 .\"   engine fodder but a graphic title in the document.



From MAILER-DAEMON Tue Nov 16 07:55:32 2004
Received: from mailman by lists.gnu.org with archive (Exim 4.33)
	id 1CU2rs-0005hb-L4
	for mharc-groff-commit@gnu.org; Tue, 16 Nov 2004 07:55:32 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1CU2rq-0005gn-Bw
	for groff-commit@gnu.org; Tue, 16 Nov 2004 07:55:30 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1CU2ro-0005fB-Bh
	for groff-commit@gnu.org; Tue, 16 Nov 2004 07:55:28 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1CU2ro-0005er-44
	for groff-commit@gnu.org; Tue, 16 Nov 2004 07:55:28 -0500
Received: from [199.232.41.5] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.34) id 1CU2ii-0003ij-Jw
	for groff-commit@gnu.org; Tue, 16 Nov 2004 07:46:04 -0500
Received: from localhost ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 4.34) id 1CU2mA-0000qu-Dk
	for groff-commit@gnu.org; Tue, 16 Nov 2004 07:49:38 -0500
To: groff-commit@gnu.org
From: Werner LEMBERG <wl@gnu.org>
Message-Id: <E1CU2ro-0005fB-Bh@lists.gnu.org>
Date: Tue, 16 Nov 2004 07:55:28 -0500
Subject: [Groff-commit] groff ChangeLog
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, 16 Nov 2004 12:55:30 -0000

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

Modified files:
	.              : ChangeLog 

Log message:
	

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/ChangeLog.diff?tr1=1.756&tr2=1.757&r1=text&r2=text

Patches:
Index: groff/ChangeLog
diff -u groff/ChangeLog:1.756 groff/ChangeLog:1.757
--- groff/ChangeLog:1.756	Tue Nov 16 12:48:49 2004
+++ groff/ChangeLog	Tue Nov 16 12:49:38 2004
@@ -1,6 +1,6 @@
 2004-11-15  Werner LEMBERG  <wl@gnu.org>
 
-	* README, doc/webpage.ms: Updated.
+	* NEWS, README, doc/webpage.ms: Updated.
 
 	* tmac/www.tmac (HTML, HTML-TAG): Minor clean-ups.
 



From MAILER-DAEMON Wed Nov 17 18:43:00 2004
Received: from mailman by lists.gnu.org with archive (Exim 4.33)
	id 1CUZS0-00027Q-0e
	for mharc-groff-commit@gnu.org; Wed, 17 Nov 2004 18:43:00 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1CUZRy-00027L-E9
	for groff-commit@gnu.org; Wed, 17 Nov 2004 18:42:58 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1CUZRx-000279-V1
	for groff-commit@gnu.org; Wed, 17 Nov 2004 18:42:58 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1CUZRx-000276-Rb
	for groff-commit@gnu.org; Wed, 17 Nov 2004 18:42:57 -0500
Received: from [199.232.41.5] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.34) id 1CUZIy-0004lv-29
	for groff-commit@gnu.org; Wed, 17 Nov 2004 18:33:40 -0500
Received: from localhost ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 4.34) id 1CUZMR-0003Ff-6c
	for groff-commit@gnu.org; Wed, 17 Nov 2004 18:37:15 -0500
To: groff-commit@gnu.org
From: Werner LEMBERG <wl@gnu.org>
Message-Id: <E1CUZRx-000279-V1@lists.gnu.org>
Date: Wed, 17 Nov 2004 18:42:58 -0500
Subject: [Groff-commit] groff ./ChangeLog doc/Makefile.in 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: Wed, 17 Nov 2004 23:42:58 -0000

CVSROOT:	/cvsroot/groff
Module name:	groff
Branch: 	
Changes by:	Werner LEMBERG <wl@gnu.org>	04/11/17 23:37:15

Modified files:
	.              : ChangeLog 
	doc            : Makefile.in Makefile.sub 

Log message:
	* doc/Makefile.in (prepare_examples, webpage.html): Handle
	`groff.css'.
	
	* doc/Makefile.sub (EXAMPLEFILES, CLEANNOTSRCDIRADD,
	prepare_examples, webpage.html): Handle `groff.css'.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/ChangeLog.diff?tr1=1.757&tr2=1.758&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/doc/Makefile.in.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/doc/Makefile.sub.diff?tr1=1.15&tr2=1.16&r1=text&r2=text

Patches:
Index: groff/ChangeLog
diff -u groff/ChangeLog:1.757 groff/ChangeLog:1.758
--- groff/ChangeLog:1.757	Tue Nov 16 12:49:38 2004
+++ groff/ChangeLog	Wed Nov 17 23:37:14 2004
@@ -1,3 +1,11 @@
+2004-11-17  Werner LEMBERG  <wl@gnu.org>
+
+	* doc/Makefile.in (prepare_examples, webpage.html): Handle
+	`groff.css'.
+
+	* doc/Makefile.sub (EXAMPLEFILES, CLEANNOTSRCDIRADD,
+	prepare_examples, webpage.html): Handle `groff.css'.
+
 2004-11-15  Werner LEMBERG  <wl@gnu.org>
 
 	* NEWS, README, doc/webpage.ms: Updated.
Index: groff/doc/Makefile.in
diff -u groff/doc/Makefile.in:1.11 groff/doc/Makefile.in:1.12
--- groff/doc/Makefile.in:1.11	Fri Jul  2 22:32:42 2004
+++ groff/doc/Makefile.in	Wed Nov 17 23:37:15 2004
@@ -107,8 +107,9 @@
 
 all: prepare_examples
 
-prepare_examples: grnexmpl.g
+prepare_examples: grnexmpl.g groff.css
 	test -f grnexmpl.g || cp $(srcdir)/grnexmpl.g .
+	test -f groff.css || cp $(srcdir)/groff.css .
 
 groff: groff.texinfo
 	$(MAKEINFO) --enable-encoding -I$(srcdir) $(srcdir)/groff.texinfo
@@ -123,7 +124,7 @@
                  -P-D$(imagedir) -P-j`basename $< | sed -e 's|.ms$$||'` \
                  -Thtml -ms >$@
 
-webpage.html: webpage.ms gnu.png gnu.eps
+webpage.html: webpage.ms gnu.png gnu.eps groff.css
 webpage.ps: gnu.eps
 
 grnexmpl.ps: grnexmpl.me grnexmpl.g
Index: groff/doc/Makefile.sub
diff -u groff/doc/Makefile.sub:1.15 groff/doc/Makefile.sub:1.16
--- groff/doc/Makefile.sub:1.15	Fri Jul  2 22:32:42 2004
+++ groff/doc/Makefile.sub	Wed Nov 17 23:37:15 2004
@@ -70,6 +70,7 @@
 
 EXAMPLEFILES=\
   webpage.ms \
+  groff.css \
   grnexmpl.g \
   grnexmpl.me
 
@@ -100,6 +101,7 @@
   $(imagedir)
 
 CLEANNOTSRCDIRADD=\
+  groff.css \
   grnexmpl.g \
   groff \
   groff-* \
@@ -124,8 +126,9 @@
 
 html: $(HTMLDOCFILES) $(HTMLEXAMPLEFILES)
 
-prepare_examples: grnexmpl.g
+prepare_examples: grnexmpl.g groff.css
 	test -f grnexmpl.g || cp $(srcdir)/grnexmpl.g .
+	test -f groff.css || cp $(srcdir)/groff.css .
 
 groff: groff.texinfo
 	$(MAKEINFO) --enable-encoding -I$(srcdir) $(srcdir)/groff.texinfo
@@ -141,7 +144,7 @@
                  -P-D$(imagedir) -P-j`basename $< | sed -e 's|.ms$$||'` \
                  -Thtml -ms >$@
 
-webpage.html: webpage.ms gnu.png
+webpage.html: webpage.ms gnu.png groff.css
 webpage.ps: gnu.eps
 
 grnexmpl.ps: grnexmpl.me grnexmpl.g



From MAILER-DAEMON Sat Nov 20 04:33:52 2004
Received: from mailman by lists.gnu.org with archive (Exim 4.33)
	id 1CVRct-0003rn-QR
	for mharc-groff-commit@gnu.org; Sat, 20 Nov 2004 04:33:52 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1CVRcs-0003rb-25
	for groff-commit@gnu.org; Sat, 20 Nov 2004 04:33:50 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1CVRcp-0003qu-QI
	for groff-commit@gnu.org; Sat, 20 Nov 2004 04:33:48 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1CVRcp-0003qr-DX
	for groff-commit@gnu.org; Sat, 20 Nov 2004 04:33:47 -0500
Received: from [199.232.41.5] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.34) id 1CVRTf-0004GS-KE
	for groff-commit@gnu.org; Sat, 20 Nov 2004 04:24:19 -0500
Received: from localhost ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 4.34) id 1CVRXB-0000Jc-MI
	for groff-commit@gnu.org; Sat, 20 Nov 2004 04:27:58 -0500
To: groff-commit@gnu.org
From: Werner LEMBERG <wl@gnu.org>
Message-Id: <E1CVRcp-0003qu-QI@lists.gnu.org>
Date: Sat, 20 Nov 2004 04:33:48 -0500
Subject: [Groff-commit] groff ./ChangeLog ./NEWS src/devices/grohtml/gr...
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, 20 Nov 2004 09:33:50 -0000

CVSROOT:	/cvsroot/groff
Module name:	groff
Branch: 	
Changes by:	Werner LEMBERG <wl@gnu.org>	04/11/20 09:27:57

Modified files:
	.              : ChangeLog NEWS 
	src/devices/grohtml: grohtml.man post-html.cpp 
	tmac           : groff_www.man www.tmac 

Log message:
	* tmac/www.tmac (HTML-NS, HTML-TAG-NS, HTML-TAG-NEXT): Simplified.
	(HTML</p>): Minor clean-up.
	
	* tmac/groff_www.man: Updated.
	
	* src/devices/grohtml/grohtml.man: Revised and updated.
	
	* NEWS: Updated.
	
	* src/devices/grohtml/post-html.cpp (html_printer::do_heading):
	Fix space insertion.
	(html_printer::do_links): Fix rules generation around automatic
	heading links.
	
	* tmac/www.tmac (LK): Use HTML-TAG-NS.
	(HR): Simplify.
	No longer emit empty line for non-HTML devices.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/ChangeLog.diff?tr1=1.758&tr2=1.759&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/NEWS.diff?tr1=1.194&tr2=1.195&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/src/devices/grohtml/grohtml.man.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/src/devices/grohtml/post-html.cpp.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/tmac/groff_www.man.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/tmac/www.tmac.diff?tr1=1.33&tr2=1.34&r1=text&r2=text

Patches:
Index: groff/ChangeLog
diff -u groff/ChangeLog:1.758 groff/ChangeLog:1.759
--- groff/ChangeLog:1.758	Wed Nov 17 23:37:14 2004
+++ groff/ChangeLog	Sat Nov 20 09:27:57 2004
@@ -1,3 +1,25 @@
+2004-11-18  Werner LEMBERG  <wl@gnu.org>
+
+	* tmac/www.tmac (HTML-NS, HTML-TAG-NS, HTML-TAG-NEXT): Simplified.
+	(HTML</p>): Minor clean-up.
+
+	* tmac/groff_www.man: Updated.
+
+	* src/devices/grohtml/grohtml.man: Revised and updated.
+
+	* NEWS: Updated.
+
+2004-11-18  Gaius Mulley  <gaius@glam.ac.uk>
+
+	* src/devices/grohtml/post-html.cpp (html_printer::do_heading):
+	Fix space insertion.
+	(html_printer::do_links): Fix rules generation around automatic
+	heading links.
+
+	* tmac/www.tmac (LK): Use HTML-TAG-NS.
+	(HR): Simplify.
+	No longer emit empty line for non-HTML devices.
+
 2004-11-17  Werner LEMBERG  <wl@gnu.org>
 
 	* doc/Makefile.in (prepare_examples, webpage.html): Handle
Index: groff/NEWS
diff -u groff/NEWS:1.194 groff/NEWS:1.195
--- groff/NEWS:1.194	Tue Nov 16 12:48:49 2004
+++ groff/NEWS	Sat Nov 20 09:27:57 2004
@@ -7,8 +7,9 @@
 Troff
 -----
 
-o Analogously to the .ft and \f pair, two new requests `glyphcolor' and
-  `fillcolor' (which pair with \m and \M, respectively) have been added.
+o Analogously to the .ft and \f pair, two new requests `gcolor' and
+  `fcolor' (which pair with \m and \M, respectively) have been added to
+  set the glyph and background colours.
 
 o A new read-only, string-valued register `.sty' returns the name of the
   current style.
@@ -22,6 +23,14 @@
 
 o The `by' argument in a `for' loop can now be negative if it is additive.
   For the multiplicative case, it must be greater than zero.
+
+Grohtml
+-------
+
+o This device driver has been raised to beta stage; its set of tags should
+  be stable now.
+
+o New command line option `-s' to set the base point size.
   
 Gxditview
 ---------
@@ -80,6 +89,13 @@
   heading size match that of NH with same argument value when the
   GROWPS/PSINCR feature is enabled.
 
+o www.tmac:
+
+  The HR macro no longer causes an empty line for non-HTML devices.
+
+  A new macro `HEAD' has been added to directly add data to the
+  <head>...</head> block.
+
 Please refer to the documentation of the ms package for other, minor
 improvements.
 
Index: groff/src/devices/grohtml/grohtml.man
diff -u groff/src/devices/grohtml/grohtml.man:1.19 groff/src/devices/grohtml/grohtml.man:1.20
--- groff/src/devices/grohtml/grohtml.man:1.19	Sat Jul  3 12:46:58 2004
+++ groff/src/devices/grohtml/grohtml.man	Sat Nov 20 09:27:57 2004
@@ -16,17 +16,23 @@
 translations approved by the Free Software Foundation instead of in
 the original English.
 ..
+.
+.
 .\" Like TP, but if specified indent is more than half
 .\" the current line-length - indent, use the default indent.
 .de Tp
-.ie \\n(.$=0:((0\\$1)*2u>(\\n(.lu-\\n(.iu)) .TP
-.el .TP "\\$1"
+.  ie \\n(.$=0:((0\\$1)*2u>(\\n(.lu-\\n(.iu)) .TP
+.  el .TP "\\$1"
 ..
+.
+.
 .TH GROHTML @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@"
 .
+.
 .SH NAME
 grohtml \- html driver for groff
 .
+.
 .SH SYNOPSIS
 .nr a \n(.j
 .ad l
@@ -34,22 +40,27 @@
 .in +\w'\fBgrohtml 'u
 .ti \niu
 .B grohtml
+.
 .de OP
-.ie \\n(.$-1 .RI "[\ \fB\\$1\fP" "\\$2" "\ ]"
-.el .RB "[\ " "\\$1" "\ ]"
+.  ie \\n(.$-1 .RI "[\ \fB\\$1\fP" "\\$2" "\ ]"
+.  el .RB "[\ " "\\$1" "\ ]"
 ..
-.OP \-vhlrn
+.
+.OP \-vbphlrn
 .OP \-D dir
 .OP \-F dir
-.OP \-i resolution
+.OP \-i \%resolution
 .OP \-I \%image-stem
 .OP \-o \%image-vertical-offset
+.OP \-j \%filename
 .OP \-a \%aa-text-bits
-.OP \-a \%aa-graphic-bits
+.OP \-g \%aa-graphic-bits
+.OP \-s size
 .RI "[\ " files\|.\|.\|. "\ ]"
 .br
 .ad \na
 .
+.
 .SH DESCRIPTION
 The
 .B grohtml
@@ -84,13 +95,15 @@
 .BR groff 's
 .B \-P
 option.
+.
+.
 .SH OPTIONS
 .TP
 .BI \-a aa-text-bits
 Number of bits of antialiasing information to be used by
 .I text
 when generating png images.
-The default is\~4 but legal values are 0, 1, 2, and\~4.
+The default is\~4 but valid values are 0, 1, 2, and\~4.
 Note your version of
 .B gs
 needs to support the
@@ -102,12 +115,13 @@
 .B grohtml
 from issuing antialiasing commands to
 .BR gs .
+.
 .TP
 .BI \-g aa-graphic-bits
 Number of bits of antialiasing information to be used by
 .I graphics
 when generating png images.
-The default is\~4 but legal values are 0, 1, 2, and\~4.
+The default is\~4 but valid values are 0, 1, 2, and\~4.
 Note your version of
 .B gs
 needs to support the
@@ -119,36 +133,55 @@
 .B grohtml
 from issuing antialiasing commands to
 .BR gs .
+.
 .TP
-.B -b
+.B \-b
 Initialize the background color to white.
+.
 .TP
-.B -h
-Generates section and number headings by using
+.B \-h
+Generate section and number headings by using
 .BR <B> .\|.\|. </B>
 and increasing the font size, rather than using the
 .BI <H n >\c
 \&.\|.\|.\c
 .BI </H n >
 tags.
+.
+.TP
+.B \-l
+Turn off the production of automatic section links at the top of the
+document.
+.
 .TP
-.B -l
-Turns off the production of automatic section links at the top of the document.
+.B \-r
+Turn off the automatic header and footer line (html rule).
+.
 .TP
-.B -r
-Turns off the automatic header and footer line (html rule).
+.B \-s size
+Set the base point size of the source file.
+Thereafter when this point size is used in the source it will correspond
+to the html base size.
+Every increase of two points in the source will yield a
+.B <big>
+tag, and conversely when a decrease of two points is seen a
+.B <small>
+tag is emitted.
+.
 .TP
-.B -n
+.B \-n
 Generate simple heading anchors whenever a section/number heading is found.
 Without the option the anchor value is the textual heading.
-This can cause problems when a heading contains a `?' on some browsers
-(netscape).
+This can cause problems when a heading contains a `?' on older versions of
+some browsers (Netscape).
 This flag is automatically turned on if a heading contains an image.
+.
 .TP
-.B -p
+.B \-p
 Display page rendering progress to stderr.
 .B grohtml
 only displays a page number when an image is required.
+.
 .TP
 .BI \-F dir
 Prepend directory
@@ -157,27 +190,34 @@
 .I name
 is the name of the device, usually
 .BR html .
+.
 .TP
 .BI \-i resolution
 Select the resolution for all images.
 By default this is 100 pixels per inch.
-Example: -i200 indicates 200 pixels per inch.
+Example:
+.B \-i200
+indicates 200 pixels per inch.
+.
 .TP
 .BI \-I stem
 Determine the image stem name.
 If omitted grohtml uses
-.BI grohtml- XXX
+.BI \%grohtml- XXX
 .RI ( XXX
 is the process ID).
+.
 .TP
 .BI \-o vertical-offset
 Specify the vertical offset of images in points.
+.
 .TP
 .BI \-D dir
 Inform
 .B grohtml
 to place all image files into directory
 .IR dir .
+.
 .TP
 .BI \-j filename
 Inform
@@ -188,10 +228,12 @@
 is the stem and all level one section headings start a new
 file, named
 .IR filename-n.html .
+.
 .TP
 .B \-v
 Print the version number.
 .
+.
 .SH USAGE
 There are styles called
 .BR R ,
@@ -200,6 +242,8 @@
 and
 .B BI
 mounted at font positions 1 to 4.
+.
+.
 .SH DEPENDENCIES
 .B grohtml
 is dependent upon the png utilities
@@ -220,10 +264,14 @@
 package.
 Images are generated whenever a table, picture, equation or line is
 encountered.
+.
+.
 .SH BUGS
 .B Grohtml
 has been completely redesigned and rewritten.
-It is still alpha code.
+It is still beta code.
+.
+.
 .SH "SEE ALSO"
 .BR afmtodit (@MAN1EXT@),
 .BR groff (@MAN1EXT@),
Index: groff/src/devices/grohtml/post-html.cpp
diff -u groff/src/devices/grohtml/post-html.cpp:1.12 groff/src/devices/grohtml/post-html.cpp:1.13
--- groff/src/devices/grohtml/post-html.cpp:1.12	Sat Oct 30 11:11:00 2004
+++ groff/src/devices/grohtml/post-html.cpp	Sat Nov 20 09:27:57 2004
@@ -2489,23 +2489,23 @@
 void html_printer::do_heading (char *arg)
 {
   text_glob *g;
-  text_glob *l = 0;
   int  level=atoi(arg);
+  int  horiz;
 
   header.header_buffer.clear();
   page_contents->glyphs.move_right();
   if (! page_contents->glyphs.is_equal_to_head()) {
     g = page_contents->glyphs.get_data();
+    horiz = g->minh;
     do {
       if (g->is_auto_img()) {
 	string img=generate_img_src((char *)(g->text_string + 20));
 
 	if (! img.empty()) {
 	  simple_anchors = TRUE;  // we cannot use full heading anchors with images
-	  if (l != 0)
+	  if (horiz < g->minh)
 	    header.header_buffer += " ";
 	  
-	  l = g;
 	  header.header_buffer += img;
 	}
       }
@@ -2519,10 +2519,10 @@
 	/*
 	 *  we ignore the other tag commands when constructing a heading
 	 */
-	if (l != 0)
+	if (horiz < g->minh)
 	  header.header_buffer += " ";
-	l = g;
 
+	horiz = g->maxh;
 	header.header_buffer += string(g->text_string, g->text_length);
       }
       page_contents->glyphs.move_right();
@@ -2827,7 +2827,7 @@
 
 void html_printer::do_links (void)
 {
-  current_paragraph->done_para();
+  html.end_line();                      // flush line
   auto_links = FALSE;   /* from now on only emit under user request */
   file_list.add_new_file(xtmpfile());
   file_list.set_links_required();
Index: groff/tmac/groff_www.man
diff -u groff/tmac/groff_www.man:1.12 groff/tmac/groff_www.man:1.13
--- groff/tmac/groff_www.man:1.12	Wed Sep 29 06:49:38 2004
+++ groff/tmac/groff_www.man	Sat Nov 20 09:27:57 2004
@@ -35,6 +35,8 @@
 .SH NAME
 groff_www \- groff macros for authoring web pages
 .HR
+.
+.
 .SH SYNOPSIS
 .B "groff \-mwww"
 [ options ]
@@ -81,6 +83,7 @@
 \&.HR	produce a horizontal rule
 \&.NHR	suppress automatic generation of rules.
 \&.HTL	only generate HTML title
+\&.HEAD	add data to <head> block
 \&.ULS	unorder list begin
 \&.ULE	unorder list end
 \&.LI	insert a list item
@@ -378,7 +381,9 @@
 .
 .TP
 .B .HR
-Generate a full-width horizontal rule.
+Generate a full-width horizontal rule for
+.BR \-Thtml .
+No effect for all other devices.
 .
 .TP
 .B .NHR
@@ -398,6 +403,23 @@
 The macro terminates when a space or break is seen (.sp, .br).
 .
 .TP
+.B .HEAD
+Add arbitrary HTML data to the <head> block.
+Ignored if not processed with
+.BR \-Thtml .
+Example:
+.RS
+.IP
+.nf
+.B ".HEAD" "\[dq]<link \[rs]"
+.B "  rel=\[dq]\[dq]icon\[dq]\[dq] \[rs]"
+.B "  type=\[dq]\[dq]image/png\[dq]\[dq] \[rs]"
+.B "  href=\[dq]\[dq]http://foo.org//bar.png\[dq]\[dq]/>\[dq]"
+.fi
+.ft P
+.RE
+.
+.TP
 .B .HTML
 All text after this macro is treated as raw html.
 If the document is processed without
Index: groff/tmac/www.tmac
diff -u groff/tmac/www.tmac:1.33 groff/tmac/www.tmac:1.34
--- groff/tmac/www.tmac:1.33	Tue Nov 16 12:48:50 2004
+++ groff/tmac/www.tmac	Sat Nov 20 09:27:57 2004
@@ -270,17 +270,15 @@
 .\" an auxiliary macro for HTML (without following space)
 .\"
 .de HTML-NS
-.  if \\n[www-html] \
-.    tag "html:\\$*
+.  tag "html:\\$*
 ..
 .\"
 .\" emit a HTML tag after shutting down a (possibly open) paragraph
 .\"
 .de HTML</p>
 .  if \\n[www-html] \{\
-.    \" the following line makes the vertical mode leave, so to say
-.    nop \&
-.    nop \X^html</p>:\\$*^
+.    \" the `\&' makes the vertical mode leave, so to say
+.    nop \&\X^html</p>:\\$*^
 .  \}
 ..
 .\" --------------------------------------------------------------------
@@ -422,8 +420,7 @@
 .\"   Emit a tag for grohtml (without a space).  This is an internal macro.
 .\"
 .de HTML-TAG-NS
-.  if \\n[www-html] \
-.    tag html-tag:\\$*
+.  tag html-tag:\\$*
 ..
 .\" --------------------------------------------------------------------
 .\" HTML-TAG-NEXT
@@ -432,8 +429,7 @@
 .\"   This is an internal macro.
 .\"
 .de HTML-TAG-NEXT
-.  if \\n[www-html] \
-.    taga html-tag:\\$*
+.  taga html-tag:\\$*
 ..
 .
 .\" --------------------------------------------------------------------
@@ -674,20 +670,15 @@
 .\"   section/numbered headings at this position.
 .\"
 .de LK
-.    HTML-TAG ".links"
+.  HTML-TAG-NS ".links"
 ..
 .\" --------------------------------------------------------------------
 .\" HR
 .\"
-.\"   Produce a horizontal line
+.\"   Produce a horizontal line.
 .\"
 .de HR
-.  ie \\n[www-html] \{\
-.    ti 0
-.    HTML "<hr>"
-.  \}
-.  el \
-.    sp
+.  HTML-NS "<hr>"
 ..
 .\" --------------------------------------------------------------------
 .\" NHR
@@ -702,7 +693,8 @@
 .\" www-end-nowhere - end of input trap called to finish diversion.
 .\"
 .de www-end-nowhere
-.  if !\\n[www-html] .di
+.  if !\\n[www-html] \
+.    di
 .  HTML-TAG ".eo.tl"
 ..
 .\" --------------------------------------------------------------------
@@ -718,7 +710,8 @@
 .\"
 .de HTL
 .  HTML-TAG ".html-tl"
-.  if !\\n[www-html] .di www-nowhere
+.  if !\\n[www-html] \
+.    di www-nowhere
 .  it 2 www-end-nowhere
 ..
 .



From MAILER-DAEMON Mon Nov 22 03:42:17 2004
Received: from mailman by lists.gnu.org with archive (Exim 4.33)
	id 1CW9m4-00013N-OB
	for mharc-groff-commit@gnu.org; Mon, 22 Nov 2004 03:42:16 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1CW9m2-000136-0n
	for groff-commit@gnu.org; Mon, 22 Nov 2004 03:42:14 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1CW9m0-00012m-N8
	for groff-commit@gnu.org; Mon, 22 Nov 2004 03:42:12 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1CW9m0-00012c-Hv
	for groff-commit@gnu.org; Mon, 22 Nov 2004 03:42:12 -0500
Received: from [199.232.41.5] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.34) id 1CW9cw-00050P-0D
	for groff-commit@gnu.org; Mon, 22 Nov 2004 03:32:50 -0500
Received: from localhost ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 4.34) id 1CW9gT-0000w4-Mf
	for groff-commit@gnu.org; Mon, 22 Nov 2004 03:36:30 -0500
To: groff-commit@gnu.org
From: Werner LEMBERG <wl@gnu.org>
Message-Id: <E1CW9m0-00012m-N8@lists.gnu.org>
Date: Mon, 22 Nov 2004 03:42:12 -0500
Subject: [Groff-commit] groff/src/roff/troff input.cpp
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, 22 Nov 2004 08:42:14 -0000

CVSROOT:	/cvsroot/groff
Module name:	groff
Branch: 	
Changes by:	Werner LEMBERG <wl@gnu.org>	04/11/22 08:36:29

Modified files:
	src/roff/troff : input.cpp 

Log message:
	formatting

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/src/roff/troff/input.cpp.diff?tr1=1.21&tr2=1.22&r1=text&r2=text

Patches:
Index: groff/src/roff/troff/input.cpp
diff -u groff/src/roff/troff/input.cpp:1.21 groff/src/roff/troff/input.cpp:1.22
--- groff/src/roff/troff/input.cpp:1.21	Fri Oct 15 05:08:35 2004
+++ groff/src/roff/troff/input.cpp	Mon Nov 22 08:36:29 2004
@@ -105,7 +105,7 @@
 int ascii_output_flag = 0;
 int suppress_output_flag = 0;
 int is_html = 0;
-int begin_level = 0;		// number of nested .begin requests
+int begin_level = 0;		// number of nested \O escapes
 
 int have_input = 0;		// whether \f, \F, \D'F...', \H, \m, \M,
 				// \R, \s, or \S has been processed in
@@ -497,7 +497,8 @@
 #if defined(DEBUGGING)
   if (debug_state)
     if (tem->is_diversion)
-      fprintf(stderr, "in diversion level = %d\n", input_stack::get_div_level());
+      fprintf(stderr,
+	      "in diversion level = %d\n", input_stack::get_div_level());
 #endif
     top = top->next;
     level--;
@@ -590,7 +591,8 @@
 #if defined(DEBUGGING)
   if (debug_state)
     if (top->is_diversion) {
-      fprintf(stderr, "in diversion level = %d\n", input_stack::get_div_level());
+      fprintf(stderr,
+	      "in diversion level = %d\n", input_stack::get_div_level());
       fflush(stderr);
     }
 #endif



From MAILER-DAEMON Tue Nov 23 04:26:45 2004
Received: from mailman by lists.gnu.org with archive (Exim 4.33)
	id 1CWWwf-0001BM-Cx
	for mharc-groff-commit@gnu.org; Tue, 23 Nov 2004 04:26:45 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1CWWwb-00019n-MG
	for groff-commit@gnu.org; Tue, 23 Nov 2004 04:26:41 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1CWWwa-00018q-Ii
	for groff-commit@gnu.org; Tue, 23 Nov 2004 04:26:41 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1CWWwX-00018f-Lu
	for groff-commit@gnu.org; Tue, 23 Nov 2004 04:26:40 -0500
Received: from [199.232.41.5] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.34) id 1CWWnM-00038k-3r
	for groff-commit@gnu.org; Tue, 23 Nov 2004 04:17:08 -0500
Received: from localhost ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 4.34) id 1CWWqu-0003zH-M0
	for groff-commit@gnu.org; Tue, 23 Nov 2004 04:20:49 -0500
To: groff-commit@gnu.org
From: Werner LEMBERG <wl@gnu.org>
Message-Id: <E1CWWwa-00018q-Ii@lists.gnu.org>
Date: Tue, 23 Nov 2004 04:26:40 -0500
Subject: [Groff-commit] groff ./ChangeLog ./NEWS man/groff_diff.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: Tue, 23 Nov 2004 09:26:43 -0000

CVSROOT:	/cvsroot/groff
Module name:	groff
Branch: 	
Changes by:	Werner LEMBERG <wl@gnu.org>	04/11/23 09:20:48

Modified files:
	.              : ChangeLog NEWS 
	man            : groff_diff.man 
	src/devices/grohtml: html-table.cpp 

Log message:
	* src/devices/grohtml/html-table.cpp
	(html_table::emit_table_header): Don't emit `cols' attribute which
	doesn't exist in HTML 4.0 and is thus invalid.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/ChangeLog.diff?tr1=1.759&tr2=1.760&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/NEWS.diff?tr1=1.195&tr2=1.196&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/man/groff_diff.man.diff?tr1=1.51&tr2=1.52&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/src/devices/grohtml/html-table.cpp.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: groff/ChangeLog
diff -u groff/ChangeLog:1.759 groff/ChangeLog:1.760
--- groff/ChangeLog:1.759	Sat Nov 20 09:27:57 2004
+++ groff/ChangeLog	Tue Nov 23 09:20:48 2004
@@ -1,3 +1,9 @@
+2004-11-22  Werner LEMBERG  <wl@gnu.org>
+
+	* src/devices/grohtml/html-table.cpp
+	(html_table::emit_table_header): Don't emit `cols' attribute which
+	doesn't exist in HTML 4.0 and is thus invalid.
+
 2004-11-18  Werner LEMBERG  <wl@gnu.org>
 
 	* tmac/www.tmac (HTML-NS, HTML-TAG-NS, HTML-TAG-NEXT): Simplified.
Index: groff/NEWS
diff -u groff/NEWS:1.195 groff/NEWS:1.196
--- groff/NEWS:1.195	Sat Nov 20 09:27:57 2004
+++ groff/NEWS	Tue Nov 23 09:20:48 2004
@@ -52,52 +52,66 @@
 Macro packages
 --------------
 
-o The ms macros now support fractional point sizes: A value for the PS, VS,
-  FPS, and VPS register larger than or equal to 1000 is always divided by
-  1000.  For example, `.nr PS 10250' sets the document's font size to
-  10.25 points.
-
-o The `Ds' and `De' macros provided in ms since groff version 1.19 have been
-  removed; the equivalent `DS' and `DE' macros should be used instead.  X11
-  documents which actually use `Ds' and `De' always load a specific macro
-  file from the X11 distribution (macros.t) which provides proper
-  definitions for the two macros.
-
-o The following registers have been added to the ms macros for improving
-  layout control:
-
-  PORPHANS
-    Defines number of lines following LP, PP, QP, IP or XP which must be
-    kept together, before any automatic page break.
-
-  HORPHANS
-    Sets number of lines of following paragraph which must be kept with a
-    heading, defined by NH or SH, before any automatic page break.
-
-  GROWPS
-    Sets the first level of heading (set with NH) which will keep the same
-    point size as body text.
-
-  PSINCR
-    Sets the point size increment for each level of heading (set with NH),
-    below the threshold level set by GROWPS; e.g., if \n[PS] = 10,
-    \n[GROWPS] = 3 and \n[PSINCR] = 2.0p, then .NH 1 will produce 14pt
-    headings, .NH 2 will produce 12pt, and all other levels will remain
-    at 10pt (because \n[PS] = 10).
-
-o The SH macro in the ms package now accepts a numeric argument, to make
-  heading size match that of NH with same argument value when the
-  GROWPS/PSINCR feature is enabled.
+o ms.tmac
 
-o www.tmac:
+  . Support for fractional point sizes: A value for the `PS', `VS', `FPS',
+    and `VPS' register larger than or equal to 1000 is always divided by
+    1000.  For example, `.nr PS 10250' sets the document's font size to
+    10.25 points.
 
-  The HR macro no longer causes an empty line for non-HTML devices.
+  . The `Ds' and `De' macros provided in ms since groff version 1.19 have
+    been removed; the equivalent `DS' and `DE' macros should be used
+    instead.  X11 documents which actually use `Ds' and `De' always load a
+    specific macro file from the X11 distribution (`macros.t') which
+    provides proper definitions for the two macros.
+
+  . The following registers have been added for improving layout control:
+
+    PORPHANS
+      Defines number of lines following `LP', `PP', `QP', `IP' or `XP' which
+      must be kept together, before any automatic page break.
+
+    HORPHANS
+      Sets number of lines of following paragraph which must be kept with a
+      heading, defined by `NH' or `SH', before any automatic page break.
+
+    GROWPS
+      Sets the first level of heading (set with `NH') which will keep the
+      same point size as body text.
+
+    PSINCR
+      Sets the point size increment for each level of heading (set with
+      `NH'), below the threshold level set by `GROWPS'; e.g., if
+      \n[PS] = 10, \n[GROWPS] = 3 and \n[PSINCR] = 2.0p, then `.NH 1' will
+      produce 14pt headings, `.NH 2' will produce 12pt, and all other levels
+      will remain at 10pt (because \n[PS] = 10).
+
+  . The `SH' macro now accepts a numeric argument, to make heading size
+    match that of `NH' with same argument value when the `GROWPS'/`PSINCR'
+    feature is enabled.
+
+  Please refer to the documentation of the ms package for other, minor
+  improvements.
+
+o me.tmac
+
+  The section type set with the `++' request is available in the `_M'
+  register.  This isn't new but hasn't been documented before.
+
+o www.tmac
+
+  The `HR' macro no longer causes an empty line for non-HTML devices.
 
   A new macro `HEAD' has been added to directly add data to the
   <head>...</head> block.
 
-Please refer to the documentation of the ms package for other, minor
-improvements.
+Miscellaneous
+-------------
+
+o Two new keywords to the DESC file have been added which are needed for
+  grohtml: `image_generator' and `unscaled_charwidths'.  The former gives
+  the name of the program which creates PNG images, and the latter makes
+  troff always use unscaled character widths.
 
 
 VERSION 1.19.1
Index: groff/man/groff_diff.man
diff -u groff/man/groff_diff.man:1.51 groff/man/groff_diff.man:1.52
--- groff/man/groff_diff.man:1.51	Tue Jul 27 01:29:24 2004
+++ groff/man/groff_diff.man	Tue Nov 23 09:20:48 2004
@@ -3522,7 +3522,7 @@
 provides a
 .B compatibility mode
 that allows to process roff code written for classical
-.troff
+.B troff
 or for other implementations of roff in a consistent way.
 .
 .P
Index: groff/src/devices/grohtml/html-table.cpp
diff -u groff/src/devices/grohtml/html-table.cpp:1.2 groff/src/devices/grohtml/html-table.cpp:1.3
--- groff/src/devices/grohtml/html-table.cpp:1.2	Tue Oct 12 21:39:31 2004
+++ groff/src/devices/grohtml/html-table.cpp	Tue Nov 23 09:20:48 2004
@@ -332,8 +332,6 @@
 
   last_col = NULL;
   if (linelength > 0) {
-    int n = no_columns() + no_gaps();
-
     out->nl();
     out->nl();
 
@@ -345,9 +343,7 @@
     start_space = space;
     out->put_string("<table width=\"100%\"")
       .put_string(" border=0 rules=\"none\" frame=\"void\"\n")
-      .put_string("       cols=\"")
-      .put_number(n)
-      .put_string("\" cellspacing=\"0\" cellpadding=\"0\"")
+      .put_string("       cellspacing=\"0\" cellpadding=\"0\"")
       .put_string(start_space ? " style=\"margin-top: 8px; margin-bottom: 8px\"" : "")
       .put_string(">")
       .nl();



From MAILER-DAEMON Tue Nov 23 04:43:13 2004
Received: from mailman by lists.gnu.org with archive (Exim 4.33)
	id 1CWXCa-0004TO-Ow
	for mharc-groff-commit@gnu.org; Tue, 23 Nov 2004 04:43:12 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1CWXCY-0004Sv-4s
	for groff-commit@gnu.org; Tue, 23 Nov 2004 04:43:10 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1CWXCW-0004SR-Ti
	for groff-commit@gnu.org; Tue, 23 Nov 2004 04:43:09 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1CWXCW-0004SK-D8
	for groff-commit@gnu.org; Tue, 23 Nov 2004 04:43:08 -0500
Received: from [199.232.41.5] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.34) id 1CWX3C-0006mJ-C6
	for groff-commit@gnu.org; Tue, 23 Nov 2004 04:33:30 -0500
Received: from localhost ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 4.34) id 1CWX6k-0004lz-QZ
	for groff-commit@gnu.org; Tue, 23 Nov 2004 04:37:11 -0500
To: groff-commit@gnu.org
From: Werner LEMBERG <wl@gnu.org>
Message-Id: <E1CWXCW-0004SR-Ti@lists.gnu.org>
Date: Tue, 23 Nov 2004 04:43:09 -0500
Subject: [Groff-commit] groff ChangeLog
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, 23 Nov 2004 09:43:11 -0000

CVSROOT:	/cvsroot/groff
Module name:	groff
Branch: 	
Changes by:	Werner LEMBERG <wl@gnu.org>	04/11/23 09:37:10

Modified files:
	.              : ChangeLog 

Log message:
	

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/ChangeLog.diff?tr1=1.760&tr2=1.761&r1=text&r2=text

Patches:
Index: groff/ChangeLog
diff -u groff/ChangeLog:1.760 groff/ChangeLog:1.761
--- groff/ChangeLog:1.760	Tue Nov 23 09:20:48 2004
+++ groff/ChangeLog	Tue Nov 23 09:37:10 2004
@@ -4,6 +4,8 @@
 	(html_table::emit_table_header): Don't emit `cols' attribute which
 	doesn't exist in HTML 4.0 and is thus invalid.
 
+	* NEWS: More minor fixes and updates.
+
 2004-11-18  Werner LEMBERG  <wl@gnu.org>
 
 	* tmac/www.tmac (HTML-NS, HTML-TAG-NS, HTML-TAG-NEXT): Simplified.



From MAILER-DAEMON Tue Nov 23 17:28:19 2004
Received: from mailman by lists.gnu.org with archive (Exim 4.33)
	id 1CWj91-0007Dx-E7
	for mharc-groff-commit@gnu.org; Tue, 23 Nov 2004 17:28:19 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1CWj8z-0007Dk-IK
	for groff-commit@gnu.org; Tue, 23 Nov 2004 17:28:17 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1CWj8y-0007DU-VW
	for groff-commit@gnu.org; Tue, 23 Nov 2004 17:28:17 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1CWj8y-0007DK-Ru
	for groff-commit@gnu.org; Tue, 23 Nov 2004 17:28:16 -0500
Received: from [199.232.41.5] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.34) id 1CWizR-0003MG-TL
	for groff-commit@gnu.org; Tue, 23 Nov 2004 17:18:26 -0500
Received: from localhost ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 4.34) id 1CWj31-0007A6-5s
	for groff-commit@gnu.org; Tue, 23 Nov 2004 17:22:07 -0500
To: groff-commit@gnu.org
From: Werner LEMBERG <wl@gnu.org>
Message-Id: <E1CWj8y-0007DU-VW@lists.gnu.org>
Date: Tue, 23 Nov 2004 17:28:17 -0500
Subject: [Groff-commit] groff ./ChangeLog tmac/s.tmac
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, 23 Nov 2004 22:28:17 -0000

CVSROOT:	/cvsroot/groff
Module name:	groff
Branch: 	
Changes by:	Werner LEMBERG <wl@gnu.org>	04/11/23 22:22:07

Modified files:
	.              : ChangeLog 
	tmac           : s.tmac 

Log message:
	* tmac/s.tmac (ref*add-V, ref*add-N): New macros for handling
	the volume and number refer entries.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/ChangeLog.diff?tr1=1.761&tr2=1.762&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/tmac/s.tmac.diff?tr1=1.20&tr2=1.21&r1=text&r2=text

Patches:
Index: groff/ChangeLog
diff -u groff/ChangeLog:1.761 groff/ChangeLog:1.762
--- groff/ChangeLog:1.761	Tue Nov 23 09:37:10 2004
+++ groff/ChangeLog	Tue Nov 23 22:22:06 2004
@@ -1,3 +1,8 @@
+2004-11-23  Y T  <doarhop@hotmail.com>
+
+	* tmac/s.tmac (ref*add-V, ref*add-N): New macros for handling
+	the volume and number refer entries.
+
 2004-11-22  Werner LEMBERG  <wl@gnu.org>
 
 	* src/devices/grohtml/html-table.cpp
Index: groff/tmac/s.tmac
diff -u groff/tmac/s.tmac:1.20 groff/tmac/s.tmac:1.21
--- groff/tmac/s.tmac:1.20	Wed Oct 13 07:24:46 2004
+++ groff/tmac/s.tmac	Tue Nov 23 22:22:07 2004
@@ -1949,6 +1949,12 @@
 .ref*field A ,
 .if r [A .nr ref*suppress-period \\n([A
 ..
+.de ref*add-V
+.ref*field V "" \fB \fR
+..
+.de ref*add-N
+.ref*field N \z( "" ")"
+..
 .de ref*add-dflt
 .ref*field \\$1 ,
 ..



From MAILER-DAEMON Tue Nov 23 18:48:05 2004
Received: from mailman by lists.gnu.org with archive (Exim 4.33)
	id 1CWkOD-0001PV-1D
	for mharc-groff-commit@gnu.org; Tue, 23 Nov 2004 18:48:05 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1CWkOB-0001Oo-1o
	for groff-commit@gnu.org; Tue, 23 Nov 2004 18:48:03 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1CWkO8-0001Nu-SS
	for groff-commit@gnu.org; Tue, 23 Nov 2004 18:48:01 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1CWkO8-0001Ne-NJ
	for groff-commit@gnu.org; Tue, 23 Nov 2004 18:48:00 -0500
Received: from [199.232.41.5] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.34) id 1CWkEo-0004YE-TM
	for groff-commit@gnu.org; Tue, 23 Nov 2004 18:38:23 -0500
Received: from localhost ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 4.34) id 1CWkIN-0005TC-9c
	for groff-commit@gnu.org; Tue, 23 Nov 2004 18:42:03 -0500
To: groff-commit@gnu.org
From: Werner LEMBERG <wl@gnu.org>
Message-Id: <E1CWkO8-0001Nu-SS@lists.gnu.org>
Date: Tue, 23 Nov 2004 18:48:01 -0500
Subject: [Groff-commit] groff ./ChangeLog ./NEWS src/devices/grohtml/gr...
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, 23 Nov 2004 23:48:03 -0000

CVSROOT:	/cvsroot/groff
Module name:	groff
Branch: 	
Changes by:	Werner LEMBERG <wl@gnu.org>	04/11/23 23:42:02

Modified files:
	.              : ChangeLog NEWS 
	src/devices/grohtml: grohtml.man post-html.cpp 
	src/preproc/html: pre-html.cpp 

Log message:
	Add option -S grohtml to determine the file split level.
	
	* src/devices/grohtml/post-html.cpp (split_level): New global
	variable.
	(html_header::determine_header_level): Use split_level.
	(main): Handle `-S' command line option.
	Sort options.
	
	* src/preproc/html/pre-html.cpp (scanArguments): Updated.
	
	* src/devices/grohtml/grohtml.man: Document it.
	Sort options.
	
	* NEWS: Document it.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/ChangeLog.diff?tr1=1.762&tr2=1.763&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/NEWS.diff?tr1=1.196&tr2=1.197&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/src/devices/grohtml/grohtml.man.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/src/devices/grohtml/post-html.cpp.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/src/preproc/html/pre-html.cpp.diff?tr1=1.12&tr2=1.13&r1=text&r2=text

Patches:
Index: groff/ChangeLog
diff -u groff/ChangeLog:1.762 groff/ChangeLog:1.763
--- groff/ChangeLog:1.762	Tue Nov 23 22:22:06 2004
+++ groff/ChangeLog	Tue Nov 23 23:42:02 2004
@@ -1,3 +1,20 @@
+2004-11-23  Larry Kollar  <kollar@alltel.net>
+
+	Add option -S grohtml to determine the file split level.
+
+	* src/devices/grohtml/post-html.cpp (split_level): New global
+	variable.
+	(html_header::determine_header_level): Use split_level.
+	(main): Handle `-S' command line option.
+	Sort options.
+
+	* src/preproc/html/pre-html.cpp (scanArguments): Updated.
+
+	* src/devices/grohtml/grohtml.man: Document it.
+	Sort options.
+
+	* NEWS: Document it.
+
 2004-11-23  Y T  <doarhop@hotmail.com>
 
 	* tmac/s.tmac (ref*add-V, ref*add-N): New macros for handling
Index: groff/NEWS
diff -u groff/NEWS:1.196 groff/NEWS:1.197
--- groff/NEWS:1.196	Tue Nov 23 09:20:48 2004
+++ groff/NEWS	Tue Nov 23 23:42:02 2004
@@ -31,6 +31,9 @@
   be stable now.
 
 o New command line option `-s' to set the base point size.
+
+o New command line option `-S' to set the split level while generating
+  multiple files.
   
 Gxditview
 ---------
Index: groff/src/devices/grohtml/grohtml.man
diff -u groff/src/devices/grohtml/grohtml.man:1.20 groff/src/devices/grohtml/grohtml.man:1.21
--- groff/src/devices/grohtml/grohtml.man:1.20	Sat Nov 20 09:27:57 2004
+++ groff/src/devices/grohtml/grohtml.man	Tue Nov 23 23:42:02 2004
@@ -46,16 +46,17 @@
 .  el .RB "[\ " "\\$1" "\ ]"
 ..
 .
-.OP \-vbphlrn
+.OP \-bhlnprv
+.OP \-a \%aa-text-bits
 .OP \-D dir
 .OP \-F dir
+.OP \-g \%aa-graphic-bits
 .OP \-i \%resolution
 .OP \-I \%image-stem
-.OP \-o \%image-vertical-offset
 .OP \-j \%filename
-.OP \-a \%aa-text-bits
-.OP \-g \%aa-graphic-bits
+.OP \-o \%image-vertical-offset
 .OP \-s size
+.OP \-S level
 .RI "[\ " files\|.\|.\|. "\ ]"
 .br
 .ad \na
@@ -117,6 +118,26 @@
 .BR gs .
 .
 .TP
+.B \-b
+Initialize the background color to white.
+.
+.TP
+.BI \-D dir
+Inform
+.B grohtml
+to place all image files into directory
+.IR dir .
+.
+.TP
+.BI \-F dir
+Prepend directory
+.IB dir /dev name
+to the search path for font and device description files;
+.I name
+is the name of the device, usually
+.BR html .
+.
+.TP
 .BI \-g aa-graphic-bits
 Number of bits of antialiasing information to be used by
 .I graphics
@@ -135,10 +156,6 @@
 .BR gs .
 .
 .TP
-.B \-b
-Initialize the background color to white.
-.
-.TP
 .B \-h
 Generate section and number headings by using
 .BR <B> .\|.\|. </B>
@@ -149,24 +166,36 @@
 tags.
 .
 .TP
-.B \-l
-Turn off the production of automatic section links at the top of the
-document.
+.BI \-i resolution
+Select the resolution for all images.
+By default this is 100 pixels per inch.
+Example:
+.B \-i200
+indicates 200 pixels per inch.
 .
 .TP
-.B \-r
-Turn off the automatic header and footer line (html rule).
+.BI \-I stem
+Determine the image stem name.
+If omitted grohtml uses
+.BI \%grohtml- XXX
+.RI ( XXX
+is the process ID).
 .
 .TP
-.B \-s size
-Set the base point size of the source file.
-Thereafter when this point size is used in the source it will correspond
-to the html base size.
-Every increase of two points in the source will yield a
-.B <big>
-tag, and conversely when a decrease of two points is seen a
-.B <small>
-tag is emitted.
+.BI \-j filename
+Inform
+.B grohtml
+to split the html output into multiple files.
+The
+.I filename
+is the stem and specified section headings
+(default is level one) start a new file, named
+.IR filename-n.html .
+.
+.TP
+.B \-l
+Turn off the production of automatic section links at the top of the
+document.
 .
 .TP
 .B \-n
@@ -177,57 +206,35 @@
 This flag is automatically turned on if a heading contains an image.
 .
 .TP
+.BI \-o vertical-offset
+Specify the vertical offset of images in points.
+.
+.TP
 .B \-p
 Display page rendering progress to stderr.
 .B grohtml
 only displays a page number when an image is required.
 .
 .TP
-.BI \-F dir
-Prepend directory
-.IB dir /dev name
-to the search path for font and device description files;
-.I name
-is the name of the device, usually
-.BR html .
-.
-.TP
-.BI \-i resolution
-Select the resolution for all images.
-By default this is 100 pixels per inch.
-Example:
-.B \-i200
-indicates 200 pixels per inch.
-.
-.TP
-.BI \-I stem
-Determine the image stem name.
-If omitted grohtml uses
-.BI \%grohtml- XXX
-.RI ( XXX
-is the process ID).
-.
-.TP
-.BI \-o vertical-offset
-Specify the vertical offset of images in points.
+.B \-r
+Turn off the automatic header and footer line (html rule).
 .
 .TP
-.BI \-D dir
-Inform
-.B grohtml
-to place all image files into directory
-.IR dir .
+.B \-s size
+Set the base point size of the source file.
+Thereafter when this point size is used in the source it will correspond
+to the html base size.
+Every increase of two points in the source will yield a
+.B <big>
+tag, and conversely when a decrease of two points is seen a
+.B <small>
+tag is emitted.
 .
 .TP
-.BI \-j filename
-Inform
-.B grohtml
-to split the html output into multiple files.
-The
-.I filename
-is the stem and all level one section headings start a new
-file, named
-.IR filename-n.html .
+.BI \-S level
+When splitting html output,
+split at the heading level (or higher) defined by
+.IR level .
 .
 .TP
 .B \-v
Index: groff/src/devices/grohtml/post-html.cpp
diff -u groff/src/devices/grohtml/post-html.cpp:1.13 groff/src/devices/grohtml/post-html.cpp:1.14
--- groff/src/devices/grohtml/post-html.cpp:1.13	Sat Nov 20 09:27:57 2004
+++ groff/src/devices/grohtml/post-html.cpp	Tue Nov 23 23:42:02 2004
@@ -85,6 +85,7 @@
                                                      /* heading?                                 */
 static int base_point_size = 0;                      /* which troff font size maps onto html     */
                                                      /* size 3?                                  */
+static int split_level = 2;                          /* what heading level to split at?          */
 static string head_info;                             /* user supplied information to be placed   */
                                                      /* into <head> </head>                      */
 
@@ -2476,7 +2477,7 @@
     }
   }
   header.header_level = level+1;
-  if (header.header_level == 2) {
+  if (header.header_level >= 2 && header.header_level <= split_level) {
     header.no_of_level_one_headings++;
     insert_split_file();
   }
@@ -4813,29 +4814,39 @@
     { "version", no_argument, 0, 'v' },
     { NULL, 0, 0, 0 }
   };
-  while ((c = getopt_long(argc, argv, "a:g:o:i:I:j:D:F:s:vbdhlrnp", long_options, NULL))
+  while ((c = getopt_long(argc, argv, "a:bdD:F:g:hi:I:j:lno:prs:S:v",
+			  long_options, NULL))
 	 != EOF)
     switch(c) {
-    case 'v':
-      printf("GNU post-grohtml (groff) version %s\n", Version_string);
-      exit(0);
-      break;
     case 'a':
       /* text antialiasing bits - handled by pre-html */
       break;
-    case 'g':
-      /* graphic antialiasing bits - handled by pre-html */
-      break;
     case 'b':
       // set background color to white
       default_background = new color;
       default_background->set_gray(color::MAX_COLOR_VAL);
       break;
+    case 'd':
+      /* handled by pre-html */
+      break;
+    case 'D':
+      /* handled by pre-html */
+      break;
     case 'F':
       font::command_line_font_dir(optarg);
       break;
-    case 's':
-      base_point_size = atoi(optarg);
+    case 'g':
+      /* graphic antialiasing bits - handled by pre-html */
+      break;
+    case 'h':
+      /* do not use the Hn headings of html, but manufacture our own */
+      manufacture_headings = TRUE;
+      break;
+    case 'i':
+      /* handled by pre-html */
+      break;
+    case 'I':
+      /* handled by pre-html */
       break;
     case 'j':
       multiple_files = TRUE;
@@ -4844,15 +4855,8 @@
     case 'l':
       auto_links = FALSE;
       break;
-    case 'r':
-      auto_rule = FALSE;
-      break;
-    case 'd':
-      /* handled by pre-html */
-      break;
-    case 'h':
-      /* do not use the Hn headings of html, but manufacture our own */
-      manufacture_headings = TRUE;
+    case 'n':
+      simple_anchors = TRUE;
       break;
     case 'o':
       /* handled by pre-html */
@@ -4860,17 +4864,18 @@
     case 'p':
       /* handled by pre-html */
       break;
-    case 'i':
-      /* handled by pre-html */
+    case 'r':
+      auto_rule = FALSE;
       break;
-    case 'I':
-      /* handled by pre-html */
+    case 's':
+      base_point_size = atoi(optarg);
       break;
-    case 'D':
-      /* handled by pre-html */
+    case 'S':
+      split_level = atoi(optarg) + 1;
       break;
-    case 'n':
-      simple_anchors = TRUE;
+    case 'v':
+      printf("GNU post-grohtml (groff) version %s\n", Version_string);
+      exit(0);
       break;
     case CHAR_MAX + 1: // --help
       usage(stdout);
Index: groff/src/preproc/html/pre-html.cpp
diff -u groff/src/preproc/html/pre-html.cpp:1.12 groff/src/preproc/html/pre-html.cpp:1.13
--- groff/src/preproc/html/pre-html.cpp:1.12	Tue Oct 12 21:39:31 2004
+++ groff/src/preproc/html/pre-html.cpp	Tue Nov 23 23:42:02 2004
@@ -1545,13 +1545,10 @@
     { "version", no_argument, 0, 'v' },
     { NULL, 0, 0, 0 }
   };
-  while ((c = getopt_long(argc, argv,
-			  "+a:g:o:i:I:j:D:F:s:vbdhlrnp", long_options, NULL))
+  while ((c = getopt_long(argc, argv, "+a:bdD:F:g:hi:I:j:lno:prs:S:v",
+			  long_options, NULL))
 	 != EOF)
     switch(c) {
-    case 'v':
-      printf("GNU pre-grohtml (groff) version %s\n", Version_string);
-      exit(0);
     case 'a':
       textAlphaBits = min(max(MIN_ALPHA_BITS, atoi(optarg)),
 			  MAX_ALPHA_BITS);
@@ -1560,6 +1557,20 @@
 	exit(1);
       }
       break;
+    case 'b':
+      // handled by post-grohtml (set background color to white)
+      break;
+    case 'd':
+#if defined(DEBUGGING)
+      debug = TRUE;
+#endif
+      break;
+    case 'D':
+      image_dir = optarg;
+      break;
+    case 'F':
+      font_path.command_line_dir(optarg);
+      break;
     case 'g':
       graphicAlphaBits = min(max(MIN_ALPHA_BITS, atoi(optarg)),
 			     MAX_ALPHA_BITS);
@@ -1568,41 +1579,42 @@
 	exit(1);
       }
       break;
-    case 'b':
-      // handled by post-grohtml (set background color to white)
-      break;
-    case 'D':
-      image_dir = optarg;
-      break;
-    case 'I':
-      image_template = optarg;
+    case 'h':
+      // handled by post-grohtml
       break;
     case 'i':
       image_res = atoi(optarg);
       break;
-    case 'F':
-      font_path.command_line_dir(optarg);
-      break;
-    case 's':
-      // handled by post-grohtml (use font size n as the html base font size)
+    case 'I':
+      image_template = optarg;
       break;
     case 'j':
       // handled by post-grohtml (set job name for multiple file output)
       break;
+    case 'l':
+      // handled by post-grohtml (no automatic section links)
+      break;
+    case 'n':
+      // handled by post-grohtml (generate simple heading anchors)
+      break;
     case 'o':
       vertical_offset = atoi(optarg);
       break;
     case 'p':
       show_progress = TRUE;
       break;
-    case 'd':
-#if defined(DEBUGGING)
-      debug = TRUE;
-#endif
+    case 'r':
+      // handled by post-grohtml (no header and footer lines)
       break;
-    case 'h':
-      // handled by post-grohtml
+    case 's':
+      // handled by post-grohtml (use font size n as the html base font size)
+      break;
+    case 'S':
+      // handled by post-grohtml (set file split level)
       break;
+    case 'v':
+      printf("GNU pre-grohtml (groff) version %s\n", Version_string);
+      exit(0);
     case CHAR_MAX + 1: // --help
       usage(stdout);
       exit(0);



From MAILER-DAEMON Wed Nov 24 09:24:19 2004
Received: from mailman by lists.gnu.org with archive (Exim 4.33)
	id 1CWy4B-0003nU-Lg
	for mharc-groff-commit@gnu.org; Wed, 24 Nov 2004 09:24:19 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1CWy4A-0003nA-IC
	for groff-commit@gnu.org; Wed, 24 Nov 2004 09:24:18 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1CWy4A-0003my-2n
	for groff-commit@gnu.org; Wed, 24 Nov 2004 09:24:18 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1CWy4A-0003mv-0U
	for groff-commit@gnu.org; Wed, 24 Nov 2004 09:24:18 -0500
Received: from [199.232.41.5] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.34) id 1CWxuq-0000hj-9B
	for groff-commit@gnu.org; Wed, 24 Nov 2004 09:14:40 -0500
Received: from localhost ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 4.34) id 1CWxyP-0007o7-Sz
	for groff-commit@gnu.org; Wed, 24 Nov 2004 09:18:22 -0500
To: groff-commit@gnu.org
From: Werner LEMBERG <wl@gnu.org>
Message-Id: <E1CWy4A-0003my-2n@lists.gnu.org>
Date: Wed, 24 Nov 2004 09:24:18 -0500
Subject: [Groff-commit] groff ./ChangeLog doc/webpage.ms src/devices/gr...
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, 24 Nov 2004 14:24:18 -0000

CVSROOT:	/cvsroot/groff
Module name:	groff
Branch: 	
Changes by:	Werner LEMBERG <wl@gnu.org>	04/11/24 14:18:21

Modified files:
	.              : ChangeLog 
	doc            : webpage.ms 
	src/devices/grohtml: post-html.cpp 
	tmac           : www.tmac 

Log message:
	First fixes to get produce HTML.
	
	* src/devices/grohtml/post-html.cpp (generate_img_src): Add `alt'
	attribute.
	
	* tmac/www.tmac (IMG, PIMG, MPIMG): Add `alt' attribute.
	
	* doc/webpage.ms: Minor updates.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/ChangeLog.diff?tr1=1.763&tr2=1.764&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/doc/webpage.ms.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/src/devices/grohtml/post-html.cpp.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/tmac/www.tmac.diff?tr1=1.34&tr2=1.35&r1=text&r2=text

Patches:
Index: groff/ChangeLog
diff -u groff/ChangeLog:1.763 groff/ChangeLog:1.764
--- groff/ChangeLog:1.763	Tue Nov 23 23:42:02 2004
+++ groff/ChangeLog	Wed Nov 24 14:18:21 2004
@@ -1,3 +1,14 @@
+2004-11-24  Werner LEMBERG  <wl@gnu.org>
+
+	First fixes to get produce HTML.
+
+	* src/devices/grohtml/post-html.cpp (generate_img_src): Add `alt'
+	attribute.
+
+	* tmac/www.tmac (IMG, PIMG, MPIMG): Add `alt' attribute.
+
+	* doc/webpage.ms: Minor updates.
+
 2004-11-23  Larry Kollar  <kollar@alltel.net>
 
 	Add option -S grohtml to determine the file split level.
Index: groff/doc/webpage.ms
diff -u groff/doc/webpage.ms:1.16 groff/doc/webpage.ms:1.17
--- groff/doc/webpage.ms:1.16	Tue Nov 16 12:48:50 2004
+++ groff/doc/webpage.ms	Wed Nov 24 14:18:21 2004
@@ -10,8 +10,8 @@
 .if '\*[.T]'html' .nr LL 10i
 .if r ps4html .nr LL 10i
 .
-.HEAD "<link rel=""stylesheet"" type=""text/css"" href=""groff.css"" />"
-.\" .HEAD "<link rel=""icon"" type=""image/png"" href=""http://www.gnu.org/graphics/gnu-mini.png"" />"
+.HEAD "<link rel=""stylesheet"" type=""text/css"" href=""groff.css"" >"
+.\" .HEAD "<link rel=""icon"" type=""image/png"" href=""http://www.gnu.org/graphics/gnu-mini.png"" >"
 .
 .mso www.tmac
 .
@@ -44,15 +44,15 @@
 .  nop \v'-0.66i'\h'2.0i'\s[60]\*[GNU] Troff\s0
 .HTML-IMAGE-END
 .
-.HnS 1
 .HR
+.HnS 1
 GNU Troff (\c
 .URL http://\:groff.ffii.org/ Groff )
 \[em] a
 .URL http://\:www.gnu.org/ GNU
 project.
-.HR
 .HnE
+.HR
 .LK
 .
 .LP
@@ -312,7 +312,7 @@
 New key character `x' to make tbl call a user-defined macro on a table
 cell.
 Patch by
-.MTO hj.oertel@\:surfeu.de "Heinz-Jürgen Oertel" .
+.MTO hj.oertel@\:surfeu.de "Heinz-J\[:u]rgen Oertel" .
 .ULE
 .
 .
Index: groff/src/devices/grohtml/post-html.cpp
diff -u groff/src/devices/grohtml/post-html.cpp:1.14 groff/src/devices/grohtml/post-html.cpp:1.15
--- groff/src/devices/grohtml/post-html.cpp:1.14	Tue Nov 23 23:42:02 2004
+++ groff/src/devices/grohtml/post-html.cpp	Wed Nov 24 14:18:21 2004
@@ -2276,7 +2276,8 @@
     filename++;
   }
   if (exists(filename))
-    *s += string("<img src=\"") + filename + "\">";
+    *s += string("<img src=\"") + filename + "\" "
+	  + "alt=\"Image " + filename + "\">";
   return *s;
 }
 
Index: groff/tmac/www.tmac
diff -u groff/tmac/www.tmac:1.34 groff/tmac/www.tmac:1.35
--- groff/tmac/www.tmac:1.34	Sat Nov 20 09:27:57 2004
+++ groff/tmac/www.tmac	Wed Nov 24 14:18:21 2004
@@ -398,7 +398,8 @@
 .    nr www-height \\n[www-width]
 .    if !'\\$4'' \
 .      nr www-height \\$4
-.    HTML <img src="\\$1" width=\\n[www-width] height=\\n[www-height]>
+.    HTML <img src="\\$1" alt="Image \\$1" \
+           width=\\n[www-width] height=\\n[www-height]>
 .  \}
 .  el \
 .    nop \[la]\f[C]\\$1\f[]\[ra]
@@ -461,15 +462,16 @@
 .      nr www-height (\\$4 * 100 / 240)
 .    ie (\\n[www-width] == 0) \{\
 .      ie (\\n[www-height] == 0) \
-.        HTML <img src="\\$2">
+.        HTML <img src="\\$2" alt="Image \\$2">
 .      el \
-.        HTML <img src="\\$1" height=\\n[www-height]>
+.        HTML <img src="\\$1" alt="Image \\$2" height=\\n[www-height]>
 .    \}
 .    el \{\
 .      ie (\\n[www-height] == 0) \
-.        HTML <img src="\\$2" width=\\n[www-width]>
+.        HTML <img src="\\$2" alt="Image \\$2" width=\\n[www-width]>
 .      el \
-.        HTML <img src="\\$2" width=\\n[www-width] height=\\n[www-height]>
+.        HTML <img src="\\$2" alt="Image \\$2" width=\\n[www-width] \
+               height=\\n[www-height]>
 .    \}
 .  \}
 .  el \{\
@@ -582,10 +584,10 @@
 .
 .  ie \\n[www-html] \{\
 .    ie !\\n[www-image-just] \
-.      HTML <img src="\\$1" hspace=\\n[www-htmlimage-gap] \
+.      HTML <img src="\\$1" alt="Image \\$1" hspace=\\n[www-htmlimage-gap] \
              align=right width=\\n[www-width] height=\\n[www-height]>
 .    el \
-.      HTML <img src="\\$1" hspace=\\n[www-htmlimage-gap] \
+.      HTML <img src="\\$1" alt="Image \\$1" hspace=\\n[www-htmlimage-gap] \
              align=left width=\\n[www-width] height=\\n[www-height]>
 .  \}
 .  el \{\



From MAILER-DAEMON Wed Nov 24 10:48:31 2004
Received: from mailman by lists.gnu.org with archive (Exim 4.33)
	id 1CWzNe-0002W3-Tw
	for mharc-groff-commit@gnu.org; Wed, 24 Nov 2004 10:48:31 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1CWzNd-0002VI-2y
	for groff-commit@gnu.org; Wed, 24 Nov 2004 10:48:29 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1CWzNb-0002Ud-QP
	for groff-commit@gnu.org; Wed, 24 Nov 2004 10:48:28 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1CWzNb-0002UH-K5
	for groff-commit@gnu.org; Wed, 24 Nov 2004 10:48:27 -0500
Received: from [199.232.41.5] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.34) id 1CWzDx-00067u-1c
	for groff-commit@gnu.org; Wed, 24 Nov 2004 10:38:29 -0500
Received: from localhost ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 4.34) id 1CWzHW-0007az-AM
	for groff-commit@gnu.org; Wed, 24 Nov 2004 10:42:10 -0500
To: groff-commit@gnu.org
From: Werner LEMBERG <wl@gnu.org>
Message-Id: <E1CWzNb-0002Ud-QP@lists.gnu.org>
Date: Wed, 24 Nov 2004 10:48:28 -0500
Subject: [Groff-commit] groff ./ChangeLog tmac/www.tmac
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, 24 Nov 2004 15:48:29 -0000

CVSROOT:	/cvsroot/groff
Module name:	groff
Branch: 	
Changes by:	Werner LEMBERG <wl@gnu.org>	04/11/24 15:42:10

Modified files:
	.              : ChangeLog 
	tmac           : www.tmac 

Log message:
	(HR, LI): Use `HTML</p>', not `HTML'.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/ChangeLog.diff?tr1=1.764&tr2=1.765&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/tmac/www.tmac.diff?tr1=1.35&tr2=1.36&r1=text&r2=text

Patches:
Index: groff/ChangeLog
diff -u groff/ChangeLog:1.764 groff/ChangeLog:1.765
--- groff/ChangeLog:1.764	Wed Nov 24 14:18:21 2004
+++ groff/ChangeLog	Wed Nov 24 15:42:09 2004
@@ -6,6 +6,7 @@
 	attribute.
 
 	* tmac/www.tmac (IMG, PIMG, MPIMG): Add `alt' attribute.
+	(HR, LI): Use `HTML</p>', not `HTML'.
 
 	* doc/webpage.ms: Minor updates.
 
Index: groff/tmac/www.tmac
diff -u groff/tmac/www.tmac:1.35 groff/tmac/www.tmac:1.36
--- groff/tmac/www.tmac:1.35	Wed Nov 24 14:18:21 2004
+++ groff/tmac/www.tmac	Wed Nov 24 15:42:10 2004
@@ -680,7 +680,7 @@
 .\"   Produce a horizontal line.
 .\"
 .de HR
-.  HTML-NS "<hr>"
+.  HTML</p> "<hr>"
 ..
 .\" --------------------------------------------------------------------
 .\" NHR
@@ -778,7 +778,7 @@
 .\"
 .de LI
 .  ie \\n[www-html] \
-.    HTML "<li>"
+.    HTML</p> "<li>"
 .  el \{\
 .    www:paraspace
 .    in \\n[www-depth]u



From MAILER-DAEMON Thu Nov 25 03:15:17 2004
Received: from mailman by lists.gnu.org with archive (Exim 4.33)
	id 1CXEmb-0001Gm-0F
	for mharc-groff-commit@gnu.org; Thu, 25 Nov 2004 03:15:17 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1CXEmY-0001Fq-Py
	for groff-commit@gnu.org; Thu, 25 Nov 2004 03:15:15 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1CXEmV-0001Dj-Ao
	for groff-commit@gnu.org; Thu, 25 Nov 2004 03:15:14 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1CXEmV-0001Cu-6k
	for groff-commit@gnu.org; Thu, 25 Nov 2004 03:15:11 -0500
Received: from [199.232.41.5] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.34) id 1CXEcV-0000rp-M0
	for groff-commit@gnu.org; Thu, 25 Nov 2004 03:04:52 -0500
Received: from localhost ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 4.34) id 1CXEg6-0004NZ-20
	for groff-commit@gnu.org; Thu, 25 Nov 2004 03:08:34 -0500
To: groff-commit@gnu.org
From: Werner LEMBERG <wl@gnu.org>
Message-Id: <E1CXEmV-0001Dj-Ao@lists.gnu.org>
Date: Thu, 25 Nov 2004 03:15:13 -0500
Subject: [Groff-commit] groff ./ChangeLog ./configure ./configure.ac sr...
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, 25 Nov 2004 08:15:15 -0000

CVSROOT:	/cvsroot/groff
Module name:	groff
Branch: 	
Changes by:	Werner LEMBERG <wl@gnu.org>	04/11/25 08:08:33

Modified files:
	.              : ChangeLog configure configure.ac 
	src/devices/grohtml: grohtml.man 
	src/devices/xditview: Dvi.c Makefile.sub README 
	src/utils/lkbib: lkbib.man 
	src/utils/lookbib: lookbib.man 
	src/utils/pfbtops: pfbtops.man 
	src/utils/xtotroff: Makefile.sub xtotroff.c 
Added files:
	src/utils/xtotroff: Makefile.in xtotroff.man 

Log message:
	* src/utils/xtotroff/xtotroff.c: Reformat to be similar to other
	groff source files.
	Include config.h.
	Include limits.h.
	Remove X_NOT_STDC_ENV conditional.
	(Version_string, program_name): New global variables.
	(groff_flag): Removed.
	(MapFont): Updated.
	(usage): Take a stream as argument.
	Use `program_name'.
	Update all callers.
	(main): Add `long_options' array for `--help' and `--version'.
	Make `-g' a dummy option.
	Handle `-v' and unknown options.
	Remove unused `position' variable.
	
	* src/utils/xtotroff/Makefile.sub (MAN1): Define.
	(XLIBS): Add LIBGROFF.
	
	* src/utils/xtotroff/xtotroff.man, src/utils/xtotroff/Makefile.in:
	New files.
	
	* src/devices/xditview/Dvi.c (default_font_map): Split into three
	parts to avoid compiler warning.
	(resources): Don't initialize with `default_font_map'.
	(ClassInitialize): Initialize first element of `resources'.
	
	* src/devices/xditview/Makefile.sub (devdir, xtotroff, DPIS, fonts):
	Removed.
	
	* src/utils/lkbib/lkbib.man, src/utils/lookbib/lookbib.man,
	src/utils/pfbtops/pfbtops.man: Revised, updated.
	
	* configure.ac: Generate src/utils/xtotroff/Makefile.
	* configure: Regenerated.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/ChangeLog.diff?tr1=1.765&tr2=1.766&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/configure.diff?tr1=1.59&tr2=1.60&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/configure.ac.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/src/devices/grohtml/grohtml.man.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/src/devices/xditview/Dvi.c.diff?tr1=1.1.1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/src/devices/xditview/Makefile.sub.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/src/devices/xditview/README.diff?tr1=1.1.1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/src/utils/lkbib/lkbib.man.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/src/utils/lookbib/lookbib.man.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/src/utils/pfbtops/pfbtops.man.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/src/utils/xtotroff/Makefile.in?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/src/utils/xtotroff/xtotroff.man?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/src/utils/xtotroff/Makefile.sub.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/src/utils/xtotroff/xtotroff.c.diff?tr1=1.1.1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: groff/ChangeLog
diff -u groff/ChangeLog:1.765 groff/ChangeLog:1.766
--- groff/ChangeLog:1.765	Wed Nov 24 15:42:09 2004
+++ groff/ChangeLog	Thu Nov 25 08:08:33 2004
@@ -1,3 +1,41 @@
+2004-11-25  Werner LEMBERG  <wl@gnu.org>
+
+	* src/utils/xtotroff/xtotroff.c: Reformat to be similar to other
+	groff source files.
+	Include config.h.
+	Include limits.h.
+	Remove X_NOT_STDC_ENV conditional.
+	(Version_string, program_name): New global variables.
+	(groff_flag): Removed.
+	(MapFont): Updated.
+	(usage): Take a stream as argument.
+	Use `program_name'.
+	Update all callers.
+	(main): Add `long_options' array for `--help' and `--version'.
+	Make `-g' a dummy option.
+	Handle `-v' and unknown options.
+	Remove unused `position' variable.
+
+	* src/utils/xtotroff/Makefile.sub (MAN1): Define.
+	(XLIBS): Add LIBGROFF.
+
+	* src/utils/xtotroff/xtotroff.man, src/utils/xtotroff/Makefile.in:
+	New files.
+
+	* src/devices/xditview/Dvi.c (default_font_map): Split into three
+	parts to avoid compiler warning.
+	(resources): Don't initialize with `default_font_map'.
+	(ClassInitialize): Initialize first element of `resources'.
+
+	* src/devices/xditview/Makefile.sub (devdir, xtotroff, DPIS, fonts):
+	Removed.
+
+	* src/utils/lkbib/lkbib.man, src/utils/lookbib/lookbib.man,
+	src/utils/pfbtops/pfbtops.man: Revised, updated.
+
+	* configure.ac: Generate src/utils/xtotroff/Makefile.
+	* configure: Regenerated.
+
 2004-11-24  Werner LEMBERG  <wl@gnu.org>
 
 	First fixes to get produce HTML.
Index: groff/configure
diff -u groff/configure:1.59 groff/configure:1.60
--- groff/configure:1.59	Thu Oct  7 10:59:37 2004
+++ groff/configure	Thu Nov 25 08:08:33 2004
@@ -10092,7 +10092,7 @@
 
           ac_config_files="$ac_config_files stamp-h"
 
-                    ac_config_files="$ac_config_files Makefile doc/Makefile"
+                              ac_config_files="$ac_config_files Makefile doc/Makefile src/utils/xtotroff/Makefile"
 
           ac_config_files="$ac_config_files test-groff"
 
@@ -10607,6 +10607,7 @@
   "stamp-h" ) CONFIG_FILES="$CONFIG_FILES stamp-h" ;;
   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
   "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
+  "src/utils/xtotroff/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/utils/xtotroff/Makefile" ;;
   "test-groff" ) CONFIG_FILES="$CONFIG_FILES test-groff" ;;
   "src/include/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS src/include/config.h:src/include/config.hin" ;;
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
Index: groff/configure.ac
diff -u groff/configure.ac:1.28 groff/configure.ac:1.29
--- groff/configure.ac:1.28	Thu Oct  7 10:59:37 2004
+++ groff/configure.ac	Thu Nov 25 08:08:33 2004
@@ -95,7 +95,7 @@
 GROFF_GHOSTSCRIPT_PATH
 
 AC_CONFIG_FILES([stamp-h], [echo timestamp > stamp-h])
-AC_CONFIG_FILES([Makefile doc/Makefile])
+AC_CONFIG_FILES([Makefile doc/Makefile src/utils/xtotroff/Makefile])
 AC_CONFIG_FILES([test-groff], [chmod +x test-groff])
 AC_OUTPUT
 
Index: groff/src/devices/grohtml/grohtml.man
diff -u groff/src/devices/grohtml/grohtml.man:1.21 groff/src/devices/grohtml/grohtml.man:1.22
--- groff/src/devices/grohtml/grohtml.man:1.21	Tue Nov 23 23:42:02 2004
+++ groff/src/devices/grohtml/grohtml.man	Thu Nov 25 08:08:33 2004
@@ -248,7 +248,7 @@
 .BR B ,
 and
 .B BI
-mounted at font positions 1 to 4.
+mounted at font positions 1 to\~4.
 .
 .
 .SH DEPENDENCIES
Index: groff/src/devices/xditview/Dvi.c
diff -u groff/src/devices/xditview/Dvi.c:1.1.1.1 groff/src/devices/xditview/Dvi.c:1.2
--- groff/src/devices/xditview/Dvi.c:1.1.1.1	Tue Jun  1 10:39:54 2004
+++ groff/src/devices/xditview/Dvi.c	Thu Nov 25 08:08:33 2004
@@ -30,7 +30,7 @@
 
 /* Private Data */
 
-static char default_font_map[] = "\
+static char default_font_map_1[] = "\
 TR	-adobe-times-medium-r-normal--*-100-*-*-*-*-iso8859-1\n\
 TI	-adobe-times-medium-i-normal--*-100-*-*-*-*-iso8859-1\n\
 TB	-adobe-times-bold-r-normal--*-100-*-*-*-*-iso8859-1\n\
@@ -39,10 +39,14 @@
 CI	-adobe-courier-medium-o-normal--*-100-*-*-*-*-iso8859-1\n\
 CB	-adobe-courier-bold-r-normal--*-100-*-*-*-*-iso8859-1\n\
 CBI	-adobe-courier-bold-o-normal--*-100-*-*-*-*-iso8859-1\n\
+";
+static char default_font_map_2[] = "\
 HR	-adobe-helvetica-medium-r-normal--*-100-*-*-*-*-iso8859-1\n\
 HI	-adobe-helvetica-medium-o-normal--*-100-*-*-*-*-iso8859-1\n\
 HB	-adobe-helvetica-bold-r-normal--*-100-*-*-*-*-iso8859-1\n\
 HBI	-adobe-helvetica-bold-o-normal--*-100-*-*-*-*-iso8859-1\n\
+";
+static char default_font_map_3[] = "\
 NR	-adobe-new century schoolbook-medium-r-normal--*-100-*-*-*-*-iso8859-1\n\
 NI	-adobe-new century schoolbook-medium-i-normal--*-100-*-*-*-*-iso8859-1\n\
 NB	-adobe-new century schoolbook-bold-r-normal--*-100-*-*-*-*-iso8859-1\n\
@@ -59,7 +63,7 @@
 static XtResource resources[] = { 
 	{(String)XtNfontMap, (String)XtCFontMap, (String)XtRString,
 	 sizeof (char *), offset(dvi.font_map_string),
-	 (String)XtRString, (XtPointer)default_font_map},
+	 (String)XtRString, NULL /* set in code */},
 	{(String)XtNforeground, (String)XtCForeground, (String)XtRPixel,
 	 sizeof (unsigned long), offset(dvi.foreground),
 	 (String)XtRString, (XtPointer)"XtDefaultForeground"},
@@ -169,6 +173,16 @@
 
 static void ClassInitialize (void)
 {
+	int len1 = strlen(default_font_map_1);
+	int len2 = strlen(default_font_map_2);
+	int len3 = strlen(default_font_map_3);
+	char *dfm = XtMalloc(len1 + len2 + len3 + 1);
+	char *ptr = dfm;
+	strcpy(ptr, default_font_map_1); ptr += len1;
+	strcpy(ptr, default_font_map_2); ptr += len2;
+	strcpy(ptr, default_font_map_3);
+	resources[0].default_addr = dfm;
+
 	XtAddConverter( XtRString, XtRBackingStore, XmuCvtStringToBackingStore,
 			NULL, 0 );
 }
Index: groff/src/devices/xditview/Makefile.sub
diff -u groff/src/devices/xditview/Makefile.sub:1.3 groff/src/devices/xditview/Makefile.sub:1.4
--- groff/src/devices/xditview/Makefile.sub:1.3	Thu Jun  3 20:15:13 2004
+++ groff/src/devices/xditview/Makefile.sub	Thu Nov 25 08:08:33 2004
@@ -36,10 +36,6 @@
 	@-rm -f $@
 	$(SHELL) $(srcdir)/ad2c $(srcdir)/GXditview.ad >GXditview-ad.h
 
-devdir=$(top_builddir)/font
-xtotroff=$(top_builddir)/src/utils/xtotroff/xtotroff
-DPIS=75 100
-
 install_data: $(srcdir)/GXditview.ad
 	-test -d $(appresdir) || $(mkinstalldirs) $(appresdir)
 	if test -f $(appresdir)/GXditview; then \
@@ -49,31 +45,3 @@
 
 uninstall_sub:
 	-rm -f $(appresdir)/GXditview
-
-fonts: $(xtotroff) $(srcdir)/DESC.in $(srcdir)/FontMap
-	fonts=`sed -e 's/[	 ].*//' $(srcdir)/FontMap`; \
-	for dpi in $(DPIS); do \
-	  echo Making devX$$dpi; \
-	  test -d $(devdir)/devX$$dpi || \
-	    $(mkinstalldirs) $(devdir)/devX$$dpi; \
-	  rm -f $(devdir)/devX$$dpi/DESC; \
-	  sed -e "s/res 75/res $$dpi/" $(srcdir)/DESC.in \
-	    >$(devdir)/devX$$dpi/DESC; \
-	  (cd $(devdir)/devX$$dpi; \
-	  rm -f Makefile.sub; \
-	  echo DEV=X$$dpi >Makefile.sub; \
-	  echo DEVFILES=DESC $$fonts >>Makefile.sub; \
-	  $(xtotroff) -g -r $$dpi -s 10 $(srcdir)/FontMap); \
-	  echo Making devX$$dpi-12; \
-	  test -d $(devdir)/devX$$dpi-12 || \
-	    $(mkinstalldirs) $(devdir)/devX$$dpi-12; \
-	  rm -f $(devdir)/devX$$dpi-12/DESC; \
-	  sed -e "s/res 75/res $$dpi/" \
-	      -e 's/unitwidth 10/unitwidth 12/' $(srcdir)/DESC.in \
-	    >$(devdir)/devX$$dpi-12/DESC; \
-	  (cd $(devdir)/devX$$dpi-12; \
-	  rm -f Makefile.sub; \
-	  echo DEV=X$$dpi-12 >Makefile.sub; \
-	  echo DEVFILES=DESC $$fonts >>Makefile.sub; \
-	  $(xtotroff) -g -r $$dpi -s 12 $(srcdir)/FontMap); \
-	done
Index: groff/src/devices/xditview/README
diff -u groff/src/devices/xditview/README:1.1.1.1 groff/src/devices/xditview/README:1.2
--- groff/src/devices/xditview/README:1.1.1.1	Tue Jun  1 10:39:54 2004
+++ groff/src/devices/xditview/README	Thu Nov 25 08:08:33 2004
@@ -3,11 +3,11 @@
 with -TX75 and -TX100.  You will need X11R5 or newer to install it (it
 might work on X11R4, but I haven't tested it.)
 
-Previously, gxditview were installed in the usual place for X binaries
+Previously, gxditview was installed in the usual place for X binaries
 (e.g., /usr/bin/X11); you have to remove it manually.
 
 xditview is copyrighted by MIT under the usual X terms (see
-gxditview.man); the changes to that come along with the groff package
+gxditview.man); the changes to that which come along with the groff package
 are in the public domain.
 
 Please report bugs to bug-groff@gnu.org.
Index: groff/src/utils/lkbib/lkbib.man
diff -u groff/src/utils/lkbib/lkbib.man:1.3 groff/src/utils/lkbib/lkbib.man:1.4
--- groff/src/utils/lkbib/lkbib.man:1.3	Wed Jun 27 12:47:27 2001
+++ groff/src/utils/lkbib/lkbib.man	Thu Nov 25 08:08:33 2004
@@ -1,5 +1,5 @@
 .ig
-Copyright (C) 1989-2000, 2001 Free Software Foundation, Inc.
+Copyright (C) 1989-2000, 2001, 2004 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,17 +16,23 @@
 translations approved by the Free Software Foundation instead of in
 the original English.
 ..
-.ds g \" empty
-.ds G \" empty
+.
+.
 .\" Like TP, but if specified indent is more than half
 .\" the current line-length - indent, use the default indent.
 .de Tp
-.ie \\n(.$=0:((0\\$1)*2u>(\\n(.lu-\\n(.iu)) .TP
-.el .TP "\\$1"
+.  ie \\n(.$=0:((0\\$1)*2u>(\\n(.lu-\\n(.iu)) .TP
+.  el .TP "\\$1"
 ..
+.
+.
 .TH LKBIB @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@"
+.
+.
 .SH NAME
 lkbib \- search bibliographic databases
+.
+.
 .SH SYNOPSIS
 .B lkbib
 [
@@ -42,13 +48,16 @@
 .BI \-t n
 ]
 .IR key \|.\|.\|.
+.
 .PP
 It is possible to have whitespace between a command line option and its
 parameter.
+.
+.
 .SH DESCRIPTION
 .B lkbib
 searches bibliographic databases for references that contain the keys
-.IR key \|.\|.\|.
+.IR key \|.\|.\|.\&
 and prints any references found on the standard output.
 .B lkbib
 will search any databases given by
@@ -68,10 +77,13 @@
 .BR @g@indxbib (@MAN1EXT@)
 exists, then it will be searched instead;
 each index can cover multiple databases.
+.
+.
 .SH OPTIONS
 .TP
 .B \-v
 Print the version number.
+.
 .TP
 .BI \-p filename
 Search
@@ -79,11 +91,13 @@
 Multiple
 .B \-p
 options can be used.
+.
 .TP
 .BI \-i string
 When searching files for which no index exists,
 ignore the contents of fields whose names are in
 .IR string .
+.
 .TP
 .BI \-t n
 Only require the first
@@ -91,19 +105,27 @@
 characters of keys to be given.
 Initially
 .I n
-is 6.
+is\~6.
+.
+.
 .SH ENVIRONMENT
 .TP \w'\fBREFER'u+2n
 .SB REFER
 Default database.
+.
+.
 .SH FILES
 .Tp \w'\fB@DEFAULT_INDEX@'u+2n
 .B @DEFAULT_INDEX@
 Default database to be used if the
 .SB REFER
 environment variable is not set.
+.
+.TP
 .IB filename @INDEX_SUFFIX@
 Index files.
+.
+.
 .SH "SEE ALSO"
 .BR @g@refer (@MAN1EXT@),
 .BR @g@lookbib (@MAN1EXT@),
Index: groff/src/utils/lookbib/lookbib.man
diff -u groff/src/utils/lookbib/lookbib.man:1.3 groff/src/utils/lookbib/lookbib.man:1.4
--- groff/src/utils/lookbib/lookbib.man:1.3	Wed Jun 27 12:47:28 2001
+++ groff/src/utils/lookbib/lookbib.man	Thu Nov 25 08:08:33 2004
@@ -1,5 +1,5 @@
 .ig
-Copyright (C) 1989-2000, 2001 Free Software Foundation, Inc.
+Copyright (C) 1989-2000, 2001, 2004 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,15 @@
 translations approved by the Free Software Foundation instead of in
 the original English.
 ..
+.
+.
 .TH @G@LOOKBIB @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@"
+.
+.
 .SH NAME
 @g@lookbib \- search bibliographic databases
+.
+.
 .SH SYNOPSIS
 .B @g@lookbib
 [
@@ -31,14 +37,19 @@
 .BI \-t n
 ]
 .IR filename \|.\|.\|.
+.
 .PP
 It is possible to have whitespace between a command line option and its
 parameter.
+.
+.
 .SH DESCRIPTION
-@g@lookbib prints a prompt on the standard error (unless the standard input is not a terminal),
+.B @g@lookbib
+prints a prompt on the standard error (unless the standard input is not
+a terminal),
 reads from the standard input a line containing a set of keywords,
 searches the bibliographic databases
-.IR filename \|.\|.\|.
+.IR filename \|.\|.\|.\&
 for references containing those keywords,
 prints any references found on the standard output,
 and repeats this process until the end of input.
@@ -51,15 +62,19 @@
 .BR @g@indxbib (@MAN1EXT@)
 exists, then it will be searched instead;
 each index can cover multiple databases.
+.
+.
 .SH OPTIONS
 .TP
 .B \-v
 Print the version number.
+.
 .TP
 .BI \-i string
 When searching files for which no index exists,
 ignore the contents of fields whose names are in
 .IR string .
+.
 .TP
 .BI \-t n
 Only require the first
@@ -67,11 +82,15 @@
 characters of keys to be given.
 Initially
 .I n
-is 6.
+is\~6.
+.
+.
 .SH FILES
 .TP \w'\fIfilename\fB@INDEX_SUFFIX@'u+2n
 .IB filename @INDEX_SUFFIX@
 Index files.
+.
+.
 .SH "SEE ALSO"
 .BR @g@refer (@MAN1EXT@),
 .BR lkbib (@MAN1EXT@),
Index: groff/src/utils/pfbtops/pfbtops.man
diff -u groff/src/utils/pfbtops/pfbtops.man:1.3 groff/src/utils/pfbtops/pfbtops.man:1.4
--- groff/src/utils/pfbtops/pfbtops.man:1.3	Mon Mar 17 16:49:35 2003
+++ groff/src/utils/pfbtops/pfbtops.man	Thu Nov 25 08:08:33 2004
@@ -1,5 +1,5 @@
 .ig
-Copyright (C) 1989-1995, 2001, 2003 Free Software Foundation, Inc.
+Copyright (C) 1989-1995, 2001, 2003, 2004 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,14 +16,25 @@
 translations approved by the Free Software Foundation instead of in
 the original English.
 ..
+.
+.
 .TH PFBTOPS @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@"
+.
+.
 .SH NAME
 pfbtops \- translate a PostScript font in .pfb format to ASCII
+.
+.
 .SH SYNOPSIS
 .B pfbtops
 [
+.B \-v
+]
+[
 .I pfb_file
 ]
+.
+.
 .SH DESCRIPTION
 .B pfbtops
 translates a PostScript font in
@@ -37,10 +48,18 @@
 PostScript fonts for MS-DOS are normally supplied in
 .B .pfb
 format.
+.
 .LP
 The resulting ASCII format PostScript font can be used with groff.
 It must first be listed in
 .BR @FONTDIR@/devps/download .
+.
+.SH OPTIONS
+.TP
+.B \-v
+Print the version number.
+.
+.
 .SH "SEE ALSO"
 .BR grops (@MAN1EXT@)
 .
Index: groff/src/utils/xtotroff/Makefile.sub
diff -u groff/src/utils/xtotroff/Makefile.sub:1.2 groff/src/utils/xtotroff/Makefile.sub:1.3
--- groff/src/utils/xtotroff/Makefile.sub:1.2	Fri Jun  4 00:01:16 2004
+++ groff/src/utils/xtotroff/Makefile.sub	Thu Nov 25 08:08:33 2004
@@ -1,7 +1,7 @@
 PROG=xtotroff$(EXEEXT)
-# MAN1=xtotroff.n
+MAN1=xtotroff.n
 MLIB=$(LIBM)
-XLIBS=$(LIBXUTIL)
+XLIBS=$(LIBXUTIL) $(LIBGROFF)
 EXTRA_CFLAGS=$(X_CFLAGS)
 EXTRA_LDFLAGS=$(X_LIBS) $(X_PRE_LIBS) -lXaw -lXt -lX11 $(X_EXTRA_LIBS)
 OBJS=xtotroff.$(OBJEXT)
Index: groff/src/utils/xtotroff/xtotroff.c
diff -u groff/src/utils/xtotroff/xtotroff.c:1.1.1.1 groff/src/utils/xtotroff/xtotroff.c:1.2
--- groff/src/utils/xtotroff/xtotroff.c:1.1.1.1	Tue Jun  1 10:42:02 2004
+++ groff/src/utils/xtotroff/xtotroff.c	Thu Nov 25 08:08:33 2004
@@ -4,291 +4,292 @@
  * convert X font metrics into troff font metrics
  */
 
-#include	<X11/Xlib.h>
-#include	<stdio.h>
-#include	<ctype.h>
-#include	<unistd.h>
-#include	<stdlib.h>
-#include	<getopt.h>
-#include	<string.h>
-#include	<fcntl.h>
-#include	"XFontName.h"
-#include	"DviChar.h"
-
-#ifdef X_NOT_STDC_ENV
-char *malloc();
-#else 
-#include <stdlib.h>
+#ifdef HAVE_CONFIG_H
+#include <config.h>
 #endif
 
-#define charWidth(fi,c)	((fi)->per_char[(c) - (fi)->min_char_or_byte2].width)
-#define charHeight(fi,c)	((fi)->per_char[(c) - (fi)->min_char_or_byte2].ascent)
-#define charDepth(fi,c)	((fi)->per_char[(c) - (fi)->min_char_or_byte2].descent)
-#define charLBearing(fi,c)	((fi)->per_char[(c) - (fi)->min_char_or_byte2].lbearing)
-#define charRBearing(fi,c)	((fi)->per_char[(c) - (fi)->min_char_or_byte2].rbearing)
-
-Display		*dpy;
-int		groff_flag = 0;
-unsigned	resolution = 75;
-unsigned	point_size = 10;
+#include <X11/Xlib.h>
+#include <stdio.h>
+#include <ctype.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <getopt.h>
+#include <string.h>
+#include <fcntl.h>
+#include <limits.h>
+#include "XFontName.h"
+#include "DviChar.h"
+
+#define charWidth(fi,c) \
+	  ((fi)->per_char[(c) - (fi)->min_char_or_byte2].width)
+#define charHeight(fi,c) \
+	  ((fi)->per_char[(c) - (fi)->min_char_or_byte2].ascent)
+#define charDepth(fi,c) \
+	  ((fi)->per_char[(c) - (fi)->min_char_or_byte2].descent)
+#define charLBearing(fi,c) \
+	  ((fi)->per_char[(c) - (fi)->min_char_or_byte2].lbearing)
+#define charRBearing(fi,c) \
+	  ((fi)->per_char[(c) - (fi)->min_char_or_byte2].rbearing)
+
+extern const char *Version_string;
+static char *program_name;
+
+Display *dpy;
+unsigned resolution = 75;
+unsigned point_size = 10;
 
-int charExists (XFontStruct *fi, int c)
+int charExists(XFontStruct * fi, int c)
 {
-	XCharStruct *p;
+  XCharStruct *p;
 
-	/* `c' is always >= 0 */
-	if ((unsigned int)c < fi->min_char_or_byte2
-	    || (unsigned int)c > fi->max_char_or_byte2)
-		return 0;
-	p = fi->per_char + (c - fi->min_char_or_byte2);
-	return (p->lbearing != 0 || p->rbearing != 0 || p->width != 0
-		|| p->ascent != 0 || p->descent != 0 || p->attributes != 0);
+  /* `c' is always >= 0 */
+  if ((unsigned int) c < fi->min_char_or_byte2
+      || (unsigned int) c > fi->max_char_or_byte2)
+    return 0;
+  p = fi->per_char + (c - fi->min_char_or_byte2);
+  return p->lbearing != 0 || p->rbearing != 0 || p->width != 0
+	 || p->ascent != 0 || p->descent != 0 || p->attributes != 0;
 }
 
 /* Canonicalize the font name by replacing scalable parts by *s. */
 
-static int
-CanonicalizeFontName (char *font_name, char *canon_font_name)
+static int CanonicalizeFontName(char *font_name, char *canon_font_name)
 {
-	unsigned int	attributes;
-	XFontName	parsed;
-
-	if (!XParseFontName(font_name, &parsed, &attributes)) {
-		fprintf (stderr, "not a standard name: %s\n", font_name);
-		return 0;
-	}
+  unsigned int attributes;
+  XFontName parsed;
 
-	attributes &= ~(FontNamePixelSize|FontNameAverageWidth
-			|FontNamePointSize
-			|FontNameResolutionX|FontNameResolutionY);
-	XFormatFontName(&parsed, attributes, canon_font_name);
-	return 1;
+  if (!XParseFontName(font_name, &parsed, &attributes)) {
+    fprintf(stderr, "not a standard name: %s\n", font_name);
+    return 0;
+  }
+
+  attributes &= ~(FontNamePixelSize | FontNameAverageWidth
+		  | FontNamePointSize
+		  | FontNameResolutionX | FontNameResolutionY);
+  XFormatFontName(&parsed, attributes, canon_font_name);
+  return 1;
 }
 
 static int
 FontNamesAmbiguous(const char *font_name, char **names, int count)
 {
-	char name1[2048], name2[2048];
-	int i;
-
-	if (count == 1)
-		return 0;
+  char name1[2048], name2[2048];
+  int i;
 
-	for (i = 0; i < count; i++) {
-		if (!CanonicalizeFontName(names[i], i == 0 ? name1 : name2)) {
-			fprintf(stderr, "bad font name: %s\n", names[i]);
-			return 1;
-		}
-		if (i > 0 && strcmp(name1, name2) != 0) {
-			fprintf(stderr, "ambiguous font name: %s\n", font_name);
-			fprintf(stderr, "  matches %s\n", names[0]);
-			fprintf(stderr, "  and %s\n", names[i]);
-			return 1;
-		}
+  if (count == 1)
+    return 0;
 
-	}
-	return 0;
+  for (i = 0; i < count; i++) {
+    if (!CanonicalizeFontName(names[i], i == 0 ? name1 : name2)) {
+      fprintf(stderr, "bad font name: %s\n", names[i]);
+      return 1;
+    }
+    if (i > 0 && strcmp(name1, name2) != 0) {
+      fprintf(stderr, "ambiguous font name: %s\n", font_name);
+      fprintf(stderr, "  matches %s\n", names[0]);
+      fprintf(stderr, "  and %s\n", names[i]);
+      return 1;
+    }
+  }
+  return 0;
 }
 
-static int
-MapFont (char *font_name, const char *troff_name)
+static int MapFont(char *font_name, const char *troff_name)
 {
-	XFontStruct	*fi;
-	int		count;
-	char		**names;
-	FILE		*out;
-	unsigned int	c;
-	unsigned int	attributes;
-	XFontName	parsed;
-	int		j, k;
-	DviCharNameMap	*char_map;
-	char		encoding[256];
-	char		*s;
-	int		wid;
-	char		name_string[2048];
-
-	if (!XParseFontName(font_name, &parsed, &attributes)) {
-		fprintf (stderr, "not a standard name: %s\n", font_name);
-		return 0;
-	}
-
-	attributes &= ~(FontNamePixelSize|FontNameAverageWidth);
-	attributes |= FontNameResolutionX;
-	attributes |= FontNameResolutionY;
-	attributes |= FontNamePointSize;
-	parsed.ResolutionX = resolution;
-	parsed.ResolutionY = resolution;
-	parsed.PointSize = point_size*10;
-	XFormatFontName(&parsed, attributes, name_string);
-
-	names = XListFonts (dpy, name_string, 100000, &count);
-	if (count < 1) {
-		fprintf (stderr, "bad font name: %s\n", font_name);
-		return 0;
-	}
-
-	if (FontNamesAmbiguous(font_name, names, count))
-		return 0;
-
-	XParseFontName(names[0], &parsed, &attributes);
-	sprintf (encoding, "%s-%s", parsed.CharSetRegistry,
-				    parsed.CharSetEncoding);
-	for (s = encoding; *s; s++)
-		if (isupper (*s))
-			*s = tolower (*s);
-	char_map = DviFindMap (encoding);
-	if (!char_map) {
-		fprintf (stderr, "not a standard encoding: %s\n", encoding);
-		return 0;
-	}
-
-	fi = XLoadQueryFont (dpy, names[0]);
-	if (!fi) {
-		fprintf (stderr, "font does not exist: %s\n", names[0]);
-		return 0;
-	}
-		
-	printf ("%s -> %s\n", names[0], troff_name);
-
-	{ /* Avoid race while opening file */
-		int fd;
-		(void) unlink (troff_name);
-		fd = open (troff_name, O_WRONLY | O_CREAT | O_EXCL, 0600);
-		out = fdopen (fd, "w");
-	}
-
-	if (!out) {
-		perror (troff_name);
-		return 0;
-	}
-	fprintf (out, "name %s\n", troff_name);
-	if (!strcmp (char_map->encoding, "adobe-fontspecific"))
-		fprintf (out, "special\n");
-	if (charExists (fi, ' ')) {
-		int w = charWidth (fi, ' ');
-		if (w > 0)
-			fprintf (out, "spacewidth %d\n", w);
-	}
-	fprintf (out, "charset\n");
-	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) && (groff_flag || name)) {
-
-			wid = charWidth (fi, c);
-
-			fprintf (out, "%s\t%d",
-					name ? name : "---",
-	 				wid);
-			if (groff_flag) {
-				int	param[5];
-				param[0] = charHeight (fi, c);
-				param[1] = charDepth (fi, c);
-				param[2] = 0 /* charRBearing (fi, c) - wid */;
-				param[3] = 0 /* charLBearing (fi, c) */;
-				param[4] = 0; /* XXX */
-				for (j = 0; j < 5; j++)
-					if (param[j] < 0)
-						param[j] = 0;
-				for (j = 4; j >= 0; j--)
-					if (param[j] != 0)
-						break;
-				for (k = 0; k <= j; k++)
-					fprintf (out, ",%d", param[k]);
-			}
-			fprintf (out, "\t0\t0%o\n", c);
-			
-			if (name) {
-				for (k = 1; DviCharName(char_map,c,k); k++) {
-					fprintf (out, "%s\t\"\n",
-						 DviCharName (char_map,c,k));
-				}
-			}
-		}
-	}
-	XUnloadFont (dpy, fi->fid);
-	fclose (out);
-	return 1;
+  XFontStruct *fi;
+  int count;
+  char **names;
+  FILE *out;
+  unsigned int c;
+  unsigned int attributes;
+  XFontName parsed;
+  int j, k;
+  DviCharNameMap *char_map;
+  char encoding[256];
+  char *s;
+  int wid;
+  char name_string[2048];
+
+  if (!XParseFontName(font_name, &parsed, &attributes)) {
+    fprintf(stderr, "not a standard name: %s\n", font_name);
+    return 0;
+  }
+
+  attributes &= ~(FontNamePixelSize | FontNameAverageWidth);
+  attributes |= FontNameResolutionX;
+  attributes |= FontNameResolutionY;
+  attributes |= FontNamePointSize;
+  parsed.ResolutionX = resolution;
+  parsed.ResolutionY = resolution;
+  parsed.PointSize = point_size * 10;
+  XFormatFontName(&parsed, attributes, name_string);
+
+  names = XListFonts(dpy, name_string, 100000, &count);
+  if (count < 1) {
+    fprintf(stderr, "bad font name: %s\n", font_name);
+    return 0;
+  }
+
+  if (FontNamesAmbiguous(font_name, names, count))
+    return 0;
+
+  XParseFontName(names[0], &parsed, &attributes);
+  sprintf(encoding, "%s-%s", parsed.CharSetRegistry,
+	  parsed.CharSetEncoding);
+  for (s = encoding; *s; s++)
+    if (isupper(*s))
+      *s = tolower(*s);
+  char_map = DviFindMap(encoding);
+  if (!char_map) {
+    fprintf(stderr, "not a standard encoding: %s\n", encoding);
+    return 0;
+  }
+
+  fi = XLoadQueryFont(dpy, names[0]);
+  if (!fi) {
+    fprintf(stderr, "font does not exist: %s\n", names[0]);
+    return 0;
+  }
+
+  printf("%s -> %s\n", names[0], troff_name);
+
+  {				/* Avoid race while opening file */
+    int fd;
+    (void) unlink(troff_name);
+    fd = open(troff_name, O_WRONLY | O_CREAT | O_EXCL, 0600);
+    out = fdopen(fd, "w");
+  }
+
+  if (!out) {
+    perror(troff_name);
+    return 0;
+  }
+  fprintf(out, "name %s\n", troff_name);
+  if (!strcmp(char_map->encoding, "adobe-fontspecific"))
+    fprintf(out, "special\n");
+  if (charExists(fi, ' ')) {
+    int w = charWidth(fi, ' ');
+    if (w > 0)
+      fprintf(out, "spacewidth %d\n", w);
+  }
+  fprintf(out, "charset\n");
+  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)) {
+      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 */
+      param[3] = 0;		/* charLBearing (fi, c) */
+      param[4] = 0;		/* XXX */
+      for (j = 0; j < 5; j++)
+	if (param[j] < 0)
+	  param[j] = 0;
+      for (j = 4; j >= 0; j--)
+	if (param[j] != 0)
+	  break;
+      for (k = 0; k <= j; k++)
+	fprintf(out, ",%d", param[k]);
+      fprintf(out, "\t0\t0%o\n", c);
+
+      if (name) {
+	for (k = 1; DviCharName(char_map, c, k); k++) {
+	  fprintf(out, "%s\t\"\n", DviCharName(char_map, c, k));
+	}
+      }
+    }
+  }
+  XUnloadFont(dpy, fi->fid);
+  fclose(out);
+  return 1;
 }
 
-static void
-usage(const char *prog)
+static void usage(FILE *stream)
 {
-	fprintf (stderr,
-		 "usage: %s [-g] [-r resolution] [-s pointsize] FontMap\n",
-		 prog);
-	exit (1);
+  fprintf(stream,
+	  "usage: %s [-r resolution] [-s pointsize] FontMap\n",
+	  program_name);
 }
 
-int
-main (int argc, char **argv)
+int main(int argc, char **argv)
 {
-	char	troff_name[1024];
-	char	font_name[1024];
-	char	line[1024];
-	char	*a, *b, c;
-	int	position;
-	FILE	*map;
-	int	opt;
-
-	while ((opt = getopt(argc, argv, "gr:s:")) != EOF) {
-		switch (opt) {
-		case 'g':
-			groff_flag = 1;
-			break;
-		case 'r':
-			sscanf(optarg, "%u", &resolution);
-			break;
-		case 's':
-			sscanf(optarg, "%u", &point_size);
-			break;
-		default:
-			usage(argv[0]);
-		}
-	}
-	if (argc - optind != 1)
-		usage(argv[0]);
-
-	dpy = XOpenDisplay (0);
-	if (!dpy) {
-		fprintf (stderr, "Can't connect to the X server.\n");
-		fprintf (stderr, "Make sure the DISPLAY environment variable is set correctly.\n");
-		exit (1);
-	}
-        position = 1;
-
-	map = fopen (argv[optind], "r");
-	if (map == NULL) {
-		perror (argv[optind]);
-		exit (1);
-	}
-
-	while (fgets (line, sizeof (line), map)) {
-		for (a=line,b=troff_name; *a; a++,b++) {
-			c = (*b = *a);
-			if (c == ' ' || c == '\t')
-				break;
-		}
-		*b = '\0';
-		while (*a && (*a == ' ' || *a == '\t'))
-			++a;
-		for (b=font_name; *a; a++,b++)
-			if ((*b = *a) == '\n')
-				break;
-		*b = '\0';
-		if (!MapFont (font_name, troff_name))
-			exit (1);
-		++position;
-	}
-	exit (0);
+  char troff_name[1024];
+  char font_name[1024];
+  char line[1024];
+  char *a, *b, c;
+  FILE *map;
+  int opt;
+  static const struct option long_options[] = {
+    { "help", no_argument, 0, CHAR_MAX + 1 },
+    { "version", no_argument, 0, 'v' },
+    { NULL, 0, 0, 0 }
+  };
+
+  program_name = argv[0];
+
+  while ((opt = getopt_long(argc, argv, "gr:s:v", long_options,
+			    NULL)) != EOF) {
+    switch (opt) {
+    case 'g':
+      /* unused; just for compatibility */
+      break;
+    case 'r':
+      sscanf(optarg, "%u", &resolution);
+      break;
+    case 's':
+      sscanf(optarg, "%u", &point_size);
+      break;
+    case 'v':
+      printf("xtotroff (groff) version %s\n", Version_string);
+      exit(0);
+      break;
+    case CHAR_MAX + 1: /* --help */
+      usage(stdout);
+      exit(0);
+      break;
+    case '?':
+      usage(stderr);
+      exit(1);
+      break;
+    }
+  }
+  if (argc - optind != 1) {
+    usage(stderr);
+    exit(1);
+  }
+
+  dpy = XOpenDisplay(0);
+  if (!dpy) {
+    fprintf(stderr, "Can't connect to the X server.\n");
+    fprintf(stderr,
+	    "Make sure the DISPLAY environment variable is set correctly.\n");
+    exit(1);
+  }
+
+  map = fopen(argv[optind], "r");
+  if (map == NULL) {
+    perror(argv[optind]);
+    exit(1);
+  }
+
+  while (fgets(line, sizeof(line), map)) {
+    for (a = line, b = troff_name; *a; a++, b++) {
+      c = (*b = *a);
+      if (c == ' ' || c == '\t')
+	break;
+    }
+    *b = '\0';
+    while (*a && (*a == ' ' || *a == '\t'))
+      ++a;
+    for (b = font_name; *a; a++, b++)
+      if ((*b = *a) == '\n')
+	break;
+    *b = '\0';
+    if (!MapFont(font_name, troff_name))
+      exit(1);
+  }
+  exit(0);
 }
-
-/*
-Local Variables:
-c-indent-level: 8
-c-continued-statement-offset: 8
-c-brace-offset: -8
-c-argdecl-indent: 8
-c-label-offset: -8
-c-tab-always-indent: nil
-End:
-*/



From MAILER-DAEMON Mon Nov 29 02:41:04 2004
Received: from mailman by lists.gnu.org with archive (Exim 4.33)
	id 1CYg9g-0002oZ-Gq
	for mharc-groff-commit@gnu.org; Mon, 29 Nov 2004 02:41:04 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1CYg9d-0002mH-Dr
	for groff-commit@gnu.org; Mon, 29 Nov 2004 02:41:01 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1CYg9a-0002kM-Mi
	for groff-commit@gnu.org; Mon, 29 Nov 2004 02:40:58 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1CYg9a-0002kJ-Ii
	for groff-commit@gnu.org; Mon, 29 Nov 2004 02:40:58 -0500
Received: from [199.232.41.5] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.34) id 1CYg00-0005An-IZ
	for groff-commit@gnu.org; Mon, 29 Nov 2004 02:31:04 -0500
Received: from localhost ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 4.34) id 1CYfmZ-000238-4X
	for groff-commit@gnu.org; Mon, 29 Nov 2004 02:17:11 -0500
To: groff-commit@gnu.org
From: Werner LEMBERG <wl@gnu.org>
Message-Id: <E1CYg9a-0002kM-Mi@lists.gnu.org>
Date: Mon, 29 Nov 2004 02:40:58 -0500
Subject: [Groff-commit] groff/src/utils/xtotroff .cvsignore
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, 29 Nov 2004 07:41:02 -0000

CVSROOT:	/cvsroot/groff
Module name:	groff
Branch: 	
Changes by:	Werner LEMBERG <wl@gnu.org>	04/11/29 07:17:11

Added files:
	src/utils/xtotroff: .cvsignore 

Log message:
	

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/src/utils/xtotroff/.cvsignore?rev=1.1




