diff options
Diffstat (limited to 'src/guile/skribilo/engine')
-rw-r--r-- | src/guile/skribilo/engine/base.scm | 8 | ||||
-rw-r--r-- | src/guile/skribilo/engine/html.scm | 6 | ||||
-rw-r--r-- | src/guile/skribilo/engine/lout.scm | 2 |
3 files changed, 10 insertions, 6 deletions
diff --git a/src/guile/skribilo/engine/base.scm b/src/guile/skribilo/engine/base.scm index ed15da4..1d04e1d 100644 --- a/src/guile/skribilo/engine/base.scm +++ b/src/guile/skribilo/engine/base.scm @@ -418,14 +418,18 @@ (t (cond ((null? ie) "") + ;; FIXME: Since we don't support + ;; `:&skribe-eval-location', we could set up a + ;; `parameterize' thing around `skribe-eval' to + ;; provide it with the right location information. ((or (not (integer? nc)) (= nc 1)) (table :width 100. - :&skribe-eval-location loc + ;;:&skribe-eval-location loc :class "index-table" (make-column ie pref))) (else (table :width 100. - :&skribe-eval-location loc + ;;:&skribe-eval-location loc :class "index-table" (make-sub-tables ie nc pref)))))) (output (skribe-eval t e) e)))) diff --git a/src/guile/skribilo/engine/html.scm b/src/guile/skribilo/engine/html.scm index 5165258..1ad86e9 100644 --- a/src/guile/skribilo/engine/html.scm +++ b/src/guile/skribilo/engine/html.scm @@ -531,7 +531,7 @@ ;*---------------------------------------------------------------------*/ ;* html-width ... */ ;*---------------------------------------------------------------------*/ -(define (html-width width) +(define-public (html-width width) (cond ((and (integer? width) (exact? width)) (format #f "~A" width)) @@ -545,7 +545,7 @@ ;*---------------------------------------------------------------------*/ ;* html-class ... */ ;*---------------------------------------------------------------------*/ -(define (html-class m) +(define-public (html-class m) (if (markup? m) (let ((c (markup-class m))) (if (or (string? c) (symbol? c) (number? c)) @@ -926,7 +926,7 @@ ;*---------------------------------------------------------------------*/ ;* html-title-authors ... */ ;*---------------------------------------------------------------------*/ -(define (html-title-authors authors e) +(define-public (html-title-authors authors e) (define (html-authorsN authors cols first) (define (make-row authors . opt) (tr (map (lambda (v) diff --git a/src/guile/skribilo/engine/lout.scm b/src/guile/skribilo/engine/lout.scm index d01b547..c2339ca 100644 --- a/src/guile/skribilo/engine/lout.scm +++ b/src/guile/skribilo/engine/lout.scm @@ -876,7 +876,7 @@ ;* lout-width ... */ ;*---------------------------------------------------------------------*/ (define (lout-width width) - (cond ((flonum? width) ;; a relative size + (cond ((inexact? width) ;; a relative size (XXX: was `flonum?') ;; FIXME: Hack ahead: assuming A4 with a 2.5cm margin ;; on both sides (let* ((orientation (let ((lout (find-engine 'lout))) |