* input/test/slur-manual.ly: new file.

* scripts/convert-ly.py (FatalConversionError.sub_chords): convert
<<  >> chords too.

diff --git a/ChangeLog b/ChangeLog
index 8d994ffd7ba9e317e5b48a6024236e438c4a991b..4cea72fb130ff03cd3288ed8d5f2d98afef25021 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2003-09-19  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+       * input/test/slur-manual.ly: new file.
+
+       * scripts/convert-ly.py (FatalConversionError.sub_chords): convert
+       <<  >> chords too.
+
        * VERSION (PACKAGE_NAME): release 1.9.8
 
        * scripts/lilypond.py (escape_path): escape spaces in directory names

diff --git a/THANKS b/THANKS
index 5bf9579ae5c418e61b844f8408026b62abb3a3c0..3bc491f72e6bdb78bac97c612c72b7d00c725140 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -1,5 +1,6 @@
 
 Release 2.0
+***********
 
 HEAD HACKERS
 
@@ -11,14 +12,35 @@ CONTRIBUTORS
 Heikki Junes
 Juergen Reuter
 
-BUG HUNTERS
+BUG HUNTERS/SUGGESTIONS
 
+Antonio Palama
+Benjamin Milde
+Daniel Berjon Diez
+David Bobroff
 David Rayleigh Arnold
+Erik Ronstroem
 Fabio dos Santos
-Antonio Palama
+Fodor Bertalan 
+Frederic Bron
+Graham Parcival
+Ian Bailey-Mortimer
+John Williams
+Josza Marton
+Marco Caliari
+Michael Welsh Duggan
+Patrick Atamaniuk
+Paul Scott
+Pedro Kroeger
+Peter Lutek
+Richard Schoeller
+Thorkil Wolvendans
+Matthieu Amiguet
+
 
 
 Release 1.8
+***********
 
 HEAD HACKERS
 

diff --git a/input/test/slur-manual.ly b/input/test/slur-manual.ly
new file mode 100644 (file)
index 0000000..aff25e3
--- /dev/null
+++ b/input/test/slur-manual.ly
@@ -0,0 +1,30 @@
+\version "1.9.8"
+\header {
+
+
+    texidoc = "In extreme cases, you can resort to setting slur
+    control-points manually. This involves a lot of trial and error,
+    though. Be sure to force line breaks at both sides, since
+    different horizontal spacing will require rearrangement of the
+    slur."
+ 
+    }
+
+
+\score {\notes \new PianoStaff  <<
+    \context Staff = up { \clef bass s1 * 6 } 
+    \context Staff = down \relative c {
+       \clef bass
+       r4 r8
+       \once\property Voice.Slur \set #'extra-offset = #'(0 . -8)
+       \once\property Voice.Slur
+       \set #'control-points =
+       #'((0 . -4) (2 . 0) (60 . 0) (63 . 4))
+                          c8( as' f c' as f c as' f
+                          \translator Staff = up
+                          \clef treble
+                          c' as f' c as' f c' as
+                          f' c as' f c'4)
+                          }>>
+\paper { raggedright = ##t }
+    }

diff --git a/lily/slur.cc b/lily/slur.cc
index 8e34c59c17b28ae696cee2abd680893c72351e3d..0d3ce25aa52b48c44894391ef5afa878d688d036 100644 (file)
--- a/lily/slur.cc
+++ b/lily/slur.cc
@@ -120,7 +120,8 @@ Slur::after_line_breaking (SCM smob)
       return SCM_UNSPECIFIED;
     }
   set_extremities (me);
-  set_control_points (me);
+  if (!gh_pair_p (me->get_grob_property ("control-points")))
+    set_control_points (me);
   return SCM_UNSPECIFIED;
 } 
 

diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py
index 1fa987853d6338dd3c60d058e5c0e7f461f06977..832fc5f1a31e33d6bd40720e468bbda471235819 100644 (file)
--- a/scripts/convert-ly.py
+++ b/scripts/convert-ly.py
@@ -1366,6 +1366,9 @@ if 1:
 
                if re.search (marker_str,str):
                        return str
+               str = re.sub ('<<', '@STARTCHORD@', str)
+               str = re.sub ('>>', '@ENDCHORD@', str)
+               
                str= re.sub (r'\\<', '@STARTCRESC@', str)
                str= re.sub (r'\\>', '@STARTDECRESC@', str)
                str= re.sub (r'([_^-])>', r'\1@ACCENT@', str)