Use base1 as the base phonemetable, not 'base'.

This is a step in the transition to using a common IPA-based
phoneme table for the pronunciations. It allows the base phonemes
to import the IPA versions during this transition phase.

phsource/ph_albanian

@@ -206,7 +206,7 @@ endphoneme
 phoneme w
   liquid
   lengthmod 7
-  CALL base/w
+  CALL base1/w
   FMT(w/w2)
 endphoneme
 
@@ -249,7 +249,7 @@ endphoneme
 
 
 phoneme t
-  import_phoneme base/t[
+  import_phoneme base1/t[
   voicingswitch d
 endphoneme
 
@@ -298,7 +298,7 @@ endphoneme
 
 
 phoneme c   // This is [tS;]
-  import_phoneme base/tS;
+  import_phoneme base1/tS;
   voicingswitch dZ;
 endphoneme
 

phsource/ph_amhari

@@ -68,7 +68,7 @@ endphoneme
 
 
 phoneme r
-  import_phoneme base/R2
+  import_phoneme base1/R2
 endphoneme
 
 
@@ -87,7 +87,7 @@ phoneme b
   IF prevPhW(isVowel) AND nextPhW(isVowel) THEN
     ChangePhoneme(B)
   ENDIF
-  CALL base/b
+  CALL base1/b
 endphoneme
 
 
@@ -132,6 +132,6 @@ phoneme x
   IF prevPhW(#i) THEN
     ChangePhoneme(C)
   ELSE
-    CALL base/x
+    CALL base1/x
   ENDIF
 endphoneme

phsource/ph_armenian

@@ -84,7 +84,7 @@ endphoneme
 
 
 phoneme t#
-  import_phoneme base/t
+  import_phoneme base1/t
 endphoneme
 
 
@@ -95,7 +95,7 @@ endphoneme
 
 phoneme k#
   import_phoneme consonants/kh
-//  import_phoneme base/k
+//  import_phoneme base1/k
 endphoneme
 
 
@@ -111,7 +111,7 @@ endphoneme
 
 
 phoneme t
-  import_phoneme base/t[
+  import_phoneme base1/t[
 endphoneme
 
 
@@ -137,7 +137,7 @@ phoneme tS
 endphoneme
 
 phoneme tS#
-  import_phoneme base/tS
+  import_phoneme base1/tS
 endphoneme
 
 phoneme k
@@ -146,7 +146,7 @@ endphoneme
 
 
 phoneme Q
-  import_phoneme base/Q"
+  import_phoneme base1/Q"
 endphoneme
 
 

phsource/ph_assamese

@@ -79,12 +79,12 @@ endphoneme
 
 
 phoneme tS
-  import_phoneme base/tS
+  import_phoneme base1/tS
 endphoneme
 
 
 phoneme tS#
-  import_phoneme base/tS
+  import_phoneme base1/tS
 endphoneme
 
 

phsource/ph_base2

@@ -152,7 +152,7 @@ phoneme w2
   liquid
   lengthmod 7
 
-  CALL base/w
+  CALL base1/w
   IF nextPh(isVowel) THEN
     FMT(w/w2)   // longer [w]
   ENDIF

phsource/ph_basque

@@ -121,7 +121,7 @@ phoneme r
     ChangePhoneme(**)
   ENDIF
 
-  CALL base/*
+  CALL base1/*
 endphoneme
 
 
@@ -145,13 +145,13 @@ phoneme n
     ChangePhoneme(n^)
   ENDIF
   
-  CALL base/n
+  CALL base1/n
 endphoneme
 
 phoneme n2  // doesn't palatalise, used for exceptions
   vcd alv nas
   lengthmod 4
-  CALL base/n
+  CALL base1/n
 endphoneme
 
 phoneme l
@@ -159,9 +159,9 @@ phoneme l
   IF prevPhW(#i) AND nextPhW(isVowel) THEN
     ChangePhoneme(l^)
   ENDIF
-  CALL base/l
+  CALL base1/l
 endphoneme
 phoneme l2 // same as n2
   liquid
-  CALL base/l
+  CALL base1/l
 endphoneme

phsource/ph_bulgarian

@@ -72,16 +72,16 @@ phoneme l
 endphoneme
 
 phoneme L   // velar L
-  import_phoneme base/L
+  import_phoneme base1/L
 endphoneme
 
 
 phoneme r
-  import_phoneme base/R2
+  import_phoneme base1/R2
 endphoneme
 
 phoneme x
-  import_phoneme base/x
+  import_phoneme base1/x
   voicingswitch x   // [x] doesn't switch to [Q]
 endphoneme
 

phsource/ph_burmese

@@ -425,7 +425,7 @@ endphoneme
 
 phoneme m
   //vcd blb nas
-  import_phoneme base/m
+  import_phoneme base1/m
 endphoneme
 
 phoneme nh
@@ -434,7 +434,7 @@ endphoneme
 
 phoneme n
   //vcd alv nas
-  import_phoneme base/n
+  import_phoneme base1/n
 endphoneme
 
 phoneme ɲh
@@ -443,7 +443,7 @@ endphoneme
 
 phoneme ɲ
   //vcd pal nasal pzd
-  import_phoneme base/n^
+  import_phoneme base1/n^
 endphoneme
 
 phoneme ŋh
@@ -452,7 +452,7 @@ endphoneme
 
 phoneme ŋ
   //vcd vel nas
-  import_phoneme base/N
+  import_phoneme base1/N
 endphoneme
 
 //phoneme ɴ
@@ -461,42 +461,42 @@ endphoneme
 
 phoneme p
   //vls blb stp
-  import_phoneme base/b
+  import_phoneme base1/b
 endphoneme
 
 phoneme b
   //vcd blb stp
-  import_phoneme base/b
+  import_phoneme base1/b
 endphoneme
 
 phoneme ph //aspirated
   //vls blb stp
-  import_phoneme base/p
+  import_phoneme base1/p
 endphoneme
 
 phoneme t
   //vls alv stp
-  import_phoneme base/d
+  import_phoneme base1/d
 endphoneme
 
 phoneme d
   //vcd alv stp
-  import_phoneme base/d
+  import_phoneme base1/d
 endphoneme
 
 phoneme th
   //vls alv stp
-  import_phoneme base/t
+  import_phoneme base1/t
 endphoneme
 
 phoneme tɕ
   //vls pla afr sib
-  import_phoneme base/tS
+  import_phoneme base1/tS
 endphoneme
 
 phoneme dʑ
   //vcd pla afr sib
-  import_phoneme base/dZ
+  import_phoneme base1/dZ
 endphoneme
 
 phoneme tɕh
@@ -506,17 +506,17 @@ endphoneme
 
 phoneme k
   //vls vel stp
-  import_phoneme base/k
+  import_phoneme base1/k
 endphoneme
 
 phoneme g
   //vcd vel stp
-  import_phoneme base/g
+  import_phoneme base1/g
 endphoneme
 
 phoneme kh
   //vls vel stp
-  import_phoneme base/k
+  import_phoneme base1/k
 endphoneme
 
 phoneme ʔ
@@ -525,22 +525,22 @@ endphoneme
 
 phoneme θ
   //vls dnt frc
-  import_phoneme base/T
+  import_phoneme base1/T
 endphoneme
 
 phoneme ð
   //vcd dnt frc
-  import_phoneme base/D
+  import_phoneme base1/D
 endphoneme
 
 phoneme s
   //vls alv frc sib
-  import_phoneme base/s
+  import_phoneme base1/s
 endphoneme
 
 phoneme z
   //vcd alv frc sib
-  import_phoneme base/z
+  import_phoneme base1/z
 endphoneme
 
 phoneme sh //aspirated not pzd
@@ -549,7 +549,7 @@ endphoneme
 
 phoneme ʃ
   //vls pla frc sib
-  import_phoneme base/S
+  import_phoneme base1/S
 endphoneme
 
 phoneme h
@@ -578,6 +578,6 @@ endphoneme
 
 phoneme l
   //vcd alv liquid
-  import_phoneme base/l  
+  import_phoneme base1/l  
 endphoneme
 

phsource/ph_croatian

@@ -231,7 +231,7 @@ endphoneme
 
 
 phoneme R
-  import_phoneme base/R
+  import_phoneme base1/R
 endphoneme
 
 

phsource/ph_danish

@@ -809,7 +809,7 @@ IF nextPhW(l) THEN
 //    ChangePhoneme(NULL)
 ENDIF
   ChangePhoneme(l/3)
-//  CALL base/l
+//  CALL base1/l
 endphoneme
 
 phoneme l/3    // Replacement for [l/]
@@ -820,7 +820,7 @@ phoneme l/3    // Replacement for [l/]
 endphoneme
 
 phoneme v        // approximant, not fricative
-  import_phoneme base/v#
+  import_phoneme base1/v#
   voicingswitch f
 endphoneme
 

phsource/ph_divehi

@@ -90,6 +90,6 @@ endphoneme
 
 // ?? This is standard [v].  Should be it [v] without the fricative noise?
 phoneme v
-  import_phoneme base/v
+  import_phoneme base1/v
 endphoneme
 

phsource/ph_dutch

@@ -179,7 +179,7 @@ endphoneme
 
 
 phoneme r
-  import_phoneme base/R2
+  import_phoneme base1/R2
 endphoneme
 
 
@@ -239,7 +239,7 @@ phoneme d
   IF prevPh(!) THEN  // previous was [t] or [d], now assimilated
     ChangePhoneme(t)
   ENDIF
-  CALL base/d
+  CALL base1/d
 endphoneme
 
 phoneme p
@@ -261,7 +261,7 @@ phoneme b
   IF prevPh(!) THEN  // previous was [p] or [b], now assimilated
     ChangePhoneme(p)
   ENDIF
-  CALL base/b
+  CALL base1/b
 endphoneme
 
 phoneme s
@@ -270,7 +270,7 @@ phoneme s
       ChangePhoneme(!)
     ENDIF
   ENDIF
-  CALL base/s
+  CALL base1/s
 endphoneme
 
 phoneme z
@@ -283,7 +283,7 @@ phoneme z
   IF prevPh(!) THEN  // previous was [s] or [z], now assimilated
     ChangePhoneme(s)
   ENDIF
-  CALL base/z
+  CALL base1/z
 endphoneme
 
 

phsource/ph_english

@@ -44,7 +44,7 @@ phoneme l      // use dark [l/2] before not-vowel
     ENDIF
   ENDIF
 
-  CALL base/l
+  CALL base1/l
 endphoneme
 
 

phsource/ph_english_n

@@ -3,7 +3,7 @@ phoneme N
   vcd vel nas
   lengthmod 8            // longer than 'n'
   IfNextVowelAppend(g)
-  CALL base/N
+  CALL base1/N
 endphoneme
 
 

phsource/ph_english_sc

@@ -403,7 +403,7 @@ phoneme r
   IF nextPh(isNotVowel) THEN
     ChangePhoneme(r/)
   ENDIF
-  CALL base/r
+  CALL base1/r
   ipa r
 endphoneme
 

phsource/ph_english_us

@@ -450,7 +450,7 @@ endphoneme
 
 
 phoneme t2   // [t] which doesn't reduce
-  import_phoneme  base/t
+  import_phoneme  base1/t
 endphoneme
 
 phoneme ?  // glottal stp

phsource/ph_english_wi

@@ -225,6 +225,6 @@ endphoneme
 
 
 phoneme l
-  import_phoneme base/l   // use clear [l] before not-vowel
+  import_phoneme base1/l   // use clear [l] before not-vowel
 endphoneme
 

phsource/ph_english_wm

@@ -3,7 +3,7 @@ phoneme N
   vcd vel nas
   lengthmod 8            // longer than 'n'
   IfNextVowelAppend(g)
-  CALL base/N
+  CALL base1/N
 endphoneme
 
 

phsource/ph_finnish

@@ -238,7 +238,7 @@ endphoneme
 
 
 phoneme r
-  import_phoneme base/R
+  import_phoneme base1/R
 endphoneme
 
 
@@ -268,7 +268,7 @@ endphoneme
 
 
 phoneme t        // dental variant of /t/
-  import_phoneme base/t[
+  import_phoneme base1/t[
   voicingswitch d
 endphoneme
 

phsource/ph_french

@@ -913,7 +913,7 @@ phoneme v
   Vowelout f1=0  f2=1000 -500 -300  f3=-300 100
 
   IF KlattSynth THEN
-    CALL base/v
+    CALL base1/v
     RETURN
   ENDIF
 

phsource/ph_georgian

@@ -56,7 +56,7 @@ endphoneme
 
 
 phoneme t#
-  import_phoneme base/t
+  import_phoneme base1/t
 endphoneme
 
 
@@ -141,6 +141,6 @@ endphoneme
 
 
 phoneme r
-  import_phoneme base/R
+  import_phoneme base1/R
 endphoneme
 

phsource/ph_german

@@ -324,7 +324,7 @@ phoneme j
     VowelEnding(j/xj, -30)
 
     IF prevPh(isPause) THEN
-      FMT(j/_j_short)          // difference from base/j
+      FMT(j/_j_short)          // difference from base1/j
     ENDIF
   ELSE
     // no vowel follows
@@ -359,7 +359,7 @@ phoneme r   // note, following consonant must be 'ustop/t_' not 'ustop/tr' etc.
       ChangePhoneme(NULL)   // 'r' is already included in the previous vowel
   ENDIF
 
-  CALL base/*
+  CALL base1/*
 endphoneme
 
 
@@ -406,7 +406,7 @@ phoneme b
   IF nextPh(l2) THEN
     ChangePhoneme(p)
   ENDIF
-  CALL base/b
+  CALL base1/b
 endphoneme
 
 phoneme d
@@ -438,5 +438,5 @@ phoneme g
   IF nextPh(l2) THEN
     ChangePhoneme(k)
   ENDIF
-  CALL base/g
+  CALL base1/g
 endphoneme

phsource/ph_greek

@@ -61,7 +61,7 @@ endphoneme
 
 
 phoneme d         // revert to alveolar /d/
-  import_phoneme base/d
+  import_phoneme base1/d
   voicingswitch t
 endphoneme
 
@@ -85,6 +85,6 @@ endphoneme
 
 
 phoneme r
-  import_phoneme base/R3
+  import_phoneme base1/R3
 endphoneme
 

phsource/ph_greenlandic

@@ -80,7 +80,7 @@ endphoneme
 // consonants
 
 phoneme r
-  import_phoneme base/r"
+  import_phoneme base1/r"
 endphoneme
 
 

phsource/ph_guarani

@@ -97,7 +97,7 @@ phoneme b
     ENDIF
   ENDIF
 
-  CALL base/b
+  CALL base1/b
 endphoneme
 
 phoneme r
@@ -110,7 +110,7 @@ phoneme r
     ChangePhoneme(**)
   ENDIF
 
-  CALL base/*
+  CALL base1/*
 endphoneme
 
 phoneme g

phsource/ph_hindi_base

@@ -287,13 +287,13 @@ endphoneme
 //===========
 
 phoneme v        // approximant, not fricative
-  import_phoneme base/v#
+  import_phoneme base1/v#
   voicingswitch f
 endphoneme
 
 
 phoneme H       // use for full "h"
-  import_phoneme base/h
+  import_phoneme base1/h
 endphoneme
 
 
@@ -312,7 +312,7 @@ endphoneme
 
 
 phoneme  b       // this is [b]
-  import_phoneme base/b
+  import_phoneme base1/b
 endphoneme
 
 
@@ -337,7 +337,7 @@ endphoneme
 //==================
 
 phoneme t        // dental variant of /t/
-  import_phoneme base/t[
+  import_phoneme base1/t[
   voicingswitch d
 endphoneme
 
@@ -356,7 +356,7 @@ endphoneme
 
 
 phoneme d       // dental variant of /d/
-  import_phoneme base/d[
+  import_phoneme base1/d[
   voicingswitch t
 endphoneme
 
@@ -464,13 +464,13 @@ endphoneme
 
 
 phoneme c#
-  CALL base/tS;
+  CALL base1/tS;
   ipa cU+02B0
 endphoneme
 
 
 phoneme J
-  import_phoneme base/J
+  import_phoneme base1/J
 endphoneme
 
 
@@ -508,7 +508,7 @@ endphoneme
 
 
 phoneme g
-  import_phoneme base/g
+  import_phoneme base1/g
   voicingswitch k
 endphoneme
 
@@ -544,7 +544,7 @@ phoneme r
   lengthmod 3
   
   IF thisPh(isWordEnd) THEN
-    CALL base/r/
+    CALL base1/r/
   ELSE
     IF prevPhW(isVowel) THEN
       IF nextPhW(isNotVowel) THEN
@@ -564,7 +564,7 @@ phoneme r
       ENDIF
     ENDIF
     
-    CALL base/r
+    CALL base1/r
   ENDIF
   ipa ɾ
 endphoneme

phsource/ph_icelandic

@@ -338,7 +338,7 @@ endphoneme
 
 
 phoneme v        // no fricative noise
-  import_phoneme base/v#
+  import_phoneme base1/v#
   voicingswitch f
 endphoneme
 

phsource/ph_indonesian

@@ -143,7 +143,7 @@ endphoneme
 
 
 phoneme d   // English [d]
-  import_phoneme base/d
+  import_phoneme base1/d
   voicingswitch t
 endphoneme
 

phsource/ph_italian

@@ -192,7 +192,7 @@ phoneme l
 endphoneme
 
 phoneme l^
-  import_phoneme base/l^
+  import_phoneme base1/l^
   length 130
 endphoneme
 

phsource/ph_kannada

@@ -99,12 +99,12 @@ endphoneme
 
 // ?? This is standard [v].  Should be it [v] without the fricative noise?
 phoneme v
-  import_phoneme base/v
+  import_phoneme base1/v
 endphoneme
 
 
 phoneme r
-  import_phoneme base/r
+  import_phoneme base1/r
 endphoneme
 
 

phsource/ph_kazakh

@@ -104,7 +104,7 @@ endphoneme
 
 
 phoneme r
-  import_phoneme base/R2
+  import_phoneme base1/R2
 endphoneme
 
 phoneme t
@@ -112,7 +112,7 @@ phoneme t
 endphoneme
 
 phoneme G
-  import_phoneme base/r"
+  import_phoneme base1/r"
 endphoneme
 
 phoneme X
@@ -126,7 +126,7 @@ endphoneme
 
 phoneme L
   import_phoneme sq/ll
-//  import_phoneme base/l-
+//  import_phoneme base1/l-
 endphoneme
 
 phoneme l
@@ -135,5 +135,5 @@ phoneme l
   ELSE
     ChangePhoneme(L)  // Hard
   ENDIF
-  CALL base/l
+  CALL base1/l
 endphoneme

phsource/ph_korean

@@ -96,19 +96,19 @@ phoneme dZ; //  voiced /ㅈ/
 endphoneme
 
 phoneme s-
-  import_phoneme base/s        // temporary
+  import_phoneme base1/s        // temporary
 endphoneme
 
 phoneme q-
-  import_phoneme base/q        // temporary
+  import_phoneme base1/q        // temporary
 endphoneme
 
 phoneme tS;-
-  import_phoneme base/tS;      // temporary
+  import_phoneme base1/tS;      // temporary
 endphoneme
 
 phoneme d-
-  import_phoneme base/d
+  import_phoneme base1/d
 endphoneme
 
 // phoneme tSh; ?? changed to [tS;h] in ko_rules

phsource/ph_malayalam

@@ -128,19 +128,19 @@ endphoneme
 
 // ?? This is standard [v].  Should be it [v] without the fricative noise?
 phoneme v
-  import_phoneme base/v
+  import_phoneme base1/v
 endphoneme
 
 phoneme r
-  import_phoneme base/**
+  import_phoneme base1/**
 endphoneme
 
 phoneme R
-  import_phoneme base/R2
+  import_phoneme base1/R2
 endphoneme
 
 phoneme d2   // 'rr' sounds like English 'd'
-  import_phoneme base/d
+  import_phoneme base1/d
 endphoneme
 
 
@@ -287,7 +287,7 @@ phoneme p
   voicingswitch b
 
   IF thisPh(isWordStart) THEN
-      CALL base/p
+      CALL base1/p
   ELIF thisPh(isWordEnd) AND NOT thisPh(isFirstVowel) THEN
       ChangePhoneme(b)
   ENDIF
@@ -295,11 +295,11 @@ endphoneme
 
 
 phoneme t 
-  import_phoneme base/t[
+  import_phoneme base1/t[
   voicingswitch d
 
   IF thisPh(isWordStart) THEN
-      CALL base/t
+      CALL base1/t
   ELIF thisPh(isWordEnd) AND NOT thisPh(isFirstVowel) THEN
       ChangePhoneme(d)
   ENDIF
@@ -311,7 +311,7 @@ phoneme k
   voicingswitch g
 
   IF thisPh(isWordStart) THEN
-      CALL base/k
+      CALL base1/k
   ELIF thisPh(isWordEnd) AND NOT thisPh(isFirstVowel) THEN
       ChangePhoneme(g)
   ENDIF

phsource/ph_marathi

@@ -38,12 +38,12 @@ endphoneme
 //F J
 
 phoneme c
-  import_phoneme base/c
+  import_phoneme base1/c
 endphoneme
 
 
 phoneme c#
-  CALL base/tS;
+  CALL base1/tS;
   ipa cU+02B0
 endphoneme
 

phsource/ph_oromo

@@ -121,7 +121,7 @@ endphoneme
 // CONSONANTS
 
 phoneme r
-  import_phoneme base/R2
+  import_phoneme base1/R2
 endphoneme
 
 phoneme k`
@@ -170,7 +170,7 @@ phoneme D
   vcd alv stp
   lengthmod 6
   voicingswitch d
-  CALL base/D
+  CALL base1/D
   IF nextPh(isPause2) THEN
     FMT(voc/dh_) addWav(vocw/dh, 35)   // weaker 
   ENDIF

phsource/ph_polish

@@ -175,14 +175,14 @@ phoneme dz
 endphoneme
 
 phoneme ts;
-  CALL base/tS;
+  CALL base1/tS;
   voicingswitch dz;
   ipa tɕ
 endphoneme
 
 
 phoneme dz;
-  import_phoneme base/dZ;
+  import_phoneme base1/dZ;
   voicingswitch ts;
 endphoneme
 
@@ -191,7 +191,7 @@ phoneme w
   liquid
   lengthmod 7
 
-  CALL base/w
+  CALL base1/w
   IF nextPh(isVowel) THEN
     FMT(w/w2)   // longer [w]
   ENDIF

phsource/ph_portugal

@@ -154,7 +154,7 @@ phoneme s#     // This is [s] for Brazil, [S] for Portugal
   IF nextPh(isVoiced) THEN
     ChangePhoneme(Z)
   ENDIF
-  CALL base/S
+  CALL base1/S
   ipa ʃ
 endphoneme
 

phsource/ph_pt_brazil

@@ -190,7 +190,7 @@ endphoneme
 
 
 phoneme x
-  CALL base/h
+  CALL base1/h
   ipa x
 endphoneme
 
@@ -205,7 +205,7 @@ phoneme s#     // This is [s] for Brazil, [S] for Portugal
     ChangePhoneme(z)
   ENDIF
 
-  CALL base/s
+  CALL base1/s
   ipa s
 endphoneme
 

phsource/ph_punjabi

@@ -91,6 +91,6 @@ endphoneme
 // Consonants
 
 phoneme v   // Try English [v]
-  import_phoneme base/v
+  import_phoneme base1/v
 endphoneme
 

phsource/ph_romanian

@@ -179,7 +179,7 @@ phoneme l;
   liquid
   lengthmod 7
 
-  CALL base/l
+  CALL base1/l
   Vowelout colr=1
  endphoneme
 
@@ -188,7 +188,7 @@ phoneme m;
   vcd blb nas
   lengthmod 4
 
-  CALL base/m
+  CALL base1/m
   Vowelout f1=2  f2=1000 -500 -350  f3=200 80 brk colr=1
 endphoneme
 
@@ -197,7 +197,7 @@ phoneme n;
   vcd alv nas
   lengthmod 4
 
-  CALL base/n
+  CALL base1/n
   Vowelout f1=2 f2=1700 -300 250  f3=200 80  rms=20 brk colr=1
 endphoneme
 
@@ -231,7 +231,7 @@ phoneme f;
   vls lbd frc
   lengthmod 3
   voicingswitch v
-  CALL base/f
+  CALL base1/f
   Vowelout f1=0  f2=1000 -500 -350  f3=-200 80 colr=1
 endphoneme
 

phsource/ph_s_gaelic

@@ -261,7 +261,7 @@ phoneme t;
 endphoneme
 
 phoneme S
-  import_phoneme base/S;
+  import_phoneme base1/S;
 endphoneme
 
 

phsource/ph_setswana

@@ -18,7 +18,7 @@ phoneme l      // use dark [l/2] before not-vowel
     ENDIF
   ENDIF
 
-  CALL base/l
+  CALL base1/l
 endphoneme
 
 phoneme r-   // linking r, used in Setswana between certain vowels and a following vowel

phsource/ph_sinhala

@@ -114,12 +114,12 @@ endphoneme
 
 // ?? This is standard [v].  Should be it [v] without the fricative noise?
 phoneme v
-  import_phoneme base/v
+  import_phoneme base1/v
 endphoneme
 
 
 phoneme r
-  import_phoneme base/r
+  import_phoneme base1/r
 endphoneme
 
 phoneme t
@@ -131,25 +131,25 @@ endphoneme
 
 phoneme m#
   ipa U+1D50
-  CALL base/m
+  CALL base1/m
 endphoneme
 
 phoneme n#
   ipa U+207F
-  CALL base/n
+  CALL base1/n
 endphoneme
 
 phoneme n.#
   ipa U+1DAF
-  CALL base/n.
+  CALL base1/n.
 endphoneme
 
 phoneme n^#
   ipa U+1DAE
-  CALL base/n^
+  CALL base1/n^
 endphoneme
 
 phoneme N#
   ipa U+1D51
-  CALL base/N
+  CALL base1/N
 endphoneme

phsource/ph_slovenian

@@ -91,7 +91,7 @@ endphoneme
 
 
 phoneme v
-  import_phoneme base/v#
+  import_phoneme base1/v#
 endphoneme
 
 

phsource/ph_spanish

@@ -131,7 +131,7 @@ phoneme b
     ENDIF
   ENDIF
 
-  CALL base/b
+  CALL base1/b
 endphoneme
 
 
@@ -139,7 +139,7 @@ phoneme D
   vcd dnt frc
   lengthmod 6
   voicingswitch T
-  CALL base/D
+  CALL base1/D
   IF nextPh(isPause2) THEN
     FMT(voc/dh_) addWav(vocw/dh, 35)   // weaker 
   ENDIF
@@ -187,7 +187,7 @@ phoneme r
     ChangePhoneme(**)
   ENDIF
 
-  CALL base/*
+  CALL base1/*
 endphoneme
 
 

phsource/ph_tamil

@@ -146,7 +146,7 @@ endphoneme
 
 // ?? This is standard [v].  Should be it [v] without the fricative noise?
 phoneme v
-  import_phoneme base/v
+  import_phoneme base1/v
 endphoneme
 
 phoneme : //  Lengthen previous vowel by "length"
@@ -160,11 +160,11 @@ phoneme #    // a NULL phoneme for 'virama'
 endphoneme
 
 phoneme z.
-  CALL base/z.
+  CALL base1/z.
   ipa U+027B
 endphoneme
 
 phoneme r
-  import_phoneme base/r
+  import_phoneme base1/r
 endphoneme
 

phsource/ph_tatar

@@ -121,7 +121,7 @@ endphoneme
 // Consonants
 
 phoneme r
-  import_phoneme base/R2
+  import_phoneme base1/R2
 endphoneme
 
 phoneme t
@@ -129,7 +129,7 @@ phoneme t
 endphoneme
 
 phoneme d
-  import_phoneme base/d[
+  import_phoneme base1/d[
 endphoneme
 
 phoneme k
@@ -137,11 +137,11 @@ phoneme k
   IF prevVowel(isFlag2) OR nextVowel(isFlag2) THEN   // back vowels
     ChangePhoneme(q)
   ENDIF
-  CALL base/k
+  CALL base1/k
 endphoneme
 
 phoneme G
-  import_phoneme base/Q"
+  import_phoneme base1/Q"
 endphoneme
 
 phoneme g
@@ -159,5 +159,5 @@ phoneme l
   IF prevVowel(isFlag2) OR nextVowel(isFlag2) THEN
     ChangePhoneme(L)
   ENDIF
-  CALL base/l
+  CALL base1/l
 endphoneme

phsource/ph_telugu

@@ -97,12 +97,12 @@ endphoneme
 
 // ?? This is standard [v].  Should be it [v] without the fricative noise?
 phoneme v
-  import_phoneme base/v
+  import_phoneme base1/v
 endphoneme
 
 
 phoneme r
-  import_phoneme base/R2
+  import_phoneme base1/R2
 endphoneme
 
 

phsource/ph_turkish

@@ -206,6 +206,6 @@ phoneme R
   IF prevPhW(isVowel) AND nextPhW(isVowel) THEN
     ChangePhoneme(*)
   ENDIF
-  CALL base/R
+  CALL base1/R
 endphoneme
 

phsource/phonemes

@@ -1,6 +1,6 @@
-
 // This is the master phoneme file.
 
+phonemetable base1 _
 
 // The base phoneme table contains the utility phonemes, the consonants,
 // and a schwa.  The vowels are defined in the language specific phoneme
@@ -577,7 +577,7 @@ endphoneme
 
 
 phoneme L/
-  import_phoneme base/l/2
+  import_phoneme base1/l/2
 endphoneme
 
 phoneme L   // velar L
@@ -1669,17 +1669,17 @@ endphoneme
 phonemetable ipa _
 include ph_ipa
 
-phonemetable jp base
+phonemetable jp base1
 include ph_japanese
 
-phonemetable consonants base
+phonemetable consonants base1
 include ph_consonants
 
 
-phonemetable base2 base
+phonemetable base2 base1
 include ph_base2
 
-phonemetable en base
+phonemetable en base1
 include ph_english
 
 phonemetable en-n en
@@ -1701,19 +1701,19 @@ phonemetable en-wi en
 include ph_english_wi
 
 
-phonemetable af base
+phonemetable af base1
 include ph_afrikaans
 
-phonemetable cy base
+phonemetable cy base1
 include ph_welsh
 
-phonemetable ga base
+phonemetable ga base1
 include ph_irish
 
-phonemetable de base
+phonemetable de base1
 include ph_german
 
-phonemetable eo base
+phonemetable eo base1
 include ph_esperanto
 
 phonemetable ia eo
@@ -1725,23 +1725,23 @@ include ph_lojban
 phonemetable nci base2
 include ph_nahuatl
 
-phonemetable fi base
+phonemetable fi base1
 include ph_finnish
 
-phonemetable et base
+phonemetable et base1
 include ph_estonian
 
-phonemetable fr base
+phonemetable fr base1
 include ph_french
 
 phonemetable fr-ca fr
 include ph_french_ca
 
-phonemetable nl base
+phonemetable nl base1
 include ph_dutch
 
 
-phonemetable hi_base base
+phonemetable hi_base base1
 include ph_hindi_base
 
 phonemetable hi hi_base
@@ -1776,17 +1776,17 @@ include ph_marathi
 
 
 
-phonemetable hu base
+phonemetable hu base1
 include ph_hungarian
 
-phonemetable lt base
+phonemetable lt base1
 include ph_lithuanian
 
 
-phonemetable lv base
+phonemetable lv base1
 include ph_latvian
 
-phonemetable pl base
+phonemetable pl base1
 include ph_polish
 
 phonemetable sk pl
@@ -1804,7 +1804,7 @@ include ph_macedonian
 phonemetable sr hr
 include ph_serbian
 
-phonemetable ru base
+phonemetable ru base1
 include ph_russian
 
 phonemetable bg pl
@@ -1814,7 +1814,7 @@ include ph_bulgarian
 phonemetable it base2
 include ph_italian
 
-phonemetable la base
+phonemetable la base1
 include ph_latin
 
 phonemetable es base2
@@ -1847,16 +1847,16 @@ include ph_greek
 phonemetable grc base2
 include ph_greek_ancient
 
-phonemetable sv base
+phonemetable sv base1
 include ph_swedish
 
-phonemetable no base
+phonemetable no base1
 include ph_norwegian
 
-phonemetable is base
+phonemetable is base1
 include ph_icelandic
 
-phonemetable vi base
+phonemetable vi base1
 include ph_vietnam
 
 phonemetable vi-hue vi
@@ -1865,14 +1865,14 @@ include ph_vietnam_hue
 phonemetable vi-sgn vi
 include ph_vietnam_sgn
 
-phonemetable zhy base
+phonemetable zhy base1
 include ph_zh_yue
 
-phonemetable zh base
+phonemetable zh base1
 include ph_zh
 
 
-phonemetable sw base
+phonemetable sw base1
 include ph_swahili
 
 phonemetable tr base2
@@ -1884,37 +1884,37 @@ include ph_kurdish
 phonemetable id base2
 include ph_indonesian
 
-phonemetable sq base
+phonemetable sq base1
 include ph_albanian
 
-phonemetable hy base
+phonemetable hy base1
 include ph_armenian
 
-phonemetable da base
+phonemetable da base1
 include ph_danish
 
-phonemetable ka base
+phonemetable ka base1
 include ph_georgian
 
-phonemetable fa base
+phonemetable fa base1
 include ph_farsi
 
-phonemetable ar base
+phonemetable ar base1
 include ph_arabic
 
 phonemetable rw base2
 include ph_kinyarwanda
 
-phonemetable prs base
+phonemetable prs base1
 include ph_dari
 
 phonemetable sl pl
 include ph_slovenian
 
-phonemetable gd base
+phonemetable gd base1
 include ph_s_gaelic
 
-phonemetable nso base
+phonemetable nso base1
 include ph_northern-sotho
 
 phonemetable ht fr
@@ -1923,13 +1923,13 @@ include ph_haitian
 phonemetable az tr
 include ph_azerbaijani
 
-phonemetable ak base
+phonemetable ak base1
 include ph_akan
 
-phonemetable am base
+phonemetable am base1
 include ph_amhari
 
-phonemetable wo base
+phonemetable wo base1
 include ph_wolof
 
 phonemetable dv hi_base
@@ -1950,35 +1950,35 @@ include ph_oriya
 phonemetable mni bn
 include ph_manipuri
 
-phonemetable tn base
+phonemetable tn base1
 include ph_setswana
 
-phonemetable mt base
+phonemetable mt base1
 include ph_maltese
 
 phonemetable bo hi
 include ph_tibetan
 
-phonemetable kk base
+phonemetable kk base1
 include ph_kazakh
 
-phonemetable tt base
+phonemetable tt base1
 include ph_tatar
 
-phonemetable ko base
+phonemetable ko base1
 include ph_korean
 
-phonemetable kl base
+phonemetable kl base1
 include ph_greenlandic
 
-phonemetable om base
+phonemetable om base1
 include ph_oromo
 
-phonemetable my base
+phonemetable my base1
 include ph_burmese
 
-phonemetable gn base
+phonemetable gn base1
 include ph_guarani
 
-phonemetable ky base
+phonemetable ky base1
 include ph_kyrgyz