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

[temp] Replace \term with \defn or \placeholder #1370

Merged
merged 1 commit into from Feb 6, 2017

Conversation

jensmaurer
Copy link
Member

Thereby also improving the index.

Partially addresses #329.

@@ -3556,11 +3561,11 @@
\rSec2[temp.dep]{Dependent names}

\pnum
\indextext{name!dependent}%
\indextext{dependent name|see{name!dependent}}%
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be see{name, dependent}?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, good catch.

@jensmaurer
Copy link
Member Author

Updated and rebased.

@@ -3704,7 +3708,8 @@

\pnum
A name refers to the
\term{current instantiation}
\indextext{current instantiation|see{instantiation, current}}
\defnx{current instantiation}{instantiation!current}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think grouping this under "instantiation" is appropriate; the "current instantiation" is a notion separate from instantiation itself (in fact, it's most relevant when checking a template definition prior to performing any instantiation).

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're right.

@jensmaurer
Copy link
Member Author

Fixed as requested.

A name is a
\term{member of the current instantiation}
\defnx{member of the current instantiation}{instantiation!member of the current}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be {current instantiation!member of} or similar.

\indextext{instantiation!dependent member of the current}%
A name is a \term{dependent member of the current instantiation} if it is a
\indextext{dependent member of the current instantiation|see{instantiation, dependent member of the current}}%
A name is a \defnx{dependent member of the current instantiation}{instantiation!dependent member of the current} if it is a
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Likewise.

Thereby also improving the index.
@jensmaurer
Copy link
Member Author

Fixed the two "member of the current instantiation" issues. The index looks sane now (in this regard).

@zygoloid zygoloid merged commit 9e92aa3 into cplusplus:master Feb 6, 2017
@jensmaurer jensmaurer deleted the b5 branch February 6, 2017 19:10
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