Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Songinfo/lyrics: Improve generation of paragraphs

Browse Source 
(generate new paragraph for two or more newlines, generate line break for single newlines)
This commit is contained in:
Eduard Braun 2015-10-10 22:04:37 +02:00
parent 3aac164f1e
commit b25101c1be
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/songinfo/songinfotextview.cpp
View File

@ -79,9 +79,12 @@ void SongInfoTextView::contextMenuEvent(QContextMenuEvent* e) {
void SongInfoTextView::SetHtml(const QString& html) { void SongInfoTextView::SetHtml(const QString& html) {
QString copy(html.trimmed()); QString copy(html.trimmed());
// Simplify newlines, and convert them to <p> // Simplify newlines
copy.replace(QRegExp("[\\r\\n]+"), "\n"); copy.replace(QRegExp("\\r\\n?"), "\n");
copy.replace(QRegExp("([^>])[\\t ]*\\n"), "\\1<p>");
// Convert two or more newlines to <p>, convert single newlines to <br>
copy.replace(QRegExp("([^>])([\\t ]*\\n){2,}"), "\\1<p>");
copy.replace(QRegExp("([^>])[\\t ]*\\n"), "\\1<br>");
// Strip any newlines from the end // Strip any newlines from the end
copy.replace(QRegExp("((<\\s*br\\s*/?\\s*>)|(<\\s*/?\\s*p\\s*/?\\s*>))+$"), copy.replace(QRegExp("((<\\s*br\\s*/?\\s*>)|(<\\s*/?\\s*p\\s*/?\\s*>))+$"),

9
src/songinfo/ultimatelyricslyric.cpp
View File

@ -25,9 +25,12 @@ UltimateLyricsLyric::UltimateLyricsLyric(QObject* parent)
void UltimateLyricsLyric::SetHtml(const QString& html) { void UltimateLyricsLyric::SetHtml(const QString& html) {
QString copy(html.trimmed()); QString copy(html.trimmed());
// Simplify newlines, and convert them to <p> // Simplify newlines
copy.replace(QRegExp("[\\r\\n]+"), "\n"); copy.replace(QRegExp("\\r\\n?"), "\n");
copy.replace(QRegExp("([^>])[\\t ]*\\n"), "\\1<p>");
// Convert two or more newlines to <p>, convert single newlines to <br>
copy.replace(QRegExp("([^>])([\\t ]*\\n){2,}"), "\\1<p>");
copy.replace(QRegExp("([^>])[\\t ]*\\n"), "\\1<br>");
// Strip any newlines from the end // Strip any newlines from the end
copy.replace(QRegExp("((<\\s*br\\s*/?\\s*>)|(<\\s*/?\\s*p\\s*/?\\s*>))+$"), copy.replace(QRegExp("((<\\s*br\\s*/?\\s*>)|(<\\s*/?\\s*p\\s*/?\\s*>))+$"),