Skip to content

Commit 39638d1

Browse files
authored
Rollup merge of rust-lang#83650 - tspiteri:source-serif-4, r=GuillaumeGomez
Update Source Serif to release 4.004 Now the family name is Source Serif 4 (upstream issue 77) instead of Source Serif Pro.
2 parents c5a3f85 + a0bd59e commit 39638d1

12 files changed

+33
-34
lines changed

src/librustdoc/html/render/write_shared.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ crate static FILES_UNVERSIONED: Lazy<FxHashMap<&str, &[u8]>> = Lazy::new(|| {
2626
"FiraSans-Regular.woff" => static_files::fira_sans::REGULAR,
2727
"FiraSans-Medium.woff" => static_files::fira_sans::MEDIUM,
2828
"FiraSans-LICENSE.txt" => static_files::fira_sans::LICENSE,
29-
"SourceSerifPro-Regular.ttf.woff" => static_files::source_serif_pro::REGULAR,
30-
"SourceSerifPro-Bold.ttf.woff" => static_files::source_serif_pro::BOLD,
31-
"SourceSerifPro-It.ttf.woff" => static_files::source_serif_pro::ITALIC,
32-
"SourceSerifPro-LICENSE.md" => static_files::source_serif_pro::LICENSE,
29+
"SourceSerif4-Regular.ttf.woff" => static_files::source_serif_4::REGULAR,
30+
"SourceSerif4-Bold.ttf.woff" => static_files::source_serif_4::BOLD,
31+
"SourceSerif4-It.ttf.woff" => static_files::source_serif_4::ITALIC,
32+
"SourceSerif4-LICENSE.md" => static_files::source_serif_4::LICENSE,
3333
"SourceCodePro-Regular.ttf.woff" => static_files::source_code_pro::REGULAR,
3434
"SourceCodePro-Semibold.ttf.woff" => static_files::source_code_pro::SEMIBOLD,
3535
"SourceCodePro-It.ttf.woff" => static_files::source_code_pro::ITALIC,

src/librustdoc/html/static/COPYRIGHT.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@ included, and carry their own copyright notices and license terms:
3333
Licensed under the SIL Open Font License, Version 1.1.
3434
See SourceCodePro-LICENSE.txt.
3535

36-
* Source Serif Pro (SourceSerifPro-Regular.ttf.woff,
37-
SourceSerifPro-Bold.ttf.woff, SourceSerifPro-It.ttf.woff):
36+
* Source Serif 4 (SourceSerif4-Regular.ttf.woff, SourceSerif4-Bold.ttf.woff,
37+
SourceSerif4-It.ttf.woff):
3838

39-
Copyright 2014 Adobe Systems Incorporated (http://www.adobe.com/), with
40-
Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of
41-
Adobe Systems Incorporated in the United States and/or other countries.
39+
Copyright 2014-2021 Adobe (http://www.adobe.com/), with Reserved Font Name
40+
'Source'. All Rights Reserved. Source is a trademark of Adobe in the United
41+
States and/or other countries.
4242

4343
Licensed under the SIL Open Font License, Version 1.1.
44-
See SourceSerifPro-LICENSE.txt.
44+
See SourceSerif4-LICENSE.md.
4545

4646
This copyright file is intended to be distributed with rustdoc output.
108 KB
Binary file not shown.
76.3 KB
Binary file not shown.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
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.
1+
Copyright 2014-2021 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

101 KB
Binary file not shown.
-91.1 KB
Binary file not shown.
-35.4 KB
Binary file not shown.
-86.5 KB
Binary file not shown.

src/librustdoc/html/static/rustdoc.css

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,26 +18,26 @@
1818
font-display: swap;
1919
}
2020

21-
/* See SourceSerifPro-LICENSE.txt for the Source Serif Pro license. */
21+
/* See SourceSerif4-LICENSE.md for the Source Serif 4 license. */
2222
@font-face {
23-
font-family: 'Source Serif Pro';
23+
font-family: 'Source Serif 4';
2424
font-style: normal;
2525
font-weight: 400;
26-
src: local('Source Serif Pro'), url("SourceSerifPro-Regular.ttf.woff") format('woff');
26+
src: local('Source Serif 4'), url("SourceSerif4-Regular.ttf.woff") format('woff');
2727
font-display: swap;
2828
}
2929
@font-face {
30-
font-family: 'Source Serif Pro';
30+
font-family: 'Source Serif 4';
3131
font-style: italic;
3232
font-weight: 400;
33-
src: local('Source Serif Pro Italic'), url("SourceSerifPro-It.ttf.woff") format('woff');
33+
src: local('Source Serif 4 Italic'), url("SourceSerif4-It.ttf.woff") format('woff');
3434
font-display: swap;
3535
}
3636
@font-face {
37-
font-family: 'Source Serif Pro';
37+
font-family: 'Source Serif 4';
3838
font-style: normal;
3939
font-weight: 700;
40-
src: local('Source Serif Pro Bold'), url("SourceSerifPro-Bold.ttf.woff") format('woff');
40+
src: local('Source Serif 4 Bold'), url("SourceSerif4-Bold.ttf.woff") format('woff');
4141
font-display: swap;
4242
}
4343

@@ -90,7 +90,7 @@ html {
9090
/* General structure and fonts */
9191

9292
body {
93-
font: 16px/1.4 "Source Serif Pro", serif;
93+
font: 16px/1.4 "Source Serif 4", serif;
9494
margin: 0;
9595
position: relative;
9696
padding: 10px 15px 20px 15px;

0 commit comments

Comments
 (0)