From 782b2f9c65953f8cf9e24ea60640eb8900f0b2c5 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 20 Feb 2005 20:33:37 +0000 Subject: [PATCH] * input/regression/stanza-number.ly: * input/regression/utf8.ly (hebrew): Use addlyrics. Update. --- ChangeLog | 3 ++ input/regression/stanza-number.ly | 32 ++++++++---------- input/regression/utf8.ly | 54 ++++++++++++------------------- 3 files changed, 38 insertions(+), 51 deletions(-) diff --git a/ChangeLog b/ChangeLog index 43ead19d8a..fde7b5e6b2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2005-02-20 Jan Nieuwenhuizen + * 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 diff --git a/input/regression/stanza-number.ly b/input/regression/stanza-number.ly index 038dcc8e2a..9b5302e8b7 100644 --- 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 4bb9a5802e..13af392a0d 100644 --- 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 } -- 2.39.5