* lily/pango-font.cc (pango_item_string_stencil): bugfix: don't

crash if psname is null.

* Documentation/user/changing-defaults.itely (Text encoding):
rewrite.

* lily/pango-font.cc (physical_font_tab): new member. Store PSname
-> font_filename mapping.

diff --git a/ChangeLog b/ChangeLog
index 51ca633961a987a80f2f1c85fb565c75faf6b35f..e854d60b7a2b0465d23a510a695cf4da6f47d428 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
 2005-02-04  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * lily/parser.yy (assignment_id): allow LYRICS_STRING as
+       identifier definition too, so foo = \lyrics { ...   } bar = #1
+       doesn't complain about "bar" being LYRICS_STRING.
+
+       * lily/paper-def.cc (find_pango_font): new routine; Store
+       pango_fonts in hash tab too. This is necessary for retrieving
+       Pango_fonts::physical_font_tab() later on.
+ 
+       * lily/pango-font.cc (pango_item_string_stencil): bugfix: don't
+       crash if psname is null.
+
+       * lily/lily-guile.cc (ly_hash2alist): new function
+
        * Documentation/user/changing-defaults.itely (Text encoding):
        rewrite. 
 

diff --git a/Documentation/topdocs/INSTALL.texi b/Documentation/topdocs/INSTALL.texi
index 2110302031ce7cce3198a26b4a91c64700e8f613..59d7f4c3d6d2cbe875b9968e3d5c0a0719f76232 100644 (file)
--- a/Documentation/topdocs/INSTALL.texi
+++ b/Documentation/topdocs/INSTALL.texi
@@ -127,7 +127,8 @@ following software:
 @item @uref{http://www.gnu.org/software/guile/guile.html,GUILE} (version 1.6.0 or newer).
 @item @uref{http://www.python.org,Python} (version 2.1 or newer).
 @item @TeX{}.
-@item Xdvi and Ghostscript.
+@item @uref{http://www.ghostscript.com,Ghostscript} (version 8.15 or
+newer)
 @end itemize
 
 You have to help @TeX{} and MetaFont find LilyPond support

diff --git a/Documentation/topdocs/NEWS.texi b/Documentation/topdocs/NEWS.texi
index 2c19948ea0e9ea87656cddd8bedc782fd8eb1cfc..873644620e0335f6edb670c5ae30a3254d66b1f1 100644 (file)
--- a/Documentation/topdocs/NEWS.texi
+++ b/Documentation/topdocs/NEWS.texi
@@ -8,6 +8,13 @@
 
 @itemize @bullet
 
+@item
+The PostScript backend is now used by default. This backend requires
+less machinery to run, and gives more consistent results.
+
+Due bugs in GhostScript's PDF handling, it is recommended to upgrade
+to GhostScript 8.x.
+
 @item
 Separator slashes may be inserted between systems in a score. See
 @file{input/regression/system-separator.ly} for an example. 

diff --git a/Documentation/user/changing-defaults.itely b/Documentation/user/changing-defaults.itely
index 455fa43ee39f7b47b8e00c33792b8ad4190bb0d6..d63f649802d6ef1531aa27e13bd33abe639123c6 100644 (file)
--- a/Documentation/user/changing-defaults.itely
+++ b/Documentation/user/changing-defaults.itely
@@ -1556,7 +1556,14 @@ 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.
 
-@lilypondfile[utf8.ly]
+Depending on the fonts installed, the following fragment shows Hebrew
+and Cyrillic lyrics,
+
+@cindex Cyrillic
+@cindex Hebrew
+@cindex ASCII, non
+
+@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
@@ -2598,6 +2605,5 @@ be entered:
 @itemize @bullet
 @item @code{\version}
 @item @code{\include}
-@item @code{\encoding}
 @item @code{\renameinput}
 @end itemize 

diff --git a/Documentation/user/lilypond-book.itely b/Documentation/user/lilypond-book.itely
index 41aa9b16792c98bcba0a14cccd6a83fb30be6d88..432e77571e80d9ab1680220bdba99408f782a4a3 100644 (file)
--- a/Documentation/user/lilypond-book.itely
+++ b/Documentation/user/lilypond-book.itely
@@ -255,6 +255,9 @@ PDF can then be produced with a PostScript to PDF translator like
 @cindex international characters
 @cindex latin1
 
+
+[THE FOLLOWING IS OUT OF DATE. ]
+
 LilyPond does not use the La@TeX{} font handling scheme for lyrics and
 text markups; it uses the EC font family and has limited support for
 selecting an input encoding with the @code{\encoding} keyword if the
@@ -280,6 +283,8 @@ the real string length.
 As a corrolary of the last paragraphs the following two lines should be
 present in the La@TeX{} document preamble
 
+[END OUT OF DATE]
+
 @example
 \usepackage[latin1]@{inputenc@}
 \usepackage[T1]@{fontenc@}

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

diff --git a/lily/pango-font.cc b/lily/pango-font.cc
index 22dfb6b47fc4988e8e56e490fe23b47965a8b788..048569c1bbfae63e472b7a85b50df33e096f5469 100644 (file)
--- a/lily/pango-font.cc
+++ b/lily/pango-font.cc
@@ -46,7 +46,10 @@ Pango_font::Pango_font (PangoFT2FontMap *fontmap,
     --hwn
    */
   scale_ = INCH_TO_BP / (Real (PANGO_SCALE) * Real (PANGO_RESOLUTION) * output_scale);
-  
+
+  /*
+    ugh. Should make this configurable.
+  */
   pango_context_set_language (context_, pango_language_from_string ("en_US"));
   pango_context_set_base_dir (context_, pango_dir);
   pango_context_set_font_description (context_, description);