From 4a8367e90add92a0a316bcc258e39d522b484c25 Mon Sep 17 00:00:00 2001
From: Nazar Serhiichuk <43041209+G1gg1L3s@users.noreply.github.com>
Date: Wed, 4 Jun 2025 11:13:39 +0300
Subject: [PATCH] Fix Ukrainian secondary smart quotes (#6372)

---
 crates/typst-library/src/text/smartquote.rs |   3 ++-
 tests/ref/smartquote-uk.png                 | Bin 0 -> 1971 bytes
 tests/suite/text/smartquote.typ             |   4 ++++
 3 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 tests/ref/smartquote-uk.png

diff --git a/crates/typst-library/src/text/smartquote.rs b/crates/typst-library/src/text/smartquote.rs
index 270d8f0f3..09cefd013 100644
--- a/crates/typst-library/src/text/smartquote.rs
+++ b/crates/typst-library/src/text/smartquote.rs
@@ -247,8 +247,9 @@ impl<'s> SmartQuotes<'s> {
             "es" if matches!(region, Some("ES") | None) => ("“", "”", "«", "»"),
             "hu" | "pl" | "ro" => ("’", "’", "„", "”"),
             "no" | "nb" | "nn" if alternative => low_high,
-            "no" | "nb" | "nn" | "uk" => ("’", "’", "«", "»"),
+            "no" | "nb" | "nn" => ("’", "’", "«", "»"),
             "ru" => ("„", "“", "«", "»"),
+            "uk" => ("“", "”", "«", "»"),
             "el" => ("‘", "’", "«", "»"),
             "he" => ("’", "’", "”", "”"),
             "hr" => ("‘", "’", "„", "”"),
diff --git a/tests/ref/smartquote-uk.png b/tests/ref/smartquote-uk.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ac1c032e583b0c3a691097b9b6fadaeaaaa7e68
GIT binary patch
literal 1971
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
FV1f-SyG;N9

literal 0
HcmV?d00001

diff --git a/tests/suite/text/smartquote.typ b/tests/suite/text/smartquote.typ
index f2af93ceb..6eab35076 100644
--- a/tests/suite/text/smartquote.typ
+++ b/tests/suite/text/smartquote.typ
@@ -46,6 +46,10 @@
 #set text(lang: "ru")
 "Лошадь не ест салат из огурцов" - это была первая фраза, сказанная по 'телефону'.
 
+--- smartquote-uk ---
+#set text(lang: "uk")
+"Кінь не їсть огірковий салат" — перше речення, коли-небудь вимовлене по 'телефону'.
+
 --- smartquote-it ---
 #set text(lang: "it")
 "Il cavallo non mangia insalata di cetrioli" è stata la prima frase pronunciata al 'telefono'.