Add support for codepage 1252 characters, sort PLIST, bump PKGREVISION.

7 files changed, 415 insertions, 25 deletions

diff --git a/textproc/rtf-tools/Makefile b/textproc/rtf-tools/Makefile
index 13e048805f9..42eb91cef6a 100644
--- a/textproc/rtf-tools/Makefile
+++ b/textproc/rtf-tools/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2004/01/27 00:53:10 heinz Exp $
+# $NetBSD: Makefile,v 1.16 2005/03/27 18:22:35 ben Exp $
 #
 
 DISTNAME=		RTF-1.10
 PKGNAME=		rtf-tools-1.10
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		textproc
 MASTER_SITES=		http://www.snake.net/software/RTF/
 EXTRACT_SUFX=		.tar.Z
@@ -31,6 +31,7 @@ do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/rtf-tools
 	${INSTALL_DATA} ${WRKSRC}/h/standard-names ${PREFIX}/lib/rtf-tools
 	cd ${WRKSRC}/lib && ${INSTALL_DATA} ansi-gen ansi-sym \
+		ansicpg1252-gen ansicpg1252-sym \
 		mac-gen mac-sym pc-gen pc-sym pca-gen pca-sym \
 		${PREFIX}/lib/rtf-tools
 	${INSTALL_DATA} ${WRKSRC}/rtf2text/text-map ${PREFIX}/lib/rtf-tools
diff --git a/textproc/rtf-tools/PLIST b/textproc/rtf-tools/PLIST
index fdaa9dce5d9..6f22eed2595 100644
--- a/textproc/rtf-tools/PLIST
+++ b/textproc/rtf-tools/PLIST
@@ -1,30 +1,32 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:58:33 zuntum Exp $
-lib/rtf-tools/standard-names
+@comment $NetBSD: PLIST,v 1.2 2005/03/27 18:22:35 ben Exp $
+bin/rtf2groff
+bin/rtf2null
+bin/rtf2text
+bin/rtf2troff
+bin/rtfchkmap
+bin/rtfdiag
+bin/rtfindent
+bin/rtfmaptortf
+bin/rtfwc
 lib/rtf-tools/ansi-gen
 lib/rtf-tools/ansi-sym
+lib/rtf-tools/ansicp1252-gen
+lib/rtf-tools/ansicp1252-sym
+lib/rtf-tools/dwbtroff-map
+lib/rtf-tools/groff-map
 lib/rtf-tools/mac-gen
 lib/rtf-tools/mac-sym
 lib/rtf-tools/pc-gen
 lib/rtf-tools/pc-sym
 lib/rtf-tools/pca-gen
 lib/rtf-tools/pca-sym
+lib/rtf-tools/standard-names
 lib/rtf-tools/text-map
-lib/rtf-tools/troff-map
-lib/rtf-tools/groff-map
-lib/rtf-tools/xroff-map
-lib/rtf-tools/dwbtroff-map
 lib/rtf-tools/troff-man-map
+lib/rtf-tools/troff-map
 lib/rtf-tools/troff-me-map
 lib/rtf-tools/troff-mm-map
 lib/rtf-tools/troff-ms-map
-bin/rtfchkmap
-bin/rtfmaptortf
-bin/rtf2null
-bin/rtf2text
-bin/rtf2troff
-bin/rtf2groff
-bin/rtfdiag
-bin/rtfindent
-bin/rtfwc
+lib/rtf-tools/xroff-map
 man/manl/rtf2troff.l
 @dirrm lib/rtf-tools
diff --git a/textproc/rtf-tools/distinfo b/textproc/rtf-tools/distinfo
index a5da600da43..4185062ad2c 100644
--- a/textproc/rtf-tools/distinfo
+++ b/textproc/rtf-tools/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 14:48:49 agc Exp $
+$NetBSD: distinfo,v 1.4 2005/03/27 18:22:35 ben Exp $
 
 SHA1 (RTF-1.10.tar.Z) = 1fcf63e52bd2d57b2841e32667ab76bb6c2998c6
 RMD160 (RTF-1.10.tar.Z) = 0fdacb6df5779a343d419e1e3bf007f8d8cabbda
@@ -7,5 +7,8 @@ SHA1 (patch-aa) = 9a2863b144a8364284a92af720c365034ec4d055
 SHA1 (patch-ab) = c45bc8d80a5c3a5cdf8f54c1c2a91caa81ce0f97
 SHA1 (patch-ac) = ab10d20e7457c978a51288391064d7baef403304
 SHA1 (patch-ad) = 5bffb2788eeba22bc8b46fd55dda25d87d22d9d6
-SHA1 (patch-ae) = c87e8edbe96d50e1a9f54e5890d21fd4c6168723
+SHA1 (patch-ae) = 352780f4a53d2746ed0a00427d701339e9947d1c
 SHA1 (patch-af) = 428112205e1cf6466c6f97de6102ecd52ae39781
+SHA1 (patch-ag) = 2c5fd9db3c011bb0648b738d09e1342fb6c76003
+SHA1 (patch-ah) = 6a7f28d28bd6b8058c77ae57c5a5d88e1152258e
+SHA1 (patch-ai) = f46a29dbdfd074ee8263b74d40f38c10646037fb
diff --git a/textproc/rtf-tools/patches/patch-ae b/textproc/rtf-tools/patches/patch-ae
index ff72ab083a6..3543714280a 100644
--- a/textproc/rtf-tools/patches/patch-ae
+++ b/textproc/rtf-tools/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.2 2001/05/31 11:04:56 agc Exp $
+$NetBSD: patch-ae,v 1.3 2005/03/27 18:22:35 ben Exp $
 
---- lib/reader.c.orig	Tue Apr  5 12:14:55 1994
-+++ lib/reader.c	Wed May 16 22:10:17 2001
-@@ -587,38 +587,45 @@
+--- lib/reader.c.orig	1994-04-05 12:14:55.000000000 -0700
++++ lib/reader.c
+@@ -587,38 +587,45 @@ RTFFont	*fp;
  	if (autoCharSetFlags == 0)
  		return;
  
@@ -75,7 +75,7 @@ $NetBSD: patch-ae,v 1.2 2001/05/31 11:04:56 agc Exp $
  		}
  	}
  }
-@@ -1194,6 +1201,7 @@
+@@ -1194,6 +1213,7 @@ RTFFont	*fp;
  char	buf[rtfBufSiz], *bp;
  int	old = -1;
  char	*fn = "ReadFontTbl";
@@ -83,7 +83,7 @@ $NetBSD: patch-ae,v 1.2 2001/05/31 11:04:56 agc Exp $
  
  	for (;;)
  	{
-@@ -1311,11 +1319,30 @@
+@@ -1311,11 +1331,30 @@ char	*fn = "ReadFontTbl";
  				RTFPanic ("%s: missing \"}\"", fn);
  		}
  	}
@@ -116,3 +116,11 @@ $NetBSD: patch-ae,v 1.2 2001/05/31 11:04:56 agc Exp $
  	RTFRouteToken ();	/* feed "}" back to router */
  }
  
+@@ -2260,6 +2299,7 @@ static RTFKey	rtfKey[] =
+ 
+ 	rtfCharSet,	rtfMacCharSet,		"mac",		0,
+ 	rtfCharSet,	rtfAnsiCharSet,		"ansi",		0,
++	rtfCharSet,	rtfAnsiCpCharSet,	"ansicpg",	0,
+ 	rtfCharSet,	rtfPcCharSet,		"pc",		0,
+ 	rtfCharSet,	rtfPcaCharSet,		"pca",		0,
+ 
diff --git a/textproc/rtf-tools/patches/patch-ag b/textproc/rtf-tools/patches/patch-ag
new file mode 100644
index 00000000000..467837695af
--- /dev/null
+++ b/textproc/rtf-tools/patches/patch-ag
@@ -0,0 +1,244 @@
+$NetBSD: patch-ag,v 1.1 2005/03/27 18:22:35 ben Exp $
+
+--- lib/ansicpg1252-gen.orig	2005-03-27 09:44:09.000000000 -0800
++++ lib/ansicpg1252-gen
+@@ -0,0 +1,239 @@
++# RTF ANSI character set (\ansi) general map
++# These are taken from the ISO-Latin-1 (ISO-8859-1) encodings, with
++# a few additions
++
++# Field 1 is the standard character name which the character value in
++# field 2 maps onto.  (It doesn't mean "to produce the character in field 1,
++# use the value in field 2.)
++
++# The character value may be given either as a single character (which will be
++# converted to the ASCII value of the character), or in numeric format, either
++# in decimal or 0xyy as hex yy.  Single or double quotes may be used to quote
++# characters.
++
++# characters in ASCII range (00-127)
++
++formula		0x06
++nobrkhyphen	0x1e
++opthyphen	0x1f
++
++space		" "
++exclam		!
++quotedbl	'"'
++numbersign	#
++dollar		$
++percent		%
++ampersand	&
++quoteright	"'"
++parenleft	(
++parenright	)
++asterisk	*
++plus		+
++comma		,
++hyphen		-
++period		.
++slash		/
++zero		0
++one		1
++two		2
++three		3
++four		4
++five		5
++six		6
++seven		7
++eight		8
++nine		9
++colon		:
++semicolon	;
++less		<
++equal		=
++greater		>
++question	?
++at		@
++A		A
++B		B
++C		C
++D		D
++E		E
++F		F
++G		G
++H		H
++I		I
++J		J
++K		K
++L		L
++M		M
++N		N
++O		O
++P		P
++Q		Q
++R		R
++S		S
++T		T
++U		U
++V		V
++W		W
++X		X
++Y		Y
++Z		Z
++bracketleft	[
++backslash	\
++bracketright	]
++asciicircum	^
++underscore	_
++quoteleft	"`"
++a		a
++b		b
++c		c
++d		d
++e		e
++f		f
++g		g
++h		h
++i		i
++j		j
++k		k
++l		l
++m		m
++n		n
++o		o
++p		p
++q		q
++r		r
++s		s
++t		t
++u		u
++v		v
++w		w
++x		x
++y		y
++z		z
++braceleft	{
++bar		|
++braceright	}
++asciitilde	~
++
++# non-ASCII characters (128-255)
++
++#euro			0x80
++quotesinglbase		0x82
++florin			0x83
++quotedblbase		0x84
++ellipsis		0x85
++dagger			0x86
++daggerdbl		0x87
++perthousand		0x89
++Scaron			0x8a
++guilsinglleft		0x8b
++OE			0x8c
++#Zcaron			0x8e
++quoteleft		0x91
++quoteright		0x92
++quotedblleft		0x93
++quotedblright		0x94
++bullet			0x95
++endash			0x96
++emdash			0x97
++tilde			0x98
++trademark		0x99
++#scaron			0x9a
++guilsinglright		0x9b
++oe			0x9c
++#zcaron			0x9e
++Ydieresis		0x9f
++nobrkspace		0xa0
++exclamdown		0xa1
++cent			0xa2
++sterling		0xa3
++currency		0xa4
++yen			0xa5
++brokenbar		0xa6
++section			0xa7
++dieresis		0xa8
++copyright		0xa9
++ordfeminine		0xaa
++guillemotleft		0xab
++logicalnot		0xac
++opthyphen		0xad
++registered		0xae
++macron			0xaf
++degree			0xb0
++plusminus		0xb1
++twosuperior		0xb2
++threesuperior		0xb3
++acute			0xb4
++mu			0xb5
++paragraph		0xb6
++periodcentered		0xb7
++cedilla			0xb8
++onesuperior		0xb9
++ordmasculine		0xba
++guillemotright		0xbb
++onequarter		0xbc
++onehalf			0xbd
++threequarters		0xbe
++questiondown		0xbf
++Agrave			0xc0
++Aacute			0xc1
++Acircumflex		0xc2
++Atilde			0xc3
++Adieresis		0xc4
++Aring			0xc5
++AE			0xc6
++Ccedilla		0xc7
++Egrave			0xc8
++Eacute			0xc9
++Ecircumflex		0xca
++Edieresis		0xcb
++Igrave			0xcc
++Iacute			0xcd
++Icircumflex		0xce
++Idieresis		0xcf
++Eth			0xd0
++Ntilde			0xd1
++Ograve			0xd2
++Oacute			0xd3
++Ocircumflex		0xd4
++Otilde			0xd5
++Odieresis		0xd6
++multiply		0xd7
++Oslash			0xd8
++Ugrave			0xd9
++Uacute			0xda
++Ucircumflex		0xdb
++Udieresis		0xdc
++Yacute			0xdd
++Thorn			0xde
++germandbls		0xdf
++agrave			0xe0
++aacute			0xe1
++acircumflex		0xe2
++atilde			0xe3
++adieresis		0xe4
++aring			0xe5
++ae			0xe6
++ccedilla		0xe7
++egrave			0xe8
++eacute			0xe9
++ecircumflex		0xea
++edieresis		0xeb
++igrave			0xec
++iacute			0xed
++icircumflex		0xee
++idieresis		0xef
++eth			0xf0
++ntilde			0xf1
++ograve			0xf2
++oacute			0xf3
++ocircumflex		0xf4
++otilde			0xf5
++odieresis		0xf6
++divide			0xf7
++oslash			0xf8
++ugrave			0xf9
++uacute			0xfa
++ucircumflex		0xfb
++udieresis		0xfc
++yacute			0xfd
++thorn			0xfe
++ydieresis		0xff
diff --git a/textproc/rtf-tools/patches/patch-ah b/textproc/rtf-tools/patches/patch-ah
new file mode 100644
index 00000000000..79e4b1cbbf4
--- /dev/null
+++ b/textproc/rtf-tools/patches/patch-ah
@@ -0,0 +1,120 @@
+$NetBSD: patch-ah,v 1.1 2005/03/27 18:22:35 ben Exp $
+
+--- lib/ansicpg1252-sym.orig	2005-03-27 09:01:54.000000000 -0800
++++ lib/ansicpg1252-sym
+@@ -0,0 +1,115 @@
++# RTF ANSI character set (\ansi) Symbol font map
++
++# Field 1 is the standard character name which the character value in
++# field 2 maps onto.  (It doesn't mean "to produce the character in field 1,
++# use the value in field 2.)
++
++# The character value may be given either as a single character (which will be
++# converted to the ASCII value of the character), or in numeric format, either
++# in decimal or 0xyy as hex yy.  Single or double quotes may be used to quote
++# characters.
++
++# characters in ASCII range (00-127)
++
++formula		0x06
++nobrkhyphen	0x1e
++opthyphen	0x1f
++
++space		" "
++exclam		!
++universal	'"'
++mathnumbersign	#
++existential	$
++percent		%
++ampersand	&
++suchthat	"'"
++parenleft	(
++parenright	)
++mathasterisk	*
++mathplus	+
++comma		,
++mathminus	-
++period		.
++slash		/
++zero		0
++one		1
++two		2
++three		3
++four		4
++five		5
++six		6
++seven		7
++eight		8
++nine		9
++colon		:
++semicolon	;
++less		<
++mathequal	=
++greater		>
++question	?
++congruent	@
++Alpha		A
++Beta		B
++Chi		C
++Delta		D
++Epsilon		E
++Phi		F
++Gamma		G
++Eta		H
++Iota		I
++# J		J
++Kappa		K
++Lambda		L
++Mu		M
++Nu		N
++Omicron		O
++Pi		P
++Theta		Q
++Rho		R
++Sigma		S
++Tau		T
++Upsilon		U
++varsigma	V
++Omega		W
++Xi		X
++Psi		Y
++Zeta		Z
++bracketleft	[
++backslash	\
++bracketright	]
++asciicircum	^
++underscore	_
++quoteleft	"`"
++alpha		a
++beta		b
++chi		c
++delta		d
++epsilon		e
++phi		f
++gamma		g
++eta		h
++iota		i
++# j		j
++kappa		k
++lambda		l
++mu		m
++nu		n
++omicron		o
++pi		p
++theta		q
++rho		r
++sigma		s
++tau		t
++upsilon		u
++# xxx		v
++omega		w
++xi		x
++psi		y
++zeta		z
++braceleft	{
++bar		|
++braceright	}
++mathtilde	~
++
++# non-ASCII characters (128-255)
++
diff --git a/textproc/rtf-tools/patches/patch-ai b/textproc/rtf-tools/patches/patch-ai
new file mode 100644
index 00000000000..4b8fe62150f
--- /dev/null
+++ b/textproc/rtf-tools/patches/patch-ai
@@ -0,0 +1,12 @@
+$NetBSD: patch-ai,v 1.1 2005/03/27 18:22:35 ben Exp $
+
+--- h/rtf.h.dist.orig	1994-04-05 12:53:31.000000000 -0700
++++ h/rtf.h.dist
+@@ -109,6 +109,7 @@ extern int	rtfLinePos;		/* input line po
+ # define		rtfMacCharSet		1
+ # define		rtfPcCharSet		2
+ # define		rtfPcaCharSet		3
++# define		rtfAnsiCpCharSet	4
+ 
+ 
+ /* destination minor numbers should be zero-based and sequential */