From 3492f90ed5c0a104c0f6cd2c970c447fccd733ea Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Mon, 13 Sep 2004 20:26:37 +0000
Subject: [PATCH] increase extent of Staff.

---
 ly/engraver-init.ly | 2 +-
 scripts/abc2ly.py   | 8 ++++----
 scripts/etf2ly.py   | 2 +-
 scripts/midi2ly.py  | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index fa4b144595..7263ce3375 100644
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -40,7 +40,7 @@
 	\consists "String_number_engraver"
 	\consists "Axis_group_engraver"
 
-	minimumVerticalExtent = #'(-3 . 3)
+	minimumVerticalExtent = #'(-4 . 4)
 	extraVerticalExtent = ##f
 	verticalExtent = ##f 
 	localKeySignature = #'()
diff --git a/scripts/abc2ly.py b/scripts/abc2ly.py
index 9a07613647..206d573c34 100644
--- a/scripts/abc2ly.py
+++ b/scripts/abc2ly.py
@@ -210,7 +210,7 @@ def dump_slyrics (outf):
 			m = k
 		for i in range (len(slyrics[voice_idx_dict[k]])):
 			l=alphabet[i]
-			outf.write ("\nwords%sV%s = \\lyrics  {" % (m, l))
+			outf.write ("\nwords%sV%s =   {" % (m, l))
 			outf.write ("\n" + slyrics [voice_idx_dict[k]][i])
 			outf.write ("\n}")
 
@@ -223,7 +223,7 @@ def dump_voices (outf):
 			m = alphabet[string.atoi(k)]
 		else:
 			m = k
-		outf.write ("\nvoice%s = \\notes {" % m)
+		outf.write ("\nvoice%s =  {" % m)
 		dump_default_bar(outf)
 		if repeat_state[voice_idx_dict[k]]:
 			outf.write("\n\\repeat volta 2 {")
@@ -254,7 +254,7 @@ def try_parse_q(a):
         
 def dump_score (outf):
 	outf.write (r"""\score{
-        \notes <<
+         <<
 """)
 
 	ks = voice_idx_dict.keys ();
@@ -584,7 +584,7 @@ def repeat_prepend():
 def lyrics_append(a):
 	a = re.sub ( '#', '\\#', a)	# latex does not like naked #'s
 	a = re.sub ( '"', '\\"', a)	# latex does not like naked "'s
-	a = '\t{ \\lyrics "' + a + '" }\n'
+	a = '\t{  "' + a + '" }\n'
 	stuff_append (lyrics, current_lyric_idx, a)
 
 # break lyrics to words and put "'s around words containing numbers and '"'s
diff --git a/scripts/etf2ly.py b/scripts/etf2ly.py
index 8e2397b4fd..c4627a611d 100644
--- a/scripts/etf2ly.py
+++ b/scripts/etf2ly.py
@@ -395,7 +395,7 @@ class Verse:
 				str = str + ' ' * 4 + line + '\n'
 				line = ''
 			
-		str = """\nverse%s = \\lyrics {\n %s}\n""" %  (encodeint (self.number - 1) ,str)
+		str = """\nverse%s = \\lyricmode {\n %s}\n""" %  (encodeint (self.number - 1) ,str)
 		return str
 
 class KeySignature:
diff --git a/scripts/midi2ly.py b/scripts/midi2ly.py
index e8244decf5..2ce6fa70fa 100644
--- a/scripts/midi2ly.py
+++ b/scripts/midi2ly.py
@@ -896,7 +896,7 @@ def dump_track (channels, n):
 				s = s + '\\relative c '
 		elif item and item.__class__ == Text:
 			skip = '" "'
-			s = s + '%s = \\lyrics ' % (track + channel)
+			s = s + '%s = \\lyricmode ' % (track + channel)
 		else:
 			skip = '\\skip '
 			# must be in \notes mode for parsing \skip
-- 
2.39.2