lilypond-0.0.46.jcn1

diff --git a/lily/include/score.hh b/lily/include/score.hh
index cf86ad342a7a8ca4f28cf12398b98ccae8aa9dbf..32b57bf01f7f06c097ae09a22d133bb34ba001da 100644 (file)
--- a/lily/include/score.hh
+++ b/lily/include/score.hh
@@ -16,6 +16,7 @@
 #include "moment.hh"
 #include "assoc.hh"
 #include "string.hh"
+#include "input.hh"
 
 /// the total music def of one movement
 struct Score {
@@ -28,7 +29,7 @@ struct Score {
     IPointerList<Score_column*> cols_;
     PScore *pscore_p_;
 
-    char const *defined_ch_C_;
+    Input input_;
     int errorlevel_i_;
     
     /* *************************************************************** */

diff --git a/lily/include/script-def.hh b/lily/include/script-def.hh
index 8b5be325611db7be559c9b7f65bdebbede75ff65..8d9528b45a95a2e7f4df48db885d6856241a5280 100644 (file)
--- a/lily/include/script-def.hh
+++ b/lily/include/script-def.hh
@@ -7,6 +7,7 @@
 #ifndef SCRIPTDEF_HH
 #define SCRIPTDEF_HH
 #include "string.hh"
+
 struct Script_def{
     int stemdir;
     int staffdir;

diff --git a/lily/include/text-def.hh b/lily/include/text-def.hh
index 50bb98105c88567b26af165e4a1073437556217a..bd59e417891e456200146d29b683a54ff43db0dc 100644 (file)
--- a/lily/include/text-def.hh
+++ b/lily/include/text-def.hh
@@ -9,14 +9,13 @@
 
 #include "string.hh"
 #include "proto.hh"
+#include "input.hh"
 
-struct Text_def  {
+struct Text_def : Input {
     int align_i_;
     String text_str_;
     String style_str_;
-    char const* defined_ch_C_;
-  
-
+    
     /* *************** */
     virtual ~Text_def() {};
     bool compare(const Text_def&);