From MAILER-DAEMON Sun Apr 08 14:54:42 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HacXB-0003cg-SE
	for mharc-groff-commit@gnu.org; Sun, 08 Apr 2007 14:54:41 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HacX9-0003bG-OD
	for groff-commit@gnu.org; Sun, 08 Apr 2007 14:54:39 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HacX9-0003aX-7i
	for groff-commit@gnu.org; Sun, 08 Apr 2007 14:54:39 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HacX9-0003a2-0m
	for groff-commit@gnu.org; Sun, 08 Apr 2007 14:54:39 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <keith.d.marshall@ntlworld.com>)
	id 1HacTO-0002hg-T4
	for groff-commit@gnu.org; Sun, 08 Apr 2007 14:50:47 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HacTL-0001xq-RF
	for groff-commit@gnu.org; Sun, 08 Apr 2007 18:50:43 +0000
Received: from keithmarshall by cvs with local (Exim 4.50) id 1HacTL-0001xn-EU
	for groff-commit@gnu.org; Sun, 08 Apr 2007 18:50:43 +0000
To: groff-commit@gnu.org
Message-Id: <E1HacTL-0001xn-EU@cvs>
From: Keith Marshall <keith.d.marshall@ntlworld.com>
Date: Sun, 08 Apr 2007 18:50:43 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Groff-commit] groff ChangeLog NEWS doc/groff.texinfo tmac/gro...
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, 08 Apr 2007 18:54:39 -0000

CVSROOT:	/cvsroot/groff
Module name:	groff
Changes by:	Keith Marshall <keithmarshall>	07/04/08 18:50:43

Modified files:
	.              : ChangeLog NEWS 
	doc            : groff.texinfo 
	tmac           : groff_ms.man s.tmac 

Log message:
		* tmac/s.tmac (SN): Define unconditionally.
		(SN-STYLE): New string; define.
	
		* NEWS, tmac/groff_ms.man, doc/groff.texinfo (SN-STYLE): Document it.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/ChangeLog?cvsroot=groff&r1=1.1081&r2=1.1082
http://cvs.savannah.gnu.org/viewcvs/groff/NEWS?cvsroot=groff&r1=1.237&r2=1.238
http://cvs.savannah.gnu.org/viewcvs/groff/doc/groff.texinfo?cvsroot=groff&r1=1.256&r2=1.257
http://cvs.savannah.gnu.org/viewcvs/groff/tmac/groff_ms.man?cvsroot=groff&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/groff/tmac/s.tmac?cvsroot=groff&r1=1.30&r2=1.31

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/groff/groff/ChangeLog,v
retrieving revision 1.1081
retrieving revision 1.1082
diff -u -b -r1.1081 -r1.1082
--- ChangeLog	22 Mar 2007 11:13:26 -0000	1.1081
+++ ChangeLog	8 Apr 2007 18:50:42 -0000	1.1082
@@ -1,3 +1,10 @@
+2007-04-08  Keith Marshall  <keith.d.marshall@ntlworld.com>
+
+	* tmac/s.tmac (SN): Define unconditionally.
+	(SN-STYLE): New string; define.
+
+	* NEWS, tmac/groff_ms.man, doc/groff.texinfo (SN-STYLE): Document it.
+
 2007-03-22  Werner LEMBERG  <wl@gnu.org>
 
 	* tmac/pspic.tmac: Fix harmless numeric overflow warning.  Reported

Index: NEWS
===================================================================
RCS file: /cvsroot/groff/groff/NEWS,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -b -r1.237 -r1.238
--- NEWS	3 Feb 2007 05:32:46 -0000	1.237
+++ NEWS	8 Apr 2007 18:50:42 -0000	1.238
@@ -132,6 +132,9 @@
   localisms `.SC', `.UC', `.P1', and `.P2'.  The latter three are enabled
   only after .SC is called.
 
+o A new string, `SN-STYLE', has been added to the ms macros, controlling
+  the formatting of section numbers in headings defined by `.NH'.
+
 
 VERSION 1.19.2
 ==============

Index: doc/groff.texinfo
===================================================================
RCS file: /cvsroot/groff/groff/doc/groff.texinfo,v
retrieving revision 1.256
retrieving revision 1.257
diff -u -b -r1.256 -r1.257
--- doc/groff.texinfo	1 Feb 2007 23:09:22 -0000	1.256
+++ doc/groff.texinfo	8 Apr 2007 18:50:43 -0000	1.257
@@ -3352,26 +3352,41 @@
 @DefstrItem {SN-DOT, ms}
 @DefstrListEnd {SN-NO-DOT, ms}
 After invocation of @code{NH}, the assigned section number is made
-available in the strings @code{SN-DOT} (exactly as it appears in the
-printed section heading) and @code{SN-NO-DOT} (with the final period
-omitted).  The string @code{SN} is also defined, as an alias for
-@code{SN-DOT}; if preferred, you may redefine it as an alias for
-@code{SN-NO-DOT}, by including the initialization
-
+available in the strings @code{SN-DOT} (as it appears in a printed
+section heading with default formatting, followed by a terminating
+period), and @code{SN-NO-DOT} (with the terminating period omitted).
+The string @code{SN} is also defined, as an alias for @code{SN-DOT};
+if preferred, you may redefine it as an alias for @code{SN-NO-DOT},
+by including the initialization
 @Example
-.ds SN-NO-DOT
 .als SN SN-NO-DOT
 @endExample
 
 @noindent
-@strong{before} your first use of @code{NH}, or simply
+at any time @strong{before} you would like the change to take effect.
+@endDefstr
 
+@Defstr {SN-STYLE, ms}
+You may control the style used to print section numbers, within
+numbered section headings, by defining an appropriate alias for the
+string @code{SN-STYLE}.  The default style, in which the printed
+section number is followed by a terminating period, is obtained
+by defining the alias
 @Example
-.als SN SN-NO-DOT
+.als SN-STYLE SN-DOT
+@endExample
+
+@noindent
+If you prefer to omit the terminating period, from section numbers
+appearing in numbered section headings, you may define the alias
+@Example
+.als SN-STYLE SN-NO-DOT
 @endExample
 
 @noindent
-@strong{after} your first use of @code{NH}.
+Any such change in section numbering style becomes effective from
+the next use of @code{.NH}, following redefinition of the alias for
+@code{SN-STYLE}.
 @endDefstr
 
 @Defmac {SH, [@Var{match-level}], ms}

Index: tmac/groff_ms.man
===================================================================
RCS file: /cvsroot/groff/groff/tmac/groff_ms.man,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- tmac/groff_ms.man	2 Feb 2007 18:43:59 -0000	1.21
+++ tmac/groff_ms.man	8 Apr 2007 18:50:43 -0000	1.22
@@ -528,14 +528,57 @@
 when assigning a value specified in points.
 .
 .IP
+The style used to represent the section number,
+within a numbered heading,
+is controlled by the
+.B SN-STYLE
+string;
+this may be set to either the
+.B SN-DOT
+or the
+.B SN-NO-DOT
+style,
+(described below),
+by aliasing
+.B SN-STYLE
+accordingly.
+By default,
+.B SN-STYLE
+is initialised by defining the alias
+.RS
+.nf
+.IP
+\&.als SN-STYLE SN-DOT
+.fi
+.RE
+.IP
+it may be changed to the
+.B SN-NO-DOT
+style,
+if preferred,
+by defining the alternative alias
+.RS
+.nf
+.IP
+\&.als SN-STYLE SN-NO-DOT
+.fi
+.RE
+.IP
+Any such change becomes effective with the first use of
+.BR .NH ,
+.I after
+the new alias is defined.
+.
+.IP
 After invoking
 .BR .NH ,
 the assigned heading number is available in the strings
 .B SN-DOT
-(exactly as it appears in the formatted heading),
+(as it appears in the default formatting style for numbered headings,
+with a terminating period following the number),
 and
 .B SN-NO-DOT
-(with its final period omitted).
+(with this terminating period omitted).
 The string
 .B SN
 is also defined,
@@ -550,28 +593,16 @@
 .RS
 .nf
 .IP
-\&.ds SN-NO-DOT
 \&.als SN SN-NO-DOT
 .fi
 .RE
 .
 .IP
-.I before
-the first use of
+at any time;
+the change becomes effective with the next use of
 .BR .NH ,
-or simply:
-.
-.RS
-.nf
-.IP
-\&.als SN SN-NO-DOT
-.fi
-.RE
-.
-.IP
 .I after
-the first use of
-.BR .NH .
+the new alias is defined.
 .
 .TP
 .BI .SH\ [ xx ]

Index: tmac/s.tmac
===================================================================
RCS file: /cvsroot/groff/groff/tmac/s.tmac,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- tmac/s.tmac	15 Mar 2007 20:41:49 -0000	1.30
+++ tmac/s.tmac	8 Apr 2007 18:50:43 -0000	1.31
@@ -1534,6 +1534,16 @@
 .\" Numbered headings.
 .\" nh*hl is the level of the last heading
 .nr nh*hl 0
+.\" SN-DOT and SN-NO-DOT represent the section number of
+.\" the current heading, with and without a terminating dot.
+.ds SN-DOT
+.ds SN-NO-DOT
+.\" SN-STYLE sets the statement numbering style used in headings
+.\" (either SN-DOT or SN-NO-DOT); for backward compatibility with
+.\" earlier ms versions, the default is SN-DOT
+.als SN-STYLE SN-DOT
+.\" Also for backward compatibility, let SN represent SN-DOT.
+.als SN SN-DOT
 .\" numbered heading
 .de @NH
 .ie '\\$1'S' \{\
@@ -1577,12 +1587,11 @@
 .	as SN-NO-DOT .\\n[H\\n[nh*i]]
 .\}
 .ds SN-DOT \\*[SN-NO-DOT].
-.if !dSN .als SN SN-DOT
 .nr sh*psincr (\\n[GROWPS]-\\n[nh*hl])*\\n[PSINCR]
 .SH-NO-TAG
 .DEVTAG-NH "\\$1"
 .  if '\*(.T'html' .nr need_eo_h 1
-\\*[SN-DOT]
+\\*[SN-STYLE]
 ..
 .\" ****************************
 .\" ******** module toc ********



From MAILER-DAEMON Mon Apr 09 04:04:45 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Haorl-0005mc-OD
	for mharc-groff-commit@gnu.org; Mon, 09 Apr 2007 04:04:45 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Haorj-0005mH-Mt
	for groff-commit@gnu.org; Mon, 09 Apr 2007 04:04:43 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Haori-0005kz-PB
	for groff-commit@gnu.org; Mon, 09 Apr 2007 04:04:42 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Haori-0005kw-Iv
	for groff-commit@gnu.org; Mon, 09 Apr 2007 04:04:42 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <wl@gnu.org>) id 1Haont-0004Es-II
	for groff-commit@gnu.org; Mon, 09 Apr 2007 04:00:46 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Haonp-0007Zy-1i
	for groff-commit@gnu.org; Mon, 09 Apr 2007 08:00:41 +0000
Received: from wl by cvs with local (Exim 4.50) id 1Haono-0007Zt-Q0
	for groff-commit@gnu.org; Mon, 09 Apr 2007 08:00:40 +0000
To: groff-commit@gnu.org
Message-Id: <E1Haono-0007Zt-Q0@cvs>
From: Werner LEMBERG <wl@gnu.org>
Date: Mon, 09 Apr 2007 08:00:40 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Groff-commit] groff ChangeLog font/devps/generate/textmap 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: Mon, 09 Apr 2007 08:04:43 -0000

CVSROOT:	/cvsroot/groff
Module name:	groff
Changes by:	Werner LEMBERG <wl>	07/04/09 08:00:40

Modified files:
	.              : ChangeLog 
	font/devps/generate: textmap 
	src/utils/afmtodit: afmtodit.tables 

Log message:
	* font/devps/generate/textmap: Add Greek letters and some more.
	
	* src/utils/afmtodit/afmtodit.tables: Change values of `Delta',
	`Omega', and `mu' to the ones from aglfn.txt.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/ChangeLog?cvsroot=groff&r1=1.1082&r2=1.1083
http://cvs.savannah.gnu.org/viewcvs/groff/font/devps/generate/textmap?cvsroot=groff&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/groff/src/utils/afmtodit/afmtodit.tables?cvsroot=groff&r1=1.1&r2=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/groff/groff/ChangeLog,v
retrieving revision 1.1082
retrieving revision 1.1083
diff -u -b -r1.1082 -r1.1083
--- ChangeLog	8 Apr 2007 18:50:42 -0000	1.1082
+++ ChangeLog	9 Apr 2007 08:00:40 -0000	1.1083
@@ -1,3 +1,10 @@
+2007-04-09  Michail Vidiassov  <master@iaas.msu.ru>
+
+	* font/devps/generate/textmap: Add Greek letters and some more.
+
+	* src/utils/afmtodit/afmtodit.tables: Change values of `Delta',
+	`Omega', and `mu' to the ones from aglfn.txt.
+
 2007-04-08  Keith Marshall  <keith.d.marshall@ntlworld.com>
 
 	* tmac/s.tmac (SN): Define unconditionally.

Index: font/devps/generate/textmap
===================================================================
RCS file: /cvsroot/groff/groff/font/devps/generate/textmap,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- font/devps/generate/textmap	28 Dec 2003 18:13:59 -0000	1.20
+++ font/devps/generate/textmap	9 Apr 2007 08:00:40 -0000	1.21
@@ -223,7 +223,6 @@
 macron a-
 minus \-
 minute fm
-mu mc
 nine 9
 notelement nm
 notequal !=
@@ -372,3 +371,64 @@
 multiply tmu
 divide tdi
 plusminus t+-
+Alpha	*A
+Beta	*B
+Chi	*X
+Delta	*D
+Epsilon	*E
+Eta	*Y
+Gamma	*G
+Iota	*I
+Kappa	*K
+Lambda	*L
+Mu	*M
+Nu	*N
+Omega	*W
+Omicron	*O
+Phi	*F
+Pi	*P
+Psi	*Q
+Rho	*R
+Sigma	*S
+Tau	*T
+Theta	*H
+Upsilon	*U
+Xi	*C
+Zeta	*Z
+alpha	*a
+beta	*b
+chi	*x
+delta	*d
+epsilon	*e
+uni03F5	+e
+eta	*y
+gamma	*g
+iota	*i
+kappa	*k
+lambda	*l
+mu	*m
+nu	*n
+omega	*w
+omega1	+p
+omicron	*o
+phi	*f
+phi1	+f
+pi	*p
+psi	*q
+rho	*r
+sigma	*s
+sigma1	ts
+tau	*t
+theta	*h
+theta1	+h
+upsilon	*u
+xi	*c
+zeta	*z
+overline	rn
+uni21D5	vA
+uni226A	>>
+uni226B	<<
+SF110000	br
+mu1	mc
+# if there is "mu1" glyph in the font - comment out the following line
+mu	mc

Index: src/utils/afmtodit/afmtodit.tables
===================================================================
RCS file: /cvsroot/groff/groff/src/utils/afmtodit/afmtodit.tables,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- src/utils/afmtodit/afmtodit.tables	9 Dec 2005 18:12:30 -0000	1.1
+++ src/utils/afmtodit/afmtodit.tables	9 Apr 2007 08:00:40 -0000	1.2
@@ -2036,9 +2036,10 @@
   "2FA1D", "2A600",
 );
 
-# This table has been algorithmically derived from the file
-# glyphlist.txt, version 2.0, available from partners.adobe.com,
-# on 2005-12-09.
+# This table has been algorithmically derived from the file glyphlist.txt,
+# version 2.0, available from partners.adobe.com, on 2005-12-09.  For glyphs
+# `Delta', `Omega', and `mu', the values have been manually changed to the
+# ones from aglfn.txt, version 1.6.
 my %AGL_to_unicode = (
   "A", "0041",
   "AE", "00C6",
@@ -2129,7 +2130,7 @@
   "Ddotbelow", "1E0C",
   "Decyrillic", "0414",
   "Deicoptic", "03EE",
-  "Delta", "2206",
+  "Delta", "0394",
   "Deltagreek", "0394",
   "Dhook", "018A",
   "Digammagreek", "03DC",
@@ -2418,7 +2419,7 @@
   "Omacron", "014C",
   "Omacronacute", "1E52",
   "Omacrongrave", "1E50",
-  "Omega", "2126",
+  "Omega", "03A9",
   "Omegacyrillic", "0460",
   "Omegagreek", "03A9",
   "Omegaroundcyrillic", "047A",
@@ -4543,7 +4544,7 @@
   "mpasquare", "33AB",
   "mssquare", "33B3",
   "mturned", "026F",
-  "mu", "00B5",
+  "mu", "03BC",
   "mu1", "00B5",
   "muasquare", "3382",
   "muchgreater", "226B",



From MAILER-DAEMON Tue Apr 10 04:17:56 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HbBY3-0003m1-8z
	for mharc-groff-commit@gnu.org; Tue, 10 Apr 2007 04:17:56 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HbBY0-0003lD-Mj
	for groff-commit@gnu.org; Tue, 10 Apr 2007 04:17:52 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HbBXz-0003kx-Vj
	for groff-commit@gnu.org; Tue, 10 Apr 2007 04:17:52 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HbBXz-0003ku-Q7
	for groff-commit@gnu.org; Tue, 10 Apr 2007 04:17:51 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <wl@gnu.org>) id 1HbBU3-0004dt-Az
	for groff-commit@gnu.org; Tue, 10 Apr 2007 04:13:48 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HbBTy-0007zu-NL
	for groff-commit@gnu.org; Tue, 10 Apr 2007 08:13:42 +0000
Received: from wl by cvs with local (Exim 4.50) id 1HbBTy-0007zo-Cs
	for groff-commit@gnu.org; Tue, 10 Apr 2007 08:13:42 +0000
To: groff-commit@gnu.org
Message-Id: <E1HbBTy-0007zo-Cs@cvs>
From: Werner LEMBERG <wl@gnu.org>
Date: Tue, 10 Apr 2007 08:13:42 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Groff-commit] groff ChangeLog src/preproc/pic/common.cpp src/...
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: groff-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/groff-commit>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Apr 2007 08:17:52 -0000

CVSROOT:	/cvsroot/groff
Module name:	groff
Changes by:	Werner LEMBERG <wl>	07/04/10 08:13:42

Modified files:
	.              : ChangeLog 
	src/preproc/pic: common.cpp common.h object.cpp output.h 

Log message:
	In pic, make rounded boxes work with colors.  Reported by Urs Eggli
	<Urs.Eggli@zuerich.ch>.
	
	* src/preproc/pic/common.h (common_output), src/preproc/pix/output.h
	(output): Add color parameter to `rounded_box' member function.
	
	* src/preproc/pic/common.cpp (common_output::rounded_box): Use it.
	
	* src/preproc/pic/object.cpp (box_object::print): Pass `color_fill'
	to `out->rounded_box'.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/ChangeLog?cvsroot=groff&r1=1.1083&r2=1.1084
http://cvs.savannah.gnu.org/viewcvs/groff/src/preproc/pic/common.cpp?cvsroot=groff&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/groff/src/preproc/pic/common.h?cvsroot=groff&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/groff/src/preproc/pic/object.cpp?cvsroot=groff&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/groff/src/preproc/pic/output.h?cvsroot=groff&r1=1.4&r2=1.5

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/groff/groff/ChangeLog,v
retrieving revision 1.1083
retrieving revision 1.1084
diff -u -b -r1.1083 -r1.1084
--- ChangeLog	9 Apr 2007 08:00:40 -0000	1.1083
+++ ChangeLog	10 Apr 2007 08:13:41 -0000	1.1084
@@ -1,3 +1,16 @@
+2007-04-10  Werner LEMBERG  <wl@gnu.org>
+
+	In pic, make rounded boxes work with colors.  Reported by Urs Eggli
+	<Urs.Eggli@zuerich.ch>.
+
+	* src/preproc/pic/common.h (common_output), src/preproc/pix/output.h
+	(output): Add color parameter to `rounded_box' member function.
+
+	* src/preproc/pic/common.cpp (common_output::rounded_box): Use it.
+
+	* src/preproc/pic/object.cpp (box_object::print): Pass `color_fill'
+	to `out->rounded_box'.
+
 2007-04-09  Michail Vidiassov  <master@iaas.msu.ru>
 
 	* font/devps/generate/textmap: Add Greek letters and some more.

Index: src/preproc/pic/common.cpp
===================================================================
RCS file: /cvsroot/groff/groff/src/preproc/pic/common.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- src/preproc/pic/common.cpp	26 May 2005 21:02:01 -0000	1.5
+++ src/preproc/pic/common.cpp	10 Apr 2007 08:13:42 -0000	1.6
@@ -1,5 +1,6 @@
 // -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 1989, 1990, 1991, 1992, 2003, 2007
+   Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
 This file is part of groff.
@@ -319,9 +320,10 @@
 
 
 void common_output::rounded_box(const position &cent, const distance &dim,
-				double rad, const line_type &lt, double fill)
+				double rad, const line_type &lt,
+			        double fill, char *color_fill)
 {
-  if (fill >= 0.0)
+  if (fill >= 0.0 || color_fill)
     filled_rounded_box(cent, dim, rad, fill);
   switch (lt.type) {
   case line_type::invisible:

Index: src/preproc/pic/common.h
===================================================================
RCS file: /cvsroot/groff/groff/src/preproc/pic/common.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- src/preproc/pic/common.h	26 May 2005 21:02:01 -0000	1.5
+++ src/preproc/pic/common.h	10 Apr 2007 08:13:42 -0000	1.6
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992, 1993, 2003
+/* Copyright (C) 1989, 1990, 1991, 1992, 1993, 2003, 2007
    Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
@@ -53,7 +53,8 @@
 			  const line_type &);
   void solid_rounded_box(const position &, const distance &, double,
 			 const line_type &);
-  void filled_rounded_box(const position &, const distance &, double, double);
+  void filled_rounded_box(const position &, const distance &, double,
+			  double);
 public:
   void start_picture(double sc, const position &ll, const position &ur) = 0;
   void finish_picture() = 0;
@@ -68,7 +69,7 @@
   void ellipse(const position &, const distance &,
 	       const line_type &, double) = 0;
   void rounded_box(const position &, const distance &, double,
-		   const line_type &, double);
+		   const line_type &, double, char *);
   void set_color(char *, char *) = 0;
   void reset_color() = 0;
   char *get_last_filled() = 0;

Index: src/preproc/pic/object.cpp
===================================================================
RCS file: /cvsroot/groff/groff/src/preproc/pic/object.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- src/preproc/pic/object.cpp	19 Mar 2006 14:56:52 -0000	1.7
+++ src/preproc/pic/object.cpp	10 Apr 2007 08:13:42 -0000	1.8
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /* Copyright (C) 1989, 1990, 1991, 1992, 2001, 2002, 2003, 2004, 2005,
-                 2006
+                 2006, 2007
      Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
@@ -783,7 +783,7 @@
   }
   else {
     distance abs_dim(fabs(dim.x), fabs(dim.y));
-    out->rounded_box(cent, abs_dim, fabs(xrad), lt, fill);
+    out->rounded_box(cent, abs_dim, fabs(xrad), lt, fill, color_fill);
   }
   out->reset_color();
 }

Index: src/preproc/pic/output.h
===================================================================
RCS file: /cvsroot/groff/groff/src/preproc/pic/output.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- src/preproc/pic/output.h	26 May 2005 21:02:01 -0000	1.4
+++ src/preproc/pic/output.h	10 Apr 2007 08:13:42 -0000	1.5
@@ -1,5 +1,6 @@
 // -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992, 2001 Free Software Foundation, Inc.
+/* Copyright (C) 1989, 1990, 1991, 1992, 2001, 2007
+     Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
 This file is part of groff.
@@ -54,7 +55,7 @@
   virtual void ellipse(const position &, const distance &,
 		       const line_type &, double) = 0;
   virtual void rounded_box(const position &, const distance &, double,
-			   const line_type &, double) = 0;
+			   const line_type &, double, char *) = 0;
   virtual void command(const char *, const char *, int) = 0;
   virtual void set_location(const char *, int) {}
   virtual void set_color(char *, char *) = 0;



From MAILER-DAEMON Wed Apr 11 18:28:07 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HblIM-0008Nm-VW
	for mharc-groff-commit@gnu.org; Wed, 11 Apr 2007 18:28:06 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HblIL-0008Nh-IK
	for groff-commit@gnu.org; Wed, 11 Apr 2007 18:28:05 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HblIK-0008NV-3j
	for groff-commit@gnu.org; Wed, 11 Apr 2007 18:28:04 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HblIJ-0008NS-Sl
	for groff-commit@gnu.org; Wed, 11 Apr 2007 18:28:03 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <keith.d.marshall@ntlworld.com>)
	id 1HblED-0007JK-L5
	for groff-commit@gnu.org; Wed, 11 Apr 2007 18:23:49 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HblEC-0002L0-Ac
	for groff-commit@gnu.org; Wed, 11 Apr 2007 22:23:48 +0000
Received: from keithmarshall by cvs with local (Exim 4.50) id 1HblEC-0002Kx-5Z
	for groff-commit@gnu.org; Wed, 11 Apr 2007 22:23:48 +0000
To: groff-commit@gnu.org
Message-Id: <E1HblEC-0002Kx-5Z@cvs>
From: Keith Marshall <keith.d.marshall@ntlworld.com>
Date: Wed, 11 Apr 2007 22:23:48 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Groff-commit] groff/contrib/pdfmark ChangeLog pdfmark.tmac
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: groff-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/groff-commit>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Apr 2007 22:28:05 -0000

CVSROOT:	/cvsroot/groff
Module name:	groff
Changes by:	Keith Marshall <keithmarshall>	07/04/11 22:23:48

Modified files:
	contrib/pdfmark: ChangeLog pdfmark.tmac 

Log message:
	* pdfmark.tmac (pdfbookmark): Don't evaluate within diversions; defer
	placement until diversion is copied out at top level.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/pdfmark/ChangeLog?cvsroot=groff&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/pdfmark/pdfmark.tmac?cvsroot=groff&r1=1.6&r2=1.7

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/groff/groff/contrib/pdfmark/ChangeLog,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- ChangeLog	30 Jul 2006 21:49:51 -0000	1.20
+++ ChangeLog	11 Apr 2007 22:23:48 -0000	1.21
@@ -1,3 +1,8 @@
+2007-04-11  Keith Marshall  <keith.d.marshall@ntlworld.com>
+
+	* pdfmark.tmac (pdfbookmark): Don't evaluate within diversions; defer
+	placement until diversion is copied out at top level.
+
 2006-07-30  Keith Marshall  <keith.d.marshall@ntlworld.com>
 
 	* pdfroff.sh (PDFROFF_KILL_NULL_PAGES): Require `%%BeginPageSetup' on

Index: pdfmark.tmac
===================================================================
RCS file: /cvsroot/groff/groff/contrib/pdfmark/pdfmark.tmac,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- pdfmark.tmac	31 Mar 2006 22:07:02 -0000	1.6
+++ pdfmark.tmac	11 Apr 2007 22:23:48 -0000	1.7
@@ -3,7 +3,7 @@
 
 pdfmark.tmac
 
-Copyright (C) 2004, 2005, 2006
+Copyright (C) 2004, 2005, 2006, 2007
   Free Software Foundation, Inc.
      Written by Keith Marshall (keith.d.marshall@ntlworld.com)
 
@@ -661,33 +661,39 @@
 .\"   $3 = suffix for PDF internal bookmark name (optional)
 .\" ------------------------------------------------------------------
 .\"
-.if \\n[PDFOPMODE] \{\
+.ie '\\n(.z'' \{\
 .\"
-.\" Make the bookmark name "untagged" by default,
-.\" then parse any specified options, to set a "tag", if required
+.\" When we are at the top diversion level, i.e. actually emitting text
+.\" to the output device stream, then we compute the location of, and
+.\" plant this bookmark immediately.
 .\"
+.   if \\n[PDFOPMODE] \{\
+.   \"
+.   \" Make the bookmark name "untagged" by default,
+.   \" then parse any specified options, to set a "tag", if required
+.   \"
 .   ds pdf:href-T
 .   while dpdf:href.opt\\$1 \{\
 .      pdf:href.opt\\$1 \\$@
 .      shift \\n[pdf:href.argc]
 .      \}
 .   rr pdf:href.argc
-.\"
-.\" If we found "--" to mark the end of the options, discard it
-.\"
+.   \"
+.   \" If we found "--" to mark the end of the options, discard it
+.   \"
 .   if '\\$1'--' .shift
-.\"
-.\" Synchronise the bookmark cache
-.\" to the requested bookmark nesting level
-.\"
+.   \"
+.   \" Synchronise the bookmark cache
+.   \" to the requested bookmark nesting level
+.   \"
 .   pdf:bm.sync \\$1
 .   shift
-.\"
-.\" Increment the bookmark serialisation index
-.\" in order to generate a uniquely serialised bookmark name,
-.\" ( which we return in the string "PDFBOOKMARK.NAME" ),
-.\" and insert this bookmark into the cache
-.\"
+.   \"
+.   \" Increment the bookmark serialisation index
+.   \" in order to generate a uniquely serialised bookmark name,
+.   \" ( which we return in the string "PDFBOOKMARK.NAME" ),
+.   \" and insert this bookmark into the cache
+.   \"
 .   pdf:href.sety
 .   nr pdf:bm.nr +1
 .   ds PDFBOOKMARK.NAME pdf:bm\\n[pdf:bm.nr]\\*[pdf:href-T]
@@ -697,6 +703,15 @@
 .   pdf:href.options.clear
 .   rr PDFPAGE.Y
 .   \}
+.   \}
+.el \{\
+.\"
+.\" But when we are collecting a diversion which will be written out later,
+.\" then we must defer bookmark placement, until we emit the diversion.
+.\" (don't rely on $0 == pdfbookmark here; it may be a volatile alias).
+.\"
+.   nop \!.pdfbookmark \\$@
+.   \}
 ..
 .\"
 .\" Macro "pdf:bm.sync" is called for each bookmark created,



From MAILER-DAEMON Wed Apr 11 18:49:30 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hbld3-0004N4-Ul
	for mharc-groff-commit@gnu.org; Wed, 11 Apr 2007 18:49:29 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hbld2-0004Mz-Ik
	for groff-commit@gnu.org; Wed, 11 Apr 2007 18:49:28 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hbld1-0004Mn-3n
	for groff-commit@gnu.org; Wed, 11 Apr 2007 18:49:27 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hbld0-0004Mk-VM
	for groff-commit@gnu.org; Wed, 11 Apr 2007 18:49:26 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <keith.d.marshall@ntlworld.com>)
	id 1HblYu-0001Md-Hy
	for groff-commit@gnu.org; Wed, 11 Apr 2007 18:45:12 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HblYu-00049i-5F
	for groff-commit@gnu.org; Wed, 11 Apr 2007 22:45:12 +0000
Received: from keithmarshall by cvs with local (Exim 4.50) id 1HblYt-00049e-MI
	for groff-commit@gnu.org; Wed, 11 Apr 2007 22:45:11 +0000
To: groff-commit@gnu.org
Message-Id: <E1HblYt-00049e-MI@cvs>
From: Keith Marshall <keith.d.marshall@ntlworld.com>
Date: Wed, 11 Apr 2007 22:45:11 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Groff-commit] groff/contrib/pdfmark ChangeLog pdfmark.tmac
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: groff-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/groff-commit>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Apr 2007 22:49:29 -0000

CVSROOT:	/cvsroot/groff
Module name:	groff
Changes by:	Keith Marshall <keithmarshall>	07/04/11 22:45:11

Modified files:
	contrib/pdfmark: ChangeLog pdfmark.tmac 

Log message:
	Avoid stray newlines in folded pdfmark literal content.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/pdfmark/ChangeLog?cvsroot=groff&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/pdfmark/pdfmark.tmac?cvsroot=groff&r1=1.7&r2=1.8

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/groff/groff/contrib/pdfmark/ChangeLog,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- ChangeLog	11 Apr 2007 22:23:48 -0000	1.21
+++ ChangeLog	11 Apr 2007 22:45:11 -0000	1.22
@@ -1,5 +1,16 @@
 2007-04-11  Keith Marshall  <keith.d.marshall@ntlworld.com>
 
+	Avoid stray newlines in folded pdfmark literal content.
+
+	* pdfmark.tmac (pdf*pdfmark.dispatch.wrapped): New string; define it
+	when accumulating long literal content; make it undefined otherwise.
+	(PDFMARK.FOLDWIDTH, PDFMARK.FOLDWIDTH.MAX): Reserve space for two
+	extra characters, to accommodate a space and an escaped newline,
+	while accumulating literal content, in case folding is required.
+	(pdf*pdfmark.dispatch) [pdf*pdfmark.dispatch.wrapped]: Add them.
+
+2007-04-11  Keith Marshall  <keith.d.marshall@ntlworld.com>
+
 	* pdfmark.tmac (pdfbookmark): Don't evaluate within diversions; defer
 	placement until diversion is copied out at top level.
 

Index: pdfmark.tmac
===================================================================
RCS file: /cvsroot/groff/groff/contrib/pdfmark/pdfmark.tmac,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- pdfmark.tmac	11 Apr 2007 22:23:48 -0000	1.7
+++ pdfmark.tmac	11 Apr 2007 22:45:11 -0000	1.8
@@ -286,20 +286,23 @@
 .\" allowed literal token length.
 .\"
 .length pdf:length "\\*[pdf:composed.literal] \\$*\"
-.ie (\\n[pdf:length] > \\n[PDFMARK.FOLDWIDTH]) \{\
+.ie (\\n[pdf:length] > (\\n[PDFMARK.FOLDWIDTH] - 2)) \{\
 .\"
 .\" If it has grown too long, then it must be folded across two
 .\" physical PDFMARK output records, so check if we can accommodate
 .\" the portion collected so far within the current output record.
 .\"
 .   pdf*length.increment "\\*[pdf:composed.literal]\"
-.   if (\\n[pdf:length] > \\n[PDFMARK.FOLDWIDTH.MAX]) \{\
+.   if (\\n[pdf:length] > (\\n[PDFMARK.FOLDWIDTH.MAX] - 2)) \{\
 .   \"
 .   \" The current output record CAN'T accommodate the currently
 .   \" composed portion of the literal, so flush out the current
-.   \" record, to make way for the accumulated literal.
+.   \" record, to make way for the accumulated literal, and mark
+.   \" the dispatch mode as "wrapped", for the fragments of the
+.   \" folded literal string, which are to follow.
 .   \"
 .      pdf*pdfmark.dispatch
+.      ds pdf*pdfmark.dispatch.wrapped
 .      \}
 .   ie d pdf:composed.line \{\
 .   \"
@@ -381,10 +384,12 @@
 .         \}
 .      \}
 .\"
-.\" Finally, since we have completed the accumulation of the literal,
-.\" we revert to the normal "pdf*compose" action, for collection of
-.\" the next token (if any).
+.\" Finally, since we have completed the accumulation of the literal, we
+.\" revert to the "unwrapped" mode of operation for "pdf*pdfmark.dispatch",
+.\" and restore the normal "pdf*compose" action, for collection of the next
+.\" token (if any).
 .\"
+.   rm pdf*pdfmark.dispatch.wrapped
 .   als pdf*compose pdf*compose.next
 .   \}
 ..
@@ -406,6 +411,15 @@
 .\" before attempting to post it; it then cleans up after posting, to
 .\" ensure that each collected record is posted only once.
 .\"
+.   if d pdf*pdfmark.dispatch.wrapped \{\
+.   \"
+.   \" When dispatching an excessively long literal string, which
+.   \" must be wrapped over multiple records, this mode is active
+.   \" for all but the closing record; we must escape the newline
+.   \" at the end of each such unclosed literal record.
+.   \"
+.      as pdf:composed.line " \\\\\\\\\"
+.   \}
 .   pdf*pdfmark.post
 .   rm pdf:composed.line
 .   \}



