From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Thu, 14 Nov 2002 22:28:27 +0000 (+0000)
Subject: (music-descriptions): no length for tempo event.
X-Git-Tag: release/1.7.8~13
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=bb4d48ee1c1398ad103566f8606e7221283757dc;p=lilypond.git

(music-descriptions): no length for tempo event.
---

diff --git a/ChangeLog b/ChangeLog
index 90af76cc3c..cfea65b36d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2002-11-14  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+	* scm/music-types.scm (music-descriptions): no length for tempo event.
+
 	* input/*.ly: add \version everywhere.
 	
 	* input/*.ly: update syntax to 1.7 + new-chords.
diff --git a/buildscripts/new-chords.py b/buildscripts/new-chords.py
index 86456cbd90..537f28bc8b 100644
--- a/buildscripts/new-chords.py
+++ b/buildscripts/new-chords.py
@@ -10,11 +10,15 @@ import os
 def sub_chord (m):
 	str = m.group(1)
 
+	origstr =  '<%s>' % str
 	if re.search (r'\\\\', str):
-		return '<%s>' % str
+		return origstr
+
+	if re.search (r'\\property', str):
+		return origstr
 
 	if re.match (r'^\s*\)?\s*\\[a-zA-Z]+', str):
-		return '<%s>' % str
+		return origstr
 
 	durs = []
 	def sub_durs (m):
diff --git a/input/test/clef-end-of-line.ly b/input/test/clef-end-of-line.ly
index 79c0966245..a2a95b6fb7 100644
--- a/input/test/clef-end-of-line.ly
+++ b/input/test/clef-end-of-line.ly
@@ -6,7 +6,7 @@
 }
 
 \score {
-    \notes \transpose c'' {
+    \notes \transpose c c' {
 	\property Staff.Clef \set #'break-visibility = #end-of-line-visible
 	\property Staff.KeySignature \set #'break-visibility = #end-of-line-visible
 	\property Staff.explicitClefVisibility = #end-of-line-visible
diff --git a/input/test/figured-bass.ly b/input/test/figured-bass.ly
index a8180f44ec..f80bd43a9d 100644
--- a/input/test/figured-bass.ly
+++ b/input/test/figured-bass.ly
@@ -15,7 +15,7 @@ mode, which allows you to type numbers, like @code{<<4 6+>>}.
    <<f ais >>8
    \figures {
      r8
-     <<1 3 5>>4 <<3- 5+ 6!>> <<5>>
+     <1 3 5>4 <3- 5+ 6!> <5>
    } 
  }
  \context Voice {
diff --git a/input/test/gmsusd.ly b/input/test/gmsusd.ly
index 2a982965b7..44f7d0ed6f 100644
--- a/input/test/gmsusd.ly
+++ b/input/test/gmsusd.ly
@@ -12,7 +12,7 @@ gmsus=\notes\relative c \chords{
 	g1:3-.4.7
 
 	% another hard way:
-	\notes<< g' bes c d f >>1
+	\notes { << g' bes c d f >>1 }
 
 	% bit easier:
 	g1:m.4.7
diff --git a/input/test/orchestscore.ly b/input/test/orchestscore.ly
index ea29ada988..470dcf5166 100644
--- a/input/test/orchestscore.ly
+++ b/input/test/orchestscore.ly
@@ -83,12 +83,12 @@ c1 | c2 c | c c | R1*5
       \property Staff.instr = "Vla."
       \m
     >
-    \context Staff = vlc <<
-      %% \property Staffinstrument = "Violoncello"
-      \property Staffinstrument = #'(lines "Violoncello" "e" "Contrabasso")
-      \property Staffinstr = "Vlc"
+    \context Staff = vlc <
+      %% \property Staff.instrument = "Violoncello"
+      \property Staff.instrument = #'(lines "Violoncello" "e" "Contrabasso")
+      \property Staff.instr = "Vlc"
       \m
-    >>.
+    >
     \context Staff = cb <
       \property Staff.instrument = "Contrabasso"
       \property Staff.instr = "C.B."
diff --git a/input/test/part-combine-score.ly b/input/test/part-combine-score.ly
index d4ce70fdca..97582627af 100644
--- a/input/test/part-combine-score.ly
+++ b/input/test/part-combine-score.ly
@@ -96,15 +96,15 @@ violinoIStaff =  \context Staff = oneViolini <
   \End
 >
 
-violinoIIStaff =  \context Staff = twoViolini <<
+violinoIIStaff =  \context Staff = twoViolini <
   % MIDI hoort geeneens verschil tussen een
   % eerste en tweede viool -)
-  \property StaffmidiInstrument = #"violin"
-  \property Staffinstrument = #"Violino II"
-  \property Staffinstr = #"Vl II"
+  \property Staff.midiInstrument = #"violin"
+  \property Staff.instrument = #"Violino II"
+  \property Staff.instr = #"Vl II"
   \violinoII
   \End
->>.
+>
 
 violaI = \notes\transpose c' c, \violinoI
 
diff --git a/scm/music-types.scm b/scm/music-types.scm
index 6b68a6226c..a0115817ae 100644
--- a/scm/music-types.scm
+++ b/scm/music-types.scm
@@ -455,7 +455,7 @@ c8-[ c c-] c8")
     (TempoEvent
      . (
 	(description .  "")
-
+	(length . #f)
 	(internal-class-name . "Event")
 	(types . (general-music tempo-event event))
 	))