(main): use commands.mkarg () to quote

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

diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index eb4f4617cab6cf19bd34db26e533bdd7b39ca9a7..d349c29bc3e46fd1497ba820f2ee27ac2810c60c 100644 (file)
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -33,6 +33,7 @@ import glob
 import stat
 import string
 import tempfile
+import commands
 
 # Users of python modules should include this snippet
 # and customize variables below.
@@ -50,7 +51,9 @@ if os.environ.has_key ('LILYPONDPREFIX'):
        datadir = os.environ['LILYPONDPREFIX']
        while datadir[-1] == os.sep:
                datadir= datadir[:-1]
-
+               
+       datadir = os.path.join (datadir, "share/lilypond/current/")
+       
 sys.path.insert (0, os.path.join (datadir, 'python'))
 
 # Customize these.
@@ -561,9 +564,13 @@ PREAMBLE_LY = r'''%%%% Generated by %(program_name)s
 %(preamble_string)s
 
 
-%% ********************************
+
+
+
+
+%% ****************************************************************
 %% Start cut-&-pastable-section 
-%% ********************************
+%% ****************************************************************
 
 \paper {
   #(define dump-extents #t)
@@ -579,16 +586,32 @@ PREAMBLE_LY = r'''%%%% Generated by %(program_name)s
 FRAGMENT_LY = r'''
 %(notes_string)s
 {
+
+
+%% ****************************************************************
 %% ly snippet contents follows:
+%% ****************************************************************
 %(code)s
+
+
+%% ****************************************************************
 %% end ly snippet
+%% ****************************************************************
 }
 '''
 
 FULL_LY = '''
+
+
+%% ****************************************************************
 %% ly snippet:
+%% ****************************************************************
 %(code)s
+
+
+%% ****************************************************************
 %% end ly snippet
+%% ****************************************************************
 '''
 
 texinfo_linewidths = {
@@ -1051,10 +1074,10 @@ class Lilypond_snippet (Snippet):
                        if VERBATIM in self.option_dict:
                                verb = self.substring ('code')
                                str += (output[LATEX][VERBATIM] % vars ())
-                       if QUOTE in self.option_dict:
-                               str = output[LATEX][QUOTE] % vars ()
 
                str += (output[LATEX][OUTPUT] % vars ())
+               if QUOTE in self.option_dict:
+                       str = output[LATEX][QUOTE] % vars ()
                return str
 
        def output_print_filename (self, format):
@@ -1612,7 +1635,7 @@ def main ():
                              + ' --formats=%s --backend eps ' % formats
 
        if process_cmd:
-               process_cmd += string.join ([(' -I %s' % p)
+               process_cmd += string.join ([(' -I %s' % commands.mkarg (p))
                                             for p in include_path])
 
        ly.identify (sys.stderr)