From 9ea8d982435a5a68fdaa14d6f9c8d4e91573d5a3 Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Sun, 18 Apr 2004 17:46:03 +0000
Subject: [PATCH] * scm/lily.scm (toplevel-expression): New define.
* lily/parser.yy (toplevel_expression): Use it.
* lily/lexer.ll, lily/parser.yy:
---
ChangeLog | 2 ++
lily/parser.yy | 4 +++-
ly/declarations-init.ly | 3 ---
scm/lily.scm | 11 +++++------
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index f489817fe5..dee858779e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2004-04-18 Jan Nieuwenhuizen <janneke@gnu.org>
+ * scm/lily.scm (toplevel-expression): New define.
+
* lily/my-lily-parser.cc (ly:parser-add-book-and-score): New function.
* lily/parser.yy (toplevel_expression): Use it.
diff --git a/lily/parser.yy b/lily/parser.yy
index 4d04513049..749d29a323 100644
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -449,10 +449,12 @@ toplevel_expression:
THIS->header_ = $1;
}
| toplevel_music EOI {
- Music_output_def *paper = get_paper (THIS);
+ Music_output_def *paper = get_paper (THIS);
+ //FIXME
// delay?
// SCM proc = paper->get_scmvar ("toplevel-music-handler");
SCM proc = ly_scheme_function ("ly:parser-add-book-and-score");
+ //SCM proc = ly_scheme_function ("toplevel-music-handler");
scm_call_2 (proc, THIS->self_scm (), $1->self_scm ());
scm_gc_unprotect_object (paper->self_scm ());
}
diff --git a/ly/declarations-init.ly b/ly/declarations-init.ly
index 37eb01d06b..bb9506f742 100644
--- a/ly/declarations-init.ly
+++ b/ly/declarations-init.ly
@@ -76,9 +76,6 @@ melismaEnd = #(make-span-event 'ManualMelismaEvent STOP)
#(define page-breaking ly:ragged-page-breaks)
%%#(define page-breaking ly:optimal-page-breaks)
- %% FIXME: too late?
- #(define toplevel-music-handler ly:parser-add-book-and-score)
-
\include "engraver-init.ly"
}
diff --git a/scm/lily.scm b/scm/lily.scm
index f163d26c71..55d6dc71fc 100644
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -28,24 +28,23 @@
;;; debugging evaluator is slower. This should
;;; have a more sensible default.
-
(if (ly:get-option 'verbose)
(begin
(debug-enable 'debug)
(debug-enable 'backtrace)
- (read-enable 'positions) ))
+ (read-enable 'positions)))
+;; FIXME: huh?
+(define-public toplevel-music-handler ly:parser-add-book-and-score)
(define-public (line-column-location line col file)
"Print an input location, including column number ."
(string-append (number->string line) ":"
- (number->string col) " " file)
- )
+ (number->string col) " " file))
(define-public (line-location line col file)
"Print an input location, without column number ."
- (string-append (number->string line) " " file)
- )
+ (string-append (number->string line) " " file))
(define-public point-and-click #f)
--
2.39.5