* lily/output-def-scheme.cc: new file.

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

diff --git a/lily/lily-parser.cc b/lily/lily-parser.cc
index 96ec79f0e3a15ce86584b409044eb10e861881d4..456702e079e965c05d6fbd43bb663f33b3c60f9c 100644 (file)
--- a/lily/lily-parser.cc
+++ b/lily/lily-parser.cc
@@ -7,15 +7,16 @@
        Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
+#include "lily-parser.hh"
+#include "text-metrics.hh"
 #include "book.hh"
-#include "grob-selector.hh"
+#include "lilypond-key.hh"
 #include "file-name.hh"
 #include "file-path.hh"
 #include "lily-version.hh"
 #include "ly-module.hh"
 #include "main.hh"
 #include "lily-lexer.hh"
-#include "lily-parser.hh"
 #include "output-def.hh"
 #include "paper-book.hh"
 #include "parser.hh"
@@ -23,7 +24,6 @@
 #include "source.hh"
 #include "warn.hh"
 
-
 Lily_parser::Lily_parser (Sources *sources)
 {
   book_count_ = 0;
@@ -86,6 +86,11 @@ Lily_parser::print_smob (SCM s, SCM port, scm_print_state*)
 void
 Lily_parser::parse_file (String init, String name, String out_name)
 {
+  if (output_backend_global == "tex")
+    {
+      try_load_text_metrics (out_name); 
+    }
+  
   lexer_ = new Lily_lexer (sources_);
   scm_gc_unprotect_object (lexer_->self_scm ());
   // TODO: use $parser 
@@ -101,23 +106,16 @@ Lily_parser::parse_file (String init, String name, String out_name)
   set_yydebug (0);
 
   lexer_->new_input (init, sources_);
-#ifdef TWEAK
+
   File_name f (name);
   String s = global_path.find (f.base_ + ".twy");
-  if (s == "")
-    Grob_selector::set_tweaks (SCM_EOL);
-  else
-    {
-      s = gulp_file_to_string (s, false);
-      SCM tweaks = scm_eval_string (scm_makfrom0str (s.to_str0 ()));
-      Grob_selector::set_tweaks (tweaks);
-    }
-#endif  
+  s = gulp_file_to_string (s, false);
+  scm_eval_string (scm_makfrom0str (s.to_str0 ()));
 
   /* Read .ly IN_FILE, lex, parse, write \score blocks from IN_FILE to
      OUT_FILE (unless IN_FILE redefines output file name).  */
   do_yyparse ();
-  
+
   if (!define_spots_.is_empty ())
     {
       define_spots_.top ().warning (_ ("Braces don't match"));
@@ -153,8 +151,9 @@ Lily_parser::parse_string (String ly_code)
   
   if (!define_spots_.is_empty ())
     {
-      define_spots_.top ().warning (_ ("Braces don't match"));
-      error_level_ = 1;
+      if (define_spots_.is_empty()
+         && !error_level_ )
+       programming_error ("Braces don't match, but error_level_ not set.");
     }
 
   error_level_ = error_level_ | lexer_->error_level_;
@@ -232,9 +231,9 @@ LY_DEFINE (ly_set_point_and_click, "ly:set-point-and-click",
   /* UGH. */
   SCM val = SCM_BOOL_F;
   if (ly_symbol2scm ("line-column") == what)
-    val = ly_scheme_function ("line-column-location");
+    val = ly_lily_module_constant ("line-column-location");
   else if (what == ly_symbol2scm ("line"))
-    val = ly_scheme_function ("line-location");
+    val = ly_lily_module_constant ("line-location");
 
   scm_module_define (global_lily_module, ly_symbol2scm ("point-and-click"),
                     val);
@@ -364,7 +363,7 @@ LY_DEFINE (ly_parser_lookup, "ly:parser-lookup",
   SCM_ASSERT_TYPE (scm_is_symbol (symbol), symbol, SCM_ARG2, __FUNCTION__, "symbol");
   SCM_ASSERT_TYPE (parser, parser_smob, SCM_ARG2, __FUNCTION__, "parser");  
 
-  SCM val= parser->lexer_->lookup_identifier (ly_scm2string (scm_symbol_to_string (symbol)));
+  SCM val = parser->lexer_->lookup_identifier (ly_scm2string (scm_symbol_to_string (symbol)));
   if (val != SCM_UNDEFINED)
     return val;
   else
@@ -431,6 +430,8 @@ 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);
+  
   if (score->error_found_)
     return SCM_UNSPECIFIED;
   
@@ -451,16 +452,19 @@ LY_DEFINE (ly_parser_print_score, "ly:parser-print-score",
   for (int i = 0; i < score->defs_.size (); i++)
     default_rendering (score->get_music (), score->defs_[i]->self_scm (),
                       paper,
-                      header, os);
+                      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);
+                        header, os, key->self_scm ());
       scm_gc_unprotect_object (layout->self_scm ());
     }
+
+  scm_gc_unprotect_object (key->self_scm ());
   return SCM_UNSPECIFIED;
 }
 
@@ -504,8 +508,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);
+  
   if (pb)
     {
       pb->output (outname.to_string ());