diff --git a/src/assets.tal b/src/assets.tal index 0c291cf..c3bf0d9 100644 --- a/src/assets.tal +++ b/src/assets.tal @@ -311,13 +311,13 @@ aa55 aa55 aa55 aa55 aa55 aa55 aa55 aa55 0000 0000 0000 0000 0000 0000 0000 0000 ( @|accented-latin ) -@page-c2/width [ +@latin2/widths [ 0808 0808 0909 0807 0606 0606 0303 0303 0707 0808 0808 0806 0808 0808 0808 0707 0707 0707 0707 0806 0707 0707 0404 0404 0608 0606 0606 0606 0608 0808 0807 0607 ] -@page-c2/glyphs [ +@latin2/glyphs [ 2010 0010 1028 2844 7c82 8282 0000 0000 0810 0010 1028 2844 7c82 8282 0000 0000 1028 0010 1028 2844 7c82 8282 0000 0000 diff --git a/src/left.tal b/src/left.tal index 49b2b50..bfcfac5 100644 --- a/src/left.tal +++ b/src/left.tal @@ -886,9 +886,11 @@ &tab #0010 JMP2r &fixed #0007 JMP2r &high ( -- width* ) + LDA2k #c2b7 NEQ2 ?{ #0006 JMP2r } + LDAk #c3 NEQ ?{ + INC2k LDA #80 SUB #00 SWP ;latin2/widths ADD2 LDA #00 SWP JMP2r } LDA2k #f090 NEQ2 ?{ INC2k INC2 LDA2 #9190 SUB2 ;shavian-width ADD2 LDA #00 SWP JMP2r } - LDA2k #c2b7 NEQ2 ?{ #0006 JMP2r } LDA2k #cebb NEQ2 ?{ #000a JMP2r } &rune ( -- width* ) #0008 JMP2r @@ -901,6 +903,8 @@ .state/rune LDZ ?&rune LDAk #20 SUB #00 SWP #50 SFT2 ;font/glyphs ADD2 JMP2r &high ( -- glyph* ) + LDAk #c3 NEQ ?{ + INC2k LDA #80 SUB #00 SWP #40 SFT2 ;latin2/glyphs ADD2 JMP2r } LDA2k #f090 NEQ2 ?{ INC2k INC2 LDA2 #9190 SUB2 #40 SFT2 ;shavian ADD2 JMP2r } LDA2k #c2b7 NEQ2 ?{ ;dot-icn JMP2r } @@ -1259,8 +1263,7 @@ ! &search ( -- ) #02 ;/color STA - ;search / - POP2 + ;search / POP2 ! @ ( state -- ) @@ -1318,8 +1321,7 @@ #0004 .Screen/y DEO2 [ LIT2 15 -Screen/auto ] DEO ;/color STA - ;filepath / - POP2 + ;filepath / POP2 @ ( -- ) #07 get-cat-x ;filepath get-strw ADD2 #0004 ADD2 .Screen/x DEO2 @@ -1467,7 +1469,8 @@ DUP LIT "- EQU ?&ok DUP LIT "_ EQU ?&ok DUP LIT "< EQU ?&ok - DUP LIT "> EQU ?&ok + DUP LIT "> + EQU ?&ok POP #00 &ok JMP2r @scmp ( a* b* -- f )