X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Ffont-name.ly;h=c4d2fc765eab0e8e3409099751b71e493f0b4958;hb=9cba6d0b05bd28e2fc73f091b09ace570c976182;hp=7783ec5366df979e3bcf29919c833edbdd4548a1;hpb=df56feefa28914b45532b0a31b24c304c162b497;p=lilypond.git

diff --git a/input/regression/font-name.ly b/input/regression/font-name.ly
index 7783ec5366..c4d2fc765e 100644
--- a/input/regression/font-name.ly
+++ b/input/regression/font-name.ly
@@ -1,45 +1,29 @@
-\version "2.4.0"
+\version "2.14.0"
 
 \header {
 
-    texidoc = "Other fonts can be used by setting font-name for
-the appropriate object. This may include Postscript fonts that are
-available through (La)TeX.
-
-
-BROKEN by pango/fontconfig
-"
+    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 {
-     {
+\layout { ragged-right = ##t }
 
-       %% FIXME. 
-%	\override Staff.TimeSignature  #'font-name = #"cmr17"
-	\set Score.skipBars = ##t
 
-	% use font-name putri8r for Utopia Italic :
-	
-	\override Staff.MultiMeasureRestText   #'font-name = #"cmss12"
-
-
-	% use "ptmb8r" for Times Roman
-	
-	c'1_\markup { \override #'(font-name . "cmdunh10")
-			  { This text is Dunhill } }
-
-	     R1*21^"Wait for Utopia Italic"
-	     }
-    
-    \layout { raggedright = ##t }
+{
+  \override Score.PaperColumn #'keep-inside-line = ##f
+  \override Staff.TimeSignature  #'font-name = #"Times New Roman"
+  \time 3/4
+  \set Score.skipBars = ##t
+  \override Staff.MultiMeasureRestText #'font-name = #"LuxiMono"
+  R1*21^"Rest in LuxiMono"
 
+  c'1_\markup {
+    \override #'(font-name . "Vera Bold")
+      \override #'(font-size . 4)
+        { This text is in large Vera Bold }
+  }
 }
+