rename textLine to lyricLine

src/parser/lineTypes.js

@@ -6,7 +6,7 @@ export default {
 	CHORD: 'chord',
 	CHORD_LINE_REPEATER: 'chordLineRepeater',
 	EMPTY_LINE: 'emptyLine',
+	LYRIC: 'lyric',
 	SECTION_LABEL: 'sectionLabel',
-	TEXT: 'text',
 	TIME_SIGNATURE: 'timeSignature',
 };

src/parser/songLinesFactory.js

@@ -21,7 +21,7 @@ const defaultTimeSignature = '4/4';
  * @typedef {Object} SongLine
  * @type {Object}
  * @property {String} string - original line in source file
- * @property {String} type - chord|text|timeSignature|sectionLabel...
+ * @property {String} type - chord|lyric|timeSignature|sectionLabel...
  * @property {Boolean} [isFromSectionRepeat] - line created by a section repeat directive (x3...)
  * @property {Boolean} [isFromAutoRepeatChords] - line created by auto repeats of chords from a section to another
  */
@@ -40,8 +40,9 @@ const defaultTimeSignature = '4/4';
  */
 
 /**
- * @typedef {SongLine} SongTextLine
+ * @typedef {SongLine} SongLyricLine
  * @type {Object}
+ * @property {LyricLine} model
  */
 
 /**
@@ -116,7 +117,7 @@ export default function songLinesFactory() {
 	}
 
 	/**
-	 * @returns {SongTextLine}
+	 * @returns {SongLyricLine}
 	 */
 	function getEmptyLine(string) {
 		return {
@@ -126,7 +127,7 @@ export default function songLinesFactory() {
 	}
 
 	/**
-	 * @returns {SongChordLine|SongTextLine}
+	 * @returns {SongChordLine|SongLyricLine}
 	 */
 	function getChordLine(string) {
 		let line;
@@ -141,13 +142,13 @@ export default function songLinesFactory() {
 			};
 			previousChordLine = line;
 		} catch (e) {
-			line = getTextLine(string);
+			line = getLyricLine(string);
 		}
 		return line;
 	}
 
 	/**
-	 * @returns {SongChordLine|SongTextLine}
+	 * @returns {SongChordLine|SongLyricLine}
 	 */
 	function getPreviousChordLine(string) {
 		if (previousChordLine) {
@@ -156,16 +157,16 @@ export default function songLinesFactory() {
 				isFromChordLineRepeater: true,
 			};
 		}
-		return getTextLine(string);
+		return getLyricLine(string);
 	}
 
 	/**
-	 * @returns {SongTextLine}
+	 * @returns {SongLyricLine}
 	 */
-	function getTextLine(string) {
+	function getLyricLine(string) {
 		return {
 			string,
-			type: lineTypes.TEXT,
+			type: lineTypes.LYRIC,
 			model: parseLyricLine(string),
 		};
 	}
@@ -257,7 +258,7 @@ export default function songLinesFactory() {
 			} else if (isEmptyLine(lineSrc)) {
 				line = getEmptyLine(lineSrc);
 			} else {
-				line = getTextLine(lineSrc);
+				line = getLyricLine(lineSrc);
 			}
 
 			repeatLinesFromBlueprint(line);
@@ -287,7 +288,7 @@ function isFirstOfLabel(currentLabel, allLines) {
 function shouldRepeatLineFromBlueprint(blueprintLine, currentLine) {
 	return (
 		blueprintLine &&
-		blueprintLine.type !== lineTypes.TEXT &&
+		blueprintLine.type !== lineTypes.LYRIC &&
 		blueprintLine.type !== lineTypes.EMPTY_LINE &&
 		blueprintLine.type !== currentLine.type &&
 		currentLine.type !== lineTypes.EMPTY_LINE

src/renderer/components/renderLyricLine.js

@@ -0,0 +1,9 @@
+import lyricLineTpl from './tpl/lyricLine.hbs';
+
+/**
+ * @param {SongLyricLine} lyricLine
+ * @returns {String} rendered html
+ */
+export default function render(lyricLine) {
+	return lyricLineTpl({ lyricLine: lyricLine.model.lyrics });
+}

src/renderer/components/renderSong.js

@@ -6,11 +6,11 @@ import chordLyricsSpacer from '../spacers/chord/chordLyrics';
 
 import { forEachChordInSong } from '../../parser/helper/songs';
 
-import renderChordLine from './renderChordLine'; //fixme should be renderChordLineModel
+import renderChordLineModel from './renderChordLine';
 import renderEmptyLine from './renderEmptyLine';
 import renderLine from './renderLine';
 import renderSectionLabel from './renderSectionLabel';
-import renderTextLine from './renderTextLine';
+import renderLyricLine from './renderLyricLine';
 import renderTimeSignature from './renderTimeSignature';
 
 import songTpl from './tpl/song.hbs';
@@ -79,17 +79,12 @@ export default function renderSong(
 			let rendered;
 
 			if (line.type === lineTypes.CHORD) {
-				// todo: move this in renderChordLine?
 				let spaced = alignBars
 					? alignedChordSpacer(line.model, maxBeatsWidth)
 					: simpleChordSpacer(line.model);
 
 				const nextLine = allFilteredLines[lineIndex + 1];
-				if (
-					alignChordsWithLyrics &&
-					nextLine &&
-					nextLine.type === lineTypes.TEXT
-				) {
+				if (shouldAlignChords(alignChordsWithLyrics, nextLine)) {
 					const { chordLine, lyricsLine } = chordLyricsSpacer(
 						spaced,
 						nextLine.model
@@ -98,7 +93,7 @@ export default function renderSong(
 					spaced = chordLine;
 				}
 
-				rendered = renderChordLine(spaced);
+				rendered = renderChordLineModel(spaced);
 			} else if (line.type === lineTypes.EMPTY_LINE) {
 				rendered = renderEmptyLine();
 			} else if (line.type === lineTypes.SECTION_LABEL) {
@@ -109,7 +104,7 @@ export default function renderSong(
 			} else if (line.type === lineTypes.TIME_SIGNATURE) {
 				rendered = renderTimeSignature(line);
 			} else {
-				rendered = renderTextLine(line);
+				rendered = renderLyricLine(line);
 			}
 			return renderLine(rendered, {
 				isFromSectionRepeat: line.isFromSectionRepeat,
@@ -133,3 +128,9 @@ export default function renderSong(
 
 	return songTpl({ song });
 }
+
+function shouldAlignChords(alignChordsWithLyrics, nextLine) {
+	return (
+		alignChordsWithLyrics && nextLine && nextLine.type === lineTypes.LYRIC
+	);
+}

src/renderer/components/tpl/lyricLine.hbs

@@ -0,0 +1 @@
+<span class="cmLyricLine">{{{ this.lyricLine }}}</span>

tests/integration/parser/parseSong.spec.js

@@ -41,7 +41,7 @@ Let it be`;
 					model: parseChordLine('C.. G..'),
 				},
 				{
-					type: 'text',
+					type: 'lyric',
 					string: 'When I find myself in times of trouble',
 					model: parseLyricLine(
 						'When I find myself in times of trouble'
@@ -53,7 +53,7 @@ Let it be`;
 					model: parseChordLine('Am.. F..'),
 				},
 				{
-					type: 'text',
+					type: 'lyric',
 					string: 'Mother mary comes to me',
 					model: parseLyricLine('Mother mary comes to me'),
 				},
@@ -63,7 +63,7 @@ Let it be`;
 					model: parseChordLine('C.. G..'),
 				},
 				{
-					type: 'text',
+					type: 'lyric',
 					string: 'Speaking words of wisdom',
 					model: parseLyricLine('Speaking words of wisdom'),
 				},
@@ -73,7 +73,7 @@ Let it be`;
 					model: parseChordLine('F. Em. Dm. C.'),
 				},
 				{
-					type: 'text',
+					type: 'lyric',
 					string: 'Let it be',
 					model: parseLyricLine('Let it be'),
 				},
@@ -84,7 +84,7 @@ Let it be`;
 					model: parseChordLine('Am.. G..'),
 				},
 				{
-					type: 'text',
+					type: 'lyric',
 					string: 'Let it be, let it be',
 					model: parseLyricLine('Let it be, let it be'),
 				},
@@ -94,7 +94,7 @@ Let it be`;
 					model: parseChordLine('C.. F..'),
 				},
 				{
-					type: 'text',
+					type: 'lyric',
 					string: 'Let it be, let it be',
 					model: parseLyricLine('Let it be, let it be'),
 				},
@@ -104,7 +104,7 @@ Let it be`;
 					model: parseChordLine('C.. G..'),
 				},
 				{
-					type: 'text',
+					type: 'lyric',
 					string: 'Whispers words of wisdom',
 					model: parseLyricLine('Whispers words of wisdom'),
 				},
@@ -114,7 +114,7 @@ Let it be`;
 					model: parseChordLine('F. Em. Dm. C.'),
 				},
 				{
-					type: 'text',
+					type: 'lyric',
 					string: 'Let it be',
 					model: parseLyricLine('Let it be'),
 				},
@@ -147,7 +147,7 @@ Let it be`;
 					model: parseChordLine('C.. G..'),
 				},
 				{
-					type: 'text',
+					type: 'lyric',
 					string: 'When I find myself in times of trouble',
 					model: parseLyricLine(
 						'When I find myself in times of trouble'
@@ -159,7 +159,7 @@ Let it be`;
 					model: parseChordLine('Am.. F..'),
 				},
 				{
-					type: 'text',
+					type: 'lyric',
 					string: 'Mother mary comes to me',
 					model: parseLyricLine('Mother mary comes to me'),
 				},