From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Sat, 26 Apr 2003 23:59:15 +0000 (+0000)
Subject: * lily/beam-engraver.cc (acknowledge_grob): set melismata for new
X-Git-Tag: release/1.7.18~10
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=15e565fef41ab50d140c3028bc6d9cff1a43a56a;p=lilypond.git

* lily/beam-engraver.cc (acknowledge_grob): set melismata for new
style beams too.

* input/regression/lyrics-melisma-beam.ly: new file.

* lily/lyric-engraver.cc (process_music): change from
process_acknowledged_grobs()

* scm/auto-beam.scm (override-auto-beam-setting): write Scheme
functions to set and revert auto-beam settings.
---

diff --git a/ChangeLog b/ChangeLog
index 81df3f1c83..2ff44a34a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2003-04-27  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
+
+	* input/{regression,test}/: use postfix for slur endings and beam
+	begins.
+
+	* lily/beam-engraver.cc (acknowledge_grob): set melismata for new
+	style beams too. 
+
+	* input/regression/lyrics-melisma-beam.ly: new file.
+
+	* lily/lyric-engraver.cc (process_music): change from
+	process_acknowledged_grobs()
+
+	* scm/auto-beam.scm (override-auto-beam-setting): write Scheme
+	functions to set and revert auto-beam settings.
+
+2003-04-26  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
+
+	* lily/*.cc (number_accidentals): gh_assoc -> scm_assoc.
+
 2003-04-24  Juergen Reuter  <reuter@ipd.uka.de>
 
 	* ChangeLog, Documentation/topdocs/AUTHORS.texi,
@@ -92,6 +112,8 @@
 
 2003-04-21  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+	* VERSION: 1.7.17 released
+	
 	* Documentation/user/GNUmakefile
 	($(outdir)/lilypond-internals/lilypond-internals.html): copy ly
 	files too.
diff --git a/Documentation/bibliography/engraving.bib b/Documentation/bibliography/engraving.bib
index b29a463af2..b4a52eb99a 100644
--- a/Documentation/bibliography/engraving.bib
+++ b/Documentation/bibliography/engraving.bib
@@ -221,7 +221,15 @@ year={1989}
   title={The G. Schirmer Manual of Style and Usage},
   address={New York},
   publisher={The G. Schirmer Publications Department},
-  year={1990}
+  year={2001}
+note={(This book can be ordered from the rental department.) 
+
+This is the style guide for Schirmer publications. This manual
+specifically focuses on preparing print for publication by
+Schirmer. As such it gives an idea of what is necessary to bring
+printouts to publication quality.
+
+}
 }
 
 
diff --git a/Documentation/user/introduction.itely b/Documentation/user/introduction.itely
index 88238d8bf4..e19afc8575 100644
--- a/Documentation/user/introduction.itely
+++ b/Documentation/user/introduction.itely
@@ -244,9 +244,25 @@ produces beautiful typeset music, but nevertheless this program can
 applied to do useful things. In this section, we show a few small
 examples of what is possible.
 
-[TODO: show examples]
+The simplest application, is printing just notes.
 
-The following example combines some more  exotic uses of notation
+@lilypond[relative=1]
+  \time 2/4 c4 c g'4 g a4 a g2  
+@end lilypond
+
+To these notes, chord names and lyrics  may be added
+
+@lilypond[raggedright]
+\score { <
+  \context ChordNames \chords  { c2 c f2 c }
+  \notes \relative c' { \time 2/4 c4 c g'4 g a4 a g2 }
+  \context Lyrics \lyrics  { twin kle twin kle lit tle star } > }
+@end lilypond
+
+
+[TODO: need piano and tab example]
+
+The following example combines some more exotic uses of notation
 
 @lilypondfile{screech-boink.ly}  
 
@@ -278,7 +294,7 @@ document is also available in
 One Big Page,
 @end ifhtml
 @ifnothtml
-@uref{One Big Page,../lilypond.html}
+@uref{../lilypond.html,One Big Page}
 @end ifnothtml 
 which is is available for text search using your browser's search
 facility.
@@ -291,7 +307,7 @@ If you are familiar with music notation, and music terminology
 the glossary as well. This documents explains many terms, and includes
 translations to various languages. It is a 
 @ifhtml
-@uref{separate document,../glossary.html}
+@uref{../glossary.html,separate document}
 @end ifhtml
 @ifnothtml
 separate document, and can be printed as well.
@@ -311,7 +327,7 @@ documentation package for your platform
 @item
 Generated internal documentation.
 @ifhtml
-available @uref{here,../lilypond-internals/lilypond-internals.html}
+available @uref{../lilypond-internals/lilypond-internals.html,here}
 @end ifhtml
 
 Almost all formatting functionality that is used internally, is
@@ -331,7 +347,7 @@ generated documentation.
 @item
   Templates
 @ifhtml
-available @uref{here,../../../input/templates/out-www/collated-files.html}
+available @uref{../../../input/templates/out-www/collated-files.html,here}
 @end ifhtml
 
   When you have gone through the tutorial, you theoretically should be
@@ -344,7 +360,7 @@ generate output.
 @item
   Various input examples
 @ifhtml
-available @uref{here,../../../input/test/out-www/collated-files.html}
+available @uref{../../../input/test/out-www/collated-files.html,here}
 @end ifhtml
 @cindex snippets
 
@@ -356,7 +372,7 @@ included.
 @item
   The regression test
 @ifhtml
-available @uref{here,../../../input/regression/out-www/collated-files.html}
+available @uref{../../../input/regression/out-www/collated-files.html,here}
 @end ifhtml
 
 We strive to test each feature in a collection of input snippets. This
diff --git a/Documentation/user/lilypond.tely b/Documentation/user/lilypond.tely
index 30d7e5e64c..784226d5be 100644
--- a/Documentation/user/lilypond.tely
+++ b/Documentation/user/lilypond.tely
@@ -33,7 +33,7 @@ Distributions will want to install lilypond.info doing:
 @omfcreator Han-Wen Nienhuys and Jan Nieuwenhuizen
 @omfdescription User manual  of the LilyPond music engraving system
 @omftype user manual
-@omfcategory Music
+@omfcategory Applications|Publishing
 @omflanguage English
 @end ignore
 
@@ -122,8 +122,9 @@ this and other documentation.
 @menu
 * Preface::                        Preface.
 * Introduction::                   What, Why, How.
-* Tutorial::                       A tutorial introduction to LilyPond.
-* Reference Manual::               Reference Manual.
+* Tutorial::                       A tutorial introduction.
+* Notation manual::                All notation supported, and how to
+                                   produce it 
 * Advanced Topics::                How it all works.
 * Invoking LilyPond::              Operation.
 * Converting from other formats::  Converting to lilypond source format.
diff --git a/Documentation/user/literature.itely b/Documentation/user/literature.itely
index 1679d134b6..0f7acec6c1 100644
--- a/Documentation/user/literature.itely
+++ b/Documentation/user/literature.itely
@@ -61,6 +61,15 @@ It contains directions on stamping, use of pens and notational
 conventions.  The sections on reproduction technicalities, and history
 are also interesting.
 
+@item Schirmer 2001
+The G.Schirmer/AMP Manual of Style and Usage. G.Schirmer/AMP, NY, 2001.
+(This book can be ordered from the rental department.) 
+
+This is the style guide for Schirmer publications. This manual
+specifically focuses on preparing print for publication by
+Schirmer. As such it gives an idea of what is necessary to bring
+printouts to publication quality.
+
 
 @item Stone 1980
 
diff --git a/Documentation/user/music-glossary.tely b/Documentation/user/music-glossary.tely
index e10c5b0ea9..1771116b77 100644
--- a/Documentation/user/music-glossary.tely
+++ b/Documentation/user/music-glossary.tely
@@ -25,7 +25,7 @@ Copyright @copyright{} 1999--2003 by the authors
 @omfcreator Christian Mondrup
 @omfdescription Glossary of musical terms with translations
 @omftype user's guide
-@omfcategory Music
+@omfcategory Applications|Publishing
 @omflanguage English
 @end ignore
 
diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely
index ba6363f35c..43f6719c63 100644
--- a/Documentation/user/refman.itely
+++ b/Documentation/user/refman.itely
@@ -7,21 +7,14 @@
 @c FIXME: singular vs. plural:  Beams/Beam
 
 
-@node Reference Manual
-@chapter Reference Manual
+@node Notation manual
+@chapter Notation manual
 
 @html
 <!--- @@WEB-TITLE@@=Reference Manual --->
 @end html
 
 
-This document describes GNU LilyPond and its input format. The last
-revision of this document was made for LilyPond 1.7.11.  It assumes
-that you already know a little bit about LilyPond input (how to make
-an input file, how to create sheet music from that input file, etc).
-New users are encouraged to study the tutorial before reading this
-manual.
-
 @menu
 * Note entry::                  
 * Easier music entry::          
@@ -183,6 +176,9 @@ ways. For more information, refer to @ref{Accidentals}.
 @subsection Rests
 @cindex Rests
 
+
+
+
 Rests are entered like notes, with the note name @code{r}.
 
 @lilypond[singleline,verbatim]
@@ -201,6 +197,8 @@ keyword appended. Rest collision testing will leave these rests alone.
 a'4\rest d'4\rest
 @end lilypond
 
+@seealso
+
 @internalsref{RestEvent}, @internalsref{Rest}
 
 
diff --git a/buildscripts/new-chords.py b/buildscripts/new-chords.py
index 12bedf6295..3c53610fb4 100644
--- a/buildscripts/new-chords.py
+++ b/buildscripts/new-chords.py
@@ -160,3 +160,11 @@ for a in files:
 		os.rename (a + '.NEW', a)
 	else:
 		print str
+
+
+##
+## regexes for postfix slur & beam:
+##
+## ([^-])\[ *([a-z]+[,']*[0-9:]+\.*) -> " \1 \2-["
+## ([^-])\( *([a-z]+[,']*[0-9:]+\.*) -> "\1 \2-("
+##
diff --git a/input/les-nereides.ly b/input/les-nereides.ly
index f54f51811f..dc56245fcf 100644
--- a/input/les-nereides.ly
+++ b/input/les-nereides.ly
@@ -329,7 +329,7 @@ lowerDynamics =  \context Dynamics=lower \notes{
 	    TextScript \override #'font-relative-size = #1
 	    TextScript \override #'font-shape = #'italic
 
-	    \consists "Skip_req_swallow_translator"
+	    \consists "Skip_event_swallow_translator"
 
 	    \consistsend "Axis_group_engraver"
     	}
diff --git a/input/regression/auto-beam-tuplets.ly b/input/regression/auto-beam-tuplets.ly
index cf074c330f..bafdc59867 100644
--- a/input/regression/auto-beam-tuplets.ly
+++ b/input/regression/auto-beam-tuplets.ly
@@ -9,7 +9,7 @@ beams even if they're auto generated."
   \property Voice.tupletSpannerDuration = #(ly:make-moment 1 4)
   \property Voice.TupletBracket \override #'bracket-visibility = #'if-no-beam
   \times 2/3 {
-	[f8 f f ][f8 f f ] f f f f f f 
+	 f8-[ f f ] f8-[ f f ] f f f f f f 
  }
 }}
 %% new-chords-done %%
\ No newline at end of file
diff --git a/input/regression/auto-change.ly b/input/regression/auto-change.ly
index 7c185c3c14..72b94934c3 100644
--- a/input/regression/auto-change.ly
+++ b/input/regression/auto-change.ly
@@ -22,4 +22,4 @@ note. When central C is reached, we don't switch (by default).
 	>
 	
 }
-%% new-chords-done %%
\ No newline at end of file
+%% new-chords-done %%
diff --git a/input/regression/beam-auto-knee.ly b/input/regression/beam-auto-knee.ly
index d0c987dfe0..83745dccdc 100644
--- a/input/regression/beam-auto-knee.ly
+++ b/input/regression/beam-auto-knee.ly
@@ -8,8 +8,8 @@ threshold.
 
 \score {
   \context Staff \notes\relative c''{ 
-    [c'8 c,,] [c8 e']
-    [c,16 e g c e g c c,,] 
+     c'8-[ c,,]  c8-[ e']
+     c,16-[ e g c e g c c,,] 
   }
   \paper{
     linewidth = 40*\staffspace
diff --git a/input/regression/beam-center-slope.ly b/input/regression/beam-center-slope.ly
index f79517b846..14c850951b 100644
--- a/input/regression/beam-center-slope.ly
+++ b/input/regression/beam-center-slope.ly
@@ -11,28 +11,28 @@
 \score{
     \notes\relative c'{
 	%%\property Staff.Stem \set #'beamed-lengths = #'(3.50)
-	%% [c8 d]
-	%% [d c]
+	%%  c8-[ d]
+	%%  d-[ c]
 	%% r2
 	%% \property Staff.Stem \set #'beamed-lengths = #'(3.26)
 
-        [a8^"small slope" b]
-        [b a]
+         a8-[^"small slope" b]
+         b-[ a]
 
-	[c'' b]
-	[b c]
+	 c''-[ b]
+	 b-[ c]
 	
-	[c,, d]
-	[d c]
+	 c,,-[ d]
+	 d-[ c]
 	
-	[a'' g]
-	[g a]
+	 a''-[ g]
+	 g-[ a]
 
-	[c,,^"bigger slope" e]
-	[e c]
+	 c,,-[^"bigger slope" e]
+	 e-[ c]
 	
-	[a'' f]
-	[f a]
+	 a''-[ f]
+	 f-[ a]
     }
     \paper{
 	linewidth = 0.0
diff --git a/input/regression/beam-concave.ly b/input/regression/beam-concave.ly
index f51de22ca6..c8d3a918ae 100644
--- a/input/regression/beam-concave.ly
+++ b/input/regression/beam-concave.ly
@@ -46,27 +46,27 @@ beams this way."
     %% sloped
     %% concaveness: 0.00
     \stemUp
-    [d,16 a' b cis]
+     d,16-[ a' b cis]
 
     %% Sarabande: m25
     %% horizontal
     %% concaveness:a: 0.12
-    [a'16^"horiz." b c b]
+     a'16-[^"horiz." b c b]
     
 % Hmm.  Concaveness of both: 1.75
 %     %% SCS-VI Prelude, m81
 %     %% slope = 0.0
 %     \stemBoth
 %     \key d\major
-%     [e,8 cis a']
+%      e,8-[ cis a']
     
 %     %% SCS-VI Prelude, m82
 %     %% slope = 0.1ss (possibly b.o. context?)
-%     [g, e' cis]
+%      g,-[ e' cis]
 
     
 %%% Han-Wen: this should be concave
-    [a,16^"horiz." a' a a]
+     a,16-[^"horiz." a' a a]
 
     \clef treble
 
diff --git a/input/regression/beam-cross-staff-slope.ly b/input/regression/beam-cross-staff-slope.ly
index b9c0e40724..bb0200763c 100644
--- a/input/regression/beam-cross-staff-slope.ly
+++ b/input/regression/beam-cross-staff-slope.ly
@@ -13,7 +13,7 @@ don't cause extreme slopes"
             f16( \> d \! b \translator Staff = down \stemUp
             \clef treble g ~ << g e>>8-)
 	    
-	    [e \translator Staff = up
+	     e-[ \translator Staff = up
 	    \stemDown
 	    e e]
 	    \translator Staff = down
diff --git a/input/regression/beam-cross-staff.ly b/input/regression/beam-cross-staff.ly
index a1f95cae3b..f62745a31d 100644
--- a/input/regression/beam-cross-staff.ly
+++ b/input/regression/beam-cross-staff.ly
@@ -9,15 +9,15 @@ behave well, wherever the switching point is.
 \score{
 	\context PianoStaff <
 	\context Staff=one \notes\relative c'{
-		\stemUp [c8 c \translator Staff=two \stemUp c c]
-		[c c c c]
+		\stemUp  c8-[ c \translator Staff=two \stemUp c c]
+		 c-[ c c c]
 		\translator Staff=one
-		\stemDown [c8 c \translator Staff=two \stemUp c c]
+		\stemDown  c8-[ c \translator Staff=two \stemUp c c]
 		r2
-		\stemDown [c8 c \translator Staff=one \stemDown c c]
+		\stemDown  c8-[ c \translator Staff=one \stemDown c c]
 		r2
 		\translator Staff=two
-		\stemUp [c8 c \translator Staff=one \stemDown c c]
+		\stemUp  c8-[ c \translator Staff=one \stemDown c c]
 		r2
 	}
 	\context Staff=two \notes\relative c'{
diff --git a/input/regression/beam-default-lengths.ly b/input/regression/beam-default-lengths.ly
index ad60d495b4..81582ebcf4 100644
--- a/input/regression/beam-default-lengths.ly
+++ b/input/regression/beam-default-lengths.ly
@@ -11,7 +11,7 @@
 	 ,Beam::check_concave
 	 ,Beam::slope_damping)
 
-        f4 [f8 f] [f16 f] [f32 f] [f64 f] [f128 f] 
+        f4  f8-[ f]  f16-[ f]  f32-[ f]  f64-[ f]  f128-[ f] 
     }
     \paper{ raggedright = ##t}
 }          %% new-chords-done %%
\ No newline at end of file
diff --git a/input/regression/beam-extreme.ly b/input/regression/beam-extreme.ly
index c714ed5764..b9ce9f7ec6 100644
--- a/input/regression/beam-extreme.ly
+++ b/input/regression/beam-extreme.ly
@@ -10,19 +10,19 @@ Beam.auto-knee-gap was set to false.
 
 extreme = \notes\relative c'' {
   \stemBoth
-  [g8 c c,]
-  [c16 c'' a f]
+   g8-[ c c,]
+   c16-[ c'' a f]
   \stemUp 
-  [c,,32 c'' a f]
+   c,,32-[ c'' a f]
 
   %%%%%%%
   \stemBoth
-  \times 2/3{[d16 fis' d,]} \times 2/3{[cis g'' cis,,]}
+  \times 2/3{ d16-[ fis' d,]} \times 2/3{ cis-[ g'' cis,,]}
   a'16 cis a, g''' % Used to give a nice beam directed upwards.
   \stemBoth
 
   \transpose c c {
-	  \stemDown [e'8 e e']
+	  \stemDown  e'8-[ e e']
       }
 }
 
diff --git a/input/regression/beam-french.ly b/input/regression/beam-french.ly
index 2b8822293f..0064144053 100644
--- a/input/regression/beam-french.ly
+++ b/input/regression/beam-french.ly
@@ -8,9 +8,9 @@
 \relative c'
 	 {
 	     \property Voice.Beam \override #'french-beaming = ##t
-	     [c16 c c c]
-	[c8 c16 c16 c8]
-	[c8 c16 e16 g8]
+	      c16-[ c c c]
+	 c8-[ c16 c16 c8]
+	 c8-[ c16 e16 g8]
 
     }}
 %% new-chords-done %%
\ No newline at end of file
diff --git a/input/regression/beam-funky.ly b/input/regression/beam-funky.ly
index ec00e413b8..29630f016a 100644
--- a/input/regression/beam-funky.ly
+++ b/input/regression/beam-funky.ly
@@ -9,15 +9,15 @@
 	     \property Voice.Beam \set #'auto-knee-gap = #7
 	     \property Voice.subdivideBeams = ##t	     
 	     \time 8/8
-	     [c,16  g'''16  
+	      c,16-[  g'''16  
 	     c,,,16  g'''16 
 	     c,,,16  g'''16 	     	     
 	     c,,,16  g'''16 ]
 
-	     [c,,,16 c c c
+	      c,,,16-[ c c c
 	      b'''   b b b]
 
-	     \transpose c' a, { \relative b'' { [g,16  g'''16  
+	     \transpose c' a, { \relative b'' {  g,16-[  g'''16  
 	     g,,,16  g'''16 
 	     g,,,16  g'''16 	     	     
 	     g,,,16  g'''16
diff --git a/input/regression/beam-length.ly b/input/regression/beam-length.ly
index 5e3176303d..5d28e3ce8e 100644
--- a/input/regression/beam-length.ly
+++ b/input/regression/beam-length.ly
@@ -8,7 +8,7 @@ beams should look the same
     
 \score { 
   \context Voice \notes\relative c {
-			[d''8 d d] [d g d]
+			 d''8-[ d d]  d-[ g d]
 			c c
   }
 }
diff --git a/input/regression/beam-manual-beaming.ly b/input/regression/beam-manual-beaming.ly
index 525f559c50..722264ffab 100644
--- a/input/regression/beam-manual-beaming.ly
+++ b/input/regression/beam-manual-beaming.ly
@@ -4,7 +4,7 @@ texidoc =
 }
 \score {
 \notes \relative c'' {
- [c32 c
+  c32-[ c
 
 
 %% WARNING: #'beaming is written, so this
diff --git a/input/regression/beam-manual.ly b/input/regression/beam-manual.ly
index e9fde0dc30..aebece6813 100644
--- a/input/regression/beam-manual.ly
+++ b/input/regression/beam-manual.ly
@@ -13,7 +13,7 @@
     \property Voice.Beam \override #'auto-knee-gap = ##f
     \property Voice.Beam \override #'positions = #'(-10 . 10)
        \stemUp
-  [c16 c'' a f]
+   c16-[ c'' a f]
 
    }
   }
diff --git a/input/regression/beam-multiple-cross-staff.ly b/input/regression/beam-multiple-cross-staff.ly
index a2780b253c..49fa6a503f 100644
--- a/input/regression/beam-multiple-cross-staff.ly
+++ b/input/regression/beam-multiple-cross-staff.ly
@@ -12,16 +12,16 @@ to the last beam.
 	 \context PianoStaff \relative c' <
 	     \context Staff = SA {
 		 \stemDown
-		 [c8 c16 \translator Staff = SB \stemUp c16 ]
+		  c8-[ c16 \translator Staff = SB \stemUp c16 ]
 		 \stemBoth
-		 [f g \translator Staff = SA a c] 
+		  f-[ g \translator Staff = SA a c] 
 			       }
 	     \context Staff = SB \relative c' {
 \clef bass
-		 [b8 b16 \stemUp b,,16 ]
+		  b8-[ b16 \stemUp b,,16 ]
 
 		 g'4\rest
-		 [b,8 b16 \stemDown b''16 b ]
+		  b,8-[ b16 \stemDown b''16 b ]
 	     }	     
 	     
 	     >
diff --git a/input/regression/beam-over-barline.ly b/input/regression/beam-over-barline.ly
index a72c851622..d8c3a5347b 100644
--- a/input/regression/beam-over-barline.ly
+++ b/input/regression/beam-over-barline.ly
@@ -3,6 +3,6 @@
 texidoc = "explicit beams may cross barlines. "
 }
 \score {
-\notes \context Voice { c2. [c8 c8 c8 c8] }
+\notes \context Voice { c2.  c8-[ c8 c8 c8] }
 }
 %% new-chords-done %%
\ No newline at end of file
diff --git a/input/regression/beam-position.ly b/input/regression/beam-position.ly
index 4a62509b86..2e0ca4eca2 100644
--- a/input/regression/beam-position.ly
+++ b/input/regression/beam-position.ly
@@ -11,14 +11,14 @@ Override with @code{noStemExtend}.
 
 \score { 
   \context Voice \notes\relative c {
-    [f8 f]  [f64 f] 
+     f8-[ f]   f64-[ f] 
     \grace { 
-      [f8 e8] 
+       f8-[ e8] 
       \property Voice.Stem \override #'no-stem-extend = ##f
-      [f8 e8] 
+       f8-[ e8] 
       \property Voice.Stem \revert #'no-stem-extend
     }
-	[f8 f]
+	 f8-[ f]
 	
   }
   \paper {
diff --git a/input/regression/beam-quarter.ly b/input/regression/beam-quarter.ly
index f385ced735..f8dc21cd46 100644
--- a/input/regression/beam-quarter.ly
+++ b/input/regression/beam-quarter.ly
@@ -5,7 +5,7 @@
 }
 
 \score {\notes \relative c'' {
-	[c8 c4 c8] % should warn here!
+	 c8-[ c4 c8] % should warn here!
 }
 \paper { raggedright = ##t} 
 }
diff --git a/input/regression/beam-rest.ly b/input/regression/beam-rest.ly
index 29fdf09e1c..9c54cfea7c 100644
--- a/input/regression/beam-rest.ly
+++ b/input/regression/beam-rest.ly
@@ -6,7 +6,7 @@
 
 \score { \notes \relative c, {
   \clef bass	 
-  [e8 r16 f d'8 e16 e16] [c8 c16 r16 bes8 r16 c16-] |
+   e8-[ r16 f d'8 e16 e16]  c8-[ c16 r16 bes8 r16 c16-] |
  }
 \paper { raggedright = ##t}
 }
diff --git a/input/regression/beam-shortened-lengths.ly b/input/regression/beam-shortened-lengths.ly
index 8006f0e5a2..2f236419a8 100644
--- a/input/regression/beam-shortened-lengths.ly
+++ b/input/regression/beam-shortened-lengths.ly
@@ -11,7 +11,7 @@
 	 ,Beam::check_concave
 	 ,Beam::slope_damping)
 	\stemUp
-        f'4 [f8 f] [f16 f] [f32 f] [f64 f] [f128 f] 
+        f'4  f8-[ f]  f16-[ f]  f32-[ f]  f64-[ f]  f128-[ f] 
     }
     \paper{ raggedright = ##t}
 }          
diff --git a/input/regression/beaming.ly b/input/regression/beaming.ly
index fdbb92e04b..5db94d37d2 100644
--- a/input/regression/beaming.ly
+++ b/input/regression/beaming.ly
@@ -9,22 +9,22 @@ hidden just as with breakable bar lines.
 }
 
 \score { \context Staff \notes \relative c''  {
-	[c8. c16]
-	[c8. c16 c8.  c16]
-	[c16 c8.] |
-	[c8. c16  c16  c8.]
-	[c8. c32  c32]
-	[c8 c8] |
-	[c16 c16]
-	[c32 c32]
-	[c64 c64]	
+	 c8.-[ c16]
+	 c8.-[ c16 c8.  c16]
+	 c16-[ c8.] |
+	 c8.-[ c16  c16  c8.]
+	 c8.-[ c32  c32]
+	 c8-[ c8] |
+	 c16-[ c16]
+	 c32-[ c32]
+	 c64-[ c64]	
 	c32
 	c2
 
-	[c8 c c] c8 % over barline
-	[c16 c8 c16]
-	[c32 c16 c16 c16 c32]
-	[c32 c16 c8 c32]		 % hmm ?
+	 c8-[ c c] c8 % over barline
+	 c16-[ c8 c16]
+	 c32-[ c16 c16 c16 c32]
+	 c32-[ c16 c8 c32]		 % hmm ?
 	
 		}}
 
diff --git a/input/regression/beams.ly b/input/regression/beams.ly
index 79ab0970ed..41ed41406d 100644
--- a/input/regression/beams.ly
+++ b/input/regression/beams.ly
@@ -5,10 +5,10 @@
 \score { \notes
 \relative c'
 	 {
-	[c16 c8.]
-	[c8. c16]
-	[c8 c16 c16 c8]
-	[c8 c16 e16 g8]
+	 c16-[ c8.]
+	 c8.-[ c16]
+	 c8-[ c16 c16 c8]
+	 c8-[ c16 e16 g8]
 
     }}
 %% new-chords-done %%
\ No newline at end of file
diff --git a/input/regression/breathing-sign.ly b/input/regression/breathing-sign.ly
index f5b8f1d280..240e210e2c 100644
--- a/input/regression/breathing-sign.ly
+++ b/input/regression/breathing-sign.ly
@@ -47,7 +47,7 @@ finalis, the latter three looking similar to bar glyphs.
 
 % caesura
     \property Voice.BreathingSign \set #'text = #"scripts-caesura"
-    [es8 d] \breathe [es f g f] |
+     es8-[ d] \breathe  es-[ f g f] |
     es2 r4 \bar "||" \break
 
 %
diff --git a/input/regression/chords-ignatzek.ly b/input/regression/chords-ignatzek.ly
index cf104c3968..7db4dce287 100644
--- a/input/regression/chords-ignatzek.ly
+++ b/input/regression/chords-ignatzek.ly
@@ -2,7 +2,7 @@
 
 texidoc = " Chord names are generated from a list pitches.  The
 functions constructing the names are customisable. This file shows
-Jazz chords, following [Ignatzek1995], page 17 and 18."
+Jazz chords, following Ignatzek (1995), page 17 and 18."
 
 }
 
diff --git a/input/regression/grace-bar-line.ly b/input/regression/grace-bar-line.ly
index 9abe8a6ad3..56338e0104 100644
--- a/input/regression/grace-bar-line.ly
+++ b/input/regression/grace-bar-line.ly
@@ -8,7 +8,7 @@ texidoc = "Bar line should come before the grace note."
 
 
 \score  {\notes \relative c' \context Staff  { 
- f1 \grace { [a'16 f]  } g1 }
+ f1 \grace {  a'16-[ f]  } g1 }
 		\paper { raggedright = ##t}
  } 
 %% new-chords-done %%
diff --git a/input/regression/grace-beam.ly b/input/regression/grace-beam.ly
index e941d5f7f5..948c99eb9c 100644
--- a/input/regression/grace-beam.ly
+++ b/input/regression/grace-beam.ly
@@ -6,5 +6,5 @@ Unbeamed grace notes are not put into normal beams.
 }
 
 \version "1.7.16"
-\score { \notes\relative c'' { c4 [d8 \grace { [e32  d c d] } e8] [e  e \grace { f16 } e8 e]   }}
+\score { \notes\relative c'' { c4  d8-[ \grace {  e32-[  d c d] } e8]  e-[  e \grace { f16 } e8 e]   }}
 %% new-chords-done %%
diff --git a/input/regression/grace-start.ly b/input/regression/grace-start.ly
index ea1261ab5d..b0e31b5f48 100644
--- a/input/regression/grace-start.ly
+++ b/input/regression/grace-start.ly
@@ -3,9 +3,9 @@
 texidoc = "Pieces may begin with grace notes."
 }
 \score  {\notes \relative c' \context Staff  { 
- \grace { [a'16 f]  } g1
+ \grace {  a'16-[ f]  } g1
  \bar "||"  % test if | and || are synced.
- \grace { [a16 bes]  }  c1
+ \grace {  a16-[ bes]  }  c1
  \bar "||"  % test if | and || are synced. 
   }
   \paper { raggedright = ##t}
diff --git a/input/regression/grace-stems.ly b/input/regression/grace-stems.ly
index 3dff2e7477..cb0bc97953 100644
--- a/input/regression/grace-stems.ly
+++ b/input/regression/grace-stems.ly
@@ -9,9 +9,9 @@ the two grace beams should be the same here.
 \score { 
   \context Voice \notes\relative c {
     \grace { 
-      [f8 e8] 
+       f8-[ e8] 
       \property Voice.Stem \override #'no-stem-extend = ##t
-      [f8 e8] 
+       f8-[ e8] 
       \property Voice.Stem \revert #'no-stem-extend
     }
     a4
diff --git a/input/regression/grace-sync.ly b/input/regression/grace-sync.ly
index b94f383d34..00cabd037e 100644
--- a/input/regression/grace-sync.ly
+++ b/input/regression/grace-sync.ly
@@ -7,9 +7,9 @@
 	 \grace  c8
   c4 c4 }
 		\context Staff = SB { c2 \clef bass
- \grace { [dis8 ( d8] \key es\major  }
+ \grace {  dis8-[ ( d8] \key es\major  }
 
-  ) c4 c4 }
+    c4-) c4 }
 		\context Staff = SC { c2 c4 c4 \bar "|." }
 		>
 		\paper { raggedright = ##t}
diff --git a/input/regression/grace-volta-repeat.ly b/input/regression/grace-volta-repeat.ly
index 46c2e3a3e2..bf1e7f468a 100644
--- a/input/regression/grace-volta-repeat.ly
+++ b/input/regression/grace-volta-repeat.ly
@@ -10,8 +10,8 @@
 \score{
    \notes\relative c'''{\key a \minor \time 2/4
      \repeat "volta" 2 {
-     \grace { [a16( c] }  c,4 c4  |
-     \grace { [e'16( gis] } c,4 c4 |
+     \grace {  a16-[( c] }  c,4 c4  |
+     \grace {  e'16-[( gis] } c,4 c4 |
      
      }
    }
diff --git a/input/regression/grace.ly b/input/regression/grace.ly
index 188e15a33c..1d6d8c870c 100644
--- a/input/regression/grace.ly
+++ b/input/regression/grace.ly
@@ -19,12 +19,12 @@ not set.  Main note scripts don't end up on the grace note.
 
 \score {\notes \context Voice = VA \relative c'' {
 	\grace b8 c4-\fermata
-	\grace { [c32 cis32] } gis4
-	\grace { [cis32 dis32] } e4
-	\grace { [c32 d] }\times 2/3 { [c8 c c] }
-	 \grace { [b32 ( c32] } ) c4
-	\grace  <<c d>>16 [c8 c8]
-%	\grace  c16 [c8 c8]
+	\grace {  c32-[ cis32] } gis4
+	\grace {  cis32-[ dis32] } e4
+	\grace {  c32-[ d] }\times 2/3 {  c8-[ c c] }
+	 \grace {  b32-[ ( c32] }   c4-)
+	\grace  <<c d>>16  c8-[ c8]
+%	\grace  c16  c8-[ c8]
         %% broken?
 	%%\grace  { \property Grace.graceAlignPosition = \right c16} c4
 	c4 \grace  { c16 } c4
diff --git a/input/regression/lyric-combine.ly b/input/regression/lyric-combine.ly
index 949f1d59e2..c65a8be268 100644
--- a/input/regression/lyric-combine.ly
+++ b/input/regression/lyric-combine.ly
@@ -17,7 +17,7 @@ to work."
 m = \notes  \relative c'' {
 	\property Staff.automaticMelismata = ##t
 	\autoBeamOff
-	g8 () a  r8 \times 2/3 { g'8( f )e } r8 \grace { [d16 c b] } e4
+	g8-( a-)  r8 \times 2/3 { g'8-( f e-) } r8 \grace {  d16-[ c b] } e4
 	\emptyText
 	d8.^"melisma" 	\melisma c16
 	\melismaEnd
diff --git a/input/regression/lyric-phrasing.ly b/input/regression/lyric-phrasing.ly
index b02fddad11..4cdbe6972e 100644
--- a/input/regression/lyric-phrasing.ly
+++ b/input/regression/lyric-phrasing.ly
@@ -27,7 +27,7 @@
     \context Voice = "v" \notes  \relative c'' {
       \property Staff.automaticMelismata = ##t
       \autoBeamOff
-      a a a8()a a4
+      a a a8 ( a-) a4
     }
     \context Lyrics <
       \context LyricsVoice = "v-1" \lyrics {
diff --git a/input/regression/lyrics-melisma-beam.ly b/input/regression/lyrics-melisma-beam.ly
new file mode 100644
index 0000000000..f861c4de06
--- /dev/null
+++ b/input/regression/lyrics-melisma-beam.ly
@@ -0,0 +1,20 @@
+
+\version "1.7.17"
+\header
+{
+    texidoc = "melismata are triggered by manual beams." 
+}
+
+
+\score {
+        \simultaneous {
+          \addlyrics
+             \context Staff = mel
+             \notes \relative c'' {
+		 \property Staff.autoBeaming = ##f
+		 c8 c8-[ c8 c8-]  c8    }
+          	
+             \context Lyrics \lyrics { bla bla bla }
+        }
+        \paper { raggedright = ##t }
+}
diff --git a/input/regression/merge-differently-dotted.ly b/input/regression/merge-differently-dotted.ly
index 033324c847..cdb4fda1fb 100644
--- a/input/regression/merge-differently-dotted.ly
+++ b/input/regression/merge-differently-dotted.ly
@@ -12,7 +12,7 @@ heads that have differing dot counts may be merged anyway."
      \property Staff.NoteCollision \override #'merge-differently-dotted = ##t
      g'8 g'8
      }
-  \context Voice = VB { \voiceTwo [g'8. f16] [g'8. f'16] } 
+  \context Voice = VB { \voiceTwo  g'8.-[ f16]  g'8.-[ f'16] } 
   >
 }}
 %% new-chords-done %%
diff --git a/input/regression/pc-mmrest.ly b/input/regression/pc-mmrest.ly
index b7d1657724..953696fb65 100644
--- a/input/regression/pc-mmrest.ly
+++ b/input/regression/pc-mmrest.ly
@@ -9,7 +9,7 @@ one = \notes\relative c'' {
 
 	f4 \!e-.-\f r2|
 	R1|
-	f2-\p()es|
+	f2-\p-(es -)|
 	\property Voice.crescendoText = #'(lines " " "cresc." " ")
 	\property Voice.crescendoSpanner = #'dashed-line
 	d1\<|
diff --git a/input/regression/pc-switch-slur.ly b/input/regression/pc-switch-slur.ly
index 9c74821221..df33462ca9 100644
--- a/input/regression/pc-switch-slur.ly
+++ b/input/regression/pc-switch-slur.ly
@@ -9,12 +9,12 @@ texidoc="The partcombiner should not combine two small slurs into a big one."
 		\context Voice=two\skip 1
 		\context Voice=one \partcombine Voice
 			\context Thread=one \notes\relative c'' {
-				c4( c b )a 
-				a( b c )d
+				c4( c b  a-) 
+				a( b c  d-)
 			}
 			\context Thread=two \notes\relative c'' {
-				a4( c b )a
-				a( b c )a
+				a4( c b  a-)
+				a( b c  a-)
 				
 			}
 	>
diff --git a/input/regression/pedal.ly b/input/regression/pedal.ly
index fbb181981a..a55e52f2b7 100644
--- a/input/regression/pedal.ly
+++ b/input/regression/pedal.ly
@@ -16,7 +16,7 @@ Brackets work  across line breaks.
 
 c4 d e f g 
 -\sustainDown b c c, |
-  [d16  c  c c] [e e -\sustainUp -\sustainDown e e ] f4 -\sustainUp
+   d16-[  c  c c]  e-[ e -\sustainUp -\sustainDown e e ] f4 -\sustainUp
     g-\sustainDown |
   b -\sustainUp c 
   \property Staff.pedalSustainStrings = #'("-" "-P" "P")
@@ -32,7 +32,7 @@ c4 d e f g
 
 \property Staff.SustainPedal \override #'pedal-type = #'bracket
 
-c4 d e -\sustainDown b c c, -\sustainUp -\sustainDown [d8 c] [e8 e -\sustainUp -\sustainDown] f4 d
+c4 d e -\sustainDown b c c, -\sustainUp -\sustainDown  d8-[ c]  e8-[ e -\sustainUp -\sustainDown] f4 d
 -\sustainUp g -\sustainDown b b, -\sustainUp c'
 c4 
 
diff --git a/input/regression/phrasing-slur.ly b/input/regression/phrasing-slur.ly
index d546d5b03c..1bc6906da3 100644
--- a/input/regression/phrasing-slur.ly
+++ b/input/regression/phrasing-slur.ly
@@ -6,7 +6,7 @@ texidoc="Slurs play well with phrasing slur."
 
 \score {
   \notes\relative c'' {
-    \time 6/4 c\((d)e f(e)\)d
+    \time 6/4 c\((d e-) f(e d-)-\)
   }
   \paper {
     raggedright = ##t
diff --git a/input/regression/rest-collision.ly b/input/regression/rest-collision.ly
index c2628739c4..fc031f6246 100644
--- a/input/regression/rest-collision.ly
+++ b/input/regression/rest-collision.ly
@@ -41,13 +41,13 @@ restsII =  \context Staff \notes {
 	\context Staff < {\stemUp r} { \stemDown r} >
 	\context Staff < {\stemUp r} r { \stemDown r} >
 	\stemUp
-	\transpose c c' { [c''8 r8 c''8 c''8]
-	[c8 r8 c8 c8]
-	[c8 r8 r8 c'''8]	
+	\transpose c c' {  c''8-[ r8 c''8 c''8]
+	 c8-[ r8 c8 c8]
+	 c8-[ r8 r8 c'''8]	
 	\stemDown
-	[c8 r8 c8 c8]
-	[c''8 r8 c''8 c''8]
-	[c'8 r8 r8 c'''8]
+	 c8-[ r8 c8 c8]
+	 c''8-[ r8 c''8 c''8]
+	 c'8-[ r8 r8 c'''8]
 	\different	
 	}
 }
diff --git a/input/regression/slur-attachment.ly b/input/regression/slur-attachment.ly
index c9445a5337..f3d801610f 100644
--- a/input/regression/slur-attachment.ly
+++ b/input/regression/slur-attachment.ly
@@ -9,10 +9,10 @@ with beams.  Also see: ophee-slurs.
 \score{
 	\notes \relative c''{
 	        \property Voice.Slur \set #'direction = #1
-	        a8( a )a4
-		a4( a8 )a
-	        a8 a()a4
-		a4() a8 a
+	        a8-( a a4-)
+		a4-( a8 a-)
+	        a8 a(a4-)
+		a4-( a8-) a
 	}
 	\paper{ 
 		indent = 0.0
diff --git a/input/regression/slur-broken-trend.ly b/input/regression/slur-broken-trend.ly
index 13549abc25..8f4fb35311 100644
--- a/input/regression/slur-broken-trend.ly
+++ b/input/regression/slur-broken-trend.ly
@@ -10,11 +10,11 @@ in unbroken state.
 }
 \score{
 	\notes \relative c''{
-		e1( \break) a,
+		e1( \break a,-)
 		\time 2/4
-		e'2( \break) a,(\break
+		e'2( \break a,-)(\break
 		a2\break
-		)e'2
+		 e'2-)
 	}
 	\paper {
 		linewidth=40.\mm
diff --git a/input/regression/slur-cross-staff.ly b/input/regression/slur-cross-staff.ly
index fdc5f31ce6..99cd31e42b 100644
--- a/input/regression/slur-cross-staff.ly
+++ b/input/regression/slur-cross-staff.ly
@@ -11,32 +11,32 @@ linebreak.
 	\context PianoStaff <
 	\context Staff=one \notes\relative c'{
 		\stemUp \slurUp
-		 c4( c \translator Staff=two c )c |
+		 c4( c \translator Staff=two c  c-) |
 		\translator Staff=one
 		\stemUp \slurUp
-		 c4( c \translator Staff=two c )c |
+		 c4( c \translator Staff=two c  c-) |
 		\stemUp \slurUp
-		 c4( c \translator Staff=one c )c |
+		 c4( c \translator Staff=one c  c-) |
 		\translator Staff=two
 		\stemUp \slurUp
-		 c4( c \translator Staff=one c )c |
+		 c4( c \translator Staff=one c  c-) |
 		\translator Staff=two
 		\stemUp \slurUp
-		 c4( \translator Staff=one c c )c |
+		 c4( \translator Staff=one c c  c-) |
 		r2
 		\translator Staff=two
 		\stemUp \slurUp
 		 c4( \translator Staff=one c
 		   \break
-		c )c
+		c  c-)
 		r2
 %		\stemDown \slurDown
-%		 c4( \translator Staff=two c c \translator Staff=one )c
+%		 c4( \translator Staff=two c c \translator Staff=one  c-)
 		\stemDown \slurDown
-		 d4( \translator Staff=two c c \translator Staff=one )d
+		 d4( \translator Staff=two c c \translator Staff=one  d-)
 		\translator Staff=two
 		\stemUp \slurUp
-		 c4( \translator Staff=one c c \translator Staff=two )c
+		 c4( \translator Staff=one c c \translator Staff=two  c-)
 		r1
 	}
 	\context Staff=two \notes\relative c'{
diff --git a/input/regression/slur-dots.ly b/input/regression/slur-dots.ly
index e0cab70667..ce19cb9931 100644
--- a/input/regression/slur-dots.ly
+++ b/input/regression/slur-dots.ly
@@ -5,10 +5,11 @@ of dots here, to make problems more visible."
 }
 \score {
   \notes\relative c'' {
-    c4.............()c
+    c4.............-( c-)
   }
   \paper {
     raggedright = ##t
   }
-} 
+}
+
 %% new-chords-done %%
diff --git a/input/regression/slur-nice.ly b/input/regression/slur-nice.ly
index 214a78a854..c02acfa093 100644
--- a/input/regression/slur-nice.ly
+++ b/input/regression/slur-nice.ly
@@ -11,12 +11,12 @@ run through noteheads or stems.
 	\notes\relative c''{
 		\time 3/4
 		\slurUp
-		\stemBoth a ( \stemDown a \stemBoth ) a a( c )a a( e' )a, a( g' )a,
-		\stemUp a( e' )a,
+		\stemBoth a ( \stemDown a \stemBoth  a-) a( c  a-) a( e'  a,-) a( g'  a,-)
+		\stemUp a( e'  a,-)
 		\break
 		\slurDown
-		\stemBoth c ( \stemUp c \stemBoth ) c c ( a ) c c( d, )c' c( f, )c'
-		\stemDown c( f, )c'
+		\stemBoth c ( \stemUp c \stemBoth  c-) c ( a  c-) c( d,  c'-) c( f,  c'-)
+		\stemDown c( f,  c'-)
 	}
 	\paper{
 		linewidth = 120.\mm
diff --git a/input/regression/slur-rest.ly b/input/regression/slur-rest.ly
index cfa3222617..6fb356fe95 100644
--- a/input/regression/slur-rest.ly
+++ b/input/regression/slur-rest.ly
@@ -6,11 +6,11 @@ the rest
 
 "
 }
-\score{ \notes  { \stemDown c'4 ( r4 ) c'2
+\score{ \notes  { \stemDown c'4 ( r4  c'2-)
 
 		  \relative c'' { 
 	% Finish with F if played separately 
-	c8-.(   r c,-. r ) c4 r4|  }
+	c8-.(   r c,-. r  c4-) r4|  }
 		  
 
 	      }
diff --git a/input/regression/slur-staccato.ly b/input/regression/slur-staccato.ly
index cede628cee..9be7f06a08 100644
--- a/input/regression/slur-staccato.ly
+++ b/input/regression/slur-staccato.ly
@@ -9,9 +9,9 @@ texidoc="Manual hack for slur and staccato."
   \context Staff \notes\relative c'' {
     \property Voice.Slur \override
       #'attachment-offset = #'((0 . 1) . (0 . 1))
-    a-.( g-. )a-.
+    a-.( g-.  a-)-.
     \property Voice.Slur \override
       #'attachment-offset = #'((0 . 1.5) . (0 . 1.5))
-    b-.( a-. )b-.
+    b-.( a-.  b-)-.
   }
 }	%% new-chords-done %%
diff --git a/input/regression/slur-stem-broken.ly b/input/regression/slur-stem-broken.ly
index 3c185c21e1..aee2fbf966 100644
--- a/input/regression/slur-stem-broken.ly
+++ b/input/regression/slur-stem-broken.ly
@@ -7,7 +7,7 @@ follow the same vertical direction it would have had in unbroken state."
   \notes\relative c' {
     \property Voice.Slur \override #'attachment = #'(stem . stem)
     f( c' c c \break
-    c c c \stemUp ) c
+    c c c \stemUp  c-)
   }
   \paper {
     linewidth=40*\staffspace
diff --git a/input/regression/slur-symmetry-1.ly b/input/regression/slur-symmetry-1.ly
index e279d09bb2..6085d1cff7 100644
--- a/input/regression/slur-symmetry-1.ly
+++ b/input/regression/slur-symmetry-1.ly
@@ -4,10 +4,10 @@
 	\notes\relative c''<
 		\time 4/4
 		\context Staff{
-			f8(f f)f f(g g)f f(a a)f f(b b)f
+			f8(f f f-) f(g g f-) f(a a f-) f(b b f-)
 		}
 		\context Staff=x{
-			e,(e e)e e(d d)e e(c c)e e(b b)e
+			e,(e e e-) e(d d e-) e(c c e-) e(b b e-)
 		}
 	>
 	\paper{
diff --git a/input/regression/slur-symmetry.ly b/input/regression/slur-symmetry.ly
index 60d5dd9f43..e445d1ade4 100644
--- a/input/regression/slur-symmetry.ly
+++ b/input/regression/slur-symmetry.ly
@@ -4,10 +4,10 @@
 	\notes\relative c'<
 		\time 6/8
 		\context Staff{
-			e8(e)e e(d)e e(c)e e(b)e
+			e8(e e-) e(d e-) e(c e-) e(b e-)
 		}
 		\context Staff=x{
-			f'8(f)f f(g)f f(a)f f(b)f
+			f'8(f f-) f(g f-) f(a f-) f(b f-)
 		}
 	>
 	\paper{
diff --git a/input/regression/spacing-folded-clef.ly b/input/regression/spacing-folded-clef.ly
index 1dec1f4784..c6d34b4e2d 100644
--- a/input/regression/spacing-folded-clef.ly
+++ b/input/regression/spacing-folded-clef.ly
@@ -5,7 +5,7 @@ this doesn't disrupt the flow of the notes."
 }
 
 \score { \notes \relative c'' <
-\context Staff = SA  { c4 [c16 c c  c] c4 c4 }
+\context Staff = SA  { c4  c16-[ c c  c] c4 c4 }
 	\context Staff = SB { \clef bass c,2 \clef treble  c'2 }
 	>
 
diff --git a/input/regression/spacing-grace-duration.ly b/input/regression/spacing-grace-duration.ly
index 32458dbd78..f4c4f4c276 100644
--- a/input/regression/spacing-grace-duration.ly
+++ b/input/regression/spacing-grace-duration.ly
@@ -11,9 +11,9 @@
 \score { \notes \relative c''
 	 \context Voice 
 {
-    [c8  c8]
+     c8-[  c8]
     \grace {  b16 }
-    [c8 c8] [c8 c8] 
+     c8-[ c8]  c8-[ c8] 
 
 }
 
diff --git a/input/regression/spacing-grace.ly b/input/regression/spacing-grace.ly
index 763141b39e..9fdbf5db64 100644
--- a/input/regression/spacing-grace.ly
+++ b/input/regression/spacing-grace.ly
@@ -4,7 +4,7 @@
 }
 	
 \score {
- \notes \context Voice \relative c'' { \grace { [c16 d] } c4 }
+ \notes \context Voice \relative c'' { \grace {  c16-[ d] } c4 }
   \paper { raggedright = ##t}
 
 }
diff --git a/input/regression/spacing-note-flags.ly b/input/regression/spacing-note-flags.ly
index bcefefb8ff..4a677d8ae3 100644
--- a/input/regression/spacing-note-flags.ly
+++ b/input/regression/spacing-note-flags.ly
@@ -8,7 +8,7 @@ texidoc = "The flags of 8th notes take some space, but not
 
 \score { \notes \relative c'' \context Staff {
     \property Voice.autoBeaming = ##f
-    [a8 a8 a8 a8] a8 a8 a8 a8
+     a8-[ a8 a8 a8] a8 a8 a8 a8
 }
 \paper {
 %stafflinethickness = 0.0
diff --git a/input/regression/spacing-stem-same-direction.ly b/input/regression/spacing-stem-same-direction.ly
index 2e60aabec5..e8b0fd1f85 100644
--- a/input/regression/spacing-stem-same-direction.ly
+++ b/input/regression/spacing-stem-same-direction.ly
@@ -8,7 +8,7 @@ two chords have no common head-positions range."
 \score { \notes \relative c'' {
 \stemDown
 \time 12/4
-[f8 e f e] [f d f d] [f c f c] [f b, f' b,] [f' a, f' a,]
+[f8 e f e]  f-[ d f d]  f-[ c f c]  f-[ b, f' b,]  f'-[ a, f' a,]
 }
 \paper { raggedright = ##t}
 }
diff --git a/input/regression/stem-direction-down.ly b/input/regression/stem-direction-down.ly
index cace3da5e9..01ec49ae0d 100644
--- a/input/regression/stem-direction-down.ly
+++ b/input/regression/stem-direction-down.ly
@@ -10,7 +10,7 @@ texidoc="Similarly, if @code{'neutral-direction} is set to @code{-1}.  "
 	\notes\relative c{
 	\property Voice.Stem \override #'neutral-direction = #-1
 		 
-	    b''4 ~ b8()b8 e4 e,
+	    b''4 ~ b8-(b8-) e4 e,
 	}
 	\paper{
 
diff --git a/input/regression/stem-direction.ly b/input/regression/stem-direction.ly
index b2a2d86d8a..a24ebaaa78 100644
--- a/input/regression/stem-direction.ly
+++ b/input/regression/stem-direction.ly
@@ -15,7 +15,7 @@ notes, and up for low notes.
 
 \score { 
   \context Voice \notes\relative c {
-    b''4 ~ b8()b8 e4 e,
+    b''4 ~ b8-(b8-) e4 e,
 	
   }
   \paper {
diff --git a/input/regression/system-extents.ly b/input/regression/system-extents.ly
index 73f81acbd9..56ca3f60f8 100644
--- a/input/regression/system-extents.ly
+++ b/input/regression/system-extents.ly
@@ -9,7 +9,7 @@
 \score { \notes
 \context Voice
 { \property Staff.minimumVerticalExtent \unset
-    \slurDown c4 ( g4 ) c''4
+    \slurDown c4 ( g4  c''4-)
 
 }
 
diff --git a/input/regression/tie-accidental.ly b/input/regression/tie-accidental.ly
index 399c0d9f64..5277b647a0 100644
--- a/input/regression/tie-accidental.ly
+++ b/input/regression/tie-accidental.ly
@@ -23,7 +23,7 @@ thenotes = \notes \relative cis' {
   g2 gis ~ |
   gis g4 gis |
   g2 gis( |
-  )g! gis4 gis |
+   g-)! gis4 gis |
   \break
   \key a \major
   gis2 gis ~ |
@@ -43,7 +43,7 @@ thenotes = \notes \relative cis' {
   % should get an accidental but it looks a bit silly and redundant.
   % See last g.
   
-  )g! gis4 gis ~ | \break
+   g-)! gis4 gis ~ | \break
   gis2  gis ~ | gis g ~\break
   g2 g
 }
diff --git a/input/regression/triplets.ly b/input/regression/triplets.ly
index c422e22c2c..4d630b03ef 100644
--- a/input/regression/triplets.ly
+++ b/input/regression/triplets.ly
@@ -22,7 +22,7 @@ ex = \notes \relative c' {
     \times 2/3 {c b bes} \times 2/3 {a aes g}
     \times 2/3 {fis f e} \times 2/3 {ees d des} |
     \times 2/3 {c b bes} \times 2/3 {a aes g}
-    \times 2/3 {fis f e} \times 2/3 {ees d )des}
+    \times 2/3 {fis f e} \times 2/3 {ees d  des-)}
   }
   c1 
 }
diff --git a/input/regression/tup.ly b/input/regression/tup.ly
index 5485887a21..c58daef539 100644
--- a/input/regression/tup.ly
+++ b/input/regression/tup.ly
@@ -18,7 +18,7 @@ direction as the
 \score{
 	\notes \context Voice \relative c'' {
 		 \times 2/3 { \times 2/3 { a8 b c}  c }
-		 \times 2/3 { r8 [b f] }
+		 \times 2/3 { r8  b-[ f] }
 		 \times 2/3 { r8 b r8 }
 		 c4 |
 		 
diff --git a/input/regression/tuplet-beam.ly b/input/regression/tuplet-beam.ly
index 297c767b11..beadb3768d 100644
--- a/input/regression/tuplet-beam.ly
+++ b/input/regression/tuplet-beam.ly
@@ -8,8 +8,8 @@ the bracket."
 }
 
 \score { \notes \context Voice\relative c'' {
-\times 2/3 { r [c8 c8] }
-\times 2/3 { [c8 c c] }
-\times 2/3 { [c16 c16] [c8 c8] }
+\times 2/3 { r  c8-[ c8] }
+\times 2/3 {  c8-[ c c] }
+\times 2/3 {  c16-[ c16]  c8-[ c8] }
 }}
 %% new-chords-done %%
diff --git a/input/regression/tuplet-properties.ly b/input/regression/tuplet-properties.ly
index fe4a5779b9..789e680455 100644
--- a/input/regression/tuplet-properties.ly
+++ b/input/regression/tuplet-properties.ly
@@ -15,17 +15,17 @@ NB should have no bracket, B should have bracket.
  	\times 2/3 { c'8 c'' c,, }
 
 	
- 	\times 2/3 { [c8^"NB" c c]  }
+ 	\times 2/3 {  c8-[^"NB" c c]  }
 	
- 	\times 2/3 { c8^"B" [c c]  }
- 	\times 2/4 { r8_"B" [c, c'] r8 }
+ 	\times 2/3 { c8^"B"  c-[ c]  }
+ 	\times 2/4 { r8_"B"  c,-[ c'] r8 }
 	
  	\property Voice.TupletBracket \override #'bracket-visibility = #'if-no-beam  
- 	\times 2/3 { [c8 c c]  }
+ 	\times 2/3 {  c8-[ c c]  }
 	
 	\property Voice.TupletBracket \override #'direction = #1
  	\property Voice.TupletBracket \override #'number-visibility = ##f
- 	\times 2/3 { c8^""^""^"up, no digit" [c c]  }
+ 	\times 2/3 { c8^""^""^"up, no digit"  c-[ c]  }
  	\property Voice.TupletBracket \revert #'number-visibility
 
 	\property Voice.TupletBracket \override #'bracket-visibility = ##t
diff --git a/input/regression/volta-broken-left-edge.ly b/input/regression/volta-broken-left-edge.ly
index adfa0ebf39..424bde926d 100644
--- a/input/regression/volta-broken-left-edge.ly
+++ b/input/regression/volta-broken-left-edge.ly
@@ -45,7 +45,7 @@ voiceB = \notes {
      \property Staff.instr = "B"
      \key f \minor 
      \time 4/4  
-    f,2 (   ) f,8    r8   f8    e8    
+    f,2 (    f,8-)    r8   f8    e8    
     \repeat  volta 2
     {
          d8.    d16    e8.    f16    f8    c8    c16    c8.    \break
@@ -53,11 +53,11 @@ voiceB = \notes {
     \alternative
     {
         { 	
-	    f,2 (   ) f,8    r8   f8    e8 
-	    f,2 (   ) f,8    r8   f8    e8 
+	    f,2 (    f,8-)    r8   f8    e8 
+	    f,2 (    f,8-)    r8   f8    e8 
 	    g1 \break   
-	    f,2 (   ) f,8    r8   f8    e8 
-	    f,2 (   ) f,8    r8   f8    e8 
+	    f,2 (    f,8-)    r8   f8    e8 
+	    f,2 (    f,8-)    r8   f8    e8 
 	    g1 \break   
 	}
         {   
@@ -74,7 +74,7 @@ voiceC = \notes {
     }
     \alternative
     {
-        {	a2 (   ) a8    r8   a8    bes8    }
+        {	a2 (    a8-)    r8   a8    bes8    }
         {	a2.    r8   g16    f16      |
      	d'8.   c'16   c'8.   d'16   c'8   c'8   c'16    c'8.    |
         }
diff --git a/input/template/piano-dynamics.ly b/input/template/piano-dynamics.ly
index 36db96ff2f..858e2a7ac4 100644
--- a/input/template/piano-dynamics.ly
+++ b/input/template/piano-dynamics.ly
@@ -53,7 +53,7 @@ pedal = \notes {
       DynamicText \override #'extra-offset = #'(0 . 2.5)
       Hairpin \override #'extra-offset = #'(0 . 2.5)
 
-      \consists "Skip_req_swallow_translator"
+      \consists "Skip_event_swallow_translator"
 
       \consistsend "Axis_group_engraver"
     }
diff --git a/input/test/ac-extra-voice.ly b/input/test/ac-extra-voice.ly
index 0ffad1796a..acf5621cc7 100644
--- a/input/test/ac-extra-voice.ly
+++ b/input/test/ac-extra-voice.ly
@@ -19,7 +19,7 @@ melody =  \notes\relative c''{
 }
 
 basloopje =  \notes\relative c{
-	d,8(	a' d f a d f d a f d	)a
+	d,8(	a' d f a d f d a f d	a-)
 }
 
 accompany =  \notes \relative c{
diff --git a/input/test/auto-beam-override.ly b/input/test/auto-beam-override.ly
index 1158ed49b4..bc1222f8cb 100644
--- a/input/test/auto-beam-override.ly
+++ b/input/test/auto-beam-override.ly
@@ -1,17 +1,25 @@
 \version "1.7.16"
+\header {
 
-%{
-  Currently (1.1.27.jcn3), the auto-beam engraver will only engrave
-  sensible beams, which means that it will end a beam when:
-    * a rest is encountered
-    * another beam (entered manually) is encountered
-    * there's a 'gap' in the beam note's durations
+    texidoc = "
+Show how auto-beaming settings can be overridden.
+
+ The auto-beamer will only engrave beams that end when:
+@itemize @bullet
+@item  a rest is encountered
+@item
+ another beam (entered manually) is encountered
+@item
+ there's a 'gap' in the beam note's durations
+@end itemize
+
+The beam will be ended also when now % beamAutoEnd = 0
+
+"
+
+}
 
-  The beam will be ended also when
 
-    now / beamAutoEnd = 0
-%}
-	
 \score{
     \notes \relative c''{
     	\time 2/4
@@ -19,10 +27,11 @@
       	c8 c c c
       	c16 c c c c c c c
 	% from here on consider ending beam every 1/4 note
-	\property Voice.autoBeamSettings \override #'(end * * * *) = #(ly:make-moment 1 4)
+	#(override-auto-beam-setting '(end * * * *) 1 4)
+
       	c8 c c c
 	% manually override autobeam with weird beaming
-      	c8 [c c] c
+      	c8  c-[ c] c
       	c8 c c r
       	c8 c c4
       	r8 c c c
@@ -33,9 +42,9 @@
     \paper{
       	\translator{
 	    \VoiceContext
-	    % consider ending beam at every 1/2 note
 	    autoBeamSettings \override #'(end * * * *) = #(ly:make-moment 1 2)
 	}
     }
 }
+
 %% new-chords-done %%
diff --git a/input/test/bagpipe.ly b/input/test/bagpipe.ly
index 0ffd17e0f1..f6e46d4331 100644
--- a/input/test/bagpipe.ly
+++ b/input/test/bagpipe.ly
@@ -44,29 +44,29 @@
 
 
 
-taor =  \notes{ \grace { [g32 d g e]}}
-grip =  \notes{ \grace { [g32 b g ]}}
-thrd =  \notes{ \grace { [g32 d c] }}
-birl =  \notes{ \grace { [g32 a g] }}
-gstd =  \notes{ \grace { [g'32 d g] }}
+taor =  \notes{ \grace {  g32-[ d g e]}}
+grip =  \notes{ \grace {  g32-[ b g ]}}
+thrd =  \notes{ \grace {  g32-[ d c] }}
+birl =  \notes{ \grace {  g32-[ a g] }}
+gstd =  \notes{ \grace {  g'32-[ d g] }}
  lgg = \notes{ \grace { g32 }}
  lag = \notes{ \grace { a32 }}
- fgg = \notes{ \grace { [f32 g'32] }}
-dblb =  \notes{ \grace { [g'32 b d] }}
-dblc =  \notes{ \grace { [g'32 c d] }}
-dble =  \notes{ \grace { [g'32 e f] }}
-dblf =  \notes{ \grace { [g'32 f g'] }}
-dblg =  \notes{ \grace { [g'32 f] }}
-dbla =  \notes{ \grace { [a'32 g'] }}
+ fgg = \notes{ \grace {  f32-[ g'32] }}
+dblb =  \notes{ \grace {  g'32-[ b d] }}
+dblc =  \notes{ \grace {  g'32-[ c d] }}
+dble =  \notes{ \grace {  g'32-[ e f] }}
+dblf =  \notes{ \grace {  g'32-[ f g'] }}
+dblg =  \notes{ \grace {  g'32-[ f] }}
+dbla =  \notes{ \grace {  a'32-[ g'] }}
 cg   = \notes{ \grace { c32 }}
 eg   = \notes{ \grace { e32 }}
 gg   = \notes{ \grace { g'32 }}
 dg   = \notes{ \grace { d32 }}
 hag  = \notes{ \grace { a'32 }}
-gefg =  \notes{ \grace { [g'32 e f] }}
-efg  = \notes{ \grace { [e32 f] }}
-gdcg =  \notes{ \grace { [g'32 d c]}}
-gcdg =  \notes{ \grace { [g'32 c d]}}
+gefg =  \notes{ \grace {  g'32-[ e f] }}
+efg  = \notes{ \grace {  e32-[ f] }}
+gdcg =  \notes{ \grace {  g'32-[ d c]}}
+gcdg =  \notes{ \grace {  g'32-[ c d]}}
 
 
 
@@ -77,31 +77,31 @@ gcdg =  \notes{ \grace { [g'32 c d]}}
   \slurUp
 f4 |
 \gg f4 e8 \thrd d4. |
-\eg a4.()a4 d8 |
+\eg a4.(a4-) d8 |
 \gg d4 f8 \dble e4. ( | \noBreak
-)e8 d4 \gg d4 e8 |
+e8-) d4 \gg d4 e8 |
 
 \break
 \time 9/8
-\dblf f2.( )f4 d8 |
+\dblf f2.( f4-) d8 |
 \time 6/8
 \dblg g'4 a'8 \gg a'4. |
-\thrd d4.( )d4 \eg a8 |
+\thrd d4.( d4-) \eg a8 |
 \time 9/8
-\dble e4 \lag e8 \gg [e16 d8. e8] \gg f4 g'8 |
+\dble e4 \lag e8 \gg  e16-[ d8. e8] \gg f4 g'8 |
 
 \break
 \time 6/8
 \gg f4 e8 \thrd d4. |
-\eg a4.( )a4 d8 |
+\eg a4.( a4-) d8 |
 \dblg g'4 a'8 \gg a'4. |
-\thrd d4.( )d4 f8 |
+\thrd d4.( d4-) f8 |
 
 \break
-\dblg g'4 e4 \dblf [f8. e16] |
-\thrd d4.( )d4 \cg d8 |
+\dblg g'4 e4 \dblf  f8.-[ e16] |
+\thrd d4.( d4-) \cg d8 |
 \gg c4 e8 \thrd d4.( |
-)d4. \gdcg d4.
+d4.-) \gdcg d4.
   }
 }
 %% new-chords-done %%
diff --git a/input/test/beam-abbrev.ly b/input/test/beam-abbrev.ly
index 11b2e2a8fd..e70dc2d2ee 100644
--- a/input/test/beam-abbrev.ly
+++ b/input/test/beam-abbrev.ly
@@ -3,9 +3,9 @@
   \context Voice \notes\relative c {
     c'1:16 
 	\stemUp
-	c4:8 c4:16 [c8:16 c:] [c,8:16 c'':]
+	c4:8 c4:16  c8:16-[ c:]  c,8:16-[ c'':]
 	\stemBoth
-	[c,,8:16 c'':]
+	 c,,8:16-[ c'':]
 	
   }
   \paper { }  
diff --git a/input/test/beam-chord.ly b/input/test/beam-chord.ly
index 24b98de26e..5055730d8f 100644
--- a/input/test/beam-chord.ly
+++ b/input/test/beam-chord.ly
@@ -12,12 +12,12 @@ texidoc = "Hmm. what's this supposed to test?"
 			       ,Beam::shift_region_to_valid
 	
 			      )
-		[a'8 <<a' g''>>]
-		[c <<c e,>>]
-		[a'16 <<a' g''>>]
-		[c <<c e,>>]
-		[a'32 <<a' g''>>]
-		[c <<c e,>>]
+		 a'8-[ <<a' g''>>]
+		 c-[ <<c e,>>]
+		 a'16-[ <<a' g''>>]
+		 c-[ <<c e,>>]
+		 a'32-[ <<a' g''>>]
+		 c-[ <<c e,>>]
 	}
 	\paper{
 
diff --git a/input/test/beam-control.ly b/input/test/beam-control.ly
index 9db8d01abf..029ca3c88c 100644
--- a/input/test/beam-control.ly
+++ b/input/test/beam-control.ly
@@ -6,16 +6,16 @@
     \context Voice \notes\relative c {
 	%% from upper staffline (position 4) to centre (position 0)
 	\property Voice.Beam \override #'positions = #'(2 . 0)
-	[c'8 c] 
+	 c'8-[ c] 
 	
 	%% from center to one above centre (position 2)
 	\property Voice.Beam \override #'positions = #'(0 . 1)
-	[c c]
+	 c-[ c]
 	
 	%% normal beam-algorithm
 	\property Voice.Beam \revert #'positions
 	\property Voice.Beam \revert #'positions
-	[c e] [e c]
+	 c-[ e]  e-[ c]
   }
 }
 %% new-chords-done %%
diff --git a/input/test/beam-damp.ly b/input/test/beam-damp.ly
index 7cd4a5da6e..47697a19af 100644
--- a/input/test/beam-damp.ly
+++ b/input/test/beam-damp.ly
@@ -6,17 +6,17 @@ texidoc = "Beams are less steep than the notes they encompass. "
 \score{
 	\notes\relative c''{
 %		\stemUp
-%		[a16 b b c]
-%		[c b b a]
+%		 a16-[ b b c]
+%		 c-[ b b a]
 %		\stemDown
-%		[c b b a]
-%		[a b b c]
+%		 c-[ b b a]
+%		 a-[ b b c]
 		\stemUp
-		[g16 a b c]
-		[c b a g]
+		 g16-[ a b c]
+		 c-[ b a g]
 		\stemDown
-		[d' c b a]
-		[a b c d]
+		 d'-[ c b a]
+		 a-[ b c d]
 	}
 	\paper{
 		raggedright = ##t
diff --git a/input/test/beam-dir-function.ly b/input/test/beam-dir-function.ly
deleted file mode 100644
index 73a21e09cc..0000000000
--- a/input/test/beam-dir-function.ly
+++ /dev/null
@@ -1,65 +0,0 @@
-\version "1.7.16"
-
-\header{
-  texidoc="
-
-There are several ways to calculate the direction of a beam
-
-@table @samp
-@item majority
-number count of up or down notes
-@item mean
-mean centre distance of all notes
-@item median
-mean centre distance weighted per note
-@end table
-
-These beam direction functions are defined in @file{scm/beam.scm}.  If
-your favourite algorithm isn't one of these, you can hook up your own.
-
-Of course, this depends on the neutral-direction for the middle line,
-down by default.  We set that to 1 (up) in the lower staff."  }
-
-\score {
-  \context PianoStaff <
-    \context Staff \notes \relative c'' {
-      \property Voice.Beam \set #'dir-function = #beam-dir-majority
-      [c8^"down" g]
-      \property Voice.Beam \set #'dir-function = #beam-dir-mean
-      [c^"up" g] 
-      \property Voice.Beam \set #'dir-function = #beam-dir-median
-      [c^"up" g]
-      
-      \time 3/8
-      \property Voice.Beam \set #'dir-function = #beam-dir-majority
-      [c8^"down" c g]
-      \property Voice.Beam \set #'dir-function = #beam-dir-mean
-      [c^"down" c g] 
-      \property Voice.Beam \set #'dir-function = #beam-dir-median
-      [c^"up" c g]
-    }
-    \context Staff=lower \notes \relative c'' {
-      \property Voice.Beam \set #'neutral-direction = #1
-      \property Voice.Beam \set #'dir-function = #beam-dir-majority
-      [d8_"up" a]
-      \property Voice.Beam \set #'dir-function = #beam-dir-mean
-      [d_"down" a] 
-      \property Voice.Beam \set #'dir-function = #beam-dir-median
-      [d_"down" a]
-      
-      \property Voice.Beam \set #'dir-function = #beam-dir-majority
-      \time 3/8
-      [d8_"up" a a]
-      \property Voice.Beam \set #'dir-function = #beam-dir-mean
-      [d_"up" a a] 
-      \property Voice.Beam \set #'dir-function = #beam-dir-median
-      [d_"down" a a] 
-
-    }
-  >
-}
-
-%% Local variables:
-%% LilyPond-indent-level:2
-%% End:
-%% new-chords-done %%
diff --git a/input/test/beam-dir.ly b/input/test/beam-dir.ly
index 22e03fae7a..676849cddf 100644
--- a/input/test/beam-dir.ly
+++ b/input/test/beam-dir.ly
@@ -2,7 +2,7 @@
 
 \score { 
   \context Voice \notes\relative c {
-    [b''16 a]
+     b''16-[ a]
 	
   }
   \paper { }  
diff --git a/input/test/beam-isknee.ly b/input/test/beam-isknee.ly
index 10ea7124a8..318d754124 100644
--- a/input/test/beam-isknee.ly
+++ b/input/test/beam-isknee.ly
@@ -7,7 +7,7 @@
 	\context Staff=two \notes\relative c'{
 		\clef bass
 % no knee
-		\stemUp [c8 \translator Staff=one \stemDown g'16 f]
+		\stemUp  c8-[ \translator Staff=one \stemDown g'16 f]
 		s8
 		s2
 	}
diff --git a/input/test/beam-neutral-direction.ly b/input/test/beam-neutral-direction.ly
index 0fc8246c77..9a394e77ef 100644
--- a/input/test/beam-neutral-direction.ly
+++ b/input/test/beam-neutral-direction.ly
@@ -2,9 +2,9 @@
 
 
 fragment = \notes {
-  [b''8 b]
+   b''8-[ b]
   \property Voice.Beam \set #'neutral-direction = #-1
-  [b b]
+   b-[ b]
 }
 
 \paper { raggedright = ##t} 
diff --git a/input/test/beam-pos.ly b/input/test/beam-pos.ly
index faf22f47b1..2d84fad29b 100644
--- a/input/test/beam-pos.ly
+++ b/input/test/beam-pos.ly
@@ -12,18 +12,18 @@ TestedFeatures =	 "beam quant positions"
 
 \score{
 	\notes\relative c' { 
-		[c8 c] [a'' a]
-		[a, a] [c c]
-		[d,8 d] [g' g]
-		[g, g] [d' d]
-		[c,16 c c c] [a'' a a a]
-		[a, a a a] [c c c c]
+		 c8-[ c]  a''-[ a]
+		 a,-[ a]  c-[ c]
+		 d,8-[ d]  g'-[ g]
+		 g,-[ g]  d'-[ d]
+		 c,16-[ c c c]  a''-[ a a a]
+		 a,-[ a a a]  c-[ c c c]
 		\break
-		[c,32 c c c c c c c] [a'' a a a a a a a]
-		[f, f f f f f f f] [e' e e e e e e e]
+		 c,32-[ c c c c c c c]  a''-[ a a a a a a a]
+		 f,-[ f f f f f f f]  e'-[ e e e e e e e]
 		\break
-		[c,8 d] [a'' g]
-		[g, f] [d' e]
+		 c,8-[ d]  a''-[ g]
+		 g,-[ f]  d'-[ e]
 		\break
 	}
 	\paper{
diff --git a/input/test/beam-position.ly b/input/test/beam-position.ly
index 0c2e465d32..6e910483fb 100644
--- a/input/test/beam-position.ly
+++ b/input/test/beam-position.ly
@@ -3,7 +3,7 @@
 
 fragment = \notes {
   \property Voice.Beam \set #'positions = #'(4 . 0)
-  [c'8 c]
+   c'8-[ c]
 }
 
 \paper { raggedright = ##t} 
diff --git a/input/test/beam-rest.ly b/input/test/beam-rest.ly
index 6aff8caea1..7271fd0763 100644
--- a/input/test/beam-rest.ly
+++ b/input/test/beam-rest.ly
@@ -8,9 +8,9 @@ Beams over rests.
 
 \score{
         \context Staff=one \notes\relative c''{
-	  r4 [r8 g a]
-	  [bes8 r16 f g a]
-	  [bes8 r16 \property Voice.stemLeftBeamCount = #1 f g a]
+	  r4  r8-[ g a]
+	   bes8-[ r16 f g a]
+	   bes8-[ r16 \property Voice.stemLeftBeamCount = #1 f g a]
     }
 
     \paper{
diff --git a/input/test/beam-second.ly b/input/test/beam-second.ly
index 24634a7464..40e27863da 100644
--- a/input/test/beam-second.ly
+++ b/input/test/beam-second.ly
@@ -1,15 +1,19 @@
 \version "1.7.16"
 \header{
-  texidoc=""
+  texidoc="
+
+TODO: what's this for?
+
+"
 }
 \score{
     \notes\relative c''{
 	\stemUp
-	[b8 c]
-	[b16 c]
-	[a' b]
+	 b8-[ c]
+	 b16-[ c]
+	 a'-[ b]
     }
     \paper{
-	linewidth = 0.0
+	raggedright = ##t
     }
 }%% new-chords-done %%
diff --git a/input/test/beam-stem-test.ly b/input/test/beam-stem-test.ly
index 0ab55cc27c..85f862adc5 100644
--- a/input/test/beam-stem-test.ly
+++ b/input/test/beam-stem-test.ly
@@ -5,9 +5,9 @@
 	
 \score {
   \context RhythmicStaff \notes {
-    \stemUp [c8 c]
-    \stemDown [c8 c]
-    \stemUp [c8. c16]
+    \stemUp  c8-[ c]
+    \stemDown  c8-[ c]
+    \stemUp  c8.-[ c16]
   }
   \paper {
     raggedright = ##t
diff --git a/input/test/beam-suspect.ly b/input/test/beam-suspect.ly
index 8d22949bc3..c735720eb1 100644
--- a/input/test/beam-suspect.ly
+++ b/input/test/beam-suspect.ly
@@ -3,14 +3,14 @@
 \score{
 	\notes\relative c'{
 		\stemUp
-		[f8 a' g f]
-		[c8 g'16 f]
-		[c8 e16 d]
-		[a16 b c d]
-		[d16 c b a]
+		 f8-[ a' g f]
+		 c8-[ g'16 f]
+		 c8-[ e16 d]
+		 a16-[ b c d]
+		 d16-[ c b a]
 		\stemDown
-		[c16 b a g]
-		[g16 a b c]
+		 c16-[ b a g]
+		 g16-[ a b c]
 	}
 	\paper{
 		raggedright = ##t
diff --git a/input/test/beams.ly b/input/test/beams.ly
index 18882aefdd..ca23994fb7 100644
--- a/input/test/beams.ly
+++ b/input/test/beams.ly
@@ -15,53 +15,53 @@ TestedFeatures = 	 "beams and beamflags"
 \context Staff = SA		\notes\transpose c c { 
 
 			\time 8/4
-			\stemUp [c8 c'' a' f']
-			\stemUp [c16 c'' a' f']
-			\stemUp [c32 c'' a' f']
-			\stemUp [c64 c'' a' f']
-			\stemUp [c128 c'' a' f']
+			\stemUp  c8-[ c'' a' f']
+			\stemUp  c16-[ c'' a' f']
+			\stemUp  c32-[ c'' a' f']
+			\stemUp  c64-[ c'' a' f']
+			\stemUp  c128-[ c'' a' f']
 			r32
 
-			\stemUp [g8 g g g]
-			\stemUp [g16 g g g]
-			\stemUp [g32 g g g]
-			\stemUp [g64 g g g]
-			\stemUp [g128 g g g]
+			\stemUp  g8-[ g g g]
+			\stemUp  g16-[ g g g]
+			\stemUp  g32-[ g g g]
+			\stemUp  g64-[ g g g]
+			\stemUp  g128-[ g g g]
 			r32
 
 						\transpose c' c{
 			\stemBoth
-			[c'8 c'] [b b] [a a] [g g] [f f] [e e]
-			[c'16 c'] [b b] [a a] [g g]  [f f] [e e]
-			[c'32 c'] [b b] [a a] [g g] [f f] [e e]
-			[c'64 c'] [e e]}
+			 c'8-[ c']  b-[ b]  a-[ a]  g-[ g]  f-[ f]  e-[ e]
+			 c'16-[ c']  b-[ b]  a-[ a]  g-[ g]   f-[ f]  e-[ e]
+			 c'32-[ c']  b-[ b]  a-[ a]  g-[ g]  f-[ f]  e-[ e]
+			 c'64-[ c']  e-[ e]}
 		}
 	>
 	<	
 \context Staff = SB		\notes { 
 \transpose c c {
 			\time 8/4
-			\stemDown [a'8 a, c e]
-			\stemDown [a'16 a, c e]
-			\stemDown [a'32 a, c e]
-			\stemDown [a'64 a, c e]
-			\stemDown [a'128 a, c e]
+			\stemDown  a'8-[ a, c e]
+			\stemDown  a'16-[ a, c e]
+			\stemDown  a'32-[ a, c e]
+			\stemDown  a'64-[ a, c e]
+			\stemDown  a'128-[ a, c e]
 			r32}
 
 			\transpose c' c{
-			\stemDown [d''8 d'' d'' d'']
-			\stemDown [d''16 d'' d'' d'']
-			\stemDown [d''32 d'' d'' d'']
-			\stemDown [d''64 d'' d'' d'']
-			\stemDown [d''128 d'' d'' d'']
+			\stemDown  d''8-[ d'' d'' d'']
+			\stemDown  d''16-[ d'' d'' d'']
+			\stemDown  d''32-[ d'' d'' d'']
+			\stemDown  d''64-[ d'' d'' d'']
+			\stemDown  d''128-[ d'' d'' d'']
 			r32}
 
 			\transpose c c'{
 			\stemBoth
-			[a8 a] [b b] [c' c'] [d' d'] [e' e'] [f' f']
-			[a16 a] [b b] [c' c'] [d' d']  [e' e'] [f' f']
-			[a32 a] [b b] [c' c'] [d' d']  [e' e'] [f' f']
-			[a64 a] [f' f']} 
+			 a8-[ a]  b-[ b]  c'-[ c']  d'-[ d']  e'-[ e']  f'-[ f']
+			 a16-[ a]  b-[ b]  c'-[ c']  d'-[ d']   e'-[ e']  f'-[ f']
+			 a32-[ a]  b-[ b]  c'-[ c']  d'-[ d']   e'-[ e']  f'-[ f']
+			 a64-[ a]  f'-[ f']} 
 		}
 	>
 	>
diff --git a/input/test/broken.ly b/input/test/broken.ly
index 17f00449fb..9f36429b22 100644
--- a/input/test/broken.ly
+++ b/input/test/broken.ly
@@ -9,25 +9,25 @@ TestedFeatures = 	 "This file tests Feta embedded slurs" +
 
 
 shortlong =  \notes{
-	c4()c( c c  |
+	c4(c-)( c c  |
 	c c c c |
 	c c c c |
 	\break
-	c c c )c |
+	c c c c-) |
 }
 
 broken =  \notes\transpose c c'{
 
-      c c c c()
       c c c c(
-      c )c c c(
-      c c )c c(
-      )a' a' a' a'()
+      c-) c c c(
+      c c-) c c(
+      c c c-) c(
+      a'-) a' a' a'()
       a' a' a' a'()
-      c( c c )c 
-      c( c c )f,
-      f,( c c )c 
-      f,( c c )f,
+      c( c c c-) 
+      c( c c f,-)
+      f,( c c c-) 
+      f,( c c f,-)
 }
 
 \score{
diff --git a/input/test/cue-notes.ly b/input/test/cue-notes.ly
index 1bf1e0989a..962832ab6b 100644
--- a/input/test/cue-notes.ly
+++ b/input/test/cue-notes.ly
@@ -29,7 +29,7 @@ usually not restored explicitly."
 	\property Voice.Beam \override #'space-function =
 	   #(lambda (beam mult) (* 0.8 (Beam::space_function beam mult)))
 
-	r8^"Bsn." c'8 [f'8 f'8]
+	r8^"Bsn." c'8  f'8-[ f'8]
        \property Staff.fontSize\unset
        \property Staff . Clef = \turnOff
        \clef treble
diff --git a/input/test/default-neutral-dir.ly b/input/test/default-neutral-dir.ly
index 35d5c6c8e5..af672f822c 100644
--- a/input/test/default-neutral-dir.ly
+++ b/input/test/default-neutral-dir.ly
@@ -7,8 +7,8 @@ directly@code{neutral-direction}
 
 \paper { raggedright = ##t}
 \score {\notes \relative c {
-  [b''8 b]
+   b''8-[ b]
   \property Voice.Beam \set #'neutral-direction = #-1
-  [b b]
+   b-[ b]
 }}
 %% new-chords-done %%
diff --git a/input/test/diverse-spacing.ly b/input/test/diverse-spacing.ly
index b110f6e63f..62fd7e3e61 100644
--- a/input/test/diverse-spacing.ly
+++ b/input/test/diverse-spacing.ly
@@ -7,7 +7,7 @@
 \relative c'{ 
   g'8. c16 es8. d16 c8. bes32 as g8. c,16
   es4 r8 es |
-  [d es f g as c ]
+   d-[ es f g as c ]
   b4 g r
 }
 
diff --git a/input/test/divisiones.ly b/input/test/divisiones.ly
index c9eed6921d..8804440adf 100644
--- a/input/test/divisiones.ly
+++ b/input/test/divisiones.ly
@@ -19,26 +19,26 @@ Choices are @code{divisioMinima}, @code{divisioMaior}
 	    \property Voice.TextScript \set #'padding = #3
 	    \property Staff.BarLine \override #'transparent = ##t
 	    \property Voice.Stem \override #'transparent = ##t
-            g4( )a g e( )f e
+            g4( a-) g e( f-) e
             ^\markup { "divisio minima" }
 	    \divisioMinima
-            g4( )a g e( )f e
+            g4( a-) g e( f-) e
             ^\markup { "divisio maior" }
 	    \divisioMaior
-            g4( )a g e( )f e
+            g4( a-) g e( f-) e
             ^\markup { "divisio maxima" }
 	    \divisioMaxima
-            g4( )a g e( )f e
+            g4( a-) g e( f-) e
             ^\markup { "finalis" }
 	    \finalis
-            g4( )a g e( )f e
+            g4( a-) g e( f-) e
 
             ^\markup { "virgula" }
 	    \virgula
-            g4( )a g e( )f e
+            g4( a-) g e( f-) e
             ^\markup { "caesura" }
 	    \caesura
-            g4( )a g e( )f e
+            g4( a-) g e( f-) e
 	}
 	\context Lyrics = lyrics \lyrics {
 	    Blah blub, blah blam.
diff --git a/input/test/drarn-slurs.ly b/input/test/drarn-slurs.ly
index e8c599ad70..1a108bd697 100644
--- a/input/test/drarn-slurs.ly
+++ b/input/test/drarn-slurs.ly
@@ -9,7 +9,7 @@ Slurs can be forced to always attach to note heads.
 fragment = \notes {
   \property Voice.Slur \set #'direction = #1
   \property Voice.Slur \set #'attachment = #'(head . head)
-  g''16()g()g()g()d'()d()d()d
+  g''16(g-)(g-)(g-)(d'-)(d-)(d-)(d-)
 }
 
 \paper { raggedright = ##t} 
diff --git a/input/test/drarn.ly b/input/test/drarn.ly
index 1d55a9b9e4..fee2f852b0 100644
--- a/input/test/drarn.ly
+++ b/input/test/drarn.ly
@@ -8,14 +8,14 @@
       \property Voice.Tie \set #'direction = #1
       \property Voice.Slur \set #'direction = #1
       \property Voice.Slur \set #'attachment = #'(head . head)
-      c8~c()c  
+      c8~c(c-)  
     }
     \context Voice=two \relative c'' {
       \property Voice.Stem \set #'direction = #-1
       \property Voice.Tie \set #'direction = #-1
       \property Voice.Slur \set #'direction = #-1
       \property Voice.Slur \set #'attachment = #'(head . head)
-      a8()a~a  
+      a8(a-)-~a  
     }
   >
   \paper { linewidth = 40*\staffspace } 
diff --git a/input/test/grace-end.ly b/input/test/grace-end.ly
index 900fd63735..4196ae29eb 100644
--- a/input/test/grace-end.ly
+++ b/input/test/grace-end.ly
@@ -3,7 +3,7 @@
 \score { 
   \context Voice \notes\relative c {
     
-	c4 \grace { [d16 d16] }
+	c4 \grace {  d16-[ d16] }
 	
   }
   \paper { }  
diff --git a/input/test/hymn.ly b/input/test/hymn.ly
index 83a9a3cbff..4ef856b0b7 100644
--- a/input/test/hymn.ly
+++ b/input/test/hymn.ly
@@ -5,13 +5,13 @@
 		\time 4/4
 		\context Voice=one \partcombine Voice
 			\context Thread=one \notes\relative c'' {
-				a4 c4.()g8 a4 |
-				g4 e' g()f | 
+				a4 c4.(g8-) a4 |
+				g4 e' g(f-) | 
 				b, a c2
 			}
 			\context Thread=two \notes\relative c'' {
-				g4 e4.()d8 c4 |
-				g'4 c, e()f |
+				g4 e4.(d8-) c4 |
+				g'4 c, e(f-) |
 				d2 a
 			}
 	>
diff --git a/input/test/improv.ly b/input/test/improv.ly
index eed79346ae..b023d624f9 100644
--- a/input/test/improv.ly
+++ b/input/test/improv.ly
@@ -19,9 +19,9 @@ global = \notes { s1*3 \bar "|." }
     \context Staff \notes <
       \context SquashVoice = impro { \global }
       \context Voice = melo \transpose c c' {
-	e8 e g a a16()bes()a8 g \improOn e8
+	e8 e g a a16(bes-)(a8-) g \improOn e8
 	~e2~e8 f4 fis8
-	~fis2 \improOff a16()bes a8 g e
+	~fis2 \improOff a16(bes-) a8 g e
       }
     >
   >
diff --git a/input/test/incipit.ly b/input/test/incipit.ly
index 0d7095eeb7..fad4076cb9 100644
--- a/input/test/incipit.ly
+++ b/input/test/incipit.ly
@@ -34,7 +34,7 @@ violin =  \notes\relative c''{
   \clef treble
 
   a4. b8 c4 fis |
-  gis~ gis8 fis16^\trill ()e b8 c \context Staff<{\voiceOne a d}{\voiceTwo es,4}>|
+  gis~ gis8 fis16^\trill (e-) b8 c \context Staff<{\voiceOne a d}{\voiceTwo es,4}>|
 }
 
 BC  = \notes\relative c{
diff --git a/input/test/knee-mult.ly b/input/test/knee-mult.ly
index 15b6af878b..fc206e6262 100644
--- a/input/test/knee-mult.ly
+++ b/input/test/knee-mult.ly
@@ -7,7 +7,7 @@
 	\context Staff=two \notes\relative c'{
 		\clef bass
 % no knee
-		\stemUp [c8 \translator Staff=one \stemDown g'16 f]
+		\stemUp  c8-[ \translator Staff=one \stemDown g'16 f]
 		s8
 		s2
 	}
diff --git a/input/test/knee-sym.ly b/input/test/knee-sym.ly
index cf65ab29cf..d8778705bf 100644
--- a/input/test/knee-sym.ly
+++ b/input/test/knee-sym.ly
@@ -1,8 +1,8 @@
 \version "1.7.16"
 \score{
     \notes\relative c'{
-	[a8 b'' a,, b'']
-	[b8 a,, b'' a,,]
+	 a8-[ b'' a,, b'']
+	 b8-[ a,, b'' a,,]
 	\stemUp [ b8 \stemDown b'']
     }
     \paper{
diff --git a/input/test/knee.ly b/input/test/knee.ly
index b4accf30e5..f5b1d4df80 100644
--- a/input/test/knee.ly
+++ b/input/test/knee.ly
@@ -3,9 +3,9 @@
 \score{
 	\notes\relative c'{
 	        \property Voice.Beam \override #'auto-knee-gap = ##f
-		[c16 \stemDown c'' \stemBoth c,, d]
-		\stemDown [d'' a \stemBoth c,, g,]
-		\stemUp [g c' \stemBoth a'' d']
+		 c16-[ \stemDown c'' \stemBoth c,, d]
+		\stemDown  d''-[ a \stemBoth c,, g,]
+		\stemUp  g-[ c' \stemBoth a'' d']
 	}
 }
 %% new-chords-done %%
diff --git a/input/test/lyric-extender.ly b/input/test/lyric-extender.ly
index adf2ed985d..45ae0eeeeb 100644
--- a/input/test/lyric-extender.ly
+++ b/input/test/lyric-extender.ly
@@ -1,7 +1,7 @@
 \version "1.7.16"
 \score{
 	<
-	\context Staff \notes { c () c () c c }
+	\context Staff \notes { c (c-) (c-) c }
 	\context Lyrics \lyrics { bla __ alb xxx __ yyy }
 	>
 }
diff --git a/input/test/lyric-hyphen.ly b/input/test/lyric-hyphen.ly
index 7f418bb32d..20ee300fb6 100644
--- a/input/test/lyric-hyphen.ly
+++ b/input/test/lyric-hyphen.ly
@@ -1,7 +1,7 @@
 \version "1.7.16"
 \score{
 	<
-	\context Staff \notes { c' () c' () c' c' }
+	\context Staff \notes { c' (c'-) (c'-) c' }
 	\context Lyrics \context LyricsVoice \lyrics { bla -- alb xxx -- yyy }
 	>
 }
diff --git a/input/test/lyric-phrasing.ly b/input/test/lyric-phrasing.ly
index 9c90102b79..7e5cde7b93 100644
--- a/input/test/lyric-phrasing.ly
+++ b/input/test/lyric-phrasing.ly
@@ -13,7 +13,7 @@ copyright = 	 "public domain"
 m = \notes  \relative c'' {
 	\property Staff.automaticMelismata = ##t
 	\autoBeamOff
-	g4  r8 \times 2/3 { g'8( f )e } r8 \grace { [d16 c b] } e4
+	g4  r8 \times 2/3 { g'8( f e-) } r8 \grace {  d16-[ c b] } e4
 	\emptyText
 	d8.^"melisma" 	\melisma c16
 	\melismaEnd
diff --git a/input/test/multi-slope.ly b/input/test/multi-slope.ly
index 8c1074d2b1..7b13eb84b1 100644
--- a/input/test/multi-slope.ly
+++ b/input/test/multi-slope.ly
@@ -2,10 +2,9 @@
 
 \score { 
   \context Voice \notes\relative c {
-    		[c8 c16 c16]
+    		 c8-[ c16 c16]
 	
   }
   \paper { }  
-  \midi { }
 }
 %% new-chords-done %%
diff --git a/input/test/pedal.ly b/input/test/pedal.ly
index 8423f74108..3246ae753f 100644
--- a/input/test/pedal.ly
+++ b/input/test/pedal.ly
@@ -12,7 +12,7 @@ Text style, bracket style, and a mixture of both are supported.  "
 
 	c4 d e f g
 	-\sustainDown b c
-	c, [d16  c  c c] [e e -\sustainUp -\sustainDown e e ] f4 -\sustainUp 
+	c,  d16-[  c  c c]  e-[ e -\sustainUp -\sustainDown e e ] f4 -\sustainUp 
 	g-\sustainDown  b -\sustainUp c 
 	\property Staff.pedalSustainStrings = #'("-" "-P" "P")
 	\property Staff.SustainPedal \override #'padding = #-2
@@ -21,7 +21,7 @@ Text style, bracket style, and a mixture of both are supported.  "
 
 	\property Staff.SustainPedal \override #'pedal-type = #'bracket
 
-	c4 d e -\sustainDown b c c, -\sustainUp -\sustainDown [d8 c] [e8 e -\sustainUp -\sustainDown] f4 d
+	c4 d e -\sustainDown b c c, -\sustainUp -\sustainDown  d8-[ c]  e8-[ e -\sustainUp -\sustainDown] f4 d
 	-\sustainUp g -\sustainDown b b, -\sustainUp c'
 
 	\property Staff.UnaCordaPedal \override #'pedal-type = #'mixed
diff --git a/input/test/phrasing-slur-height.ly b/input/test/phrasing-slur-height.ly
index dd3a7a3b50..37279b3a46 100644
--- a/input/test/phrasing-slur-height.ly
+++ b/input/test/phrasing-slur-height.ly
@@ -7,8 +7,8 @@
 \score {
     \context Staff = melody \notes\relative c''{
 	\property Staff.PhrasingSlur \override #'height-limit = #8.0
-	c8 \( (d e ) f g ( a b ) c
-	| c ( b a ) g f ( e d )\) c
+	c8 \( (d e f-) g ( a b c-)
+	| c ( b a g-) f ( e d c-)-\)
     }
     \paper {
     }
diff --git a/input/test/scripts.ly b/input/test/scripts.ly
index ec51beed51..8916c72868 100644
--- a/input/test/scripts.ly
+++ b/input/test/scripts.ly
@@ -45,20 +45,20 @@ blah =  	\notes{ \transpose c c' {
 	b,---. c---. d---. e---. f---. g---. a---. b---. c'---.
 	\stemBoth
       \time 4/4
-	[c8 \< d e \! f][d' \> e' f' \! g'] 
-	[c-> \< d-> e-> \! f->][d'-> \> e'-> f'-> \! g'->] 
-	[c-^ \< d-^ e-^ \! f-^][d'-^ \> e'-^ f'-^ \! g'-^] 
-	[c-. \< d-. e-. \! f-.][d'-. \> e'-. f'-. \! g'-.]
-	[c-- \< d-- e-- \! f--][d'-- \> e'-- f'-- \! g'--] 
-	[c-\tenuto \< d-\tenuto e-\tenuto \! f-\tenuto]
-		[d'-\tenuto \> e'-\tenuto f'-\tenuto \! g'-\tenuto]
-	[c-\upbow \< d-\upbow e-\upbow \! f-\upbow]
-		[d'-\upbow \> e'-\upbow f'-\upbow \! g'-\upbow] 
-	[c-| \< d-| e-| \! f-|][d'-| \> e'-| f'-| \! g'-|]
-	[c-\fermata \< d-\fermata e-\fermata \! f-\fermata]
-		[d'-\fermata \> e'-\fermata f'-\fermata \! g'-\fermata] 
-	[c-\lheel \< d-\lheel e-\lheel \! f-\lheel]
-		[d'-\lheel \> e'-\lheel f'-\lheel \! g'-\lheel]
+	 c8-[ \< d e \! f] d'-[ \> e' f' \! g'] 
+	 c-[-> \< d-> e-> \! f->] d'-[-> \> e'-> f'-> \! g'->] 
+	 c-[-^ \< d-^ e-^ \! f-^] d'-[-^ \> e'-^ f'-^ \! g'-^] 
+	 c-[-. \< d-. e-. \! f-.] d'-[-. \> e'-. f'-. \! g'-.]
+	 c-[-- \< d-- e-- \! f--] d'-[-- \> e'-- f'-- \! g'--] 
+	 c-[-\tenuto \< d-\tenuto e-\tenuto \! f-\tenuto]
+		 d'-[-\tenuto \> e'-\tenuto f'-\tenuto \! g'-\tenuto]
+	 c-[-\upbow \< d-\upbow e-\upbow \! f-\upbow]
+		 d'-[-\upbow \> e'-\upbow f'-\upbow \! g'-\upbow] 
+	 c-[-| \< d-| e-| \! f-|] d'-[-| \> e'-| f'-| \! g'-|]
+	 c-[-\fermata \< d-\fermata e-\fermata \! f-\fermata]
+		 d'-[-\fermata \> e'-\fermata f'-\fermata \! g'-\fermata] 
+	 c-[-\lheel \< d-\lheel e-\lheel \! f-\lheel]
+		 d'-[-\lheel \> e'-\lheel f'-\lheel \! g'-\lheel]
 
 }}
 
diff --git a/input/test/simple-slur-endings.ly b/input/test/simple-slur-endings.ly
index 5db14608c3..3701dcb6a4 100644
--- a/input/test/simple-slur-endings.ly
+++ b/input/test/simple-slur-endings.ly
@@ -2,11 +2,11 @@
 
 \score{
 	\notes \relative c''{
-		\slurUp c()a d()g,\break
-		\slurDown c()a d()g,\break
-		\slurUp a()c d()g,\break
-		\slurDown a()c d()g,\break
-		\slurDown a()c d()g,\break
+		\slurUp c(a-) d(g,-)\break
+		\slurDown c(a-) d(g,-)\break
+		\slurUp a(c-) d(g,-)\break
+		\slurDown a(c-) d(g,-)\break
+		\slurDown a(c-) d(g,-)\break
 	}
 	\paper{
 		indent = 0.0
diff --git a/input/test/sketch.ly b/input/test/sketch.ly
index bdd3db4337..c0935d1a94 100644
--- a/input/test/sketch.ly
+++ b/input/test/sketch.ly
@@ -6,11 +6,11 @@ texidoc="sketch output supported features"
   \notes\relative c''' {
 % doesn't work yet  
 %    \time 3/4
-    a4( a a a )a
+    a4( a a a a-)
     \stemDown
-    a,8( b c )d
+    a,8( b c d-)
     \stemUp
-    \slurDown d16( c b )a
+    \slurDown d16( c b a-)
   }
 }
 %% new-chords-done %%
diff --git a/input/test/sleur.ly b/input/test/sleur.ly
index 16f0a55c54..e5940f40a9 100644
--- a/input/test/sleur.ly
+++ b/input/test/sleur.ly
@@ -9,154 +9,154 @@ TestedFeatures = 	 "This file tests Feta embedded slurs" +
 
 
 shortlong =  \notes{
-	c4()c( c c  |
+	c4(c-)( c c  |
 	c c c c |
 	c c c c |
 	\break
-	c c c )c |
+	c c c c-) |
 }
 
 dirs =  \notes\transpose c c {
 
-	c'1() g' () c () g () c |
+	c'1(g'-) (c-) (g-) (c-) |
 }
 over =  \notes\transpose c c{
 
 
-	e( g' g' )e
-	e( a' a' )e
-	e( b' b' )e
-	e( c'' c'' )e
+	e( g' g' e-)
+	e( a' a' e-)
+	e( b' b' e-)
+	e( c'' c'' e-)
 	\stemUp
-	e( c' c' )e
-	e( d' d' )e
-	e( e' e' )e
-	e( c'' c'' )e
+	e( c' c' e-)
+	e( d' d' e-)
+	e( e' e' e-)
+	e( c'' c'' e-)
 	\stemBoth
-	e( f' b' )e
-	e( b' f' )e
-	e( e'' g' )e
-	e( g' e'' )e
+	e( f' b' e-)
+	e( b' f' e-)
+	e( e'' g' e-)
+	e( g' e'' e-)
 	\stemUp
-	e( d' b )e
-	e( b d' )e
-	e( f' c'' )e
-	e( c'' f )e
+	e( d' b e-)
+	e( b d' e-)
+	e( f' c'' e-)
+	e( c'' f e-)
 }
 
 under =  \notes\transpose c c{
 	\stemDown 
-	f'( \stemBoth d d \stemDown )f'
-	f'( \stemBoth c c \stemDown )f'
-	f'( \stemBoth b, b, \stemDown )f'
-	f'( \stemBoth a, a, \stemDown )f'
+	f'( \stemBoth d d \stemDown f'-)
+	f'( \stemBoth c c \stemDown f'-)
+	f'( \stemBoth b, b, \stemDown f'-)
+	f'( \stemBoth a, a, \stemDown f'-)
 	\stemDown
-	f'( a a )f'
-	f'( g g )f'
-	f'( f f )f'
-	f'( a, a, )f'
+	f'( a a f'-)
+	f'( g g f'-)
+	f'( f f f'-)
+	f'( a, a, f'-)
 
 	\stemDown 
-	f'( \stemBoth d b, \stemDown )f'
-	f'( \stemBoth b, d \stemDown )f'
-	f'( \stemBoth d, b, \stemDown )f'
-	f'( \stemBoth b, d, \stemDown )f'
+	f'( \stemBoth d b, \stemDown f'-)
+	f'( \stemBoth b, d \stemDown f'-)
+	f'( \stemBoth d, b, \stemDown f'-)
+	f'( \stemBoth b, d, \stemDown f'-)
 	\stemDown
-	f'( f a )f'
-	f'( a f )f'
-	f'( f e, )f'
-	f'( e, f )f'
+	f'( f a f'-)
+	f'( a f f'-)
+	f'( f e, f'-)
+	f'( e, f f'-)
 }
 
 eccentric =  \notes\transpose c c{
 	\stemUp
-	\times 4/7 { f( a' f f f f )f } |
-	\times 4/7 { f( f f f f a' )f } |
+	\times 4/7 { f( a' f f f f f-) } |
+	\times 4/7 { f( f f f f a' f-) } |
 	\stemDown
-	\times 4/7 { e'( c e' e' e' e' )e' } |
-	\times 4/7 { e'( e' e' e' e' c )e' } |
+	\times 4/7 { e'( c e' e' e' e' e'-) } |
+	\times 4/7 { e'( e' e' e' e' c e'-) } |
 }
 
 tiltup =  \notes\transpose c c{
-	e( c'' c'' )e'
+	e( c'' c'' e'-)
 	\stemUp
-	e( c'' c'' )e'
+	e( c'' c'' e'-)
 	\stemBoth
-	e( g' e'' )e'
+	e( g' e'' e'-)
 	\stemUp
-	e( c'' f )e'
+	e( c'' f e'-)
 	\stemDown 
-	f'( \stemBoth a, a, \stemDown )f''
+	f'( \stemBoth a, a, \stemDown f''-)
 	\stemDown
-	f'( a, a, )f''
+	f'( a, a, f''-)
 }
 
 tiltdown =  \notes\transpose c c{
-	e'( c'' c'' )e
+	e'( c'' c'' e-)
 	\stemUp
-	e'( c'' c'' )e
+	e'( c'' c'' e-)
 	\stemBoth
-	e'( g' e'' )e
+	e'( g' e'' e-)
 	\stemUp
-	e'( c'' f )e
+	e'( c'' f e-)
 	\stemDown 
-	f''( \stemBoth a, a, \stemDown )f'
+	f''( \stemBoth a, a, \stemDown f'-)
 	\stemDown
-	f''( a, a, )f'
+	f''( a, a, f'-)
 }
 
 broken =  \notes\transpose c c'{
       c c c c()
       c c c c(
-      c )c c c(
-      c c )c c(
-      )a' a' a' a'()
+      c c-) c c(
+      c c c-) c(
+      a'-) a' a' a'()
       a' a' a' a'()
-      c( c c )c 
-      c( c c )f, 
-      f,( c c )c 
-      f,( c c )f,
+      c( c c c-) 
+      c( c c f,-) 
+      f,( c c c-) 
+      f,( c c f,-)
 }
 
 blend = 	\notes\transpose c c{
-	e( c'' c'' )e
+	e( c'' c'' e-)
 	\stemUp
-	f'( c'' c'' )f'
-	e( c'' c'' )e
+	f'( c'' c'' f'-)
+	e( c'' c'' e-)
 	\stemDown
-	f'( \stemBoth a, a, \stemDown )f'
-	f'( a, a, )f'
+	f'( \stemBoth a, a, \stemDown f'-)
+	f'( a, a, f'-)
 
 	\stemBoth
-	e( c'' c'' )e'
-	e'( c'' c'' )e
-	d( d d )d
+	e( c'' c'' e'-)
+	e'( c'' c'' e-)
+	d( d d d-)
 
 	\stemDown
-	e( c'' c'' )e'
-	e'( c'' c'' )e
-	d( d d )d
+	e( c'' c'' e'-)
+	e'( c'' c'' e-)
+	d( d d d-)
 }
 
 
 bug =  \notes\transpose c c{
 
-	a()g( f )e
-	b'()a'( g' )f'
-	g( f' e' )d'
-	f f( g )a
-	c' () b () c' c'
+	a(g-)( f e-)
+	b'(a'-)( g' f'-)
+	g( f' e' d'-)
+	f f( g a-)
+	c' (b-) (c'-) c'
 }
 
 clipping =  \notes\transpose c c{
 	\stemBoth
-	c( c''' c''')c
-	c( c''' c )c''
-	c''( c c''' )c
+	c( c''' c'''c-)
+	c( c''' c c''-)
+	c''( c c''' c-)
 	\stemDown
-	c( \stemUp c,,, c,,, \stemDown )c
-	c( \stemUp c,,, c \stemDown )c,,
-	c,,( \stemUp c c,,, \stemDown )c
+	c( \stemUp c,,, c,,, \stemDown c-)
+	c( \stemUp c,,, c \stemDown c,,-)
+	c,,( \stemUp c c,,, \stemDown c-)
 }
 
 \score{
diff --git a/input/test/slur-area.ly b/input/test/slur-area.ly
index 9ee6e9da6e..e31111c3b0 100644
--- a/input/test/slur-area.ly
+++ b/input/test/slur-area.ly
@@ -5,21 +5,21 @@
 
 \slurUp
 \stemDown
-a(a' a,)a
-a(a a')a,
-a(d a)a
-a(a d)a
+a(a' a, a-)
+a(a a' a,-)
+a(d a a-)
+a(a d a-)
 
-e'8(e e e e e e)e
-a,8(d a a a a a)a
-a(a a a a a d)a
+e'8(e e e e e e e-)
+a,8(d a a a a a a-)
+a(a a a a a d a-)
 
-c,(g' c e f d b)g 
-c,(g' c e f d b)g 
+c,(g' c e f d b g-) 
+c,(g' c e f d b g-) 
 
 \property Voice.autoBeaming = ##f
 \stemUp
-a8(a a a a a a)a
+a8(a a a a a a a-)
 
 }
 \paper{
diff --git a/input/test/slur-attachment-override.ly b/input/test/slur-attachment-override.ly
index 7d14124718..1ad321bd0e 100644
--- a/input/test/slur-attachment-override.ly
+++ b/input/test/slur-attachment-override.ly
@@ -11,9 +11,9 @@ fragment = \notes {
   \property Voice.autoBeaming = ##f
   \property Voice.Stem \set #'direction = #1
   \property Voice.Slur \set #'direction = #1
-  d'32( f'4 )d8..
+  d'32( f'4  d8..-)
   \property Voice.Slur \set #'attachment = #'(stem . stem)
-  d,32( f'4 )d8.
+  d,32( f'4  d8.-)
 }
 
 \paper { raggedright = ##t} 
diff --git a/input/test/slur-attachment.ly b/input/test/slur-attachment.ly
index d02d468525..cc3be8d50b 100644
--- a/input/test/slur-attachment.ly
+++ b/input/test/slur-attachment.ly
@@ -4,11 +4,11 @@
 fragment = \notes {
   \property Voice.Slur \set #'direction = #1
   \property Voice.Stem \set #'length = #5.5
-  g''8(g)g4
-  g4(g8)g
+  g''8(g g4-)
+  g4(g8 g-)
   \property Voice.Slur \set #'attachment = #'(stem . stem)
-  g8(g)g4
-  g4(g8)g
+  g8(g g4-)
+  g4(g8 g-)
 }
 
 \paper { raggedright = ##t} 
diff --git a/input/test/slur-broken-cross-staff.ly b/input/test/slur-broken-cross-staff.ly
index 2a957b8a36..b59fd5c479 100644
--- a/input/test/slur-broken-cross-staff.ly
+++ b/input/test/slur-broken-cross-staff.ly
@@ -12,33 +12,33 @@ linebreak.
 	\context Staff=one \notes\relative c'{
 %{
 		\stemUp \slurUp
-		 c4( c \translator Staff=two c )c |
+		 c4( c \translator Staff=two c  c-) |
 		\translator Staff=one
 		\stemUp \slurUp
-		 c4( c \translator Staff=two c )c |
+		 c4( c \translator Staff=two c  c-) |
 		\stemUp \slurUp
-		 c4( c \translator Staff=one c )c |
+		 c4( c \translator Staff=one c  c-) |
 		\translator Staff=two
 		\stemUp \slurUp
-		 c4( c \translator Staff=one c )c |
+		 c4( c \translator Staff=one c  c-) |
 		\translator Staff=two
 		\stemUp \slurUp
-		 c4( \translator Staff=one c c )c |
+		 c4( \translator Staff=one c c  c-) |
 %}
 		r2
 		\translator Staff=two
 		\stemUp \slurUp
 		 c4( \translator Staff=one c
 		   \break
-		c )c
+		c  c-)
 		r2
 
 %{
 		\stemDown \slurDown
-		 d4( \translator Staff=two c c \translator Staff=one )d
+		 d4( \translator Staff=two c c \translator Staff=one  d-)
 		\translator Staff=two
 		\stemUp \slurUp
-		 c4( \translator Staff=one c c \translator Staff=two )c
+		 c4( \translator Staff=one c c \translator Staff=two  c-)
 		r1
 %}
 	}
diff --git a/input/test/slur-broken.ly b/input/test/slur-broken.ly
index 2dfc71b014..a1b4b2f238 100644
--- a/input/test/slur-broken.ly
+++ b/input/test/slur-broken.ly
@@ -5,10 +5,10 @@
 		\time 2/4
 		e2(
 		\break
-		)e4 f,(\break
-		)f4 f(\break
+		 e4-) f,(\break
+		 f4-) f(\break
 		a2\break
-		)e'2
+		 e'2-)
 	}
 	\paper{
 		linewidth = 60.\mm
diff --git a/input/test/slur-damping.ly b/input/test/slur-damping.ly
index 3664a20145..de801a60c5 100644
--- a/input/test/slur-damping.ly
+++ b/input/test/slur-damping.ly
@@ -5,7 +5,7 @@
 \score{
 	\notes\relative c'{
 
-		c'()b' ~ b, c
+		c'(b'-)-~ b, c
 		c c c c
 		c c c c
 		c c c c
diff --git a/input/test/slur-dash.ly b/input/test/slur-dash.ly
index 145913db38..337ae1006b 100644
--- a/input/test/slur-dash.ly
+++ b/input/test/slur-dash.ly
@@ -3,15 +3,15 @@
 
 \score{
 	\notes{
-		c( d e )c |
+		c( d e  c-) |
 		\slurDotted
-		c( d e )c |
+		c( d e  c-) |
 		\slurSolid
-		c( d e )c |
+		c( d e  c-) |
 		\property Voice. Slur \set #'dashed = #0.0
-		c( d e )c |
+		c( d e  c-) |
 		\slurSolid
-		c( d e )c |
+		c( d e  c-) |
 	}
 	\paper{ 
 	      indent = 0.0\pt
diff --git a/input/test/slur-follow-music.ly b/input/test/slur-follow-music.ly
index f18d3af1bc..667a805f5a 100644
--- a/input/test/slur-follow-music.ly
+++ b/input/test/slur-follow-music.ly
@@ -3,15 +3,15 @@
 \score { 
   \context Voice \notes\relative c {
     % CASE 3
-	d''4 ( ) b a ( ) e' \break
-	g,( \stemDown ) b \stemBoth c ( ) f, \break
+	d''4 (  b-) a (  e'-) \break
+	g,( \stemDown  b-) \stemBoth c (  f,-) \break
 	
 	% no adjusting...
-	\stemUp [d'8 ( b a] \stemBoth ) e' \break
-	\stemUp [g,8 ( b d] \stemBoth ) c \break
+	\stemUp  d'8-[ ( b a] \stemBoth  e'-) \break
+	\stemUp  g,8-[ ( b d] \stemBoth  c-) \break
 	
 	% still ugly
-	g4 ( b d ) c \break
+	g4 ( b d  c-) \break
 	
 	%TIES
 	d ~ b a ~ e' \break
diff --git a/input/test/slur-mininum.ly b/input/test/slur-mininum.ly
index 07b8be4766..1fcacddd48 100644
--- a/input/test/slur-mininum.ly
+++ b/input/test/slur-mininum.ly
@@ -7,7 +7,7 @@ texidoc = ""
 	\notes\relative c''{
 		\time 2/4
 		\property Voice.Slur \set #'minimum-length = #40
-		c()c
+		c(c-)
 		c~c\break
 		}
 }
diff --git a/input/test/slur-positions.ly b/input/test/slur-positions.ly
index 3f2a8d7c4b..dfa1b24cd0 100644
--- a/input/test/slur-positions.ly
+++ b/input/test/slur-positions.ly
@@ -3,13 +3,13 @@
 \score{
 	\notes\relative c''{
 		\slurUp
-		a2 () a\break
+		a2 (a-)\break
 		\slurDown
-		a2 () a\break
+		a2 (a-)\break
 		\slurUp
-		c2 () c\break
+		c2 (c-)\break
 		\slurDown
-		c2 () c\break
+		c2 (c-)\break
 
 	}
 	\paper{
diff --git a/input/test/slur-proof.ly b/input/test/slur-proof.ly
index ba0fe50d96..4dd0f8d9b2 100644
--- a/input/test/slur-proof.ly
+++ b/input/test/slur-proof.ly
@@ -8,33 +8,33 @@ x = {
 
 \score {
     \context Staff \notes\relative c <
-    \context Voice=va { \x f()f }
-    \context Voice=vb { \x g(s4)g }
-    \context Voice=vc { \x a(s4*2)a }
-    \context Voice=vd { \x b(s4*3)b }
-    \context Voice=ve { \x c(s4*4)c }
-    \context Voice=vf { \x d(s4*5)d }
-    \context Voice=vg { \x e(s4*6)e }
-    \context Voice=vh { \x f(s4*7)f }
-    \context Voice=vi { \x g(s4*8)g }
-    \context Voice=vj { \x a(s4*9)a }
-    \context Voice=vk { \x b(s4*10)b }
-    \context Voice=vl { \x c(s4*11)c }
-    \context Voice=vm { \x d(s4*12)d }
-    \context Voice=vn { \x e(s4*13)e }
-    \context Voice=vo { \x f(s4*14)f }
-    \context Voice=vp { \x g(s4*15)g }
-    \context Voice=vq { \x a(s4*16)a }
-    \context Voice=vr { \x b(s4*17)b }
-    \context Voice=vs { \x c(s4*18)c }
-    \context Voice=vt { \x d(s4*19)d }
-    \context Voice=vu { \x e(s4*20)e }
-    \context Voice=vv { \x f(s4*21)f }
-    \context Voice=vw { \x g(s4*22)g }
-    \context Voice=vx { \x a(s4*23)a }
-    \context Voice=vy { \x b(s4*24)b }
-    \context Voice=vz { \x c(s4*25)c }
-    \context Voice=wa { \x d(s4*26)d }
+    \context Voice=va { \x f(f-) }
+    \context Voice=vb { \x g(s4g-) }
+    \context Voice=vc { \x a(s4*2a-) }
+    \context Voice=vd { \x b(s4*3b-) }
+    \context Voice=ve { \x c(s4*4c-) }
+    \context Voice=vf { \x d(s4*5d-) }
+    \context Voice=vg { \x e(s4*6e-) }
+    \context Voice=vh { \x f(s4*7f-) }
+    \context Voice=vi { \x g(s4*8g-) }
+    \context Voice=vj { \x a(s4*9a-) }
+    \context Voice=vk { \x b(s4*10b-) }
+    \context Voice=vl { \x c(s4*11c-) }
+    \context Voice=vm { \x d(s4*12d-) }
+    \context Voice=vn { \x e(s4*13e-) }
+    \context Voice=vo { \x f(s4*14f-) }
+    \context Voice=vp { \x g(s4*15g-) }
+    \context Voice=vq { \x a(s4*16a-) }
+    \context Voice=vr { \x b(s4*17b-) }
+    \context Voice=vs { \x c(s4*18c-) }
+    \context Voice=vt { \x d(s4*19d-) }
+    \context Voice=vu { \x e(s4*20e-) }
+    \context Voice=vv { \x f(s4*21f-) }
+    \context Voice=vw { \x g(s4*22g-) }
+    \context Voice=vx { \x a(s4*23a-) }
+    \context Voice=vy { \x b(s4*24b-) }
+    \context Voice=vz { \x c(s4*25c-) }
+    \context Voice=wa { \x d(s4*26d-) }
   >
   \paper {
     indent=0.0\mm
diff --git a/input/test/slur-symmetry-2.ly b/input/test/slur-symmetry-2.ly
index b60d1dd036..79c43b38e7 100644
--- a/input/test/slur-symmetry-2.ly
+++ b/input/test/slur-symmetry-2.ly
@@ -6,10 +6,10 @@ title="symmetry"
 }
 \score{
 	\notes\relative c'{
-		[g'8( e )c' g,]
-		[d'( f' )a, a]
-		[d( f )a, d']
-		[g,( e, )c' c]
+		 g'8-[( e  c'-) g,]
+		 d'-[( f'  a,-) a]
+		 d-[( f  a,-) d']
+		 g,-[( e,  c'-) c]
 	}
 	\paper{
 
diff --git a/input/test/slur-symmetry-3.ly b/input/test/slur-symmetry-3.ly
index aa93523930..2e800a85e0 100644
--- a/input/test/slur-symmetry-3.ly
+++ b/input/test/slur-symmetry-3.ly
@@ -1,18 +1,21 @@
 \version "1.7.16"
 
 \header{
-% should look the same
-title="symmetry"
+title="symmetry.
+
+Both slurs should look the same.
+
+"
 }
+
 \score{
 	\notes\relative c'{
-		[g'8( e )c' g,] r2
+		[g'8( e  c'-) g,] r2
 		\break
-		[d''8( f )a, d'] r2
+		[d''8( f  a,-) d'] r2
 	}
 	\paper{
-
-		linewidth = 50.0\mm
+	raggedright = ##t
 	}
 }
 %% new-chords-done %%
diff --git a/input/test/slur-ugly.ly b/input/test/slur-ugly.ly
index 13ca21e0f3..f206ea092e 100644
--- a/input/test/slur-ugly.ly
+++ b/input/test/slur-ugly.ly
@@ -6,7 +6,7 @@ texidoc="You can get ugly slurs, if you want.
 }
 
 baseWalk = \notes \relative c {
-  d,8( a' d f a d f d a f d )a
+  d,8( a' d f a d f d a f d  a-)
 }
 
 \score {
diff --git a/input/test/spacing-2.ly b/input/test/spacing-2.ly
index 65a1e2fe2e..033813c5e4 100644
--- a/input/test/spacing-2.ly
+++ b/input/test/spacing-2.ly
@@ -18,11 +18,11 @@ source =  "Petits Preludes et Fugues.  Urtext. Editions Henry Lemoine, Paris."
 		\context Voice = VA { \stemUp\slurUp\tieUp
 			e4 dis4 e2 }
 		\context Voice = VB { \stemDown\slurDown\tieDown
-			[cis8 a] [fis b] gis2 }
+			 cis8-[ a]  fis-[ b] gis2 }
 		{\key e \major }
 		>
 	\context Staff = SB { \clef "bass" \key e \major
-		[a,,16 e dis e] [b'8 b,] [e16 e, gis b] e4
+		 a,,16-[ e dis e]  b'8-[ b,]  e16-[ e, gis b] e4
 	} 
 > 
 
diff --git a/input/test/spacing.ly b/input/test/spacing.ly
index e4f00289c7..f09974b417 100644
--- a/input/test/spacing.ly
+++ b/input/test/spacing.ly
@@ -17,70 +17,70 @@ multipart =  \notes \relative c'{
                    c c 
                 }
                 \context Staff = two \context Voice { 
-                   [c8 c] 
-                   [c c] 
-                   [c c] [c c] 
+                    c8-[ c] 
+                    c-[ c] 
+                    c-[ c]  c-[ c] 
                 }
                 \context Staff = three \context Voice { 
-                   \times 2/3 { [c8 c c] } 
-                   \times 2/3 { [c  c c] } 
-                   \times 2/3 { [c  c c] }
-		   \times 2/3 { [c c c] } 
+                   \times 2/3 {  c8-[ c c] } 
+                   \times 2/3 {  c-[  c c] } 
+                   \times 2/3 {  c-[  c c] }
+		   \times 2/3 {  c-[ c c] } 
                 }
                 \context Staff = four \context Voice { 
-                   \times 2/4 { [c8 c c c] }
-                   \times 2/4 { [c  c c c] } 
-                   \times 2/4 { [c  c c c] } \times 2/4 { [c c c c] } 
+                   \times 2/4 {  c8-[ c c c] }
+                   \times 2/4 {  c-[  c c c] } 
+                   \times 2/4 {  c-[  c c c] } \times 2/4 {  c-[ c c c] } 
                 }
                 \context Staff = five \context Voice { 
-                   \times 2/5 { [c8 c c c c] } 
-                   \times 2/5 { [c  c c c c] } 
-                   \times 2/5 { [c  c c c c] } \times 2/5 { [c c c c c] } 
+                   \times 2/5 {  c8-[ c c c c] } 
+                   \times 2/5 {  c-[  c c c c] } 
+                   \times 2/5 {  c-[  c c c c] } \times 2/5 {  c-[ c c c c] } 
 		}
                 \context Staff = six \context Voice { 
-                   \times 2/6 { [c8 c c c c c] } 
-                   \times 2/6 { [c  c c c c c] } 
-                   \times 2/6 { [c  c c c c c] } \times 2/6 { [c c c c c c] } 
+                   \times 2/6 {  c8-[ c c c c c] } 
+                   \times 2/6 {  c-[  c c c c c] } 
+                   \times 2/6 {  c-[  c c c c c] } \times 2/6 {  c-[ c c c c c] } 
                 }
                 \context Staff = seven \context Voice { 
-                   \times 2/7 { [c8 c c c c c c] } 
-                   \times 2/7 { [c  c c c c c c] } 
-                   \times 2/7 { [c  c c c c c c] } 
-		   \times 2/7 { [c  c c c c c c] } 
+                   \times 2/7 {  c8-[ c c c c c c] } 
+                   \times 2/7 {  c-[  c c c c c c] } 
+                   \times 2/7 {  c-[  c c c c c c] } 
+		   \times 2/7 {  c-[  c c c c c c] } 
                 }
                 \context Staff = eight \context Voice { 
-                   \times 2/8 { [c8 c c c c c c c] } 
-                   \times 2/8 { [c  c c c c c c c] } 
-                   \times 2/8 { [c  c c c c c c c] } 
-		   \times 2/8 { [c  c c c c c c c] } 
+                   \times 2/8 {  c8-[ c c c c c c c] } 
+                   \times 2/8 {  c-[  c c c c c c c] } 
+                   \times 2/8 {  c-[  c c c c c c c] } 
+		   \times 2/8 {  c-[  c c c c c c c] } 
 		}
                 \context Staff = nine  \context Voice { 
-                   \times 2/9 { [c8 c c c c c c c c] } 
-                   \times 2/9 { [c  c c c c c c c c] } 
-                   \times 2/9 { [c  c c c c c c c c] } 
-		   \times 2/9 { [c  c c c c c c c c] } 
+                   \times 2/9 {  c8-[ c c c c c c c c] } 
+                   \times 2/9 {  c-[  c c c c c c c c] } 
+                   \times 2/9 {  c-[  c c c c c c c c] } 
+		   \times 2/9 {  c-[  c c c c c c c c] } 
 		}
                 \context Staff = ten  \context Voice { 
-                   \times 2/10 { [c8 c c c c c c c c c] } 
-                   \times 2/10 { [c  c c c c c c c c c] } 
-                   \times 2/10 { [c  c c c c c c c c c] } 
-		   \times 2/10 { [c  c c c c c c c c c] } 
+                   \times 2/10 {  c8-[ c c c c c c c c c] } 
+                   \times 2/10 {  c-[  c c c c c c c c c] } 
+                   \times 2/10 {  c-[  c c c c c c c c c] } 
+		   \times 2/10 {  c-[  c c c c c c c c c] } 
 		}
                 \context Staff = eleven  \context Voice { 
-                   \times 2/11 { [c8 c c c c c c c c c c] } 
-                   \times 2/11 { [c  c c c c c c c c c c] } 
-                   \times 2/11 { [c  c c c c c c c c c c] } 
-		   \times 2/11 { [c  c c c c c c c c c c] } 
+                   \times 2/11 {  c8-[ c c c c c c c c c c] } 
+                   \times 2/11 {  c-[  c c c c c c c c c c] } 
+                   \times 2/11 {  c-[  c c c c c c c c c c] } 
+		   \times 2/11 {  c-[  c c c c c c c c c c] } 
                 }
             >
 	}
 
 singlepart =  \notes{ 
 	c4 d e f
-	c4 d e [f8 f]
-	c4 d e f8 [f16 f]
-	c4 d e f8 f16 [f32 f]
-	c4 d e f8 f16 f32 [f64 f]
+	c4 d e  f8-[ f]
+	c4 d e f8  f16-[ f]
+	c4 d e f8 f16  f32-[ f]
+	c4 d e f8 f16 f32  f64-[ f]
 	c4 c4 c4 c4
 	
     }
diff --git a/input/test/staff-line-leading.ly b/input/test/staff-line-leading.ly
index 946179a2f6..28c3f2e3ea 100644
--- a/input/test/staff-line-leading.ly
+++ b/input/test/staff-line-leading.ly
@@ -6,10 +6,12 @@
 \score { 
   \notes \relative c'' \context GrandStaff <
 	\context Staff = up { c4 c4  }
-	\context Staff = down {  c4
-	  [<<c d f g>>8
+	\context Staff = down {
+	    c4
+
+	    <<c d f g>>8-[
 	   e]
-	  [f c']
+	   f-[ c']
 	 }
 >
 \paper {  \translator  {
diff --git a/input/test/staff-size.ly b/input/test/staff-size.ly
index ba2c18f073..7294c91cfd 100644
--- a/input/test/staff-size.ly
+++ b/input/test/staff-size.ly
@@ -15,7 +15,7 @@ are two options: using StaffContainer and override/revert, or
 	\dynamicUp\stemDown
 
 	%\key gis \major
-	c8 d [e f g a] b c -\ff
+	c8 d  e-[ f g a] b c -\ff
   }
 
 \context Staff = SB { \dynamicDown c,,4 -\ff c c c  }
diff --git a/input/test/stem-extend.ly b/input/test/stem-extend.ly
index ba251243f6..4ea6f8ae33 100644
--- a/input/test/stem-extend.ly
+++ b/input/test/stem-extend.ly
@@ -9,6 +9,6 @@ extension can be controlled through @code{Voice.Stem}'s grob-property
 \score {\notes \relative c \context Voice {
   \grace a'8 a4
   \property Voice.Stem \set #'no-stem-extend = ##t
-  \grace g8 g4 [g8 g]
+  \grace g8 g4  g8-[ g]
 }}
 %% new-chords-done %%
diff --git a/input/test/tablature-hammer.ly b/input/test/tablature-hammer.ly
index 9b82239135..9f78869f4d 100644
--- a/input/test/tablature-hammer.ly
+++ b/input/test/tablature-hammer.ly
@@ -6,9 +6,9 @@ texidoc = ""
 \score{
   \context TabStaff <
 	\notes\relative c''{
-		c()d
-		d()d
-		d()c
+		c(d-)
+		d(d-)
+		d(c-)
   }
   >
 }
diff --git a/input/test/timing.ly b/input/test/timing.ly
index fa0f466637..528bb7fd53 100644
--- a/input/test/timing.ly
+++ b/input/test/timing.ly
@@ -7,7 +7,7 @@
 	% \property Score. measurePosition = #(ly:make-moment -1 4)
 	\partial 4
 	c''4 c4 c4 c2 c1
-	\cadenzaOn [c8 d e f] [g a b c b c b c]
+	\cadenzaOn  c8-[ d e f]  g-[ a b c b c b c]
 	\cadenzaOff
 	c4 c4 c4 c4
 	\property Score. measureLength = #(ly:make-moment 5 4)
diff --git a/input/test/trills.ly b/input/test/trills.ly
index 0dd3e93ae6..55ac7864fa 100644
--- a/input/test/trills.ly
+++ b/input/test/trills.ly
@@ -66,9 +66,9 @@ endHorizScript = {
 %}
 	\endHorizScript
         \time  2/2 \slurDown
-	<{c2}{s4 \invisible d1*1/4 ( \visible }> ) e2
-	<{a,2}{s4 \invisible b1*1/4 ( \visible }> ) d2
-	<{a2}{s4 \invisible b1*1/4 ( \visible }> ) d2
+	<{c2}{s4 \invisible d1*1/4 ( \visible }>  e2-)
+	<{a,2}{s4 \invisible b1*1/4 ( \visible }>  d2-)
+	<{a2}{s4 \invisible b1*1/4 ( \visible }>  d2-)
 	\time 3/4
 	d2^\prallup e4
       }
@@ -106,7 +106,7 @@ endHorizScript = {
 	d8~[\repeat unfold 4 { d32 c }]
 	d32 c b c \repeat unfold 4 { d32 c }
 	b32 c d c \repeat unfold 4 { d32 c }
-	[c32( b a16 b )c] [b32 c d c \repeat unfold 4 { d32 c }]
+	 c32-[( b a16 b  c-)]  b32-[ c d c \repeat unfold 4 { d32 c }]
       }
     >
   >
diff --git a/input/test/two-slurs.ly b/input/test/two-slurs.ly
index 26ccb22684..3f450f6139 100644
--- a/input/test/two-slurs.ly
+++ b/input/test/two-slurs.ly
@@ -8,11 +8,11 @@
 	\context Staff <
 		\context Voice=v \notes\relative c''{
 			\stemUp
-			a4 c4.()g8 a4
+			a4 c4.(g8-) a4
 		}
 		\context Voice=u \notes\relative c''{
 			\stemDown
-			g4 e4.()d8 c4
+			g4 e4.(d8-) c4
 		}
 	>
 	\paper{
diff --git a/input/test/vertical-text.ly b/input/test/vertical-text.ly
index 9ef1d243f3..ec76473282 100644
--- a/input/test/vertical-text.ly
+++ b/input/test/vertical-text.ly
@@ -2,13 +2,13 @@
 \score{
 	<
 		\context Staff = o \notes\relative c,,, { 
-			\stemDown [c8 c c c] c4 c4 \break [c8 c c c] c4 c4
+			\stemDown  c8-[ c c c] c4 c4 \break  c8-[ c c c] c4 c4
 		}
 		\context Lyrics \lyrics{
 			BLA gag _2 < { BLA gag } { BLA gag la } > _2 
 		}
 		\context Staff = t \notes\relative c''''' { 
-			\stemUp [c8 c c c] c4 c [c8 c c c] c4 c
+			\stemUp  c8-[ c c c] c4 c  c8-[ c c c] c4 c
 		} 
 	>
 	\paper{
diff --git a/input/test/voice-switch.ly b/input/test/voice-switch.ly
index f7507e2828..7f1e8b41ff 100644
--- a/input/test/voice-switch.ly
+++ b/input/test/voice-switch.ly
@@ -10,8 +10,8 @@
 				c2 c2
 			}
 			\context Thread=two \notes\relative c'' {
-				b2 a4 () a
-				a2 a4 () a
+				b2 a4 (a-)
+				a2 a4 (a-)
 				
 			}
 	>
diff --git a/input/test/voicify-chords.ly b/input/test/voicify-chords.ly
deleted file mode 100644
index 2e3460e6a6..0000000000
--- a/input/test/voicify-chords.ly
+++ /dev/null
@@ -1,66 +0,0 @@
-\version "1.7.16"
-  
-#(define (voicify-list lst number)
-   "Make a list of Musics.
-
-   voicify-list :: [ [Music ] ] -> number -> [Music]
-   LST is a list music-lists.
-"
-
-   (if (null? lst) '()
-       (cons (context-spec-music
-	      (make-sequential-music
-	       (list
-		(make-voice-props-set number)
-		(make-simultaneous-music (car lst))))
-
-	      "Voice"  (number->string number))
-	      (voicify-list (cdr lst) (+ number 1))
-       ))
-   )
-
-#(define (voicify-chord ch)
-  "Split the parts of a chord into different Voices using separator"
-   (let* ((es (ly:get-mus-property ch 'elements)))
-
-
-     (ly:set-mus-property! ch 'elements
-       (voicify-list (split-list es music-separator?) 0))
-     ch
-   ))
-
-#(define (voicify-music m)
-   "Recursively split chords that are separated with \\ "
-   
-   (if (not (ly:music? m))
-       (begin (display m)
-       (error "not music!"))
-       )
-   (let*
-       ((es (ly:get-mus-property m 'elements))
-	(e (ly:get-mus-property m 'element))
-	)
-	
-     (if
-      (and (equal? (ly:music-name m) "Simultaneous_music")
-	   (reduce (lambda (x y ) (or x y)) 	(map music-separator? es)))
-      (voicify-chord m)
-      (begin
-	(if (pair? es)
-	    (ly:set-mus-property! m 'elements (map voicify-music es)))
-	(if (ly:music? e)
-	    (ly:set-mus-property! m 'element  (voicify-music e)))
-	    
-	m)
-      
-      )
-     ))
-
-\score { \notes \context Staff \relative c'' 
-\apply #voicify-music {
-   c4   <g' \\ c, \\ f \\ d > f g < c \\ d> a 
-}
-}
-
-
-%% new-chords-done %%
diff --git a/input/test/volta-start.ly b/input/test/volta-start.ly
index bb13832432..33cde4613f 100644
--- a/input/test/volta-start.ly
+++ b/input/test/volta-start.ly
@@ -15,7 +15,7 @@ voiceB =  \notes {
      \property Staff.instr = "B"
      \key f \minor 
      \time 4/4  
-    f,2 (   ) f,8    r8   f8    e8    
+    f,2 (    f,8-)    r8   f8    e8    
     \repeat  volta 2
     {
          d8.    d16    e8.    f16    f8    c8    c16    c8.    \break
@@ -23,11 +23,11 @@ voiceB =  \notes {
     \alternative
     {
         { 	
-	    f,2 (   ) f,8    r8   f8    e8 
-	    f,2 (   ) f,8    r8   f8    e8 
+	    f,2 (    f,8-)    r8   f8    e8 
+	    f,2 (    f,8-)    r8   f8    e8 
 	    g1 \break   
-	    f,2 (   ) f,8    r8   f8    e8 
-	    f,2 (   ) f,8    r8   f8    e8 
+	    f,2 (    f,8-)    r8   f8    e8 
+	    f,2 (    f,8-)    r8   f8    e8 
 	    g1 \break   
 	}
         {   
@@ -44,7 +44,7 @@ voiceC =  \notes {
     }
     \alternative
     {
-        {	a2 (   ) a8    r8   a8    bes8    }
+        {	a2 (    a8-)    r8   a8    bes8    }
         {	a2.    r8   g16    f16      |
      	d'8.   c'16   c'8.   d'16   c'8   c'8   c'16    c'8.    |
         }
diff --git a/input/test/volta.ly b/input/test/volta.ly
index ec40c4c378..f8342180db 100644
--- a/input/test/volta.ly
+++ b/input/test/volta.ly
@@ -11,15 +11,15 @@ voiceE =  \notes {
  \property Staff.instr = "B"
 % \property Staff.VoltaBracket = \turnOff
 
- \time 4/4  f,2 (   ) f,8    r8   f8    e8    
+ \time 4/4  f,2 (    f,8-)    r8   f8    e8    
 \repeat  volta 2
 {
  d8.    d16    e8.    f16    f8    c8    c16    c8. 
 }
 \alternative
 {
-    {   f,2 (   ) f,8    r8   f8    e8 ( \break   }
-    {   ) f,2.    r8   c16    c16      |
+    {   f,2 (    f,8-)    r8   f8    e8 ( \break   }
+    {    f,2.-)    r8   c16    c16      |
     }
 }
 }
diff --git a/input/tutorial/flowing.ly b/input/tutorial/flowing.ly
index e9baa5cd3c..769d992483 100644
--- a/input/tutorial/flowing.ly
+++ b/input/tutorial/flowing.ly
@@ -10,8 +10,8 @@
 melody = \notes \relative c' {
         \partial 8
         g8 |
-        c4 c8 d es-[ ( d-]-) c4 | f4 f8 g es-(-[ d-)-] c g |
-        c4 c8 d es-[ ( d-]-) c4 | d4 es8 d c4.
+        c4 c8 d es-[-( d-]-) c4 | f4 f8 g es-(-[ d-)-] c g |
+        c4 c8 d es-[-( d-]-) c4 | d4 es8 d c4.
         \bar "|."
 }
 
@@ -22,8 +22,8 @@ text = \lyrics {
 
 accompaniment =\chords {
         r8
-        c2:3- f:3-.7 d:m es4 c8:m r8
-        c2:m f:m7 g:7^3.5 c:m }
+        c2:m f:m7 d:m es4 c8:m r8
+        c2:m f:m7 g:7 c:m }
 
 \score {
         \simultaneous {
@@ -33,7 +33,6 @@ accompaniment =\chords {
           \addlyrics
              \context Staff = mel
              {	\property Staff.autoBeaming = ##f
-		\property Staff.automaticMelismata = ##t
           	\melody }
              \context Lyrics \text
         }
diff --git a/lily/accidental-engraver.cc b/lily/accidental-engraver.cc
index 4e94fc2d99..68ea213eb1 100644
--- a/lily/accidental-engraver.cc
+++ b/lily/accidental-engraver.cc
@@ -134,7 +134,7 @@ number_accidentals (SCM sig, Music * note, Pitch *pitch, SCM curbarnum, SCM lazy
   if (ignore_octave_b)
     prev = ly_assoc_cdr (scm_int2num (n), sig);
   else
-    prev = gh_assoc (gh_cons (scm_int2num (o), scm_int2num (n)), sig);
+    prev = scm_assoc (gh_cons (scm_int2num (o), scm_int2num (n)), sig);
 
   /* should really be true unless prev == SCM_BOOL_F */
   if (gh_pair_p (prev) && gh_pair_p (ly_cdr (prev)))
@@ -146,7 +146,7 @@ number_accidentals (SCM sig, Music * note, Pitch *pitch, SCM curbarnum, SCM lazy
   /* If an accidental was not found or the accidental was too old */
   if (prev == SCM_BOOL_F ||
       (gh_number_p (lazyness) && curbarnum_i > accbarnum_i + gh_scm2int (lazyness)))
-    prev = gh_assoc (scm_int2num (n), sig);
+    prev = scm_assoc (scm_int2num (n), sig);
 
 
   SCM prev_acc = (prev == SCM_BOOL_F) ? scm_int2num (0) : ly_cdr (prev);
diff --git a/lily/ambitus.cc b/lily/ambitus.cc
index 2a3a29f23b..a4864d6b29 100644
--- a/lily/ambitus.cc
+++ b/lily/ambitus.cc
@@ -71,7 +71,7 @@ number_accidentals (SCM key_signature, Pitch *pitch,
   if (ignore_octave_b)
     prev = ly_assoc_cdr (scm_int2num (notename), key_signature);
   else
-    prev = gh_assoc (gh_cons (scm_int2num (octave), scm_int2num (notename)),
+    prev = scm_assoc (gh_cons (scm_int2num (octave), scm_int2num (notename)),
 		     key_signature);
 
   /* should really be true unless prev == SCM_BOOL_F */
@@ -82,7 +82,7 @@ number_accidentals (SCM key_signature, Pitch *pitch,
 
   /* If an accidental was not found */
   if (prev == SCM_BOOL_F)
-    prev = gh_assoc (scm_int2num (notename), key_signature);
+    prev = scm_assoc (scm_int2num (notename), key_signature);
 
   SCM prev_acc = (prev == SCM_BOOL_F) ? scm_int2num (0) : ly_cdr (prev);
   int sig_alteration = gh_number_p (prev_acc) ? gh_scm2int (prev_acc) : 0;
diff --git a/lily/auto-beam-engraver.cc b/lily/auto-beam-engraver.cc
index 6dc65ddfb3..2a05a239fb 100644
--- a/lily/auto-beam-engraver.cc
+++ b/lily/auto-beam-engraver.cc
@@ -153,23 +153,23 @@ Auto_beam_engraver::test_moment (Direction dir, Moment test_mom)
     }
 
   /* second guess: property generic time exception */
-  SCM m = gh_assoc (gh_append3 (function, wild, time), settings);
+  SCM m = scm_assoc (gh_append3 (function, wild, time), settings);
   
   if (m != SCM_BOOL_F && unsmob_moment (ly_cdr (m)))
     moment = * unsmob_moment (ly_cdr (m));
 
   /* third guess: property time exception, specific for duration type */
-  m = gh_assoc (gh_append3 (function, type, time), settings);
+  m = scm_assoc (gh_append3 (function, type, time), settings);
   if (m != SCM_BOOL_F && unsmob_moment (ly_cdr (m)))
     moment = * unsmob_moment (ly_cdr (m));
 
   /* fourth guess [user override]: property plain generic */
-  m = gh_assoc (gh_append3 (function, wild, wild), settings);
+  m = scm_assoc (gh_append3 (function, wild, wild), settings);
   if (m != SCM_BOOL_F && unsmob_moment (ly_cdr (m)))
     moment = * unsmob_moment (ly_cdr (m));
 
   /* fifth guess [user override]: property plain, specific for duration type */
-  m = gh_assoc (gh_append3 (function, type, wild), settings);
+  m = scm_assoc (gh_append3 (function, type, wild), settings);
   if (m != SCM_BOOL_F && unsmob_moment (ly_cdr (m)))
     moment = * unsmob_moment (ly_cdr (m));
   
diff --git a/lily/beam-engraver.cc b/lily/beam-engraver.cc
index d9c3ff9ad3..feb5ec7575 100644
--- a/lily/beam-engraver.cc
+++ b/lily/beam-engraver.cc
@@ -137,8 +137,9 @@ Beam_engraver::try_music (Music *m)
       if (d == START)
 	evs_drul_[d] = m;
       else if (d==STOP)
-	now_stop_ev_ = m;
-
+	{
+	  now_stop_ev_ = m;
+	}
       return true;
     }
   return false;
@@ -239,6 +240,12 @@ Beam_engraver::stop_translation_timestep ()
       beam_ = 0;
       beam_info_ = 0;
       typeset_beam();
+
+      if (to_boolean (get_property ("automaticMelismata"))
+	  && !to_boolean (get_property ("autoBeaming")))
+	{
+	  set_melisma (false);
+	}
     }
 }
 
diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc
index 320367412e..36b56aab16 100644
--- a/lily/lily-guile.cc
+++ b/lily/lily-guile.cc
@@ -556,11 +556,20 @@ type_check_assignment (SCM sym, SCM val,  SCM type_symbol)
   if (val == SCM_EOL || val == SCM_BOOL_F)
     return ok;
 
-  
-  SCM type = SCM_EOL;
+  if (!gh_symbol_p (sym))
+#if 0
+    return false;
+#else
+  /*
+    This is used for autoBeamSettings.
 
-  if (gh_symbol_p (sym))
-    type = scm_object_property (sym, type_symbol);
+    TODO: deprecate the use of \override and \revert for
+    autoBeamSettings?
+   */
+  return true; 
+#endif
+  
+  SCM type = scm_object_property (sym, type_symbol);
 
   if (type != SCM_EOL && !gh_procedure_p (type))
       {
diff --git a/lily/lyric-combine-music-iterator.cc b/lily/lyric-combine-music-iterator.cc
index 755b209fb3..37f3d39467 100644
--- a/lily/lyric-combine-music-iterator.cc
+++ b/lily/lyric-combine-music-iterator.cc
@@ -145,7 +145,7 @@ Lyric_combine_music_iterator::melisma_busy ()
     music_iter_->report_to() might not be the context that sets the
     melisma properties, but rather a parent context.
    */
-  return  music_iter_->try_music (melisma_playing_req);
+  return music_iter_->try_music (melisma_playing_req);
 #endif
   
 }
diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc
index ff3ce86c3a..bbaa005cdf 100644
--- a/lily/lyric-engraver.cc
+++ b/lily/lyric-engraver.cc
@@ -23,7 +23,7 @@ class Lyric_engraver : public Engraver
 protected:
   virtual void stop_translation_timestep ();
   virtual bool try_music (Music *);
-  virtual void process_acknowledged_grobs ();
+  virtual void process_music ();
   virtual void start_translation_timestep ();
   
 public:
@@ -56,7 +56,7 @@ Lyric_engraver::try_music (Music*r)
 }
 
 void
-Lyric_engraver::process_acknowledged_grobs ()
+Lyric_engraver::process_music ()
 {
   if (req_)
     {
@@ -68,13 +68,12 @@ Lyric_engraver::process_acknowledged_grobs ()
 	We can't reach the notehead where we're centered from here. So
 	we kludge.
 
- (UGH UGH, pulled amount of space out of thin air)
+	(UGH UGH, pulled amount of space out of thin air)
       */
       
       text_->translate_axis (0.66, X_AXIS);
       
-      announce_grob(text_, req_->self_scm());
-      req_ = 0;
+      announce_grob (text_, req_->self_scm());
     }
 }
 
diff --git a/lily/new-accidental-engraver.cc b/lily/new-accidental-engraver.cc
index aa03965df4..bb1b7b7181 100644
--- a/lily/new-accidental-engraver.cc
+++ b/lily/new-accidental-engraver.cc
@@ -195,7 +195,7 @@ number_accidentals (SCM sig, Music * note, Pitch *pitch, SCM curbarnum, SCM lazy
   if (ignore_octave_b)
     prev = ly_assoc_cdr (gh_int2scm (n), sig);
   else
-    prev = gh_assoc (gh_cons (gh_int2scm (o), gh_int2scm (n)), sig);
+    prev = scm_assoc (gh_cons (gh_int2scm (o), gh_int2scm (n)), sig);
 
   /* should really be true unless prev == SCM_BOOL_F */
   if (gh_pair_p (prev) && gh_pair_p (ly_cdr (prev)))
@@ -207,7 +207,7 @@ number_accidentals (SCM sig, Music * note, Pitch *pitch, SCM curbarnum, SCM lazy
   /* If an accidental was not found or the accidental was too old */
   if (prev == SCM_BOOL_F ||
       (gh_number_p (lazyness) && curbarnum_i > accbarnum_i + gh_scm2int (lazyness)))
-    prev = gh_assoc (gh_int2scm (n), sig);
+    prev = scm_assoc (gh_int2scm (n), sig);
 
 
   SCM prev_acc = (prev == SCM_BOOL_F) ? gh_int2scm (0) : ly_cdr (prev);
diff --git a/lily/property-iterator.cc b/lily/property-iterator.cc
index 808747fc94..b42d1f8b04 100644
--- a/lily/property-iterator.cc
+++ b/lily/property-iterator.cc
@@ -76,6 +76,10 @@ Property_iterator::do_quit ()
 
 SCM list_p = 0;
 
+/*
+  This is a rather crude check: we merely check if the translator
+  property is a list.
+ */
 bool
 check_grob(Music *mus, SCM sym)
 {
diff --git a/lily/translator-def.cc b/lily/translator-def.cc
index f6add24b23..8c8c459bc5 100644
--- a/lily/translator-def.cc
+++ b/lily/translator-def.cc
@@ -151,6 +151,8 @@ Translator_def::add_pop_property (SCM props, SCM syms)
 				 this->property_ops_);
 }
 
+
+
 /*
   Do it. SYM is single symbol. VAL is SCM_UNDEFINED in case of a pop
 */
diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index 84cd15f157..2fb368af1f 100644
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -379,8 +379,6 @@ ScoreContext = \translator {
 	systemStartDelimiter =#'SystemStartBar
 
 
-	%% name, glyph id, clef position 
-	%% where is c0 in this clef?
 	clefGlyph = #"clefs-G"
 	clefPosition = #-2
 	centralCPosition = #-6
@@ -393,7 +391,7 @@ ScoreContext = \translator {
 
 	explicitClefVisibility = #all-visible
 	explicitKeySignatureVisibility = #all-visible
-	autoBeamSettings = #auto-beam-settings
+	autoBeamSettings = #default-auto-beam-settings
 	autoBeaming = ##t
 	scriptDefinitions = #default-script-alist
 
@@ -449,8 +447,7 @@ ScoreContext = \translator {
 
 	%% One may change the strings tuning as following :
 	%% The lenght of the list must be equal to the number of string
-      
-	stringTunings   = #guitar-tunings
+      	stringTunings   = #guitar-tunings
 	tablatureFormat = #fret-number-tablature-format
 
 	%%
diff --git a/make/lilypond.redhat.spec.in b/make/lilypond.redhat.spec.in
index a1b37fd09d..27895eb854 100644
--- a/make/lilypond.redhat.spec.in
+++ b/make/lilypond.redhat.spec.in
@@ -90,7 +90,7 @@ rm `find /var/lib/texmf -name 'feta*pk' -or -name 'feta*tfm' -or -name 'parmesan
 /sbin/install-info %{_infodir}/lilypond.info.gz %{_infodir}/dir 
 %endif
 
-chkfontpath --add=%{_datadir}/lilypond/@TOPLEVEL_VERSION@/fonts/type1/
+# chkfontpath --add=%{_datadir}/lilypond/@TOPLEVEL_VERSION@/fonts/type1/
 
 echo 'Please logout first before using LilyPond.'
 
@@ -103,7 +103,7 @@ if [ $1 = 0 ]; then
 fi
 %endif
 
-chkfontpath --remove=%{_datadir}/share/lilypond/@TOPLEVEL_VERSION@/fonts/type1/
+# chkfontpath --remove=%{_datadir}/share/lilypond/@TOPLEVEL_VERSION@/fonts/type1/
 
 
 %post documentation
diff --git a/scm/auto-beam.scm b/scm/auto-beam.scm
index 4d306ba741..277b7de603 100644
--- a/scm/auto-beam.scm
+++ b/scm/auto-beam.scm
@@ -28,7 +28,7 @@
 ;;;   end beams with 16th notes each 1 4 note
 ;;;   end beams with 32th notes each 1 8 note
 
-(define-public auto-beam-settings
+(define-public default-auto-beam-settings
    `(
      ((end * * 3 2) . ,(ly:make-moment 1 2))
      ((end 1 16 3 2) . ,(ly:make-moment 1 4))
@@ -82,3 +82,60 @@
      ((end 1 16 12 8) . ,(ly:make-moment 3 8))
      ((end 1 32 12 8) . ,(ly:make-moment 1 8))
      ))
+
+
+(define (override-property-setting context context-prop setting value)
+  "Like the C++ code that executes \override, but without type
+checking. "
+
+  (ly:set-context-property context context-prop
+			   (cons (cons setting value)
+				 (ly:get-context-property context context-prop)
+				 )
+			   )
+  )
+
+(define (revert-property-setting context setting)
+  "Like the C++ code that executes \revert, but without type
+checking. "
+  
+  (define (revert-assoc alist key)
+    "Return ALIST, with KEY removed. ALIST is not modified, instead
+a fresh copy of the  list-head is made."
+    (cond
+     ((null? alist) '())
+     ((equal? (caar alist) key) (cdr alist))
+     (else (cons (car alist) (revert-assoc alist key)))
+     ))
+
+  
+  
+    (ly:set-context-property
+     context context-prop
+     (revert-assoc (ly:get-context-property context context-prop)
+		   setting))
+  )
+
+(define-public (override-auto-beam-setting setting num den)
+  (ly:export
+   (context-spec-music
+    (make-apply-context (lambda (c)
+			  (override-property-setting
+			   c 'autoBeamSettings
+			   setting (ly:make-moment num den))
+			  ))
+    "Voice")
+  ))
+
+(define-public (revert-auto-beam-setting setting)
+  (ly:export
+   (context-spec-music
+    (make-apply-context (lambda (c)
+			  (revert-property-setting
+			   c 'autoBeamSettings
+			   setting)))
+    
+    "Voice")))
+  
+
+
diff --git a/scm/documentation-generate.scm b/scm/documentation-generate.scm
index 8533ef0f5c..255b460cbe 100644
--- a/scm/documentation-generate.scm
+++ b/scm/documentation-generate.scm
@@ -81,7 +81,7 @@
 @omfdescription Programmer's reference of the LilyPond music engraving system
 @omftype user's guide
 @omflanguage English
-@omfcategory Music
+@omfcategory Applications|Publishing
 @end ignore
 
 
diff --git a/scm/music-functions.scm b/scm/music-functions.scm
index 47ef6232a2..4129d94be0 100644
--- a/scm/music-functions.scm
+++ b/scm/music-functions.scm
@@ -198,6 +198,16 @@ i.e.  this is not an override"
     cm
   ))
 
+(define-public (make-apply-context func)
+  (let*
+      (
+       (m (make-music-by-name 'ApplyContext))
+       )
+
+    (ly:set-mus-property! m 'procedure func)
+    m
+  ))
+
 (define-public (make-sequential-music elts)
   (let*  ((m (make-music-by-name 'SequentialMusic)))
     (ly:set-mus-property! m 'elements elts)
diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index 8b36a7521e..fea9750d4c 100644
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -660,7 +660,7 @@ def compose_full_body (body, opts):
 	if is_fragment and not 'multiline' in opts:
 		opts.append ('singleline')
 
-	if 'singleline' in opts:
+	if 'raggedright' in opts or  'singleline' in opts:
 		if not linewidth:
 			linewidth = 'raggedright = ##t'
 		if not indent: