diff options
| author | Ludovic Courtes | 2006-04-08 10:26:51 +0000 |
|---|---|---|
| committer | Ludovic Courtes | 2006-04-08 10:26:51 +0000 |
| commit | 8aac71ff592e43cd42b768e7facc788be86b38f4 (patch) | |
| tree | 9661814a87d8436b8646d85ac2e08e184f7a5374 /src | |
| parent | d43ab320c8c711aef6417d33a33d0b3d2058f690 (diff) | |
| parent | 20b51395ade2d520b83530aa548947a1a53fad4a (diff) | |
| download | skribilo-8aac71ff592e43cd42b768e7facc788be86b38f4.tar.gz skribilo-8aac71ff592e43cd42b768e7facc788be86b38f4.tar.lz skribilo-8aac71ff592e43cd42b768e7facc788be86b38f4.zip | |
Merge from lcourtes@laas.fr--2004-libre
Patches applied:
* lcourtes@laas.fr--2004-libre/skribilo--devel--1.2 (patch 73-78)
- Merge from lcourtes@laas.fr--2005-mobile
- Moved `convert-image' et al. to `utils/images.scm'.
- Image- and compat-related fixes.
- Lout engine: small fixes.
- Various documentation fixes + completed the doc automake stuff.
- Small aesthetic changes in the Lout engine.
git-archimport-id: lcourtes@laas.fr--2005-mobile/skribilo--devel--1.2--patch-51
Diffstat (limited to 'src')
| -rw-r--r-- | src/guile/skribilo/engine/lout.scm | 4 | ||||
| -rw-r--r-- | src/guile/skribilo/package/eq/lout.scm | 7 |
2 files changed, 4 insertions, 7 deletions
diff --git a/src/guile/skribilo/engine/lout.scm b/src/guile/skribilo/engine/lout.scm index 3d86eb4..8727df8 100644 --- a/src/guile/skribilo/engine/lout.scm +++ b/src/guile/skribilo/engine/lout.scm @@ -405,7 +405,7 @@ ;; In single-column document, `@FullWidth' yields a blank page. (display "\n@FullWidth {")) (display "\n//3.0fx\n") - (display "\n@Center 1.4f @Font @B { ") + (display "\n@Center 1.4f @Font @B { cragged nohyphen 1.4fx } @Break { ") (if title (output title engine) (display "The Lout Document")) @@ -698,7 +698,7 @@ (string-append "{ { Symbol Base } @Font " "@Char \"" m "\" }")) (lambda (m) - (format #f "@Eq { ~a }\n" m))))) + (format #f "{ @Eq { ~a } }" m))))) ;; So that calls to `markup-writer' automatically use `lout-engine'... diff --git a/src/guile/skribilo/package/eq/lout.scm b/src/guile/skribilo/package/eq/lout.scm index bd2ccf4..561e4cb 100644 --- a/src/guile/skribilo/package/eq/lout.scm +++ b/src/guile/skribilo/package/eq/lout.scm @@ -52,16 +52,13 @@ ;;; -;; FIXME: Reimplement the `symbol' writer so that `@Sym' is not used within -;; equations (e.g. output `alpha' instead of `{ @Sym alpha }'). - (markup-writer 'eq (find-engine 'lout) - :before "\n@Eq { " + :before "{ @Eq { " :action (lambda (node engine) (let ((eq (markup-body node))) ;(fprint (current-error-port) "eq=" eq) (output eq engine))) - :after " }\n") + :after " } }") ;; |