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

Rustdoc: update Source Serif Pro and replace Heuristica italic #57400

Merged
merged 3 commits into from
Jan 12, 2019
Merged

Rustdoc: update Source Serif Pro and replace Heuristica italic #57400

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
239ac2b
Source Serif Pro regular and bold 2.007, and italic 1.007
tspiteri Jan 7, 2019
aa257ec
Replace Heuristica with Source Serif Pro italic in rustdoc.css
tspiteri Jan 7, 2019
d2ac094
Update static files code for updated Source Serif Pro font
tspiteri Jan 7, 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
10 changes: 4 additions & 6 deletions src/librustdoc/html/render.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -893,14 +893,12 @@ themePicker.onblur = handleThemeButtonsBlur;
static_files::fira_sans::MEDIUM)?;
write(cx.dst.join("FiraSans-LICENSE.txt"),
static_files::fira_sans::LICENSE)?;
write(cx.dst.join("Heuristica-Italic.woff"),
static_files::heuristica::ITALIC)?;
write(cx.dst.join("Heuristica-LICENSE.txt"),
static_files::heuristica::LICENSE)?;
write(cx.dst.join("SourceSerifPro-Regular.woff"),
write(cx.dst.join("SourceSerifPro-Regular.ttf.woff"),
Copy link
Contributor

@ishitatsuyuki ishitatsuyuki Jan 7, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

This file name is... too weird.

Edit: it seems this is what in the upstream zip, so nevermind.

static_files::source_serif_pro::REGULAR)?;
write(cx.dst.join("SourceSerifPro-Bold.woff"),
write(cx.dst.join("SourceSerifPro-Bold.ttf.woff"),
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"),
static_files::source_serif_pro::LICENSE)?;
write(cx.dst.join("SourceCodePro-Regular.woff"),
Expand Down
18 changes: 2 additions & 16 deletions src/librustdoc/html/static/COPYRIGHT.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,6 @@ included, and carry their own copyright notices and license terms:
Licensed under the SIL Open Font License, Version 1.1.
See FiraSans-LICENSE.txt.

* Heuristica (Heuristica-Italic.woff):

Copyright 1989, 1991 Adobe Systems Incorporated. All rights reserved.
Utopia is either a registered trademark or trademark of Adobe Systems
Incorporated in the United States and/or other countries. Used under
license.

Copyright 2006 Han The Thanh, Vntopia font family, http://vntex.sf.net

Copyright (c) 2008-2012, Andrey V. Panov ([email protected]),
with Reserved Font Name Heuristica.

Licensed under the SIL Open Font License, Version 1.1.
See Heuristica-LICENSE.txt.

* rustdoc.css, main.js, and playpen.js:

Copyright 2015 The Rust Developers.
Expand All @@ -47,7 +32,8 @@ included, and carry their own copyright notices and license terms:
Licensed under the SIL Open Font License, Version 1.1.
See SourceCodePro-LICENSE.txt.

* Source Serif Pro (SourceSerifPro-Regular.woff, SourceSerifPro-Bold.woff):
* Source Serif Pro (SourceSerifPro-Regular.ttf.woff,
SourceSerifPro-Bold.ttf.woff, SourceSerifPro-It.ttf.woff):

Copyright 2014 Adobe Systems Incorporated (http://www.adobe.com/), with
Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of
Expand Down
Binary file removed src/librustdoc/html/static/Heuristica-Italic.woff
View file
Open in desktop
Binary file not shown.
101 changes: 0 additions & 101 deletions src/librustdoc/html/static/Heuristica-LICENSE.txt
View file
Open in desktop

This file was deleted.

Binary file added src/librustdoc/html/static/SourceSerifPro-Bold.ttf.woff
View file
Open in desktop
Binary file not shown.
Binary file removed src/librustdoc/html/static/SourceSerifPro-Bold.woff
View file
Open in desktop
Binary file not shown.
Binary file added src/librustdoc/html/static/SourceSerifPro-It.ttf.woff
View file
Open in desktop
Binary file not shown.
Binary file added src/librustdoc/html/static/SourceSerifPro-Regular.ttf.woff
View file
Open in desktop
Binary file not shown.
Binary file removed src/librustdoc/html/static/SourceSerifPro-Regular.woff
View file
Open in desktop
Binary file not shown.
9 changes: 4 additions & 5 deletions src/librustdoc/html/static/rustdoc.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,25 +12,24 @@
src: local('Fira Sans Medium'), url("FiraSans-Medium.woff") format('woff');
}

/* See SourceSerifPro-LICENSE.txt for the Source Serif Pro license and
* Heuristica-LICENSE.txt for the Heuristica license. */
/* See SourceSerifPro-LICENSE.txt for the Source Serif Pro license. */
@font-face {
font-family: 'Source Serif Pro';
font-style: normal;
font-weight: 400;
src: local('Source Serif Pro'), url("SourceSerifPro-Regular.woff") format('woff');
src: local('Source Serif Pro'), url("SourceSerifPro-Regular.ttf.woff") format('woff');
}
@font-face {
font-family: 'Source Serif Pro';
font-style: italic;
font-weight: 400;
src: url("Heuristica-Italic.woff") format('woff');
src: local('Source Serif Pro Italic'), url("SourceSerifPro-It.ttf.woff") format('woff');
}
@font-face {
font-family: 'Source Serif Pro';
font-style: normal;
font-weight: 700;
src: local('Source Serif Pro Bold'), url("SourceSerifPro-Bold.woff") format('woff');
src: local('Source Serif Pro Bold'), url("SourceSerifPro-Bold.ttf.woff") format('woff');
}

/* See SourceCodePro-LICENSE.txt for the Source Code Pro license. */
Expand Down
21 changes: 8 additions & 13 deletions src/librustdoc/html/static_files.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,22 +73,17 @@ pub mod fira_sans {
pub static LICENSE: &'static [u8] = include_bytes!("static/FiraSans-LICENSE.txt");
}

/// Files related to the Heuristica font.
pub mod heuristica {
/// The file `Heuristica-Italic.woff`, the Italic variant of the Heuristica font.
pub static ITALIC: &'static [u8] = include_bytes!("static/Heuristica-Italic.woff");

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

/// Files related to the Source Serif Pro font.
pub mod source_serif_pro {
/// The file `SourceSerifPro-Regular.woff`, the Regular variant of the Source Serif Pro font.
pub static REGULAR: &'static [u8] = include_bytes!("static/SourceSerifPro-Regular.woff");
/// The file `SourceSerifPro-Regular.ttf.woff`, the Regular variant of the Source Serif Pro
/// font.
pub static REGULAR: &'static [u8] = include_bytes!("static/SourceSerifPro-Regular.ttf.woff");

/// The file `SourceSerifPro-Bold.ttf.woff`, the Bold variant of the Source Serif Pro font.
pub static BOLD: &'static [u8] = include_bytes!("static/SourceSerifPro-Bold.ttf.woff");

/// The file `SourceSerifPro-Bold.woff`, the Bold variant of the Source Serif Pro font.
pub static BOLD: &'static [u8] = include_bytes!("static/SourceSerifPro-Bold.woff");
/// The file `SourceSerifPro-It.ttf.woff`, the Italic variant of the Source Serif Pro font.
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");
Expand Down