* scm/define-music-types.scm (music-descriptions): don't use

[lilypond.git] / scripts / lilypond-book.py

diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index ccc873c41c36e8b5556ed93bda1972b6a9ffe03b..692790bf3c670d7000032194257580e1570c0f02 100644 (file)
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -106,7 +106,7 @@ option_definitions = [
          _ ("show warranty and copyright")),
 ]
 
-include_path = [ly.abspath (os.getcwd ())]
+include_path = [os.path.abspath (os.getcwd ())]
 lilypond_binary = os.path.join ('@bindir@', 'lilypond')
 
 # Only use installed binary when we are installed too.
@@ -554,7 +554,7 @@ PREAMBLE_LY = r'''%%%% Generated by %(program_name)s
 #(set! toplevel-score-handler ly:parser-print-score)
 #(set! toplevel-music-handler (lambda (p m)
                               (ly:parser-print-score
-                               p (ly:music-scorify m p))))
+                               p (scorify-music m p))))
 
 #(ly:set-option (quote no-point-and-click))
 
@@ -1531,7 +1531,7 @@ def do_options ():
                        sys.exit (0)
                elif o == '--include' or o == '-I':
                        include_path.append (os.path.join (original_dir,
-                                                          ly.abspath (a)))
+                                                          os.path.abspath (a)))
                elif o == '--output' or o == '-o':
                        output_name = a
                elif o == '--process' or o == '-P':