From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Wed, 13 Apr 2005 15:03:18 +0000 (+0000)
Subject: * Documentation/user/changing-defaults.itely (Font selection):
X-Git-Tag: release/2.5.19~8
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=9e8d8b33d143f482dd41d9b638d5379461999d16;p=lilypond.git

* Documentation/user/changing-defaults.itely (Font selection):
document font-name.

* input/regression/font-name.ly: show Pango fonts for
font-name. Update example.
---

diff --git a/ChangeLog b/ChangeLog
index 3ff9743a48..dad0b8b4c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-04-13  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+	* Documentation/user/changing-defaults.itely (Font selection):
+	document font-name.
+
 	* input/regression/font-name.ly: show Pango fonts for
 	font-name. Update example. 
 
diff --git a/Documentation/user/changing-defaults.itely b/Documentation/user/changing-defaults.itely
index 0061a912af..de1a50b840 100644
--- a/Documentation/user/changing-defaults.itely
+++ b/Documentation/user/changing-defaults.itely
@@ -1433,8 +1433,8 @@ then set the
   \override Staff.TimeSignature #'font-size = #2
   \time 3/4
   c'1_\markup {
-    \override #'(font-name . "Utopia Bold")
-      { This text is in Utopia Bold }
+    \override #'(font-name . "Vera Bold")
+      { This text is in Vera Bold }
   }
 }
 @end lilypond
@@ -1444,7 +1444,7 @@ Any font can be used, as long as it is available to Pango/FontConfig.
 
 The size of the font may be set with the @code{font-size}
 property. The resulting size is taken relative to the
-@code{text-font-size} as defined in the @code{\layout} block.
+@code{text-font-size} as defined in the @code{\paper} block.
 
 
 @cindex font size
diff --git a/Documentation/user/global.itely b/Documentation/user/global.itely
index 4aadd5287e..aa2c15997a 100644
--- a/Documentation/user/global.itely
+++ b/Documentation/user/global.itely
@@ -148,7 +148,7 @@ This manual: @ref{Selecting font sizes}.
 @cindex page size
 @cindex @code{papersize}
 
-To change the paper size, there are two equal commands,
+To change the paper size, there are two commands,
 @example
 #(set-default-paper-size "a4")
 \paper @{
diff --git a/input/regression/font-name.ly b/input/regression/font-name.ly
index 0a68bb6d78..80deff734d 100644
--- a/input/regression/font-name.ly
+++ b/input/regression/font-name.ly
@@ -16,16 +16,13 @@ without size specification."
   \override Staff.TimeSignature  #'font-name = #"Times"
   \time 3/4
   \set Score.skipBars = ##t
-
-				% use font-name putri8r for Utopia Italic :
-  
   \override Staff.MultiMeasureRestText #'font-name = #"LuxiMono"
   R1*21^"Rest in LuxiMono"
 
   c'1_\markup {
-    \override #'(font-name . "Utopia Bold")
+    \override #'(font-name . "Vera Bold")
       \override #'(font-size . 4)
-        { This text is in large Utopia Bold }
+        { This text is in large Vera Bold }
   }
 }