curioustorvald/tsvm
1
0
Fork 0
mirror of https://github.com/curioustorvald/tsvm.git synced 2026-03-07 19:51:51 +09:00
Code Issues Packages Projects Releases Wiki Activity

justification: text cursor is set correctly when the line is contracted

Browse Source
This commit is contained in:
minjaesong
2021-06-22 11:19:29 +09:00
parent cb4e1f94c8
commit 92e968f8ee
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
assets/bios/wp.js
View File

@@ -192,12 +192,22 @@ function getRealLength(text) {
}
function typesetJustified(lineStart, lineEnd) {
const pnTier = {'.':1, ',':2}
function wordobj(t,v) { return {type:t, value:v} }
function wordTypeOf(c, c1) {
if (c == " ") return "sp"
else if ((c1 == " " || c1 == "\n") && (NO_LINEHEAD_PUNCT.includes(c.charCodeAt(0)) || NO_LINELAST_PUNCT.includes(c.charCodeAt(0)))) return "pn"
else return "tx"
}
function shufflePNs(pns) {
let pnsWithSortID = pns.map(it => {
let rndnum = (Math.random() * 65536)|0
let tier = pnTier[it.value] || 16
return {key: (tier-1) * 65536 + rndnum, value: it}
})
pnsWithSortID.sort((it, other) => it.key - other.key)
return pnsWithSortID.map(it => it.value)
}
let printbuf = []
let lineIndices = []
@@ -292,10 +302,10 @@ function typesetJustified(lineStart, lineEnd) {
// contract puncts
if (pns.length > 0) {
pns.shuffle() // strats: '.'s first, ','s second, then others
shufflePNs(pns).reverse() // strats: '.'s last, ','s second-last, then others
for (let j = 0; j < Math.min(spcToFill, pns.length); j++) {
serial.println(`-pn #${j} (${pns[j]})`)
words[pns[j] + 1].value = ''; justLen -= 1
words[pns[j] + 1].value = ''; justLen -= 1; textCursor += 1
}
}
@@ -313,7 +323,7 @@ function typesetJustified(lineStart, lineEnd) {
if (expandAgain > 0 || !(lastWord.length >= 4 && pns.length >= 2)) {
// expand puncts
if (pns.length > 0) {
pns.shuffle() // strats: '.'s first, ','s second, then others
shufflePNs(pns) // strats: '.'s first, ','s second, then others
for (let j = 0; j < Math.min(spcToFill, pns.length); j++) {
serial.println(`pn #${j} (${pns[j]})`)
words[pns[j] + 1].value = SYM_TWOSPC; justLen += 1