*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index a396d438b24573c11a4cc9e02845fd83a0f59060..8f955af3d0f8808083510e04e568777b921a37cb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,17 @@
 
 2004-11-28  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * lily/moment.cc (LY_DEFINE):
+       ly:moment-main-{denominator,numberator}, new function.
+
+       * lily/score-engraver.cc (typeset_all): assign to column on basis
+       of axis-group-parent-X setting.
+
+       * lily/axis-group-engraver.cc (process_acknowledged_grobs): do
+       add_element() on basis of axis-group-parent-Y setting.
+
+       * lily/grob.cc: add axis-group-parent-{XY} properties.
+
        * input/regression/spacing-stick-out.ly: new file.
 
        * lily/simple-spacer.cc (add_columns): use binary search for
@@ -41,6 +52,8 @@
        
 2004-11-26  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * VERSION: release 2.5.2
+
        * Documentation/user/changing-defaults.itely (Creating titles):
        add breakbefore variable.
 

diff --git a/Documentation/topdocs/NEWS.texi b/Documentation/topdocs/NEWS.texi
index 49616d8988aa631f1d6f05d1ac5b48898f27d152..85e561a6d67eebd68e6127ebb3edc736a972a47b 100644 (file)
--- a/Documentation/topdocs/NEWS.texi
+++ b/Documentation/topdocs/NEWS.texi
@@ -7,6 +7,23 @@
 @unnumbered New features in 2.5 since 2.4
 
 @itemize @bullet
+@item
+Grace notes following a main note, used to be entered by letting the
+grace notes follow a skip in a parallel expression, for example,
+
+@verbatim
+  << { d1 }
+     { s2 \grace { c16[ d] } } >>
+  c4
+@end verbatim
+
+@noindent
+This can verbose input can now be shortened, by doing
+
+@example
+\afterGrace { d1 } { c16[ d] } 
+@end example 
+
 @item
 Pagebreaks can now be forced or forbidden after title blocks. This is
 achieved by setting @code{breakbefore} in the @code{\header} block to

diff --git a/Documentation/user/notation.itely b/Documentation/user/notation.itely
index aed049fc106b8c5e98b4b42e8e1c857347d696ac..236dcdbf55ad740ffe1078db4583c44f7d768c7d 100644 (file)
--- a/Documentation/user/notation.itely
+++ b/Documentation/user/notation.itely
@@ -2508,8 +2508,28 @@ every eighth grace note
 
 
 
-If you want to end a note with a grace, the standard trick is to put
-the grace notes after a ``space note''
+If you want to end a note with a grace, use the @code{\afterGrace}
+command. It takes two arguments: the main note, and the grace notes
+following the main note. 
+
+@lilypond[raggedright, verbatim,relative=2]
+c1 \afterGrace d1 { c16[ d] } c4   
+@end lilypond
+
+This will put the grace notes after a ``space'' lasting 3/4 of the
+length of the main note. The fraction 3/4 can be changed by setting
+@code{afterGraceFraction}, ie.
+
+@example
+afterGraceFraction = #(cons 7 8) 
+@end example
+
+@noindent
+will put the grace note at 7/8 of the main note. 
+
+
+The same effect can be achieved manually by doing
+
 
 @lilypond[quote,raggedright,fragment,verbatim,relative=2]
 \context Voice {
@@ -2524,6 +2544,8 @@ By adjusting the duration of the skip note (here it is a half-note),
 the space between the main-note and the grace is adjusted.
 
 
+
+
 A @code{\grace} section will introduce special typesetting settings,
 for example, to produce smaller type, and set directions.  Hence, when
 introducing layout tweaks, they should be inside the grace section,