From MAILER-DAEMON Sat Dec 04 07:01:30 2004
Received: from mailman by lists.gnu.org with archive (Exim 4.33)
	id 1CaYbS-0006i0-Cp
	for mharc-groff-commit@gnu.org; Sat, 04 Dec 2004 07:01:30 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1CaYbO-0006gl-I0
	for groff-commit@gnu.org; Sat, 04 Dec 2004 07:01:26 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1CaYbN-0006gE-1D
	for groff-commit@gnu.org; Sat, 04 Dec 2004 07:01:25 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1CaYbM-0006fy-Rq
	for groff-commit@gnu.org; Sat, 04 Dec 2004 07:01:24 -0500
Received: from [199.232.41.4] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.34) id 1CaYRe-0004MN-Ss
	for groff-commit@gnu.org; Sat, 04 Dec 2004 06:51:23 -0500
Received: from localhost ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 4.34) id 1CaYVN-0004Qg-0v
	for groff-commit@gnu.org; Sat, 04 Dec 2004 06:55:13 -0500
To: groff-commit@gnu.org
From: Werner LEMBERG <wl@gnu.org>
Message-Id: <E1CaYbN-0006gE-1D@lists.gnu.org>
Date: Sat, 04 Dec 2004 07:01:25 -0500
Subject: [Groff-commit] groff ./ChangeLog src/preproc/eqn/eqn.man
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, 04 Dec 2004 12:01:27 -0000

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

Modified files:
	.              : ChangeLog 
	src/preproc/eqn: eqn.man 

Log message:
	* src/preproc/eqn/eqn.man: Revised.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/ChangeLog.diff?tr1=1.766&tr2=1.767&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/src/preproc/eqn/eqn.man.diff?tr1=1.8&tr2=1.9&r1=text&r2=text

Patches:
Index: groff/ChangeLog
diff -u groff/ChangeLog:1.766 groff/ChangeLog:1.767
--- groff/ChangeLog:1.766	Thu Nov 25 08:08:33 2004
+++ groff/ChangeLog	Sat Dec  4 11:55:11 2004
@@ -1,3 +1,7 @@
+2004-12-04  Werner LEMBERG  <wl@gnu.org>
+
+	* src/preproc/eqn/eqn.man: Revised.
+
 2004-11-25  Werner LEMBERG  <wl@gnu.org>
 
 	* src/utils/xtotroff/xtotroff.c: Reformat to be similar to other
Index: groff/src/preproc/eqn/eqn.man
diff -u groff/src/preproc/eqn/eqn.man:1.8 groff/src/preproc/eqn/eqn.man:1.9
--- groff/src/preproc/eqn/eqn.man:1.8	Fri Oct  5 14:12:21 2001
+++ groff/src/preproc/eqn/eqn.man	Sat Dec  4 11:55:12 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,20 +16,34 @@
 translations approved by the Free Software Foundation instead of in
 the original English.
 ..
-.ie \n(.V<\n(.v .ds tx T\h'-.1667m'\v'.224m'E\v'-.224m'\h'-.125m'X
-.el .ds tx TeX
+.
+.
+.ie \n(.V<\n(.v \
+.  ds tx T\h'-.1667m'\v'.224m'E\v'-.224m'\h'-.125m'X
+.el \
+.  ds tx TeX
+.
+.
 .\" 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"
 ..
+.
+.
 .\" The BSD man macros can't handle " in arguments to font change macros,
 .\" so use \(ts instead of ".
 .tr \(ts"
+.
+.
 .TH @G@EQN @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@"
+.
+.
 .SH NAME
 @g@eqn \- format equations for troff
+.
+.
 .SH SYNOPSIS
 .nr a \n(.j
 .ad l
@@ -38,8 +52,8 @@
 .ti \niu
 .B @g@eqn
 .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 \-rvCNR
 .OP \-d xy
@@ -52,9 +66,12 @@
 .RI "[\ " files\|.\|.\|. "\ ]"
 .br
 .ad \na
-.PP
+.
+.LP
 It is possible to have whitespace between a command line option and its
 parameter.
+.
+.
 .SH DESCRIPTION
 This manual page describes the GNU version of
 .BR eqn ,
@@ -69,13 +86,16 @@
 option of
 .BR groff .
 The syntax is quite compatible with Unix eqn.
-The output of GNU eqn cannot be processed with Unix troff;
+The output of GNU
+.B eqn
+cannot be processed with Unix troff;
 it must be processed with GNU troff.
 If no files are given on the command line, the standard input
 will be read.
 A filename of
 .B \-
 will cause the standard input to be read.
+.
 .LP
 .B eqn
 searches for the file
@@ -87,25 +107,33 @@
 .BR @LOCALMACRODIR@ ,
 and finally in the standard macro directory
 .BR @MACRODIR@ .
-If it exists, eqn will process it before the other input files.
+If it exists,
+.B eqn
+will process it before the other input files.
 The
 .B \-R
 option prevents this.
+.
 .LP
-GNU eqn does not provide the functionality of neqn:
+GNU
+.B eqn
+does not provide the functionality of neqn:
 it does not support low-resolution, typewriter-like devices
 (although it may work adequately for very simple input).
+.
+.
 .SH OPTIONS
 .TP
 .BI \-d xy
 Specify delimiters
 .I x
-and
+and\~\c
 .I y
 for the left and right end, respectively, of in-line equations.
 Any
 .B delim
 statements in the source file overrides this.
+.
 .TP
 .B \-C
 Recognize
@@ -119,32 +147,38 @@
 This option allows
 .B eqn
 to recover better from missing closing delimiters.
+.
 .TP
 .B \-v
 Print the version number.
+.
 .TP
 .B \-r
 Only one size reduction.
+.
 .TP
 .BI \-m n
-The minimum point-size is
+The minimum point-size is\~\c
 .IR n .
-eqn will not reduce the size of subscripts or superscripts to
-a smaller size than
+.B eqn
+will not reduce the size of subscripts or superscripts to
+a smaller size than\~\c
 .IR n .
+.
 .TP
 .BI \-T name
 The output is for device
 .IR name .
 The only effect of this is to define a macro
 .I name
-with a value of
+with a value of\~\c
 .BR 1 .
 Typically
 .B eqnrc
 will use this to provide definitions appropriate for the output device.
 The default output device is
 .BR @DEVICE@ .
+.
 .TP
 .BI \-M dir
 Search
@@ -152,82 +186,109 @@
 for
 .B eqnrc
 before the default directories.
+.
 .TP
 .B \-R
 Don't load
 .BR eqnrc .
+.
 .TP
 .BI \-f F
 This is equivalent to a
 .BI gfont\  F
 command.
+.
 .TP
 .BI \-s n
 This is equivalent to a
 .BI gsize\  n
 command.
 This option is deprecated.
-eqn will normally set equations at whatever the current point size
+.B eqn
+will normally set equations at whatever the current point size
 is when the equation is encountered.
+.
 .TP
 .BI \-p n
 This says that subscripts and superscripts should be
-.I n
+.I n\~\c
 points smaller than the surrounding text.
 This option is deprecated. 
-Normally eqn makes sets subscripts and superscripts at 70% 
+Normally
+.B eqn
+makes sets subscripts and superscripts at 70% 
 of the size of the surrounding text.
+.
+.
 .SH USAGE
-Only the differences between GNU eqn and Unix eqn are described here.
+Only the differences between GNU
+.B eqn
+and Unix eqn are described here.
+.
 .LP
-Most of the new features of GNU eqn
+Most of the new features of GNU
+.B eqn
 are based on \*(tx.
-There are some references to the differences between \*(tx and GNU eqn below;
+There are some references to the differences between \*(tx and GNU
+.B eqn
+below;
 these may safely be ignored if you do not know \*(tx.
+.
 .SS Automatic spacing
-.LP
 .B eqn
 gives each component of an equation a type, and adjusts the spacing
 between components using that type.
 Possible types are:
+.
+.RS
 .TP \w'punctuation'u+2n
 ordinary
-an ordinary character such as 1 or
-.IR x ;
+an ordinary character such as `1' or `\c
+.IR x ';
+.
 .TP
 operator
 a large operator such as
-.ds Su \s+5\(*S\s0
+.ds Su `\s+5\(*S\s0'
 .if \n(.g .if !c\(*S .ds Su the summation operator
 \*(Su;
+.
 .TP
 binary
-a binary operator such as +;
+a binary operator such as `\(pl';
+.
 .TP
 relation
-a relation such as =;
+a relation such as `=';
+.
 .TP
 opening
-a opening bracket such as (;
+a opening bracket such as `(';
+.
 .TP
 closing
-a closing bracket such as );
+a closing bracket such as `)';
+.
 .TP
 punctuation
-a punctuation character such as ,;
+a punctuation character such as `,';
+.
 .TP
 inner
 a subformula contained within brackets;
 .TP
 suppress
 spacing that suppresses automatic spacing adjustment.
+.RE
+.
 .LP
 Components of an equation get a type in one of two ways.
+.
 .TP
 .BI type\  t\ e
-This yields an equation component that contains
+This yields an equation component that contains\~\c
 .I e
-but that has type
+but that has type\~\c
 .IR t ,
 where
 .I t
@@ -235,14 +296,17 @@
 For example,
 .B times
 is defined as
+.
 .RS
 .IP
 .B
 type "binary" \e(mu
 .RE
+.
 .IP
 The name of the type doesn't have to be quoted, but quoting protects
 from macro expansion.
+.
 .TP
 .BI chartype\  t\ text
 Unquoted groups of characters are split up into individual characters,
@@ -250,20 +314,20 @@
 this changes the type that is stored for each character;
 it says that the characters in
 .I text
-from now on have type
+from now on have type\~\c
 .IR t .
 For example,
+.
 .RS
 .IP
 .B
 chartype "punctuation" .,;:
 .RE
+.
 .IP
-would make the characters
-.B .,;:
-have type punctuation
+would make the characters `.,;:' have type punctuation
 whenever they subsequently appeared in an equation.
-The type
+The type\~\c
 .I t
 can also be
 .B letter
@@ -272,7 +336,10 @@
 in these cases
 .B chartype
 changes the font type of the characters.
-See the Fonts subsection.
+See the
+.B Fonts
+subsection.
+.
 .SS New primitives
 .TP
 .IB e1\  smallover\  e2
@@ -297,22 +364,25 @@
 corresponds to
 .B \eover
 in non-display styles.
+.
 .TP
 .BI vcenter\  e
 This vertically centers
 .I e
 about the math axis.
 The math axis is the vertical position about which characters
-such as + and - are centered; also it is the vertical position
+such as `\(pl' and `\(mi' are centered; also it is the vertical position
 used for the bar of fractions.
 For example,
 .B sum
 is defined as
+.
 .RS
 .IP
 .B
 { type "operator" vcenter size +5 \e(*S }
 .RE
+.
 .TP
 .IB e1\  accent\  e2
 This sets
@@ -328,21 +398,24 @@
 For example,
 .B hat
 is defined as
+.
 .RS
 .IP
 .B
 accent { "^" }
 .RE
+.
 .IP
 .BR dotdot ,
 .BR dot ,
 .BR tilde ,
-.B vec
+.BR vec ,
 and
 .B dyad
 are also defined using the
 .B accent
 primitive.
+.
 .TP
 .IB e1\  uaccent\  e2
 This sets
@@ -359,13 +432,16 @@
 is pre-defined using
 .B uaccent
 as a tilde accent below the baseline.
+.
 .TP
 .BI split\ \(ts text \(ts
 This has the same effect as simply
+.
 .RS
 .IP
 .I text
 .RE
+.
 .IP
 but
 .I text
@@ -373,13 +449,16 @@
 .I text
 will be split up and the spacing between individual characters
 will be adjusted.
+.
 .TP
 .BI nosplit\  text
 This has the same effect as
+.
 .RS
 .IP
 .BI \(ts text \(ts
 .RE
+.
 .IP
 but because
 .I text
@@ -387,11 +466,12 @@
 .I text
 will not be split up
 and the spacing between individual characters will not be adjusted.
+.
 .TP
 .IB e\  opprime
 This is a variant of
 .B prime
-that acts as an operator on
+that acts as an operator on\~\c
 .IR e .
 It produces a different result from
 .B prime
@@ -399,14 +479,14 @@
 .BR A\ opprime\ sub\ 1 :
 with
 .B opprime
-the
+the\~\c
 .B 1
-will be tucked under the prime as a subscript to the
+will be tucked under the prime as a subscript to the\~\c
 .B A
 (as is conventional in mathematical typesetting),
 whereas with
 .B prime
-the
+the\~\c
 .B 1
 will be a subscript to the prime character.
 The precedence of
@@ -419,31 +499,32 @@
 .B accent
 and
 .BR uaccent .
-In unquoted text a
+In unquoted text a\~\c
 .B '
 that is not the first character will be treated like
 .BR opprime .
+.
 .TP
 .BI special\  text\ e
-This constructs a new object from
+This constructs a new object from\~\c
 .I e
 using a
-.BR @g@troff  (@MAN1EXT@)
+.BR @g@troff (@MAN1EXT@)
 macro named
 .IR text .
 When the macro is called,
 the string
 .B 0s
-will contain the output for
+will contain the output for\~\c
 .IR e ,
 and the number registers
 .BR 0w ,
 .BR 0h ,
 .BR 0d ,
-.BR 0skern
+.BR 0skern ,
 and
 .BR 0skew
-will contain the width, height, depth, subscript kern, and skew of
+will contain the width, height, depth, subscript kern, and skew of\~\c
 .IR e .
 (The
 .I "subscript kern"
@@ -459,82 +540,133 @@
 of the object.
 The number registers must also be modified so that they correspond to the
 result.
-.RS
-.LP
+.
+.IP
 For example, suppose you wanted a construct that `cancels' an expression
 by drawing a diagonal line through it.
+.
+.RS
 .IP
-.nf
 .ft B
 .if t .ne 6+\n(.Vu
+.br
 \&.EQ
+.br
 define cancel 'special Ca'
+.br
 \&.EN
+.br
 \&.de Ca
-\&.ds 0s \eZ'\e\e*(0s'\ev'\e\en(0du'\eD'l \e\en(0wu -\e\en(0hu-\e\en(0du'\ev'\e\en(0hu'
+.br
+\&.\ \ ds 0s \e
+.br
+\eZ'\e\e*(0s'\e
+.br
+\ev'\e\en(0du'\e
+.br
+\eD'l \e\en(0wu -\e\en(0hu-\e\en(0du'\e
+.br
+\ev'\e\en(0hu'
+.br
 \&..
 .ft
-.fi
-.LP
-Then you could cancel an expression
+.RE
+.
+.IP
+Then you could cancel an expression\~\c
 .I e
 with
-.BI cancel\ {\  e\  }
-.LP
+.BI \%cancel\ {\  e\  }
+.
+.IP
 Here's a more complicated construct that draws a box round an expression:
+.
+.RS
 .IP
-.nf
 .ft B
 .if t .ne 11+\n(.Vu
 \&.EQ
+.br
 define box 'special Bx'
+.br
 \&.EN
+.br
 \&.de Bx
-\&.ds 0s \eZ'\eh'1n'\e\e*(0s'\e
-\eZ'\ev'\e\en(0du+1n'\eD'l \e\en(0wu+2n 0'\eD'l 0 -\e\en(0hu-\e\en(0du-2n'\e
-\eD'l -\e\en(0wu-2n 0'\eD'l 0 \e\en(0hu+\e\en(0du+2n''\eh'\e\en(0wu+2n'
-\&.nr 0w +2n
-\&.nr 0d +1n
-\&.nr 0h +1n
+.br
+\&.\ \ ds 0s \e
+.br
+\eZ'\eh'1n'\e\e*(0s'\e
+.br
+\eZ'\e
+.br
+\ev'\e\en(0du+1n'\e
+.br
+\eD'l \e\en(0wu+2n 0'\e
+.br
+\eD'l 0 -\e\en(0hu-\e\en(0du-2n'\e
+.br
+\eD'l -\e\en(0wu-2n 0'\e
+.br
+\eD'l 0 \e\en(0hu+\e\en(0du+2n'\e
+.br
+\&'\e
+.br
+\eh'\e\en(0wu+2n'
+.br
+\&.\ \ nr 0w +2n
+.br
+\&.\ \ nr 0d +1n
+.br
+\&.\ \ nr 0h +1n
+.br
 \&..
 .ft
-.fi
 .RE
+.
 .SS Customization
-The appearance of equations is controlled by
-a large number of parameters. These can be set using
+The appearance of equations is controlled by a large number of parameters.
+These can be set using
 the
 .B set
 command.
+.
 .TP
 .BI set\  p\ n
-This sets parameter
+This sets parameter\~\c
 .I p
-to value
-.I n ;
-.I n
+to value\~\c
+.IR n ;
+.I n\~\c
 is an integer.
 For example,
+.
 .RS
 .IP
 .B
 set x_height 45
 .RE
+.
 .IP
 says that
 .B eqn
-should assume an x height of 0.45 ems.
+should assume an x\~height of 0.45\~ems.
+.
 .RS
 .LP
 Possible parameters are as follows.
 Values are in units of hundredths of an em unless otherwise stated.
 These descriptions are intended to be expository rather than
 definitive.
-.TP \w'\fBdefault_rule_thickness'u+2n
+.
+.ie t \
+.  TP \w'\fBdefault_rule_thickness'u+2n
+.el \
+.  TP
 .B minimum_size
 .B eqn
 will not set anything at a smaller point-size than this.
 The value is in points.
+.
 .TP
 .B fat_offset
 The
@@ -542,12 +674,14 @@
 primitive emboldens an equation
 by overprinting two copies of the equation
 horizontally offset by this amount.
+.
 .TP
 .B over_hang
 A fraction bar will be longer by twice this amount than
 the maximum of the widths of the numerator and denominator;
 in other words, it will overhang the numerator and
 denominator by at least this amount.
+.
 .TP
 .B accent_width
 When
@@ -563,6 +697,7 @@
 produces a line whose length is the width of the object to which it applies;
 in the case of a single character,
 this tends to produce a line that looks too long.
+.
 .TP
 .B delimiter_factor
 Extensible delimiters produced with the
@@ -572,6 +707,7 @@
 primitives will have a combined height and depth of at least this many
 thousandths of twice the maximum amount by which the sub-equation that
 the delimiters enclose extends away from the axis.
+.
 .TP
 .B delimiter_shortfall
 Extensible delimiters produced with the
@@ -583,34 +719,42 @@
 twice the maximum amount by which the sub-equation that
 the delimiters enclose extends away from the axis
 and this amount.
+.
 .TP
 .B null_delimiter_space
 This much horizontal space is inserted
 on each side of a fraction.
+.
 .TP
 .B script_space
 The width of subscripts and superscripts is increased by this amount.
+.
 .TP
 .B thin_space
 This amount of space is automatically inserted after punctuation
 characters.
+.
 .TP
 .B medium_space
 This amount of space is automatically inserted on either side
 of binary operators.
+.
 .TP
 .B thick_space
 This amount of space is automatically inserted on either side of
 relations.
+.
 .TP
 .B x_height
-The height of lowercase letters without ascenders such as x.
+The height of lowercase letters without ascenders such as `x'.
+.
 .TP
 .B axis_height
 The height above the baseline of the center of characters
-such as \(pl and \(mi.
+such as `\(pl' and `\(mi'.
 It is important that this value is correct for the font
 you are using.
+.
 .TP
 .B default_rule_thickness
 This should set to the thickness of the
@@ -618,29 +762,35 @@
 character, or the thickness of horizontal lines produced with the
 .B \eD
 escape sequence.
+.
 .TP
 .B num1
 The
 .B over
 command will shift up the numerator by at least this amount.
+.
 .TP
 .B num2
 The
 .B smallover
 command will shift up the numerator by at least this amount.
+.
 .TP
 .B denom1
 The
 .B over
 command will shift down the denominator by at least this amount.
+.
 .TP
 .B denom2
 The
 .B smallover
 command will shift down the denominator by at least this amount.
+.
 .TP
 .B sup1
 Normally superscripts will be shifted up by at least this amount.
+.
 .TP
 .B sup2
 Superscripts within superscripts or upper limits
@@ -649,47 +799,58 @@
 fractions
 will be shifted up by at least this amount.
 This is usually less than sup1.
+.
 .TP
 .B sup3
 Superscripts within denominators or square roots
 or subscripts or lower limits will be shifted up by at least
 this amount.
 This is usually less than sup2.
+.
 .TP
 .B sub1
 Subscripts will normally be shifted down by at least this amount.
+.
 .TP
 .B sub2
 When there is both a subscript and a superscript, the subscript
 will be shifted down by at least this amount.
+.
 .TP
 .B sup_drop
 The baseline of a superscript will be no more
 than this much amount below the top of the object on
 which the superscript is set.
+.
 .TP
 .B sub_drop
 The baseline of a subscript will be at least this much below
 the bottom of the object on which the subscript is set.
+.
 .TP
 .B big_op_spacing1
 The baseline of an upper limit will be at least this
 much above the top of the object on which the limit is set.
+.
 .TP
 .B big_op_spacing2
 The baseline of a lower limit will be at least this
 much below the bottom of the object on which the limit is set.
+.
 .TP
 .B big_op_spacing3
 The bottom of an upper limit will be at least this much above the
 top of the object on which the limit is set.
+.
 .TP
 .B big_op_spacing4
 The top of a lower limit will be at least this much below
 the bottom of the object on which the limit is set.
+.
 .TP
 .B big_op_spacing5
 This much vertical space will be added above and below limits.
+.
 .TP
 .B baseline_sep
 The baselines of the rows in a pile or matrix will normally be
@@ -698,18 +859,22 @@
 .B num1
 and
 .BR denom1 .
+.
 .TP
 .B shift_down
 The midpoint between the top baseline and the bottom baseline
 in a matrix or pile will be shifted down by this much from the axis.
 In most cases this should be equal to
 .BR axis_height .
+.
 .TP
 .B column_sep
 This much space will be added between columns in a matrix.
+.
 .TP
 .B matrix_side_sep
 This much space will be added at each side of a matrix.
+.
 .TP
 .B draw_lines
 If this is non-zero, lines will be drawn using the
@@ -719,20 +884,23 @@
 escape sequence and the
 .B \e(ru
 character.
+.
 .TP
 .B body_height
 The amount by which the height of the equation exceeds this
 will be added as extra space before the line containing the equation
 (using
-.BR \ex .)
+.BR \ex ).
 The default value is 85.
+.
 .TP
 .B body_depth
 The amount by which the depth of the equation exceeds this
 will be added as extra space after the line containing the equation
 (using
-.BR \ex .)
+.BR \ex ).
 The default value is 35.
+.
 .TP
 .B nroff
 If this is non-zero,
@@ -750,8 +918,8 @@
 and
 .B ndefine
 will be ignored.
-The default value is 0
-(This is typically changed to 1 by the
+The default value is\~0
+(This is typically changed to\~1 by the
 .B eqnrc
 file for the
 .BR ascii ,
@@ -760,23 +928,25 @@
 and
 .B cp1047
 devices.)
+.
 .LP
 A more precise description of the role of many of these
-parameters can be found in Appendix H of
-.IR The\ \*(txbook .
+parameters can be found in Appendix\~H of
+.IR "The \*(txbook" .
 .RE
+.
 .SS Macros
 Macros can take arguments.
 In a macro body,
 .BI $ n
 where
 .I n
-is between 1 and 9,
+is between 1 and\~9,
 will be replaced by the
 .IR n-th
 argument if the macro is called with arguments;
 if there are fewer than
-.I n
+.I n\~\c
 arguments, it will be replaced by nothing.
 A word containing a left parenthesis where the part of the word
 before the left parenthesis has been defined using the
@@ -787,6 +957,7 @@
 up to a matching right parenthesis will be treated as comma-separated
 arguments;
 commas inside nested parentheses do not terminate an argument.
+.
 .TP
 .BI sdefine\  name\ X\ anything\ X
 This is like the
@@ -794,6 +965,7 @@
 command, but
 .I name
 will not be recognized if called with arguments.
+.
 .TP
 .BI include\ \(ts file \(ts
 Include the contents of
@@ -805,6 +977,7 @@
 or
 .B .EN
 will be ignored.
+.
 .TP
 .BI ifdef\  name\ X\ anything\ X
 If
@@ -821,6 +994,7 @@
 .I X
 can be any character not appearing in
 .IR anything .
+.
 .SS Fonts
 .B eqn
 normally uses at least two fonts to set an equation:
@@ -830,16 +1004,18 @@
 .B gfont
 command
 changes the font that is used as the italic font.
-By default this is
+By default this is\~\c
 .BR I .
 The font that is used as the roman font can be changed
 using the new
 .B grfont
 command.
+.
 .TP
 .BI grfont\  f
-Set the roman font to
+Set the roman font to\~\c
 .IR f .
+.
 .LP
 The
 .B italic
@@ -867,6 +1043,7 @@
 and
 .B gbfont
 commands.
+.
 .LP
 You can control which characters are treated as letters
 (and therefore set in italics) by using the
@@ -878,13 +1055,19 @@
 A type of
 .B digit
 will cause a character to be set in roman type.
+.
+.
 .SH FILES
 .Tp \w'\fB@MACRODIR@/eqnrc'u+2n
 .B @MACRODIR@/eqnrc
 Initialization file.
+.
+.
 .SH BUGS
 Inline equations will be set at the point size that is current at the
 beginning of the input line.
+.
+.
 .SH "SEE ALSO"
 .BR groff (@MAN1EXT@),
 .BR @g@troff (@MAN1EXT@),



From MAILER-DAEMON Sun Dec 05 20:19:06 2004
Received: from mailman by lists.gnu.org with archive (Exim 4.33)
	id 1Cb7Ws-0001mT-5M
	for mharc-groff-commit@gnu.org; Sun, 05 Dec 2004 20:19:06 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1Cb7Wo-0001kT-Bx
	for groff-commit@gnu.org; Sun, 05 Dec 2004 20:19:02 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1Cb7Wi-0001iD-5a
	for groff-commit@gnu.org; Sun, 05 Dec 2004 20:18:59 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1Cb7Wh-0001fd-GX
	for groff-commit@gnu.org; Sun, 05 Dec 2004 20:18:55 -0500
Received: from [199.232.41.5] (helo=mx20.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.34) id 1Cb7Mc-0000pY-FJ
	for groff-commit@gnu.org; Sun, 05 Dec 2004 20:08:30 -0500
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by mx20.gnu.org with esmtp (Exim 4.34) id 1Cb7IY-00081g-Vv
	for groff-commit@gnu.org; Sun, 05 Dec 2004 20:04:19 -0500
Received: from localhost ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 4.34) id 1Cb7MI-0000UZ-U5
	for groff-commit@gnu.org; Sun, 05 Dec 2004 20:08:11 -0500
To: groff-commit@gnu.org
From: Werner LEMBERG <wl@gnu.org>
Message-Id: <E1Cb7Wi-0001iD-5a@lists.gnu.org>
Date: Sun, 05 Dec 2004 20:18:59 -0500
Subject: [Groff-commit] groff ./ChangeLog man/groff_char.man
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, 06 Dec 2004 01:19:03 -0000

CVSROOT:	/cvsroot/groff
Module name:	groff
Branch: 	
Changes by:	Werner LEMBERG <wl@gnu.org>	04/12/06 01:08:10

Modified files:
	.              : ChangeLog 
	man            : groff_char.man 

Log message:
	* man/groff_char.man: Minor imrovements.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/ChangeLog.diff?tr1=1.767&tr2=1.768&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/man/groff_char.man.diff?tr1=1.21&tr2=1.22&r1=text&r2=text

Patches:
Index: groff/ChangeLog
diff -u groff/ChangeLog:1.767 groff/ChangeLog:1.768
--- groff/ChangeLog:1.767	Sat Dec  4 11:55:11 2004
+++ groff/ChangeLog	Mon Dec  6 01:08:10 2004
@@ -1,3 +1,7 @@
+2004-12-05  Alejandro López-Valencia  <dradul@etb.net.co>
+
+	* man/groff_char.man: Minor imrovements.
+
 2004-12-04  Werner LEMBERG  <wl@gnu.org>
 
 	* src/preproc/eqn/eqn.man: Revised.
Index: groff/man/groff_char.man
diff -u groff/man/groff_char.man:1.21 groff/man/groff_char.man:1.22
--- groff/man/groff_char.man:1.21	Sun Dec 28 07:14:49 2003
+++ groff/man/groff_char.man	Mon Dec  6 01:08:10 2004
@@ -8,7 +8,7 @@
 .
 .
 .\" --------------------------------------------------------------------
-.\" Legalize
+.\" Legal terms
 .\" --------------------------------------------------------------------
 .
 .ig
@@ -17,9 +17,9 @@
 This file is part of groff (GNU roff).
 
 File position: <groff_src_top>/man/groff_char.man
-Last update: 27 Dec 2003
+Last update: 05 Dec 2004
 
-Copyright (C) 1989-2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+Copyright (C) 1989-2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 written by Werner Lemberg <wl@gnu.org>
 with additions by Bernd Warken <bwarken@mayn.de>
 
@@ -1130,7 +1130,7 @@
 .2e OK a19 u2713 "check mark, tick"
 .
 .Pa
-.I Legalize
+.I Legal Symbols
 .P
 .2s co copyright u00A9 "+"
 .C2 rg registered u00AE "+"
@@ -1357,7 +1357,8 @@
 .SH "AUTHOR"
 .\" --------------------------------------------------------------------
 .
-Copyright \(co 1989-2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+Copyright \(co 1989-2000, 2001, 2002, 2003,
+2004 Free Software Foundation, Inc.
 .
 .P
 This document is distributed under the terms of the FDL (GNU Free



From MAILER-DAEMON Tue Dec 07 16:34:28 2004
Received: from mailman by lists.gnu.org with archive (Exim 4.33)
	id 1CbmyZ-0005o1-T8
	for mharc-groff-commit@gnu.org; Tue, 07 Dec 2004 16:34:27 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1CbmyX-0005nd-Ux
	for groff-commit@gnu.org; Tue, 07 Dec 2004 16:34:26 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1CbmyW-0005nG-Ua
	for groff-commit@gnu.org; Tue, 07 Dec 2004 16:34:25 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1CbmyW-0005n5-QZ
	for groff-commit@gnu.org; Tue, 07 Dec 2004 16:34:24 -0500
Received: from [199.232.41.4] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.34) id 1CbmoN-0007xu-AY
	for groff-commit@gnu.org; Tue, 07 Dec 2004 16:23:55 -0500
Received: from localhost ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 4.34) id 1CbmoN-0005fv-OW
	for groff-commit@gnu.org; Tue, 07 Dec 2004 16:23:56 -0500
To: groff-commit@gnu.org
From: Werner LEMBERG <wl@gnu.org>
Message-Id: <E1CbmyW-0005nG-Ua@lists.gnu.org>
Date: Tue, 07 Dec 2004 16:34:25 -0500
Subject: [Groff-commit] groff ./ChangeLog src/devices/grohtml/post-html...
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: groff-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/groff-commit>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 07 Dec 2004 21:34:26 -0000

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

Modified files:
	.              : ChangeLog 
	src/devices/grohtml: post-html.cpp 
	tmac           : s.tmac 

Log message:
	Fix a bug with title handling in HTML.
	
	* src/devices/grohtml/post-html.cpp (text_glob::is_nf,
	text_glob::is_fi, text_glob::is_ce): Use strlen to compute string
	length.
	(html_printer::handle_tag_within_title): New function.
	(html_printer::do_title): Use it.
	
	* tmac/s.tmac (TL): Don't set `need_eo_tl'.
	(cov*tl-au-print): Emit `.eo.tl' tag.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/ChangeLog.diff?tr1=1.768&tr2=1.769&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/src/devices/grohtml/post-html.cpp.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/tmac/s.tmac.diff?tr1=1.21&tr2=1.22&r1=text&r2=text

Patches:
Index: groff/ChangeLog
diff -u groff/ChangeLog:1.768 groff/ChangeLog:1.769
--- groff/ChangeLog:1.768	Mon Dec  6 01:08:10 2004
+++ groff/ChangeLog	Tue Dec  7 21:23:55 2004
@@ -1,3 +1,16 @@
+2004-12-07  Gaius Mulley  <gaius@glam.ac.uk>
+
+	Fix a bug with title handling in HTML.
+
+	* src/devices/grohtml/post-html.cpp (text_glob::is_nf,
+	text_glob::is_fi, text_glob::is_ce): Use strlen to compute string
+	length.
+	(html_printer::handle_tag_within_title): New function.
+	(html_printer::do_title): Use it.
+
+	* tmac/s.tmac (TL): Don't set `need_eo_tl'.
+	(cov*tl-au-print): Emit `.eo.tl' tag.
+
 2004-12-05  Alejandro López-Valencia  <dradul@etb.net.co>
 
 	* man/groff_char.man: Minor imrovements.
Index: groff/src/devices/grohtml/post-html.cpp
diff -u groff/src/devices/grohtml/post-html.cpp:1.15 groff/src/devices/grohtml/post-html.cpp:1.16
--- groff/src/devices/grohtml/post-html.cpp:1.15	Wed Nov 24 14:18:21 2004
+++ groff/src/devices/grohtml/post-html.cpp	Tue Dec  7 21:23:55 2004
@@ -694,7 +694,8 @@
 
 int text_glob::is_nf (void)
 {
-  return is_tag && (strncmp(text_string, "html-tag:.fi", 12) == 0) &&
+  return is_tag && (strncmp(text_string, "html-tag:.fi",
+			    strlen("html-tag:.fi")) == 0) &&
          (get_arg() == 0);
 }
 
@@ -704,7 +705,8 @@
 
 int text_glob::is_fi (void)
 {
-  return( is_tag && (strncmp(text_string, "html-tag:.fi", 12) == 0) &&
+  return( is_tag && (strncmp(text_string, "html-tag:.fi",
+			     strlen("html-tag:.fi")) == 0) &&
 	  (get_arg() == 1) );
 }
 
@@ -723,7 +725,8 @@
 
 int text_glob::is_ce (void)
 {
-  return is_tag && (strcmp(text_string, "html-tag:.ce") == 0);
+  return is_tag && (strncmp(text_string, "html-tag:.ce",
+			    strlen("html-tag:.ce")) == 0);
 }
 
 /*
@@ -732,7 +735,8 @@
 
 int text_glob::is_in (void)
 {
-  return is_tag && (strncmp(text_string, "html-tag:.in ", strlen("html-tag:.in ")) == 0);
+  return is_tag && (strncmp(text_string, "html-tag:.in ",
+			    strlen("html-tag:.in ")) == 0);
 }
 
 /*
@@ -741,7 +745,8 @@
 
 int text_glob::is_po (void)
 {
-  return is_tag && (strncmp(text_string, "html-tag:.po ", strlen("html-tag:.po ")) == 0);
+  return is_tag && (strncmp(text_string, "html-tag:.po ",
+			    strlen("html-tag:.po ")) == 0);
 }
 
 /*
@@ -750,7 +755,8 @@
 
 int text_glob::is_ti (void)
 {
-  return is_tag && (strncmp(text_string, "html-tag:.ti ", strlen("html-tag:.ti ")) == 0);
+  return is_tag && (strncmp(text_string, "html-tag:.ti ",
+			    strlen("html-tag:.ti ")) == 0);
 }
 
 /*
@@ -2076,6 +2082,8 @@
   void handle_state_assertion         (text_glob *g);
   void do_end_para                    (text_glob *g);
   int  round_width                    (int x);
+  void handle_tag_within_title        (text_glob *g);
+  
   // ADD HERE
 
 public:
@@ -2208,6 +2216,20 @@
 }
 
 /*
+ *  handle_tag_within_title - handle a limited number of tags within
+ *                            the context of a table. Those tags which
+ *                            set values rather than generate spaces
+ *                            and paragraphs.
+ */
+
+void html_printer::handle_tag_within_title (text_glob *g)
+{
+  if (g->is_in() || g->is_ti() || g->is_po() || g->is_ce() || g->is_ll()
+      || g->is_fi() || g->is_nf())
+    troff_tag(g);
+}
+
+/*
  *  do_center - handle the .ce commands from troff.
  */
 
@@ -2353,6 +2375,7 @@
 	  title.has_been_found = TRUE;
 	  return;
 	} else if (t->is_a_tag()) {
+	  handle_tag_within_title(t);
 	  page_contents->glyphs.sub_move_right(); 	  /* move onto next word */
 	  removed_from_head = ((!page_contents->glyphs.is_empty()) &&
 			       (page_contents->glyphs.is_equal_to_head()));
@@ -2369,7 +2392,8 @@
 	  removed_from_head = ((!page_contents->glyphs.is_empty()) &&
 			       (page_contents->glyphs.is_equal_to_head()));
 	}
-      } while ((! page_contents->glyphs.is_equal_to_head()) || (removed_from_head));
+      } while ((! page_contents->glyphs.is_equal_to_head()) ||
+	       (removed_from_head));
     }
   }
 }
Index: groff/tmac/s.tmac
diff -u groff/tmac/s.tmac:1.21 groff/tmac/s.tmac:1.22
--- groff/tmac/s.tmac:1.21	Tue Nov 23 22:22:07 2004
+++ groff/tmac/s.tmac	Tue Dec  7 21:23:55 2004
@@ -179,7 +179,6 @@
 .ll (u;\\n[LL]*5/6)
 .nr cov*n-au 0
 .HTML-TAG-NS ".tl"
-.nr need_eo_tl 1
 ..
 .de @AU
 .par@reset
@@ -381,7 +380,10 @@
 .rs
 .sp 3
 .ce 9999
-.if d cov*tl-div .cov*tl-div
+.if d cov*tl-div \{\
+.    cov*tl-div
+.    HTML-TAG-NS ".eo.tl"
+.\}
 .nr cov*i 1
 .nr cov*sp 1v
 .while \\n[cov*i]<=\\n[cov*n-au] \{\



From MAILER-DAEMON Wed Dec 08 03:26:33 2004
Received: from mailman by lists.gnu.org with archive (Exim 4.33)
	id 1Cbx9c-0004jL-UX
	for mharc-groff-commit@gnu.org; Wed, 08 Dec 2004 03:26:33 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1Cbx9a-0004ie-KG
	for groff-commit@gnu.org; Wed, 08 Dec 2004 03:26:30 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1Cbx9Z-0004i9-89
	for groff-commit@gnu.org; Wed, 08 Dec 2004 03:26:30 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1Cbx9Z-0004i6-2J
	for groff-commit@gnu.org; Wed, 08 Dec 2004 03:26:29 -0500
Received: from [199.232.41.4] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.34) id 1CbwzK-0006TH-LR
	for groff-commit@gnu.org; Wed, 08 Dec 2004 03:15:55 -0500
Received: from localhost ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 4.34) id 1Cbwho-0007K1-Nn
	for groff-commit@gnu.org; Wed, 08 Dec 2004 02:57:51 -0500
To: groff-commit@gnu.org
From: Werner LEMBERG <wl@gnu.org>
Message-Id: <E1Cbx9Z-0004i9-89@lists.gnu.org>
Date: Wed, 08 Dec 2004 03:26:30 -0500
Subject: [Groff-commit] groff/contrib/mom BUGS ChangeLog om.tmac exampl...
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, 08 Dec 2004 08:26:30 -0000

CVSROOT:	/cvsroot/groff
Module name:	groff
Branch: 	
Changes by:	Werner LEMBERG <wl@gnu.org>	04/12/08 07:57:48

Modified files:
	contrib/mom    : BUGS ChangeLog om.tmac 
	contrib/mom/examples: elvis_syntax elvis_syntax.new 
	contrib/mom/momdoc: docprocessing.html 

Log message:
	o Small fixes to elvis_syntax.new (dealing with strings, \{\ and \}
	
	o Changed
	.    ie \\n[#START] \{\
	.       if \\n[#DOC_HEADER]=0 \{ . \}
	.    \}
	in HEAD to
	.    ie \\n[#START] \{\
	.       if \\n[#DOC_HEADER]=0 \{ .RLD 1v \}
	.    \}
	so that HEADs at the start of docs with no docheaders falls on
	the correct baseline.
	
	o Removed spurious parens from if ( \\n[#TRAP_DISTANCE] < \\n[#DOC_LEAD]*2 )
	in SUBHEAD.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/mom/BUGS.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/mom/ChangeLog.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/mom/om.tmac.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/mom/examples/elvis_syntax.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/mom/examples/elvis_syntax.new.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/mom/momdoc/docprocessing.html.diff?tr1=1.18&tr2=1.19&r1=text&r2=text

Patches:
Index: groff/contrib/mom/BUGS
diff -u groff/contrib/mom/BUGS:1.16 groff/contrib/mom/BUGS:1.17
--- groff/contrib/mom/BUGS:1.16	Fri Oct 15 06:10:24 2004
+++ groff/contrib/mom/BUGS	Wed Dec  8 07:57:46 2004
@@ -18,8 +18,23 @@
 Version 1.2-d
 =============
 
+HEADER_FAMILY not changing header family.
+---Fixed---
+
+FAMILY, after COLLATE, not changing the family of all and every
+page element or tag.
+---Fixed---
+
+Heads and subheads at the start of docs are printing one line lower
+than they should.
+---Fixed---
+ 
+Gaps are appearing at the bottom of pages when there's a linebreak
+followed by a subhead.
+---Fixed---
+
 When LS is invoked after a single text line at the top of a page
-containing a T_MARGIN (set with T_MARGIN or PAGE), mom performing
+containing a T_MARGIN (set with T_MARGIN or PAGE), mom is performing
 spacing adjustments as if the first line doesn't exist.
 ---Fixed---
 
Index: groff/contrib/mom/ChangeLog
diff -u groff/contrib/mom/ChangeLog:1.28 groff/contrib/mom/ChangeLog:1.29
--- groff/contrib/mom/ChangeLog:1.28	Fri Oct 15 06:10:24 2004
+++ groff/contrib/mom/ChangeLog	Wed Dec  8 07:57:46 2004
@@ -1,3 +1,23 @@
+*Dec 6 2004
+
+o Small fixes to elvis_syntax.new (dealing with strings, \{\ and \}
+
+o Changed
+    .    ie \\n[#START] \{\
+    .       if \\n[#DOC_HEADER]=0 \{ . \}
+    .    \}
+  in HEAD to
+    .    ie \\n[#START] \{\
+    .       if \\n[#DOC_HEADER]=0 \{ .RLD 1v \}
+    .    \}
+  so that HEADs at the start of docs with no docheaders falls on
+  the correct baseline.
+
+*Dec 3 2004
+
+o Removed spurious parens from if ( \\n[#TRAP_DISTANCE] < \\n[#DOC_LEAD]*2 )
+  in SUBHEAD.
+
 *Oct 14 2004
 
 o Reworked the LL macro so that the argument can take a prepended +
Index: groff/contrib/mom/examples/elvis_syntax
diff -u groff/contrib/mom/examples/elvis_syntax:1.8 groff/contrib/mom/examples/elvis_syntax:1.9
--- groff/contrib/mom/examples/elvis_syntax:1.8	Mon Jul  7 20:55:43 2003
+++ groff/contrib/mom/examples/elvis_syntax	Wed Dec  8 07:57:47 2004
@@ -1,143 +1,89 @@
 #Mom
 language mom
-extension .mom
-startword .\
-inword _(
-keyword .ALD .ALIAS .ALWAYS_FULLSPACE_QUOTES .ATTRIBUTE_STRING
-keyword .AUTHOR .AUTHOR_FAMILY .AUTHOR_FONT .AUTHOR_SIZE .AUTOLEAD .BLANKPAGE
-keyword .BLOCKQUOTE .BLOCKQUOTE_FAMILY .BLOCKQUOTE_FONT .BLOCKQUOTE_QUAD .BLOCKQUOTE_SIZE
-keyword .B_MARGIN .BR .BR_AT_LINE_KERN .BREAK_QUOTE
-keyword .CAPS .CENTER .CENTRE
-keyword .CHAPTER .CHAPTER_TITLE .CHAPTER_STRING .CITATION .CITE .CLOSING
-keyword .COLLATE .COL_BREAK .COL_BREAK .COL_NEXT .COLUMNS
-keyword .COMMENT .CONDENSE .COPYSTYLE
-keyword .DATE .DEFAULTS
-keyword .DOC_FAM .DOC_FAMILY .DOCHEADER
-keyword .DOCHEADER_ADVANCE .DOCHEADER_LEAD
-keyword .DOC_LEAD .DOC_LEAD_ADJUST .DOC_LEFT_MARGIN .DOC_LINE_LENGTH
-keyword .DOC_LLENGTH .DOC_L_LENGTH .DOC_L_MARGIN .DOC_LMARGIN
-keyword .DOC_LS .DOC_PS .DOC_PT_SIZE .DOC_QUAD
-keyword .DOC_RIGHT_MARGIN .DOC_R_MARGIN .DOC_RMARGIN
-keyword .DOCTYPE .DOCTYPE_FAMILY .DOCTYPE_FONT .DOCTYPE_SIZE .DOC_TITLE
-keyword .DRAFT .DRAFT_STRING .DRAFT_WITH_PAGENUMBER
-keyword .DROPCAP .DROPCAP_ADJUST .DROPCAP_FAMILY .DROPCAP_FONT .DROPCAP_GUTTER .DROPCAP_OFF
-keyword .EL
-keyword .ENDNOTE .ENDNOTES
-keyword .ENDNOTE_FAMILY .ENDNOTE_FONT .ENDNOTE_PT_SIZE .ENDNOTE_LEAD .ENDNOTE_QUAD
-keyword .ENDNOTE_STRING .ENDNOTE_STRING_FAMILY .ENDNOTE_STRING_FONT .ENDNOTE_STRING_SIZE
-keyword .ENDNOTE_STRING_QUAD .ENDNOTE_STRING_UNDERSCORE
-keyword .ENDNOTE_TITLE .ENDNOTE_TITLE_FAMILY .ENDNOTE_TITLE_FONT .ENDNOTE_TITLE_SIZE
-keyword .ENDNOTE_TITLE_QUAD .ENDNOTE_TITLE_UNDERSCORE
-keyword .ENDNOTE_NUMBER_FAMILY .ENDNOTE_NUMBER_FONT .ENDNOTE_NUMBER_SIZE
-keyword .ENDNOTE_NUMBERS_ALIGN_RIGHT .ENDNOTE_NUMBERS_ALIGN_LEFT
-keyword .ENDNOTE_PARA_INDENT .ENDNOTE_PARA_SPACE .ENDNOTES_FOOTER_CENTER .ENDNOTES_HEADER_CENTER
-keyword .ENDNOTE_STRING_CAPS .ENDNOTES_NO_COLUMNS .ENDNOTES_NO_FIRST_PAGENUM
-keyword .ENDNOTES_ALLOWS_HEADERS .ENDNOTES_PAGENUM_STYLE .ENDNOTES_FIRST_PAGENUMBER
-keyword .ENDNOTE_SINGLESPACE
-keyword .EPIGRAPH .EPIGRAPH_AUTOLEAD .EPIGRAPH_FAMILY .EPIGRAPH_FONT
-keyword .EPIGRAPH_INDENT .EPIGRAPH_QUAD .EPIGRAPH_SIZE
-keyword .EW .EXTEND
-keyword .FAM .FAMILY
-keyword .FINIS .FINIS_STRING
-keyword .FOOTER .FOOTER_CENTER .FOOTER_CENTER_CAPS .FOOTER_CENTER_FAM .FOOTER_CENTER_FAMILY
-keyword .FOOTER_CENTER_FONT .FOOTER_CENTER_FT .FOOTER_CENTER_PS .FOOTER_CENTER_SIZE
-keyword .FOOTER_CENTRE .FOOTER_CENTRE_CAPS .FOOTER_CENTRE_FAM .FOOTER_CENTRE_FAMILY
-keyword .FOOTER_CENTRE_FT .FOOTER_CENTRE_PS .FOOTER_CENTRE_SIZE .FOOTER_FAM
-keyword .FOOTER_FAMILY .FOOTER_GAP .FOOTER_LEFT .FOOTER_LEFT_CAPS .FOOTER_LEFT_FAM
-keyword .FOOTER_LEFT_FAMILY .FOOTER_LEFT_FONT .FOOTER_LEFT_FT .FOOTER_LEFT_PS
-keyword .FOOTER_LEFT_SIZE .FOOTER_MARGIN .FOOTER_ON_FIRST_PAGE .FOOTER_PLAIN
-keyword .FOOTER_RECTO .FOOTER_RIGHT .FOOTER_RIGHT_CAPS .FOOTER_RIGHT_FAM .FOOTER_RIGHT_FAMILY
-keyword .FOOTER_RIGHT_FONT .FOOTER_RIGHT_FT .FOOTER_RIGHT_PS .FOOTER_RIGHT_SIZE
-keyword .FOOTER_RULE .FOOTER_RULE_GAP .FOOTERS .FOOTER_SIZE .FOOTER_VERSO
-keyword .FOOTNOTE .FOOTNOTE_AUTOLEAD .FOOTNOTE_FAMILY .FOOTNOTE_FONT .FOOTNOTE_MARKERS
-keyword .FOOTNOTE_MARKER_STYLE .FOOTNOTE_QUAD .FOOTNOTE_RULE .FOOTNOTE_RULE_ADJ
-keyword .FOOTNOTE_RULE_LENGTH .FOOTNOTE_SIZE
-keyword .FROM .FT
-keyword .GREETING
-keyword .HDRFTR_CENTER .HDRFTR_CENTER .HDRFTR_CENTER_CAPS .HDRFTR_CENTER_FAMILY
-keyword .HDRFTR_CENTER_FONT .HDRFTR_CENTER_SIZE .HDRFTR_FAMILY .HDRFTR_GAP .HDRFTR_CENTER_PAD
-keyword .HDRFTR_LEFT .HDRFTR_LEFT .HDRFTR_LEFT_CAPS .HDRFTR_LEFT_FAMILY
-keyword .HDRFTR_LEFT_FONT .HDRFTR_LEFT_SIZE .HDRFTR_MARGIN .HDRFTR_PLAIN
-keyword .HDRFTR_RIGHT .HDRFTR_RIGHT_CAPS .HDRFTR_RIGHT_FAMILY .HDRFTR_RIGHT_FONT
-keyword .HDRFTR_RIGHT_SIZE .HDRFTR_RULE .HDRFTR_RULE_GAP .HDRFTR_RULE_INTERNAL
-keyword .HDRFTR_RULE_INTERNAL .HDRFTR_SIZE
-keyword .HEAD .HEAD_CAPS .HEADER .HEADER_CENTER .HEADER_CENTER_CAPS
-keyword .HEADER_CENTER_FAM .HEADER_CENTER_FAMILY .HEADER_CENTER_FONT
-keyword .HEADER_CENTER_FT .HEADER_CENTER_PS .HEADER_CENTER_SIZE .HEADER_CENTRE
-keyword .HEADER_CENTRE_CAPS .HEADER_CENTRE_FAM .HEADER_CENTRE_FAMILY
-keyword .HEADER_CENTRE_FONT .HEADER_CENTRE_FT .HEADER_CENTRE_PS .HEADER_CENTRE_SIZE
-keyword .HEADER_FAM .HEADER_FAMILY .HEADER_GAP
-keyword .HEADER_LEFT .HEADER_LEFT_CAPS .HEADER_LEFT_FAM .HEADER_LEFT_FAMILY
-keyword .HEADER_LEFT_FONT .HEADER_LEFT_FT .HEADER_LEFT_PS .HEADER_LEFT_SIZE
-keyword .HEADER_MARGIN .HEADER_PLAIN
-keyword .HEADER_RECTO .HEADER_RIGHT .HEADER_RIGHT_CAPS .HEADER_RIGHT_FAM .HEADER_RIGHT_FAMILY
-keyword .HEADER_RIGHT_FONT .HEADER_RIGHT_FT .HEADER_RIGHT_PS .HEADER_RIGHT_SIZE .HEADER_VERSO
-keyword .HEADER_RULE .HEADER_RULE_GAP .HEADERS .HEADER_SIZE
-keyword .HEAD_FAMILY .HEAD_FONT .HEAD_QUAD .HEAD_SIZE .HEAD_SPACE .HEAD_UNDERLINE
-keyword .HI .HY .HYPHENATE .HYPHENATION .HY_SET
-keyword .IB .IBX .IBQ .IH .IL .ILX .ILQ
-keyword .IQ .IR .IRX .IRQ .IT .IX
-keyword .INDENT_FIRST_PARAS .ITALIC_MEANS_ITALIC
-keyword .JUSTIFY
-keyword .KERN
-keyword .LEADER_CHARACTER .LEFT .LIG .LIGATURES .LINEBREAK .LL .LL .L_MARGIN .LS
-keyword .MCO .MCR .MCX
-keyword .NEWPAGE .NEW_PAGE .NO_SUITE .NUMBER_HEADS .NUMBER_PARAHEADS .NUMBER_SUBHEADS
-keyword .PAD .PADMARKER .PAD_STRING .PAGE .PAGE_LENGTH .PAGELENGTH .PAGEWIDTH
-keyword .PAGENUM .PAGENUM_FAMILY .PAGENUM_FONT .PAGENUM_HYPHENS
-keyword .PAGENUM_ON_FIRST_PAGE .PAGENUM_POS .PAGENUM_SIZE .PAGENUM_STYLE .PAGENUMBER
-keyword .PAGINATE .PAGINATION .PAPER
-keyword .PARAHEAD .PARAHEAD_FAMILY .PARAHEAD_FONT .PARAHEAD_INDENT .PARAHEAD_SIZE
-keyword .PARA_INDENT .PARA_SPACE
-keyword .PP .PP_FONT .PP_FT .PT_SIZE .PSPIC
-keyword .PRINTSTYLE
-keyword .QUAD
-keyword .QUOTE .QUOTE_FAMILY .QUOTE_FONT .QUOTE_INDENT .QUOTE_SIZE
-keyword .RECTO_VERSO
-keyword .RESET_FOOTNOTE_NUMBER .RESET_HEAD_NUMBER .RESET_PARAHEAD_NUMBER
-keyword .RESET_SUBHEAD_NUMBER
-keyword .REVISION .REVISION_STRING .RIGHT .RLD .R_MARGIN .RW
-keyword .SETBOLDER .SETSLANT .SHIM .SILENT .SLANT_MEANS_SLANT .SMARTQUOTES .SP .SPACE
-keyword .SPREAD .SS .ST .START .STRING .SUBHEAD .SUBHEAD_FAMILY .SUBHEAD_FONT .SUBHEAD_SIZE
-keyword .SUBTITLE .SUBTITLE_FAMILY .SUBTITLE_FONT .SUBTITLE_SIZE
-keyword .SWITCH_FOOTERS .SWITCH_HDRFTR .SWITCH_HEADERS
-keyword .SUSPEND_PAGINATION .RESTORE_PAGINATION
-keyword .TAB_SET .TAB .TABSET .TB .TI
-keyword .TITLE .TITLE_FAMILY .TITLE_FONT .TITLE_SIZE .T_MARGIN
-keyword .TN .TO .TOC
-keyword .TOC_FAMILY .TOC_PT_SIZE .TOC_LEAD .TOC_PAGENUM_STYLE
-keyword .TOC_HEADER_FAMILY .TOC_HEADER_FONT .TOC_HEADER_SIZE .TOC_HEADER_QUAD .TOC_HEADER_STRING
-keyword .TOC_TITLE_FAMILY .TOC_TITLE_FONT .TOC_TITLE_SIZE .TOC_TITLE_INDENT
-keyword .TOC_HEAD_FAMILY .TOC_HEAD_FONT .TOC_HEAD_SIZE .TOC_HEAD_INDENT
-keyword .TOC_SUBHEAD_FAMILY .TOC_SUBHEAD_FONT .TOC_SUBHEAD_SIZE .TOC_SUBHEAD_INDENT
-keyword .TOC_PARAHEAD_FAMILY .TOC_PARAHEAD_FONT .TOC_PARAHEAD_SIZE .TOC_PARAHEAD_INDENT
-keyword .TOC_PN_FAMILY .TOC_PN_FONT .TOC_PN_SIZE
-keyword .TOC_APPENDS_AUTHOR .TOC_RV_SWITCH .TOC_PADDING .PAGINATE_TOC
-keyword .TQ .TRAP .TYPESIZE
-keyword .UNDERLINE .UNDERLINE_ITALIC .UNDERLINE_QUOTES .UNDERLINE_SLANT
-keyword .UNDERSCORE .UNDERSCORE_2 .UNDERSCORE2
-keyword .WS
-font fixed DEFAULT CHAPTER NAMED LETTER
-font fixed TYPESET TYPEWRITE
-font fixed FINAL DRAFT
-font fixed BLOCK QUAD
-font fixed LEFT RIGHT CENTER CENTRE JUSTIFY TOP BOTTOM 
-font fixed OFF QUIT END EXIT DONE NO ALL
-font fixed PAGE NUMBER STAR
-font fixed COND EXT
-font fixed LETTER LEGAL EXECUTIVE LEDGER TABLOID QUARTO FOLIO
-font fixed 10x14 A3 A4 A5 B4 B5
-font fixed SINGLESPACE
-font fixed FACTOR
-font underlined \/ \/. \/? \/! \/, \/; \/:
-font underlined \, \,. \,? \,! \,, \,; \,:
-font underlined \\ \~ \% \0 \: \( \| \^ \& \%
-font underlined \b \c \C \d \D \e \f \f( \h \l \L \p \r \s \s+ \s- \S \u \v \w
-font fixed \(bu \(co \(ct \(de \(dg \(di \(em \(en \(mu \(pl \(rg \(sc \(sq
-font fixed \(14 \(12 \(34 \(+-
-font fixed # ' ^
-font italic "
-character \]
-comment \#
-comment \"
-comment \!
+extension .mom .tmac
+
+startword .
+color startword normal
+
+inword _.'
+color inword normal
+
+other initialpunct
+mostly normal
+
+backslash none
+
+color args         like fixed
+color braces       like char
+color brackets     like underlined
+color chars        like emphasized
+color decimals     like number
+color ellipsis     normal
+color escapes      like keyword
+color math         like cursor
+color misc         like string
+color operators    like string
+color parens       like comment
+color reg_string   like math
+color tmac_escapes like keyword
+color single_slash like char
+
+font args DA DE EN ES FR IT NL NO PT SV
+font args DEFAULT CHAPTER NAMED LETTER
+font args TYPESET TYPEWRITE
+font args FINAL DRAFT
+font args BLOCK QUAD
+font args LEFT RIGHT CENTER CENTRE JUSTIFY TOP BOTTOM L R C J
+font args OFF QUIT END EXIT DONE NO ALL
+font args PAGE NUMBER STAR
+font args LETTER LEGAL EXECUTIVE LEDGER TABLOID QUARTO FOLIO
+font args 10x14 A3 A4 A5 B4 B5
+font args SINGLESPACE
+font args FACTOR
+font args DASH BULLET ALPHA DIGIT USER
+font args RGB CYM CMYK GRAY GREY
+font args COND CONDX EXT EXTX SUP SUPX CONDSUP CONDSUPX EXTSUP EXTSUPX
+font args BOLDER BOLDERX SLANT SLANTX
+font args UP DOWN BCK FWD BU BP FU FP
+font args ROM IT BD BDI PREV
+font args ST
+
+prefix            { \{ \{\
+font braces       { \{ \{\
+prefix            [ ]
+font brackets     [ ]
+prefix            \(bu \(co \(ct \(de \(dg \(di \(em \(en \(mu \(pl \(rg \(sc \(sq \(lq \(rq
+font chars        \(bu \(co \(ct \(de \(dg \(di \(em \(en \(mu \(pl \(rg \(sc \(sq \(lq \(rq
+prefix            \(14 \(12 \(34 \(+-
+font chars        \(14 \(12 \(34 \(+-
+prefix            \fR \fB \fI \fP \f0 \f1 \f2 \f3
+font chars        \fR \fB \fI \fP \f0 \f1 \f2 \f3
+prefix            .0 .1 .2 .3 .4 .5 .6 .7 .8 .9
+font decimals     . .0 .1 .2 .3 .4 .5 .6 .7 .8 .9
+prefix            \/ \/. \/? \/! \/, \/; \/:
+font escapes      \/ \/. \/? \/! \/, \/; \/:
+prefix            \, \,. \,? \,! \,, \,; \,:
+font escapes      \, \,. \,? \,! \,, \,; \,:
+prefix            \~ \0 \: \| \^ \& \% \!
+font escapes      \~ \0 \: \| \^ \& \% \!
+prefix            \b \c \C \d \D \e \f \f( \h \l \L \p \r \s \s+ \s- \S \u \v \w
+font escapes      \b \c \C \d \D \e \f \f( \h \l \L \p \r \s \s+ \s- \S \u \v \w
+prefix            ...
+font ellipsis     ...
+prefix            + - * / = == < > <= >= <? >? %
+font math         + - * / = == < > <= >= <? >? %
+prefix            |
+font misc         |
+prefix            ! : &
+font operators    ! : &
+prefix            ( )
+font parens       ( )
+prefix            # * $
+font reg_string   # * $
+prefix            \n \* \[
+font single_slash \n \* \[
+prefix            \\n \\* \\$
+font tmac_escapes \\n \\* \\$
+
+comment   \#
+comment   \"
Index: groff/contrib/mom/examples/elvis_syntax.new
diff -u groff/contrib/mom/examples/elvis_syntax.new:1.6 groff/contrib/mom/examples/elvis_syntax.new:1.7
--- groff/contrib/mom/examples/elvis_syntax.new:1.6	Wed Sep 29 09:29:38 2004
+++ groff/contrib/mom/examples/elvis_syntax.new	Wed Dec  8 07:57:47 2004
@@ -63,8 +63,8 @@
 font args ROM IT BD BDI PREV
 font args ST
 
-prefix            { \{ \{\
-font braces       { \{ \{\
+prefix            { \{ \} \{\
+font braces       { \{ \} \{\
 prefix            [ ]
 font brackets     [ ]
 prefix            \(bu \(co \(ct \(de \(dg \(di \(em \(en \(mu \(pl \(rg \(sc \(sq \(lq \(rq
@@ -100,7 +100,6 @@
 prefix            \\n \\* \\$
 font tmac_escapes \\n \\* \\$
 
-character \]
-string    ''
+character \]'
 comment   \#
 comment   \"
Index: groff/contrib/mom/momdoc/docprocessing.html
diff -u groff/contrib/mom/momdoc/docprocessing.html:1.18 groff/contrib/mom/momdoc/docprocessing.html:1.19
--- groff/contrib/mom/momdoc/docprocessing.html:1.18	Mon Sep 13 15:57:39 2004
+++ groff/contrib/mom/momdoc/docprocessing.html	Wed Dec  8 07:57:47 2004
@@ -871,6 +871,14 @@
 macros, only the title will appear, both at the top of page one and in
 subsequent page headers.
 <p>
+The style of the chapter title can be altered by
+<a href="docelement.html#DOCELEMENT_CONTROL">control macros</a>,
+e.g. <strong>CHAPTER_TITLE_FAMILY</strong>,
+<strong>CHAPTER_TITLE_FONT</strong>, etc.  The default family,
+font and point size are Times Roman, Bold Italic, 4 points larger
+than
+<a href="definitions.html#TERMS_RUNNING">running text</a>.
+<p>
 
 <!---DRAFT--->
 
@@ -2359,13 +2367,11 @@
 	<li>the argument is the same as for
 		<a href="typesetting.html#FAMILY">FAMILY</a>
 	<li>globally changes the type family
-	<li>if you wish the
-		<a href="definitions.html#TERMS_HEADER">header</a>
-		and/or page number families to remain at their old values,
-		you must reset them with
-		<a href="headfootpage.html#HEADER_FAMILY">HEADER_FAMILY</a>
-		and
-		<a href="headfootpage.html#PAGENUM_FAMILY">PAGENUM_FAMILY</a>
+	<li>any page elements (e.g.
+		<a href="definitions.html#TERMS_HEADER">headers</a>,
+        page numbers, footnotes) whose families you wish to remain
+        at their old values must be reset with the appropriate
+        <a href="docelement.html#DOCELEMENT_CONTROL">control macros</a>
 </ul>
 <br>
 
Index: groff/contrib/mom/om.tmac
diff -u groff/contrib/mom/om.tmac:1.23 groff/contrib/mom/om.tmac:1.24
--- groff/contrib/mom/om.tmac:1.23	Fri Oct 15 06:10:24 2004
+++ groff/contrib/mom/om.tmac	Wed Dec  8 07:57:46 2004
@@ -23,7 +23,7 @@
 .\"
 .\"
 .\"
-\# Version 1.2-d
+\# Version 1.2-e
 \# -------------
 \#
 \# Antoine de St-Exupéry asserted that elegance in engineering is
@@ -449,6 +449,9 @@
 .          ft 0
 .       \}
 .    \}
+.    if \\n[#COLLATE]=1 \{\
+.       if !r#START \{ .DOC_FAM \\*[$FAMILY] \}
+.    \}
 .END
 \#
 \#
@@ -4158,7 +4161,12 @@
 .    if '\\$0'EPIGRAPH_FAMILY'                .ds $EPI_FAM \\$1
 .    if '\\$0'FOOTNOTE_FAMILY'                .ds $FN_FAM \\$1
 .    if '\\$0'HDRFTR_CENTER_FAMILY'           .ds $HDRFTR_CENTER_FAM \\$1
-.    if '\\$0'HDRFTR_FAMILY'                  .ds $HDRFTR_FAM \\$1
+.    if '\\$0'HDRFTR_FAMILY' \{\
+.       ds $HDRFTR_FAM        \\$1
+.       ds $HDRFTR_LEFT_FAM   \\$1
+.       ds $HDRFTR_CENTER_FAM \\$1
+.       ds $HDRFTR_RIGHT_FAM  \\$1
+.    \}
 .    if '\\$0'HDRFTR_LEFT_FAMILY'             .ds $HDRFTR_LEFT_FAM \\$1
 .    if '\\$0'HDRFTR_RIGHT_FAMILY'            .ds $HDRFTR_RIGHT_FAM \\$1
 .    if '\\$0'HEAD_FAMILY'                    .ds $HEAD_FAM \\$1
@@ -6331,8 +6339,8 @@
 \#
 .MAC DOC_FAMILY END
 .    br
-.    ds $DOC_FAM \\$1
-.    FAMILY            \\*[$DOC_FAM]
+.    ds $DOC_FAM       \\$1
+.    ds $FAMILY        \\*[$DOC_FAM]
 .    TITLE_FAMILY      \\*[$DOC_FAM]
 .    SUBTITLE_FAMILY   \\*[$DOC_FAM]
 .    AUTHOR_FAMILY     \\*[$DOC_FAM]
@@ -6343,7 +6351,7 @@
 .    BLOCKQUOTE_FAMILY \\*[$DOC_FAM]
 .    EPIGRAPH_FAMILY   \\*[$DOC_FAM]
 .    HDRFTR_FAMILY     \\*[$DOC_FAM]
-.    PAGENUM_FAMILY    \\*[$DOC_FAM]
+.    FOOTNOTE_FAMILY   \\*[$DOC_FAM]
 .END
 \#
 \#
@@ -8423,7 +8431,7 @@
 .       el \{ .ne 3 \}
 .    \}
 .    ie \\n[#START] \{\
-.       if \\n[#DOC_HEADER]=0 \{ . \}
+.       if \\n[#DOC_HEADER]=0 \{ .RLD 1v \}
 .    \}
 .    el \{\
 .       if \\n[#PRINT_STYLE]=1 \{\
@@ -8621,9 +8629,9 @@
 .    \}
 .    if \\n[#PRINT_STYLE]=1 \{ .nr #SH_LEAD_ADJUST \\n[#LEAD]/5 \}
 .    if \\n[#PRINT_STYLE]=2 \{ .nr #SH_LEAD_ADJUST \\n[#LEAD]/8 \}
-.    ie \\n[#START] \{ . \}
+.    ie \\n[#START] \{ .RLD 1v \}
 .    el \{\
-.       ie ( \\n[#TRAP_DISTANCE] < (\\n[#DOC_LEAD]u*2u) ) \{\
+.       ie ( \\n[#TRAP_DISTANCE] < \\n[#DOC_LEAD]*2 ) \{\
 .          ie \\n[#COLUMNS] \{ .COL_NEXT \}
 .          el \{ .bp \}
 .       \}
@@ -12660,311 +12668,311 @@
 \#
 .MAC FOOTER_CENTER_COLOR END
 .    HDRFTR_CENTER_COLOR \\$1
-.END \\$1
+.END
 \#
 .MAC FOOTER_CENTER_COLOUR END
 .    HDRFTR_CENTER_COLOR \\$1
-.END \\$1
+.END
 \#
 .MAC FOOTER_CENTER_FAM END
 .    HDRFTR_CENTER_FAMILY \\$1
-.END \\$1
+.END
 \#
 .MAC FOOTER_CENTER_FAMILY END
 .    HDRFTR_CENTER_FAMILY \\$1
-.END \\$1
+.END
 \#
 .MAC FOOTER_CENTER_FONT END
 .    HDRFTR_CENTER_FONT \\$1
-.END \\$1
+.END
 \#
 .MAC FOOTER_CENTER_FT END
 .    HDRFTR_CENTER_FONT \\$1
-.END \\$1
+.END
 \#
 .MAC FOOTER_CENTER_PS END
 .    HDRFTR_CENTER_SIZE \\$1
-.END \\$1
+.END
 \#
 .MAC FOOTER_CENTER_SIZE END
 .    HDRFTR_CENTER_SIZE \\$1
-.END \\$1
+.END
 \#
 .MAC FOOTER_CENTRE_CAPS END
 .    HDRFTR_CENTER_CAPS \\$1
-.END \\$1
+.END
 \#
 .MAC FOOTER_CENTRE_COLOR END
 .    HDRFTR_CENTRE_COLOR \\$1
-.END \\$1
+.END
 \#
 .MAC FOOTER_CENTRE_COLOUR END
 .    HDRFTR_CENTRE_COLOR \\$1
-.END \\$1
+.END
 \#
 .MAC FOOTER_CENTRE_FAM END
 .    HDRFTR_CENTER_FAMILY \\$1
-.END \\$1
+.END
 \#
 .MAC FOOTER_CENTRE_FAMILY END
 .    HDRFTR_CENTER_FAMILY \\$1
-.END \\$1
+.END
 \#
 .MAC FOOTER_CENTRE_FONT END
 .    HDRFTR_CENTER_FONT \\$1
-.END \\$1
+.END
 \#
 .MAC FOOTER_CENTRE_FT END
 .    HDRFTR_CENTER_FONT \\$1
-.END \\$1
+.END
 \#
 .MAC FOOTER_CENTRE_PS END
 .    HDRFTR_CENTER_SIZE \\$1
-.END \\$1
+.END
 \#
 .MAC FOOTER_CENTRE_SIZE END
 .    HDRFTR_CENTER_SIZE \\$1
-.END \\$1
+.END
 \#
 .MAC FOOTER_COLOR END
 .    HDRFTR_COLOR \\$1
-.END \\$1
+.END
 \#
 .MAC FOOTER_COLOUR END
 .    HDRFTR_COLOR \\$1
-.END \\$1
+.END
 \#
 .MAC FOOTER_FAM END
 .    HDRFTR_FAMILY \\$1
-.END \\$1
+.END
 \#
 .MAC FOOTER_FAMILY END
 .    HDRFTR_FAMILY \\$1
-.END \\$1
+.END
 \#
 .MAC FOOTER_LEFT_COLOR END
 .    HDRFTR_LEFT_COLOR \\$1
-.END \\$1
+.END
 \#
 .MAC FOOTER_LEFT_COLOUR END
 .    HDRFTR_LEFT_COLOR \\$1
-.END \\$1
+.END
 \#
 .MAC FOOTER_LEFT_FAM END
 .    HDRFTR_LEFT_FAMILY \\$1
-.END \\$1
+.END
 \#
 .MAC FOOTER_LEFT_FAMILY END
 .    HDRFTR_LEFT_FAMILY \\$1
-.END \\$1
+.END
 \#
 .MAC FOOTER_LEFT_FONT END
 .    HDRFTR_LEFT_FONT \\$1
-.END \\$1
+.END
 \#
 .MAC FOOTER_LEFT_FT END
 .    HDRFTR_LEFT_FONT \\$1
-.END \\$1
+.END
 \#
 .MAC FOOTER_LEFT_PS END
 .    HDRFTR_LEFT_SIZE \\$1
-.END \\$1
+.END
 \#
 .MAC FOOTER_LEFT_SIZE END
 .    HDRFTR_LEFT_SIZE \\$1
-.END \\$1
+.END
 \#
 .MAC FOOTER_RIGHT_COLOR END
 .    HDRFTR_RIGHT_COLOR \\$1
-.END \\$1
+.END
 \#
 .MAC FOOTER_RIGHT_COLOUR END
 .    HDRFTR_RIGHT_COLOR \\$1
-.END \\$1
+.END
 \#
 .MAC FOOTER_RIGHT_FAM END
 .    HDRFTR_RIGHT_FAMILY \\$1
-.END \\$1
+.END
 \#
 .MAC FOOTER_RIGHT_FAMILY END
 .    HDRFTR_RIGHT_FAMILY \\$1
-.END \\$1
+.END
 \#
 .MAC FOOTER_RIGHT_FONT END
 .    HDRFTR_RIGHT_FONT \\$1
-.END \\$1
+.END
 \#
 .MAC FOOTER_RIGHT_FT END
 .    HDRFTR_RIGHT_FONT \\$1
-.END \\$1
+.END
 \#
 .MAC FOOTER_RIGHT_PS END
 .    HDRFTR_RIGHT_SIZE \\$1
-.END \\$1
+.END
 \#
 .MAC FOOTER_RIGHT_SIZE END
 .    HDRFTR_RIGHT_SIZE \\$1
-.END \\$1
+.END
 \#
 .MAC FOOTER_RULE_COLOR END
 .    HDRFTR_RULE_COLOR \\$1
-.END \\$1
+.END
 \#
 .MAC FOOTER_SIZE END
 .    HDRFTR_SIZE \\$1
-.END \\$1
+.END
 \#
 .MAC HEADER_CENTER_COLOR END
 .    HDRFTR_CENTER_COLOR \\$1
-.END \\$1
+.END
 \#
 .MAC HEADER_CENTER_COLOUR END
 .    HDRFTR_CENTER_COLOR \\$1
-.END \\$1
+.END
 \#
 .MAC HEADER_CENTER_FAM END
 .    HDRFTR_CENTER_FAMILY \\$1
-.END \\$1
+.END
 \#
 .MAC HEADER_CENTER_FAMILY END
 .    HDRFTR_CENTER_FAMILY \\$1
-.END \\$1
+.END
 \#
 .MAC HEADER_CENTER_FONT END
 .    HDRFTR_CENTER_FONT \\$1
-.END \\$1
+.END
 \#
 .MAC HEADER_CENTER_FT END
 .    HDRFTR_CENTER_FONT \\$1
-.END \\$1
+.END
 \#
 .MAC HEADER_CENTER_PS END
 .    HDRFTR_CENTER_SIZE \\$1
-.END \\$1
+.END
 \#
 .MAC HEADER_CENTER_SIZE END
 .    HDRFTR_CENTER_SIZE \\$1
-.END \\$1
+.END
 \#
 .MAC HEADER_CENTRE_COLOR END
 .    HDRFTR_CENTRE_COLOR \\$1
-.END \\$1
+.END
 \#
 .MAC HEADER_CENTRE_COLOUR END
 .    HDRFTR_CENTRE_COLOR \\$1
-.END \\$1
+.END
 \#
 .MAC HEADER_CENTRE_FAM END
 .    HDRFTR_CENTER_FAMILY \\$1
-.END \\$1
+.END
 \#
 .MAC HEADER_CENTRE_FAMILY END
 .    HDRFTR_CENTER_FAMILY \\$1
-.END \\$1
+.END
 \#
 .MAC HEADER_CENTRE_FONT END
 .    HDRFTR_CENTER_FONT \\$1
-.END \\$1
+.END
 \#
 .MAC HEADER_CENTRE_FT END
 .    HDRFTR_CENTER_FONT \\$1
-.END \\$1
+.END
 \#
 .MAC HEADER_CENTRE_PS END
 .    HDRFTR_CENTER_SIZE \\$1
-.END \\$1
+.END
 \#
 .MAC HEADER_CENTRE_SIZE END
 .    HDRFTR_CENTER_SIZE \\$1
-.END \\$1
+.END
 \#
 .MAC HEADER_COLOR END
 .    HDRFTR_COLOR \\$1
-.END \\$1
+.END
 \#
 .MAC HEADER_COLOUR END
 .    HDRFTR_COLOR \\$1
-.END \\$1
+.END
 \#
 .MAC HEADER_FAM END
 .    HDRFTR_FAMILY \\$1
-.END \\$1
+.END
 \#
 .MAC HEADER_FAMILY END
 .    HDRFTR_FAMILY \\$1
-.END \\$1
+.END
 \#
 .MAC HEADER_LEFT_COLOR END
 .    HDRFTR_LEFT_COLOR \\$1
-.END \\$1
+.END
 \#
 .MAC HEADER_LEFT_COLOUR END
 .    HDRFTR_LEFT_COLOR \\$1
-.END \\$1
+.END
 \#
 .MAC HEADER_LEFT_FAM END
 .    HDRFTR_LEFT_FAMILY \\$1
-.END \\$1
+.END
 \#
 .MAC HEADER_LEFT_FAMILY END
 .    HDRFTR_LEFT_FAMILY \\$1
-.END \\$1
+.END
 \#
 .MAC HEADER_LEFT_FONT END
 .    HDRFTR_LEFT_FONT \\$1
-.END \\$1
+.END
 \#
 .MAC HEADER_LEFT_FT END
 .    HDRFTR_LEFT_FONT \\$1
-.END \\$1
+.END
 \#
 .MAC HEADER_LEFT_PS END
 .    HDRFTR_LEFT_SIZE \\$1
-.END \\$1
+.END
 \#
 .MAC HEADER_LEFT_SIZE END
 .    HDRFTR_LEFT_SIZE \\$1
-.END \\$1
+.END
 \#
 .MAC HEADER_RIGHT_COLOR END
 .    HDRFTR_RIGHT_COLOR \\$1
-.END \\$1
+.END
 \#
 .MAC HEADER_RIGHT_COLOUR END
 .    HDRFTR_RIGHT_COLOR \\$1
-.END \\$1
+.END
 \#
 .MAC HEADER_RIGHT_FAM END
 .    HDRFTR_RIGHT_FAMILY \\$1
-.END \\$1
+.END
 \#
 .MAC HEADER_RIGHT_FAMILY END
 .    HDRFTR_RIGHT_FAMILY \\$1
-.END \\$1
+.END
 \#
 .MAC HEADER_RIGHT_FONT END
 .    HDRFTR_RIGHT_FONT \\$1
-.END \\$1
+.END
 \#
 .MAC HEADER_RIGHT_FT END
 .    HDRFTR_RIGHT_FONT \\$1
-.END \\$1
+.END
 \#
 .MAC HEADER_RIGHT_PS END
 .    HDRFTR_RIGHT_SIZE \\$1
-.END \\$1
+.END
 \#
 .MAC HEADER_RIGHT_SIZE END
 .    HDRFTR_RIGHT_SIZE \\$1
-.END \\$1
+.END
 \#
 .MAC HEADER_RULE_COLOR END
 .    HDRFTR_RULE_COLOR \\$1
-.END \\$1
+.END
 \#
 .MAC HEADER_SIZE END
 .    HDRFTR_SIZE \\$1
-.END \\$1
+.END
 \#
 \# HEADER and FOOTER aliases for HDRFTR macros.
 \#



From MAILER-DAEMON Wed Dec 08 03:30:25 2004
Received: from mailman by lists.gnu.org with archive (Exim 4.33)
	id 1CbxDN-0005Fv-N8
	for mharc-groff-commit@gnu.org; Wed, 08 Dec 2004 03:30:25 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1CbxDL-0005Eq-Kh
	for groff-commit@gnu.org; Wed, 08 Dec 2004 03:30:23 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1CbxDL-0005EZ-6F
	for groff-commit@gnu.org; Wed, 08 Dec 2004 03:30:23 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1CbxDL-0005EW-3c
	for groff-commit@gnu.org; Wed, 08 Dec 2004 03:30:23 -0500
Received: from [199.232.41.4] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.34) id 1Cbx3E-0007Aq-NL
	for groff-commit@gnu.org; Wed, 08 Dec 2004 03:19:56 -0500
Received: from localhost ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 4.34) id 1Cbx3F-0000M0-LW
	for groff-commit@gnu.org; Wed, 08 Dec 2004 03:19:57 -0500
To: groff-commit@gnu.org
From: Werner LEMBERG <wl@gnu.org>
Message-Id: <E1CbxDL-0005EZ-6F@lists.gnu.org>
Date: Wed, 08 Dec 2004 03:30:23 -0500
Subject: [Groff-commit] groff/contrib/pdfmark
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, 08 Dec 2004 08:30:23 -0000

CVSROOT:	/cvsroot/groff
Module name:	groff
Branch: 	
Changes by:	Werner LEMBERG <wl@gnu.org>	04/12/08 08:19:57

groff/contrib/pdfmark

Update of /cvsroot/groff/groff/contrib/pdfmark
In directory savannah:/tmp/cvs-serv1360/pdfmark

Log Message:
Directory /cvsroot/groff/groff/contrib/pdfmark added to the repository




From MAILER-DAEMON Wed Dec 08 03:41:33 2004
Received: from mailman by lists.gnu.org with archive (Exim 4.33)
	id 1CbxO9-00080J-Da
	for mharc-groff-commit@gnu.org; Wed, 08 Dec 2004 03:41:33 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1CbxO8-0007zn-BG
	for groff-commit@gnu.org; Wed, 08 Dec 2004 03:41:32 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1CbxO7-0007zD-8h
	for groff-commit@gnu.org; Wed, 08 Dec 2004 03:41:31 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1CbxO7-0007yt-0u
	for groff-commit@gnu.org; Wed, 08 Dec 2004 03:41:31 -0500
Received: from [199.232.41.4] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.34) id 1CbxED-0000kl-Gw
	for groff-commit@gnu.org; Wed, 08 Dec 2004 03:31:17 -0500
Received: from localhost ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 4.34) id 1CbxED-0000jG-Un
	for groff-commit@gnu.org; Wed, 08 Dec 2004 03:31:18 -0500
To: groff-commit@gnu.org
From: Werner LEMBERG <wl@gnu.org>
Message-Id: <E1CbxO7-0007zD-8h@lists.gnu.org>
Date: Wed, 08 Dec 2004 03:41:31 -0500
Subject: [Groff-commit] groff ./ChangeLog ./Makefile.in ./NEWS contrib/...
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, 08 Dec 2004 08:41:32 -0000

CVSROOT:	/cvsroot/groff
Module name:	groff
Branch: 	
Changes by:	Werner LEMBERG <wl@gnu.org>	04/12/08 08:31:17

Modified files:
	.              : ChangeLog Makefile.in NEWS 
Added files:
	contrib/pdfmark: Makefile Makefile.sub PROBLEMS README TODO 
	                 cover.ms pdfmark.ms pdfmark.tmac spdf.tmac 

Log message:
	Import Keith's `pdfmark' package.  Integration is very preliminary.
	
	* contrib/pdfmark/*: New files.
	* Makefile.in (OTHERDIRS): Add contrib/pdfmark.
	* NEWS: Updated.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/ChangeLog.diff?tr1=1.769&tr2=1.770&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/Makefile.in.diff?tr1=1.78&tr2=1.79&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/NEWS.diff?tr1=1.197&tr2=1.198&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/pdfmark/Makefile?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/pdfmark/Makefile.sub?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/pdfmark/PROBLEMS?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/pdfmark/README?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/pdfmark/TODO?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/pdfmark/cover.ms?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/pdfmark/pdfmark.ms?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/pdfmark/pdfmark.tmac?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/pdfmark/spdf.tmac?rev=1.1

Patches:
Index: groff/ChangeLog
diff -u groff/ChangeLog:1.769 groff/ChangeLog:1.770
--- groff/ChangeLog:1.769	Tue Dec  7 21:23:55 2004
+++ groff/ChangeLog	Wed Dec  8 08:31:17 2004
@@ -1,3 +1,11 @@
+2004-12-08  Werner LEMBERG  <wl@gnu.org>
+
+	Import Keith's `pdfmark' package.  Integration is very preliminary.
+
+	* contrib/pdfmark/*: New files.
+	* Makefile.in (OTHERDIRS): Add contrib/pdfmark.
+	* NEWS: Updated.
+
 2004-12-07  Gaius Mulley  <gaius@glam.ac.uk>
 
 	Fix a bug with title handling in HTML.
Index: groff/Makefile.in
diff -u groff/Makefile.in:1.78 groff/Makefile.in:1.79
--- groff/Makefile.in:1.78	Fri Oct 15 05:21:55 2004
+++ groff/Makefile.in	Wed Dec  8 08:31:17 2004
@@ -528,6 +528,7 @@
   contrib/grap2graph \
   contrib/groffer \
   contrib/mom \
+  contrib/pdfmark \
   doc
 ALLDIRS=$(INCDIRS) $(LIBDIRS) $(PROGDIRS) \
   $(DEVDIRS) $(XDEVDIRS) $(OTHERDEVDIRS) $(TTYDEVDIRS) $(OTHERDIRS)
Index: groff/NEWS
diff -u groff/NEWS:1.197 groff/NEWS:1.198
--- groff/NEWS:1.197	Tue Nov 23 23:42:02 2004
+++ groff/NEWS	Wed Dec  8 08:31:17 2004
@@ -108,6 +108,12 @@
   A new macro `HEAD' has been added to directly add data to the
   <head>...</head> block.
 
+Pdfmark
+-------
+
+o A new macro package (together with a build script) contributed by Keith
+  Marshall which implements PDF marks.  This is in alpha stage currently.
+
 Miscellaneous
 -------------
 



From MAILER-DAEMON Wed Dec 08 09:44:20 2004
Received: from mailman by lists.gnu.org with archive (Exim 4.33)
	id 1Cc33E-0003zQ-Qa
	for mharc-groff-commit@gnu.org; Wed, 08 Dec 2004 09:44:20 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1Cc33C-0003yA-LJ
	for groff-commit@gnu.org; Wed, 08 Dec 2004 09:44:18 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1Cc33C-0003xp-29
	for groff-commit@gnu.org; Wed, 08 Dec 2004 09:44:18 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1Cc33B-0003xe-Sr
	for groff-commit@gnu.org; Wed, 08 Dec 2004 09:44:17 -0500
Received: from [199.232.41.4] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.34) id 1Cc2t9-0004W4-Gb
	for groff-commit@gnu.org; Wed, 08 Dec 2004 09:33:55 -0500
Received: from localhost ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 4.34) id 1Cc2t9-0000ce-Rz
	for groff-commit@gnu.org; Wed, 08 Dec 2004 09:33:56 -0500
To: groff-commit@gnu.org
From: Werner LEMBERG <wl@gnu.org>
Message-Id: <E1Cc33C-0003xp-29@lists.gnu.org>
Date: Wed, 08 Dec 2004 09:44:18 -0500
Subject: [Groff-commit] groff Makefile.in
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, 08 Dec 2004 14:44:19 -0000

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

Modified files:
	.              : Makefile.in 

Log message:
	(OTHERDIRS: Fix directory order.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/Makefile.in.diff?tr1=1.79&tr2=1.80&r1=text&r2=text

Patches:
Index: groff/Makefile.in
diff -u groff/Makefile.in:1.79 groff/Makefile.in:1.80
--- groff/Makefile.in:1.79	Wed Dec  8 08:31:17 2004
+++ groff/Makefile.in	Wed Dec  8 14:33:55 2004
@@ -522,14 +522,14 @@
   src/utils/afmtodit \
   src/roff/grog \
   src/roff/nroff \
+  doc \
   contrib/mm \
   contrib/pic2graph \
   contrib/eqn2graph \
   contrib/grap2graph \
   contrib/groffer \
   contrib/mom \
-  contrib/pdfmark \
-  doc
+  contrib/pdfmark
 ALLDIRS=$(INCDIRS) $(LIBDIRS) $(PROGDIRS) \
   $(DEVDIRS) $(XDEVDIRS) $(OTHERDEVDIRS) $(TTYDEVDIRS) $(OTHERDIRS)
 EXTRADIRS=\



From MAILER-DAEMON Wed Dec 08 09:53:21 2004
Received: from mailman by lists.gnu.org with archive (Exim 4.33)
	id 1Cc3Bw-0007BX-Vz
	for mharc-groff-commit@gnu.org; Wed, 08 Dec 2004 09:53:21 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1Cc3Bv-0007Az-A6
	for groff-commit@gnu.org; Wed, 08 Dec 2004 09:53:19 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1Cc3Bu-0007Ae-EV
	for groff-commit@gnu.org; Wed, 08 Dec 2004 09:53:18 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1Cc3Bt-0007AL-V9
	for groff-commit@gnu.org; Wed, 08 Dec 2004 09:53:18 -0500
Received: from [199.232.41.4] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.34) id 1Cc31u-0006F3-OL
	for groff-commit@gnu.org; Wed, 08 Dec 2004 09:42:58 -0500
Received: from localhost ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 4.34) id 1Cc31v-0001VL-2s
	for groff-commit@gnu.org; Wed, 08 Dec 2004 09:42:59 -0500
To: groff-commit@gnu.org
From: Werner LEMBERG <wl@gnu.org>
Message-Id: <E1Cc3Bu-0007Ae-EV@lists.gnu.org>
Date: Wed, 08 Dec 2004 09:53:18 -0500
Subject: [Groff-commit] groff Makefile.in
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, 08 Dec 2004 14:53:19 -0000

CVSROOT:	/cvsroot/groff
Module name:	groff
Branch: 	
Changes by:	Werner LEMBERG <wl@gnu.org>	04/12/08 14:42:58

Modified files:
	.              : Makefile.in 

Log message:
	

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/Makefile.in.diff?tr1=1.80&tr2=1.81&r1=text&r2=text

Patches:
Index: groff/Makefile.in
diff -u groff/Makefile.in:1.80 groff/Makefile.in:1.81
--- groff/Makefile.in:1.80	Wed Dec  8 14:33:55 2004
+++ groff/Makefile.in	Wed Dec  8 14:42:58 2004
@@ -516,6 +516,7 @@
   font/devlatin1 \
   font/devutf8 \
   font/devcp1047
+# `doc' must be processed before `contrib/pdfmark'.
 OTHERDIRS=\
   man \
   tmac \



From MAILER-DAEMON Fri Dec 10 02:26:24 2004
Received: from mailman by lists.gnu.org with archive (Exim 4.33)
	id 1CcfAW-0004kU-8X
	for mharc-groff-commit@gnu.org; Fri, 10 Dec 2004 02:26:24 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1CcfAU-0004j6-Pw
	for groff-commit@gnu.org; Fri, 10 Dec 2004 02:26:22 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1CcfAU-0004iQ-0q
	for groff-commit@gnu.org; Fri, 10 Dec 2004 02:26:22 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1CcfAT-0004i7-U1
	for groff-commit@gnu.org; Fri, 10 Dec 2004 02:26:21 -0500
Received: from [199.232.41.4] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.34) id 1Ccezi-0006dl-BC
	for groff-commit@gnu.org; Fri, 10 Dec 2004 02:15:14 -0500
Received: from localhost ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 4.34) id 1Ccezk-0002UC-MW
	for groff-commit@gnu.org; Fri, 10 Dec 2004 02:15:17 -0500
To: groff-commit@gnu.org
From: Werner LEMBERG <wl@gnu.org>
Message-Id: <E1CcfAU-0004iQ-0q@lists.gnu.org>
Date: Fri, 10 Dec 2004 02:26:22 -0500
Subject: [Groff-commit] groff/contrib/mom om.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: Fri, 10 Dec 2004 07:26:23 -0000

CVSROOT:	/cvsroot/groff
Module name:	groff
Branch: 	
Changes by:	Werner LEMBERG <wl@gnu.org>	04/12/10 07:15:16

Modified files:
	contrib/mom    : om.tmac 

Log message:
	(VFP_CHECK): Must be run in a separate environment.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/mom/om.tmac.diff?tr1=1.24&tr2=1.25&r1=text&r2=text

Patches:
Index: groff/contrib/mom/om.tmac
diff -u groff/contrib/mom/om.tmac:1.24 groff/contrib/mom/om.tmac:1.25
--- groff/contrib/mom/om.tmac:1.24	Wed Dec  8 07:57:46 2004
+++ groff/contrib/mom/om.tmac	Fri Dec 10 07:15:16 2004
@@ -10657,18 +10657,21 @@
 \# The main macros that handle footnote processing.
 \# -----------------------------------------------
 \#
-\# Sometimes, #VARIABLE_FOOTER_POS sets FOOTER at a location so
-\# close to the next legal baseline that, visually, one has the
-\# impression another line of running text would fit on the page.
-\# VFP_CHECK is always set to the line just above the one where
-\# FOOTER will be sprung, and checks for this condition.  If it
-\# exists, FOOTER is set one line lower on the page, thus squeezing
-\# in an extra line of running text.  This is a judgment call on
-\# my part, but seems to work well.  If there are problems (e.g.
-\# footnotes really do look jammed), the user should probably adjust
-\# FOOTNOTE_AUTOLEAD and/or FOOTNOTE_RULE_ADJ.
+\# Sometimes, #VARIABLE_FOOTER_POS sets FOOTER at a location that
+\# gives the impression another line of running text could fit on
+\# the page.  VFP_CHECK is always set to the line just above the
+\# one where FOOTER will be sprung, and checks for this condition.
+\# If it exists, FOOTER is set one line lower on the page, thus
+\# squeezing in an extra line of running text.  This is a judgment
+\# call on my part, but seems to work well.  If there are problems
+\# (e.g. footnotes really do look jammed), the user should probably
+\# adjust FOOTNOTE_AUTOLEAD and/or FOOTNOTE_RULE_ADJ.
 \# 
+\# The macro has to be run in its own environment, otherwise the
+\# first word of the last line before the footnotes gets chopped.
+\#
 .MAC VFP_CHECK END
+.    ev VFP_CHECK
 \# The trap also has to be removed each time VFP_CHECK is run
 .    if \\n[#PRINT_STYLE]=2 \{\
 .       ch VFP_CHECK
@@ -10695,6 +10698,7 @@
 .          \}
 .       \}
 .    \}
+.    ev
 .END
 \#
 \# FN_OVERFLOW_TRAP starts off "underneath" FOOTER, but is revealed as



From MAILER-DAEMON Sat Dec 11 07:19:13 2004
Received: from mailman by lists.gnu.org with archive (Exim 4.33)
	id 1Cd6DR-0003JJ-5S
	for mharc-groff-commit@gnu.org; Sat, 11 Dec 2004 07:19:13 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1Cd6DN-0003HS-Fu
	for groff-commit@gnu.org; Sat, 11 Dec 2004 07:19:09 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1Cd6DK-0003G5-SE
	for groff-commit@gnu.org; Sat, 11 Dec 2004 07:19:07 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1Cd6DK-0003FH-Jd
	for groff-commit@gnu.org; Sat, 11 Dec 2004 07:19:06 -0500
Received: from [199.232.41.5] (helo=mx20.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.34) id 1Cd631-0005B8-Tw
	for groff-commit@gnu.org; Sat, 11 Dec 2004 07:08:28 -0500
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by mx20.gnu.org with esmtp (Exim 4.34) id 1Cd5eT-0007nS-Ho
	for groff-commit@gnu.org; Sat, 11 Dec 2004 06:43:05 -0500
Received: from localhost ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 4.34) id 1Cd5eV-0006Cz-Th
	for groff-commit@gnu.org; Sat, 11 Dec 2004 06:43:08 -0500
To: groff-commit@gnu.org
From: Werner LEMBERG <wl@gnu.org>
Message-Id: <E1Cd6DK-0003G5-SE@lists.gnu.org>
Date: Sat, 11 Dec 2004 07:19:06 -0500
Subject: [Groff-commit] groff/contrib/pdfmark TODO 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: Sat, 11 Dec 2004 12:19:10 -0000

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

Modified files:
	contrib/pdfmark: TODO 
Added files:
	contrib/pdfmark: ChangeLog 

Log message:
	* TODO: Updated.

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

Patches:
Index: groff/contrib/pdfmark/TODO
diff -u groff/contrib/pdfmark/TODO:1.1 groff/contrib/pdfmark/TODO:1.2
--- groff/contrib/pdfmark/TODO:1.1	Wed Dec  8 08:31:17 2004
+++ groff/contrib/pdfmark/TODO	Sat Dec 11 11:43:07 2004
@@ -25,10 +25,12 @@
 
 --------
 
-Provide Makefile.sub, to integrate pdfmark.tmac installation
-into a regular groff build.  Add it to groff's Makefile.in
+Improve Makefile.sub, to integrate pdfmark.tmac installation
+into a regular groff build.  Add it to groff's Makefile.in.
 
 --------
 
-Remove gnu.eps; get it from groff's own 'doc' directory, during
-Makefile.sub execution.
+Provide a `pdfmark' script (or call it `groff2pdf'?) which
+actually converts a groff input file to pdf, and which
+takes care of the necessary intermediate steps to handle
+PDF marks.



From MAILER-DAEMON Sat Dec 11 12:13:26 2004
Received: from mailman by lists.gnu.org with archive (Exim 4.33)
	id 1CdAoA-00038W-Io
	for mharc-groff-commit@gnu.org; Sat, 11 Dec 2004 12:13:26 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1CdAo7-00037j-PO
	for groff-commit@gnu.org; Sat, 11 Dec 2004 12:13:23 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1CdAo6-00037A-Og
	for groff-commit@gnu.org; Sat, 11 Dec 2004 12:13:22 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1CdAo6-000370-Mq
	for groff-commit@gnu.org; Sat, 11 Dec 2004 12:13:22 -0500
Received: from [199.232.41.4] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.34) id 1CdAdt-0003SM-ER
	for groff-commit@gnu.org; Sat, 11 Dec 2004 12:02:49 -0500
Received: from localhost ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 4.34) id 1CdAdu-0002M1-NB
	for groff-commit@gnu.org; Sat, 11 Dec 2004 12:02:51 -0500
To: groff-commit@gnu.org
From: Werner LEMBERG <wl@gnu.org>
Message-Id: <E1CdAo6-00037A-Og@lists.gnu.org>
Date: Sat, 11 Dec 2004 12:13:22 -0500
Subject: [Groff-commit] groff ./ChangeLog ./Makefile.in ./NEWS contrib/...
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, 11 Dec 2004 17:13:24 -0000

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

Modified files:
	.              : ChangeLog Makefile.in NEWS 
Added files:
	contrib/gdiffmk: Makefile.sub gdiffmk.man gdiffmk.sh 

Log message:
	Import Mike's `gdiffmk' package.
	
	* contrib/gdiffmk/*: New files.
	* Makefile.in (OTHERDIRS): Add contrib/gdiffmk.
	* NEWS: Updated.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/ChangeLog.diff?tr1=1.770&tr2=1.771&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/Makefile.in.diff?tr1=1.81&tr2=1.82&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/NEWS.diff?tr1=1.198&tr2=1.199&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/gdiffmk/Makefile.sub?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/gdiffmk/gdiffmk.man?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/gdiffmk/gdiffmk.sh?rev=1.1

Patches:
Index: groff/ChangeLog
diff -u groff/ChangeLog:1.770 groff/ChangeLog:1.771
--- groff/ChangeLog:1.770	Wed Dec  8 08:31:17 2004
+++ groff/ChangeLog	Sat Dec 11 17:02:50 2004
@@ -1,3 +1,11 @@
+2004-12-10  Werner LEMBERG  <wl@gnu.org>
+
+	Import Mike's `gdiffmk' package.
+
+	* contrib/gdiffmk/*: New files.
+	* Makefile.in (OTHERDIRS): Add contrib/gdiffmk.
+	* NEWS: Updated.
+
 2004-12-08  Werner LEMBERG  <wl@gnu.org>
 
 	Import Keith's `pdfmark' package.  Integration is very preliminary.
Index: groff/Makefile.in
diff -u groff/Makefile.in:1.81 groff/Makefile.in:1.82
--- groff/Makefile.in:1.81	Wed Dec  8 14:42:58 2004
+++ groff/Makefile.in	Sat Dec 11 17:02:50 2004
@@ -530,7 +530,8 @@
   contrib/grap2graph \
   contrib/groffer \
   contrib/mom \
-  contrib/pdfmark
+  contrib/pdfmark \
+  contrib/gdiffmk
 ALLDIRS=$(INCDIRS) $(LIBDIRS) $(PROGDIRS) \
   $(DEVDIRS) $(XDEVDIRS) $(OTHERDEVDIRS) $(TTYDEVDIRS) $(OTHERDIRS)
 EXTRADIRS=\
Index: groff/NEWS
diff -u groff/NEWS:1.198 groff/NEWS:1.199
--- groff/NEWS:1.198	Wed Dec  8 08:31:17 2004
+++ groff/NEWS	Sat Dec 11 17:02:50 2004
@@ -52,6 +52,13 @@
 
 o A security problem (reported as CAN-2004-0969) has been fixed.
 
+Gdiffmk
+-------
+
+o A new script contributed by Mike Bianchi.  It compares two groff, nroff,
+  or troff documents and creates an output with added margin characters
+  (using `.mc') to indicate the differences.
+
 Macro packages
 --------------
 



From MAILER-DAEMON Sat Dec 11 12:13:26 2004
Received: from mailman by lists.gnu.org with archive (Exim 4.33)
	id 1CdAoA-00038J-Ej
	for mharc-groff-commit@gnu.org; Sat, 11 Dec 2004 12:13:26 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1CdAo7-00037f-NW
	for groff-commit@gnu.org; Sat, 11 Dec 2004 12:13:23 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1CdAo6-000373-K9
	for groff-commit@gnu.org; Sat, 11 Dec 2004 12:13:22 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1CdAo6-000370-H6
	for groff-commit@gnu.org; Sat, 11 Dec 2004 12:13:22 -0500
Received: from [199.232.41.4] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.34) id 1CdAcI-00037b-RL
	for groff-commit@gnu.org; Sat, 11 Dec 2004 12:01:10 -0500
Received: from localhost ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 4.34) id 1CdAcD-0002I5-Nl
	for groff-commit@gnu.org; Sat, 11 Dec 2004 12:01:08 -0500
To: groff-commit@gnu.org
From: Werner LEMBERG <wl@gnu.org>
Message-Id: <E1CdAo6-000373-K9@lists.gnu.org>
Date: Sat, 11 Dec 2004 12:13:22 -0500
Subject: [Groff-commit] groff/contrib/gdiffmk
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, 11 Dec 2004 17:13:24 -0000

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

groff/contrib/gdiffmk

Update of /cvsroot/groff/groff/contrib/gdiffmk
In directory savannah:/tmp/cvs-serv8803/gdiffmk

Log Message:
Directory /cvsroot/groff/groff/contrib/gdiffmk added to the repository




From MAILER-DAEMON Sun Dec 12 09:16:03 2004
Received: from mailman by lists.gnu.org with archive (Exim 4.33)
	id 1CdUW3-0005kd-OM
	for mharc-groff-commit@gnu.org; Sun, 12 Dec 2004 09:16:03 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1CdUW1-0005jr-8D
	for groff-commit@gnu.org; Sun, 12 Dec 2004 09:16:01 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1CdUW0-0005jD-51
	for groff-commit@gnu.org; Sun, 12 Dec 2004 09:16:00 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1CdUVz-0005im-NC
	for groff-commit@gnu.org; Sun, 12 Dec 2004 09:15:59 -0500
Received: from [199.232.41.4] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.34) id 1CdULD-0006V6-If
	for groff-commit@gnu.org; Sun, 12 Dec 2004 09:04:51 -0500
Received: from localhost ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 4.34) id 1CdULG-0003qZ-07
	for groff-commit@gnu.org; Sun, 12 Dec 2004 09:04:54 -0500
To: groff-commit@gnu.org
From: Werner LEMBERG <wl@gnu.org>
Message-Id: <E1CdUW0-0005jD-51@lists.gnu.org>
Date: Sun, 12 Dec 2004 09:16:00 -0500
Subject: [Groff-commit] groff/contrib/gdiffmk Makefile.sub gdiffmk.man ...
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: groff-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/groff-commit>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 12 Dec 2004 14:16:01 -0000

CVSROOT:	/cvsroot/groff
Module name:	groff
Branch: 	
Changes by:	Werner LEMBERG <wl@gnu.org>	04/12/12 14:04:53

Modified files:
	contrib/gdiffmk: Makefile.sub gdiffmk.man gdiffmk.sh 

Log message:
	Cosmetical fixes.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/gdiffmk/Makefile.sub.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/gdiffmk/gdiffmk.man.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/gdiffmk/gdiffmk.sh.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: groff/contrib/gdiffmk/Makefile.sub
diff -u groff/contrib/gdiffmk/Makefile.sub:1.1 groff/contrib/gdiffmk/Makefile.sub:1.2
--- groff/contrib/gdiffmk/Makefile.sub:1.1	Sat Dec 11 17:02:50 2004
+++ groff/contrib/gdiffmk/Makefile.sub	Sun Dec 12 14:04:52 2004
@@ -2,12 +2,12 @@
 
 # File position: <groff-source>/contrib/gdiffmk/Makefile.sub
 
-# Last update: 11 December 2004
+# Last update: 12 December 2004
 
 # Copyright (C) 2004 Free Software Foundation, Inc.
 # Written by Mike Bianchi <MBianchi@Foveal.com <mailto:MBianchi@Foveal.com>>
 
-# This file is part of groff.
+# This file is part of the gdiffmk utility, which is part of groff.
 
 # groff is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
Index: groff/contrib/gdiffmk/gdiffmk.man
diff -u groff/contrib/gdiffmk/gdiffmk.man:1.1 groff/contrib/gdiffmk/gdiffmk.man:1.2
--- groff/contrib/gdiffmk/gdiffmk.man:1.1	Sat Dec 11 17:02:50 2004
+++ groff/contrib/gdiffmk/gdiffmk.man	Sun Dec 12 14:04:53 2004
@@ -1,5 +1,8 @@
 .ig \"-*- nroff -*-
-Copyright (C) 1989-1995, 2004 Free Software Foundation, Inc.
+Copyright (C) 2004 Free Software Foundation, Inc.
+
+This file is part of the gdiffmk utility, which is part of groff.
+Written by Mike Bianchi <MBianchi@Foveal.com <mailto:MBianchi@Foveal.com>>
 
 Permission is granted to make and distribute verbatim copies of
 this manual provided the copyright notice and this permission notice
Index: groff/contrib/gdiffmk/gdiffmk.sh
diff -u groff/contrib/gdiffmk/gdiffmk.sh:1.1 groff/contrib/gdiffmk/gdiffmk.sh:1.2
--- groff/contrib/gdiffmk/gdiffmk.sh:1.1	Sat Dec 11 17:02:50 2004
+++ groff/contrib/gdiffmk/gdiffmk.sh	Sun Dec 12 14:04:53 2004
@@ -1,21 +1,24 @@
 #!/bin/sh
-# This file is part of GNU gdiffmk.
-#
-# GNU gdiffmk is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any
-# later version.
-#
-# GNU gdiffmk is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# Written by Mike Bianchi <MBianchi@Foveal.com <mailto:MBianchi@Foveal.com>>
+
+# This file is part of the gdiffmk utility, which is part of groff.
+
+# groff is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# groff is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
+# License for more details.
+
 # You should have received a copy of the GNU General Public License
-# along with gdiffmk; see the file COPYING.  If not, write to the
-#    Free Software Foundation, Inc.
-#    59 Temple Place - Suite 330
-#    Boston, MA 02111-1307, USA.
+# along with groff; see the files COPYING and LICENSE in the top
+# directory of the groff source.  If not, write to the Free Software
+# Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# This file is part of GNU gdiffmk.
 
 
 cmd=$( basename $0 )



From MAILER-DAEMON Sun Dec 12 15:18:32 2004
Received: from mailman by lists.gnu.org with archive (Exim 4.33)
	id 1CdaAq-0003MU-FK
	for mharc-groff-commit@gnu.org; Sun, 12 Dec 2004 15:18:32 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1CdaAo-0003LZ-PO
	for groff-commit@gnu.org; Sun, 12 Dec 2004 15:18:30 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1CdaAm-0003K8-AF
	for groff-commit@gnu.org; Sun, 12 Dec 2004 15:18:28 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1CdaAm-0003K5-79
	for groff-commit@gnu.org; Sun, 12 Dec 2004 15:18:28 -0500
Received: from [199.232.41.4] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.34) id 1CdZym-0001Nc-Jn
	for groff-commit@gnu.org; Sun, 12 Dec 2004 15:06:04 -0500
Received: from localhost ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 4.34) id 1CdZyo-0005HE-Un
	for groff-commit@gnu.org; Sun, 12 Dec 2004 15:06:09 -0500
To: groff-commit@gnu.org
From: Werner LEMBERG <wl@gnu.org>
Message-Id: <E1CdaAm-0003K8-AF@lists.gnu.org>
Date: Sun, 12 Dec 2004 15:18:28 -0500
Subject: [Groff-commit] groff/contrib/pdfmark 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: Sun, 12 Dec 2004 20:18:31 -0000

CVSROOT:	/cvsroot/groff
Module name:	groff
Branch: 	
Changes by:	Werner LEMBERG <wl@gnu.org>	04/12/12 20:06:05

Modified files:
	contrib/pdfmark: ChangeLog 

Log message:
	

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

Patches:
Index: groff/contrib/pdfmark/ChangeLog
diff -u groff/contrib/pdfmark/ChangeLog:1.1 groff/contrib/pdfmark/ChangeLog:1.2
--- groff/contrib/pdfmark/ChangeLog:1.1	Sat Dec 11 11:43:07 2004
+++ groff/contrib/pdfmark/ChangeLog	Sun Dec 12 20:06:04 2004
@@ -1,7 +1,7 @@
-2004-12-08  Keith Marshall  <keith.d.marshall@ntlworld.com>
-
-	First import of pdfmark files.
-
 2004-12-10  Werner LEMBERG  <wl@gnu.org>
 
 	* TODO: Updated.
+
+2004-12-08  Keith Marshall  <keith.d.marshall@ntlworld.com>
+
+	First import of pdfmark files.



From MAILER-DAEMON Sun Dec 12 15:18:33 2004
Received: from mailman by lists.gnu.org with archive (Exim 4.33)
	id 1CdaAq-0003Mg-Nl
	for mharc-groff-commit@gnu.org; Sun, 12 Dec 2004 15:18:32 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1CdaAo-0003Lf-Tc
	for groff-commit@gnu.org; Sun, 12 Dec 2004 15:18:31 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1CdaAn-0003Kv-Bc
	for groff-commit@gnu.org; Sun, 12 Dec 2004 15:18:29 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1CdaAm-0003Ki-V9
	for groff-commit@gnu.org; Sun, 12 Dec 2004 15:18:29 -0500
Received: from [199.232.41.4] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.34) id 1CdZzX-0001WI-5H
	for groff-commit@gnu.org; Sun, 12 Dec 2004 15:06:51 -0500
Received: from localhost ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 4.34) id 1CdZzb-0005N4-RJ
	for groff-commit@gnu.org; Sun, 12 Dec 2004 15:06:56 -0500
To: groff-commit@gnu.org
From: Werner LEMBERG <wl@gnu.org>
Message-Id: <E1CdaAn-0003Kv-Bc@lists.gnu.org>
Date: Sun, 12 Dec 2004 15:18:29 -0500
Subject: [Groff-commit] groff/contrib/gdiffmk ChangeLog README
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: groff-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/groff-commit>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 12 Dec 2004 20:18:31 -0000

CVSROOT:	/cvsroot/groff
Module name:	groff
Branch: 	
Changes by:	Werner LEMBERG <wl@gnu.org>	04/12/12 20:06:55

Added files:
	contrib/gdiffmk: ChangeLog README 

Log message:
	* README: New file.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/gdiffmk/ChangeLog?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/gdiffmk/README?rev=1.1




From MAILER-DAEMON Mon Dec 13 16:17:04 2004
Received: from mailman by lists.gnu.org with archive (Exim 4.33)
	id 1CdxZ1-0003fR-V7
	for mharc-groff-commit@gnu.org; Mon, 13 Dec 2004 16:17:04 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1CdxYx-0003c5-41
	for groff-commit@gnu.org; Mon, 13 Dec 2004 16:17:01 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1CdxYu-0003ZV-7V
	for groff-commit@gnu.org; Mon, 13 Dec 2004 16:16:57 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1CdxYt-0003Z2-HU
	for groff-commit@gnu.org; Mon, 13 Dec 2004 16:16:55 -0500
Received: from [199.232.41.4] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.34) id 1CdxLu-0005lQ-5u
	for groff-commit@gnu.org; Mon, 13 Dec 2004 16:03:30 -0500
Received: from localhost ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 4.34) id 1CdxCB-0007QG-BX
	for groff-commit@gnu.org; Mon, 13 Dec 2004 15:53:27 -0500
To: groff-commit@gnu.org
From: Werner LEMBERG <wl@gnu.org>
Message-Id: <E1CdxYu-0003ZV-7V@lists.gnu.org>
Date: Mon, 13 Dec 2004 16:16:57 -0500
Subject: [Groff-commit] groff/contrib/gdiffmk ChangeLog gdiffmk.man gdi...
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, 13 Dec 2004 21:17:02 -0000

CVSROOT:	/cvsroot/groff
Module name:	groff
Branch: 	
Changes by:	Werner LEMBERG <wl@gnu.org>	04/12/13 20:53:27

Modified files:
	contrib/gdiffmk: ChangeLog gdiffmk.man gdiffmk.sh 

Log message:
	Add `-x' command line option to select a diff program.
	
	* gdiffmk.sh: Add code to handle `-x'.
	Move test for working `diff' down.
	Fix sed pattern.
	(Usage): Updated.
	* gdiffmk.man: Updated.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/gdiffmk/ChangeLog.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/gdiffmk/gdiffmk.man.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/gdiffmk/gdiffmk.sh.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: groff/contrib/gdiffmk/ChangeLog
diff -u groff/contrib/gdiffmk/ChangeLog:1.1 groff/contrib/gdiffmk/ChangeLog:1.2
--- groff/contrib/gdiffmk/ChangeLog:1.1	Sun Dec 12 20:06:55 2004
+++ groff/contrib/gdiffmk/ChangeLog	Mon Dec 13 20:53:26 2004
@@ -1,3 +1,13 @@
+2004-12-13  Mike Bianchi  <MBianchi@Foveal.com>
+
+	Add `-x' command line option to select a diff program.
+
+	* gdiffmk.sh: Add code to handle `-x'.
+	Move test for working `diff' down.
+	Fix sed pattern.
+	(Usage): Updated.
+	* gdiffmk.man: Updated.
+
 2004-12-12  Mike Bianchi  <MBianchi@Foveal.com>
 
 	* README: New file.
Index: groff/contrib/gdiffmk/gdiffmk.man
diff -u groff/contrib/gdiffmk/gdiffmk.man:1.2 groff/contrib/gdiffmk/gdiffmk.man:1.3
--- groff/contrib/gdiffmk/gdiffmk.man:1.2	Sun Dec 12 14:04:53 2004
+++ groff/contrib/gdiffmk/gdiffmk.man	Mon Dec 13 20:53:26 2004
@@ -43,6 +43,7 @@
 .OP \-a \%addmark
 .OP \-c \%changemark
 .OP \-d \%deletemark
+.OP \-x \%diffcmd
 .OP \-\-
 .OP \-\-help
 .OP \-\-version
@@ -51,6 +52,8 @@
 [
 .I \%output
 ]
+.br
+.ad \na
 .
 .
 .SH DESCRIPTION
@@ -125,6 +128,22 @@
 .BR * .
 .
 .TP
+.BI \-x diffcmd
+Use the
+.I diffcmd
+command to perform the comparison of
+.I file1
+and
+.I file2 .
+In particular,
+.I diffcmd
+should accept the
+.BI \-D name
+option.
+Default:
+.BR diff (1).
+.
+.TP
 .B \-\-
 All the following arguments are treated as file names,
 even if they begin with
@@ -150,13 +169,16 @@
 .LP
 .B gdiffmk
 relies on the
-.B \-D
+.BI \-D name
 option of GNU
 .BR diff (1)
 to make a merged `#ifdef' output format.
 It hasn't been tested whether other versions of
 .BR diff (1)
 do support this option.
+See also the
+.BI \-x diffcmd
+option.
 .
 .LP
 Report bugs to bug-groff@gnu.org.
Index: groff/contrib/gdiffmk/gdiffmk.sh
diff -u groff/contrib/gdiffmk/gdiffmk.sh:1.2 groff/contrib/gdiffmk/gdiffmk.sh:1.3
--- groff/contrib/gdiffmk/gdiffmk.sh:1.2	Sun Dec 12 14:04:53 2004
+++ groff/contrib/gdiffmk/gdiffmk.sh	Mon Dec 13 20:53:26 2004
@@ -23,16 +23,6 @@
 
 cmd=$( basename $0 )
 
-diff -Dx /dev/null /dev/null >/dev/null 2>&1  ||
-	{
-		echo >&2 "${cmd}:  "				\
-			"The \`diff' program does not accept "	\
-			"the required -DNAME option."
-		echo >&2 "${cmd}:  "				\
-			"Use GNU diff instead."
-		exit 126
-	}
-
 function Usage {
 	if test "$#" -gt 0
 	then
@@ -51,12 +41,14 @@
   OUTPUT  Copy of FILE2 with \`.mc' commands added.
           \`-' means standard output (the default).
 
-options:
+OPTIONS:
   -a addmark     Mark for added groff source lines.    Default: +.
   -c changemark  Mark for changed groff source lines.  Default: |.
   -d deletemark  Mark for deleted groff source lines.  Default: *.
-  --version      Print version information on standard output and exit.
-  --help         Print this message on standard error.
+  -x diffcmd     Use a different diff(1) command;
+  	          one that accepts the \`-Dname' option, such as GNU diff.
+  --version      Print version information on the standard output and exit.
+  --help         Print this message on the standard error.
 "
 	exit 255
 }
@@ -150,19 +142,24 @@
 }
 
 badoption=
-for option
+diffcmd=diff
+for OPTION
 do
-	case "${option}" in
+	case "${OPTION}" in
 	-a*)
-		addmark=$( RequiresArgument "${option}" $2 )		&&
+		addmark=$( RequiresArgument "${OPTION}" $2 )		&&
 			shift
 		;;
 	-c*)
-		changemark=$( RequiresArgument "${option}" $2 )		&&
+		changemark=$( RequiresArgument "${OPTION}" $2 )		&&
 			shift
 		;;
 	-d*)
-		deletemark=$( RequiresArgument "${option}" $2 )		&&
+		deletemark=$( RequiresArgument "${OPTION}" $2 )		&&
+			shift
+		;;
+	-x* )
+		diffcmd=$( RequiresArgument "${OPTION}" $2 )		&&
 			shift
 		;;
 	--version)
@@ -190,6 +187,11 @@
 	shift
 done
 
+${diffcmd} -Dx /dev/null /dev/null >/dev/null 2>&1  ||
+	Usage "The \`${diffcmd}' program does not accept"	\
+		"the required \`-Dname' option.
+Use GNU diff instead.  See the \`-x diffcmd' option."
+
 if test -n "${badoption}"
 then
 	Usage "${badoption}"
@@ -246,7 +248,11 @@
 		    p
 		    d
 		  }
-		  /^#endif \/\* not '"${label}"'/ s/.*/.mc '"${deletemark}"'/p
+		  /^#endif \/\* not '"${label}"'/ {
+		   s/.*/.mc '"${deletemark}"'/p
+		   a\
+.mc
+		  }
 		  d
 		}
 		p



From MAILER-DAEMON Tue Dec 14 19:12:40 2004
Received: from mailman by lists.gnu.org with archive (Exim 4.33)
	id 1CeMmU-0003JN-OD
	for mharc-groff-commit@gnu.org; Tue, 14 Dec 2004 19:12:40 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1CeMmT-0003Iu-7q
	for groff-commit@gnu.org; Tue, 14 Dec 2004 19:12:37 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1CeMmR-0003IM-SD
	for groff-commit@gnu.org; Tue, 14 Dec 2004 19:12:36 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1CeMmR-0003IJ-Cz
	for groff-commit@gnu.org; Tue, 14 Dec 2004 19:12:35 -0500
Received: from [199.232.41.4] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.34) id 1CeML8-00055f-AE
	for groff-commit@gnu.org; Tue, 14 Dec 2004 18:44:22 -0500
Received: from localhost ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 4.34) id 1CeMDK-0008WU-QP
	for groff-commit@gnu.org; Tue, 14 Dec 2004 18:36:18 -0500
To: groff-commit@gnu.org
From: Werner LEMBERG <wl@gnu.org>
Message-Id: <E1CeMmR-0003IM-SD@lists.gnu.org>
Date: Tue, 14 Dec 2004 19:12:35 -0500
Subject: [Groff-commit] groff/contrib/gdiffmk/tests
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, 15 Dec 2004 00:12:37 -0000

CVSROOT:	/cvsroot/groff
Module name:	groff
Branch: 	
Changes by:	Werner LEMBERG <wl@gnu.org>	04/12/14 23:36:18

groff/contrib/gdiffmk/tests

Update of /cvsroot/groff/groff/contrib/gdiffmk/tests
In directory savannah:/tmp/cvs-serv32749/tests

Log Message:
Directory /cvsroot/groff/groff/contrib/gdiffmk/tests added to the repository




From MAILER-DAEMON Wed Dec 15 01:26:05 2004
Received: from mailman by lists.gnu.org with archive (Exim 4.33)
	id 1CeSbt-0000EL-0E
	for mharc-groff-commit@gnu.org; Wed, 15 Dec 2004 01:26:05 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1CeSbp-0000DC-QH
	for groff-commit@gnu.org; Wed, 15 Dec 2004 01:26:02 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1CeSbm-0000BI-ES
	for groff-commit@gnu.org; Wed, 15 Dec 2004 01:25:58 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1CeSbm-0000BF-Aa
	for groff-commit@gnu.org; Wed, 15 Dec 2004 01:25:58 -0500
Received: from [199.232.41.4] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.34) id 1CeSOn-0008Ex-1x
	for groff-commit@gnu.org; Wed, 15 Dec 2004 01:12:34 -0500
Received: from localhost ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 4.34) id 1CeSHy-000870-9N
	for groff-commit@gnu.org; Wed, 15 Dec 2004 01:05:32 -0500
To: groff-commit@gnu.org
From: Werner LEMBERG <wl@gnu.org>
Message-Id: <E1CeSbm-0000BI-ES@lists.gnu.org>
Date: Wed, 15 Dec 2004 01:25:58 -0500
Subject: [Groff-commit] groff/contrib/gdiffmk/tests .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: Wed, 15 Dec 2004 06:26:02 -0000

CVSROOT:	/cvsroot/groff
Module name:	groff
Branch: 	
Changes by:	Werner LEMBERG <wl@gnu.org>	04/12/15 06:05:30

Added files:
	contrib/gdiffmk/tests: .cvsignore 

Log message:
	

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/gdiffmk/tests/.cvsignore?rev=1.1




From MAILER-DAEMON Wed Dec 15 01:37:39 2004
Received: from mailman by lists.gnu.org with archive (Exim 4.33)
	id 1CeSn3-0000P9-KF
	for mharc-groff-commit@gnu.org; Wed, 15 Dec 2004 01:37:38 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1CeSmz-0000Mw-EU
	for groff-commit@gnu.org; Wed, 15 Dec 2004 01:37:33 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1CeSmw-0000LE-6V
	for groff-commit@gnu.org; Wed, 15 Dec 2004 01:37:31 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1CeSmw-0000Kz-33
	for groff-commit@gnu.org; Wed, 15 Dec 2004 01:37:30 -0500
Received: from [199.232.41.5] (helo=mx20.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.34) id 1CeScX-0003JO-9N
	for groff-commit@gnu.org; Wed, 15 Dec 2004 01:26:45 -0500
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by mx20.gnu.org with esmtp (Exim 4.34) id 1CeSCr-0000Id-MK
	for groff-commit@gnu.org; Wed, 15 Dec 2004 01:00:13 -0500
Received: from localhost ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 4.34) id 1CeSHJ-00081f-CC
	for groff-commit@gnu.org; Wed, 15 Dec 2004 01:04:49 -0500
To: groff-commit@gnu.org
From: Werner LEMBERG <wl@gnu.org>
Message-Id: <E1CeSmw-0000LE-6V@lists.gnu.org>
Date: Wed, 15 Dec 2004 01:37:30 -0500
Subject: [Groff-commit] groff/contrib/gdiffmk ChangeLog README gdiffmk....
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, 15 Dec 2004 06:37:35 -0000

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

Modified files:
	contrib/gdiffmk: ChangeLog README gdiffmk.man gdiffmk.sh 
Added files:
	contrib/gdiffmk/tests: file1 file2 test_baseline test_baseline6 
	                       test_baseline7 tests.sh 

Log message:
	* gdiffmk.sh: Make sed pattern work with alternate result of GNU
	diff's -D option, using `!' instead of `not' in #endif comments.
	(Exit): Use prefix for each emitted message line.
	
	* tests/*: New files for testing gdiffmk.
	
	* README, gdiffmk.man, gdiffmk.sh: Updated.
	Minor fixes.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/gdiffmk/ChangeLog.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/gdiffmk/README.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/gdiffmk/gdiffmk.man.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/gdiffmk/gdiffmk.sh.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/gdiffmk/tests/file1?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/gdiffmk/tests/file2?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/gdiffmk/tests/test_baseline?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/gdiffmk/tests/test_baseline6?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/gdiffmk/tests/test_baseline7?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/gdiffmk/tests/tests.sh?rev=1.1

Patches:
Index: groff/contrib/gdiffmk/ChangeLog
diff -u groff/contrib/gdiffmk/ChangeLog:1.2 groff/contrib/gdiffmk/ChangeLog:1.3
--- groff/contrib/gdiffmk/ChangeLog:1.2	Mon Dec 13 20:53:26 2004
+++ groff/contrib/gdiffmk/ChangeLog	Wed Dec 15 06:04:48 2004
@@ -1,10 +1,23 @@
+2004-12-14  Werner LEMBERG  <wl@gnu.org>
+
+	* gdiffmk.sh: Make sed pattern work with alternate result of GNU
+	diff's -D option, using `!' instead of `not' in #endif comments.
+	(Exit): Use prefix for each emitted message line.
+
+2004-12-14  Mike Bianchi  <MBianchi@Foveal.com>
+
+	* tests/*: New files for testing gdiffmk.
+
+	* README, gdiffmk.man, gdiffmk.sh: Updated.
+	Minor fixes.
+
 2004-12-13  Mike Bianchi  <MBianchi@Foveal.com>
 
 	Add `-x' command line option to select a diff program.
 
 	* gdiffmk.sh: Add code to handle `-x'.
 	Move test for working `diff' down.
-	Fix sed pattern.
+	Fix sed pattern -- `.mc *' needs to be followed by `.mc .'.
 	(Usage): Updated.
 	* gdiffmk.man: Updated.
 
Index: groff/contrib/gdiffmk/README
diff -u groff/contrib/gdiffmk/README:1.1 groff/contrib/gdiffmk/README:1.2
--- groff/contrib/gdiffmk/README:1.1	Sun Dec 12 20:06:55 2004
+++ groff/contrib/gdiffmk/README	Wed Dec 15 06:04:48 2004
@@ -3,35 +3,41 @@
 
 It should not be confused with diffmk commands that operate on XML.
 
-The inspiration for this code was a Perl 2 version written in 1989 by Randal L.
-Schwartz.  Thanks to Werner Lemberg for help in making the package more
-portable and fit into the GNU groff source structure.
+The inspiration for this code was a Perl 2 version written in 1989 by Randal
+L. Schwartz.  See
 	
-http://www.landfield.com/software/comp.sources.misc/archive-name/volume06/diffmk.p.gz
+  landfield.com/software/comp.sources.misc/archive-name/volume06/diffmk.p.gz
 
-Gnu diff(1) with the -Dname option does all of the work and sed(1) translates
-the output into something groff/troff/nroff can handle.
+Thanks to Werner Lemberg for help in making the package more portable and
+fit into the GNU groff source structure.
 
-Note the BUGS on the man page.
-
-$Header: /cvsroot/groff/groff/contrib/gdiffmk/README,v 1.1 2004/12/12 20:06:55 wl Exp $
+Gnu diff(1) with the -Dname option does all of the work and sed(1)
+translates the output into something groff/troff/nroff can handle.
 
-# Copyright (C) 2004 Free Software Foundation, Inc.
-# Written by Mike Bianchi <MBianchi@Foveal.com <mailto:MBianchi@Foveal.com>>
-
-# This file is part of the gdiffmk utility, which is part of groff.
+Note the BUGS on the man page.
 
-# groff is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# groff is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-# or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
-# License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with groff; see the files COPYING and LICENSE in the top
-# directory of the groff source.  If not, write to the Free Software
-# Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+The `tests' directory contains simple tests.  `tests.sh run' runs them and
+compares the output against baseline files.  Calling `tests.sh' without
+argument gives the usage.
+
+----------------------------------------------------------------------------
+
+Copyright (C) 2004 Free Software Foundation, Inc.
+Written by Mike Bianchi <MBianchi@Foveal.com <mailto:MBianchi@Foveal.com>>
+
+This file is part of the gdiffmk utility, which is part of groff.
+
+groff is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+groff is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
+License for more details.
+
+You should have received a copy of the GNU General Public License
+along with groff; see the files COPYING and LICENSE in the top
+directory of the groff source.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
Index: groff/contrib/gdiffmk/gdiffmk.man
diff -u groff/contrib/gdiffmk/gdiffmk.man:1.3 groff/contrib/gdiffmk/gdiffmk.man:1.4
--- groff/contrib/gdiffmk/gdiffmk.man:1.3	Mon Dec 13 20:53:26 2004
+++ groff/contrib/gdiffmk/gdiffmk.man	Wed Dec 15 06:04:48 2004
@@ -134,7 +134,7 @@
 command to perform the comparison of
 .I file1
 and
-.I file2 .
+.IR file2 .
 In particular,
 .I diffcmd
 should accept the
Index: groff/contrib/gdiffmk/gdiffmk.sh
diff -u groff/contrib/gdiffmk/gdiffmk.sh:1.3 groff/contrib/gdiffmk/gdiffmk.sh:1.4
--- groff/contrib/gdiffmk/gdiffmk.sh:1.3	Mon Dec 13 20:53:26 2004
+++ groff/contrib/gdiffmk/gdiffmk.sh	Wed Dec 15 06:04:48 2004
@@ -57,7 +57,11 @@
 function Exit {
 	exitcode=$1
 	shift
-	echo >&2 "${cmd}:  $@"
+	for arg
+	do
+		echo >&2 "${cmd}:  $1"
+		shift
+	done
 	exit ${exitcode}
 }
 
@@ -74,11 +78,11 @@
 
 	if test ! -e "$2"
 	then
-		Exit $1  "File \`$2' not found."
+		Exit $1 "File \`$2' not found."
 	fi
 	if test ! -r "$2"
 	then
-		Exit $1  "File \`$2' not readable."
+		Exit $1 "File \`$2' not readable."
 	fi
 }
 
@@ -101,7 +105,7 @@
 			Exit $1 "File \`$2' not created; " \
 			  "Cannot write directory \`$( dirname "$2" )'."
 		fi
-		Exit $1  "File \`$2' not writeable."
+		Exit $1 "File \`$2' not writeable."
 	fi
 }
 
@@ -114,7 +118,9 @@
 
 	if test "$1" -ef "$3"
 	then
-		Exit 3 "\`$3' is the same as \`$2' and would be clobbered."
+		Exit 3 \
+		  "The $2 and OUTPUT arguments both point to the same file," \
+		  "\`$1', and it would be overwritten."
 	fi
 }
 
@@ -241,14 +247,14 @@
 		  p
 		  d
 		}
-		/^#ifndef '"${label}"'/,/^#endif \/\* [not ]*'"${label}"'/ {
+		/^#ifndef '"${label}"'/,/^#endif \/\* [!not ]*'"${label}"'/ {
 		  /^#else \/\* '"${label}"'/,/^#endif \/\* '"${label}"'/ {
 		    /^#else \/\* '"${label}"'/    s/.*/.mc '"${changemark}"'/
 		    /^#endif \/\* '"${label}"'/   s/.*/.mc/
 		    p
 		    d
 		  }
-		  /^#endif \/\* not '"${label}"'/ {
+		  /^#endif \/\* \(not\|!\) '"${label}"'/ {
 		   s/.*/.mc '"${deletemark}"'/p
 		   a\
 .mc



From MAILER-DAEMON Thu Dec 16 08:34:01 2004
Received: from mailman by lists.gnu.org with archive (Exim 4.33)
	id 1CevlX-0007Lv-JL
	for mharc-groff-commit@gnu.org; Thu, 16 Dec 2004 08:34:01 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1CevlS-0007Dq-JT
	for groff-commit@gnu.org; Thu, 16 Dec 2004 08:33:56 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1CevlN-00079Y-Iz
	for groff-commit@gnu.org; Thu, 16 Dec 2004 08:33:52 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1CevlN-00077L-64
	for groff-commit@gnu.org; Thu, 16 Dec 2004 08:33:49 -0500
Received: from [199.232.41.4] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.34) id 1CevaY-0002hN-D5
	for groff-commit@gnu.org; Thu, 16 Dec 2004 08:22:38 -0500
Received: from localhost ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 4.34) id 1CevOF-0001Ot-4i
	for groff-commit@gnu.org; Thu, 16 Dec 2004 08:09:55 -0500
To: groff-commit@gnu.org
From: Werner LEMBERG <wl@gnu.org>
Message-Id: <E1CevlN-00079Y-Iz@lists.gnu.org>
Date: Thu, 16 Dec 2004 08:33:51 -0500
Subject: [Groff-commit] groff ./ChangeLog ./INSTALL ./test-groff.in 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: Thu, 16 Dec 2004 13:33:57 -0000

CVSROOT:	/cvsroot/groff
Module name:	groff
Branch: 	
Changes by:	Werner LEMBERG <wl@gnu.org>	04/12/16 13:09:54

Modified files:
	.              : ChangeLog INSTALL test-groff.in 
	src/devices/grohtml: post-html.cpp 
	src/include    : printer.h 
	src/libs/libdriver: input.cpp printer.cpp 
	src/roff/troff : env.cpp input.cpp mtsm.cpp node.cpp 
	tmac           : Makefile.sub an-old.tmac s.tmac troffrc-end 
	                 www.tmac 
Added files:
	tmac           : devtag.tmac 

Log message:
	Make `test-groff' work again -- previously, wrong paths have been
	used.  Additionally, it can now be called from anywhere.
	
	* test-groff.in: Don't test for groff binary.  This is no longer
	necessary since the proper paths are determined by `configure'.
	(EXEEXT): Removed.  No longer used.
	(srcdir, builddir): Use values provided by the configure script.
	(XENVIRONMENT): Updated.
	
	* INSTALL: Updated.
	
	Make .tag and .taga work for all devices (but only grohtml actually
	handles them).
	
	* src/devices/grohtml/post-html.cpp: s/html-tag/devtag/.
	(text_glob::is_br, page::add_tag, html_printer::troff_tag,
	html_printer::handle_assertion): Don't use hard-coded string
	lengths.
	(html_printer::lookahead_for_table): Reset `tbl' properly if
	necessary.
	(html_printer::devtag): New function, handling `devtag'.
	(html_printer::special): Don't handle `html-tag'.
	
	* src/include/printer.h, src/libs/libdriver/printer.cpp
	(printer::devtag): New virtual function.
	
	* src/libs/libdriver/input.cpp (parse_x_command) <'X'>: Handle
	`devtag'.
	
	* src/roff/troff/env.cpp, src/roff/troff/mtsm.cpp,
	src/roff/troff/node.cpp: s/html-tag/devtag/.
	
	* src/roff/troff/input.cpp (tag, taga): Always call
	curenv->add_node.
	
	* tmac/an-old.tmac, tmac/s.tmac, tmac/troffrc-end: Use DEVTAG*
	macros instead of HTML-TAG*.
	
	* tmac/devtag.tmac: New file, defining the DEVTAG-* macros.
	
	* tmac/www.tmac: Load devtag.tmac.
	Replace HTML-TAG* macros with DEVTAG* macros.
	(HTML, HTML-NS): Changed definitions.
	(URL): Use HTML-NS.
	(HTML-TAG, HTML-TAG-NS, HTML-TAG-NEXT): Removed.
	
	* tmac/Makefile.sub (NORMALFILES): Add devtag.tmac.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/ChangeLog.diff?tr1=1.771&tr2=1.772&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/INSTALL.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/test-groff.in.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/src/devices/grohtml/post-html.cpp.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/src/include/printer.h.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/src/libs/libdriver/input.cpp.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/src/libs/libdriver/printer.cpp.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/src/roff/troff/env.cpp.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/src/roff/troff/input.cpp.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/src/roff/troff/mtsm.cpp.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/src/roff/troff/node.cpp.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/tmac/devtag.tmac?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/tmac/Makefile.sub.diff?tr1=1.33&tr2=1.34&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/tmac/an-old.tmac.diff?tr1=1.48&tr2=1.49&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/tmac/s.tmac.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/tmac/troffrc-end.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/tmac/www.tmac.diff?tr1=1.36&tr2=1.37&r1=text&r2=text

Patches:
Index: groff/ChangeLog
diff -u groff/ChangeLog:1.771 groff/ChangeLog:1.772
--- groff/ChangeLog:1.771	Sat Dec 11 17:02:50 2004
+++ groff/ChangeLog	Thu Dec 16 13:09:54 2004
@@ -1,3 +1,55 @@
+2004-12-15  Werner LEMBERG  <wl@gnu.org>
+
+	Make `test-groff' work again -- previously, wrong paths have been
+	used.  Additionally, it can now be called from anywhere.
+
+	* test-groff.in: Don't test for groff binary.  This is no longer
+	necessary since the proper paths are determined by `configure'.
+	(EXEEXT): Removed.  No longer used.
+	(srcdir, builddir): Use values provided by the configure script.
+	(XENVIRONMENT): Updated.
+
+	* INSTALL: Updated.
+
+2004-12-14  Gaius Mulley  <gaius@glam.ac.uk>
+
+	Make .tag and .taga work for all devices (but only grohtml actually
+	handles them).
+
+	* src/devices/grohtml/post-html.cpp: s/html-tag/devtag/.
+	(text_glob::is_br, page::add_tag, html_printer::troff_tag,
+	html_printer::handle_assertion): Don't use hard-coded string
+	lengths.
+	(html_printer::lookahead_for_table): Reset `tbl' properly if
+	necessary.
+	(html_printer::devtag): New function, handling `devtag'.
+	(html_printer::special): Don't handle `html-tag'.
+
+	* src/include/printer.h, src/libs/libdriver/printer.cpp
+	(printer::devtag): New virtual function.
+
+	* src/libs/libdriver/input.cpp (parse_x_command) <'X'>: Handle
+	`devtag'.
+
+	* src/roff/troff/env.cpp, src/roff/troff/mtsm.cpp,
+	src/roff/troff/node.cpp: s/html-tag/devtag/.
+
+	* src/roff/troff/input.cpp (tag, taga): Always call
+	curenv->add_node.
+
+	* tmac/an-old.tmac, tmac/s.tmac, tmac/troffrc-end: Use DEVTAG*
+	macros instead of HTML-TAG*.
+
+	* tmac/devtag.tmac: New file, defining the DEVTAG-* macros.
+
+	* tmac/www.tmac: Load devtag.tmac.
+	Replace HTML-TAG* macros with DEVTAG* macros.
+	(HTML, HTML-NS): Changed definitions.
+	(URL): Use HTML-NS.
+	(HTML-TAG, HTML-TAG-NS, HTML-TAG-NEXT): Removed.
+
+	* tmac/Makefile.sub (NORMALFILES): Add devtag.tmac.
+
 2004-12-10  Werner LEMBERG  <wl@gnu.org>
 
 	Import Mike's `gdiffmk' package.
Index: groff/INSTALL
diff -u groff/INSTALL:1.12 groff/INSTALL:1.13
--- groff/INSTALL:1.12	Thu Jun  3 06:24:23 2004
+++ groff/INSTALL	Thu Dec 16 13:09:54 2004
@@ -36,8 +36,7 @@
 When you have built groff, you can use the test-groff script to try
 groff out on one of the man pages.  (Use the .n files not the .man
 files.)  The test-groff script sets up environment variables to allow
-groff to run without being installed.  The current directory must be
-the build directory when the script is run.  For example, you could do
+groff to run without being installed.  For example, you could do
 
   ./test-groff -man -Tascii src/roff/groff/groff.n | less
 
Index: groff/src/devices/grohtml/post-html.cpp
diff -u groff/src/devices/grohtml/post-html.cpp:1.16 groff/src/devices/grohtml/post-html.cpp:1.17
--- groff/src/devices/grohtml/post-html.cpp:1.16	Tue Dec  7 21:23:55 2004
+++ groff/src/devices/grohtml/post-html.cpp	Thu Dec 16 13:09:54 2004
@@ -430,7 +430,7 @@
 
   // and return start of new string
 
-  return( &tail->buffer[old_used] );
+  return &tail->buffer[old_used];
 }
 
 char *char_buffer::add_string (const string &s)
@@ -658,7 +658,7 @@
 
 int text_glob::is_eol (void)
 {
-  return is_tag && (strcmp(text_string, "html-tag:.eol") == 0);
+  return is_tag && (strcmp(text_string, "devtag:.eol") == 0);
 }
 
 /*
@@ -667,7 +667,7 @@
 
 int text_glob::is_eol_ce (void)
 {
-  return is_tag && (strcmp(text_string, "html-tag:eol.ce") == 0);
+  return is_tag && (strcmp(text_string, "devtag:eol.ce") == 0);
 }
 
 /*
@@ -676,7 +676,7 @@
 
 int text_glob::is_tl (void)
 {
-  return is_tag && (strcmp(text_string, "html-tag:.tl") == 0);
+  return is_tag && (strcmp(text_string, "devtag:.tl") == 0);
 }
 
 /*
@@ -685,7 +685,7 @@
 
 int text_glob::is_eo_tl (void)
 {
-  return is_tag && (strcmp(text_string, "html-tag:.eo.tl") == 0);
+  return is_tag && (strcmp(text_string, "devtag:.eo.tl") == 0);
 }
 
 /*
@@ -694,8 +694,8 @@
 
 int text_glob::is_nf (void)
 {
-  return is_tag && (strncmp(text_string, "html-tag:.fi",
-			    strlen("html-tag:.fi")) == 0) &&
+  return is_tag && (strncmp(text_string, "devtag:.fi",
+			    strlen("devtag:.fi")) == 0) &&
          (get_arg() == 0);
 }
 
@@ -705,8 +705,8 @@
 
 int text_glob::is_fi (void)
 {
-  return( is_tag && (strncmp(text_string, "html-tag:.fi",
-			     strlen("html-tag:.fi")) == 0) &&
+  return( is_tag && (strncmp(text_string, "devtag:.fi",
+			     strlen("devtag:.fi")) == 0) &&
 	  (get_arg() == 1) );
 }
 
@@ -716,7 +716,7 @@
 
 int text_glob::is_eo_h (void)
 {
-  return is_tag && (strcmp(text_string, "html-tag:.eo.h") == 0);
+  return is_tag && (strcmp(text_string, "devtag:.eo.h") == 0);
 }
 
 /*
@@ -725,8 +725,8 @@
 
 int text_glob::is_ce (void)
 {
-  return is_tag && (strncmp(text_string, "html-tag:.ce",
-			    strlen("html-tag:.ce")) == 0);
+  return is_tag && (strncmp(text_string, "devtag:.ce",
+			    strlen("devtag:.ce")) == 0);
 }
 
 /*
@@ -735,8 +735,8 @@
 
 int text_glob::is_in (void)
 {
-  return is_tag && (strncmp(text_string, "html-tag:.in ",
-			    strlen("html-tag:.in ")) == 0);
+  return is_tag && (strncmp(text_string, "devtag:.in ",
+			    strlen("devtag:.in ")) == 0);
 }
 
 /*
@@ -745,8 +745,8 @@
 
 int text_glob::is_po (void)
 {
-  return is_tag && (strncmp(text_string, "html-tag:.po ",
-			    strlen("html-tag:.po ")) == 0);
+  return is_tag && (strncmp(text_string, "devtag:.po ",
+			    strlen("devtag:.po ")) == 0);
 }
 
 /*
@@ -755,8 +755,8 @@
 
 int text_glob::is_ti (void)
 {
-  return is_tag && (strncmp(text_string, "html-tag:.ti ",
-			    strlen("html-tag:.ti ")) == 0);
+  return is_tag && (strncmp(text_string, "devtag:.ti ",
+			    strlen("devtag:.ti ")) == 0);
 }
 
 /*
@@ -765,7 +765,8 @@
 
 int text_glob::is_ll (void)
 {
-  return is_tag && (strncmp(text_string, "html-tag:.ll ", strlen("html-tag:.ll ")) == 0);
+  return is_tag && (strncmp(text_string, "devtag:.ll ",
+			    strlen("devtag:.ll ")) == 0);
 }
 
 /*
@@ -774,7 +775,8 @@
 
 int text_glob::is_col (void)
 {
-  return is_tag && (strncmp(text_string, "html-tag:.col", strlen("html-tag:.col")) == 0);
+  return is_tag && (strncmp(text_string, "devtag:.col",
+			    strlen("devtag:.col")) == 0);
 }
 
 /*
@@ -783,7 +785,7 @@
 
 int text_glob::is_tab_ts (void)
 {
-  return is_tag && (strcmp(text_string, "html-tag:.tab-ts") == 0);
+  return is_tag && (strcmp(text_string, "devtag:.tab-ts") == 0);
 }
 
 /*
@@ -792,7 +794,7 @@
 
 int text_glob::is_tab_te (void)
 {
-  return is_tag && (strcmp(text_string, "html-tag:.tab-te") == 0);
+  return is_tag && (strcmp(text_string, "devtag:.tab-te") == 0);
 }
 
 /*
@@ -801,7 +803,8 @@
 
 int text_glob::is_ta (void)
 {
-  return is_tag && (strncmp(text_string, "html-tag:.ta ", strlen("html-tag:.ta ")) == 0);
+  return is_tag && (strncmp(text_string, "devtag:.ta ",
+			    strlen("devtag:.ta ")) == 0);
 }
 
 /*
@@ -810,7 +813,8 @@
 
 int text_glob::is_tab (void)
 {
-  return is_tag && (strncmp(text_string, "html-tag:tab ", strlen("html-tag:tab ")) == 0);
+  return is_tag && (strncmp(text_string, "devtag:tab ",
+			    strlen("devtag:tab ")) == 0);
 }
 
 /*
@@ -819,7 +823,8 @@
 
 int text_glob::is_tab0 (void)
 {
-  return is_tag && (strncmp(text_string, "html-tag:tab0", strlen("html-tag:tab0")) == 0);
+  return is_tag && (strncmp(text_string, "devtag:tab0",
+			    strlen("devtag:tab0")) == 0);
 }
 
 /*
@@ -841,13 +846,14 @@
 
 int text_glob::is_br (void)
 {
-  return is_a_tag() && ((strcmp ("html-tag:.br", text_string) == 0) ||
-			(strncmp("html-tag:.sp", text_string, 11) == 0));
+  return is_a_tag() && ((strcmp ("devtag:.br", text_string) == 0) ||
+			(strncmp("devtag:.sp", text_string,
+				 strlen("devtag:.sp")) == 0));
 }
 
 int text_glob::get_arg (void)
 {
-  if (strncmp("html-tag:", text_string, strlen("html-tag:")) == 0) {
+  if (strncmp("devtag:", text_string, strlen("devtag:")) == 0) {
     const char *p = text_string;
 
     while ((*p != (char)0) && (!isspace(*p)))
@@ -867,7 +873,7 @@
 
 int text_glob::get_tab_args (char *align)
 {
-  if (strncmp("html-tag:", text_string, strlen("html-tag:")) == 0) {
+  if (strncmp("devtag:", text_string, strlen("devtag:")) == 0) {
     const char *p = text_string;
 
     // firstly the alignment C|R|L
@@ -1320,7 +1326,8 @@
   if (str.length() > 0) {
     text_glob *g;
 
-    if (strncmp((str+'\0').contents(), "html-tag:.auto-image", 20) == 0) {
+    if (strncmp((str+'\0').contents(), "devtag:.auto-image",
+		strlen("devtag:.auto-image")) == 0) {
       g = new text_glob();
       g->text_glob_auto_image(s, buffer.add_string(str), str.length(),
 			      min_vertical, min_horizontal, max_vertical, max_horizontal);
@@ -2097,6 +2104,7 @@
   void begin_page       (int);
   void end_page         (int);
   void special          (char *arg, const environment *env, char type);
+  void devtag           (char *arg, const environment *env, char type);
   font *make_font       (const char *);
   void end_of_line      ();
 };
@@ -2240,7 +2248,7 @@
 }
 
 /*
- *  do_centered_image - set a flag such that the next html-tag is
+ *  do_centered_image - set a flag such that the next devtag is
  *                      placed inside a centered paragraph.
  */
 
@@ -2250,7 +2258,7 @@
 }
 
 /*
- *  do_right_image - set a flag such that the next html-tag is
+ *  do_right_image - set a flag such that the next devtag is
  *                   placed inside a right aligned paragraph.
  */
 
@@ -2260,7 +2268,7 @@
 }
 
 /*
- *  do_left_image - set a flag such that the next html-tag is
+ *  do_left_image - set a flag such that the next devtag is
  *                  placed inside a left aligned paragraph.
  */
 
@@ -2996,7 +3004,7 @@
 }
 
 /*
- *  do_tab - handle the "html-tag:tab" tag
+ *  do_tab - handle the "devtag:tab" tag
  */
 
 void html_printer::do_tab (char *s)
@@ -3014,7 +3022,7 @@
 }
 
 /*
- *  do_tab0 - handle the "html-tag:tab0" tag
+ *  do_tab0 - handle the "devtag:tab0" tag
  */
 
 void html_printer::do_tab0 (void)
@@ -3048,11 +3056,11 @@
 void html_printer::troff_tag (text_glob *g)
 {
   /*
-   *  firstly skip over html-tag:
+   *  firstly skip over devtag:
    */
-  char *t=(char *)g->text_string+9;
+  char *t=(char *)g->text_string+strlen("devtag:");
 
-  if (strncmp(g->text_string, "html</p>:", 9) == 0) {
+  if (strncmp(g->text_string, "html</p>:", strlen("html</p>:")) == 0) {
     do_end_para(g);
   } else if (g->is_eol()) {
     do_eol();
@@ -3141,7 +3149,8 @@
 
 int html_printer::is_in_middle (int left, int right)
 {
-  return( abs(abs(left-pageoffset) - abs(pageoffset+linelength-right)) <= CENTER_TOLERANCE );
+  return( abs(abs(left-pageoffset) - abs(pageoffset+linelength-right))
+	  <= CENTER_TOLERANCE );
 }
 
 /*
@@ -3269,7 +3278,7 @@
 
   page_contents->glyphs.move_to(where);
   page_contents->glyphs.move_left();
-  page_contents->insert_tag(string("html-tag:.tab-ts"));  // tab table start
+  page_contents->insert_tag(string("devtag:.tab-ts"));  // tab table start
   page_contents->glyphs.move_right();
   start_of_table = page_contents->glyphs.get_data();
   page_contents->glyphs.move_to(old_pos);
@@ -3289,7 +3298,7 @@
   while (page_contents->glyphs.get_data()->is_a_tag())
     page_contents->glyphs.move_left();
 
-  page_contents->insert_tag(string("html-tag:.tab-te"));  // tab table end
+  page_contents->insert_tag(string("devtag:.tab-te"));  // tab table end
   while (g != page_contents->glyphs.get_data())
     page_contents->glyphs.move_right();
   page_contents->dump_page();
@@ -3305,7 +3314,7 @@
 
   page_contents->glyphs.move_to(where);
   page_contents->glyphs.move_left();
-  page_contents->insert_tag(string("html-tag:tab0"));  // tab0 start of line
+  page_contents->insert_tag(string("devtag:tab0"));  // tab0 start of line
   page_contents->glyphs.move_right();
   page_contents->glyphs.move_to(old_pos);
 }
@@ -3498,8 +3507,10 @@
       g = page_contents->glyphs.move_right_get_data();
       handle_state_assertion(g);
       if (page_contents->glyphs.is_equal_to_head()) {
-	if (tbl != NULL)
+	if (tbl != NULL) {
 	  delete tbl;
+	  tbl = NULL;
+	}
 	return;
       }
 
@@ -3664,8 +3675,10 @@
       page_contents->insert_tag(string("*** LAST ***"));      
     }
   }
-  if (tbl != NULL)
+  if (tbl != NULL) {
     delete tbl;
+    tbl = NULL;
+  }
 
   // and reset the registers
   pageoffset = old_pageoffset;
@@ -3728,7 +3741,7 @@
 
     return( (fontname != 0) && (fontname[0] == 'C') );
   }
-  return( FALSE );
+  return FALSE;
 }
 
 /*
@@ -4698,7 +4711,7 @@
   else if (strcmp(cmd, "assertion:[y") == 0)
     as.addy(cmd, id, make_val(val, minv, id, file, line), file, line);
   else
-    if (strncmp(cmd, "assertion:[", 11) == 0)
+    if (strncmp(cmd, "assertion:[", strlen("assertion:[")) == 0)
       page_contents->add_tag(&sbuf_style, string(s),
 			     line_number, minv, minh, maxv, maxh);
 }
@@ -4725,8 +4738,7 @@
 /*
  *  special - handle all x X requests from troff. For post-html they
  *            allow users to pass raw html commands, turn auto linked
- *            headings off/on and also allow troff to emit tags to
- *            indicate when a: .br, .sp etc occurs.
+ *            headings off/on etc.
  */
 
 void html_printer::special(char *s, const environment *env, char type)
@@ -4793,22 +4805,48 @@
        */
     } else if (strncmp(s, "index:", 6) == 0) {
       cutoff_heading = atoi(&s[6]);
-    } else if (strncmp(s, "html-tag:", 9) == 0) {
+    } else if (strncmp(s, "assertion:[", 11) == 0) {
+      int r=font::res;   /* resolution of the device */
+
+      handle_assertion(env->vpos-env->size*r/72, env->hpos,
+		       env->vpos, env->hpos, s);
+    }
+  }
+}
+
+/*
+ *  devtag - handles device troff tags sent from the `troff'.
+ *           These include the troff state machine tags:
+ *           .br, .sp, .in, .tl, .ll etc
+ *
+ *           (see man 5 grohtml_tags).
+ */
+
+void html_printer::devtag (char *s, const environment *env, char type)
+{
+  if (type != 'p')
+    return;
+
+  if (s != 0) {
+    flush_sbuf();
+    if (env->fontno >= 0) {
+      style sty(get_font_from_index(env->fontno), env->size, env->height,
+		env->slant, env->fontno, *env->col);
+      sbuf_style = sty;
+    }
+
+    if (strncmp(s, "devtag:", strlen("devtag:")) == 0) {
       int r=font::res;   /* resolution of the device */
 
       page_contents->add_tag(&sbuf_style, string(s),
 			     line_number,
 			     env->vpos-env->size*r/72, env->hpos,
 			     env->vpos               , env->hpos);
-    } else if (strncmp(s, "assertion:[", 11) == 0) {
-      int r=font::res;   /* resolution of the device */
-
-      handle_assertion(env->vpos-env->size*r/72, env->hpos,
-		       env->vpos, env->hpos, s);
     }
   }
 }
 
+
 /*
  *  taken from number.cpp in src/roff/troff, [hunits::hunits(units x)]
  */
Index: groff/src/include/printer.h
diff -u groff/src/include/printer.h:1.12 groff/src/include/printer.h:1.13
--- groff/src/include/printer.h:1.12	Sat Oct 30 11:11:00 2004
+++ groff/src/include/printer.h	Thu Dec 16 13:09:54 2004
@@ -7,7 +7,7 @@
 
    Written by James Clark (jjc@jclark.com)
 
-   Last update: 12 Apr 2002
+   Last update: 15 Dec 2004
 
    This file is part of groff.
 
@@ -83,6 +83,8 @@
   virtual void end_of_line();
   virtual void special(char *arg, const environment *env,
 		       char type = 'p');
+  virtual void devtag(char *arg, const environment *env,
+		      char type = 'p');
 
 protected:
   font_pointer_list *font_list;
Index: groff/src/libs/libdriver/input.cpp
diff -u groff/src/libs/libdriver/input.cpp:1.2 groff/src/libs/libdriver/input.cpp:1.3
--- groff/src/libs/libdriver/input.cpp:1.2	Thu Apr  8 20:43:22 2004
+++ groff/src/libs/libdriver/input.cpp	Thu Dec 16 13:09:54 2004
@@ -8,7 +8,7 @@
    Written by James Clark (jjc@jclark.com)
    Major rewrite 2001 by Bernd Warken (bwarken@mayn.de)
 
-   Last update: 04 Apr 2003
+   Last update: 15 Dec 2004
 
    This file is part of groff, the GNU roff text processing system.
 
@@ -1520,6 +1520,9 @@
       char *str_arg = get_extended_arg(); // includes line skip
       if (npages <= 0)
 	error("`x X' command invalid before first `p' command");
+      else if (str_arg != NULL && (strncmp(str_arg, "devtag:",
+					   strlen("devtag:")) == 0))
+	pr->devtag(str_arg, current_env);
       else
 	pr->special(str_arg, current_env);
       a_delete str_arg;
Index: groff/src/libs/libdriver/printer.cpp
diff -u groff/src/libs/libdriver/printer.cpp:1.1 groff/src/libs/libdriver/printer.cpp:1.2
--- groff/src/libs/libdriver/printer.cpp:1.1	Tue Apr 15 15:13:35 2003
+++ groff/src/libs/libdriver/printer.cpp	Thu Dec 16 13:09:54 2004
@@ -2,11 +2,11 @@
 
 // <groff_src_dir>/src/libs/libdriver/printer.cpp
 
-/* Copyright (C) 1989, 1990, 1991, 1992, 2001, 2002, 2003
+/* Copyright (C) 1989, 1990, 1991, 1992, 2001, 2002, 2003, 2004
    Free Software Foundation, Inc.
    Written by James Clark (jjc@jclark.com)
 
-   Last update: 04 Apr 2003
+   Last update: 15 Dec 2004
 
    This file is part of groff.
 
@@ -107,6 +107,10 @@
 {
 }
 
+void printer::devtag(char *, const environment *, char)
+{
+}
+
 void printer::draw(int, int *, int, const environment *)
 {
 }
Index: groff/src/roff/troff/env.cpp
diff -u groff/src/roff/troff/env.cpp:1.10 groff/src/roff/troff/env.cpp:1.11
--- groff/src/roff/troff/env.cpp:1.10	Fri Oct 15 05:08:35 2004
+++ groff/src/roff/troff/env.cpp	Thu Dec 16 13:09:54 2004
@@ -2206,7 +2206,7 @@
     if (curdiv == topdiv && topdiv->before_first_page)
       topdiv->begin_page();
     macro *m = new macro;
-    m->append_str("html-tag:");
+    m->append_str("devtag:");
     for (const char *p = nm; *p; p++)
       if (!invalid_input_char((unsigned char)*p))
 	m->append(*p);
Index: groff/src/roff/troff/input.cpp
diff -u groff/src/roff/troff/input.cpp:1.22 groff/src/roff/troff/input.cpp:1.23
--- groff/src/roff/troff/input.cpp:1.22	Mon Nov 22 08:36:29 2004
+++ groff/src/roff/troff/input.cpp	Thu Dec 16 13:09:54 2004
@@ -6075,8 +6075,7 @@
     for (; c != '\n' && c != EOF; c = get_copy(0))
       s += (char)c;
     s += '\n';
-    if (is_html)
-      curenv->add_node(new tag_node(s, 0));
+    curenv->add_node(new tag_node(s, 0));
   }
   tok.next();
 }
@@ -6099,8 +6098,7 @@
     for (; c != '\n' && c != EOF; c = get_copy(0))
       s += (char)c;
     s += '\n';
-    if (is_html)
-      curenv->add_node(new tag_node(s, 1));
+    curenv->add_node(new tag_node(s, 1));
   }
   tok.next();
 }
Index: groff/src/roff/troff/mtsm.cpp
diff -u groff/src/roff/troff/mtsm.cpp:1.2 groff/src/roff/troff/mtsm.cpp:1.3
--- groff/src/roff/troff/mtsm.cpp:1.2	Fri Oct 15 05:08:35 2004
+++ groff/src/roff/troff/mtsm.cpp	Thu Dec 16 13:09:54 2004
@@ -198,27 +198,27 @@
 
 void statem::flush(FILE *fp, statem *compare)
 {
-  int_values[MTSM_FI].diff(fp, "html-tag:.fi",
+  int_values[MTSM_FI].diff(fp, "devtag:.fi",
 			   compare->int_values[MTSM_FI]);
-  int_values[MTSM_RJ].diff(fp, "html-tag:.rj",
+  int_values[MTSM_RJ].diff(fp, "devtag:.rj",
 			   compare->int_values[MTSM_RJ]);
-  int_values[MTSM_SP].diff(fp, "html-tag:.sp",
+  int_values[MTSM_SP].diff(fp, "devtag:.sp",
 			   compare->int_values[MTSM_SP]);
-  units_values[MTSM_IN].diff(fp, "html-tag:.in",
+  units_values[MTSM_IN].diff(fp, "devtag:.in",
 			     compare->units_values[MTSM_IN]);
-  units_values[MTSM_LL].diff(fp, "html-tag:.ll",
+  units_values[MTSM_LL].diff(fp, "devtag:.ll",
 			     compare->units_values[MTSM_LL]);
-  units_values[MTSM_PO].diff(fp, "html-tag:.po",
+  units_values[MTSM_PO].diff(fp, "devtag:.po",
 			     compare->units_values[MTSM_PO]);
-  string_values[MTSM_TA].diff(fp, "html-tag:.ta",
+  string_values[MTSM_TA].diff(fp, "devtag:.ta",
 			      compare->string_values[MTSM_TA]);
-  units_values[MTSM_TI].diff(fp, "html-tag:.ti",
+  units_values[MTSM_TI].diff(fp, "devtag:.ti",
 			     compare->units_values[MTSM_TI]);
-  int_values[MTSM_CE].diff(fp, "html-tag:.ce",
+  int_values[MTSM_CE].diff(fp, "devtag:.ce",
 			   compare->int_values[MTSM_CE]);
-  bool_values[MTSM_EOL].diff(fp, "html-tag:.eol",
+  bool_values[MTSM_EOL].diff(fp, "devtag:.eol",
 			     compare->bool_values[MTSM_EOL]);
-  bool_values[MTSM_BR].diff(fp, "html-tag:.br",
+  bool_values[MTSM_BR].diff(fp, "devtag:.br",
 			    compare->bool_values[MTSM_BR]);
   if (debug_state) {
     fprintf(stderr, "compared state %d\n", compare->issue_no);
Index: groff/src/roff/troff/node.cpp
diff -u groff/src/roff/troff/node.cpp:1.14 groff/src/roff/troff/node.cpp:1.15
--- groff/src/roff/troff/node.cpp:1.14	Fri Oct 15 05:08:35 2004
+++ groff/src/roff/troff/node.cpp	Thu Dec 16 13:09:54 2004
@@ -4081,15 +4081,15 @@
 	switch (last_position) {
 	case 'c':
 	  out->start_special();
-	  put(out, "html-tag:.centered-image");
+	  put(out, "devtag:.centered-image");
 	  break;
 	case 'r':
 	  out->start_special();
-	  put(out, "html-tag:.right-image");
+	  put(out, "devtag:.right-image");
 	  break;
 	case 'l':
 	  out->start_special();
-	  put(out, "html-tag:.left-image");
+	  put(out, "devtag:.left-image");
 	  break;
 	case 'i':
 	  ;
@@ -4098,7 +4098,7 @@
 	}
 	out->end_special();
 	out->start_special();
-	put(out, "html-tag:.auto-image ");
+	put(out, "devtag:.auto-image ");
 	put(out, name);
 	out->end_special();
       }
Index: groff/test-groff.in
diff -u groff/test-groff.in:1.3 groff/test-groff.in:1.4
--- groff/test-groff.in:1.3	Tue Jun  1 10:46:52 2004
+++ groff/test-groff.in	Thu Dec 16 13:09:54 2004
@@ -1,17 +1,9 @@
 #! /bin/sh
 # This script runs groff without requiring that it be installed.
-# The current directory must be the top build directory.
 
 SEP='@PATH_SEPARATOR@'
-EXEEXT=@EXEEXT@
-builddir=./src
-srcdir=`echo $0 | sed -e 's;/[^/]*$;;'`
-
-if test ! -d $builddir/roff/groff || \
-   test ! -r $builddir/roff/groff/groff$EXEEXT; then
-  echo $0 must be run with the top build directory as the current directory 2>&1
-  exit 1
-fi
+builddir=@abs_top_builddir@/src
+srcdir=@abs_top_srcdir@
 
 GROFF_BIN_PATH=\
 $builddir/roff/groff$SEP\
@@ -31,9 +23,7 @@
 $builddir/devices/grohtml$SEP\
 $builddir/devices/xditview
 
-test -n "$srcdir" || srcdir=.
-
-XENVIRONMENT=`cd $srcdir; pwd`/src/devices/xditview/GXditview.ad
+XENVIRONMENT=$srcdir/src/devices/xditview/GXditview.ad
 export XENVIRONMENT
 
 GROFF_COMMAND_PREFIX=
Index: groff/tmac/Makefile.sub
diff -u groff/tmac/Makefile.sub:1.33 groff/tmac/Makefile.sub:1.34
--- groff/tmac/Makefile.sub:1.33	Thu Apr 10 18:07:35 2003
+++ groff/tmac/Makefile.sub	Thu Dec 16 13:09:54 2004
@@ -23,6 +23,7 @@
   lj4.tmac \
   lbp.tmac \
   html.tmac html-end.tmac \
+  devtag.tmac \
   europs.tmac \
   composite.tmac \
   eqnrc \
Index: groff/tmac/an-old.tmac
diff -u groff/tmac/an-old.tmac:1.48 groff/tmac/an-old.tmac:1.49
--- groff/tmac/an-old.tmac:1.48	Wed Oct 13 07:24:46 2004
+++ groff/tmac/an-old.tmac	Thu Dec 16 13:09:54 2004
@@ -109,9 +109,9 @@
 .\" .TH title section extra1 extra2 extra3
 .de1 TH
 .  if \\n[an-html] \{\
-.    HTML-TAG-NS ".tl"
+.    DEVTAG-TL
 \\$1
-.    HTML-TAG-NS ".eo.tl"
+.    DEVTAG-EO-TL
 .  \}
 .
 .  de an-init \" We have to do it like this to get multiple man pages right.
@@ -314,7 +314,7 @@
 .  in \\n[an-margin]u
 .  ti 0
 .  nr need_eo_h 1
-.  HTML-TAG-NS ".NH \\n[an-level]"
+.  DEVTAG-NH \\n[an-level]
 .  it 1 an-trap
 .  nr an-no-space-flag 1
 .  nr an-break-flag 1
@@ -377,7 +377,7 @@
 ..
 .
 .de1 an-trap
-.  if \\n[need_eo_h]>0 .HTML-TAG-NS ".eo.h"
+.  if \\n[need_eo_h]>0 .DEVTAG-EO-H
 .  nr need_eo_h 0
 .  ft R
 .  ps \\n[PS]u
@@ -413,9 +413,9 @@
 .    ti -\\n[an-prevailing-indent]u
 .    chop an-div
 .    ne (1v + 1u)
-.    HTML-TAG-NS ".col 1"
+.    DEVTAG-COL 1
 \\*[an-div]\\h'|\\n[an-prevailing-indent]u'\c
-.    HTML-TAG-NEXT ".col 2"
+.    DEVTAG-COL-NEXT 2
 .  \}
 ..
 .
Index: groff/tmac/s.tmac
diff -u groff/tmac/s.tmac:1.22 groff/tmac/s.tmac:1.23
--- groff/tmac/s.tmac:1.22	Tue Dec  7 21:23:55 2004
+++ groff/tmac/s.tmac	Thu Dec 16 13:09:54 2004
@@ -178,7 +178,7 @@
 .vs +3p
 .ll (u;\\n[LL]*5/6)
 .nr cov*n-au 0
-.HTML-TAG-NS ".tl"
+.DEVTAG-TL
 ..
 .de @AU
 .par@reset
@@ -382,7 +382,7 @@
 .ce 9999
 .if d cov*tl-div \{\
 .    cov*tl-div
-.    HTML-TAG-NS ".eo.tl"
+.    DEVTAG-EO-TL
 .\}
 .nr cov*i 1
 .nr cov*sp 1v
@@ -500,7 +500,7 @@
 .		nr pg*gutw \\n[LL]-(\\n[pg@ncols]*\\n[pg@colw])/(\\n[pg@ncols]-1)
 .	el .nr pg*gutw 0
 .\}
-.HTML-TAG ".mc \\n[pg@ncols] \\n[pg@colw] \\n[pg*gutw]"
+.DEVTAG ".mc \\n[pg@ncols] \\n[pg@colw] \\n[pg*gutw]"
 .mk pg*col-top
 .ns
 .nr pg*col-num 0
@@ -1137,9 +1137,9 @@
 .\" par@reset
 .de par@reset
 .br
-.if \\n[need_eo_tl]>0 .HTML-TAG ".eo.tl"
+.if \\n[need_eo_tl]>0 .DEVTAG-EO-TL
 .nr need_eo_tl 0
-.if \\n[need_eo_h]>0 .HTML-TAG ".eo.h"
+.if \\n[need_eo_h]>0 .DEVTAG-EO-H
 .nr need_eo_h 0
 .ce 0
 .rj 0
@@ -1226,14 +1226,14 @@
 .	chop par*label
 .	ti -\\n[\\n[.ev]:ai]u
 .	ie \\n[dl]+1n<=\\n[\\n[.ev]:ai] \{\
-.		HTML-TAG-NS ".col 1"
+.		DEVTAG-COL 1
 \\*[par*label]\h'|\\n[\\n[.ev]:ai]u'\c
-.		HTML-TAG-NS ".col 2"
+.		DEVTAG-COL 2
 .       \}
 .	el \{\
-.		HTML-TAG-NS ".col 1"
+.		DEVTAG-COL 1
 \\*[par*label]
-.		HTML-TAG-NEXT ".col 2"
+.		DEVTAG-COL-NEXT 2
 .		br
 .	\}
 .	rm par*label
@@ -1403,7 +1403,7 @@
 .  nr sh*psincr 0
 .  if 0\\$1>0 .nr sh*psincr (\\n[GROWPS]-0\\$1)*\\n[PSINCR]
 .  SH-NO-TAG
-.  HTML-TAG ".SH 1"
+.  DEVTAG-SH 1
 .  if '\*(.T'html' .nr need_eo_h 1
 ..
 .\" TL, AU, and AI are aliased to these in cov*ab-init.
@@ -1414,7 +1414,7 @@
 .ps +2
 .vs +3p
 .ce 9999
-.HTML-TAG-NS ".tl"
+.DEVTAG-TL
 .nr need_eo_tl 1
 ..
 .de par@AU
@@ -1575,7 +1575,7 @@
 .if !dSN .als SN SN-DOT
 .nr sh*psincr (\\n[GROWPS]-\\n[nh*hl])*\\n[PSINCR]
 .SH-NO-TAG
-.HTML-TAG-NS ".NH \\$1"
+.DEVTAG-NH "\\$1"
 .  if '\*(.T'html' .nr need_eo_h 1
 \\*[SN-DOT]
 ..
Index: groff/tmac/troffrc-end
diff -u groff/tmac/troffrc-end:1.10 groff/tmac/troffrc-end:1.11
--- groff/tmac/troffrc-end:1.10	Thu Apr 10 18:07:36 2003
+++ groff/tmac/troffrc-end	Thu Dec 16 13:09:54 2004
@@ -13,8 +13,7 @@
 .do if !d HTML-IMAGE-RIGHT  .do ds HTML-IMAGE-RIGHT
 .do if !d HTML-IMAGE-LEFT   .do ds HTML-IMAGE-LEFT
 .do if !d HTML-IMAGE-END    .do ds HTML-IMAGE-END
-.do if !d HTML-TAG          .do ds HTML-TAG
-.do if !d HTML-TAG-NS       .do ds HTML-TAG-NS
+.do if !d DEVTAG            .do ds DEVTAG
 .do if !d HTML-DO-IMAGE     .do ds HTML-DO-IMAGE
 .
 .\" Don't let blank lines creep in here.
Index: groff/tmac/www.tmac
diff -u groff/tmac/www.tmac:1.36 groff/tmac/www.tmac:1.37
--- groff/tmac/www.tmac:1.36	Wed Nov 24 15:42:10 2004
+++ groff/tmac/www.tmac	Thu Dec 16 13:09:54 2004
@@ -45,6 +45,8 @@
 .nr _C \n(.C
 .cp 0
 .
+.mso devtag.tmac
+.
 .nr www-html 0
 .if '\*[.T]'html' .nr www-html 1
 .
@@ -262,15 +264,21 @@
 .\"
 .de HTML
 .  if \\n[www-html] \{\
+.    \" was implemented via .nop \&\X^html:\\$*^ but
+.    \" is now implemented using HTML-NS to utilize code factoring.
+.    \"
 .    \" the `\&' makes the vertical mode leave, so to say
-.    nop \&\X^html:\\$*^
+.    \"
+.    nop \&\c
+.    HTML-NS \\$*
+.    nop \&
 .  \}
 ..
 .\"
 .\" an auxiliary macro for HTML (without following space)
 .\"
 .de HTML-NS
-.  tag "html:\\$*
+.  nop \X^html:\\$*^\c
 ..
 .\"
 .\" emit a HTML tag after shutting down a (possibly open) paragraph
@@ -314,10 +322,16 @@
 .  ds \\$0:adr \\$1\"
 .  www:url_breaks \\$0:adr
 .  ie \\n[www-html] \{\
+.    ie '\\$3'' \
+.      ds \\$0:after \&
+.    el \
+.      ds \\$0:after \&\\$3
 .    ie '\\$2'' \
-.       HTML <a href="\\$1">\\$1</a>\\$3
+.       HTML-NS <a href="\\$1">\\$1</a>
 .    el \
-.       HTML <a href="\\$1">\\$2</a>\\$3
+.       HTML-NS <a href="\\$1">\\$2</a>
+.    nop \\*[\\$0:after]
+.    rm \\$0:after
 .  \}
 .  el \{\
 .    if !r ps4html .ad l
@@ -385,12 +399,12 @@
 .de IMG
 .  ie \\n[www-html] \{\
 .    ie '\\$2'-R' \
-.      HTML-TAG ".right-image"
+.      DEVTAG ".right-image"
 .    el \{\
 .      ie '\\$2'-L' \
-.        HTML-TAG ".left-image"
+.        DEVTAG ".left-image"
 .      el \
-.        HTML-TAG ".centered-image"
+.        DEVTAG ".centered-image"
 .    \}
 .    nr www-width 100
 .    if !'\\$3'' \
@@ -405,35 +419,6 @@
 .    nop \[la]\f[C]\\$1\f[]\[ra]
 ..
 .\" --------------------------------------------------------------------
-.\" HTML-TAG
-.\"
-.\"   Emit a tag for grohtml.  This is an internal macro.
-.\"
-.de HTML-TAG
-.  if \\n[www-html] \{\
-.    \" the `\&' makes the vertical mode leave, so to say
-.    nop \&\X^html-tag:\\$*^
-.  \}
-..
-.\" --------------------------------------------------------------------
-.\" HTML-TAG-NS
-.\"
-.\"   Emit a tag for grohtml (without a space).  This is an internal macro.
-.\"
-.de HTML-TAG-NS
-.  tag html-tag:\\$*
-..
-.\" --------------------------------------------------------------------
-.\" HTML-TAG-NEXT
-.\"
-.\"   When the troff state changes, emit a tag for grohtml (without a space)
-.\"   This is an internal macro.
-.\"
-.de HTML-TAG-NEXT
-.  taga html-tag:\\$*
-..
-.
-.\" --------------------------------------------------------------------
 .\" PIMG  [-R|-L|-C] filename [width] [height]
 .\"
 .\"   Include a png image.  It will work for -Tps and -Thtml.
@@ -447,12 +432,12 @@
 .de PIMG
 .  ie \\n[www-html] \{\
 .    ie '\\$1'-R' \
-.      HTML-TAG ".right-image"
+.      DEVTAG ".right-image"
 .    el \{\
 .      ie '\\$1'-L' \
-.        HTML-TAG ".left-image"
+.        DEVTAG ".left-image"
 .      el \
-.        HTML-TAG ".centered-image"
+.        DEVTAG ".centered-image"
 .    \}
 .    nr www-width 0
 .    nr www-height 0
@@ -657,13 +642,13 @@
 .    nr www-heading-no 1
 .  el \
 .    nr www-heading-no \\$1
-.  HTML-TAG ".NH \\n[www-heading-no]"
+.  DEVTAG-NH \\n[www-heading-no]
 ..
 .
 .de HnE
 .  if (\\n[www-heading-no] == -1) \
 .    www-error "HnE found without a corresponding HnS"
-.  HTML-TAG ".eo.h"
+.  DEVTAG-EO-H
 ..
 .\" --------------------------------------------------------------------
 .\" LK
@@ -672,7 +657,7 @@
 .\"   section/numbered headings at this position.
 .\"
 .de LK
-.  HTML-TAG-NS ".links"
+.  DEVTAG ".links"
 ..
 .\" --------------------------------------------------------------------
 .\" HR
@@ -689,7 +674,7 @@
 .\"  emits by default.
 .\"
 .de NHR
-.  HTML-TAG ".no-auto-rule"
+.  DEVTAG ".no-auto-rule"
 ..
 .\"
 .\" www-end-nowhere - end of input trap called to finish diversion.
@@ -697,7 +682,7 @@
 .de www-end-nowhere
 .  if !\\n[www-html] \
 .    di
-.  HTML-TAG ".eo.tl"
+.  DEVTAG-EO-TL
 ..
 .\" --------------------------------------------------------------------
 .\" HTL
@@ -711,7 +696,7 @@
 .\"   The macro terminates when a space or break is seen (.sp, .br).
 .\"
 .de HTL
-.  HTML-TAG ".html-tl"
+.  DEVTAG ".html-tl"
 .  if !\\n[www-html] \
 .    di www-nowhere
 .  it 2 www-end-nowhere
@@ -913,7 +898,7 @@
 .\"   The argument to JOBNAME is the file stem for future output files.
 .\"
 .de JOBNAME
-.  HTML-TAG .job-name \\$1
+.  DEVTAG .job-name \\$1
 ..
 .\" --------------------------------------------------------------------
 .\" HEAD
@@ -922,7 +907,7 @@
 .\"   document
 .\" --------------------------------------------------------------------
 .de HEAD
-.  HTML-TAG .head "\\$*"
+.  DEVTAG .head "\\$*"
 ..
 .\" --------------------------------------------------------------------
 .\" Final Setup



From MAILER-DAEMON Thu Dec 16 09:35:43 2004
Received: from mailman by lists.gnu.org with archive (Exim 4.33)
	id 1CewjH-0001Q6-LC
	for mharc-groff-commit@gnu.org; Thu, 16 Dec 2004 09:35:43 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1CewjF-0001NN-3T
	for groff-commit@gnu.org; Thu, 16 Dec 2004 09:35:41 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1CewjD-0001MG-UM
	for groff-commit@gnu.org; Thu, 16 Dec 2004 09:35:40 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1CewjD-0001LO-HG
	for groff-commit@gnu.org; Thu, 16 Dec 2004 09:35:39 -0500
Received: from [199.232.41.4] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.34) id 1CewXh-0000bG-D6
	for groff-commit@gnu.org; Thu, 16 Dec 2004 09:23:45 -0500
Received: from localhost ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 4.34) id 1CewXg-00083k-Jl
	for groff-commit@gnu.org; Thu, 16 Dec 2004 09:23:44 -0500
To: groff-commit@gnu.org
From: Werner LEMBERG <wl@gnu.org>
Message-Id: <E1CewjD-0001MG-UM@lists.gnu.org>
Date: Thu, 16 Dec 2004 09:35:40 -0500
Subject: [Groff-commit] groff ./ChangeLog contrib/gdiffmk/tests/.cvsign...
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, 16 Dec 2004 14:35:41 -0000

CVSROOT:	/cvsroot/groff
Module name:	groff
Branch: 	
Changes by:	Werner LEMBERG <wl@gnu.org>	04/12/16 14:23:44

Modified files:
	.              : ChangeLog 
	contrib/gdiffmk/tests: .cvsignore 
	tmac           : doc-syms groff_mdoc.man 

Log message:
	* tmac/doc-syms, tmac/groff_mdoc.man: Add `libpam' library.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/ChangeLog.diff?tr1=1.772&tr2=1.773&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/gdiffmk/tests/.cvsignore.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/tmac/doc-syms.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/tmac/groff_mdoc.man.diff?tr1=1.32&tr2=1.33&r1=text&r2=text

Patches:
Index: groff/ChangeLog
diff -u groff/ChangeLog:1.772 groff/ChangeLog:1.773
--- groff/ChangeLog:1.772	Thu Dec 16 13:09:54 2004
+++ groff/ChangeLog	Thu Dec 16 14:23:44 2004
@@ -1,3 +1,7 @@
+2004-12-15  Thomas Klausner  <wiz@netbsd.org>
+
+	* tmac/doc-syms, tmac/groff_mdoc.man: Add `libpam' library.
+
 2004-12-15  Werner LEMBERG  <wl@gnu.org>
 
 	Make `test-groff' work again -- previously, wrong paths have been
Index: groff/contrib/gdiffmk/tests/.cvsignore
diff -u groff/contrib/gdiffmk/tests/.cvsignore:1.1 groff/contrib/gdiffmk/tests/.cvsignore:1.2
--- groff/contrib/gdiffmk/tests/.cvsignore:1.1	Wed Dec 15 06:05:30 2004
+++ groff/contrib/gdiffmk/tests/.cvsignore	Thu Dec 16 14:23:44 2004
@@ -1,2 +1,2 @@
 test_result*
-tmp_file*
\ No newline at end of file
+tmp_file*
Index: groff/tmac/doc-syms
diff -u groff/tmac/doc-syms:1.11 groff/tmac/doc-syms:1.12
--- groff/tmac/doc-syms:1.11	Fri Jul  9 22:18:17 2004
+++ groff/tmac/doc-syms	Thu Dec 16 14:23:44 2004
@@ -697,6 +697,7 @@
 .ds doc-str-Lb-libmagic    Magic Number Recognition Library (libmagic, \-lmagic)
 .ds doc-str-Lb-libmenu     Curses Menu Library (libmenu, \-lmenu)
 .ds doc-str-Lb-libossaudio OSS Audio Emulation Library (libossaudio, \-lossaudio)
+.ds doc-str-Lb-libpam      Pluggable Authentication Module Library (libpam, \-lpam)
 .ds doc-str-Lb-libpcap     Packet Capture Library (libpcap, \-lpcap)
 .ds doc-str-Lb-libpci      PCI Bus Access Library (libpci, \-lpci)
 .ds doc-str-Lb-libpmc      Performance Counters Library (libpmc, \-lpmc)
Index: groff/tmac/groff_mdoc.man
diff -u groff/tmac/groff_mdoc.man:1.32 groff/tmac/groff_mdoc.man:1.33
--- groff/tmac/groff_mdoc.man:1.32	Mon Oct  4 07:20:04 2004
+++ groff/tmac/groff_mdoc.man	Thu Dec 16 14:23:44 2004
@@ -1699,6 +1699,8 @@
 .Lb libmenu
 .It Li libossaudio
 .Lb libossaudio
+.It Li libpam
+.Lb libpam
 .It Li libpcap
 .Lb libpcap
 .It Li libpci



From MAILER-DAEMON Thu Dec 16 17:14:13 2004
Received: from mailman by lists.gnu.org with archive (Exim 4.33)
	id 1Cf3sz-0006n7-1T
	for mharc-groff-commit@gnu.org; Thu, 16 Dec 2004 17:14:13 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1Cf3sw-0006kt-V1
	for groff-commit@gnu.org; Thu, 16 Dec 2004 17:14:11 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1Cf3su-0006ic-Cv
	for groff-commit@gnu.org; Thu, 16 Dec 2004 17:14:08 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1Cf3su-0006iS-8r
	for groff-commit@gnu.org; Thu, 16 Dec 2004 17:14:08 -0500
Received: from [199.232.41.4] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.34) id 1Cf3hY-0007za-Nt
	for groff-commit@gnu.org; Thu, 16 Dec 2004 17:02:24 -0500
Received: from localhost ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 4.34) id 1Cf3hW-0000hY-Mw
	for groff-commit@gnu.org; Thu, 16 Dec 2004 17:02:23 -0500
To: groff-commit@gnu.org
From: Werner LEMBERG <wl@gnu.org>
Message-Id: <E1Cf3su-0006ic-Cv@lists.gnu.org>
Date: Thu, 16 Dec 2004 17:14:08 -0500
Subject: [Groff-commit] groff/contrib/gdiffmk ChangeLog README tests/ru...
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, 16 Dec 2004 22:14:11 -0000

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

Modified files:
	contrib/gdiffmk: ChangeLog README 
Added files:
	contrib/gdiffmk/tests: runtests.sh 
Removed files:
	contrib/gdiffmk/tests: tests.sh 

Log message:
	* tests/tests.sh: Renamed to...
	* tests/runtests.sh: This.
	* README: Updated.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/gdiffmk/ChangeLog.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/gdiffmk/README.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/gdiffmk/tests/runtests.sh?rev=1.1

Patches:
Index: groff/contrib/gdiffmk/ChangeLog
diff -u groff/contrib/gdiffmk/ChangeLog:1.3 groff/contrib/gdiffmk/ChangeLog:1.4
--- groff/contrib/gdiffmk/ChangeLog:1.3	Wed Dec 15 06:04:48 2004
+++ groff/contrib/gdiffmk/ChangeLog	Thu Dec 16 22:02:21 2004
@@ -1,3 +1,9 @@
+2004-12-15  Werner LEMBERG  <wl@gnu.org>
+
+	* tests/tests.sh: Renamed to...
+	* tests/runtests.sh: This.
+	* README: Updated.
+
 2004-12-14  Werner LEMBERG  <wl@gnu.org>
 
 	* gdiffmk.sh: Make sed pattern work with alternate result of GNU
Index: groff/contrib/gdiffmk/README
diff -u groff/contrib/gdiffmk/README:1.2 groff/contrib/gdiffmk/README:1.3
--- groff/contrib/gdiffmk/README:1.2	Wed Dec 15 06:04:48 2004
+++ groff/contrib/gdiffmk/README	Thu Dec 16 22:02:21 2004
@@ -16,8 +16,8 @@
 
 Note the BUGS on the man page.
 
-The `tests' directory contains simple tests.  `tests.sh run' runs them and
-compares the output against baseline files.  Calling `tests.sh' without
+The `tests' directory contains simple tests.  `runtests run' runs them and
+compares the output against baseline files.  Calling `runtests' without
 argument gives the usage.
 
 ----------------------------------------------------------------------------



From MAILER-DAEMON Thu Dec 16 17:25:46 2004
Received: from mailman by lists.gnu.org with archive (Exim 4.33)
	id 1Cf44A-000740-Jg
	for mharc-groff-commit@gnu.org; Thu, 16 Dec 2004 17:25:46 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1Cf449-00070u-4u
	for groff-commit@gnu.org; Thu, 16 Dec 2004 17:25:45 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1Cf448-000707-K3
	for groff-commit@gnu.org; Thu, 16 Dec 2004 17:25:44 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1Cf3yh-0003Ol-Ba
	for groff-commit@gnu.org; Thu, 16 Dec 2004 17:20:07 -0500
Received: from [199.232.41.4] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.34) id 1Cf3n3-0001fd-E1
	for groff-commit@gnu.org; Thu, 16 Dec 2004 17:08:05 -0500
Received: from localhost ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 4.34) id 1Cf3n2-0001Os-PD
	for groff-commit@gnu.org; Thu, 16 Dec 2004 17:08:05 -0500
To: groff-commit@gnu.org
From: Werner LEMBERG <wl@gnu.org>
Message-Id: <E1Cf448-000707-K3@lists.gnu.org>
Date: Thu, 16 Dec 2004 17:25:44 -0500
Subject: [Groff-commit] groff/contrib/gdiffmk ChangeLog tests/runtests....
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, 16 Dec 2004 22:25:45 -0000

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

Modified files:
	contrib/gdiffmk: ChangeLog 
Added files:
	contrib/gdiffmk/tests: runtests.in 
Removed files:
	contrib/gdiffmk/tests: runtests.sh 

Log message:
	runtests.sh -> runtests.in

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/gdiffmk/ChangeLog.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/gdiffmk/tests/runtests.in?rev=1.1

Patches:
Index: groff/contrib/gdiffmk/ChangeLog
diff -u groff/contrib/gdiffmk/ChangeLog:1.4 groff/contrib/gdiffmk/ChangeLog:1.5
--- groff/contrib/gdiffmk/ChangeLog:1.4	Thu Dec 16 22:02:21 2004
+++ groff/contrib/gdiffmk/ChangeLog	Thu Dec 16 22:08:04 2004
@@ -1,7 +1,7 @@
 2004-12-15  Werner LEMBERG  <wl@gnu.org>
 
 	* tests/tests.sh: Renamed to...
-	* tests/runtests.sh: This.
+	* tests/runtests.in: This.
 	* README: Updated.
 
 2004-12-14  Werner LEMBERG  <wl@gnu.org>



From MAILER-DAEMON Thu Dec 16 17:28:10 2004
Received: from mailman by lists.gnu.org with archive (Exim 4.33)
	id 1Cf46U-0002V0-6d
	for mharc-groff-commit@gnu.org; Thu, 16 Dec 2004 17:28:10 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1Cf46Q-0002UH-7v
	for groff-commit@gnu.org; Thu, 16 Dec 2004 17:28:06 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1Cf46O-0002Tg-WB
	for groff-commit@gnu.org; Thu, 16 Dec 2004 17:28:05 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1Cf46O-0002TJ-RQ
	for groff-commit@gnu.org; Thu, 16 Dec 2004 17:28:04 -0500
Received: from [199.232.41.4] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.34) id 1Cf3vG-0004d0-Aw
	for groff-commit@gnu.org; Thu, 16 Dec 2004 17:16:34 -0500
Received: from localhost ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 4.34) id 1Cf3vG-0001sk-3X
	for groff-commit@gnu.org; Thu, 16 Dec 2004 17:16:34 -0500
To: groff-commit@gnu.org
From: Werner LEMBERG <wl@gnu.org>
Message-Id: <E1Cf46O-0002Tg-WB@lists.gnu.org>
Date: Thu, 16 Dec 2004 17:28:05 -0500
Subject: [Groff-commit] groff ChangeLog configure configure.ac
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, 16 Dec 2004 22:28:06 -0000

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

Modified files:
	.              : ChangeLog configure configure.ac 

Log message:
	* configure.ac: Produce `contrib/gdiffml/tests/runtests'.
	* configure: Updated.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/ChangeLog.diff?tr1=1.773&tr2=1.774&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/configure.diff?tr1=1.60&tr2=1.61&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/configure.ac.diff?tr1=1.29&tr2=1.30&r1=text&r2=text

Patches:
Index: groff/ChangeLog
diff -u groff/ChangeLog:1.773 groff/ChangeLog:1.774
--- groff/ChangeLog:1.773	Thu Dec 16 14:23:44 2004
+++ groff/ChangeLog	Thu Dec 16 22:16:33 2004
@@ -1,3 +1,8 @@
+2004-12-16  Mike Bianchi  <mbianchi@Foveal.com>
+
+	* configure.ac: Produce `contrib/gdiffml/tests/runtests'.
+	* configure: Updated.
+
 2004-12-15  Thomas Klausner  <wiz@netbsd.org>
 
 	* tmac/doc-syms, tmac/groff_mdoc.man: Add `libpam' library.
Index: groff/configure
diff -u groff/configure:1.60 groff/configure:1.61
--- groff/configure:1.60	Thu Nov 25 08:08:33 2004
+++ groff/configure	Thu Dec 16 22:16:33 2004
@@ -10094,6 +10094,8 @@
 
                               ac_config_files="$ac_config_files Makefile doc/Makefile src/utils/xtotroff/Makefile"
 
+          ac_config_files="$ac_config_files contrib/gdiffmk/tests/runtests"
+
           ac_config_files="$ac_config_files test-groff"
 
 cat >confcache <<\_ACEOF
@@ -10608,6 +10610,7 @@
   "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" ;;
+  "contrib/gdiffmk/tests/runtests" ) CONFIG_FILES="$CONFIG_FILES contrib/gdiffmk/tests/runtests" ;;
   "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
@@ -10992,6 +10995,7 @@
   # Run the commands associated with the file.
   case $ac_file in
     stamp-h ) echo timestamp > stamp-h ;;
+    contrib/gdiffmk/tests/runtests ) chmod +x contrib/gdiffmk/tests/runtests ;;
     test-groff ) chmod +x test-groff ;;
   esac
 done
Index: groff/configure.ac
diff -u groff/configure.ac:1.29 groff/configure.ac:1.30
--- groff/configure.ac:1.29	Thu Nov 25 08:08:33 2004
+++ groff/configure.ac	Thu Dec 16 22:16:33 2004
@@ -96,6 +96,8 @@
 
 AC_CONFIG_FILES([stamp-h], [echo timestamp > stamp-h])
 AC_CONFIG_FILES([Makefile doc/Makefile src/utils/xtotroff/Makefile])
+AC_CONFIG_FILES([contrib/gdiffmk/tests/runtests],
+                [chmod +x contrib/gdiffmk/tests/runtests])
 AC_CONFIG_FILES([test-groff], [chmod +x test-groff])
 AC_OUTPUT
 



From MAILER-DAEMON Thu Dec 16 17:51:48 2004
Received: from mailman by lists.gnu.org with archive (Exim 4.33)
	id 1Cf4TL-00089H-TI
	for mharc-groff-commit@gnu.org; Thu, 16 Dec 2004 17:51:48 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1Cf4TJ-00086p-Pb
	for groff-commit@gnu.org; Thu, 16 Dec 2004 17:51:45 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1Cf4TH-00084G-Ul
	for groff-commit@gnu.org; Thu, 16 Dec 2004 17:51:44 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1Cf4TH-00084A-Qe
	for groff-commit@gnu.org; Thu, 16 Dec 2004 17:51:43 -0500
Received: from [199.232.41.4] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.34) id 1Cf4Iy-00045U-11
	for groff-commit@gnu.org; Thu, 16 Dec 2004 17:41:04 -0500
Received: from localhost ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 4.34) id 1Cf4Ix-0003XA-U9
	for groff-commit@gnu.org; Thu, 16 Dec 2004 17:41:04 -0500
To: groff-commit@gnu.org
From: Werner LEMBERG <wl@gnu.org>
Message-Id: <E1Cf4TH-00084G-Ul@lists.gnu.org>
Date: Thu, 16 Dec 2004 17:51:44 -0500
Subject: [Groff-commit] groff/contrib/gdiffmk ChangeLog Makefile.sub te...
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, 16 Dec 2004 22:51:46 -0000

CVSROOT:	/cvsroot/groff
Module name:	groff
Branch: 	
Changes by:	Werner LEMBERG <wl@gnu.org>	04/12/16 22:41:03

Modified files:
	contrib/gdiffmk: ChangeLog Makefile.sub 
	contrib/gdiffmk/tests: .cvsignore runtests.in test_baseline7 
Added files:
	contrib/gdiffmk: .cvsignore 

Log message:
	Updates.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/gdiffmk/.cvsignore?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/gdiffmk/ChangeLog.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/gdiffmk/Makefile.sub.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/gdiffmk/tests/.cvsignore.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/gdiffmk/tests/runtests.in.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/gdiffmk/tests/test_baseline7.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: groff/contrib/gdiffmk/ChangeLog
diff -u groff/contrib/gdiffmk/ChangeLog:1.5 groff/contrib/gdiffmk/ChangeLog:1.6
--- groff/contrib/gdiffmk/ChangeLog:1.5	Thu Dec 16 22:08:04 2004
+++ groff/contrib/gdiffmk/ChangeLog	Thu Dec 16 22:41:03 2004
@@ -1,8 +1,10 @@
 2004-12-15  Werner LEMBERG  <wl@gnu.org>
 
+	The configure script now generates tests/runtests.
+
 	* tests/tests.sh: Renamed to...
 	* tests/runtests.in: This.
-	* README: Updated.
+	* README, Makefile.sub (CLEANADD), tests/test_baseline7: Updated.
 
 2004-12-14  Werner LEMBERG  <wl@gnu.org>
 
Index: groff/contrib/gdiffmk/Makefile.sub
diff -u groff/contrib/gdiffmk/Makefile.sub:1.2 groff/contrib/gdiffmk/Makefile.sub:1.3
--- groff/contrib/gdiffmk/Makefile.sub:1.2	Sun Dec 12 14:04:52 2004
+++ groff/contrib/gdiffmk/Makefile.sub	Thu Dec 16 22:41:03 2004
@@ -27,7 +27,7 @@
 ########################################################################
 
 MAN1=gdiffmk.n
-CLEANADD=gdiffmk
+CLEANADD=gdiffmk tests/runtests
 
 all: gdiffmk
 
Index: groff/contrib/gdiffmk/tests/.cvsignore
diff -u groff/contrib/gdiffmk/tests/.cvsignore:1.2 groff/contrib/gdiffmk/tests/.cvsignore:1.3
--- groff/contrib/gdiffmk/tests/.cvsignore:1.2	Thu Dec 16 14:23:44 2004
+++ groff/contrib/gdiffmk/tests/.cvsignore	Thu Dec 16 22:41:03 2004
@@ -1,2 +1,3 @@
 test_result*
 tmp_file*
+runtests
Index: groff/contrib/gdiffmk/tests/runtests.in
diff -u groff/contrib/gdiffmk/tests/runtests.in:1.1 groff/contrib/gdiffmk/tests/runtests.in:1.2
--- groff/contrib/gdiffmk/tests/runtests.in:1.1	Thu Dec 16 22:08:04 2004
+++ groff/contrib/gdiffmk/tests/runtests.in	Thu Dec 16 22:41:03 2004
@@ -1,7 +1,9 @@
 #!/bin/sh
 #	A very simple function test for gdiffmk.sh.
 
-command=../gdiffmk.sh
+srcdir=@srcdir@
+
+command=../gdiffmk
 
 #	Test the number of arguments and the first argument.
 case $#-$1 in
@@ -34,39 +36,43 @@
 tmpfile=/tmp/$$
 trap 'rm -f ${tmpfile}' 0 1 2 3 15
 
+#	Run tests.
+
 #	3 file arguments
 ResultFile=test_result1
-sh ${command}  file1  file2 ${ResultFile} 2>${tmpfile}
+${command}  $(srcdir)/file1  $(srcdir)/file2 ${ResultFile} 2>${tmpfile}
 cat ${tmpfile} >>${ResultFile}
-TestResult test_baseline ${ResultFile}
+TestResult $(srcdir)/test_baseline ${ResultFile}
 
 #	OUTPUT to stdout by default
 ResultFile=test_result2
-sh ${command}  file1  file2  >${ResultFile} 2>&1
-TestResult test_baseline ${ResultFile}
+${command}  $(srcdir)/file1  $(srcdir)/file2  >${ResultFile} 2>&1
+TestResult $(srcdir)/test_baseline ${ResultFile}
 
 #	OUTPUT to stdout via  -  argument
 ResultFile=test_result3
-sh ${command}  file1  file2 - >${ResultFile} 2>&1
-TestResult test_baseline ${ResultFile}
+${command}  $(srcdir)/file1  $(srcdir)/file2 - >${ResultFile} 2>&1
+TestResult $(srcdir)/test_baseline ${ResultFile}
 
 #	FILE1 from standard input via  -  argument
 ResultFile=test_result4
-sh ${command}  - file2 <file1  >${ResultFile} 2>&1
-TestResult test_baseline ${ResultFile}
+${command}  - $(srcdir)/file2 <$(srcdir)/file1  >${ResultFile} 2>&1
+TestResult $(srcdir)/test_baseline ${ResultFile}
 
 #	FILE2 from standard input via  -  argument
 ResultFile=test_result5
-sh ${command}  file1 - <file2  >${ResultFile} 2>&1
-TestResult test_baseline ${ResultFile}
+${command}  $(srcdir)/file1 - <$(srcdir)/file2  >${ResultFile} 2>&1
+TestResult $(srcdir)/test_baseline ${ResultFile}
 
 #	Different values for addmark, changemark, deletemark
 ResultFile=test_result6
-sh ${command}  -aA -cC -dD  file1 file2  >${ResultFile} 2>&1
-TestResult test_baseline6 ${ResultFile}
+${command}  -aA -cC -dD  $(srcdir)/file1 $(srcdir)/file2  >${ResultFile} 2>&1
+TestResult $(srcdir)/test_baseline6 ${ResultFile}
 
 #	Test for accidental file overwrite.
 ResultFile=test_result7
-cp file2 tmp_file7
-sh ${command}  -aA -dD -cC  file1 tmp_file7  tmp_file7  >${ResultFile} 2>&1
-TestResult test_baseline7 ${ResultFile}
+cp $(srcdir)/file2 tmp_file7
+${command}  -aA -dD -cC  $(srcdir)/file1 tmp_file7  tmp_file7  >${ResultFile} 2>&1
+TestResult $(srcdir)/test_baseline7 ${ResultFile}
+
+#	EOF
Index: groff/contrib/gdiffmk/tests/test_baseline7
diff -u groff/contrib/gdiffmk/tests/test_baseline7:1.1 groff/contrib/gdiffmk/tests/test_baseline7:1.2
--- groff/contrib/gdiffmk/tests/test_baseline7:1.1	Wed Dec 15 06:04:49 2004
+++ groff/contrib/gdiffmk/tests/test_baseline7	Thu Dec 16 22:41:03 2004
@@ -1,2 +1,2 @@
-gdiffmk.sh:  The FILE2 and OUTPUT arguments both point to the same file,
-gdiffmk.sh:  `tmp_file7', and it would be overwritten.
+gdiffmk:  The FILE2 and OUTPUT arguments both point to the same file,
+gdiffmk:  `tmp_file7', and it would be overwritten.



From MAILER-DAEMON Thu Dec 16 17:55:15 2004
Received: from mailman by lists.gnu.org with archive (Exim 4.33)
	id 1Cf4Wh-0000ny-7L
	for mharc-groff-commit@gnu.org; Thu, 16 Dec 2004 17:55:15 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1Cf4We-0000nJ-6A
	for groff-commit@gnu.org; Thu, 16 Dec 2004 17:55:12 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1Cf4WZ-0000lR-6S
	for groff-commit@gnu.org; Thu, 16 Dec 2004 17:55:08 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1Cf4WY-0000kW-L4
	for groff-commit@gnu.org; Thu, 16 Dec 2004 17:55:06 -0500
Received: from [199.232.41.5] (helo=mx20.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.34) id 1Cf4KW-0004mj-Sv
	for groff-commit@gnu.org; Thu, 16 Dec 2004 17:42:41 -0500
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by mx20.gnu.org with esmtp (Exim 4.34) id 1Cf4K4-00014I-C3
	for groff-commit@gnu.org; Thu, 16 Dec 2004 17:42:12 -0500
Received: from localhost ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 4.34) id 1Cf4K4-0003kq-8b
	for groff-commit@gnu.org; Thu, 16 Dec 2004 17:42:12 -0500
To: groff-commit@gnu.org
From: Werner LEMBERG <wl@gnu.org>
Message-Id: <E1Cf4WZ-0000lR-6S@lists.gnu.org>
Date: Thu, 16 Dec 2004 17:55:08 -0500
Subject: [Groff-commit] groff/contrib/gdiffmk 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: Thu, 16 Dec 2004 22:55:12 -0000

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

Modified files:
	contrib/gdiffmk: ChangeLog 

Log message:
	

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

Patches:
Index: groff/contrib/gdiffmk/ChangeLog
diff -u groff/contrib/gdiffmk/ChangeLog:1.6 groff/contrib/gdiffmk/ChangeLog:1.7
--- groff/contrib/gdiffmk/ChangeLog:1.6	Thu Dec 16 22:41:03 2004
+++ groff/contrib/gdiffmk/ChangeLog	Thu Dec 16 22:42:12 2004
@@ -4,6 +4,7 @@
 
 	* tests/tests.sh: Renamed to...
 	* tests/runtests.in: This.
+	Add proper $srcdir prefixes to make it run from build directory.
 	* README, Makefile.sub (CLEANADD), tests/test_baseline7: Updated.
 
 2004-12-14  Werner LEMBERG  <wl@gnu.org>



From MAILER-DAEMON Fri Dec 17 01:07:54 2004
Received: from mailman by lists.gnu.org with archive (Exim 4.33)
	id 1CfBHN-00017u-Ml
	for mharc-groff-commit@gnu.org; Fri, 17 Dec 2004 01:07:53 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1CfBHK-00014y-Np
	for groff-commit@gnu.org; Fri, 17 Dec 2004 01:07:50 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1CfBHI-00013C-N5
	for groff-commit@gnu.org; Fri, 17 Dec 2004 01:07:49 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1CfBHI-00012I-C5
	for groff-commit@gnu.org; Fri, 17 Dec 2004 01:07:48 -0500
Received: from [199.232.41.4] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.34) id 1CfB65-0006kS-OM
	for groff-commit@gnu.org; Fri, 17 Dec 2004 00:56:13 -0500
Received: from localhost ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 4.34) id 1CfB65-00010D-Qn
	for groff-commit@gnu.org; Fri, 17 Dec 2004 00:56:13 -0500
To: groff-commit@gnu.org
From: Werner LEMBERG <wl@gnu.org>
Message-Id: <E1CfBHI-00013C-N5@lists.gnu.org>
Date: Fri, 17 Dec 2004 01:07:48 -0500
Subject: [Groff-commit] groff/contrib/gdiffmk ChangeLog tests/runtests.in
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: Fri, 17 Dec 2004 06:07:51 -0000

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

Modified files:
	contrib/gdiffmk: ChangeLog 
	contrib/gdiffmk/tests: runtests.in 

Log message:
	* tests/runtests.in: Fix typo (s/$(srcdir)/${srcdir}/).

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/gdiffmk/ChangeLog.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/gdiffmk/tests/runtests.in.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: groff/contrib/gdiffmk/ChangeLog
diff -u groff/contrib/gdiffmk/ChangeLog:1.7 groff/contrib/gdiffmk/ChangeLog:1.8
--- groff/contrib/gdiffmk/ChangeLog:1.7	Thu Dec 16 22:42:12 2004
+++ groff/contrib/gdiffmk/ChangeLog	Fri Dec 17 05:56:13 2004
@@ -1,3 +1,7 @@
+2004-12-16  Mike Bianchi  <MBianchi@Foveal.com>
+
+	* tests/runtests.in: Fix typo (s/$(srcdir)/${srcdir}/).
+
 2004-12-15  Werner LEMBERG  <wl@gnu.org>
 
 	The configure script now generates tests/runtests.
Index: groff/contrib/gdiffmk/tests/runtests.in
diff -u groff/contrib/gdiffmk/tests/runtests.in:1.2 groff/contrib/gdiffmk/tests/runtests.in:1.3
--- groff/contrib/gdiffmk/tests/runtests.in:1.2	Thu Dec 16 22:41:03 2004
+++ groff/contrib/gdiffmk/tests/runtests.in	Fri Dec 17 05:56:13 2004
@@ -40,39 +40,39 @@
 
 #	3 file arguments
 ResultFile=test_result1
-${command}  $(srcdir)/file1  $(srcdir)/file2 ${ResultFile} 2>${tmpfile}
+${command}  ${srcdir}/file1  ${srcdir}/file2 ${ResultFile} 2>${tmpfile}
 cat ${tmpfile} >>${ResultFile}
-TestResult $(srcdir)/test_baseline ${ResultFile}
+TestResult ${srcdir}/test_baseline ${ResultFile}
 
 #	OUTPUT to stdout by default
 ResultFile=test_result2
-${command}  $(srcdir)/file1  $(srcdir)/file2  >${ResultFile} 2>&1
-TestResult $(srcdir)/test_baseline ${ResultFile}
+${command}  ${srcdir}/file1  ${srcdir}/file2  >${ResultFile} 2>&1
+TestResult ${srcdir}/test_baseline ${ResultFile}
 
 #	OUTPUT to stdout via  -  argument
 ResultFile=test_result3
-${command}  $(srcdir)/file1  $(srcdir)/file2 - >${ResultFile} 2>&1
-TestResult $(srcdir)/test_baseline ${ResultFile}
+${command}  ${srcdir}/file1  ${srcdir}/file2 - >${ResultFile} 2>&1
+TestResult ${srcdir}/test_baseline ${ResultFile}
 
 #	FILE1 from standard input via  -  argument
 ResultFile=test_result4
-${command}  - $(srcdir)/file2 <$(srcdir)/file1  >${ResultFile} 2>&1
-TestResult $(srcdir)/test_baseline ${ResultFile}
+${command}  - ${srcdir}/file2 <${srcdir}/file1  >${ResultFile} 2>&1
+TestResult ${srcdir}/test_baseline ${ResultFile}
 
 #	FILE2 from standard input via  -  argument
 ResultFile=test_result5
-${command}  $(srcdir)/file1 - <$(srcdir)/file2  >${ResultFile} 2>&1
-TestResult $(srcdir)/test_baseline ${ResultFile}
+${command}  ${srcdir}/file1 - <${srcdir}/file2  >${ResultFile} 2>&1
+TestResult ${srcdir}/test_baseline ${ResultFile}
 
 #	Different values for addmark, changemark, deletemark
 ResultFile=test_result6
-${command}  -aA -cC -dD  $(srcdir)/file1 $(srcdir)/file2  >${ResultFile} 2>&1
-TestResult $(srcdir)/test_baseline6 ${ResultFile}
+${command}  -aA -cC -dD  ${srcdir}/file1 ${srcdir}/file2  >${ResultFile} 2>&1
+TestResult ${srcdir}/test_baseline6 ${ResultFile}
 
 #	Test for accidental file overwrite.
 ResultFile=test_result7
-cp $(srcdir)/file2 tmp_file7
-${command}  -aA -dD -cC  $(srcdir)/file1 tmp_file7  tmp_file7  >${ResultFile} 2>&1
-TestResult $(srcdir)/test_baseline7 ${ResultFile}
+cp ${srcdir}/file2 tmp_file7
+${command}  -aA -dD -cC  ${srcdir}/file1 tmp_file7  tmp_file7  >${ResultFile} 2>&1
+TestResult ${srcdir}/test_baseline7 ${ResultFile}
 
 #	EOF



From MAILER-DAEMON Sat Dec 18 03:20:31 2004
Received: from mailman by lists.gnu.org with archive (Exim 4.33)
	id 1CfZpH-00034T-9Q
	for mharc-groff-commit@gnu.org; Sat, 18 Dec 2004 03:20:31 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1CfZpF-00034H-Ds
	for groff-commit@gnu.org; Sat, 18 Dec 2004 03:20:29 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1CfZpE-00033j-76
	for groff-commit@gnu.org; Sat, 18 Dec 2004 03:20:28 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1CfZpE-00033Z-3v
	for groff-commit@gnu.org; Sat, 18 Dec 2004 03:20:28 -0500
Received: from [199.232.41.4] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.34) id 1CfZek-0003XG-Ms
	for groff-commit@gnu.org; Sat, 18 Dec 2004 03:09:38 -0500
Received: from localhost ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 4.34) id 1CfZel-00007T-HV
	for groff-commit@gnu.org; Sat, 18 Dec 2004 03:09:39 -0500
To: groff-commit@gnu.org
From: Werner LEMBERG <wl@gnu.org>
Message-Id: <E1CfZpE-00033j-76@lists.gnu.org>
Date: Sat, 18 Dec 2004 03:20:28 -0500
Subject: [Groff-commit] groff ./ChangeLog tmac/an-old.tmac tmac/devtag....
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, 18 Dec 2004 08:20:29 -0000

CVSROOT:	/cvsroot/groff
Module name:	groff
Branch: 	
Changes by:	Werner LEMBERG <wl@gnu.org>	04/12/18 08:09:39

Modified files:
	.              : ChangeLog 
	tmac           : an-old.tmac devtag.tmac s.tmac www.tmac 

Log message:
	* tmac/devtag.tmac: Protect against loading twice.
	Protect agains compatibility mode.
	* tmac/www.tmac: Protect against loading twice.
	Load `devtag.tmac' before switching off compatibility mode.
	* tmac/an-old.tmac, tmac/s.tmac: Load `devtag.tmac'.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/ChangeLog.diff?tr1=1.774&tr2=1.775&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/tmac/an-old.tmac.diff?tr1=1.49&tr2=1.50&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/tmac/devtag.tmac.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/tmac/s.tmac.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/tmac/www.tmac.diff?tr1=1.37&tr2=1.38&r1=text&r2=text

Patches:
Index: groff/ChangeLog
diff -u groff/ChangeLog:1.774 groff/ChangeLog:1.775
--- groff/ChangeLog:1.774	Thu Dec 16 22:16:33 2004
+++ groff/ChangeLog	Sat Dec 18 08:09:39 2004
@@ -1,3 +1,11 @@
+2004-12-17  Werner LEMBERG  <wl@gnu.org>
+
+	* tmac/devtag.tmac: Protect against loading twice.
+	Protect agains compatibility mode.
+	* tmac/www.tmac: Protect against loading twice.
+	Load `devtag.tmac' before switching off compatibility mode.
+	* tmac/an-old.tmac, tmac/s.tmac: Load `devtag.tmac'.
+
 2004-12-16  Mike Bianchi  <mbianchi@Foveal.com>
 
 	* configure.ac: Produce `contrib/gdiffml/tests/runtests'.
Index: groff/tmac/an-old.tmac
diff -u groff/tmac/an-old.tmac:1.49 groff/tmac/an-old.tmac:1.50
--- groff/tmac/an-old.tmac:1.49	Thu Dec 16 13:09:54 2004
+++ groff/tmac/an-old.tmac	Sat Dec 18 08:09:39 2004
@@ -38,6 +38,8 @@
 .
 .do if d RI .nx
 .
+.do mso devtag.tmac
+.
 .nr _C \n(.C
 .cp 0
 .
Index: groff/tmac/devtag.tmac
diff -u groff/tmac/devtag.tmac:1.1 groff/tmac/devtag.tmac:1.2
--- groff/tmac/devtag.tmac:1.1	Thu Dec 16 13:09:54 2004
+++ groff/tmac/devtag.tmac	Sat Dec 18 08:09:39 2004
@@ -1,5 +1,5 @@
 .ig
-www.tmac - macro package for adding HTML elements to roff documents.
+devtag.tmac - macro package for adding tags to roff documents.
 
 File position: <groff_source_top>/tmac/devtag.tmac
 Installed position: groff's main macro directory.
@@ -35,16 +35,20 @@
 
 A simple set of macros to provide markup devices (currently only grohtml)
 with tags that define the meaning of the formatted text and also
-basic formatting instructions. It generalises the tag concept used within
+basic formatting instructions.  It generalizes the tag concept used within
 grohtml and in the future it is hoped that more markup based devices
-can capitalise on this work. It also clearly defines those tags which are
-honoured by grohtml. Note that not all tags are included here. Some
-of the grohtml specific tags (header specific and jobname etc) are
-called directly from within www.tmac. The tags defined here are
-reasonably generic and could be applied to the -Tdoc device when it
-is written.
+can capitalize on this work.  It also clearly defines those tags which are
+honoured by grohtml.  Note that not all tags are included here.  Some
+of the grohtml specific tags (header specific and jobname, etc.) are
+called directly from within www.tmac.  The tags defined here are
+reasonably generic and could be applied to other devices.
 ..
 .
+.do if d DEVTAG-NH .nx
+.
+.nr _C \n(.C
+.cp 0
+.
 .\" --------------------------------------------------------------------
 .\" DEVTAG <name>
 .\"
@@ -113,6 +117,10 @@
 .   DEVTAG-NEXT ".col \\$1"
 ..
 .
+.
+.cp \n[_C]
+.
+.
 .\" --------------------------------------------------------------------
 .\" Emacs settings
 .\" --------------------------------------------------------------------
Index: groff/tmac/s.tmac
diff -u groff/tmac/s.tmac:1.23 groff/tmac/s.tmac:1.24
--- groff/tmac/s.tmac:1.23	Thu Dec 16 13:09:54 2004
+++ groff/tmac/s.tmac	Sat Dec 18 08:09:39 2004
@@ -31,6 +31,7 @@
 .if (\n[.warn] == 65543) .warn
 .\" See if already loaded.
 .if r GS .nx
+.mso devtag.tmac
 .nr GS 1
 .nr need_eo_h 0
 .nr need_eo_tl 0
Index: groff/tmac/www.tmac
diff -u groff/tmac/www.tmac:1.37 groff/tmac/www.tmac:1.38
--- groff/tmac/www.tmac:1.37	Thu Dec 16 13:09:54 2004
+++ groff/tmac/www.tmac	Sat Dec 18 08:09:39 2004
@@ -42,10 +42,13 @@
 .\" Setup
 .\" --------------------------------------------------------------------
 .
+.do if d www:lenstr .nx
+.
+.do mso devtag.tmac
+.
 .nr _C \n(.C
 .cp 0
 .
-.mso devtag.tmac
 .
 .nr www-html 0
 .if '\*[.T]'html' .nr www-html 1



From MAILER-DAEMON Tue Dec 21 01:09:42 2004
Received: from mailman by lists.gnu.org with archive (Exim 4.33)
	id 1CgdDK-0004A5-6I
	for mharc-groff-commit@gnu.org; Tue, 21 Dec 2004 01:09:42 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1CgdDH-00048Y-VP
	for groff-commit@gnu.org; Tue, 21 Dec 2004 01:09:40 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1CgdDF-00046z-7J
	for groff-commit@gnu.org; Tue, 21 Dec 2004 01:09:38 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1CgdDF-00046N-1b
	for groff-commit@gnu.org; Tue, 21 Dec 2004 01:09:37 -0500
Received: from [199.232.41.4] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.34) id 1Cgd0u-00005z-Nv
	for groff-commit@gnu.org; Tue, 21 Dec 2004 00:56:53 -0500
Received: from localhost ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 4.34) id 1Cgd0v-0003q2-Rr
	for groff-commit@gnu.org; Tue, 21 Dec 2004 00:56:54 -0500
To: groff-commit@gnu.org
From: Werner LEMBERG <wl@gnu.org>
Message-Id: <E1CgdDF-00046z-7J@lists.gnu.org>
Date: Tue, 21 Dec 2004 01:09:37 -0500
Subject: [Groff-commit] groff ChangeLog install-sh
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, 21 Dec 2004 06:09:40 -0000

CVSROOT:	/cvsroot/groff
Module name:	groff
Branch: 	
Changes by:	Werner LEMBERG <wl@gnu.org>	04/12/21 05:56:53

Modified files:
	.              : ChangeLog install-sh 

Log message:
	* install-sh: New version; taken from texinfo CVS.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/ChangeLog.diff?tr1=1.775&tr2=1.776&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/install-sh.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: groff/ChangeLog
diff -u groff/ChangeLog:1.775 groff/ChangeLog:1.776
--- groff/ChangeLog:1.775	Sat Dec 18 08:09:39 2004
+++ groff/ChangeLog	Tue Dec 21 05:56:52 2004
@@ -1,3 +1,7 @@
+2004-12-19  Werner LEMBERG  <wl@gnu.org>
+
+	* install-sh: New version; taken from texinfo CVS.
+
 2004-12-17  Werner LEMBERG  <wl@gnu.org>
 
 	* tmac/devtag.tmac: Protect against loading twice.
Index: groff/install-sh
diff -u groff/install-sh:1.2 groff/install-sh:1.3
--- groff/install-sh:1.2	Tue May  4 16:54:38 2004
+++ groff/install-sh	Tue Dec 21 05:56:53 2004
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2004-04-01.17
+scriptversion=2004-12-17.09
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -58,9 +58,6 @@
 rmprog="${RMPROG-rm}"
 mkdirprog="${MKDIRPROG-mkdir}"
 
-transformbasename=
-transform_arg=
-instcmd="$mvprog"
 chmodcmd="$chmodprog 0755"
 chowncmd=
 chgrpcmd=
@@ -70,23 +67,27 @@
 src=
 dst=
 dir_arg=
+dstarg=
+no_target_directory=
 
-usage="Usage: $0 [OPTION]... SRCFILE DSTFILE
+usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
    or: $0 [OPTION]... SRCFILES... DIRECTORY
-   or: $0 -d DIRECTORIES...
+   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
+   or: $0 [OPTION]... -d DIRECTORIES...
 
-In the first form, install SRCFILE to DSTFILE, removing SRCFILE by default.
-In the second, create the directory path DIR.
+In the 1st form, copy SRCFILE to DSTFILE.
+In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
+In the 4th, create DIRECTORIES.
 
 Options:
--b=TRANSFORMBASENAME
--c         copy source (using $cpprog) instead of moving (using $mvprog).
+-c         (ignored)
 -d         create directories instead of installing files.
--g GROUP   $chgrp installed files to GROUP.
--m MODE    $chmod installed files to MODE.
--o USER    $chown installed files to USER.
--s         strip installed files (using $stripprog).
--t=TRANSFORM
+-g GROUP   $chgrpprog installed files to GROUP.
+-m MODE    $chmodprog installed files to MODE.
+-o USER    $chownprog installed files to USER.
+-s         $stripprog installed files.
+-t DIRECTORY  install into DIRECTORY.
+-T         report an error if DSTFILE is a directory.
 --help     display this help and exit.
 --version  display version info and exit.
 
@@ -96,12 +97,7 @@
 
 while test -n "$1"; do
   case $1 in
-    -b=*) transformbasename=`echo $1 | sed 's/-b=//'`
-        shift
-        continue;;
-
-    -c) instcmd=$cpprog
-        shift
+    -c) shift
         continue;;
 
     -d) dir_arg=true
@@ -129,14 +125,20 @@
         shift
         continue;;
 
-    -t=*) transformarg=`echo $1 | sed 's/-t=//'`
-        shift
-        continue;;
+    -t) dstarg=$2
+	shift
+	shift
+	continue;;
+
+    -T) no_target_directory=true
+	shift
+	continue;;
 
     --version) echo "$0 $scriptversion"; exit 0;;
 
     *)  # When -d is used, all remaining arguments are directories to create.
-	test -n "$dir_arg" && break
+	# When -t is used, the destination is already specified.
+	test -n "$dir_arg$dstarg" && break
         # Otherwise, the last argument is the destination.  Remove it from $@.
 	for arg
 	do
@@ -174,13 +176,13 @@
     src=
 
     if test -d "$dst"; then
-      instcmd=:
+      mkdircmd=:
       chmodcmd=
     else
-      instcmd=$mkdirprog
+      mkdircmd=$mkdirprog
     fi
   else
-    # Waiting for this to be detected by the "$instcmd $src $dsttmp" command
+    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
     # might cause directories to be created, which would be especially bad
     # if $src (and thus $dsttmp) contains '*'.
     if test ! -f "$src" && test ! -d "$src"; then
@@ -202,12 +204,16 @@
     # If destination is a directory, append the input filename; won't work
     # if double slashes aren't ignored.
     if test -d "$dst"; then
+      if test -n "$no_target_directory"; then
+	echo "$0: $dstarg: Is a directory" >&2
+	exit 1
+      fi
       dst=$dst/`basename "$src"`
     fi
   fi
 
   # This sed command emulates the dirname command.
-  dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
+  dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
 
   # Make sure that the destination directory exists.
 
@@ -220,7 +226,8 @@
     oIFS=$IFS
     # Some sh's can't handle IFS=/ for some reason.
     IFS='%'
-    set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
+    set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
+    shift
     IFS=$oIFS
 
     pathcomp=
@@ -229,51 +236,42 @@
       pathcomp=$pathcomp$1
       shift
       if test ! -d "$pathcomp"; then
-        $mkdirprog "$pathcomp" || lasterr=$?
+        $mkdirprog "$pathcomp"
 	# mkdir can fail with a `File exist' error in case several
 	# install-sh are creating the directory concurrently.  This
 	# is OK.
-	test ! -d "$pathcomp" && { (exit ${lasterr-1}); exit; }
+	test -d "$pathcomp" || exit
       fi
       pathcomp=$pathcomp/
     done
   fi
 
   if test -n "$dir_arg"; then
-    $doit $instcmd "$dst" \
+    $doit $mkdircmd "$dst" \
       && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
       && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
       && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
       && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
 
   else
-    # If we're going to rename the final executable, determine the name now.
-    if test -z "$transformarg"; then
-      dstfile=`basename "$dst"`
-    else
-      dstfile=`basename "$dst" $transformbasename \
-               | sed $transformarg`$transformbasename
-    fi
-
-    # don't allow the sed command to completely eliminate the filename.
-    test -z "$dstfile" && dstfile=`basename "$dst"`
+    dstfile=`basename "$dst"`
 
     # Make a couple of temp file names in the proper directory.
     dsttmp=$dstdir/_inst.$$_
     rmtmp=$dstdir/_rm.$$_
 
     # Trap to clean up those temp files at exit.
-    trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0
+    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
     trap '(exit $?); exit' 1 2 13 15
 
-    # Move or copy the file name to the temp name
-    $doit $instcmd "$src" "$dsttmp" &&
+    # Copy the file name to the temp name.
+    $doit $cpprog "$src" "$dsttmp" &&
 
     # and set any options; do chmod last to preserve setuid bits.
     #
     # If any of these fail, we abort the whole thing.  If we want to
     # ignore errors from any of these, just make sure not to ignore
-    # errors from the above "$doit $instcmd $src $dsttmp" command.
+    # errors from the above "$doit $cpprog $src $dsttmp" command.
     #
     { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
       && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
@@ -298,7 +296,7 @@
 	       || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
 	       || {
 		 echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
-		 (exit 1); exit
+		 (exit 1); exit 1
 	       }
 	     else
 	       :
@@ -309,12 +307,12 @@
 	   $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
 	 }
     }
-  fi || { (exit 1); exit; }
+  fi || { (exit 1); exit 1; }
 done
 
 # The final little trick to "correctly" pass the exit status to the exit trap.
 {
-  (exit 0); exit
+  (exit 0); exit 0
 }
 
 # Local variables:



