From: hanwen <hanwen>
Date: Fri, 17 Jun 2005 23:39:16 +0000 (+0000)
Subject: (file): open file in binary mode. This
X-Git-Tag: release/2.5.32~19
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=5d6a0d8d66266656a7ddfd64480b2120b522f572;p=lilypond.git

(file): open file in binary mode. This
fixes OTF embedding on windows.
---

diff --git a/ChangeLog b/ChangeLog
index 928dfa669e..80cd2c6932 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
+2005-06-18  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+	* lily/paper-outputter.cc (file): open file in binary mode. This
+	fixes OTF embedding on windows.
+
 2005-06-17  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+	* scm/framework-ps.scm (write-preamble): remove debugging output.
+
 	* mf/aybabtu.pe.in (i): don't generate aybabtu.cff
 
 	* mf/GNUmakefile ($(outdir)/fonts.cache-1): create font cache for
diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc
index 5da3ca0607..778c15880e 100644
--- a/lily/paper-outputter.cc
+++ b/lily/paper-outputter.cc
@@ -68,8 +68,12 @@ Paper_outputter::file ()
     if (file_name_ == "-")
       file_ = scm_current_output_port ();
     else
+      /*
+	Opening binary sucks a little for DOS, since PS doesn't look like
+	ASCII anymore, but binary CFFs will get embedded correctly.
+       */
       file_ = scm_open_file (scm_makfrom0str (file_name_.to_str0 ()),
-			     scm_makfrom0str ("w"));
+			     scm_makfrom0str ("wb"));
   return file_;
 }