[jo
Dmitri Hrapof <yavannadil@yahoo.com>**20101010073803
 Ignore-this: fea1615c48a10ae8fabd72680f9bca71
] {
hunk ./aranrod.lisp 442
+		 (when (and (null tuples) (null %i)
+			    (string/= $w (string-downcase $w)))
+		   (multiple-value-setq 
+		    (tuples level)
+		    (obtain-translations
+		     (if secure *dict* *slovar*)
+		     (string-downcase $w) %f %t %v)))
hunk ./cronfa-generic.lisp 169
-    (format st "</table><h2>Число прямых переводов</h2>
-<table border=\"1\">
-<tr><td></td>")
-    (dolist (lng llist) (format st "<td>~a</td>" (cdr lng)))
-    (format st "</tr>~%")
-    (dolist (lng llist)
-      (format st "<tr><td>~a</td>" (cdr lng))
-      (dolist (gnl llist)
-	(format st "<td>~a</td>" (aref *p-count* (car lng) (car gnl))))
-      (format st "</tr>~%")))
-  (format st "</table></body></html>"))
+(format st "</table>~%")
+;    (format st "</table><h2>Число прямых переводов</h2>
+;<table border=\"1\">
+;<tr><td></td>")
+;    (dolist (lng llist) (format st "<td>~a</td>" (cdr lng)))
+;    (format st "</tr>~%")
+;    (dolist (lng llist)
+;      (format st "<tr><td>~a</td>" (cdr lng))
+;      (dolist (gnl llist)
+;	(format st "<td>~a</td>" (aref *p-count* (car lng) (car gnl))))
+;      (format st "</tr>~%")))
+;  (format st "</table></body></html>"))
+    (format st "<a href=\"http://www.cymraeg.ru/awstats.pl?urlfilter=%5E%2Fgeiriadur%2Fdict.*f%3D%5B01%5D.*t%3D%5B01%5D&urlfilterex=&output=urldetail&config=cymraeg.ru&lang=cy\">COA</a></body></html>")))
hunk ./cronfa-generic.lisp 212
-      "select f.* from f, s where f.word=s.id and s.lang=~a and f.val=~/gdr:stroqa/" (lang-id from) word)) :tuples)))
+      (if (and (zerop (lang-id from)) (position #\е word))
+	  "select f.* from f, s where f.word=s.id and s.lang=~a and f.val~~~/gdr:jo/"
+	"select f.* from f, s where f.word=s.id and s.lang=~a and f.val=~/gdr:stroqa/") 
+      (lang-id from) word)) 
+    :tuples)))
hunk ./cronfa-generic.lisp 275
-      collect (cons (subseq word 0 i) (subseq word i))))
+      collect (cons (string-trim " ,.?!;" (subseq word 0 i))
+		    (string-trim " ,.?!;" (subseq word i)))))
hunk ./cronfa-pg.lisp 38
+(defun jo (stream arg colon dog &rest params)
+  (declare (ignore colon dog params))
+  (princ "'^" stream)
+  (map nil
+       #'(lambda (c) 
+	   (case c
+	     (#\' (princ "''" stream))
+	     (#\е (princ "[её]" stream))
+	     (t (princ c stream))))
+       arg)
+  (princ "$'" stream))
+
hunk ./papur.lisp 36
-  '(("ch" . "cx") ("dd" . "dx") ("ff" . "fx") ("ng" . "gx") ("ll" . "lx")
-    ("ph" . "px") ("rh" . "rx") ("th" . "tx")))
+  '(("ch" . "cя") ("dd" . "dя") ("ff" . "fя") ("ng" . "gя") ("ll" . "lя")
+    ("ph" . "pя") ("rh" . "rя") ("th" . "tя")))
}