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

working linehead indexing with the new justification

Browse Source
This commit is contained in:
minjaesong
2021-06-23 09:54:33 +09:00
parent 2287683f8d
commit ae8db313dd
1 changed files with 36 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
assets/bios/wp.js
View File

@@ -32,7 +32,7 @@ function typesetSymToVisual(code) {
const TYPESET_STRATEGY_DONOTHING = 0 // not implemented yet! const TYPESET_STRATEGY_DONOTHING = 0 // not implemented yet!
const TYPESET_STRATEGY_RAGGEDRIGHT = 1 // not implemented yet! const TYPESET_STRATEGY_RAGGEDRIGHT = 1 // not implemented yet!
const TYPESET_STRATEGY_LESSRAGGED = 2 const TYPESET_STRATEGY_LESSRAGGED = 2
const TYPESET_STRATEGY_JUSTIFIED = 3 // not implemented yet! const TYPESET_STRATEGY_JUSTIFIED = 3
const typesetStrats = [undefined, undefined, typesetLessRagged, typesetJustified] const typesetStrats = [undefined, undefined, typesetLessRagged, typesetJustified]
let PAGE_HEIGHT = 60 let PAGE_HEIGHT = 60
@@ -222,7 +222,7 @@ function typesetJustified(lineStart, lineEnd) {
pnsWithSortID.sort((it, other) => it.key - other.key) pnsWithSortID.sort((it, other) => it.key - other.key)
return pnsWithSortID.map(it => it.value) return pnsWithSortID.map(it => it.value)
} }
function printdbg(msg) { serial.println(`L${lc}\t${msg}`) } function printdbg(msg) { serial.println(`L${lc+1}\t${msg}`) }
let printbuf = [] let printbuf = []
let lineIndices = [] let lineIndices = []
@@ -232,7 +232,7 @@ function typesetJustified(lineStart, lineEnd) {
: paragraphs.join('\n') : paragraphs.join('\n')
let textCursor = 0 let textCursor = 0
let lc = 1 let lc = 0
let isParHead = true let isParHead = true
while (true) { while (true) {
@@ -282,18 +282,26 @@ function typesetJustified(lineStart, lineEnd) {
function tryJustify(recDepth, adjust, fuckit) { function tryJustify(recDepth, adjust, fuckit) {
let isLineEnd = (words.last().type == "ct_lf") let isLineEnd = (words.last().type == "ct_lf")
// trim spaces at the end of the line // trim spaces at the end of the line
while ("sp" == words.last().type) { if ("sp" == words.last().type) {
words.pop() while ("sp" == words.last().type) {
words.pop()
}
return tryJustify(recDepth, adjust)
} }
// trim spaces at the head of the line // trim spaces at the head of the line
// "pull" the words when removing preceding spaces // "pull" the words when removing preceding spaces
let pullLen = 0 else if (!isParHead && "sp" == words.head().type) {
while (!isParHead && "sp" == words.head().type) { let pullLen = 0
pullLen += getWordLen(words.shift()) while (!isParHead && "sp" == words.head().type) {
} pullLen += getWordLen(words.shift())
}
printdbg(`Pulled ${pullLen} characters`) printdbg(`Pulled ${pullLen} characters`)
adjust += pullLen adjust += pullLen
return tryJustify(recDepth, adjust)
}
let spcAfterPunct = [] // indices in the WORDS let spcAfterPunct = [] // indices in the WORDS
@@ -405,7 +413,23 @@ function typesetJustified(lineStart, lineEnd) {
words.forEach((o,i) => printdbg(`${i}\t${o.type}\t${o.value}`)) words.forEach((o,i) => printdbg(`${i}\t${o.type}\t${o.value}`))
textCursor += tryJustify(0,0) let justed = tryJustify(0,0)
textCursor += justed
let lastLineInd = (lineIndices.last() || 0) - 1
if (lc > 0) {
let lineHeadChar = printbuf.last().charCodeAt(0)
// add the number of nonprintables to the lastLineInd;
// lastLineInd currently points to the column where the current line ends, which is not something we want
while (text.charCodeAt(lastLineInd) != lineHeadChar) {
if (lastLineInd > text.length) break
lastLineInd += 1
}
lineIndices[lineIndices.length - 1] = lastLineInd
}
// push a "wrong" value so that it can be fixed up later
lineIndices.push(lastLineInd + justed)
isParHead = false isParHead = false