diff options
| author | Ludovic Courtes | 2007-07-01 23:50:22 +0000 |
|---|---|---|
| committer | Ludovic Courtes | 2007-07-01 23:50:22 +0000 |
| commit | 46122eb2392f848079320e09eda8b747dc9a4177 (patch) | |
| tree | 728ea377a75932e600c734a9ed985c2c537cc3d6 /src/guile/skribilo/prog.scm | |
| parent | 518ed0ad7bdd7b1bb34360d5480c09bcbdffe5cd (diff) | |
| download | skribilo-46122eb2392f848079320e09eda8b747dc9a4177.tar.gz skribilo-46122eb2392f848079320e09eda8b747dc9a4177.tar.lz skribilo-46122eb2392f848079320e09eda8b747dc9a4177.zip | |
Fixed and simplified `(ref :line ...)', aka. `line-ref'.
* src/guile/skribilo/engine/base.scm (line-ref): Changed the way the
number is obtained.
* src/guile/skribilo/engine/context.scm (line-ref): Removed.
* src/guile/skribilo/engine/html.scm (&prog-line): New. Produce an
anchor. Needed because `mark' are no longer produced by
`make-prog-body'.
(line-ref): Changed the way the number is obtained.
* src/guile/skribilo/engine/latex.scm (line-ref): Removed.
* src/guile/skribilo/engine/lout.scm (line-ref): Removed.
* src/guile/skribilo/prog.scm (make-line-mark): Removed.
(make-prog-body): No longer use it.
git-archimport-id: skribilo@sv.gnu.org--2006/skribilo--devo--1.2--patch-133
Diffstat (limited to 'src/guile/skribilo/prog.scm')
| -rw-r--r-- | src/guile/skribilo/prog.scm | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/guile/skribilo/prog.scm b/src/guile/skribilo/prog.scm index 5f08420..87321da 100644 --- a/src/guile/skribilo/prog.scm +++ b/src/guile/skribilo/prog.scm @@ -27,7 +27,6 @@ :use-module (skribilo lib) ;; `new' :use-module (skribilo ast) :use-module (skribilo utils syntax) - :autoload (skribilo package base) (mark) :export (make-prog-body resolve-line)) @@ -53,12 +52,6 @@ ;*---------------------------------------------------------------------*/ -;* make-line-mark ... */ -;*---------------------------------------------------------------------*/ -(define (make-line-mark ident b) - (list (mark ident) b)) - -;*---------------------------------------------------------------------*/ ;* resolve-line ... */ ;*---------------------------------------------------------------------*/ (define (resolve-line doc id) @@ -200,9 +193,9 @@ (let* ((line-ident (symbol->string (gensym "&prog-line"))) (n (new markup (markup '&prog-line) - (ident line-ident) + (ident (or m line-ident)) (options `((:number ,(and lnum-init lnum)))) - (body (if m (make-line-mark m l) l))))) + (body l)))) (loop (cdr lines) (+ lnum 1) (cons n res)))))))) |