Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Rollup merge of rust-lang#60382 - Manishearth:revert-code-font, r=Gui…
…llaumeGomez

Revert "Update Source Code Pro fonts to version 2.030"

Temporary fix for rust-lang#60365

rust-lang#60146 updated all fonts (not just the fonts that were buggy), however it looks like the new Source Code Pro is buggy.

We should test this out of tree: `cargo doc` on anything, replace the font in `target/doc`, and use `python -m SimpleHTTPServer` to see what's going on.

Till we figure that out, I'll just back this out.

r? @GuillaumeGomez

This reverts commit 6bafc58.
  • Loading branch information
Centril committed Apr 30, 2019
2 parents 54fd023 + 7aab005 commit ebb6561
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/librustdoc/html/render.rs
Expand Up @@ -938,7 +938,7 @@ themePicker.onblur = handleThemeButtonsBlur;
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.md"),
write(cx.dst.join("SourceCodePro-LICENSE.txt"),
static_files::source_code_pro::LICENSE)?;
write(cx.dst.join("LICENSE-MIT.txt"),
static_files::LICENSE_MIT)?;
Expand Down
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
Binary file not shown.
Binary file modified src/librustdoc/html/static/SourceCodePro-Semibold.woff
Binary file not shown.
2 changes: 1 addition & 1 deletion src/librustdoc/html/static_files.rs
Expand Up @@ -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.md");
pub static LICENSE: &'static [u8] = include_bytes!("static/SourceCodePro-LICENSE.txt");
}

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

0 comments on commit ebb6561

Please sign in to comment.