From 39f7e7b2f6a6e802190eac6b83ff7cd9d56247a1 Mon Sep 17 00:00:00 2001
From: "Reece H. Dunn" <msclrhd@gmail.com>
Date: Tue, 31 Jan 2017 13:07:21 +0000
Subject: [PATCH] =?UTF-8?q?ipa:=20d=CC=AA=20(vcd=20dnt=20stp)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 phsource/ph_ipa   | 21 ++++++++++++++++++++-
 phsource/phonemes | 18 +-----------------
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/phsource/ph_ipa b/phsource/ph_ipa
index e8d594d2..5ba4b607 100644
--- a/phsource/ph_ipa
+++ b/phsource/ph_ipa
@@ -8,7 +8,7 @@
 // |         | vls | vcd | vls | vcd | vls | vcd | vls | vcd | vls | vcd | vls | vcd | vls | vcd | vls | vcd | vls | vcd | vls | vcd | vls | vcd | vls | vcd |
 // |---------|-----|-----|-----|-----|-----|-----|-----|-----|-----|-----|-----|-----|-----|-----|-----|-----|-----|-----|-----|-----|-----|-----|-----|-----|
 // | nas     |     | m   |     |     |     |     |     | n   |     |     |     | n`  |     |     |     | J   |     | N   |     |     |     |     |     |     |
-// | stp     |     |     |     |     | t_d |     | t   | d   |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |
+// | stp     |     |     |     |     | t_d | d_d | t   | d   |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |
 // | sib afr |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |
 // | afr     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |
 // | lat afr |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |
@@ -197,6 +197,25 @@ phoneme t_d
   WAV(ustop/t_hi, 70)
 endphoneme
 
+phoneme d_d
+  vcd dnt stp
+  lengthmod 5
+  Vowelin f1=2  f2=1500 -300 300  f3=-150 80
+  Vowelout f1=2 f2=1500 -300 300  f3=-150 80
+
+  IF PreVoicing THEN
+    FMT(d/xd)
+  ENDIF
+
+  IF nextPh(isPause2) THEN
+    FMT(d/d_)  addWav(x/d_)
+  ELIF nextPh(isRhotic) THEN
+    FMT(d/dr) addWav(x/d_dnt, 100)
+  ENDIF
+
+  FMT(d/d) addWav(x/d_dnt, 100)
+endphoneme
+
 phoneme t
   vls alv stp
   ipa t
diff --git a/phsource/phonemes b/phsource/phonemes
index b7633681..e3a2fd35 100644
--- a/phsource/phonemes
+++ b/phsource/phonemes
@@ -797,26 +797,10 @@ phoneme d
 endphoneme
 
 phoneme d[
-  vcd dnt stp
+  import_phoneme ipa/d_d
   voicingswitch t[
-  lengthmod 5
-  Vowelin f1=2  f2=1500 -300 300  f3=-150 80
-  Vowelout f1=2 f2=1500 -300 300  f3=-150 80
-
-  IF PreVoicing THEN
-    FMT(d/xd)
-  ENDIF
-
-  IF nextPh(isPause2) THEN
-    FMT(d/d_)  addWav(x/d_)
-  ELIF nextPh(r) THEN
-    FMT(d/dr) addWav(x/d_dnt, 100)
-  ENDIF
-
-  FMT(d/d) addWav(x/d_dnt, 100)
 endphoneme
 
-
 phoneme dZ // **j**udge
   vcd pla afr sib
   voicingswitch tS