* input/regression/stanza-number.ly:

* input/regression/utf8.ly (hebrew): Use addlyrics.  Update.

diff --git a/ChangeLog b/ChangeLog
index 43ead19d8a0d93590b8f24ae6af2075cc92bba6c..fde7b5e6b25b5d24aac4cc93328a336f58165355 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-02-20  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * input/regression/stanza-number.ly:
+       * input/regression/utf8.ly (hebrew): Use addlyrics.  Update.
+
        * lily/tie-engraver.cc (acknowledge_grob): Compile fix.
 
 2005-02-20  Han-Wen Nienhuys  <hanwen@xs4all.nl>

diff --git a/input/regression/stanza-number.ly b/input/regression/stanza-number.ly
index 038dcc8e2ac5a19f4f5d1fba889ffe8dbba95a3c..9b5302e8b75cd658dfd84f888029fc2e8c52d8d7 100644 (file)
--- a/input/regression/stanza-number.ly
+++ b/input/regression/stanza-number.ly
@@ -1,25 +1,21 @@
 \version "2.4.0"
 
-\header {
-texidoc = "Stanza numbers are put left of their lyric. They are aligned in a column."
-}
+\header { texidoc = "Stanza numbers are put left of their lyric.  They
+are aligned in a column."  }
 
-\score {
-<<
-    \context Voice = "A"  \relative c'' { r4 r4 c4  c4 }
-    \lyricsto A  \new Lyrics   {
-       \skip 2
-       \set stanza = "1."
-       Foo8 
-    }
-    \lyricsto A  \new Lyrics  {
-       \skip 2
-       \set stanza = "2."
-       FFFooooo8
-    }
->>
+\layout { raggedright = ##t }
 
-\layout { raggedright = ##t } 
+\relative c'' { r4 r4 c4 c4 }
+\addlyrics {
+  \skip 2
+  \set stanza = "1."
+  Foo8 
+}
+\addlyrics {
+  \skip 2
+  \set stanza = "2."
+  FFFooooo8
 }
 
 
+

diff --git a/input/regression/utf8.ly b/input/regression/utf8.ly
index 4bb9a5802e5dd90b48c3ca8ab3090cbef07adc49..13af392a0de8de49e0555706428a9131777b149d 100644 (file)
--- a/input/regression/utf8.ly
+++ b/input/regression/utf8.ly
@@ -1,18 +1,19 @@
 \version "2.5.10"
 
-% Edit this file using a Unicode aware editor, such as GVIM, GEDIT, Emacs
+%% Edit this file using a Unicode aware editor, such as GVIM, GEDIT, Emacs
 
 %{
 
-I installed some additional font packages to get this working.
+You may have to install additional fonts.
 
-taipeifonts 
-fonts-xorg-truetype 
-ttfonts-ja 
-fonts-arabic 
-ttfonts-zh_CN 
-fonts-ja 
-fonts-hebrew 
+Red Hat Fedora
+
+    taipeifonts fonts-xorg-truetype ttfonts-ja fonts-arabic \
+        ttfonts-zh_CN fonts-ja fonts-hebrew 
+
+Debian GNU/Linux
+
+   apt-get install emacs-intl-fonts xfonts-intl-.*
 
 %} 
 
@@ -27,38 +28,25 @@ will render Japanese, Hebrew and Cyrillic.
   
 }
 
-
-japanese = \lyricsto "melody" \new Lyrics {  
-
+japanese = \lyricmode {  
   いろはにほへど ちりぬるを
   わがよたれぞ  つねならむ
   うゐのおくや  まけふこえて
   あさきゆめみじ ゑひもせず 
-
  }
 
 
-bulgarian = \lyricsto "melody" \new Lyrics {
-
-    Жълтата дюля беше щастлива, че пухът, който цъфна, замръзна като гьон.
-
+bulgarian = \lyricmode {
+  Жълтата дюля беше щастлива, че пухът, който цъфна, замръзна като гьон.
 }
 
-hebrew = \lyricsto "melody" \new Lyrics { 
-זה כיף סתם לשמוע איך תנצח קרפד עץ טוב בגן.
+hebrew = \lyricmode { 
+  זה כיף סתם לשמוע איך תנצח קרפד עץ טוב בגן.
 }
 
-% latin1 section start
-
- <<
-  \context Voice = "melody" \relative  { 
-     c2 d e f g f e 
-  } 
-  \hebrew
-  \bulgarian
-
-  %% no support for TTF  yet.
-  
-  \japanese
-  
->>
+\relative  { 
+  c2 d e f g f e 
+}
+\addlyrics { \hebrew }
+\addlyrics { \bulgarian }
+\addlyrics { \japanese }