Merge pull request #148 from TylerKirby/prosody-fix

Added diphthong to Greek prosody scanner, added anceps support for Latin scanner
cltk · Feb 29, 2016 · 3d8856a · 3d8856a
2 parents b4763ed + 34cd5ee
commit 3d8856a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/cltk/prosody/greek/scanner.py b/cltk/prosody/greek/scanner.py
@@ -34,7 +34,7 @@ def __init__(self):
         self.doub_cons = ['ξ', 'ζ', 'ψ']
         self.long_vowels = ['η', 'ω', 'ῖ', 'ᾶ', 'ῦ']
         self.diphthongs = ['αι', 'αῖ', 'ευ', 'εῦ', 'αυ', 'αῦ', 'οι', 'οῖ',
-                           'ου', 'οῦ', 'ει', 'εῖ', 'υι', 'υῖ']
+                           'ου', 'οῦ', 'ει', 'εῖ', 'υι', 'υῖ', 'ηῦ']
         self.stops = ['π', 'τ', 'κ', 'β', 'δ', 'γ']
         self.liquids = ['ρ', 'λ']
         self.punc = ['!', '@', '#', '$', '%', '^', '&', '*', '(', ')',

diff --git a/cltk/prosody/latin/scanner.py b/cltk/prosody/latin/scanner.py
@@ -250,6 +250,8 @@ def _scansion(self, sentence_syllables):
                     scanned_sent.append('¯')
                 else:
                     scanned_sent.append('˘')
+            del scanned_sent[-1]
+            scanned_sent.append('x')
             scanned_text.append(''.join(scanned_sent))
         return scanned_text
 

diff --git a/cltk/tests/test_prosody.py b/cltk/tests/test_prosody.py
@@ -15,7 +15,7 @@ def test_scanner_latin(self):
         """Test Latin prosody scanner."""
         scan = ScansionLatin()
         meter = scan.scan_text('quō usque tandem abūtēre, Catilīna, patientiā nostrā. quam diū etiam furor iste tuus nōs ēlūdet.')
-        self.assertEqual(meter, ['¯˘¯˘¯¯˘˘˘¯˘˘˘¯˘¯¯¯', '¯˘¯˘¯˘˘¯˘˘¯¯¯¯˘'])
+        self.assertEqual(meter, ['¯˘¯˘¯¯˘˘˘¯˘˘˘¯˘¯¯x', '¯˘¯˘¯˘˘¯˘˘¯¯¯¯x'])
 
     def test_long_by_nature_latin(self):
         """Test Latin prosody scanner's `_long_by_nature` method."""