diff options
| author | Ludovic Court`es | 2006-02-17 17:24:51 +0000 |
|---|---|---|
| committer | Ludovic Court`es | 2006-02-17 17:24:51 +0000 |
| commit | 02d1bf3d462a8356ec62a1c3aa07cb72cd58ea2b (patch) | |
| tree | 0eafc06b63644d9adaadf8501b243a9a27231b27 /src/guile/skribilo/utils | |
| parent | b5e6483d3823d197e5c20d574487db5e916a8555 (diff) | |
| download | skribilo-02d1bf3d462a8356ec62a1c3aa07cb72cd58ea2b.tar.gz skribilo-02d1bf3d462a8356ec62a1c3aa07cb72cd58ea2b.tar.lz skribilo-02d1bf3d462a8356ec62a1c3aa07cb72cd58ea2b.zip | |
`slide' and `eq': moved engine-specific code in separate modules.
* src/guile/skribilo/package/slide.scm: Moved engine-specific code to
`slide/ENGINE.scm'.
* src/guile/skribilo/package/eq.scm: Likewise.
* configure.ac: Produce the new Makefiles.
* src/guile/skribilo/engine/lout.scm: Export more stuff.
Moved the slide-related things out of here.
* src/guile/skribilo/utils/compat.scm (skribe-load): Removed `call/cc'
(not needed).
git-archimport-id: lcourtes@laas.fr--2004-libre/skribilo--devel--1.2--patch-51
Diffstat (limited to 'src/guile/skribilo/utils')
| -rw-r--r-- | src/guile/skribilo/utils/compat.scm | 46 |
1 files changed, 22 insertions, 24 deletions
diff --git a/src/guile/skribilo/utils/compat.scm b/src/guile/skribilo/utils/compat.scm index 3fce068..9ed9f3e 100644 --- a/src/guile/skribilo/utils/compat.scm +++ b/src/guile/skribilo/utils/compat.scm @@ -136,30 +136,28 @@ ("acmproc.skr" . (skribilo package acmproc)))) (define*-public (skribe-load file :rest args) - (call/cc - (lambda (return) - (guard (c ((file-search-error? c) - ;; Regular file loading failed. Try built-ins. - (let ((mod-name (assoc-ref %skribe-known-files file))) - (if mod-name - (begin - (if (> (*verbose*) 1) - (format (current-error-port) - " skribe-load: `~a' -> `~a'~%" - file mod-name)) - (let ((mod (false-if-exception - (resolve-module mod-name)))) - (if (not mod) - (raise c) - (begin - (set-module-uses! - (current-module) - (cons mod (module-uses (current-module)))) - (return #t))))) - (raise c))))) - - ;; Try a regular `load-document'. - (apply load-document file args))))) + (guard (c ((file-search-error? c) + ;; Regular file loading failed. Try built-ins. + (let ((mod-name (assoc-ref %skribe-known-files file))) + (if mod-name + (begin + (if (> (*verbose*) 1) + (format (current-error-port) + " skribe-load: `~a' -> `~a'~%" + file mod-name)) + (let ((mod (false-if-exception + (resolve-module mod-name)))) + (if (not mod) + (raise c) + (begin + (set-module-uses! + (current-module) + (cons mod (module-uses (current-module)))) + #t)))) + (raise c))))) + + ;; Try a regular `load-document'. + (apply load-document file args))) (define-public skribe-include include-document) |