Reorder phoneme table definitions by extended table and then table name

phsource/phonemes

@@ -1664,283 +1664,289 @@ phoneme h
 endphoneme
 
 
-
 //*******************************************************************
 // ADDITIONAL PHONEME TABLES
+// These are grouped by extended table and table name
 //*******************************************************************
 
-phonemetable ja base1
-include ph_japanese
+// *** Tables extending base1 ***
 
 phonemetable consonants base1
 include ph_consonants
 
-
 phonemetable base2 base1
 include ph_base2
 
-phonemetable en base1
-include ph_english
-
-phonemetable en-n en
-include ph_english_n
-
-phonemetable en-us en
-include ph_english_us
-
-phonemetable en-sc en
-include ph_english_sc
-
-phonemetable en-rp en
-include ph_english_rp
-
-phonemetable en-wm en
-include ph_english_wm
-
-phonemetable en-wi en
-include ph_english_wi
+phonemetable ak base1
+include ph_akan
 
+phonemetable am base1
+include ph_amhari
 
-phonemetable af base1
-include ph_afrikaans
+phonemetable ar base1
+include ph_arabic
 
 phonemetable cy base1
 include ph_welsh
 
-phonemetable ga base1
-include ph_irish
+phonemetable da base1
+include ph_danish
 
-phonemetable de base1
-include ph_german
+phonemetable en base1
+include ph_english
 
 phonemetable eo base1
 include ph_esperanto
 
-phonemetable ia eo
-include ph_interlingua
-
-phonemetable jbo eo
-include ph_lojban
-
-phonemetable py eo
-include ph_pyash
+phonemetable et base1
+include ph_estonian
 
-phonemetable nci base2
-include ph_nahuatl
+phonemetable fa base1
+include ph_farsi
 
 phonemetable fi base1
 include ph_finnish
 
-phonemetable et base1
-include ph_estonian
-
 phonemetable fr base1
 include ph_french
 
-phonemetable hak base1
-include ph_hakka
+phonemetable ga base1
+include ph_irish
 
-phonemetable nl base1
-include ph_dutch
+phonemetable gn base1
+include ph_guarani
 
+phonemetable hak base1
+include ph_hakka
 
 phonemetable hi_base base1
 include ph_hindi_base
 
-phonemetable hi hi_base
-include ph_hindi
+phonemetable hy base1
+include ph_armenian
 
-phonemetable bn hi_base
-include ph_bengali
+phonemetable hu base1
+include ph_hungarian
 
-phonemetable ne hi_base
-include ph_nepali
+phonemetable is base1
+include ph_icelandic
 
-phonemetable ur hi_base
-include ph_urdu
+phonemetable ja base1
+include ph_japanese
 
-phonemetable pa hi_base
-include ph_punjabi
+phonemetable ka base1
+include ph_georgian
 
-phonemetable ta hi_base
-include ph_tamil
+phonemetable ky base1
+include ph_kyrgyz
 
-phonemetable kn hi_base
-include ph_kannada
+phonemetable kl base1
+include ph_greenlandic
 
-phonemetable ml hi_base
-include ph_malayalam
+phonemetable ko base1
+include ph_korean
 
-phonemetable gu hi_base
-include ph_gujarati
+phonemetable la base1
+include ph_latin
 
-phonemetable mr hi_base
-include ph_marathi
+phonemetable lt base1
+include ph_lithuanian
 
-phonemetable kok hi_base
-include ph_konkani
+phonemetable lv base1
+include ph_latvian
 
+phonemetable mi base1
+include ph_maori
 
-phonemetable hu base1
-include ph_hungarian
+phonemetable my base1
+include ph_myanmar
 
-phonemetable lt base1
-include ph_lithuanian
+phonemetable mt base1
+include ph_maltese
 
+phonemetable no base1
+include ph_norwegian
 
-phonemetable lv base1
-include ph_latvian
+phonemetable om base1
+include ph_oromo
 
 phonemetable pl base1
 include ph_polish
 
-phonemetable sk pl
-include ph_slovak
+phonemetable prs base1
+include ph_dari
 
-phonemetable cs sk
-include ph_czech
+phonemetable quc base1
 
-phonemetable hr sk
-include ph_croatian
+phonemetable ru base1
+include ph_russian
 
-phonemetable mk hr
-include ph_macedonian
+phonemetable shn base1
+include ph_shan
 
-phonemetable sr hr
-include ph_serbian
+phonemetable sq base1
+include ph_albanian
 
-phonemetable ru base1
-include ph_russian
+phonemetable sv base1
+include ph_swedish
 
-phonemetable ru-lv ru
-include ph_russian_lv
+phonemetable sw base1
+include ph_swahili
 
-phonemetable bg pl
-include ph_bulgarian
+phonemetable tn base1
+include ph_setswana
 
+phonemetable tt base1
+include ph_tatar
 
-phonemetable it base2
-include ph_italian
+phonemetable vi base1
+include ph_vietnam
 
-phonemetable la base1
-include ph_latin
+phonemetable wo base1
+include ph_wolof
 
-phonemetable es base2
-include ph_spanish
+phonemetable zh base1
+include ph_zh
 
-phonemetable es-la es
-include ph_spanish_la
+phonemetable zhy base1
+include ph_zh_yue
 
-phonemetable ca es
-include ph_catalan
+// *** Tables extending base2 ***
 
-phonemetable an es
-include ph_aragon
+phonemetable el base2
+include ph_greek
+
+phonemetable es base2
+include ph_spanish
 
 phonemetable eu base2
 include ph_basque
 
+phonemetable grc base2
+include ph_greek_ancient
+
+phonemetable id base2
+include ph_indonesian
+
+phonemetable it base2
+include ph_italian
+
+phonemetable ku base2
+include ph_kurdish
+
+phonemetable nci base2
+include ph_nahuatl
+
 phonemetable pt base2
 include ph_pt_brazil
 
-phonemetable pt-pt pt
-include ph_portugal
-
 phonemetable ro base2
 include ph_romanian
 
-phonemetable el base2
-include ph_greek
+phonemetable rw base2
+include ph_kinyarwanda
 
-phonemetable grc base2
-include ph_greek_ancient
+phonemetable tr base2
+include ph_turkish
 
-phonemetable sv base1
-include ph_swedish
+// *** Tables extending en ***
 
-phonemetable no base1
-include ph_norwegian
+phonemetable en-n en
+include ph_english_n
 
-phonemetable is base1
-include ph_icelandic
+phonemetable en-rp en
+include ph_english_rp
 
-phonemetable vi base1
-include ph_vietnam
+phonemetable en-sc en
+include ph_english_sc
 
-phonemetable vi-hue vi
-include ph_vietnam_hue
+phonemetable en-us en
+include ph_english_us
 
-phonemetable vi-sgn vi
-include ph_vietnam_sgn
+phonemetable en-wi en
+include ph_english_wi
 
-phonemetable zhy base1
-include ph_zh_yue
+phonemetable en-wm en
+include ph_english_wm
 
-phonemetable zh base1
-include ph_zh
+// *** Hidden dependencies ***
+// Tables which include/import phonemes from other (in comment) tables
+// TODO these may be needed to redesign
 
+phonemetable af base1 // form en
+include ph_afrikaans
 
-phonemetable sw base1
-include ph_swahili
+phonemetable de base1 // from en-us
+include ph_german
 
-phonemetable tr base2
-include ph_turkish
+phonemetable kk base1 // from sq
+include ph_kazakh
 
-phonemetable ku base2
-include ph_kurdish
+phonemetable nl base1 // from af
+include ph_dutch
 
-phonemetable id base2
-include ph_indonesian
+phonemetable nso base1 // from af
+include ph_northern-sotho
 
-phonemetable sq base1
-include ph_albanian
+// *** Tables extending other language tables ***
 
-phonemetable hy base1
-include ph_armenian
+phonemetable ia eo
+include ph_interlingua
 
-phonemetable da base1
-include ph_danish
+phonemetable jbo eo
+include ph_lojban
 
-phonemetable ka base1
-include ph_georgian
+phonemetable py eo
+include ph_pyash
 
-phonemetable fa base1
-include ph_farsi
+phonemetable es-la es
+include ph_spanish_la
 
-phonemetable ar base1
-include ph_arabic
+phonemetable ca es
+include ph_catalan
 
-phonemetable rw base2
-include ph_kinyarwanda
+phonemetable an es
+include ph_aragon
 
-phonemetable prs base1
-include ph_dari
+phonemetable ht fr
+include ph_haitian
 
-phonemetable quc base1
+phonemetable hi hi_base
+include ph_hindi
 
-phonemetable sl pl
-include ph_slovenian
+phonemetable bo hi
+include ph_tibetan
 
-phonemetable gd base1
+phonemetable gd base1 // hidden dependency, imports from hi
 include ph_s_gaelic
 
-phonemetable nso base1
-include ph_northern-sotho
+// hi_base
+phonemetable ne hi_base
+include ph_nepali
 
-phonemetable ht fr
-include ph_haitian
+phonemetable ur hi_base
+include ph_urdu
 
-phonemetable az tr
-include ph_azerbaijani
+phonemetable pa hi_base
+include ph_punjabi
 
-phonemetable ak base1
-include ph_akan
+phonemetable ta hi_base
+include ph_tamil
 
-phonemetable am base1
-include ph_amhari
+phonemetable kn hi_base
+include ph_kannada
 
-phonemetable wo base1
-include ph_wolof
+phonemetable ml hi_base
+include ph_malayalam
+
+phonemetable gu hi_base
+include ph_gujarati
+
+phonemetable mr hi_base
+include ph_marathi
+
+phonemetable kok hi_base
+include ph_konkani
 
 phonemetable dv hi_base
 include ph_divehi
@@ -1951,6 +1957,9 @@ include ph_telugu
 phonemetable si hi_base
 include ph_sinhala
 
+phonemetable bn hi_base
+include ph_bengali
+
 phonemetable as bn
 include ph_assamese
 
@@ -1960,44 +1969,42 @@ include ph_oriya
 phonemetable bpy bn
 include ph_manipuri
 
-phonemetable sd ur
-include ph_sindhi
+phonemetable sk pl
+include ph_slovak
 
-phonemetable tn base1
-include ph_setswana
+phonemetable bg pl
+include ph_bulgarian
 
-phonemetable mt base1
-include ph_maltese
+phonemetable sl pl
+include ph_slovenian
 
-phonemetable bo hi
-include ph_tibetan
+phonemetable cs sk
+include ph_czech
 
-phonemetable kk base1
-include ph_kazakh
+phonemetable hr sk
+include ph_croatian
 
-phonemetable tt base1
-include ph_tatar
+phonemetable mk hr
+include ph_macedonian
 
-phonemetable ko base1
-include ph_korean
+phonemetable sr hr
+include ph_serbian
 
-phonemetable kl base1
-include ph_greenlandic
+phonemetable ru-lv ru
+include ph_russian_lv
 
-phonemetable om base1
-include ph_oromo
+phonemetable az tr
+include ph_azerbaijani
 
-phonemetable my base1
-include ph_myanmar
+phonemetable pt-pt pt
+include ph_portugal
 
-phonemetable gn base1
-include ph_guarani
+phonemetable vi-hue vi
+include ph_vietnam_hue
 
-phonemetable ky base1
-include ph_kyrgyz
+phonemetable vi-sgn vi
+include ph_vietnam_sgn
 
-phonemetable mi base1
-include ph_maori
+phonemetable sd ur
+include ph_sindhi
 
-phonemetable shn base1
-include ph_shan