* GNUmakefile.in: clean up web building.

[lilypond.git] / input / regression / molecule-hacking.ly

diff --git a/input/regression/molecule-hacking.ly b/input/regression/molecule-hacking.ly
index 49a9ce9f4f16d25f2bcb034ebef287a053cfde75..e0cb4bc84506aa24eacb804bcdda3610918940e3 100644 (file)
--- a/input/regression/molecule-hacking.ly
+++ b/input/regression/molecule-hacking.ly
@@ -1,3 +1,4 @@
+\version "1.7.18"
 
 \header { texidoc=" You can write molecule callbacks in Scheme, thus
 providing custom glyphs for notation elements.  A simple example is
@@ -6,9 +7,9 @@ adding parentheses to existing molecule callbacks.
 The parenthesized beam is less successful due to implementation of the
 Beam. The note head is also rather naive, since the extent of the
 parens are also not seen by accidentals.
-";
+"
        
-        }
+}
 
 #(define (parenthesize-callback callback)
    "Construct a function that will do CALLBACK and add parentheses.
@@ -27,23 +28,25 @@ GROB.  The dimensions of the molecule is not affected.
 "
      
      (let* (
-           (fn (ly-get-default-font grob))
-           (pclose (ly-find-glyph-by-name fn "accidentals-)"))
-           (popen (ly-find-glyph-by-name fn "accidentals-("))
+           (fn (ly:get-default-font grob))
+           (pclose (ly:find-glyph-by-name fn "accidentals-rightparen"))
+           (popen (ly:find-glyph-by-name fn "accidentals-leftparen"))
            (subject (callback grob))
 
-           ;; remember old size
-           (subject-dims (ly-get-molecule-extent subject 0))
-           )
+           ; remember old size
+           (subject-dim-x (ly:molecule-get-extent subject 0))
+           (subject-dim-y (ly:molecule-get-extent subject 1))
+       )
 
-       ;; add parens
+        ; add parens
         (set! subject
-            (ly-combine-molecule-at-edge 
-             (ly-combine-molecule-at-edge subject 0 1 pclose 0.2)
+            (ly:molecule-combine-at-edge 
+             (ly:molecule-combine-at-edge subject 0 1 pclose 0.2)
              0 -1 popen  0.2))
 
-       ;; revert old size.
-       (ly-set-molecule-extent! subject 0 subject-dims)
+       ; revert old size.
+       (ly:molecule-set-extent! subject 0 subject-dim-x)
+       (ly:molecule-set-extent! subject 1 subject-dim-y)
        subject
     )
      )
@@ -68,6 +71,7 @@ GROB.  The dimensions of the molecule is not affected.
                    
                    }
 
-       \paper { linewidth = -1.; }
+       \paper { raggedright = ##t}
        }
 
+