* lily/slur-scoring.cc (get_bound_info): robustness: substitute

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

diff --git a/lily/lily-parser-scheme.cc b/lily/lily-parser-scheme.cc
index d50aa564ad6163a1e1c910fb6912d76d7845b3c9..d77dcb3bc35edeeb8bf7dbc693cda802d674ed10 100644 (file)
--- a/lily/lily-parser-scheme.cc
+++ b/lily/lily-parser-scheme.cc
@@ -1,10 +1,9 @@
 /*
-  lily-parser-scheme.cc --  implement Lily_parser bindings
+  lily-parser-scheme.cc -- implement Lily_parser bindings
 
   source file of the GNU LilyPond music typesetter
 
   (c) 2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
-
 */
 
 #include "file-name.hh"
@@ -13,20 +12,22 @@
 #include "lily-parser.hh"
 #include "warn.hh"
 #include "source.hh"
-#include "lily-lexer.hh" 
+#include "lily-lexer.hh"
 #include "score.hh"
 #include "lilypond-key.hh"
 #include "ly-module.hh"
 #include "output-def.hh"
 #include "book.hh"
 #include "paper-book.hh"
+#include "file-name-map.hh"
 
 /* Do not append `!' suffix, since 1st argument is not modified. */
 LY_DEFINE (ly_set_point_and_click, "ly:set-point-and-click",
           1, 0, 0, (SCM what),
           "Deprecated.")
 {
-  warning ("ly:set-point-and-click called");
+  (void) what;
+  warning (_f ("deprecated function called: %s", "ly:set-point-and-click"));
   return SCM_UNSPECIFIED;
 }
 
@@ -47,14 +48,14 @@ LY_DEFINE (ly_parse_file, "ly:parse-file",
   File_name out_file_name (file_name);
 
   global_path.append (out_file_name.dir_);
-  
+
   out_file_name.ext_ = "";
   out_file_name.root_ = "";
   out_file_name.dir_ = "";
 
   if (!output_name_global.is_empty ())
     out_file_name = File_name (output_name_global);
-  
+
   String init;
   if (!init_name_global.is_empty ())
     init = init_name_global;
@@ -81,8 +82,9 @@ LY_DEFINE (ly_parse_file, "ly:parse-file",
     {
       Sources sources;
       sources.set_path (&global_path);
-  
-      progress_indication (_f ("Processing `%s'", file_name.to_str0 ()));
+
+      String mapped_fn = map_file_name (file_name);
+      message (_f ("Processing `%s'", mapped_fn.to_str0 ()));
       progress_indication ("\n");
 
       Lily_parser *parser = new Lily_parser (&sources);
@@ -106,7 +108,7 @@ LY_DEFINE (ly_parse_string, "ly:parse-string",
           "Upon failure, throw @code{ly-file-failed} key.")
 {
   SCM_ASSERT_TYPE (scm_is_string (ly_code), ly_code, SCM_ARG1, __FUNCTION__, "string");
-  
+
   Sources sources;
   sources.set_path (&global_path);
   Lily_parser *parser = new Lily_parser (&sources);
@@ -115,13 +117,13 @@ LY_DEFINE (ly_parse_string, "ly:parse-string",
   parser->parse_string (ly_scm2string (ly_code));
   scm_gc_unprotect_object (parser->self_scm ());
   parser = 0;
-  
+
   return SCM_UNSPECIFIED;
 }
 
 LY_DEFINE (ly_clone_parser, "ly:clone-parser",
-           1, 0, 0, (SCM parser_smob),
-           "Return a clone of PARSER_SMOB.")
+          1, 0, 0, (SCM parser_smob),
+          "Return a clone of PARSER_SMOB.")
 {
   Lily_parser *parser = unsmob_my_lily_parser (parser_smob);
   Lily_parser *clone = new Lily_parser (*parser);
@@ -136,7 +138,7 @@ LY_DEFINE (ly_parser_define, "ly:parser-define",
 {
   Lily_parser *parser = unsmob_my_lily_parser (parser_smob);
   SCM_ASSERT_TYPE (scm_is_symbol (symbol), symbol, SCM_ARG2, __FUNCTION__, "symbol");
-  SCM_ASSERT_TYPE (parser, parser_smob, SCM_ARG2, __FUNCTION__, "parser");  
+  SCM_ASSERT_TYPE (parser, parser_smob, SCM_ARG2, __FUNCTION__, "parser");
 
   parser->lexer_->set_identifier (scm_symbol_to_string (symbol), val);
   return SCM_UNSPECIFIED;
@@ -150,7 +152,7 @@ LY_DEFINE (ly_parser_lookup, "ly:parser-lookup",
   Lily_parser *parser = unsmob_my_lily_parser (parser_smob);
 
   SCM_ASSERT_TYPE (scm_is_symbol (symbol), symbol, SCM_ARG2, __FUNCTION__, "symbol");
-  SCM_ASSERT_TYPE (parser, parser_smob, SCM_ARG2, __FUNCTION__, "parser");  
+  SCM_ASSERT_TYPE (parser, parser_smob, SCM_ARG2, __FUNCTION__, "parser");
 
   SCM val = parser->lexer_->lookup_identifier (ly_scm2string (scm_symbol_to_string (symbol)));
   if (val != SCM_UNDEFINED)
@@ -168,9 +170,9 @@ LY_DEFINE (ly_parser_parse_string, "ly:parser-parse-string",
 
   SCM_ASSERT_TYPE (parser, parser_smob, SCM_ARG1, __FUNCTION__, "parser");
   SCM_ASSERT_TYPE (scm_is_string (ly_code), ly_code, SCM_ARG2, __FUNCTION__, "string");
-  
+
   parser->parse_string (ly_scm2string (ly_code));
-  
+
   return SCM_UNSPECIFIED;
 }
 
@@ -184,17 +186,17 @@ LY_DEFINE (ly_parser_print_score, "ly:parser-print-score",
   Lily_parser *parser = unsmob_my_lily_parser (parser_smob);
   Score *score = unsmob_score (score_smob);
 
-  Object_key * key = new Lilypond_general_key (0, score->user_key_, 0);
-  
+  Object_key *key = new Lilypond_general_key (0, score->user_key_, 0);
+
   if (score->error_found_)
     return SCM_UNSPECIFIED;
-  
+
   SCM_ASSERT_TYPE (parser, parser_smob, SCM_ARG1, __FUNCTION__, "parser");
   SCM_ASSERT_TYPE (score, score_smob, SCM_ARG2, __FUNCTION__, "score");
 
   SCM header = ly_c_module_p (score->header_) ? score->header_
     : parser->lexer_->lookup_identifier ("$globalheader");
-  
+
   File_name outname (parser->output_basename_);
   int *c = &parser->book_count_;
   if (*c)
@@ -205,14 +207,12 @@ LY_DEFINE (ly_parser_print_score, "ly:parser-print-score",
   SCM paper = get_paper (parser)->self_scm ();
   for (int i = 0; i < score->defs_.size (); i++)
     default_rendering (score->get_music (), score->defs_[i]->self_scm (),
-                      paper,
-                      header, os,
-                      key->self_scm ());
+                      paper, header, os, key->self_scm ());
 
   if (score->defs_.is_empty ())
     {
       Output_def *layout = get_layout (parser);
-      default_rendering (score->get_music(), layout->self_scm (),
+      default_rendering (score->get_music (), layout->self_scm (),
                         get_paper (parser)->self_scm (),
                         header, os, key->self_scm ());
       scm_gc_unprotect_object (layout->self_scm ());
@@ -222,8 +222,6 @@ LY_DEFINE (ly_parser_print_score, "ly:parser-print-score",
   return SCM_UNSPECIFIED;
 }
 
-
-
 LY_DEFINE (ly_parser_set_note_names, "ly:parser-set-note-names",
           2, 0, 0, (SCM parser, SCM names),
           "Replace current note names in @var{parser}. "
@@ -231,7 +229,7 @@ LY_DEFINE (ly_parser_set_note_names, "ly:parser-set-note-names",
           "This only has effect if the current mode is notes.")
 {
   Lily_parser *p = unsmob_my_lily_parser (parser);
-  SCM_ASSERT_TYPE(p, parser, SCM_ARG1, __FUNCTION__, "Lilypond parser");
+  SCM_ASSERT_TYPE (p, parser, SCM_ARG1, __FUNCTION__, "Lilypond parser");
 
   if (p->lexer_->is_note_state ())
     {
@@ -249,13 +247,13 @@ LY_DEFINE (ly_parser_print_book, "ly:parser-print-book",
   Lily_parser *parser = unsmob_my_lily_parser (parser_smob);
   Book *book = unsmob_book (book_smob);
   Output_def *bp = unsmob_output_def (parser->lexer_->lookup_identifier ("$defaultpaper"));
-  
+
   SCM_ASSERT_TYPE (parser, parser_smob, SCM_ARG1, __FUNCTION__, "Lilypond parser");
   SCM_ASSERT_TYPE (book, book_smob, SCM_ARG2, __FUNCTION__, "Book");
-  
+
   /*  ugh. changing argument.*/
   book->paper_ = bp;
-  
+
   File_name outname (parser->output_basename_);
   int *c = &parser->book_count_;
   if (*c)
@@ -263,8 +261,8 @@ LY_DEFINE (ly_parser_print_book, "ly:parser-print-book",
   (*c)++;
 
   Output_def *layout = get_layout (parser);
-  Paper_book* pb = book->process (outname.to_string (), layout);
-  
+  Paper_book *pb = book->process (outname.to_string (), layout);
+
   if (pb)
     {
       pb->output (outname.to_string ());