Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / lily / general-scheme.cc

diff --git a/lily/general-scheme.cc b/lily/general-scheme.cc
index fe3327880266f684bc0ac190f51a90890808a9d0..558d111f8617b7b61147504ec8dbf658446b76ed 100644 (file)
--- a/lily/general-scheme.cc
+++ b/lily/general-scheme.cc
@@ -3,20 +3,20 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2005 Jan Nieuwenhuizen <janneke@gnu.org>
-  Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+  Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "config.hh"
 
-#include <math.h>  /* isinf */
-#include <stdio.h>
-#include <string.h>  /* memset */
+#include <cstdio>
+#include <cstring>  /* memset */
+using namespace std;
 
 #include "international.hh"
 #include "libc-extension.hh"
 #include "lily-guile.hh"
-#include "string.hh"
+#include "std-string.hh"
 #include "misc.hh"
 #include "warn.hh"
 #include "version.hh"
@@ -24,14 +24,6 @@
 #include "main.hh"
 #include "file-path.hh"
 
-/* MacOS S fix:
-   source-file.hh includes cmath which undefines isinf and isnan
-*/
-#ifdef __APPLE__
-inline int my_isinf (Real r) { return isinf (r); }
-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}, "
@@ -39,12 +31,12 @@ LY_DEFINE (ly_find_file, "ly:find-file",
 {
   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 ())
+  string nm = ly_scm2string (name);
+  string file_name = global_path.find (nm);
+  if (file_name.empty ())
     return SCM_BOOL_F;
 
-  return scm_makfrom0str (file_name.to_str0 ());
+  return scm_makfrom0str (file_name.c_str ());
 }
 
 /*
@@ -52,13 +44,20 @@ LY_DEFINE (ly_find_file, "ly:find-file",
   buffering.)
 */
 LY_DEFINE (ly_gulp_file, "ly:gulp-file",
-          1, 0, 0, (SCM name),
+          1, 1, 0, (SCM name, SCM size),
           "Read the file @var{name}, and return its contents in a string.  "
-          "The file is looked up using the search path.")
+          "The file is looked up using the search path. ")
 {
   SCM_ASSERT_TYPE (scm_is_string (name), name, SCM_ARG1, __FUNCTION__, "string");
-  String contents = gulp_file_to_string (ly_scm2string (name), true);
-  return scm_from_locale_stringn (contents.get_str0 (), contents.length ());
+  int sz = -1;
+  if (size != SCM_UNDEFINED)
+    {
+      SCM_ASSERT_TYPE (scm_is_number (size), size, SCM_ARG2, __FUNCTION__, "number");
+      sz = scm_to_int (size);
+    }
+  
+  string contents = gulp_file_to_string (ly_scm2string (name), true, sz);
+  return scm_from_locale_stringn (contents.c_str (), contents.length ());
 }
 
 LY_DEFINE (ly_error, "ly:error",
@@ -157,11 +156,7 @@ LY_DEFINE (ly_number2string, "ly:number->string",
   if (scm_exact_p (s) == SCM_BOOL_F)
     {
       Real r (scm_to_double (s));
-#ifdef __APPLE__
-      if (my_isinf (r) || my_isnan (r))
-#else
        if (isinf (r) || isnan (r))
-#endif
          {
            programming_error (_ ("infinity or NaN encountered while converting Real number"));
            programming_error (_ ("setting to zero"));
@@ -214,14 +209,14 @@ LY_DEFINE (ly_gettext, "ly:gettext",
 {
   SCM_ASSERT_TYPE (scm_is_string (string), string, SCM_ARG1,
                   __FUNCTION__, "string");
-  return scm_makfrom0str (_ (scm_i_string_chars (string)).to_str0 ());
+  return scm_makfrom0str (_ (scm_i_string_chars (string)).c_str ());
 }
 
 LY_DEFINE (ly_output_backend, "ly:output-backend",
           0, 0, 0, (),
           "Return name of output backend.")
 {
-  return scm_makfrom0str (output_backend_global.to_str0 ());
+  return scm_makfrom0str (output_backend_global.c_str ());
 }
 
 LY_DEFINE (ly_output_formats, "ly:output-formats",
@@ -229,12 +224,12 @@ LY_DEFINE (ly_output_formats, "ly:output-formats",
           "Formats passed to --format as a list of strings, "
           "used for the output.")
 {
-  Array<String> output_formats = split_string (output_format_global, ',');
+  vector<string> output_formats = string_split (output_format_global, ',');
 
   SCM lst = SCM_EOL;
   int output_formats_count = output_formats.size ();
-  for (int i = 0; i < output_formats_count; i ++)
-    lst = scm_cons (scm_makfrom0str (output_formats[i].to_str0 ()), lst);
+  for (int i = 0; i < output_formats_count; i++)
+    lst = scm_cons (scm_makfrom0str (output_formats[i].c_str ()), lst);
 
   return lst;
 }
@@ -250,9 +245,7 @@ LY_DEFINE (ly_wchar_to_utf_8, "ly:wide-char->utf-8",
   char *p = buf;
 
   if (wide_char < 0x0080)
-    {
-      *p++ = (char)wide_char;
-    }
+    *p++ = (char)wide_char;
   else if (wide_char < 0x0800)
     {
       *p++ = (char) (((wide_char >> 6)) | 0xC0);
@@ -280,7 +273,7 @@ LY_DEFINE (ly_effective_prefix, "ly:effective-prefix",
           0, 0, 0, (),
           "Return effective prefix.")
 {
-  return scm_makfrom0str (prefix_directory.to_str0 ());
+  return scm_makfrom0str (prefix_directory.c_str ());
 }
 
 LY_DEFINE (ly_chain_assoc_get, "ly:chain-assoc-get",
@@ -306,7 +299,7 @@ LY_DEFINE (ly_stderr_redirect, "ly:stderr-redirect",
 {
   SCM_ASSERT_TYPE (scm_string_p (file_name), file_name, SCM_ARG1,
                   __FUNCTION__, "file_name");
-  char const* m = "w";
+  char const *m = "w";
   if (mode != SCM_UNDEFINED && scm_string_p (mode))
     m = ly_scm2newstr (mode, 0);
   /* dup2 and (fileno (current-error-port)) do not work with mingw'c