Skip to content

Update Source Code Pro and include italics - #80705

Merged
bors merged 1 commit into
rust-lang:masterfrom
tspiteri:italic-and-update-SourceCodePro
Mar 23, 2021
Merged

Update Source Code Pro and include italics#80705
bors merged 1 commit into
rust-lang:masterfrom
tspiteri:italic-and-update-SourceCodePro

Conversation

@tspiteri

@tspiteritspiteri commented Jan 4, 2021•
edited
Loading

Copy link
Copy Markdown
Contributor

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

rust-highfive commented Jan 4, 2021

Copy link
Copy Markdown
Contributor

Some changes occurred in HTML/CSS/JS.

cc @GuillaumeGomez

@rust-highfive

rust-highfive commented Jan 4, 2021

Copy link
Copy Markdown
Contributor

r? @GuillaumeGomez

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

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

jyn514 commented Jan 5, 2021

Copy link
Copy Markdown
Member

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

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

GuillaumeGomez commented Jan 5, 2021

Copy link
Copy Markdown
Member

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

@jyn514

jyn514 commented Jan 5, 2021

Copy link
Copy Markdown
Member

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

@GuillaumeGomez

GuillaumeGomez commented Jan 5, 2021

Copy link
Copy Markdown
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

jyn514 commented Jan 5, 2021

Copy link
Copy Markdown
Member

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.

@emilyalbini

emilyalbini commented Jan 6, 2021

Copy link
Copy Markdown
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.

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

crlf0710 commented Jan 22, 2021

Copy link
Copy Markdown
Member

Triage: What's the current status?

@JohnCSimonJohnCSimon 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
@JohnCSimonJohnCSimon 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

bors commented Mar 4, 2021

Copy link
Copy Markdown
Collaborator

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

@tspiteri
tspiteriforce-pushed the italic-and-update-SourceCodePro branch from a80ef80 to d78ccd3CompareMarch 4, 2021 14:39
@tspiteri

tspiteri commented Mar 4, 2021

Copy link
Copy Markdown
ContributorAuthor

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

@bors

bors commented Mar 5, 2021

Copy link
Copy Markdown
Collaborator

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

@tspiteri
tspiteriforce-pushed the italic-and-update-SourceCodePro branch from d78ccd3 to 6f7ebb5CompareMarch 5, 2021 14:17
@jyn514jyn514 mentioned this pull request Mar 5, 2021
Closed
@bors

bors commented Mar 7, 2021

Copy link
Copy Markdown
Collaborator

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

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

This comment has been minimized.

Sign in to view
@tspiteri
tspiteriforce-pushed the italic-and-update-SourceCodePro branch from 8415cdf to 3ba2136CompareMarch 7, 2021 08:12
@tspiteri
tspiteriforce-pushed the italic-and-update-SourceCodePro branch from 3ba2136 to 87d17bbCompareMarch 7, 2021 08:13
@GuillaumeGomez

GuillaumeGomez commented Mar 10, 2021

Copy link
Copy Markdown
Member

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

@jyn514

jyn514 commented Mar 21, 2021

Copy link
Copy Markdown
Member

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.

@jyn514jyn514 added S-blocked Status: 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

jyn514 commented Mar 22, 2021

Copy link
Copy Markdown
Member

@bors r=GuillaumeGomez

@bors

bors commented Mar 22, 2021

Copy link
Copy Markdown
Collaborator

📌 Commit 87d17bb has been approved by GuillaumeGomez

@borsbors 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: Blocked on something else such as an RFC or other implementation work. labels Mar 22, 2021
@JohnTitorJohnTitor 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 ofrust-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:masterMar 23, 2021
@bors

bors commented Mar 23, 2021

Copy link
Copy Markdown
Collaborator

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

@rustbotrustbot 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
@jyn514jyn514 mentioned this pull request Mar 25, 2021
Merged
@jyn514jyn514 mentioned this pull request Apr 2, 2021
Open
3 tasks
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@GuillaumeGomezGuillaumeGomezGuillaumeGomez approved these changes

Assignees

@GuillaumeGomezGuillaumeGomez

Labels

A-rustdoc-uiArea: Rustdoc UI (generated HTML)S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-rustdocRelevant 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

11 participants

@tspiteri@rust-highfive@jyn514@GuillaumeGomez@emilyalbini@crlf0710@bors@rust-log-analyzer@JohnCSimon@camelid@rustbot