From 7c5486cc4d4f4a182fc8aca84efc8e5a7fd08770 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Sun, 7 Nov 2004 23:18:27 +0000 Subject: [PATCH] *** empty log message *** --- input/regression/quote-cue-during.ly | 2 +- input/regression/quote-during.ly | 2 +- ...ew-quote-iterator.cc => quote-iterator.cc} | 26 +++++++++---------- ly/music-functions-init.ly | 4 +-- scm/define-music-types.scm | 2 +- 5 files changed, 18 insertions(+), 18 deletions(-) rename lily/{new-quote-iterator.cc => quote-iterator.cc} (90%) diff --git a/input/regression/quote-cue-during.ly b/input/regression/quote-cue-during.ly index 5ed1d79c4d..1bf62b7f6f 100644 --- a/input/regression/quote-cue-during.ly +++ b/input/regression/quote-cue-during.ly @@ -9,7 +9,7 @@ voice in the @code{cue} @code{Voice}." } -quoteMe = \relative c' { fis4 r16 a8.-> b4-\ff } +quoteMe = \relative c' { fis4 r16 a8.-> b4-\ff c4 } \addquote quoteMe \quoteMe original = \relative c'' { c8 d s2 es8 gis8 } diff --git a/input/regression/quote-during.ly b/input/regression/quote-during.ly index 8d7324cd01..6dade058be 100644 --- a/input/regression/quote-during.ly +++ b/input/regression/quote-during.ly @@ -14,7 +14,7 @@ quoted. In this example, a 16th rests is not quoted, since } -quoteMe = \relative c' { fis4 r16 a8.-> b4-\ff } +quoteMe = \relative c' { fis4 r16 a8.-> b4-\ff c } \addquote quoteMe \quoteMe original = \relative c'' { c8 d s2 es8 gis8 } diff --git a/lily/new-quote-iterator.cc b/lily/quote-iterator.cc similarity index 90% rename from lily/new-quote-iterator.cc rename to lily/quote-iterator.cc index 241f77b635..4998d735f8 100644 --- a/lily/new-quote-iterator.cc +++ b/lily/quote-iterator.cc @@ -1,5 +1,5 @@ /* - quote-iterator.cc -- implement New_quote_iterator + quote-iterator.cc -- implement Quote_iterator source file of the GNU LilyPond music typesetter @@ -17,10 +17,10 @@ #include "warn.hh" #include "interpretation-context-handle.hh" -class New_quote_iterator : public Music_wrapper_iterator +class Quote_iterator : public Music_wrapper_iterator { public: - New_quote_iterator (); + Quote_iterator (); Moment vector_moment (int idx) const; Interpretation_context_handle quote_outlet_; @@ -44,7 +44,7 @@ protected: }; bool -New_quote_iterator::accept_music_type (Music *mus) const +Quote_iterator::accept_music_type (Music *mus) const { SCM accept = get_outlet()->get_property ("quotedEventTypes"); for (SCM s = mus->get_property ("types"); @@ -59,12 +59,12 @@ New_quote_iterator::accept_music_type (Music *mus) const void -New_quote_iterator::derived_mark () const +Quote_iterator::derived_mark () const { scm_gc_mark (transposed_musics_ ); } -New_quote_iterator::New_quote_iterator () +Quote_iterator::Quote_iterator () { transposed_musics_ = SCM_EOL; event_vector_ = SCM_EOL; @@ -98,7 +98,7 @@ binsearch_scm_vector (SCM vec, SCM key, bool (*is_less)(SCM a,SCM b)) void -New_quote_iterator::construct_children () +Quote_iterator::construct_children () { Music_wrapper_iterator::construct_children (); @@ -130,7 +130,7 @@ New_quote_iterator::construct_children () bool -New_quote_iterator::ok () const +Quote_iterator::ok () const { return Music_wrapper_iterator::ok() @@ -138,7 +138,7 @@ New_quote_iterator::ok () const } bool -New_quote_iterator::quote_ok () const +Quote_iterator::quote_ok () const { return (event_idx_ >= 0 && ly_c_vector_p (event_vector_) @@ -152,7 +152,7 @@ New_quote_iterator::quote_ok () const } Moment -New_quote_iterator::pending_moment () const +Quote_iterator::pending_moment () const { Rational infty; infty.set_infinite (1); @@ -172,14 +172,14 @@ New_quote_iterator::pending_moment () const } Moment -New_quote_iterator::vector_moment (int idx) const +Quote_iterator::vector_moment (int idx) const { SCM entry = SCM_VECTOR_REF (event_vector_, idx); return *unsmob_moment (scm_caar (entry)); } void -New_quote_iterator::process (Moment m) +Quote_iterator::process (Moment m) { if (Music_wrapper_iterator::ok()) Music_wrapper_iterator::process (m); @@ -259,4 +259,4 @@ New_quote_iterator::process (Moment m) } } -IMPLEMENT_CTOR_CALLBACK (New_quote_iterator); +IMPLEMENT_CTOR_CALLBACK (Quote_iterator); diff --git a/ly/music-functions-init.ly b/ly/music-functions-init.ly index 6e074d0a14..526f397ccb 100644 --- a/ly/music-functions-init.ly +++ b/ly/music-functions-init.ly @@ -83,7 +83,7 @@ cueDuring = # (string? ly:dir? ly:music?) (let* ((quote-music - (make-music 'NewQuoteMusic + (make-music 'QuoteMusic 'quoted-context-type 'Voice 'quoted-context-id "cue" 'quoted-music-name what @@ -117,7 +117,7 @@ quoteDuring = # (def-music-function (location what main-music) (string? ly:music?) - (make-music 'NewQuoteMusic + (make-music 'QuoteMusic 'element main-music 'quoted-music-name what 'origin location)) diff --git a/scm/define-music-types.scm b/scm/define-music-types.scm index 00f3d26f4b..44f01d24d6 100644 --- a/scm/define-music-types.scm +++ b/scm/define-music-types.scm @@ -406,7 +406,7 @@ goes down).") . ( (description . "Quote preprocessed snippets of music. ") (internal-class-name . "Music_wrapper") ;; so we get Event::get_length (). - (iterator-ctor . ,New_quote_iterator::constructor) + (iterator-ctor . ,Quote_iterator::constructor) (types . (general-music)) )) -- 2.39.5