* buildscripts/gen-emmentaler-scripts.py (outdir): capitalize

emmentaler.

* lily/score-engraver.cc (initialize): remove check for ecrm10 /
lcrm10.

diff --git a/ChangeLog b/ChangeLog
index 9f8bdd9c5e6ab9fd5c73fd03d7ccdd50db45fc20..04306f3141aec3f07f6698621d0ad686f978be1b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2005-03-06  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * buildscripts/gen-emmentaler-scripts.py (outdir): capitalize
+       emmentaler.
+
+       * lily/score-engraver.cc (initialize): remove check for ecrm10 /
+       lcrm10.
+
        * scm/define-markup-commands.scm (fontsize): new markup
        command. Also set baseline-skip
 

diff --git a/buildscripts/gen-emmentaler-scripts.py b/buildscripts/gen-emmentaler-scripts.py
index 6c75e72ef7e6cf8bf1bf3d13eea0fa610469f3dc..4b0946f0c7d3a47e17a7167f66c2d50f5ac3a5f0 100644 (file)
--- a/buildscripts/gen-emmentaler-scripts.py
+++ b/buildscripts/gen-emmentaler-scripts.py
@@ -23,7 +23,7 @@ for opt in options:
 
 
 for design_size in [11,13,14,16,18,20,23,26]:
-       name = 'emmentaler' 
+       name = 'Emmentaler' 
        script = '''#!@FONTFORGE@
 New();
 

diff --git a/lily/general-scheme.cc b/lily/general-scheme.cc
index c26dfbfa13c0af31fe090da8f5c73600f0f1dcb4..eab9d896de1e9439b5ac0cd524289bc74c8de835 100644 (file)
--- a/lily/general-scheme.cc
+++ b/lily/general-scheme.cc
@@ -23,6 +23,7 @@
 #include "version.hh"
 #include "dimensions.hh"
 #include "main.hh"
+#include "file-path.hh"
 
 /* MacOS S fix:
    source-file.hh includes cmath which undefines isinf and isnan
@@ -33,6 +34,22 @@ inline int my_isnan (Real r) { return isnan (r); }
 #endif
 
 
+
+LY_DEFINE (ly_find_file, "ly:find-file",
+          1, 0, 0, (SCM name),
+          "Return the absolute file name of @var{name}, "
+          "or @code{#f} if not found.")
+{
+  SCM_ASSERT_TYPE (scm_is_string (name), name, SCM_ARG1, __FUNCTION__, "string");
+
+  String nm = ly_scm2string (name);
+  String file_name = global_path.find (nm);
+  if (file_name.is_empty ())
+    return SCM_BOOL_F;
+  
+  return scm_makfrom0str (file_name.to_str0 ());
+}
+
 /*
   Ugh. Gulped file is copied twice. (maybe thrice if you count stdio
   buffering.)

diff --git a/lily/kpath-scheme.cc b/lily/kpath-scheme.cc
index 8990660d020f0d80f54d87b22b6b58b2c9865cb0..0c6ab232fc1cb09d2d27f7fc0d2c32bf514f7056 100644 (file)
--- a/lily/kpath-scheme.cc
+++ b/lily/kpath-scheme.cc
@@ -45,20 +45,6 @@ extern "C" {
 #include "warn.hh"
 #include "kpath-private.hh"
 
-LY_DEFINE (ly_find_file, "ly:find-file",
-          1, 0, 0, (SCM name),
-          "Return the absolute file name of @var{name}, "
-          "or @code{#f} if not found.")
-{
-  SCM_ASSERT_TYPE (scm_is_string (name), name, SCM_ARG1, __FUNCTION__, "string");
-
-  String nm = ly_scm2string (name);
-  String file_name = global_path.find (nm);
-  if (file_name.is_empty ())
-    return SCM_BOOL_F;
-  
-  return scm_makfrom0str (file_name.to_str0 ());
-}
 
 LY_DEFINE (ly_kpathsea_find_file, "ly:kpathsea-find-file",
           1, 0, 0, (SCM name),

diff --git a/lily/kpath.cc b/lily/kpath.cc
index 0a5cfc9cc317c24f58593e42c0ff51d3edd9ed46..8140f9cfbcef4ecc9b8a08029e8a50f6c81cfe25 100644 (file)
--- a/lily/kpath.cc
+++ b/lily/kpath.cc
@@ -14,7 +14,7 @@
 /*
 
 The problem, as far as I can tell, is that MacOS X has its getopt
-prototype in <unistd.h>, whinole I think other operating systems have it
+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.
 
@@ -51,10 +51,7 @@ kpathsea_find_afm (char const *name)
 
   if (char *afm = kpse_find_file (name, kpse_afm_format, false))
     return afm;
-#if 0 /* Do not mutter about afms, since we try to find them first, and
-        lots of TFMs don't have AFMs. */
-  warning (_f ("kpathsea can't find %s file: `%s'", "AFM", name));
-#endif
+
 #endif
   return "";
 }

diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc
index c8692d0a74d0849e071a814bea71dc7fbcafaf99..c335fd1e2ddcf0c4c6c7460ceb3452abdb677ee2 100644 (file)
--- a/lily/lily-guile.cc
+++ b/lily/lily-guile.cc
@@ -743,3 +743,5 @@ ly_hash2alist (SCM tab)
   return scm_call_1 (func, tab);
 }
 
+
+

diff --git a/lily/pango-font.cc b/lily/pango-font.cc
index 048569c1bbfae63e472b7a85b50df33e096f5469..1101a8d8d50f2c8dd84377e0c0a75cabdfe5ea4b 100644 (file)
--- a/lily/pango-font.cc
+++ b/lily/pango-font.cc
@@ -155,9 +155,7 @@ Pango_font::physical_font_tab () const
   return physical_font_tab_;
 }
 
-
 Stencil
-
 Pango_font::text_stencil (String str) const
 {
   GList *items = pango_itemize (context_,

diff --git a/lily/score-engraver.cc b/lily/score-engraver.cc
index 514f800c94677d0c5338554bf640622be32cb8de..19693e99f96fb909cc48cc8686a51576f1177a64 100644 (file)
--- a/lily/score-engraver.cc
+++ b/lily/score-engraver.cc
@@ -111,18 +111,7 @@ Score_engraver::initialize ()
             + "\n"
             + _ ("Aborting"));       
     }
-  
-  if (!scm_is_string (ly_kpathsea_find_file (scm_makfrom0str ("ecrm10.pfa")))
-      && (!scm_is_string (ly_kpathsea_find_file (scm_makfrom0str ("lmr10.pfb")))))
-      error (_f ("cannot find `%s'", "ecrm10.pfa")
-            + "\n"
-            + _f ("cannot find `%s'", "lmr10.pfb")
-            + "\n"
-            + _f ("Install the ec-fonts-mftraced package from: %s.",
-                  "http://lilypond.org/download/fonts/")
-            + "\n"
-            + _ ("Aborting."));
-      
+
   pscore_ = new Paper_score;
   pscore_->layout_ = dynamic_cast<Output_def*> (get_output_def ());
 

diff --git a/scm/font.scm b/scm/font.scm
index ece75a640c7ff4d5c80382f98bf1dade782b962e..9c083fac87968ead826f75224a8c031a9774c2d5 100644 (file)
--- a/scm/font.scm
+++ b/scm/font.scm
@@ -154,6 +154,9 @@
                   ,(delay  (ly:font-load "feta-alphabet20"))             
                   ,(delay  (ly:font-load "feta-alphabet23"))             
                   ,(delay  (ly:font-load "feta-alphabet26"))))
+     (fetaTest ,(ly:pt 20)
+                #((cons (ly:pt 20)
+                        "Emmentaler 20 7.02799479")))
      
      (fetaDynamic ,(ly:pt 20.0)  #(,(delay  (ly:font-load "feta-alphabet11"))
                                   ,(delay  (ly:font-load "feta-alphabet13"))

diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm
index 558d42e043ec749bfb2d138fccd5440a22b74462..5a9094cd91a86e3943d644fedfff972ec8ece590 100644 (file)
--- a/scm/framework-ps.scm
+++ b/scm/framework-ps.scm
@@ -227,8 +227,7 @@
                           (aname (string-append x ".pfa"))
                           (bname (string-append x ".pfb"))
                           (cff-file-name (ly:find-file cffname))
-                          (a-file-name (ly:kpathsea-find-file aname))
-                          (b-file-name (ly:kpathsea-find-file bname)))
+                          )
                      (cond
                       ((and bare-file-name (string-match "\\.pfb" bare-file-name))
                        (ly:pfb->pfa bare-file-name))