From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Sun, 28 Sep 2003 13:18:23 +0000 (+0000)
Subject: * ly/property-init.ly (arpeggioBracket): simplify
X-Git-Tag: release/2.0.1~7
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=db683dfcc4e82c48a5a5f415a7b38a34014e7480;p=lilypond.git

* ly/property-init.ly (arpeggioBracket): simplify

* lily/translator-group.cc (execute_pushpop_property): use
SCM_EQ_P for comparing keys. This fixes reverting
auto-beam-settings.
---

diff --git a/ChangeLog b/ChangeLog
index 37f8e23ab3..0158c935a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2003-09-28  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
+
+	* ly/property-init.ly (arpeggioBracket): simplify
+
+	* lily/translator-group.cc (execute_pushpop_property): use
+	SCM_EQ_P for comparing keys. This fixes reverting
+	auto-beam-settings.
+
 2003-09-28  Jan Nieuwenhuizen  <janneke@gnu.org>
 
 	* lily/midi-stream.cc (operator <<): Also write MIDI string when
diff --git a/lily/bar-line.cc b/lily/bar-line.cc
index 38af64a6bb..cf1999356d 100644
--- a/lily/bar-line.cc
+++ b/lily/bar-line.cc
@@ -118,6 +118,10 @@ Bar_line::compound_barline (Grob*me, String str, Real h)
     }
   else if (str == "||")
     {
+      /*
+	should align to other side? this never appears
+	on the system-start?
+      */
       m.add_at_edge (X_AXIS, RIGHT, thin, 0, 0);
       m.add_at_edge (X_AXIS, RIGHT, thin, thinkern, 0);
     }
diff --git a/lily/translator-group.cc b/lily/translator-group.cc
index 74f86d0e41..655d15f4f5 100644
--- a/lily/translator-group.cc
+++ b/lily/translator-group.cc
@@ -346,7 +346,7 @@ Translator_group::execute_pushpop_property (SCM prop, SCM eltprop, SCM val)
 	    autobeam properties.
 	   */
 	  SCM newprops= SCM_EOL ;
-	  while (gh_pair_p (prev) && ly_caar (prev) != eltprop)
+	  while (gh_pair_p (prev) && !SCM_EQ_P(ly_caar (prev), eltprop))
 	    {
 	      newprops = gh_cons (ly_car (prev), newprops);
 	      prev = ly_cdr (prev);
diff --git a/ly/property-init.ly b/ly/property-init.ly
index 123729df10..e308097166 100644
--- a/ly/property-init.ly
+++ b/ly/property-init.ly
@@ -226,7 +226,7 @@ turnOff = #'()
 % of either Staff.Arpeggio or PianoStaff.Arpeggio, depending whether 
 % cross-staff brackets are desired. 
 
-arpeggioBracket = #(lambda (grob) (Arpeggio::brew_chord_bracket grob))
+arpeggioBracket = #Arpeggio::brew_chord_bracket
 arpeggio = #(make-music-by-name 'ArpeggioEvent)
 glissando = #(make-music-by-name 'GlissandoEvent)