(conv): oops. One slash too much.

diff --git a/ChangeLog b/ChangeLog
index 3e824bf447693439f4d2eec1c716248b227e8d7e..c962264fa3640e65b17fd4a532dfea3398ab0d0b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-02-02  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * python/convertrules.py (conv): oops. One slash too much.
+
 2006-02-02  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * flower/include/std-vector.hh (slice): Remove.

diff --git a/input/regression/markup-eps.ly b/input/regression/markup-eps.ly
index 71ae960cd6c7bfb737a299fd2633ad210affcd12..3f6a8f5057a452f3e9a0619f03b23c530c43de65 100644 (file)
--- a/input/regression/markup-eps.ly
+++ b/input/regression/markup-eps.ly
@@ -3,7 +3,7 @@
   texidoc = "The epsfile markup command reads an EPS file"
 
 }
-\version "2.7.13"
+\version "2.7.31"
 
 #(let* ((port (open-output-file "box.eps")))
 
@@ -14,4 +14,4 @@ closepath stroke" port)
 
   (close port))
 
-{ c''4-\markup { \box \epsfile #"box.eps" } } 
+{ c''4-\markup { \box \epsfile #X #10 #"box.eps" } } 

diff --git a/lily/beam.cc b/lily/beam.cc
index bb48a4572db7fa08ab7ed702a2cc301b6115b044..08e22e72baa64fb517b6bcdf6a6e24b342367c60 100644 (file)
--- a/lily/beam.cc
+++ b/lily/beam.cc
@@ -143,7 +143,11 @@ Beam::calc_direction (SCM smob)
       else 
        {
          Grob *stem = first_visible_stem (me);
-         d = to_dir (stem->get_property ("default-direction"));
+
+         /*
+           ugh: stems[0] case happens for chord tremolo.
+         */
+         d = to_dir ((stem ? stem : stems[0])->get_property ("default-direction"));
        }
     }
 

diff --git a/python/convertrules.py b/python/convertrules.py
index 2cbc931f642592e18bdebfd61ecf96f0e9797cfc..5be6856802e5c65ba5c4f79f99cbabeb294cbf1d 100644 (file)
--- a/python/convertrules.py
+++ b/python/convertrules.py
@@ -2682,7 +2682,7 @@ conversions.append (((2, 7, 28), conv,
                     """ly:spanner-get-bound -> ly:spanner-bound"""))
 
 def conv (str):
-       str = re.sub (r'\epsfile *#"', r'\\epsfile #X #10 #"', str)
+       str = re.sub (r'\epsfile *#"', r'\epsfile #X #10 #"', str)
        return str
 
 conversions.append (((2, 7, 30), conv,