diff options
| author | bors <bors@rust-lang.org> | 2014-07-09 10:36:31 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-07-09 10:36:31 +0000 |
| commit | b53f3e7ddb07fce91aafa6f2bb2db896cbc23992 (patch) | |
| tree | 69b73b2eb2c747e68a172122fc470d1c309f8af1 /src/librustdoc/html/render.rs | |
| parent | ad3eda123a00b3ddf8897295ff26d97ba7c64d44 (diff) | |
| parent | b7ef0cf742c7c68afdb708fe9989f37760f3f542 (diff) | |
| download | rust-b53f3e7ddb07fce91aafa6f2bb2db896cbc23992.tar.gz rust-b53f3e7ddb07fce91aafa6f2bb2db896cbc23992.zip | |
auto merge of #15530 : adrientetar/rust/proper-fonts, r=alexcrichton
- Treat WOFF as binary files so that git does not perform newline normalization. - Replace corrupt Heuristica files with Source Serif Pro — italics are [almost in production](https://github.com/adobe/source-serif-pro/issues/2) so I left Heuristica Italic which makes a good pair with SSP. Overall, Source Serif Pro is I think a better fit for rustdoc (cc @TheHydroImpulse). This ought to fix #15527. - Store Source Code Pro locally in order to make offline docs freestanding. Fixes #14778. Preview: http://adrientetar.legtux.org/cached/rust-docs/core.html r? @alexcrichton
Diffstat (limited to 'src/librustdoc/html/render.rs')
| -rw-r--r-- | src/librustdoc/html/render.rs | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/librustdoc/html/render.rs b/src/librustdoc/html/render.rs index eeeee8cedf1..70edbcf86e1 100644 --- a/src/librustdoc/html/render.rs +++ b/src/librustdoc/html/render.rs @@ -478,12 +478,16 @@ fn write_shared(cx: &Context, include_bin!("static/FiraSans-Regular.woff"))); try!(write(cx.dst.join("FiraSans-Medium.woff"), include_bin!("static/FiraSans-Medium.woff"))); - try!(write(cx.dst.join("Heuristica-Regular.woff"), - include_bin!("static/Heuristica-Regular.woff"))); + try!(write(cx.dst.join("SourceSerifPro-Bold.woff"), + include_bin!("static/SourceSerifPro-Bold.woff"))); try!(write(cx.dst.join("Heuristica-Italic.woff"), include_bin!("static/Heuristica-Italic.woff"))); - try!(write(cx.dst.join("Heuristica-Bold.woff"), - include_bin!("static/Heuristica-Bold.woff"))); + try!(write(cx.dst.join("SourceSerifPro-Bold.woff"), + include_bin!("static/SourceSerifPro-Bold.woff"))); + try!(write(cx.dst.join("SourceCodePro-Regular.woff"), + include_bin!("static/SourceCodePro-Regular.woff"))); + try!(write(cx.dst.join("SourceCodePro-Semibold.woff"), + include_bin!("static/SourceCodePro-Semibold.woff"))); fn collect(path: &Path, krate: &str, key: &str) -> io::IoResult<Vec<String>> { |