lilypond-1.3.150

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 9099be977dae5c0f606f8f7441d056a9614a37b5..81c9024e1c21adbbf53acbb1bd4639bb5e6c2d1c 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -18,7 +18,7 @@ SUBDIRS = buildscripts scripts flower lily \
 
 SCRIPTS = configure aclocal.m4
 README_FILES =  DEDICATION COPYING NEWS CHANGES ROADMAP
-README_TXT_FILES = AUTHORS.txt README.txt INSTALL.txt WINDOWS.txt FAQ.txt
+README_TXT_FILES = AUTHORS.txt README.txt INSTALL.txt FAQ.txt
 IN_FILES := $(wildcard *.in)
 EXTRA_DIST_FILES = lilypond-font-lock.el lilypond-mode.el vimrc VERSION $(README_FILES)  $(SCRIPTS) $(IN_FILES)  emacsclient.patch
 NON_ESSENTIAL_DIST_FILES = $(README_TXT_FILES)

diff --git a/ROADMAP b/ROADMAP
index 85a50d9ec8bfe4d4009be12f884bfe608ee3ee10..3befc634734dd94067dccc55af25cccc70312cc6 100644 (file)
--- a/ROADMAP
+++ b/ROADMAP
@@ -4,7 +4,7 @@ LilyPond's source files.
 
    Documentation/
      bibliography/             .bib files with references to books and articles
-     ntweb/                    building on NT
+     windows/                  building on windows
      pictures/                 .xpms of the logo
      programmer/               programmers documentation, including a test document
      topdocs/                  sources for the toplevel files (README.txt, INSTALL.txt, etc.)

diff --git a/lily/volta-spanner.cc b/lily/volta-spanner.cc
index 356d696d52c075a1c9d71377cfe86e21c0bc34d0..3ffe7b78da4301887bf7820a34b86ef5a146a31a 100644 (file)
--- a/lily/volta-spanner.cc
+++ b/lily/volta-spanner.cc
@@ -6,6 +6,7 @@
   (c)  1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
+#include <string.h>
 
 #include "box.hh"
 #include "debug.hh"
@@ -46,16 +47,22 @@ Volta_spanner::brew_molecule (SCM smob)
   if (!bar_arr.size ())
     return SCM_EOL;
 
-  bool no_vertical_start = false;
-  bool no_vertical_end = to_boolean (me->get_grob_property ("last-volta"));
   Spanner *orig_span =  dynamic_cast<Spanner*> (me->original_l_);
 
   bool first_bracket = orig_span && (orig_span->broken_into_l_arr_[0] == (Spanner*)me);
   
   bool last_bracket = orig_span && (orig_span->broken_into_l_arr_.top () == (Spanner*)me);
 
-  no_vertical_start = orig_span && !first_bracket;
-  no_vertical_end = orig_span && !last_bracket;
+  bool no_vertical_start = orig_span && !first_bracket;
+  bool no_vertical_end = orig_span && !last_bracket;
+  SCM bars = me->get_grob_property ("bars");
+  Grob * endbar =   unsmob_grob (gh_car (bars));
+  SCM glyph = endbar->get_grob_property("glyph");
+  String str = ly_scm2string(glyph);
+  const char* cs = str.ch_C();
+  no_vertical_end |=
+    (strcmp(cs,":|")!=0 && strcmp(cs,"|:")!=0 && strcmp(cs,"|.")!=0
+     && strcmp(cs,":|:")!=0 && strcmp(cs,".|")!=0);
 
   Real staff_thick = me->paper_l ()->get_var ("stafflinethickness");  
   Real half_space = 0.5;