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

Convert blah\opt to \opt{blah} #1838

Merged
merged 1 commit into from Nov 27, 2017
Merged

Conversation

jensmaurer
Copy link
Member

@jensmaurer jensmaurer commented Nov 23, 2017

Fixes #1433.

@jensmaurer jensmaurer changed the title Convert xxx\opt to \opt{xxx} and remove package xspace' Convert xxx\opt to \opt{xxx} and remove package 'xspace' Nov 23, 2017
@jensmaurer
Copy link
Member Author

No diffs in diffpdf "words" mode; two expected line-breaking diffs in "appearance mode" for the C++ 20nn non-breaking space.

I can squash some of these commits if desired.

@tkoeppe
Copy link
Contributor

tkoeppe commented Nov 23, 2017

I stole a few commits I liked from this PR. Please rebase.

@tkoeppe tkoeppe added the needs rebase The pull request needs a git rebase to resolve merge conflicts. label Nov 23, 2017
@jensmaurer jensmaurer removed the needs rebase The pull request needs a git rebase to resolve merge conflicts. label Nov 23, 2017
@jensmaurer
Copy link
Member Author

Rebased.

After @tkoeppe's partial merge, the remaining change is to morph blah\opt into \opt{blah}.

@jensmaurer jensmaurer changed the title Convert xxx\opt to \opt{xxx} and remove package 'xspace' Convert blah\opt to \opt{blah} Nov 23, 2017
@tkoeppe
Copy link
Contributor

tkoeppe commented Nov 23, 2017

Is the "C++ 2003" change worth it? Either we already don't break the line, or if we need to break, it doesn't look like a terrible place to break. Why prevent the line break at all costs?

@jensmaurer
Copy link
Member Author

jensmaurer commented Nov 23, 2017

@tkoeppe: That's why it is a separate commit.

In my view, it's somewhat ugly to have "C++" at the end of a line and then have the next line start with "2003". And in the two situations where it makes a difference, TeX finds another linebreak opportunity. Maybe it's better to apply some extra penalty as opposed to "prevent at all costs", though.

@tkoeppe
Copy link
Contributor

tkoeppe commented Nov 23, 2017

Yes, if we could "discourage" rather than "forbid absolutely", that'd be nice. I.e. it's good if we can improve the situation without breaking it.

@jensmaurer
Copy link
Member Author

Dropped patch for avoiding line breaks for earlier versions of C++.

@jensmaurer
Copy link
Member Author

@zygoloid : This merge went the wrong way: You merged "master" into my branch, it seems, rather than the other way round.

@tkoeppe
Copy link
Contributor

tkoeppe commented Nov 26, 2017

@jensmaurer: No, I think he was trying to rebase your PR. Apparently that's a thing you can do now.

@jensmaurer
Copy link
Member Author

jensmaurer commented Nov 26, 2017

@tkoeppe: Ahem. I thought "rebases" don't want to do a "merge", but a force-push, to keep the history tree clean?

@jensmaurer
Copy link
Member Author

Ah, the \tilde changes. Let me fix those in a proper rebase and push again.

@tkoeppe
Copy link
Contributor

tkoeppe commented Nov 27, 2017

No visual diff, looks good. Will leave to @zygoloid to merge because of the wide impact.

@zygoloid zygoloid merged commit 0e003d8 into cplusplus:master Nov 27, 2017
@jensmaurer jensmaurer deleted the xspace branch November 27, 2017 20:21
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.

None yet

3 participants