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.

Sign up for GitHub

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

Jump to bottom

Update Source Code Pro and include italics #80705

Merged
merged 1 commit into from
Mar 23, 2021
Merged

Update Source Code Pro and include italics #80705

merged 1 commit into from
Mar 23, 2021

Conversation

tspiteri
Copy link
Contributor

@tspiteri tspiteri commented Jan 4, 2021 •
edited
Loading

Fixes #65502.

#65665, a similar PR to this was merged but reverted because of #65665 (comment).

The issue in that comment is the upstream issue adobe-fonts/source-code-pro#217 which should now be fixed in the upstream since 2.032R-ro/1.052R-it/1.012R-VAR release, so I think this can now be merged.

A couple of notes from the original PR:

  • Since this PR changes the font set, I think docs.rs would have to be updated if this PR is merged.
  • The fonts have a double extension (.ttf.woff); this is to keep the names consistent with the upstream font release which does that to distinguish these from the .otf.woff files (Source Code Pro otf renders poorly on older Windows system apps).

@rust-highfive
Copy link
Collaborator

Some changes occurred in HTML/CSS/JS.

cc @GuillaumeGomez

@rust-highfive
Copy link
Collaborator

r? @GuillaumeGomez

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 4, 2021
@jyn514
Copy link
Member

jyn514 commented Jan 5, 2021

Since this PR changes the font set, I think docs.rs would have to be updated if this PR is merged.

You mean, update ESSENTIAL_FILES_VERSIONED?
https://github.com/rust-lang/docs.rs/blob/05d236821ca7d569daa8a33dc2819e9e39467ed1/src/docbuilder/rustwide_builder.rs#L27

@jyn514 jyn514 added the T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. label Jan 5, 2021
@GuillaumeGomez
Copy link
Member

Looks good to me, thanks! Now we just need to sync with docs.rs and I think we're good to go.

@jyn514
Copy link
Member

jyn514 commented Jan 5, 2021

Could someone please explain what they mean by 'sync with docs.rs'?

@GuillaumeGomez
Copy link
Member

Someone can explain: you'll need to update the font file on docs.rs but I don't know the process. If there is nothing particular to be done, then we can simply merge this PR. :)

@jyn514
Copy link
Member

jyn514 commented Jan 5, 2021

Ok. Docs.rs can only be updated after this is merged, because it requires those files to exist and gives an error otherwise. So this needs to make it to a nightly before docs.rs can be updated I think.

@rust-lang/docs-rs please correct me if I'm wrong.

@pietroalbini
Copy link
Member

Yeah we'll need to update the essential files list.

To avoid generating broken docs I think the best approach is to pin the docs.rs nightly to a known good one before merging this PR, merge the PR, update the docs.rs code to copy the file and then remove the pin.

@camelid camelid added the A-rustdoc-ui Area: Rustdoc UI (generated HTML) label Jan 6, 2021
@crlf0710
Copy link
Member

Triage: What's the current status?

@JohnCSimon JohnCSimon added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 7, 2021
@JohnCSimon JohnCSimon added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 28, 2021
@bors
Copy link
Contributor

bors commented Mar 4, 2021

☔ The latest upstream changes (presumably #82756) made this pull request unmergeable. Please resolve the merge conflicts.

@tspiteri tspiteri force-pushed the italic-and-update-SourceCodePro branch from a80ef80 to d78ccd3 Compare March 4, 2021 14:39
@tspiteri
Copy link
Contributor Author

tspiteri commented Mar 4, 2021

Rebased and updated fonts to the upstream 2.038R-ro/1.058R-it/1.018R-VAR release.

@bors
Copy link
Contributor

bors commented Mar 5, 2021

☔ The latest upstream changes (presumably #82777) made this pull request unmergeable. Please resolve the merge conflicts.

@tspiteri tspiteri force-pushed the italic-and-update-SourceCodePro branch from d78ccd3 to 6f7ebb5 Compare March 5, 2021 14:17
@jyn514 jyn514 mentioned this pull request Mar 5, 2021
Closed
@bors
Copy link
Contributor

bors commented Mar 7, 2021

☔ The latest upstream changes (presumably #82851) made this pull request unmergeable. Please resolve the merge conflicts.

@tspiteri tspiteri force-pushed the italic-and-update-SourceCodePro branch from 6f7ebb5 to 8415cdf Compare March 7, 2021 07:34
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@tspiteri tspiteri force-pushed the italic-and-update-SourceCodePro branch from 8415cdf to 3ba2136 Compare March 7, 2021 08:12
@tspiteri tspiteri force-pushed the italic-and-update-SourceCodePro branch from 3ba2136 to 87d17bb Compare March 7, 2021 08:13
@GuillaumeGomez
Copy link
Member

@jyn514 Should we wait for rust-lang/docs.rs#1302 or can we r+ it?

@jyn514
Copy link
Member

jyn514 commented Mar 21, 2021

I would prefer to wait for rust-lang/docs.rs#1302 if possible. If it takes more than another week or so I'm ok with approving this and fixing the breakage when it occurs.

@jyn514 jyn514 added S-blocked Status: Marked as blocked ❌ on something else such as an RFC or other implementation work. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 21, 2021
@jyn514
Copy link
Member

jyn514 commented Mar 22, 2021

@bors r=GuillaumeGomez

@bors
Copy link
Contributor

bors commented Mar 22, 2021

📌 Commit 87d17bb has been approved by GuillaumeGomez

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-blocked Status: Marked as blocked ❌ on something else such as an RFC or other implementation work. labels Mar 22, 2021
@JohnTitor JohnTitor mentioned this pull request Mar 23, 2021
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 23, 2021
@bors
Auto merge of rust-lang#83398 - JohnTitor:rollup-om80krv, r=JohnTitor
2bd94f4 
Rollup of 7 pull requests

Successful merges:

 - rust-lang#80705 (Update Source Code Pro and include italics)
 - rust-lang#81917 (Update RELEASES.md for 1.51.0)
 - rust-lang#82732 (Remove theme.js file)
 - rust-lang#83356 (rustdoc: Replace pair of `Option`s with an enum)
 - rust-lang#83384 (rename :pat2018 -> :pat2015)
 - rust-lang#83385 (:arrow_up: rust-analyzer)
 - rust-lang#83389 (add rust-analyzer rustc_private option in librustdoc Cargo.toml)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 0e96c62 into rust-lang:master Mar 23, 2021
@bors
Copy link
Contributor

bors commented Mar 23, 2021

⌛ Testing commit 87d17bb with merge 2bd94f4...

@rustbot rustbot added this to the 1.53.0 milestone Mar 23, 2021
@tspiteri tspiteri deleted the italic-and-update-SourceCodePro branch March 23, 2021 08:31
@jyn514 jyn514 mentioned this pull request Mar 25, 2021
Merged
@jyn514 jyn514 mentioned this pull request Apr 2, 2021
Open
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@GuillaumeGomez GuillaumeGomez GuillaumeGomez approved these changes

Assignees

@GuillaumeGomez GuillaumeGomez

Labels
A-rustdoc-ui Area: Rustdoc UI (generated HTML) S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.53.0
Development

Successfully merging this pull request may close these issues.

Rustdoc uses fake italics for code