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

Fix several index entries. #483

Merged
merged 7 commits into from Nov 20, 2015
Merged

Fix several index entries. #483

merged 7 commits into from Nov 20, 2015

Conversation

Eelis
Copy link
Contributor

@Eelis Eelis commented Apr 19, 2015

No description provided.

@Eelis Eelis changed the title [intro] Fix index entry for conditionally-supported behavior. [intro], [except.ctor] Fix index entries that use !see instead of |see. Apr 19, 2015
@Eelis Eelis changed the title [intro], [except.ctor] Fix index entries that use !see instead of |see. Fix several index entries. Apr 19, 2015
@Eelis Eelis force-pushed the trivial branch 2 times, most recently from 1454ecd to bc8ffd9 Compare April 19, 2015 23:04
@@ -28,7 +28,7 @@
\indextext{conventions!lexical|(}%
\indextext{compilation!separate|(}%
The text of the program is kept in units called
\indextext{source file}\term{source files} in this International
\defnx{source files}{source file} in this International
Copy link
Member

Choose a reason for hiding this comment

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

\defn{source file}{s} perhaps?

@zygoloid
Copy link
Member

zygoloid commented May 8, 2015

The diffs look good to me, thanks.

@tkoeppe Would you mind looking over the built standard to double-check?

\index{grammar}%
\index{summary, syntax}%
\indextext{grammar}%
\indextext{summary, syntax}%
Copy link
Contributor

Choose a reason for hiding this comment

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

Is there a reason this is summary, syntax rather than summary!syntax?

@tkoeppe
Copy link
Contributor

tkoeppe commented May 9, 2015

Generally a good change. Two nitpicks, see above. The change replaces the low-level \indextext followed by a \term with the combined \defnx that combines indexing and rendering into a single command. It also fixes a few errors.

@Eelis
Copy link
Contributor Author

Eelis commented May 10, 2015

Thanks for the review and suggestions! I've re-pushed the branch with amended commits fixing the issues.

@tkoeppe
Copy link
Contributor

tkoeppe commented Nov 19, 2015

The changes look good!

@Eelis
Copy link
Contributor Author

Eelis commented Nov 19, 2015

Ah, thanks, I'll look into it.

@Eelis
Copy link
Contributor Author

Eelis commented Nov 19, 2015

It was simply because [except.ctor]p1 actually defines "stack unwinding" as a term with a proper index entry. So there is no need for a "see" index entry for stack unwinding in the first place. :)

I've amended the commit that tried to fix that "see" index entry, to no longer try to fix it, and added a separate commit to remove it.

@tkoeppe
Copy link
Contributor

tkoeppe commented Nov 19, 2015

Sounds good, thanks! @zygoloid: I think this is ready for merging.

zygoloid added a commit that referenced this pull request Nov 20, 2015
Fix several index entries.
@zygoloid zygoloid merged commit 01c0772 into cplusplus:master Nov 20, 2015
@@ -2,7 +2,7 @@
\rSec0[intro]{General}

\indextext{diagnostic message|see{message, diagnostic}}%
\indexdefn{conditionally-supported behavior!see{behavior, conditionally-supported}}%
\indexdefn{conditionally-supported behavior|see{behavior, conditionally-supported}}%
Copy link
Contributor

Choose a reason for hiding this comment

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

When to use indexdefn vs. indextext? Looking in macros.tex, they seem to be equivalent.

@jwakely
Copy link
Member

jwakely commented Apr 13, 2016

When to use indexdefn vs. indextext? Looking in macros.tex, they seem to be equivalent.

Currently, yes, but indexdefn has more semantic meaning, and could in theory be formatted differently in future.

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

5 participants