diff options
author | Han-Wen Nienhuys <hanwen@xs4all.nl> | 2006-04-02 23:36:51 +0000 |
---|---|---|
committer | Han-Wen Nienhuys <hanwen@xs4all.nl> | 2006-04-02 23:36:51 +0000 |
commit | 83a7a46410c472fadec6ec8eac6de170fef6288b (patch) | |
tree | 6f8b22126285d26423572701416708bbcde9389c | |
parent | 635104ddf9d6f82c57f9d751d678ad697396ec1c (diff) |
(quote-substitute): set iterators-ctor
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | input/regression/beam-funky-beamlet.ly | 18 | ||||
-rw-r--r-- | input/regression/collision-merge-differently-dotted.ly | 3 | ||||
-rw-r--r-- | input/regression/fill-line-test.ly | 2 | ||||
-rw-r--r-- | lily/quote-iterator.cc | 4 | ||||
-rw-r--r-- | ly/declarations-init.ly | 1 | ||||
-rw-r--r-- | scm/define-music-types.scm | 2 | ||||
-rw-r--r-- | scm/music-functions.scm | 13 | ||||
-rw-r--r-- | scm/part-combiner.scm | 1 |
9 files changed, 35 insertions, 13 deletions
@@ -1,3 +1,7 @@ +2006-04-03 Han-Wen Nienhuys <hanwen@lilypond.org> + + * scm/music-functions.scm (quote-substitute): set iterators-ctor + 2006-03-31 Han-Wen Nienhuys <hanwen@lilypond.org> * Documentation/bibliography/GNUmakefile ($(outdir)/%.html): set diff --git a/input/regression/beam-funky-beamlet.ly b/input/regression/beam-funky-beamlet.ly index 0a1e0e0396..f78f76f91e 100644 --- a/input/regression/beam-funky-beamlet.ly +++ b/input/regression/beam-funky-beamlet.ly @@ -11,9 +11,21 @@ should be pointing to the note head. \layout { ragged-right = ##t} \relative c' { - c16 c''8 c,,16 - c16 c''8 c16 - c16 c,,8 c16 + \once \override Stem #'direction = #UP + c16 + \once \override Stem #'direction = #DOWN + + c''8 c,,16 + \once \override Stem #'direction = #UP + c16 + \once \override Stem #'direction = #DOWN + + c''8 c16 + \once \override Stem #'direction = #DOWN + c16 c,,8 + \once \override Stem #'direction = #UP + + c16 } diff --git a/input/regression/collision-merge-differently-dotted.ly b/input/regression/collision-merge-differently-dotted.ly index b021673261..2fba4ae37d 100644 --- a/input/regression/collision-merge-differently-dotted.ly +++ b/input/regression/collision-merge-differently-dotted.ly @@ -1,7 +1,8 @@ \version "2.7.39" \header { - texidoc = "If NoteCollision has merge-differently-dotted = ##t note + texidoc = "If @code{NoteCollision} has + @code{merge-differently-dotted = ##t} note heads that have differing dot counts may be merged anyway. Dots should not disappear when merging similar note heads." diff --git a/input/regression/fill-line-test.ly b/input/regression/fill-line-test.ly index 324f14b5bb..cf3a643c83 100644 --- a/input/regression/fill-line-test.ly +++ b/input/regression/fill-line-test.ly @@ -7,8 +7,8 @@ column." } - \paper { + linewidth = 15\cm bookTitleMarkup = \markup { \column { \fill-line { diff --git a/lily/quote-iterator.cc b/lily/quote-iterator.cc index aa06734e00..f0a2d46e6b 100644 --- a/lily/quote-iterator.cc +++ b/lily/quote-iterator.cc @@ -28,7 +28,7 @@ public: SCM event_vector_; int event_idx_; int end_idx_; - + SCM transposed_musics_; DECLARE_SCHEME_CALLBACK (constructor, ()); @@ -107,7 +107,7 @@ void Quote_iterator::construct_children () { Music_wrapper_iterator::construct_children (); - + SCM name = get_music ()->get_property ("quoted-context-type"); SCM id = get_music ()->get_property ("quoted-context-id"); diff --git a/ly/declarations-init.ly b/ly/declarations-init.ly index f60c9f4578..7dbc3b3c29 100644 --- a/ly/declarations-init.ly +++ b/ly/declarations-init.ly @@ -98,6 +98,7 @@ partCombineListener = \layout { } \context { \Score + ignoreQuotes = ##t skipTypesetting = ##t ignoreBarChecks = ##t } diff --git a/scm/define-music-types.scm b/scm/define-music-types.scm index da13e221d2..8fc012277e 100644 --- a/scm/define-music-types.scm +++ b/scm/define-music-types.scm @@ -397,7 +397,7 @@ goes down).") (QuoteMusic . ( (description . "Quote preprocessed snippets of music. ") - (iterator-ctor . ,ly:quote-iterator::constructor) + (iterator-ctor . ,ly:music-wrapper-iterator::constructor) (length-callback . ,ly:music-wrapper::length-callback) (start-callback . ,ly:music-wrapper::start-callback) (types . (general-music music-wrapper-music)) diff --git a/scm/music-functions.scm b/scm/music-functions.scm index 2207e18601..deba74c08c 100644 --- a/scm/music-functions.scm +++ b/scm/music-functions.scm @@ -701,7 +701,7 @@ Syntax: (cue-voice (if (eq? 1 dir) 0 1)) (main-music (ly:music-property quote-music 'element)) (return-value quote-music)) - + (if (or (eq? 1 dir) (eq? -1 dir)) ;; if we have stem dirs, change both quoted and main music @@ -732,11 +732,15 @@ Syntax: (quoted-vector (if (string? quoted-name) (hash-ref quote-tab quoted-name #f) #f))) + (if (string? quoted-name) - (if (vector? quoted-vector) - (set! (ly:music-property music 'quoted-events) quoted-vector) - (ly:warning (_ "can't find quoted music `~S'" quoted-name)))) + (if (vector? quoted-vector) + (begin + (set! (ly:music-property music 'quoted-events) quoted-vector) + (set! (ly:music-property music 'iterator-ctor) + ly:quote-iterator::constructor)) + (ly:warning (_ "can't find quoted music `~S'" quoted-name)))) music)) @@ -819,6 +823,7 @@ if appropriate. (skip-to-last x parser) ))) + ;;;;;;;;;;;;;;;;; ;; lyrics diff --git a/scm/part-combiner.scm b/scm/part-combiner.scm index 0a055a5136..56b43892b9 100644 --- a/scm/part-combiner.scm +++ b/scm/part-combiner.scm @@ -461,7 +461,6 @@ the mark when there are no spanners active." part-combine-listener)) (first-voice-handle (last-pair noticed))) - ;;(display first-voice-handle) (if (pair? first-voice-handle) (hash-set! tab name ;; cdr : skip name string |