From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Tue, 16 Nov 2004 00:59:19 +0000 (+0000)
Subject: (text): Revert to file name of font if font
X-Git-Tag: release/2.5.14~542
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=e1e94ff4f4c5757450cf1cd1ba1f0aa05f1a9bc3;p=lilypond.git

(text): Revert to file name of font if font
has no name.  Fixes ec font selection.
---

diff --git a/ChangeLog b/ChangeLog
index 154227db5c..d3a1576677 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-11-16  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+	* scm/output-gnome.scm (text): Revert to file name of font if font
+	has no name.  Fixes ec font selection.
+
 	* scm/framework-svg.scm:
 	* scm/output-svg.scm: New file.  TODO: figure out how to
 	do character by index in font.
diff --git a/scm/output-gnome.scm b/scm/output-gnome.scm
index a993d99a0b..344a6e35bf 100644
--- a/scm/output-gnome.scm
+++ b/scm/output-gnome.scm
@@ -370,7 +370,8 @@ lilypond -fgnome input/simple-song.ly
 	    ;; TODO s/filename/file-name/
 	    (stderr "font-filename: ~S\n" (ly:font-filename font))
 	    (stderr "pango-font-size: ~S\n" (pango-font-size font))
-	    "ecrm12"))))
+	    ;;"ecrm12"))))
+	    (ly:font-filename font)))))
   
   (define (pango-font-size font)
     (let* ((designsize (ly:font-design-size font))
@@ -386,13 +387,9 @@ lilypond -fgnome input/simple-song.ly
 	   ;;design:20.0
   
 	   ;; experimental sizing:
-	   ;; where does factor come from?
-	   ;;
-	   ;; 0.435 * (12 / 20) = 0.261
-	   ;; 2.8346456692913/ 0.261 = 10.86071137659501915708
-	   ;;(ops (* 0.435 (/ 12 20) (* output-scale pixels-per-unit)))
-	   ;; for size-points
-	   (ops 2.61)
+	   ;; where does factor ops come from?
+	   ;; Hmm, design size: 26/20 
+	   (ops 2.60)
 	   
 	   (scaling (* ops magnification designsize)))
       (debugf "OPS:~S\n" ops)
@@ -406,7 +403,7 @@ lilypond -fgnome input/simple-song.ly
     #:parent (canvas-root)
 
     #:anchor 'west
-    #:x 0.0 #:y 0.0
+    #:x 0.0 #:y 0.15
     
     #:font (pango-font-name font)