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

Replace \nonterminal with \grammarterm or \cvqual, as appropriate. #1316

Merged
merged 1 commit into from Jan 9, 2017
Merged

Replace \nonterminal with \grammarterm or \cvqual, as appropriate. #1316

merged 1 commit into from Jan 9, 2017

Conversation

jensmaurer
Copy link
Member

Fixes #1312.

@tkoeppe
Copy link
Contributor

tkoeppe commented Jan 9, 2017

Can you run diffpdf?

@jensmaurer
Copy link
Member Author

Yes. There are 14 pages with differences, all of them due to the fact that \nonterminal uses a slightly smaller font than \grammarterm or \cvqual.

@jensmaurer
Copy link
Member Author

jensmaurer commented Jan 9, 2017 •
edited

(I've rebased the patch to avoid a fallback to 3-way merge.)

@tkoeppe
Copy link
Contributor

tkoeppe commented Jan 9, 2017

Oh, very good, we should fix that. Thanks!

@tkoeppe tkoeppe merged commit 89ad8fa into cplusplus:master Jan 9, 2017
@jensmaurer jensmaurer deleted the nonterminal branch January 9, 2017 20:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tkoeppe tkoeppe Awaiting requested review from tkoeppe

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@jensmaurer @tkoeppe