X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flily-parser-scheme.cc;h=f58f2ea0fad9a773b2c6da8f7979b4f35b54cba8;hb=0aa76be34498475f09693cba89b17be8a1f13b8f;hp=61ea288fc608221868fc0832234a4deca0a9f5f6;hpb=6928c1207b7df4516e58d38724e6a3985cd1c3f6;p=lilypond.git

diff --git a/lily/lily-parser-scheme.cc b/lily/lily-parser-scheme.cc
index 61ea288fc6..f58f2ea0fa 100644
--- 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--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include <unistd.h>
@@ -21,16 +21,6 @@
 #include "sources.hh"
 #include "warn.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.")
-{
-  (void) what;
-  warning (_f ("deprecated function called: %s", "ly:set-point-and-click"));
-  return SCM_UNSPECIFIED;
-}
-
 LY_DEFINE (ly_parse_file, "ly:parse-file",
 	   1, 0, 0, (SCM name),
 	   "Parse a single @code{.ly} file."
@@ -47,15 +37,13 @@ LY_DEFINE (ly_parse_file, "ly:parse-file",
      file name.  */
   File_name out_file_name (file_name);
 
-  global_path.append (out_file_name.dir_);
-
   out_file_name.ext_ = "";
   out_file_name.root_ = "";
   if (ly_get_option (ly_symbol2scm ("gui")) != SCM_BOOL_T
       && ly_get_option (ly_symbol2scm ("strip-output-dir")) == SCM_BOOL_T) {
     out_file_name.dir_ = "";
   }
-  
+
   /* When running from gui, generate output in .ly source directory.  */
   string output_name = output_name_global;
   if (!output_name.empty ())
@@ -75,7 +63,7 @@ LY_DEFINE (ly_parse_file, "ly:parse-file",
 	      dir = out.dir_part ();
 	      out_file_name = out.file_part ();
 	    }
-	}	  
+	}
 
       if (dir != "" && dir != "." && dir != get_working_directory ())
 	{
@@ -130,13 +118,13 @@ LY_DEFINE (ly_parse_file, "ly:parse-file",
     }
 
   /*
-    outside the if-else to ensure cleanup fo Sources object, 
+    outside the if-else to ensure cleanup fo Sources object,
   */
   if (error)
     /* TODO: pass renamed input file too.  */
     scm_throw (ly_symbol2scm ("ly-file-failed"),
 	       scm_list_1 (ly_string2scm (file_name)));
-  
+
   return SCM_UNSPECIFIED;
 }
 
@@ -164,12 +152,12 @@ LY_DEFINE (ly_parser_define_x, "ly:parser-define!",
 	   3, 0, 0, (SCM parser_smob, SCM symbol, SCM val),
 	   "Bind @var{symbol} to @var{val} in @var{parser-smob}'s module.")
 {
-  
+
   LY_ASSERT_SMOB (Lily_parser, parser_smob, 1);
   Lily_parser *parser = unsmob_lily_parser (parser_smob);
 
   LY_ASSERT_TYPE (ly_is_symbol, symbol, 2);
-    
+
   parser->lexer_->set_identifier (scm_symbol_to_string (symbol), val);
   return SCM_UNSPECIFIED;
 }
@@ -182,7 +170,7 @@ LY_DEFINE (ly_parser_lookup, "ly:parser-lookup",
   LY_ASSERT_SMOB (Lily_parser, parser_smob, 1);
 
   Lily_parser *parser = unsmob_lily_parser (parser_smob);
- 
+
   LY_ASSERT_TYPE (ly_is_symbol, symbol, 2);
 
   SCM val = parser->lexer_->lookup_identifier (ly_scm2string (scm_symbol_to_string (symbol)));
@@ -198,7 +186,7 @@ LY_DEFINE (ly_parser_parse_string, "ly:parser-parse-string",
 	   "  Upon failure, throw @code{ly-file-failed} key.")
 {
   LY_ASSERT_SMOB (Lily_parser, parser_smob, 1);
-  Lily_parser *parser = unsmob_lily_parser (parser_smob); 
+  Lily_parser *parser = unsmob_lily_parser (parser_smob);
   LY_ASSERT_TYPE (scm_is_string, ly_code, 2);
 
   parser->parse_string (ly_scm2string (ly_code));
@@ -240,10 +228,10 @@ LY_DEFINE (ly_parser_error, "ly:parser-error",
 {
   LY_ASSERT_SMOB (Lily_parser, parser, 1);
   Lily_parser *p = unsmob_lily_parser (parser);
-  
+
   LY_ASSERT_TYPE (scm_is_string, msg, 2);
   string s = ly_scm2string (msg);
-  
+
   Input *i = unsmob_input (input);
   if (i)
     p->parser_error (*i, s);
@@ -259,11 +247,11 @@ LY_DEFINE (ly_parser_clear_error, "ly:parser-clear-error",
 {
   LY_ASSERT_SMOB (Lily_parser, parser, 1);
   Lily_parser *p = unsmob_lily_parser (parser);
-  
+
 
   p->error_level_ = 0;
   p->lexer_->error_level_ = 0;
-  
+
   return SCM_UNSPECIFIED;
 }