X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Ffont-name.ly;h=f2a05774a658dd48278c4aad27a44076424eacbd;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=9e6ceb6b8cf9cb92c0e8af503bace6e104bc3ec5;hpb=70048d99398924e7ca0eb481925145ec243700c5;p=lilypond.git

diff --git a/input/regression/font-name.ly b/input/regression/font-name.ly
index 9e6ceb6b8c..f2a05774a6 100644
--- a/input/regression/font-name.ly
+++ b/input/regression/font-name.ly
@@ -1,41 +1,34 @@
-\version "1.9.4"
+\version "2.17.6"
 
 \header {
 
-    texidoc = "Using other fonts can be done by setting font-name for
-the appropriate object. This may include Postscript fonts that are
-available through (La)TeX.
-
-"
+    texidoc = "Other fonts can be used by setting @code{font-name} for
+the appropriate object. The string should be a Pango font description
+without size specification."
 
 
 }
 
-%{
-
- Postscript fonts are switched off by default,
- for compatibility with TeX installations that have no
- PS fonts installed.
-%}
-
-\score {
-    \notes {
-	\property Staff.TimeSignature 	\set #'font-name = #"cmr17"
-	\property Score.skipBars = ##t
+\layout { ragged-right = ##t }
 
-	% use font-name putri8r for Utopia Italic :
-	
-	\property Staff.MultiMeasureRestText \set  #'font-name = #"cmss12"
 
+{
+  \override Score.PaperColumn.keep-inside-line = ##f
 
-	% use "ptmb8r" for Times Roman
-	
-	c'1_\markup { \override #'(font-name . "cmdunh10")
-			  { This text is Dunhill } }
-
-	     R1*21^"Wait for Utopia Italic"
-	     }
-    
-    \paper { raggedright = ##t }
+  % A comma is required
+  % for font name "Times New Roman"'s explicit termination.
+  % If there is no comma, Pango interpret "Times New Roman" as
+  % "Times New" family with "Roman" style.
+  \override Staff.TimeSignature.font-name = #"Times New Roman,"
+  \time 3/4
+  \set Score.skipBars = ##t
+  \override Staff.MultiMeasureRestText.font-name = #"Luxi Mono"
+  R1*21^"Rest in Luxi Mono"
 
+  c'1_\markup {
+    \override #'(font-name . "Bitstream Vera Sans, Bold")
+      \override #'(font-size . 4)
+        { This text is in large Vera Bold }
+  }
 }
+