microtherion/VocalEasel
1
0
Fork 0
mirror of https://github.com/microtherion/VocalEasel.git synced 2024-12-22 19:23:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle pickup notes

Browse Source
This commit is contained in:
Matthias Neeracher 2007-05-04 05:38:21 +00:00
parent cbf758784c
commit ca9592111c
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Sources/VLModel.cpp
View File

@ -159,7 +159,7 @@ void VLNote::Name(std::string & name, bool useSharps) const
name = PitchName(fPitch, useSharps); name = PitchName(fPitch, useSharps);
} }
void VLNote::LilypondName(std::string & name, VLFraction at, VLFraction prevDur, VLFraction nextDur, bool & triplet, const VLProperties & prop) const void VLNote::LilypondName(std::string & name, VLFraction at, VLFraction prevDur, VLFraction nextDur, bool & triplet, bool & pickup, const VLProperties & prop) const
{ {
std::string n = LilypondPitchName(fPitch, prop.fKey >= 0); std::string n = LilypondPitchName(fPitch, prop.fKey >= 0);
if (fPitch != kNoPitch) { if (fPitch != kNoPitch) {
@ -167,6 +167,9 @@ void VLNote::LilypondName(std::string & name, VLFraction at, VLFraction prevDur,
n += '\''; n += '\'';
for (int commas = (kMiddleC-kOctave-fPitch)/kOctave; commas>0; --commas) for (int commas = (kMiddleC-kOctave-fPitch)/kOctave; commas>0; --commas)
n += ','; n += ',';
pickup = false;
} else if (pickup) {
n = "s";
} }
std::vector<std::string> durations; std::vector<std::string> durations;
@ -1285,6 +1288,7 @@ void VLSong::LilypondNotes(std::string & notes) const
size_t seenEnding = 0; size_t seenEnding = 0;
int numEndings = 0; int numEndings = 0;
size_t endMeasure = fMeasures.size()-EmptyEnding(); size_t endMeasure = fMeasures.size()-EmptyEnding();
bool pickup = fMeasures[0].NoChords();
for (size_t measure=0; measure<fMeasures.size(); ++measure) { for (size_t measure=0; measure<fMeasures.size(); ++measure) {
VLNoteList::const_iterator i = fMeasures[measure].fMelody.begin(); VLNoteList::const_iterator i = fMeasures[measure].fMelody.begin();
VLNoteList::const_iterator e = fMeasures[measure].fMelody.end(); VLNoteList::const_iterator e = fMeasures[measure].fMelody.end();
@ -1336,7 +1340,7 @@ void VLSong::LilypondNotes(std::string & notes) const
VLFraction nextDur(0); VLFraction nextDur(0);
if (++n != e) if (++n != e)
nextDur = n->fDuration; nextDur = n->fDuration;
i->LilypondName(note, at, prevDur, nextDur, triplet, fProperties[fMeasures[measure].fPropIdx]); i->LilypondName(note, at, prevDur, nextDur, triplet, pickup, fProperties[fMeasures[measure].fPropIdx]);
prevDur = i->fDuration; prevDur = i->fDuration;
at += i->fDuration; at += i->fDuration;
notes += note+" "; notes += note+" ";
@ -1354,7 +1358,7 @@ void VLSong::LilypondNotes(std::string & notes) const
// //
while ((trip = notes.find("} ~")) != std::string::npos) while ((trip = notes.find("} ~")) != std::string::npos)
notes.replace(trip, 3, "~ } ", 4); notes.replace(trip, 3, "~ } ", 4);
if (fGoToCoda == measure+1) if (fGoToCoda == measure+1)
notes += "\n" notes += "\n"
+ indent + indent

2
Sources/VLModel.h
View File

@ -140,7 +140,7 @@ struct VLNote {
VLNote(std::string name); VLNote(std::string name);
void Name(std::string & name, bool useSharps = false) const; void Name(std::string & name, bool useSharps = false) const;
void LilypondName(std::string & name, VLFraction at, VLFraction prevDur, VLFraction nextDur, bool & triplet, const VLProperties & prop) const; void LilypondName(std::string & name, VLFraction at, VLFraction prevDur, VLFraction nextDur, bool & triplet, bool & pickup, const VLProperties & prop) const;
void MMAName(std::string & name, VLFraction at, VLFraction dur, VLFraction prevDur, VLFraction nextDur, const VLProperties & prop) const; void MMAName(std::string & name, VLFraction at, VLFraction dur, VLFraction prevDur, VLFraction nextDur, const VLProperties & prop) const;
}; };