Skip to content

Commit 22f96d4

Browse files
authored
Rollup merge of rust-lang#60146 - Manishearth:font-update, r=QuietMisdreavus
Update fonts used by rustdoc Our version of Source Serif Pro is pretty old and is causing issues on Linux, see https://bugzilla.mozilla.org/show_bug.cgi?id=1545317 . I took this opportunity to update all of the fonts we use. r? @steveklabnik @QuietMisdreavus
2 parents 2524399 + cdca41d commit 22f96d4

12 files changed

+9
-14
lines changed

src/librustdoc/html/render.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -930,13 +930,13 @@ themePicker.onblur = handleThemeButtonsBlur;
930930
static_files::source_serif_pro::BOLD)?;
931931
write(cx.dst.join("SourceSerifPro-It.ttf.woff"),
932932
static_files::source_serif_pro::ITALIC)?;
933-
write(cx.dst.join("SourceSerifPro-LICENSE.txt"),
933+
write(cx.dst.join("SourceSerifPro-LICENSE.md"),
934934
static_files::source_serif_pro::LICENSE)?;
935935
write(cx.dst.join("SourceCodePro-Regular.woff"),
936936
static_files::source_code_pro::REGULAR)?;
937937
write(cx.dst.join("SourceCodePro-Semibold.woff"),
938938
static_files::source_code_pro::SEMIBOLD)?;
939-
write(cx.dst.join("SourceCodePro-LICENSE.txt"),
939+
write(cx.dst.join("SourceCodePro-LICENSE.md"),
940940
static_files::source_code_pro::LICENSE)?;
941941
write(cx.dst.join("LICENSE-MIT.txt"),
942942
static_files::LICENSE_MIT)?;

src/librustdoc/html/static/FiraSans-LICENSE.txt

+3-8
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
1-
Copyright (c) 2014, Mozilla Foundation https://mozilla.org/
2-
with Reserved Font Name Fira Sans.
3-
4-
Copyright (c) 2014, Mozilla Foundation https://mozilla.org/
5-
with Reserved Font Name Fira Mono.
6-
7-
Copyright (c) 2014, Telefonica S.A.
1+
Digitized data copyright (c) 2012-2015, The Mozilla Foundation and Telefonica S.A.
2+
with Reserved Font Name < Fira >,
83

94
This Font Software is licensed under the SIL Open Font License, Version 1.1.
105
This license is copied below, and is also available with a FAQ at:
@@ -24,7 +19,7 @@ with others.
2419

2520
The OFL allows the licensed fonts to be used, studied, modified and
2621
redistributed freely as long as they are not sold by themselves. The
27-
fonts, including any derivative works, can be bundled, embedded,
22+
fonts, including any derivative works, can be bundled, embedded,
2823
redistributed and/or sold with any software provided that any reserved
2924
names are not used by derivative works. The fonts and derivatives,
3025
however, cannot be released under any other type of license. The
94.7 KB
Binary file not shown.
89.2 KB
Binary file not shown.

src/librustdoc/html/static/SourceCodePro-LICENSE.txt renamed to src/librustdoc/html/static/SourceCodePro-LICENSE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ with others.
1818

1919
The OFL allows the licensed fonts to be used, studied, modified and
2020
redistributed freely as long as they are not sold by themselves. The
21-
fonts, including any derivative works, can be bundled, embedded,
21+
fonts, including any derivative works, can be bundled, embedded,
2222
redistributed and/or sold with any software provided that any reserved
2323
names are not used by derivative works. The fonts and derivatives,
2424
however, cannot be released under any other type of license. The
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

src/librustdoc/html/static/SourceSerifPro-LICENSE.txt renamed to src/librustdoc/html/static/SourceSerifPro-LICENSE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright 2014 Adobe Systems Incorporated (http://www.adobe.com/), with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of Adobe Systems Incorporated in the United States and/or other countries.
1+
Copyright 2014-2018 Adobe (http://www.adobe.com/), with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of Adobe in the United States and/or other countries.
22

33
This Font Software is licensed under the SIL Open Font License, Version 1.1.
44

Binary file not shown.

src/librustdoc/html/static_files.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ pub mod source_serif_pro {
9191
pub static ITALIC: &'static [u8] = include_bytes!("static/SourceSerifPro-It.ttf.woff");
9292

9393
/// The file `SourceSerifPro-LICENSE.txt`, the license text for the Source Serif Pro font.
94-
pub static LICENSE: &'static [u8] = include_bytes!("static/SourceSerifPro-LICENSE.txt");
94+
pub static LICENSE: &'static [u8] = include_bytes!("static/SourceSerifPro-LICENSE.md");
9595
}
9696

9797
/// Files related to the Source Code Pro font.
@@ -103,7 +103,7 @@ pub mod source_code_pro {
103103
pub static SEMIBOLD: &'static [u8] = include_bytes!("static/SourceCodePro-Semibold.woff");
104104

105105
/// The file `SourceCodePro-LICENSE.txt`, the license text of the Source Code Pro font.
106-
pub static LICENSE: &'static [u8] = include_bytes!("static/SourceCodePro-LICENSE.txt");
106+
pub static LICENSE: &'static [u8] = include_bytes!("static/SourceCodePro-LICENSE.md");
107107
}
108108

109109
/// Files related to the sidebar in rustdoc sources.

0 commit comments

Comments
 (0)