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

shell arguments.

diff --git a/ChangeLog b/ChangeLog
index aff41da433ece3efe4a5daccb23dafc799071c4d..eb04958cc879f3505d88a9198634f234d4806735 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-10  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * scripts/lilypond-book.py (main): use commands.mkarg () to quote
+       shell arguments. 
+
 2005-11-10  Mats Bengtsson  <mabe@drongo.s3.kth.se>
 
        * Documentation/user/examples.itely (Piano templates): Minor
@@ -5,6 +10,9 @@
 
 2005-11-10  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * scripts/lilypond-invoke-editor.scm (run-browser): look at
+       $BROWSER.
+
        * Documentation/user/point-and-click.itely: simplify p&c
        instruction: don't configure firefox. Put lilypond-invoke-editor
        in front of the browser.

diff --git a/scm/layout-page-layout.scm b/scm/layout-page-layout.scm
index 85e19ab95cbc647615577d36896df27f3cd70ba6..a49d25dbaf6eff8ae0a34a805bcbc872a5faa217 100644 (file)
--- a/scm/layout-page-layout.scm
+++ b/scm/layout-page-layout.scm
@@ -256,7 +256,7 @@
                     (if (= dir UP)
                         (ly:stencil-translate-axis
                          (annotate-y-interval layout
-                                             "topspace"
+                                             "pagetopspace"
                                              (cons
                                               (- (min 0 (* dir sep))
                                                  (ly:output-def-lookup layout 'pagetopspace))

diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index 460a814fed5f183bbccc4ddd38359fdbb792f7f6..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.
@@ -1634,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)

diff --git a/scripts/lilypond-invoke-editor.scm b/scripts/lilypond-invoke-editor.scm
index 9fe02c467f5beef121b207a2607e2ad63d6fbd05..f9716bfec69d63891ecdbb127228eb04a04acec4 100755 (executable)
--- a/scripts/lilypond-invoke-editor.scm
+++ b/scripts/lilypond-invoke-editor.scm
@@ -120,9 +120,10 @@ Options:
          (exit 1)))))
 
 (define (run-browser uri)
-
-  ;; TODO: make educated guess which browser to run.
-  (system (format #f "firefox -remote 'OpenURL(~a,new-tab)'" uri)))
+  (system
+   (if (getenv "BROWSER")
+       (format "~a ~a" (getenv "BROWSER") uri)
+       (format #f "firefox -remote 'OpenURL(~a,new-tab)'" uri))))
 
 (define (main args)
   (let ((files (parse-options args)))