* Documentation/user/advanced-notation.itely (Font selection):

remove CMR note.

* scm/framework-ps.scm (write-preamble): ly:warning iso. ly:warn

diff --git a/ChangeLog b/ChangeLog
index 437e69dacc5afba64731012fd1367c006b5735f1..ecd0dc0646855e18a741144d13d136e00e029045 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-06-28  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * Documentation/user/advanced-notation.itely (Font selection):
+       remove CMR note.
+
+       * scm/framework-ps.scm (write-preamble): ly:warning iso. ly:warn 
+
 2005-06-28  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * THANKS: Add UTF-8 marker.

diff --git a/Documentation/user/advanced-notation.itely b/Documentation/user/advanced-notation.itely
index cd6516ba7645da634713514bcfa06c290884bb3c..76d6314f24429be8d762d4ea1ba57a23c1a2f518 100644 (file)
--- a/Documentation/user/advanced-notation.itely
+++ b/Documentation/user/advanced-notation.itely
@@ -396,8 +396,11 @@ The following commands can all be used inside @code{\markup @{ @}}.
 
 By setting the object properties described below, you can select a
 font from the preconfigured font families.  LilyPond has default
-support for the feta music fonts and @TeX{}'s Computer Modern text
-fonts.
+support for the feta music fonts. Text fonts are selected through
+Pango/FontConfig. The serif font defaults to New Century Schoolbook,
+the sans and typewriter to whatever the Pango installation defaults
+to.
+
 
 @itemize @bullet
 @item @code{font-encoding}
@@ -453,6 +456,7 @@ property. The resulting size is taken relative to the
 
 @seealso
 
+@c FIXME.
 Init files: @file{ly/@/declarations@/-init@/.ly} contains hints how new
 fonts may be added to LilyPond.
 

diff --git a/Documentation/user/point-and-click.itely b/Documentation/user/point-and-click.itely
index c9c89cc572fea3065acfe7f5a544bca8fdfe2ead..a4d58320d773503401f1332d2c8649b5d77f9aa1 100644 (file)
--- a/Documentation/user/point-and-click.itely
+++ b/Documentation/user/point-and-click.itely
@@ -53,7 +53,7 @@ user_pref("network.protocol-handler.warn-external.textedit", false);
 
 @end itemize
 
-The program @file{lilypond-pdfpc-helper} is a small helper program.
+The program @file{lilypond-invoke-editor} is a small helper program.
 It tests the environment variable @code{EDITOR} for the following
 patterns,
 

diff --git a/ly/declarations-init.ly b/ly/declarations-init.ly
index 598985e8d14952341545699463c999c9a6fc3730..3beff0b6e0b3b012543a19faeea430e34ee8ce86 100644 (file)
--- a/ly/declarations-init.ly
+++ b/ly/declarations-init.ly
@@ -120,3 +120,4 @@ setDefaultDurationToQuarter = { c4 }
 #(define toplevel-music-handler collect-music-for-book)
 #(define toplevel-score-handler collect-scores-for-book)
 #(define toplevel-text-handler collect-scores-for-book)
+

diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm
index 5f90e67226411bddd899f4aebe9730a2d9c8c9a3..0dad2a827b485cd28dd64965d0ea45eaaabcd849 100644 (file)
--- a/scm/framework-ps.scm
+++ b/scm/framework-ps.scm
@@ -300,7 +300,7 @@
       (if (not embed)
          (begin
            (set! embed "% failed \n")
-           (ly:warn (_ "Couldn't extract file matching ~a from ~a") name filename)))
+           (ly:warning (_ "Couldn't extract file matching ~a from ~a") name filename)))
       embed))
 
     (define (font-file-as-ps-string name file-name)