From 34ebbaeb1082b82b4f38d0b8da9a07675127ed79 Mon Sep 17 00:00:00 2001 From: LU Jialin Date: Mon, 2 Oct 2023 22:22:33 +0800 Subject: [PATCH] Passing color to the augment line in matrix (#2281) --- crates/typst-library/src/math/matrix.rs | 1 + tests/ref/bugs/mat-aug-color.png | Bin 0 -> 1680 bytes tests/typ/bugs/mat-aug-color.typ | 9 +++++++++ 3 files changed, 10 insertions(+) create mode 100644 tests/ref/bugs/mat-aug-color.png create mode 100644 tests/typ/bugs/mat-aug-color.typ diff --git a/crates/typst-library/src/math/matrix.rs b/crates/typst-library/src/math/matrix.rs index dd30209a..68f7f438 100644 --- a/crates/typst-library/src/math/matrix.rs +++ b/crates/typst-library/src/math/matrix.rs @@ -378,6 +378,7 @@ fn layout_mat_body( let default_stroke_thickness = DEFAULT_STROKE_THICKNESS.scaled(ctx); let default_stroke = FixedStroke { thickness: default_stroke_thickness, + paint: TextElem::fill_in(ctx.styles()), line_cap: LineCap::Square, ..Default::default() }; diff --git a/tests/ref/bugs/mat-aug-color.png b/tests/ref/bugs/mat-aug-color.png new file mode 100644 index 0000000000000000000000000000000000000000..d6ab02398f24c373ccf47faea381d5c2133b2ef2 GIT binary patch literal 1680 zcmY+F`#aQ$0>-}>Op{nDTdfq?F32S#U9@V9!?dY&Yb)CcWwlJP%4Mr9N7A80(jnD~ zPHx$<(JIx(v~;t%lqF`2+Zc=)Gv;Py%)IM7&-rEF=Y8JiegA;Z^JaXt({~^#AVKJnX8U%s!E8oLdvXXu|I$}Gf_-Ku{wE!v1!e#ZpaxXXO+%-IP63@9IvI3Q z=%%2RKr4oJ5?T?oLTCk;5n)D%nQ_eUFf$Cz5Hy3(3_#Nd4F~F8sC%IP2z58qT~PlC zRVP#*pn4BgJ5+5@wPN}mrvJcn3#Q*<`VFRELHQEOW+x zih3v>L;ei%N08S+{ww4UA+LqJ2J#1x{Q_AvWcMMv2ieb%RY7(a(n?4xAT5Wq4AN3a z?_laSrb;kXjHz3gD#FxHn7Rqcbw~;!xdurAB>9m12jZ&`=Rtf0;#`O?L!1L~HYR6% z36oivyokvQn9PLeJVfabor5S1qO%aCLi8_)QXri583<29_#=cTAp8Ln$(TsOL;@y` zW8xSl;vx7Rf;b3bAvg-b5eS$N#9%xco!AgRU5K!Jsn+oiONt0ecLr!N6(^tir%b41A6O zJM`P4-v<55(Z3A+OTo1Q_cL&pfV&9XPrRGnmdTMxJS5~p2P8W5ZtLxEgaQKX< zF6zz>kE{QOxnhfNTi*do{g!ccFKw87KPfDi%S|#PHhTST9$#+h-Qtzd@c#C9rQ}m} zlouL-duCj;Yx;!0@t^t`ck50YU0y-8V*NKMpo!3%{B{1i>E-FRpoVc&8KvYo`4pGh z#FzyG_bp6B=X(_T&ZR|6(+fGh?MBwdDQ|sW-S}d|5yOTDQK9Qd`|W>k^E6p-<5+m6 zOVTi}t5C0evVApc)Y0T-MW=yF*Z0y++Of0(vkqr|+e5>!#=WU;cK* z<%zX%36xONuuH_r^^I?=QhKaeov~$F!?>kICZu^+EnHrB&9iWJcJnQ838c?FmlJC> z)Xca?=_#w;6vrw(H+-b7WTjk5HX~x{=j4ktx-#lY(@699+QO7(uau2CN{6?3gi~pN zBI;ImsCAZYEz|hc;LB1{VnPn@w~pk{SQ+m z#l;x24ZF|TiUSf($6jl%q}?Xhnd#ewY`h!zI)i^SzsBCdlg7?1%O$E!%FG!t)+-a8 zw^lys2r&&l!7BA0%;oJS0@H`6nGJRC1BSb^G7ko+o`)X&{Nj_PH*H(k=SrNJ<*Uc+ z>Q^k@=hMGs^LEh@??2wHp$|pV?~@su-2!rY7oIK5Gjm(SZAqkFXs|P;SZ8>LoLD?` w@^~uqdL+;3?|}Rt9gleRs#%)IHo;nB|GoM;0Wme$wEzGB literal 0 HcmV?d00001 diff --git a/tests/typ/bugs/mat-aug-color.typ b/tests/typ/bugs/mat-aug-color.typ new file mode 100644 index 00000000..c2e617d6 --- /dev/null +++ b/tests/typ/bugs/mat-aug-color.typ @@ -0,0 +1,9 @@ +// https://github.com/typst/typst/issues/2268 +// The augment line should be of the same color as the text +#set text( + font: "New Computer Modern", + lang: "en", + fill: yellow, +) + +$mat(augment: #1, M, v) arrow.r.squiggly mat(augment: #1, R, b)$