From d40d5cd9d9bfebd1f06f8d0505a1efb6354f336c Mon Sep 17 00:00:00 2001
From: Kuldeep LNU <kuldeeplnu@microsoft.com>
Date: Thu, 27 Feb 2025 15:52:40 +0530
Subject: [PATCH 1/3] Adding simsun-extg font to globalUserInterface

---
 .../Fonts/GlobalUserInterface.CompositeFont                | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Fonts/GlobalUserInterface.CompositeFont b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Fonts/GlobalUserInterface.CompositeFont
index b41e0c71610..74332c68f11 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Fonts/GlobalUserInterface.CompositeFont
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Fonts/GlobalUserInterface.CompositeFont
@@ -1716,8 +1716,11 @@
             -->
             <!-- CHS -->
             <FontFamilyMap
-                Unicode     = "20000-2A6DF"
-                Language    = "zh-Hans"
+                Unicode     = "2EBF0-323AF"
+                Target      = "SimSun-ExtG"
+                Scale       = "1.0" />
+            <FontFamilyMap
+                Unicode     = "20000-2EBE0"
                 Target      = "SimSun-ExtB"
                 Scale       = "1.0" />
             <!-- CHT -->

From 560265d9523f32eecfa200cd55bf68651c94474d Mon Sep 17 00:00:00 2001
From: Kuldeep LNU <kuldeeplnu@microsoft.com>
Date: Wed, 2 Apr 2025 14:53:07 +0530
Subject: [PATCH 2/3] fixing the unicode range for SimSun-ExtG

---
 .../Fonts/GlobalUserInterface.CompositeFont        | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Fonts/GlobalUserInterface.CompositeFont b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Fonts/GlobalUserInterface.CompositeFont
index 74332c68f11..e50ece10b67 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Fonts/GlobalUserInterface.CompositeFont
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Fonts/GlobalUserInterface.CompositeFont
@@ -1715,10 +1715,6 @@
             - MS Gothic: 304
             -->
             <!-- CHS -->
-            <FontFamilyMap
-                Unicode     = "2EBF0-323AF"
-                Target      = "SimSun-ExtG"
-                Scale       = "1.0" />
             <FontFamilyMap
                 Unicode     = "20000-2EBE0"
                 Target      = "SimSun-ExtB"
@@ -1807,7 +1803,10 @@
                 Target      = "SimSun-ExtB"
                 Scale       = "1.0" />
 
-            <!-- (unassigned)                  2EBF0-2F7FF -->
+            <FontFamilyMap
+                Unicode     = "2EBF0-2EE5F"
+                Target      = "SimSun-ExtG"
+                Scale       = "1.0" />
 
             <!-- CJK Compatibility Ideographs Supplement 2F800-2FA1F -->
             <!-- Vista, Win7, Win8:
@@ -1853,7 +1852,10 @@
 
             <!-- (unassigned)                  2FA20-2FFFF -->
 
-            <!-- (unassigned)                  30000-3FFFF -->
+            <FontFamilyMap
+                Unicode     = "30000-323AF"
+                Target      = "SimSun-ExtG"
+                Scale       = "1.0" />
 
             <!-- Ignoring planes 4 to 16 -->
 

From c53f365fdb965f0e1606aa1807b228c966e470ac Mon Sep 17 00:00:00 2001
From: Kuldeep LNU <kuldeeplnu@microsoft.com>
Date: Wed, 2 Apr 2025 15:14:40 +0530
Subject: [PATCH 3/3] fixing range for SimSun-ExtB

---
 .../Fonts/GlobalUserInterface.CompositeFont   | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Fonts/GlobalUserInterface.CompositeFont b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Fonts/GlobalUserInterface.CompositeFont
index e50ece10b67..215b71ae385 100644
--- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/Fonts/GlobalUserInterface.CompositeFont
+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/Fonts/GlobalUserInterface.CompositeFont
@@ -1716,7 +1716,8 @@
             -->
             <!-- CHS -->
             <FontFamilyMap
-                Unicode     = "20000-2EBE0"
+                Unicode     = "20000-2A6DF"
+                Language    = "zh-Hans"
                 Target      = "SimSun-ExtB"
                 Scale       = "1.0" />
             <!-- CHT -->
@@ -1744,9 +1745,13 @@
                 Target      = "MingLiU-ExtB"
                 Scale       = "1.0" />
             <!-- Other -->
+            <!-- CHT/KO/All
+                MingLiU-ExtB is not in UapFonts so Yu Gothic is specified as a fallback.
+                YaHei, Simsun-ExtB, and MingLiU_HKSCS-ExtB are included at the end of this catch-all category because each includes some characters
+                not present in other fonts. -->
             <FontFamilyMap
                 Unicode     = "20000-2A6DF"
-                Target      = "MingLiU-ExtB"
+                Target      = "MingLiU-ExtB, Yu Gothic UI, Microsoft YaHei UI, Simsun-ExtB, MingLiU_HKSCS-ExtB"
                 Scale       = "1.0" />
 
             <!-- (unassigned)                  2A6E0-2A6FF -->
@@ -1789,9 +1794,13 @@
                 Target      = "MingLiU-ExtB"
                 Scale       = "1.0" />
             <!-- Other -->
+            <!-- All
+                MingLiU-ExtB is not in UapFonts so Yu Gothic is specified as a fallback.
+                YaHei, Simsun-ExtB, and MingLiU_HKSCS-ExtB are included at the end of this catch-all category because each includes some characters
+                not present in other fonts. -->
             <FontFamilyMap
                 Unicode     = "2A700-2B81F"
-                Target      = "MingLiU-ExtB"
+                Target      = "MingLiU-ExtB, Yu Gothic UI, Microsoft YaHei UI, Simsun-ExtB, MingLiU_HKSCS-ExtB"
                 Scale       = "1.0" />
 
             <!--
@@ -1800,7 +1809,7 @@
             -->
             <FontFamilyMap
                 Unicode     = "2B820-2EBEF"
-                Target      = "SimSun-ExtB"
+                Target      = "SimSun-ExtB, Yu Gothic UI, Yu Gothic, Microsoft YaHei UI, Microsoft YaHei"
                 Scale       = "1.0" />
 
             <FontFamilyMap
@@ -1847,7 +1856,7 @@
             <!-- Other -->
             <FontFamilyMap
                 Unicode     = "2F800-2FA1F"
-                Target      = "Yu Gothic UI, Meiryo UI, Meiryo, MingLiU-ExtB"
+                Target      = "Yu Gothic UI, Meiryo UI, Meiryo, MingLiU-ExtB, MingLiU_MSCS-ExtB"
                 Scale       = "1.0" />
 
             <!-- (unassigned)                  2FA20-2FFFF -->