From a092cdafdcd520e03795f2086f324aaa73c52247 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Wed, 18 Feb 2004 12:23:22 +0000 Subject: [PATCH] * scm/define-translator-properties.scm (all-user-translation-properties): add printOctaveNames * ly/engraver-init.ly: remove Note_event_swallower. * lily/note-name-engraver.cc (process_music): new property printOctaveNames * lily/context.cc (find_existing_context): remove support for Current. * scm/music-functions.scm (set-accidental-style): new function; duplicate accidental macros. * ly/property-init.ly (hideStaffSwitch): remove accidental macros. * lily/note-name-engraver.cc (process_music): process_acknowledged_grobs () -> process_music () --- Documentation/user/refman.itely | 16 ++++++++-------- input/regression/accidental-cautionary.ly | 2 +- input/regression/accidental-double.ly | 2 +- input/regression/accidental-ledger.ly | 2 +- input/regression/accidental-placement.ly | 2 +- input/regression/accidental-quarter.ly | 2 +- input/regression/accidental-single-double.ly | 2 +- .../accidental-unbroken-tie-spacing.ly | 2 +- input/regression/accidental.ly | 2 +- input/regression/chord-name-exceptions.ly | 2 +- lily/context.cc | 6 +++++- ...perties.scm => define-context-properties.scm} | 8 +++----- scm/lily.scm | 2 +- 13 files changed, 26 insertions(+), 24 deletions(-) rename scm/{define-translator-properties.scm => define-context-properties.scm} (98%) diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely index 36563253f2..697f83eeea 100644 --- a/Documentation/user/refman.itely +++ b/Documentation/user/refman.itely @@ -1564,7 +1564,7 @@ individually for each voice. Apart from that, the rule is similar to voices: @lilypond[raggedright,relative,fragment,verbatim,quote] \context Staff << - \voiceAccidentals + #(set-accidental-style 'voice) << { es g } \\ { c, e } @@ -1586,7 +1586,7 @@ instead. measure: @lilypond[raggedright,fragment,verbatim] - \modernAccidentals + #(set-accidental-style 'modern) cis' c'' cis'2 | c'' c' @end lilypond @@ -1624,8 +1624,8 @@ some of them are typeset as cautionaries. @internalsref{PianoStaff}. @item piano-cautionary - @cindex @code{\pianoCautionaries} - As @code{\pianoAccidentals} but with the extra accidentals + @cindex @code{#(set-accidental-style 'piano-cautionary)} + As @code{#(set-accidental-style 'piano)' , str)} but with the extra accidentals typeset as cautionaries. @item no-reset @@ -1633,7 +1633,7 @@ some of them are typeset as cautionaries. Same as @code{default} but with accidentals lasting ``forever'' and not only until the next measure: @lilypond[raggedright,fragment,verbatim,relative] - \noResetKey + #(set-accidental-style 'no-reset) c1 cis cis c @end lilypond @@ -1644,7 +1644,7 @@ some of them are typeset as cautionaries. before in the music: @lilypond[raggedright,fragment,verbatim,relative] - \forgetAccidentals + #(set-accidental-style 'forget) \key d\major c4 c cis cis d d dis dis @end lilypond @end table @@ -3415,7 +3415,7 @@ In addition, notes are considered a melisma if they are manually beamed, and automatic beaming (see @ref{Setting automatic beam behavior}) is switched off. The criteria for deciding melismata can be tuned with the property @code{melismaBusyProperties}. See -@internalsref{Melisma_engraver} for more information. +@internalsref{Melisma_translator} for more information. When multiple stanzas are put on the same melody, it can happen that two stanzas have melismata in different locations. This can be @@ -3440,7 +3440,7 @@ A complete example of a SATB score setup is in the file @seealso Internals: Music expressions: @internalsref{LyricCombineMusic}, -Contexts: @internalsref{Lyrics}, @internalsref{Melisma_engraver}. +Contexts: @internalsref{Lyrics}, @internalsref{Melisma_translator}. Examples: @inputfileref{input/template,satb.ly}, @inputfileref{input/regression,lyric-combine-new.ly}. diff --git a/input/regression/accidental-cautionary.ly b/input/regression/accidental-cautionary.ly index 04eebebe87..7e0d7f40c4 100644 --- a/input/regression/accidental-cautionary.ly +++ b/input/regression/accidental-cautionary.ly @@ -1,4 +1,4 @@ -\version "2.1.22" +\version "2.1.25" \header { texidoc = "Cautionary accidentals are indicated using either diff --git a/input/regression/accidental-double.ly b/input/regression/accidental-double.ly index 482a1cfdd2..7fbfdfc192 100644 --- a/input/regression/accidental-double.ly +++ b/input/regression/accidental-double.ly @@ -1,4 +1,4 @@ -\version "2.1.22" +\version "2.1.25" \header { texidoc = "If two forced accidentals happen at the same time, only one sharp sign is printed." diff --git a/input/regression/accidental-ledger.ly b/input/regression/accidental-ledger.ly index cbe5474f71..b584f64d73 100644 --- a/input/regression/accidental-ledger.ly +++ b/input/regression/accidental-ledger.ly @@ -1,4 +1,4 @@ -\version "2.1.22" +\version "2.1.25" \header { diff --git a/input/regression/accidental-placement.ly b/input/regression/accidental-placement.ly index c7549246dd..3206b95965 100644 --- a/input/regression/accidental-placement.ly +++ b/input/regression/accidental-placement.ly @@ -1,5 +1,5 @@ -\version "2.1.22" +\version "2.1.25" \header { diff --git a/input/regression/accidental-quarter.ly b/input/regression/accidental-quarter.ly index 8b572ab498..4cb95def7f 100644 --- a/input/regression/accidental-quarter.ly +++ b/input/regression/accidental-quarter.ly @@ -3,7 +3,7 @@ texidoc = "Quarter tone notation is supported, including threequarters flat." } -\version "2.1.22" +\version "2.1.25" \score { \notes \relative c'' { diff --git a/input/regression/accidental-single-double.ly b/input/regression/accidental-single-double.ly index 7214e988bc..ad54638e5d 100644 --- a/input/regression/accidental-single-double.ly +++ b/input/regression/accidental-single-double.ly @@ -1,5 +1,5 @@ -\version "2.1.22" +\version "2.1.25" \header{ texidoc=" A sharp sign after a double sharp sign, as well as a flat sign diff --git a/input/regression/accidental-unbroken-tie-spacing.ly b/input/regression/accidental-unbroken-tie-spacing.ly index 4529f62fd1..2dd5efdc33 100644 --- a/input/regression/accidental-unbroken-tie-spacing.ly +++ b/input/regression/accidental-unbroken-tie-spacing.ly @@ -4,7 +4,7 @@ texidoc = "Tied accidentaled notes (which cause reminder accidentals) don't wrea the spacing when unbroken." } -\version "2.1.22" +\version "2.1.25" rechts = \notes \relative c' { \clef treble diff --git a/input/regression/accidental.ly b/input/regression/accidental.ly index 296814e30c..1decbd5213 100644 --- a/input/regression/accidental.ly +++ b/input/regression/accidental.ly @@ -1,5 +1,5 @@ -\version "2.1.22" +\version "2.1.25" \header{ texidoc=" diff --git a/input/regression/chord-name-exceptions.ly b/input/regression/chord-name-exceptions.ly index 3182f1daf4..40466227e5 100644 --- a/input/regression/chord-name-exceptions.ly +++ b/input/regression/chord-name-exceptions.ly @@ -33,7 +33,7 @@ chExceptions = #(append theMusic = \chords { c:7sus4 c:dim7/+f - \set Current.chordNameExceptions = #chExceptions + \set chordNameExceptions = #chExceptions c:7sus4 c:dim7/+f } diff --git a/lily/context.cc b/lily/context.cc index 6b4b71b2dc..166f916ca6 100644 --- a/lily/context.cc +++ b/lily/context.cc @@ -167,8 +167,12 @@ Context::find_create_context (SCM n, String id, return current; } + /* + Don't go up to Global_context, because global goes down to + Score_context + */ Context *ret = 0; - if (daddy_context_) + if (daddy_context_ && !dynamic_cast (daddy_context_)) ret = daddy_context_->find_create_context (n, id, operations); else { diff --git a/scm/define-translator-properties.scm b/scm/define-context-properties.scm similarity index 98% rename from scm/define-translator-properties.scm rename to scm/define-context-properties.scm index 1b21fa39ae..23389f9cbf 100644 --- a/scm/define-translator-properties.scm +++ b/scm/define-context-properties.scm @@ -270,8 +270,8 @@ r1 r1*3 R1*3 \\\\property Score.skipBars= ##t r1*3 R1*3 @end example ") (skipTypesetting ,boolean? - "When true, all no typesetting is done at -this moment, causing the interpretation phase to go a lot faster. This can + "When true, all no typesetting is done at this +moment, causing the interpretation phase to go a lot faster. This can help with debugging large scores.") (soloADue ,boolean? "set Solo/A due texts in the part combiner?") (soloIIText ,string? "text for begin of solo for voice ``two'' when part-combining.") @@ -388,9 +388,7 @@ Valid values are described in @internalsref{bar-line-interface}. ) - `( - - (slurMelismaBusy ,boolean? "Signal if a slur is present.") + `((slurMelismaBusy ,boolean? "Signal if a slur is present.") (originalCentralCPosition ,integer? "Used for temporary overriding central C in octavation brackets. ") diff --git a/scm/lily.scm b/scm/lily.scm index ab4066cd91..296f8de657 100644 --- a/scm/lily.scm +++ b/scm/lily.scm @@ -416,7 +416,7 @@ L1 is copied, L2 not. "auto-beam.scm" "chord-name.scm" - "define-translator-properties.scm" + "define-context-properties.scm" "translation-functions.scm" "script.scm" "midi.scm" -- 2.39.5