From f87c63f02e856527fc170c5373a5496b09f6024c Mon Sep 17 00:00:00 2001
From: minjaesong <alswo9628@gmail.com>
Date: Sat, 19 Jun 2021 15:48:59 +0900
Subject: [PATCH] wp: text justification wip

---
 assets/JS_INIT.js |  19 ++++++
 assets/bios/wp.js | 166 ++++++++++++++++++++++++++++++++++++++++++----
 assets/wpfont.kra |   4 +-
 assets/wpfont.png | Bin 5901 -> 5941 bytes
 4 files changed, 173 insertions(+), 16 deletions(-)

diff --git a/assets/JS_INIT.js b/assets/JS_INIT.js
index 40212cc..5bfac7b 100644
--- a/assets/JS_INIT.js
+++ b/assets/JS_INIT.js
@@ -334,6 +334,25 @@ Array.prototype.tail = function() {
 Array.prototype.init = function() {
     return this.slice(0, this.length - 1)
 }
+Array.prototype.shuffle = function() {
+    let counter = this.length;
+
+    // While there are elements in the array
+    while (counter > 0) {
+        // Pick a random index
+        let index = Math.floor(Math.random() * counter);
+
+        // Decrease counter by 1
+        counter--;
+
+        // And swap the last element with it
+        let temp = this[counter];
+        this[counter] = this[index];
+        this[index] = temp;
+    }
+
+    return this;
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 //  NOTE TO PROGRAMMERS: this JS_INIT script does not, and must not be invoked with strict mode  //
diff --git a/assets/bios/wp.js b/assets/bios/wp.js
index 1518759..48c2ed5 100644
--- a/assets/bios/wp.js
+++ b/assets/bios/wp.js
@@ -15,12 +15,17 @@ const NO_LINELAST_PUNCT = [34,39,40,60,91,123]
 
 const TYPESET_DEBUG_PRINT = true
 
-// bits:
-// 0: set to justify; unset to ragged
-// 1: set to hyphenate
-const TYPESET_STRATEGY_RAGGEDRIGHT = 1024 + 0b00000000 // not implemented yet!
-const TYPESET_STRATEGY_LESSRAGGED = 1024 + 0b00000010
-const TYPESET_STRATEGY_JUSTIFIED = 1024 + 0b00000011 // not implemented yet!
+const SYM_SPC = String.fromCharCode(250)
+const SYM_TWOSPC = String.fromCharCode(251,252)
+const SYM_FF = String.fromCharCode(253)
+const SYM_LF = String.fromCharCode(254)
+
+
+const TYPESET_STRATEGY_DONOTHING = 0 // not implemented yet!
+const TYPESET_STRATEGY_RAGGEDRIGHT = 1 // not implemented yet!
+const TYPESET_STRATEGY_LESSRAGGED = 2
+const TYPESET_STRATEGY_JUSTIFIED = 3 // not implemented yet!
+const typesetStrats = [undefined, undefined, typesetLessRagged, typesetJustified]
 
 let PAGE_HEIGHT = 60
 let PAGE_WIDTH = 80
@@ -38,7 +43,7 @@ let paragraphs = [
 'Contrary to popular belief, Lorem Ipsum is not simply random text.  It has roots in a piece of classical Latin literature from  45 BC,  making it over 2000 years old. Richard McClintock, a Latin professor at Hampden-Sydney College in Virginia, looked up one of the more obscure Latin words,  consectetur,  from a Lorem Ipsum passage, and going through the cites of the word in classical literature, discovered the undoubtable source.  Lorem Ipsum comes from sections 1.10.32 and 1.10.33 of "de Finibus Bonorum et Malorum" (The Extremes of Good and Evil) by Cicero, written in 45 BC.  This book is a treatise on the theory of ethics, very popular during the Renaissance.The first line of Lorem Ipsum,"Lorem ipsum dolor sit amet..", comes from a line in section 1.10.32.',
 'The standard chunk of Lorem Ipsum used since the 1500s is reproduced below for those interested. Sections 1.10.32 and 1.10.33 from "de Finibus Bonorum et Malorum" by Cicero are also reproduced in their exact original form, accompanied by English versions from the 1914 translation by H. Rackham.'
 ]*/
-let typeset = {lineIndices: [], lineValidated: [], strategy: TYPESET_STRATEGY_LESSRAGGED} // index 0 == 2nd line
+let typeset = {lineIndices: [], lineValidated: [], strategy: TYPESET_STRATEGY_JUSTIFIED} // index 0 == 2nd line
 let cursorRow = 0
 let cursorCol = 0
 let page = 0
@@ -134,7 +139,7 @@ function typesetLessRagged(lineStart, lineEnd) {
         //serial.println(`i:${i} char:'${String.fromCharCode(cM2,cM1,32,c,32,c1,c2)}' Ln ${vr} Col ${vc}`)
 
         if (c == 10) {
-            printbuf[vr] += String.fromCharCode(254)
+            printbuf[vr] += SYM_LF
             ln(i+1)
             printbuf[vr] = ''
         }
@@ -176,7 +181,143 @@ function typesetLessRagged(lineStart, lineEnd) {
             vc += 1
         }
 
-        if (vr > paintHeight || c === undefined) break;
+        if (vr > paintHeight || c === undefined) break
+    }
+
+    return [printbuf, lineIndices]
+}
+
+function typesetJustified(lineStart, lineEnd) {
+    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"
+    }
+
+    let printbuf = []
+    let lineIndices = []
+
+    let text = (typeset.lineIndices[lineStart] !== undefined)
+        ? paragraphs.join('\n').slice(typeset.lineIndices[lineStart], typeset.lineIndices[lineEnd] || 9999999)
+        : paragraphs.join('\n')
+
+    let textCursor = 0
+    while (true) {
+
+        let status = wordTypeOf(text.charAt(textCursor), text.charAt(textCursor+1)) // state of the state machine
+        let words = [wordobj(status, "")] // {type: "tx/sp/pn", value: ""}
+        let linelen = 0
+
+        while (linelen <= paintWidth || status == "tx") {
+
+            let c = text.charAt(textCursor + linelen)
+            let c1 = text.charAt(textCursor + linelen + 1)
+
+            let newStatus = wordTypeOf(c, c1)
+
+            if (status != newStatus) {
+                status = newStatus
+                words.push(wordobj(status, ""))
+            }
+
+            if ("tx" == status) {
+                words.last().value += c; linelen += 1
+            }
+            else if ("sp" == status) {
+                words.last().value += SYM_SPC; linelen += 1
+            }
+            else if ("pn" == status) {
+                words.last().value += c; linelen += 1
+            }
+        }
+
+
+        let justLen = words.map(o => o.value).join('').length
+
+
+        words.forEach(o => serial.println(`${o.type}\t${o.value}`))
+        serial.println(`linelength: ${justLen}`)
+
+
+        // try simple join
+        if (justLen == paintWidth || justLen == paintWidth + 1 && "sp" == words.last().type) {
+            serial.println("cond 1")
+            printbuf.push(words.map(o => o.value).join(''))
+            lineIndices.push(textCursor)
+        }
+        // try fitting a line by removing a word then adding spaces
+        else if (justLen > paintWidth) {
+            serial.println("cond 2")
+            // nuke non-text words
+            while ("tx" != words.last().type) {
+                justLen -= words.pop().value.length
+            }
+            // also nuke the last word
+            let lastWord = words.pop().value
+            justLen -= lastWord.length // new linelength -= length of the last word
+            // nuke spaces before the last word
+            let extraSpaces = ''
+            while ("sp" == words.last().type) {
+                let extraSpcLen = words.pop().value.length
+                extraSpaces += SYM_SPC.repeat(extraSpcLen)
+                justLen -= extraSpcLen
+            }
+
+            let pns = []; words.forEach((o,i)=>{ if ("pn" == o.type && i < words.length) { pns.push(i) } })
+            let spcToFill = paintWidth - justLen
+            // make decision to contract or expand
+            // expand
+            if (!(lastWord.length >= 4 && pns.length >= 3)) {
+                // expand puncts
+                if (pns.length > 0) {
+                    pns.shuffle()
+                    for (let j = 0; j < spcToFill; j++) {
+                        serial.println(`pn #${j}`)
+
+                        words[pns[j] + 1].value = SYM_TWOSPC
+
+                        words.push(wordobj("sp", extraSpaces))
+                        justLen += words.last().value.length
+                    }
+                }
+
+                spcToFill = paintWidth - justLen
+                serial.println(`spcToFill after expanding puncts: ${spcToFill}`)
+
+                // still got spaces to expand?
+                if (spcToFill > 0) {
+                    TODO()
+                }
+            }
+            // contract
+            else if (lastWord.length >= 4 && pns.length >= 3) {
+                TODO()
+            }
+
+            //words.forEach((o,i) => serial.println(`${i} ${o.type} '${o.value}'`))
+
+            printbuf.push(words.map(o => o.value).join(''))
+            lineIndices.push(textCursor)
+
+            serial.println(`newlinelength: ${justLen}`)
+        }
+        // do <some other thing>
+        else {
+            serial.println("cond 3")
+            printbuf.push(words.map(o => o.value).join(''))
+            lineIndices.push(textCursor)
+        }
+
+
+
+
+        textCursor += justLen
+
+        if (printbuf.length > 2) break
+        if (printbuf.length > paintHeight || textCursor >= text.length) break
+
+
     }
 
     return [printbuf, lineIndices]
@@ -187,13 +328,11 @@ function typesetAndPrint(from, toExclusive) {
     let lineEnd = toExclusive || lineStart + paintHeight
 
     let lineValidated = []
-    let [printbuf, lineIndices] = typesetLessRagged(lineStart, lineEnd)
+    let [printbuf, lineIndices] = typesetStrats[typeset.strategy](lineStart, lineEnd)
 
     for (let y = 0; y < paintHeight; y++) {
-        //con.move(3+y, 1+caretLeft)
-        //print(printbuf[y] || '')
         let str = printbuf[y] || ''
-        for (let x = 0; x < paintWidth; x++) {
+        for (let x = 0; x < paintWidth + 3; x++) {
             sys.poke(
                 -1307649 - ((y+2) * windowWidth + caretLeft) - x,
                 str.charCodeAt(x) || 0
@@ -269,4 +408,3 @@ function drawMain() {
 
 drawMain()
 typesetAndPrint()
-typesetAndPrint(5)
\ No newline at end of file
diff --git a/assets/wpfont.kra b/assets/wpfont.kra
index bdc9318..d452f5a 100644
--- a/assets/wpfont.kra
+++ b/assets/wpfont.kra
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0b2cb02950a8a919853c9202a17e13723ad47065755229345031da9082a07ecd
-size 96435
+oid sha256:e95d7543eadcc4db6ab5dfbc68a066dd9bb92f4c5c21520433a7590cacb9f452
+size 115330
diff --git a/assets/wpfont.png b/assets/wpfont.png
index 579f133ab3db4f2bf35122efeb50fb137bc8a8dc..e99288afad0ba987e865c3c884fcc301ed0f1576 100644
GIT binary patch
literal 5941
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
JFlvuN{s;I37?%J5

delta 5630
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
U-gJsyCyqp#>d#=MP|Lvo2i3LfkN^Mx