From 0415c46a8f1d855d2ec0666efd8c7f672cf81e6e Mon Sep 17 00:00:00 2001 From: "Reece H. Dunn" Date: Sat, 28 Jan 2017 19:56:52 +0000 Subject: [PATCH] Replace 'nonsyllabic' with 'nsy'. --- phsource/ph_croatian | 2 +- phsource/ph_danish | 2 +- phsource/ph_russian | 2 +- phsource/phonemes | 2 +- src/libespeak-ng/compiledata.c | 1 - 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/phsource/ph_croatian b/phsource/ph_croatian index 60d72f79..e3c7ee1d 100644 --- a/phsource/ph_croatian +++ b/phsource/ph_croatian @@ -236,7 +236,7 @@ endphoneme phoneme r* - vwl nonsyllabic + vwl nsy unstressed ipa NULL length 50 diff --git a/phsource/ph_danish b/phsource/ph_danish index 72d65cf4..50594191 100644 --- a/phsource/ph_danish +++ b/phsource/ph_danish @@ -432,7 +432,7 @@ endphoneme phoneme @- // very short schwa vwl starttype #@ endtype #@ - unstressed nonsyllabic + unstressed nsy ipa ə IF nextPhW(*) OR nextPhW(r) THEN ipa NULL // @-* is used to make 'r' diff --git a/phsource/ph_russian b/phsource/ph_russian index 47f78f69..b9816fc3 100644 --- a/phsource/ph_russian +++ b/phsource/ph_russian @@ -237,7 +237,7 @@ endphoneme phoneme I^ // "silent i", palatilizes the preceding consonant vwl starttype #i endtype #i - unstressed nonsyllabic + unstressed nsy length 70 IF nextPh(isVowel) THEN ChangePhoneme(;) diff --git a/phsource/phonemes b/phsource/phonemes index d253e288..3ea7170c 100644 --- a/phsource/phonemes +++ b/phsource/phonemes @@ -146,7 +146,7 @@ endphoneme phoneme @- // very short schwa vwl starttype #@ endtype #@ - unstressed nonsyllabic + unstressed nsy ipa ə IF nextPhW(*) OR nextPhW(r) THEN diff --git a/src/libespeak-ng/compiledata.c b/src/libespeak-ng/compiledata.c index 2d3a31e6..eb6cc6d2 100644 --- a/src/libespeak-ng/compiledata.c +++ b/src/libespeak-ng/compiledata.c @@ -282,7 +282,6 @@ static keywtab_t keywords[] = { { "nolink", tPHONEME_FLAG, phNOLINK }, { "brkafter", tPHONEME_FLAG, phBRKAFTER }, { "rhotic", tPHONEME_FLAG, phRHOTIC }, - { "nonsyllabic", tPHONEME_FLAG, phNONSYLLABIC }, // TODO (deprecated): use 'nsy' instead { "lengthenstop", tPHONEME_FLAG, phLENGTHENSTOP }, { "nopause", tPHONEME_FLAG, phNOPAUSE }, { "prevoice", tPHONEME_FLAG, phPREVOICE },