Revert the ipa phoneme changes.

These are causing problems with several of the voices.

Revert "ipa: n (vcd alv nas)." commit 8869c72d97.
Revert "ipa: m (vcd blb nas)." commit 581b366bb0.
Revert "ipa: ɳ (vcd rfx nas)." commit 7cc3a6c0c2.
Revert "ipa: ɲ (vcd pal nas)." commit eda7bc03d6.
Revert "ipa: ŋ (vcd vel nas)." commit efeca3b275.
Revert "ipa: document the supported pulmonic consonants in ph_ipa as an IPA chart."
       commit 675cec2fac.
Revert "ipa: ɹ (vcd alv apr)." commit 0f41dae8e9.
Revert "ipa: t (vls alv stp)." commit a49729cd70.
Revert "ipa: ensure that each phoneme has an ipa annotation."
       commit 3cdb952ea3.
Revert "ipa: t̪ (vls dnt stp)." commit dd30a61186.
Revert "ipa: d (vcd alv stp)" commit a96f748470.
Revert "ipa: d̪ (vcd dnt stp)" commit 39f7e7b2f6.
Revert "ipa: d͡ʒ (vcd pla sib afr)" commit 16be8f19bf.
Revert "ipa: d͡ʑ (vcd alp sib afr)." commit 883187cfb5.
Revert "ipa: ɟ (vcd pal stp)." commit 2e682bcdc5.
Revert "ipa: g (vcd vel stp)." commit 679b939474.
Revert "ipa: b (vcd blb stp)." commit fb6bd384ee.
Revert "ipa: j (vcd pal apr)." commit 1d36966b9f.
Revert "ipa: w (vcd ptr vel apr)." commit efade0fc71.
Revert "ipa: β (vcd blb frc)." commit 063ee44a4f.
Revert "ipa: v (vcd lbd frc)." commit 3374b13ad6.
Revert "ipa: ʋ (vcd lbd apr)." commit 0a55fe6ad4.
Revert "ipa: fix the 'Other Symbols' table."
       commit 440fb6d4bb.
Revert "ipa: ð (vcd dnt frc)." commit 6eb518ee0f.
Revert "ipa: d (vcd alv frc)." commit 0574f488c3.
Revert "ipa: ʒ (vcd pla frc)." commit 7312b1b2a2.
Revert "ipa: ʐ (vcd rfx frc)." commit dc937cf1de.
Revert "ipa: ʑ (vcd alp sib frc)." commit 8b55428ece.
Revert "ipa: ʝ (vcd pal frc)." commit 736fa69471.
Revert "ipa: ɣ (vcd vel frc)." commit 237af08312.
Revert "ipa: ʁ (vcd uvl frc)." commit 09601af6f5.
Revert "ipa: t͡ʃ (vls pla sib afr)" commit d170b0c024.
Revert "ipa: t͡ɕ (vls alp sib afr)" commit 88bdbe9256.
Revert "ipa: c (vls pal stp)" commit e836376922.
Revert "ipa: q (vls uvl stp)" commit 695a9007aa.
Revert "ipa: l (vcd alv lat apr)." commit a5e5202ca5.
Revert "ipa: ɫ (vcd alv fzd lat apr)." commit 217eceeb34.
Revert "ipa: ɭ (vcd rfx lat apr)." commit b7428eb443.
Revert "ipa: ʎ (vcd pal lat apr)." commit 74c3ff5c97.
Revert "ipa: ʟ (vcd vel lat apr)." commit 9796200f26.
Revert "ipa: p (vls blb stp)." commit 302decc882.
Revert "ipa: k (vls vel stp)." commit d4a2846837.
Revert "ipa: f (vls lbd frc)." commit 175d3c0299.
Revert "ipa: θ (vls dnt frc)." commit d2a04674e8.
Revert "ipa: s (vls alv sib frc)." commit ce810f3cd8.
Revert "ipa: ʃ (vls pla sib frc)." commit dce61376d8.
Revert "ipa: ʂ (vls rfx sib frc)." commit 1135ff1013.
Revert "ipa: zʲ (vls alv sib frc pzd)." commit d8aa055697.
Revert "ipa: sʲ (vls alv sib frc pzd)." commit e51dc6e61a.
Revert "ipa: ɕ (vls alp sib frc)." commit cc7127d26e.
Revert "ipa: ɬ (vls alv lat frc)." commit e338295e19.
Revert "ipa: ç (vls pal frc)." commit f05a32bf0f.
Revert "ipa: x (vls vel frc)." commit c88c43eecc.
Revert "ipa: χ (vls uvl frc)." commit 5cb8ce12bd.
Revert "ipa: h (vls glt frc)." commit 98355a0f47.
Revert "ipa: t͡s (vls alv sib afr)." commit dd66fe41e3.
Revert "ipa: t͡s (vls alv sib afr)." commit 2c45f60588.
Revert "ipa: d͡z (vcd alv sib afr)" commit 1cd9bf80b3.
Revert "ipa: ʍ (vls ptr vel frc)" commit 923bfdb82c.
Revert "base1: Restore the original eSpeak definitions for /l/. The ipa table versions are causing issues."
       commit 299c91aca1.

phsource/ph_albanian

@@ -255,13 +255,13 @@ endphoneme
 
 
 phoneme ts
-  import_phoneme ipa/ts\)
+  import_phoneme consonants/ts
   voicingswitch dz
 endphoneme
 
 
 phoneme dz
-  import_phoneme ipa/dz\)
+  import_phoneme consonants/dz
   voicingswitch ts
 endphoneme
 

phsource/ph_armenian

@@ -89,7 +89,7 @@ endphoneme
 
 
 phoneme ts#
-  import_phoneme ipa/ts\)
+  import_phoneme consonants/ts
 endphoneme
 
 
@@ -100,7 +100,7 @@ endphoneme
 
 
 phoneme dz
-  import_phoneme ipa/dz\)
+  import_phoneme consonants/dz
   voicingswitch ts
 endphoneme
 

phsource/ph_base2

@@ -176,7 +176,7 @@ phoneme p
 endphoneme
 
 phoneme ts
-  import_phoneme ipa/ts\)
+  import_phoneme consonants/ts
 endphoneme
 
 

phsource/ph_consonants

@@ -1,5 +1,37 @@
+
 // Extra consonants. Use (for example):
-//    import_phoneme consonants/c2
+//    import_phoneme consonants/ts
+
+phoneme ts
+  vls alv afr sib
+  voicingswitch dz
+  lengthmod 2
+  Vowelin f1=0  f2=1700 -300 300  f3=-100 80
+  Vowelout f1=0 f2=1700 -300 250  f3=-100 80  rms=20
+  IF nextPh(isPause2) THEN
+    WAV(ustop/ts_)
+  ENDIF
+  WAV(ustop/ts)
+endphoneme
+
+
+phoneme dz
+  vcd alv afr sib
+  voicingswitch ts
+  lengthmod 5
+  Vowelin f1=1  f2=1700 -300 300  f3=-100 80 len=50
+  Vowelout f1=2 f2=1700 -300 300  f3=-100 80
+
+  IF PreVoicing THEN
+    FMT(d/xd)
+  ENDIF
+
+  IF nextPh(isPause2) THEN
+    FMT(voc/z_) addWav(ustop/ts_, 60)
+  ENDIF
+  FMT(d/xdz) addWav(ustop/ts, 140)
+endphoneme
+
 
 phoneme p-  // unaspirated
   vls blb stp

phsource/ph_english

@@ -88,8 +88,23 @@ phoneme z/2    // used for 's suffix
   ChangePhoneme(z)
 endphoneme
 
+
 phoneme w#
-  import_phoneme ipa/W
+  vls glt apr  // [h]
+  ipa ʍ
+  
+  IF nextPh(isVowel) THEN
+    NextVowelStarts
+      VowelStart(w/w@)
+      VowelStart(w/wa)
+      VowelStart(w/we)
+      VowelStart(w/wi)
+      VowelStart(w/wo)
+      VowelStart(w/wu)
+    EndSwitch
+  ENDIF
+
+  WAV(h/hu, 70)
 endphoneme
 
 
@@ -99,7 +114,7 @@ phoneme n
   IF nextPh(isVelar) THEN // /n/ is velarized to /N/ when before velar stops
     ChangePhoneme(N)
   ENDIF
-  CALL ipa/n
+  CALL base1/n
 endphoneme
 
 

phsource/ph_esperanto

@@ -90,7 +90,7 @@ endphoneme
 //===========
 
 phoneme ts
-  import_phoneme ipa/ts\)
+  import_phoneme consonants/ts
 endphoneme
 
 

phsource/ph_georgian

@@ -61,7 +61,7 @@ endphoneme
 
 
 phoneme ts#
-  import_phoneme ipa/ts\)
+  import_phoneme consonants/ts
 endphoneme
 
 
@@ -85,7 +85,7 @@ endphoneme
 
 
 phoneme dz
-  import_phoneme ipa/dz\)
+  import_phoneme consonants/dz
   voicingswitch ts
 endphoneme
 

phsource/ph_german

@@ -260,7 +260,7 @@ endphoneme
 
 
 phoneme ts
-  import_phoneme ipa/ts\)
+  import_phoneme consonants/ts
 endphoneme
 
 

phsource/ph_greenlandic

@@ -95,7 +95,7 @@ endphoneme
 
 
 phoneme ts
-  import_phoneme ipa/ts\)
+  import_phoneme consonants/ts
 endphoneme
 
 

phsource/ph_hungarian

@@ -105,7 +105,7 @@ endphoneme
 
 
 phoneme dz
-  import_phoneme ipa/dz\)
+  import_phoneme consonants/dz
   voicingswitch ts
 endphoneme
 

phsource/ph_italian

@@ -231,7 +231,7 @@ Vowelin f1=0  f2=1700 -300 300  f3=-100 60 len=60
 endphoneme
 
 phoneme dz
-  import_phoneme ipa/dz\)
+  import_phoneme consonants/dz
   voicingswitch z
   lengthmod 3
 endphoneme

phsource/ph_kyrgyz

@@ -446,15 +446,8 @@ phoneme b
 endphoneme
 
 phoneme ts
-  vls alv afr sib
-  voicingswitch dZ
-  lengthmod 2
-  Vowelin f1=0  f2=1700 -300 300  f3=-100 80
-  Vowelout f1=0 f2=1700 -300 250  f3=-100 80  rms=20
-  IF nextPh(isPause2) THEN
-    WAV(ustop/ts_)
-  ENDIF
-  WAV(ustop/ts)
+  ipa ts        
+  import_phoneme consonants/ts
 endphoneme
 
 phoneme tS     // **ch**urch

phsource/ph_lithuanian

@@ -227,7 +227,7 @@ endphoneme
 
 
 phoneme ts
-  import_phoneme ipa/ts\)
+  import_phoneme consonants/ts
 endphoneme
 
 

phsource/ph_polish

@@ -163,14 +163,15 @@ endphoneme
 
 
 phoneme ts
-  import_phoneme ipa/ts\)
+  import_phoneme consonants/ts
   voicingswitch dz
 endphoneme
 
 
 phoneme dz
-  import_phoneme ipa/dz\)
+  CALL consonants/dz
   voicingswitch ts
+  ipa dʑ
 endphoneme
 
 phoneme ts;

phsource/ph_russian

@@ -147,7 +147,7 @@ endphoneme
 
 
 phoneme ts
-  import_phoneme ipa/ts\)
+  import_phoneme consonants/ts
 endphoneme