From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Tue, 23 Mar 2004 18:45:07 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: release/2.1.35~20
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=ff46ec19b454266e273458c15aa6d5e6f0301d3f;p=lilypond.git

*** empty log message ***
---

diff --git a/ChangeLog b/ChangeLog
index aa90dae6b5..ce9359991f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
 
 2004-03-23  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+	* VERSION: 2.1.34 released
+	
 	* lily/main.cc (main_with_guile): switch debugging.
 
 	* lily/system.cc (get_line): plug leak.
diff --git a/THANKS b/THANKS
index 5662f687c0..b06d6fecad 100644
--- a/THANKS
+++ b/THANKS
@@ -9,11 +9,14 @@ Jan Nieuwenhuizen
 CONTRIBUTORS
 
 David Bobroff
+Edward Sanford Sutton
 Heikki Junes
 Nicolas Sceaux
 
 BUG HUNTERS/SUGGESTIONS
 
+Alexandre Beneteau
+Andrew McNabb
 Atte Andre Jensen 
 Bertalan Fodor
 Bruce McIntyre
@@ -22,7 +25,6 @@ David Bobroff
 Darius
 Delma Avers
 Doug Linhardt
-Edward Sanford Sutton
 Eric Wurbel
 Erik Sandberg
 Hans Forbrich
@@ -31,6 +33,7 @@ Jos
 Juergen Reuter
 Kieren Richard MacMillan
 Laurent Martelli
+Mats Bengtsson
 Matthias Kilian
 Nancho Alvarez
 Nick Busigin
diff --git a/lily/accidental-engraver.cc b/lily/accidental-engraver.cc
index 3db03bf591..18acdfe966 100644
--- a/lily/accidental-engraver.cc
+++ b/lily/accidental-engraver.cc
@@ -440,8 +440,7 @@ Accidental_engraver::acknowledge_grob (Grob_info info)
       && note->is_mus_type ("note-event")
       && Rhythmic_head::has_interface (info.grob_))
     {
-
-      if (to_boolean ("harmonicAccidentals")
+      if (to_boolean ( get_property ("harmonicAccidentals"))
 	  || !gh_equal_p (info.grob_->get_property ("style"),
 			  ly_symbol2scm ("harmonic")))
 	{
diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py
index ddcfbbbc03..8a970b4ed2 100644
--- a/scripts/convert-ly.py
+++ b/scripts/convert-ly.py
@@ -2022,7 +2022,7 @@ conversions.append (((2,1,31), conv,
 		     '''remove \\alias Timing'''))
 
 def conv (str):
-	str = re.sub (r"(\\set)\s+)?(?P<context>(Score\.)?)breakAlignOrder\s*=\s*#'(?P<list>[^\)]+)",
+	str = re.sub (r"(\\set\s+)?(?P<context>(Score\.)?)breakAlignOrder\s*=\s*#'(?P<list>[^\)]+)",
 		      r"\n\\override \g<context>BreakAlignment #'break-align-orders = "
 		      + "#(make-vector 3 '\g<list>)", str)