From c42dfb7a99fe0cea64d19296e7196888eccbeb09 Mon Sep 17 00:00:00 2001
From: Devine Lu Linvega <aliceffekt@gmail.com>
Date: Thu, 8 Feb 2024 16:25:16 -0800
Subject: [PATCH] Fixed issue with shavian glyph lenght

---
 gui/shavian/6x13.icn    | Bin 576 -> 768 bytes
 gui/shavian/6x13.txt    |   2 +-
 gui/shavian/7x14.icn    | Bin 576 -> 768 bytes
 gui/shavian/7x14.txt    |   2 +-
 gui/shavian/shavian.tal |  31 +++++++++++++++++++------------
 5 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/gui/shavian/6x13.icn b/gui/shavian/6x13.icn
index ce30bf33c4c75ca844f82c1b7a7cdf0792920617..a51c77247e3ef7180793f7ca00d0be6604c32335 100644
GIT binary patch
literal 768
zcmZ9KA&-PG5QPyH6^O~H3PjUXAXX59Kp>i?0<k|~1=(CSC-(>3kKflaWqLOTzP>lZ
z@Sy9uNpp2)Y4dX)Fe{}7Z>=4w&i0Afk~Ti2y|RJXDCJG{leHm)v|fDt;Sj7P(ps@@
zd@1u{#syC=RY#t5n=D&a?C4jVGMm#NT=v7FRrgB4bFH{04A7ct|H=KuMa-|k{ja(s
z^N^oc^TAn9sDnjZG7<@w^%{Rk^euXsXNBLzAe_=Tw(~R{NKkb28{N#y`KX#dY;Y6x
z;<x^`sG2{HH!RrdTaKrGU+BM@kcRZH3DwLe8po7G$1pSq<9((!uPw&;>s$1@bFrN_
jI5)>d^d-*DHTexL#&{R~@%+aJe!##w?)H6IoXh+HzNs%u

literal 576
zcmYk3A&<i_4225<0t&1{0RdJNP%uzc1qB6B6i~3AFi=gW>EM3A{rG#f)9D_VzP{M8
zUpD)$VHkY)u@A6wE@ozq;&;tpCLeNZhj2haa4rX_A?8v_+mz1_m%>csz0>+E3NJ8(
z+f~wTbekExVRqi&fP)<v>s%}#es&ILI(lnp@K^x8@u;k(tOfrSbhOq-xl?jMBSEL)
zAV_4aV|$IJf19tpZ2Z;(<JP9>>h*LY@uxoc-YdDBybpv5qS2W1ZFTZK(2l{Eze_B6
zXXw`xk|-i0)bAmhrq;|yBZ`c%+k9o*YhAv+&A+Equilu_QdjfWx}?<e##C#)oBw$J
Q;}d^yfsfzgSl5)mfB8@^O8@`>

diff --git a/gui/shavian/6x13.txt b/gui/shavian/6x13.txt
index 640e679..26ac11d 100644
--- a/gui/shavian/6x13.txt
+++ b/gui/shavian/6x13.txt
@@ -622,4 +622,4 @@ HDR yew
 000000
 000000
 000000
-HDR ---
+------
diff --git a/gui/shavian/7x14.icn b/gui/shavian/7x14.icn
index c8448b8791bea9ee8dcfeffff149530a05202550..d2c2da26977e6777ca86285399f6e66a2017cec1 100644
GIT binary patch
literal 768
zcmZ9Ip>Bmh5JeFyR=hNmDg<J(3Q4L~AU0$LqG>7+l`9aH<S7J#5JW{kp`TLqG#^pX
z59uuIGW&WBIdf-*yOU*^19>PrB=h$>7DCj9R7d}C!3CyyZP)c<2&}C^kizQN4~R6L
z@Xs9^g9wyCg#N1CRc(RkgNNV}O0<sj=1ky`GK!H(fphdeDe#fcV1BZYfE-C%nwL~!
zpZMWq@9nP${uVRFe*drdUaDPy<bp{bj{wZR9Sde3U&i}Uxj^5+{vdq^v$bWJ?vvo?
zg6tQFdAd*g@gyI0!+A^^GtXV0?w|hUn`k`UH|^)(|7lA~_5+lqwd^C%MUZ)rvP$1y
yH_g-IFZ-KPw{>JLl)5fGbH7}bO72%T%d&j3|9vC=Vt#pbe9w8F+qUbJ^8OzP1x51!

literal 576
zcmYk1t!{-t5QPydR@^j`Dg<J(3Q4LEhz(hRXqpN{<qAY4xe9?G1X0mP=%Z9!%|lf5
zL3(BfZhF+WXV3gavZ^f0Z2o>{V@%_rMtl`Ta3ouYZTlF(b?{8qgjzDhjQGJnclMr{
zFvB2IbxG9@hFC=xFiN4f=)n_an+Z>F&f-I0o$EPIY%o#B)d6{nr~2TB#Nwr`;P2;b
z$w)uh8M+V@6J~-$$`av1S=O;~FI2GnB+N!DKguDL<ymVf;$rm+=KQR!C4S6Bg3{rL
z`R9H(`^^95&WNA2b2>$P)&V;D5S3*J>NDXQRvxXb&i$LVeR}*=e|PS-P0EFH*L6@H
g)~j>Jy-mBW>!<qPH}IG8%WKrzmu2a?zIP7(9|P1y^8f$<

diff --git a/gui/shavian/7x14.txt b/gui/shavian/7x14.txt
index d648534..be0f31f 100644
--- a/gui/shavian/7x14.txt
+++ b/gui/shavian/7x14.txt
@@ -622,4 +622,4 @@ HDR yew
 0000000
 0000000
 0000000
-HDR ---
+-------
diff --git a/gui/shavian/shavian.tal b/gui/shavian/shavian.tal
index 64cb60b..561113b 100644
--- a/gui/shavian/shavian.tal
+++ b/gui/shavian/shavian.tal
@@ -12,13 +12,13 @@
 |0100
 
 @on-reset ( -> )
-	#f07f .System/r DEO2
-	#f0d6 .System/g DEO2
-	#f0b2 .System/b DEO2
+	#f0ef .System/r DEO2
+	#f0e6 .System/g DEO2
+	#f0e2 .System/b DEO2
 	#0000 DUP2 .Screen/x DEO2
 	.Screen/y DEO2
-	#0040 .Screen/width DEO2
-	#0060 .Screen/height DEO2
+	#0047 .Screen/width DEO2
+	#0065 .Screen/height DEO2
 	;on-console .Console/vector DEO2
 	[ LIT2 15 -Screen/auto ] DEO
 	#ffff .id STZ2
@@ -35,6 +35,7 @@
 	( >> )
 
 @new-glyph ( -- )
+	;buf LDA [ LIT "- ] NEQ ?{ <output> }
 	( clean ) #0000 ;buf STA2
 	.id LDZ2 <draw-glyph>
 	.id LDZ2 INC2 .id STZ2
@@ -43,12 +44,18 @@
 
 @new-pixels ( -- )
 	;buf parse-pixels
-	( store ) DUP .id LDZ2 #40 SFT2 ;glyphs ADD2 [ LIT2 &row 0003 ] INC2k ,&row STR2
+	( store ) .id LDZ2 #40 SFT2 ;glyphs ADD2 [ LIT2 &row 0003 ] INC2k ,&row STR2
 	ADD2 STA
-	( output ) #18 DEO
 	( clean ) #0000 ;buf STA2
 	JMP2r
 
+@<output> ( -- )
+	;glyphs/end ;glyphs
+	&l ( -- )
+		LDAk #18 DEO
+		INC2 GTH2k ?&l
+	POP2 POP2 JMP2r
+
 @parse-pixels ( line* -- icn )
 	[ LITr 00 ] DUP2
 	&w ( -- )
@@ -59,10 +66,10 @@
 
 @<draw-glyph> ( id* -- )
 	DUP2 #ffff NEQ2 ?{ POP2 JMP2r }
-	DUP2 #0007 AND2 #30 SFT2 .Screen/x DEO2
-	DUP2 #43 SFT2 .Screen/y DEO2
+	DUP2 #0007 AND2 #0009 MUL2 .Screen/x DEO2
+	DUP2 #03 SFT2 #0011 MUL2 .Screen/y DEO2
 	#40 SFT2 ;glyphs ADD2 .Screen/addr DEO2
-	[ LIT2 01 -Screen/sprite ] DEO
+	[ LIT2 09 -Screen/sprite ] DEO
 	JMP2r
 
 (
@@ -85,6 +92,6 @@
 		#0f AND DUP #09 GTH #27 MUL ADD [ LIT "0 ] ADD #18 DEO
 		JMP2r
 
-@glyphs
-
+@glyphs $300
+	&end