CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/07/13 19:31:03
Modified files:
. : ChangeLog
flower : rational.cc
flower/include : rational.hh
lily : grob.cc
scm : define-music-types.scm
Log message:
(music-descriptions): remove
internal-class-name properties.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3875&tr2=1.3876&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/flower/rational.cc.diff?tr1=1.32&tr2=1.33&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/flower/include/rational.hh.diff?tr1=1.33&tr2=1.34&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/grob.cc.diff?tr1=1.133&tr2=1.134&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/define-music-types.scm.diff?tr1=1.58&tr2=1.59&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3875 lilypond/ChangeLog:1.3876
--- lilypond/ChangeLog:1.3875 Wed Jul 13 18:22:34 2005
+++ lilypond/ChangeLog Wed Jul 13 19:31:01 2005
@@ -1,5 +1,8 @@
2005-07-13 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+ * scm/define-music-types.scm (music-descriptions): remove
+ internal-class-name properties.
+
* lily/include/event.hh: remove file.
* lily/include/music-constructor.hh: remove file.
Index: lilypond/flower/include/rational.hh
diff -u lilypond/flower/include/rational.hh:1.33
lilypond/flower/include/rational.hh:1.34
--- lilypond/flower/include/rational.hh:1.33 Wed Mar 16 19:19:15 2005
+++ lilypond/flower/include/rational.hh Wed Jul 13 19:31:02 2005
@@ -42,9 +42,10 @@
Rational div_rat (Rational) const;
Rational mod_rat (Rational) const;
void negate ();
- // operator bool () const;
int to_int () const;
+ operator bool () const;
operator double () const;
+
Rational operator - () const;
/**
Initialize to 0.
Index: lilypond/flower/rational.cc
diff -u lilypond/flower/rational.cc:1.32 lilypond/flower/rational.cc:1.33
--- lilypond/flower/rational.cc:1.32 Thu Apr 21 14:28:31 2005
+++ lilypond/flower/rational.cc Wed Jul 13 19:31:02 2005
@@ -16,8 +16,14 @@
Rational::operator double () const
{
- return (double)sign_ * num_ / den_;
+ return ((double)sign_) * num_ / den_;
}
+
+Rational::operator bool () const
+{
+ return sign_ && num_;
+}
+
#ifdef STREAM_SUPPORT
ostream &
Index: lilypond/lily/grob.cc
diff -u lilypond/lily/grob.cc:1.133 lilypond/lily/grob.cc:1.134
--- lilypond/lily/grob.cc:1.133 Wed Jul 13 18:22:34 2005
+++ lilypond/lily/grob.cc Wed Jul 13 19:31:02 2005
@@ -137,7 +137,8 @@
pscore_ = 0;
smobify_self ();
- scm_gc_unprotect_object (key_->self_scm ());
+ if (key_)
+ scm_gc_unprotect_object (key_->self_scm ());
}
Grob::~Grob ()
Index: lilypond/scm/define-music-types.scm
diff -u lilypond/scm/define-music-types.scm:1.58
lilypond/scm/define-music-types.scm:1.59
--- lilypond/scm/define-music-types.scm:1.58 Wed Jul 13 18:22:35 2005
+++ lilypond/scm/define-music-types.scm Wed Jul 13 19:31:02 2005
@@ -15,13 +15,11 @@
Syntax: @[EMAIL PROTECTED],
where x is one of \\ppp, \\pp, \\p, \\mp, \\mf, \\f, \\ff, \\fff.")
- (internal-class-name . "Event")
(types . (general-music event dynamic-event absolute-dynamic-event))
))
(ApplyContext
. (
(description . "Call the argument with the current context during
interpreting phase")
- (internal-class-name . "Music")
(types . (general-music apply-context))
(iterator-ctor . ,Apply_context_iterator::constructor)
))
@@ -38,7 +36,6 @@
3. context where FUNC is called.
")
- (internal-class-name . "Event")
(iterator-ctor . ,Output_property_music_iterator::constructor)
(types . (general-music layout-instruction))
))
@@ -48,7 +45,6 @@
Syntax:
@[EMAIL PROTECTED]")
- (internal-class-name . "Event")
(types . (general-music arpeggio-event event))
))
@@ -64,13 +60,11 @@
is an articulation (such as @code{-.}, @code{->}, @code{\\tenuto},
@code{\\downbow}). See the user manual for details.")
- (internal-class-name . "Event")
(types . (general-music event articulation-event script-event))
))
(AutoChangeMusic
. (
(description . "Used for making voices that switch between piano
staves automatically.")
- (internal-class-name . "Music")
(iterator-ctor . ,Auto_change_iterator::constructor)
(start-callback . ,Music_wrapper::start_callback)
(length-callback . ,Music_wrapper::length_callback)
@@ -80,7 +74,6 @@
. (
(description .
"Check whether this music coincides with the start of the
measure.")
- (internal-class-name . "Music")
(types . (general-music bar-check))
(iterator-ctor . ,Bar_check_iterator::constructor)
))
@@ -88,7 +81,6 @@
. (
(description . "Print a bass-figure text")
- (internal-class-name . "Event")
(types . (general-music event rhythmic-event bass-figure-event))
))
(BeamEvent
@@ -97,14 +89,12 @@
Syntax for manual control:
c8-[ c c-] c8")
- (internal-class-name . "Event")
(types . (general-music event beam-event span-event))
))
(BreakEvent
. (
(description . "Create a line break, Syntax: \\break or page break,
Syntax: \\pagebreak.")
- (internal-class-name . "Event")
(types . (general-music break-event event))
))
(BreathingSignEvent
@@ -114,14 +104,12 @@
Syntax:
@var{note}\\breathe.")
- (internal-class-name . "Event")
(types . (general-music event breathing-event))
))
(BusyPlayingEvent
. (
(description . "Used internally to signal beginning and ending of
notes.")
- (internal-class-name . "Event")
(types . (general-music event busy-playing-event))
))
(ContextChange
@@ -129,7 +117,6 @@
(description . "Change staffs in Piano staff.
Syntax @code{\\translator Staff = @var{new-id}}.")
- (internal-class-name . "Music")
(iterator-ctor . , Change_iterator::constructor)
(types . (general-music translator-change-instruction))
))
@@ -137,7 +124,6 @@
(ClusterNoteEvent
. (
(description . "A note that is part of a cluster.")
- (internal-class-name . "Event")
; not a note-event, to ensure that
Note_engraver doesn't eat it.
(types . (general-music cluster-note-event melodic-event rhythmic-event
event))
@@ -149,7 +135,6 @@
(iterator-ctor . ,Context_specced_music_iterator::constructor)
(length-callback . ,Music_wrapper::length_callback)
(start-callback . ,Music_wrapper::start_callback)
- (internal-class-name . "Music")
(types . (context-specification general-music music-wrapper-music))
))
@@ -161,14 +146,12 @@
... @var{note}\\rc (you can also use \\<, \\!, \\cresc, and
\\endcresc. See the user manual for details.).")
- (internal-class-name . "Event")
(types . (general-music dynamic-event crescendo-event event))
))
(DecrescendoEvent
. (
(description . "See @ref{CrescendoEvent}.")
- (internal-class-name . "Event")
(types . (general-music dynamic-event decrescendo-event event))
))
@@ -176,7 +159,6 @@
. (
(description . "Extend lyrics.")
- (internal-class-name . "Event")
(types . (general-music extender-event event))
))
@@ -184,7 +166,6 @@
(EventChord
. (
(description . "Internally used to group a set of events.")
- (internal-class-name . "Music")
(iterator-ctor . ,Event_chord_iterator::constructor)
(length-callback . ,Music_sequence::maximum_length_callback)
(to-relative-callback . ,Music_sequence::event_chord_relative_callback)
@@ -194,26 +175,22 @@
(FingerEvent
. (
(description . "Specify what finger to use for this note.")
- (internal-class-name . "Event")
(types . (general-music fingering-event event))
))
(BeamForbidEvent
. (
(description . "Specify that a note may not auto-beamed ")
- (internal-class-name . "Event")
(types . (general-music event beam-forbid-event))
))
(GlissandoEvent
. (
(description . "Start a glissando on this note.")
- (internal-class-name . "Event")
(types . (general-music glissando-event event))
))
(GraceMusic
. (
(description . "Interpret the argument as grace notes. ")
- (internal-class-name . "Music")
(start-callback . ,Grace_music::start_callback)
(length . ,(ly:make-moment 0 1))
(iterator-ctor . ,Grace_iterator::constructor)
@@ -222,20 +199,17 @@
(NoteGroupingEvent
. (
(description . "Start or stop grouping brackets.")
- (internal-class-name . "Event")
(types . (general-music event note-grouping-event))
))
(HarmonicEvent
. (
(description . "Mark a note as harmonic")
- (internal-class-name . "Event")
(types . (general-music event harmonic-event))
))
(HyphenEvent
. (
(description . "A hyphen between lyric syllables.")
- (internal-class-name . "Event")
(types . (general-music hyphen-event event))
))
@@ -245,7 +219,6 @@
Syntax: @code{\\key } @var{name} @var{scale}.")
- (internal-class-name . "Event")
(types . (general-music key-change-event event))
))
@@ -253,7 +226,6 @@
. (
(description . "(docme).")
- (internal-class-name . "Event")
(span-type . ligature)
(types . (general-music span-event ligature-event event))
))
@@ -264,7 +236,6 @@
Syntax @var{\\oldaddlyrics [EMAIL PROTECTED] @var{lyrics}.")
- (internal-class-name . "Music")
(types . (general-music lyric-combine-music))
(length-callback . ,Lyric_combine_music::length_callback)
(start-callback . ,Music_sequence::first_start_callback)
@@ -276,7 +247,6 @@
(description . "Align lyrics to the start of notes.
Syntax @var{\\lyricsto [EMAIL PROTECTED] @var{lyrics}.")
- (internal-class-name . "Music")
(length . ,(ly:make-moment 0 1))
(types . (general-music lyric-combine-music))
(iterator-ctor . ,New_lyric_combine_music_iterator::constructor)
@@ -287,7 +257,6 @@
(description . "A lyric syllable. Must be entered in lyrics mode, i.e.
@code{\\lyrics @{ twinkle4 twinkle4 @} } .")
- (internal-class-name . "Event")
(types . (general-music rhythmic-event lyric-event event))
))
(MarkEvent
@@ -297,13 +266,11 @@
Syntax: @code{\\mark} @var{marker},
e.g. @code{\\mark \"A\"}.")
- (internal-class-name . "Event")
(types . (general-music mark-event event))
))
(MelismaPlayingEvent
. (
(description . "Used internally to signal melismas.")
- (internal-class-name . "Event")
(types . (general-music melisma-playing-event event))
))
(ManualMelismaEvent
@@ -311,7 +278,6 @@
(description . "Start or stop a melisma.
Syntax: @code{c4\\melisma d\\melismaEnd}.")
- (internal-class-name . "Event")
(types . (general-music melisma-span-event event))
))
@@ -321,7 +287,6 @@
Syntax
@code{R2.*4} for 4 measures in 3/4 time. Note the capital R.")
- (internal-class-name . "Event")
(types . (general-music event rhythmic-event multi-measure-rest-event))
))
@@ -331,7 +296,6 @@
to group start-mmrest, skip, stop-mmrest sequence.
Syntax @code{R2.*5} for 5 measures in 3/4 time.")
- (internal-class-name . "Music")
(length-callback . ,Music_sequence::cumulative_length_callback)
(start-callback . ,Music_sequence::first_start_callback)
(iterator-ctor . ,Sequential_music_iterator::constructor)
@@ -344,7 +308,6 @@
Syntax
@code{R-\\markup @{ \\roman \"bla\" @}}. Note the explicit font switch.")
- (internal-class-name . "Event")
(types . (general-music event multi-measure-text-event))
))
@@ -352,14 +315,12 @@
. (
(description . "Generic type for music expressions.")
- (internal-class-name . "Music")
(types . (general-music))
))
(NoteEvent
. (
(description . "A note.")
- (internal-class-name . "Event")
(types . (general-music event note-event rhythmic-event melodic-event))
))
@@ -371,7 +332,6 @@
Syntax @code{\\outputproperty @var{predicate} @var{prop}
= @var{val}}.")
- (internal-class-name . "Music")
(iterator-ctor . ,Output_property_music_iterator::constructor)
(types . (general-music layout-instruction))
))
@@ -385,7 +345,6 @@
@code{\\propery Foo.Bar \\override} @var{SYMBOL} = @var{VALUE}
")
- (internal-class-name . "Music")
(types . (general-music layout-instruction))
(iterator-ctor . , Push_property_iterator::constructor)
))
@@ -393,7 +352,6 @@
. (
(description . "Combine two parts on a staff, either merged or
as separate voices.")
- (internal-class-name . "Music")
(length-callback . ,Music_sequence::maximum_length_callback)
(start-callback . ,Music_sequence::minimum_start_callback)
(types . (general-music part-combine-music))
@@ -404,7 +362,6 @@
(description . "Start or end phrasing slur.
Syntax NOTE \\( and \\) NOTE")
- (internal-class-name . "Event")
(types . (general-music span-event phrasing-slur-event))
))
@@ -413,7 +370,6 @@
(description . "Set a context property.
Syntax: @code{\\property @[EMAIL PROTECTED] = @var{scheme-val}}.")
- (internal-class-name . "Music")
(types . (layout-instruction general-music))
(iterator-ctor . ,Property_iterator::constructor)
))
@@ -422,7 +378,6 @@
. (
(description . "Remove the definition of a context @code{\\property}.")
- (internal-class-name . "Music")
(types . (layout-instruction general-music))
(iterator-ctor . ,Property_unset_iterator::constructor)
))
@@ -433,21 +388,18 @@
following note to form a pes (if melody goes up) or a flexa (if melody
goes down).")
- (internal-class-name . "Event")
(types . (general-music pes-or-flexa-event event))
))
(QuoteMusic
. (
(description . "Quote preprocessed snippets of music. ")
- (internal-class-name . "Music")
(iterator-ctor . ,Quote_iterator::constructor)
(types . (general-music))
))
(RelativeOctaveCheck
. ((description . "Check if a pitch is in the correct octave.")
- (internal-class-name . "Music")
(to-relative-callback . ,Relative_octave_check::relative_callback)
(types . (general-music relative-octave-check))
))
@@ -463,7 +415,6 @@
. (
(description . "Atomic music event.")
- (internal-class-name . "Event")
(types . (general-music event))
))
@@ -473,7 +424,6 @@
Syntax @code{r4} for a quarter rest. ")
- (internal-class-name . "Event")
(types . (general-music event rhythmic-event rest-event))
))
(RevertProperty
@@ -482,7 +432,6 @@
previously added property from a graphical object definition
")
- (internal-class-name . "Music")
(types . (general-music layout-instruction))
(iterator-ctor . , Pop_property_iterator::constructor)
))
@@ -493,7 +442,6 @@
Syntax \\sequential @[EMAIL PROTECTED] or simply @[EMAIL PROTECTED] .")
- (internal-class-name . "Music")
(length-callback . ,Music_sequence::cumulative_length_callback)
(start-callback . ,Music_sequence::first_start_callback)
(iterator-ctor . ,Sequential_music_iterator::constructor)
@@ -503,20 +451,17 @@
(SoloOneEvent
. (
(description . "Print Solo.1")
- (internal-class-name . "Event")
(part-combine-status . solo1)
(types . (general-music event part-combine-event))
))
(SoloTwoEvent
. (
(description . "Print Solo.2")
- (internal-class-name . "Event")
(part-combine-status . solo2)
(types . (general-music event part-combine-event))
))
(UnisonoEvent
. ((description . "Print a2")
- (internal-class-name . "Event")
(part-combine-status . unisono)
(types . (general-music event part-combine-event))))
@@ -528,7 +473,6 @@
@code{ \\simultaneous @{ .. @}} or < .. >.")
- (internal-class-name . "Music")
(iterator-ctor . ,Simultaneous_music_iterator::constructor)
(start-callback . ,Music_sequence::minimum_start_callback)
(length-callback . ,Music_sequence::maximum_length_callback)
@@ -542,13 +486,11 @@
(description . "Start or end slur.
Syntax NOTE( and )NOTE")
- (internal-class-name . "Event")
(types . (general-music span-event slur-event))
))
(StaffSpanEvent
. ((description . "Start or stop a staff symbol.")
- (internal-class-name . "Event")
(types . (general-music event span-event staff-span-event))
))
@@ -556,21 +498,18 @@
. (
(description . "Used internally to signal beginning of notes.")
- (internal-class-name . "Event")
(types . (general-music event start-playing-event))
))
(TextSpanEvent
. (
(description . "Start a text spanner like 8va.....|")
- (internal-class-name . "Event")
(types . (general-music span-event text-span-event))
))
(TrillSpanEvent
. (
(description . "Start a trill spanner tr~~~")
- (internal-class-name . "Event")
(types . (general-music span-event trill-span-event))
))
@@ -581,7 +520,6 @@
Syntax @code{\\times @var{fraction} @var{music}}, e.g.
@code{\\times 2/3 @{ ... @}} for triplets.
")
- (internal-class-name . "Music")
(length-callback . ,Music_wrapper::length_callback)
(start-callback . ,Music_wrapper::start_callback)
(iterator-ctor . ,Time_scaled_music_iterator::constructor)
@@ -591,7 +529,6 @@
(TransposedMusic
. (
(description . "Music that has been transposed.")
- (internal-class-name . "Music")
(iterator-ctor . ,Music_wrapper_iterator::constructor)
(start-callback . ,Music_wrapper::start_callback)
(length-callback . ,Music_wrapper::length_callback)
@@ -606,7 +543,6 @@
(to-relative-callback . ,Relative_octave_music::no_relative_callback)
(iterator-ctor . ,Music_wrapper_iterator::constructor)
(length-callback . ,Music_wrapper::length_callback)
- (internal-class-name . "Music")
(types . (music-wrapper-music general-music unrelativable-music))
))
@@ -617,14 +553,12 @@
(iterator-ctor . ,Music_wrapper_iterator::constructor)
(length-callback . ,Music_wrapper::length_callback)
(start-callback . ,Music_wrapper::start_callback)
- (internal-class-name . "Music")
(types . (music-wrapper-music general-music relative-octave-music))
))
(ScriptEvent
. (
(description . "Add an articulation mark to a note. ")
- (internal-class-name . "Event")
(types . (general-music event))
))
@@ -636,7 +570,6 @@
Syntax: @code{\\skip [EMAIL PROTECTED]")
- (internal-class-name . "Music")
(length-callback . ,ly:music-duration-length)
(iterator-ctor . ,Simple_music_iterator::constructor)
(types . (general-music event rhythmic-event skip-event))
@@ -650,35 +583,30 @@
Syntax: @[EMAIL PROTECTED]")
- (internal-class-name . "Event")
(types . (general-music event rhythmic-event skip-event))
))
(SpanEvent
. (
(description . "Event for anything that is started at a different time
than stopped.")
- (internal-class-name . "Event")
(types . (general-music event))
))
(SustainEvent
. (
(description . "Depress or release sustain pedal. ")
- (internal-class-name . "Event")
(types . (general-music pedal-event sustain-pedal-event))
))
(SostenutoEvent
. (
(description . "Depress or release sostenuto pedal. ")
- (internal-class-name . "Event")
(types . (general-music pedal-event sostenuto-pedal-event))
))
(UnaCordaEvent
. (
(description . "Depress or release una-corda pedal.")
- (internal-class-name . "Event")
(types . (general-music pedal-event una-corda-pedal-event))
))
@@ -688,33 +616,28 @@
Syntax: @[EMAIL PROTECTED]")
- (internal-class-name . "Event")
(types . (general-music string-number-event event))
))
(MetronomeChangeEvent
. (
(description . "Change tempo setting (in beats per minute).")
- (internal-class-name . "Event")
(types . (general-music metronome-change-event tempo-event event))
))
(TextScriptEvent
. (
(description . "")
- (internal-class-name . "Event")
(types . (general-music script-event text-script-event event))
))
(TieEvent
. (
(description . "A tie. Entered as @var{note}-~.")
- (internal-class-name . "Event")
(types . (general-music tie-event event))
))
(TremoloEvent
. (
(description . "Un measured tremolo.")
- (internal-class-name . "Event")
(types . (general-music event tremolo-event))
))
@@ -724,14 +647,12 @@
Syntax: @code{\\\\}")
- (internal-class-name . "Music")
(types . (separator general-music))
))
(VoltaRepeatedMusic
. (
(iterator-ctor . ,Volta_repeat_iterator::constructor)
- (internal-class-name . "Music")
(description . "")
(start-callback . ,Repeated_music::first_start)
(length-callback . ,Repeated_music::volta_music_length)
@@ -743,13 +664,11 @@
(iterator-ctor . ,Unfolded_repeat_iterator::constructor)
(description . "")
(start-callback . ,Repeated_music::first_start)
- (internal-class-name . "Music")
(types . (general-music repeated-music unfolded-repeated-music))
(length-callback . ,Repeated_music::unfolded_music_length)
))
(PercentRepeatedMusic
. (
- (internal-class-name . "Music")
(description . "Repeats encoded by percents.")
(iterator-ctor . ,Percent_repeat_iterator::constructor)
(start-callback . ,Repeated_music::first_start)
@@ -761,7 +680,6 @@
. (
(iterator-ctor . ,Chord_tremolo_iterator::constructor)
(description . "Repeated notes denoted by tremolo beams.")
- (internal-class-name . "Music")
(start-callback . ,Repeated_music::first_start)
;; the length of the repeat is handled by shifting the note logs
@@ -772,7 +690,6 @@
(FoldedRepeatedMusic
. (
- (internal-class-name . "Music")
(description . "Repeats with alternatives placed in parallel. ")
(iterator-ctor . ,Folded_repeat_iterator::constructor)
(start-callback . ,Repeated_music::minimum_start)
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
