(text): Revert to file name of font if font

has no name.  Fixes ec font selection.

diff --git a/ChangeLog b/ChangeLog
index 154227db5c334af6aa0c6d059f1a9847356cf19b..d3a1576677384fdc4721534d02a7d03b06a75787 100644 (file)
--- 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 a993d99a0be26051b5a2928136619835b5447b4e..344a6e35bf0c84e63afa071e45a66b5e742068c3 100644 (file)
--- 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)