Merge commit 'origin' into beamlets2

[lilypond.git] / input / lsr / changing-the-default-text-font-family.ly

diff --git a/input/lsr/changing-the-default-text-font-family.ly b/input/lsr/changing-the-default-text-font-family.ly
index c380242d9a8e1fa389a7b896dfa05d499b0d9c3d..d73371c642773de03f202c7e5e2ad4b767a8ca33 100644 (file)
--- a/input/lsr/changing-the-default-text-font-family.ly
+++ b/input/lsr/changing-the-default-text-font-family.ly
@@ -1,13 +1,18 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-%% Tags: editorial-and-educational-use, text, tweaks-and-overrides
-\version "2.11.35"
+\version "2.12.0"
 
-\header { texidoc = "
+\header {
+  lsrtags = "text, tweaks-and-overrides"
+
+  texidoc = "
 The default font families for text can be overridden with
 @code{make-pango-font-tree}. 
-" }
-% begin verbatim
+
+"
+  doctitle = "Changing the default text font family"
+} % begin verbatim
+
 \paper {
   % change for other default global staff size. 
   myStaffSize = #20
@@ -26,17 +31,17 @@ The default font families for text can be overridden with
      (/ myStaffSize 20)))
 }
 
-\relative {
-  c'^\markup {
+\relative c'' {
+  c4^\markup {
     roman: foo \bold bla \italic bar \italic \bold baz 
   }
-  c'_\markup {
+  c'4_\markup {
     \override #'(font-family . sans)
     {
       sans: foo \bold bla \italic bar \italic \bold baz
     }
   }
-  c'^\markup {
+  c'2^\markup {
     \override #'(font-family . typewriter)
     {
       mono: foo \bold bla \italic bar \italic \bold baz