X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Ftoc-init.ly;h=ad7c64b72c5e421876ed74796e6a9ca37ba57921;hb=2c894ac3f60274f9fdd0bf2593cfb856c5c7b13f;hp=ef1f18fe8b2497dbaa9a0bb4fcc99e6e63920880;hpb=ec074a41f03cf4cd3b914daa1359dd6e0fb2012d;p=lilypond.git diff --git a/ly/toc-init.ly b/ly/toc-init.ly index ef1f18fe8b..ad7c64b72c 100644 --- a/ly/toc-init.ly +++ b/ly/toc-init.ly @@ -1,4 +1,4 @@ -\version "2.16.0" +\version "2.19.22" %% defined later, in a closure #(define-public (add-toc-item! markup-symbol text) @@ -36,13 +36,14 @@ tocItemWithDotsMarkup = \markup \fill-with-pattern #1 #RIGHT . \fromproperty #'toc:text \fromproperty #'toc:page #(define-markup-list-command (table-of-contents layout props) () + #:properties ((baseline-skip)) ( _i "Outputs the table of contents, using the paper variable @code{tocTitleMarkup} for its title, then the list of lines built using the @code{tocItem} music function Usage: @code{\\markuplist \\table-of-contents}" ) (cons (interpret-markup layout props (ly:output-def-lookup layout 'tocTitleMarkup)) - (space-lines (chain-assoc-get 'baseline-skip props) + (space-lines baseline-skip (map (lambda (toc-item) (let ((label (car toc-item)) (toc-markup (cadr toc-item)) @@ -58,7 +59,7 @@ Usage: @code{\\markuplist \\table-of-contents}" ) (toc-items))))) tocItem = -#(define-music-function (parser location text) (markup?) +#(define-music-function (text) (markup?) "Add a line to the table of content, using the @code{tocItemMarkup} paper variable markup" (add-toc-item! 'tocItemMarkup text))