* lily/include/dots.hh (class Dots): make has_interface() static.

* python/convertrules.py (conv): add rule for ly:grob-default-font

* scm/define-grobs.scm (all-grob-descriptions): reorganize in
alphabetical order.

* input/regression/trill-spanner-pitched.ly: new file.

* scm/define-grobs.scm (Module): new grob TrillPitchHead.

* lily/pitched-trill-engraver.cc (acknowledge_grob): new file.

diff --git a/ChangeLog b/ChangeLog
index a3180e29d6db3334337d1db7db8302f0db190a29..42e6cee7cc4e72c5c3cfb471cd8cb3567107ef17 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2005-07-08  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * lily/include/dots.hh (class Dots): make has_interface() static.
+
+       * python/convertrules.py (conv): add rule for ly:grob-default-font
+
        * scm/define-grobs.scm (all-grob-descriptions): reorganize in
        alphabetical order.
 

diff --git a/Documentation/topdocs/NEWS.tely b/Documentation/topdocs/NEWS.tely
index a8310b92fb399e7112269ce0ca69eb0ce198283b..5f862f7db8403e583761fa27cbbbf7562fe15e55 100644 (file)
--- a/Documentation/topdocs/NEWS.tely
+++ b/Documentation/topdocs/NEWS.tely
@@ -32,6 +32,14 @@ See user manual, \NAME\
 
 
 @itemize @bullet
+@item
+Explicit pitches may be added to trills,
+
+@lilypond[relative,verbatim,fragment]
+  \pitchedTrill c4\startTrillSpan fis f\stopTrillSpan
+@end lilypond 
+
+This feature was sponsored by D. Josiah Boothby and Jamie Bullock
 
 @item
 Markup now supports formatting of text paragraphs, using

diff --git a/Documentation/user/advanced-notation.itely b/Documentation/user/advanced-notation.itely
index 6d3255042e8b1e591540093b5e7e809f4d3f0b11..fd535ee39f6c02cb83d23db8140518b53321637c 100644 (file)
--- a/Documentation/user/advanced-notation.itely
+++ b/Documentation/user/advanced-notation.itely
@@ -1422,6 +1422,7 @@ LilyPond is limited.
 * Clusters::                    
 * Special fermatas::            
 * Special noteheads::           
+* Pitched trills::              
 * Feathered beams::             
 * Improvisation::               
 @end menu

diff --git a/THANKS b/THANKS
index 1b90cea7956dbca76a806081b5c4e81a02c02c48..37488a8a4ad855120cae8943bccadbdfa369084d 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -16,6 +16,8 @@ Joe Neeman
 
 SPONSORS
 
+Jamie Bullock
+D. Josiah Boothby
 Sven Axelsson
 
 

diff --git a/input/regression/trill-spanner-pitched.ly b/input/regression/trill-spanner-pitched.ly
index fe75b1dc88333ffc337b06c0888ada0a19aa541d..38d2393f285afc5bf80238eae30d28953d25f123 100644 (file)
--- a/input/regression/trill-spanner-pitched.ly
+++ b/input/regression/trill-spanner-pitched.ly
@@ -13,5 +13,5 @@
 }
 
 \relative {
-  \pitchedTrill c4\startTrillSpan fis f\stopTrillSpan
+  \pitchedTrill c4.\startTrillSpan fis f\stopTrillSpan
 }

diff --git a/lily/include/dots.hh b/lily/include/dots.hh
index a6b10298712fe45ff1ab109b726a28280bd0da38..b73c55c07b26daf3537e4038238c9d85b93f4075 100644 (file)
--- a/lily/include/dots.hh
+++ b/lily/include/dots.hh
@@ -16,7 +16,7 @@ class Dots
 {
 public:
   DECLARE_SCHEME_CALLBACK (print, (SCM));
-  bool has_interface (Grob *);
+  static bool has_interface (Grob *);
 };
 
 #endif // DOTS_HH

diff --git a/lily/pitched-trill-engraver.cc b/lily/pitched-trill-engraver.cc
index 67c5d83b05d52eeb57cac70c240cd14db9583892..4651a4cc0dfb683ffaad7b47428695d931cb5de1 100644 (file)
--- a/lily/pitched-trill-engraver.cc
+++ b/lily/pitched-trill-engraver.cc
@@ -9,6 +9,7 @@
 
 #include "engraver.hh"
 
+#include "dots.hh"
 #include "group-interface.hh"
 #include "axis-group-interface.hh"
 #include "context.hh"
@@ -52,7 +53,8 @@ Pitched_trill_engraver::acknowledge_grob (Grob_info info)
 {
   Music *mus = info.music_cause ();
 
-  if (Note_head::has_interface (info.grob ()))
+  if (Note_head::has_interface (info.grob ())
+      || Dots::has_interface (info.grob ()))
     {
       heads_.push (info.grob ());
     }
@@ -144,6 +146,6 @@ ADD_TRANSLATOR (Pitched_trill_engraver,
                /* descr */ "Print the bracketed notehead after a notehead with trill.",
                /* creats*/ "TrillPitchHead TrillPitchAccidental TrillPitchGroup",
                /* accepts */ "",
-               /* acks  */ "script-interface text-spanner-interface note-head-interface",
+               /* acks  */ "script-interface text-spanner-interface dots-interface note-head-interface",
                /* reads */ "",
                /* write */ "");

diff --git a/python/convertrules.py b/python/convertrules.py
index da970be7fd3cd1590f8ae46e3419018e36447c2a..84f5fd3ea6e906ebe34b4fcb1f6411dc51f1877d 100644 (file)
--- a/python/convertrules.py
+++ b/python/convertrules.py
@@ -2503,6 +2503,14 @@ conversions.append (((2, 6, 0), conv,
 
                     'dummy rule for 2.6')) 
 
+
+def conv (str):
+       return re.sub('ly:get-default-font', 'ly:grob-default-font', str) 
+
+conversions.append (((2, 7, 0), conv,
+                    
+                    'ly:get-default-font -> ly:grob-default-font')) 
+
 ################################################################
 
 def str_to_tuple (s):

diff --git a/scm/define-grob-interfaces.scm b/scm/define-grob-interfaces.scm
index 21dddeb6bc1161f219f5a8eb95e6e638ac7653ae..ffad4afbc1fa115be045bddddd6a8a5b909e21f2 100644 (file)
--- a/scm/define-grob-interfaces.scm
+++ b/scm/define-grob-interfaces.scm
@@ -10,6 +10,12 @@
 
 
 
+(ly:add-interface
+ 'pitched-trill-interface
+   "A note head to indicate trill pitches"
+   '(accidental-grob)
+    )
+
 (ly:add-interface
  'dynamic-interface
    "Any kind of loudness sign"

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 3984c024c2a5b0e012761e37ae342b7193fa4330..23ced398cd5f21fcbf3e9bbc1bdb56b1994b753e 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -1332,7 +1332,7 @@
        (direction . ,LEFT)
        (font-size . -4)
        (print-function . ,Accidental_interface::print)
-       (meta . ((interfaces . (item-interface  font-interface))))
+       (meta . ((interfaces . (item-interface side-position-interface font-interface))))
        ))
 
     (TrillPitchGroup
@@ -1342,7 +1342,9 @@
        (print-function . ,parenthesize-elements)
        (direction . ,RIGHT)
        (padding . 0.3)
-       (meta . ((interfaces . (font-interface item-interface axis-group-interface))))
+       (meta . ((interfaces . (side-position-interface
+                               font-interface accidental-interface
+                               item-interface axis-group-interface))))
        ))
 
     (TrillPitchHead
@@ -1350,7 +1352,9 @@
        (duration-log . 2)
        (Y-offset-callbacks . (,Staff_symbol_referencer::callback))
        (font-size . -4)
-       (meta . ((interfaces . (item-interface font-interface ledgered-interface staff-symbol-referencer-interface))))
+       (meta . ((interfaces . (item-interface
+                               font-interface pitched-trill-interface
+                               ledgered-interface staff-symbol-referencer-interface))))
        ))