resolve merge

[lilypond.git] / ly / toc-init.ly

diff --git a/ly/toc-init.ly b/ly/toc-init.ly
index dda4f31ab4d13250336decea7f2c3e57c87485e6..55b48b96c2fec65040489667e5768e86ff093d21 100644 (file)
--- a/ly/toc-init.ly
+++ b/ly/toc-init.ly
@@ -1,4 +1,4 @@
-\version "2.12.0"
+\version "2.14.0"
 
 %% defined later, in a closure
 #(define-public (add-toc-item! markup-symbol text)
@@ -31,6 +31,9 @@
   }
 }
 
+tocItemWithDotsMarkup = \markup \fill-with-pattern #1 #RIGHT .
+  \fromproperty #'toc:text \fromproperty #'toc:page
+
 #(define-markup-list-command (table-of-contents layout props) ()
   ( _i "Outputs the table of contents, using the paper variable
 @code{tocTitleMarkup} for its title, then the list of lines
@@ -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)))))