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.

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

webfonts: fixes #15530

Merged
merged 3 commits into from
Jul 9, 2014
Merged

webfonts: fixes #15530

merged 3 commits into from
Jul 9, 2014

Conversation

adrientetar
Copy link
Contributor

Preview: http://adrientetar.legtux.org/cached/rust-docs/core.html

r? @alexcrichton

@lilyball
Copy link
Contributor

lilyball commented Jul 8, 2014

👍 on fixing the .gitattributes. Serving Source Code Pro locally is also probably a good idea for offline docs.

Not so sure about replacing Heuristica. I don't know what led to that font being chosen, but it seems like replacing that with Source Serif Pro should be an intentional decision and not something done purely because the Heuristica WOFF files are corrupt. Surely we can get non-corrupted Heuristica WOFF files?

That's not to say that using SSP is a bad idea. Perhaps it's a better fit, I don't know.

@adrientetar
Copy link
Contributor Author

Surely we can get non-corrupted Heuristica WOFF files?

Of course, but there were a few negative opinions towards Heuristica during the original merge, then with the corrupt files and the fact that some people were willing to plain revert all rustdoc design changes there hasn't been a sheer discussion on the subject, through I expect that Source Serif Pro will be easier on the eye for that kind of use-case so I am proposing that unless people prefer Heuristica.
(Plus it's made by Adobe so we can expect top-notch support if any rendering problem was to arise.)

@alexcrichton
Copy link
Member

To quote @brson from IRC:

12:03 <@acrichto> brson: do you know if we have to do anything about licensing for 
                  rustdoc to distribute fonts?
12:41 <@brson> acrichto: if our fonts use the SIL license then I beleive we can 
               basically distribute them w/o restriction

I'm not personally familiar with these fonts, but do you know what sort of license they come under?

@adrientetar
Copy link
Contributor Author

In fact, SIL OFL has been for long the de-facto standard for free and open-source fonts.

@adrientetar
Copy link
Contributor Author

Original or Modified Versions of the Font Software may be bundled,
redistributed and/or sold with any software, provided that each copy
contains the above copyright notice and this license.

I'll add that.

@adrientetar
Copy link
Contributor Author

@alexcrichton What I added in that last commit is basically four times the SIL modulo the different copyright statements. Is it fine to combine them together in one file?

@alexcrichton
Copy link
Member

I'm not entirely sure, I would defer that question to @brson.

@@ -52,7 +58,7 @@
body {
margin: 0 auto;
padding: 0 15px;
font-family: "Heuristica", "Helvetica Neue", Helvetica, Arial, sans-serif;
font-family: "Source Serif Pro", "Helvetica Neue", Helvetica, Arial, sans-serif;
Copy link
Contributor

Choose a reason for hiding this comment

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

Since we're changing this line, wouldn't it be better if the fallback fonts were also serif? (Just "Source Serif Pro", serif would be enough, IMO)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Probably; I haven't tested default serifs on all major platforms just now through.

bors added a commit that referenced this pull request Jul 9, 2014
- Treat WOFF as binary files so that git does not perform newline normalization.
- Replace corrupt Heuristica files with Source Serif Pro &mdash; italics are [almost in production](adobe-fonts/source-serif#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
@bors bors closed this Jul 9, 2014
@bors bors merged commit b7ef0cf into rust-lang:master Jul 9, 2014
Centril added a commit to Centril/rust that referenced this pull request Jan 12, 2019
…llaumeGomez

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.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

"Heuristica" WOFF in documentation is corrupted Offline docs use webfonts
5 participants