* scripts/lilypond.py (escape_path): revise.

* scm/music-functions.scm (set-output-property): new function.

diff --git a/ChangeLog b/ChangeLog
index 5364b508239cdaf22b2313fd32fe32814efcd1bb..846b1d6d653a3ed89d9cd44fda49b30a1c74b3a0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-09-27  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
+
+       * scripts/lilypond.py (escape_path): revise.
+
+       * scm/music-functions.scm (set-output-property): new function.
+       
 2003-09-27  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * cygwin/mknetrel: Next try in building doc on Cygwin natively;
@@ -15,6 +21,8 @@
 
 2003-09-27  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+       * scripts/lilypond.py (escape_path): escape quotes too. 
+
        * Documentation/user/lilypond.tely (Unified index): rename Index
        to accomodate Windows breakage.
 
@@ -57,7 +65,7 @@
 
 2003-09-25  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
-       * lily/tie-performer.cc (initialize): init  prev_event
+       * lily/tie-performer.cc (initialize): init prev_event
 
        * make/lilypond.redhat.spec.in: move site-start back to /usr/share.
 

diff --git a/input/test/extra-staff.ly b/input/test/extra-staff.ly
index 2a304ef38a3e5c0cd10486925d4e6453faba8f36..d3e1017bbfeacdf964d1c296f27ff23bdd9b223f 100644 (file)
--- a/input/test/extra-staff.ly
+++ b/input/test/extra-staff.ly
@@ -1,6 +1,7 @@
-#(ly:set-option 'old-relative)
+
 \version "1.9.8"
-% definately wil be renamed to something.
+
+% definitely wil be renamed to something.
 %{
 (Message vers:9)
 To: Adrian Mariano <adrian@camcornelledu>.
@@ -25,6 +26,7 @@ Try this (we'll include it in pl23/24):
 extra-staff.ly:
 %}
 
+
 \header{ texidoc="@cindex Staff Extra
 @cindex Staff Ossia
 You can add an extra staff after the beginning of a piece. "}
@@ -35,7 +37,7 @@ You can add an extra staff after the beginning of a piece. "}
                \new StaffGroup \notes\relative c''{ 
                        \new Staff 
                        c1 c
-                       << \new Staff { c1 } \new Staff { c1 } >>
+                       << c1 \new Staff { c1 } >>
                        c
                }
        >>

diff --git a/scm/music-functions.scm b/scm/music-functions.scm
index 4ee3dfe0b5b36b7a2ad62c0bcdcbda5a5553162c..5af90d22606c00012469bd194f4551a81b077257 100644 (file)
--- a/scm/music-functions.scm
+++ b/scm/music-functions.scm
@@ -541,6 +541,22 @@ Rest can contain a list of beat groupings
   (if (func grob)
       (ly:set-grob-property! grob sym val)))
 
+
+(define-public ((set-output-property grob-name symbol val)  grob grob-c context)
+   "Usage:
+
+\\applyoutput #(set-output-property 'Clef 'extra-offset '(0 . 1))
+
+"
+   
+   (let*
+       ((meta (ly:get-grob-property grob 'meta)))
+
+     (if (equal?  (cdr (assoc 'name meta)) grob-name)
+        (ly:set-grob-property! grob symbol val)
+        )))
+
+
 ;;
 (define-public (smart-bar-check n)
   "Make  a bar check that checks for a specific bar number. 

diff --git a/scripts/lilypond.py b/scripts/lilypond.py
index 681b8fa231b6cf2520e1acc4416547972b5d06ad..100036abcdb3967df6ee3e8bbfa92d7576a39ff7 100644 (file)
--- a/scripts/lilypond.py
+++ b/scripts/lilypond.py
@@ -234,8 +234,8 @@ def set_setting (dict, key, val):
 
 
 def escape_shell (x):
-       return re.sub (r'''([^\\])([`'"\\\s])''', r'\1\\\2', x)
-       # help emacs'" broken python mode
+       return re.sub ("(\s|[`'\"\\\\])", r'\\\1',x)
+
 
 def run_lilypond (files, dep_prefix):
        def make_include_option (x):