X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Futf-8.ly;h=b5fefcf9231c8c9ef200c0d3f05358613d1a6884;hb=b307da2a51bb84957ae2194fbe34f33d00867cde;hp=dc4979142637e8282161a8bce42d21aa7830f357;hpb=d02446a61d3eabfde67ed48928ae07766c97750f;p=lilypond.git

diff --git a/input/regression/utf-8.ly b/input/regression/utf-8.ly
index dc49791426..b5fefcf923 100644
--- a/input/regression/utf-8.ly
+++ b/input/regression/utf-8.ly
@@ -1,4 +1,4 @@
-\version "2.7.32"
+\version "2.19.21"
 
 %% Edit this file using a Unicode aware editor, such as GVIM, GEDIT, Emacs
 
@@ -8,52 +8,67 @@ 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
+	fonts-linuxlibertine (Latin, Cyrillic, Hebrew)
+	fonts-ipafont (Japanese)
 
-%} 
+%}
 
 \header {
 
   texidoc = "Various scripts may be used for texts (like titles and
 lyrics) introduced by entering them in UTF-8 encoding, and using a
-Pango based backend. Depending on the fonts installed, this fragment
-will render Japanese, Hebrew, Cyrillic and Portuguese.
+Pango based backend.  Depending on the fonts installed, this fragment
+will render Bulgarian (Cyrillic), Hebrew, Japanese and Portuguese.
 
 "
-  
-}
 
-japanese = \lyricmode {  
-  いろはにほへど ちりぬるを
-  わがよたれぞ  つねならむ
-  うゐのおくや  まけふこえて
-  あさきゆめみじ ゑひもせず 
- }
+}
 
+% 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
 bulgarian = \lyricmode {
   Жълтата дюля беше щастлива, че пухът, който цъфна, замръзна като гьон.
 }
 
-hebrew = \lyricmode { 
+hebrew = \lyricmode {
   זה כיף סתם לשמוע איך תנצח קרפד עץ טוב בגן.
 }
 
-portuguese = \lyricmode { 
-  à vo cê uma can ção legal
+japanese = \lyricmode {
+  いろはにほへど ちりぬるを
+  わがよたれぞ  つねならむ
+  うゐのおくや  まけふこえて
+  あさきゆめみじ ゑひもせず
+}
+
+% "a legal song to you"
+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 { \hebrew }
 \addlyrics { \bulgarian }
+\addlyrics { \hebrew }
 \addlyrics { \japanese }
 \addlyrics { \portuguese }