diff options
| author | Ludovic Courtes | 2006-01-10 23:40:38 +0000 |
|---|---|---|
| committer | Ludovic Courtes | 2006-01-10 23:40:38 +0000 |
| commit | 9bf866163bcf1c187341ab2e364c8dddc17093e8 (patch) | |
| tree | 1063a21da359fd1a618ca3a2596e5f5167ddeb1a /src/guile/skribilo/coloring/lisp.scm | |
| parent | 20e5a989999ca11d68bf90417402c60c275dd0cc (diff) | |
| download | skribilo-9bf866163bcf1c187341ab2e364c8dddc17093e8.tar.gz skribilo-9bf866163bcf1c187341ab2e364c8dddc17093e8.tar.lz skribilo-9bf866163bcf1c187341ab2e364c8dddc17093e8.zip | |
Syntax highlighting and `image'-related fixes.
* src/guile/skribilo/coloring/lisp.scm: Use `(skribilo reader)'.
(lisp-family-fontifier): Take a READ argument.
(skribe-fontifier): Pass `(make-reader 'skribe)' as the reader.
* src/guile/skribilo/module.scm (%skribilo-user-autoloads): Added
`(skribilo prog)'.
* src/guile/skribilo/parameters.scm (*ref-base*): New.
* src/guile/skribilo/prog.scm: Guilified.
* src/guile/skribilo/reader/skribe.scm: Nothing changed.
* src/guile/skribilo/runtime.scm (suffix): New.
(string-ref-base): Don't use `file-separator'. Use `string-contains'
instead of Bigloo/STkLos' `substring=?'.
(convert-image): Use `*image-path*' instead of `skribe-image-path'.
Don't use `make-path'.
git-archimport-id: lcourtes@laas.fr--2005-mobile/skribilo--devel--1.2--patch-20
Diffstat (limited to 'src/guile/skribilo/coloring/lisp.scm')
| -rw-r--r-- | src/guile/skribilo/coloring/lisp.scm | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/guile/skribilo/coloring/lisp.scm b/src/guile/skribilo/coloring/lisp.scm index 55fb7d6..589e70a 100644 --- a/src/guile/skribilo/coloring/lisp.scm +++ b/src/guile/skribilo/coloring/lisp.scm @@ -30,6 +30,7 @@ :use-module (skribilo source) :use-module (skribilo lib) :use-module (skribilo runtime) + :autoload (skribilo reader) (make-reader) :export (skribe scheme stklos bigloo lisp)) @@ -57,7 +58,7 @@ (Loop (%read inp)))))) -(define (lisp-family-fontifier s) +(define (lisp-family-fontifier s read) (let ((lisp-input (open-input-string s))) (let loop ((token (read lisp-input)) (res '())) @@ -99,7 +100,7 @@ (with-fluids ((*the-keys* (init-lisp-keys)) (*bracket-highlight* #f) (*class-highlight* #f)) - (lisp-family-fontifier s))) + (lisp-family-fontifier s read))) (define lisp @@ -143,7 +144,7 @@ (with-fluids ((*the-keys* (init-scheme-keys)) (*bracket-highlight* #f) (*class-highlight* #f)) - (lisp-family-fontifier s))) + (lisp-family-fontifier s read))) (define scheme @@ -196,7 +197,7 @@ (with-fluids ((*the-keys* (init-stklos-keys)) (*bracket-highlight* #t) (*class-highlight* #t)) - (lisp-family-fontifier s))) + (lisp-family-fontifier s read))) (define stklos @@ -257,7 +258,7 @@ (with-fluids ((*the-keys* (init-skribe-keys)) (*bracket-highlight* #t) (*class-highlight* #t)) - (lisp-family-fontifier s))) + (lisp-family-fontifier s (make-reader 'skribe)))) (define skribe |