X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Flily-parser-scheme.cc;h=27cf5e5e5c69a3536b523e89f9c07a585e09a73e;hb=5e24aa455cac67a7e7b42a0539fcbd8c235417bf;hp=69c90478b18f282c5a0349d95b96edd5e42dbe65;hpb=26bb48ca73e9b8f4c0aeca0427eff8b7520b0731;p=lilypond.git

diff --git a/lily/lily-parser-scheme.cc b/lily/lily-parser-scheme.cc
index 69c90478b1..27cf5e5e5c 100644
--- a/lily/lily-parser-scheme.cc
+++ b/lily/lily-parser-scheme.cc
@@ -4,22 +4,19 @@
   source file of the GNU LilyPond music typesetter
 
   (c) 2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
-
 */
 
+#include <unistd.h>
+
 #include "file-name.hh"
 #include "file-path.hh"
 #include "main.hh"
 #include "lily-parser.hh"
 #include "warn.hh"
 #include "source.hh"
-#include "lily-lexer.hh" 
-#include "score.hh"
-#include "lilypond-key.hh"
+#include "lily-lexer.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",
@@ -27,7 +24,7 @@ LY_DEFINE (ly_set_point_and_click, "ly:set-point-and-click",
 	   "Deprecated.")
 {
   (void) what;
-  warning ("ly:set-point-and-click called");
+  warning (_f ("deprecated function called: %s", "ly:set-point-and-click"));
   return SCM_UNSPECIFIED;
 }
 
@@ -48,14 +45,43 @@ 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_ = "";
 
+  /* When running from gui, generate output in .ly source directory.  */
+  if (output_name_global.is_empty ()
+      && scm_call_0 (ly_lily_module_constant ("running-from-gui?")) == SCM_BOOL_T)
+    {
+      File_name f (file);
+      f.base_ = "";
+      f.ext_ = "";
+      output_name_global = f.to_string ();
+    }
+
   if (!output_name_global.is_empty ())
-    out_file_name = File_name (output_name_global);
-  
+    {
+      /* Interpret --output=DIR to mean --output=DIR/BASE.  */
+      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 ());
+	      
+	    }
+	  output_name_global = "";
+	}
+      else      
+	out_file_name = File_name (output_name_global);
+    }
+
   String init;
   if (!init_name_global.is_empty ())
     init = init_name_global;
@@ -82,8 +108,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);
@@ -107,37 +134,34 @@ 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);
-  scm_module_define (global_lily_module, ly_symbol2scm ("parser"),
-		     parser->self_scm ());
   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 *parser = unsmob_lily_parser (parser_smob);
   Lily_parser *clone = new Lily_parser (*parser);
 
-  /* FIXME: should copy scopes too. */
   return scm_gc_unprotect_object (clone->self_scm ());
 }
 
-LY_DEFINE (ly_parser_define, "ly:parser-define",
+LY_DEFINE (ly_parser_define, "ly:parser-define!",
 	   3, 0, 0, (SCM parser_smob, SCM symbol, SCM val),
 	   "Bind SYMBOL to VAL in PARSER_SMOB's module.")
 {
-  Lily_parser *parser = unsmob_my_lily_parser (parser_smob);
+  Lily_parser *parser = unsmob_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;
@@ -148,10 +172,10 @@ LY_DEFINE (ly_parser_lookup, "ly:parser-lookup",
 	   "Lookup @var{symbol} in @var{parser_smob}'s module.  "
 	   "Undefined is '().")
 {
-  Lily_parser *parser = unsmob_my_lily_parser (parser_smob);
+  Lily_parser *parser = unsmob_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)
@@ -165,72 +189,24 @@ LY_DEFINE (ly_parser_parse_string, "ly:parser-parse-string",
 	   "Parse the string LY_CODE with PARSER_SMOB."
 	   "Upon failure, throw @code{ly-file-failed} key.")
 {
-  Lily_parser *parser = unsmob_my_lily_parser (parser_smob);
+  Lily_parser *parser = unsmob_lily_parser (parser_smob);
 
   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;
-}
 
-/* TODO: move this to Scheme?  Why take the parser arg, and all the back
-   & forth between scm and c++? */
-LY_DEFINE (ly_parser_print_score, "ly:parser-print-score",
-	   2, 0, 0,
-	   (SCM parser_smob, SCM score_smob),
-	   "Print score, i.e., the classic way.")
-{
-  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);
-  
-  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)
-    outname.base_ += "-" + to_string (*c);
-  (*c)++;
-
-  SCM os = scm_makfrom0str (outname.to_string ().to_str0 ());
-  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 ());
-
-  if (score->defs_.is_empty ())
-    {
-      Output_def *layout = get_layout (parser);
-      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 ());
-    }
+  parser->parse_string (ly_scm2string (ly_code));
 
-  scm_gc_unprotect_object (key->self_scm ());
   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}. "
 	   "@var{names} is an alist of symbols.  "
 	   "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");
+  Lily_parser *p = unsmob_lily_parser (parser);
+  SCM_ASSERT_TYPE (p, parser, SCM_ARG1, __FUNCTION__, "Lilypond parser");
 
   if (p->lexer_->is_note_state ())
     {
@@ -241,36 +217,14 @@ LY_DEFINE (ly_parser_set_note_names, "ly:parser-set-note-names",
   return SCM_UNSPECIFIED;
 }
 
-LY_DEFINE (ly_parser_print_book, "ly:parser-print-book",
-	   2, 0, 0, (SCM parser_smob, SCM book_smob),
-	   "Print book.")
+
+LY_DEFINE (ly_parser_output_name, "ly:parser-output-name",
+	   1, 0, 0, (SCM parser),
+	   "Return the base name of the output file.")
 {
-  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)
-    outname.base_ += "-" + to_string (*c);
-  (*c)++;
-
-  Output_def *layout = get_layout (parser);
-  Paper_book* pb = book->process (outname.to_string (), layout);
-  
-  if (pb)
-    {
-      pb->output (outname.to_string ());
-      scm_gc_unprotect_object (pb->self_scm ());
-    }
+  Lily_parser *p = unsmob_lily_parser (parser);
+  SCM_ASSERT_TYPE (p, parser, SCM_ARG1, __FUNCTION__, "Lilypond parser");
 
-  scm_gc_unprotect_object (layout->self_scm ());
-  return SCM_UNSPECIFIED;
+  return scm_from_locale_string (p->output_basename_.to_str0 ());
 }