From 4e39a726c0dd6db9d2f590cc05daa907115bb916 Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Sun, 28 Nov 2004 17:33:34 +0000
Subject: [PATCH] *** empty log message ***

---
 ChangeLog                         | 13 +++++++++++++
 Documentation/topdocs/NEWS.texi   | 17 +++++++++++++++++
 Documentation/user/notation.itely | 26 ++++++++++++++++++++++++--
 3 files changed, 54 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a396d438b2..8f955af3d0 100644
--- 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 49616d8988..85e561a6d6 100644
--- 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 aed049fc10..236dcdbf55 100644
--- 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,
-- 
2.39.5