From de32e41d6e418bd7b3ae34e9a94a652db648fb99 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Fri, 4 Feb 2005 12:01:11 +0000 Subject: [PATCH] * 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. --- ChangeLog | 13 +++++++++++++ Documentation/topdocs/INSTALL.texi | 3 ++- Documentation/topdocs/NEWS.texi | 7 +++++++ Documentation/user/changing-defaults.itely | 10 ++++++++-- Documentation/user/lilypond-book.itely | 5 +++++ VERSION | 2 +- lily/pango-font.cc | 5 ++++- 7 files changed, 40 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 51ca633961..e854d60b7a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,18 @@ 2005-02-04 Han-Wen Nienhuys + * 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 2110302031..59d7f4c3d6 100644 --- 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 2c19948ea0..873644620e 100644 --- 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 455fa43ee3..d63f649802 100644 --- 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 41aa9b1679..432e77571e 100644 --- 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 cfeb198b57..43753a1df9 100644 --- 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 22dfb6b47f..048569c1bb 100644 --- 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); -- 2.39.5