patch 9.0.0842: Unicode range for Apple SF symbols is outdated

Problem:    Unicode range for Apple SF symbols is outdated.
Solution:   Update to SF Symbols 4. (Yee Cheng Chin, closes #11474)

diff --git a/src/mbyte.c b/src/mbyte.c
index 537c47bbe4a617505328ca3e67406e7263d18c54..aa2b177ce67264f220f95ba39ee3cc3cff660047 100644 (file)
--- a/src/mbyte.c
+++ b/src/mbyte.c
@@ -1565,12 +1565,27 @@ utf_char2cells(int c)
        {0x1f6f3, 0x1f6f3}
 
 #ifdef MACOS_X
-       // Include SF Symbols characters, which should be rendered as
-       // double-width. All of them are in the Supplementary Private Use
-       // Area-B range. The exact range was determined by downloading the "SF
-       // Symbols" app from Apple, and then selecting all symbols, copying
-       // them out, and inspecting the unicode values of them.
-       , {0x100000, 0x100d7f}
+       // Include SF Symbols 4 characters, which should be rendered as
+       // double-width.  SF Symbols is an Apple-specific set of symbols and
+       // icons for use in Apple operating systems.  They are included as
+       // glyphs as part of the default San Francisco fonts shipped with
+       // macOS.  The current version is SF Symbols 4.
+       //
+       // These Apple-specific glyphs are not part of standard Unicode, and
+       // all of them are in the Supplementary Private Use Area-B range. The
+       // exact range was determined by downloading the 'SF Symbols 4' app
+       // from Apple (https://developer.apple.com/sf-symbols/), and then
+       // selecting all symbols, copying them out, and inspecting the unicode
+       // values of them.
+       //
+       // Note that these symbols are of varying widths, as they are symbols
+       // representing differents things ranging from a simple gear icon to an
+       // airplane. Some of them are in fact wider than double-width, but Vim
+       // doesn't support non-fixed-width font, and tagging them as
+       // double-width is the best way to handle them.
+       //
+       // Also see https://en.wikipedia.org/wiki/San_Francisco_(sans-serif_typeface)#SF_Symbols
+       , {0x100000, 0x1018c7}
 #endif
     };
 

diff --git a/src/version.c b/src/version.c
index 0e59a7874cfef4f8d41535eabfcf2cc8d2c9dde8..d46aebb6fe5d23bf156d9a2037cea675d8f717bf 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    842,
 /**/
     841,
 /**/