CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/05/12 09:30:49
Modified files:
. : ChangeLog THANKS
lily : instrument-name-engraver.cc slur-scoring.cc
Log message:
* lily/slur-scoring.cc (move_away_from_staffline): robustness,
don't access StaffSymbol if not there.
* lily/instrument-name-engraver.cc (class
Instrument_name_engraver): data member first_. Create
InstrumentName on start.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3597&tr2=1.3598&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/THANKS.diff?tr1=1.115&tr2=1.116&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/instrument-name-engraver.cc.diff?tr1=1.64&tr2=1.65&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/slur-scoring.cc.diff?tr1=1.50&tr2=1.51&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3597 lilypond/ChangeLog:1.3598
--- lilypond/ChangeLog:1.3597 Thu May 12 08:15:42 2005
+++ lilypond/ChangeLog Thu May 12 09:30:49 2005
@@ -1,3 +1,12 @@
+2005-05-12 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+
+ * lily/slur-scoring.cc (move_away_from_staffline): robustness,
+ don't access StaffSymbol if not there.
+
+ * lily/instrument-name-engraver.cc (class
+ Instrument_name_engraver): data member first_. Create
+ InstrumentName on start.
+
2005-05-12 Graham Percival <[EMAIL PROTECTED]>
* Documentation/user/instrument-notation.itely: add guitar
Index: lilypond/THANKS
diff -u lilypond/THANKS:1.115 lilypond/THANKS:1.116
--- lilypond/THANKS:1.115 Wed May 11 12:06:16 2005
+++ lilypond/THANKS Thu May 12 09:30:49 2005
@@ -45,6 +45,7 @@
SPONSORS
Bertalan Fodor
+Chris Sawer
Gunther Strube
Hans Forbrich
Jonathan Walther
Index: lilypond/lily/instrument-name-engraver.cc
diff -u lilypond/lily/instrument-name-engraver.cc:1.64
lilypond/lily/instrument-name-engraver.cc:1.65
--- lilypond/lily/instrument-name-engraver.cc:1.64 Sun May 8 23:30:50 2005
+++ lilypond/lily/instrument-name-engraver.cc Thu May 12 09:30:49 2005
@@ -17,7 +17,7 @@
class Instrument_name_engraver : public Engraver
{
-
+ bool first_;
public:
TRANSLATOR_DECLARATIONS (Instrument_name_engraver);
@@ -29,11 +29,13 @@
virtual void acknowledge_grob (Grob_info);
virtual void stop_translation_timestep ();
virtual void process_music ();
+
};
Instrument_name_engraver::Instrument_name_engraver ()
{
text_ = 0;
+ first_ = true;
}
void
@@ -51,6 +53,8 @@
get_property ("instrumentSupport"));
text_ = 0;
}
+
+ first_ = false;
}
void
@@ -119,7 +123,8 @@
Also create text if barlines in other groups. This allows
a name to be attached to lyrics or chords.
*/
- if (scm_is_string (get_property ("whichBar")))
+ if (scm_is_string (get_property ("whichBar"))
+ || first_)
create_text ();
}
Index: lilypond/lily/slur-scoring.cc
diff -u lilypond/lily/slur-scoring.cc:1.50 lilypond/lily/slur-scoring.cc:1.51
--- lilypond/lily/slur-scoring.cc:1.50 Wed May 4 10:35:56 2005
+++ lilypond/lily/slur-scoring.cc Thu May 12 09:30:49 2005
@@ -598,8 +598,12 @@
Slur_score_state::move_away_from_staffline (Real y,
Grob *on_staff) const
{
+ Grob * staff_symbol = Staff_symbol_referencer::get_staff_symbol (on_staff);
+ if (!staff_symbol)
+ return y;
+
Real pos
- = (y - Staff_symbol_referencer::get_staff_symbol
(on_staff)->relative_coordinate (common_[Y_AXIS],
+ = (y - staff_symbol->relative_coordinate (common_[Y_AXIS],
Y_AXIS))
* 2.0 / staff_space_;
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
