From 46727878da083eb8186373434997f5f7403cbb66 Mon Sep 17 00:00:00 2001 From: Hong Jiarong Date: Fri, 31 Jan 2025 18:02:42 +0800 Subject: [PATCH] Disable cjk_latin_spacing in raw by default (#5753) --- crates/typst-library/src/text/raw.rs | 1 + ...sue-5760-disable-cjk-latin-spacing-in-raw.png | Bin 0 -> 2011 bytes tests/suite/text/raw.typ | 11 +++++++++++ 3 files changed, 12 insertions(+) create mode 100644 tests/ref/issue-5760-disable-cjk-latin-spacing-in-raw.png diff --git a/crates/typst-library/src/text/raw.rs b/crates/typst-library/src/text/raw.rs index 01d6d8f01..5bb21e43a 100644 --- a/crates/typst-library/src/text/raw.rs +++ b/crates/typst-library/src/text/raw.rs @@ -475,6 +475,7 @@ impl ShowSet for Packed { out.set(TextElem::set_hyphenate(Hyphenate(Smart::Custom(false)))); out.set(TextElem::set_size(TextSize(Em::new(0.8).into()))); out.set(TextElem::set_font(FontList(vec![FontFamily::new("DejaVu Sans Mono")]))); + out.set(TextElem::set_cjk_latin_spacing(Smart::Custom(None))); if self.block(styles) { out.set(ParElem::set_justify(false)); } diff --git a/tests/ref/issue-5760-disable-cjk-latin-spacing-in-raw.png b/tests/ref/issue-5760-disable-cjk-latin-spacing-in-raw.png new file mode 100644 index 0000000000000000000000000000000000000000..9624273329b4df3fcd229acdef4757934cbd02f9 GIT binary patch literal 2011 zcmV<12PF83P)6J^w;o7Q? z8Lh{=3e_Xmiqr>AbRBLVX&SuMxBib$e{I=Yr>mh&*^Q&)6LvAo#ix{*Po3*6^M$;k zveVqsW9#BC5{iU4{G=>JY0o{Y>OFa|d5-|Sp?U>hW83AgW(TzU>NVYmtIRw055BwH zeyl7Gw7uxKHSdt~ylQyU4nTWb+I1hLu@9OpiJ<4som*O3I)DEBa5x+c230E6f&~i_ zuNZN;Eqe=;EwKSC92542A(eo&>g-~YMu)i>WB}FO>iauUcnVwhG3bmA9Rqxe>dXGI z?(4?7&(6I0*CnD6yU&(Yy|TLhOh(nxQ<|dXr``~qzi{wTZe&%@3CF~(SkV5^#M{T7 z2lQ)2PYcjZ##+7x7o8o@!C|v${T6R)2fsOSL=S$j()P}m%hV-mErH<6p zRDz6*42?!3DiC6e0w2{JMl*GvzG_Y!B>n*KK{;cF9gDVf|m*(S2~Xc&A%l3(pr&` z06qITdaUp_{qir285=FR2LpNoHO})FT^Fv1vqLM^!Xo1FvWXfp_|!Q%Gc&WJqhkut z;cn+N57nx);h#6mGOh7Yo8Ozj{v==D<>%9%%i{MQ6v32J@;jUz!Up6#8u=(N| zF(h9vekL3Z6Qq{C8r!)t(z~r48>&Ae*j4w~V6 z3~gh^H)BUjtp^IlSpv(x0$+z_YS3!6Iy*ai&YU^y$Ht}}w$p>Qc`XF`@qR!Ph;;mW z=b@7~j_{lmZA4?z$cu%KkvEwerRb@9 z0{X9~TsR_ym5S6@v1j7LW0P(C-4OGUx=XnAyambqq^hGS{6JPR3&;&dlX-Q0Kk`op=GnAku z0ts4zmPLY=pe1No9zf6&J^f6<@uf4pjK|~Y?CgxIY-nhhX+Og6V1>{|id18&!jz=h zR3F<6F@)|waUh=9E@~^q1ahVYk;IfIu9BIH%`-}X_T$S4ZJjLWu)~R>LwW>9MnhJc zHNS8QA3c)2`|f>oZf@s|>%0PGE=Kxx(tHvd5y|fPT4`^m|Xf|Y!nBdK{ zU`^jEU65#{<78>FpeK5@=%mpf^Yov7iS<|PouV{H_vE9h{R4Vt;g-EWYhPQ!-rKBB z1dZljwrp8mULJ=omn%Izedo@dNrDCplQdtbE!wN=>?8;~?GZ301~;W9uOw)po3}XyHcqGWe5ZLEB4CvS@;g#@L}r<3Q_{tYrLJa`N$+(}G^TdiC9C zQiK%uRoSLVYtgVUb1)T}v{;=#>K+CYSXm8;)1(w3uP+T$VWm;hh-t<$=8yWNCte1k z(9^fI(mV!s)@BhLYRQRncuA)YO^m+?N zS8-HSE8E>@Qmj011!$*#oQxqJVytp;ClW!E#91z3vGJ{v=g8*tfC3~7y?S*1ZDnbC z#RuYX$Eu@Pqv0QlrAA`ZL zfB$}h{QP{aR@>OvNRD2#Xc2ph#ge3th9-Q;9!<01e6 literal 0 HcmV?d00001 diff --git a/tests/suite/text/raw.typ b/tests/suite/text/raw.typ index 1ba216302..a7f58a8d0 100644 --- a/tests/suite/text/raw.typ +++ b/tests/suite/text/raw.typ @@ -676,6 +676,17 @@ a b c -------------------- `code` ``` +--- issue-5760-disable-cjk-latin-spacing-in-raw --- + +```typ +#let hi = "你好world" +``` + +#show raw: set text(cjk-latin-spacing: auto) +```typ +#let hi = "你好world" +``` + --- raw-theme-set-to-auto --- ```typ #let hi = "Hello World"