[sword-svn] r268 - trunk/source/data/translit/crosswire

[chrislit at crosswire.org]

Author: chrislit
Date: 2014-02-07 20:26:04 -0700 (Fri, 07 Feb 2014)
New Revision: 268

Modified:
   trunk/source/data/translit/crosswire/Greek_Latin_Beta.txt
   trunk/source/data/translit/crosswire/Hebrew_Latin_MC.txt
Log:
minor tweaks


Modified: trunk/source/data/translit/crosswire/Greek_Latin_Beta.txt
===================================================================
--- trunk/source/data/translit/crosswire/Greek_Latin_Beta.txt	2014-02-08 03:25:34 UTC (rev 267)
+++ trunk/source/data/translit/crosswire/Greek_Latin_Beta.txt	2014-02-08 03:26:04 UTC (rev 268)
@@ -16,11 +16,8 @@
 :: [[:Greek:][̓ʼ᾽᾿̔ʽ῞´ˊ΄´͂̂\^ˆ῀̀\`ˋ`̈¨ͅιͺ̣··;’‐—]];
 :: NFD (NFC);
 
-$betaMarks = [|():/=\\+_];
+$betaMarks = [\|\(\)\:\/\=\\\+\_];
 
-|\*$2$1<\*($betaMarks)([A-Z]);
-|$2$1<[A-Z]{($betaMarks)([A-Z]);
-
 # Letters
 #  Uppercase
 Α<>\*A;
@@ -146,6 +143,12 @@
 
 # ̄<>\_;	# Perseus LSJ uses _ for long vowels
 
+::Null;
+
+# Move accents preceding capitals/words after the letter
+\*$2$1<\*($betaMarks+)([A-Z]);
+$2$1<[^[[A-Z123]$betaMarks]]{($betaMarks+)([A-Z]);
+
 :: ([a-z] upper);
 :: NFC (NFD);
 :: ([\*A-Za-z\#1235\)\(\/\=\\\+\|\?\:\;\'\-\_]);

Modified: trunk/source/data/translit/crosswire/Hebrew_Latin_MC.txt
===================================================================
--- trunk/source/data/translit/crosswire/Hebrew_Latin_MC.txt	2014-02-08 03:25:34 UTC (rev 267)
+++ trunk/source/data/translit/crosswire/Hebrew_Latin_MC.txt	2014-02-08 03:26:04 UTC (rev 268)
@@ -9,9 +9,10 @@
 
 # Based on Michigan-Claremont encoding:
 # http://ccat.sas.upenn.edu/gopher/text/religion/biblical/0-betacode.txt
+
 # Hebrew-Latin/MC
 
-:: [[:Hebrew:][‍ ]];
+:: [[:Hebrew:][\‍\ ]];
 :: NFD (); #Don't put into NFC when Hebrew is the destination
 
 $letter=[A-Z0-9\)\(\+\&\$\#\"\.\,\:\-];