Include Cascadia Mono in-package, switch to it by default (#5505)

It was brought to our attention that shipping a font with ligatures as our default font could be an accessibility issue for the visually-impaired. Unfortunately, we don't have a renderer setting to disable ligatures (#759). Fortunately however, we DO already have a version of Cascadia that doesn't have ligatures. If we ship that and set it as our default font, we'll at least let people _opt_ to have ligatures enabled by switching from `Cascadia Mono` to `Cascadia Code`. ## PR Checklist * [x] Closes internal discussion * [x] CLA signed * [ ] Tests added/passed * [x] Requires documentation to be updated * [x] I've discussed this with core contributors already.
microsoft · Apr 27, 2020 · 6cc6ee3 · 6cc6ee3
1 parent 4b4a006
commit 6cc6ee3
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 7 deletions.
diff --git a/doc/cascadia/SettingsSchema.md b/doc/cascadia/SettingsSchema.md
@@ -43,7 +43,7 @@ Properties listed below are specific to each unique profile.
 | `cursorColor` | Optional | String | | Sets the cursor color of the profile. Overrides `cursorColor` set in color scheme if `colorscheme` is set. Uses hex color format: `"#rrggbb"`. |
 | `cursorHeight` | Optional | Integer | | Sets the percentage height of the cursor starting from the bottom. Only works when `cursorShape` is set to `"vintage"`. Accepts values from 25-100. |
 | `cursorShape` | Optional | String | `bar` | Sets the cursor shape for the profile. Possible values: `"vintage"` ( &#x2583; ), `"bar"` ( &#x2503; ), `"underscore"` ( &#x2581; ), `"filledBox"` ( &#x2588; ), `"emptyBox"` ( &#x25AF; ) |
-| `fontFace` | Optional | String | `Cascadia Code` | Name of the font face used in the profile. We will try to fallback to Consolas if this can't be found or is invalid. |
+| `fontFace` | Optional | String | `Cascadia Mono` | Name of the font face used in the profile. We will try to fallback to Consolas if this can't be found or is invalid. |
 | `fontSize` | Optional | Integer | `12` | Sets the font size. |
 | `foreground` | Optional | String | | Sets the foreground color of the profile. Overrides `foreground` set in color scheme if `colorscheme` is set. Uses hex color format: `#rgb` or `"#rrggbb"`. |
 | `hidden` | Optional | Boolean | `false` | If set to true, the profile will not appear in the list of profiles. This can be used to hide default profiles and dynamically generated profiles, while leaving them in your settings file. |

diff --git a/doc/cascadia/profiles.schema.json b/doc/cascadia/profiles.schema.json
@@ -595,7 +595,7 @@
           "type": "boolean"
         },
         "fontFace": {
-          "default": "Cascadia Code",
+          "default": "Cascadia Mono",
           "description": "Name of the font face used in the profile.",
           "type": "string"
         },

diff --git a/res/CascadiaMono.ttf b/res/CascadiaMono.ttf
diff --git a/res/README.md b/res/README.md
@@ -17,5 +17,5 @@ Please consult the [license](https://raw.githubusercontent.com/microsoft/cascadi
 
 ### Fonts Included
 
-* Cascadia Code
+* Cascadia Code, Cascadia Mono
    * from microsoft/cascadia-code@d733599504811e8f3969de20368817d20e162dba
diff --git a/src/cascadia/CascadiaPackage/Package.appxmanifest b/src/cascadia/CascadiaPackage/Package.appxmanifest
@@ -74,6 +74,7 @@
     <uap7:Extension Category="windows.sharedFonts">
       <uap7:SharedFonts>
         <uap4:Font File="Cascadia.ttf" />
+        <uap4:Font File="CascadiaMono.ttf" />
       </uap7:SharedFonts>
     </uap7:Extension>
   </Extensions>

diff --git a/src/cascadia/CascadiaResources.build.items b/src/cascadia/CascadiaResources.build.items
@@ -11,6 +11,10 @@
       <DeploymentContent>true</DeploymentContent>
       <Link>%(RecursiveDir)%(FileName)%(Extension)</Link>
     </Content>
+    <Content Include="$(OpenConsoleDir)res\CascadiaMono.ttf" Condition="'$(WindowsTerminalReleaseBuild)'=='true'">
+      <DeploymentContent>true</DeploymentContent>
+      <Link>%(RecursiveDir)%(FileName)%(Extension)</Link>
+    </Content>
     <!-- Profile Icons -->
     <Content Include="$(OpenConsoleDir)src\cascadia\CascadiaPackage\ProfileIcons\**\*">
       <DeploymentContent>true</DeploymentContent>

diff --git a/src/cascadia/TerminalApp/defaults-universal.json b/src/cascadia/TerminalApp/defaults-universal.json
@@ -37,7 +37,7 @@
             "colorScheme": "Vintage",
             "cursorColor": "#FFFFFF",
             "cursorShape": "bar",
-            "fontFace": "Cascadia Code",
+            "fontFace": "Cascadia Mono",
             "icon": "ms-appx:///ProfileIcons/{550ce7b8-d500-50ad-8a1a-c400c3262db3}.png",
             "padding": "8, 8, 8, 8",
             "snapOnInput": true,

diff --git a/src/cascadia/TerminalApp/defaults.json b/src/cascadia/TerminalApp/defaults.json
@@ -35,7 +35,7 @@
             "antialiasingMode": "grayscale",
             "closeOnExit": "graceful",
             "cursorShape": "bar",
-            "fontFace": "Cascadia Code",
+            "fontFace": "Cascadia Mono",
             "fontSize": 12,
             "hidden": false,
             "historySize": 9001,
@@ -53,7 +53,7 @@
             "antialiasingMode": "grayscale",
             "closeOnExit": "graceful",
             "cursorShape": "bar",
-            "fontFace": "Cascadia Code",
+            "fontFace": "Cascadia Mono",
             "fontSize": 12,
             "hidden": false,
             "historySize": 9001,

diff --git a/src/inc/DefaultSettings.h b/src/inc/DefaultSettings.h
@@ -30,7 +30,7 @@ constexpr short DEFAULT_HISTORY_SIZE = 9001;
 #pragma warning(push)
 #pragma warning(disable : 26426)
 // TODO GH 2674, don't disable this warning, move to std::wstring_view or something like that.
-const std::wstring DEFAULT_FONT_FACE{ L"Cascadia Code" };
+const std::wstring DEFAULT_FONT_FACE{ L"Cascadia Mono" };
 constexpr int DEFAULT_FONT_SIZE = 12;
 
 constexpr int DEFAULT_ROWS = 30;