|
From: <fri...@us...> - 2009-02-27 13:35:09
|
Revision: 9685
http://zaf.svn.sourceforge.net/zaf/?rev=9685&view=rev
Author: friedelwolff
Date: 2009-02-27 13:34:55 +0000 (Fri, 27 Feb 2009)
Log Message:
-----------
Rename distant -> remote
Modified Paths:
--------------
trunk/dict/zu/hunspell/zu_aff.py
Modified: trunk/dict/zu/hunspell/zu_aff.py
===================================================================
--- trunk/dict/zu/hunspell/zu_aff.py 2009-02-27 13:28:48 UTC (rev 9684)
+++ trunk/dict/zu/hunspell/zu_aff.py 2009-02-27 13:34:55 UTC (rev 9685)
@@ -40,7 +40,7 @@
#TODO: hortative particle words
#TODO: noun continuation class for infinitive+obj and negative infinitives?
#TODO: negative qualificatives
-#TODO: qualificatives of distant past
+#TODO: qualificatives of remote past
#TODO: passives and all their consequences
#TODO: consider doing -eka -ela -ana with rules
@@ -55,6 +55,7 @@
subject_morphemes = ["ngi", "u", "si", "ni", "u", "ba", "i", "li", "a", "si", "zi", "lu", "bu", "ku"]
remote_past_subject_morphemes = ["nga", "wa", "sa", "na", "wa", "ba", "ya", "la", "a", "sa", "za", "lwa", "ba", "kwa"]
qualificative_prefixes = ["engi", "esi", "eni", "o", "aba", "e", "eli", "a", "esi", "ezi", "olu", "obu", "oku"]
+remote_past_qualificative_prefixes = ["engi", "esi", "eni", "o", "aba", "e", "eli", "a", "esi", "ezi", "olu", "obu", "oku"]
situative_prefixes = ["e", "be"]
concords = subject_morphemes + qualificative_prefixes + situative_prefixes
object_morphemes = ["ngi", "ku", "si", "ni", "m", "ba", "wu", "yi", "li", "wa", "zi", "lu", "bu"]
@@ -524,7 +525,7 @@
verb_rules(main_subjects, affix=morpheme, morphology="FUTURE_RELATIVE/QUALIFICATIVE")
verb_rules(main_subjects, affix=morpheme+"nga", needaffix=True, circumfix=True, morphology="RELATIVE/QUALIFICATIVE_NEG", continuation_classes=[qualificative_sfx_neg])
verb_rules(main_subjects, affix=morpheme+"ngazuku", needaffix=True, circumfix=True, morphology="NEAR_FUTURE_RELATIVE/QUALIFICATIVE_NEG")
- verb_rules(main_subjects, affix=morpheme+"ngayuku", needaffix=True, circumfix=True, morphology="DISTANT_FUTURE_RELATIVE/QUALIFICATIVE_NEG")
+ verb_rules(main_subjects, affix=morpheme+"ngayuku", needaffix=True, circumfix=True, morphology="REMOTE_FUTURE_RELATIVE/QUALIFICATIVE_NEG")
#indicative long form, present, positive
verb_rules(infixes, affix="ya", needaffix=True, morphology="PRESENT_IND_LONG", continuation_classes=[simple_subjects])
@@ -537,20 +538,20 @@
#indicative future tenses
verb_rules(infixes, affix="zo", condition="[^aeiou]", needaffix=True, morphology="NEAR_FUTURE_IND_SHORT", continuation_classes=[simple_subjects])
verb_rules(infixes, affix="zoku", needaffix=True, morphology="NEAR_FUTURE_IND_LONG", continuation_classes=[simple_subjects])
- verb_rules(infixes, affix="yo", condition="[^aeiou]", needaffix=True, morphology="DISTANT_FUTURE_IND_SHORT", continuation_classes=[simple_subjects])
- verb_rules(infixes, affix="yoku", needaffix=True, morphology="DISTANT_FUTURE_IND_LONG", continuation_classes=[simple_subjects])
+ verb_rules(infixes, affix="yo", condition="[^aeiou]", needaffix=True, morphology="REMOTE_FUTURE_IND_SHORT", continuation_classes=[simple_subjects])
+ verb_rules(infixes, affix="yoku", needaffix=True, morphology="REMOTE_FUTURE_IND_LONG", continuation_classes=[simple_subjects])
#indicative future tenses, negative
verb_rules(infixes, affix="zu", condition="[^aeiou]", needaffix=True, morphology="NEAR_FUTURE_IND_SHORT_NEG", continuation_classes=[simple_subjects_neg])
verb_rules(infixes, affix="zuku", needaffix=True, morphology="NEAR_FUTURE_IND_LONG_NEG", continuation_classes=[simple_subjects_neg])
- verb_rules(infixes, affix="yu", condition="[^aeiou]", needaffix=True, morphology="DISTANT_FUTURE_IND_SHORT_NEG", continuation_classes=[simple_subjects_neg])
- verb_rules(infixes, affix="yuku", needaffix=True, morphology="DISTANT_FUTURE_IND_LONG_NEG", continuation_classes=[simple_subjects_neg])
+ verb_rules(infixes, affix="yu", condition="[^aeiou]", needaffix=True, morphology="REMOTE_FUTURE_IND_SHORT_NEG", continuation_classes=[simple_subjects_neg])
+ verb_rules(infixes, affix="yuku", needaffix=True, morphology="REMOTE_FUTURE_IND_LONG_NEG", continuation_classes=[simple_subjects_neg])
#-sa- + indicative future tenses (progressive aspectual morpheme)
verb_rules(infixes, affix="sazo", condition="[^aeiou]", needaffix=True, morphology="PROG_NEAR_FUTURE_IND_SHORT", continuation_classes=[simple_subjects])
verb_rules(infixes, affix="sazoku", needaffix=True, morphology="PROG_NEAR_FUTURE_IND_LONG", continuation_classes=[simple_subjects])
- verb_rules(infixes, affix="sayo", condition="[^aeiou]", needaffix=True, morphology="PROG_DISTANT_FUTURE_IND_SHORT", continuation_classes=[simple_subjects])
- verb_rules(infixes, affix="sayoku", needaffix=True, morphology="PROG_DISTANT_FUTURE_IND_LONG", continuation_classes=[simple_subjects])
+ verb_rules(infixes, affix="sayo", condition="[^aeiou]", needaffix=True, morphology="PROG_REMOTE_FUTURE_IND_SHORT", continuation_classes=[simple_subjects])
+ verb_rules(infixes, affix="sayoku", needaffix=True, morphology="PROG_REMOTE_FUTURE_IND_LONG", continuation_classes=[simple_subjects])
#infinitive
verb_rules(infixes, affix="uku", morphology="INFINITIVE", continuation_classes=[noun])
@@ -597,26 +598,26 @@
#TODO: do we need to exclude the short forms with vowel verbs?
verb_rules(infixes, affix="zo"+morpheme, needaffix=True, morphology="NEAR_FUTURE_IND_SHORT_with_OBJ", continuation_classes=[simple_subjects])
verb_rules(infixes, affix="zoku"+morpheme, needaffix=True, morphology="NEAR_FUTURE_IND_LONG_with_OBJ", continuation_classes=[simple_subjects])
- verb_rules(infixes, affix="yo"+morpheme, needaffix=True, morphology="DISTANT_FUTURE_IND_SHORT_with_OBJ", continuation_classes=[simple_subjects])
- verb_rules(infixes, affix="yoku"+morpheme, needaffix=True, morphology="DISTANT_FUTURE_IND_LONG_with_OBJ", continuation_classes=[simple_subjects])
+ verb_rules(infixes, affix="yo"+morpheme, needaffix=True, morphology="REMOTE_FUTURE_IND_SHORT_with_OBJ", continuation_classes=[simple_subjects])
+ verb_rules(infixes, affix="yoku"+morpheme, needaffix=True, morphology="REMOTE_FUTURE_IND_LONG_with_OBJ", continuation_classes=[simple_subjects])
#indicative future tenses, negative
verb_rules(infixes, affix="zu"+morpheme, condition="[^aeiou]", needaffix=True, morphology="NEAR_FUTURE_IND_SHORT_NEG_with_OBJ", continuation_classes=[simple_subjects_neg])
verb_rules(infixes, affix="zuku"+morpheme, needaffix=True, morphology="NEAR_FUTURE_IND_LONG_NEG_with_OBJ", continuation_classes=[simple_subjects_neg])
- verb_rules(infixes, affix="yu"+morpheme, condition="[^aeiou]", needaffix=True, morphology="DISTANT_FUTURE_IND_SHORT_NEG_with_OBJ", continuation_classes=[simple_subjects_neg])
- verb_rules(infixes, affix="yuku"+morpheme, needaffix=True, morphology="DISTANT_FUTURE_IND_LONG_NEG_with_OBJ", continuation_classes=[simple_subjects_neg])
+ verb_rules(infixes, affix="yu"+morpheme, condition="[^aeiou]", needaffix=True, morphology="REMOTE_FUTURE_IND_SHORT_NEG_with_OBJ", continuation_classes=[simple_subjects_neg])
+ verb_rules(infixes, affix="yuku"+morpheme, needaffix=True, morphology="REMOTE_FUTURE_IND_LONG_NEG_with_OBJ", continuation_classes=[simple_subjects_neg])
#-sa- + future indicative, positive (progressive aspectual morpheme)
verb_rules(infixes, affix="sazo"+morpheme, needaffix=True, morphology="PROG_NEAR_FUTURE_IND_SHORT_with_OBJ", continuation_classes=[simple_subjects])
verb_rules(infixes, affix="sazoku"+morpheme, needaffix=True, morphology="PROG_NEAR_FUTURE_IND_LONG_with_OBJ", continuation_classes=[simple_subjects])
- verb_rules(infixes, affix="sayo"+morpheme, needaffix=True, morphology="PROG_DISTANT_FUTURE_IND_SHORT_with_OBJ", continuation_classes=[simple_subjects])
- verb_rules(infixes, affix="sayoku"+morpheme, needaffix=True, morphology="PROG_DISTANT_FUTURE_IND_LONG_with_OBJ", continuation_classes=[simple_subjects])
+ verb_rules(infixes, affix="sayo"+morpheme, needaffix=True, morphology="PROG_REMOTE_FUTURE_IND_SHORT_with_OBJ", continuation_classes=[simple_subjects])
+ verb_rules(infixes, affix="sayoku"+morpheme, needaffix=True, morphology="PROG_REMOTE_FUTURE_IND_LONG_with_OBJ", continuation_classes=[simple_subjects])
#-sa- + indicative future tenses, negative
verb_rules(infixes, affix="sazu"+morpheme, condition="[^aeiou]", needaffix=True, morphology="PROG_NEAR_FUTURE_IND_SHORT_NEG_with_OBJ", continuation_classes=[simple_subjects_neg])
verb_rules(infixes, affix="sazuku"+morpheme, needaffix=True, morphology="PROG_NEAR_FUTURE_IND_LONG_NEG_with_OBJ", continuation_classes=[simple_subjects_neg])
- verb_rules(infixes, affix="sayu"+morpheme, condition="[^aeiou]", needaffix=True, morphology="PROG_DISTANT_FUTURE_IND_SHORT_NEG_with_OBJ", continuation_classes=[simple_subjects_neg])
- verb_rules(infixes, affix="sayuku"+morpheme, needaffix=True, morphology="PROG_DISTANT_FUTURE_IND_LONG_NEG_with_OBJ", continuation_classes=[simple_subjects_neg])
+ verb_rules(infixes, affix="sayu"+morpheme, condition="[^aeiou]", needaffix=True, morphology="PROG_REMOTE_FUTURE_IND_SHORT_NEG_with_OBJ", continuation_classes=[simple_subjects_neg])
+ verb_rules(infixes, affix="sayuku"+morpheme, needaffix=True, morphology="PROG_REMOTE_FUTURE_IND_LONG_NEG_with_OBJ", continuation_classes=[simple_subjects_neg])
#infinitive with object morpheme
verb_rules(infixes, affix="uku"+morpheme, morphology="INFINITIVE_with_OBJ", continuation_classes=[locative_e_ini, noun])
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|