lilypond-1.3.133

diff --git a/Documentation/topdocs/FAQ.texi b/Documentation/topdocs/FAQ.texi
index 080ee097ede9302f8f573133cee2e246bc9878bc..1f7d909a996f63d300a187d4b702f12b6dd13662 100644 (file)
--- a/Documentation/topdocs/FAQ.texi
+++ b/Documentation/topdocs/FAQ.texi
@@ -62,15 +62,19 @@ yourself:
 
 Yes.  It is included with the source archive as
 @file{lilypond-mode.el} and @file{lilypond-font-lock.el}.  If you have
-an RPM or .deb it is in @file{/usr/share/doc/lilypond-X/}.  You have
-to install it yourself.
+an RPM, it is in @file{/usr/share/doc/lilypond-X/}.  You have to install
+it yourself.
 
-Add this to your .emacs.el:
+Add this to your ~/.emacs or ~/.emacs.el:
 @example 
     (load-library "lilypond-mode.el")
     (setq auto-mode-alist
-     (append '(("\\.ly$" . LilyPond-mode) auto-mode-alist)))
-@end example 
+      (cons '("\\.ly$" . LilyPond-mode) auto-mode-alist))
+    (add-hook 'LilyPond-mode-hook (lambda () (turn-on-font-lock)))
+@end example
+
+If you have the latest LilyPond-1.3.x Debian package, LilyPond-mode
+is automatically loaded, so you need not modify your ~/.emacs file.
 
 
 @subsection I downloaded the windows32 port, and it doesn't match the website!

diff --git a/debian/changelog b/debian/changelog
index 215774e68d3c143773cbbdf4c1d66f266850323b..ff69e33e536e92746c009c5b503309decfb98860 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+lilypond1.3 (1.3.132-1) unstable; urgency=medium
+
+  * New upstream version.
+  * Oops, in 1.3.129-1, the "(setq auto-mode-alist (append ..." line in
+    /etc/emacs/site-start.d/50lilypond1.3.el (debian/emacsen-startup)
+    and in FAQ.txt was buggy.  Thanks to Erik Demaine for the bug report.
+    Closes: Bug#86685.
+
+ -- Anthony Fok <foka@debian.org>  Sun, 25 Feb 2001 20:27:09 -0700
+
 lilypond1.3 (1.3.129-1) unstable; urgency=low
 
   * In memory of Werner Icking + (August 26, 1943 - February 8, 2001),

diff --git a/debian/emacsen-startup b/debian/emacsen-startup
index 0ce6460c08cd3c0760110578ff1a446b68d3fe7e..379d5666637ffc4e7953c0d4f800a3466e9dae33 100644 (file)
--- a/debian/emacsen-startup
+++ b/debian/emacsen-startup
@@ -1,3 +1,3 @@
 (autoload 'LilyPond-mode "lilypond-mode" nil t)
-(setq auto-mode-alist (append '(("\\.ly$" . LilyPond-mode) auto-mode-alist)))
+(setq auto-mode-alist (cons '("\\.ly$" . LilyPond-mode) auto-mode-alist))
 (add-hook 'LilyPond-mode-hook (lambda () (turn-on-font-lock)))

diff --git a/lily/break-align-item.cc b/lily/break-align-item.cc
index 4318f0b78d534e5e058987f08e5cf276494c7043..74dab15ca4e0de6977ba657690a6084de823ce66 100644 (file)
--- a/lily/break-align-item.cc
+++ b/lily/break-align-item.cc
@@ -170,6 +170,11 @@ Break_align_interface::do_alignment (Grob *me)
   scm_set_car_x (first_pair, gh_double2scm (-dists[0]));
   elems[0]->set_grob_property ("minimum-space", first_pair);
 
+  Direction bsd = item->break_status_dir();
+  if (bsd == LEFT)
+    {
+      me->set_grob_property ("self-alignment-X", gh_int2scm (RIGHT));
+    }
 
   /*
     Force callbacks for alignment to be called   

diff --git a/lily/parser.yy b/lily/parser.yy
index cad76eb68d3e730c94f46ae87e5eece4c380edc2..32dc7fc492ecd0715393856670d21c9730714b72 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -659,7 +659,7 @@ Alternative_music:
 
 
 Repeated_music:
-       REPEAT STRING bare_unsigned Music Alternative_music
+       REPEAT string bare_unsigned Music Alternative_music
        {
                Music_sequence* alts = dynamic_cast <Music_sequence*> ($5);
                if (alts && $3 < alts->length_i ())