From bcdd145a5fced2ff770e1aaee06e936577f843a7 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Sat, 10 Apr 2004 23:13:25 +0000 Subject: [PATCH] * ly/declarations-init.ly (melismaEnd): typo * scm/font.scm (add-cmr-fonts): caps is eccc, ecsc is slanted caps. --- ChangeLog | 2 ++ ly/declarations-init.ly | 2 +- scm/font.scm | 9 ++++----- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7a657984d4..9e4816ffac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2004-04-11 Han-Wen Nienhuys + * ly/declarations-init.ly (melismaEnd): typo + * scm/font.scm (add-cmr-fonts): caps is eccc, ecsc is slanted caps. * scm/output-ps.scm (text): split string into spaces, use moveto diff --git a/ly/declarations-init.ly b/ly/declarations-init.ly index 4a295f466f..3ee9859bf7 100644 --- a/ly/declarations-init.ly +++ b/ly/declarations-init.ly @@ -64,7 +64,7 @@ melismaEnd = #(make-span-event 'ManualMelismaEvent STOP) ) #(define text-font-defaults - '((font-encoding . TeX-tex) + '((font-encoding . TeX-text) (baseline-skip . 2) (word-space . 0.6) )) diff --git a/scm/font.scm b/scm/font.scm index 01c3d10aeb..e07e706625 100644 --- a/scm/font.scm +++ b/scm/font.scm @@ -117,8 +117,7 @@ ((qual (font-qualifier node)) (def (font-default node)) (val (chain-assoc-get qual alist-chain def)) - (desired-child (hashq-ref (font-children node) val)) - ) + (desired-child (hashq-ref (font-children node) val))) (if desired-child (g-lookup-font desired-child alist-chain) @@ -299,7 +298,7 @@ (#(roman caps medium) . (10.0 . #(,(delay (ly:font-load "eccc10"))))) - (#(roman slanted-caps medium) . + (#(roman caps medium) . (10.0 . #(,(delay (ly:font-load "ecsc10"))))) (#(roman upright bold-narrow ) . @@ -358,7 +357,7 @@ (define-public (make-cmr-tree factor) (let - ((n (make-font-tree-node 'font-encoding 'music))) + ((n (make-font-tree-node 'font-encoding 'fetaMusic))) (add-music-fonts n factor) (add-cmr-fonts n factor) @@ -369,7 +368,7 @@ (define-public (make-century-schoolbook-tree factor) (let - ((n (make-font-tree-node 'font-encoding 'music))) + ((n (make-font-tree-node 'font-encoding 'fetaMusic))) (add-music-fonts n factor) (add-century-schoolbook-fonts n factor) -- 2.39.5