Skip to content

Commit

Permalink
phonemeset/espeak: Disambiguate [aU@L] as [aU]+[@l], not [aU@]+[L].
Browse files Browse the repository at this point in the history
  • Loading branch information
rhdunn committed Jun 18, 2016
1 parent 0db9825 commit 938143b
Show file tree
Hide file tree
Showing 20 changed files with 39 additions and 4 deletions.
4 changes: 4 additions & 0 deletions data/phonemeset/espeak/en-029.phon
Expand Up @@ -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̩/
4 changes: 4 additions & 0 deletions data/phonemeset/espeak/en-GB-scotland.phon
Expand Up @@ -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.
8 changes: 6 additions & 2 deletions data/phonemeset/espeak/en-GB-x-rp.phon
Expand Up @@ -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.
4 changes: 4 additions & 0 deletions data/phonemeset/espeak/en-US.phon
Expand Up @@ -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.
8 changes: 6 additions & 2 deletions data/phonemeset/espeak/en.phon
Expand Up @@ -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.
1 change: 1 addition & 0 deletions tests/phonemeset/espeak/en
Expand Up @@ -71,6 +71,7 @@ aI
aI@
aU
aU@
aU@L

t_:_:
t_!
Expand Down
1 change: 1 addition & 0 deletions tests/phonemeset/espeak/en-029
Expand Up @@ -68,6 +68,7 @@ OI
aI
aU
aU@
aU@L

t_:_:
t_!
Expand Down
1 change: 1 addition & 0 deletions tests/phonemeset/espeak/en-029.espeak
Expand Up @@ -68,6 +68,7 @@ OI
aI
aU
aU@
aU@L

t
t
Expand Down
1 change: 1 addition & 0 deletions tests/phonemeset/espeak/en-029.ipa
Expand Up @@ -68,6 +68,7 @@ eɪ̯
aɪ̯
aʊ̯
aʊ̯ə̯
aʊ̯l̩

t
t
Expand Down
1 change: 1 addition & 0 deletions tests/phonemeset/espeak/en-GB-scotland
Expand Up @@ -75,6 +75,7 @@ aI2
aI@
aU
aU@
aU@L

t_:_:
t_!
Expand Down
1 change: 1 addition & 0 deletions tests/phonemeset/espeak/en-GB-scotland.espeak
Expand Up @@ -75,6 +75,7 @@ aI2
aI@
aU
aU@
aU@L

t
t
Expand Down
1 change: 1 addition & 0 deletions tests/phonemeset/espeak/en-GB-scotland.ipa
Expand Up @@ -75,6 +75,7 @@ aɪ̯
aɪ̯ə̯
aʊ̯
aʊ̯ə̯
aʊ̯l̩

t
t
Expand Down
1 change: 1 addition & 0 deletions tests/phonemeset/espeak/en-GB-x-rp
Expand Up @@ -73,6 +73,7 @@ aI
aI@
aU
aU@
aU@L

t_:_:
t_!
Expand Down
1 change: 1 addition & 0 deletions tests/phonemeset/espeak/en-GB-x-rp.espeak
Expand Up @@ -73,6 +73,7 @@ aI
aI@
aU
aU@
aU@L

t
t
Expand Down
1 change: 1 addition & 0 deletions tests/phonemeset/espeak/en-GB-x-rp.ipa
Expand Up @@ -73,6 +73,7 @@ aɪ̯
aɪ̯ə̯
aʊ̯
aʊ̯ə̯
aʊ̯l̩

t
t
Expand Down
1 change: 1 addition & 0 deletions tests/phonemeset/espeak/en-US
Expand Up @@ -77,6 +77,7 @@ aI
aI3
aU
aU@
aU@L

t_:_:
t_!
Expand Down
1 change: 1 addition & 0 deletions tests/phonemeset/espeak/en-US.espeak
Expand Up @@ -77,6 +77,7 @@ aI
aI3
aU
aU@
aU@L

t
t
Expand Down
1 change: 1 addition & 0 deletions tests/phonemeset/espeak/en-US.ipa
Expand Up @@ -77,6 +77,7 @@ aɪ̯
aɪ̯ɚ̯
aʊ̯
aʊ̯ə̯
aʊ̯l̩

t
t
Expand Down
1 change: 1 addition & 0 deletions tests/phonemeset/espeak/en.espeak
Expand Up @@ -71,6 +71,7 @@ aI
aI@
aU
aU@
aU@L

t
t
Expand Down
1 change: 1 addition & 0 deletions tests/phonemeset/espeak/en.ipa
Expand Up @@ -71,6 +71,7 @@ aɪ̯
aɪ̯ə̯
aʊ̯
aʊ̯ə̯
aʊ̯l̩

t
t
Expand Down

0 comments on commit 938143b

Please sign in to comment.