From efade0fc71ecf1705985af864ea34e9ff686f17b Mon Sep 17 00:00:00 2001
From: "Reece H. Dunn" <msclrhd@gmail.com>
Date: Tue, 31 Jan 2017 21:46:01 +0000
Subject: [PATCH] ipa: w (vcd ptr vel apr).

---
 phsource/ph_ipa   | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 phsource/phonemes | 35 +----------------------------------
 2 files changed, 47 insertions(+), 34 deletions(-)

diff --git a/phsource/ph_ipa b/phsource/ph_ipa
index 875830dc..118602f7 100644
--- a/phsource/ph_ipa
+++ b/phsource/ph_ipa
@@ -21,6 +21,19 @@
 // | lat flp |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |
 // | trl     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |
 
+// Other Symbols
+// =============
+//
+// |             | bld |     | alv |     | pla |     | pal |     | lbv |     | vel |     |
+// |-------------|-----|-----|-----|-----|-----|-----|-----|-----|-----|-----|-----|-----|
+// |             | vls | vcd | vls | vcd | vls | vcd | vls | vcd | vls | vcd | vls | vcd |
+// | nas         |     |     |     |     |     |     |     |     |     |     |     |     |
+// | stp         |     |     |     |     |     |     |     |     |     |     |     |     |
+// | afr         |     |     |     |     |     |     |     |     |     |     |     |     |
+// | vzd frc     |     |     |     |     |     |     |     |     |     |     |     |     |
+// | ptr apr     |     |     |     |     |     |     |     |     |     |     |     | w   |
+// | fzd lat apr |     |     |     |     |     |     |     |     |     |     |     |     |
+
 // nasal
 
 phoneme m
@@ -186,6 +199,7 @@ endphoneme
 
 phoneme b
   vcd blb stp
+  ipa b
   Vowelout f1=2  f2=1000 -500 -300  f3=-300 80 brk
   lengthmod 5
 
@@ -437,3 +451,35 @@ phoneme j
     FMT(j/j_)
   ENDIF
 endphoneme
+
+phoneme w
+  vcd ptr vel apr liquid starttype #u
+  ipa w
+  lengthmod 7
+  
+  IF nextPh(isVowel) THEN
+    NextVowelStarts
+      VowelStart(w/w@)
+      VowelStart(w/wa)
+      VowelStart(w/we)
+      VowelStart(w/wi)
+      VowelStart(w/wo)
+      VowelStart(w/wu)
+    EndSwitch
+
+    VowelEnding(w/xw, -30)
+
+    IF prevPhW(isNasal) THEN
+      FMT(w/w)
+    ELSE
+      FMT(w/_w)
+    ENDIF
+  ELSE
+    // no vowel follows
+    Vowelout len=50
+    IF prevPh(#i) THEN
+      FMT(w/iw_)
+    ENDIF
+    FMT(w/w_)
+  ENDIF
+endphoneme
diff --git a/phsource/phonemes b/phsource/phonemes
index 2b603843..d5043432 100644
--- a/phsource/phonemes
+++ b/phsource/phonemes
@@ -563,41 +563,8 @@ phoneme L   // velar L
   FMT(ll/ll)
 endphoneme
 
-
-
-
 phoneme w
-  liquid
-  lengthmod 7
-  starttype #u
-  
-  IF nextPh(isVowel) THEN
-    NextVowelStarts
-      VowelStart(w/w@)
-      VowelStart(w/wa)
-      VowelStart(w/we)
-      VowelStart(w/wi)
-      VowelStart(w/wo)
-      VowelStart(w/wu)
-    EndSwitch
-
-    VowelEnding(w/xw, -30)
-
-    IF prevPhW(isNasal) THEN
-      FMT(w/w)
-    ELSEIF prevPhW(h) THEN
-      // none,  [hw]
-    ELSE
-      FMT(w/_w)
-    ENDIF
-  ELSE
-    // no vowel follows
-    Vowelout len=50
-    IF prevPh(#i) THEN
-      FMT(w/iw_)
-    ENDIF
-    FMT(w/w_)
-  ENDIF
+  import_phoneme ipa/w
 endphoneme
 
 phoneme j // **y**es