Fix stress of Elvish ⟨ch⟩, ⟨dh⟩, ⟨th⟩

In Elvish languages, ⟨ch⟩, ⟨dh⟩, and ⟨th⟩ count as single consonants for
the purposes of stress, since they represent single letters in the
original scripts. The easiest way to implement this is to replace them
with single letters at the beginning – ⟨ð⟩ for ⟨dh⟩ and ⟨þ⟩ for ⟨th⟩ are
natural, and ⟨x⟩ for ⟨ch⟩ also makes some sense, though it means we need
to replace real ⟨x⟩ first (it’s not mentioned in Appendix E of The Lord
of the Rings, but does occur in some Quenya words, notably Helcaraxë).
Real ⟨x⟩ is pronounced like /ks/, but of course we need to spell that as
⟨cs⟩, since ⟨k⟩ does not occur in Elvish languages.

dictsource/qya_rules

@@ -1,3 +1,12 @@
+.replace
+	// turn x into cs, both because that’s how it’s pronounced
+	// and to free up x as a single letter for ch (see immediately below)
+	x	cs
+	// turn ch, dh, th into single consonants for stress purposes
+	ch	x
+	dh	ð
+	th	þ
+
 .group a
 	a	a
 	// light penultimate syllable: put stress on antepenultimate
@@ -9,15 +18,17 @@
 
 .group c
 	c	k
+	// recall that ch was replaced with x earlier
 
-.group ch
-	ch	x
+.group x
+	x	x
 
 .group d
 	d	d
+	// recall that dh was replaced with ð earlier
 
-.group dh
-	dh	D
+.group ð
+	ð	D
 
 .group e
 	e	e
@@ -80,9 +91,10 @@
 
 .group t
 	t	t
+	// recall that th was replaced with þ earlier
 
-.group th
-	th	T
+.group þ
+	þ	T
 
 .group ty
 	ty	tj
@@ -99,7 +111,7 @@
 .group w
 	w	w
 
-// x does not occur in Quenya
+// recall that x was replaced with cs earlier
 
 .group y
 	y	j

dictsource/sjn_rules

@@ -1,3 +1,13 @@
+.replace
+	// turn x into cs, both because that’s how it’s pronounced
+	// (strictly speaking only in some Quenya, but let’s do it here too)
+	// and to free up x as a single letter for ch (see immediately below)
+	x	cs
+	// turn ch, dh, th into single consonants for stress purposes
+	ch	x
+	dh	ð
+	th	þ
+
 .group a
 	a	a
 	// light penultimate syllable: put stress on antepenultimate
@@ -9,15 +19,17 @@
 
 .group c
 	c	k
+	// recall that ch was replaced with x earlier
 
-.group ch
-	ch	x
+.group x
+	x	x
 
 .group d
 	d	d
+	// recall that dh was replaced with ð earlier
 
-.group dh
-	dh	D
+.group ð
+	ð	D
 
 .group e
 	e	e
@@ -84,9 +96,10 @@
 
 .group t
 	t	t
+	// recall that th was replaced with þ earlier
 
-.group th
-	th	T
+.group þ
+	þ	T
 
 .group ty
 	ty	tj
@@ -103,7 +116,7 @@
 .group w
 	w	w
 
-// x does not occur in Sindarin
+// recall that x was replaced with cs earlier
 
 .group y
 	y	y

tests/language-pronunciation.test

@@ -186,7 +186,7 @@ S'a
 'OksidU
 p'or-
 z'&~Ng&U~_:_: ,E*&U~ p,&l'avR&Z dU p,u*@-tug'es#" "Luís argüia à Júlia que «brações, fé, chá, óxido, pôr, zângão» eram palavras do português." "Latn"
-test_phon qya ",ainul'indal,e ald'iNga ank'alim,a ,eaR'endil el'endil el'essaR e'onwe eR'esse,a is'ilduR 'oRom,e tuR'ambaR ut'umno" "Ainulindalë aldinga ancalima Eärendil Elendil Elessar Eönwe Eressëa Isildur Orome Turambar Utumno" "Quenya"
+test_phon qya ",ainul'indal,e ald'iNga ank'alim,a ,eaR'endil el'endil el'essaR e'onwe eR'esse,a h,elkaR'akse is'ilduR 'oRom,e tuR'ambaR ut'umno" "Ainulindalë aldinga ancalima Eärendil Elendil Elessar Eönwe Eressëa Helcaraxë Isildur Orome Turambar Utumno" "Quenya"
 test_phon ro "m,uzikol'og@_! yn b'eZ v'ynd wh'iski Si tekw'ila
 p@-*'ets f'iks" "Muzicologă în bej vând whisky și tequila, preț fix." "Latn"
 test_phon ru "Syr'okVja E#l;ikt@-r;if;ik'Atsyja 'juZnyx gub;'ern;ij d'Ast m'oS;nyj tVltS;'ok pVdj'8mu s;'elskVvV xVz;'Ajstva#" "Широкая электрификация южных губерний даст мощный толчок подъёму сельского хозяйства." "Cyrl"
@@ -194,7 +194,7 @@ test_phon sd "s'Indhi b'o:li; 'Ind.o: jo:R'Vpi xa:nd'a:n s'a~: t[a:l'Vq R,@k#@nd
 J'Vnhn t['e: ,aRb'i: bo:l'i:;a J'o: b'I t[@m'a:m v'Vd.o: as'VR ,a:he:
 h'Ina v'aqt s'Indhi b'o:li s'Indh J'e: m'Vk# b'o:li_! 'ae~ d,@f@t['VRi z@b'a:n ,a:he:" "سنڌي ٻولي انڊو يورپي خاندان سان تعلق رکندڙ آريائي ٻولي آھي، جنھن تي عربي ٻوليءَ جو بہ تمام وڏو اثر آهي. هن وقت سنڌي ٻولي سنڌ جي مک ٻولي ۽ دفتري زبان آھي." "Arab"
 test_phon si "t'aw@t st#'a:n@ k'i:p@j,@kin w'a:rta: w'u: s'ul.u p'ipiri:m s'ah@ d'e:s@p,a:l@n@ p'akS@ k r'ija:k,a:ri:n 'at@r@ '&tiwu: g'&t.um h'e:tuwen 'ek 'ajeku m'ij@gos k'i:p@ d'eneku t'uwa:l@ l'aba: t'ibe:" "තවත් ස්ථාන කීපයකින් වාර්තා වූ සුළු පිපිරීම් සහ දේශපාලන පක්ෂ ක්‍රියාකාරීන් අතර ඇතිවූ ගැටුම් හේතුවෙන් එක් අයෙකු මියගොස් කීප දෙනෙකු තුවාල ලබා තිබේ." "Sinh"
-test_phon sjn "'alf 'aman 'amaRT 'amon 'aRag,oRn bel'eRi;,and b'oRom,iR bRag'ollax bR'eTil bRiT'ombaR kaR'aDRas dR'eNgist ekT'eli;,on 'emyn eR'i;ad,oR f'ean,oR f'iNgon fiNg'olfin fin'aRfin gal'adRi;,el gR'ond j'aRwa,in j'oReT iT'ili;,en miTR'andiR moR'annon m'oRi;,a osg'ili;,aT pal'antiR pel'ennoR p,eRi;'annaT sil'ivRen ToR'ondoR" "alph Aman Amarth Amon Aragorn Beleriand Boromir Bragollach Brethil Brithombar Caradhras Drengist Ecthelion Emyn Eriador Fëanor Fingon Fingolfin Finarfin Galadriel Grond Iarwain Ioreth Ithilien Mithrandir Morannon Moria Osgiliath Palantír Pelennor Periannath Silivren Thorondor" "Sindarin"
+test_phon sjn "'alf 'aman 'amaRT 'amon 'aRag,oRn bel'eRi;,and b'oRom,iR bRag'ollax bR'eTil bRiT'ombaR kaR'aDRas d'eneT,oR dR'eNgist ekT'eli;,on 'emyn eR'i;ad,oR f'ean,oR f'iNgon fiNg'olfin fin'aRfin f'oRox,el g'alaD,on gal'adRi;,el gR'ond j'aRwa,in j'oReT iT'ili;,en miTR'andiR moR'annon m'oRi;,a osg'ili;,aT pal'antiR pel'ennoR p,eRi;'annaT sil'ivRen ToR'ondoR" "alph Aman Amarth Amon Aragorn Beleriand Boromir Bragollach Brethil Brithombar Caradhras Denethor Drengist Ecthelion Emyn Eriador Fëanor Fingon Fingolfin Finarfin Forochel Galadhon Galadriel Grond Iarwain Ioreth Ithilien Mithrandir Morannon Moria Osgiliath Palantír Pelennor Periannath Silivren Thorondor" "Sindarin"
 test_phon sk "k'r:d;el^ St;'astni:Q d;'atl^ow 'utSi: pR'i;u:st;i: v'a:hu m'l:kveho k'on^a 'ophRi:zat; k'uoRu_:_: a ZR'at; tS'eRstve: m'eso
 p'et;ti:Zdn^,ove: v'l:tSata: n'eRvo:zn^e St;'ekaju: n'amu,ojho d;'atl^a_! v_ t'r:n^i:" "Kŕdeľ šťastných ďatľov učí pri ústí Váhu mĺkveho koňa obhrýzať kôru a žrať čerstvé mäso. Päťtýždňové vĺčatá nervózne štekajú na môjho ďatľa v tŕní." "Latn"
 test_phon sl "xiSn'i:tSin bR'a:tEts uzg'a:ja p'o:wZE p'o:t fik'u:sOm" "Hišničin bratec vzgaja polže pod fikusom." "Latn"