upgrade to ogi-2.0 / festival-1.4.0

18 files changed, 121 insertions, 81 deletions

diff --git a/audio/festlex-ogi/Makefile b/audio/festlex-ogi/Makefile
index b868f17d124..f9b2c974139 100644
--- a/audio/festlex-ogi/Makefile
+++ b/audio/festlex-ogi/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.4 1999/06/09 17:05:32 agc Exp $
+# $NetBSD: Makefile,v 1.5 1999/10/11 10:54:34 proff Exp $
 
-DISTNAME=	festlex-ogi-1.4
+DISTNAME=	festlex-ogi-2.0
 WRKSRC=		${WRKDIR}/festival
 CATEGORIES=	audio
 MASTER_SITES=	ftp://cslu.cse.ogi.edu/pub/tts/
-DISTFILES=	OGIlexicon-1.4.tar.gz
+DISTFILES=	OGIlexicon-2.0.tar.gz
 
 MAINTAINER=	proff@iq.org
 HOMEPAGE=	http://cslu.cse.ogi.edu/tts
 
-DEPENDS+=	festival-1.3.1:../festival \
-		festlex-poslex-1.3.1:../festlex-poslex
+DEPENDS+=	festival-1.4.0:../festival \
+		festlex-poslex-1.4.0:../festlex-poslex
 
 LICENSE=	no-commercial-use
 
diff --git a/audio/festlex-ogi/files/md5 b/audio/festlex-ogi/files/md5
index 41beb2dcd62..099bd67561b 100644
--- a/audio/festlex-ogi/files/md5
+++ b/audio/festlex-ogi/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 1999/04/04 19:33:08 proff Exp $
+$NetBSD: md5,v 1.2 1999/10/11 10:54:35 proff Exp $
 
-MD5 (OGIlexicon-1.4.tar.gz) = faddfe2be26febf589bc9a79fd96641a
+MD5 (OGIlexicon-2.0.tar.gz) = 7edfa40d62421baa501218050f131b97
diff --git a/audio/festogi-spanish/Makefile b/audio/festogi-spanish/Makefile
index a50ef243be7..e59b3280f0f 100644
--- a/audio/festogi-spanish/Makefile
+++ b/audio/festogi-spanish/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.4 1999/06/09 17:05:33 agc Exp $
+# $NetBSD: Makefile,v 1.5 1999/10/11 10:54:35 proff Exp $
 
-DISTNAME=	festogi-spanish-1.4
+DISTNAME=	festogi-spanish-2.0
 WRKSRC=		${WRKDIR}/festival
 CATEGORIES=	audio
 MASTER_SITES=	ftp://cslu.cse.ogi.edu/pub/tts/
-DISTFILES=	OGIspanish-1.4.tar.gz
+DISTFILES=	OGIspanish-2.0.tar.gz
 
 MAINTAINER=	proff@iq.org
 HOMEPAGE=	http://cslu.cse.ogi.edu/tts
 
-DEPENDS+=	festival-1.3.1:../festival
+DEPENDS+=	festival-1.4.0:../festival
 
 LICENSE=	no-commercial-use
 
diff --git a/audio/festogi-spanish/files/md5 b/audio/festogi-spanish/files/md5
index 712a7ea2076..e1027ab76fa 100644
--- a/audio/festogi-spanish/files/md5
+++ b/audio/festogi-spanish/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 1999/04/04 19:33:34 proff Exp $
+$NetBSD: md5,v 1.2 1999/10/11 10:54:36 proff Exp $
 
-MD5 (OGIspanish-1.4.tar.gz) = f873100c7ce26fe7f4abd05c5bb44e3e
+MD5 (OGIspanish-2.0.tar.gz) = b56179c9071b881012e244c82e0d78e3
diff --git a/audio/festogi-spanish/pkg/DESCR b/audio/festogi-spanish/pkg/DESCR
index 9eb3078db92..4eb2091bd6d 100644
--- a/audio/festogi-spanish/pkg/DESCR
+++ b/audio/festogi-spanish/pkg/DESCR
@@ -1,14 +1,48 @@
 Festival Spanish (Mexican) language support routines (in scheme) from ogi.edu
 
-OGIspanish is an extension to the Festival TTS system (created by
-CSTR at the University of Edinburgh
-http://www.cstr.ed.ac.uk/projects/festival).  This version of
-voice_abc has been designed to work with Festival version 1.3.0
-released starting from September 1998.  It provides Mexican Spanish
-voices created by Alejandro Barbosa from UDLA, Puebla, Mexico.
 
-New in recent releases:
-	* works with Festival 1.3.0
+		     Mexican Spanish Synthesizer
+			    for OGIresLPC
+			     version 2.0
+			      June 1999
+
+	     http://www.pue.udlap.mx/~sistemas/tlatoa/tts
+		   http://cslu.cse.ogi.edu/tts
+
+	      Alejandro Barbosa <alex@mail.pue.udlap.mx>
+		   Andrew Cronk <cronk@cse.ogi.edu>
+		Horacio Meza <is093970@mail.udlap.mx>
+		    Mike Macon <macon@ee.ogi.edu>
+		
+DESCRIPTION
+-----------
+
+OGIspanish is an extension to the Festival TTS system
+(http://www.cstr.ed.ac.uk/projects/festival).  This version of
+OGIspanish has been designed to work with Festival version 1.4.0
+released June 1999.  It provides Mexican Spanish voices created by OGI
+staff and Alejandro Barbosa from UDLA, Puebla, Mexico.
+
+The module is distributed in three chunks:
+ 1) OGIspanish-2.0.tar.gz -- Scheme code
+ 2) voice_hvs-2.0.tar.gz -- female voice
+ 3) voice_abc-2.0.tar.gz -- male voice
+
+New in this release (2.0):
+	* works with Festival 1.4.0
+	
+	* intonation module accepts parameter that allows base f0 to be
+	  modified in the same manner as the English voices in the context
+	  of the CSLU Toolkit
+
+	* major improvements to the tokenization module
+		- accents 'vowel format abandoned
+		- now use vowel' to indicate accent on non-Spanish keyboard
+		- tilde can be entered as n~ or ny
+		- dieresis supported
+		- Spanish keyboard special characters supported
+		- a host of Abbreviations added
+		- improved processing of money, temperature, etc.
 
 	* intonation module: At the highest level of the intonation module 
 	  is a new stage to incorporate different phrase intonation models. 
@@ -24,23 +58,29 @@ New in recent releases:
 Notes:
 
 1) Currently, the Mexican Spanish voice does not support Spanish
-characteres such as tilded vowels, or dierisis. You must enter 
+characters such as tilded vowels, ˜ or dierisis. You must enter 
 them as follows: 
 
-tilded a	-	'a
-tilded e	-	'e
-tilded i	-	'i
-tilded o	-	'o
-tilded u	-	'u
-tilded n	-	ny
+tilded a	-	a'
+tilded e	-	e'
+tilded i	-	i'
+tilded o	-	o'
+tilded u	-	u'
+tilded n	-	n~
 
-dierisis is not supported in this version.
 
 LICENSE 
 ------- 
 This module and accompanying data are freely available for
-non-commercial use only.  Please see the file "license.ogi" for
-information on usage and redistribution, and for a DISCLAIMER OF ALL
-WARRANTIES.
+non-commercial use only.  Please see the file "license_ogi_tts.txt"
+for information on usage and redistribution, and for a DISCLAIMER OF
+ALL WARRANTIES.
+
+
+BUGS and IMPROVEMENTS
+---------------------
+Please contact us via email if you find bugs or have suggestions
+for improvements.  <cronk@cse.ogi.edu>
+
 
 -Julian Assange <proff@iq.org>
diff --git a/audio/festvox-abc/Makefile b/audio/festvox-abc/Makefile
index d9d104cef36..4b3eed1ad97 100644
--- a/audio/festvox-abc/Makefile
+++ b/audio/festvox-abc/Makefile
@@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.4 1999/06/09 17:05:33 agc Exp $
+# $NetBSD: Makefile,v 1.5 1999/10/11 10:54:36 proff Exp $
 
-DISTNAME=	festvox-abc-1.4
+DISTNAME=	festvox-abc-2.0
 WRKSRC=		${WRKDIR}/festival
 CATEGORIES=	audio
 MASTER_SITES=	ftp://cslu.cse.ogi.edu/pub/tts/
-DISTFILES=	voice_abc-1.4.tar.gz
+DISTFILES=	voice_abc_di-2.0.tar.gz
 
 MAINTAINER=	proff@iq.org
 HOMEPAGE=	http://cslu.cse.ogi.edu/tts
 
-DEPENDS+=	festival-1.3.1:../festival \
-		festlex-ogi-1.4:../festlex-ogi \
-		festogi-spanish-1.4:../festogi-spanish
+DEPENDS+=	festival-1.4.0:../festival \
+		festlex-ogi-2.0:../festlex-ogi \
+		festogi-spanish-2.0:../festogi-spanish
 
 LICENSE=	no-commercial-use
 
diff --git a/audio/festvox-abc/files/md5 b/audio/festvox-abc/files/md5
index a4834b40763..5263f9fd9cc 100644
--- a/audio/festvox-abc/files/md5
+++ b/audio/festvox-abc/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 1999/04/04 19:33:46 proff Exp $
+$NetBSD: md5,v 1.2 1999/10/11 10:54:37 proff Exp $
 
-MD5 (voice_abc-1.4.tar.gz) = 8bf0ceef415834ed5eef4db43cf7e82e
+MD5 (voice_abc_di-2.0.tar.gz) = 66e9699e8f3d35b0c4b5feef3770d5d9
diff --git a/audio/festvox-aec/Makefile b/audio/festvox-aec/Makefile
index 0ea15057255..f497233a956 100644
--- a/audio/festvox-aec/Makefile
+++ b/audio/festvox-aec/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.4 1999/06/09 17:05:33 agc Exp $
+# $NetBSD: Makefile,v 1.5 1999/10/11 10:54:37 proff Exp $
 
-DISTNAME=	festvox-aec-1.4
+DISTNAME=	festvox-aec-2.0
 WRKSRC=		${WRKDIR}/festival
 CATEGORIES=	audio
 MASTER_SITES=	ftp://cslu.cse.ogi.edu/pub/tts/
-DISTFILES=	voice_aec-1.4.tar.gz
+DISTFILES=	voice_aec_di-2.0.tar.gz
 
 MAINTAINER=	proff@iq.org
 HOMEPAGE=	http://cslu.cse.ogi.edu/tts
 
-DEPENDS+=	festival-1.3.1:../festival \
-		festlex-ogi-1.4:../festlex-ogi
+DEPENDS+=	festival-1.4.0:../festival \
+		festlex-ogi-2.0:../festlex-ogi
 
 LICENSE=	no-commercial-use
 
diff --git a/audio/festvox-aec/files/md5 b/audio/festvox-aec/files/md5
index 4afbeea19eb..0a02b3f78ad 100644
--- a/audio/festvox-aec/files/md5
+++ b/audio/festvox-aec/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 1999/04/04 19:33:57 proff Exp $
+$NetBSD: md5,v 1.2 1999/10/11 10:54:38 proff Exp $
 
-MD5 (voice_aec-1.4.tar.gz) = 4a35f47f7a5cbafd001d019e14365112
+MD5 (voice_aec_di-2.0.tar.gz) = 5f17a9cd6d73258be5774f76bebd2877
diff --git a/audio/festvox-hvs/Makefile b/audio/festvox-hvs/Makefile
index 23d233ddb4d..cd6579f6b5e 100644
--- a/audio/festvox-hvs/Makefile
+++ b/audio/festvox-hvs/Makefile
@@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.4 1999/06/09 17:05:34 agc Exp $
+# $NetBSD: Makefile,v 1.5 1999/10/11 10:54:38 proff Exp $
 
-DISTNAME=	festvox-hvs-1.4
+DISTNAME=	festvox-hvs-2.0
 WRKSRC=		${WRKDIR}/festival
 CATEGORIES=	audio
 MASTER_SITES=	ftp://cslu.cse.ogi.edu/pub/tts/
-DISTFILES=	voice_hvs-1.4.tar.gz
+DISTFILES=	voice_hvs_di-2.0.tar.gz
 
 MAINTAINER=	proff@iq.org
 HOMEPAGE=	http://cslu.cse.ogi.edu/tts
 
-DEPENDS+=	festival-1.3.1:../festival \
-		festlex-ogi-1.4:../festlex-ogi \
-		festogi-spanish-1.4:../festogi-spanish
+DEPENDS+=	festival-1.4.0:../festival \
+		festlex-ogi-2.0:../festlex-ogi \
+		festogi-spanish-2.0:../festogi-spanish
 
 LICENSE=	no-commercial-use
 
diff --git a/audio/festvox-hvs/files/md5 b/audio/festvox-hvs/files/md5
index 12cd19cf85e..ba26614cf60 100644
--- a/audio/festvox-hvs/files/md5
+++ b/audio/festvox-hvs/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 1999/04/04 19:34:33 proff Exp $
+$NetBSD: md5,v 1.2 1999/10/11 10:54:39 proff Exp $
 
-MD5 (voice_hvs-1.4.tar.gz) = 80905d94db69b90055fa0c3a5e3e49ff
+MD5 (voice_hvs_di-2.0.tar.gz) = c0aeade9f11333ae5ca9d5c2e69447c0
diff --git a/audio/festvox-jph/Makefile b/audio/festvox-jph/Makefile
index c46efaa6b40..e7918e2b181 100644
--- a/audio/festvox-jph/Makefile
+++ b/audio/festvox-jph/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.4 1999/06/09 17:05:34 agc Exp $
+# $NetBSD: Makefile,v 1.5 1999/10/11 10:54:39 proff Exp $
 
-DISTNAME=	festvox-jph-1.4
+DISTNAME=	festvox-jph-2.0
 WRKSRC=		${WRKDIR}/festival
 CATEGORIES=	audio
 MASTER_SITES=	ftp://cslu.cse.ogi.edu/pub/tts/
-DISTFILES=	voice_jph-1.4.tar.gz
+DISTFILES=	voice_jph_di-2.0.tar.gz
 
 MAINTAINER=	proff@iq.org
 HOMEPAGE=	http://cslu.cse.ogi.edu/tts
 
-DEPENDS+=	festival-1.3.1:../festival \
-		festlex-ogi-1.4:../festlex-ogi
+DEPENDS+=	festival-1.4.0:../festival \
+		festlex-ogi-2.0:../festlex-ogi
 
 LICENSE=	no-commercial-use
 
diff --git a/audio/festvox-jph/files/md5 b/audio/festvox-jph/files/md5
index 7a5398a5276..2bb96659544 100644
--- a/audio/festvox-jph/files/md5
+++ b/audio/festvox-jph/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 1999/04/04 19:34:44 proff Exp $
+$NetBSD: md5,v 1.2 1999/10/11 10:54:39 proff Exp $
 
-MD5 (voice_jph-1.4.tar.gz) = 06146468cdcfd5d8635a8b35c522df7e
+MD5 (voice_jph_di-2.0.tar.gz) = 653f8c8c5602097600fe27ebdf7f17f9
diff --git a/audio/festvox-mwm/Makefile b/audio/festvox-mwm/Makefile
index dee057c38be..5d4a26947d9 100644
--- a/audio/festvox-mwm/Makefile
+++ b/audio/festvox-mwm/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.4 1999/06/09 17:05:35 agc Exp $
+# $NetBSD: Makefile,v 1.5 1999/10/11 10:54:40 proff Exp $
 
-DISTNAME=	festvox-mwm-1.4
+DISTNAME=	festvox-mwm-2.0
 WRKSRC=		${WRKDIR}/festival
 CATEGORIES=	audio
 MASTER_SITES=	ftp://cslu.cse.ogi.edu/pub/tts/
-DISTFILES=	voice_mwm-1.4.tar.gz
+DISTFILES=	voice_mwm_di-2.0.tar.gz
 
 MAINTAINER=	proff@iq.org
 HOMEPAGE=	http://cslu.cse.ogi.edu/tts
 
-DEPENDS+=	festival-1.3.1:../festival \
-		festlex-ogi-1.4:../festlex-ogi
+DEPENDS+=	festival-1.4.0:../festival \
+		festlex-ogi-2.0:../festlex-ogi
 
 LICENSE=	no-commercial-use
 
diff --git a/audio/festvox-mwm/files/md5 b/audio/festvox-mwm/files/md5
index fef8ff31e6c..f73d2625f65 100644
--- a/audio/festvox-mwm/files/md5
+++ b/audio/festvox-mwm/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 1999/04/04 19:35:56 proff Exp $
+$NetBSD: md5,v 1.2 1999/10/11 10:54:40 proff Exp $
 
-MD5 (voice_mwm-1.4.tar.gz) = 4ff37dd61382562cf0a3dd2485d9b6cd
+MD5 (voice_mwm_di-2.0.tar.gz) = 6037a6703ec83936e3e28d501e4e655e
diff --git a/audio/festvox-ogirab/Makefile b/audio/festvox-ogirab/Makefile
index 18d3e4f9374..f5fca819f02 100644
--- a/audio/festvox-ogirab/Makefile
+++ b/audio/festvox-ogirab/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.4 1999/06/09 17:05:35 agc Exp $
+# $NetBSD: Makefile,v 1.5 1999/10/11 10:54:41 proff Exp $
 
-DISTNAME=	festvox-ogirab-1.4
+DISTNAME=	festvox-ogirab-2.0
 WRKSRC=		${WRKDIR}/festival
 CATEGORIES=	audio
 MASTER_SITES=	ftp://cslu.cse.ogi.edu/pub/tts/
-DISTFILES=	voice_ogirab-1.4.tar.gz
+DISTFILES=	voice_ogirab_di-2.0.tar.gz
 
 MAINTAINER=	proff@iq.org
 HOMEPAGE=	http://cslu.cse.ogi.edu/tts
 
-DEPENDS+=	festival-1.3.1:../festival \
-		festlex-ogi-1.4:../festlex-ogi
+DEPENDS+=	festival-1.4.0:../festival \
+		festlex-ogi-2.0:../festlex-ogi
 
 LICENSE=	no-commercial-use
 
diff --git a/audio/festvox-ogirab/files/md5 b/audio/festvox-ogirab/files/md5
index 79b6ba78a6b..aa4440ca5f0 100644
--- a/audio/festvox-ogirab/files/md5
+++ b/audio/festvox-ogirab/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 1999/04/04 19:36:08 proff Exp $
+$NetBSD: md5,v 1.2 1999/10/11 10:54:41 proff Exp $
 
-MD5 (voice_ogirab-1.4.tar.gz) = 20fd1b4cf7888a9a182c57c95cadc2d1
+MD5 (voice_ogirab_di-2.0.tar.gz) = 013dbf46994a7916a212a431358b9e7f
diff --git a/audio/festvox-tll/Makefile b/audio/festvox-tll/Makefile
index 80ca5de5652..1033b227e62 100644
--- a/audio/festvox-tll/Makefile
+++ b/audio/festvox-tll/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.4 1999/06/09 17:05:35 agc Exp $
+# $NetBSD: Makefile,v 1.5 1999/10/11 10:54:41 proff Exp $
 
-DISTNAME=	festvox-tll-1.4
+DISTNAME=	festvox-tll-2.0
 WRKSRC=		${WRKDIR}/festival
 CATEGORIES=	audio
 MASTER_SITES=	ftp://cslu.cse.ogi.edu/pub/tts/
-DISTFILES=	voice_tll-1.4.tar.gz
+DISTFILES=	voice_tll_di-2.0.tar.gz
 
 MAINTAINER=	proff@iq.org
 HOMEPAGE=	http://cslu.cse.ogi.edu/tts
 
-DEPENDS+=	festival-1.3.1:../festival \
-		festlex-ogi-1.4:../festlex-ogi
+DEPENDS+=	festival-1.4.0:../festival \
+		festlex-ogi-2.0:../festlex-ogi
 
 LICENSE=	no-commercial-use