Skip to content

Commit 2edf50a

Browse files
AlisdairMtkoeppe
authored andcommitted
[lex.header] Modernize text around header names
The footnote better belongs in the main text as a regular note. To make the notes flow consistently, switch the order of the note and normative text in the first paragraph to lead with the normative text.
1 parent 2cd11c5 commit 2edf50a

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

source/lex.tex

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -661,16 +661,16 @@
661661
\end{bnf}
662662

663663
\pnum
664+
The sequences in both forms of \grammarterm{header-name}{s} are mapped in an
665+
\impldef{mapping header name to header or external source file} manner to headers or to
666+
external source file names as specified in~\ref{cpp.include}.
664667
\begin{note}
665-
Header name preprocessing tokens only appear within
668+
Header name preprocessing tokens appear only within
666669
a \tcode{\#include} preprocessing directive,
667670
a \tcode{__has_include} preprocessing expression, or
668671
after certain occurrences of an \tcode{import} token
669672
(see~\ref{lex.pptoken}).
670673
\end{note}
671-
The sequences in both forms of \grammarterm{header-name}{s} are mapped in an
672-
\impldef{mapping header name to header or external source file} manner to headers or to
673-
external source file names as specified in~\ref{cpp.include}.
674674

675675
\pnum
676676
The appearance of either of the characters \tcode{'} or \tcode{\textbackslash} or of
@@ -680,12 +680,12 @@
680680
\tcode{/*}, or \tcode{//} in a \grammarterm{q-char-sequence} or an
681681
\grammarterm{h-char-sequence}} semantics, as is the appearance of the character
682682
\tcode{"} in an \grammarterm{h-char-sequence}.
683-
\begin{footnote}
683+
\begin{note}
684684
Thus, a sequence of characters
685685
that resembles an escape sequence can result in an error, be interpreted as the
686686
character corresponding to the escape sequence, or have a completely different meaning,
687687
depending on the implementation.
688-
\end{footnote}
688+
\end{note}
689689
\indextext{header!name|)}
690690

691691
\rSec1[lex.ppnumber]{Preprocessing numbers}

0 commit comments

Comments
 (0)