Skip to content

Commit 5ab2bcc

Browse files
authored
Rollup merge of #66602 - GuillaumeGomez:revert-font, r=GuillaumeGomez
Revert "Update Source Code Pro and include italics" This reverts commit ea9519b.
2 parents d7bb37d + d0b67dd commit 5ab2bcc

9 files changed

+9
-22
lines changed

src/librustdoc/html/render.rs

+2-4
Original file line numberDiff line numberDiff line change
@@ -697,12 +697,10 @@ themePicker.onblur = handleThemeButtonsBlur;
697697
static_files::source_serif_pro::ITALIC)?;
698698
write(cx.dst.join("SourceSerifPro-LICENSE.md"),
699699
static_files::source_serif_pro::LICENSE)?;
700-
write(cx.dst.join("SourceCodePro-Regular.ttf.woff"),
700+
write(cx.dst.join("SourceCodePro-Regular.woff"),
701701
static_files::source_code_pro::REGULAR)?;
702-
write(cx.dst.join("SourceCodePro-Semibold.ttf.woff"),
702+
write(cx.dst.join("SourceCodePro-Semibold.woff"),
703703
static_files::source_code_pro::SEMIBOLD)?;
704-
write(cx.dst.join("SourceCodePro-It.ttf.woff"),
705-
static_files::source_code_pro::ITALIC)?;
706704
write(cx.dst.join("SourceCodePro-LICENSE.txt"),
707705
static_files::source_code_pro::LICENSE)?;
708706
write(cx.dst.join("LICENSE-MIT.txt"),

src/librustdoc/html/static/COPYRIGHT.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ included, and carry their own copyright notices and license terms:
2323
Copyright (c) Nicolas Gallagher and Jonathan Neal.
2424
Licensed under the MIT license (see LICENSE-MIT.txt).
2525

26-
* Source Code Pro (SourceCodePro-Regular.ttf.woff,
27-
SourceCodePro-Semibold.ttf.woff, SourceCodePro-It.ttf.woff):
26+
* Source Code Pro (SourceCodePro-Regular.woff, SourceCodePro-Semibold.woff):
2827

2928
Copyright 2010, 2012 Adobe Systems Incorporated (http://www.adobe.com/),
3029
with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

src/librustdoc/html/static/rustdoc.css

+2-8
Original file line numberDiff line numberDiff line change
@@ -39,19 +39,13 @@
3939
font-weight: 400;
4040
/* Avoid using locally installed font because bad versions are in circulation:
4141
* see https://github.com/rust-lang/rust/issues/24355 */
42-
src: url("SourceCodePro-Regular.ttf.woff") format('woff');
43-
}
44-
@font-face {
45-
font-family: 'Source Code Pro';
46-
font-style: italic;
47-
font-weight: 400;
48-
src: url("SourceCodePro-It.ttf.woff") format('woff');
42+
src: url("SourceCodePro-Regular.woff") format('woff');
4943
}
5044
@font-face {
5145
font-family: 'Source Code Pro';
5246
font-style: normal;
5347
font-weight: 600;
54-
src: url("SourceCodePro-Semibold.ttf.woff") format('woff');
48+
src: url("SourceCodePro-Semibold.woff") format('woff');
5549
}
5650

5751
* {

src/librustdoc/html/static_files.rs

+4-8
Original file line numberDiff line numberDiff line change
@@ -96,15 +96,11 @@ pub mod source_serif_pro {
9696

9797
/// Files related to the Source Code Pro font.
9898
pub mod source_code_pro {
99-
/// The file `SourceCodePro-Regular.ttf.woff`, the Regular variant of the Source Code Pro font.
100-
pub static REGULAR: &'static [u8] = include_bytes!("static/SourceCodePro-Regular.ttf.woff");
99+
/// The file `SourceCodePro-Regular.woff`, the Regular variant of the Source Code Pro font.
100+
pub static REGULAR: &'static [u8] = include_bytes!("static/SourceCodePro-Regular.woff");
101101

102-
/// The file `SourceCodePro-Semibold.ttf.woff`, the Semibold variant of the Source Code Pro
103-
/// font.
104-
pub static SEMIBOLD: &'static [u8] = include_bytes!("static/SourceCodePro-Semibold.ttf.woff");
105-
106-
/// The file `SourceCodePro-It.ttf.woff`, the Italic variant of the Source Code Pro font.
107-
pub static ITALIC: &'static [u8] = include_bytes!("static/SourceCodePro-It.ttf.woff");
102+
/// The file `SourceCodePro-Semibold.woff`, the Semibold variant of the Source Code Pro font.
103+
pub static SEMIBOLD: &'static [u8] = include_bytes!("static/SourceCodePro-Semibold.woff");
108104

109105
/// The file `SourceCodePro-LICENSE.txt`, the license text of the Source Code Pro font.
110106
pub static LICENSE: &'static [u8] = include_bytes!("static/SourceCodePro-LICENSE.txt");

0 commit comments

Comments
 (0)