diff options
| author | Ludovic Court`es | 2007-06-29 11:44:40 +0000 |
|---|---|---|
| committer | Ludovic Court`es | 2007-06-29 11:44:40 +0000 |
| commit | 4b7b6d5564594d55491d148fa6ba5717ca4aff77 (patch) | |
| tree | 60797317af90f6704e048b6c9e2f813feceb839f /src/guile/skribilo/package/base.scm | |
| parent | d124800880fff08365f571d5cd0904ef62fd23a1 (diff) | |
| parent | e6880448f8001d0659d69a49d9b16fdf63daaa18 (diff) | |
| download | skribilo-4b7b6d5564594d55491d148fa6ba5717ca4aff77.tar.gz skribilo-4b7b6d5564594d55491d148fa6ba5717ca4aff77.tar.lz skribilo-4b7b6d5564594d55491d148fa6ba5717ca4aff77.zip | |
Factorized `bib-ref+', add a `:sort-bib-refs' options to `ref'.
* src/guile/skribilo/biblio.scm (bib-sort-refs/number): New.
* src/guile/skribilo/engine/base.scm: Use `%skribilo-module-reader'
instead of the Skribe reader.
(bib-ref, bib-ref+): New writer. Handle `:sort-bib-refs' in
`bib-ref+'.
* src/guile/skribilo/engine/context.scm (bib-ref+): Removed.
* src/guile/skribilo/engine/html.scm (bib-ref+): Removed.
* src/guile/skribilo/engine/latex.scm (bib-ref, bib-ref+): Removed.
* src/guile/skribilo/engine/lout.scm (lout-bib-refs-sort/number):
Removed.
(lout-engine): Documented `bib-refs-sort-proc' as unused.
(bib-ref, bib-ref+): Removed.
* src/guile/skribilo/package/base.scm (ref): New `:sort-bib-refs' option.
[bib-ref]: Add it to the markup's option list.
git-archimport-id: skribilo@sv.gnu.org--2006/skribilo--devo--1.2--patch-124
Diffstat (limited to 'src/guile/skribilo/package/base.scm')
| -rw-r--r-- | src/guile/skribilo/package/base.scm | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/guile/skribilo/package/base.scm b/src/guile/skribilo/package/base.scm index 28cd0fb..9f6de43 100644 --- a/src/guile/skribilo/package/base.scm +++ b/src/guile/skribilo/package/base.scm @@ -34,7 +34,7 @@ ;; optional ``sub-packages'' :autoload (skribilo biblio) (*bib-table* resolve-bib - bib-load! bib-add!) + bib-load! bib-add! bib-sort-refs/number) :autoload (skribilo color) (skribe-use-color!) :autoload (skribilo source) (language? source-read-lines source-fontify) :autoload (skribilo prog) (make-prog-body resolve-line) @@ -1063,7 +1063,8 @@ (handle #f) (line #f) (skribe #f) - (page #f)) + (page #f) + (sort-bib-refs bib-sort-refs/number)) (define (unref ast text kind) (let ((msg (format #f "can't find `~a': " kind))) (if (ast? ast) @@ -1188,8 +1189,8 @@ (o (markup-option s 'used))) (markup-option-add! s 'used (if (pair? o) (cons h o) (list h))) n) - (unref #f v 'bib)))) ; FIXME: This prevents source location - ; info to be provided in the warning msg + (unref #f v 'bib)))) ; FIXME: This prevents source location info + ; from being provided in the warning msg (define (bib-ref text) (if (pair? text) (new markup @@ -1197,7 +1198,8 @@ (ident (symbol->string (gensym "bib-ref+"))) (class class) (loc &invocation-location) - (options (the-options opts :ident :class)) + (options `((:sort-bib-refs ,sort-bib-refs) + ,@(the-options opts :ident :class))) (body (map make-bib-ref text))) (make-bib-ref text))) (define (url-ref) |