Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update fonts used by rustdoc #60146

Merged
merged 3 commits into from
Apr 23, 2019
Merged

Update fonts used by rustdoc #60146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e14819a
Update Source Serif Pro fonts to version 2.010
Manishearth Apr 21, 2019
6bafc58
Update Source Code Pro fonts to version 2.030
Manishearth Apr 21, 2019
cdca41d
Update Fira Sans to version 4.202
Manishearth Apr 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/librustdoc/html/render.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -930,13 +930,13 @@ themePicker.onblur = handleThemeButtonsBlur;
static_files::source_serif_pro::BOLD)?;
write(cx.dst.join("SourceSerifPro-It.ttf.woff"),
static_files::source_serif_pro::ITALIC)?;
write(cx.dst.join("SourceSerifPro-LICENSE.txt"),
write(cx.dst.join("SourceSerifPro-LICENSE.md"),
static_files::source_serif_pro::LICENSE)?;
write(cx.dst.join("SourceCodePro-Regular.woff"),
static_files::source_code_pro::REGULAR)?;
write(cx.dst.join("SourceCodePro-Semibold.woff"),
static_files::source_code_pro::SEMIBOLD)?;
write(cx.dst.join("SourceCodePro-LICENSE.txt"),
write(cx.dst.join("SourceCodePro-LICENSE.md"),
static_files::source_code_pro::LICENSE)?;
write(cx.dst.join("LICENSE-MIT.txt"),
static_files::LICENSE_MIT)?;
Expand Down
11 changes: 3 additions & 8 deletions src/librustdoc/html/static/FiraSans-LICENSE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
Copyright (c) 2014, Mozilla Foundation https://mozilla.org/
with Reserved Font Name Fira Sans.

Copyright (c) 2014, Mozilla Foundation https://mozilla.org/
with Reserved Font Name Fira Mono.

Copyright (c) 2014, Telefonica S.A.
Digitized data copyright (c) 2012-2015, The Mozilla Foundation and Telefonica S.A.
with Reserved Font Name < Fira >,

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

The OFL allows the licensed fonts to be used, studied, modified and
redistributed freely as long as they are not sold by themselves. The
fonts, including any derivative works, can be bundled, embedded,
fonts, including any derivative works, can be bundled, embedded,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is the "random" trailing space to keep it inline with the original for some reason?

redistributed and/or sold with any software provided that any reserved
names are not used by derivative works. The fonts and derivatives,
however, cannot be released under any other type of license. The
Expand Down
Binary file modified src/librustdoc/html/static/FiraSans-Medium.woff
View file
Open in desktop
Binary file not shown.
Binary file modified src/librustdoc/html/static/FiraSans-Regular.woff
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion ...doc/html/static/SourceCodePro-LICENSE.txt → ...tdoc/html/static/SourceCodePro-LICENSE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ with others.

The OFL allows the licensed fonts to be used, studied, modified and
redistributed freely as long as they are not sold by themselves. The
fonts, including any derivative works, can be bundled, embedded,
fonts, including any derivative works, can be bundled, embedded,
redistributed and/or sold with any software provided that any reserved
names are not used by derivative works. The fonts and derivatives,
however, cannot be released under any other type of license. The
Expand Down
Binary file modified src/librustdoc/html/static/SourceCodePro-Regular.woff
View file
Open in desktop
Binary file not shown.
Binary file modified src/librustdoc/html/static/SourceCodePro-Semibold.woff
View file
Open in desktop
Binary file not shown.
Binary file modified src/librustdoc/html/static/SourceSerifPro-Bold.ttf.woff
View file
Open in desktop
Binary file not shown.
Binary file modified src/librustdoc/html/static/SourceSerifPro-It.ttf.woff
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion ...oc/html/static/SourceSerifPro-LICENSE.txt → ...doc/html/static/SourceSerifPro-LICENSE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
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.
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.

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

Expand Down
Binary file modified src/librustdoc/html/static/SourceSerifPro-Regular.ttf.woff
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions src/librustdoc/html/static_files.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ pub mod source_serif_pro {
pub static ITALIC: &'static [u8] = include_bytes!("static/SourceSerifPro-It.ttf.woff");

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

/// Files related to the Source Code Pro font.
Expand All @@ -103,7 +103,7 @@ pub mod source_code_pro {
pub static SEMIBOLD: &'static [u8] = include_bytes!("static/SourceCodePro-Semibold.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");
pub static LICENSE: &'static [u8] = include_bytes!("static/SourceCodePro-LICENSE.md");
}

/// Files related to the sidebar in rustdoc sources.
Expand Down