From 16c4d8784dae4535c44f150362ff558fda11b432 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Thu, 2 Feb 2006 00:30:01 +0000 Subject: [PATCH] (conv): oops. One slash too much. --- ChangeLog | 4 ++++ input/regression/markup-eps.ly | 4 ++-- lily/beam.cc | 6 +++++- python/convertrules.py | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3e824bf447..c962264fa3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2006-02-02 Han-Wen Nienhuys + + * python/convertrules.py (conv): oops. One slash too much. + 2006-02-02 Jan Nieuwenhuizen * flower/include/std-vector.hh (slice): Remove. diff --git a/input/regression/markup-eps.ly b/input/regression/markup-eps.ly index 71ae960cd6..3f6a8f5057 100644 --- 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 bb48a4572d..08e22e72ba 100644 --- 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 2cbc931f64..5be6856802 100644 --- 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, -- 2.39.5