--- /dev/null
+\version "2.15.4"
+
+#(ly:set-option 'warning-as-error #f)
+
+\header {
+ texidoc = "LilyPond does not support multiple concurrent phrasing slurs with the
+parentheses syntax. In this case, warnings will be given and the nested
+slur will not be generated. However, one can can create a second slur with
+a different spanner-id."
+}
+
+altPhSlur = #(make-music 'PhrasingSlurEvent 'span-direction START 'spanner-id "alt")
+altPhSlurEnd = #(make-music 'PhrasingSlurEvent 'span-direction STOP 'spanner-id "alt")
+
+\relative c'' {
+ % This will give warnings ("Already have phrasing slur" and "Cannot end phrasing slur")
+ c4\(\( d4\)\( e4\) f\) |
+ % This will give two overlapping slurs:
+ d\( d\altPhSlur e\) f\altPhSlurEnd |
+
+}
--- /dev/null
+\version "2.15.4"
+
+\header {
+ texidoc = "Appoggiatura and acciaccaturas use a different slur than the
+default, so they produce a nested slur without warnings."
+}
+
+\relative c'' {
+ c4( \acciaccatura e8 d4 e4 f) |
+ c4( \appoggiatura e8 d4 e4 f) |
+ c4 \appoggiatura e8 d4 e4 f |
+}
--- /dev/null
+\version "2.15.5"
+
+#(ly:set-option 'warning-as-error #f)
+
+\header {
+ texidoc = "An additional opening slur during a running slur should be ignored
+(and a warning printed), but never influence the slur's extents."
+}
+
+\paper { ragged-right = ##t }
+
+\relative c' {
+ \key fis \major
+ c1(
+ \break
+ a2 b4 c)
+}
+
+\relative c' {
+ \key fis \major
+ c1(
+ \break
+ a2( b4 c)
+% ^ extra SlurEvent
+}
+%% END
\ No newline at end of file
--- /dev/null
+\version "2.15.5"
+
+#(ly:set-option 'warning-as-error #f)
+
+\header {
+ texidoc = "LilyPond does not support multiple concurrent slurs with the
+parentheses syntax. In this case, warnings will be given and the nested
+slur will not be generated. However, one can can create a second slur with
+a different spanner-id."
+}
+
+altSlur = #(make-music 'SlurEvent 'span-direction START 'spanner-id "alt")
+altSlurEnd = #(make-music 'SlurEvent 'span-direction STOP 'spanner-id "alt")
+
+\relative c'' {
+ % This will give warnings ("Already have slur" and "Cannot end slur")
+ c4(( d4)( e4) f) |
+ % This will give two overlapping slurs:
+ d( d\altSlur e) f\altSlurEnd |
+
+}
#include "translator.icc"
-/*
- It is possible that a slur starts and ends on the same note. At
- least, it is for phrasing slurs: a note can be both beginning and
- ending of a phrase.
-
-*/
/*
NOTE NOTE NOTE
- This is largely similar to Slur_engraver. Check if fixes apply there too.
+ This is largely similar to Slur_engraver. Check if fixes
+ apply there too.
(on principle, engravers don't use inheritance for code sharing)
*/
+
+/*
+ It is possible that a slur starts and ends on the same note. At
+ least, it is for phrasing slurs: a note can be both beginning and
+ ending of a phrase.
+
+*/
class Phrasing_slur_engraver : public Engraver
{
- Drul_array<Stream_event *> events_;
- Stream_event *running_slur_start_;
+ vector<Stream_event *> start_events_;
+ vector<Stream_event *> stop_events_;
vector<Grob*> slurs_;
vector<Grob*> end_slurs_;
protected:
- void acknowledge_extra_object (Grob_info);
+ DECLARE_TRANSLATOR_LISTENER (phrasing_slur);
DECLARE_ACKNOWLEDGER (accidental);
DECLARE_ACKNOWLEDGER (fingering);
DECLARE_ACKNOWLEDGER (note_column);
DECLARE_ACKNOWLEDGER (text_script);
DECLARE_ACKNOWLEDGER (tie);
DECLARE_ACKNOWLEDGER (tuplet_number);
- DECLARE_TRANSLATOR_LISTENER (phrasing_slur);
+ void acknowledge_extra_object (Grob_info);
void stop_translation_timestep ();
- virtual void finalize ();
void process_music ();
+ virtual void finalize ();
+
+
public:
TRANSLATOR_DECLARATIONS (Phrasing_slur_engraver);
};
Phrasing_slur_engraver::Phrasing_slur_engraver ()
{
- events_[START] = events_[STOP] = 0;
}
IMPLEMENT_TRANSLATOR_LISTENER (Phrasing_slur_engraver, phrasing_slur);
void
Phrasing_slur_engraver::listen_phrasing_slur (Stream_event *ev)
{
- /*
- Let's not start more than one slur per moment.
- */
Direction d = to_dir (ev->get_property ("span-direction"));
if (d == START)
- ASSIGN_EVENT_ONCE (events_[START], ev);
- else if (d == STOP && !slurs_.empty ())
- ASSIGN_EVENT_ONCE (events_[STOP], ev);
+ start_events_.push_back(ev);
+ else if (d == STOP)
+ stop_events_.push_back(ev);
+ else ev->origin ()->warning (_f ("direction of %s invalid: %d",
+ "phrasing-slur-event", int (d)));
}
void
}
void
-Phrasing_slur_engraver::acknowledge_text_script (Grob_info info)
+Phrasing_slur_engraver::acknowledge_tuplet_number (Grob_info info)
{
acknowledge_extra_object (info);
}
}
void
-Phrasing_slur_engraver::acknowledge_tie (Grob_info info)
+Phrasing_slur_engraver::acknowledge_text_script (Grob_info info)
{
acknowledge_extra_object (info);
}
void
-Phrasing_slur_engraver::acknowledge_tuplet_number (Grob_info info)
+Phrasing_slur_engraver::acknowledge_tie (Grob_info info)
{
acknowledge_extra_object (info);
}
void
Phrasing_slur_engraver::finalize ()
{
- if (slurs_.size ())
- slurs_[0]->warning (_ ("unterminated phrasing slur"));
+ for (vsize i = 0; i < slurs_.size (); i++)
+ {
+ slurs_[i]->warning (_ ("unterminated phrasing slur"));
+ slurs_[i]->suicide ();
+ }
}
void
Phrasing_slur_engraver::process_music ()
{
- if (events_[STOP])
+ for (vsize i = 0; i < stop_events_.size (); i++)
{
- end_slurs_ = slurs_;
- slurs_.clear ();
+ Stream_event *ev = stop_events_[i];
+ string id = robust_scm2string (ev->get_property ("spanner-id"), "");
+
+ // Find the slur that is ended with this event (by checking the spanner-id)
+ bool ended = false;
+ for (vsize j = slurs_.size (); j--;)
+ {
+ if (id == robust_scm2string (slurs_[j]->get_property ("spanner-id"), ""))
+ {
+ ended = true;
+ end_slurs_.push_back (slurs_[j]);
+ slurs_.erase (slurs_.begin () + j);
+ }
+ }
+ if (!ended)
+ ev->origin ()->warning (_ ("cannot end phrasing slur"));
}
- if (events_[START] && slurs_.empty ())
+ for (vsize i = 0; i < start_events_.size (); i++)
{
- Stream_event *ev = events_[START];
-
- Grob *slur = make_spanner ("PhrasingSlur", events_[START]->self_scm ());
- Direction updown = to_dir (ev->get_property ("direction"));
- if (updown)
- set_grob_direction (slur, updown);
-
- slurs_.push_back (slur);
+ Stream_event *ev = start_events_[i];
+ string id = robust_scm2string (ev->get_property ("spanner-id"), "");
+ bool have_slur = false;
+ // Check if we already have a slur with the same spanner-id.
+ // In that case, don't create a new slur, but print a warning
+ for (vsize i = 0; i < slurs_.size (); i++)
+ have_slur = have_slur || (id == robust_scm2string (slurs_[i]->get_property ("spanner-id"), ""));
+
+ if (have_slur)
+ ev->origin ()->warning(_ ("already have phrasing slur"));
+ else
+ {
+ Grob *slur = make_spanner ("PhrasingSlur", ev->self_scm ());
+ Direction updown = to_dir (ev->get_property ("direction"));
+ slur->set_property ("spanner-id", ly_string2scm (id));
+ if (updown)
+ set_grob_direction (slur, updown);
+ slurs_.push_back (slur);
+ }
}
}
Phrasing_slur_engraver::stop_translation_timestep ()
{
end_slurs_.clear ();
- events_[START] = events_[STOP] = 0;
+ start_events_.clear ();
+ stop_events_.clear ();
}
ADD_ACKNOWLEDGER (Phrasing_slur_engraver, accidental);
*/
class Slur_engraver : public Engraver
{
- Drul_array<Stream_event *> events_;
- Stream_event *running_slur_start_;
+ vector<Stream_event *> start_events_;
+ vector<Stream_event *> stop_events_;
vector<Grob*> slurs_;
vector<Grob*> end_slurs_;
Slur_engraver::Slur_engraver ()
{
- events_[START] = events_[STOP] = 0;
}
IMPLEMENT_TRANSLATOR_LISTENER (Slur_engraver, slur);
{
Direction d = to_dir (ev->get_property ("span-direction"));
if (d == START)
- ASSIGN_EVENT_ONCE (events_[START], ev);
+ start_events_.push_back(ev);
else if (d == STOP)
- ASSIGN_EVENT_ONCE (events_[STOP], ev);
+ stop_events_.push_back(ev);
else ev->origin ()->warning (_f ("direction of %s invalid: %d",
"slur-event", int (d)));
}
acknowledge_extra_object (info);
}
-
void
Slur_engraver::acknowledge_script (Grob_info info)
{
void
Slur_engraver::finalize ()
{
- if (slurs_.size ())
+ for (vsize i = 0; i < slurs_.size (); i++)
{
- slurs_[0]->warning (_ ("unterminated slur"));
- for (vsize i = 0; i < slurs_.size (); i++)
- slurs_[i]->suicide ();
+ slurs_[i]->warning (_ ("unterminated slur"));
+ slurs_[i]->suicide ();
}
}
void
Slur_engraver::process_music ()
{
- if (events_[STOP])
+ for (vsize i = 0; i < stop_events_.size (); i++)
{
- if (slurs_.size () == 0)
- events_[STOP]->origin ()->warning (_ ("cannot end slur"));
-
-
- end_slurs_ = slurs_;
- slurs_.clear ();
+ Stream_event *ev = stop_events_[i];
+ string id = robust_scm2string (ev->get_property ("spanner-id"), "");
+
+ // Find the slur that is ended with this event (by checking the spanner-id)
+ bool ended = false;
+ for (vsize j = slurs_.size (); j--;)
+ {
+ if (id == robust_scm2string (slurs_[j]->get_property ("spanner-id"), ""))
+ {
+ ended = true;
+ end_slurs_.push_back (slurs_[j]);
+ slurs_.erase (slurs_.begin () + j);
+ }
+ }
+ if (!ended)
+ ev->origin ()->warning (_ ("cannot end slur"));
}
- if (events_[START] && slurs_.empty ())
+ for (vsize i = start_events_.size (); i--;)
{
- Stream_event *ev = events_[START];
-
- bool double_slurs = to_boolean (get_property ("doubleSlurs"));
-
- Grob *slur = make_spanner ("Slur", events_[START]->self_scm ());
- Direction updown = to_dir (ev->get_property ("direction"));
- if (updown && !double_slurs)
- set_grob_direction (slur, updown);
-
- slurs_.push_back (slur);
-
- if (double_slurs)
- {
- set_grob_direction (slur, DOWN);
- slur = make_spanner ("Slur", events_[START]->self_scm ());
- set_grob_direction (slur, UP);
- slurs_.push_back (slur);
- }
+ Stream_event *ev = start_events_[i];
+ string id = robust_scm2string (ev->get_property ("spanner-id"), "");
+ bool have_slur = false;
+ // Check if we already have a slur with the same spanner-id.
+ // In that case, don't create a new slur, but print a warning
+ for (vsize j = 0; j < slurs_.size (); j++)
+ have_slur = have_slur || (id == robust_scm2string (slurs_[j]->get_property ("spanner-id"), ""));
+
+ if (have_slur)
+ {
+ // We already have a slur, so give a warning and completely ignore
+ // the new slur.
+ ev->origin ()->warning(_ ("already have slur"));
+ start_events_.erase (start_events_.begin () + i);
+ }
+ else
+ {
+ Grob *slur = make_spanner ("Slur", ev->self_scm ());
+ Direction updown = to_dir (ev->get_property ("direction"));
+ slur->set_property ("spanner-id", ly_string2scm (id));
+ if (updown)
+ set_grob_direction (slur, updown);
+ slurs_.push_back (slur);
+
+ if (to_boolean (get_property ("doubleSlurs")))
+ {
+ set_grob_direction (slur, DOWN);
+ slur = make_spanner ("Slur", ev->self_scm ());
+ slur->set_property ("spanner-id", ly_string2scm (id));
+ set_grob_direction (slur, UP);
+ slurs_.push_back (slur);
+ }
+ }
}
set_melisma (slurs_.size ());
}
for (vsize i = 0; i < end_slurs_.size (); i++)
Slur::add_extra_encompass (end_slurs_[i], g);
- if (!events_[START])
+ if (!start_events_.size ())
for (vsize i = 0; i < slurs_.size (); i++)
Slur::add_extra_encompass (slurs_[i], g);
}
announce_end_grob (s, SCM_EOL);
}
end_slurs_.clear ();
- events_[START] = events_[STOP] = 0;
+ start_events_.clear ();
+ stop_events_.clear ();
}
ADD_ACKNOWLEDGER (Slur_engraver, accidental);
/* properties */
"normalized-endpoints "
"minimum-length "
+ "spanner-id "
"to-barline "
);
\version "2.14.0"
+startGraceSlur = #(make-music 'SlurEvent 'span-direction START 'spanner-id "grace")
+stopGraceSlur = #(make-music 'SlurEvent 'span-direction STOP 'spanner-id "grace")
+
startGraceMusic = {
}
startAppoggiaturaMusic =
{
- s1*0(
+ s1*0\startGraceSlur
}
stopAppoggiaturaMusic = {
- s1*0)
+ s1*0\stopGraceSlur
}
startAcciaccaturaMusic = {
- s1*0(
+ s1*0\startGraceSlur
\override Stem #'stroke-style = #"grace"
}
stopAcciaccaturaMusic = {
\revert Stem #'stroke-style
- s1*0)
+ s1*0\stopGraceSlur
}
@example
\\override MultiMeasureRest #'spacing-pair = #'(staff-bar . staff-bar)
@end example")
+ (spanner-id ,string? "An identifier to distinguish concurrent spanners.")
(springs-and-rods ,boolean? "Dummy variable for triggering
spacing routines.")
(stacking-dir ,ly:dir? "Stack objects in which direction?")
(height-limit . 2.0)
(minimum-length . 1.5)
(ratio . 0.333)
+ (spanner-id . "")
(springs-and-rods . ,ly:spanner::set-spacing-rods)
(stencil . ,ly:slur::print)
(thickness . 1.1)
(line-thickness . 0.8)
(minimum-length . 1.5)
(ratio . 0.25)
+ (spanner-id . "")
(springs-and-rods . ,ly:spanner::set-spacing-rods)
(stencil . ,ly:slur::print)
(thickness . 1.2)
Options are @code{'text} and @code{'hairpin}.")
(span-text ,markup? "The displayed text for dynamic text spanners
(e.g., cresc.)")
+ (spanner-id ,string? "Identifier to distinguish concurrent spanners.")
(split-list ,list? "Splitting moments for part combiner.")
(start-callback ,procedure? "Function to compute the negative length
of starting grace notes. This property can only be defined as initializer
. ((description . "Start or end phrasing slur.
Syntax: @var{note}@code{\\(} and @var{note}@code{\\)}")
+ (spanner-id . "")
(types . (general-music span-event event phrasing-slur-event))
))
. ((description . "Start or end slur.
Syntax: @var{note}@code{(} and @var{note}@code{)}")
+ (spanner-id . "")
(types . (general-music span-event event slur-event))
))