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

Use \keyword pervasively #4405

Merged
merged 20 commits into from Jun 1, 2021
Merged

Use \keyword pervasively #4405

merged 20 commits into from Jun 1, 2021

Conversation

jensmaurer
Copy link
Member

@jensmaurer jensmaurer commented Dec 3, 2020

Slightly related to #4401

source/basic.tex Outdated Show resolved Hide resolved
@jensmaurer jensmaurer marked this pull request as ready for review February 12, 2021 20:54
@tkoeppe tkoeppe added the needs rebase The pull request needs a git rebase to resolve merge conflicts. label Mar 15, 2021
@tkoeppe
Copy link
Contributor

tkoeppe commented May 29, 2021

@jensmaurer If you rebase this, I think this can land -- it has no visual effect, right?

@jensmaurer
Copy link
Member Author

jensmaurer commented May 29, 2021

@tkoeppe: Rebased. Confirmed no visual effect, except one strange false positive / spacing diff shown by diffpdf, and (of course) except for the additional index entries.

@jensmaurer
Copy link
Member Author

@tkoeppe, we should consider squashing this.

source/basic.tex Outdated Show resolved Hide resolved
@tkoeppe
Copy link
Contributor

tkoeppe commented Jun 1, 2021

I extraced a nesting fix into b0a253c; please rebase.

@tkoeppe
Copy link
Contributor

tkoeppe commented Jun 1, 2021

Well, I can actually just fix this myself, so leave it with me.

@jensmaurer
Copy link
Member Author

jensmaurer commented Jun 1, 2021

Hm... That situation is actually fine in my copy. But apparently, I need to rebase.

@tkoeppe, rebased.

@tkoeppe
Copy link
Contributor

tkoeppe commented Jun 1, 2021

Hm, you lost the tcode around the closing paren. I'd reinstate \tcode{\keyword{int}).

@jensmaurer
Copy link
Member Author

Are we talking about the same thing? I have

a function of \tcode{(\keyword{int}}, pointer to pointer to \tcode{\keyword{char})} returning \keyword{int}

@jensmaurer
Copy link
Member Author

(These are parens around a parameter-type-list; the closing paren is at the end.)

@tkoeppe
Copy link
Contributor

tkoeppe commented Jun 1, 2021

The "function of" issue was a problem with your PR, which you have now fixed. The const_cast nesting issue was pre-existing, and your PR had fixed it, but I extraced it into a separate commit (since it has nothing to do with \keyword).

@jensmaurer
Copy link
Member Author

Yes, and I've rebased/force-pushed and fixed the "function of" issue. Are there any other issues?

@jensmaurer jensmaurer removed the needs rebase The pull request needs a git rebase to resolve merge conflicts. label Jun 1, 2021
@jensmaurer jensmaurer requested a review from tkoeppe June 1, 2021 12:11
@tkoeppe
Copy link
Contributor

tkoeppe commented Jun 1, 2021

No, that should be it.

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