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

Generate skips instead of rests for chords

Browse Source
This commit is contained in:
Matthias Neeracher 2011-07-24 03:31:33 +00:00
parent 01e107666c
commit ecd3593a04
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Sources/VLLilypondWriter.cpp
View File

@ -187,10 +187,10 @@ static const char kValue[] = {
1, 2, 4, 8, 16, 32 1, 2, 4, 8, 16, 32
}; };
static std::string LilypondPitchName(int8_t pitch, bool useSharps) static std::string LilypondPitchName(int8_t pitch, bool useSharps, bool restIsSkip)
{ {
if (pitch == VLNote::kNoPitch) if (pitch == VLNote::kNoPitch)
return "r"; return restIsSkip ? "s" : "r";
pitch %= 12; pitch %= 12;
if (kScale[pitch] != ' ') if (kScale[pitch] != ' ')
return kScale[pitch] + std::string(); return kScale[pitch] + std::string();
@ -257,7 +257,7 @@ static bool PreferSharps(bool globalSharps, int noteAccidentals)
void VLLilypondWriter::VisitNote(VLLyricsNote & n) void VLLilypondWriter::VisitNote(VLLyricsNote & n)
{ {
std::string nm = std::string nm =
LilypondPitchName(n.fPitch, PreferSharps(fUseSharps, n.fVisual)); LilypondPitchName(n.fPitch, PreferSharps(fUseSharps, n.fVisual), false);
if (n.fPitch != VLNote::kNoPitch) { if (n.fPitch != VLNote::kNoPitch) {
int ref = VLNote::kMiddleC-VLNote::kOctave; int ref = VLNote::kMiddleC-VLNote::kOctave;
for (int ticks = (n.fPitch-ref)/VLNote::kOctave; ticks>0; --ticks) for (int ticks = (n.fPitch-ref)/VLNote::kOctave; ticks>0; --ticks)
@ -304,7 +304,7 @@ static const char * kLilypondStepNames[] = {
void VLLilypondWriter::VisitChord(VLChord & c) void VLLilypondWriter::VisitChord(VLChord & c)
{ {
std::string name = std::string name =
LilypondPitchName(c.fPitch, PreferSharps(fUseSharps, c.fVisual)); LilypondPitchName(c.fPitch, PreferSharps(fUseSharps, c.fVisual), true);
char duration[16]; char duration[16];
if (c.fDuration.fNum == 1 && !(c.fDuration.fDenom & (c.fDuration.fDenom-1))) // Power of two if (c.fDuration.fNum == 1 && !(c.fDuration.fDenom & (c.fDuration.fDenom-1))) // Power of two
sprintf(duration, "%d", c.fDuration.fDenom); sprintf(duration, "%d", c.fDuration.fDenom);
@ -396,7 +396,7 @@ void VLLilypondWriter::VisitChord(VLChord & c)
// Root // Root
// //
if (c.fRootPitch != VLNote::kNoPitch) if (c.fRootPitch != VLNote::kNoPitch)
name += "/+" + LilypondPitchName(c.fRootPitch, fUseSharps); name += "/+" + LilypondPitchName(c.fRootPitch, fUseSharps, false);
done: done:
if (fAccum.size()) if (fAccum.size())