From 88150a9d344f8986fc96f7b1466c069d5f209451 Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Fri, 17 Dec 2004 00:23:30 +0000
Subject: [PATCH] * buildscripts/gen-bigcheese-scripts.py (i): use symbols for
 subfonts.

* scm/framework-tex.scm (otf-font-load-command): load subfonts.
(tex-font-command-raw): new function.

* lily/virtual-font-metric.cc (Module): remove file.
---
 ChangeLog                             | 3 +++
 buildscripts/gen-bigcheese-scripts.py | 2 +-
 lily/font-metric.cc                   | 8 --------
 scm/framework-tex.scm                 | 7 ++++---
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 22db230b14..0a094a7170 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-12-17  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+	* buildscripts/gen-bigcheese-scripts.py (i): use symbols for
+	subfonts.
+
 	* scm/output-tex.scm (named-glyph): new function. This fixes TeX output.
 
 	* scm/framework-tex.scm (otf-font-load-command): load subfonts.
diff --git a/buildscripts/gen-bigcheese-scripts.py b/buildscripts/gen-bigcheese-scripts.py
index 4b066b22c5..3a62ccceea 100644
--- a/buildscripts/gen-bigcheese-scripts.py
+++ b/buildscripts/gen-bigcheese-scripts.py
@@ -77,7 +77,7 @@ Generate("%(name)s%(design_size)d.cff");''' % vars()
 
 	ns = []
 	for s in subfonts:
-		ns.append ('"%s"' % (s % vars()))
+		ns.append ('%s' % (s % vars()))
 		
 	subfonts_str = string.join (ns)
 	
diff --git a/lily/font-metric.cc b/lily/font-metric.cc
index 55084aad4d..c4b32af950 100644
--- a/lily/font-metric.cc
+++ b/lily/font-metric.cc
@@ -284,14 +284,6 @@ Font_metric::index_to_charcode (int i) const
   return (unsigned) index_to_ascii (i);
 }
 
-#if 0
-unsigned
-Font_metric::glyph_name_to_charcode (String glyph_name) const
-{
-  return (unsigned) index_to_ascii (name_to_index (glyph_name));
-}
-#endif
-
 Stencil
 Font_metric::get_ascii_char_stencil (int code) const
 {
diff --git a/scm/framework-tex.scm b/scm/framework-tex.scm
index 58d1bcdf01..2affc64649 100644
--- a/scm/framework-tex.scm
+++ b/scm/framework-tex.scm
@@ -75,8 +75,10 @@
 	    (map
 	     (lambda (sub-name)
 	       (string-append
-		"\\font\\" (tex-font-command-raw sub-name (ly:font-magnification font))
-		"=" sub-name
+		"\\font\\" (tex-font-command-raw
+			    (symbol->string sub-name)
+			    (ly:font-magnification font))
+		"=" (symbol->string sub-name)
 		" scaled "
 		(ly:number->string (inexact->exact
 				    (round (* 1000
@@ -85,7 +87,6 @@
 		"%\n"))
 	     sub-fonts)))))
 
-
 (define (simple-font-load-command paper font)
   (let* ((coding-alist (ly:font-encoding-alist font))
 	 (font-encoding (assoc-get 'output-name coding-alist)))
-- 
2.39.2