diff --git a/src/app/modules/songs/services/text-rendering.service.ts b/src/app/modules/songs/services/text-rendering.service.ts index 648013d..dcf1bc4 100644 --- a/src/app/modules/songs/services/text-rendering.service.ts +++ b/src/app/modules/songs/services/text-rendering.service.ts @@ -68,7 +68,9 @@ export class TextRenderingService { const type = hasMatches ? LineType.chord : LineType.text; const line = {type, text, chords: hasMatches ? cords : undefined}; - return transpose ? this.transposeService.transpose(line, transpose.baseKey, transpose.targetKey) : line; + return transpose + ? this.transposeService.transpose(line, transpose.baseKey, transpose.targetKey) + : this.transposeService.renderChords(line); } private getSectionTypeOfLine(line: string): SectionType { @@ -107,7 +109,7 @@ export class TextRenderingService { const chordCount = chords.reduce((acc: number, cur: Chord) => acc + cur.length, 0); const lineCount = chordLine.replace(/\s/g, "").length; - const isChrod = chordCount * 2 > lineCount; + const isChrod = chordCount * 1.2 > lineCount; return isChrod ? chords : []; } diff --git a/src/app/modules/songs/services/transpose.service.ts b/src/app/modules/songs/services/transpose.service.ts index 65a7020..b84e9f3 100644 --- a/src/app/modules/songs/services/transpose.service.ts +++ b/src/app/modules/songs/services/transpose.service.ts @@ -23,6 +23,13 @@ export class TransposeService { return {...line, text: renderedLine, chords}; } + public renderChords(line: Line): Line { + if (line.type !== LineType.chord) return line; + + const renderedLine = this.renderLine(line.chords); + return {...line, text: renderedLine}; + } + public getDistance(baseKey: string, targetKey: string): number { const scale = getScaleType(baseKey); return ( diff --git a/src/app/modules/songs/song/edit/edit-song/edit-song.component.html b/src/app/modules/songs/song/edit/edit-song/edit-song.component.html index 6331758..1b3b75c 100644 --- a/src/app/modules/songs/song/edit/edit-song/edit-song.component.html +++ b/src/app/modules/songs/song/edit/edit-song/edit-song.component.html @@ -37,6 +37,8 @@ formControlName="text" matInput>
+

Vorschau

+

Hinweise zur Bearbeitung

Aufbau

Der Liedtext wird hintereinander weg geschrieben. Dabei werden Strophen, Refrain und Bridge jeweils durch @@ -58,7 +60,7 @@
         Dur: C  D  E
         Moll: c  d  e
-        Kreuz/B-Tonarten: C#  f#  Eb  (Erlaubt ist auch B statt Hb)
+        Kreuz/B-Tonarten: C#  f#  Eb  (Hb muss als B angegeben werden)
         Basstöne: C/E  D/C
         Obertöne: c7  E9  f#maj7
       
diff --git a/src/app/modules/songs/song/edit/edit.module.ts b/src/app/modules/songs/song/edit/edit.module.ts index 6a09387..b31c89a 100644 --- a/src/app/modules/songs/song/edit/edit.module.ts +++ b/src/app/modules/songs/song/edit/edit.module.ts @@ -25,6 +25,7 @@ import {MatTooltipModule} from '@angular/material/tooltip'; import {SaveDialogComponent} from './edit-song/save-dialog/save-dialog.component'; import {MatDialogModule} from '@angular/material/dialog'; import {HistoryComponent} from './history/history.component'; +import {SongTextModule} from '../../../../widget-modules/components/song-text/song-text.module'; @NgModule({ @@ -54,6 +55,7 @@ import {HistoryComponent} from './history/history.component'; ButtonModule, MatTooltipModule, MatDialogModule, + SongTextModule, ] })