CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/05/26 00:09:54
Modified files:
. : ChangeLog
Documentation/user: advanced-notation.itely basic-notation.itely
input/regression: repeat-unfold-all.ly
lily : event-chord-iterator.cc font-config.cc tie.cc
lily/include : event-chord-iterator.hh
scm : define-grobs.scm
Log message:
* lily/font-config.cc (init_fontconfig): comment out FontConfig
cache warning.
* lily/tie.cc (print): support dotted ties.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3658&tr2=1.3659&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/Documentation/user/advanced-notation.itely.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/Documentation/user/basic-notation.itely.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/input/regression/repeat-unfold-all.ly.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/event-chord-iterator.cc.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/font-config.cc.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/tie.cc.diff?tr1=1.139&tr2=1.140&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/include/event-chord-iterator.hh.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/define-grobs.scm.diff?tr1=1.200&tr2=1.201&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3658 lilypond/ChangeLog:1.3659
--- lilypond/ChangeLog:1.3658 Wed May 25 10:23:36 2005
+++ lilypond/ChangeLog Thu May 26 00:09:53 2005
@@ -1,7 +1,15 @@
+2005-05-26 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+
+ * lily/font-config.cc (init_fontconfig): comment out FontConfig
+ cache warning.
+
+ * lily/tie.cc (print): support dotted ties.
+
2005-05-25 Han-Wen Nienhuys <[EMAIL PROTECTED]>
* scm/define-grobs.scm (all-grob-descriptions): switch off
debugging
+ (all-grob-descriptions): Arpeggio has Y-extent.
* scm/define-music-properties.scm (all-music-properties): document
length-callback and start-callback as "read-only".
Index: lilypond/Documentation/user/advanced-notation.itely
diff -u lilypond/Documentation/user/advanced-notation.itely:1.28
lilypond/Documentation/user/advanced-notation.itely:1.29
--- lilypond/Documentation/user/advanced-notation.itely:1.28 Tue May 24
19:09:20 2005
+++ lilypond/Documentation/user/advanced-notation.itely Thu May 26 00:09:53 2005
@@ -1537,7 +1537,7 @@
each staff but replacing it manually using
@code{timeSignatureFraction} to the desired fraction. Then the printed
durations in each staff are scaled to the common time signature.
-The latter is done with @code{\compressmusic}, which is similar to
+The latter is done with @code{\compressMusic}, which is similar to
@code{\times}, but does not create a tuplet bracket.
@@ -1555,13 +1555,13 @@
\new Staff {
\time 3/4
\set Staff.timeSignatureFraction = #'(9 . 8)
- \compressmusic #'(2 . 3)
+ \compressMusic #'(2 . 3)
\repeat unfold 6 { c8[ c c] }
}
\new Staff {
\time 3/4
\set Staff.timeSignatureFraction = #'(10 . 8)
- \compressmusic #'(3 . 5) {
+ \compressMusic #'(3 . 5) {
\repeat unfold 2 { c8[ c c] }
\repeat unfold 2 { c8[ c] }
| c4. c4. \times 2/3 { c8 c c } c4
Index: lilypond/Documentation/user/basic-notation.itely
diff -u lilypond/Documentation/user/basic-notation.itely:1.21
lilypond/Documentation/user/basic-notation.itely:1.22
--- lilypond/Documentation/user/basic-notation.itely:1.21 Wed May 25
19:38:39 2005
+++ lilypond/Documentation/user/basic-notation.itely Thu May 26 00:09:54 2005
@@ -2706,15 +2706,15 @@
@subsection Repeats and MIDI
@cindex expanding repeats
[EMAIL PROTECTED] @code{\unfoldrepeats}
[EMAIL PROTECTED] @code{\unfoldRepeats}
With a little bit of tweaking, all types of repeats can be present
in the MIDI output. This is achieved by applying the
[EMAIL PROTECTED] music function. This functions changes all
[EMAIL PROTECTED] music function. This functions changes all
repeats to unfold repeats.
@lilypond[quote,verbatim,fragment,linewidth=8.0\cm]
-\unfoldrepeats {
+\unfoldRepeats {
\repeat tremolo 8 {c'32 e' }
\repeat percent 4 { c''8 d'' }
\repeat volta 2 {c'4 d' e' f'}
@@ -2726,7 +2726,7 @@
\bar "|."
@end lilypond
-When creating a score file using @code{\unfoldrepeats} for midi, then
+When creating a score file using @code{\unfoldRepeats} for midi, then
it is necessary to make two @code{\score} blocks. One for MIDI (with
unfolded repeats) and one for notation (with volta, tremolo, and
percent repeats). For example,
@@ -2737,7 +2737,7 @@
\layout @{ .. @}
@}
\score @{
- \unfoldrepeats @var{..music..}
+ \unfoldRepeats @var{..music..}
\midi @{ .. @}
@}
@end example
Index: lilypond/input/regression/repeat-unfold-all.ly
diff -u lilypond/input/regression/repeat-unfold-all.ly:1.28
lilypond/input/regression/repeat-unfold-all.ly:1.29
--- lilypond/input/regression/repeat-unfold-all.ly:1.28 Sat Oct 30 20:55:16 2004
+++ lilypond/input/regression/repeat-unfold-all.ly Thu May 26 00:09:54 2005
@@ -1,7 +1,7 @@
-\version "2.4.0"
+\version "2.5.25"
\header { texidoc = "Volta repeats may be unfolded through the music
- function @code{\unfoldrepeats}."
+ function @code{\unfoldRepeats}."
}
@@ -13,6 +13,6 @@
\context Voice {
\nots
\bar "||"
- \unfoldrepeats \nots
+ \unfoldRepeats \nots
}
Index: lilypond/lily/event-chord-iterator.cc
diff -u lilypond/lily/event-chord-iterator.cc:1.21
lilypond/lily/event-chord-iterator.cc:1.22
--- lilypond/lily/event-chord-iterator.cc:1.21 Tue Apr 12 22:49:28 2005
+++ lilypond/lily/event-chord-iterator.cc Thu May 26 00:09:54 2005
@@ -17,7 +17,7 @@
}
Context *
-Event_chord_iterator::get_req_translator ()
+Event_chord_iterator::get_bottom_context ()
{
assert (get_outlet ());
if (get_outlet ()->is_bottom_context ())
@@ -31,7 +31,7 @@
Event_chord_iterator::construct_children ()
{
Simple_music_iterator::construct_children ();
- get_req_translator ();
+ get_bottom_context ();
}
Event_chord *
Index: lilypond/lily/font-config.cc
diff -u lilypond/lily/font-config.cc:1.20 lilypond/lily/font-config.cc:1.21
--- lilypond/lily/font-config.cc:1.20 Tue May 17 12:00:19 2005
+++ lilypond/lily/font-config.cc Thu May 26 00:09:54 2005
@@ -27,11 +27,17 @@
FcConfig *fcc = FcConfigGetCurrent ();
+
+#if 0
+ /*
+ Hmm. the cache is always out of date??!
+ */
FcChar8 *cache = FcConfigGetCache (fcc);
if (!FcDirCacheValid (cache))
{
warning (_ ("FontConfig cache out of date. Rebuilding may take some
time."));
}
+#endif
Array<String> dirs;
struct stat statbuf;
Index: lilypond/lily/include/event-chord-iterator.hh
diff -u lilypond/lily/include/event-chord-iterator.hh:1.8
lilypond/lily/include/event-chord-iterator.hh:1.9
--- lilypond/lily/include/event-chord-iterator.hh:1.8 Thu Mar 10 14:36:12 2005
+++ lilypond/lily/include/event-chord-iterator.hh Thu May 26 00:09:54 2005
@@ -20,7 +20,7 @@
/**
Find a bottom notation context to deliver events to.
*/
- virtual Context *get_req_translator ();
+ virtual Context *get_bottom_context ();
/*
Since Event_chord_iterator has no list-cursor internally, we
Index: lilypond/lily/tie.cc
diff -u lilypond/lily/tie.cc:1.139 lilypond/lily/tie.cc:1.140
--- lilypond/lily/tie.cc:1.139 Tue Apr 12 22:49:27 2005
+++ lilypond/lily/tie.cc Thu May 26 00:09:54 2005
@@ -346,13 +346,28 @@
i++;
}
- Stencil a = Lookup::slur (b,
- get_grob_direction (me) * staff_thick,
- thick);
+ Stencil a;
+ SCM p = me->get_property ("dash-period");
+ SCM f = me->get_property ("dash-fraction");
+ if (scm_is_number (p) && scm_is_number (f))
+ a = Lookup::dashed_slur (b,
+ thick,
+ robust_scm2double (p, 1.0),
+ robust_scm2double (f, 0));
+ else
+ a = Lookup::slur (b,
+ get_grob_direction (me) * staff_thick,
+ thick);
+
+
return a.smobbed_copy ();
}
-ADD_INTERFACE (Tie, "tie-interface",
+ADD_INTERFACE (Tie,
+ "tie-interface",
"A tie connecting two noteheads.\n",
- "y-offset staffline-clearance control-points head-pair details
thickness x-gap direction minimum-length");
+
+ "y-offset dash-period dash-fraction "
+ "staffline-clearance control-points head-pair "
+ "details thickness x-gap direction minimum-length");
Index: lilypond/scm/define-grobs.scm
diff -u lilypond/scm/define-grobs.scm:1.200 lilypond/scm/define-grobs.scm:1.201
--- lilypond/scm/define-grobs.scm:1.200 Wed May 25 10:23:36 2005
+++ lilypond/scm/define-grobs.scm Thu May 26 00:09:54 2005
@@ -93,7 +93,6 @@
(Arpeggio
. (
(X-extent-callback . ,Arpeggio::width_callback)
- (Y-extent-callback . #f)
(print-function . ,Arpeggio::print)
(Y-offset-callbacks . (,Staff_symbol_referencer::callback))
(X-offset-callbacks . (,Side_position_interface::aligned_side))
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
