resolve merge

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

diff --git a/input/regression/font-name-font-size.ly b/input/regression/font-name-font-size.ly
new file mode 100644 (file)
index 0000000..429bf99
--- /dev/null
+++ b/input/regression/font-name-font-size.ly
@@ -0,0 +1,20 @@
+\version "2.14.0"
+
+\header {
+  texidoc = "
+Setting the @code{font-name} property does not change the font
+size.  The two strings below should be concatenated and have the
+same font size.
+
+Note that `the same font size' is related to what lilypond reports
+on the console if in verbose mode (3.865234375 units for this
+regression test).  If you actually look at the two fonts the
+optical size differs enormously.
+"
+}
+
+\markup \concat {
+  "pfsm"
+  \override #'(font-name . "Emmentaler-20")
+  "pfsm"
+}