X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Ftoc-init.ly;h=32c1dd2b3ae302c16103f8e66ec634be918fc7ba;hb=3d571d9c80b7855422c96ecc6966bcbfa4dfb9ff;hp=334c983d0b793d5fb81630658a3c6cd5f7b53749;hpb=c373de38a49dea998a0733658a48a0e62912fa11;p=lilypond.git

diff --git a/ly/toc-init.ly b/ly/toc-init.ly
index 334c983d0b..32c1dd2b3a 100644
--- a/ly/toc-init.ly
+++ b/ly/toc-init.ly
@@ -1,4 +1,4 @@
-\version "2.11.26"
+\version "2.12.0"
 
 %% defined later, in a closure
 #(define-public (add-toc-item! markup-symbol text)
@@ -31,11 +31,14 @@
   }
 }
 
+tocItemWithDotsMarkup = \markup \fill-with-pattern #1 #RIGHT .
+  \fromproperty #'toc:text \fromproperty #'toc:page
+
 #(define-markup-list-command (table-of-contents layout props) ()
-  "Outputs the table of contents, using the paper variable
+  ( _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{\\markuplines \\table-of-contents}"
+Usage: @code{\\markuplines \\table-of-contents}" )
   (cons (interpret-markup layout props
 			  (ly:output-def-lookup layout 'tocTitleMarkup))
 	(space-lines (chain-assoc-get 'baseline-skip props)
@@ -45,9 +48,10 @@ Usage: @code{\\markuplines \\table-of-contents}"
 				 (text (caddr toc-item)))
 			     (interpret-markup
 			       layout
-			       (cons (list (cons 'toc:page 
-					    (markup #:page-ref label "XXX" "?"))
-					   (cons 'toc:text text))
+			       (cons (list (cons 'toc:page
+					    (markup #:with-link label #:page-ref label "XXX" "?"))
+					   (cons 'toc:text (markup #:with-link label text))
+					   (cons 'toc:label label))
 				     props)
 			       (ly:output-def-lookup layout toc-markup))))
 			 (toc-items)))))