From d78b391acd41ff94234f100c3b1870e03bd2d7c1 Mon Sep 17 00:00:00 2001
From: "Reece H. Dunn" <msclrhd@gmail.com>
Date: Thu, 7 Mar 2013 00:58:10 +0000
Subject: [PATCH] 1.46.42 (from http://espeak.sourceforge.net/test/latest.html)

---
 .gitignore                                     |  1 +
 espeak-data/voices/{test => europe}/lt         |  0
 platforms/windows/espeakedit/src/speech.h      |  2 +-
 platforms/windows/espeakedit/src_copy/speech.h |  2 +-
 platforms/windows/make_espeak.iss              | 10 +---------
 5 files changed, 4 insertions(+), 11 deletions(-)
 rename espeak-data/voices/{test => europe}/lt (100%)

diff --git a/.gitignore b/.gitignore
index 857b9771..08199e85 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,6 +21,7 @@ praat-mod/
 ChangeLog.txt
 License.txt
 ReadMe
+Makefile
 
 # espeak-data
 
diff --git a/espeak-data/voices/test/lt b/espeak-data/voices/europe/lt
similarity index 100%
rename from espeak-data/voices/test/lt
rename to espeak-data/voices/europe/lt
diff --git a/platforms/windows/espeakedit/src/speech.h b/platforms/windows/espeakedit/src/speech.h
index 9b2aae5c..0ac7b3b2 100644
--- a/platforms/windows/espeakedit/src/speech.h
+++ b/platforms/windows/espeakedit/src/speech.h
@@ -35,7 +35,7 @@
 #define mkdir(p1,p2) mkdir(p1)
 
 #define PATHSEP  '\\'
-//#define USE_PORTAUDIO
+#define USE_PORTAUDIO
 //#define USE_NANOSLEEP
 #define NO_VARIADIC_MACROS
 #define __cdecl 
diff --git a/platforms/windows/espeakedit/src_copy/speech.h b/platforms/windows/espeakedit/src_copy/speech.h
index 9b2aae5c..0ac7b3b2 100644
--- a/platforms/windows/espeakedit/src_copy/speech.h
+++ b/platforms/windows/espeakedit/src_copy/speech.h
@@ -35,7 +35,7 @@
 #define mkdir(p1,p2) mkdir(p1)
 
 #define PATHSEP  '\\'
-//#define USE_PORTAUDIO
+#define USE_PORTAUDIO
 //#define USE_NANOSLEEP
 #define NO_VARIADIC_MACROS
 #define __cdecl 
diff --git a/platforms/windows/make_espeak.iss b/platforms/windows/make_espeak.iss
index 53bc3866..24368b09 100644
--- a/platforms/windows/make_espeak.iss
+++ b/platforms/windows/make_espeak.iss
@@ -2,7 +2,7 @@
 
 [Setup]
 AppName=eSpeak
-AppVerName=eSpeak version 1.46.42
+AppVerName=eSpeak version 1.46.31
 AppCopyright=Licensed under GNU General Public License version 3.   (See file License.txt for details).
 WindowVisible=yes
 
@@ -18,11 +18,6 @@ Name: "{group}\TTSApp"; Filename: "{app}\TTSApp.exe"; WorkingDir: "{app}"
 
 [InstallDelete]
 Type: files; Name: "{app}\espeak.dll"
-Type: files; Name: "{app}\espeak-data\voices\*"
-Type: filesandordirs; Name: "{app}\espeak-data\voices\en"
-Type: filesandordirs; Name: "{app}\espeak-data\voices\asia"
-Type: filesandordirs; Name: "{app}\espeak-data\voices\europe"
-Type: filesandordirs; Name: "{app}\espeak-data\voices\other"
 Type: filesandordirs; Name: "{app}\espeak-data\voices\test"
 Type: filesandordirs; Name: "{app}\docs"
 
@@ -166,7 +161,6 @@ begin
   $41: Result := 'sw';
   //$44: Result := 'tt';
   $49: Result := 'ta';
-  $46: Result := 'pa';
   $4b: Result := 'kn';
   //$50: Result := 'mn';
   $52: Result := 'cy';
@@ -214,7 +208,6 @@ begin
   'an': value := $40a;   // Aragon, use code for Spanish
   'az': value := $42c;
   'bg': value := $402;
-  'bn': value := $445;
   'bs': value := $41a;   // should be $141a but Jaws crashes on startup
   'ca': value := $403;
   'cs': value := $405;
@@ -254,7 +247,6 @@ begin
   'ne': value := $461;
   'nl': value := $413;
   'no': value := $414;
-  'pa': value := $446;
   'pl': value := $415;
   'pt': value := $416;
   'ro': value := $418;