From MAILER-DAEMON Thu Aug 04 02:53:38 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1QoroI-0002Vn-2I
	for mharc-groff-commit@gnu.org; Thu, 04 Aug 2011 02:53:38 -0400
Received: from eggs.gnu.org ([140.186.70.92]:37831)
	by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <wl@gnu.org>)
	id 1QoroF-0002Vh-RL
	for groff-commit@gnu.org; Thu, 04 Aug 2011 02:53:36 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <wl@gnu.org>) id 1QoroE-00055u-RG
	for groff-commit@gnu.org; Thu, 04 Aug 2011 02:53:35 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:55838)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <wl@gnu.org>)
	id 1QoroE-00055n-OW
	for groff-commit@gnu.org; Thu, 04 Aug 2011 02:53:34 -0400
Received: from wl by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <wl@gnu.org>) id 1QoroD-0005Sk-7x
	for groff-commit@gnu.org; Thu, 04 Aug 2011 06:53:33 +0000
Date: Thu, 04 Aug 2011 06:53:33 +0000
Message-Id: <E1QoroD-0005Sk-7x@vcs.savannah.gnu.org>
To: groff-commit@gnu.org
From: Werner LEMBERG <wl@gnu.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
Subject: [Groff-commit] groff/src/devices/gropdf gropdf.pl
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: <groff-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/groff-commit>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Aug 2011 06:53:36 -0000

CVSROOT:	/cvsroot/groff
Module name:	groff
Changes by:	Werner LEMBERG <wl>	11/08/04 06:53:33

Modified files:
	src/devices/gropdf: gropdf.pl 

Log message:
	gropdf.pl: Adjust indentation to be in sync with other groff Perl scripts.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/src/devices/gropdf/gropdf.pl?cvsroot=groff&r1=1.1&r2=1.2

Patches:
Index: gropdf.pl
===================================================================
RCS file: /cvsroot/groff/groff/src/devices/gropdf/gropdf.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2


From MAILER-DAEMON Wed Aug 10 14:39:54 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1QrDh4-0000tg-JB
	for mharc-groff-commit@gnu.org; Wed, 10 Aug 2011 14:39:54 -0400
Received: from eggs.gnu.org ([140.186.70.92]:37442)
	by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <wl@gnu.org>)
	id 1QrDh0-0000r1-C4
	for groff-commit@gnu.org; Wed, 10 Aug 2011 14:39:52 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <wl@gnu.org>) id 1QrDSQ-0006xk-47
	for groff-commit@gnu.org; Wed, 10 Aug 2011 14:24:51 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:52534)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <wl@gnu.org>)
	id 1QrDSP-0006xg-UB
	for groff-commit@gnu.org; Wed, 10 Aug 2011 14:24:46 -0400
Received: from wl by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <wl@gnu.org>) id 1QrDSP-0006zL-2v
	for groff-commit@gnu.org; Wed, 10 Aug 2011 18:24:45 +0000
Date: Wed, 10 Aug 2011 18:24:45 +0000
Message-Id: <E1QrDSP-0006zL-2v@vcs.savannah.gnu.org>
To: groff-commit@gnu.org
From: Werner LEMBERG <wl@gnu.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
Subject: [Groff-commit] groff/font/devpdf Foundry.in Foundry util/Makef...
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: <groff-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/groff-commit>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Aug 2011 18:39:52 -0000

CVSROOT:	/cvsroot/groff
Module name:	groff
Changes by:	Werner LEMBERG <wl>	11/08/10 18:24:45

Added files:
	font/devpdf    : Foundry.in 
Removed files:
	font/devpdf    : Foundry 
	font/devpdf/util: Makefile.sub 

Log message:
	

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/font/devpdf/Foundry.in?cvsroot=groff&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/groff/font/devpdf/Foundry?cvsroot=groff&r1=1.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/groff/font/devpdf/util/Makefile.sub?cvsroot=groff&r1=1.1&r2=0

Patches:
Index: Foundry.in
===================================================================
RCS file: Foundry.in
diff -N Foundry.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Foundry.in	10 Aug 2011 18:24:42 -0000	1.1
@@ -0,0 +1,114 @@
+# Foundry file
+
+# Copyright (C) 2011 Free Software Foundation, Inc.
+#      Written by Deri James <deri@chuzzlewit.demon.co.uk>
+#
+# This file 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 3 of the License, 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 this program. If not, see <http://www.gnu.org/licenses/>.
+
+#=====================================================================
+#Foundry|Name|Searchpath
+foundry||(gs)
+
+# These are just copies of the grops fonts so MUST not have any flags etc set
+
+#Font|IsBase14|Flags|Map|Encoding|File(!file...)
+AB|N||||URWGothicL-Demi!a010015l.pfb
+ABI|N||||URWGothicL-DemiObli!a010035l.pfb
+AI|N||||URWGothicL-BookObli!a010033l.pfb
+AR|N||||URWGothicL-Book!a010013l.pfb
+BMB|N||||URWBookmanL-DemiBold!b018015l.pfb
+BMBI|N||||URWBookmanL-DemiBoldItal!b018035l.pfb
+BMI|N||||URWBookmanL-LighItal!b018032l.pfb
+BMR|N||||URWBookmanL-Ligh!b018012l.pfb
+CB|Y||||NimbusMonL-Bold!n022004l.pfb
+CBI|Y||||NimbusMonL-BoldObli!n022024l.pfb
+CI|Y||||NimbusMonL-ReguObli!n022023l.pfb
+CR|Y||||NimbusMonL-Regu!n022003l.pfb
+EURO|N||||freeeuro.pfa
+HB|Y||||NimbusSanL-Bold!n019004l.pfb
+HBI|Y||||NimbusSanL-BoldItal!n019024l.pfb
+HI|Y||||NimbusSanL-ReguItal!n019023l.pfb
+HNB|N||||NimbusSanL-BoldCond!n019044l.pfb
+HNBI|N||||NimbusSanL-BoldCondItal!n019064l.pfb
+HNI|N||||NimbusSanL-ReguCondItal!n019063l.pfb
+HNR|N||||NimbusSanL-ReguCond!n019043l.pfb
+HR|Y||||NimbusSanL-Regu!n019003l.pfb
+NB|N||||CenturySchL-Bold!c059016l.pfb
+NBI|N||||CenturySchL-BoldItal!c059036l.pfb
+NI|N||||CenturySchL-Ital!c059033l.pfb
+NR|N||||CenturySchL-Roma!c059013l.pfb
+PB|N||||URWPalladioL-Bold!p052004l.pfb
+PBI|N||||URWPalladioL-BoldItal!p052024l.pfb
+PI|N||||URWPalladioL-Ital!p052023l.pfb
+PR|N||||URWPalladioL-Roma!p052003l.pfb
+S|Y||||StandardSymL!s050000l.pfb
+TB|Y||||NimbusRomNo9L-Medi!n021004l.pfb
+TBI|Y||||NimbusRomNo9L-MediItal!n021024l.pfb
+TI|Y||||NimbusRomNo9L-ReguItal!n021023l.pfb
+TR|Y||||NimbusRomNo9L-Regu!n021003l.pfb
+ZCMI|N||||URWChanceryL-MediItal!z003034l.pfb
+ZD|Y||||Dingbats!d050000l.pfb
+
+#======================================================================
+
+#Foundry|Name|Searchpath
+foundry|U|(gs):/opt/local/share/fonts/urw-fonts # the URW fonts delivered with ghostscript (may be different)
+
+#Define Flags for afmtodit
+
+r=-i 0 -m
+i=-i 50
+n=-n
+s=-s
+
+#Font|IsBase14|Flags|Map|Encoding|File
+AB|N|r|textmap|text.enc|a010015l.pfb
+ABI|N|i|textmap|text.enc|a010035l.pfb
+AI|N|i|textmap|text.enc|a010033l.pfb
+AR|N|r|textmap|text.enc|a010013l.pfb
+BMB|N|r|textmap|text.enc|b018015l.pfb
+BMBI|N|i|textmap|text.enc|b018035l.pfb
+BMI|N|i|textmap|text.enc|b018032l.pfb
+BMR|N|r|textmap|text.enc|b018012l.pfb
+CB|N|nr|textmap|text.enc|n022004l.pfb
+CBI|N|ni|textmap|text.enc|n022024l.pfb
+CI|N|ni|textmap|text.enc|n022023l.pfb
+CR|N|nr|textmap|text.enc|n022003l.pfb
+HB|N|r|textmap|text.enc|n019004l.pfb
+HBI|N|i|textmap|text.enc|n019024l.pfb
+HI|N|i|textmap|text.enc|n019023l.pfb
+HNB|N|r|textmap|text.enc|n019044l.pfb
+HNBI|N|i|textmap|text.enc|n019064l.pfb
+HNI|N|i|textmap|text.enc|n019063l.pfb
+HNR|N|r|textmap|text.enc|n019043l.pfb
+HR|N|r|textmap|text.enc|n019003l.pfb
+NB|N|r|textmap|text.enc|c059016l.pfb
+NBI|N|i|textmap|text.enc|c059036l.pfb
+NI|N|i|textmap|text.enc|c059033l.pfb
+NR|N|r|textmap|text.enc|c059013l.pfb
+PB|N|r|textmap|text.enc|p052004l.pfb
+PBI|N|i|textmap|text.enc|p052024l.pfb
+PI|N|i|textmap|text.enc|p052023l.pfb
+PR|N|r|textmap|text.enc|p052003l.pfb
+S|N|sr|symbolmap||s050000l.pfb
+TB|N|r|textmap|text.enc|n021004l.pfb
+TBI|N|i|textmap|text.enc|n021024l.pfb
+TI|N|i|textmap|text.enc|n021023l.pfb
+TR|N|r|textmap|text.enc|n021003l.pfb
+ZCMI|N|i|textmap|text.enc|z003034l.pfb
+ZD|N|sr|dingbats.map||d050000l.pfb
+
+#======================================================================

Index: Foundry
===================================================================
RCS file: Foundry
diff -N Foundry
--- Foundry	26 Jul 2011 17:11:10 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,114 +0,0 @@
-# Foundry file
-
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#      Written by Deri James <deri@chuzzlewit.demon.co.uk>
-#
-# This file 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 3 of the License, 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 this program. If not, see <http://www.gnu.org/licenses/>.
-
-#=====================================================================
-#Foundry|Name|Searchpath
-foundry||(gs)
-
-# These are just copies of the grops fonts so MUST not have any flags etc set
-
-#Font|IsBase14|Flags|Map|Encoding|File
-AB|N||||URWGothicL-Demi
-ABI|N||||URWGothicL-DemiObli
-AI|N||||URWGothicL-BookObli
-AR|N||||URWGothicL-Book
-BMB|N||||URWBookmanL-DemiBold
-BMBI|N||||URWBookmanL-DemiBoldItal
-BMI|N||||URWBookmanL-LighItal
-BMR|N||||URWBookmanL-Ligh
-CB|Y||||NimbusMonL-Bold
-CBI|Y||||NimbusMonL-BoldObli
-CI|Y||||NimbusMonL-ReguObli
-CR|Y||||NimbusMonL-Regu
-EURO|N||||../devps/freeeuro.pfa
-HB|Y||||NimbusSanL-Bold
-HBI|Y||||NimbusSanL-BoldItal
-HI|Y||||NimbusSanL-ReguItal
-HNB|N||||NimbusSanL-BoldCond
-HNBI|N||||NimbusSanL-BoldCondItal
-HNI|N||||NimbusSanL-ReguCondItal
-HNR|N||||NimbusSanL-ReguCond
-HR|Y||||NimbusSanL-Regu
-NB|N||||CenturySchL-Bold
-NBI|N||||CenturySchL-BoldItal
-NI|N||||CenturySchL-Ital
-NR|N||||CenturySchL-Roma
-PB|N||||URWPalladioL-Bold
-PBI|N||||URWPalladioL-BoldItal
-PI|N||||URWPalladioL-Ital
-PR|N||||URWPalladioL-Roma
-S|Y||||StandardSymL
-TB|Y||||NimbusRomNo9L-Medi
-TBI|Y||||NimbusRomNo9L-MediItal
-TI|Y||||NimbusRomNo9L-ReguItal
-TR|Y||||NimbusRomNo9L-Regu
-ZCMI|N||||URWChanceryL-MediItal
-ZD|Y||||Dingbats
-
-#======================================================================
-
-#Foundry|Name|Searchpath
-foundry|U|(gs) # the URW fonts delivered with ghostscript (may be different)
-
-#Define Flags for afmtodit
-
-r=-i 0 -m
-i=-i 50
-n=-n
-s=-s
-
-#Font|IsBase14|Flags|Map|Encoding|File
-AB|N|r|textmap|text.enc|a010015l.pfb
-ABI|N|i|textmap|text.enc|a010035l.pfb
-AI|N|i|textmap|text.enc|a010033l.pfb
-AR|N|r|textmap|text.enc|a010013l.pfb
-BMB|N|r|textmap|text.enc|b018015l.pfb
-BMBI|N|i|textmap|text.enc|b018035l.pfb
-BMI|N|i|textmap|text.enc|b018032l.pfb
-BMR|N|r|textmap|text.enc|b018012l.pfb
-CB|N|nr|textmap|text.enc|n022004l.pfb
-CBI|N|ni|textmap|text.enc|n022024l.pfb
-CI|N|ni|textmap|text.enc|n022023l.pfb
-CR|N|nr|textmap|text.enc|n022003l.pfb
-HB|N|r|textmap|text.enc|n019004l.pfb
-HBI|N|i|textmap|text.enc|n019024l.pfb
-HI|N|i|textmap|text.enc|n019023l.pfb
-HNB|N|r|textmap|text.enc|n019044l.pfb
-HNBI|N|i|textmap|text.enc|n019064l.pfb
-HNI|N|i|textmap|text.enc|n019063l.pfb
-HNR|N|r|textmap|text.enc|n019043l.pfb
-HR|N|r|textmap|text.enc|n019003l.pfb
-NB|N|r|textmap|text.enc|c059016l.pfb
-NBI|N|i|textmap|text.enc|c059036l.pfb
-NI|N|i|textmap|text.enc|c059033l.pfb
-NR|N|r|textmap|text.enc|c059013l.pfb
-PB|N|r|textmap|text.enc|p052004l.pfb
-PBI|N|i|textmap|text.enc|p052024l.pfb
-PI|N|i|textmap|text.enc|p052023l.pfb
-PR|N|r|textmap|text.enc|p052003l.pfb
-S|N|sr|symbolmap||s050000l.pfb
-TB|N|r|textmap|text.enc|n021004l.pfb
-TBI|N|i|textmap|text.enc|n021024l.pfb
-TI|N|i|textmap|text.enc|n021023l.pfb
-TR|N|r|textmap|text.enc|n021003l.pfb
-ZCMI|N|i|textmap|text.enc|z003034l.pfb
-ZD|N|sr|dingbats.map||d050000l.pfb
-
-#======================================================================

Index: util/Makefile.sub
===================================================================
RCS file: util/Makefile.sub
diff -N util/Makefile.sub
--- util/Makefile.sub	26 Jul 2011 17:11:10 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,38 +0,0 @@
-# Copyright (C) 2011 Free Software Foundation, Inc.
-#      Written by Deri James <deri@chuzzlewit.demon.co.uk>
-#
-# This file 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 3 of the License, 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 this program. If not, see <http://www.gnu.org/licenses/>.
-
-DEV=pdf
-UTILFILES=\
-  BuildFoundries
-
-#MOSTLYCLEANADD=BuildFoundries
-
-# Some `makes' don't predefine RM...
-RM=rm -f
-
-
-all: BuildFoundries
-
-
-BuildFoundries: BuildFoundries.pl $(SH_DEPS_SED_SCRIPT)
-	$(RM) $@
-	sed -f $(SH_DEPS_SED_SCRIPT) \
-	    -e "s|@VERSION@|$(version)$(revision)|" \
-	    -e "s|@PERLPATH@|$(PERLPATH)|" \
-	    -e "s|@GROFF_FONT_DIR@|$(fontdir)|" $(srcdir)/BuildFoundries.pl >$@
-	chmod +x $@


From MAILER-DAEMON Wed Aug 10 14:40:06 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1QrDhG-00012G-SD
	for mharc-groff-commit@gnu.org; Wed, 10 Aug 2011 14:40:06 -0400
Received: from eggs.gnu.org ([140.186.70.92]:37442)
	by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <wl@gnu.org>)
	id 1QrDhC-0000r1-21
	for groff-commit@gnu.org; Wed, 10 Aug 2011 14:40:04 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <wl@gnu.org>) id 1QrDQr-0006eo-Dp
	for groff-commit@gnu.org; Wed, 10 Aug 2011 14:23:13 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:52504)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <wl@gnu.org>)
	id 1QrDQr-0006eY-6x
	for groff-commit@gnu.org; Wed, 10 Aug 2011 14:23:09 -0400
Received: from wl by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <wl@gnu.org>) id 1QrDQq-0006vz-7J
	for groff-commit@gnu.org; Wed, 10 Aug 2011 18:23:08 +0000
Date: Wed, 10 Aug 2011 18:23:08 +0000
Message-Id: <E1QrDQq-0006vz-7J@vcs.savannah.gnu.org>
To: groff-commit@gnu.org
From: Werner LEMBERG <wl@gnu.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
Subject: [Groff-commit] groff ChangeLog Makefile.in doc/groff.texinfo f...
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: <groff-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/groff-commit>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Aug 2011 18:40:04 -0000

CVSROOT:	/cvsroot/groff
Module name:	groff
Changes by:	Werner LEMBERG <wl>	11/08/10 18:23:06

Modified files:
	.              : ChangeLog Makefile.in 
	doc            : groff.texinfo 
	font/devpdf    : Makefile.sub 
	font/devpdf/util: BuildFoundries.pl 
	src/devices/gropdf: gropdf.man gropdf.pl 

Log message:
	[gropdf] Minor updates and fixes.
	
	* src/devices/gropdf/gropdf.pl: Change command line option `-fy' to
	`-y' for consistency.
	Better support for Windows platform.
	(do_x): Handle keywords `pagename' and `switchtopage'.
	
	* doc/groff.texinfo, src/devices/gropdf/gropdf.man: Updated.
	
	* font/devpdf/Foundry: Renamed to...
	* font/devpdf/Foundry.in: This.
	Add default alias font names.
	
	* font/devpdf/util/BuildFoundries.pl: This is now an installation
	helper script and gets not longer installed.
	Support alternative font file names (separated with `!').
	
	* font/devpdf/Makefile.sub: Fixes to work with a separate build
	directory.
	Font files are now build at `make' time; this makes `test-groff'
	work with -Tpdf.
	
	* font/devpdf/util/Makefile.sub: Removed.
	
	* Makefile.in (DEVDIRS, OTHERDIRS, EXTRADIRS): Handle devpdf
	specially.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/ChangeLog?cvsroot=groff&r1=1.1305&r2=1.1306
http://cvs.savannah.gnu.org/viewcvs/groff/Makefile.in?cvsroot=groff&r1=1.117&r2=1.118
http://cvs.savannah.gnu.org/viewcvs/groff/doc/groff.texinfo?cvsroot=groff&r1=1.305&r2=1.306
http://cvs.savannah.gnu.org/viewcvs/groff/font/devpdf/Makefile.sub?cvsroot=groff&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/groff/font/devpdf/util/BuildFoundries.pl?cvsroot=groff&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/groff/src/devices/gropdf/gropdf.man?cvsroot=groff&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/groff/src/devices/gropdf/gropdf.pl?cvsroot=groff&r1=1.2&r2=1.3

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/groff/groff/ChangeLog,v
retrieving revision 1.1305
retrieving revision 1.1306
diff -u -b -r1.1305 -r1.1306
--- ChangeLog	29 Jul 2011 20:16:42 -0000	1.1305
+++ ChangeLog	10 Aug 2011 18:22:58 -0000	1.1306
@@ -1,3 +1,32 @@
+2011-08-10  Deri James  <deri@chuzzlewit.demon.co.uk>
+
+	[gropdf] Minor updates and fixes.
+
+	* src/devices/gropdf/gropdf.pl: Change command line option `-fy' to
+	`-y' for consistency.
+	Better support for Windows platform.
+	(do_x): Handle keywords `pagename' and `switchtopage'.
+
+	* doc/groff.texinfo, src/devices/gropdf/gropdf.man: Updated.
+
+	* font/devpdf/Foundry: Renamed to...
+	* font/devpdf/Foundry.in: This.
+	Add default alias font names.
+
+	* font/devpdf/util/BuildFoundries.pl: This is now an installation
+	helper script and gets not longer installed.
+	Support alternative font file names (separated with `!').
+
+	* font/devpdf/Makefile.sub: Fixes to work with a separate build
+	directory.
+	Font files are now build at `make' time; this makes `test-groff'
+	work with -Tpdf.
+
+	* font/devpdf/util/Makefile.sub: Removed.
+
+	* Makefile.in (DEVDIRS, OTHERDIRS, EXTRADIRS): Handle devpdf
+	specially.
+
 2011-07-29  Daiki Ueno  <ueno@unixuser.org>
 
 	Fix cross building.

Index: Makefile.in
===================================================================
RCS file: /cvsroot/groff/groff/Makefile.in,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -b -r1.117 -r1.118
--- Makefile.in	29 Jul 2011 20:16:42 -0000	1.117
+++ Makefile.in	10 Aug 2011 18:22:59 -0000	1.118
@@ -589,7 +589,6 @@
   $(XPROGDIRS)
 DEVDIRS=\
   font/devps \
-  font/devpdf \
   font/devdvi \
   font/devhtml
 ALLTTYDEVDIRS=\
@@ -615,6 +614,7 @@
   contrib/hdtbl \
   contrib/pdfmark \
   src/devices/gropdf \
+  font/devpdf \
   contrib/gdiffmk
   
 ALLDIRS=\
@@ -630,7 +630,6 @@
   font/devps/generate \
   font/devdvi/generate \
   font/devlj4/generate \
-  font/devpdf/util \
   doc
 NOMAKEDIRS=\
   m4 \

Index: doc/groff.texinfo
===================================================================
RCS file: /cvsroot/groff/groff/doc/groff.texinfo,v
retrieving revision 1.305
retrieving revision 1.306
diff -u -b -r1.305 -r1.306
--- doc/groff.texinfo	26 Jul 2011 17:11:09 -0000	1.305
+++ doc/groff.texinfo	10 Aug 2011 18:22:59 -0000	1.306
@@ -15164,7 +15164,7 @@
 search path for the font, prologue and device description files,
 given the target device @var{name}, usually @strong{pdf}.
 
-@item -fy@var{foundry}
+@item -y@var{foundry}
 This forces the use of a different font foundry.
 
 @item -l

Index: font/devpdf/Makefile.sub
===================================================================
RCS file: /cvsroot/groff/groff/font/devpdf/Makefile.sub,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- font/devpdf/Makefile.sub	26 Jul 2011 17:11:10 -0000	1.1
+++ font/devpdf/Makefile.sub	10 Aug 2011 18:23:00 -0000	1.2
@@ -17,10 +17,11 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 DEV=pdf
-GROFF_FONT_FILES=`cd $(DESTDIR)$(fontsubdir); \
-                  grep -l internalname * | grep -v Makefile.sub`
-ENC_FILES=`cd $(DESTDIR)$(fontsubdir); ls enc`
-MAP_FILES=`cd $(DESTDIR)$(fontsubdir); ls map`
+GROFF_FONT_FILES=`cd $(top_builddir)/font/devpdf \
+                  && find * -maxdepth 0 -type f ! -name Makefile.sub \
+                            -exec grep -l internalname {} \;`
+ENC_FILES=`cd $(top_builddir)/font/devpdf; ls enc/*`
+MAP_FILES=`cd $(top_builddir)/font/devpdf; ls map/*`
 
 UTILFILES=\
   BuildFoundries
@@ -28,14 +29,17 @@
 MOSTLYCLEANADD=\
   download \
   DESC \
+  Foundry \
   util/BuildFoundries \
   $(GROFF_FONT_FILES) \
   $(ENC_FILES) \
   $(MAP_FILES)
-#MOSTLYCLEANDIRADD=enc map
+
+MOSTLYCLEANDIRADD=enc map
 
 DEVFILES=\
   Foundry
+
 #DEVSCRIPTS=util/BuildFoundries
 
 DISTFILES=\
@@ -51,21 +55,53 @@
 
 DESC: DESC.in
 	-rm -f DESC
-	cat $(srcdir)/DESC.in >DESC
+	cat $(srcdir)/DESC.in >$(top_builddir)/font/devpdf/DESC
 	if test "$(PAGE)" = A4; then \
-	  echo "papersize a4" >>DESC; \
+	  echo "papersize a4" >>$(top_builddir)/font/devpdf/DESC; \
 	else \
-	  echo "papersize letter" >>DESC; \
+	  echo "papersize letter" >>$(top_builddir)/font/devpdf/DESC; \
 	fi
+	-rm -f Foundry
+	cat $(srcdir)/Foundry.in >$(top_builddir)/font/devpdf/Foundry
 
 BuildFoundries: util/BuildFoundries.pl $(SH_DEPS_SED_SCRIPT)
+	-test -d $(top_builddir)/font/devpdf/enc \
+	  || $(mkinstalldirs) $(top_builddir)/font/devpdf/enc
+	-test -d $(top_builddir)/font/devpdf/map \
+	  || $(mkinstalldirs) $(top_builddir)/font/devpdf/map
+	cp -f $(top_srcdir)/font/devps/text.enc \
+	  $(top_builddir)/font/devpdf/enc
+	cp -f $(top_srcdir)/font/devps/symbolmap \
+	  $(top_builddir)/font/devpdf/map
+	cp -f $(top_srcdir)/font/devps/generate/dingbats.map \
+	  $(top_builddir)/font/devpdf/map
+	cp -f $(top_srcdir)/font/devps/generate/textmap \
+	  $(top_builddir)/font/devpdf/map
+	cp -f $(top_srcdir)/font/devps/generate/symbolchars \
+	  $(top_builddir)/font/devpdf/map
 	-test -d util || $(mkinstalldirs) util
 	$(RM) util/$@
+	if test -n "$(PERLPATH)"; then \
+	  sed -f $(SH_DEPS_SED_SCRIPT) \
+	    -e "s|/usr/bin/perl|$(PERLPATH)|" \
+	    -e "s|@GROFF_GHOSTSCRIPT_INTERPRETERS@|$(GHOSTSCRIPT)|" \
+	    -e "s|@VERSION@|$(version)$(revision)|" \
+	    -e "s|@GROFF_FONT_DIR@|$(fontdir)|" \
+	    $(srcdir)/util/BuildFoundries.pl \
+	    >$(top_builddir)/font/devpdf/util/$@ ;\
+	else \
 	sed -f $(SH_DEPS_SED_SCRIPT) \
 	    -e "s|@VERSION@|$(version)$(revision)|" \
-	    -e "s|@PERLPATH@|$(PERLPATH)|" \
-	    -e "s|@GROFF_FONT_DIR@|$(fontdir)|" $(srcdir)/util/BuildFoundries.pl > util/$@
+	    -e "s|@GROFF_FONT_DIR@|$(fontdir)|" \
+	    $(srcdir)/util/BuildFoundries.pl \
+	    >$(top_builddir)/font/devpdf/util/$@ ;\
+	fi
 	chmod +x util/$@
+	echo "# foundry	ps name	psfile" > $(top_builddir)/font/devpdf/download
+	PATH="$(top_builddir)/src/utils/afmtodit:${GROFF_PATH_SEPARATOR}${PATH}" \
+	  util/BuildFoundries $(top_builddir)/font/devpdf \
+	    '$(top_srcdir)/font/devps : $(top_builddir)/font/devps' \
+	  >> $(top_builddir)/font/devpdf/download
 
 install_data:
 	-test -d $(DESTDIR)$(fontsubdir) \
@@ -83,25 +119,16 @@
 	  fi; \
 	done
 	$(RM) $@
-	cp -f $(DESTDIR)$(fontdir)/devps/text.enc \
-	  $(DESTDIR)$(fontsubdir)/enc
-	cp -f $(srcdir)/../devps/symbolmap \
-	  $(DESTDIR)$(fontsubdir)/map
-	cp -f $(DESTDIR)$(fontdir)/devps/generate/dingbats.map \
-	  $(DESTDIR)$(fontsubdir)/map
-	cp -f $(DESTDIR)$(fontdir)/devps/generate/textmap \
-	  $(DESTDIR)$(fontsubdir)/map
-	cp -f $(DESTDIR)$(fontdir)/devps/generate/symbolchars \
-	  $(DESTDIR)$(fontsubdir)/map
-	echo "# foundry	ps name	psfile" > $(DESTDIR)$(fontsubdir)/download
-	util/BuildFoundries $(DESTDIR)$(fontsubdir) \
-	  > $(DESTDIR)$(fontsubdir)/download
 
 uninstall_sub:
 	for f in $(MOSTLYCLEANADD); do \
 	  $(RM) $(DESTDIR)$(fontsubdir)/$$f; \
 	done
-	rmdir $(DESTDIR)$(fontsubdir)/enc
-	rmdir $(DESTDIR)$(fontsubdir)/map
-	rmdir $(DESTDIR)$(fontsubdir)/util
-	rmdir $(DESTDIR)$(fontsubdir)
+	-test -d $(DESTDIR)$(fontsubdir)/enc \
+	  && rmdir $(DESTDIR)$(fontsubdir)/enc
+	-test -d $(DESTDIR)$(fontsubdir)/map \
+	  && rmdir $(DESTDIR)$(fontsubdir)/map
+	-test -d $(DESTDIR)$(fontsubdir)/util \
+	  && rmdir $(DESTDIR)$(fontsubdir)/util
+	-test -d $(DESTDIR)$(fontsubdir) \
+	  && rmdir $(DESTDIR)$(fontsubdir)

Index: font/devpdf/util/BuildFoundries.pl
===================================================================
RCS file: /cvsroot/groff/groff/font/devpdf/util/BuildFoundries.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- font/devpdf/util/BuildFoundries.pl	26 Jul 2011 17:11:10 -0000	1.1
+++ font/devpdf/util/BuildFoundries.pl	10 Aug 2011 18:23:00 -0000	1.2
@@ -1,7 +1,7 @@
-#!@PERLPATH@ -w
+#!/usr/bin/perl -w
 #
-#  BuildFoundries: Given a Foundry file generate groff and download files
-#  Deri James:     Monday 07 Feb 2011
+#   BuildFoundries   : Given a Foundry file generate groff and download files
+#   Deri James       : Monday 07 Feb 2011
 
 # Copyright (C) 2011 Free Software Foundation, Inc.
 #      Written by Deri James <deri@chuzzlewit.demon.co.uk>
@@ -24,6 +24,7 @@
 use strict;
 
 my $where=shift||'';
+my $devps=shift||'../devps';
 chdir $where if $where ne '';
 my (%foundry,%flg,@downloadpreamble,%download);
 my $GSpath=FindGSpath();
@@ -38,6 +39,7 @@
 exit $warn;
 
 
+
 sub LoadFoundry
 {
     my $fn=shift;
@@ -67,7 +69,8 @@
 	if (lc($r[0]) eq 'foundry')
 	{
 	    $foundry=uc($r[1]);
-	    $foundrypath=$r[2];
+	    $foundrypath=$r[2].' : '.$devps;
+	    $foundrypath=~s/\(gs\)/$GSpath /;
 	}
 	else
 	{
@@ -92,10 +95,11 @@
 		# Don't run afmtodit, just copy the grops font file
 
 		my $gotf=1;
+		my $gropsfnt=LocateFile($devps,$r[0],0);
 
-		if (-r "../devps/$r[0]")
+		if ($gropsfnt ne '' and -r "$gropsfnt")
 		{
-		    my $psfont=UseGropsVersion($r[0]);
+		    my $psfont=UseGropsVersion($gropsfnt);
 		    if (!PutDownload($psfont,LocatePF($foundrypath,$r[5]),uc($r[1])))
 		    {
 			if (uc($r[1]) ne 'Y')
@@ -106,6 +110,7 @@
 			}
 		    }
 		    print STDERR "Copied grops font $gfont...\n" if $gotf;
+
 		}
 		else
 		{
@@ -211,9 +216,11 @@
 sub LocateFile
 {
     my $path=shift;
-    my $file=shift;
+    my $files=shift;
     my $tryafm=shift;
 
+    foreach my $file (split('!',$files))
+    {
     if ($file=~m'/')
     {
 	# path given with file name so no need to search the paths
@@ -234,11 +241,7 @@
 	return('');
     }
 
-    if ($path eq '(gs)')
-    {
-	$path=$GSpath;
-    }
-    elsif ($path eq '(tex)')
+	if ($path eq '(tex)')
     {
 	my $res=`kpsewhich $file`;
 	return '' if $?;
@@ -246,10 +249,11 @@
 	return($res);
     }
 
-    my (@paths)=split(':',$path);
+	my (@paths)=split(/ (:|;)/,$path);
 
     foreach my $p (@paths)
     {
+	    next if !defined($p) or $p eq ';' or $p eq ':';
 	$p=~s/^\s+//;
 	$p=~s/\s+$//;
 
@@ -268,13 +272,14 @@
 	    }
 	}
     }
+    }
 
     return('');
 }
 
 sub FindGSpath
 {
-    my (@res)=`gs -h 2>/dev/null`;
+    my (@res)=`@GROFF_GHOSTSCRIPT_INTERPRETERS@ -h 2>/dev/null`;
     return '' if $?;
     my $buildpath='';
     my $stg=1;
@@ -308,8 +313,10 @@
 {
     my $gfont=shift;
     my $psfont='';
+    my (@gfa)=split('/',$gfont);
+    my $gfontbase=pop(@gfa);
 
-    if (open(GF,"<../devps/$gfont"))
+    if (open(GF,"<$gfont"))
     {
 	my (@gf)=(<GF>);
 	my @ps=grep(/^internalname /,@gf);
@@ -327,7 +334,7 @@
 
 	if ($psfont)
 	{
-	    if (open(GF,">$gfont"))
+	    if (open(GF,">$gfontbase"))
 	    {
 		local $"='';
 		print GF "@gf";

Index: src/devices/gropdf/gropdf.man
===================================================================
RCS file: /cvsroot/groff/groff/src/devices/gropdf/gropdf.man,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- src/devices/gropdf/gropdf.man	26 Jul 2011 17:11:11 -0000	1.1
+++ src/devices/gropdf/gropdf.man	10 Aug 2011 18:23:01 -0000	1.2
@@ -25,11 +25,6 @@
 .  ie \\n(.$=0:((0\\$1)*2u>(\\n(.lu-\\n(.iu)) .TP
 .  el .TP "\\$1"
 ..
-.de TQ
-.  br
-.  ns
-.  TP \$1
-..
 .
 .de FT
 .  if '\\*(.T'ps' .ft \\$1
@@ -53,7 +48,7 @@
 \#.OP \-I dir
 .OP \-p papersize
 \#.OP \-w n
-.OP \-fy foundry
+.OP \-y foundry
 .RI [ files
 .IR .\|.\|. ]
 .YS
@@ -84,7 +79,7 @@
 A filename of
 .B \-
 also causes
-.B grops
+.B gropdf
 to read the standard input.
 .
 PDF output is written to the standard output.
@@ -188,7 +183,7 @@
 Print the version number.
 .
 .TP
-.BI \-fy foundry
+.BI \-y foundry
 Set the foundry to use for selecting fonts of the same name.
 .
 .TP

Index: src/devices/gropdf/gropdf.pl
===================================================================
RCS file: /cvsroot/groff/groff/src/devices/gropdf/gropdf.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- src/devices/gropdf/gropdf.pl	4 Aug 2011 06:53:32 -0000	1.2
+++ src/devices/gropdf/gropdf.pl	10 Aug 2011 18:23:01 -0000	1.3
@@ -91,6 +91,8 @@
 my $mark=undef;
 my $suspendmark=undef;
 my $n_flg=1;
+my $pginsert=-1;    # Growth point for kids array
+my %pgnames;        # 'names' of pages for switchtopage
 
 my %ppsz=(	'ledger'=>[1224,792],
 	'legal'=>[612,1008],
@@ -131,9 +133,13 @@
 
 #Load_Config();
 
-GetOptions("F=s" => \$fd, 'l' => \$frot, 'p=s' => \$fpsz, 'd!' => \$debug, 'v' => \$version, 'e' => \$embedall, 'fy=s' => \$Foundry);
+GetOptions("F=s" => \$fd, 'l' => \$frot, 'p=s' => \$fpsz, 'd!' => \$debug, 'v' => \$version, 'e' => \$embedall, 'y=s' => \$Foundry);
 
-print "GNU gropdf (groff) version $cfg{GROFF_VERSION}\n", exit if $version;
+if ($version)
+{
+    print "GNU gropdf (groff) version $cfg{GROFF_VERSION}\n";
+    exit;
+}
 
 # Search for 'font directory': paths in -f opt, shell var GROFF_FONT_PATH, default paths
 
@@ -191,6 +197,7 @@
 while (<>)
 {
     chomp;
+    s/\r$//;
     $lct++;
 
     do 	# The ahead buffer behaves like 'ungetc'
@@ -470,7 +477,7 @@
     my $dirs=shift;
     my $fnm=shift;
 
-    if (substr($fnm,0,1)  eq '/')
+    if (substr($fnm,0,1)  eq '/' or substr($fnm,1,1) eq ':') # dos
     {
 	return if -r "$fnm" and open($$f,"<$fnm");
     }
@@ -557,7 +564,7 @@
 	$cat=$obj[$objct]->{DATA};
 	$objct++;
 	$pages=$obj[2]->{DATA};
-        Put("%PDF-1.4\n%âãÏÓ\n");
+	Put("%PDF-1.4\n\x25\xe2\xe3\xcf\xd3\n");
     }
     elsif ($xcmd eq 'X')
     {
@@ -866,6 +873,85 @@
 		$mark=$suspendmark;
 		$suspendmark=undef;
 	    }
+	    elsif (lc($xprm[1]) eq 'pagename')
+	    {
+		if ($pginsert > -1)
+		{
+		    $pgnames{$xprm[2]}=$pages->{Kids}->[$pginsert];
+		}
+		else
+		{
+		    $pgnames{$xprm[2]}='top';
+		}
+	    }
+	    elsif (lc($xprm[1]) eq 'switchtopage')
+	    {
+		my $ba=$xprm[2];
+		my $want=$xprm[3];
+
+		if ($pginsert > -1)
+		{
+		    if (!defined($want) or $want eq '')
+		    {
+			# no before/after
+			$want=$ba;
+			$ba='before';
+		    }
+
+		    if (!defined($ba) or $ba eq '' or $ba eq 'bottom')
+		    {
+			$pginsert=$#{$pages->{Kids}};
+		    }
+		    elsif ($ba eq 'top')
+		    {
+			$pginsert=-1;
+		    }
+		    else
+		    {
+			if (exists($pgnames{$want}))
+			{
+			    my $ref=$pgnames{$want};
+
+			    if ($ref eq 'top')
+			    {
+				$pginsert=-1;
+			    }
+			    else
+			    {
+
+				foreach my $j (0..$#{$pages->{Kids}})
+				{
+				    if ($ref eq $pages->{Kids}->[$j])
+				    {
+					if ($ba eq 'before')
+					{
+					    $pginsert=$j-1;
+					    return;
+					}
+					elsif ($ba eq 'after')
+					{
+					    $pginsert=$j;
+					    return;
+					}
+					else
+					{
+					    Msg(0,"Parameter must be top|bottom|before|after not '$ba'");
+					    return;
+					}
+				    }
+				}
+
+				Msg(0,"Can't find page ref '$ref'");
+			    }
+			}
+			else
+			{
+			    Msg(0,"Can't find page named '$want'");
+			}
+		    }
+
+		}
+	    }
 	}
 	elsif (lc(substr($xprm[0],0,9)) eq 'papersize')
 	{
@@ -2056,7 +2142,7 @@
 
     $cpageno=++$objct;
 
-    push(@{$pages->{Kids}},BuildObj($objct,
+    my $thispg=BuildObj($objct,
 		    {'Type' => '/Page',
 		    'Group' => {'CS' => '/DeviceRGB', 'S' => '/Transparency'},
 		    'Parent' => '2 0 R',
@@ -2064,8 +2150,10 @@
 				{'Length' => 0}
 				) ],
 		    }
-		    )
 	);
+
+    splice(@{$pages->{Kids}},++$pginsert,0,$thispg);
+
     $objct+=1;
     $cpage=$obj[$cpageno]->{DATA};
     $pages->{'Count'}++;
@@ -2693,6 +2781,7 @@
     {
 	my $lin=<>;
 	chomp($lin);
+	$lin=~s/\r$//;
 	$lct++;
 
 	push(@ahead,$lin);


From MAILER-DAEMON Sun Aug 14 01:41:46 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1QsTSE-0006ia-Dg
	for mharc-groff-commit@gnu.org; Sun, 14 Aug 2011 01:41:46 -0400
Received: from eggs.gnu.org ([140.186.70.92]:51218)
	by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <wl@gnu.org>)
	id 1QsTSB-0006iQ-O2
	for groff-commit@gnu.org; Sun, 14 Aug 2011 01:41:44 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <wl@gnu.org>) id 1QsTSA-0004aU-Nu
	for groff-commit@gnu.org; Sun, 14 Aug 2011 01:41:43 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:52611)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <wl@gnu.org>)
	id 1QsTSA-0004Yt-M3
	for groff-commit@gnu.org; Sun, 14 Aug 2011 01:41:42 -0400
Received: from wl by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <wl@gnu.org>) id 1QsTSA-000856-7X
	for groff-commit@gnu.org; Sun, 14 Aug 2011 05:41:42 +0000
Date: Sun, 14 Aug 2011 05:41:42 +0000
Message-Id: <E1QsTSA-000856-7X@vcs.savannah.gnu.org>
To: groff-commit@gnu.org
From: Werner LEMBERG <wl@gnu.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
Subject: [Groff-commit] groff/contrib/mm ChangeLog m.tmac
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: <groff-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/groff-commit>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 14 Aug 2011 05:41:44 -0000

CVSROOT:	/cvsroot/groff
Module name:	groff
Changes by:	Werner LEMBERG <wl>	11/08/14 05:41:42

Modified files:
	contrib/mm     : ChangeLog m.tmac 

Log message:
	Fix indents in nested static displays.
	
	* m.tmac (DS, ds@end): Save indent with a stack.
	See http://lists.gnu.org/archive/html/groff/2011-07/msg00068.html
	for an example.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/mm/ChangeLog?cvsroot=groff&r1=2.60&r2=2.61
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/mm/m.tmac?cvsroot=groff&r1=2.51&r2=2.52

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/groff/groff/contrib/mm/ChangeLog,v
retrieving revision 2.60
retrieving revision 2.61
diff -u -b -r2.60 -r2.61
--- ChangeLog	27 Mar 2011 08:11:38 -0000	2.60
+++ ChangeLog	14 Aug 2011 05:41:41 -0000	2.61
@@ -1,3 +1,11 @@
+Sun Aug 14 07:36:29 2011  Anton Shepelev  <anton.txt@gmail.com>
+
+	Fix indents in nested static displays.
+
+	* m.tmac (DS, ds@end): Save indent with a stack.
+	See http://lists.gnu.org/archive/html/groff/2011-07/msg00068.html
+	for an example.
+
 Sun Mar 27 09:25:01 2011  Anton Shepelev  <anton.txt@gmail.com>
 
 	* m.tmac (misc@tag): Fix last patch.

Index: m.tmac
===================================================================
RCS file: /cvsroot/groff/groff/contrib/mm/m.tmac,v
retrieving revision 2.51
retrieving revision 2.52
diff -u -b -r2.51 -r2.52
--- m.tmac	27 Mar 2011 08:11:38 -0000	2.51
+++ m.tmac	14 Aug 2011 05:41:42 -0000	2.52
@@ -3,8 +3,8 @@
 .ds RE \\$2
 ..
 .\"
-.\" $Id: m.tmac,v 2.51 2011/03/27 08:11:38 wl Exp $
-.@revision $Revision: 2.51 $
+.\" $Id: m.tmac,v 2.52 2011/08/14 05:41:42 wl Exp $
+.@revision $Revision: 2.52 $
 .ig
 
 Copyright (C) 1991-2006, 2009-2011
@@ -2072,7 +2072,8 @@
 .\"
 .nr ds*old-ll \\n[.l]
 .nr ds*old-in \\n[.i]
-.misc@push ds-ll \\n[.l]
+.misc@push ds-in \\n[ds*old-in] \" Saving indent and line length of
+.misc@push ds-ll \\n[ds*old-ll] \" the text outside the display.
 .misc@push ds-form \\n[ds*format]
 .nr ds*i \\n[.i]
 .nr ds*ftmp \\n[.f]
@@ -2095,7 +2096,8 @@
 .\" **********
 .nr ds*width \\n[dl]
 .nr ds*height \\n[dn]
-.misc@pop-nr ds-ll ds*old-ll
+.misc@pop-nr ds-ll ds*old-ll \" Restore indent and
+.misc@pop-nr ds-in ds*old-in \" line length
 .misc@pop-nr ds-form ds*format
 .\"
 .\" **********


From MAILER-DAEMON Sun Aug 14 10:46:25 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1QsbxJ-0000xz-52
	for mharc-groff-commit@gnu.org; Sun, 14 Aug 2011 10:46:25 -0400
Received: from eggs.gnu.org ([140.186.70.92]:41292)
	by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <wl@gnu.org>)
	id 1QsbxG-0000xJ-8C
	for groff-commit@gnu.org; Sun, 14 Aug 2011 10:46:23 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <wl@gnu.org>) id 1QsbxE-0005Yf-9y
	for groff-commit@gnu.org; Sun, 14 Aug 2011 10:46:22 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:44296)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <wl@gnu.org>)
	id 1QsbxE-0005Ya-2x
	for groff-commit@gnu.org; Sun, 14 Aug 2011 10:46:20 -0400
Received: from wl by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <wl@gnu.org>) id 1QsbxD-0005F7-QP
	for groff-commit@gnu.org; Sun, 14 Aug 2011 14:46:19 +0000
Date: Sun, 14 Aug 2011 14:46:19 +0000
Message-Id: <E1QsbxD-0005F7-QP@vcs.savannah.gnu.org>
To: groff-commit@gnu.org
From: Werner LEMBERG <wl@gnu.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
Subject: [Groff-commit] groff ChangeLog font/devpdf/Makefile.sub src/de...
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: <groff-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/groff-commit>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 14 Aug 2011 14:46:23 -0000

CVSROOT:	/cvsroot/groff
Module name:	groff
Changes by:	Werner LEMBERG <wl>	11/08/14 14:46:19

Modified files:
	.              : ChangeLog 
	font/devpdf    : Makefile.sub 
	src/devices/gropdf: gropdf.pl 

Log message:
	[gropdf] More minor fixes.
	
	* font/devpdf/Makefile.sub (MOSTLYCLEANADD): Don't attempt to
	install 'util/BuildFoundries', only used in 'make'.
	
	* src/devices/gropdf/gropdf.pl (<top>, GetType1): Make STDOUT and
	any font files read to be accessed in binary rather than text mode. 
	Prevents errors when running on systems set up for UTF-8.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/ChangeLog?cvsroot=groff&r1=1.1306&r2=1.1307
http://cvs.savannah.gnu.org/viewcvs/groff/font/devpdf/Makefile.sub?cvsroot=groff&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/groff/src/devices/gropdf/gropdf.pl?cvsroot=groff&r1=1.3&r2=1.4

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/groff/groff/ChangeLog,v
retrieving revision 1.1306
retrieving revision 1.1307
diff -u -b -r1.1306 -r1.1307
--- ChangeLog	10 Aug 2011 18:22:58 -0000	1.1306
+++ ChangeLog	14 Aug 2011 14:46:19 -0000	1.1307
@@ -1,3 +1,14 @@
+2011-08-14  Deri James  <deri@chuzzlewit.demon.co.uk>
+
+	[gropdf] More minor fixes.
+
+	* font/devpdf/Makefile.sub (MOSTLYCLEANADD): Don't attempt to
+	install 'util/BuildFoundries', only used in 'make'.
+
+	* src/devices/gropdf/gropdf.pl (<top>, GetType1): Make STDOUT and
+	any font files read to be accessed in binary rather than text mode. 
+	Prevents errors when running on systems set up for UTF-8.
+
 2011-08-10  Deri James  <deri@chuzzlewit.demon.co.uk>
 
 	[gropdf] Minor updates and fixes.

Index: font/devpdf/Makefile.sub
===================================================================
RCS file: /cvsroot/groff/groff/font/devpdf/Makefile.sub,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- font/devpdf/Makefile.sub	10 Aug 2011 18:23:00 -0000	1.2
+++ font/devpdf/Makefile.sub	14 Aug 2011 14:46:19 -0000	1.3
@@ -30,7 +30,6 @@
   download \
   DESC \
   Foundry \
-  util/BuildFoundries \
   $(GROFF_FONT_FILES) \
   $(ENC_FILES) \
   $(MAP_FILES)

Index: src/devices/gropdf/gropdf.pl
===================================================================
RCS file: /cvsroot/groff/groff/src/devices/gropdf/gropdf.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- src/devices/gropdf/gropdf.pl	10 Aug 2011 18:23:01 -0000	1.3
+++ src/devices/gropdf/gropdf.pl	14 Aug 2011 14:46:19 -0000	1.4
@@ -30,6 +30,7 @@
 
 $cfg{GROFF_VERSION}='@VERSION@';
 $cfg{GROFF_FONT_PATH}='@GROFF_FONT_DIR@';
+binmode(STDOUT);
 
 my @obj;	# Array of PDF objects
 my $objct=0;	# Count of Objects
@@ -1995,6 +1996,7 @@
 
     OpenFile(\$f,$fontdir,"$file");
     Msg(1,"Failed to open '$file'") if !defined($f);
+    binmode($f);
 
     my $l=<$f>;
 


