resolve merge

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

diff --git a/input/lsr/utf-8.ly b/input/lsr/utf-8.ly
deleted file mode 100644 (file)
index fd892f4..0000000
--- a/input/lsr/utf-8.ly
+++ /dev/null
@@ -1,69 +0,0 @@
-%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
-%% This file is in the public domain.
-\version "2.12.3"
-
-\header {
-  lsrtags = "text"
-
-  texidoc = "
-Various scripts may be used for texts (like titles and 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
-
-%% Edit this file using a Unicode aware editor, such as GVIM, GEDIT, Emacs
-
-%{
-
-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 
-
-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 
-%}
-
-% Cyrillic font
-bulgarian = \lyricmode {
-  Жълтата дюля беше щастлива, че пухът, който цъфна, замръзна като гьон.
-}
-
-hebrew = \lyricmode {
-  זה כיף סתם לשמוע איך תנצח קרפד עץ טוב בגן.
-}
-
-japanese = \lyricmode {
-  いろはにほへど ちりぬるを
-  わがよたれぞ  つねならむ
-  うゐのおくや  まけふこえて
-  あさきゆめみじ ゑひもせず
-}
-
-% "a legal song to you"
-portuguese = \lyricmode {
-  à vo -- cê uma can -- ção legal
-}
-
-\relative c' {
-  c2 d
-  e2 f
-  g2 f
-  e1
-}
-\addlyrics { \bulgarian }
-\addlyrics { \hebrew }
-\addlyrics { \japanese }
-\addlyrics { \portuguese }