added accentuation.make_varia

.gitignore

@@ -3,3 +3,8 @@ __pycache__
 dist
 .coverage
 htmlcov
+.idea/
+venv/
+.ipynb_checkpoints
+*/.ipynb_checkpoints/*
+*.ipynb

README.md

@@ -21,6 +21,10 @@ see [docs.rst](https://github.com/jtauber/greek-accentuation/blob/master/docs.rs
 
 ## Change Log
 
+### Changed in 1.2.1
+
+* added `accentuation.make_varia`, that changes acute in oxytona to grave 
+
 ### Changed in 1.2.0
 
 * `on_penult` will now return an oxytone rather than None if input only has one syllable

docs.rst

@@ -428,6 +428,9 @@ provided):
 >>> get_accent_type('ψυχή') == OXYTONE
 True
 
+>>> get_accent_type('ψυχὴ') == VARIA
+True
+
 >>> get_accent_type('ἀγαθοῦ') == PERISPOMENON
 True
 
@@ -467,6 +470,9 @@ If you want to display the type of accent you can use ``display_accent_type``:
 >>> syllable_add_accent('ος', ACUTE)
 'ός'
 
+>>> syllable_add_accent('κος', GRAVE)
+'κὸς'
+
 >>> syllable_add_accent('ου', CIRCUMFLEX)
 'οῦ'
 
@@ -477,6 +483,15 @@ If you want to display the type of accent you can use ``display_accent_type``:
 >>> make_oxytone('θεος')
 'θεός'
 
+>>> make_varia('θεος')
+'θεὸς'
+
+>>> make_varia('θεός')
+'θεὸς'
+
+>>> make_varia('λόγος')
+'λόγος'
+
 This is the same as:
 
 >>> add_accent(syllabify('θεος'), OXYTONE)
@@ -613,7 +628,7 @@ If the word only has one syllable, it will fall back to an oxytone:
 'δός'
 
 
-The ``persistent`` function will try to persist the accent from the given form:
+The ``persistent`` function will try to keep an accent from a given form:
 
 >>> persistent('ἀνθρωπος', 'ἄνθρωπος')
 'ἄνθρωπος'
@@ -622,4 +637,4 @@ The ``persistent`` function will try to persist the accent from the given form:
 'ἀνθρώπου'
 
 >>> persistent('καταβαινον', 'καταβαίνων')
-'καταβαῖνον'
+'καταβαῖνον'

greek_accentuation/accentuation.py

@@ -1,5 +1,5 @@
-from .characters import add_diacritic
-from .characters import ACUTE, CIRCUMFLEX, SHORT, LONG, SMOOTH, ROUGH
+from .characters import add_diacritic, remove_diacritic
+from .characters import ACUTE, CIRCUMFLEX, SHORT, LONG, SMOOTH, ROUGH, GRAVE
 from .syllabify import onset_nucleus_coda, syllabify, UNKNOWN, syllable_length
 from .syllabify import syllable_accent, ultima, penult, antepenult
 
@@ -18,6 +18,7 @@ def add_accent(s, accent_type):
     return "".join(s[:-pos] + [syllable_add_accent(s[-pos], accent)] + final)
 
 
+VARIA = 1, GRAVE
 OXYTONE = 1, ACUTE
 PERISPOMENON = 1, CIRCUMFLEX
 PAROXYTONE = 2, ACUTE
@@ -27,6 +28,7 @@ def add_accent(s, accent_type):
 
 def display_accent_type(accent_type):
     return {
+        VARIA: "varia",
         OXYTONE: "oxytone",
         PERISPOMENON: "perispomenon",
         PAROXYTONE: "paroxytone",
@@ -62,21 +64,36 @@ def make_properispomenon(w):
     else:
         return add_accent(s, PAROXYTONE)
 
+def make_varia(w):
+    s = syllabify(w)
+    if get_accent_type(w) == OXYTONE:
+        s[-1] = remove_diacritic(ACUTE)(s[-1])
+        return add_accent(s, VARIA)
+    elif get_accent_type(w) in [PAROXYTONE, PROPAROXYTONE, PERISPOMENON, PROPERISPOMENON]:
+        return w
+    else:
+        return add_accent(s, VARIA)
 
 def get_accent_type(w):
     u = syllable_accent(ultima(w))
     if u == ACUTE:
         return OXYTONE
     elif u == CIRCUMFLEX:
         return PERISPOMENON
-    p = syllable_accent(penult(w))
-    if p == ACUTE:
-        return PAROXYTONE
-    elif p == CIRCUMFLEX:
-        return PROPERISPOMENON
-    a = syllable_accent(antepenult(w))
-    if a == ACUTE:
-        return PROPAROXYTONE
+    elif u == GRAVE:
+        return VARIA
+    if len(syllabify(w)) > 1:
+        p = syllable_accent(penult(w))
+        if p == ACUTE:
+            return PAROXYTONE
+        elif p == CIRCUMFLEX:
+            return PROPERISPOMENON
+    if len(syllabify(w)) > 2:
+        a = syllable_accent(antepenult(w))
+        if a == ACUTE:
+            return PROPAROXYTONE
+    else:
+        return None
 
 
 def possible_accentuations(
@@ -139,8 +156,9 @@ def on_penult(w, default_short=False):
 
 
 def persistent(w, lemma, default_short=False):
-    w = w.replace("|", "")
 
+    w = w.replace("|", "")
+    get_accent_type(lemma)
     place, accent = get_accent_type(lemma)
     s = syllabify(w)
     possible = list(possible_accentuations(s, default_short=default_short))
@@ -157,3 +175,6 @@ def persistent(w, lemma, default_short=False):
                     accent_type = (place2 - i, ACUTE)
                     break
     return add_accent(s, accent_type)
+
+
+

greek_accentuation/characters.py

@@ -53,6 +53,7 @@ def _(text):
     return _
 
 
+
 PSILI = SMOOTH = "\u0313"
 DASIA = ROUGH = "\u0314"