lilypond-0.1.36

diff --git a/input/kortjakje.ly b/input/kortjakje.ly
index 8b49f135753ce9705024050fc7336ff5a8048d2e..b3707432802e59ed96b5341847ef0a626ce0c96a 100644 (file)
--- a/input/kortjakje.ly
+++ b/input/kortjakje.ly
@@ -3,7 +3,7 @@
 filename =      "kortjakje.ly";
 title =         "Ah,  vous dirais-je, maman (variations)";
 description =   "bare bones version. (written down from memory :-)";
-composers =     "Mozart, KV 265";
+composer =      "Mozart, KV 265";
 enteredby =     "HWN";
 copyright =     "public domain";
 }

diff --git a/input/standchen-16.ly b/input/standchen-16.ly
index bb250a98fdf3e6147222f062fd7df14d8f70c6c6..412c202ca24286e1f2e891fd49fb5e958e7e04a4 100644 (file)
--- a/input/standchen-16.ly
+++ b/input/standchen-16.ly
@@ -2,7 +2,7 @@
 filename =      "standchen.ly";
 title =         "St\"andchen (Serenade) \"Leise flehen meine Lieder\"";
 opus =  "D. 957 No. 4";
-composers =     "Franz Schubert (1797-1828)"
+composer =      "Franz Schubert (1797-1828)"
         "Text by Ludwig Rellstab (1799-1860)";
 enteredby =     "JCN";
 copyright =     "public domain";

diff --git a/input/standchen-20.ly b/input/standchen-20.ly
index 1a13f3fc11e5d72219b7c8e005ce9b760d1bf1ab..cb13ab64d66dc0ad5f741fa95f9e959a19495101 100644 (file)
--- a/input/standchen-20.ly
+++ b/input/standchen-20.ly
@@ -2,7 +2,7 @@
 filename =      "standchen.ly";
 title =         "St\"andchen (Serenade) Leise flehen meine Lieder\"";
 opus =  "D. 957 No. 4";
-composers =     "Franz Schubert (1797-1828)"
+composer =      "Franz Schubert (1797-1828)"
         "Text by Ludwig Rellstab (1799-1860)";
 enteredby =     "JCN";
 copyright =     "public domain";

diff --git a/input/standchen.ly b/input/standchen.ly
index 9faee5ed92e3a997004131c8e9da4b779df8efd6..b2a00d2996c8a510bef14d87b319a49359ed0daa 100644 (file)
--- a/input/standchen.ly
+++ b/input/standchen.ly
@@ -2,7 +2,7 @@
 filename =      "standchen.ly";
 title =         "St\"andchen (Serenade) \"Leise flehen meine Lieder\"";
 opus =  "D. 957 No. 4";
-composers =     "Franz Schubert (1797-1828)"
+composer =      "Franz Schubert (1797-1828)"
         "Text by Ludwig Rellstab (1799-1860)";
 enteredby =     "JCN";
 copyright =     "public domain";
@@ -495,13 +495,15 @@ themusic =
                % 20pt music uses whole pagewidth
                % ja Vette Pech.  Koop maar aan A4 printer
                linewidth= 185.\mm;
-
+               arithmetic_multiplier = 7.\pt;
+               
                gourlay_maxmeasures = 9.;
                \output "standchen-20.out";
        }
        \paper{
                % 16pt mustn't use whole page width
                linewidth= 160.\mm;
+               arithmetic_multiplier = 6.\pt;
                gourlay_maxmeasures = 9.;
                \output "standchen-16.out";
        }

diff --git a/input/toccata-fuga-E.ly b/input/toccata-fuga-E.ly
index 7a14e64255d93cebfd169682412f3d56bea17d20..0d5cb37007cb783921c233b2074bc8eb281185b1 100644 (file)
--- a/input/toccata-fuga-E.ly
+++ b/input/toccata-fuga-E.ly
@@ -5,7 +5,7 @@ opus =   "BWV 566"
         "toccata               3 bar excerpt"
         "2nd fuga      transposed subject --- 4 bar excerpt";
 
-composers =     "Johann Sebastian Bach (1685-1750)";
+composer =      "Johann Sebastian Bach (1685-1750)";
 enteredby =     "JCN";
 copyright =     "public domain";
 

diff --git a/input/twinkle-pop.ly b/input/twinkle-pop.ly
index 2132cf3cb8f6d97d2c08ee7f857f72fb48a2b0ed..fae537bf46d8ab7cc69c13a48468fb9396f4ce99 100644 (file)
--- a/input/twinkle-pop.ly
+++ b/input/twinkle-pop.ly
@@ -2,7 +2,7 @@
 filename =      "twinkle.ly";
 title =         "Ah, vous dirais-je, maman ";
 description =   "twinkle twinkle in pop-song-settings";
-composers =     "traditional";
+composer =      "traditional";
 
 enteredby =     "HWN, chords by Johan Vromans";
 copyright =     "public domain";

diff --git a/input/twinkle.ly b/input/twinkle.ly
index 51d8114f05e0b67d8ba4dd286c1af01296eeea4a..e6814ce34810b25f494e7cdd513c99d850705e70 100644 (file)
--- a/input/twinkle.ly
+++ b/input/twinkle.ly
@@ -1,12 +1,12 @@
 \header{
 filename =      "twinkle.ly";
-title =         "twinkle twinkle little star";
+title =         "Twinkle Twinkle Little Star";
 description =   "traditional song in various languages."
   "Ah, vous dirais-je, maman" 
   "Altijd is Kortjakje ziek"
   "Twinkle twinkle little star";
 
-composers =     "Traditional";
+composer =      "Traditional";
 enteredby =     "HWN & JCN";
 copyright =     "public domain";
 }
@@ -55,11 +55,15 @@ global = \melodic {
 
 tekst = \lyric{ 
        Al-4 tijd is Kort- jak- je ziek,2
-       midden4 in_de week maar 's_zon- dags niet.2
+%      midden4 in_de week maar 's_zon- dags niet.2
+% ugly hack: insertion of  empty syllables creates columns on extra 
+% moments.  The net result is more spacing.
+%
+       midden8 _8 in_de8 _8 week4 maar 's_zon- dags niet.2
        's_Zon-4 dags gaat ze naar de kerk,2
        met4 een boek vol zil- ver werk.2
        Al-4 tijd is Kort- jak- je ziek,2
-       midden4 in_de week maar 's_zon- dags niet.2
+       midden8 _8  in_de8 _8 week4 maar 's_zon- dags niet.2
 }
 
 %{
@@ -125,19 +129,23 @@ textiii = \lyric{
        < 
                \lyric \type Lyrics = top < 
                        \global \tekst >
-
-               \type Staff=treb < \global 
+               \type Staff_group < 
+               \type Staff=treb < \global  
                          \melody >
                \lyric \type Lyrics  = "Middle" <  \global
                        \texte >
                \type Staff=bass        < \global 
                        \accompany >
                % ugh
+               >
                \lyric \type Lyrics  = bottomlyrics < \global
                        \texti \textii \textiii >
                
        >
        \paper{
+               % use a lot of space, to avoid clashing syllables
+               arithmetic_multiplier = 8.\pt;
+               gourlay_maxmeasures = 14.0;
        }
        \midi{ 
                \tempo 4 = 120 ;