From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Tue, 26 Aug 2003 12:07:25 +0000 (+0000)
Subject: * lily/parser.yy (relative_music): whoops. All \relative were off
X-Git-Tag: release/1.9.1~7
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=aa76d0de152265e9913d7dc67c4fd8d923aec04b;hp=679d99a7ce5c6f07e8e6c15b22ed8a3cb0d57126;p=lilypond.git

* lily/parser.yy (relative_music): whoops. All \relative were off
by ...  a lot .... Ahem.

* scm/define-music-types.scm (music-descriptions): idem.

* lily/beam-engraver.cc: move new-beam-event to beam-event

* input/regression/bar-number.ly: remove unnecessary old-relative
options.

* lily/parser.yy (Composite_music): add \newcontext

* scripts/convert-ly.py (conv): dashes rule.
Apply rule.
---

diff --git a/ChangeLog b/ChangeLog
index 98566424ca..cbc8d898c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2003-08-26  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+	* lily/parser.yy (relative_music): whoops. All \relative were off
+	by ...  a lot .... Ahem.
+
 	* scm/define-music-types.scm (music-descriptions): idem.
 
 	* lily/beam-engraver.cc: move new-beam-event to beam-event
diff --git a/input/regression/accidental-placement.ly b/input/regression/accidental-placement.ly
index a424618789..f7a45c064c 100644
--- a/input/regression/accidental-placement.ly
+++ b/input/regression/accidental-placement.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \version "1.9.1"
 
 \header {
diff --git a/input/regression/accidental-single-double.ly b/input/regression/accidental-single-double.ly
index 7e96efe590..4391992306 100644
--- a/input/regression/accidental-single-double.ly
+++ b/input/regression/accidental-single-double.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \version "1.9.1"
 \header{
 texidoc="
diff --git a/input/regression/accidental-unbroken-tie-spacing.ly b/input/regression/accidental-unbroken-tie-spacing.ly
index 9587d656d4..53f95b3068 100644
--- a/input/regression/accidental-unbroken-tie-spacing.ly
+++ b/input/regression/accidental-unbroken-tie-spacing.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \header {
 texidoc = "Tied accidentaled notes (which cause reminder accidentals) don't wreak havoc in
 the spacing when unbroken."
diff --git a/input/regression/accidental.ly b/input/regression/accidental.ly
index 83468c0b00..0fed2637ba 100644
--- a/input/regression/accidental.ly
+++ b/input/regression/accidental.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \version "1.9.1"
 
 \header{
diff --git a/input/regression/allfontstyle.ly b/input/regression/allfontstyle.ly
index 9ac37d04ca..ef54e59095 100644
--- a/input/regression/allfontstyle.ly
+++ b/input/regression/allfontstyle.ly
@@ -1,4 +1,3 @@
-#(ly:set-option 'old-relative)
 \version "1.9.1"
 
 \header{
@@ -12,10 +11,11 @@ Different text styles are used for various purposes.
 		\emptyText
 		\repeat volta 2 { \time 4/4 c4^"cuivr\\'e"_\fermata }
 		 \alternative {
-		 	{ \property Voice.TextScript \set #'font-style = #'italic d-4_"cantabile" }
+		 	{
+			    d-4_\markup { \italic "cantabile"  } }
 		 	{  e }  } \grace { c16 }
-			\property Voice.TextScript \set #'font-style = #'large
-			 f4\ff^""^"Largo" \mark "B" g 
+			 
+			 f4\ff^""^\markup  { \large "Largo" } \mark "B" g 
 	}
 	\paper { raggedright = ##t
 	% \translator {\BarNumberingStaffContext} }
diff --git a/input/regression/ambitus.ly b/input/regression/ambitus.ly
index fb38cd23e0..d136f82ff8 100644
--- a/input/regression/ambitus.ly
+++ b/input/regression/ambitus.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \header {
     texidoc = "Ambituses indicate pitch ranges for voices.
 
diff --git a/input/regression/apply-context.ly b/input/regression/apply-context.ly
index 0b9c57712c..9e6320ef62 100644
--- a/input/regression/apply-context.ly
+++ b/input/regression/apply-context.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \version "1.9.1"
 
 
diff --git a/input/regression/apply-output.ly b/input/regression/apply-output.ly
index 88e9b7045f..cd4bf3728c 100644
--- a/input/regression/apply-output.ly
+++ b/input/regression/apply-output.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \version "1.9.1" 
 \header {
 
diff --git a/input/regression/arpeggio.ly b/input/regression/arpeggio.ly
index 277b308961..303c8dd9a9 100644
--- a/input/regression/arpeggio.ly
+++ b/input/regression/arpeggio.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \version "1.9.1"
 \header{
 texidoc="
diff --git a/input/regression/auto-beam-bar.ly b/input/regression/auto-beam-bar.ly
index 5364837395..e864261f78 100644
--- a/input/regression/auto-beam-bar.ly
+++ b/input/regression/auto-beam-bar.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \version "1.9.1"
 
 \header{
diff --git a/input/regression/auto-beam-triplet.ly b/input/regression/auto-beam-triplet.ly
index 3f3a0306d5..d2ecfcb2eb 100644
--- a/input/regression/auto-beam-triplet.ly
+++ b/input/regression/auto-beam-triplet.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \header
 {
 texidoc = "Automatic beaming is also done on tuplets."
diff --git a/input/regression/auto-beam-tuplets.ly b/input/regression/auto-beam-tuplets.ly
index c0d9aea33b..9656496596 100644
--- a/input/regression/auto-beam-tuplets.ly
+++ b/input/regression/auto-beam-tuplets.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \version "1.9.1"
 
 \header {
diff --git a/input/regression/auto-beam.ly b/input/regression/auto-beam.ly
index 234cfe4487..8848aadda3 100644
--- a/input/regression/auto-beam.ly
+++ b/input/regression/auto-beam.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \header {
 
 texidoc="Test automatic beamer: the last measure should have a single beam."
diff --git a/input/regression/auto-change.ly b/input/regression/auto-change.ly
index 01567777e7..5585613c21 100644
--- a/input/regression/auto-change.ly
+++ b/input/regression/auto-change.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \version "1.9.1"
 
 \header {
diff --git a/input/regression/bar-number.ly b/input/regression/bar-number.ly
index 2e595a9de7..4ea24600ed 100644
--- a/input/regression/bar-number.ly
+++ b/input/regression/bar-number.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \version "1.9.1"
 
 \header {
diff --git a/input/regression/beam-auto-knee.ly b/input/regression/beam-auto-knee.ly
index 8d4c5ec1f3..d8211f9739 100644
--- a/input/regression/beam-auto-knee.ly
+++ b/input/regression/beam-auto-knee.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \version "1.9.1"
 
 \header{ texidoc="Automatic kneeing. A knee is made when a horizontal
diff --git a/input/regression/beam-break.ly b/input/regression/beam-break.ly
index fceb8c164f..f66a5c34a7 100644
--- a/input/regression/beam-break.ly
+++ b/input/regression/beam-break.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \header {
     texidoc = "Beams can be printed across line breaks if forced.
 "
diff --git a/input/regression/beam-center-slope.ly b/input/regression/beam-center-slope.ly
index 4e642b01be..2221ca2b07 100644
--- a/input/regression/beam-center-slope.ly
+++ b/input/regression/beam-center-slope.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 
 \version "1.9.1"
 \header{
diff --git a/input/regression/beam-concave.ly b/input/regression/beam-concave.ly
index 1d52cadeed..46be76e827 100644
--- a/input/regression/beam-concave.ly
+++ b/input/regression/beam-concave.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \version "1.9.1"
 \header{
 
diff --git a/input/regression/beam-cross-staff-auto-knee.ly b/input/regression/beam-cross-staff-auto-knee.ly
index 7da8577341..2c17f6e818 100644
--- a/input/regression/beam-cross-staff-auto-knee.ly
+++ b/input/regression/beam-cross-staff-auto-knee.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \version "1.9.1"
 
 \header{
diff --git a/input/regression/beam-cross-staff.ly b/input/regression/beam-cross-staff.ly
index 2f4c6e2982..00a13bb8a7 100644
--- a/input/regression/beam-cross-staff.ly
+++ b/input/regression/beam-cross-staff.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \version "1.9.1"
 \header{
 texidoc="
diff --git a/input/regression/beam-damp.ly b/input/regression/beam-damp.ly
index f98aef0424..ec90c22ac0 100644
--- a/input/regression/beam-damp.ly
+++ b/input/regression/beam-damp.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \version "1.9.1"
 \header { texidoc = "@cindex Beam Damp
 Beams are less steep than the notes they encompass. " }
diff --git a/input/regression/beam-default-lengths.ly b/input/regression/beam-default-lengths.ly
index a6db3c9fbb..01a82fc6b4 100644
--- a/input/regression/beam-default-lengths.ly
+++ b/input/regression/beam-default-lengths.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \version "1.9.1"
 
 \header{
diff --git a/input/regression/beam-extreme.ly b/input/regression/beam-extreme.ly
index 5cae7ef76b..61b2a09c60 100644
--- a/input/regression/beam-extreme.ly
+++ b/input/regression/beam-extreme.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \version "1.9.1"
 \header{
 texidoc="
diff --git a/input/regression/beam-french.ly b/input/regression/beam-french.ly
index d4027f6c3e..120f7d1e31 100644
--- a/input/regression/beam-french.ly
+++ b/input/regression/beam-french.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \version "1.9.1"
 
 \header {
diff --git a/input/regression/beam-funky-beamlet.ly b/input/regression/beam-funky-beamlet.ly
index 20282b72f1..640a74f697 100644
--- a/input/regression/beam-funky-beamlet.ly
+++ b/input/regression/beam-funky-beamlet.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \version "1.9.1"
 \header {
 
diff --git a/input/regression/beam-funky.ly b/input/regression/beam-funky.ly
index 609408c1c2..91c7fd06c0 100644
--- a/input/regression/beam-funky.ly
+++ b/input/regression/beam-funky.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \version "1.9.1"
 \header {
     
diff --git a/input/regression/beam-knee-symmetry.ly b/input/regression/beam-knee-symmetry.ly
index 030f19f331..0160d0b03d 100644
--- a/input/regression/beam-knee-symmetry.ly
+++ b/input/regression/beam-knee-symmetry.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \version "1.9.1"
 \header {
 
diff --git a/input/regression/beam-length.ly b/input/regression/beam-length.ly
index d3242c0352..e7c51165a5 100644
--- a/input/regression/beam-length.ly
+++ b/input/regression/beam-length.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \version "1.9.1"
 
 \header{
diff --git a/input/regression/beam-manual-beaming.ly b/input/regression/beam-manual-beaming.ly
index ed73fd8635..5903482718 100644
--- a/input/regression/beam-manual-beaming.ly
+++ b/input/regression/beam-manual-beaming.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \version "1.9.1"
 
 
diff --git a/input/regression/beam-manual.ly b/input/regression/beam-manual.ly
index 9a75c064a7..6e0cfea60e 100644
--- a/input/regression/beam-manual.ly
+++ b/input/regression/beam-manual.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \version "1.9.1"
 
 \header {
diff --git a/input/regression/beam-over-barline.ly b/input/regression/beam-over-barline.ly
index bba4a7cf22..497f1ff193 100644
--- a/input/regression/beam-over-barline.ly
+++ b/input/regression/beam-over-barline.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \version "1.9.1"
 \header {
 texidoc = "Explicit beams may cross barlines. "
diff --git a/input/regression/beam-position.ly b/input/regression/beam-position.ly
index 21ff0b9919..fac9615d9f 100644
--- a/input/regression/beam-position.ly
+++ b/input/regression/beam-position.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \version "1.9.1"
 \header{
 texidoc="
diff --git a/input/regression/beam-postfix-notation.ly b/input/regression/beam-postfix-notation.ly
index 218f693a9a..4075beab9f 100644
--- a/input/regression/beam-postfix-notation.ly
+++ b/input/regression/beam-postfix-notation.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \version "1.9.1"
 \header {
 
diff --git a/input/regression/beam-quanting-horizontal.ly b/input/regression/beam-quanting-horizontal.ly
index 320cf2b942..984d20a91e 100644
--- a/input/regression/beam-quanting-horizontal.ly
+++ b/input/regression/beam-quanting-horizontal.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \version "1.9.1"
 
 \header{
diff --git a/input/regression/beam-quarter.ly b/input/regression/beam-quarter.ly
index 3925765d0f..174120e42a 100644
--- a/input/regression/beam-quarter.ly
+++ b/input/regression/beam-quarter.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \version "1.9.1"
 \header
 {
diff --git a/input/regression/beam-rest.ly b/input/regression/beam-rest.ly
index d33bfc99ff..34ff1d9041 100644
--- a/input/regression/beam-rest.ly
+++ b/input/regression/beam-rest.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \header {
  texidoc = "The number of beams doesn't change on a rest."
 }
diff --git a/input/regression/beam-second.ly b/input/regression/beam-second.ly
index c47e38287f..1dd2cdf73c 100644
--- a/input/regression/beam-second.ly
+++ b/input/regression/beam-second.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \version "1.9.1"
 \header{
   texidoc="
diff --git a/input/regression/beam-shortened-lengths.ly b/input/regression/beam-shortened-lengths.ly
index c95d984695..a06f2c0e3d 100644
--- a/input/regression/beam-shortened-lengths.ly
+++ b/input/regression/beam-shortened-lengths.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \version "1.9.1"
 
 \header{
diff --git a/input/regression/beamed-chord.ly b/input/regression/beamed-chord.ly
index 929ecda4d1..3596817c7e 100644
--- a/input/regression/beamed-chord.ly
+++ b/input/regression/beamed-chord.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \version "1.9.1"
 
 \header{
diff --git a/input/regression/beaming-ternary-metrum.ly b/input/regression/beaming-ternary-metrum.ly
index 3e5003b5e5..cced3839bc 100644
--- a/input/regression/beaming-ternary-metrum.ly
+++ b/input/regression/beaming-ternary-metrum.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \version "1.9.1"
 \header {
 texidoc = "Automatic beaming works also in ternary time sigs."
diff --git a/input/regression/beaming.ly b/input/regression/beaming.ly
index ee46ce2859..94815dcfde 100644
--- a/input/regression/beaming.ly
+++ b/input/regression/beaming.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \version "1.9.1"
 
 \header{
diff --git a/input/regression/beams.ly b/input/regression/beams.ly
index 0a1b930e8c..4aff48da6c 100644
--- a/input/regression/beams.ly
+++ b/input/regression/beams.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \version "1.9.1"
 \header {
     texidoc = "Beams (simple)."
diff --git a/input/regression/between-systems.ly b/input/regression/between-systems.ly
index 2d332bfc10..e496a42125 100644
--- a/input/regression/between-systems.ly
+++ b/input/regression/between-systems.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \version "1.9.1"
 
 \header{
diff --git a/input/regression/break.ly b/input/regression/break.ly
index 0a77a28559..a166c8aa0e 100644
--- a/input/regression/break.ly
+++ b/input/regression/break.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \version "1.9.1"
 
 \header{
diff --git a/input/regression/chord-scripts.ly b/input/regression/chord-scripts.ly
index 6fff693ebd..6a785c4c8b 100644
--- a/input/regression/chord-scripts.ly
+++ b/input/regression/chord-scripts.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \version "1.9.1"
 \header {
 
diff --git a/input/regression/cluster.ly b/input/regression/cluster.ly
index 9ca98bc437..a68deb7187 100644
--- a/input/regression/cluster.ly
+++ b/input/regression/cluster.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \version "1.9.1"
 \header {
     texidoc = "Clusters are a device to denote that a complete range of
diff --git a/input/regression/completion-heads.ly b/input/regression/completion-heads.ly
index 54b7692b02..4111eb0ffa 100644
--- a/input/regression/completion-heads.ly
+++ b/input/regression/completion-heads.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \version "1.9.1"
 
 \header{
diff --git a/input/regression/dot-flag-collision.ly b/input/regression/dot-flag-collision.ly
index 17193d48c9..b8f6387ad8 100644
--- a/input/regression/dot-flag-collision.ly
+++ b/input/regression/dot-flag-collision.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \version "1.9.1"
 \header {
     texidoc = "Dots move to the right when a collision with the (up)flag happens."
diff --git a/input/regression/dynamics-broken-hairpin.ly b/input/regression/dynamics-broken-hairpin.ly
index 5cfdf800f7..0e38c38c39 100644
--- a/input/regression/dynamics-broken-hairpin.ly
+++ b/input/regression/dynamics-broken-hairpin.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \version "1.9.1"
 \header{
 texidoc = "Broken crescendi should be open on one side."
diff --git a/input/regression/dynamics-glyphs.ly b/input/regression/dynamics-glyphs.ly
index 03d508af63..1c5dc497b9 100644
--- a/input/regression/dynamics-glyphs.ly
+++ b/input/regression/dynamics-glyphs.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \version "1.9.1"
 
 \header {texidoc = "Dynamic letters are kerned, and their weight
diff --git a/input/regression/dynamics-line.ly b/input/regression/dynamics-line.ly
index 7e0a892115..6c65940d74 100644
--- a/input/regression/dynamics-line.ly
+++ b/input/regression/dynamics-line.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \version "1.9.1"
 \header{
 texidoc=" Dynamics appear below or above the staff.  If multiple
diff --git a/input/regression/finger-chords.ly b/input/regression/finger-chords.ly
index 04ba72932c..bb6f10d66a 100644
--- a/input/regression/finger-chords.ly
+++ b/input/regression/finger-chords.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \version "1.9.1"
 \header {
 
diff --git a/input/regression/fingering.ly b/input/regression/fingering.ly
index 4c37ce9938..92c23287fc 100644
--- a/input/regression/fingering.ly
+++ b/input/regression/fingering.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \version "1.9.1"
 \header {
 
diff --git a/input/regression/follow-voice-break.ly b/input/regression/follow-voice-break.ly
index 2cebbb1997..4a168aa3ad 100644
--- a/input/regression/follow-voice-break.ly
+++ b/input/regression/follow-voice-break.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \version "1.9.1"
 \header{
        texidoc = "
diff --git a/input/regression/font-magnification.ly b/input/regression/font-magnification.ly
index b4dbfbfece..3e739b36f6 100644
--- a/input/regression/font-magnification.ly
+++ b/input/regression/font-magnification.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \version "1.9.1"
 \header { texidoc = "The magnification can be set for any font. Note
 that this doesn't change variable symbols such as beams or slurs. " }
diff --git a/input/regression/generic-output-property.ly b/input/regression/generic-output-property.ly
index f1d757fc73..87a03e5c62 100644
--- a/input/regression/generic-output-property.ly
+++ b/input/regression/generic-output-property.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \version "1.9.1"
 
 \header{
diff --git a/input/regression/grace-auto-beam.ly b/input/regression/grace-auto-beam.ly
index 8b81abbbef..6a429f8b02 100644
--- a/input/regression/grace-auto-beam.ly
+++ b/input/regression/grace-auto-beam.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \version "1.9.1"
 \header
 {
diff --git a/input/regression/grace-bar-line.ly b/input/regression/grace-bar-line.ly
index 39cf0665f6..6214f60f4c 100644
--- a/input/regression/grace-bar-line.ly
+++ b/input/regression/grace-bar-line.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \version "1.9.1"
 \header {
 texidoc = "Bar line should come before the grace note."
diff --git a/input/regression/grace-bar-number.ly b/input/regression/grace-bar-number.ly
index 7fedb2816c..8a7ebc0d9f 100644
--- a/input/regression/grace-bar-number.ly
+++ b/input/regression/grace-bar-number.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \version "1.9.1"
 \header {
 
diff --git a/input/regression/grace-beam.ly b/input/regression/grace-beam.ly
index 8a51accbc9..c97d17fd4c 100644
--- a/input/regression/grace-beam.ly
+++ b/input/regression/grace-beam.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \header
 {
 texidoc = "Grace beams and normal beams may occur simultaneously.
diff --git a/input/regression/grace-dynamic.ly b/input/regression/grace-dynamic.ly
index b73ccae4e4..22bc88bffa 100644
--- a/input/regression/grace-dynamic.ly
+++ b/input/regression/grace-dynamic.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \version "1.9.1"
 \header{
  % ?
diff --git a/input/regression/grace-end.ly b/input/regression/grace-end.ly
index b1c572f64a..34e5247230 100644
--- a/input/regression/grace-end.ly
+++ b/input/regression/grace-end.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \version "1.9.1"
 \header {
 
diff --git a/input/regression/grace-nest5.ly b/input/regression/grace-nest5.ly
index ef991e9df3..362994ec24 100644
--- a/input/regression/grace-nest5.ly
+++ b/input/regression/grace-nest5.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \version "1.9.1"
 \header {
     texidoc = "Another nested grace situation."
diff --git a/input/regression/grace-part-combine.ly b/input/regression/grace-part-combine.ly
index 43e8dd3c2f..e6bd449b7b 100644
--- a/input/regression/grace-part-combine.ly
+++ b/input/regression/grace-part-combine.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \version "1.9.1"
 \header {
     texidoc = "Partcombiner and grace notes can go together."
diff --git a/input/regression/grace-start.ly b/input/regression/grace-start.ly
index 23ec247bbb..f9ed41ccbe 100644
--- a/input/regression/grace-start.ly
+++ b/input/regression/grace-start.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \version "1.9.1"
 \header {
 texidoc = "Pieces may begin with grace notes."
diff --git a/input/regression/grace-stems.ly b/input/regression/grace-stems.ly
index 2ed71f6d1f..e5d32c2b80 100644
--- a/input/regression/grace-stems.ly
+++ b/input/regression/grace-stems.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \version "1.9.1"
 \header{
 texidoc = "Here startGraceMusic should set no-stem-extend to true;
diff --git a/input/regression/grace.ly b/input/regression/grace.ly
index 5304ed0f80..8a719937bc 100644
--- a/input/regression/grace.ly
+++ b/input/regression/grace.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \version "1.9.1"
 
 \header{
diff --git a/input/regression/hairpin-ending.ly b/input/regression/hairpin-ending.ly
index 715f8f51d0..b9e8fc7c7d 100644
--- a/input/regression/hairpin-ending.ly
+++ b/input/regression/hairpin-ending.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \version "1.9.1"
 
 \header {
diff --git a/input/regression/instrument-name-partial.ly b/input/regression/instrument-name-partial.ly
index ccabed0205..d301d9ead8 100644
--- a/input/regression/instrument-name-partial.ly
+++ b/input/regression/instrument-name-partial.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \version "1.9.1"
 \header {
     texidoc = "Instrument names are also printed on  partial starting measures."
diff --git a/input/regression/key-clefs.ly b/input/regression/key-clefs.ly
index 893744602c..288077a50d 100644
--- a/input/regression/key-clefs.ly
+++ b/input/regression/key-clefs.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \version "1.9.1"
 \header { texidoc = "Tests placement of accidentals in every clef. " }
 
diff --git a/input/regression/key-signature-scordatura.ly b/input/regression/key-signature-scordatura.ly
index e34bb8ca54..27bb6bda64 100644
--- a/input/regression/key-signature-scordatura.ly
+++ b/input/regression/key-signature-scordatura.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \version "1.9.1"
 
 \header { texidoc = "Key signatures can be set per pitch
diff --git a/input/regression/keys.ly b/input/regression/keys.ly
index b9eb85cb29..86b207e0d1 100644
--- a/input/regression/keys.ly
+++ b/input/regression/keys.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \version "1.9.1"
 \header{
 texidoc="
diff --git a/input/regression/lyric-align.ly b/input/regression/lyric-align.ly
index 696a7b034f..41e1f3f528 100644
--- a/input/regression/lyric-align.ly
+++ b/input/regression/lyric-align.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \version "1.9.1"
 \header{
   texidoc="
diff --git a/input/regression/lyric-combine.ly b/input/regression/lyric-combine.ly
index a4cb15f50c..0708d90f5e 100644
--- a/input/regression/lyric-combine.ly
+++ b/input/regression/lyric-combine.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \version "1.9.1"
 
 \header{
diff --git a/input/regression/lyric-phrasing.ly b/input/regression/lyric-phrasing.ly
index a66dcc5e41..f66d2b5a7f 100644
--- a/input/regression/lyric-phrasing.ly
+++ b/input/regression/lyric-phrasing.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \version "1.9.1"
 \header{
   texidoc="Lyric phrasing
diff --git a/input/regression/lyrics-melisma-beam.ly b/input/regression/lyrics-melisma-beam.ly
index 7720dfc935..e45346316e 100644
--- a/input/regression/lyrics-melisma-beam.ly
+++ b/input/regression/lyrics-melisma-beam.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \version "1.9.1"
 \header
 {
diff --git a/input/regression/lyrics-multi-stanza.ly b/input/regression/lyrics-multi-stanza.ly
index 2ab13a4e30..8de8ed6a91 100644
--- a/input/regression/lyrics-multi-stanza.ly
+++ b/input/regression/lyrics-multi-stanza.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \version "1.9.1"
 \header {
 
diff --git a/input/regression/measure-grouping.ly b/input/regression/measure-grouping.ly
index 45fd1db9ed..70c1baf8fa 100644
--- a/input/regression/measure-grouping.ly
+++ b/input/regression/measure-grouping.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \header
 {
 
diff --git a/input/regression/metronome-marking.ly b/input/regression/metronome-marking.ly
index d1a1452112..8e4a5bff79 100644
--- a/input/regression/metronome-marking.ly
+++ b/input/regression/metronome-marking.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 
 \header {
 
diff --git a/input/regression/mm-rests2.ly b/input/regression/mm-rests2.ly
index fafe8c9ef1..10415956f2 100644
--- a/input/regression/mm-rests2.ly
+++ b/input/regression/mm-rests2.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \version "1.9.1"
 
 \header{
diff --git a/input/regression/molecule-hacking.ly b/input/regression/molecule-hacking.ly
index f12a480740..9ff0451161 100644
--- a/input/regression/molecule-hacking.ly
+++ b/input/regression/molecule-hacking.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \version "1.9.1"
 
 \header { texidoc=" You can write molecule callbacks in Scheme, thus
diff --git a/input/regression/non-empty-text.ly b/input/regression/non-empty-text.ly
index 71bc0debe9..bc7ea18514 100644
--- a/input/regression/non-empty-text.ly
+++ b/input/regression/non-empty-text.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \version "1.9.1"
 
 \header{
diff --git a/input/regression/note-group-bracket.ly b/input/regression/note-group-bracket.ly
index f9ac6ef38b..c45b80de07 100644
--- a/input/regression/note-group-bracket.ly
+++ b/input/regression/note-group-bracket.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \version "1.9.1"
 
 \header {
diff --git a/input/regression/note-head-chord.ly b/input/regression/note-head-chord.ly
index df002efdf8..2d3e03611a 100644
--- a/input/regression/note-head-chord.ly
+++ b/input/regression/note-head-chord.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \version "1.9.1"
 
 \header {
diff --git a/input/regression/number-staff-lines.ly b/input/regression/number-staff-lines.ly
index 9e65db846d..9b03a38842 100644
--- a/input/regression/number-staff-lines.ly
+++ b/input/regression/number-staff-lines.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \version "1.9.1"
 
 \header{
diff --git a/input/regression/ottava-broken.ly b/input/regression/ottava-broken.ly
index 7579bc7e3e..c0f8b176d4 100644
--- a/input/regression/ottava-broken.ly
+++ b/input/regression/ottava-broken.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 
 \header
 {
diff --git a/input/regression/ottava.ly b/input/regression/ottava.ly
index 115ff53295..272d23f75b 100644
--- a/input/regression/ottava.ly
+++ b/input/regression/ottava.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \header
 {
 texidoc = "Ottava brackets are supported, through the
diff --git a/input/regression/output-property.ly b/input/regression/output-property.ly
index 09af5dbee8..c21b5d8a30 100644
--- a/input/regression/output-property.ly
+++ b/input/regression/output-property.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \header { texidoc = "
 
 Setting @code{\outputproperty} is a clumsy and deprecated way of changing
diff --git a/input/regression/pc-mmrest.ly b/input/regression/pc-mmrest.ly
index 40c9544e92..4a638d47d9 100644
--- a/input/regression/pc-mmrest.ly
+++ b/input/regression/pc-mmrest.ly
@@ -1,4 +1,4 @@
-
+#(ly:set-option 'old-relative)
 \version "1.9.1"
 \header {
 texidoc="Multi measure rests of second voice should not disappear."
diff --git a/input/test/bar-lines-lyric-only.ly b/input/test/bar-lines-lyric-only.ly
index 4c92d67082..aae8810043 100644
--- a/input/test/bar-lines-lyric-only.ly
+++ b/input/test/bar-lines-lyric-only.ly
@@ -1,4 +1,3 @@
-#(ly:set-option 'old-relative)
 \version "1.9.1"
 \header { texidoc = "@cindex Bar line lyric only
 You can move around @code{Bar_engraver} and
@@ -6,16 +5,15 @@ You can move around @code{Bar_engraver} and
 }
 
 \score {
-\notes \relative c' \context ChoirStaff = groupie <
- \context Staff = SA { c1 c1 c1}
+\notes \relative c' \context ChoirStaff <
+ \newcontext Staff { c1 c1 c1}
  \context Lyrics \lyrics <
   { bla1 die bla }
   { foo bar foo }
   { foo bar foo }  
  >
- \context Staff = SB { c1 c1 c1} 
-
- > 
+ \newcontext Staff { c1 c1 c1} 
+ >
 
 
 \paper  {
diff --git a/input/test/beam-rest.ly b/input/test/beam-rest.ly
index 2f4a68dbfb..2240d5a619 100644
--- a/input/test/beam-rest.ly
+++ b/input/test/beam-rest.ly
@@ -7,7 +7,7 @@ Beams over rests.
 " }
 
 \score{
-        \context Staff=one \notes\relative c''{
+    \notes\relative c''{
 	  r4  r8[ g a]
 	   bes8[ r16 f g a]
 	   bes8[ r16 \property Voice.stemLeftBeamCount = #1 f g a]
diff --git a/input/test/chord-names-german.ly b/input/test/chord-names-german.ly
index 0983328780..34d009647c 100644
--- a/input/test/chord-names-german.ly
+++ b/input/test/chord-names-german.ly
@@ -22,10 +22,10 @@ scm = \chords {
 \score {
 \notes <
     \context ChordNames { \scm }
-    \context ChordNames = CA {
+    \newcontext ChordNames {
 	\property ChordNames.instrument = #"german"
 	\germanChords \scm }
-    \context ChordNames = CB {
+    \newcontext ChordNames {
 	\property ChordNames.instrument =#"semi-german"
 	\semiGermanChords \scm }
     \context Voice {  \scm } >
diff --git a/input/test/chord-names-jazz.ly b/input/test/chord-names-jazz.ly
index 0fa2be4830..e244072e7f 100644
--- a/input/test/chord-names-jazz.ly
+++ b/input/test/chord-names-jazz.ly
@@ -116,7 +116,7 @@ banterProperties = \sequential {
 	    \property ChordNames.instrument = #"Ignatzek (default)"
 	    \property ChordNames.instr = #"Def"
 	    \chs }
-	\context ChordNames = ALT {
+	\newcontext ChordNames {
 	    \property ChordNames.instrument = #"Alternative"
 	    \property ChordNames.instr = #"Alt"
 	    \jazzAltProperties
@@ -127,7 +127,7 @@ banterProperties = \sequential {
 	% making this file take up to 4 pages.
 	
 %{
-		\context ChordNames = BANTER  {
+		\newcontext ChordNames  {
 	    \banterProperties
 	    \chs
 	    }
diff --git a/input/test/cue-notes.ly b/input/test/cue-notes.ly
index c523c9d969..59d94bace1 100644
--- a/input/test/cue-notes.ly
+++ b/input/test/cue-notes.ly
@@ -19,7 +19,7 @@ Cue notes should be set in smaller type. "
 	    R1
 	    \property Voice.MultiMeasureRest \revert #'staff-position
 	}
-     \context Voice = cue { s2
+     \newcontext Voice { s2
        \clef tenor
 
 	%% this should probably be put into an identifier.
diff --git a/input/test/divisiones.ly b/input/test/divisiones.ly
index 70fef04d79..4efe93c91e 100644
--- a/input/test/divisiones.ly
+++ b/input/test/divisiones.ly
@@ -13,7 +13,7 @@ Choices are @code{divisioMinima}, @code{divisioMaior}
 
 \score {
     \notes {
-	\context Staff = staff \addlyrics \notes \transpose c c' {
+	\newcontext Staff \addlyrics \notes \transpose c c' {
 	    \property Score.timing = ##f
 	    \property Score.barAlways = ##t
 	    \property Voice.TextScript \set #'padding = #3
@@ -40,7 +40,7 @@ Choices are @code{divisioMinima}, @code{divisioMaior}
 	    \caesura
             g4( a) g e( f) e
 	}
-	\context Lyrics = lyrics \lyrics {
+	\newcontext Lyrics \lyrics {
 	    Blah blub, blah blam.
 	    Blah blub, blah blam.
 	    Blah blub, blah blam.
diff --git a/input/test/force-hshift.ly b/input/test/force-hshift.ly
index 2e029f61b5..b5909651ac 100644
--- a/input/test/force-hshift.ly
+++ b/input/test/force-hshift.ly
@@ -1,27 +1,24 @@
-#(ly:set-option 'old-relative)
+
 \version "1.9.1"
 \header {
     texidoc="@cindex Force hshift
 Force hshift to override collisions. " }
 
 \score { 
-  \context Voice \notes\relative c {
-    
-	\context Staff <
-		\context Voice = VA {
+     \notes\relative c'
+       \context Staff < {
 			\property Voice.NoteColumn \override #'force-hshift = #0.1
 			\stemUp
 	       		\property Voice.NoteColumn \override #'horizontal-shift = #1
-			<<g' d'>>
-		}
-		\context Voice = VB {
+			<<d a'>>
+		} \\
+		 {
 			\stemDown
 	       		\property Voice.NoteColumn \override #'horizontal-shift = #1
 			\property Voice.NoteColumn \override #'force-hshift = #-0.1
-			<<bes f'>>
+			<<b f'>>
 		}
-	>
-  }
+	> 
   \paper {
     raggedright = ##t
   }  
diff --git a/lily/parser.yy b/lily/parser.yy
index fbb7684c9a..33ac19f461 100644
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -1077,9 +1077,9 @@ relative_music:
 		scm_gc_unprotect_object (p->self_scm ());
 
 
+		Pitch retpitch = p->to_relative_octave (pit);
 		if (lily_1_8_relative)
-			$$->set_mus_property ("last-pitch", p->to_relative_octave (pit).smobbed_copy ());
-
+			$$->set_mus_property ("last-pitch", retpitch.smobbed_copy ());
 	}
 	;
 
diff --git a/scm/define-music-types.scm b/scm/define-music-types.scm
index 2bc5bc9a6d..130bce3e0e 100644
--- a/scm/define-music-types.scm
+++ b/scm/define-music-types.scm
@@ -88,7 +88,7 @@ is an articulation (such as @code{-.}, @code{->}, @code{\\tenuto},
    (description .  "Starts or stops a beam.  Syntax for manual control:
 c8-[ c c-] c8")
 	(internal-class-name . "Event")
-	(types . (general-music event new-beam-event span-event))
+	(types . (general-music event beam-event span-event))
 	))
     (BreakEvent
      . (
@@ -567,7 +567,7 @@ For example, transposed music.")
      . (
 	(description .  "A tie.  Entered as @var{note}-~.")
 	(internal-class-name . "Event")
-	(types . (general-music new-tie-event event))
+	(types . (general-music tie-event event))
 	))
     (TremoloEvent
      . (
diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py
index dc9f1da69b..3525650684 100644
--- a/scripts/convert-ly.py
+++ b/scripts/convert-ly.py
@@ -1407,6 +1407,10 @@ Postfix articulations, new chord syntax."""))
 
 if 1:
 	def conv (str):
+		if re.search ("font-style",str):
+			sys.stderr.write ("font-style is deprecated. Please remove.")
+			raise FatalConversionError()
+			
 		str = re.sub (r'-\\markup', r'@\\markup', str)
 		str = re.sub (r'-\\', r'\\', str)
 		str = re.sub (r'-\)', ')', str)