From ee7e05782140f5e59894468ab09da09c49572893 Mon Sep 17 00:00:00 2001
From: Lucas Werkmeister <mail@lucaswerkmeister.de>
Date: Sun, 27 Jun 2021 20:03:07 +0200
Subject: [PATCH] Fix extra-long vowels in Elvish languages
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

A circumflex “specially prolonged” vowels; according to Appendix E of
The Lord of the Rings, only in Sindarin, but the Ambar Eldaron Quenya
Dictionary [1] also has some very few circumflex words (sû, lîs), so
let’s support the circumflex in Quenya as well. Marking extra-long
vowels with two colons seems to work well and is also done in several
other languages.

[1]: https://ambar-eldaron.com/telechargements/quenya-engl-A4.pdf
---
 dictsource/qya_rules              | 15 +++++++++++++++
 dictsource/sjn_rules              | 18 ++++++++++++++++++
 tests/language-pronunciation.test |  2 +-
 3 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/dictsource/qya_rules b/dictsource/qya_rules
index c2547e35..7606f669 100644
--- a/dictsource/qya_rules
+++ b/dictsource/qya_rules
@@ -16,6 +16,9 @@
 .group á
 	á	a:
 
+.group â
+	â	a::
+
 .group b
 	b	b
 
@@ -42,6 +45,9 @@
 .group é
 	é	e:
 
+.group ê
+	ê	e::
+
 .group f
 	f	f
 	f (_	v
@@ -62,6 +68,9 @@
 .group í
 	í	i:
 
+.group î
+	î	i::
+
 // j and k do not occur in Quenya
 
 .group l
@@ -86,6 +95,9 @@
 .group ó
 	ó	o:
 
+.group ô
+	ô	o::
+
 .group p
 	p	p
 
@@ -120,6 +132,9 @@
 .group ú
 	ú	u:
 
+.group û
+	û	u::
+
 .group v
 	v	v
 
diff --git a/dictsource/sjn_rules b/dictsource/sjn_rules
index d383fa7f..757abc00 100644
--- a/dictsource/sjn_rules
+++ b/dictsource/sjn_rules
@@ -17,6 +17,9 @@
 .group á
 	á	a:
 
+.group â
+	â	a::
+
 .group b
 	b	b
 
@@ -43,6 +46,9 @@
 .group é
 	é	e:
 
+.group ê
+	ê	e::
+
 .group f
 	f	f
 	f (_	v
@@ -66,6 +72,9 @@
 .group í
 	í	i:
 
+.group î
+	î	i::
+
 // j and k do not occur in Sindarin
 
 .group l
@@ -91,6 +100,9 @@
 .group ó
 	ó	o:
 
+.group ô
+	ô	o::
+
 .group p
 	p	p
 
@@ -122,6 +134,9 @@
 	u (AX	=u
 	u (CAX	=u
 
+.group û
+	û	u::
+
 .group ú
 	ú	u:
 
@@ -142,4 +157,7 @@
 .group ý
 	ý	y:
 
+.group ŷ
+	ŷ	y::
+
 // z does not occur in Sindarin
diff --git a/tests/language-pronunciation.test b/tests/language-pronunciation.test
index 561dce51..3ea1a715 100755
--- a/tests/language-pronunciation.test
+++ b/tests/language-pronunciation.test
@@ -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 k,elebR'i:an 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 loTl'o:Ri;,en miTR'andiR moR'annon m'oRi;,a osg'ili;,aT pal'anti:R p,alant'i:Ri pel'ennoR p,eRi;'annaT sil'ivRen ToR'ondoR" "alph Aman Amarth Amon Aragorn Beleriand Boromir Bragollach Brethil Brithombar Caradhras Celebrían Denethor Drengist Ecthelion Emyn Eriador Fëanor Fingon Fingolfin Finarfin Forochel Galadhon Galadriel Grond Iarwain Ioreth Ithilien Lothlórien Mithrandir Morannon Moria Osgiliath Palantír Palantíri 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 k,elebR'i:an d'eneT,oR dR'eNgist d'u::n 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 loTl'o:Ri;,en miTR'andiR moR'annon m'oRi;,a osg'ili;,aT pal'anti:R p,alant'i:Ri pel'ennoR p,eRi;'annaT sil'ivRen ToR'ondoR" "alph Aman Amarth Amon Aragorn Beleriand Boromir Bragollach Brethil Brithombar Caradhras Celebrían Denethor Drengist dûn Ecthelion Emyn Eriador Fëanor Fingon Fingolfin Finarfin Forochel Galadhon Galadriel Grond Iarwain Ioreth Ithilien Lothlórien Mithrandir Morannon Moria Osgiliath Palantír Palantíri 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"