From f7ae4443e90912be3bec2d22b5683d8bf3aab0cd Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Wed, 27 Mar 2002 02:03:59 +0000
Subject: [PATCH] lilypond-1.5.20

---
 buildscripts/mf-to-table.py |  3 +++
 input/test/sketch.ly        | 12 ++++++++++++
 scm/lily.scm                |  3 ++-
 scm/output-lib.scm          |  6 +++++-
 4 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 input/test/sketch.ly

diff --git a/buildscripts/mf-to-table.py b/buildscripts/mf-to-table.py
index bb9c05919b..113c902070 100644
--- 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
index 0000000000..22594c583e
--- /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 c251e8fa2e..c3ae34acf2 100644
--- 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 8c6f1e3d91..039121f527 100644
--- 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 "")))
-- 
2.39.5