* 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.

diff --git a/ChangeLog b/ChangeLog
index 22db230b1429bd9cb88711b0689bc0c22f469767..0a094a71706e902629b23c49bc34f755b062b01c 100644 (file)
--- 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 4b066b22c542f109f1b55a4a6802bb36788d0c1b..3a62ccceea432cae10ea68df57e890df19044150 100644 (file)
--- 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 55084aad4ded3bd7c1564191d3d3cc142ad4c905..c4b32af95095935cc8dbb64eb608f2da15f56add 100644 (file)
--- 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 58d1bcdf014ac960c972c4521baa8ee7c2f8cb42..2affc64649ec613b061ab83a39a606c93bbf9142 100644 (file)
--- 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)))