* lily/rest.cc (after_line_breaking): backport dot position fix.

* lily/rest-collision.cc (do_shift): also remove dots for suicided
rests. Thanks to Klaus Zimmermann for finding this bug.

diff --git a/ChangeLog b/ChangeLog
index 40e3bc44dc2a253a2d151b5b29e24e5cddb202db..f9233d9aca766b757e9cf7a9089bb08f51e240c5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-10-27  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
+
+       * lily/rest.cc (after_line_breaking): backport dot position fix.
+
+       * lily/rest-collision.cc (do_shift): also remove dots for suicided
+       rests. Thanks to Klaus Zimmermann for finding this bug.
+
 2002-10-24  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * Documentation/topdocs/INSTALL.texi: Correction for broken /bin/sh.

diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely
index 152c5f190cdff523b0c17d12dc703fea8c3ae65a..a893d2145a57ad7c01e210ece183cf3808524ecf 100644 (file)
--- a/Documentation/user/refman.itely
+++ b/Documentation/user/refman.itely
@@ -752,23 +752,27 @@ emacsclient --no-wait +%l %f
 If you use xemacs instead of emacs, you use @code{(gnuserve-start)} in
 your @file{.emacs}, and set @code{XEDITOR} to @code{gnuclient -q +%l %f}
 
-For using Vim, set @code{XEDITOR} to @code{gvim --remote +%l %f}, or use this
-argument with xdvi's @code{-editor} option.
+For using Vim, set @code{XEDITOR} to @code{gvim --remote +%l %f}, or
+use this argument with xdvi's @code{-editor} option.
+
 @cindex NEdit
 For using NEdit, set @code{XEDITOR} to @code{nc -noask +%l %f}, or
 use this argument with xdvi's @code{-editor} option.
 
 If can also make your editor jump to the exact location of the note
-you clicked. This is only supported on Emacs. Users of version 20 must
-apply the patch @file{emacsclient.patch}. Users of version 21 must
-apply @file{server.el.patch} (version 21.2 and earlier).  At the top
-of the @code{ly} file, replace the @code{set!} line with the following
-line,
+you clicked. This is only supported on Emacs and VIM. Users of Emacs version
+20 must apply the patch @file{emacsclient.patch}. Users of version 21
+must apply @file{server.el.patch} (version 21.2 and earlier).  At the
+top of the @code{ly} file, replace the @code{set-point-and-click} line
+with the following line,
 @example
 #(set-point-and-click! 'line-column)
 @end example
 @cindex line-colomn-location
-and set @code{XEDITOR} to @code{emacsclient --no-wait +%l:%c %f}.
+and set @code{XEDITOR} to @code{emacsclient --no-wait +%l:%c %f}.  Vim
+users can set @var{XEDITOR} to @code{gvim --remote +:%l:norm%c| %f}.
+
+
 
 @refbugs
 

diff --git a/THANKS b/THANKS
index d9cb3c915c55a54d9902258b73117af5ec3fda18..be44b8f7e2f0aad11b98853c329c67fda965857f 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -15,4 +15,4 @@ Jeremie Lumbroso
 Karl-Johan Karlsson 
 Karl Berry
 Werner Lemberg
-
+Klaus Zimmermann

diff --git a/aclocal.m4 b/aclocal.m4
index d96f454e524f774da5ad27ffe03f64c14f14b265..d9e1e9e964d3506d8a42214414986e9a3b2df388 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,6 +1,6 @@
 dnl aclocal.m4   -*-shell-script-*-
 dnl WARNING WARNING WARNING
-dnl do not edit! this is aclocal.m4, generated from /home/fred/lily-1.6/stepmake/aclocal.m4
+dnl do not edit! this is aclocal.m4, generated from /home/hanwen/usr/src/lilypond/stepmake/aclocal.m4
 dnl aclocal.m4   -*-shell-script-*-
 dnl StepMake subroutines for configure.in
 

diff --git a/lily/parser.yy b/lily/parser.yy
index 99ff6633534efbb7039a2bc11f6ff13e91075011..6c4d70ee548b43281e38eeb022b795c7c71c5b83 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -1,4 +1,4 @@
-%{ // -*-Fundamental-*-
+ %{ // -*-Fundamental-*-
 
 /*
   parser.yy -- Bison/C++ parser for lilypond

diff --git a/lily/rest-collision.cc b/lily/rest-collision.cc
index 0292881cb4e64b09aa4bdde35c761867bf33984f..ad332ef82025531475472a240b475e65218b68d1 100644 (file)
--- a/lily/rest-collision.cc
+++ b/lily/rest-collision.cc
@@ -145,7 +145,12 @@ Rest_collision::do_shift (Grob *me, SCM elts)
            {
              Grob* r = unsmob_grob (rests[i-1]->get_grob_property ("rest"));
              if (r)
-               r->suicide ();
+               {
+                 Grob * d = unsmob_grob (r->get_grob_property ("dot"));
+                 if (d)
+                   d->suicide();
+                 r->suicide ();
+               }
              rests[i-1]->suicide ();
            }
        }

diff --git a/lily/rest.cc b/lily/rest.cc
index 4f135a31caedf8b216dad16dabf3f3b440c3410d..b54f78d766d3ab38d23c8aaa8e49904bab36fcab 100644 (file)
--- a/lily/rest.cc
+++ b/lily/rest.cc
@@ -42,6 +42,11 @@ Rest::after_line_breaking (SCM smob)
                            gh_int2scm ((bt == 7) ? 4 : 3));
     }
 
+  if (d && bt >= -1 && bt <= 1) // UGH again.
+    {
+      d->set_grob_property ("staff-position",
+                           gh_int2scm ((bt == 0) ? -1 : 1));
+    }
   return SCM_UNSPECIFIED;
 }