From fea5aac53f22eb8f3f96d36a34b58da98757ce4a Mon Sep 17 00:00:00 2001
From: hanwen <hanwen>
Date: Tue, 28 Jun 2005 11:10:24 +0000
Subject: [PATCH] * Documentation/user/advanced-notation.itely (Font
selection): remove CMR note.
* scm/framework-ps.scm (write-preamble): ly:warning iso. ly:warn
---
ChangeLog | 7 +++++++
Documentation/user/advanced-notation.itely | 8 ++++++--
Documentation/user/point-and-click.itely | 2 +-
ly/declarations-init.ly | 1 +
scm/framework-ps.scm | 2 +-
5 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 437e69dacc..ecd0dc0646 100644
--- 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 cd6516ba76..76d6314f24 100644
--- 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 c9c89cc572..a4d58320d7 100644
--- 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 598985e8d1..3beff0b6e0 100644
--- 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 5f90e67226..0dad2a827b 100644
--- 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)
--
2.39.5