lilypond-0.0.52

diff --git a/lily/include/parseconstruct.hh b/lily/include/parseconstruct.hh
index 45b7c3f3c8404b23d2d485fe51c0982e1a8a6d95..711f555865804e16e47b61855cb5fb26e39badb6 100644 (file)
--- a/lily/include/parseconstruct.hh
+++ b/lily/include/parseconstruct.hh
@@ -16,6 +16,7 @@ Request*get_script_req(int d , Script_def*def);
 Request*get_text_req(int d , Text_def*def);
 Request* get_stemdir_req(int);
 Request*get_grouping_req(Array<int> i_arr);
+Request* get_hshift_req(int);
 
 #endif // PARSECONSTRUCT_HH
 

diff --git a/lily/include/script-reg.hh b/lily/include/script-reg.hh
index 034140baeb4e25613025e3f4170aa6fed20279d3..67d1215b9a2497dacd16f30ee55a6e358472d98f 100644 (file)
--- a/lily/include/script-reg.hh
+++ b/lily/include/script-reg.hh
@@ -21,7 +21,6 @@ public:
     NAME_MEMBERS(Script_register);
     Script_register();
 protected:
-    virtual    void set_feature(Features dir_i_);
     virtual bool try_request(Request*);
     virtual void process_requests();
     virtual void acknowledge_element(Staff_elem_info);

diff --git a/lily/main.cc b/lily/main.cc
index d14272f41b2d500755d4613104ca64e81ed0c7ad..0b901f54d33c7bdc08b321ebe02d6b57ea9ecc80 100644 (file)
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -118,15 +118,22 @@ int
 main (int argc, char **argv)
 {    
     debug_init();              // should be first
-    File_path path(String(DIR_DATADIR)+"/init/") ;
-    path_l = & path;
-    path_l->push(DIR_DATADIR );
 
+//    File_path path(String(DIR_DATADIR)+"/init/") ;
+    // silly File_path, now has two .:.
+    File_path path( "." );
+    
+    // must override (come before) "/usr/local/share/lilypond"!
     char const * env_l=getenv("LILYINCLUDE");
     if (env_l) {
        path.add(env_l);
     }
     
+    path.add( String( DIR_DATADIR ) + "/init/" );
+    
+    path_l = & path;
+    path_l->push(DIR_DATADIR );
+
     Getopt_long oparser(argc, argv,theopts);
     cout << get_version_str() << endl;
     String init_str("symbol.ini");
@@ -151,7 +158,7 @@ main (int argc, char **argv)
            exit(0);
            break;
        case 'V':
-           version_ignore_b_ = false;
+           version_ignore_b_ = true;
            break;
        case 'd':
            set_debug(true);