Merge branch 'master' into translation

[lilypond.git] / input / regression / utf-8.ly

diff --git a/input/regression/utf-8.ly b/input/regression/utf-8.ly
index 4a82eab24b5ec7fab1d5b102cf5bdf3ca167f8a2..b5fefcf9231c8c9ef200c0d3f05358613d1a6884 100644 (file)
--- a/input/regression/utf-8.ly
+++ b/input/regression/utf-8.ly
@@ -1,4 +1,4 @@
-\version "2.7.39"
+\version "2.19.21"
 
 %% Edit this file using a Unicode aware editor, such as GVIM, GEDIT, Emacs
 
@@ -8,15 +8,15 @@ You may have to install additional fonts.
 
 Red Hat Fedora
 
-    taipeifonts fonts-xorg-truetype ttfonts-ja fonts-arabic \
-        ttfonts-zh_CN fonts-ja fonts-hebrew 
+       linux-libertine-fonts (Latin, Cyrillic, Hebrew)
+       ipa-mincho-fonts ipa-gothic-fonts (Japanese)
 
-Debian GNU/Linux
+Debian GNU/Linux, Ubuntu
 
-   apt-get install emacs-intl-fonts xfonts-intl-.* \
-       ttf-kochi-gothic ttf-kochi-mincho \
-       xfonts-bolkhov-75dpi xfonts-cronyx-100dpi xfonts-cronyx-75dpi 
-%} 
+       fonts-linuxlibertine (Latin, Cyrillic, Hebrew)
+       fonts-ipafont (Japanese)
+
+%}
 
 \header {
 
@@ -26,7 +26,18 @@ Pango based backend.  Depending on the fonts installed, this fragment
 will render Bulgarian (Cyrillic), Hebrew, Japanese and Portuguese.
 
 "
-  
+
+}
+
+% Font settings for Cyrillic and Hebrew
+% Linux Libertine fonts contain Cyrillic and Hebrew glyphs.
+\paper {
+  #(define fonts
+    (set-global-fonts
+     #:roman "Linux Libertine O,serif"
+     #:sans "Linux Biolinum O,sans-serif"
+     #:typewriter "Linux Libertine Mono O,monospace"
+   ))
 }
 
 % Cyrillic font
@@ -34,25 +45,28 @@ bulgarian = \lyricmode {
   Жълтата дюля беше щастлива, че пухът, който цъфна, замръзна като гьон.
 }
 
-hebrew = \lyricmode { 
+hebrew = \lyricmode {
   זה כיף סתם לשמוע איך תנצח קרפד עץ טוב בגן.
 }
 
-japanese = \lyricmode {  
+japanese = \lyricmode {
   いろはにほへど ちりぬるを
   わがよたれぞ  つねならむ
   うゐのおくや  まけふこえて
-  あさきゆめみじ ゑひもせず 
+  あさきゆめみじ ゑひもせず
 }
 
 % "a legal song to you"
-portuguese = \lyricmode { 
-  à vo cê uma can ção legal
+portuguese = \lyricmode {
+  à vo -- cê uma can -- ção legal
 }
 
+\paper {
+  ragged-right = ##T
+}
 
-\relative  { 
-  c2 d e f g f e
+\relative {
+  c'2 d e f g f e
 }
 \addlyrics { \bulgarian }
 \addlyrics { \hebrew }