Merge master into nested-bookparts

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

diff --git a/input/lsr/utf-8.ly b/input/lsr/utf-8.ly
index 80b6a8ca5febba7e0b0b792a9d80c4c26d499a1e..158dc4ef84320d13777fb203199f8e12c633e52d 100644 (file)
--- a/input/lsr/utf-8.ly
+++ b/input/lsr/utf-8.ly
@@ -1,6 +1,6 @@
-%% Do not edit this file; it is auto-generated from LSR!
-%% Tags: text
-\version "2.11.35"
+%% Do not edit this file; it is auto-generated from input/new
+%% This file is in the public domain.
+\version "2.11.62"
 
 %% Edit this file using a Unicode aware editor, such as GVIM, GEDIT, Emacs
 
@@ -11,53 +11,53 @@ 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 
+   ttfonts-zh_CN fonts-ja fonts-hebrew 
 
 Debian GNU/Linux
 
    apt-get install emacs-intl-fonts xfonts-intl-.* \
-       ttf-kochi-gothic ttf-kochi-mincho \
-       xfonts-bolkhov-75dpi xfonts-cronyx-100dpi xfonts-cronyx-75dpi 
+  ttf-kochi-gothic ttf-kochi-mincho \
+  xfonts-bolkhov-75dpi xfonts-cronyx-100dpi xfonts-cronyx-75dpi 
 %} 
 
 \header {
-
+  lsrtags = "text"
   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 Bulgarian (Cyrillic), Hebrew, Japanese and Portuguese.
-
+lyrics) by entering them in UTF-8 encoding, and using a Pango based
+backend.  Depending on the fonts installed, this fragment will
+render Bulgarian (Cyrillic), Hebrew, Japanese and Portuguese.
 "
-  
-}
+  doctitle = "UTF-8"
+} % begin verbatim
 
+% end verbatim - this comment is a hack to prevent texinfo.tex
+% from choking on non-European UTF-8 subsets
 % Cyrillic font
 bulgarian = \lyricmode {
   Жълтата дюля беше щастлива, че пухът, който цъфна, замръзна като гьон.
 }
 
-hebrew = \lyricmode { 
+hebrew = \lyricmode {
   זה כיף סתם לשמוע איך תנצח קרפד עץ טוב בגן.
 }
 
-japanese = \lyricmode {  
+japanese = \lyricmode {
   いろはにほへど ちりぬるを
   わがよたれぞ  つねならむ
   うゐのおくや  まけふこえて
-  あさきゆめみじ ゑひもせず 
+  あさきゆめみじ ゑひもせず
 }
 
 % "a legal song to you"
-portuguese = \lyricmode { 
+portuguese = \lyricmode {
   à vo -- cê uma can -- ção legal
 }
 
-\paper {
-  ragged-right = ##T
-}
-
-\relative  { 
-  c2 d e f g f e
+\relative c' {
+  c2 d
+  e2 f
+  g2 f
+  e1
 }
 \addlyrics { \bulgarian }
 \addlyrics { \hebrew }