From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Fri, 30 Jul 2004 13:32:39 +0000 (+0000)
Subject: release commit
X-Git-Tag: release/2.3.10~26
X-Git-Url: https://git.donarmstrong.com/lilypond.git?a=commitdiff_plain;h=485bf4739de4c47d07b9f694eafaa1165d06038d;p=lilypond.git

release commit
---

diff --git a/make/lilypond.redhat.spec.in b/make/lilypond.redhat.spec.in
index f2701797ad..6660f6ffe3 100644
--- a/make/lilypond.redhat.spec.in
+++ b/make/lilypond.redhat.spec.in
@@ -151,7 +151,7 @@ scrollkeeper-update
 %{_bindir}/convert-ly
 %{_bindir}/etf2ly
 %{_bindir}/lilypond
-%{_bindir}/lilypond-bin
+%{_bindir}/lilypond-latex
 %{_bindir}/midi2ly
 %{_bindir}/lilypond-book
 %{_bindir}/mup2ly
@@ -172,7 +172,7 @@ scrollkeeper-update
 %{_mandir}/man1/abc2ly.1.gz
 %{_mandir}/man1/convert-ly.1.gz
 %{_mandir}/man1/etf2ly.1.gz
-%{_mandir}/man1/lilypond-bin.1.gz
+%{_mandir}/man1/lilypond-latex.1.gz
 %{_mandir}/man1/lilypond.1.gz
 %{_mandir}/man1/midi2ly.1.gz
 %{_mandir}/man1/lilypond-book.1.gz
diff --git a/make/lilypond.suse.spec.in b/make/lilypond.suse.spec.in
index 775a1e3a01..10fe5156f4 100644
--- a/make/lilypond.suse.spec.in
+++ b/make/lilypond.suse.spec.in
@@ -226,7 +226,7 @@ touch var/adm/SuSEconfig/run-texhash
 %{_prefix}/bin/abc2ly
 %{_prefix}/bin/convert-ly
 %{_prefix}/bin/etf2ly
-%{_prefix}/bin/lilypond-bin
+%{_prefix}/bin/lilypond-latex
 %{_prefix}/bin/lilypond
 %{_prefix}/bin/midi2ly
 %{_prefix}/bin/lilypond-book
@@ -244,7 +244,7 @@ touch var/adm/SuSEconfig/run-texhash
 %{_prefix}/man/man1/abc2ly.1.gz
 %{_prefix}/man/man1/convert-ly.1.gz
 %{_prefix}/man/man1/etf2ly.1.gz
-%{_prefix}/man/man1/lilypond-bin.1.gz
+%{_prefix}/man/man1/lilypond-latex.1.gz
 %{_prefix}/man/man1/lilypond.1.gz
 %{_prefix}/man/man1/midi2ly.1.gz
 %{_prefix}/man/man1/lilypond-book.1.gz
diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm
index 0c96ee1cdd..22ee5dd1e3 100644
--- a/scm/framework-ps.scm
+++ b/scm/framework-ps.scm
@@ -77,22 +77,12 @@
        plain " " coding-vector " /" command " reencode-font\n"
        "/" command "{ /" command " findfont 1 scalefont } bind def\n")))
 
-  (define (guess-ps-fontname basename)
-
-    "We do not have the FontName, try to guess is from basename."
-    (cond
-     (#t basename)
-     ((tex-font? basename)
-      ;; FIXME: we need proper Fontmap for the bluesky CM*, EC* fonts.
-      ;; Only the fonts that we trace in mf/ are in our own FontMap.
-      (string-append basename ".pfb"))
-     (else (string-append basename ".pfa"))))
-
+ 
   (define (font-load-command font)
     (let* ((specced-font-name (ly:font-name font))
 	   (fontname (if specced-font-name
 			 specced-font-name
-			 (guess-ps-fontname (ly:font-filename font))))
+			 (ly:font-filename font)))
 	
 	   (coding-alist (ly:font-encoding-alist font))
 	   (input-encoding (assoc-get 'input-name coding-alist))
@@ -220,8 +210,7 @@
 			  (map ly:paper-system-stencil
 			       (append titles (list non-title)))))
 	 (xext (ly:stencil-extent dump-me X))
-	 (yext (ly:stencil-extent dump-me Y))
-	 )
+	 (yext (ly:stencil-extent dump-me Y)))
     
   (for-each
    (lambda (x)