happyz
/
llama.cpp
mirror of https://github.com/ggerganov/llama.cpp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SimpleChatTCRV:Markdown:Basic List (ordered/unordered) handling 

Rename from unordered to just list, given that the logic handles
both types of lists at a basic level now.
This commit is contained in:
hanishkvc 2025-11-26 14:54:03 +05:30
parent 226dc793b1
commit 1129ab5a6d
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
tools/server/public_simplechat/typemd.mjs
View File

@ -27,6 +27,9 @@ export class MarkDown {
offsets: [], offsets: [],
/** @type {Array<string>} */ /** @type {Array<string>} */
endType: [], endType: [],
},
/** @type {Object<string, string>} */
empty: {
} }
} }
/** /**
@ -37,7 +40,7 @@ export class MarkDown {
this.html = "" this.html = ""
} }
unwind_list_unordered() { unwind_list() {
while (true) { while (true) {
let popped = this.in.list.endType.pop() let popped = this.in.list.endType.pop()
if (popped == undefined) { if (popped == undefined) {
@ -48,29 +51,24 @@ export class MarkDown {
this.in.list.offsets.length = 0 this.in.list.offsets.length = 0
} }
unwind_list() {
this.unwind_list_unordered()
}
/** /**
* Process a unordered list one line at a time * Process list one line at a time
* @param {string} line * @param {string} line
*/ */
process_list_unordered(line) { process_list(line) {
// spaces followed by - or + or * followed by a space and actual list item // spaces followed by - or + or * followed by a space and actual list item
let matchUnOrdered = line.match(/^([ ]*)([-+*]|[a-zA-Z0-9]\.)[ ](.*)$/); let matchList = line.match(/^([ ]*)([-+*]|[a-zA-Z0-9]\.)[ ](.*)$/);
if (matchUnOrdered != null) { if (matchList != null) {
let listLvl = 0 let listLvl = 0
let curOffset = matchUnOrdered[1].length let curOffset = matchList[1].length
let lastOffset = this.in.list.offsets[this.in.list.offsets.length-1]; let lastOffset = this.in.list.offsets[this.in.list.offsets.length-1];
if (lastOffset == undefined) { if (lastOffset == undefined) {
lastOffset = -1 lastOffset = -1
} }
if (lastOffset < curOffset){ if (lastOffset < curOffset){
this.in.list.offsets.push(curOffset) this.in.list.offsets.push(curOffset)
listLvl = this.in.list.offsets.length listLvl = this.in.list.offsets.length
if (matchUnOrdered[2][matchUnOrdered[2].length-1] == '.') { if (matchList[2][matchList[2].length-1] == '.') {
this.html += "<ol>\n" this.html += "<ol>\n"
this.in.list.endType.push("</ol>\n") this.in.list.endType.push("</ol>\n")
} else { } else {
@ -87,7 +85,7 @@ export class MarkDown {
} }
} }
} }
this.html += `<li>${matchUnOrdered[3]}</li>\n` this.html += `<li>${matchList[3]}</li>\n`
return true return true
} else { } else {
if (this.in.list.offsets.length > 0) { if (this.in.list.offsets.length > 0) {
@ -209,7 +207,7 @@ export class MarkDown {
this.html += `<pre class="${matchPreFenced[2]}">\n` this.html += `<pre class="${matchPreFenced[2]}">\n`
return return
} }
if (this.process_list_unordered(line)) { if (this.process_list(line)) {
return return
} }
this.unwind_list() this.unwind_list()