jdb/pco_chords
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support additional text on the same lines as section headings.

Browse Source
This commit is contained in:
Jonathan Bernard 2023-07-19 13:23:59 -05:00
parent e832b91443
commit 9ca5a1b99c
2 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/pco_chordspkg/ast.nim
View File

@ -35,6 +35,7 @@ type
case kind: ChordChartNodeKind case kind: ChordChartNodeKind
of ccnkSection: of ccnkSection:
sectionName*: string sectionName*: string
remainingSectionLine*: Option[string]
sectionContents*: seq[ChordChartNode] sectionContents*: seq[ChordChartNode]
of ccnkLine: of ccnkLine:
line*: seq[ChordChartNode] line*: seq[ChordChartNode]
@ -267,12 +268,13 @@ proc parseMetadata(ctx: var ParserContext): ChordChartMetadata =
const KNOWN_SECTION_NAMES = [ const KNOWN_SECTION_NAMES = [
"chorus", "verse", "bridge", "breakdown", "vamp", "intstrumental", "chorus", "verse", "bridge", "breakdown", "vamp", "intstrumental",
"interlude", "intro", "outtro", "ending", "end", "tag" "interlude", "intro", "outtro", "ending", "end", "tag", "prechorus",
"pre-chorus", "pre chorus"
] ]
let SECTION_LINE_PAT = re( let SECTION_LINE_PAT = re(
"^((" & # case insensitive "^((" & "((?i)" & # case insensitive
"((?i)" & KNOWN_SECTION_NAMES.join("|") & ")" & # known names KNOWN_SECTION_NAMES.join("|") & ")" & # known names
"|[[:upper:]]{3,}" & # all upper-case words "|[[:upper:]]{3,}" & # all upper-case words
") ?\\d*)" & # numeric suffix (Verse 2) ") ?\\d*)" & # numeric suffix (Verse 2)
@ -422,12 +424,14 @@ proc parseBody(ctx: var ParserContext): seq[ChordChartNode] =
let captures = m.get.captures.toSeq let captures = m.get.captures.toSeq
ctx.curSection = ChordChartNode( ctx.curSection = ChordChartNode(
kind: ccnkSection, kind: ccnkSection,
sectionName: if captures[0].isSome: captures[0].get.strip sectionName:
else: raise ctx.makeError("unknown error parsing section header: " & line), if captures[0].isSome: captures[0].get.strip
else: raise ctx.makeError("unknown error parsing section header: " & line),
remainingSectionLine:
if captures[3].isSome: some(captures[3].get.strip)
else: none[string](),
sectionContents: @[]) sectionContents: @[])
result.add(ctx.curSection) result.add(ctx.curSection)
if captures[3].isSome:
ctx.curSection.sectionContents &= ctx.parseLineParts(captures[3].get)
continue continue
else: else:

15
src/pco_chordspkg/html.nim
View File

@ -40,6 +40,13 @@ h3 {
text-decoration: underline; text-decoration: underline;
} }
h3 .section-text {
font-style: italic;
font-size: 1em;
font-weight: normal;
margin: 0 0.5em;
}
.line { .line {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
@ -108,7 +115,13 @@ proc toHtml(ctx: var FormatContext, node: ChordChartNode, indent: string): strin
of ccnkSection: of ccnkSection:
ctx.currentSection = node ctx.currentSection = node
result &= indent & "<section>\p" & result &= indent & "<section>\p" &
indent & " " & "<h3>" & node.sectionName & "</h3>\p" indent & " " & "<h3>" & node.sectionName
if ctx.currentSection.remainingSectionLine.isSome:
result &= "<span class='section-text'>" &
ctx.currentSection.remainingSectionLine.get & "</span>"
result &= "</h3>\p"
var contents = newSeq[string]() var contents = newSeq[string]()
for contentNode in node.sectionContents: for contentNode in node.sectionContents: