From 938143ba6d5c81a36f9599bd6e3fc542630b2d90 Mon Sep 17 00:00:00 2001
From: "Reece H. Dunn" <msclrhd@gmail.com>
Date: Sat, 18 Jun 2016 13:21:18 +0100
Subject: [PATCH] phonemeset/espeak: Disambiguate [aU@L] as [aU]+[@L], not
 [aU@]+[L].

---
 data/phonemeset/espeak/en-029.phon            | 4 ++++
 data/phonemeset/espeak/en-GB-scotland.phon    | 4 ++++
 data/phonemeset/espeak/en-GB-x-rp.phon        | 8 ++++++--
 data/phonemeset/espeak/en-US.phon             | 4 ++++
 data/phonemeset/espeak/en.phon                | 8 ++++++--
 tests/phonemeset/espeak/en                    | 1 +
 tests/phonemeset/espeak/en-029                | 1 +
 tests/phonemeset/espeak/en-029.espeak         | 1 +
 tests/phonemeset/espeak/en-029.ipa            | 1 +
 tests/phonemeset/espeak/en-GB-scotland        | 1 +
 tests/phonemeset/espeak/en-GB-scotland.espeak | 1 +
 tests/phonemeset/espeak/en-GB-scotland.ipa    | 1 +
 tests/phonemeset/espeak/en-GB-x-rp            | 1 +
 tests/phonemeset/espeak/en-GB-x-rp.espeak     | 1 +
 tests/phonemeset/espeak/en-GB-x-rp.ipa        | 1 +
 tests/phonemeset/espeak/en-US                 | 1 +
 tests/phonemeset/espeak/en-US.espeak          | 1 +
 tests/phonemeset/espeak/en-US.ipa             | 1 +
 tests/phonemeset/espeak/en.espeak             | 1 +
 tests/phonemeset/espeak/en.ipa                | 1 +
 20 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/data/phonemeset/espeak/en-029.phon b/data/phonemeset/espeak/en-029.phon
index 76f30abc1..56cc0cec0 100644
--- a/data/phonemeset/espeak/en-029.phon
+++ b/data/phonemeset/espeak/en-029.phon
@@ -83,3 +83,7 @@ aU	/{low,fnt,unr,vwl}{smh,bck,rnd,vwl,nsy}/ # /aʊ̯/ M[OU]TH
 # Triphthongs
 
 aU@	/{low,fnt,unr,vwl}{smh,bck,rnd,vwl,nsy}{mid,cnt,unr,vwl,nsy}/ # /aʊ̯ə̯/ H[OUR]
+
+# Disambiguation
+
+aU@L	/{low,fnt,unr,vwl}{smh,bck,rnd,vwl,nsy}{vcd,alv,lat,apr,syl}/ # /aʊ̯l̩/
diff --git a/data/phonemeset/espeak/en-GB-scotland.phon b/data/phonemeset/espeak/en-GB-scotland.phon
index 4b436214a..5235a8854 100644
--- a/data/phonemeset/espeak/en-GB-scotland.phon
+++ b/data/phonemeset/espeak/en-GB-scotland.phon
@@ -90,3 +90,7 @@ aU	/{low,fnt,unr,vwl}{smh,bck,rnd,vwl,nsy}/ # /aʊ̯/ M[OU]TH
 
 aI@	/{low,fnt,unr,vwl}{smh,fnt,unr,vwl,nsy}{mid,cnt,unr,vwl,nsy}/ # /aɪ̯ə̯/ F[IRE]
 aU@	/{low,fnt,unr,vwl}{smh,bck,rnd,vwl,nsy}{mid,cnt,unr,vwl,nsy}/ # /aʊ̯ə̯/ H[OUR]
+
+# Disambiguation
+
+aU@L	/{low,fnt,unr,vwl}{smh,bck,rnd,vwl,nsy}{vcd,alv,lat,apr,syl}/ # /aʊ̯l̩/ towel, etc.
diff --git a/data/phonemeset/espeak/en-GB-x-rp.phon b/data/phonemeset/espeak/en-GB-x-rp.phon
index 535e2254a..e18154a59 100644
--- a/data/phonemeset/espeak/en-GB-x-rp.phon
+++ b/data/phonemeset/espeak/en-GB-x-rp.phon
@@ -81,10 +81,14 @@ eI	/{umd,fnt,unr,vwl}{smh,fnt,unr,vwl,nsy}/ # /eɪ̯/ F[A]CE
 oU	/{mid,cnt,unr,vwl}{smh,bck,rnd,vwl,nsy}/ # /əʊ̯/ G[OA]T
 e@	/{lmd,fnt,unr,vwl}{mid,cnt,unr,vwl,nsy}/ # /ɛə̯/ SQU[ARE]
 OI	/{lmd,bck,rnd,vwl}{smh,fnt,unr,vwl,nsy}/ # /ɔɪ̯/ CH[OI]CE
-aI	/{low,fnt,unr,vwl}{smh,fnt,unr,vwl,nsy}/ # /aɪ̯/ PRICE
-aU	/{low,fnt,unr,vwl}{smh,bck,rnd,vwl,nsy}/ # /aʊ̯/ MOUTH
+aI	/{low,fnt,unr,vwl}{smh,fnt,unr,vwl,nsy}/ # /aɪ̯/ PR[I]CE
+aU	/{low,fnt,unr,vwl}{smh,bck,rnd,vwl,nsy}/ # /aʊ̯/ M[OU]TH
 
 # Triphthongs
 
 aI@	/{low,fnt,unr,vwl}{smh,fnt,unr,vwl,nsy}{mid,cnt,unr,vwl,nsy}/ # /aɪ̯ə̯/ F[IRE]
 aU@	/{low,fnt,unr,vwl}{smh,bck,rnd,vwl,nsy}{mid,cnt,unr,vwl,nsy}/ # /aʊ̯ə̯/ H[OUR]
+
+# Disambiguation
+
+aU@L	/{low,fnt,unr,vwl}{smh,bck,rnd,vwl,nsy}{vcd,alv,lat,apr,syl}/ # /aʊ̯l̩/ towel, etc.
diff --git a/data/phonemeset/espeak/en-US.phon b/data/phonemeset/espeak/en-US.phon
index ca3880070..4fde7ecd9 100644
--- a/data/phonemeset/espeak/en-US.phon
+++ b/data/phonemeset/espeak/en-US.phon
@@ -92,3 +92,7 @@ aU	/{low,fnt,unr,vwl}{smh,bck,rnd,vwl,nsy}/ # /aʊ̯/ M[OU]TH
 
 aI3	/{low,fnt,unr,vwl}{smh,fnt,unr,vwl,nsy}{mid,cnt,unr,vwl,rzd,nsy}/ # /aɪ̯ɚ̯/ F[IRE]
 aU@	/{low,fnt,unr,vwl}{smh,bck,rnd,vwl,nsy}{mid,cnt,unr,vwl,nsy}/ # /aʊ̯ə̯/ H[OUR]
+
+# Disambiguation
+
+aU@L	/{low,fnt,unr,vwl}{smh,bck,rnd,vwl,nsy}{vcd,alv,lat,apr,syl}/ # /aʊ̯l̩/ towel, etc.
diff --git a/data/phonemeset/espeak/en.phon b/data/phonemeset/espeak/en.phon
index abf9f6cbd..eaf28ce96 100644
--- a/data/phonemeset/espeak/en.phon
+++ b/data/phonemeset/espeak/en.phon
@@ -79,10 +79,14 @@ eI	/{umd,fnt,unr,vwl}{smh,fnt,unr,vwl,nsy}/ # /eɪ̯/ F[A]CE
 oU	/{mid,cnt,unr,vwl}{smh,bck,rnd,vwl,nsy}/ # /əʊ̯/ G[OA]T
 e@	/{lmd,fnt,unr,vwl}{mid,cnt,unr,vwl,nsy}/ # /ɛə̯/ SQU[ARE]
 OI	/{lmd,bck,rnd,vwl}{smh,fnt,unr,vwl,nsy}/ # /ɔɪ̯/ CH[OI]CE
-aI	/{low,fnt,unr,vwl}{smh,fnt,unr,vwl,nsy}/ # /aɪ̯/ PRICE
-aU	/{low,fnt,unr,vwl}{smh,bck,rnd,vwl,nsy}/ # /aʊ̯/ MOUTH
+aI	/{low,fnt,unr,vwl}{smh,fnt,unr,vwl,nsy}/ # /aɪ̯/ PR[I]CE
+aU	/{low,fnt,unr,vwl}{smh,bck,rnd,vwl,nsy}/ # /aʊ̯/ M[OU]TH
 
 # Triphthongs
 
 aI@	/{low,fnt,unr,vwl}{smh,fnt,unr,vwl,nsy}{mid,cnt,unr,vwl,nsy}/ # /aɪ̯ə̯/ F[IRE]
 aU@	/{low,fnt,unr,vwl}{smh,bck,rnd,vwl,nsy}{mid,cnt,unr,vwl,nsy}/ # /aʊ̯ə̯/ H[OUR]
+
+# Disambiguation
+
+aU@L	/{low,fnt,unr,vwl}{smh,bck,rnd,vwl,nsy}{vcd,alv,lat,apr,syl}/ # /aʊ̯l̩/ towel, etc.
diff --git a/tests/phonemeset/espeak/en b/tests/phonemeset/espeak/en
index 1b6c7fef0..3f65a8e0c 100644
--- a/tests/phonemeset/espeak/en
+++ b/tests/phonemeset/espeak/en
@@ -71,6 +71,7 @@ aI
 aI@
 aU
 aU@
+aU@L
 
 t_:_:
 t_!
diff --git a/tests/phonemeset/espeak/en-029 b/tests/phonemeset/espeak/en-029
index ae525f76f..a7cb9a149 100644
--- a/tests/phonemeset/espeak/en-029
+++ b/tests/phonemeset/espeak/en-029
@@ -68,6 +68,7 @@ OI
 aI
 aU
 aU@
+aU@L
 
 t_:_:
 t_!
diff --git a/tests/phonemeset/espeak/en-029.espeak b/tests/phonemeset/espeak/en-029.espeak
index 873b85585..a1b683614 100644
--- a/tests/phonemeset/espeak/en-029.espeak
+++ b/tests/phonemeset/espeak/en-029.espeak
@@ -68,6 +68,7 @@ OI
 aI
 aU
 aU@
+aU@L
 
 t
 t
diff --git a/tests/phonemeset/espeak/en-029.ipa b/tests/phonemeset/espeak/en-029.ipa
index a24ea79dc..1c82a32b5 100644
--- a/tests/phonemeset/espeak/en-029.ipa
+++ b/tests/phonemeset/espeak/en-029.ipa
@@ -68,6 +68,7 @@ eɪ̯
 aɪ̯
 aʊ̯
 aʊ̯ə̯
+aʊ̯l̩
 
 t
 t
diff --git a/tests/phonemeset/espeak/en-GB-scotland b/tests/phonemeset/espeak/en-GB-scotland
index 0b5d15d94..7397df976 100644
--- a/tests/phonemeset/espeak/en-GB-scotland
+++ b/tests/phonemeset/espeak/en-GB-scotland
@@ -75,6 +75,7 @@ aI2
 aI@
 aU
 aU@
+aU@L
 
 t_:_:
 t_!
diff --git a/tests/phonemeset/espeak/en-GB-scotland.espeak b/tests/phonemeset/espeak/en-GB-scotland.espeak
index 74d799b1e..ffe5f0e7e 100644
--- a/tests/phonemeset/espeak/en-GB-scotland.espeak
+++ b/tests/phonemeset/espeak/en-GB-scotland.espeak
@@ -75,6 +75,7 @@ aI2
 aI@
 aU
 aU@
+aU@L
 
 t
 t
diff --git a/tests/phonemeset/espeak/en-GB-scotland.ipa b/tests/phonemeset/espeak/en-GB-scotland.ipa
index 9a76c2f7d..41cb3b286 100644
--- a/tests/phonemeset/espeak/en-GB-scotland.ipa
+++ b/tests/phonemeset/espeak/en-GB-scotland.ipa
@@ -75,6 +75,7 @@ aɪ̯
 aɪ̯ə̯
 aʊ̯
 aʊ̯ə̯
+aʊ̯l̩
 
 t
 t
diff --git a/tests/phonemeset/espeak/en-GB-x-rp b/tests/phonemeset/espeak/en-GB-x-rp
index 9cee5148e..2470ad168 100644
--- a/tests/phonemeset/espeak/en-GB-x-rp
+++ b/tests/phonemeset/espeak/en-GB-x-rp
@@ -73,6 +73,7 @@ aI
 aI@
 aU
 aU@
+aU@L
 
 t_:_:
 t_!
diff --git a/tests/phonemeset/espeak/en-GB-x-rp.espeak b/tests/phonemeset/espeak/en-GB-x-rp.espeak
index a8b15ce44..efc8c155c 100644
--- a/tests/phonemeset/espeak/en-GB-x-rp.espeak
+++ b/tests/phonemeset/espeak/en-GB-x-rp.espeak
@@ -73,6 +73,7 @@ aI
 aI@
 aU
 aU@
+aU@L
 
 t
 t
diff --git a/tests/phonemeset/espeak/en-GB-x-rp.ipa b/tests/phonemeset/espeak/en-GB-x-rp.ipa
index ba6a30ac9..019f93b57 100644
--- a/tests/phonemeset/espeak/en-GB-x-rp.ipa
+++ b/tests/phonemeset/espeak/en-GB-x-rp.ipa
@@ -73,6 +73,7 @@ aɪ̯
 aɪ̯ə̯
 aʊ̯
 aʊ̯ə̯
+aʊ̯l̩
 
 t
 t
diff --git a/tests/phonemeset/espeak/en-US b/tests/phonemeset/espeak/en-US
index 2edc13a29..2fff4d876 100644
--- a/tests/phonemeset/espeak/en-US
+++ b/tests/phonemeset/espeak/en-US
@@ -77,6 +77,7 @@ aI
 aI3
 aU
 aU@
+aU@L
 
 t_:_:
 t_!
diff --git a/tests/phonemeset/espeak/en-US.espeak b/tests/phonemeset/espeak/en-US.espeak
index 7509842a0..86cec0f8f 100644
--- a/tests/phonemeset/espeak/en-US.espeak
+++ b/tests/phonemeset/espeak/en-US.espeak
@@ -77,6 +77,7 @@ aI
 aI3
 aU
 aU@
+aU@L
 
 t
 t
diff --git a/tests/phonemeset/espeak/en-US.ipa b/tests/phonemeset/espeak/en-US.ipa
index 3600e674b..2334874b2 100644
--- a/tests/phonemeset/espeak/en-US.ipa
+++ b/tests/phonemeset/espeak/en-US.ipa
@@ -77,6 +77,7 @@ aɪ̯
 aɪ̯ɚ̯
 aʊ̯
 aʊ̯ə̯
+aʊ̯l̩
 
 t
 t
diff --git a/tests/phonemeset/espeak/en.espeak b/tests/phonemeset/espeak/en.espeak
index f936599a1..f8d89ad68 100644
--- a/tests/phonemeset/espeak/en.espeak
+++ b/tests/phonemeset/espeak/en.espeak
@@ -71,6 +71,7 @@ aI
 aI@
 aU
 aU@
+aU@L
 
 t
 t
diff --git a/tests/phonemeset/espeak/en.ipa b/tests/phonemeset/espeak/en.ipa
index 14ccddc8b..aeb38aaed 100644
--- a/tests/phonemeset/espeak/en.ipa
+++ b/tests/phonemeset/espeak/en.ipa
@@ -71,6 +71,7 @@ aɪ̯
 aɪ̯ə̯
 aʊ̯
 aʊ̯ə̯
+aʊ̯l̩
 
 t
 t