* lily/pango-select.cc (select_pango_font): use ::find_pango_font,

[lilypond.git] / lily / kpath.cc

diff --git a/lily/kpath.cc b/lily/kpath.cc
index cb6968aafbf3c5387a901e4c0e78db0ccac1e6b4..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/lily/kpath.cc
+++ b/lily/kpath.cc
@@ -1,133 +0,0 @@
-/*   
-  kpath.cc -- glue kpathsea to lily. Need some ugly kludges for gcc 2.96
-
-  source file of the GNU LilyPond music typesetter
-
-  (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" {
-#include <kpathsea/kpathsea.h>
-#include <kpathsea/tex-file.h>
-}
-#endif
-
-#include "file-path.hh"
-#include "string.hh"
-#include "main.hh"
-#include "kpath.hh"
-#include "warn.hh"
-
-String
-kpathsea_find_afm (char const * name)
-{
-#if (KPATHSEA && HAVE_KPSE_FIND_FILE)
-  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 "";
-}
-
-String
-kpathsea_find_tfm (char const * name)
-{
-  String p = global_path.find (String (name) + ".tfm");
-
-  if (p.length ())
-    return p;
-  
-#if (KPATHSEA && HAVE_KPSE_FIND_FILE)
-  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
-initialize_kpathsea (char *av0)
-{
-#if KPATHSEA && HAVE_KPATHSEA_KPATHSEA_H
-  /*
-    We take two pronged approach to tfms:
-
-    * the lilypond tfms (feta*.tfm) are found through our own routines.
-
-    * the TeX tfms are found through vanilla kpathsea.
-
-    (* other TFMs are not found, i.e. don't use them. )
-
-    PRO:
- 
-    - TFM and AFM checksums always match in Lily.
-
-    - less hassle, no kpathsea spaghetti
-
-    CON:
-
-    - feta PK files are often recreated, locally
-    Solution: cache PK files locally?
-
-    - need env. vars to make sure that TeX finds the TFMs
-
-    - Outdated PK (TFM?) font files are not automatically removed,
-    since VERSION is not part of the standard location.
-
-
-    ALTERNATIVE
-
-    we have tried to come up with schemes that leave this kind of work
-    to kpathsea with objective of fixing the CONs, but miserably
-    failed. TeX installations and kpathsea itself form a buggy,
-    inconsistent, and unorderly mess.
-    
-  */
-
-  /*
-   initialize kpathsea
-   */
-  kpse_set_program_name (av0, NULL);
-  kpse_maketex_option ("tfm", TRUE);
-#endif
-}
-
-