From 40fc2eaf9a670d399d20d62df15c1e71c28f9c0f Mon Sep 17 00:00:00 2001
From: hanwen <hanwen>
Date: Wed, 9 Mar 2005 13:02:47 +0000
Subject: [PATCH] (Module): read fonts from fonts/extension, replace
 /fonts/otf/ by /ps/

---
 input/les-nereides.ly  | 2 +-
 lily/note-collision.cc | 2 +-
 scm/framework-ps.scm   | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/input/les-nereides.ly b/input/les-nereides.ly
index cdbeaf7ed8..e0b34df388 100644
--- 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 d2d806eca1..0354950a53 100644
--- 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 a2c2f53f87..1176c6d66f 100644
--- 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))
-- 
2.39.5