lilypond-0.0.47

diff --git a/NEWS b/NEWS
index 239dd52b9aa61dd5d8d96f551c38d3e01eb50aef..e456d8d44e13cd9954c0e3e5b5e8cb4e8ee7ffcf 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,10 +1,8 @@
-pl 46.jcn1
-Bugfix
-       - reincluded {interval,pcursor,plist}.tcc
-       - renamed Interval::elt_q to elt_b, invoking of empty to empty_b
-       - readded second (0) arg to warning function (only lily exports
-         a warning(String) function)
-       - fixed dist make/Files.make
+pl 47
+       - dynamic flowerlib
+       - Input mods: now use Source_file iso Sources
+       - makefile lib deps restructured
+       - make_website now produces in out/
 
 pl 46
        - examples.pod

diff --git a/lib/includable-lexer.cc b/lib/includable-lexer.cc
index f394907823ad369bbdaa5666354f947e227360b0..2f8d33f4610ebbbdad5d720b6ade4b56d10a194b 100644 (file)
--- a/lib/includable-lexer.cc
+++ b/lib/includable-lexer.cc
@@ -35,7 +35,7 @@ Includable_lexer::new_input(String s, Sources  * global_sources)
 }
 
 /** pop the inputstack.  conceptually this is a destructor, but it
-  does not destruct the Source_file it creates.  */
+  does not destruct the Source_file that Includable_lexer::new_input creates.  */
 bool
 Includable_lexer::close_input()
 {
@@ -75,3 +75,9 @@ Includable_lexer::add_lexed_char(int count)
 {
     char_count_stack_.top() += count;
 }
+
+Source_file*
+Includable_lexer::source_file_l()const
+{
+    return include_stack_.top();
+}

diff --git a/lib/include/includable-lexer.hh b/lib/include/includable-lexer.hh
index 3a076181a46677c68dd0d48e07e45e6bb38622fb..a5416ef45a04fbcd9d48218d38004df2b906490e 100644 (file)
--- a/lib/include/includable-lexer.hh
+++ b/lib/include/includable-lexer.hh
@@ -28,6 +28,7 @@ protected:
     Array<Source_file*> include_stack_;
     Array<int> char_count_stack_;
 public:
+    Source_file* source_file_l()const;
     void new_input(String s,Sources*);
     Includable_lexer();
     ~Includable_lexer();

diff --git a/lily/my-lily-parser.cc b/lily/my-lily-parser.cc
index 0696d91912cb74dfbfb9a8ed6d8c9b27c2a61881..0463a9d07739e7d393a7a43f945bc805b25d5a32 100644 (file)
--- a/lily/my-lily-parser.cc
+++ b/lily/my-lily-parser.cc
@@ -210,7 +210,7 @@ My_lily_parser::My_lily_parser(Sources * source_l)
     source_l_ = source_l;
     lexer_p_ = 0;
     default_duration_.type_i_ = 4;
-    default_octave_i_ = 3; // retain old default
+    default_octave_i_ = 0;
     textstyle_str_="roman";            // in lexer?
     error_level_i_ = 0;
     last_duration_mode = false;
@@ -239,5 +239,6 @@ My_lily_parser::pop_spot()
 Input
 My_lily_parser::here_input()const
 {
-    return Input(source_l_, here_ch_C());
+    Source_file * f_l= lexer_p_->source_file_l();
+    return Input(f_l, here_ch_C());
 }