From d0980c892d79010a9506aa5b7da504181ba5b632 Mon Sep 17 00:00:00 2001
From: Masamichi Hosoda <trueroad@trueroad.jp>
Date: Mon, 7 Sep 2015 22:12:56 +0900
Subject: [PATCH] Issue 4591 / 3: Fix font-name overriding wrong name

Some font names do not exist.
This commit replaces them with correct font names.
---
 Documentation/de/notation/text.itely          |  2 +-
 Documentation/es/notation/text.itely          |  2 +-
 Documentation/fr/notation/text.itely          |  2 +-
 Documentation/it/notation/text.itely          |  2 +-
 Documentation/ja/notation/text.itely          |  2 +-
 Documentation/notation/text.itely             |  2 +-
 .../snippets/new/changing-stanza-fonts.ly     | 29 +++++++++++++++++++
 input/regression/font-name.ly                 |  6 ++--
 8 files changed, 38 insertions(+), 9 deletions(-)
 create mode 100644 Documentation/snippets/new/changing-stanza-fonts.ly

diff --git a/Documentation/de/notation/text.itely b/Documentation/de/notation/text.itely
index fedd9bf807..dfc5eef14d 100644
--- a/Documentation/de/notation/text.itely
+++ b/Documentation/de/notation/text.itely
@@ -1593,7 +1593,7 @@ verwendet man folgende Syntax:
 \time 3/4
 
 a'1_\markup {
-  \override #'(font-name . "Vera Bold")
+  \override #'(font-name . "Bitstream Vera Sans Bold")
     { Vera Bold }
 }
 @end lilypond
diff --git a/Documentation/es/notation/text.itely b/Documentation/es/notation/text.itely
index 2a55ec7252..d301757b0e 100644
--- a/Documentation/es/notation/text.itely
+++ b/Documentation/es/notation/text.itely
@@ -1576,7 +1576,7 @@ FontConfig, usando la siguiente sintaxis:
 \time 3/4
 
 a'1_\markup {
-  \override #'(font-name . "Vera Bold")
+  \override #'(font-name . "Bitstream Vera Sans Bold")
     { Vera Bold }
 }
 @end lilypond
diff --git a/Documentation/fr/notation/text.itely b/Documentation/fr/notation/text.itely
index 56f08f8538..f66e432aed 100644
--- a/Documentation/fr/notation/text.itely
+++ b/Documentation/fr/notation/text.itely
@@ -1600,7 +1600,7 @@ respectez la syntaxe suivante :
 \time 3/4
 
 a'1_\markup {
-  \override #'(font-name . "Vera Bold")
+  \override #'(font-name . "Bitstream Vera Sans Bold")
     { Vera Bold }
 }
 @end lilypond
diff --git a/Documentation/it/notation/text.itely b/Documentation/it/notation/text.itely
index 672a17dec3..d4820c4d1c 100644
--- a/Documentation/it/notation/text.itely
+++ b/Documentation/it/notation/text.itely
@@ -1539,7 +1539,7 @@ sintassi:
 \time 3/4
 
 a'1_\markup {
-  \override #'(font-name . "Vera Bold")
+  \override #'(font-name . "Bitstream Vera Sans Bold")
     { Vera Bold }
 }
 @end lilypond
diff --git a/Documentation/ja/notation/text.itely b/Documentation/ja/notation/text.itely
index 72d31153cd..a737f2963f 100644
--- a/Documentation/ja/notation/text.itely
+++ b/Documentation/ja/notation/text.itely
@@ -1554,7 +1554,7 @@ FontConfig に認識されている任意のフォントを@c
 \time 3/4
 
 a'1_\markup {
-  \override #'(font-name . "Vera Bold")
+  \override #'(font-name . "Bitstream Vera Sans Bold")
     { Vera Bold }
 }
 @end lilypond
diff --git a/Documentation/notation/text.itely b/Documentation/notation/text.itely
index 85f48e4e7b..ae40256caa 100644
--- a/Documentation/notation/text.itely
+++ b/Documentation/notation/text.itely
@@ -1531,7 +1531,7 @@ FontConfig may be used in a score, using the following syntax:
 \time 3/4
 
 a'1_\markup {
-  \override #'(font-name . "Vera Bold")
+  \override #'(font-name . "Bitstream Vera Sans Bold")
     { Vera Bold }
 }
 @end lilypond
diff --git a/Documentation/snippets/new/changing-stanza-fonts.ly b/Documentation/snippets/new/changing-stanza-fonts.ly
new file mode 100644
index 0000000000..3988ec6a95
--- /dev/null
+++ b/Documentation/snippets/new/changing-stanza-fonts.ly
@@ -0,0 +1,29 @@
+\version "2.18.0"
+
+\header {
+  lsrtags = "really-simple, vocal-music"
+
+  texidoc = "
+Fonts can be changed independently for each stanza, including the font
+used for printing the stanza number.
+
+"
+  doctitle = "Changing stanza fonts"
+} % begin verbatim
+
+\new Voice {
+  \time 3/4
+  g2 e4
+  a2 f4
+  g2.
+}
+\addlyrics {
+  \set stanza = #"1. "
+  Hi, my name is Bert.
+}
+\addlyrics {
+  \override StanzaNumber.font-name = #"DejaVu Sans"
+  \set stanza = #"2. "
+  \override LyricText.font-family = #'typewriter
+  Oh, ché -- ri, je t'aime
+}
diff --git a/input/regression/font-name.ly b/input/regression/font-name.ly
index 4d74b6f3c2..f2a05774a6 100644
--- a/input/regression/font-name.ly
+++ b/input/regression/font-name.ly
@@ -22,11 +22,11 @@ without size specification."
   \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"
+  \override Staff.MultiMeasureRestText.font-name = #"Luxi Mono"
+  R1*21^"Rest in Luxi Mono"
 
   c'1_\markup {
-    \override #'(font-name . "Vera Bold")
+    \override #'(font-name . "Bitstream Vera Sans, Bold")
       \override #'(font-size . 4)
         { This text is in large Vera Bold }
   }
-- 
2.39.2