new file.

diff --git a/ChangeLog b/ChangeLog
index 1ae59b215d5ef80ad36dc554821bb980a55c026d..4a4ad15932bf18fb0ad98d8cbdde3e7e450ad6b0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-02-04  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * input/regression/fill-line-test.ly: new file.
+
+       * buildscripts/gen-emmentaler-scripts.py (i): insert dash in
+       emmentaler name, eg. emmentaler-23. 
+
 2005-02-04  Christian Hitz  <chhitz@gmx.net>
 
        * scm/scm/define-markup-commands.scm (fill-line): rework for better

diff --git a/THANKS b/THANKS
index b1082a772861ee24b59953d252c7cc929c2ae08a..2ea7a353d57c383fe13c95e60354574b884a67af 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -11,6 +11,7 @@ Graham Percival   - Documentation Editor
 
 CONTRIBUTORS
 
+Christian Hitz
 Erlend Aasland
 Arno Waschk
 Carl Sorensen

diff --git a/input/regression/fill-line-test.ly b/input/regression/fill-line-test.ly
new file mode 100644 (file)
index 0000000..d94e486
--- /dev/null
+++ b/input/regression/fill-line-test.ly
@@ -0,0 +1,163 @@
+\version "2.5.10"
+
+\header {
+
+  texidoc = "The fill-line markup command should align texts in
+  columns. For examlpe, the characters in the center should form one
+  column."
+
+}
+
+\paper {
+  bookTitleMarkup = \markup {
+  \column {
+   \fill-line {
+               1
+   }
+   \fill-line {
+               1
+               2
+   }
+   \fill-line {
+               1
+               2
+               3
+   }
+   \fill-line {
+               1
+               2
+               3
+               4
+   }
+   \fill-line {
+               1
+               2
+               3
+               4
+               5
+   }
+   \fill-line {
+               1
+               2
+               3
+               4
+               5
+               6
+   }
+   \fill-line {
+               1
+               2
+               3
+               4
+               5
+               6
+               7
+   }
+   \fill-line {
+               1
+               2
+               3
+               4
+               5
+               6
+               7
+               8
+   }
+   \fill-line {
+               1
+               2
+               3
+               4
+               5
+               6
+               7
+               8
+               9
+   }
+   \fill-line {
+               1
+               2
+               3
+               4
+               5
+               6
+               7
+               8
+               9
+               10
+   }
+   \fill-line {
+               1
+               2
+               3
+               4
+               5
+               6
+               7
+               8
+               9
+               10
+               11
+   }
+   \fill-line {
+               1
+               2
+               3
+               4
+               5
+               6
+               7
+               8
+               9
+               10
+               11
+               12
+   }
+   \fill-line {
+               1
+               2
+               3
+               4
+               5
+               6
+               7
+               8
+               9
+               10
+               11
+               12
+               13
+   }
+   \fill-line {
+               1
+               2
+               3
+               4
+               5
+               6
+               7
+               8
+               9
+               10
+               11
+               12
+               13
+               14
+   }
+   %{
+   \fill-line {
+               abcdefghijklmnopqrstuvwxyz0123456789
+               abcdefghijklmnopqrstuvwxyz0123456789
+               abcdefghijklmnopqrstuvwxyz0123456789
+   }
+   %}
+   
+   }
+  }
+}
+\book {
+       \score { \new Staff \relative c''{
+               \repeat unfold 4 c1
+       }
+       \layout {}
+}}

diff --git a/lily/score-engraver.cc b/lily/score-engraver.cc
index 9668184c4d21208b086d0b5c732caa590bb9438e..37c60dd94fc90800f9591bb252544649e753a05c 100644 (file)
--- a/lily/score-engraver.cc
+++ b/lily/score-engraver.cc
@@ -92,7 +92,7 @@ Score_engraver::finish ()
   recurse_over_translators (context (), &Translator::finalize, UP);
 }
 
-#define MUSIC_FONT "emmentaler20"
+#define MUSIC_FONT "emmentaler-20"
 
 /*
   use start/finish?

diff --git a/scm/font.scm b/scm/font.scm
index ba06c70c25cc8007eeff3fbc663df46ea75df582..70247b76ac19c76d6dc3185caf531299f5551214 100644 (file)
--- a/scm/font.scm
+++ b/scm/font.scm
@@ -165,14 +165,14 @@
                                   ,(delay  (ly:font-load "feta-alphabet26"))))
      
      (fetaMusic ,(ly:pt 20.0)
-               #(,(delay  (ly:font-load "emmentaler11"))
-                 ,(delay  (ly:font-load "emmentaler13"))                 
-                 ,(delay  (ly:font-load "emmentaler14"))
-                 ,(delay  (ly:font-load "emmentaler16"))                 
-                 ,(delay  (ly:font-load "emmentaler18"))
-                 ,(delay  (ly:font-load "emmentaler20"))                 
-                 ,(delay  (ly:font-load "emmentaler23"))                 
-                 ,(delay  (ly:font-load "emmentaler26"))))
+               #(,(delay  (ly:font-load "emmentaler-11"))
+                 ,(delay  (ly:font-load "emmentaler-13"))                
+                 ,(delay  (ly:font-load "emmentaler-14"))
+                 ,(delay  (ly:font-load "emmentaler-16"))                
+                 ,(delay  (ly:font-load "emmentaler-18"))
+                 ,(delay  (ly:font-load "emmentaler-20"))                
+                 ,(delay  (ly:font-load "emmentaler-23"))                
+                 ,(delay  (ly:font-load "emmentaler-26"))))
 
      (fetaBraces ,(ly:pt 20.0) #(,(delay
                            (ly:font-load "aybabtu")))))))