From dc937cf1de0d47c282162d73aeb82912adddd7a9 Mon Sep 17 00:00:00 2001
From: "Reece H. Dunn" <msclrhd@gmail.com>
Date: Wed, 1 Feb 2017 07:31:55 +0000
Subject: [PATCH] =?UTF-8?q?ipa:=20=CA=90=20(vcd=20rfx=20frc).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/phsource/ph_ipa b/phsource/ph_ipa
index ecf6671b..d38d4889 100644
--- a/phsource/ph_ipa
+++ b/phsource/ph_ipa
@@ -12,7 +12,7 @@
 // | sib afr |     |     |     |     |     |     |     |     |     | dZ) |     |     | dz\)|     |     |     |     |     |     |     |     |     |     |     |
 // | afr     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |
 // | lat afr |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |
-// | sib frc |     |     |     |     |     |     |     | z   |     | Z   |     |     |     |     |     |     |     |     |     |     |     |     |     |     |
+// | sib frc |     |     |     |     |     |     |     | z   |     | Z   |     | z`  |     |     |     |     |     |     |     |     |     |     |     |     |
 // | frc     |     | B   |     | v   |     | D   |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |
 // | lat frc |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |
 // | apr     |     | P   |     |     |     |     |     | r\  |     |     |     |     |     |     |     | j   |     |     |     |     |     |     |     |     |
@@ -483,6 +483,26 @@ phoneme Z
   FMT(voc/zh) addWav(vocw/zh, 130)
 endphoneme
 
+phoneme z`
+  vcd rfx sib frc
+  ipa ʐ
+  lengthmod 6
+  Vowelin  f1=0  f2=1800 -100 300  f3=-300 80
+  Vowelout f1=2  f2=1800 -100 300  f3=-300 80 brk
+
+  IF KlattSynth THEN
+    IF nextPh(isPause2) THEN
+      FMT(klatt/zh_) addWav(vocw/zh_rfx)
+    ENDIF
+    FMT(klatt/zh) addWav(vocw/zh_rfx)
+  ENDIF
+
+  IF nextPh(isPause2) THEN
+    FMT(voc/zh_) addWav(vocw/zh_rfx)
+  ENDIF
+  FMT(voc/zh) addWav(vocw/zh_rfx)
+endphoneme
+
 // approximant
 
 phoneme P
diff --git a/phsource/phonemes b/phsource/phonemes
index 875d8e8b..b6d255d0 100644
--- a/phsource/phonemes
+++ b/phsource/phonemes
@@ -765,27 +765,10 @@ phoneme Z // plea**s**ure
 endphoneme
 
 phoneme z.
-  vcd pla frc sib
-  ipa ʐ
+  import_phoneme ipa/z`
   voicingswitch s.
-  lengthmod 6
-  Vowelin  f1=0  f2=1800 -100 300  f3=-300 80
-  Vowelout f1=2  f2=1800 -100 300  f3=-300 80 brk
-
-  IF KlattSynth THEN
-    IF nextPh(isPause2) THEN
-      FMT(klatt/zh_) addWav(vocw/zh_rfx)
-    ENDIF
-    FMT(klatt/zh) addWav(vocw/zh_rfx)
-  ENDIF
-
-  IF nextPh(isPause2) THEN
-    FMT(voc/zh_) addWav(vocw/zh_rfx)
-  ENDIF
-  FMT(voc/zh) addWav(vocw/zh_rfx)
 endphoneme
 
-
 phoneme z;
   vcd alp sib frc
   ipa ʑ