CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Jan Nieuwenhuizen <[EMAIL PROTECTED]> 05/08/18 09:55:08
Modified files:
scm : define-grobs.scm define-grob-properties.scm
lily : slur-engraver.cc script-interface.cc
phrasing-slur-engraver.cc accidental.cc
input/regression: slur-script.ly
Documentation/topdocs: NEWS.tely
Log message:
* scm/define-grob-properties.scm (avoid-slur): New property.
* lily/phrasing-slur-engraver.cc (acknowledge_extra_object):
* lily/slur-engraver.cc (acknowledge_extra_object): Invoke
outside_slur_callback if avoid-slur != #'inside.
* scm/define-grobs.scm (Fingering, Textscript): No
inside-slur/outside-slur preference.
(DynamicLineSpanner): Always outside slur.
* input/regression/slur-script.ly: More tests.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/define-grobs.scm.diff?tr1=1.224&tr2=1.225&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/define-grob-properties.scm.diff?tr1=1.113&tr2=1.114&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/slur-engraver.cc.diff?tr1=1.115&tr2=1.116&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/script-interface.cc.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/phrasing-slur-engraver.cc.diff?tr1=1.56&tr2=1.57&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/accidental.cc.diff?tr1=1.61&tr2=1.62&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/input/regression/slur-script.ly.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/Documentation/topdocs/NEWS.tely.diff?tr1=1.68&tr2=1.69&r1=text&r2=text
Patches:
Index: lilypond/Documentation/topdocs/NEWS.tely
diff -u lilypond/Documentation/topdocs/NEWS.tely:1.68
lilypond/Documentation/topdocs/NEWS.tely:1.69
--- lilypond/Documentation/topdocs/NEWS.tely:1.68 Thu Aug 18 09:26:25 2005
+++ lilypond/Documentation/topdocs/NEWS.tely Thu Aug 18 09:55:08 2005
@@ -56,7 +56,7 @@
{
b_1( f'_1_2_3 c_3_4_5 a)
b( f'\p b,)
- c-2_\markup { \italic {"cresc."}}( f c)
+ c-2_\markup { \italic {"cresc."}} ( f_\markup {x} c)
}
@end lilypond
Index: lilypond/input/regression/slur-script.ly
diff -u lilypond/input/regression/slur-script.ly:1.14
lilypond/input/regression/slur-script.ly:1.15
--- lilypond/input/regression/slur-script.ly:1.14 Thu Aug 18 09:26:25 2005
+++ lilypond/input/regression/slur-script.ly Thu Aug 18 09:55:08 2005
@@ -11,6 +11,7 @@
\version "2.6.0"
\layout {
+ indent = 0\mm
raggedright = ##t
}
\relative
@@ -22,9 +23,14 @@
b( f'\p b,)
%% Do not force dynamics outside slur, only avoid collisions.
- \override DynamicLineSpanner #'avoid-slur = #'()
- \override DynamicLineSpanner #'padding = #0.3
+ \override DynamicLineSpanner #'avoid-slur = #'around
+ \override DynamicLineSpanner #'padding = #0.4
b( e\p e\f b)
+
+ %% Do not avoid collisions.
+ \override DynamicLineSpanner #'avoid-slur = #'()
+ \revert DynamicLineSpanner #'padding
+ b( d\p d\f b)
c_\markup { \italic {"cresc."}}( c c)
\once \override Script #'padding = #1.2
Index: lilypond/lily/accidental.cc
diff -u lilypond/lily/accidental.cc:1.61 lilypond/lily/accidental.cc:1.62
--- lilypond/lily/accidental.cc:1.61 Sat Aug 13 21:35:23 2005
+++ lilypond/lily/accidental.cc Thu Aug 18 09:55:08 2005
@@ -240,8 +240,14 @@
}
/*
- TODO: should move inside-slur into item?
+ TODO: should move avoid-slur into item?
*/
ADD_INTERFACE (Accidental_interface, "accidental-interface",
"a single accidental",
- "inside-slur cautionary cautionary-style style tie accidentals");
+ "accidentals "
+ "avoid-slur "
+ "cautionary "
+ "cautionary-style "
+ "style "
+ "tie "
+ );
Index: lilypond/lily/phrasing-slur-engraver.cc
diff -u lilypond/lily/phrasing-slur-engraver.cc:1.56
lilypond/lily/phrasing-slur-engraver.cc:1.57
--- lilypond/lily/phrasing-slur-engraver.cc:1.56 Thu Aug 18 09:26:25 2005
+++ lilypond/lily/phrasing-slur-engraver.cc Thu Aug 18 09:55:08 2005
@@ -103,8 +103,8 @@
for (int i = end_slurs_.size (); i--;)
Slur::add_extra_encompass (end_slurs_[i], e);
}
- else if (avoid != ly_symbol2scm ("inside")
- && e->name () != "DynamicText")
+ else if (avoid == ly_symbol2scm ("outside")
+ || avoid == ly_symbol2scm ("around"))
{
Grob *slur = slurs_.size () ? slurs_[0] : 0;
slur = (end_slurs_.size () && !slur)
Index: lilypond/lily/script-interface.cc
diff -u lilypond/lily/script-interface.cc:1.17
lilypond/lily/script-interface.cc:1.18
--- lilypond/lily/script-interface.cc:1.17 Thu Aug 11 12:47:26 2005
+++ lilypond/lily/script-interface.cc Thu Aug 18 09:55:08 2005
@@ -90,12 +90,22 @@
ADD_INTERFACE (Text_script, "text-script-interface",
"An object that is put above or below a note",
- "add-stem-support slur script-priority inside-slur");
+ "add-stem-support "
+ "avoid-slur "
+ "script-priority "
+ "slur "
+ );
/*
Hmm. Where should we put add-stem-support ?
*/
ADD_INTERFACE (Script_interface, "script-interface",
"An object that is put above or below a note",
- "add-stem-support slur-padding slur script-priority
script-stencil inside-slur");
+ "add-stem-support "
+ "avoid-slur "
+ "script-priority "
+ "script-stencil "
+ "slur "
+ "slur-padding "
+ );
Index: lilypond/lily/slur-engraver.cc
diff -u lilypond/lily/slur-engraver.cc:1.115
lilypond/lily/slur-engraver.cc:1.116
--- lilypond/lily/slur-engraver.cc:1.115 Thu Aug 18 09:26:25 2005
+++ lilypond/lily/slur-engraver.cc Thu Aug 18 09:55:08 2005
@@ -102,7 +102,8 @@
for (int i = end_slurs_.size (); i--;)
Slur::add_extra_encompass (end_slurs_[i], e);
}
- else if (avoid != ly_symbol2scm ("inside")
+ else if ((avoid == ly_symbol2scm ("outside")
+ || avoid == ly_symbol2scm ("around"))
&& e->name () != "DynamicText")
{
Grob *slur = slurs_.size () ? slurs_[0] : 0;
Index: lilypond/scm/define-grob-properties.scm
diff -u lilypond/scm/define-grob-properties.scm:1.113
lilypond/scm/define-grob-properties.scm:1.114
--- lilypond/scm/define-grob-properties.scm:1.113 Thu Aug 18 09:26:25 2005
+++ lilypond/scm/define-grob-properties.scm Thu Aug 18 09:55:08 2005
@@ -277,8 +277,8 @@
of note-column for horizontal shifting. This is used by
@internalsref{note-collision-interface}.")
(avoid-slur ,symbol? "Method of handling slur collisions.
-Choices are @{around}, @{ignore}, @{inside}, @{outside}. If
-unset, script and slur ignore eachother.")
+Choices are @{around}, @{inside}, @{outside}. If unset, script
+and slur ignore eachother.")
(inspect-quants ,number-pair? "If debugging is set,
set beam quant to this position, and print the respective scores.")
Index: lilypond/scm/define-grobs.scm
diff -u lilypond/scm/define-grobs.scm:1.224 lilypond/scm/define-grobs.scm:1.225
--- lilypond/scm/define-grobs.scm:1.224 Thu Aug 18 09:26:25 2005
+++ lilypond/scm/define-grobs.scm Thu Aug 18 09:55:07 2005
@@ -536,6 +536,7 @@
;; sync with TextScript (?)
(padding . 0.5)
+ (avoid-slur . around)
(slur-padding . 0.2)
(staff-padding . 0.5)
(self-alignment-X . 0)
@@ -1408,6 +1409,7 @@
(padding . 0.5)
(staff-padding . 0.5)
(before-line-breaking-callback .
,Script_interface::before_line_breaking)
+ (avoid-slur . around)
(slur-padding . 0.5)
(script-priority . 200)
;; todo: add X self alignment?
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
