2003 -> 2004

[lilypond.git] / lily / kpath.cc

diff --git a/lily/kpath.cc b/lily/kpath.cc
index f42c5fd1f6fcbadb101c1d692932af28cd19020c..8cb57d8c862392f3f5c2dd853dfcfda316b71356 100644 (file)
--- a/lily/kpath.cc
+++ b/lily/kpath.cc
@@ -3,16 +3,29 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include <stdio.h>
 #include <string.h>
 
+/*
+
+The problem, as far as I can tell, is that MacOS X has its getopt
+prototype in <unistd.h>, while I think other operating systems have it
+in other places. <unistd.h> is included by kpathsea.h, so you end up
+renaming both conflicting prototypes to YAKLUDGE.
+
+I found a somewhat more elegant patch for this: Just #include
+<unistd.h> before defining YAKLUDGE.
+
+*/
+#include <unistd.h>    
 #include "config.h"
 
 #define popen REALLYUGLYKLUDGE
 #define pclose ANOTHERREALLYUGLYKLUDGE
+#define getopt YAKLUDGE
 
 #if HAVE_KPATHSEA_KPATHSEA_H
 extern "C" {
@@ -25,35 +38,53 @@ extern "C" {
 #include "string.hh"
 #include "main.hh"
 #include "kpath.hh"
-#include "lily-version.hh"
+#include "warn.hh"
 
-
-char *
-ly_find_afm (char const * name)
+String
+kpathsea_find_afm (char const * name)
 {
 #if (KPATHSEA && HAVE_KPSE_FIND_FILE)
-  return kpse_find_file (name, kpse_afm_format, true);
+  char * name_ptr =  kpse_find_file (name, kpse_afm_format, true);
+
+  if(!name_ptr)
+    {
+  /*
+    don't mutter about afms, since we try to find them first, and lots of
+    TFMs don't have AFMs. 
+   */
+      //      warning (_f("kpathsea couldn't find AFM file `%s'", name));
+    }
+  else
+    return name_ptr;
+  
 #endif
-  return 0;
+  return "";
 }
 
 String
-ly_find_tfm (char const * name)
+kpathsea_find_tfm (char const * name)
 {
   String p = global_path.find (String (name) + ".tfm");
 
-  if (p.length_i ())
+  if (p.length ())
     return p;
   
 #if (KPATHSEA && HAVE_KPSE_FIND_FILE)
-  return kpse_find_file (name, kpse_tfm_format, true);
+  char * name_ptr =  kpse_find_file (name, kpse_tfm_format, true);
+  if(!name_ptr)
+    {
+      warning (_f("Kpathsea couldn't find TFM file `%s'", name));
+    }
+  else
+    return name_ptr;
+  
 #endif
   return "";
 }
 
 
 void
-ly_init_kpath (char *av0)
+init_kpath (char *av0)
 {
 #if KPATHSEA && HAVE_KPATHSEA_KPATHSEA_H
   /*
@@ -96,55 +127,7 @@ ly_init_kpath (char *av0)
    */
   kpse_set_program_name (av0, NULL);
   kpse_maketex_option ("tfm", TRUE);
-
-#if  0
-
-
-  /*
-    
-    Remove the setting for TFMFONTS if we have kpathsea, because
-    kpathsea can find TFM fonts anyway.
-
-    If we don't lily will want to make tfms for cmr fonts, even if
-    there is a :: entry in the TFMFONTS path.
-
-    This will fail if a user has special fonts (outside of feta) that
-    can not be found by kpath.
-
-    If TFMFONTS is unset, TFMs of feta will be generated on the
-    fly. The risk is that this will cause checksum mismatch errors,
-    but MF is reasonably deterministic (so we hope not).
-
-    The advantage is that the PK font will also be generated under
-    /var/texmf/fonts, reducing clutter and compilation time.
-
-   */
-
-#ifndef __CYGWIN__  /* mktextfm/mktexpk does not work on windows */
-  unsetenv ("TFMFONTS");
 #endif
-
-#ifdef DEBIAN
-  String my_tfm = "$VARTEXFONTS/tfm/public/lilypond";
-#else
-  String my_tfm = "$VARTEXFONTS/tfm/lilypond/";
-  my_tfm += version_str () + "/";
-#endif
-
-#ifdef DEBIAN
-  char * mypath = strdup ((my_tfm + ":").ch_C());
-  kpse_format_info[kpse_tfm_format].client_path = mypath;
-#else
-  char * mypath = kpse_expand (my_tfm.ch_C ());
-                          
-  String prog = "mktextfm --destdir ";
-  prog += mypath;
-  
-  kpse_format_info[kpse_tfm_format].program = strdup (prog.ch_C ());
-#endif
-#endif
-#endif
-  
 }