lilypond-0.0.27

diff --git a/pavane.tex b/pavane.tex
deleted file mode 100644 (file)
index 69a1362..0000000
--- a/pavane.tex
+++ /dev/null
@@ -1,12 +0,0 @@
-\documentclass{article}         %UGH
-\usepackage{a4}
-\begin{document}
-\input lilyponddefs
-\input titledefs
-\def\interscoreline{\vskip12pt}
-\title{Pavane pour une Infante d\'efunte}
-\composer{Maurice Ravel}
-\instrument{Cor en Fa}
-\maketit
-\input pavane.out
-\end{document}

diff --git a/src/inputstaff.cc b/src/inputstaff.cc
index 3c3909468ddfca3faf79f27fd301087874acdc97..6cbed389569050bb0a56fda358be1f0ac0ade584 100644 (file)
--- a/src/inputstaff.cc
+++ b/src/inputstaff.cc
@@ -8,8 +8,8 @@
 #include "melodicstaff.hh"
 #include "rhythmstaff.hh"
 #include "lyricstaff.hh"
-#include "complexmelodicstaff.hh"
 #include "staff.hh"
+#include "complexstaff.hh"
 
 void
 Input_staff::add(Array<Input_command*> &s)
@@ -36,10 +36,10 @@ Input_staff::parse(Score*score_l)
 {
     Staff *p=0;
 
-    if (type == "complex")
-       p = new Complex_melodic_staff;
-    else if (type == "melodic")
+    if (type == "simple")
        p = new Melodic_staff;
+    else if (type == "melodic")
+       p = new Complex_staff;
     else if (type == "rhythmic")
        p = new Rhythmic_staff;
     else if (type == "lyric")

diff --git a/standchen.tex b/standchen.tex
deleted file mode 100644 (file)
index 5ef590b..0000000
--- a/standchen.tex
+++ /dev/null
@@ -1,13 +0,0 @@
-\documentclass{article}         %UGH
-\usepackage{a4}
-\begin{document}
-\input lilyponddefs
-\input titledefs
-\def\interscoreline{\vskip12pt}
-\title{St\"andchen}
-\composer{Franz Schubert}
-\instrument{M\"a\ss ig} % heu
-%#%\tempo{M\"a\ss ig}
-\maketit
-\input standchen.uit
-\end{document}