Imported Upstream version 2.14.2

[lilypond.git] / input / regression / font-family-override.ly

diff --git a/input/regression/font-family-override.ly b/input/regression/font-family-override.ly
index 39c9b6849a7417b989182c9c9ce5d3d8a7c8100c..e077176761c26f1dd12c2ec933c34d8508580697 100644 (file)
--- a/input/regression/font-family-override.ly
+++ b/input/regression/font-family-override.ly
@@ -5,10 +5,10 @@
 
 }
 
-\version "2.12.0"
+\version "2.14.0"
 
-\paper  {
-  % change for other default global staff size. 
+\paper {
+  % change for other default global staff size.
   myStaffSize = #20
 
 
@@ -18,11 +18,11 @@
 
       lilypond -dshow-available-fonts blabla
 
-  to show all fonts available in the process log.  
-  
+  to show all fonts available in the process log.
+
   %}
 
-  
+
   #(define fonts
     (make-pango-font-tree "Times New Roman"
                           "Nimbus Sans"
@@ -34,19 +34,29 @@
      (/ myStaffSize 20)))
 }
 
-\relative {
+\score {
+  \relative c'' {
 
-  c'^\markup { roman: foo \bold bla \italic bar \italic \bold baz }
-  c'_\markup {
-    \override #'(font-family . sans)
-    {
-      sans: foo \bold bla \italic bar \italic \bold baz
+    c^\markup { roman: foo \bold bla \italic bar \italic \bold baz }
+    c'_\markup {
+      \override #'(font-family . sans)
+      {
+        sans: foo \bold bla \italic bar \italic \bold baz
+      }
+    }
+    c'^\markup {
+      \override #'(font-family . typewriter)
+      {
+        mono: foo \bold bla \italic bar \italic \bold baz
+      }
     }
   }
-  c'^\markup {
-    \override #'(font-family . typewriter)
-    {
-      mono: foo \bold bla \italic bar \italic \bold baz
+
+  \layout {
+    \context {
+      \Score
+      \override PaperColumn #'keep-inside-line = ##f
     }
   }
-}  
+
+}