diff options
| -rw-r--r-- | ChangeLog | 31 | ||||
| -rw-r--r-- | src/guile/skribilo/engine/lout.scm | 4 | ||||
| -rw-r--r-- | src/guile/skribilo/package/eq/lout.scm | 7 |
3 files changed, 35 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog index 9f7ef92..9f42a14 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,37 @@ # arch-tag: automatic-ChangeLog--lcourtes@laas.fr--2005-mobile/skribilo--devel--1.2 # +2006-04-08 10:26:51 GMT Ludovic Courtes <ludovic.courtes@laas.fr> patch-51 + + Summary: + Merge from lcourtes@laas.fr--2004-libre + Revision: + skribilo--devel--1.2--patch-51 + + 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. + + modified files: + ChangeLog src/guile/skribilo/engine/lout.scm + src/guile/skribilo/package/eq/lout.scm + + new patches: + lcourtes@laas.fr--2004-libre/skribilo--devel--1.2--patch-73 + lcourtes@laas.fr--2004-libre/skribilo--devel--1.2--patch-74 + lcourtes@laas.fr--2004-libre/skribilo--devel--1.2--patch-75 + lcourtes@laas.fr--2004-libre/skribilo--devel--1.2--patch-76 + lcourtes@laas.fr--2004-libre/skribilo--devel--1.2--patch-77 + lcourtes@laas.fr--2004-libre/skribilo--devel--1.2--patch-78 + + 2006-03-19 20:08:40 GMT Ludovic Courtes <ludovic.courtes@laas.fr> patch-50 Summary: 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 " } }") ;; |