From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Fri, 24 Jan 1997 10:35:22 +0000 (+0100)
Subject: partial: 0.0.24.jcn
X-Git-Tag: release/0.0.24~2
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=9fec3c315a8eb07d09dff75c374df217f187db77;p=lilypond.git

partial: 0.0.24.jcn
---

diff --git a/hdr/lyriccolumn.hh b/hdr/lyriccolumn.hh
new file mode 100644
index 0000000000..368dadf1bc
--- /dev/null
+++ b/hdr/lyriccolumn.hh
@@ -0,0 +1,45 @@
+//
+// lyriccolumn.hh -- part of LilyPond
+//
+// copyright 1997 Jan Nieuwenhuizen <jan@digicash.nl>
+
+
+#ifndef LYRICCOLUMN_HH
+#define LYRICCOLUMN_HH
+
+#include "key.hh"
+#include "stcol.hh"
+#include "staff.hh"
+#include "staffwalker.hh"
+
+struct Lyric_staff;
+
+/// (winfo)
+struct Word_info {
+    Lyric_req* lreq_l_;
+    Word_info();
+    Word_info(Lyric_req* lreq_l);
+};
+
+/// (lcol)
+struct Lyric_column : Staff_column {
+
+    Array<Word_info> winfo_array_;
+    Lyric_staff* lstaff_l_;
+    
+    void typeset_item(Item *, int=1);
+//    void typeset_item_directional(Item *, int dir, int=1);
+
+//    Molecule *create_command_mol(Command *com);
+
+//    void take_request(Request *rq);   
+    virtual void process_requests();
+
+    Lyric_column(Score_column*s,Lyric_staff*rs);
+};
+
+#endif // LYRICSTAFF_HH
+
+
+
+
diff --git a/hdr/lyricitem.hh b/hdr/lyricitem.hh
new file mode 100644
index 0000000000..7fda46142e
--- /dev/null
+++ b/hdr/lyricitem.hh
@@ -0,0 +1,19 @@
+//
+//  lyricitem.hh -- part of LilyPond
+//
+//  copyright 1997 Jan Nieuwenhuizen <jan@digicash.nl>
+
+#ifndef LYRIC_ITEM_HH
+#define LYRIC_ITEM_HH
+
+#include "textitem.hh"
+  
+struct Lyric_item : Text_item {
+    /****************/
+    Lyric_item(Lyric_req* lreq_l, int voice_count_i);
+    virtual void do_pre_processing();    
+};
+
+
+#endif // LYRICITEM_HH
+
diff --git a/hdr/lyricstaff.hh b/hdr/lyricstaff.hh
new file mode 100644
index 0000000000..6959636c60
--- /dev/null
+++ b/hdr/lyricstaff.hh
@@ -0,0 +1,31 @@
+//
+//  lyricstaff.hh -- part of LilyPond
+//
+//  copyright 1997 Jan Nieuwenhuizen <jan@digicash.nl>
+
+#ifndef LYRICSTAFF_HH
+#define LYRICSTAFF_HH
+
+#include "staff.hh"
+
+/// (lstaff)
+struct Lyric_staff : Staff {
+    PStaff* line_pstaff_p_;
+
+    Staff_column* create_col(Score_column*);
+    
+//    virtual Item *get_TYPESET_item(Command*);
+    virtual void set_output(PScore *);
+//    virtual Local_key_item* get_local_key_item();
+
+    void process_commands(PCursor<Command*> &where);
+    virtual void walk();
+
+    Lyric_staff();
+};
+
+#endif // LYRICSTAFF_HH
+
+
+
+