From: ntakahas <ntakahas>
Date: Mon, 29 Mar 2010 06:18:12 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: REL-1-1-11~2
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=71afdef8f74bb23c6c4b4b9b01517486f05b1958;p=m17n%2Fm17n-contrib.git

*** empty log message ***
---

diff --git a/im/yi-yivo.mim b/im/yi-yivo.mim
index cf8c80a..bea1ed5 100644
--- a/im/yi-yivo.mim
+++ b/im/yi-yivo.mim
@@ -30,159 +30,125 @@ A description of the YIVO orthography can be found in Mordkhe Schaechter, _Der e
 (title "ייִדיש")
 (map
   (initials
-    ("i" "אי")
-    ("u" "או")
-    ("ey" "אײ")
-    ("ay" "אײַ")
-    ("oy" "אױ")
+	("i" "אי")
+	("u" "או")
+	("ey" "אײ")
+	("ay" "אײַ")
+	("oy" "אױ")
 	("ayo" "אַיאָ")
   )
   (initdiph
-    ("e" ?×¢)
-    ("a" "אַ")
-    ("o" "אָ")
+	("e" ?×¢)
+	("a" "אַ")
+	("o" "אָ")
   )
-  (openquotes ("\"" "„"))
-  (closequotes ("\"" "‟") ("?\"" "?‟") (".\"" ".‟") ("!\"" "!‟"))
-  (parentheses
-      ("\(" "\)")
-      ("\)" "\(")
-  )
-  (makef ("-" "Ö¾"))
   (otherchars
-    ("A") ("b") ("d") ("f") ("g") ("h") ("H") ("k") ("l") ("m") ("n") ("p") ("r") ("s") ("S") ("t") ("u") ("v") ("y") ("z") ("B") ("K") ("T") ("W")
-  )
-  (singlechars
-    ("A" ?א)
-    ("b" ?ב)
-    ("d" ?ד)
-    ("e" ?×¢)
-    ("ey" "ײ")
-    ("f" ?×£)
-    ("g" ?ג)
-    ("h" ?ה)
-    ("H" ?ח)
-    ("i" ?י)
-    ("k" ?ק)
-    ("kh" ?ך)
-    ("l" ?ל)
-    ("m" ?ם)
-    ("n" ?ן)
-    ("oy" "×±")
-    ("r" ?ר)
-    ("s" ?ס)
-    ("sh" ?ש)
-    ("S" ?ת)
-    ("t" ?ט)
-    ("ts" ?×¥)
-    ("u" ?ו)
-    ("v" "×°")
-    ("y" ?י)
-    ("z" ?ז)
+	("A") ("b") ("d") ("f") ("g") ("h") ("H") ("k") ("l") ("m") ("n") ("p") ("r") ("s") ("S") ("t") ("u") ("v") ("y") ("z") ("B") ("K") ("T") ("W")
   )
-  (doublechars
-    ("a" "אַ")
-    ("B" "בֿ")
-    ("ay" "ײַ")
-    ("K" "כּ")
-    ("o" "אָ")
-    ("p" "פּ")
-    ("T" "תּ")
-    ("tsh" "טש")
-    ("W" "שׂ")
-    ("zh" "זש")
+  (allchars
+	("A") ("b") ("d") ("f") ("g") ("h") ("H") ("k") ("l") ("m") ("n") ("p") ("r") ("s") ("S") ("t") ("u") ("v") ("y") ("z") ("B") ("K") ("T") ("W") ("a") ("e") ("o") ("i") ("u")
   )
-  (triplechars
-    ("uv" "וּװ")
-    ("vu" "װוּ")
-    ("yi" "ייִ")
-    ("ui" "ויִ")
+  (medials
+	("A" ?א)
+	("b" ?ב)
+	("d" ?ד)
+	("e" ?×¢)
+	("ey" "ײ")
+	("f" ?×£)
+	("g" ?ג)
+	("h" ?ה)
+	("H" ?ח)
+	("i" ?י)
+	("k" ?ק)
+	("kh" ?ך)
+	("l" ?ל)
+	("m" ?ם)
+	("n" ?ן)
+	("oy" "×±")
+	("r" ?ר)
+	("s" ?ס)
+	("sh" ?ש)
+	("S" ?ת)
+	("t" ?ט)
+	("ts" ?×¥)
+	("u" ?ו)
+	("v" "×°")
+	("y" ?י)
+	("z" ?ז)
+	("a" "אַ")
+	("B" "בֿ")
+	("ay" "ײַ")
+	("K" "כּ")
+	("o" "אָ")
+	("p" "פּ")
+	("T" "תּ")
+	("tsh" "טש")
+	("W" "שׂ")
+	("zh" "זש")
+	("uv" "וּװ")
+	("vu" "װוּ")
+	("yi" "ייִ")
+	("ui" "ויִ")
 	("eyi" "ײיִ")
 	("ie" "יִע")
 	("ei" "עיִ")
-  )
-  (quadruplechars
+	("iu" "יִו")
 	("ii" "יִיִ")
 	("ayi" "ײַיִ")
+	("ayo" "אַיאָ")
 	("ia" "יִאַ")
 	("io" "יִאָ")
-  )
-  (quintuplechars
 	("uvu" "וּװוּ")	; For words like "tsuvuks!"
   )
   (abbreviations
-    ("s'" "ס'")
-    ("m'" "מ'")
+	("s'" "ס'")
+	("m'" "מ'")
 	("kh'" "כ'")
   )
+  (openquotes ("\"" "„"))
+  (closequotes ("\"" "‟") ("?\"" "?‟") (".\"" ".‟") ("!\"" "!‟"))
+  (parentheses
+	("\(" "\)")
+	("\)" "\(")
+  )
+  (makef ("-" "Ö¾"))
   (gershayim
-    ("`" "׳")
+	("`" "׳")
 	("``" "×´")
   )
   (backspace
-    ((BackSpace) (undo)))
+	((BackSpace) (undo)))
 )
 											
 (state 
   (init
-    (initials (shift subsq))
-    (initdiph)
-    (openquotes)
-    (otherchars (pushback 1) (shift subsq))
-    (backspace)
+	(initials (shift subsq))
+	(initdiph)
+	(openquotes)
+	(otherchars (pushback 1) (shift subsq))
+	(backspace)
 	(parentheses)
   )
   (subsq
-    (singlechars
-      (cond
-        ((= @-2 ?ף) (set X @-1) (delete @-2) (insert "פֿ") (insert X))
-        ((= @-2 ?ך) (set X @-1) (delete @-2) (insert ?כ) (insert X))
-        ((= @-2 ?ם) (set X @-1) (delete @-2) (insert ?מ) (insert X))
-        ((= @-2 ?ן) (set X @-1) (delete @-2) (insert ?נ) (insert X))
-	    ((= @-2 ?ץ) (set X @-1) (delete @-2) (insert ?צ) (insert X))
-       )
-     )
-	 (doublechars
-      (cond
-        ((= @-3 ?ף) (set X @-1) (set Y @-2) (delete @-3) (insert "פֿ") (insert Y) (insert X))
-        ((= @-3 ?ך) (set X @-1) (set Y @-2) (delete @-3) (insert ?כ) (insert Y) (insert X))
-        ((= @-3 ?ם) (set X @-1) (set Y @-2) (delete @-3) (insert ?מ) (insert Y) (insert X))
-        ((= @-3 ?ן) (set X @-1) (set Y @-2) (delete @-3) (insert ?נ) (insert Y) (insert X))
-	    ((= @-3 ?ץ) (set X @-1) (set Y @-2) (delete @-3) (insert ?צ) (insert Y) (insert X))
-       )
-     )
-	 (triplechars
-	   (cond
-        ((= @-4 ?ף) (set X @-1) (set Y @-2) (set Z @-3) (delete @-4) (insert "פֿ") (insert Z) (insert Y) (insert X))
-        ((= @-4 ?ך) (set X @-1) (set Y @-2) (set Z @-3) (delete @-4) (insert ?כ) (insert Z) (insert Y) (insert X))
-        ((= @-4 ?ם) (set X @-1) (set Y @-2) (set Z @-3) (delete @-4) (insert ?מ) (insert Z) (insert Y) (insert X))
-        ((= @-4 ?ן) (set X @-1) (set Y @-2) (set Z @-3) (delete @-4) (insert ?נ) (insert Z) (insert Y) (insert X))
-	    ((= @-4 ?ץ) (set X @-1) (set Y @-2) (set Z @-3) (delete @-4) (insert ?צ) (insert Z) (insert Y) (insert X))
-       )
-     )
-	 (quadruplechars
-	  (cond
-        ((= @-5 ?ף) (set X @-1) (set Y @-2) (set Z @-3) (set A @-4) (delete @-5) (insert "פֿ") (insert A) (insert Z) (insert Y) (insert X))
-        ((= @-5 ?ך) (set X @-1) (set Y @-2) (set Z @-3) (set A @-4) (delete @-5) (insert ?כ) (insert A) (insert Z) (insert Y) (insert X))
-        ((= @-5 ?ם) (set X @-1) (set Y @-2) (set Z @-3) (set A @-4) (delete @-5) (insert ?מ) (insert A) (insert Z) (insert Y) (insert X))
-        ((= @-5 ?ן) (set X @-1) (set Y @-2) (set Z @-3) (set A @-4) (delete @-5) (insert ?נ) (insert A) (insert Z) (insert Y) (insert X))
-        ((= @-5 ?ץ) (set X @-1) (set Y @-2) (set Z @-3) (set A @-4) (delete @-5) (insert ?צ) (insert A) (insert Z) (insert Y) (insert X))
-	  )
-     )
-     (quintuplechars
-	  (cond
-        ((= @-6 ?ף) (set X @-1) (set Y @-2) (set Z @-3) (set A @-4) (set B @-5) (delete @-6) (insert "פֿ") (insert B) (insert A) (insert Z) (insert Y) (insert X))
-        ((= @-6 ?ך) (set X @-1) (set Y @-2) (set Z @-3) (set A @-4) (set B @-5) (delete @-6) (insert ?כ) (insert B) (insert A) (insert Z) (insert Y) (insert X))
-        ((= @-6 ?ם) (set X @-1) (set Y @-2) (set Z @-3) (set A @-4) (set B @-5) (delete @-6) (insert ?מ) (insert B) (insert A) (insert Z) (insert Y) (insert X))
-        ((= @-6 ?ן) (set X @-1) (set Y @-2) (set Z @-3) (set A @-4) (set B @-5) (delete @-6) (insert ?נ) (insert B) (insert A) (insert Z) (insert Y) (insert X))
-        ((= @-6 ?ץ) (set X @-1) (set Y @-2) (set Z @-3) (set A @-4) (set B @-5) (delete @-6) (insert ?צ) (insert B) (insert A) (insert Z) (insert Y) (insert X))
-	  )
-     )
-	 (closequotes)
-	 (gershayim)
-	 (makef (shift init))
-	 (abbreviations (shift init))
-	 (backspace)
-	 (nil (shift init))
-   )
+	(allchars 
+		(pushback 1)
+		(cond
+			((= @-1 ?ף) (delete @-1) (insert "פֿ"))
+			((= @-1 ?ך) (delete @-1) (insert ?כ))
+			((= @-1 ?ם) (delete @-1) (insert ?מ))
+			((= @-1 ?ן) (delete @-1) (insert ?נ))
+			((= @-1 ?ץ) (delete @-1) (insert ?צ))
+		)
+		(shift letters))
+	(closequotes)
+	(gershayim)
+	(makef (shift init))
+	(backspace)
+	(nil (shift init))
+  )
+  (letters
+	(medials (shift subsq))
+	(abbreviations (shift init))
+	(nil (shift subsq))
+  )
 )