lilypond-1.5.20

diff --git a/buildscripts/mf-to-table.py b/buildscripts/mf-to-table.py
index bb9c05919b505e274db243baa2494cba24e025a5..113c9020701bfb7de224483e0a7b78d89e4dec7c 100644 (file)
--- a/buildscripts/mf-to-table.py
+++ b/buildscripts/mf-to-table.py
@@ -82,6 +82,9 @@ def parse_logfile (fn):
                elif tags[0] == 'font':
                        global_info['FontName'] = string.join (tags[1:])
                        global_info['FontFamily']=tags[1]
+                       global_info['FontBBox'] = '0 0 1000 1000'
+                       global_info['Ascender'] = '0'
+                       global_info['Descender'] = '0'
        
        return (global_info, charmetrics, deps)
 

diff --git a/input/test/sketch.ly b/input/test/sketch.ly
new file mode 100644 (file)
index 0000000..22594c5
--- /dev/null
+++ b/input/test/sketch.ly
@@ -0,0 +1,12 @@
+\header {
+texidoc="sketch output supported features"
+}
+\score {
+  \notes\relative c''' {
+    a4( a a a )a
+    \stemDown
+    a,8( b c )d
+    \stemUp
+    \slurDown d16( c b )a
+  }
+}
\ No newline at end of file

diff --git a/scm/lily.scm b/scm/lily.scm
index c251e8fa2ee650b19532e6ab114022e9022f703c..c3ae34acf21b82b168c3026923d1eb4e2e81c1e6 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -113,7 +113,8 @@
 (map (lambda (x) (eval-string (ly-gulp-file x)))
      '("output-lib.scm"
        "tex.scm"
-       "ps.scm" "sketch.scm"
+       "ps.scm"
+       "sketch.scm"
        "pdf.scm"
        "pdftex.scm"
        "ascii-script.scm"

diff --git a/scm/output-lib.scm b/scm/output-lib.scm
index 8c6f1e3d91988b384550a9be0b3820bf36e53782..039121f527a435990c68913c0ffd49445ab357c1 100644 (file)
--- a/scm/output-lib.scm
+++ b/scm/output-lib.scm
@@ -121,7 +121,11 @@ centered, X==1 is at the right, X == -1 is at the left."
                (font-load-command (car x) (cdr x)))
              (map cdr font-name-alist))))
 
-(define (fontify name-mag-pair exp)
+;; urg, how can exp be #unspecified?  -- in sketch output
+(define (xfontify name-mag-pair exp)
   (string-append (select-font name-mag-pair)
                 exp))
 
+(define (fontify name-mag-pair exp)
+  (string-append (select-font name-mag-pair)
+                (if (string? exp) exp "")))