]> git.donarmstrong.com Git - lilypond.git/commitdiff
lilypond-0.0.35
authorfred <fred>
Sun, 24 Mar 2002 19:33:26 +0000 (19:33 +0000)
committerfred <fred>
Sun, 24 Mar 2002 19:33:26 +0000 (19:33 +0000)
Sources.make
hdr/complexwalker.hh
hdr/walkregs.hh [new file with mode: 0644]

index ba5833629c29c4d2f797312e61a683b42d076a23..b255d37e543ba33d9ab326a59db0692aaf3a7fcd 100644 (file)
@@ -1,11 +1,11 @@
 # Sources.make
 # sourcefiles to be shipped. Also used for dependencies
 
-hdr=   bar.hh barreg.hh beam.hh boxes.hh break.hh clefreg.hh clefitem.hh\
+hdr=bar.hh barreg.hh beam.hh boxes.hh break.hh clefreg.hh clefitem.hh\
        colhpos.hh  commandrequest.hh   \
        complexwalker.hh complexstaff.hh\
        const.hh debug.hh dimen.hh directionalspanner.hh\
-        glob.hh  grouping.hh headreg.hh idealspacing.hh\
+       glob.hh grouping.hh headreg.hh idealspacing.hh\
        identifier.hh identparent.hh \
        inputmusic.hh inputscore.hh inputstaff.hh\
        inputfile.hh\
@@ -20,23 +20,23 @@ hdr=   bar.hh barreg.hh beam.hh boxes.hh break.hh clefreg.hh clefitem.hh\
        misc.hh\
        molecule.hh moment.hh musicalrequest.hh\
        notehead.hh notename.hh offset.hh paperdef.hh\
-        parseconstruct.hh pcol.hh proto.hh\
+       parseconstruct.hh pcol.hh proto.hh\
        pscore.hh pstaff.hh qlp.hh\
-       qlpsolve.hh register.hh reqtodo.hh request.hh rest.hh \
-       sccol.hh score.hh\
+       qlpsolve.hh register.hh registergroup.hh reqtodo.hh \
+       request.hh rest.hh scorecolumn.hh score.hh\
        scoreline.hh scorewalker.hh script.hh scriptdef.hh scriptreg.hh \
        slur.hh slurreg.hh source.hh sourcefile.hh\
        spanner.hh staff.hh\
        staffelem.hh staffeleminfo.hh staffline.hh staffsym.hh stembeamreg.hh\
-       stcol.hh stem.hh staffwalker.hh symbol.hh symtable.hh\
+       staffcolumn.hh stem.hh staffwalker.hh symbol.hh symtable.hh\
        tex.hh textdef.hh \
        textitem.hh textreg.hh textspanner.hh timedescription.hh \
        tstream.hh voice.hh\
-       voicegroup.hh
+       voiceregs.hh voicegroupregs.hh walkregs.hh
 
 mycc=bar.cc barreg.cc beam.cc boxes.cc break.cc calcideal.cc clefreg.cc\
        clefitem.cc colhpos.cc  commandrequest.cc\
-        complexstaff.cc complexwalker.cc \
+       complexstaff.cc complexwalker.cc \
        debug.cc dimen.cc\
        directionalspanner.cc\
        grouping.cc groupregs.cc headreg.cc\
@@ -53,19 +53,21 @@ mycc=bar.cc barreg.cc beam.cc boxes.cc break.cc calcideal.cc clefreg.cc\
        mididef.cc  midiitem.cc midioutput.cc midistream.cc\
        midiwalker.cc misc.cc molecule.cc mylexer.cc note.cc\
        notehead.cc  notename.cc\
-        paperdef.cc pcol.cc pscore.cc pstaff.cc qlp.cc qlpsolve.cc\
-       register.cc request.cc rest.cc  sccol.cc score.cc\
+       paperdef.cc pcol.cc pscore.cc pstaff.cc qlp.cc qlpsolve.cc\
+       register.cc registergroup.cc request.cc rest.cc\
+       scorecolumn.cc score.cc\
        scoreline.cc scores.cc scorewalker.cc script.cc\
        scriptdef.cc scriptreg.cc slur.cc\
        slurreg.cc source.cc sourcefile.cc\
        spanner.cc staff.cc\
        staffelem.cc staffline.cc staffsym.cc\
-       stembeamreg.cc stcol.cc stem.cc\
-       staffwalker.cc symbol.cc symtable.cc  tex.cc texbeam.cc\
+       stembeamreg.cc staffcolumn.cc stem.cc\
+       staffeleminfo.cc staffwalker.cc symbol.cc\
+       symtable.cc tex.cc texbeam.cc\
        texslur.cc textdef.cc textitem.cc textreg.cc textspanner.cc\
        timedescription.cc tstream.cc voice.cc voiceelt.cc \
-       voiceregs.cc voicegroup.cc\
-       warn.cc windhoos-suck-suck-suck-thank-you-cygnus.cc wordwrap.cc\
+       voiceregs.cc voicegroupregs.cc\
+       walkregs.cc warn.cc windhoos-suck-suck-suck-thank-you-cygnus.cc wordwrap.cc\
        template1.cc template2.cc template3.cc template4.cc\
        template5.cc template6.cc version.cc
 
index 5f0a8084500cdd6308489a0bffbd8fa09b977c74..a67d5b881a2ee5bae0a14ba7a51fccd4e46824fb 100644 (file)
@@ -8,7 +8,6 @@
 #define COMPLEXWALKER_HH
 
 #include "proto.hh"
-#include "voicegroup.hh"
 #include "assoc.hh"
 #include "staffwalker.hh"
 #include "staffeleminfo.hh"
@@ -18,7 +17,7 @@
   A staff walker which uses registers to decide what to print
  */
 class Complex_walker: public Staff_walker {
-    bool try_command_request(Nonmusical_req *req_l);
+    bool try_command_request(Command_req *req_l);
     void do_change_group( Voice * v, String group_id_str);
     void do_announces();
     void try_request(Request*req);    
@@ -33,14 +32,9 @@ public:
     IPointerList<Voice_registers *> voice_reg_list_;
     IPointerList<Voice_group_registers*> group_reg_list_;
     Assoc<Voice *, Voice_group_registers *> voice_group_map_;
-
-    Clef_register *clef_reg_p_;
-    Local_key_register *local_key_reg_p_;
-    Key_register *key_reg_p_;
-    Bar_register *bar_reg_p_;
-    Meter_register *meter_reg_p_;
     
     Array<Staff_elem_info> announce_info_arr_;
+    Walker_registers *walk_regs_p_;
     
     /* *************** */
 
diff --git a/hdr/walkregs.hh b/hdr/walkregs.hh
new file mode 100644 (file)
index 0000000..93801d0
--- /dev/null
@@ -0,0 +1,20 @@
+/*
+  walkregs.hh -- declare Walker_registers
+
+  source file of the LilyPond music typesetter
+
+  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+*/
+
+
+#ifndef WALKREGS_HH
+#define WALKREGS_HH
+
+
+#include "registergroup.hh"
+
+struct Walker_registers : Register_group {
+    Walker_registers(Complex_walker *w);
+};
+
+#endif // WALKREGS_HH