From 2a30148eb4454227edf8bb2dec49a83ed9a82955 Mon Sep 17 00:00:00 2001 From: Neil Puttock Date: Sat, 24 May 2008 23:53:49 +0100 Subject: [PATCH] Fix 626. Let ottavation accept markup text. Also allow markup text for part-combine texts. --- lily/ottava-engraver.cc | 3 ++- scm/define-context-properties.scm | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/lily/ottava-engraver.cc b/lily/ottava-engraver.cc index f104287..44fbc3b 100644 --- a/lily/ottava-engraver.cc +++ b/lily/ottava-engraver.cc @@ -11,6 +11,7 @@ #include "side-position-interface.hh" #include "engraver.hh" #include "spanner.hh" +#include "text-interface.hh" #include "item.hh" class Ottava_spanner_engraver : public Engraver @@ -55,7 +56,7 @@ Ottava_spanner_engraver::process_music () { finished_ = span_; span_ = 0; - if (scm_is_string (ott)) + if (Text_interface::is_markup (ott)) { span_ = make_spanner ("OttavaBracket", SCM_EOL); span_->set_property ("text", ott); diff --git a/scm/define-context-properties.scm b/scm/define-context-properties.scm index 357a3e0..42c8e16 100644 --- a/scm/define-context-properties.scm +++ b/scm/define-context-properties.scm @@ -33,7 +33,7 @@ ;; TODO FIXME - (aDueText ,string? "Text to print at a unisono passage.") + (aDueText ,markup? "Text to print at a unisono passage.") (alignBelowContext ,string? "Where to insert newly created context in vertiical alignment.") (alignAboveContext ,string? "Where to insert newly created context in @@ -329,7 +329,7 @@ repeated section for a page turn to be allowed within that section.") Parameters: A list of note events and a list of tabstring events.") - (ottavation ,string? "If set, the text for an ottava spanner. + (ottavation ,markup? "If set, the text for an ottava spanner. Changing this creates a new text spanner.") (output ,ly:music-output? "The output produced by a score-level translator during music interpretation.") @@ -391,9 +391,9 @@ voices is preserved. (skipTypesetting ,boolean? "If true, no typesetting is done, speeding up the interpretation phase. Useful for debugging large scores.") - (soloIIText ,string? "The text for the start of a solo for + (soloIIText ,markup? "The text for the start of a solo for voice @q{two} when part-combining.") - (soloText ,string? "The text for the start of a solo when + (soloText ,markup? "The text for the start of a solo when part-combining.") (squashedPosition ,integer? "Vertical position of squashing for @rinternals{Pitch_squash_engraver}.") -- 1.5.4.3