Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/lily-parser-scheme.cc b/lily/lily-parser-scheme.cc
index 501eb2023c0f000f904fe2c9c37927ee5335e220..1657438212786785c5a37a102f23fa11a76f394c 100644 (file)
--- a/lily/lily-parser-scheme.cc
+++ b/lily/lily-parser-scheme.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include <unistd.h>
@@ -11,6 +11,7 @@
 #include "file-name-map.hh"
 #include "file-name.hh"
 #include "file-path.hh"
+#include "international.hh"
 #include "lily-lexer.hh"
 #include "lily-parser.hh"
 #include "ly-module.hh"
@@ -38,7 +39,7 @@ LY_DEFINE (ly_parse_file, "ly:parse-file",
   char const *file = scm_i_string_chars (name);
   char const *extensions[] = {"ly", "", 0};
 
-  String file_name = global_path.find (file, extensions);
+  string file_name = global_path.find (file, extensions);
 
   /* By default, use base name of input file for output file name,
      write output to cwd; do not use root and directory parts of input
@@ -52,7 +53,7 @@ LY_DEFINE (ly_parse_file, "ly:parse-file",
   out_file_name.dir_ = "";
 
   /* When running from gui, generate output in .ly source directory.  */
-  if (output_name_global.is_empty ()
+  if (output_name_global.empty ()
       && ly_get_option (ly_symbol2scm ("gui")) == SCM_BOOL_T)
     {
       File_name f (file);
@@ -61,56 +62,57 @@ LY_DEFINE (ly_parse_file, "ly:parse-file",
       output_name_global = f.to_string ();
     }
 
-  if (!output_name_global.is_empty ())
+  if (!output_name_global.empty ())
     {
       /* Interpret --output=DIR to mean --output=DIR/BASE.  */
+      string dir;
       if (is_dir (output_name_global))
        {
-         char cwd[PATH_MAX];
-         getcwd (cwd, PATH_MAX);
-
-         if (output_name_global != cwd)
-           {
-             global_path.prepend (cwd);
-             message (_f ("Changing working directory to `%s'",
-                          output_name_global.to_str0 ()));
-             chdir (output_name_global.to_str0 ());
-           }
+         dir = output_name_global;
          output_name_global = "";
        }
+      else
+       dir = dir_name (output_name_global);
+      if (dir != "" && dir != "." && dir != get_working_directory ())
+       {
+         global_path.prepend (get_working_directory ());
+         message (_f ("Changing working directory to `%s'",
+                      dir.c_str ()));
+         chdir (dir.c_str ());
+       }
       else
        out_file_name = File_name (output_name_global);
     }
 
-  String init;
-  if (!init_name_global.is_empty ())
+  string init;
+  if (!init_name_global.empty ())
     init = init_name_global;
   else
     init = "init.ly";
 
-  String out_file = out_file_name.to_string ();
+  string out_file = out_file_name.to_string ();
 
-  if (init.length () && global_path.find (init).is_empty ())
+  if (init.length () && global_path.find (init).empty ())
     {
       warning (_f ("can't find init file: `%s'", init));
       warning (_f ("(search path: `%s')",
-                  global_path.to_string ().to_str0 ()));
+                  global_path.to_string ().c_str ()));
       exit (2);
     }
 
-  if ((file_name != "-") && global_path.find (file_name).is_empty ())
+  if ((file_name != "-") && global_path.find (file_name).empty ())
     {
       warning (_f ("can't find file: `%s'", file_name));
       scm_throw (ly_symbol2scm ("ly-file-failed"),
-                scm_list_1 (scm_makfrom0str (file_name.to_str0 ())));
+                scm_list_1 (scm_makfrom0str (file_name.c_str ())));
     }
   else
     {
       Sources sources;
       sources.set_path (&global_path);
 
-      String mapped_fn = map_file_name (file_name);
-      message (_f ("Processing `%s'", mapped_fn.to_str0 ()));
+      string mapped_fn = map_file_name (file_name);
+      message (_f ("Processing `%s'", mapped_fn.c_str ()));
       progress_indication ("\n");
 
       Lily_parser *parser = new Lily_parser (&sources);
@@ -123,7 +125,7 @@ LY_DEFINE (ly_parse_file, "ly:parse-file",
       if (error)
        /* TODO: pass renamed input file too.  */
        scm_throw (ly_symbol2scm ("ly-file-failed"),
-                  scm_list_1 (scm_makfrom0str (file_name.to_str0 ())));
+                  scm_list_1 (scm_makfrom0str (file_name.c_str ())));
     }
   return SCM_UNSPECIFIED;
 }
@@ -224,6 +226,7 @@ LY_DEFINE (ly_parser_output_name, "ly:parser-output-name",
   Lily_parser *p = unsmob_lily_parser (parser);
   SCM_ASSERT_TYPE (p, parser, SCM_ARG1, __FUNCTION__, "Lilypond parser");
 
-  return scm_makfrom0str (p->output_basename_.to_str0 ());
+  return scm_makfrom0str (p->output_basename_.c_str ());
 }
 
+