diff options
| author | Ludovic Court`es | 2007-07-03 09:04:14 +0000 |
|---|---|---|
| committer | Ludovic Court`es | 2007-07-03 09:04:14 +0000 |
| commit | f9392ad8b5d8af05d7f59757507c94044cc343af (patch) | |
| tree | 728ea377a75932e600c734a9ed985c2c537cc3d6 /src/guile/skribilo/engine/lout.scm | |
| parent | 3650657f3e41690a1051c2f3e14e67acaf60f6b2 (diff) | |
| parent | 46122eb2392f848079320e09eda8b747dc9a4177 (diff) | |
| download | skribilo-f9392ad8b5d8af05d7f59757507c94044cc343af.tar.gz skribilo-f9392ad8b5d8af05d7f59757507c94044cc343af.tar.lz skribilo-f9392ad8b5d8af05d7f59757507c94044cc343af.zip | |
Merge from skribilo@sv.gnu.org--2006
Patches applied:
* lcourtes@laas.fr--2005-mobile/skribilo--devel--1.2 (patch 110-117)
- Merge from skribilo@sv.gnu.org--2006/skribilo--devo--1.2
- Fixed (or almost so) the C lexer.
- Autoload `(skribilo coloring c)' in the default module.
- `lout' engine: Fixed argument passing for `lout-illustration'.
- `base' package: Honor `:line #f' in `prog'.
- Tiny doc fix.
- Removed global hash tables for marks and program lines.
- Fixed and simplified `(ref :line ...)', aka. `line-ref'.
* skribilo@sv.gnu.org--2006/skribilo--devo--1.2 (patch 122-133)
- `diff' package: Small bug fix.
- Updated `TODO'.
- Factorized `bib-ref+', add a `:sort-bib-refs' options to `ref'.
- Updated documentation of `ref'.
- `lncs' package: Honor `:sort-bib-refs'.
- Fixed (or almost so) the C lexer.
- Autoload `(skribilo coloring c)' in the default module.
- `lout' engine: Fixed argument passing for `lout-illustration'.
- `base' package: Honor `:line #f' in `prog'.
- Tiny doc fix.
- Removed global hash tables for marks and program lines.
- Fixed and simplified `(ref :line ...)', aka. `line-ref'.
git-archimport-id: lcourtes@laas.fr--2006-libre/skribilo--devo--1.2--patch-83
Diffstat (limited to 'src/guile/skribilo/engine/lout.scm')
| -rw-r--r-- | src/guile/skribilo/engine/lout.scm | 31 |
1 files changed, 8 insertions, 23 deletions
diff --git a/src/guile/skribilo/engine/lout.scm b/src/guile/skribilo/engine/lout.scm index bc796bd..a93cde7 100644 --- a/src/guile/skribilo/engine/lout.scm +++ b/src/guile/skribilo/engine/lout.scm @@ -2472,22 +2472,6 @@ (output (transform n) e)))))) ;*---------------------------------------------------------------------*/ -;* line-ref ... */ -;*---------------------------------------------------------------------*/ -(markup-writer 'line-ref - :options '(:offset) - :before "{ @I {" ;; FIXME: Not tested - :action (lambda (n e) - (let ((o (markup-option n :offset)) - (v (string->number (markup-option n :text)))) - (cond - ((and (number? o) (number? v)) - (display (+ o v))) - (else - (display v))))) - :after "} }") - -;*---------------------------------------------------------------------*/ ;* &the-bibliography ... */ ;*---------------------------------------------------------------------*/ (markup-writer '&the-bibliography @@ -2811,13 +2795,14 @@ (gensym "lout-illustration"))) ".eps")) (port (open-output-pipe - (apply string-append - (or (engine-custom lout 'lout-program-name) - "lout") - " -o " output - " -EPS " - (engine-custom lout - 'lout-program-arguments))))) + (string-append + (or (engine-custom lout 'lout-program-name) + "lout") + " -o " output + " -EPS " + (string-join + (engine-custom lout + 'lout-program-arguments)))))) ;; send the illustration to Lout's standard input (display (illustration-header) port) |