From efeca3b2759fa9def17245a7af191b4ef4c234d9 Mon Sep 17 00:00:00 2001
From: "Reece H. Dunn" <msclrhd@gmail.com>
Date: Mon, 30 Jan 2017 22:11:12 +0000
Subject: [PATCH] =?UTF-8?q?ipa:=20=C5=8B=20(vcd=20vel=20nas).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/phsource/ph_ipa b/phsource/ph_ipa
index 9abdd279..f2418eb5 100644
--- a/phsource/ph_ipa
+++ b/phsource/ph_ipa
@@ -123,3 +123,38 @@ phoneme J
     FMT(n^/n^_)
   ENDIF
 endphoneme
+
+phoneme N
+  vcd vel nas
+  Vowelout f1=3 f2=2300 300 400  f3=-200 80  len=40 rms=20 brk
+  lengthmod 8 // longer than 'n'
+
+  IF KlattSynth THEN
+    Vowelin f1=0 f2=2100 50 300 f3=0 80
+    IF nextPh(isPause2) THEN
+      FMT(klatt/nn_)
+    ENDIF
+    FMT(klatt/nn)
+  ENDIF
+
+  NextVowelStarts
+    VowelStart(nn/nn@)
+    VowelStart(nn/nna)
+    VowelStart(nn/nne)
+    VowelStart(nn/nni)
+    VowelStart(nn/nno)
+    VowelStart(nn/nnu)
+  EndSwitch
+
+  IF prevPh(#i) THEN
+    VowelEnding(nn/inn, -40)
+  ENDIF
+
+  IF prevPh(isNotVowel) AND nextPhW(isLiquid) THEN
+    FMT(nn/nnj)
+  ELIF prevPh(isPause) THEN
+    FMT(nn/_nn)
+  ELIF nextPh(isNotVowel) THEN
+    FMT(nn/nn_)
+  ENDIF
+endphoneme
diff --git a/phsource/phonemes b/phsource/phonemes
index d61ef5c0..3a9de388 100644
--- a/phsource/phonemes
+++ b/phsource/phonemes
@@ -726,40 +726,8 @@ phoneme n^ // Spanish **ñ**
   import_phoneme ipa/J
 endphoneme
 
-
 phoneme N // si**ng** 
-  vcd vel nas
-  Vowelout f1=3 f2=2300 300 400  f3=-200 80  len=40 rms=20 brk
-  lengthmod 8            // longer than 'n'
-
-  IF KlattSynth THEN
-    Vowelin f1=0 f2=2100 50 300 f3=0 80
-    IF nextPh(isPause2) THEN
-      FMT(klatt/nn_)
-    ENDIF
-    FMT(klatt/nn)
-  ENDIF
-
-  NextVowelStarts
-    VowelStart(nn/nn@)
-    VowelStart(nn/nna)
-    VowelStart(nn/nne)
-    VowelStart(nn/nni)
-    VowelStart(nn/nno)
-    VowelStart(nn/nnu)
-  EndSwitch
-
-  IF prevPh(#i) THEN
-    VowelEnding(nn/inn, -40)
-  ENDIF
-
-  IF prevPh(isNotVowel) AND nextPhW(isLiquid) THEN
-    FMT(nn/nnj)
-  ELIF prevPh(isPause) THEN
-    FMT(nn/_nn)
-  ELIF nextPh(isNotVowel) THEN
-    FMT(nn/nn_)
-  ENDIF
+  import_phoneme ipa/N
 endphoneme