From 2f44d10aa4209b226cfc3d0f8f2c8516005edf6a Mon Sep 17 00:00:00 2001 From: Laurenz Date: Tue, 29 Jun 2021 16:05:05 +0200 Subject: [PATCH] Make test separators commentable --- tests/ref/markup/shorthands.png | Bin 2122 -> 2621 bytes tests/typ/code/block-invalid.typ | 2 +- tests/typ/code/call-invalid.typ | 2 +- tests/typ/markup/shorthands.typ | 3 ++- tests/typeset.rs | 4 ++-- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/tests/ref/markup/shorthands.png b/tests/ref/markup/shorthands.png index 3a5652ac658fecf1926267658368b96a261ee417..0a7e4064387642d9e29a0024a152b5a63d3d5908 100644 GIT binary patch literal 2621 zcmZ{mdpHvcAIGOHja)W`h|F+Q<~F%bF?R_&>EzB{WVt2ePBx~H%fiW}Q9X$qx49c; z4#TuasFB;;6Ovo*?VR&G?|J`v`}{u7_xb+u`|tP9FBxNFF32y*4*&oJEiFv00{}dr zzxy=!?*N=E$hHFj_(7H?=o=BARwq_NXAzC~=?TK{Kg09Ia0w6&3&-n`Q0>y^rAb2P z2_omGuNXl5tYb29-jjJ=9=J7`bWcx&tJr5C2rl_Q=x1VTF(A|bFY%ozb4rkhQhg<1 zZnjkL?|SAIIsJ22F}m&SG13D8hjl=0XRJAqgm3<$9%D-s3H|UZk!!}JZ*S1#7(@5o z03uzBtz6lm{W(6LSaCU#dZu`_L`;@}NXJT;lC7Z@K_4+6DtA<~X4bK8R%*3lwxI0a zw{;tg!XBrbq}261fmy|RIq_Q&O_AH{@4tW)3GxZ*-3U$d6IcO8W`y`j8-P)y0=>xG z7+h7xOu=N~b7i0#^6;^jvY^o^q9Jc%sqUXD4u5D%)+r=@Xj@mS0RrgRpt`K*pU zD8+*)!My#A;DLIHZ?5;{iFFNwZl?_M=g5{>WMm}i{+G*uJ-8>)Z_L1Wr5jghP1NaC z$SRyWtp9^CWeR9eCUU~?XN)X*a@F@1t*f`g}(!Lr_i6Orsq{DY`}v@m z#}hc&xfDQH`PyTf0JKB1Iz1V}=(Gzclar9J>w66=s{b7mu0}}>l=C-_Z!5FJ>o9W- zLaauXYg(f8PnYO^n1N(GS#$=qk`Fk^#7|!-~u|P?MN_*XqS@3~G3p3XJ zEd{|xdGwT3*};^82_F*Ss50SUqirvjl(M zoSZ+=HLf_j-icvNPwfe*)QM9jeqzo@z04KwLau#+E$y|4_nLo5$Vz|!SMSQHKi>hU zAyc9}Nj=pwO>y?1_MBL&R>!5aL{h$%Aw}E#QZe^ts8LPAy|49Xx72EGbA_8KRVf}G zbGl<&>AU&93z0@+_jBVytQ<~HH>qq*K-+HHTAS|P1|@A{10Uw30CpNOc7Fq5{k)Qb zNZnA$JdKvn23JCC<_PQh{<`pnXnKMHKaZ+VFb>~`*KSu)1gDK~JkV-84)XU!c|QO0 zJWvCHDs_>eh+v;MDSAcc^jOhT?z#Yl6CyS+s!6qv%Ea^eW)=@xlMn5oc=>c)LAgo7 zg#gQG(GJ*;_t4w}uWyaF1HJ03J}%J} zD6M$Uwc_M|NZ@OgVI>zI_EG(S{vI--Jmb8K!PDdlvV9A%#QSsjh~AL-RLZrb7tr9P zGCOYUT7O%Qicp4R%5(6~j5~=o{+C(Yi-&zbTTJ;@1%=TgGdSWcGBdW24XeCSrMA}a z9drHqMme_8m2K8bn4z1bkJzIB=HwaLXq)Cv&H+a~)_|(B(sR##O;BRHzhEmP5%Z8= zaOybWuE3|5N8hHdW+ZY%jVTQ%-i z`Ewc}sY&CLqB34WviB59jz33AdtQv@Q+wBQG&}=aknq@PUhBBs%U{q&Nb2XfkkIxFG@BMNx2HtU!!sZ}B+@>iwrI*j4>vuvg z?n0I@L(k=4J>u({@7mq7Bo!Ld$Ms#TvC}Jhrt08F3GMQ&tm?s*R;Et_vcH>ro;S7r{xY!b4ew5gbBDTNEw@*#FVH5TQJ>!^;K6}A zWIPt$%GiPIs(`D-Blo|8vy#Tc`VipxE^MS58^8{&P!2M5V6z+`g={6mwsJpS#Uj?e zf}YBe_p?`fV$)0W^VAb+NThR$Q^t27fmv*7bM!Kh|nZ;N0n)k4D2DHbNT)Mf=V$7gdJuTt&Y{f!%33t!bDj zEtMYu#2e{|?zXLwt20=hg=tYEw^8Q&4ElO)Gx^$ox v;qS*;lheN%|NM|>=nt*<2mhs;`-ltF>(i`OcRv07pTE%3)W)RJ2pj(wBz@wn delta 2057 zcmV+k2=@2A6v_~g7h}B$00000aM4`f000OPNklb1I?!~W5>$dp`0sl4Gj$q z4Gj$qjdup$ERz8W7=IMua}mmSLjY`Q|3UWY)W`3J0L(Hk*BHg-NxmBbkf#Dz@c^sC zeMf|tfmZYszb8VCR&*5M|09&&dimZF(rGyrfUVr
=O-9$EomITE7j8GO4IUWrmN_Yz) z+#*OMJ0HJTrTDK15-IZZYXmPFKo);f9qznM*xI+=5F~tD z%Vqhy2wwi_;0N+lkDfj%+y`x>??r&^pAdl55MUnv^naj18_oNh2=6)!ZV1rHpFUos z9gyD(0_2Z4X1+Is4{8+tHiAT6_U8hSPsBX|FZ-pQe!1+WA*3HaJme>U;Cb0E*9K$X zUs`75=luet6XntpyzHs{Q*&*9+dD3&x@zUQEoe!u*?lwuQO?e}u20}Z&LRidglOji zVYMl4}dxXn%B zyhcCORr5B+wU5w}kcN<^@F@rZDBV~ng9Kt>j=*r>C)nhQP}T%6big48a7cnf3ivie z=?r8KgJi(TMilT8q4WicE6kzh4#2hor4zsp0Dq=Wv?N#q(SKH(0Ec)m9e|f*Sr$3i zLaVOgiml(BG3`A>@vok@{VibXXLUW!Ul-f8Ch;=Y+ySzr`Zl0tCG;9wnr*iOUcPR@m<*(|)oRz`5sZSM6?yf(fvwj_|Q*?ks5 zX@3Y{=eCS|>MO!F%;lE|Q9L}gb9H1Rb8Z<`guM3>+YSb{`PT@?HNiNvBtV*EE}yw2 zgtqRk^@q~3=2jij_001v0$$FGEkBoQ15;1q&MW0Kr63VxZp&Lw132o3*Db-;HD6yP zv9f&%f(O`!RzgzM56n~huEde#^ecq2rhhiv4me<1p`OCe5?Q6RQ#l7va?8E$6f5l} zK;4IAiERY}2Qb)=MgR`!Bg7#AbD!%vjr+a?rvBw+kmn0gHn1{hnEP^VMG3OO+P6*u zz>p|o03&lI&mOEi|5#fBlm>#QeOw>i9s$kGnSgIR3=%-|+#6Hv_L z$~HO3b{K4~xtmrpf*ICmY{-zT*=)_|nk1NY{kI06I;av??`(I|_cn&V9iNHdSAa6O z?}`AVYhQ5=-xUGyb>EV13jMtha(~xHi1wyOW5#dQCS*Iw;9eV)%^3T)&(-UYyCNvU zM;?GI5a8bS5${C+j!veO zCg~ipleG}6v;7W)Mbao+y^ep9uh0+vC(WQ!D?tigLycYo& z7GUfPY=K{3*A`oN_ly0_wujhe+$fJLn?zRU-1OG0Km@r( z0Ae>iRCVa;g16>}g6UU_zQ%k~e+r>ZBKp?d&~KFYF%eLNYm{$|5FLL|E<9#FtfnPS8M`xdQ4@Ke2;)QAgl zmHM`?^*fRO4k5;9UE3(ytldEFGf>2UZ&NF8GnCY(W*!V+Wqpk5kUec4<#wkyY*VZL zz2TFi@;VV7cmA>Z)^S%H$CN~^^&)+$}DzlnNXe7K0qKy-7+7n00000NkvXXu0mjfNBh|X diff --git a/tests/typ/code/block-invalid.typ b/tests/typ/code/block-invalid.typ index ba3f02d36..7116e86a3 100644 --- a/tests/typ/code/block-invalid.typ +++ b/tests/typ/code/block-invalid.typ @@ -29,7 +29,7 @@ --- // Ref: false -// Error: 3:1 expected closing brace +// Error: 2:1 expected closing brace { --- diff --git a/tests/typ/code/call-invalid.typ b/tests/typ/code/call-invalid.typ index f5a5adc30..34aa092d4 100644 --- a/tests/typ/code/call-invalid.typ +++ b/tests/typ/code/call-invalid.typ @@ -26,7 +26,7 @@ // Error: 1-3 expected function, found string #x() -// Error: 3:1 expected closing bracket +// Error: 2:1 expected closing bracket #args[`a]` --- diff --git a/tests/typ/markup/shorthands.typ b/tests/typ/markup/shorthands.typ index 38471c9d9..ef0bf8666 100644 --- a/tests/typ/markup/shorthands.typ +++ b/tests/typ/markup/shorthands.typ @@ -4,4 +4,5 @@ The non-breaking~space does work. --- -En dash: -- +- En dash: -- +- Em dash: --- diff --git a/tests/typeset.rs b/tests/typeset.rs index 31da3ce0f..1540164f7 100644 --- a/tests/typeset.rs +++ b/tests/typeset.rs @@ -146,7 +146,7 @@ fn test( let mut compare_ref = true; let mut compare_ever = false; - let parts: Vec<_> = src.split("---").collect(); + let parts: Vec<_> = src.split("\n---").collect(); for (i, part) in parts.iter().enumerate() { let is_header = i == 0 && parts.len() > 1 @@ -168,7 +168,7 @@ fn test( frames.extend(part_frames); } - lines += part.lines().count() as u32; + lines += part.lines().count() as u32 + 1; } if compare_ever {