increase extent of Staff.

diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index fa4b144595d91e89e6d0ca4e911f1c075e0f1432..7263ce33755eabb647e7b5ff4b1242d87c16f382 100644 (file)
--- 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 9a076136470334a348cc35afcb98dad881800f8a..206d573c3473017ee1c113cc6aee961f8ee38119 100644 (file)
--- 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 8e2397b4fd059612163f7c224b59c87881ae4350..c4627a611d41efca94e003d30a0bdae7e8f174d0 100644 (file)
--- 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 e8244decf5da73a77a38e5630ab208dcd963fd88..2ce6fa70fa6f511fc9a5ac20904b720cb967ae46 100644 (file)
--- 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