* scm/grob-description.scm (minimum-beam-collision-distance): 0.75

staff-space.  Previous 1.5 was probably meant as half-spaces.
(cautionary-style): parentheses (was: smaller).  This is what doco
says, and it seems more logical.

* Documentation/user/refman.itely (Chromatic alterations): Bugfix
for 2nd sentence.

diff --git a/ChangeLog b/ChangeLog
index 1970cf83e40d5a1e17849427bfaf7e223e4955db..7af01537479cae4cd3515fe1427d8f7541b04645 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2002-10-04  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * scm/grob-description.scm (minimum-beam-collision-distance): 0.75
+       staff-space.  Previous 1.5 was probably meant as half-spaces.
+       (cautionary-style): parentheses (was: smaller).  This is what doco
+       says, and it seems more logical.
+
+       * Documentation/user/refman.itely (Chromatic alterations): Bugfix
+       for 2nd sentence.
+
 2002-10-04  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
        * make/lilypond.redhat.spec.in: various fixes for RedHat 8.0

diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely
index 1f89b4ac672a75e482a6a7d8949dcd6be1136595..152c5f190cdff523b0c17d12dc703fea8c3ae65a 100644 (file)
--- a/Documentation/user/refman.itely
+++ b/Documentation/user/refman.itely
@@ -163,7 +163,8 @@ octave; each @code{,} lowers the pitch by an octave.
 Normally accidentals are printed automatically, but you may also
 print them manually.  A reminder accidental
 @cindex reminder accidental
-@cindex @code{?} can be forced by adding an exclamation mark @code{!}
+@cindex @code{?}
+can be forced by adding an exclamation mark @code{!}
 after the pitch.  A cautionary accidental
 @cindex cautionary accidental
 @cindex parenthesized accidental

diff --git a/scm/grob-description.scm b/scm/grob-description.scm
index d3f8f6149f79f5fb8a7d61591336ee20877c9fd4..5545ffc8e5280ad8bf6bf3c159c0c5ce10da0a88 100644 (file)
--- a/scm/grob-description.scm
+++ b/scm/grob-description.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 1998--20.301  Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 1998--2002  Han-Wen Nienhuys <hanwen@cs.uu.nl>
 ;;;;                 Jan Nieuwenhuizen <janneke@gnu.org>
 
 ;;;; distances are given in stafflinethickness (thicknesses) and
@@ -18,7 +18,7 @@
      . (
        (molecule-callback . ,Accidental_interface::brew_molecule)
        (font-family . music)
-       (cautionary-style . smaller)
+       (cautionary-style . parentheses)
        (after-line-breaking-callback . ,Accidental_interface::after_line_breaking)             (meta . ((interfaces . (item-interface accidental-interface font-interface))))
        ))
     (AccidentalPlacement
@@ -692,7 +692,7 @@
        (Y-extent-callback . ,Rest::extent_callback)            
        (molecule-callback . ,Rest::brew_molecule)
        (Y-offset-callbacks . (,Staff_symbol_referencer::callback)) 
-       (minimum-beam-collision-distance . 1.5)
+       (minimum-beam-collision-distance . 0.75)
        (meta . (
                 (interfaces . (font-interface
                                rhythmic-head-interface