Skip to content

Commit

Permalink
Merge pull request #258 from AlphaHasher/SafeMerge
Browse files Browse the repository at this point in the history
Remove last <br/> tag, add toggle command for Bible Icon Prefix setting
  • Loading branch information
tim-hub authored Jan 19, 2025
2 parents c602931 + 4ba105f commit 0e144a1
Showing 1 changed file with 10 additions and 8 deletions.
18 changes: 10 additions & 8 deletions src/verse/BaseVerseFormatter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,17 +53,19 @@ export abstract class BaseVerseFormatter {
} else {
text = ''
}
this.verses.forEach((verse) => {
this.verses.forEach((verse, index) => {
let singleVerseText = verse.text.trim()
if (
index === this.verses!.length - 1 &&
singleVerseText.endsWith('<br/>') // Remove the last <br/> tag that appears in LSB verses.
) {
singleVerseText = singleVerseText.slice(0, -5)
}
const verseNumberFormatted = this.formatVerseNumber(verse.verse)
if (this.settings?.verseFormatting === BibleVerseFormat.Paragraph) {
text +=
' ' + verseNumberFormatted + verse.text.trim().replaceAll('\n', ' ')
text += ' ' + verseNumberFormatted + singleVerseText.replaceAll('\n', ' ')
} else {
text +=
'> ' +
verseNumberFormatted +
verse.text.trim().replace(/\r\n|\n|\r/g, ' ') +
'\n' // Remove extraneous line breaks in KJV verses.
text += '> ' + verseNumberFormatted + singleVerseText.replace(/\r\n|\n|\r/g, ' ') + '\n' // Remove extraneous line breaks in KJV verses.
}
})
console.debug('text', text)
Expand Down

0 comments on commit 0e144a1

Please sign in to comment.