From 4827f28a940b9610e55afb888ddde11e240caa20 Mon Sep 17 00:00:00 2001
From: Jeremie Knuesel <knuesel@gmail.com>
Date: Thu, 26 Sep 2024 11:09:32 +0200
Subject: [PATCH] Fix smartquotes for Swiss French (#4992)

---
 crates/typst/src/text/smartquote.rs |   8 ++++++--
 tests/ref/smartquote-fr-ch.png      | Bin 0 -> 2353 bytes
 tests/suite/text/smartquote.typ     |   4 ++++
 3 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 tests/ref/smartquote-fr-ch.png

diff --git a/crates/typst/src/text/smartquote.rs b/crates/typst/src/text/smartquote.rs
index 0bcccf41c..9b48c03ac 100644
--- a/crates/typst/src/text/smartquote.rs
+++ b/crates/typst/src/text/smartquote.rs
@@ -207,8 +207,8 @@ impl<'s> SmartQuotes<'s> {
     /// Currently, the supported languages are: English, Czech, Danish, German,
     /// Swiss / Liechtensteinian German, Estonian, Icelandic, Italian, Latin,
     /// Lithuanian, Latvian, Slovak, Slovenian, Spanish, Bosnian, Finnish,
-    /// Swedish, French, Hungarian, Polish, Romanian, Japanese, Traditional
-    /// Chinese, Russian, Norwegian, and Hebrew.
+    /// Swedish, French, Swiss French, Hungarian, Polish, Romanian, Japanese,
+    /// Traditional Chinese, Russian, Norwegian, and Hebrew.
     ///
     /// For unknown languages, the English quotes are used as fallback.
     pub fn get(
@@ -227,6 +227,10 @@ impl<'s> SmartQuotes<'s> {
                 false => ("‹", "›", "«", "»"),
                 true => low_high,
             },
+            "fr" if matches!(region, Some("CH")) => match alternative {
+                false => ("‹\u{202F}", "\u{202F}›", "«\u{202F}", "\u{202F}»"),
+                true => default,
+            },
             "cs" | "da" | "de" | "sk" | "sl" if alternative => ("›", "‹", "»", "«"),
             "cs" | "de" | "et" | "is" | "lt" | "lv" | "sk" | "sl" => low_high,
             "da" => ("‘", "’", "“", "”"),
diff --git a/tests/ref/smartquote-fr-ch.png b/tests/ref/smartquote-fr-ch.png
new file mode 100644
index 0000000000000000000000000000000000000000..30e91e401884146a28a43ae638e714b60aab5a2e
GIT binary patch
literal 2353
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
X{$y%WD784<00000NkvXXu0mjfjya5s

literal 0
HcmV?d00001

diff --git a/tests/suite/text/smartquote.typ b/tests/suite/text/smartquote.typ
index f5442ffd0..fe4e8c85c 100644
--- a/tests/suite/text/smartquote.typ
+++ b/tests/suite/text/smartquote.typ
@@ -22,6 +22,10 @@
 #set text(lang: "fr")
 "Le cheval ne mange pas de salade de concombres" est la première phrase jamais prononcée au 'téléphone'.
 
+--- smartquote-fr-ch ---
+#set text(lang: "fr", region: "CH")
+"Le cheval ne mange pas de salade de concombres" est la première phrase jamais prononcée au 'téléphone'.
+
 --- smartquote-fi ---
 #set text(lang: "fi")
 "Hevonen ei syö kurkkusalaattia" oli ensimmäinen koskaan 'puhelimessa' lausuttu lause.