Skip to content

Commit 7be2ff3

Browse files
authored
Rollup merge of rust-lang#57400 - tspiteri:source-serif-pro-it, r=GuillaumeGomez
Rustdoc: update Source Serif Pro and replace Heuristica italic When Source Serif Pro was used to replace Heuristica in rust-lang#15530, the italic variant was not ready yet, but now it is. This PR updates the Source Serif Pro font files to the [latest release](https://github.com/adobe-fonts/source-serif-pro/releases/tag/2.007R-ro%2F1.007R-it) which includes an italic variant, and replaces Heuristica italic with Source Serif Pro italic. Fixes rust-lang#57363.
2 parents c6146b2 + d2ac094 commit 7be2ff3

11 files changed

+18
-141
lines changed

src/librustdoc/html/render.rs

+4-6
Original file line numberDiff line numberDiff line change
@@ -893,14 +893,12 @@ themePicker.onblur = handleThemeButtonsBlur;
893893
static_files::fira_sans::MEDIUM)?;
894894
write(cx.dst.join("FiraSans-LICENSE.txt"),
895895
static_files::fira_sans::LICENSE)?;
896-
write(cx.dst.join("Heuristica-Italic.woff"),
897-
static_files::heuristica::ITALIC)?;
898-
write(cx.dst.join("Heuristica-LICENSE.txt"),
899-
static_files::heuristica::LICENSE)?;
900-
write(cx.dst.join("SourceSerifPro-Regular.woff"),
896+
write(cx.dst.join("SourceSerifPro-Regular.ttf.woff"),
901897
static_files::source_serif_pro::REGULAR)?;
902-
write(cx.dst.join("SourceSerifPro-Bold.woff"),
898+
write(cx.dst.join("SourceSerifPro-Bold.ttf.woff"),
903899
static_files::source_serif_pro::BOLD)?;
900+
write(cx.dst.join("SourceSerifPro-It.ttf.woff"),
901+
static_files::source_serif_pro::ITALIC)?;
904902
write(cx.dst.join("SourceSerifPro-LICENSE.txt"),
905903
static_files::source_serif_pro::LICENSE)?;
906904
write(cx.dst.join("SourceCodePro-Regular.woff"),

src/librustdoc/html/static/COPYRIGHT.txt

+2-16
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,6 @@ included, and carry their own copyright notices and license terms:
1212
Licensed under the SIL Open Font License, Version 1.1.
1313
See FiraSans-LICENSE.txt.
1414

15-
* Heuristica (Heuristica-Italic.woff):
16-
17-
Copyright 1989, 1991 Adobe Systems Incorporated. All rights reserved.
18-
Utopia is either a registered trademark or trademark of Adobe Systems
19-
Incorporated in the United States and/or other countries. Used under
20-
license.
21-
22-
Copyright 2006 Han The Thanh, Vntopia font family, http://vntex.sf.net
23-
24-
Copyright (c) 2008-2012, Andrey V. Panov ([email protected]),
25-
with Reserved Font Name Heuristica.
26-
27-
Licensed under the SIL Open Font License, Version 1.1.
28-
See Heuristica-LICENSE.txt.
29-
3015
* rustdoc.css, main.js, and playpen.js:
3116

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

50-
* Source Serif Pro (SourceSerifPro-Regular.woff, SourceSerifPro-Bold.woff):
35+
* Source Serif Pro (SourceSerifPro-Regular.ttf.woff,
36+
SourceSerifPro-Bold.ttf.woff, SourceSerifPro-It.ttf.woff):
5137

5238
Copyright 2014 Adobe Systems Incorporated (http://www.adobe.com/), with
5339
Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of
Binary file not shown.

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

-101
This file was deleted.
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

+4-5
Original file line numberDiff line numberDiff line change
@@ -12,25 +12,24 @@
1212
src: local('Fira Sans Medium'), url("FiraSans-Medium.woff") format('woff');
1313
}
1414

15-
/* See SourceSerifPro-LICENSE.txt for the Source Serif Pro license and
16-
* Heuristica-LICENSE.txt for the Heuristica license. */
15+
/* See SourceSerifPro-LICENSE.txt for the Source Serif Pro license. */
1716
@font-face {
1817
font-family: 'Source Serif Pro';
1918
font-style: normal;
2019
font-weight: 400;
21-
src: local('Source Serif Pro'), url("SourceSerifPro-Regular.woff") format('woff');
20+
src: local('Source Serif Pro'), url("SourceSerifPro-Regular.ttf.woff") format('woff');
2221
}
2322
@font-face {
2423
font-family: 'Source Serif Pro';
2524
font-style: italic;
2625
font-weight: 400;
27-
src: url("Heuristica-Italic.woff") format('woff');
26+
src: local('Source Serif Pro Italic'), url("SourceSerifPro-It.ttf.woff") format('woff');
2827
}
2928
@font-face {
3029
font-family: 'Source Serif Pro';
3130
font-style: normal;
3231
font-weight: 700;
33-
src: local('Source Serif Pro Bold'), url("SourceSerifPro-Bold.woff") format('woff');
32+
src: local('Source Serif Pro Bold'), url("SourceSerifPro-Bold.ttf.woff") format('woff');
3433
}
3534

3635
/* See SourceCodePro-LICENSE.txt for the Source Code Pro license. */

src/librustdoc/html/static_files.rs

+8-13
Original file line numberDiff line numberDiff line change
@@ -73,22 +73,17 @@ pub mod fira_sans {
7373
pub static LICENSE: &'static [u8] = include_bytes!("static/FiraSans-LICENSE.txt");
7474
}
7575

76-
/// Files related to the Heuristica font.
77-
pub mod heuristica {
78-
/// The file `Heuristica-Italic.woff`, the Italic variant of the Heuristica font.
79-
pub static ITALIC: &'static [u8] = include_bytes!("static/Heuristica-Italic.woff");
80-
81-
/// The file `Heuristica-LICENSE.txt`, the license text for the Heuristica font.
82-
pub static LICENSE: &'static [u8] = include_bytes!("static/Heuristica-LICENSE.txt");
83-
}
84-
8576
/// Files related to the Source Serif Pro font.
8677
pub mod source_serif_pro {
87-
/// The file `SourceSerifPro-Regular.woff`, the Regular variant of the Source Serif Pro font.
88-
pub static REGULAR: &'static [u8] = include_bytes!("static/SourceSerifPro-Regular.woff");
78+
/// The file `SourceSerifPro-Regular.ttf.woff`, the Regular variant of the Source Serif Pro
79+
/// font.
80+
pub static REGULAR: &'static [u8] = include_bytes!("static/SourceSerifPro-Regular.ttf.woff");
81+
82+
/// The file `SourceSerifPro-Bold.ttf.woff`, the Bold variant of the Source Serif Pro font.
83+
pub static BOLD: &'static [u8] = include_bytes!("static/SourceSerifPro-Bold.ttf.woff");
8984

90-
/// The file `SourceSerifPro-Bold.woff`, the Bold variant of the Source Serif Pro font.
91-
pub static BOLD: &'static [u8] = include_bytes!("static/SourceSerifPro-Bold.woff");
85+
/// The file `SourceSerifPro-It.ttf.woff`, the Italic variant of the Source Serif Pro font.
86+
pub static ITALIC: &'static [u8] = include_bytes!("static/SourceSerifPro-It.ttf.woff");
9287

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

0 commit comments

Comments
 (0)