(Module): read fonts from fonts/extension,

replace /fonts/otf/ by /ps/

diff --git a/input/les-nereides.ly b/input/les-nereides.ly
index cdbeaf7ed84505ab028f90a14efba4d4a318a3d3..e0b34df388000cce83b20fab0bdc62ed267359cb 100644 (file)
--- a/input/les-nereides.ly
+++ b/input/les-nereides.ly
@@ -15,7 +15,7 @@ http://www.orphee.com/comparison/study.html, see
 http://www.orphee.com/comparison/gray.pdf
 
 
-lines that contain tweaks (17 currently, not counting reverts) are
+lines that contain tweaks (22 currently, not counting reverts) are
 marked with %tweak
 
 possibly more impressive to render without tweaks?

diff --git a/lily/note-collision.cc b/lily/note-collision.cc
index d2d806eca1ececfbab940337487b24d47e81d193..0354950a535f3856234e47a4e7904b2800cc9c09 100644 (file)
--- a/lily/note-collision.cc
+++ b/lily/note-collision.cc
@@ -258,7 +258,7 @@ check_meshing_chords (Grob *me,
   else if (Rhythmic_head::dot_count (nu) || Rhythmic_head::dot_count (nd))
     shift_amount *= 0.1;
   else
-    shift_amount *= 0.25;
+    shift_amount *= 0.17;
 
   /* For full or close half collisions, the right hand head may
      obscure dots.  Move dots to the right.  */

diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm
index a2c2f53f8701cf5bc80423060690b4e856d63390..1176c6d66fa3950e00d1c4b5589162fb7f3e4841 100644 (file)
--- a/scm/framework-ps.scm
+++ b/scm/framework-ps.scm
@@ -234,10 +234,12 @@
                       ((and bare-file-name
                             (string-match "\\.(otf|cff)" bare-file-name))
 
+                       ; replace with the CFF.ps, which lives in a
+                       ; separate subdir.
                        (for-each (lambda (tup)  (set! bare-file-name
                                                       (string-regexp-substitute (car tup) (cdr tup) bare-file-name)))
                                  '(("/fonts/otf/" . "/ps/")
-                                   ("/fonts/cff/" . "/cff/")
+                                   ("/fonts/cff/" . "/ps/")
                                    ("\\.(otf|cff)" . ".cff.ps")))
 
                        (cached-file-contents bare-file-name))