From: hanwen <hanwen>
Date: Mon, 1 Aug 2005 11:31:09 +0000 (+0000)
Subject: (Font selection): add
X-Git-Tag: release/2.6.4~17^2~164
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=2ad2c184eb9b9b77142a6d4492e46848c8bbedcc;p=lilypond.git

(Font selection): add
doco for make-pango-font-tree.
---

diff --git a/ChangeLog b/ChangeLog
index 4dfb7d8996..fb3f719678 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-01  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+	* Documentation/user/advanced-notation.itely (Font selection): add
+	doco for make-pango-font-tree.
+
 2005-07-31  Graham Percival  <gperlist@shaw.ca>
 
 	* Documentation/user/music-glossary: more languages
diff --git a/Documentation/user/advanced-notation.itely b/Documentation/user/advanced-notation.itely
index ee6b3ae790..4a840dd44d 100644
--- a/Documentation/user/advanced-notation.itely
+++ b/Documentation/user/advanced-notation.itely
@@ -454,11 +454,37 @@ property. The resulting size is taken relative to the
 @cindex font size
 @cindex font magnification
 
+
+It is also possible to change the default font family for the entire
+document. This is done by calling the @code{make-pango-font-tree} from
+within the @code{\paper} block. The function takes names for the font
+families to use for roman, sans serif and monospaced text. For
+example,
+
+@cindex font families, setting
+@cindex Pango
+
+
+@lilypond[verbatim]
+\paper  {
+  myStaffSize = #20
+  
+  #(define fonts
+    (make-pango-font-tree "Times New Roman"
+                          "Helvetica"
+                          "Courier"
+                           (/ myStaffSize 20)))
+}
+
+{
+  c'^\markup { roman: foo \sans bla \typewriter bar }
+}
+@end lilypond
+
+
 @seealso
 
-@c FIXME.
-Init files: @file{ly/@/declarations@/-init@/.ly} contains hints how new
-fonts may be added to LilyPond.
+Examples: @file{ly/@/font@/-family@/-override.ly}
 
 
 @node New dynamic marks
diff --git a/lily/forbid-break-engraver.cc b/lily/forbid-break-engraver.cc
index 7ad1133e4f..1724ccd36c 100644
--- a/lily/forbid-break-engraver.cc
+++ b/lily/forbid-break-engraver.cc
@@ -51,7 +51,8 @@ Forbid_line_break_engraver::start_translation_timestep ()
 
 
 ADD_TRANSLATOR (Forbid_line_break_engraver,
-		/* descr */ "Forbid line breaks when note heads are still playing at some point.",
+		/* descr */ "Forbid line breaks when note heads "
+		"are still playing at some point.",
 		/* creats*/ "",
 		/* accepts */ "",
 		/* reads */ "busyGrobs",