lilypond-0.0.43

diff --git a/.version b/.version
index 71f7750ff1d9fd30008589c27793b8f506a35c1f..f3fe58849aa8715eae9fb2ebc37ca1f57dd9b1eb 100644 (file)
--- a/.version
+++ b/.version
@@ -1,6 +1,6 @@
 TOPLEVEL_MAJOR_VERSION = 0
 TOPLEVEL_MINOR_VERSION = 0
-TOPLEVEL_PATCH_LEVEL = 42
+TOPLEVEL_PATCH_LEVEL = 43
 # use to send patches, always empty for released version:
 # include separator: ".postfix", "-pl" makes rpm barf
 

diff --git a/lily/input-music.cc b/lily/input-music.cc
index 8ccc9071b8813b8b28d874f1498a3c61f0ad4b28..5c8aa72472c0fd186eefd380f627c5c3df39e14f 100644 (file)
--- a/lily/input-music.cc
+++ b/lily/input-music.cc
@@ -21,6 +21,12 @@ Input_music::check_plet(Voice_element* velt_l)
         }
 }
 
+void
+Simple_music::transpose(Melodic_req const &d)const
+{
+    voice_.transpose(d);
+}
+
 void
 Simple_music::add(Voice_element*v)
 {
@@ -67,6 +73,12 @@ Simple_music::set_plet_backwards(Moment& now_moment_r, Moment until_moment, int
 
 /* *************** */
 
+void
+Complex_music::transpose(Melodic_req const& d) const
+{
+     for (iter_top(elts,i); i.ok(); i++)
+        i->transpose(d);
+}
 void
 Complex_music::add(Input_music*v)
 {

diff --git a/lily/my-lily-lexer.cc b/lily/my-lily-lexer.cc
new file mode 100644 (file)
index 0000000..8c02f12
--- /dev/null
+++ b/lily/my-lily-lexer.cc
@@ -0,0 +1,181 @@
+#include <strstream.h>
+
+#include "interval.hh"
+#include "identifier.hh"
+#include "assoc-iter.hh"
+#include "input-file.hh"
+#include "out/parser.hh"
+#include "keyword.hh"
+#include "assoc.hh"
+#include "my-lily-lexer.hh"
+#include "debug.hh"
+#include "source-file.hh"
+#include "parseconstruct.hh"
+
+static Keyword_ent the_key_tab[]={
+    "bar", BAR,
+    "cadenza", CADENZA,
+    "clef", CLEF,
+    "cm", CM_T,
+    "duration", DURATIONCOMMAND,
+    "dynamic", DYNAMIC,
+    "geometric", GEOMETRIC,
+    "in", IN_T,
+    "lyrics", LYRICS,
+    "key", KEY,
+    "melodic" , MELODIC,
+    "meter", METER,
+    "midi", MIDI,
+    "mm", MM_T,
+    "multivoice", MULTIVOICE,
+    "octave", OCTAVECOMMAND,
+    "output", OUTPUT,
+    "partial", PARTIAL,
+    "paper", PAPER,
+    "plet", PLET,
+    "pt", PT_T,
+    "score", SCORE,
+    "script", SCRIPT,
+    "skip", SKIP,
+    "staff", STAFF,
+    "start", START_T,
+    "stem", STEM,
+    "table", TABLE,
+    "symboltables", SYMBOLTABLES,
+    "tempo", TEMPO,
+    "texid", TEXID,
+    "textstyle", TEXTSTYLE,
+    "transpose", TRANSPOSE,
+    "unitspace", UNITSPACE,
+    "width", WIDTH,
+    "music", MUSIC,
+    "grouping", GROUPING,
+    0,0
+};
+
+My_lily_lexer::My_lily_lexer()
+{
+    keytable_p_ = new Keyword_table(the_key_tab);
+    identifier_assoc_p_ = new Assoc<String, Identifier*>;
+    errorlevel_i_ = 0;
+}
+
+int
+My_lily_lexer::lookup_keyword(String s)
+{
+    return keytable_p_->lookup(s);
+}
+
+Identifier*
+My_lily_lexer::lookup_identifier(String s)
+{
+    if (!identifier_assoc_p_->elt_query(s))
+       return 0;
+    
+    return (*identifier_assoc_p_)[s];
+}
+
+char const*
+My_lily_lexer::here_ch_c_l()
+{
+    return include_stack_.top()->sourcefile_l_->ch_c_l() + yyin->tellg();
+}
+
+void
+My_lily_lexer::add_identifier(Identifier*i)
+{
+    delete lookup_identifier(i->name);
+    (*identifier_assoc_p_)[i->name] = i;
+}
+
+My_lily_lexer::~My_lily_lexer()
+{
+    delete keytable_p_;
+
+    for (Assoc_iter<String,Identifier*>
+            ai(*identifier_assoc_p_); ai.ok(); ai++) {
+       mtor << "deleting: " << ai.key()<<'\n';
+       Identifier *i_p = ai.val();
+       if (!i_p->accessed_b_ && !i_p->init_b_)
+           warning("Variable not used", i_p->defined_ch_C_);
+       
+       delete ai.val();
+    }
+    delete identifier_assoc_p_;
+}
+void
+My_lily_lexer::print_init_declarations()const
+{
+    for (Assoc_iter<String,Identifier*> ai(*identifier_assoc_p_); ai.ok(); 
+        ai++) {
+       if (ai.val()->init_b_)
+           ai.val()->print();
+    }
+}
+void
+My_lily_lexer::print_user_declarations()const
+{
+    for (Assoc_iter<String,Identifier*> ai(*identifier_assoc_p_); ai.ok(); ai++) {
+       if (!ai.val()->init_b_)
+           ai.val()->print();
+    }
+}
+
+String
+My_lily_lexer::spot()const
+{
+    return include_stack_.top()->name +  ": " + String( lineno() );
+}
+
+void
+My_lily_lexer::LexerError(char const *s)
+{
+    if (lexer->include_stack_.empty()) {
+       *mlog << "error at EOF" << s << '\n';
+    } else {
+       char const* ch_c_l = here_ch_c_l();
+       if ( ch_c_l ) {
+           ch_c_l--;
+           while ( ( *ch_c_l == ' ' ) || ( *ch_c_l == '\t' ) || ( *ch_c_l == '\n' ) )
+                   ch_c_l--;
+           ch_c_l++;
+       }
+       errorlevel_i_ |= 1;
+       error( s, ch_c_l );
+    }
+}
+
+// set the  new input to s, remember old file.
+void
+My_lily_lexer::new_input(String s)
+{    
+   if (!include_stack_.empty()) {
+       include_stack_.top()->line = lineno();
+            // should this be saved at all?
+       include_stack_.top()->defined_ch_c_l_ = defined_ch_c_l;
+   }
+
+   Input_file *newin = new Input_file(s);
+   include_stack_.push(newin);
+   switch_streams(newin->is);
+
+   yylineno = 1;
+}
+
+// pop the inputstack.
+bool
+My_lily_lexer::close_input()
+{
+    Input_file *old = include_stack_.pop();
+     bool ok =         true;
+    if (include_stack_.empty()) {
+       ok = false;
+    } else {
+       Input_file *i = include_stack_.top();
+       switch_streams(i->is);
+       yylineno = i->line;     
+       defined_ch_c_l = i->defined_ch_c_l_;
+    }
+    delete old;
+    return ok;
+}