From 973b5e78d6c9d323fabd801237a31b8b0b19dc74 Mon Sep 17 00:00:00 2001
From: Steven Hugg <hugg@fasterlight.com>
Date: Sat, 29 Aug 2026 23:20:17 +0200
Subject: [PATCH] 6502: fixed apple2 reverse video bug and early space flush
 when leaving span

---
 src/6502/a2_frontend.s               |  11 ++++++++---
 src/6502/engine.s                    |   5 +++++
 test/codepoints/codepoints.6502.gold |   1 +
 test/codepoints/codepoints.aastory   | Bin 8506 -> 8622 bytes
 test/codepoints/codepoints.dg        |   7 +++++++
 test/codepoints/codepoints.js.gold   |   1 +
 6 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/6502/a2_frontend.s b/src/6502/a2_frontend.s
index 178216f..86deca4 100644
--- a/src/6502/a2_frontend.s
+++ b/src/6502/a2_frontend.s
@@ -231,6 +231,7 @@ AUXUNDOBANK2	= $d0		; logical page from
 
 ; ---- frontend zero page ----
 
+curstyle	= $04	; last style bits set by io_mstyle
 nunread		= $05	; lines scrolled off since last clear
 ioparam		= $06	; word, used by the engine
 wrappos		= $08
@@ -882,8 +883,11 @@ moretxt
 	.asc	"<...>",0
 
 io_mstyle
-	; style bits are already in rstyle zp var in engine
-	jmp	io_mflush_nostyle
+	pha
+	jsr	io_mflush
+	pla
+	sta	curstyle
+	rts
 
 ; TODO consider refactoring with sprogress?
 io_mprogress
@@ -1358,7 +1362,7 @@ gotoxy
 
 mstyle_enter
 	.(
-	lda	`rstyle
+	lda	curstyle
 	lsr			; reverse style bit
 	bcc	set_inverse_rts
 	; fallthrough to set_inverse
@@ -3065,6 +3069,7 @@ auxclrlp
 	sta	stxoffs
 	sta	cury
 	sta	strow
+	sta	curstyle
 #if UNDO
 	sta	u_ready
 	sta	u_count
diff --git a/src/6502/engine.s b/src/6502/engine.s
index 7ae9b4a..d24d3bd 100644
--- a/src/6502/engine.s
+++ b/src/6502/engine.s
@@ -3778,6 +3778,11 @@ op_en_lv_span
 	stx	divsp
 
 	inc	nspan
+	; ENTER_SPAN emits a pending AUTO/PENDING
+	; space before entering the span,
+	; so the space has the outer style.
+	; op_style does the same thing.
+	jsr	syncspace
 done
 	jsr	unstyle
 skip
diff --git a/test/codepoints/codepoints.6502.gold b/test/codepoints/codepoints.6502.gold
index 2e75f34..fbbcf33 100644
--- a/test/codepoints/codepoints.6502.gold
+++ b/test/codepoints/codepoints.6502.gold
@@ -276,6 +276,7 @@ and must leave the other alone.
 bold normal bold
 italic upright italic
 both italic only both
+reverse normal reverse
 ---
 The deprecated SET_STYLE/RESET_STYLE
 opcodes, which bypass the CSS parser
diff --git a/test/codepoints/codepoints.aastory b/test/codepoints/codepoints.aastory
index 8fc7d4c6f61ddf9bd1d33b335bb4c653046fa423..808cac93bfb29dbf0bbdcc05734e96ea42ed5d29 100644
GIT binary patch
delta 917
zcmZurZERCz6h3cnzizj#?PP1$c5o*I*r2d1qv6BVx4o@_&AEhZ;6fm8xxL-G;oU4{
zdNF3@BijPVy1Ygi1V4(X2}DS0Oh<$;6?07hQ8bYljfTiZ7VZ=b$%xCmB{RmvALl&J
zInQ&RoC~3k_$AM@Y;FdqdOsN4(!4Pe3<E$IferxG`D@qKtvk_Zi;pZhhSrT-Tpq|n
z1=K?u^ue2uhg<Lnc~ArDLT{ieXjbRf_39omRZJrzF=v?X^(OsleVcx;Q%rPprq*+{
zG>Xb{^@!0&eTjG~?n{b&Vsf|W>r2GMp7q@P2)k4AF3~4NUl9M@!T(-JJ(Bnz`yOdN
zB<DAn7<7{c%mJ6H_X!8s(|90gJXC7G3<D->Z>d0*($~#<(AU($^5`&qj;%p!sLXmB
zTv@Q%UjugV<+O}ZSdp<VykEvl_$e9d`G+z#@MAJI^35_f@opKLLs1#CAuMA{@OSzx
zTa9@77kk;M2;{&5K_DR6h(#q(V0KbRZ(15wa4IpXLP3zq$r@GD1*w$Sq%yKYB{pqv
z5{Kj>n$1C16*;@l7jn9F#5iSp9Mr8RmU$|4BjT8{72wED4N0TM+?rUf;o`!&dSE5#
z5&pR}la-IDK!zR)WN@EQh}Av`s3fEbUV6TWuUsgmZ>3A@N5Ry8kI`IPwVD&i!ByHH
zYpK0BfvV}=Vjl|94~vtCrHiZ^=oYI7oy{e!l?Z)DGbLAxHr$D`Wc8i6g)E>Qwv+v^
zb@QfH0Ee&kw@7UIlSszD>u0Q*9&qC`Pb#N}{yf3K^rvZ1%WrdsqVIK$!tF@~vZFDW
zxQ^lD$r#+X;IVf8ZLW2(GMs@U%U%s&7!PiAa`2WA*~US8<ckL!Y=2ssQ1M_#_QqEk
zmvSTE%gj0_=bAD`=b|0gzQnm9d%eMbwlaTud(GXh{PH=e)~!swGxlu#@K5>dfzG|B
zvL`!Jt%{SgS2RKU+{6#oSB{SylbT8nkLK=|@dn!Bal2=B4yD>cmtHdea%whb@%KJ|
z?@G;8?wcPEDm39~@y-O_jh*{^{1TR~@4x#&gN^-6>r)Y9YJ6Xk<~?5eho^$F-Y|V}
Uq1P}y^J_mxo4r-JVec9J-#)KMCIA2c

delta 820
zcmXwzdq`7Z7{=dkXPet}Zd!UOw>+hkn&w*OrO3YRY++eMwXzY$m&dGJEGex{QLZ$#
zo6f#}vari4`XjqB3A>`vWzhwTf-ZJLN+Uc$g<uqR7WK!&^YA|W-uFGvU$rOCUa)9B
zz&NYTwsd}h)8+sG2Lc5EvSwRytvOXnBiEdK2<0^2NSU$_Sg^oC*Z>sT;W-Q<7UiKb
zbP#o+A%#`3PBF-snb}M^bB1}MWR#PFW6(HduvMjI&|P{;lRqk^VnhrWeYno1-WzM|
zgt`cQMXW$l=}%1+x<xCrJla9qwP`4YzSEj!Mg~A{JOJAIEj|$=$2Acv991G_9GN0k
z@}EVl;@d>5=COz)c)f@<c9)2?_NgM)*?MWNE)}KH5?v?TCXkwuf<VA)AX<q)I2p+d
znin~9tXU#zNeCC-c#<i}z2J={ao#wxLLzbWL?m1NER1>-ME%9^m-Q%#_Foh{h)nom
z2-|*}>}0N-M#v>AI~N|O*QJy7!hcdjlKw`4Gz<!)ey0##D<997h+Qs5?;$%aj0Ocz
zv>V4Z8UhNutcm7CWttOK`Cj^>jg1gdJ;2Chk*r~X)J~Rvn?`G*)*_w`L}j27nxNl+
zqG+RjDGCKY>dgpUq>SNVWbUUjEwO$o(-8xGWoWG~S~SN65R+l~=q&wu+3C+-_ZCYL
z-?^@#(+xk4a4<gf^|}vw`$N$87(;u1DM<0XT%e^CzUlB4H-C(CC54*&uz%wAd<<^q
z?e84yU3sd!1-fhnEC)vg=W-54g}U=I{Kd1peG>l7_74~O*~Ar(?&5mY>Ol8>fAE(v
zOO<ULT?p>sz8Cs!hno+13#0e7%*$$e(-Ejyv-M=4bxox!#By!sj?=|ypUXQ^hP{?C
zq5k7nf@Sf%Dr=~up>m1+=4Q?NlfQ$y?22UrchVkmPhQuCj#{2h+*PyjL}J?eOMwry
z7gCP*^o*SAN%r{Zn}h|lz+|H7vPw<G-1Ox~&bII9S*%ZTZE`-a9=4ow=XEzVRu<gr
SQ5Wq_yiPk!<AaR(tnv@Pa3o&<

diff --git a/test/codepoints/codepoints.dg b/test/codepoints/codepoints.dg
index 4c0325b..a699b50 100644
--- a/test/codepoints/codepoints.dg
+++ b/test/codepoints/codepoints.dg
@@ -157,6 +157,12 @@
 (style class @fixed)
 	font-family: monospace;
 
+(style class @reverse)
+	-iftf-reverse-video: reverse;
+
+(style class @unreverse)
+	-iftf-reverse-video: none;
+
 %% A font-family that is not monospace must set no bit at all.  The name is
 %% deliberately one that contains neither 'm' nor a substring of 'monospace',
 %% since the matcher scans for the word rather than comparing the whole value.
@@ -649,6 +655,7 @@
 	(line) (span @bold) { bold (span @unbold) { normal } bold }
 	(line) (span @italic) { italic (span @roman) { upright } italic }
 	(line) (span @bolditalic) { both (span @unbold) { italic only } both }
+	(line) (span @reverse) { reverse (span @unreverse) { normal } reverse }
 	(line) ---
 	(line) The deprecated SET_STYLE/RESET_STYLE
 	(line) opcodes, which bypass the CSS parser
diff --git a/test/codepoints/codepoints.js.gold b/test/codepoints/codepoints.js.gold
index 58de3cb..b8b8d25 100644
--- a/test/codepoints/codepoints.js.gold
+++ b/test/codepoints/codepoints.js.gold
@@ -269,6 +269,7 @@ and must leave the other alone.
 bold normal bold
 italic upright italic
 both italic only both
+reverse normal reverse
 ---
 The deprecated SET_STYLE/RESET_STYLE
 opcodes, which bypass the CSS parser