CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Jan Nieuwenhuizen <[EMAIL PROTECTED]> 05/08/18 10:23:16
Modified files:
scm : script.scm
input/regression: slur-script-inside.ly
input : les-nereides.ly
. : ChangeLog
Log message:
* input/les-nereides.ly: Remove three fingering tweaks, update
remaining one.
* input/regression/slur-script-inside.ly: Update, fix doc.
* scm/script.scm: Update to avoid-slur.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/script.scm.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/input/regression/slur-script-inside.ly.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/input/les-nereides.ly.diff?tr1=1.77&tr2=1.78&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.4028&tr2=1.4029&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.4028 lilypond/ChangeLog:1.4029
--- lilypond/ChangeLog:1.4028 Thu Aug 18 09:26:26 2005
+++ lilypond/ChangeLog Thu Aug 18 10:23:16 2005
@@ -1,5 +1,12 @@
2005-08-18 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
+ * input/les-nereides.ly: Remove three fingering tweaks, update
+ remaining one.
+
+ * input/regression/slur-script-inside.ly: Update, fix doc.
+
+ * scm/script.scm: Update to avoid-slur.
+
* scm/define-grob-properties.scm (avoid-slur): New property.
* lily/phrasing-slur-engraver.cc (acknowledge_extra_object):
Index: lilypond/input/les-nereides.ly
diff -u lilypond/input/les-nereides.ly:1.77 lilypond/input/les-nereides.ly:1.78
--- lilypond/input/les-nereides.ly:1.77 Fri Jul 1 11:22:42 2005
+++ lilypond/input/les-nereides.ly Thu Aug 18 10:23:15 2005
@@ -15,8 +15,7 @@
http://www.orphee.com/comparison/study.html, see
http://www.orphee.com/comparison/gray.pdf
-
-lines that contain tweaks (14 currently, not counting reverts) are
+Lines that contain tweaks (10 currently, not counting reverts) are
marked with %tweak
possibly more impressive to render without tweaks?
@@ -77,8 +76,6 @@
% \fingerUp
\override Fingering #'direction = #1
- % Manual fix for collision with slur
- \override Fingering #'inside-slur = ##f %tweak
<gis gis,> <fis fis,> e)-1-4-5 r
| %6
@@ -103,8 +100,10 @@
<e, gis, e d!>2
| %5
s8 cis4. d4
+ % fair to count as one tweak?
\override Fingering #'add-stem-support = ##t %tweak
- \override Fingering #'padding = #0.1 %tweak
+ \override Fingering #'padding = #0.15
+ \override Fingering #'slur-padding = #0.1
<cis e,>8[( <d,_3 b'_1>
| %6
<cis_1 a'_2>)] cis'4. d4
@@ -186,11 +185,9 @@
%%r b,-5 <e-3 gis-5 d'>4
r b,-5\sustainUp\sustainDown <e gis d'>4-3-5
\slurNeutral
- \once \override Fingering #'extra-offset = #'(0 . -1) %tweak
e,8[-5(\sustainUp
| %6
- \once \override Fingering #'extra-offset = #'(0 . -1) %tweak
a)-2]\sustainDown
\slurUp
e'[(<a cis>)] r b,\sustainUp\sustainDown <e gis d'>4
@@ -227,8 +224,9 @@
s32 s s s\!
}
-
+ \fatText
s32 s-"rall." s s s8 s4
+ \emptyText
| %5
s2-"a tempo" s8
\once\override Dynamics.Hairpin #'extra-offset = #'(1 . 0) %tweak
@@ -271,7 +269,7 @@
\consists "Dynamic_engraver"
\consists "Text_engraver"
- \override TextScript #'font-size = #2
+ %%\override TextScript #'font-size = #1
\override TextScript #'font-shape = #'italic
\consists "Skip_event_swallow_translator"
Index: lilypond/input/regression/slur-script-inside.ly
diff -u lilypond/input/regression/slur-script-inside.ly:1.6
lilypond/input/regression/slur-script-inside.ly:1.7
--- lilypond/input/regression/slur-script-inside.ly:1.6 Sun Jun 26 22:39:14 2005
+++ lilypond/input/regression/slur-script-inside.ly Thu Aug 18 10:23:15 2005
@@ -1,8 +1,9 @@
\header {
- texidoc = "Slurs avoid scripts with @code{inside-slur} set
- true, while scripts avoid slurs if @code{inside-slur} set to
- false."
+ texidoc = "Slurs avoid scripts with @code{avoid-slur} set to
[EMAIL PROTECTED], scripts avoid slurs with @code{avoid-slur} set to
[EMAIL PROTECTED] Slurs and scripts keep a distance of
[EMAIL PROTECTED]"
}
@@ -14,9 +15,10 @@
\relative c''{
\clef alto
\slurUp
- \override Script #'inside-slur = ##t
+ \override Script #'slur-padding = #0.2
+ \override Script #'avoid-slur = #'inside
c4(^\downbow b)
- \override Script #'inside-slur = ##f
+ \override Script #'avoid-slur = #'around
c4(^\downbow b)
c4^\downbow b
}
Index: lilypond/scm/script.scm
diff -u lilypond/scm/script.scm:1.28 lilypond/scm/script.scm:1.29
--- lilypond/scm/script.scm:1.28 Fri Feb 4 13:48:10 2005
+++ lilypond/scm/script.scm Thu Aug 18 10:23:15 2005
@@ -10,12 +10,12 @@
((script-stencil . (feta . ("thumb" . "thumb")))
(direction . 1)))
("accent" .
- ((inside-slur . #f)
+ ((avoid-slur . around)
(follow-into-staff . #t)
(script-stencil . (feta . ("sforzato" . "sforzato")))
(side-relative-direction . -1)))
("espressivo" .
- ((inside-slur . #f)
+ ((avoid-slur . around)
(follow-into-staff . #t)
(script-stencil . (feta . ("espr" . "espr")))
(side-relative-direction . -1)))
@@ -24,7 +24,7 @@
(follow-into-staff . #t)
(side-relative-direction . -1)))
("staccatissimo" .
- ((inside-slur . #t)
+ ((avoid-slur . inside)
(script-stencil . (feta . ("dstaccatissimo" . "ustaccatissimo")))
(side-relative-direction . -1)))
@@ -62,7 +62,7 @@
(direction . 1)))
("fermata" .
((script-stencil . (feta . ("dfermata" . "ufermata")))
- (inside-slur . #f)
+ (avoid-slur . around)
(direction . 1)))
("shortfermata" .
((script-stencil . (feta . ("dshortfermata" . "ushortfermata")))
@@ -80,12 +80,12 @@
((script-stencil . (feta . ("staccato" . "staccato")))
(side-relative-direction . -1)
(follow-into-staff . #t)
- (inside-slur . #t)
+ (avoid-slur . inside)
(priority . -100)))
("tenuto" .
((script-stencil . (feta . ("tenuto" . "tenuto")))
(follow-into-staff . #t)
- (inside-slur . #t)
+ (avoid-slur . inside)
(side-relative-direction . -1)))
("comma" .
((script-stencil . (feta . ("lcomma" . "rcomma")))
@@ -97,11 +97,11 @@
(direction . 1)))
("upbow" .
((script-stencil . (feta . ("upbow" . "upbow")))
- (inside-slur . #f)
+ (avoid-slur . around)
(direction . 1)))
("downbow" .
((script-stencil . (feta . ("downbow" . "downbow")))
- (inside-slur . #f)
+ (avoid-slur . around)
(direction . 1)))
("lheel" .
((script-stencil . (feta . ("upedalheel" . "upedalheel")))
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
