From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Sun, 12 Dec 2004 19:28:19 +0000 (+0000)
Subject: set PUA codepoints before loading din & nummer.
X-Git-Tag: release/2.5.14~440
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=a9124d7c28c9a1eb99d22372773109ec856ef845;p=lilypond.git

set PUA codepoints before loading din & nummer.
---

diff --git a/ChangeLog b/ChangeLog
index 81958846b2..2348febb65 100644
--- 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 0a7c8362d6..9250bc956d 100644
--- 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 43ff56a4ac..831e68cbf6 100644
--- 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 5ed72f949e..e6235a1882 100644
--- 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 d114f910f9..dde5e6f817 100644
--- 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 5fbc6828ed..be7e7c5a1d 100644
--- 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)