Accept multiple suffixes.

* data/irregular-verbs.xml: Update.
* scm/verbop.scm: Allow for multiple suffixes.
* src/ellinika/conjugator.scm: Accept multiple suffixes.
Fix accent settings.

* src/cgi-bin/conj.scm4: Minor changes.

4 files changed, 169 insertions, 93 deletions

diff --git a/data/irregular-verbs.xml b/data/irregular-verbs.xml
index 67d4126..312987e 100644
--- a/data/irregular-verbs.xml
+++ b/data/irregular-verbs.xml
@@ -201,7 +201,8 @@
   <v>
     <a>βαστώ</a>
     <c>B1</c>
-    <suffix>ηξ</suffix> <!-- also αξ -->
+    <suffix>ηξ</suffix>
+    <suffix>αξ</suffix>
   </v>
 
   <v>
@@ -514,11 +515,54 @@
   </v>
 
   <v>
+    <a>μπορώ</a>
+    <c>B2</c>
+    <suffix>εσ</suffix>
+    <pas/>
+  </v>
+  
+  <v>
     <a>ξέρω</a>
     <c>A</c>
     <augment>η</augment>
   </v>
 
+  <!-- Unfinished -->
+  <v>
+    <a>πάω</a>
+    <c>B1</c>
+    <act>
+      <ind>
+        <t name="Ενεστώτας">
+          <p n="s" p="1" prop="true">πάω</p>
+          <p n="s" p="3" prop="true">πάει</p>
+          <p n="p" p="1" prop="true">πάμε</p>
+          <p n="p" p="3" prop="true">πάνε,παν</p>
+        </t>
+        <t name="Παρατατικός">
+          <prop name="stem">πήγαιν</prop>
+          <prop name="class">A</prop>
+        </t>
+        <t name="Αόριστος">
+          <suffix/>
+        </t>
+      </ind>
+      <sub>
+        <t name="Ενεστώτας">
+          <prop name="stem">πήγαιν</prop>
+          <prop name="class">A</prop>
+        </t>
+        <t name="Αόριστος">
+          <prop name="stem">πά</prop>
+          <prop name="class">A</prop>
+          <suffix/>
+        </t>
+      </sub>         
+      <stem theme="aor">πηγ</stem>
+    </act>
+    <pas/>
+  </v>
+  
   <v>
     <a>παθαίνω</a>
     <c>A</c>
diff --git a/scm/verbop.scm b/scm/verbop.scm
index 464c384..0ad0f90 100644
--- a/scm/verbop.scm
+++ b/scm/verbop.scm
@@ -175,7 +175,15 @@ exec ${GUILE-guile} -l $0 -c "(apply $main (command-line))" "$@"
 (define (verb-set what val)
   (if (null? verbdef)
       (verb-init))
-  (list-set! verbdef (verbdef:index what) val))
+  (let ((val (cond
+              ((not (eq? what #:suffix))
+               val)
+              ((list-ref verbdef (verbdef:index what)) =>
+               (lambda (entry)
+                 (cons val entry)))
+              (else
+               (list val)))))
+    (list-set! verbdef (verbdef:index what) val)))
 
 (define (verb-init)
   (set! verbdef (make-list 9 #f))
@@ -331,27 +339,31 @@ VALUES (~Q,~Q,~Q,~Q)"
 ;                     (format #t "MOOD ~A~%" mood-ref)
                       (for-each
                        (lambda (tense-name)
-                         (let* ((tense (or (assoc tense-name (cdr mood-ref))
-                                           (begin
-                                             (append! 
-                                              mood-ref
-                                              (list
-                                               (cons tense-name
-                                                     (append
-                                                      (make-list 6 #f)
-                                                      (list
-                                                       (cons "default" #t))))))
-;                                            (format #t "NM ~A~%" mood-ref)
-                                             (assoc tense-name
-                                                    (cdr mood-ref)))))
+                         (let* ((tense
+                                 (or (assoc tense-name (cdr mood-ref))
+                                     (begin
+                                       (append! 
+                                        mood-ref
+                                        (list
+                                         (cons tense-name
+                                               (append
+                                                (make-list 6 #f)
+                                                (list
+                                                 (cons "default" #t))))))
+;                                         (format #t "NM ~A~%" mood-ref)
+                                       (assoc tense-name
+                                              (cdr mood-ref)))))
                                 (prop (begin
-;                                     (format #t "TENSE ~A~%" tense)
+;                                          (format #t "TENSE ~A~%" tense)
                                         (list-tail tense 7))))
-;                          (format #t "PROP ~A ~A~%" tense prop)
+;                             (format #t "PROP ~A ~A~%" tense prop)
                            (if (not (assoc attr prop))
-                               (append! tense
-                                        (list
-                                         (cons attr value))))))
+                               (for-each
+                                (lambda (value)
+                                  (append! tense
+                                           (list
+                                            (cons attr value))))
+                                (if (list? value) value (list value))))))
                        (cdr mood-tenses))))
                   mtlist)))))
        attrlist))
@@ -506,12 +518,7 @@ VALUES (~Q,~Q,~Q,~Q)"
  (tag attr text)
  (cond
   ((xmltrans:parent? "v")
-   (cond
-    ((verb-get #:suffix)
-     (xmltrans:parse-error #f "Suffix was already defined")
-     (mark-invalid))
-    (else
-     (verb-set #:suffix text))))
+   (verb-set #:suffix text))
   ((xmltrans:parent? "t")
    (set! tense-prop (cons (cons "suffix" text) tense-prop)))
   (else
diff --git a/src/cgi-bin/conj.scm4 b/src/cgi-bin/conj.scm4
index 1894485..a8d84f1 100644
--- a/src/cgi-bin/conj.scm4
+++ b/src/cgi-bin/conj.scm4
@@ -105,10 +105,10 @@ ifelse(IFACE,[CGI],(cgi:init))
                  (cdr tense))))
        (display "<th>")
        (cond
-       ((not (member 'root att))
-        (display "<a href=\"#root-na\">?</a>&nbsp;")
-        (if (not (member 'root unattested))
-            (set! unattested (cons 'root unattested)))))
+       ((not (member 'stem att))
+        (display "<a href=\"#stem-na\">?</a>&nbsp;")
+        (if (not (member 'stem unattested))
+            (set! unattested (cons 'stem unattested)))))
        (display tense-name)
        (display "</th>")
        (newline)))
@@ -145,7 +145,7 @@ ifelse(IFACE,[CGI],(cgi:init))
   (fold
    (lambda (elt prev)
      (if prev
-         (string-append prev "," elt)
+         (string-append prev ",<br>" elt)
          elt))
    #f
    lst))
@@ -385,7 +385,7 @@ ifelse(IFACE,[CGI],(cgi:init))
         (print-footnote "class-na" "*"
                         "Conjugation class of this verb is not attested"))
        ((root)
-        (print-footnote "root-na" "?"
+        (print-footnote "stem-na" "?"
                         (_ "Το θέμα αυτού του χρόνου δεν επιβεβαιώνεται από τη βάση δεδοµένων")))))
    unattested)
   (display "</div>"))
diff --git a/src/ellinika/conjugator.scm b/src/ellinika/conjugator.scm
index 536b48e..bffc6be 100644
--- a/src/ellinika/conjugator.scm
+++ b/src/ellinika/conjugator.scm
@@ -46,6 +46,8 @@
      (list-set! verb 1 value))
     ((#:attested)
      (list-set! verb 3 (append (list-ref verb 3) (list value))))
+    ((#:proplist)
+     (list-set! verb 2 value))
     (else
      (let ((container (assoc key (list-ref verb 2)))
            (value (if (and (eq? key #:stem) (not (list? value)))
@@ -78,8 +80,7 @@
    ;; FIXME: deponentia?
    (else                         "A")))
 
-(define (create-basic-verb-info verb proplist . rest)
-;  (format #t "PROPLIST ~A~%" proplist)
+(define (create-basic-verb-info verb . rest)
   (let ((vdb (if (null? rest)