diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2010-06-27 20:07:19 +0000 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2010-06-27 20:07:19 +0000 |
commit | 01f3ae722c6dda2dad25254e38f7dd7aac9acbf6 (patch) | |
tree | 7d303e2fe83360813c60ae4772a9a67affd871f4 /src | |
parent | 7ef0d2646c62493211c2bda9970591abf5a2b1cd (diff) | |
download | ellinika-01f3ae722c6dda2dad25254e38f7dd7aac9acbf6.tar.gz ellinika-01f3ae722c6dda2dad25254e38f7dd7aac9acbf6.tar.bz2 |
More fixed to accomodate Dico 2.0.90
git-svn-id: file:///home/puszcza/svnroot/ellinika/trunk@551 941c8c0f-9102-463b-b60b-cd22ce0e6858
Diffstat (limited to 'src')
-rw-r--r-- | src/ellinika/dico.scm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/ellinika/dico.scm b/src/ellinika/dico.scm index 90302df..298dcea 100644 --- a/src/ellinika/dico.scm +++ b/src/ellinika/dico.scm | |||
@@ -244,7 +244,7 @@ Invariant Sections, no Front-Cover and Back-Cover Texts")) | |||
244 | 244 | ||
245 | (define (match-selector dbh strat key) | 245 | (define (match-selector dbh strat key) |
246 | (let* ((key (dico-make-key strat (dico-key->word key))) | 246 | (let* ((key (dico-make-key strat (dico-key->word key))) |
247 | (sound (ellinika:sounds-like (dico-key->word key))) | 247 | (sound (ellinika:sounds-like (dico-key->word key))) |
248 | (dlist (mapcan | 248 | (dlist (mapcan |
249 | (lambda (elt) | 249 | (lambda (elt) |
250 | (let ((word (car elt))) | 250 | (let ((word (car elt))) |
@@ -283,15 +283,15 @@ Invariant Sections, no Front-Cover and Back-Cover Texts")) | |||
283 | (cons "suffix" match-suffix) | 283 | (cons "suffix" match-suffix) |
284 | (cons "re" match-extnd-regex))) | 284 | (cons "re" match-extnd-regex))) |
285 | 285 | ||
286 | (define (match-word dbh strat word) | 286 | (define (match-word dbh strat key) |
287 | (let ((sp (assoc (dico-strat-name strat) strategy-list))) | 287 | (let ((sp (assoc (dico-strat-name strat) strategy-list))) |
288 | (let ((res (cond | 288 | (let ((res (cond |
289 | (sp | 289 | (sp |
290 | ((cdr sp) dbh strat word)) | 290 | ((cdr sp) dbh strat (dico-key->word key))) |
291 | ((dico-strat-selector? strat) | 291 | ((dico-strat-selector? strat) |
292 | (match-selector dbh strat word)) | 292 | (match-selector dbh strat key)) |
293 | (else | 293 | (else |
294 | (match-default dbh strat word))))) | 294 | (match-default dbh strat (dico-key->word key)))))) |
295 | (if res | 295 | (if res |
296 | (cons #f (map car res)) | 296 | (cons #f (map car res)) |
297 | #f)))) | 297 | #f)))) |