lilypond-0.0.6

diff --git a/maartje.ly b/maartje.ly
index 508389a12ed03ca7d79f6814f683f8a79201614a..00d4ea8d5ee334872a92def835aecf0fffacd7f1 100644 (file)
--- a/maartje.ly
+++ b/maartje.ly
@@ -1,23 +1,26 @@
-% erg lang
 
 
+ritme = rhythmstaff {
+       voice { $ c2 r32 r32 r16 r8 r4 c2 c2 c2 c2 c2
+               c2 c2 c2 c2 c2 c2 c2 c2 c2 c2 c2 c2 c2 c2 $ }
+}
+melody=
+melodicstaff {
+  voice { $ c2.. r8 r4 r8 r16 r32 r32 d8 e8 f8 g8 a8 b8 'c8 c8 r4 c4 c4 c4 c4 c4 c4 $ }
+}
 score {
        paper {
                unitspace 3 cm
        }
-       rhythmstaff {
-               voice { $ c2 c2 c2 c2 c2 c2 c2 c2 c2 c2 c2 c2 c2 c2 c2 c2 c2 c2 c2 c2 c2 $ }
-       }
-       rhythmstaff {
-               voice { $ c2.. r8 c4 r4 c4 r4 c4 r4 c4 r4 c4 r4 c4 r4 c4 r4
-               r2 r4 r1
-       $ }
-       }
+       staff { ritme }
+       staff { melody }
        commands {
                meter 4 4
                skip 3:0
                meter 2 4
-               skip 8:0
+               skip 19:0
        }
 }
 
+
+

diff --git a/melodicstaff.cc b/melodicstaff.cc
new file mode 100644 (file)
index 0000000..60d9a6f
--- /dev/null
+++ b/melodicstaff.cc
@@ -0,0 +1,54 @@
+#include "melodicstaff.hh"
+#include "paper.hh"
+#include "molecule.hh"
+#include "linestaff.hh"
+#include "rhythmstaff.hh"
+#include "sccol.hh" 
+
+void
+Melodic_staff::set_output(PScore*ps)
+{
+    theline = new Linestaff(5,ps);
+    Simple_staff::set_output(ps);
+}
+
+void
+Melodic_column::typeset_command(Command *com, int breakst)
+{
+    Item *i = create_command_item(com);
+    typeset_item(i, breakst);
+}
+
+void
+Melodic_column::typeset_req(Request *rq)
+{
+    Item *i = create_req_item(rq);
+    if (rq->note()) {
+       int h = rq->note()->height();
+       Real dy = staff_->paper()->interline()/2;
+       i->output->translate(Offset(0,(h-2)*dy));
+    }
+    typeset_item(i);
+}
+
+/*
+  creation
+  */
+Staff *
+get_new_melodicstaff()
+{
+    return new Melodic_staff;
+}
+
+
+Staff_column*
+Melodic_staff::create_col(Score_column*s)
+{
+    return new Melodic_column(s,this);
+}
+
+Melodic_staff*
+Melodic_staff::clone()const
+{
+    return new Melodic_staff(*this);
+}

diff --git a/symbol.ini b/symbol.ini
index 26c0a31bffdd62ac27ca82884620bb326f3b4c31..3671dae8afdfe8138979d813d26d05630ced9d48 100644 (file)
--- a/symbol.ini
+++ b/symbol.ini
@@ -1,27 +1,31 @@
+
+
+
+symboltables
 # index TeXstring,     xmin xmax ymin ymax
 
 # be careful with editing this:
 # the "index" entry is hardwired into lilypond.
 
 table balls
-       1       \wholeball      -5pt    5pt     -1pt    1pt
-       2       \halfball       -5pt    5pt     -1pt    1pt
-       4       \quartball      -5pt    5pt     -1pt    1pt
+       1       \wholeball      -5pt    5pt     -2.5pt  2.5pt
+       2       \halfball       -5pt    5pt     -2.5pt  2.5pt
+       4       \quartball      -5pt    5pt     -2.5pt  2.5pt
 end
 
 table bars
        empty   \emptybar       0pt     0pt     0pt     0pt
-       |       \maatstreep     0pt     1pt     -8pt    8pt
-       ||      \finishbar      0pt     2pt     -8pt    8pt
+       |       \maatstreep     0pt     1pt     -12pt   12pt
+       ||      \finishbar      0pt     2pt     -12pt   12pt
 end
 
 table rests
        1       \wholerest              -5pt    1pt     -1pt    1pt
        2       \halfrest               -5pt    1pt     -1pt    1pt
-       4       \cquartrest             -5pt    2pt     -5pt    5pt
-       8       \ceighthrest            -5pt    1pt     -1pt    1pt
-       16      \csixteenthrest         -5pt    1pt     -1pt    1pt
-       32      \cthirtysecondrest      -1pt    1pt     -1pt    1pt
+       4       \quartrest              -5pt    2pt     -5pt    5pt
+       8       \eighthrest             0pt     5pt     0pt     8pt
+       16      \sixteenthrest          0pt     6pt     0pt     12pt
+       32      \thirtysecondrest       0pt     6pt     0pt     16pt
 end
 
 table meters
@@ -39,4 +43,5 @@ table dots
        1       \lsingledot             0pt     8pt     -1pt    1pt
        2       \ldoubledot             0pt     12pt    -1pt    1pt
        3       \ltripledot             0pt     16pt    -1pt    1pt
-end
+end 
+end # symboltables
\ No newline at end of file