diff options
| author | Patrick McCarty <pnorcks@gmail.com> | 2010-02-25 17:17:35 -0800 |
|---|---|---|
| committer | Patrick McCarty <pnorcks@gmail.com> | 2010-02-26 00:47:28 -0800 |
| commit | fc76fda44a887f47c10db1dcb76756951167bfc1 (patch) | |
| tree | 525cc7e2c827b2726ab678fcc4ad5e446fc08c38 | |
| parent | 77cc43a987b539afc330fd4be9dd846985338379 (diff) | |
Fix #1020.
The default size of the Century Schoolbook fonts is 11pt (as seen in
font.scm).
But when a 'font-name is specified, the 'text-font-size property is
used, which changes the default size to 12pt.
This commit standardizes the default size to 11pt, and also fixes the
behavior of \abs-fontsize when setting font size to 12pt.
Note: there are still some rounding errors related to converting between
LilyPond's scale and Pango's scale, but they are relatively small.
| -rw-r--r-- | input/regression/font-name-font-size.ly | 15 | ||||
| -rw-r--r-- | scm/paper.scm | 2 |
2 files changed, 16 insertions, 1 deletions
diff --git a/input/regression/font-name-font-size.ly b/input/regression/font-name-font-size.ly new file mode 100644 index 0000000000..a0ba3a2e20 --- /dev/null +++ b/input/regression/font-name-font-size.ly @@ -0,0 +1,15 @@ +\version "2.13.14" + +\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. +" +} + +\markup \concat { + "string" + \override #'(font-name . "New Century Schoolbook") + "string" +} diff --git a/scm/paper.scm b/scm/paper.scm index 117bbb0fff..3a8644ecdc 100644 --- a/scm/paper.scm +++ b/scm/paper.scm @@ -69,7 +69,7 @@ (setm! (lambda (sym val) (module-define! module sym val)))) - (setm! 'text-font-size (* 12 factor)) + (setm! 'text-font-size (* 11 factor)) (setm! 'output-scale ss) (setm! 'fonts (make-century-schoolbook-tree factor)) |