[sword-svn] r179 - in trunk/source/data/translit/crosswire: . cldr
chrislit at crosswire.org
chrislit at crosswire.org
Sat Feb 28 05:01:29 MST 2009
Author: chrislit
Date: 2009-02-28 05:01:29 -0700 (Sat, 28 Feb 2009)
New Revision: 179
Modified:
trunk/source/data/translit/crosswire/Ethiopic_Latin_BGN.txt
trunk/source/data/translit/crosswire/Ethiopic_Latin_UNGEGN.txt
trunk/source/data/translit/crosswire/Georgian_Latin_ALALC.txt
trunk/source/data/translit/crosswire/Georgian_Latin_BGN.txt
trunk/source/data/translit/crosswire/Georgian_Latin_ISO.txt
trunk/source/data/translit/crosswire/Thaana_Latin_ALALC.txt
trunk/source/data/translit/crosswire/Thaana_Latin_BGN.txt
trunk/source/data/translit/crosswire/cldr/Ethiopic-Latin-BGN.xml
trunk/source/data/translit/crosswire/cldr/Ethiopic-Latin-UNGEGN.xml
trunk/source/data/translit/crosswire/cldr/Georgian-Latin-ALALC.xml
trunk/source/data/translit/crosswire/cldr/Georgian-Latin-BGN.xml
trunk/source/data/translit/crosswire/cldr/Georgian-Latin-ISO.xml
trunk/source/data/translit/crosswire/cldr/Thaana-Latin-ALALC.xml
trunk/source/data/translit/crosswire/cldr/Thaana-Latin-BGN.xml
Log:
fixed remaining transliteration data
Modified: trunk/source/data/translit/crosswire/Ethiopic_Latin_BGN.txt
===================================================================
--- trunk/source/data/translit/crosswire/Ethiopic_Latin_BGN.txt 2009-02-28 10:08:41 UTC (rev 178)
+++ trunk/source/data/translit/crosswire/Ethiopic_Latin_BGN.txt 2009-02-28 12:01:29 UTC (rev 179)
@@ -6,354 +6,339 @@
# Based on BGN/PCGN 1967 from
# http://www.eki.ee/wgrs/rom1_am.pdf
#-------------------------------------------------------------------
-# Ethiopic-Latin/BGNPCGN
+# Ethiopic-Latin/BGN
:: NFD (NFC);
-$macron = ̄;
-$udot = ̣;
-$apos = ʼ;
-$caron = ʼ;
-$ucaron = ʼ;
-$umacron = ʼ;
-[:L:]{አ>$apos a$macron;
-[:L:]{ኡ>$apos u;
-[:L:]{ኢ>$apos i$macron;
-[:L:]{ኣ>$apos a;
-[:L:]{ኤ>$apos e$macron;
-[:L:]{እ>$apos i;
-[:L:]{ኦ>$apos o;
-[:L:]{ኧ>$apos wa;
-ፂ<>t$umacron s$umacron $apos i$macron;
-ፄ<>t$umacron s$umacron $apos e$macron;
-ቚ<>kh$apos wi$macron;
-ፀ<>t$umacron s$umacron $apos e;
-ፁ<>t$umacron s$umacron $apos u;
-ፃ<>t$umacron s$umacron $apos a;
-ፅ<>t$umacron s$umacron $apos i;
-ፆ<>t$umacron s$umacron $apos o;
-ቊ<>k$apos wi$macron;
-ቒ<>kh$apos i$macron;
-ቔ<>kh$apos e$macron;
-ቘ<>kh$apos we;
-ቛ<>kh$apos wa;
-ቝ<>kh$apos wi;
-ኊ<>h$ucaron wi$macron;
-ዂ<>h$umacron wi$macron;
-ጪ<>ch$apos i$macron;
-ጬ<>ch$apos e$macron;
-ጯ<>ch$apos wa;
-ጺ<>ts$apos i$macron;
-ጼ<>ts$apos e$macron;
-ጿ<>ts$apos wa;
-ሐ<h$udot a$macron;
-ሒ<h$udot i$macron;
-ሔ<h$udot e$macron;
-ሗ<h$udot wa;
-ሢ<>s$caron i$macron;
-ሤ<>s$caron e$macron;
-ሧ<>s$caron wa;
-ሺ<>shi$macron;
-ሼ<>she$macron;
+[:L:]{አ>ʼa ;
+[:L:]{ኡ>ʼu;
+[:L:]{ኢ>ʼi ;
+[:L:]{ኣ>ʼa;
+[:L:]{ኤ>ʼe ;
+[:L:]{እ>ʼi;
+[:L:]{ኦ>ʼo;
+[:L:]{ኧ>ʼwa;
+ፂ<>tʼsʼi ;
+ፄ<>tʼsʼe ;
+ቚ<>khʼwi ;
+ፀ>tʼsʼe;
+ፁ<>tʼsʼu;
+ፃ<>tʼsʼa;
+ፅ>tʼsʼi;
+ፆ<>tʼsʼo;
+ቊ<>kʼwi ;
+ቒ<>khʼi ;
+ቔ<>khʼe ;
+ቘ<>khʼwe;
+ቛ<>khʼwa;
+ቝ>khʼwi;
+ኊ<>hʼwi ;
+ዂ>hʼwi ;
+ጪ<>chʼi ;
+ጬ<>chʼe ;
+ጯ<>chʼwa;
+ጺ<>tsʼi ;
+ጼ<>tsʼe ;
+ጿ<>tsʼwa;
+ሐ<>ḥa ;
+ሒ<>ḥi ;
+ሔ<>ḥe ;
+ሗ<>ḥwa;
+ሢ<>sʼi ;
+ሤ<>sʼe ;
+ሧ<>sʼwa;
+ሺ<>shi ;
+ሼ<>she ;
ሿ<>shwa;
-ቂ<>k$apos i$macron;
-ቄ<>k$apos e$macron;
-ቈ<>k$apos we;
-ቋ<>k$apos wa;
-ቍ<>k$apos wi;
-ቐ<>kh$apos e;
-ቑ<>kh$apos u;
-ቓ<>kh$apos a;
-ቕ<>kh$apos i;
-ቖ<>kh$apos o;
-ቜ>kh$apos o;
-ቺ<>chi$macron;
-ቼ<>che$macron;
+ቂ<>kʼi ;
+ቄ<>kʼe ;
+ቈ<>kʼwe;
+ቋ<>kʼwa;
+ቍ>kʼwi;
+ቐ>khʼe;
+ቑ<>khʼu;
+ቓ<>khʼa;
+ቕ>khʼi;
+ቖ<>khʼo;
+ቜ>khʼo;
+ቺ<>chi ;
+ቼ<>che ;
ቿ<>chwa;
-ኀ<>h$ucaron a$macron;
-ኂ<>h$ucaron i$macron;
-ኄ<>h$ucaron e$macron;
-ኈ<>h$ucaron we;
-ኋ<>h$ucaron wa;
-ኍ<>h$ucaron wi;
-ኚ<>nyi$macron;
-ኜ<>nye$macron;
+ኀ<>hʼa ;
+ኂ<>hʼi ;
+ኄ<>hʼe ;
+ኈ<>hʼwe;
+ኋ<>hʼwa;
+ኍ>hʼwi;
+ኚ<>nyi ;
+ኜ<>nye ;
ኟ<>nywa;
-ኲ<>kwi$macron;
-ኺ<>h$umacron i$macron;
-ኼ<>h$umacron e$macron;
-ዀ<>h$umacron we;
-ዃ<>h$umacron wa;
-ዅ<>h$umacron wi;
-ዢ<>zhi$macron;
-ዤ<>zhe$macron;
+ኲ<>kwi ;
+ኺ>hʼi ;
+ኼ>hʼe ;
+ዀ>hʼwe;
+ዃ>hʼwa;
+ዅ>hʼwi;
+ዢ<>zhi ;
+ዤ<>zhe ;
ዧ<>zhwa;
-ዺ<>dhi$macron;
-ዼ<>dhe$macron;
+ዺ<>dhi ;
+ዼ<>dhe ;
ዿ<>dhwo;
-ጒ<>gwi$macron;
-ጚ<>ghi$macron;
-ጜ<>ghe$macron;
-ጢ<>t$apos i$macron;
-ጤ<>t$apos e$macron;
-ጧ<>t$apos wa;
-ጨ<>ch$apos e;
-ጩ<>ch$apos u;
-ጫ<>ch$apos a;
-ጭ<>ch$apos i;
-ጮ<>ch$apos o;
-ጲ<>p$apos i$macron;
-ጴ<>p$apos e$macron;
-ጷ<>p$apos wa;
-ጸ<>ts$apos e;
-ጹ<>ts$apos u;
-ጻ<>ts$apos a;
-ጽ<>ts$apos i;
-ጾ<>ts$apos o;
-ሀ<>ha$macron;
-ሂ<>hi$macron;
-ሄ<>he$macron;
-ሊ<>li$macron;
-ሌ<>le$macron;
+ጒ<>gwi ;
+ጚ<>ghi ;
+ጜ<>ghe ;
+ጢ<>tʼi ;
+ጤ<>tʼe ;
+ጧ<>tʼwa;
+ጨ>chʼe;
+ጩ<>chʼu;
+ጫ<>chʼa;
+ጭ>chʼi;
+ጮ<>chʼo;
+ጲ<>pʼi ;
+ጴ<>pʼe ;
+ጷ<>pʼwa;
+ጸ>tsʼe;
+ጹ<>tsʼu;
+ጻ<>tsʼa;
+ጽ>tsʼi;
+ጾ<>tsʼo;
+ሀ<>ha ;
+ሂ<>hi ;
+ሄ<>he ;
+ሊ<>li ;
+ሌ<>le ;
ሏ<>lwa;
-ሐ<>ha$macron;
-ሒ<>hi$macron;
-ሔ<>he$macron;
-ሗ<>hwa;
-ሑ<h$udot u;
-ሓ<h$udot a;
-ሕ<h$udot i;
-ሖ<h$udot o;
-ሚ<>mi$macron;
-ሜ<>me$macron;
+ሑ<ḥu;
+ሓ>ḥa;
+ሕ>ḥi;
+ሖ<>ḥo;
+ሚ<>mi ;
+ሜ<>me ;
ሟ<>mwa;
-ሠ<>s$caron e;
-ሡ<>s$caron u;
-ሣ<>s$caron a;
-ሥ<>s$caron i;
-ሦ<>s$caron o;
-ሪ<>ri$macron;
-ሬ<>re$macron;
+ሠ>sʼe;
+ሡ<>sʼu;
+ሣ<>sʼa;
+ሥ>sʼi;
+ሦ<>sʼo;
+ሪ<>ri ;
+ሬ<>re ;
ሯ<>rwa;
-ሲ<>si$macron;
-ሴ<>se$macron;
+ሲ<>si ;
+ሴ<>se ;
ሷ<>swa;
-ሸ<>she;
+ሸ>she;
ሹ<>shu;
ሻ<>sha;
-ሽ<>shi;
+ሽ>shi;
ሾ<>sho;
-ቀ<>k$apos e;
-ቁ<>k$apos u;
-ቃ<>k$apos a;
-ቅ<>k$apos i;
-ቆ<>k$apos o;
-ቌ>k$apos o;
-ቢ<>bi$macron;
-ቤ<>be$macron;
+ቀ>kʼe;
+ቁ<>kʼu;
+ቃ<>kʼa;
+ቅ>kʼi;
+ቆ<>kʼo;
+ቌ>kʼo;
+ቢ<>bi ;
+ቤ>be ;
ቧ<>bwa;
-ቪ<>vi$macron;
-ቬ<>ve$macron;
+ቪ<>vi ;
+ቬ<>ve ;
ቯ<>vwa;
-ቲ<>ti$macron;
-ቴ<>te$macron;
+ቲ<>ti ;
+ቴ<>te ;
ቷ<>twa;
-ቸ<>che;
+ቸ>che;
ቹ<>chu;
ቻ<>cha;
-ች<>chi;
+ች>chi;
ቾ<>cho;
-ኁ<>h$ucaron u;
-ኃ<>h$ucaron a;
-ኅ<>h$ucaron i;
-ኆ<>h$ucaron o;
-ኌ>h$ucaron o;
-ኒ<>ni$macron;
-ኔ<>ne$macron;
+ኁ<>hʼu;
+ኃ>hʼa;
+ኅ>hʼi;
+ኆ<>hʼo;
+ኌ>hʼo;
+ኒ<>ni ;
+ኔ<>ne ;
ኗ<>nwa;
-ኘ<>nye;
+ኘ>nye;
ኙ<>nyu;
ኛ<>nya;
-ኝ<>nyi;
+ኝ>nyi;
ኞ<>nyo;
-አ<$apos a$macron;
-ኢ<$apos i$macron;
-ኤ<$apos e$macron;
-ኧ<$apos wa;
-ኪ<>ki$macron;
-ኬ<>ke$macron;
+ኤ<ʼe ;
+ኧ<ʼwa;
+ኪ<>ki ;
+ኬ<>ke ;
ኰ<>kwe;
ኳ<>kwa;
-ኵ<>kwi;
-ኸ<>h$umacron e;
-ኹ<>h$umacron u;
-ኻ<>h$umacron a;
-ኽ<>h$umacron i;
-ኾ<>h$umacron o;
-ዄ>h$umacron o;
-ዊ<>wi$macron;
-ዌ<>we$macron;
-ዐ<>ʻ a$macron;
-ዒ<>ʻ i$macron;
-ዔ<>ʻ e$macron;
-ዚ<>zi$macron;
-ዜ<>ze$macron;
+ኵ>kwi;
+ኸ>hʼe;
+ኹ>hʼu;
+ኻ>hʼa;
+ኽ>hʼi;
+ኾ>hʼo;
+ዄ>hʼo;
+ዊ<>wi ;
+ዌ<>we ;
+ዐ<>ʻa ;
+ዒ<>ʻi ;
+ዔ<>ʻe ;
+ዚ<>zi ;
+ዜ<>ze ;
ዟ<>zwa;
-ዠ<>zhe;
+ዠ>zhe;
ዡ<>zhu;
ዣ<>zha;
-ዥ<>zhi;
+ዥ>zhi;
ዦ<>zho;
-ዪ<>yi$macron;
-ዬ<>ye$macron;
-ዲ<>di$macron;
-ዴ<>de$macron;
+ዪ<>yi ;
+ዬ<>ye ;
+ዲ<>di ;
+ዴ<>de ;
ዷ<>dwa;
-ዸ<>dhe;
+ዸ>dhe;
ዹ<>dhu;
ዻ<>dha;
-ዽ<>dhi;
+ዽ>dhi;
ዾ<>dho;
-ጂ<>ji$macron;
-ጄ<>je$macron;
+ጂ<>ji ;
+ጄ<>je ;
ጇ<>jwa;
-ጊ<>gi$macron;
-ጌ<>ge$macron;
+ጊ<>gi ;
+ጌ<>ge ;
ጐ<>gwe;
ጓ<>gwa;
-ጕ<>gwi;
-ጘ<>ghe;
+ጕ>gwi;
+ጘ>ghe;
ጙ<>ghu;
ጛ<>gha;
-ጝ<>ghi;
+ጝ>ghi;
ጞ<>gho;
-ጠ<>t$apos e;
-ጡ<>t$apos u;
-ጣ<>t$apos a;
-ጥ<>t$apos i;
-ጦ<>t$apos o;
-ጰ<>p$apos e;
-ጱ<>p$apos u;
-ጳ<>p$apos a;
-ጵ<>p$apos i;
-ጶ<>p$apos o;
-ፊ<>fi$macron;
-ፌ<>fe$macron;
+ጠ>tʼe;
+ጡ<>tʼu;
+ጣ<>tʼa;
+ጥ>tʼi;
+ጦ<>tʼo;
+ጰ>pʼe;
+ጱ<>pʼu;
+ጳ<>pʼa;
+ጵ>pʼi;
+ጶ<>pʼo;
+ፊ<>fi ;
+ፌ<>fe ;
ፏ<>fwa;
-ፒ<>pi$macron;
-ፔ<>pe$macron;
+ፒ<>pi ;
+ፔ<>pe ;
ፗ<>pwa;
ፘ<>rya;
ፙ<>mya;
ፚ<>fya;
ሁ<>hu;
-ሃ<>ha;
-ህ<>hi;
+ሃ>ha;
+ህ>hi;
ሆ<>ho;
-ለ<>le;
+ለ>le;
ሉ<>lu;
ላ<>la;
-ል<>li;
+ል>li;
ሎ<>lo;
-ሑ<>hu;
-ሓ<>ha;
-ሕ<>hi;
-ሖ<>ho;
-መ<>me;
+ሑ>hu;
+መ>me;
ሙ<>mu;
ማ<>ma;
-ም<>mi;
+ም>mi;
ሞ<>mo;
-ረ<>re;
+ረ>re;
ሩ<>ru;
ራ<>ra;
-ር<>ri;
+ር>ri;
ሮ<>ro;
-ሰ<>se;
+ሰ>se;
ሱ<>su;
ሳ<>sa;
-ስ<>si;
+ስ>si;
ሶ<>so;
በ<>be;
ቡ<>bu;
ባ<>ba;
-ብ<>bi;
+ብ>bi;
ቦ<>bo;
-ቨ<>ve;
+ቨ>ve;
ቩ<>vu;
ቫ<>va;
-ቭ<>vi;
+ቭ>vi;
ቮ<>vo;
-ተ<>te;
+ተ>te;
ቱ<>tu;
ታ<>ta;
-ት<>ti;
+ት>ti;
ቶ<>to;
-ነ<>ne;
+ነ>ne;
ኑ<>nu;
ና<>na;
-ን<>ni;
+ን>ni;
ኖ<>no;
-ኡ<$apos u;
-ኣ<$apos a;
-እ<$apos i;
-ኦ<$apos o;
-አ<>a$macron;
-ኢ<>i$macron;
-ኤ<>e$macron;
+ኡ<ʼu;
+ኣ<ʼa;
+እ<ʼi;
+ኦ<ʼo;
+አ<>a ;
+ኢ<>i ;
+ኤ<>e ;
ኧ<>wa;
-ከ<>ke;
+ከ>ke;
ኩ<>ku;
ካ<>ka;
-ክ<>ki;
+ክ>ki;
ኮ<>ko;
ኴ>ko;
-ወ<>we;
+ወ>we;
ዉ<>wu;
-ዋ<>wa;
-ው<>wi;
+ዋ>wa;
+ው>wi;
ዎ<>wo;
-ዑ<>ʻ u;
-ዓ<>ʻ a;
-ዕ<>ʻ i;
-ዖ<>ʻ o;
-ዘ<>ze;
+ዑ<>ʻu;
+ዓ>ʻa;
+ዕ>ʻi;
+ዖ<>ʻo;
+ዘ>ze;
ዙ<>zu;
ዛ<>za;
-ዝ<>zi;
+ዝ>zi;
ዞ<>zo;
-የ<>ye;
+የ>ye;
ዩ<>yu;
ያ<>ya;
-ይ<>yi;
+ይ>yi;
ዮ<>yo;
-ደ<>de;
+ደ>de;
ዱ<>du;
ዳ<>da;
-ድ<>di;
+ድ>di;
ዶ<>do;
-ጀ<>je;
+ጀ>je;
ጁ<>ju;
ጃ<>ja;
-ጅ<>ji;
+ጅ>ji;
ጆ<>jo;
-ገ<>ge;
+ገ>ge;
ጉ<>gu;
ጋ<>ga;
-ግ<>gi;
+ግ>gi;
ጎ<>go;
ጔ>go;
-ፈ<>fe;
+ፈ>fe;
ፉ<>fu;
ፋ<>fa;
-ፍ<>fi;
+ፍ>fi;
ፎ<>fo;
-ፐ<>pe;
+ፐ>pe;
ፑ<>pu;
ፓ<>pa;
-ፕ<>pi;
+ፕ>pi;
ፖ<>po;
ኡ<>u;
-ኣ<>a;
-እ<>i;
+ኣ>a;
+እ>i;
ኦ<>o;
፡<>' ';
።<>'.';
Modified: trunk/source/data/translit/crosswire/Ethiopic_Latin_UNGEGN.txt
===================================================================
--- trunk/source/data/translit/crosswire/Ethiopic_Latin_UNGEGN.txt 2009-02-28 10:08:41 UTC (rev 178)
+++ trunk/source/data/translit/crosswire/Ethiopic_Latin_UNGEGN.txt 2009-02-28 12:01:29 UTC (rev 179)
@@ -8,6 +8,7 @@
#-------------------------------------------------------------------
# Ethiopic-Latin/UNGEGN
:: NFD (NFC);
+$apos = ʼ;
$macron = ̱;
ቘ<>kh$apos we$macron;
ቝ<>kh$apos wi$macron;
@@ -24,8 +25,8 @@
ጸ<>ts$apos e$macron;
ጽ<>ts$apos i$macron;
ጿ<>ts$apos wa;
-ፀ<>ts$apos e$macron;
-ፅ<>ts$apos i$macron;
+ፀ>ts$apos e$macron;
+ፅ>ts$apos i$macron;
ሸ<>she$macron;
ሽ<>shi$macron;
ሿ<>shwa;
@@ -49,8 +50,8 @@
ኟ<>nywa;
ኰ<>kwe$macron;
ኵ<>kwi$macron;
-ዀ<>hwe$macron;
-ዅ<>hwi$macron;
+ዀ>hwe$macron;
+ዅ>hwi$macron;
ዠ<>zhe$macron;
ዥ<>zhi$macron;
ዧ<>zhwa;
@@ -77,23 +78,23 @@
ጻ<>ts$apos a;
ጼ<>ts$apos e;
ጾ<>ts$apos o;
-ፁ<>ts$apos u;
-ፂ<>ts$apos i;
-ፃ<>ts$apos a;
-ፄ<>ts$apos e;
-ፆ<>ts$apos o;
+ፁ>ts$apos u;
+ፂ>ts$apos i;
+ፃ>ts$apos a;
+ፄ>ts$apos e;
+ፆ>ts$apos o;
ህ<>hi$macron;
ለ<>le$macron;
ል<>li$macron;
ሏ<>lwa;
-ሕ<>hi$macron;
+ሕ>hi$macron;
ሗ<>hwa;
መ<>me$macron;
ም<>mi$macron;
ሟ<>mwa;
-ሠ<>se$macron;
-ሥ<>si$macron;
-ሧ<>swa;
+ሠ>se$macron;
+ሥ>si$macron;
+ሧ>swa;
ረ<>re$macron;
ር<>ri$macron;
ሯ<>rwa;
@@ -124,9 +125,9 @@
ቻ<>cha;
ቼ<>che;
ቾ<>cho;
-ኅ<>hi$macron;
+ኅ>hi$macron;
ኊ<>hwi;
-ኋ<>hwa;
+ኋ>hwa;
ኌ<>hwe;
ነ<>ne$macron;
ን<>ni$macron;
@@ -142,10 +143,10 @@
ኳ<>kwa;
ኴ<>kwe;
ኸ<>he$macron;
-ኽ<>hi$macron;
-ዂ<>hwi;
-ዃ<>hwa;
-ዄ<>hwe;
+ኽ>hi$macron;
+ዂ>hwi;
+ዃ>hwa;
+ዄ>hwe;
ወ<>we$macron;
ው<>wi$macron;
ዘ<>ze$macron;
@@ -201,7 +202,7 @@
ሀ<>ha;
ሁ<>hu;
ሂ<>hi;
-ሃ<>ha;
+ሃ>ha;
ሄ<>he;
ሆ<>ho;
ሉ<>lu;
@@ -209,22 +210,22 @@
ላ<>la;
ሌ<>le;
ሎ<>lo;
-ሐ<>ha;
-ሑ<>hu;
-ሒ<>hi;
-ሓ<>ha;
-ሔ<>he;
-ሖ<>ho;
+ሐ>ha;
+ሑ>hu;
+ሒ>hi;
+ሓ>ha;
+ሔ>he;
+ሖ>ho;
ሙ<>mu;
ሚ<>mi;
ማ<>ma;
ሜ<>me;
ሞ<>mo;
-ሡ<>su;
-ሢ<>si;
-ሣ<>sa;
-ሤ<>se;
-ሦ<>so;
+ሡ>su;
+ሢ>si;
+ሣ>sa;
+ሤ>se;
+ሦ>so;
ሩ<>ru;
ሪ<>ri;
ራ<>ra;
@@ -250,12 +251,12 @@
ታ<>ta;
ቴ<>te;
ቶ<>to;
-ኀ<>ha;
-ኁ<>hu;
-ኂ<>hi;
-ኃ<>ha;
-ኄ<>he;
-ኆ<>ho;
+ኀ>ha;
+ኁ>hu;
+ኂ>hi;
+ኃ>ha;
+ኄ>he;
+ኆ>ho;
ኑ<>nu;
ኒ<>ni;
ና<>na;
@@ -268,17 +269,17 @@
ካ<>ka;
ኬ<>ke;
ኮ<>ko;
-ኹ<>hu;
-ኺ<>hi;
-ኻ<>ha;
-ኼ<>he;
-ኾ<>ho;
+ኹ>hu;
+ኺ>hi;
+ኻ>ha;
+ኼ>he;
+ኾ>ho;
ዉ<>wu;
ዊ<>wi;
-ዋ<>wa;
+ዋ>wa;
ዌ<>we;
ዎ<>wo;
-ዕ<>i$macron;
+ዕ>i$macron;
ዙ<>zu;
ዚ<>zi;
ዛ<>za;
@@ -317,15 +318,15 @@
አ<>a;
ኡ<>u;
ኢ<>i;
-ኣ<>a;
+ኣ>a;
ኤ<>e;
ኦ<>o;
-ዐ<>a;
-ዑ<>u;
-ዒ<>i;
-ዓ<>a;
-ዔ<>e;
-ዖ<>o;
+ዐ>a;
+ዑ>u;
+ዒ>i;
+ዓ>a;
+ዔ>e;
+ዖ>o;
፡<>' ';
።<>'.';
፣<>',';
Modified: trunk/source/data/translit/crosswire/Georgian_Latin_ALALC.txt
===================================================================
--- trunk/source/data/translit/crosswire/Georgian_Latin_ALALC.txt 2009-02-28 10:08:41 UTC (rev 178)
+++ trunk/source/data/translit/crosswire/Georgian_Latin_ALALC.txt 2009-02-28 12:01:29 UTC (rev 179)
@@ -8,25 +8,20 @@
#--------------------------------------------------------------------
# Georgian-Latin/ALALC
:: NFD (NFC);
-$caron = ̌;
-$macron = ̄;
-$odot = ̇;
-$udot = ̣;
-$breve = ̆;
# uppercase digraphs
-Ⴙ>C$caronʻ;
+Ⴙ>Čʻ;
Ⴚ>Cʻ;
Ⴇ>Tʻ;
-Ⴏ>Z$breve;
+Ⴏ>Z̆;
Ⴔ>Pʻ;
Ⴕ>Kʻ;
-Ⴖ>G$odot;
-Ⴘ>S$caron;
-Ⴛ>Z $odot;
-Ⴝ>C$caron;
-Ⴡ>E$macron;
-Ⴤ>X $udot;
-Ⴥ>O$macron;
+Ⴖ>Ġ;
+Ⴘ>Š;
+Ⴛ>Z ̇;
+Ⴝ>Č;
+Ⴡ>Ē;
+Ⴤ>X ̣;
+Ⴥ>Ō;
Ⴀ>A;
Ⴁ>B;
Ⴂ>G;
@@ -53,20 +48,20 @@
Ⴢ>Y;
Ⴣ>W;
#l owercase digraphs
-ჩ<>c$caronʻ;
+ჩ<>čʻ;
ც<>cʻ;
თ<>tʻ;
-ჟ<>z$breve;
+ჟ<>z̆;
ფ<>pʻ;
ქ<>kʻ;
-ღ<>g$odot;
-შ<>s$caron;
-ძ<>z $odot;
-ჭ<>c$caron;
-ჱ<>e$macron;
-ჴ<>x $udot;
-ჵ<>o$macron;
-Ƿ<>e $breve;
+ღ<>ġ;
+შ<>š;
+ძ<>z ̇;
+ჭ<>č;
+ჱ<>ē;
+ჴ<>x ̣;
+ჵ<>ō;
+Ƿ<>e ̆;
ა<>a;
ბ<>b;
გ<>g;
Modified: trunk/source/data/translit/crosswire/Georgian_Latin_BGN.txt
===================================================================
--- trunk/source/data/translit/crosswire/Georgian_Latin_BGN.txt 2009-02-28 10:08:41 UTC (rev 178)
+++ trunk/source/data/translit/crosswire/Georgian_Latin_BGN.txt 2009-02-28 12:01:29 UTC (rev 179)
@@ -109,6 +109,6 @@
჻<>¶;
# completeness mappings for latin
კ<c;
-ხ;<x;
+ხ<x;
:: ([:LATIN:] lower);
:: NFC (NFD);
Modified: trunk/source/data/translit/crosswire/Georgian_Latin_ISO.txt
===================================================================
--- trunk/source/data/translit/crosswire/Georgian_Latin_ISO.txt 2009-02-28 10:08:41 UTC (rev 178)
+++ trunk/source/data/translit/crosswire/Georgian_Latin_ISO.txt 2009-02-28 12:01:29 UTC (rev 179)
@@ -8,23 +8,21 @@
#--------------------------------------------------------------------
# Georgian-Latin/ISO
:: NFD (NFC);
-$caron = ̌;
-$macron = ̄;
# uppercase digraphs
-Ⴙ>C$caronʼ;
+Ⴙ>Čʼ;
Ⴚ>Cʼ;
Ⴇ>Tʼ;
-Ⴏ>Z$caron;
+Ⴏ>Ž;
Ⴔ>Pʼ;
Ⴕ>Kʼ;
-Ⴖ>G$macron;
-Ⴘ>S$caron;
-Ⴝ>C$caron;
-Ⴟ>J$caron;
+Ⴖ>Ḡ;
+Ⴘ>Š;
+Ⴝ>Č;
+Ⴟ>J̌;
# non-ISO
-Ⴡ>E$macron;
+Ⴡ>Ē;
Ⴤ>Qʼ;
-Ⴥ>O$macron;
+Ⴥ>Ō;
Ⴀ>A;
Ⴁ>B;
Ⴂ>G;
@@ -51,20 +49,20 @@
Ⴢ>Y;
Ⴣ>W;
# lowercase digraphs
-ჩ<>c$caronʼ;
+ჩ<>čʼ;
ც<>cʼ;
თ<>tʼ;
-ჟ<>z$caron;
+ჟ<>ž;
ფ<>pʼ;
ქ<>kʼ;
-ღ<>g$macron;
-შ<>s$caron;
-ჭ<>c$caron;
-ჯ<>j$caron;
+ღ<>ḡ;
+შ<>š;
+ჭ<>č;
+ჯ<>ǰ;
# non-ISO
-ჱ<>e$macron;
+ჱ<>ē;
ჴ<>qʼ;
-ჵ<>o$macron;
+ჵ<>ō;
ა<>a;
ბ<>b;
გ<>g;
Modified: trunk/source/data/translit/crosswire/Thaana_Latin_ALALC.txt
===================================================================
--- trunk/source/data/translit/crosswire/Thaana_Latin_ALALC.txt 2009-02-28 10:08:41 UTC (rev 178)
+++ trunk/source/data/translit/crosswire/Thaana_Latin_ALALC.txt 2009-02-28 12:01:29 UTC (rev 179)
@@ -6,10 +6,13 @@
# Based ALA-LC Romanization from
# http://lcweb.loc.gov/catdir/cpso/romanization/divehi.pdf
#--------------------------------------------------------------------
+# This transform definitely needs more attention
# Thaana-Latin/ALALC
:: NFD (NFC);
+$consonants = [\u0780-\u07A5];
+
ށް}[:^L:]>ḫ;
-ށް}[:L:]>ḫ |$1;
+ށް}[$consonants]>ḫ;
ތްތ<>t̤t;
ޘ<>th;
ޙ<>ḥ;
@@ -36,7 +39,7 @@
[:^L:]{އ>;
އް([:L:])>|$1 $1;
އް<>ẖ;
-އ<>ʼ;
+އ>;
ހ<>h;
ން<>ṁ;
ނ<>n;
@@ -60,7 +63,7 @@
ޫ<>ū;
ޭ<>ē;
ޯ<>ō;
-|$1 އ $1<([aeiou])([aeiou]);
+|$1 އ $2<([aeiou])([aeiou]);
ަ<>a;
ި<>i;
ު<>u;
Modified: trunk/source/data/translit/crosswire/Thaana_Latin_BGN.txt
===================================================================
--- trunk/source/data/translit/crosswire/Thaana_Latin_BGN.txt 2009-02-28 10:08:41 UTC (rev 178)
+++ trunk/source/data/translit/crosswire/Thaana_Latin_BGN.txt 2009-02-28 12:01:29 UTC (rev 179)
@@ -6,10 +6,11 @@
# Based BGN/PCGN 1988 from
# http://www.eki.ee/wgrs/rom2_dv.pdf
#--------------------------------------------------------------------
+# This transform definitely needs more attention
# Thaana-Latin/BGN
:: NFD (NFC);
[ށއ]ް}[:^L:]>h;
-[ށއ]ް([:L:])>|$1$1;
+[ށއ]ް([:L:])>|$1;
ޘ<>thʼ;
ޛ<>dhʼ;
ޝ<>shʼ;
@@ -54,7 +55,7 @@
ޫ<>ee;
ޭ<>oa;
ޯ<>oo;
-|$1 އ $1<([aeiou])([aeiou]);
+|$1 އ $2<([aeiou])([aeiou]);
ަ<>a;
ި<>e;
ު<>i;
Modified: trunk/source/data/translit/crosswire/cldr/Ethiopic-Latin-BGN.xml
===================================================================
--- trunk/source/data/translit/crosswire/cldr/Ethiopic-Latin-BGN.xml 2009-02-28 10:08:41 UTC (rev 178)
+++ trunk/source/data/translit/crosswire/cldr/Ethiopic-Latin-BGN.xml 2009-02-28 12:01:29 UTC (rev 179)
@@ -11,354 +11,339 @@
<comment># Based on BGN/PCGN 1967 from</comment>
<comment># http://www.eki.ee/wgrs/rom1_am.pdf</comment>
<comment>#-------------------------------------------------------------------</comment>
-<comment># Ethiopic-Latin/BGNPCGN</comment>
+<comment># Ethiopic-Latin/BGN</comment>
<tRule>:: NFD (NFC);</tRule>
-<tRule>$macron = ̄;</tRule>
-<tRule>$udot = ̣;</tRule>
-<tRule>$apos = ʼ;</tRule>
-<tRule>$caron = ʼ;</tRule>
-<tRule>$ucaron = ʼ;</tRule>
-<tRule>$umacron = ʼ;</tRule>
-<tRule>[:L:]{አ→$apos a$macron;</tRule>
-<tRule>[:L:]{ኡ→$apos u;</tRule>
-<tRule>[:L:]{ኢ→$apos i$macron;</tRule>
-<tRule>[:L:]{ኣ→$apos a;</tRule>
-<tRule>[:L:]{ኤ→$apos e$macron;</tRule>
-<tRule>[:L:]{እ→$apos i;</tRule>
-<tRule>[:L:]{ኦ→$apos o;</tRule>
-<tRule>[:L:]{ኧ→$apos wa;</tRule>
-<tRule>ፂ↔t$umacron s$umacron $apos i$macron;</tRule>
-<tRule>ፄ↔t$umacron s$umacron $apos e$macron;</tRule>
-<tRule>ቚ↔kh$apos wi$macron;</tRule>
-<tRule>ፀ↔t$umacron s$umacron $apos e;</tRule>
-<tRule>ፁ↔t$umacron s$umacron $apos u;</tRule>
-<tRule>ፃ↔t$umacron s$umacron $apos a;</tRule>
-<tRule>ፅ↔t$umacron s$umacron $apos i;</tRule>
-<tRule>ፆ↔t$umacron s$umacron $apos o;</tRule>
-<tRule>ቊ↔k$apos wi$macron;</tRule>
-<tRule>ቒ↔kh$apos i$macron;</tRule>
-<tRule>ቔ↔kh$apos e$macron;</tRule>
-<tRule>ቘ↔kh$apos we;</tRule>
-<tRule>ቛ↔kh$apos wa;</tRule>
-<tRule>ቝ↔kh$apos wi;</tRule>
-<tRule>ኊ↔h$ucaron wi$macron;</tRule>
-<tRule>ዂ↔h$umacron wi$macron;</tRule>
-<tRule>ጪ↔ch$apos i$macron;</tRule>
-<tRule>ጬ↔ch$apos e$macron;</tRule>
-<tRule>ጯ↔ch$apos wa;</tRule>
-<tRule>ጺ↔ts$apos i$macron;</tRule>
-<tRule>ጼ↔ts$apos e$macron;</tRule>
-<tRule>ጿ↔ts$apos wa;</tRule>
-<tRule>ሐ←h$udot a$macron;</tRule>
-<tRule>ሒ←h$udot i$macron;</tRule>
-<tRule>ሔ←h$udot e$macron;</tRule>
-<tRule>ሗ←h$udot wa;</tRule>
-<tRule>ሢ↔s$caron i$macron;</tRule>
-<tRule>ሤ↔s$caron e$macron;</tRule>
-<tRule>ሧ↔s$caron wa;</tRule>
-<tRule>ሺ↔shi$macron;</tRule>
-<tRule>ሼ↔she$macron;</tRule>
+<tRule>[:L:]{አ→ʼa ;</tRule>
+<tRule>[:L:]{ኡ→ʼu;</tRule>
+<tRule>[:L:]{ኢ→ʼi ;</tRule>
+<tRule>[:L:]{ኣ→ʼa;</tRule>
+<tRule>[:L:]{ኤ→ʼe ;</tRule>
+<tRule>[:L:]{እ→ʼi;</tRule>
+<tRule>[:L:]{ኦ→ʼo;</tRule>
+<tRule>[:L:]{ኧ→ʼwa;</tRule>
+<tRule>ፂ↔tʼsʼi ;</tRule>
+<tRule>ፄ↔tʼsʼe ;</tRule>
+<tRule>ቚ↔khʼwi ;</tRule>
+<tRule>ፀ→tʼsʼe;</tRule>
+<tRule>ፁ↔tʼsʼu;</tRule>
+<tRule>ፃ↔tʼsʼa;</tRule>
+<tRule>ፅ→tʼsʼi;</tRule>
+<tRule>ፆ↔tʼsʼo;</tRule>
+<tRule>ቊ↔kʼwi ;</tRule>
+<tRule>ቒ↔khʼi ;</tRule>
+<tRule>ቔ↔khʼe ;</tRule>
+<tRule>ቘ↔khʼwe;</tRule>
+<tRule>ቛ↔khʼwa;</tRule>
+<tRule>ቝ→khʼwi;</tRule>
+<tRule>ኊ↔hʼwi ;</tRule>
+<tRule>ዂ→hʼwi ;</tRule>
+<tRule>ጪ↔chʼi ;</tRule>
+<tRule>ጬ↔chʼe ;</tRule>
+<tRule>ጯ↔chʼwa;</tRule>
+<tRule>ጺ↔tsʼi ;</tRule>
+<tRule>ጼ↔tsʼe ;</tRule>
+<tRule>ጿ↔tsʼwa;</tRule>
+<tRule>ሐ↔ḥa ;</tRule>
+<tRule>ሒ↔ḥi ;</tRule>
+<tRule>ሔ↔ḥe ;</tRule>
+<tRule>ሗ↔ḥwa;</tRule>
+<tRule>ሢ↔sʼi ;</tRule>
+<tRule>ሤ↔sʼe ;</tRule>
+<tRule>ሧ↔sʼwa;</tRule>
+<tRule>ሺ↔shi ;</tRule>
+<tRule>ሼ↔she ;</tRule>
<tRule>ሿ↔shwa;</tRule>
-<tRule>ቂ↔k$apos i$macron;</tRule>
-<tRule>ቄ↔k$apos e$macron;</tRule>
-<tRule>ቈ↔k$apos we;</tRule>
-<tRule>ቋ↔k$apos wa;</tRule>
-<tRule>ቍ↔k$apos wi;</tRule>
-<tRule>ቐ↔kh$apos e;</tRule>
-<tRule>ቑ↔kh$apos u;</tRule>
-<tRule>ቓ↔kh$apos a;</tRule>
-<tRule>ቕ↔kh$apos i;</tRule>
-<tRule>ቖ↔kh$apos o;</tRule>
-<tRule>ቜ→kh$apos o;</tRule>
-<tRule>ቺ↔chi$macron;</tRule>
-<tRule>ቼ↔che$macron;</tRule>
+<tRule>ቂ↔kʼi ;</tRule>
+<tRule>ቄ↔kʼe ;</tRule>
+<tRule>ቈ↔kʼwe;</tRule>
+<tRule>ቋ↔kʼwa;</tRule>
+<tRule>ቍ→kʼwi;</tRule>
+<tRule>ቐ→khʼe;</tRule>
+<tRule>ቑ↔khʼu;</tRule>
+<tRule>ቓ↔khʼa;</tRule>
+<tRule>ቕ→khʼi;</tRule>
+<tRule>ቖ↔khʼo;</tRule>
+<tRule>ቜ→khʼo;</tRule>
+<tRule>ቺ↔chi ;</tRule>
+<tRule>ቼ↔che ;</tRule>
<tRule>ቿ↔chwa;</tRule>
-<tRule>ኀ↔h$ucaron a$macron;</tRule>
-<tRule>ኂ↔h$ucaron i$macron;</tRule>
-<tRule>ኄ↔h$ucaron e$macron;</tRule>
-<tRule>ኈ↔h$ucaron we;</tRule>
-<tRule>ኋ↔h$ucaron wa;</tRule>
-<tRule>ኍ↔h$ucaron wi;</tRule>
-<tRule>ኚ↔nyi$macron;</tRule>
-<tRule>ኜ↔nye$macron;</tRule>
+<tRule>ኀ↔hʼa ;</tRule>
+<tRule>ኂ↔hʼi ;</tRule>
+<tRule>ኄ↔hʼe ;</tRule>
+<tRule>ኈ↔hʼwe;</tRule>
+<tRule>ኋ↔hʼwa;</tRule>
+<tRule>ኍ→hʼwi;</tRule>
+<tRule>ኚ↔nyi ;</tRule>
+<tRule>ኜ↔nye ;</tRule>
<tRule>ኟ↔nywa;</tRule>
-<tRule>ኲ↔kwi$macron;</tRule>
-<tRule>ኺ↔h$umacron i$macron;</tRule>
-<tRule>ኼ↔h$umacron e$macron;</tRule>
-<tRule>ዀ↔h$umacron we;</tRule>
-<tRule>ዃ↔h$umacron wa;</tRule>
-<tRule>ዅ↔h$umacron wi;</tRule>
-<tRule>ዢ↔zhi$macron;</tRule>
-<tRule>ዤ↔zhe$macron;</tRule>
+<tRule>ኲ↔kwi ;</tRule>
+<tRule>ኺ→hʼi ;</tRule>
+<tRule>ኼ→hʼe ;</tRule>
+<tRule>ዀ→hʼwe;</tRule>
+<tRule>ዃ→hʼwa;</tRule>
+<tRule>ዅ→hʼwi;</tRule>
+<tRule>ዢ↔zhi ;</tRule>
+<tRule>ዤ↔zhe ;</tRule>
<tRule>ዧ↔zhwa;</tRule>
-<tRule>ዺ↔dhi$macron;</tRule>
-<tRule>ዼ↔dhe$macron;</tRule>
+<tRule>ዺ↔dhi ;</tRule>
+<tRule>ዼ↔dhe ;</tRule>
<tRule>ዿ↔dhwo;</tRule>
-<tRule>ጒ↔gwi$macron;</tRule>
-<tRule>ጚ↔ghi$macron;</tRule>
-<tRule>ጜ↔ghe$macron;</tRule>
-<tRule>ጢ↔t$apos i$macron;</tRule>
-<tRule>ጤ↔t$apos e$macron;</tRule>
-<tRule>ጧ↔t$apos wa;</tRule>
-<tRule>ጨ↔ch$apos e;</tRule>
-<tRule>ጩ↔ch$apos u;</tRule>
-<tRule>ጫ↔ch$apos a;</tRule>
-<tRule>ጭ↔ch$apos i;</tRule>
-<tRule>ጮ↔ch$apos o;</tRule>
-<tRule>ጲ↔p$apos i$macron;</tRule>
-<tRule>ጴ↔p$apos e$macron;</tRule>
-<tRule>ጷ↔p$apos wa;</tRule>
-<tRule>ጸ↔ts$apos e;</tRule>
-<tRule>ጹ↔ts$apos u;</tRule>
-<tRule>ጻ↔ts$apos a;</tRule>
-<tRule>ጽ↔ts$apos i;</tRule>
-<tRule>ጾ↔ts$apos o;</tRule>
-<tRule>ሀ↔ha$macron;</tRule>
-<tRule>ሂ↔hi$macron;</tRule>
-<tRule>ሄ↔he$macron;</tRule>
-<tRule>ሊ↔li$macron;</tRule>
-<tRule>ሌ↔le$macron;</tRule>
+<tRule>ጒ↔gwi ;</tRule>
+<tRule>ጚ↔ghi ;</tRule>
+<tRule>ጜ↔ghe ;</tRule>
+<tRule>ጢ↔tʼi ;</tRule>
+<tRule>ጤ↔tʼe ;</tRule>
+<tRule>ጧ↔tʼwa;</tRule>
+<tRule>ጨ→chʼe;</tRule>
+<tRule>ጩ↔chʼu;</tRule>
+<tRule>ጫ↔chʼa;</tRule>
+<tRule>ጭ→chʼi;</tRule>
+<tRule>ጮ↔chʼo;</tRule>
+<tRule>ጲ↔pʼi ;</tRule>
+<tRule>ጴ↔pʼe ;</tRule>
+<tRule>ጷ↔pʼwa;</tRule>
+<tRule>ጸ→tsʼe;</tRule>
+<tRule>ጹ↔tsʼu;</tRule>
+<tRule>ጻ↔tsʼa;</tRule>
+<tRule>ጽ→tsʼi;</tRule>
+<tRule>ጾ↔tsʼo;</tRule>
+<tRule>ሀ↔ha ;</tRule>
+<tRule>ሂ↔hi ;</tRule>
+<tRule>ሄ↔he ;</tRule>
+<tRule>ሊ↔li ;</tRule>
+<tRule>ሌ↔le ;</tRule>
<tRule>ሏ↔lwa;</tRule>
-<tRule>ሐ↔ha$macron;</tRule>
-<tRule>ሒ↔hi$macron;</tRule>
-<tRule>ሔ↔he$macron;</tRule>
-<tRule>ሗ↔hwa;</tRule>
-<tRule>ሑ←h$udot u;</tRule>
-<tRule>ሓ←h$udot a;</tRule>
-<tRule>ሕ←h$udot i;</tRule>
-<tRule>ሖ←h$udot o;</tRule>
-<tRule>ሚ↔mi$macron;</tRule>
-<tRule>ሜ↔me$macron;</tRule>
+<tRule>ሑ←ḥu;</tRule>
+<tRule>ሓ→ḥa;</tRule>
+<tRule>ሕ→ḥi;</tRule>
+<tRule>ሖ↔ḥo;</tRule>
+<tRule>ሚ↔mi ;</tRule>
+<tRule>ሜ↔me ;</tRule>
<tRule>ሟ↔mwa;</tRule>
-<tRule>ሠ↔s$caron e;</tRule>
-<tRule>ሡ↔s$caron u;</tRule>
-<tRule>ሣ↔s$caron a;</tRule>
-<tRule>ሥ↔s$caron i;</tRule>
-<tRule>ሦ↔s$caron o;</tRule>
-<tRule>ሪ↔ri$macron;</tRule>
-<tRule>ሬ↔re$macron;</tRule>
+<tRule>ሠ→sʼe;</tRule>
+<tRule>ሡ↔sʼu;</tRule>
+<tRule>ሣ↔sʼa;</tRule>
+<tRule>ሥ→sʼi;</tRule>
+<tRule>ሦ↔sʼo;</tRule>
+<tRule>ሪ↔ri ;</tRule>
+<tRule>ሬ↔re ;</tRule>
<tRule>ሯ↔rwa;</tRule>
-<tRule>ሲ↔si$macron;</tRule>
-<tRule>ሴ↔se$macron;</tRule>
+<tRule>ሲ↔si ;</tRule>
+<tRule>ሴ↔se ;</tRule>
<tRule>ሷ↔swa;</tRule>
-<tRule>ሸ↔she;</tRule>
+<tRule>ሸ→she;</tRule>
<tRule>ሹ↔shu;</tRule>
<tRule>ሻ↔sha;</tRule>
-<tRule>ሽ↔shi;</tRule>
+<tRule>ሽ→shi;</tRule>
<tRule>ሾ↔sho;</tRule>
-<tRule>ቀ↔k$apos e;</tRule>
-<tRule>ቁ↔k$apos u;</tRule>
-<tRule>ቃ↔k$apos a;</tRule>
-<tRule>ቅ↔k$apos i;</tRule>
-<tRule>ቆ↔k$apos o;</tRule>
-<tRule>ቌ→k$apos o;</tRule>
-<tRule>ቢ↔bi$macron;</tRule>
-<tRule>ቤ↔be$macron;</tRule>
+<tRule>ቀ→kʼe;</tRule>
+<tRule>ቁ↔kʼu;</tRule>
+<tRule>ቃ↔kʼa;</tRule>
+<tRule>ቅ→kʼi;</tRule>
+<tRule>ቆ↔kʼo;</tRule>
+<tRule>ቌ→kʼo;</tRule>
+<tRule>ቢ↔bi ;</tRule>
+<tRule>ቤ→be ;</tRule>
<tRule>ቧ↔bwa;</tRule>
-<tRule>ቪ↔vi$macron;</tRule>
-<tRule>ቬ↔ve$macron;</tRule>
+<tRule>ቪ↔vi ;</tRule>
+<tRule>ቬ↔ve ;</tRule>
<tRule>ቯ↔vwa;</tRule>
-<tRule>ቲ↔ti$macron;</tRule>
-<tRule>ቴ↔te$macron;</tRule>
+<tRule>ቲ↔ti ;</tRule>
+<tRule>ቴ↔te ;</tRule>
<tRule>ቷ↔twa;</tRule>
-<tRule>ቸ↔che;</tRule>
+<tRule>ቸ→che;</tRule>
<tRule>ቹ↔chu;</tRule>
<tRule>ቻ↔cha;</tRule>
-<tRule>ች↔chi;</tRule>
+<tRule>ች→chi;</tRule>
<tRule>ቾ↔cho;</tRule>
-<tRule>ኁ↔h$ucaron u;</tRule>
-<tRule>ኃ↔h$ucaron a;</tRule>
-<tRule>ኅ↔h$ucaron i;</tRule>
-<tRule>ኆ↔h$ucaron o;</tRule>
-<tRule>ኌ→h$ucaron o;</tRule>
-<tRule>ኒ↔ni$macron;</tRule>
-<tRule>ኔ↔ne$macron;</tRule>
+<tRule>ኁ↔hʼu;</tRule>
+<tRule>ኃ→hʼa;</tRule>
+<tRule>ኅ→hʼi;</tRule>
+<tRule>ኆ↔hʼo;</tRule>
+<tRule>ኌ→hʼo;</tRule>
+<tRule>ኒ↔ni ;</tRule>
+<tRule>ኔ↔ne ;</tRule>
<tRule>ኗ↔nwa;</tRule>
-<tRule>ኘ↔nye;</tRule>
+<tRule>ኘ→nye;</tRule>
<tRule>ኙ↔nyu;</tRule>
<tRule>ኛ↔nya;</tRule>
-<tRule>ኝ↔nyi;</tRule>
+<tRule>ኝ→nyi;</tRule>
<tRule>ኞ↔nyo;</tRule>
-<tRule>አ←$apos a$macron;</tRule>
-<tRule>ኢ←$apos i$macron;</tRule>
-<tRule>ኤ←$apos e$macron;</tRule>
-<tRule>ኧ←$apos wa;</tRule>
-<tRule>ኪ↔ki$macron;</tRule>
-<tRule>ኬ↔ke$macron;</tRule>
+<tRule>ኤ←ʼe ;</tRule>
+<tRule>ኧ←ʼwa;</tRule>
+<tRule>ኪ↔ki ;</tRule>
+<tRule>ኬ↔ke ;</tRule>
<tRule>ኰ↔kwe;</tRule>
<tRule>ኳ↔kwa;</tRule>
-<tRule>ኵ↔kwi;</tRule>
-<tRule>ኸ↔h$umacron e;</tRule>
-<tRule>ኹ↔h$umacron u;</tRule>
-<tRule>ኻ↔h$umacron a;</tRule>
-<tRule>ኽ↔h$umacron i;</tRule>
-<tRule>ኾ↔h$umacron o;</tRule>
-<tRule>ዄ→h$umacron o;</tRule>
-<tRule>ዊ↔wi$macron;</tRule>
-<tRule>ዌ↔we$macron;</tRule>
-<tRule>ዐ↔ʻ a$macron;</tRule>
-<tRule>ዒ↔ʻ i$macron;</tRule>
-<tRule>ዔ↔ʻ e$macron;</tRule>
-<tRule>ዚ↔zi$macron;</tRule>
-<tRule>ዜ↔ze$macron;</tRule>
+<tRule>ኵ→kwi;</tRule>
+<tRule>ኸ→hʼe;</tRule>
+<tRule>ኹ→hʼu;</tRule>
+<tRule>ኻ→hʼa;</tRule>
+<tRule>ኽ→hʼi;</tRule>
+<tRule>ኾ→hʼo;</tRule>
+<tRule>ዄ→hʼo;</tRule>
+<tRule>ዊ↔wi ;</tRule>
+<tRule>ዌ↔we ;</tRule>
+<tRule>ዐ↔ʻa ;</tRule>
+<tRule>ዒ↔ʻi ;</tRule>
+<tRule>ዔ↔ʻe ;</tRule>
+<tRule>ዚ↔zi ;</tRule>
+<tRule>ዜ↔ze ;</tRule>
<tRule>ዟ↔zwa;</tRule>
-<tRule>ዠ↔zhe;</tRule>
+<tRule>ዠ→zhe;</tRule>
<tRule>ዡ↔zhu;</tRule>
<tRule>ዣ↔zha;</tRule>
-<tRule>ዥ↔zhi;</tRule>
+<tRule>ዥ→zhi;</tRule>
<tRule>ዦ↔zho;</tRule>
-<tRule>ዪ↔yi$macron;</tRule>
-<tRule>ዬ↔ye$macron;</tRule>
-<tRule>ዲ↔di$macron;</tRule>
-<tRule>ዴ↔de$macron;</tRule>
+<tRule>ዪ↔yi ;</tRule>
+<tRule>ዬ↔ye ;</tRule>
+<tRule>ዲ↔di ;</tRule>
+<tRule>ዴ↔de ;</tRule>
<tRule>ዷ↔dwa;</tRule>
-<tRule>ዸ↔dhe;</tRule>
+<tRule>ዸ→dhe;</tRule>
<tRule>ዹ↔dhu;</tRule>
<tRule>ዻ↔dha;</tRule>
-<tRule>ዽ↔dhi;</tRule>
+<tRule>ዽ→dhi;</tRule>
<tRule>ዾ↔dho;</tRule>
-<tRule>ጂ↔ji$macron;</tRule>
-<tRule>ጄ↔je$macron;</tRule>
+<tRule>ጂ↔ji ;</tRule>
+<tRule>ጄ↔je ;</tRule>
<tRule>ጇ↔jwa;</tRule>
-<tRule>ጊ↔gi$macron;</tRule>
-<tRule>ጌ↔ge$macron;</tRule>
+<tRule>ጊ↔gi ;</tRule>
+<tRule>ጌ↔ge ;</tRule>
<tRule>ጐ↔gwe;</tRule>
<tRule>ጓ↔gwa;</tRule>
-<tRule>ጕ↔gwi;</tRule>
-<tRule>ጘ↔ghe;</tRule>
+<tRule>ጕ→gwi;</tRule>
+<tRule>ጘ→ghe;</tRule>
<tRule>ጙ↔ghu;</tRule>
<tRule>ጛ↔gha;</tRule>
-<tRule>ጝ↔ghi;</tRule>
+<tRule>ጝ→ghi;</tRule>
<tRule>ጞ↔gho;</tRule>
-<tRule>ጠ↔t$apos e;</tRule>
-<tRule>ጡ↔t$apos u;</tRule>
-<tRule>ጣ↔t$apos a;</tRule>
-<tRule>ጥ↔t$apos i;</tRule>
-<tRule>ጦ↔t$apos o;</tRule>
-<tRule>ጰ↔p$apos e;</tRule>
-<tRule>ጱ↔p$apos u;</tRule>
-<tRule>ጳ↔p$apos a;</tRule>
-<tRule>ጵ↔p$apos i;</tRule>
-<tRule>ጶ↔p$apos o;</tRule>
-<tRule>ፊ↔fi$macron;</tRule>
-<tRule>ፌ↔fe$macron;</tRule>
+<tRule>ጠ→tʼe;</tRule>
+<tRule>ጡ↔tʼu;</tRule>
+<tRule>ጣ↔tʼa;</tRule>
+<tRule>ጥ→tʼi;</tRule>
+<tRule>ጦ↔tʼo;</tRule>
+<tRule>ጰ→pʼe;</tRule>
+<tRule>ጱ↔pʼu;</tRule>
+<tRule>ጳ↔pʼa;</tRule>
+<tRule>ጵ→pʼi;</tRule>
+<tRule>ጶ↔pʼo;</tRule>
+<tRule>ፊ↔fi ;</tRule>
+<tRule>ፌ↔fe ;</tRule>
<tRule>ፏ↔fwa;</tRule>
-<tRule>ፒ↔pi$macron;</tRule>
-<tRule>ፔ↔pe$macron;</tRule>
+<tRule>ፒ↔pi ;</tRule>
+<tRule>ፔ↔pe ;</tRule>
<tRule>ፗ↔pwa;</tRule>
<tRule>ፘ↔rya;</tRule>
<tRule>ፙ↔mya;</tRule>
<tRule>ፚ↔fya;</tRule>
<tRule>ሁ↔hu;</tRule>
-<tRule>ሃ↔ha;</tRule>
-<tRule>ህ↔hi;</tRule>
+<tRule>ሃ→ha;</tRule>
+<tRule>ህ→hi;</tRule>
<tRule>ሆ↔ho;</tRule>
-<tRule>ለ↔le;</tRule>
+<tRule>ለ→le;</tRule>
<tRule>ሉ↔lu;</tRule>
<tRule>ላ↔la;</tRule>
-<tRule>ል↔li;</tRule>
+<tRule>ል→li;</tRule>
<tRule>ሎ↔lo;</tRule>
-<tRule>ሑ↔hu;</tRule>
-<tRule>ሓ↔ha;</tRule>
-<tRule>ሕ↔hi;</tRule>
-<tRule>ሖ↔ho;</tRule>
-<tRule>መ↔me;</tRule>
+<tRule>ሑ→hu;</tRule>
+<tRule>መ→me;</tRule>
<tRule>ሙ↔mu;</tRule>
<tRule>ማ↔ma;</tRule>
-<tRule>ም↔mi;</tRule>
+<tRule>ም→mi;</tRule>
<tRule>ሞ↔mo;</tRule>
-<tRule>ረ↔re;</tRule>
+<tRule>ረ→re;</tRule>
<tRule>ሩ↔ru;</tRule>
<tRule>ራ↔ra;</tRule>
-<tRule>ር↔ri;</tRule>
+<tRule>ር→ri;</tRule>
<tRule>ሮ↔ro;</tRule>
-<tRule>ሰ↔se;</tRule>
+<tRule>ሰ→se;</tRule>
<tRule>ሱ↔su;</tRule>
<tRule>ሳ↔sa;</tRule>
-<tRule>ስ↔si;</tRule>
+<tRule>ስ→si;</tRule>
<tRule>ሶ↔so;</tRule>
<tRule>በ↔be;</tRule>
<tRule>ቡ↔bu;</tRule>
<tRule>ባ↔ba;</tRule>
-<tRule>ብ↔bi;</tRule>
+<tRule>ብ→bi;</tRule>
<tRule>ቦ↔bo;</tRule>
-<tRule>ቨ↔ve;</tRule>
+<tRule>ቨ→ve;</tRule>
<tRule>ቩ↔vu;</tRule>
<tRule>ቫ↔va;</tRule>
-<tRule>ቭ↔vi;</tRule>
+<tRule>ቭ→vi;</tRule>
<tRule>ቮ↔vo;</tRule>
-<tRule>ተ↔te;</tRule>
+<tRule>ተ→te;</tRule>
<tRule>ቱ↔tu;</tRule>
<tRule>ታ↔ta;</tRule>
-<tRule>ት↔ti;</tRule>
+<tRule>ት→ti;</tRule>
<tRule>ቶ↔to;</tRule>
-<tRule>ነ↔ne;</tRule>
+<tRule>ነ→ne;</tRule>
<tRule>ኑ↔nu;</tRule>
<tRule>ና↔na;</tRule>
-<tRule>ን↔ni;</tRule>
+<tRule>ን→ni;</tRule>
<tRule>ኖ↔no;</tRule>
-<tRule>ኡ←$apos u;</tRule>
-<tRule>ኣ←$apos a;</tRule>
-<tRule>እ←$apos i;</tRule>
-<tRule>ኦ←$apos o;</tRule>
-<tRule>አ↔a$macron;</tRule>
-<tRule>ኢ↔i$macron;</tRule>
-<tRule>ኤ↔e$macron;</tRule>
+<tRule>ኡ←ʼu;</tRule>
+<tRule>ኣ←ʼa;</tRule>
+<tRule>እ←ʼi;</tRule>
+<tRule>ኦ←ʼo;</tRule>
+<tRule>አ↔a ;</tRule>
+<tRule>ኢ↔i ;</tRule>
+<tRule>ኤ↔e ;</tRule>
<tRule>ኧ↔wa;</tRule>
-<tRule>ከ↔ke;</tRule>
+<tRule>ከ→ke;</tRule>
<tRule>ኩ↔ku;</tRule>
<tRule>ካ↔ka;</tRule>
-<tRule>ክ↔ki;</tRule>
+<tRule>ክ→ki;</tRule>
<tRule>ኮ↔ko;</tRule>
<tRule>ኴ→ko;</tRule>
-<tRule>ወ↔we;</tRule>
+<tRule>ወ→we;</tRule>
<tRule>ዉ↔wu;</tRule>
-<tRule>ዋ↔wa;</tRule>
-<tRule>ው↔wi;</tRule>
+<tRule>ዋ→wa;</tRule>
+<tRule>ው→wi;</tRule>
<tRule>ዎ↔wo;</tRule>
-<tRule>ዑ↔ʻ u;</tRule>
-<tRule>ዓ↔ʻ a;</tRule>
-<tRule>ዕ↔ʻ i;</tRule>
-<tRule>ዖ↔ʻ o;</tRule>
-<tRule>ዘ↔ze;</tRule>
+<tRule>ዑ↔ʻu;</tRule>
+<tRule>ዓ→ʻa;</tRule>
+<tRule>ዕ→ʻi;</tRule>
+<tRule>ዖ↔ʻo;</tRule>
+<tRule>ዘ→ze;</tRule>
<tRule>ዙ↔zu;</tRule>
<tRule>ዛ↔za;</tRule>
-<tRule>ዝ↔zi;</tRule>
+<tRule>ዝ→zi;</tRule>
<tRule>ዞ↔zo;</tRule>
-<tRule>የ↔ye;</tRule>
+<tRule>የ→ye;</tRule>
<tRule>ዩ↔yu;</tRule>
<tRule>ያ↔ya;</tRule>
-<tRule>ይ↔yi;</tRule>
+<tRule>ይ→yi;</tRule>
<tRule>ዮ↔yo;</tRule>
-<tRule>ደ↔de;</tRule>
+<tRule>ደ→de;</tRule>
<tRule>ዱ↔du;</tRule>
<tRule>ዳ↔da;</tRule>
-<tRule>ድ↔di;</tRule>
+<tRule>ድ→di;</tRule>
<tRule>ዶ↔do;</tRule>
-<tRule>ጀ↔je;</tRule>
+<tRule>ጀ→je;</tRule>
<tRule>ጁ↔ju;</tRule>
<tRule>ጃ↔ja;</tRule>
-<tRule>ጅ↔ji;</tRule>
+<tRule>ጅ→ji;</tRule>
<tRule>ጆ↔jo;</tRule>
-<tRule>ገ↔ge;</tRule>
+<tRule>ገ→ge;</tRule>
<tRule>ጉ↔gu;</tRule>
<tRule>ጋ↔ga;</tRule>
-<tRule>ግ↔gi;</tRule>
+<tRule>ግ→gi;</tRule>
<tRule>ጎ↔go;</tRule>
<tRule>ጔ→go;</tRule>
-<tRule>ፈ↔fe;</tRule>
+<tRule>ፈ→fe;</tRule>
<tRule>ፉ↔fu;</tRule>
<tRule>ፋ↔fa;</tRule>
-<tRule>ፍ↔fi;</tRule>
+<tRule>ፍ→fi;</tRule>
<tRule>ፎ↔fo;</tRule>
-<tRule>ፐ↔pe;</tRule>
+<tRule>ፐ→pe;</tRule>
<tRule>ፑ↔pu;</tRule>
<tRule>ፓ↔pa;</tRule>
-<tRule>ፕ↔pi;</tRule>
+<tRule>ፕ→pi;</tRule>
<tRule>ፖ↔po;</tRule>
<tRule>ኡ↔u;</tRule>
-<tRule>ኣ↔a;</tRule>
-<tRule>እ↔i;</tRule>
+<tRule>ኣ→a;</tRule>
+<tRule>እ→i;</tRule>
<tRule>ኦ↔o;</tRule>
<tRule>፡↔' ';</tRule>
<tRule>።↔'.';</tRule>
Modified: trunk/source/data/translit/crosswire/cldr/Ethiopic-Latin-UNGEGN.xml
===================================================================
--- trunk/source/data/translit/crosswire/cldr/Ethiopic-Latin-UNGEGN.xml 2009-02-28 10:08:41 UTC (rev 178)
+++ trunk/source/data/translit/crosswire/cldr/Ethiopic-Latin-UNGEGN.xml 2009-02-28 12:01:29 UTC (rev 179)
@@ -13,6 +13,7 @@
<comment>#-------------------------------------------------------------------</comment>
<comment># Ethiopic-Latin/UNGEGN</comment>
<tRule>:: NFD (NFC);</tRule>
+<tRule>$apos = ʼ;</tRule>
<tRule>$macron = ̱;</tRule>
<tRule>ቘ↔kh$apos we$macron;</tRule>
<tRule>ቝ↔kh$apos wi$macron;</tRule>
@@ -29,8 +30,8 @@
<tRule>ጸ↔ts$apos e$macron;</tRule>
<tRule>ጽ↔ts$apos i$macron;</tRule>
<tRule>ጿ↔ts$apos wa;</tRule>
-<tRule>ፀ↔ts$apos e$macron;</tRule>
-<tRule>ፅ↔ts$apos i$macron;</tRule>
+<tRule>ፀ→ts$apos e$macron;</tRule>
+<tRule>ፅ→ts$apos i$macron;</tRule>
<tRule>ሸ↔she$macron;</tRule>
<tRule>ሽ↔shi$macron;</tRule>
<tRule>ሿ↔shwa;</tRule>
@@ -54,8 +55,8 @@
<tRule>ኟ↔nywa;</tRule>
<tRule>ኰ↔kwe$macron;</tRule>
<tRule>ኵ↔kwi$macron;</tRule>
-<tRule>ዀ↔hwe$macron;</tRule>
-<tRule>ዅ↔hwi$macron;</tRule>
+<tRule>ዀ→hwe$macron;</tRule>
+<tRule>ዅ→hwi$macron;</tRule>
<tRule>ዠ↔zhe$macron;</tRule>
<tRule>ዥ↔zhi$macron;</tRule>
<tRule>ዧ↔zhwa;</tRule>
@@ -82,23 +83,23 @@
<tRule>ጻ↔ts$apos a;</tRule>
<tRule>ጼ↔ts$apos e;</tRule>
<tRule>ጾ↔ts$apos o;</tRule>
-<tRule>ፁ↔ts$apos u;</tRule>
-<tRule>ፂ↔ts$apos i;</tRule>
-<tRule>ፃ↔ts$apos a;</tRule>
-<tRule>ፄ↔ts$apos e;</tRule>
-<tRule>ፆ↔ts$apos o;</tRule>
+<tRule>ፁ→ts$apos u;</tRule>
+<tRule>ፂ→ts$apos i;</tRule>
+<tRule>ፃ→ts$apos a;</tRule>
+<tRule>ፄ→ts$apos e;</tRule>
+<tRule>ፆ→ts$apos o;</tRule>
<tRule>ህ↔hi$macron;</tRule>
<tRule>ለ↔le$macron;</tRule>
<tRule>ል↔li$macron;</tRule>
<tRule>ሏ↔lwa;</tRule>
-<tRule>ሕ↔hi$macron;</tRule>
+<tRule>ሕ→hi$macron;</tRule>
<tRule>ሗ↔hwa;</tRule>
<tRule>መ↔me$macron;</tRule>
<tRule>ም↔mi$macron;</tRule>
<tRule>ሟ↔mwa;</tRule>
-<tRule>ሠ↔se$macron;</tRule>
-<tRule>ሥ↔si$macron;</tRule>
-<tRule>ሧ↔swa;</tRule>
+<tRule>ሠ→se$macron;</tRule>
+<tRule>ሥ→si$macron;</tRule>
+<tRule>ሧ→swa;</tRule>
<tRule>ረ↔re$macron;</tRule>
<tRule>ር↔ri$macron;</tRule>
<tRule>ሯ↔rwa;</tRule>
@@ -129,9 +130,9 @@
<tRule>ቻ↔cha;</tRule>
<tRule>ቼ↔che;</tRule>
<tRule>ቾ↔cho;</tRule>
-<tRule>ኅ↔hi$macron;</tRule>
+<tRule>ኅ→hi$macron;</tRule>
<tRule>ኊ↔hwi;</tRule>
-<tRule>ኋ↔hwa;</tRule>
+<tRule>ኋ→hwa;</tRule>
<tRule>ኌ↔hwe;</tRule>
<tRule>ነ↔ne$macron;</tRule>
<tRule>ን↔ni$macron;</tRule>
@@ -147,10 +148,10 @@
<tRule>ኳ↔kwa;</tRule>
<tRule>ኴ↔kwe;</tRule>
<tRule>ኸ↔he$macron;</tRule>
-<tRule>ኽ↔hi$macron;</tRule>
-<tRule>ዂ↔hwi;</tRule>
-<tRule>ዃ↔hwa;</tRule>
-<tRule>ዄ↔hwe;</tRule>
+<tRule>ኽ→hi$macron;</tRule>
+<tRule>ዂ→hwi;</tRule>
+<tRule>ዃ→hwa;</tRule>
+<tRule>ዄ→hwe;</tRule>
<tRule>ወ↔we$macron;</tRule>
<tRule>ው↔wi$macron;</tRule>
<tRule>ዘ↔ze$macron;</tRule>
@@ -206,7 +207,7 @@
<tRule>ሀ↔ha;</tRule>
<tRule>ሁ↔hu;</tRule>
<tRule>ሂ↔hi;</tRule>
-<tRule>ሃ↔ha;</tRule>
+<tRule>ሃ→ha;</tRule>
<tRule>ሄ↔he;</tRule>
<tRule>ሆ↔ho;</tRule>
<tRule>ሉ↔lu;</tRule>
@@ -214,22 +215,22 @@
<tRule>ላ↔la;</tRule>
<tRule>ሌ↔le;</tRule>
<tRule>ሎ↔lo;</tRule>
-<tRule>ሐ↔ha;</tRule>
-<tRule>ሑ↔hu;</tRule>
-<tRule>ሒ↔hi;</tRule>
-<tRule>ሓ↔ha;</tRule>
-<tRule>ሔ↔he;</tRule>
-<tRule>ሖ↔ho;</tRule>
+<tRule>ሐ→ha;</tRule>
+<tRule>ሑ→hu;</tRule>
+<tRule>ሒ→hi;</tRule>
+<tRule>ሓ→ha;</tRule>
+<tRule>ሔ→he;</tRule>
+<tRule>ሖ→ho;</tRule>
<tRule>ሙ↔mu;</tRule>
<tRule>ሚ↔mi;</tRule>
<tRule>ማ↔ma;</tRule>
<tRule>ሜ↔me;</tRule>
<tRule>ሞ↔mo;</tRule>
-<tRule>ሡ↔su;</tRule>
-<tRule>ሢ↔si;</tRule>
-<tRule>ሣ↔sa;</tRule>
-<tRule>ሤ↔se;</tRule>
-<tRule>ሦ↔so;</tRule>
+<tRule>ሡ→su;</tRule>
+<tRule>ሢ→si;</tRule>
+<tRule>ሣ→sa;</tRule>
+<tRule>ሤ→se;</tRule>
+<tRule>ሦ→so;</tRule>
<tRule>ሩ↔ru;</tRule>
<tRule>ሪ↔ri;</tRule>
<tRule>ራ↔ra;</tRule>
@@ -255,12 +256,12 @@
<tRule>ታ↔ta;</tRule>
<tRule>ቴ↔te;</tRule>
<tRule>ቶ↔to;</tRule>
-<tRule>ኀ↔ha;</tRule>
-<tRule>ኁ↔hu;</tRule>
-<tRule>ኂ↔hi;</tRule>
-<tRule>ኃ↔ha;</tRule>
-<tRule>ኄ↔he;</tRule>
-<tRule>ኆ↔ho;</tRule>
+<tRule>ኀ→ha;</tRule>
+<tRule>ኁ→hu;</tRule>
+<tRule>ኂ→hi;</tRule>
+<tRule>ኃ→ha;</tRule>
+<tRule>ኄ→he;</tRule>
+<tRule>ኆ→ho;</tRule>
<tRule>ኑ↔nu;</tRule>
<tRule>ኒ↔ni;</tRule>
<tRule>ና↔na;</tRule>
@@ -273,17 +274,17 @@
<tRule>ካ↔ka;</tRule>
<tRule>ኬ↔ke;</tRule>
<tRule>ኮ↔ko;</tRule>
-<tRule>ኹ↔hu;</tRule>
-<tRule>ኺ↔hi;</tRule>
-<tRule>ኻ↔ha;</tRule>
-<tRule>ኼ↔he;</tRule>
-<tRule>ኾ↔ho;</tRule>
+<tRule>ኹ→hu;</tRule>
+<tRule>ኺ→hi;</tRule>
+<tRule>ኻ→ha;</tRule>
+<tRule>ኼ→he;</tRule>
+<tRule>ኾ→ho;</tRule>
<tRule>ዉ↔wu;</tRule>
<tRule>ዊ↔wi;</tRule>
-<tRule>ዋ↔wa;</tRule>
+<tRule>ዋ→wa;</tRule>
<tRule>ዌ↔we;</tRule>
<tRule>ዎ↔wo;</tRule>
-<tRule>ዕ↔i$macron;</tRule>
+<tRule>ዕ→i$macron;</tRule>
<tRule>ዙ↔zu;</tRule>
<tRule>ዚ↔zi;</tRule>
<tRule>ዛ↔za;</tRule>
@@ -322,15 +323,15 @@
<tRule>አ↔a;</tRule>
<tRule>ኡ↔u;</tRule>
<tRule>ኢ↔i;</tRule>
-<tRule>ኣ↔a;</tRule>
+<tRule>ኣ→a;</tRule>
<tRule>ኤ↔e;</tRule>
<tRule>ኦ↔o;</tRule>
-<tRule>ዐ↔a;</tRule>
-<tRule>ዑ↔u;</tRule>
-<tRule>ዒ↔i;</tRule>
-<tRule>ዓ↔a;</tRule>
-<tRule>ዔ↔e;</tRule>
-<tRule>ዖ↔o;</tRule>
+<tRule>ዐ→a;</tRule>
+<tRule>ዑ→u;</tRule>
+<tRule>ዒ→i;</tRule>
+<tRule>ዓ→a;</tRule>
+<tRule>ዔ→e;</tRule>
+<tRule>ዖ→o;</tRule>
<tRule>፡↔' ';</tRule>
<tRule>።↔'.';</tRule>
<tRule>፣↔',';</tRule>
Modified: trunk/source/data/translit/crosswire/cldr/Georgian-Latin-ALALC.xml
===================================================================
--- trunk/source/data/translit/crosswire/cldr/Georgian-Latin-ALALC.xml 2009-02-28 10:08:41 UTC (rev 178)
+++ trunk/source/data/translit/crosswire/cldr/Georgian-Latin-ALALC.xml 2009-02-28 12:01:29 UTC (rev 179)
@@ -13,25 +13,20 @@
<comment>#--------------------------------------------------------------------</comment>
<comment># Georgian-Latin/ALALC</comment>
<tRule>:: NFD (NFC);</tRule>
-<tRule>$caron = ̌;</tRule>
-<tRule>$macron = ̄;</tRule>
-<tRule>$odot = ̇;</tRule>
-<tRule>$udot = ̣;</tRule>
-<tRule>$breve = ̆;</tRule>
<comment># uppercase digraphs</comment>
-<tRule>Ⴙ→C$caronʻ;</tRule>
+<tRule>Ⴙ→Čʻ;</tRule>
<tRule>Ⴚ→Cʻ;</tRule>
<tRule>Ⴇ→Tʻ;</tRule>
-<tRule>Ⴏ→Z$breve;</tRule>
+<tRule>Ⴏ→Z̆;</tRule>
<tRule>Ⴔ→Pʻ;</tRule>
<tRule>Ⴕ→Kʻ;</tRule>
-<tRule>Ⴖ→G$odot;</tRule>
-<tRule>Ⴘ→S$caron;</tRule>
-<tRule>Ⴛ→Z $odot;</tRule>
-<tRule>Ⴝ→C$caron;</tRule>
-<tRule>Ⴡ→E$macron;</tRule>
-<tRule>Ⴤ→X $udot;</tRule>
-<tRule>Ⴥ→O$macron;</tRule>
+<tRule>Ⴖ→Ġ;</tRule>
+<tRule>Ⴘ→Š;</tRule>
+<tRule>Ⴛ→Z ̇;</tRule>
+<tRule>Ⴝ→Č;</tRule>
+<tRule>Ⴡ→Ē;</tRule>
+<tRule>Ⴤ→X ̣;</tRule>
+<tRule>Ⴥ→Ō;</tRule>
<tRule>Ⴀ→A;</tRule>
<tRule>Ⴁ→B;</tRule>
<tRule>Ⴂ→G;</tRule>
@@ -58,20 +53,20 @@
<tRule>Ⴢ→Y;</tRule>
<tRule>Ⴣ→W;</tRule>
<comment>#l owercase digraphs</comment>
-<tRule>ჩ↔c$caronʻ;</tRule>
+<tRule>ჩ↔čʻ;</tRule>
<tRule>ც↔cʻ;</tRule>
<tRule>თ↔tʻ;</tRule>
-<tRule>ჟ↔z$breve;</tRule>
+<tRule>ჟ↔z̆;</tRule>
<tRule>ფ↔pʻ;</tRule>
<tRule>ქ↔kʻ;</tRule>
-<tRule>ღ↔g$odot;</tRule>
-<tRule>შ↔s$caron;</tRule>
-<tRule>ძ↔z $odot;</tRule>
-<tRule>ჭ↔c$caron;</tRule>
-<tRule>ჱ↔e$macron;</tRule>
-<tRule>ჴ↔x $udot;</tRule>
-<tRule>ჵ↔o$macron;</tRule>
-<tRule>Ƿ↔e $breve;</tRule>
+<tRule>ღ↔ġ;</tRule>
+<tRule>შ↔š;</tRule>
+<tRule>ძ↔z ̇;</tRule>
+<tRule>ჭ↔č;</tRule>
+<tRule>ჱ↔ē;</tRule>
+<tRule>ჴ↔x ̣;</tRule>
+<tRule>ჵ↔ō;</tRule>
+<tRule>Ƿ↔e ̆;</tRule>
<tRule>ა↔a;</tRule>
<tRule>ბ↔b;</tRule>
<tRule>გ↔g;</tRule>
Modified: trunk/source/data/translit/crosswire/cldr/Georgian-Latin-BGN.xml
===================================================================
--- trunk/source/data/translit/crosswire/cldr/Georgian-Latin-BGN.xml 2009-02-28 10:08:41 UTC (rev 178)
+++ trunk/source/data/translit/crosswire/cldr/Georgian-Latin-BGN.xml 2009-02-28 12:01:29 UTC (rev 179)
@@ -114,7 +114,7 @@
<tRule>჻↔¶;</tRule>
<comment># completeness mappings for latin</comment>
<tRule>კ←c;</tRule>
-<tRule>ხ;←x;</tRule>
+<tRule>ხ←x;</tRule>
<tRule>:: ([:LATIN:] lower);</tRule>
<tRule>:: NFC (NFD);</tRule>
</transform>
Modified: trunk/source/data/translit/crosswire/cldr/Georgian-Latin-ISO.xml
===================================================================
--- trunk/source/data/translit/crosswire/cldr/Georgian-Latin-ISO.xml 2009-02-28 10:08:41 UTC (rev 178)
+++ trunk/source/data/translit/crosswire/cldr/Georgian-Latin-ISO.xml 2009-02-28 12:01:29 UTC (rev 179)
@@ -13,23 +13,21 @@
<comment>#--------------------------------------------------------------------</comment>
<comment># Georgian-Latin/ISO</comment>
<tRule>:: NFD (NFC);</tRule>
-<tRule>$caron = ̌;</tRule>
-<tRule>$macron = ̄;</tRule>
<comment># uppercase digraphs</comment>
-<tRule>Ⴙ→C$caronʼ;</tRule>
+<tRule>Ⴙ→Čʼ;</tRule>
<tRule>Ⴚ→Cʼ;</tRule>
<tRule>Ⴇ→Tʼ;</tRule>
-<tRule>Ⴏ→Z$caron;</tRule>
+<tRule>Ⴏ→Ž;</tRule>
<tRule>Ⴔ→Pʼ;</tRule>
<tRule>Ⴕ→Kʼ;</tRule>
-<tRule>Ⴖ→G$macron;</tRule>
-<tRule>Ⴘ→S$caron;</tRule>
-<tRule>Ⴝ→C$caron;</tRule>
-<tRule>Ⴟ→J$caron;</tRule>
+<tRule>Ⴖ→Ḡ;</tRule>
+<tRule>Ⴘ→Š;</tRule>
+<tRule>Ⴝ→Č;</tRule>
+<tRule>Ⴟ→J̌;</tRule>
<comment># non-ISO</comment>
-<tRule>Ⴡ→E$macron;</tRule>
+<tRule>Ⴡ→Ē;</tRule>
<tRule>Ⴤ→Qʼ;</tRule>
-<tRule>Ⴥ→O$macron;</tRule>
+<tRule>Ⴥ→Ō;</tRule>
<tRule>Ⴀ→A;</tRule>
<tRule>Ⴁ→B;</tRule>
<tRule>Ⴂ→G;</tRule>
@@ -56,20 +54,20 @@
<tRule>Ⴢ→Y;</tRule>
<tRule>Ⴣ→W;</tRule>
<comment># lowercase digraphs</comment>
-<tRule>ჩ↔c$caronʼ;</tRule>
+<tRule>ჩ↔čʼ;</tRule>
<tRule>ც↔cʼ;</tRule>
<tRule>თ↔tʼ;</tRule>
-<tRule>ჟ↔z$caron;</tRule>
+<tRule>ჟ↔ž;</tRule>
<tRule>ფ↔pʼ;</tRule>
<tRule>ქ↔kʼ;</tRule>
-<tRule>ღ↔g$macron;</tRule>
-<tRule>შ↔s$caron;</tRule>
-<tRule>ჭ↔c$caron;</tRule>
-<tRule>ჯ↔j$caron;</tRule>
+<tRule>ღ↔ḡ;</tRule>
+<tRule>შ↔š;</tRule>
+<tRule>ჭ↔č;</tRule>
+<tRule>ჯ↔ǰ;</tRule>
<comment># non-ISO</comment>
-<tRule>ჱ↔e$macron;</tRule>
+<tRule>ჱ↔ē;</tRule>
<tRule>ჴ↔qʼ;</tRule>
-<tRule>ჵ↔o$macron;</tRule>
+<tRule>ჵ↔ō;</tRule>
<tRule>ა↔a;</tRule>
<tRule>ბ↔b;</tRule>
<tRule>გ↔g;</tRule>
Modified: trunk/source/data/translit/crosswire/cldr/Thaana-Latin-ALALC.xml
===================================================================
--- trunk/source/data/translit/crosswire/cldr/Thaana-Latin-ALALC.xml 2009-02-28 10:08:41 UTC (rev 178)
+++ trunk/source/data/translit/crosswire/cldr/Thaana-Latin-ALALC.xml 2009-02-28 12:01:29 UTC (rev 179)
@@ -11,10 +11,12 @@
<comment># Based ALA-LC Romanization from</comment>
<comment># http://lcweb.loc.gov/catdir/cpso/romanization/divehi.pdf</comment>
<comment>#--------------------------------------------------------------------</comment>
+<comment># This transform definitely needs more attention</comment>
<comment># Thaana-Latin/ALALC</comment>
<tRule>:: NFD (NFC);</tRule>
+<tRule>$consonants = [ހ-ޥ];</tRule>
<tRule>ށް}[:^L:]→ḫ;</tRule>
-<tRule>ށް}[:L:]→ḫ |$1;</tRule>
+<tRule>ށް}[$consonants]→ḫ;</tRule>
<tRule>ތްތ↔t̤t;</tRule>
<tRule>ޘ↔th;</tRule>
<tRule>ޙ↔ḥ;</tRule>
@@ -41,7 +43,7 @@
<tRule>[:^L:]{އ→;</tRule>
<tRule>އް([:L:])→|$1 $1;</tRule>
<tRule>އް↔ẖ;</tRule>
-<tRule>އ↔ʼ;</tRule>
+<tRule>އ→;</tRule>
<tRule>ހ↔h;</tRule>
<tRule>ން↔ṁ;</tRule>
<tRule>ނ↔n;</tRule>
@@ -65,7 +67,7 @@
<tRule>ޫ↔ū;</tRule>
<tRule>ޭ↔ē;</tRule>
<tRule>ޯ↔ō;</tRule>
-<tRule>|$1 އ $1←([aeiou])([aeiou]);</tRule>
+<tRule>|$1 އ $2←([aeiou])([aeiou]);</tRule>
<tRule>ަ↔a;</tRule>
<tRule>ި↔i;</tRule>
<tRule>ު↔u;</tRule>
Modified: trunk/source/data/translit/crosswire/cldr/Thaana-Latin-BGN.xml
===================================================================
--- trunk/source/data/translit/crosswire/cldr/Thaana-Latin-BGN.xml 2009-02-28 10:08:41 UTC (rev 178)
+++ trunk/source/data/translit/crosswire/cldr/Thaana-Latin-BGN.xml 2009-02-28 12:01:29 UTC (rev 179)
@@ -11,10 +11,11 @@
<comment># Based BGN/PCGN 1988 from</comment>
<comment># http://www.eki.ee/wgrs/rom2_dv.pdf</comment>
<comment>#--------------------------------------------------------------------</comment>
+<comment># This transform definitely needs more attention</comment>
<comment># Thaana-Latin/BGN</comment>
<tRule>:: NFD (NFC);</tRule>
<tRule>[ށއ]ް}[:^L:]→h;</tRule>
-<tRule>[ށއ]ް([:L:])→|$1$1;</tRule>
+<tRule>[ށއ]ް([:L:])→|$1;</tRule>
<tRule>ޘ↔thʼ;</tRule>
<tRule>ޛ↔dhʼ;</tRule>
<tRule>ޝ↔shʼ;</tRule>
@@ -59,7 +60,7 @@
<tRule>ޫ↔ee;</tRule>
<tRule>ޭ↔oa;</tRule>
<tRule>ޯ↔oo;</tRule>
-<tRule>|$1 އ $1←([aeiou])([aeiou]);</tRule>
+<tRule>|$1 އ $2←([aeiou])([aeiou]);</tRule>
<tRule>ަ↔a;</tRule>
<tRule>ި↔e;</tRule>
<tRule>ު↔i;</tRule>
More information about the sword-cvs
mailing list