diff options
Diffstat (limited to 'src/document/io/LilyPondExporter.cpp')
| -rw-r--r-- | src/document/io/LilyPondExporter.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/document/io/LilyPondExporter.cpp b/src/document/io/LilyPondExporter.cpp index 0ffccff..06e7c15 100644 --- a/src/document/io/LilyPondExporter.cpp +++ b/src/document/io/LilyPondExporter.cpp @@ -137,7 +137,7 @@ LilyPondExporter::readConfigVariables(void) m_exportBeams = cfg->readBoolEntry("lilyexportbeamings", false); m_exportStaffMerge = cfg->readBoolEntry("lilyexportstaffmerge", false); m_exportStaffGroup = cfg->readBoolEntry("lilyexportstaffbrackets", true); - m_lyricsHAlignment = cfg->readBoolEntry("lilylyricshtqalignment", LEFT_ALIGN); + m_lyricsHAlignment = cfg->readBoolEntry("lilylyricshalignment", LEFT_ALIGN); m_languageLevel = cfg->readUnsignedNumEntry("lilylanguage", LILYPOND_VERSION_2_6); m_exportMarkerMode = cfg->readUnsignedNumEntry("lilyexportmarkermode", EXPORT_NO_MARKERS ); @@ -402,7 +402,7 @@ LilyPondExporter::write() CurrentProgressDialog::freeze(); int reply = KMessageBox::warningContinueCancel( 0, i18n("LilyPond does not allow spaces or backslashes in filenames.\n\n" - "Would you like to use\n\n %1\n\n instead?").tqarg(baseName)); + "Would you like to use\n\n %1\n\n instead?").arg(baseName)); if (reply != KMessageBox::Continue) return false; } @@ -1202,13 +1202,13 @@ LilyPondExporter::write() str << indent(col) << "\\lyricsto \"" << voiceNumber.str() << "\"" << " \\new Lyrics \\lyricmode {" << std::endl; if (m_lyricsHAlignment == RIGHT_ALIGN) { - str << indent(++col) << "\\override LyricText #'self-tqalignment-X = #RIGHT" + str << indent(++col) << "\\override LyricText #'self-alignment-X = #RIGHT" << std::endl; } else if (m_lyricsHAlignment == CENTER_ALIGN) { - str << indent(++col) << "\\override LyricText #'self-tqalignment-X = #CENTER" + str << indent(++col) << "\\override LyricText #'self-alignment-X = #CENTER" << std::endl; } else { - str << indent(++col) << "\\override LyricText #'self-tqalignment-X = #LEFT" + str << indent(++col) << "\\override LyricText #'self-alignment-X = #LEFT" << std::endl; } str << indent(col) << "\\set ignoreMelismata = ##t" << std::endl; @@ -1430,7 +1430,7 @@ LilyPondExporter::writeBar(Segment *s, writtenDuration += note.getDuration(); durationRatio = writeSkip(timeSignature, 0, note.getDuration(), true, str); durationRatioSum = fractionSum(durationRatioSum,durationRatio); - // str << qstrtostr(TQString(" %{ %1/%2 %} ").tqarg(durationRatio.first).tqarg(durationRatio.second)); // DEBUG + // str << qstrtostr(TQString(" %{ %1/%2 %} ").arg(durationRatio.first).arg(durationRatio.second)); // DEBUG } timeT prevDuration = -1; @@ -1496,7 +1496,7 @@ LilyPondExporter::writeBar(Segment *s, groupId = -1; groupType = ""; } else { - startGroupBeamingsStr += TQString("\\times %1/%2 { ").tqarg(numerator).tqarg(denominator); + startGroupBeamingsStr += TQString("\\times %1/%2 { ").arg(numerator).arg(denominator); tupletRatio = std::pair<int, int>(numerator, denominator); // Require explicit beamed groups, // fixes bug #1683205. @@ -1688,7 +1688,7 @@ LilyPondExporter::writeBar(Segment *s, writtenDuration += soundingDuration; std::pair<int,int> ratio = fractionProduct(durationRatio,tupletRatio); durationRatioSum = fractionSum(durationRatioSum, ratio); - // str << qstrtostr(TQString(" %{ %1/%2 * %3/%4 = %5/%6 %} ").tqarg(durationRatio.first).tqarg(durationRatio.second).tqarg(tupletRatio.first).tqarg(tupletRatio.second).tqarg(ratio.first).tqarg(ratio.second)); // DEBUG + // str << qstrtostr(TQString(" %{ %1/%2 * %3/%4 = %5/%6 %} ").arg(durationRatio.first).arg(durationRatio.second).arg(tupletRatio.first).arg(tupletRatio.second).arg(ratio.first).arg(ratio.second)); // DEBUG std::vector<Mark> marks(chord.getMarksForChord()); // problem here: stem direction unavailable (it's a view-local property) @@ -1869,7 +1869,7 @@ LilyPondExporter::writeBar(Segment *s, writtenDuration += soundingDuration; std::pair<int,int> ratio = fractionProduct(durationRatio,tupletRatio); durationRatioSum = fractionSum(durationRatioSum, ratio); - // str << qstrtostr(TQString(" %{ %1/%2 * %3/%4 = %5/%6 %} ").tqarg(durationRatio.first).tqarg(durationRatio.second).tqarg(tupletRatio.first).tqarg(tupletRatio.second).tqarg(ratio.first).tqarg(ratio.second)); // DEBUG + // str << qstrtostr(TQString(" %{ %1/%2 * %3/%4 = %5/%6 %} ").arg(durationRatio.first).arg(durationRatio.second).arg(tupletRatio.first).arg(tupletRatio.second).arg(ratio.first).arg(ratio.second)); // DEBUG } else if ((*i)->isa(Clef::EventType)) { try { |