CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/07/08 18:08:24
Modified files:
. : ChangeLog THANKS
Documentation/topdocs: NEWS.tely
Documentation/user: advanced-notation.itely
input/regression: trill-spanner-pitched.ly
lily : pitched-trill-engraver.cc
lily/include : dots.hh
python : convertrules.py
scm : define-grob-interfaces.scm define-grobs.scm
Log message:
* 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.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3854&tr2=1.3855&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/THANKS.diff?tr1=1.130&tr2=1.131&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/Documentation/topdocs/NEWS.tely.diff?tr1=1.41&tr2=1.42&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/Documentation/user/advanced-notation.itely.diff?tr1=1.38&tr2=1.39&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/input/regression/trill-spanner-pitched.ly.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/pitched-trill-engraver.cc.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/include/dots.hh.diff?tr1=1.37&tr2=1.38&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/python/convertrules.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/define-grob-interfaces.scm.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/define-grobs.scm.diff?tr1=1.207&tr2=1.208&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3854 lilypond/ChangeLog:1.3855
--- lilypond/ChangeLog:1.3854 Fri Jul 8 17:53:39 2005
+++ lilypond/ChangeLog Fri Jul 8 18:08:23 2005
@@ -1,5 +1,9 @@
2005-07-08 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+ * 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.
Index: lilypond/Documentation/topdocs/NEWS.tely
diff -u lilypond/Documentation/topdocs/NEWS.tely:1.41
lilypond/Documentation/topdocs/NEWS.tely:1.42
--- lilypond/Documentation/topdocs/NEWS.tely:1.41 Wed Jun 29 10:55:45 2005
+++ lilypond/Documentation/topdocs/NEWS.tely Fri Jul 8 18:08:24 2005
@@ -32,6 +32,14 @@
@itemize @bullet
[EMAIL PROTECTED]
+Explicit pitches may be added to trills,
+
[EMAIL PROTECTED],verbatim,fragment]
+ \pitchedTrill c4\startTrillSpan fis f\stopTrillSpan
[EMAIL PROTECTED] lilypond
+
+This feature was sponsored by D. Josiah Boothby and Jamie Bullock
@item
Markup now supports formatting of text paragraphs, using
Index: lilypond/Documentation/user/advanced-notation.itely
diff -u lilypond/Documentation/user/advanced-notation.itely:1.38
lilypond/Documentation/user/advanced-notation.itely:1.39
--- lilypond/Documentation/user/advanced-notation.itely:1.38 Fri Jul 8
17:53:40 2005
+++ lilypond/Documentation/user/advanced-notation.itely Fri Jul 8 18:08:24 2005
@@ -1422,6 +1422,7 @@
* Clusters::
* Special fermatas::
* Special noteheads::
+* Pitched trills::
* Feathered beams::
* Improvisation::
@end menu
Index: lilypond/THANKS
diff -u lilypond/THANKS:1.130 lilypond/THANKS:1.131
--- lilypond/THANKS:1.130 Thu Jul 7 05:16:53 2005
+++ lilypond/THANKS Fri Jul 8 18:08:23 2005
@@ -16,6 +16,8 @@
SPONSORS
+Jamie Bullock
+D. Josiah Boothby
Sven Axelsson
Index: lilypond/input/regression/trill-spanner-pitched.ly
diff -u lilypond/input/regression/trill-spanner-pitched.ly:1.1
lilypond/input/regression/trill-spanner-pitched.ly:1.2
--- lilypond/input/regression/trill-spanner-pitched.ly:1.1 Fri Jul 8
17:53:40 2005
+++ lilypond/input/regression/trill-spanner-pitched.ly Fri Jul 8 18:08:24 2005
@@ -13,5 +13,5 @@
}
\relative {
- \pitchedTrill c4\startTrillSpan fis f\stopTrillSpan
+ \pitchedTrill c4.\startTrillSpan fis f\stopTrillSpan
}
Index: lilypond/lily/include/dots.hh
diff -u lilypond/lily/include/dots.hh:1.37 lilypond/lily/include/dots.hh:1.38
--- lilypond/lily/include/dots.hh:1.37 Thu Mar 10 14:36:12 2005
+++ lilypond/lily/include/dots.hh Fri Jul 8 18:08:24 2005
@@ -16,7 +16,7 @@
{
public:
DECLARE_SCHEME_CALLBACK (print, (SCM));
- bool has_interface (Grob *);
+ static bool has_interface (Grob *);
};
#endif // DOTS_HH
Index: lilypond/lily/pitched-trill-engraver.cc
diff -u lilypond/lily/pitched-trill-engraver.cc:1.1
lilypond/lily/pitched-trill-engraver.cc:1.2
--- lilypond/lily/pitched-trill-engraver.cc:1.1 Fri Jul 8 17:53:40 2005
+++ lilypond/lily/pitched-trill-engraver.cc Fri Jul 8 18:08:24 2005
@@ -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 @@
{
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 @@
/* 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 */ "");
Index: lilypond/python/convertrules.py
diff -u lilypond/python/convertrules.py:1.3 lilypond/python/convertrules.py:1.4
--- lilypond/python/convertrules.py:1.3 Sun Jun 26 22:46:56 2005
+++ lilypond/python/convertrules.py Fri Jul 8 18:08:24 2005
@@ -2503,6 +2503,14 @@
'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):
Index: lilypond/scm/define-grob-interfaces.scm
diff -u lilypond/scm/define-grob-interfaces.scm:1.20
lilypond/scm/define-grob-interfaces.scm:1.21
--- lilypond/scm/define-grob-interfaces.scm:1.20 Mon Mar 28 16:27:00 2005
+++ lilypond/scm/define-grob-interfaces.scm Fri Jul 8 18:08:24 2005
@@ -11,6 +11,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"
'()
Index: lilypond/scm/define-grobs.scm
diff -u lilypond/scm/define-grobs.scm:1.207 lilypond/scm/define-grobs.scm:1.208
--- lilypond/scm/define-grobs.scm:1.207 Fri Jul 8 17:53:41 2005
+++ lilypond/scm/define-grobs.scm Fri Jul 8 18:08:24 2005
@@ -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))))
))
_______________________________________________
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
