set PUA codepoints before loading din & nummer.

diff --git a/ChangeLog b/ChangeLog
index 81958846b269d3002ce48cd90ae216549f4f99d7..2348febb65ac09906d49ed9a159ba8d1f4cb42c8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-12-12  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * mf/bigcheese.pe.in: set PUA codepoints before loading din & nummer.
+
 2004-12-12  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * mf/bigcheese.pe.in (i): Map to 0xe000 (PUA) for testing, which

diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc
index 0a7c8362d6a2c139e5efd95bd862faff7574a052..9250bc956d3e0f1e1b3899224c4f5f82656fbafc 100644 (file)
--- a/lily/lily-guile.cc
+++ b/lily/lily-guile.cc
@@ -111,7 +111,7 @@ gulp_file_to_string (String fn, bool must_exist)
 
   int n;
   char *str = gulp_file (s, &n);
-  String result (str);
+  String result ((Byte*) str, n);
   delete[] str;
   
   if (verbose_global_b)

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index 43ff56a4ac81c1745fa6542a2fdc6dc75c6c106b..831e68cbf6a13f4dc538aa2ebb996a13b2a42500 100644 (file)
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -98,7 +98,7 @@ INSTALLATION_OUT_FILES7=$(ENC_FILES)
 
 export MFINPUTS:=.:$(MFINPUTS)
 
-default: pfa_warning $(ALL_GEN_FILES)
+default: pfa_warning $(ALL_GEN_FILES) $(outdir)/bigcheese20.otf
 
 
 pfa_warning:

diff --git a/mf/bigcheese.pe.in b/mf/bigcheese.pe.in
index 5ed72f949e95a82b26625f8261a83cfce91fc545..e6235a1882f06ac94d2273d313ad89a8161819c6 100644 (file)
--- a/mf/bigcheese.pe.in
+++ b/mf/bigcheese.pe.in
@@ -9,14 +9,8 @@ SetFontNames("bigcheese20", "LilyPond", "LilyPond BigCheese 20", "20", "GNU GPL"
 
 MergeFonts("feta20.pfa");
 MergeFonts("parmesan20.pfa");
-MergeFonts("feta-nummer10.pfa");
-MergeFonts("feta-din14.pfa");
-MergeKern("feta-din14.tfm");
 
-LoadTableFromFile("LILC", "feta20.otf-table")
-
-# Hmm, how do we keep feta-din and feta-nummer mapped on ascii positions?
-# That's much more convenient for using in a text processor.  --jcn
+# load nummer/din after setting PUA.
 i = 0;
 while (i < CharCnt())
   Select(i);
@@ -37,5 +31,12 @@ PRIVATE AREA
   ++i;
 endloop
 
+
+MergeFonts("feta-nummer10.pfa");
+MergeFonts("feta-din14.pfa");
+MergeKern("feta-din14.tfm");
+
+LoadTableFromFile("LILC", "feta20.otf-table")
+
 Generate("bigcheese20.otf");
 Generate("bigcheese20.cff");

diff --git a/scm/font.scm b/scm/font.scm
index d114f910f9f39b26440d98b47b5976a9cf8ca537..dde5e6f817bf581ba0295064427f8c1b05513eef 100644 (file)
--- a/scm/font.scm
+++ b/scm/font.scm
@@ -179,9 +179,7 @@
                  ,(delay (ly:make-virtual-font
                           (ly:font-load "feta18")
                           (ly:font-load "parmesan18")))
-;                ,(delay (ly:make-virtual-font
-;                         (ly:font-load "feta20")
-;                         (ly:font-load "parmesan20")))
+;                ,(delay (ly:make-virtual-font (ly:font-load "feta20") (ly:font-load "parmesan20")))
                  ,(delay (ly:make-virtual-font (ly:font-load "bigcheese20")))
                  ,(delay (ly:make-virtual-font
                           (ly:font-load "feta23")

diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm
index 5fbc6828ed9329bbc2b2ee225e98503e673b99ff..be7e7c5a1db18338d940d3db4f9b560e519c2bb8 100644 (file)
--- a/scm/framework-ps.scm
+++ b/scm/framework-ps.scm
@@ -70,7 +70,6 @@
 
    ))
 
-(display (ly:gulp-file "/home/hanwen/usr/src/lilypond/mf/out/bigcheese20.cff"))
 
 
 (define (load-fonts paper)