From 0ebe5f9f560080e3884b432a9391faa31e08a38b Mon Sep 17 00:00:00 2001 From: fred Date: Sun, 24 Mar 2002 19:30:26 +0000 Subject: [PATCH] lilypond-0.0.27 --- pavane.tex | 12 ------------ src/inputstaff.cc | 8 ++++---- standchen.tex | 13 ------------- 3 files changed, 4 insertions(+), 29 deletions(-) delete mode 100644 pavane.tex delete mode 100644 standchen.tex diff --git a/pavane.tex b/pavane.tex deleted file mode 100644 index 69a136237e..0000000000 --- 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 3c3909468d..6cbed38956 100644 --- 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 &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 index 5ef590b060..0000000000 --- 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} -- 2.39.5