diff --git a/doc/cascadia/SettingsSchema.md b/doc/cascadia/SettingsSchema.md index bb57aff657..48b0b73345 100644 --- a/doc/cascadia/SettingsSchema.md +++ b/doc/cascadia/SettingsSchema.md @@ -42,7 +42,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"` ( ▃ ), `"bar"` ( ┃ ), `"underscore"` ( ▁ ), `"filledBox"` ( █ ), `"emptyBox"` ( ▯ ) | -| `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 index 2484c49976..70791b8eca 100644 --- a/doc/cascadia/profiles.schema.json +++ b/doc/cascadia/profiles.schema.json @@ -579,7 +579,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 new file mode 100644 index 0000000000..2f582ead9d Binary files /dev/null and b/res/CascadiaMono.ttf differ diff --git a/res/README.md b/res/README.md index 12ac3ea5b7..4c36c9fb5b 100644 --- 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 index d50ce857c1..ad429698b6 100644 --- a/src/cascadia/CascadiaPackage/Package.appxmanifest +++ b/src/cascadia/CascadiaPackage/Package.appxmanifest @@ -74,6 +74,7 @@ + diff --git a/src/cascadia/CascadiaResources.build.items b/src/cascadia/CascadiaResources.build.items index 2df326e05e..49996fc9c6 100644 --- a/src/cascadia/CascadiaResources.build.items +++ b/src/cascadia/CascadiaResources.build.items @@ -11,6 +11,10 @@ true %(RecursiveDir)%(FileName)%(Extension) + + true + %(RecursiveDir)%(FileName)%(Extension) + true diff --git a/src/cascadia/TerminalApp/defaults-universal.json b/src/cascadia/TerminalApp/defaults-universal.json index bec1a91390..e91b91f138 100644 --- 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 index 8a001cc6b3..1f72e7e3c1 100644 --- 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 index c152545611..08d39f4b0d 100644 --- 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;