Merge pull request #205 from nathans/diaeresis

Diaeresis

cltk/corpus/greek/beta_to_unicode.py

@@ -177,9 +177,13 @@
 ]
 
 LOWER = [
-    (r'i\\\+', 'ῒ'),
-    (r'i/\+', 'ΐ'),
-    (r'i=\+', 'ῗ'),
+    (r'I\+', 'ϊ'),
+    (r'I\\\+', 'ῒ'),
+    (r'I/\+', 'ΐ'),
+    # Add a second entry for out-of-order betacode
+    (r'I\+/', 'ΐ'),
+    (r'I=\+', 'ῗ'),
+    (r'U\+', 'ϋ'),
     (r'U\\\+', 'ῢ'),
     (r'U/\+', 'ΰ'),
     (r'U=\+', 'ῧ'),

cltk/tests/test_corpus.py

@@ -49,11 +49,22 @@ def test_greek_betacode_to_unicode(self):
         Note: assertEqual appears to not be correctly comparing certain
         characters (``ά`` and ``ί``, at least).
         """
-        beta_example = r"""O(/PWS OU)=N MH\ TAU)TO\ """
         replacer = Replacer()
-        unicode = replacer.beta_code(beta_example)
-        target_unicode = 'ὅπως οὖν μὴ ταὐτὸ '
-        self.assertEqual(unicode, target_unicode)
+        # Generic test
+        beta_1 = r"""O(/PWS OU)=N MH\ TAU)TO\ """
+        unicode_1 = replacer.beta_code(beta_1)
+        target_1 = 'ὅπως οὖν μὴ ταὐτὸ '
+        # Test for iota and diaeresis
+        self.assertEqual(unicode_1, target_1)
+        beta_2 = r"""*XALDAI+KH\N"""
+        unicode_2 = replacer.beta_code(beta_2)
+        target_2 = 'Χαλδαϊκὴν'
+        self.assertEqual(unicode_2, target_2)
+        # Test for upsilon and diaeresis
+        beta_3 = r"""PROU+POTETAGME/NWN"""
+        unicode_3 = replacer.beta_code(beta_3)
+        target_3 = 'προϋποτεταγμένων'
+        self.assertEqual(unicode_3, target_3)
 
     def test_tlgu_init(self):
         """Test constructors of TLGU module for check, import, and install."""