plint

commit 3b19829834795e74f5c7ed9e97a8d5ceb661b73d
parent d50b9e9d75f58ede2eaf40cf972472ebf3f34e77
Author: Antoine Amarilli <a3nm@a3nm.net>
Date:   Sat, 10 Aug 2019 23:19:06 +0200

non-aspirated h does not prevent hiatus

Diffstat:
verse.py
 | 
13
+++++--------

1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/verse.py b/verse.py
@@ -331,7 +331,6 @@ class Verse:
 
     # annotate hiatus and ambiguities
     ambiguous_potential = ["ie", "ée", "ue"]
-    no_hiatus = ["oui"]
     for i, w in enumerate(self.chunks[:-1]):
       if w[-1]['text'] == "s":
         if w[-2]['text'] in ambiguous_potential:
@@ -344,13 +343,11 @@ class Verse:
           self.chunks[i+1][0]['error'] = "ambiguous"
       elif ((is_vowels(w[-1]['text']) or w[-1]['text'] == 'Y') and not
           w[-1]['text'].endswith('e')):
-        if (is_vowels(self.chunks[i+1][0]['text']) and 'no_hiatus' not in
-            self.chunks[i+1][0].keys()):
-          if ''.join(x['text'] for x in w) not in no_hiatus:
-            if ''.join(x['text'] for x in self.chunks[i+1]) not in no_hiatus:
-              if 'no_hiatus' not in w[-1].keys():
-                w[-1]['error'] = "hiatus"
-                self.chunks[i+1][0]['error'] = "hiatus"
+        if (False not in self.chunks[i+1][0]['elision'] and 
+                'no_hiatus' not in self.chunks[i+1][0].keys() and
+                'no_hiatus' not in w[-1].keys()):
+          w[-1]['error'] = "hiatus"
+          self.chunks[i+1][0]['error'] = "hiatus"
 
     # annotate word ends
     for w in self.chunks[:-1]: