From fb6bd384ee998e141c29ae212aa1d3e6978b9295 Mon Sep 17 00:00:00 2001
From: "Reece H. Dunn" <msclrhd@gmail.com>
Date: Tue, 31 Jan 2017 21:29:38 +0000
Subject: [PATCH] ipa: b (vcd blb stp).

---
 phsource/ph_ipa   | 38 +++++++++++++++++++++++++++++++++++++-
 phsource/phonemes | 36 +-----------------------------------
 2 files changed, 38 insertions(+), 36 deletions(-)

diff --git a/phsource/ph_ipa b/phsource/ph_ipa
index 06618550..1de57e96 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 | d_d | t   | d   |     |     |     |     |     |     |     | J\  |     | g   |     |     |     |     |     |     |
+// | stp     |     | b   |     |     | t_d | d_d | t   | d   |     |     |     |     |     |     |     | J\  |     | g   |     |     |     |     |     |     |
 // | sib afr |     |     |     |     |     |     |     |     |     | dZ) |     |     | dz\)|     |     |     |     |     |     |     |     |     |     |     |
 // | afr     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |
 // | lat afr |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |
@@ -184,6 +184,42 @@ endphoneme
 
 // stop
 
+phoneme b
+  vcd blb stp
+  Vowelout f1=2  f2=1000 -500 -300  f3=-300 80 brk
+  lengthmod 5
+
+  IF PreVoicing THEN
+    FMT(b/xb)
+  ENDIF
+
+  IF KlattSynth THEN
+    Vowelin f1=1  f2=1000 -500 -300  f3=-300 80
+    IF nextPh(isPause2) THEN
+      FMT(klatt/b)  addWav(x/b_)
+    ENDIF
+    FMT(klatt/b) addWav(x/b)
+  ENDIF
+
+  IF nextPh(isPause2) THEN
+    FMT(b/b_) addWav(x/b_)
+  ELIF nextPh(#@) THEN
+    FMT(b/b@) addWav(x/b)
+  ELIF nextPh(#a) THEN
+    FMT(b/ba) addWav(x/b)
+  ELIF nextPh(#e) THEN
+    FMT(b/be) addWav(x/b)
+  ELIF nextPh(#i) THEN
+    FMT(b/bi) addWav(x/b)
+  ELIF nextPh(#o) THEN
+    FMT(b/bo) addWav(x/b)
+  ELIF nextPh(#u) THEN
+    FMT(b/bu) addWav(x/b)
+  ENDIF
+
+  FMT(b/b) addWav(x/b)
+endphoneme
+
 phoneme t_d
   vls dnt stp
   ipa t̪
diff --git a/phsource/phonemes b/phsource/phonemes
index 4f66ab50..ef745e24 100644
--- a/phsource/phonemes
+++ b/phsource/phonemes
@@ -753,42 +753,8 @@ endphoneme
 
 
 phoneme b
-  vcd blb stp
+  import_phoneme ipa/b
   voicingswitch p 
-  Vowelout f1=2  f2=1000 -500 -300  f3=-300 80 brk
-  lengthmod 5
-
-  IF PreVoicing THEN
-    FMT(b/xb)
-  ENDIF
-
-  IF KlattSynth THEN
-    Vowelin f1=1  f2=1000 -500 -300  f3=-300 80
-    IF nextPh(isPause2) THEN
-      FMT(klatt/b)  addWav(x/b_)
-    ENDIF
-    FMT(klatt/b) addWav(x/b)
-  ENDIF
-
-  IF nextPh(isPause2) THEN
-    FMT(b/b_) addWav(x/b_)
-  ELIF nextPh(@-) THEN
-    FMT(b/b@2) addWav(x/b)
-  ELIF nextPh(#@) THEN
-    FMT(b/b@) addWav(x/b)
-  ELIF nextPh(#a) THEN
-    FMT(b/ba) addWav(x/b)
-  ELIF nextPh(#e) THEN
-    FMT(b/be) addWav(x/b)
-  ELIF nextPh(#i) THEN
-    FMT(b/bi) addWav(x/b)
-  ELIF nextPh(#o) THEN
-    FMT(b/bo) addWav(x/b)
-  ELIF nextPh(#u) THEN
-    FMT(b/bu) addWav(x/b)
-  ENDIF
-
-  FMT(b/b) addWav(x/b)
 endphoneme
 
 phoneme d