From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Thu, 10 Nov 2005 19:05:02 +0000 (+0000)
Subject: (main): use commands.mkarg () to quote
X-Git-Tag: release/2.7.17~34
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=f4beff9cdba290efe94de240e38a5f2ec19c8388;p=lilypond.git

(main): use commands.mkarg () to quote
shell arguments.
---

diff --git a/ChangeLog b/ChangeLog
index aff41da433..eb04958cc8 100644
--- 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 85e19ab95c..a49d25dbaf 100644
--- 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 460a814fed..d349c29bc3 100644
--- 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 9fe02c467f..f9716bfec6 100755
--- 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)))