Merge commit 'origin' into beamlets2

[lilypond.git] / input / regression / font-name.ly

diff --git a/input/regression/font-name.ly b/input/regression/font-name.ly
index 211ea2da9c02ef6e2e56a2f4cbed6f27598bb111..062f2f7549626d18b63bbd1048b7f1dfd34703a7 100644 (file)
--- a/input/regression/font-name.ly
+++ b/input/regression/font-name.ly
@@ -1,26 +1,28 @@
-\version "1.7.28"
+\version "2.12.0"
 
 \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."
 
 
 }
 
-\score {
-    \notes {
-       \property Staff.TimeSignature   \set #'font-name = #"cmr17"
-       \property Score.skipBars = ##t 
-       \property Staff.MultiMeasureRestText \set  #'font-name = #"putri8r"
-       c'1_\markup { \override #'(font-name . "ptmb8r")
-                         { This text is bold Times Roman } }
+\layout { ragged-right = ##t }
 
-            R1*21^"Wait for Utopia Italic"
-            }
-    
-    \paper { raggedright = ##t }
 
+{
+  \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 }
+  }
 }
+