* VERSION (MY_PATCH_LEVEL): make 1.7.0

[lilypond.git] / input / test / boxed-molecule.ly

diff --git a/input/test/boxed-molecule.ly b/input/test/boxed-molecule.ly
index 7767e4f36b606688dd3dc163f7477ebdd74b21bc..a87f5e4dbd055c50de97b6bd1b404d971ee77414 100644 (file)
--- a/input/test/boxed-molecule.ly
+++ b/input/test/boxed-molecule.ly
@@ -1,53 +1,27 @@
-\version "1.5.68"
+\version "1.6.1"
 \header {
 
 texidoc = "overriding the molecule callback can also be used to draw a
  box around arbitrary grobs.
 
- TODO: check whether the corners are really correct.
-
  TODO:  circled molecules.
   
  "
 }
 
-#(define (make-molecule-boxer callback)
-  (define (molecule-boxer grob)
-  (let*
-   (
-    (mol    (callback grob))
-    (box-padding 0.1)
-    (x-ext (widen-interval (ly-get-molecule-extent mol 0) box-padding))
-    (y-ext (widen-interval (ly-get-molecule-extent mol 1) box-padding))
-    (rule-thick 0.1)
-    (x-rule (box-molecule (widen-interval x-ext rule-thick)
-                              (cons 0 rule-thick)))
-    (y-rule (box-molecule (cons 0 rule-thick) y-ext))
-    )
-    
-    (set! mol (ly-combine-molecule-at-edge mol 0 1 y-rule (* 0.5 box-padding)))
-    (set! mol (ly-combine-molecule-at-edge mol 0 -1  y-rule (* 0.5 box-padding)))
-    (set! mol (ly-combine-molecule-at-edge mol 1 1  x-rule 0.0))  
-    (set! mol (ly-combine-molecule-at-edge mol 1 -1 x-rule 0.0))
-    
-    mol
- ))
- molecule-boxer
- )
-
 
  \score { \notes \relative c''  {
 
  \property Voice.TextScript \override #'molecule-callback =
-   #(make-molecule-boxer Text_item::brew_molecule)
+   #(make-molecule-boxer 0.1 0.3 0.2 Text_item::brew_molecule)
 
    c'4^"foo"
 
 \property Voice.Stem \override #'molecule-callback =
-   #(make-molecule-boxer Stem::brew_molecule)
+   #(make-molecule-boxer 0.05 0.25 0.25 Stem::brew_molecule)
 
 \property Score.RehearsalMark \override #'molecule-callback =
-   #(make-molecule-boxer Text_item::brew_molecule)
+   #(make-molecule-boxer 0.15 0.3 0.3 Text_item::brew_molecule)
 
       c8
 \property Voice.Stem \revert #'molecule-callback