From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Fri, 19 Mar 2004 11:44:33 +0000 (+0000)
Subject: (define-fonts): Always scale by designsize.
X-Git-Tag: release/2.1.32~12
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=f077e4c3fcf04dffd2f011755762e04561e9c7ac;p=lilypond.git

(define-fonts): Always scale by designsize.
Fixes feta-nummer, feta-din scaling.
---

diff --git a/ChangeLog b/ChangeLog
index 7aedc96221..2b2bba0b1f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 2004-03-19  Jan Nieuwenhuizen  <janneke@gnu.org>
 
-	* scm/output-ps.scm (define-fonts): Always scale by 12.  Fixes
-	feta-nummer, feta-din scaling.
+	* scm/output-ps.scm (define-fonts): Always scale by designsize.
+	Fixes feta-nummer, feta-din scaling.
 
 2004-03-19  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
diff --git a/scm/output-ps.scm b/scm/output-ps.scm
index 41e01a61c1..4ad9a06802 100644
--- a/scm/output-ps.scm
+++ b/scm/output-ps.scm
@@ -207,13 +207,9 @@
 	   (fontname (car value-name-size))
 	   (mangled (possibly-mangle-fontname fontname))
 	   (encoding (assoc-get fontname font-encoding-alist))
-	   (designsize (if #t ;;(tex-font? fontname)
-			   (/ 12 (fontname->designsize fontname))
-			   ;; This is about 12/20 :-)
-			   (cdr key-name-size)))
+	   (designsize (fontname->designsize fontname))
 	   (fontsize (cdr value-name-size))
-	   (scaling (* 12 (/ fontsize designsize)))
-	   (scaling (/ fontsize (/ designsize 12))))
+	   (scaling (* fontsize designsize)))
 
       (if
        #f