From ba770b541128ae5ae6ad7c50721805826a4c1ae6 Mon Sep 17 00:00:00 2001
From: Brecht Machiels <brecht@mos6581.org>
Date: Fri, 12 Jul 2024 13:22:46 +0200
Subject: [PATCH] Sphinx graphviz test case: update for graphviz 10+

---
 tests_regression/sphinx/graphviz.pdf      | Bin 32348 -> 32417 bytes
 tests_regression/sphinx/graphviz.stylelog |   9 +++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/tests_regression/sphinx/graphviz.pdf b/tests_regression/sphinx/graphviz.pdf
index f9f6e3a313dd66f14b3976d79d87572f0f1b5302..489a1584af0422edede58433cd8ec51c56d736cf 100644
GIT binary patch
delta 1889
zcmccfhjHOw#tq?I^%iz^T*W0tsfoE<6?1w6cjp~8;JNctROazPo|WyYYZ<$k7_GK^
z6-)7uRdE&M_ibnT`zvVEoG%+$+D<O6QF*W9cx|~TuaGjI@*d{to0nI|yp!mcSNO3q
zJ-haP!e&>sW40WRnbq3u9?d8g*RVXOF@?o>d1)VWmGc~<5}RU?%=+sSHg_Mfb4(TW
z>T{mEIKbV1$*!CO&$T|(90}!r)G@QS`09zJUnb^!xDlEAOn~*b;I#H>(WPB~8O^$<
zyFE&}-Vr}%cJBVR-T$&;r*}R*IqSxk!?SnH2z_R<`*g(8b9<O}O0b9=cCAhA(mXpW
ztzYuF>eO)Y`+3Fz>3hEYkglowYyLTMU8hd<)>Rf!pPm{SN*Wy$+j!=Q)&J;AsSXLB
zT9X#fP3!PEs`>x->+Qn(4#|Jwl6xraQc!zga~F3vBbT0qiMg4nnS!aoWJeYSWn*Jw
zJp%)C3qvCX0~BatVhmNf*_T&RaWv4$4D^}$<OO<+;b@?fo6;vg3>4nHJGg?Z)SexB
zUPaHuz}(Qt(8$!x*j(GdNZr6dT~k5dH$TNCu_RSN!^O(Tzz9jn=8P&v#(EP40}xQi
zQ{VzK42%s-jWNVbOwBRG%ng9K4@Iw`p^332rkEKpkD{qFH#dZc)x#||G&Hw_3L?ae
zjEpSMH5(ZlpgYFU$lMT9uO+a+K(*M&z|0cWbM*!WM!--*4+SGb10z#(&4vahm|`Xt
z=%HX_XljP;7$ZYVGYq{(KwIk3EwQvTLHC`JrKK5qC>R?UnWG0aP|Olj%+df;uca}}
zj#yZ{8yi?+_{7-Izz{tMfnw(9J~1{lG)DI^P|U(?@}XLrI0J(;^W+qxWFu1p6C?99
y(^Nylq@+X(3ll>_%cP`a3p)iHf=Xh+m1km6Nkvg=8ke!5iIFjvs;aBM8y5gUc8Lf8

delta 1789
zcmZ4Zm+{UY#tq?I^=5W<T*W0tsfoE<6?1wg?#?@Gz~fq8$9lZNz&Yx@sY9TGL;JRS
zO*|``muNg%_%dKYe7x7R$#&BYY^YF;x9d|q@oUSX?js$CIo=<5`sStFbn9b}**WT7
z-Hf_#ej{gMXCeQg9}OoLbz3}p!K|t+(K;#N!>;qM8`dfNMMllDU1d_Aed3~9()0zp
zx>VOYuU#DE?Z50+&VlDv4}Ny6mOCP3Tz)NV!s%<SMh6#~&pM;X^-WoaUw6A#*I!1n
z?&)rilCF0|&zYUOzis!wu61XRd}vWq`<oyv{dtPznUcuYD>kq9&}(S8R5){=)l%(~
zQfbH56i<G&x;Otg&lBtAmhafkt*<wo^K{mU4Z$H-F9v)_J#uB@e22)6-ru$tRqYKj
zi_^MRP7|1Ew*1fQ_4oaLaMhpDu4u_W@v3&`<{s{D#>sNLYC;MIDA2^jcykJ`q~d6>
zk`=6*^l=Akm*Hrzl9^g>1mh0Y4WZ{%^o$M6jSP&8O)ZQqv<-~Z4Gh#Z74&`cQ(O{D
zQWZ2@tU!_oC7ah)F*4R0DHwo&LY@K_m|<XSU}}gVW@2oDA!cT7i6&-fXkuuFDQ0Yr
zA!cr30THW*TWn}(ZUz-Zh#46f7^7=8GO|E-w4srinJI=kOG99;M)91Hftd-aW9khI
zfPxqn8yQ$)_zoy$iSA<~L(GsdGBh<rceIhAg(Z5(7y&gK)}y=7(!v})6pSn_Ff2AU
zFv9R1P|O(J$HoR0#^{a)iorcRIjWW`*b>9N#s-#X0cBudY-nJB?gyZl8G2+G8v>(p
zGJBm(oN1z=aavNcv4ugZ0gz#6U}$JzV33rQoNADglxk#Pr(i=+Ni4WxODrm>C`wJ^
RGBz|eHQ`cKb@g}S0swV)mCXPE

diff --git a/tests_regression/sphinx/graphviz.stylelog b/tests_regression/sphinx/graphviz.stylelog
index ed244e28a..5e318af04 100644
--- a/tests_regression/sphinx/graphviz.stylelog
+++ b/tests_regression/sphinx/graphviz.stylelog
@@ -8,16 +8,17 @@
 #### ChainedContainer('column1')
   StaticGroupedFlowables()
     DocumentTree()   index.rst   <document>
-      Image('/private/var/folders/3k/f4b645zs4fl7xjnw7nzc43m40000gn/T/pytest-of-brechtm/pytest-85/graphviz/_build/rinoh/graphviz-4df2f99e83d4f5fbac159d69dfa787b3095a1429.pdf', id='bar-baz')   index.rst   <graphviz>
+      Image('/private/var/folders/t3/n6h1s2ss58n5l5llnt6c4zbh0000gn/T/pytest-of-brechtm/pytest-27/graphviz/_build/rinoh/graphviz-4df2f99e83d4f5fbac159d69dfa787b3095a1429.pdf', id='bar-baz')   index.rst   <graphviz>
            > (0,0,0,0,2) image [Sphinx] > DEFAULT
       Figure(id='id1')   index.rst   <figure>
            > (0,0,0,0,2) figure [Sphinx graphviz] > DEFAULT
-        Image('/private/var/folders/3k/f4b645zs4fl7xjnw7nzc43m40000gn/T/pytest-of-brechtm/pytest-85/graphviz/_build/rinoh/graphviz-ed6d45d9c44a3b261c080ffebc5e8850973a97ec.pdf')   <graphviz>
+        Image('/private/var/folders/t3/n6h1s2ss58n5l5llnt6c4zbh0000gn/T/pytest-of-brechtm/pytest-27/graphviz/_build/rinoh/graphviz-ed6d45d9c44a3b261c080ffebc5e8850973a97ec.pdf')   <graphviz>
              > (0,0,0,0,4) figure image [Sphinx] > image
                (0,0,0,0,2) image [Sphinx] > DEFAULT
         Caption('Figure 1. This figure is rendere...')   index.rst:13   <caption>
              > (0,0,0,0,4) figure caption [Sphinx] > caption
-            SingleStyledText('Figure')
+            StringField('Figure')
+              SingleStyledText('Figure')
             SingleStyledText(' ')
             MixedStyledText('1. ', style='label')
               SingleStyledText('')
@@ -26,7 +27,7 @@
             MixedStyledText('This figure is rendered incorrec...')
               MixedStyledText('This figure is rendered incorrec...')
                 SingleStyledText('This figure is rendered incorrec...')
-      Image('/private/var/folders/3k/f4b645zs4fl7xjnw7nzc43m40000gn/T/pytest-of-brechtm/pytest-85/graphviz/_build/rinoh/graphviz-ed6d45d9c44a3b261c080ffebc5e8850973a97ec.pdf')   index.rst   <graphviz>
+      Image('/private/var/folders/t3/n6h1s2ss58n5l5llnt6c4zbh0000gn/T/pytest-of-brechtm/pytest-27/graphviz/_build/rinoh/graphviz-ed6d45d9c44a3b261c080ffebc5e8850973a97ec.pdf')   index.rst   <graphviz>
            > (0,0,0,0,2) image [Sphinx] > DEFAULT
 #### UpExpandingContainer('header')
   StaticGroupedFlowables()