* ly/declarations-init.ly (melismaEnd): typo

* scm/font.scm (add-cmr-fonts): caps is eccc, ecsc is slanted caps.

diff --git a/ChangeLog b/ChangeLog
index 7a657984d449c1b200945e1a1a57c213b0b6a16b..9e4816fface82a9b3f7e6b25954309421f3a7c50 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2004-04-11  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+       * 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 4a295f466f68a7a83a30a6b4c2a1c9c7981b10bc..3ee9859bf74d8df9015827f76512f8870c5a7138 100644 (file)
--- 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 01c3d10aebf5c2ccfea0141ac50a7e71ee0b03ff..e07e706625f4a3fe447ee1e574261cc2ee74b510 100644 (file)
--- 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)