2007-05-24 08:52:14 +00:00
|
|
|
//
|
|
|
|
// File: VLLilypondWriter.h
|
|
|
|
//
|
|
|
|
// Author(s):
|
|
|
|
//
|
|
|
|
// (MN) Matthias Neeracher
|
|
|
|
//
|
2018-02-19 00:59:23 +00:00
|
|
|
// Copyright © 2007-2018 Matthias Neeracher
|
2007-05-24 08:52:14 +00:00
|
|
|
//
|
|
|
|
|
|
|
|
#include "VLLilypondWriter.h"
|
2011-08-28 15:21:12 +00:00
|
|
|
#include "VLPitchName.h"
|
2007-05-24 08:52:14 +00:00
|
|
|
|
|
|
|
void VLLilypondWriter::Visit(VLSong & song)
|
|
|
|
{
|
|
|
|
fSong = &song;
|
|
|
|
fChords.clear();
|
|
|
|
fMelody.clear();
|
|
|
|
fLyrics.clear();
|
|
|
|
fLyrics.resize(song.CountStanzas());
|
|
|
|
fL = fLyrics;
|
|
|
|
fInPickup = true;
|
|
|
|
fIndent.clear();
|
|
|
|
fSeenEnding = 0;
|
|
|
|
fNumEndings = 0;
|
2008-01-26 10:54:00 +00:00
|
|
|
fLastProp = 0;
|
2008-08-15 13:27:21 +00:00
|
|
|
fPrevBreak = 0;
|
2008-08-15 13:25:42 +00:00
|
|
|
|
|
|
|
fAutomaticLayout = true;
|
|
|
|
for (int i=0; i<song.fMeasures.size(); ++i)
|
|
|
|
if (song.fMeasures[i].fBreak & VLMeasure::kNewSystem) {
|
|
|
|
fAutomaticLayout = false;
|
|
|
|
break;
|
|
|
|
}
|
2007-05-24 08:52:14 +00:00
|
|
|
|
|
|
|
VisitMeasures(song, false);
|
|
|
|
//
|
|
|
|
// Terminate melody
|
|
|
|
//
|
|
|
|
if (fIndent.size())
|
|
|
|
fMelody += fSeenEnding ? "}}\n" : "}\n";
|
|
|
|
}
|
|
|
|
|
2018-02-19 00:59:23 +00:00
|
|
|
void VLLilypondWriter::VisitMeasure(uint32_t m, VLProperties & p, VLMeasure & meas)
|
2007-05-24 08:52:14 +00:00
|
|
|
{
|
|
|
|
char measNo[8];
|
|
|
|
if (!(m % 4))
|
2011-08-28 10:40:45 +00:00
|
|
|
sprintf(measNo, " %% %lu", m+1);
|
2007-05-24 08:52:14 +00:00
|
|
|
else
|
|
|
|
measNo[0] = 0;
|
|
|
|
|
2008-04-06 22:33:07 +00:00
|
|
|
fUseSharps = p.fKey > 0;
|
2011-09-12 14:29:14 +00:00
|
|
|
fInPickup = fInPickup && !m && meas.NoChords();
|
|
|
|
if (fInPickup)
|
2008-08-15 13:27:21 +00:00
|
|
|
++fPrevBreak;
|
2011-09-12 14:29:14 +00:00
|
|
|
fInPickup = fInPickup && meas.CanSkipRests();
|
2007-05-24 08:52:14 +00:00
|
|
|
|
|
|
|
//
|
|
|
|
// Generate chords
|
|
|
|
//
|
|
|
|
fAccum.clear();
|
|
|
|
VisitChords(meas);
|
|
|
|
fAccum += measNo;
|
|
|
|
fChords+= fAccum + '\n';
|
|
|
|
|
2008-01-26 10:54:00 +00:00
|
|
|
fAccum.clear();
|
|
|
|
//
|
|
|
|
// Generate key/time if changed
|
|
|
|
//
|
|
|
|
if (!fLastProp || fLastProp->fTime != p.fTime) {
|
|
|
|
char time[16];
|
|
|
|
sprintf(time, "\\time %d/%d\n", p.fTime.fNum, p.fTime.fDenom);
|
|
|
|
fAccum += fIndent+time;
|
|
|
|
}
|
|
|
|
if (!fLastProp || fLastProp->fKey != p.fKey || fLastProp->fMode != p.fMode) {
|
|
|
|
const int kMajorOffset = 6;
|
|
|
|
const int kMinorOffset = 9;
|
|
|
|
|
|
|
|
static const char * sKeyNames[] = {
|
|
|
|
"ges", "des", "as", "es", "bes", "f",
|
|
|
|
"c", "g", "d", "a", "e", "b", "fis", "cis", "gis"
|
|
|
|
};
|
|
|
|
char key[16];
|
|
|
|
if (p.fMode < 0)
|
|
|
|
sprintf(key, "\\key %s \\minor\n", sKeyNames[p.fKey+kMinorOffset]);
|
|
|
|
else
|
|
|
|
sprintf(key, "\\key %s \\major\n", sKeyNames[p.fKey+kMajorOffset]);
|
|
|
|
fAccum += fIndent+key;
|
|
|
|
}
|
|
|
|
fLastProp = &p;
|
2007-05-24 08:52:14 +00:00
|
|
|
//
|
|
|
|
// Generate structure elements
|
|
|
|
//
|
|
|
|
int times;
|
|
|
|
size_t volta;
|
|
|
|
bool repeat;
|
2008-04-05 19:19:10 +00:00
|
|
|
bool hasBarLine = false;
|
2008-08-15 13:27:21 +00:00
|
|
|
|
|
|
|
if (meas.fBreak & VLMeasure::kNewPage) {
|
2008-04-05 19:19:10 +00:00
|
|
|
fAccum += fIndent+"\\pageBreak\n";
|
|
|
|
hasBarLine = true;
|
2008-08-15 13:27:21 +00:00
|
|
|
fPrevBreak = m;
|
|
|
|
} else if ((meas.fBreak & VLMeasure::kNewSystem)
|
|
|
|
|| (fAutomaticLayout && m == fPrevBreak+4)
|
|
|
|
) {
|
2008-04-05 19:19:10 +00:00
|
|
|
fAccum += fIndent+"\\break\n";
|
|
|
|
hasBarLine = true;
|
2008-08-15 13:27:21 +00:00
|
|
|
fPrevBreak = m;
|
2008-04-05 19:19:10 +00:00
|
|
|
}
|
2007-05-24 08:52:14 +00:00
|
|
|
if (fSong->DoesEndRepeat(m)) {
|
2008-04-05 19:19:10 +00:00
|
|
|
fAccum += "}\n";
|
|
|
|
fIndent = "";
|
|
|
|
hasBarLine = true;
|
2007-05-24 08:52:14 +00:00
|
|
|
}
|
|
|
|
if (fSong->DoesBeginEnding(m, &repeat, &volta)) {
|
|
|
|
fAccum += fSeenEnding ? "}{\n" : "} \\alternative {{\n";
|
|
|
|
fAccum += " \\set Score.repeatCommands = #'((volta \"";
|
|
|
|
const char * comma = "";
|
|
|
|
for (int r=0; r<8; ++r)
|
|
|
|
if (volta & (1<<r)) {
|
|
|
|
char volta[8];
|
|
|
|
sprintf(volta, "%s%d.", comma, r+1);
|
|
|
|
comma = ", ";
|
|
|
|
fAccum += volta;
|
|
|
|
}
|
|
|
|
fAccum += "\")" + std::string(repeat ? "" : " end-repeat") + ")\n";
|
|
|
|
fSeenEnding |= volta;
|
|
|
|
++fNumEndings;
|
2008-04-05 19:19:10 +00:00
|
|
|
hasBarLine = true;
|
|
|
|
} else if (fSong->DoesEndEnding(m, &hasBarLine)) {
|
2007-05-24 08:52:14 +00:00
|
|
|
fAccum += "}}\n";
|
|
|
|
fIndent = "";
|
|
|
|
}
|
|
|
|
if (fSong->DoesBeginRepeat(m, ×)) {
|
|
|
|
char volta[8];
|
|
|
|
sprintf(volta, "%d", times);
|
|
|
|
fAccum = fAccum + "\\repeat volta "+volta+" {\n";
|
|
|
|
fIndent = " ";
|
|
|
|
fSeenEnding = 0;
|
|
|
|
fNumEndings = 0;
|
2008-04-05 19:19:10 +00:00
|
|
|
hasBarLine = true;
|
2007-05-24 08:52:14 +00:00
|
|
|
}
|
|
|
|
fAccum += fIndent;
|
2008-04-05 19:19:10 +00:00
|
|
|
if (fSong->fCoda == m) {
|
|
|
|
if (!hasBarLine)
|
|
|
|
fAccum += "\\bar \"|.\" ";
|
2007-05-24 08:52:14 +00:00
|
|
|
fAccum += "\\break \\mark \\markup { \\musicglyph #\"scripts.coda\" }\n"
|
|
|
|
+ fIndent;
|
2008-04-05 19:19:10 +00:00
|
|
|
}
|
2007-05-24 08:52:14 +00:00
|
|
|
fMelody += fAccum;
|
|
|
|
|
|
|
|
//
|
|
|
|
// Generate melody & lyrics
|
|
|
|
//
|
|
|
|
fAccum.clear();
|
|
|
|
for (size_t stanza=0; stanza<fL.size(); ++stanza)
|
|
|
|
fL[stanza].clear();
|
|
|
|
fPrevNote.fPitch = VLNote::kNoPitch;
|
|
|
|
VisitNotes(meas, p, true);
|
|
|
|
|
|
|
|
//
|
|
|
|
// Consolidate triplets and dots
|
|
|
|
//
|
|
|
|
size_t trip;
|
|
|
|
while ((trip = fAccum.find("} \\times 2/3 { ")) != std::string::npos)
|
|
|
|
fAccum.erase(trip, 15);
|
|
|
|
while ((trip = fAccum.find(" ~ } \\times 2/3 { ")) != std::string::npos)
|
|
|
|
fAccum.erase(trip+2, 17);
|
2018-02-19 00:59:23 +00:00
|
|
|
while ((trip = fAccum.find("~.")) != std::string::npos)
|
|
|
|
fAccum.erase(trip, 1);
|
|
|
|
while ((trip = fAccum.find("~(.")) != std::string::npos)
|
|
|
|
fAccum.replace(trip, 3, ".(");
|
2007-05-24 08:52:14 +00:00
|
|
|
|
|
|
|
if (fSong->fGoToCoda == m+1)
|
|
|
|
fAccum += "\n"
|
|
|
|
+ fIndent
|
|
|
|
+ "\\mark \\markup { \\musicglyph #\"scripts.coda\" } |";
|
|
|
|
else
|
|
|
|
fAccum += " |";
|
|
|
|
fMelody += fAccum + measNo + '\n';
|
|
|
|
|
|
|
|
//
|
|
|
|
// Accumulate lyrics
|
|
|
|
//
|
|
|
|
const char * nuline = m%4 ? "" : "\n";
|
|
|
|
for (size_t stanza=0; stanza<fLyrics.size(); ++stanza)
|
|
|
|
fLyrics[stanza] += fL[stanza] + nuline;
|
|
|
|
}
|
|
|
|
|
|
|
|
static const char kValue[] = {
|
|
|
|
1, 2, 4, 8, 16, 32
|
|
|
|
};
|
|
|
|
|
2007-05-29 08:52:53 +00:00
|
|
|
static std::string EscapeSyllable(std::string syll)
|
|
|
|
{
|
2008-08-15 13:28:06 +00:00
|
|
|
bool seenAlpha = false;
|
2007-05-29 08:52:53 +00:00
|
|
|
for (size_t i=0; i<syll.size(); ++i)
|
2008-08-15 13:28:06 +00:00
|
|
|
if (isalpha(syll[i])) {
|
|
|
|
seenAlpha = true;
|
2007-05-29 08:52:53 +00:00
|
|
|
continue;
|
2008-08-15 13:28:06 +00:00
|
|
|
} else {
|
2007-05-29 08:52:53 +00:00
|
|
|
switch (syll[i]) {
|
|
|
|
case '-':
|
|
|
|
case ':':
|
|
|
|
case '.':
|
|
|
|
case ',':
|
|
|
|
case ';':
|
|
|
|
case '\'':
|
|
|
|
case '_':
|
2008-08-15 13:28:06 +00:00
|
|
|
if (seenAlpha)
|
|
|
|
continue;
|
|
|
|
/* Else fall through */
|
2007-05-29 08:52:53 +00:00
|
|
|
default:
|
|
|
|
goto escape;
|
|
|
|
}
|
2008-08-15 13:28:06 +00:00
|
|
|
}
|
2007-05-29 08:52:53 +00:00
|
|
|
//
|
|
|
|
// Purely alphabetic syllable, no need to escape.
|
|
|
|
//
|
|
|
|
return syll;
|
|
|
|
|
|
|
|
escape:
|
|
|
|
size_t q=0;
|
2008-08-15 13:28:06 +00:00
|
|
|
while ((q = syll.find_first_of('\\', q)) != std::string::npos) {
|
|
|
|
syll.replace(q, 1, "\\\\", 2);
|
|
|
|
q += 2;
|
|
|
|
}
|
|
|
|
q = 0;
|
2007-05-29 08:52:53 +00:00
|
|
|
while ((q = syll.find_first_of('"', q)) != std::string::npos) {
|
|
|
|
syll.replace(q, 1, "\\\"", 2);
|
|
|
|
q += 2;
|
|
|
|
}
|
|
|
|
q = 0;
|
|
|
|
while ((q = syll.find_first_of('_', q)) != std::string::npos) {
|
|
|
|
syll.replace(q, 1, "\"_\"", 3);
|
|
|
|
q += 3;
|
|
|
|
}
|
|
|
|
return '"'+syll+'"';
|
|
|
|
}
|
|
|
|
|
2008-05-29 18:54:30 +00:00
|
|
|
static bool PreferSharps(bool globalSharps, int noteAccidentals)
|
|
|
|
{
|
2011-08-27 22:12:32 +00:00
|
|
|
return (noteAccidentals & VLNote::kAccidentalsMask)
|
2008-05-29 18:54:30 +00:00
|
|
|
? (noteAccidentals & VLNote::kWantSharp)
|
|
|
|
: globalSharps;
|
|
|
|
}
|
|
|
|
|
2007-05-24 08:52:14 +00:00
|
|
|
void VLLilypondWriter::VisitNote(VLLyricsNote & n)
|
|
|
|
{
|
2011-08-28 15:21:12 +00:00
|
|
|
int octave;
|
|
|
|
std::string nm = VLPitchName(n.fPitch, n.fVisual, &octave, kVLLilypondNames);
|
2007-05-24 08:52:14 +00:00
|
|
|
if (n.fPitch != VLNote::kNoPitch) {
|
2011-08-28 15:21:12 +00:00
|
|
|
for (int ticks = octave+1; ticks>0; --ticks)
|
2007-05-24 08:52:14 +00:00
|
|
|
nm += '\'';
|
2011-08-28 15:21:12 +00:00
|
|
|
for (int commas = -1-octave; commas>0; --commas)
|
2007-05-24 08:52:14 +00:00
|
|
|
nm += ',';
|
|
|
|
fInPickup = false;
|
2011-09-12 14:29:14 +00:00
|
|
|
} else if (fInPickup && n.fDuration.IsPowerOfTwo()) {
|
2007-05-24 08:52:14 +00:00
|
|
|
nm = "s";
|
|
|
|
}
|
|
|
|
const char * space = fAccum.size() ? " " : "";
|
2018-02-19 00:59:23 +00:00
|
|
|
const char * tie;
|
|
|
|
switch (n.fTied & (VLNote::kTiedWithNext|VLNote::kSlurWithNext|VLNote::kStartSlur|VLNote::kEndSlur)) {
|
|
|
|
case VLNote::kTiedWithNext|VLNote::kSlurWithNext|VLNote::kStartSlur:
|
|
|
|
tie = "(";
|
|
|
|
break;
|
|
|
|
case VLNote::kTiedWithNext|VLNote::kStartSlur:
|
|
|
|
tie = "~(";
|
|
|
|
break;
|
|
|
|
case VLNote::kTiedWithNext:
|
|
|
|
tie = "~";
|
|
|
|
break;
|
|
|
|
case VLNote::kEndSlur:
|
|
|
|
tie = ")";
|
|
|
|
break;
|
|
|
|
case VLNote::kTiedWithNext|VLNote::kSlurWithNext:
|
|
|
|
default:
|
|
|
|
tie = "";
|
|
|
|
break;
|
|
|
|
}
|
2007-05-24 08:52:14 +00:00
|
|
|
char duration[32];
|
2018-02-19 00:59:23 +00:00
|
|
|
if ((n.fTied & VLNote::kTiedWithPrev) && n.fVisual == fPrevNote.fVisual+1
|
2007-05-24 08:52:14 +00:00
|
|
|
&& n.fPitch == fPrevNote.fPitch
|
2018-02-19 00:59:23 +00:00
|
|
|
) {
|
2007-05-24 08:52:14 +00:00
|
|
|
strcpy(duration, ".");
|
2018-02-19 00:59:23 +00:00
|
|
|
} else if (n.fVisual & VLNote::kTupletMask) {
|
|
|
|
sprintf(duration, "%s\\times %d/%d { %s%d%s }",
|
|
|
|
space, VLNote::TupletDenom(n.fVisual), VLNote::TupletNum(n.fVisual),
|
2011-08-31 02:02:37 +00:00
|
|
|
nm.c_str(), kValue[n.fVisual & VLNote::kNoteHeadMask], tie);
|
2018-02-19 00:59:23 +00:00
|
|
|
} else {
|
|
|
|
sprintf(duration, "%s%s%d%s",
|
|
|
|
space, nm.c_str(), kValue[n.fVisual & VLNote::kNoteHeadMask], tie);
|
|
|
|
}
|
|
|
|
fAccum += duration;
|
|
|
|
fPrevNote = n;
|
2007-05-24 08:52:14 +00:00
|
|
|
|
2018-02-19 00:59:23 +00:00
|
|
|
if (n.fPitch != VLNote::kNoPitch && !(n.fTied & VLNote::kTiedWithPrev)) {
|
|
|
|
for (size_t i=0; i<fL.size(); ++i) {
|
2007-05-24 08:52:14 +00:00
|
|
|
if (n.fLyrics.size() <= i || !n.fLyrics[i]) {
|
|
|
|
fL[i] += " \\skip1";
|
|
|
|
} else {
|
2007-05-29 08:52:53 +00:00
|
|
|
fL[i] += ' ' + EscapeSyllable(n.fLyrics[i].fText);
|
2007-05-24 08:52:14 +00:00
|
|
|
if (n.fLyrics[i].fKind & VLSyllable::kHasNext)
|
|
|
|
fL[i] += " --";
|
|
|
|
}
|
2018-02-19 00:59:23 +00:00
|
|
|
}
|
|
|
|
}
|
2007-05-24 08:52:14 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static const char * kLilypondStepNames[] = {
|
|
|
|
"", "", "sus2", "", "", "sus", "5-", "", "5+", "6", "7", "7+", "",
|
|
|
|
"9-", "9", "9+", "", "11", "11+", "", "13-", "13"
|
|
|
|
};
|
|
|
|
|
|
|
|
void VLLilypondWriter::VisitChord(VLChord & c)
|
|
|
|
{
|
2011-08-28 15:21:12 +00:00
|
|
|
std::string name = VLPitchName(c.fPitch, c.fVisual, 0, kVLLilypondNames);
|
|
|
|
if (name == "r")
|
|
|
|
name = "s";
|
2007-05-24 08:52:14 +00:00
|
|
|
char duration[16];
|
2011-09-12 14:17:21 +00:00
|
|
|
if (c.fDuration.IsPowerOfTwo())
|
2007-05-24 08:52:14 +00:00
|
|
|
sprintf(duration, "%d", c.fDuration.fDenom);
|
|
|
|
else
|
|
|
|
sprintf(duration, "1*%d/%d", c.fDuration.fNum, c.fDuration.fDenom);
|
|
|
|
name += std::string(duration);
|
|
|
|
std::string ext;
|
|
|
|
uint32_t steps = c.fSteps;
|
|
|
|
if (c.fPitch == VLNote::kNoPitch)
|
|
|
|
goto done;
|
|
|
|
|
|
|
|
//
|
|
|
|
// m / dim
|
|
|
|
//
|
|
|
|
if (steps & VLChord::kmMin3rd)
|
|
|
|
if (steps & (VLChord::kmDim5th|VLChord::kmDim7th)
|
|
|
|
&& !(steps & (VLChord::km5th|VLChord::kmMin7th|VLChord::kmMaj7th|VLChord::kmMin9th|VLChord::kmMaj9th|VLChord::km11th|VLChord::kmAug11th|VLChord::kmMin13th|VLChord::kmMaj13th))
|
|
|
|
) {
|
|
|
|
ext = "dim";
|
|
|
|
steps|= (steps & VLChord::kmDim7th) << 1;
|
|
|
|
steps&= ~(VLChord::kmMin3rd|VLChord::kmDim5th|VLChord::kmDim7th);
|
|
|
|
} else {
|
|
|
|
ext = "m";
|
|
|
|
steps&= ~VLChord::kmMin3rd;
|
|
|
|
}
|
|
|
|
steps &= ~(VLChord::kmUnison | VLChord::km5th);
|
|
|
|
//
|
|
|
|
// Maj
|
|
|
|
//
|
|
|
|
if (steps & VLChord::kmMaj7th) {
|
2007-06-04 05:47:17 +00:00
|
|
|
bool hasMinor = ext.size();
|
|
|
|
ext += hasMinor ? "7+" : "maj";
|
2007-05-24 08:52:14 +00:00
|
|
|
if (steps & VLChord::kmMaj9th) {
|
2007-06-04 05:47:17 +00:00
|
|
|
ext += hasMinor ? ".9" : "9";
|
2007-05-24 08:52:14 +00:00
|
|
|
steps &= ~VLChord::kmMaj9th;
|
|
|
|
} else
|
2007-06-04 05:47:17 +00:00
|
|
|
ext += hasMinor ? "" : "7";
|
2007-05-24 08:52:14 +00:00
|
|
|
steps&= ~VLChord::kmMaj7th;
|
|
|
|
}
|
|
|
|
//
|
|
|
|
// Sus
|
|
|
|
//
|
|
|
|
if (steps & (VLChord::kmMaj2nd|VLChord::km4th)) {
|
|
|
|
if (ext.size())
|
|
|
|
ext += '.';
|
|
|
|
ext += "sus";
|
|
|
|
if (steps & VLChord::kmMaj2nd)
|
|
|
|
ext += "2";
|
|
|
|
else
|
|
|
|
ext += "4";
|
|
|
|
steps&= ~(VLChord::kmMaj2nd|VLChord::km4th);
|
|
|
|
}
|
|
|
|
//
|
|
|
|
// 6/9
|
|
|
|
//
|
|
|
|
if ((steps & (VLChord::kmDim7th|VLChord::kmMaj9th)) == (VLChord::kmDim7th|VLChord::kmMaj9th)) {
|
|
|
|
if (ext.size() && !isalpha(ext[ext.size()-1]))
|
|
|
|
ext += '.';
|
|
|
|
ext += "6.9";
|
|
|
|
steps&= ~(VLChord::kmDim7th|VLChord::kmMaj9th);
|
|
|
|
}
|
|
|
|
//
|
|
|
|
// Other extensions. Only the highest unaltered extension is listed.
|
|
|
|
//
|
|
|
|
if (uint32_t unaltered = steps & (VLChord::kmMin7th|VLChord::kmMaj9th|VLChord::km11th|VLChord::kmMaj13th)) {
|
|
|
|
steps &= ~unaltered;
|
|
|
|
|
|
|
|
for (int step = VLChord::kMaj13th; step > VLChord::kDim7th; --step)
|
|
|
|
if (unaltered & (1 << step)) {
|
|
|
|
std::string sn = kLilypondStepNames[step];
|
|
|
|
if (ext.size() && !isalpha(ext[ext.size()-1]) && sn.size())
|
|
|
|
ext += '.';
|
|
|
|
ext += sn;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
for (int step = VLChord::kMin2nd; steps; ++step)
|
|
|
|
if (steps & (1 << step)) {
|
|
|
|
std::string sn = kLilypondStepNames[step];
|
|
|
|
if (ext.size() && !isalpha(ext[ext.size()-1]) && sn.size())
|
|
|
|
ext += '.';
|
|
|
|
ext += sn;
|
|
|
|
steps &= ~(1 << step);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ext.size())
|
|
|
|
name += ':' + ext;
|
|
|
|
//
|
|
|
|
// Root
|
|
|
|
//
|
|
|
|
if (c.fRootPitch != VLNote::kNoPitch)
|
2011-08-28 15:21:12 +00:00
|
|
|
name += "/+" + VLPitchName(c.fRootPitch, c.fRootAccidental, 0, kVLLilypondNames);
|
2007-05-24 08:52:14 +00:00
|
|
|
|
|
|
|
done:
|
|
|
|
if (fAccum.size())
|
|
|
|
fAccum += ' ';
|
|
|
|
fAccum += name;
|
|
|
|
}
|