*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 221d3b7fd7e725bbcae4566c7f6ba226ca801eb3..b3dca95ff74b5a8bdddf3da63251e8689218b0cf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2005-02-05  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * input/regression/*.ly: remove old-relative everywhere
+
        * lily/music-sequence.cc (simultaneous_relative_callback): do
        what-if analysis on copy, not on original. Fixes old-relative
        compatibility.

diff --git a/Documentation/user/changing-defaults.itely b/Documentation/user/changing-defaults.itely
index d63f649802d6ef1531aa27e13bd33abe639123c6..4d3b32b9cea856f36d7cacf31dcf59816405ebf8 100644 (file)
--- a/Documentation/user/changing-defaults.itely
+++ b/Documentation/user/changing-defaults.itely
@@ -1554,7 +1554,10 @@ Syntax errors for markup mode are confusing.
 
 LilyPond uses the Pango library to format multi-lingual texts.  This
 means that any text, be it title, lyric text, or musical instruction
-contaning non-ASCII characters should be entered as Unicode.
+contaning non-ASCII characters should be entered as Unicode.  Such
+files should be edited using a Unicode aware editor, and saved as UTF8
+encoded. Most popular modern editors have UTF8 support, for example,
+vim, Emacs, jEdit, and GEdit do.
 
 Depending on the fonts installed, the following fragment shows Hebrew
 and Cyrillic lyrics,
@@ -1565,21 +1568,22 @@ and Cyrillic lyrics,
 
 @lilypondfile{utf8.ly}
 
+
 The @TeX{} backend does not handle encoding specially at all. Strings
 in the input are put in the output as-is. Extents of text items in the
 @TeX{} backend, are determined by reading a file created via the
 @file{texstr} backend,
 
 @example
-  lilypond -b texstr input/les-nereides.ly
-  latex les-nereides.texstr
+lilypond -b texstr input/les-nereides.ly
+latex les-nereides.texstr
 @end example
 
 The last command produces @file{les-nereides.textmetrics}, which is
 read when you execute
 
 @example
-  lilypond -b tex input/les-nereides.ly
+lilypond -b tex input/les-nereides.ly
 @end example
 
 Both @file{les-nereides.texstr} and @file{les-nereides.tex} need
@@ -1588,7 +1592,7 @@ interpreting non-ASCII strings.
 
 @seealso
 
-@inputfileref{input/regression/,utf8.ly}
+@inputfileref{input/regression,utf8.ly}
 
 
 @node Nested scores

diff --git a/VERSION b/VERSION
index 43753a1df983eb793b91f7299573ae7a1491f90b..3643ac4c4b6c88a7dd293fa2fb0dfcac727f2ced 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,6 +1,6 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=2
 MINOR_VERSION=5
-PATCH_LEVEL=11
+PATCH_LEVEL=12
 MY_PATCH_LEVEL=