* lily/font-config.cc (init_fontconfig): comment out FontConfig

cache warning.

* lily/tie.cc (print): support dotted ties.

diff --git a/ChangeLog b/ChangeLog
index 18940d76321bb0acd37556af1446235d7110dcab..098ac4d879e65ffdc52c481f757307a977fb290e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,15 @@
+2005-05-26  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * lily/font-config.cc (init_fontconfig): comment out FontConfig
+       cache warning.
+
+       * lily/tie.cc (print): support dotted ties.
+       
 2005-05-25  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
        * 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".

diff --git a/Documentation/user/advanced-notation.itely b/Documentation/user/advanced-notation.itely
index ba312eb31ba17eb1e4d5da889343ad1ee87b3121..66c1c4ece4d927ebb5418e4bbf71bfd58cd81de8 100644 (file)
--- a/Documentation/user/advanced-notation.itely
+++ b/Documentation/user/advanced-notation.itely
@@ -1537,7 +1537,7 @@ This notation can be created by setting a common time signature for
 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 @@ multiplied by 3/5, so that 3/5 * 10/8 = 3/4.
   \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

diff --git a/Documentation/user/basic-notation.itely b/Documentation/user/basic-notation.itely
index e2a7ce5d3b9bfe479cabc092fb58495e36e747b2..e047718541e709e846f29b6d68d942b37b2922d9 100644 (file)
--- a/Documentation/user/basic-notation.itely
+++ b/Documentation/user/basic-notation.itely
@@ -2706,15 +2706,15 @@ example by setting @code{Score.measurePosition} or entering
 @subsection Repeats and MIDI
 
 @cindex expanding repeats
-@cindex @code{\unfoldrepeats}
+@cindex @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
-@code{\unfoldrepeats} music function.  This functions changes all
+@code{\unfoldRepeats} 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 @@ repeats to unfold repeats.
 \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 @@ percent repeats).  For example,
   \layout @{ .. @}
 @}
 \score @{
-  \unfoldrepeats @var{..music..}
+  \unfoldRepeats @var{..music..}
   \midi @{ .. @}
 @}
 @end example

diff --git a/input/regression/repeat-unfold-all.ly b/input/regression/repeat-unfold-all.ly
index e616615d85eb8507caefad12755883377785ceaf..2e414a847666c587cb14d01ae8486948ff5b0ef5 100644 (file)
--- a/input/regression/repeat-unfold-all.ly
+++ b/input/regression/repeat-unfold-all.ly
@@ -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 @@ nots = \relative c'   {
 \context Voice {
     \nots
     \bar "||"
-    \unfoldrepeats \nots
+    \unfoldRepeats \nots
 }
 

diff --git a/lily/event-chord-iterator.cc b/lily/event-chord-iterator.cc
index 0271eca42443fbe9fc9b7c050a9bdab2bec0a8b5..212dccc37160ebc48dddcf556f55164e26b66913 100644 (file)
--- a/lily/event-chord-iterator.cc
+++ b/lily/event-chord-iterator.cc
@@ -17,7 +17,7 @@ Event_chord_iterator::Event_chord_iterator ()
 }
 
 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 @@ void
 Event_chord_iterator::construct_children ()
 {
   Simple_music_iterator::construct_children ();
-  get_req_translator ();
+  get_bottom_context ();
 }
 
 Event_chord *

diff --git a/lily/font-config.cc b/lily/font-config.cc
index 8a2303d52d1f12171023fc5568b53655c81b1b39..8954c809f40f6bc454a715eec638dd7c20ab4659 100644 (file)
--- a/lily/font-config.cc
+++ b/lily/font-config.cc
@@ -27,11 +27,17 @@ init_fontconfig ()
 
   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; 

diff --git a/lily/include/event-chord-iterator.hh b/lily/include/event-chord-iterator.hh
index e0f2635923c841e9336d7e4abd410214f8e81a09..946e4bebb4bc09c585c7240ce773b05c5ee68366 100644 (file)
--- a/lily/include/event-chord-iterator.hh
+++ b/lily/include/event-chord-iterator.hh
@@ -20,7 +20,7 @@ class Event_chord_iterator : public Simple_music_iterator
   /**
      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

diff --git a/lily/tie.cc b/lily/tie.cc
index 97866e4c1d2b2514c6769c1555168720e2468988..1899046dc051710c5d8111e7ed98ebd36605d336 100644 (file)
--- a/lily/tie.cc
+++ b/lily/tie.cc
@@ -346,13 +346,28 @@ Tie::print (SCM smob)
       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");

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 6c535a8c76a42420f43f06d93a402aae5a028a6e..f8a92c1939437fc91e9e780678aebeb54cd322d9 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -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))