From d4a284683795cb37b044d144f4e901317ea07dbf Mon Sep 17 00:00:00 2001
From: "Reece H. Dunn" <msclrhd@gmail.com>
Date: Wed, 1 Feb 2017 22:18:39 +0000
Subject: [PATCH] ipa: k (vls vel stp).

---
 phsource/ph_ipa   | 27 ++++++++++++++++++++++++++-
 phsource/phonemes | 22 +---------------------
 2 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/phsource/ph_ipa b/phsource/ph_ipa
index d2aebbe3..80638658 100644
--- a/phsource/ph_ipa
+++ b/phsource/ph_ipa
@@ -11,7 +11,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     | p   | b   |     |     | t_d | d_d | t   | d   |     |     |     |     |     |     | c   | J\  |     | g   | q   |     |     |     |     |     |
+// | stp     | p   | b   |     |     | t_d | d_d | t   | d   |     |     |     |     |     |     | c   | J\  | k   | g   | q   |     |     |     |     |     |
 // | sib afr |     |     |     |     |     |     |     |     | tS) | dZ) |     |     | ts\)| dz\)|     |     |     |     |     |     |     |     |     |     |
 // | afr     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |
 // | lat afr |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |
@@ -361,6 +361,31 @@ phoneme J\\
   FMT(dzh/dz_pzd) addWav(x/dzh, 45)
 endphoneme
 
+phoneme k
+  vls vel stp
+  ipa k
+  lengthmod 2
+  Vowelin f1=0  f2=2300 200 300  f3=-200 80
+  Vowelout f1=0 f2=2300 300 400  f3=-200 80  rms=20
+
+  IF KlattSynth THEN
+    Vowelout f1=0 f2=2300 200 300  f3=-200 80  rms=20
+  ENDIF
+
+  IF nextPh(isPause2) THEN
+    WAV(ustop/k_)
+  ELIF nextPh(isRhotic) THEN
+    WAV(ustop/kr)
+  ELIF nextPh(#i) OR nextPh(isPalatal) THEN
+    WAV(ustop/ki)
+  ELIF nextPh(l) THEN
+    WAV(ustop/kl)
+  ELIF nextPh(#@) THEN
+    WAV(ustop/k_unasp, 70)
+  ENDIF
+  WAV(ustop/k)
+endphoneme
+
 phoneme g
   vcd vel stp
   ipa ɡ
diff --git a/phsource/phonemes b/phsource/phonemes
index a05ee5b6..f3f3825d 100644
--- a/phsource/phonemes
+++ b/phsource/phonemes
@@ -700,28 +700,8 @@ phoneme c
 endphoneme
 
 phoneme k
-  vls vel stp
+  import_phoneme ipa/k
   voicingswitch g
-  lengthmod 2
-  Vowelin f1=0  f2=2300 200 300  f3=-200 80
-  Vowelout f1=0 f2=2300 300 400  f3=-200 80  rms=20
-
-  IF KlattSynth THEN
-    Vowelout f1=0 f2=2300 200 300  f3=-200 80  rms=20
-  ENDIF
-
-  IF nextPh(isPause2) THEN
-    WAV(ustop/k_)
-  ELIF nextPh(r) OR nextPh(R) OR nextPh(R2) THEN
-    WAV(ustop/kr)
-  ELIF nextPh(#i) OR nextPh(;) THEN
-    WAV(ustop/ki)
-  ELIF nextPh(l) THEN
-    WAV(ustop/kl)
-  ELIF nextPh(@-) THEN
-    WAV(ustop/k_unasp, 70)
-  ENDIF
-  WAV(ustop/k)
 endphoneme
 
 phoneme q