From a03fa4e3eb5a71fd4ab2f548802d61db54489f0c Mon Sep 17 00:00:00 2001 From: Nicolas Sceaux Date: Sat, 28 Jun 2008 20:08:23 +0200 Subject: [PATCH] Markup commands: fix \abs-fontsize Compute word-space and baseline-skip based on the reference one, as defined in the paper block, instead of using the one from props. --- scm/define-markup-commands.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/scm/define-markup-commands.scm b/scm/define-markup-commands.scm index 4abfbc311f..b81cd9428b 100644 --- a/scm/define-markup-commands.scm +++ b/scm/define-markup-commands.scm @@ -1423,8 +1423,7 @@ any sort of property supported by @rinternals{font-interface} and (define-builtin-markup-command (abs-fontsize layout props size arg) (number? markup?) font - ((word-space 1) - (baseline-skip 2)) + () "Use @var{size} as the absolute font size to display @var{arg}. Adjust baseline skip and word space accordingly. @lilypond[verbatim,quote] @@ -1437,10 +1436,13 @@ Adjust baseline skip and word space accordingly. } @end lilypond" (let* ((ref-size (ly:output-def-lookup layout 'text-font-size 12)) + (text-props (list (ly:output-def-lookup layout 'text-font-defaults))) + (ref-word-space (chain-assoc-get 'word-space text-props 0.6)) + (ref-baseline (chain-assoc-get 'baseline-skip text-props 3)) (magnification (/ size ref-size))) (interpret-markup layout - (cons `((baseline-skip . ,(* magnification baseline-skip)) - (word-space . ,(* magnification word-space)) + (cons `((baseline-skip . ,(* magnification ref-baseline)) + (word-space . ,(* magnification ref-word-space)) (font-size . ,(magnification->font-size magnification))) props) arg))) -- 2.39.5