remove tail, filter-list, filter-out-list,

[lilypond.git] / scm / new-markup.scm

diff --git a/scm/new-markup.scm b/scm/new-markup.scm
index e78ef4184e5c39f2e16e1af7c8a63c626112cb65..f04cf768d8e3b980ee2089bf75e1b7d922e248ff 100644 (file)
--- a/scm/new-markup.scm
+++ b/scm/new-markup.scm
@@ -223,13 +223,13 @@ for the reader.
        (dot (ly:find-glyph-by-name font "dots-dot"))
        (dotwid  (interval-length (ly:molecule-get-extent dot X)))
        (dots (if (> dot-count 0)
-                (reduce
+                (reduce-no-unit        ; TODO: use reduce.
                  (lambda (x y)
                    (ly:molecule-add x y))
                  (map (lambda (x)
                         (ly:molecule-translate-axis
                          dot  (* (+ 1 (* 2 x)) dotwid) X) )
-                      (range dot-count 1)))
+                      (iota dot-count 1)))
                 #f
                 ))
        
@@ -658,13 +658,11 @@ against SIGNATURE, reporting MAKE-NAME as the user-invoked function.
 
 (define-public (brew-new-markup-molecule grob)
   (let*
-      ((t (ly:get-grob-property grob 'text)))
+      ((t (ly:get-grob-property grob 'text))
+       (chain (Font_interface::get_property_alist_chain grob)))
     (if (markup? t)
-       (interpret-markup grob
-                         (Font_interface::get_property_alist_chain grob)
-                         t
-                         )
-       (Text_item::text_to_molecule t)
+       (interpret-markup grob  chain t)
+       (Text_item::text_to_molecule grob t chain)
        )))
 
 (define-public empty-markup (make-simple-markup ""))