Rollup merge of #65665 - tspiteri:italic-and-update-SourceCodePro, r=GuillaumeGomez
Update Source Code Pro and include italics Fixes #65502. A few notes: * As stated in #65502, this does increase the download size. * Since this PR changes the font set, I think docs.rs would have to be updated if this PR is merged. * The fonts have a double extension (.ttf.woff); this is to keep the names consistent with the upstream font release which does that to distinguish these from the .otf.woff files ([Source Code Pro otf renders poorly on older Windows system apps](https://github.com/adobe-fonts/source-code-pro/issues/25#issuecomment-9019600)).
This commit is contained in:
commit
423137b779
9 changed files with 22 additions and 9 deletions
|
@ -697,10 +697,12 @@ themePicker.onblur = handleThemeButtonsBlur;
|
|||
static_files::source_serif_pro::ITALIC)?;
|
||||
write(cx.dst.join("SourceSerifPro-LICENSE.md"),
|
||||
static_files::source_serif_pro::LICENSE)?;
|
||||
write(cx.dst.join("SourceCodePro-Regular.woff"),
|
||||
write(cx.dst.join("SourceCodePro-Regular.ttf.woff"),
|
||||
static_files::source_code_pro::REGULAR)?;
|
||||
write(cx.dst.join("SourceCodePro-Semibold.woff"),
|
||||
write(cx.dst.join("SourceCodePro-Semibold.ttf.woff"),
|
||||
static_files::source_code_pro::SEMIBOLD)?;
|
||||
write(cx.dst.join("SourceCodePro-It.ttf.woff"),
|
||||
static_files::source_code_pro::ITALIC)?;
|
||||
write(cx.dst.join("SourceCodePro-LICENSE.txt"),
|
||||
static_files::source_code_pro::LICENSE)?;
|
||||
write(cx.dst.join("LICENSE-MIT.txt"),
|
||||
|
|
|
@ -23,7 +23,8 @@ included, and carry their own copyright notices and license terms:
|
|||
Copyright (c) Nicolas Gallagher and Jonathan Neal.
|
||||
Licensed under the MIT license (see LICENSE-MIT.txt).
|
||||
|
||||
* Source Code Pro (SourceCodePro-Regular.woff, SourceCodePro-Semibold.woff):
|
||||
* Source Code Pro (SourceCodePro-Regular.ttf.woff,
|
||||
SourceCodePro-Semibold.ttf.woff, SourceCodePro-It.ttf.woff):
|
||||
|
||||
Copyright 2010, 2012 Adobe Systems Incorporated (http://www.adobe.com/),
|
||||
with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark
|
||||
|
|
BIN
src/librustdoc/html/static/SourceCodePro-It.ttf.woff
Normal file
BIN
src/librustdoc/html/static/SourceCodePro-It.ttf.woff
Normal file
Binary file not shown.
BIN
src/librustdoc/html/static/SourceCodePro-Regular.ttf.woff
Normal file
BIN
src/librustdoc/html/static/SourceCodePro-Regular.ttf.woff
Normal file
Binary file not shown.
Binary file not shown.
BIN
src/librustdoc/html/static/SourceCodePro-Semibold.ttf.woff
Normal file
BIN
src/librustdoc/html/static/SourceCodePro-Semibold.ttf.woff
Normal file
Binary file not shown.
Binary file not shown.
|
@ -39,13 +39,19 @@
|
|||
font-weight: 400;
|
||||
/* Avoid using locally installed font because bad versions are in circulation:
|
||||
* see https://github.com/rust-lang/rust/issues/24355 */
|
||||
src: url("SourceCodePro-Regular.woff") format('woff');
|
||||
src: url("SourceCodePro-Regular.ttf.woff") format('woff');
|
||||
}
|
||||
@font-face {
|
||||
font-family: 'Source Code Pro';
|
||||
font-style: italic;
|
||||
font-weight: 400;
|
||||
src: url("SourceCodePro-It.ttf.woff") format('woff');
|
||||
}
|
||||
@font-face {
|
||||
font-family: 'Source Code Pro';
|
||||
font-style: normal;
|
||||
font-weight: 600;
|
||||
src: url("SourceCodePro-Semibold.woff") format('woff');
|
||||
src: url("SourceCodePro-Semibold.ttf.woff") format('woff');
|
||||
}
|
||||
|
||||
* {
|
||||
|
|
|
@ -96,11 +96,15 @@ pub mod source_serif_pro {
|
|||
|
||||
/// Files related to the Source Code Pro font.
|
||||
pub mod source_code_pro {
|
||||
/// The file `SourceCodePro-Regular.woff`, the Regular variant of the Source Code Pro font.
|
||||
pub static REGULAR: &'static [u8] = include_bytes!("static/SourceCodePro-Regular.woff");
|
||||
/// The file `SourceCodePro-Regular.ttf.woff`, the Regular variant of the Source Code Pro font.
|
||||
pub static REGULAR: &'static [u8] = include_bytes!("static/SourceCodePro-Regular.ttf.woff");
|
||||
|
||||
/// The file `SourceCodePro-Semibold.woff`, the Semibold variant of the Source Code Pro font.
|
||||
pub static SEMIBOLD: &'static [u8] = include_bytes!("static/SourceCodePro-Semibold.woff");
|
||||
/// The file `SourceCodePro-Semibold.ttf.woff`, the Semibold variant of the Source Code Pro
|
||||
/// font.
|
||||
pub static SEMIBOLD: &'static [u8] = include_bytes!("static/SourceCodePro-Semibold.ttf.woff");
|
||||
|
||||
/// The file `SourceCodePro-It.ttf.woff`, the Italic variant of the Source Code Pro font.
|
||||
pub static ITALIC: &'static [u8] = include_bytes!("static/SourceCodePro-It.ttf.woff");
|
||||
|
||||
/// The file `SourceCodePro-LICENSE.txt`, the license text of the Source Code Pro font.
|
||||
pub static LICENSE: &'static [u8] = include_bytes!("static/SourceCodePro-LICENSE.txt");
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue