Updated

git-svn-id: file:///home/puszcza/svnroot/ellinika/trunk@112 941c8c0f-9102-463b-b60b-cd22ce0e6858

1 files changed, 57 insertions, 25 deletions

diff --git a/scm/conj.scm b/scm/conj.scm
index 6c3d604..781d630 100644
--- a/scm/conj.scm
+++ b/scm/conj.scm
@@ -61,7 +61,19 @@
 	 (cons #f (cdr (greek->xlat f))))
        pers))
     p)))
-      
+
+; FIXME: Should return real augment!
+(define (get-augment root)
+  #\e)
+
+; FIXME: Does not handle verbs with internal augment
+(define (create-paratatikos-A root flect)
+  (let ((word (add-flection root flect)))
+    (cons 3 
+	  (if (< (length (cdr word)) 3)
+	      (append (cdr word) (list (list (get-augment root))))
+	      (cdr word)))))
+
 (define verbal-flect-table
   (list
    (cons "Α"
@@ -71,32 +83,33 @@
 		 (cons "οριστική"
 		       (list
 			(cons "ενεστώτας"
-			      (flect-list #f
-				    (list "ω")
-				    (list "εις")
-				    (list "ει")
-				    (list "ουμε")
-				    (list "ετε")
-				    (list "ουν" "ουνε")))
+			      (flect-list
+			       #f
+			       (list "ω")
+			       (list "εις")
+			       (list "ει")
+			       (list "ουμε")
+			       (list "ετε")
+			       (list "ουν" "ουνε")))
 			(cons "παρατατικός"
-			      (flect-list (lambda (x flect)
-				      (shift-accent
-				       (add-flection x flect)))
-				    (list "α")
-				    (list "ες")
-				    (list "ε")
-				    (list "αμε")
-				    (list "ατε")
-				    (list "αν" "ανε")))
+			      (flect-list
+			       create-paratatikos-A
+			       (list "α")
+			       (list "ες")
+			       (list "ε")
+			       (list "αμε")
+			       (list "ατε")
+			       (list "αν" "ανε")))
 			(cons "μέλλοντας διαρκείας"
-			      (flect-list (lambda (x)
-				      (list "θα" x))
-				    (list "ω")
-				    (list "εις")
-				    (list "ει")
-				    (list "ουμε")
-				    (list "ετε")
-				    (list "ουν" "ουνε")))))))))))
+			      (flect-list
+			       (lambda (x)
+				 (list "θα" x))
+			       (list "ω")
+			       (list "εις")
+			       (list "ει")
+			       (list "ουμε")
+			       (list "ετε")
+			       (list "ουν" "ουνε")))))))))))
   
 
 ;; ("άω")
@@ -148,6 +161,25 @@
   (newline))
 (newline)
 
+(do ((i 1 (1+ i)))
+    ((> i 6) #f)
+  (map
+   (lambda (x)
+     (display (xlat->greek x))(display ","))
+   (conjugate (greek->xlat "βεβαίων")
+	      i "Α" "ενεργητηκή" "οριστική"  "παρατατικός"))
+  (newline))
+(newline)
+
+(do ((i 1 (1+ i)))
+    ((> i 6) #f)
+  (map
+   (lambda (x)
+     (display (xlat->greek x))(display ","))
+   (conjugate (greek->xlat "λύν")
+	      i "Α" "ενεργητηκή" "οριστική"  "παρατατικός"))
+  (newline))
+