fixups: consistent use of \keyword for const, always using it in prose because that seems to be the consistent style in the standard, removed informational-only JMB comments

Author: joshuaberne

source/basic.tex

@@ -7376,8 +7376,8 @@
 Within the predicate of a contract assertion,
 \grammarterm{id-expression}s referring to
 variables declared outside the contract assertion
-are const\iref{expr.prim.id.unqual},
-\tcode{this} is a pointer to const\iref{expr.prim.this},
+are \keyword{const}\iref{expr.prim.id.unqual},
+\tcode{this} is a pointer to \keyword{const}\iref{expr.prim.this},
 and the result object can be named
 if a \grammarterm{result-name-introducer}\iref{dcl.contract.res} has been specified.
 \end{note}
@@ -7743,7 +7743,7 @@
 The contract-violation handler
 shall have a single parameter
 of type
-``lvalue reference to \tcode{const} \tcode{std::\-contracts::\-contract_violation}''
+``lvalue reference to \keyword{const} \tcode{std::\-contracts::\-contract_violation}''
 and shall return \tcode{void}.
 The contract-violation handler
 may have a non-throwing exception specification.

source/declarations.tex

@@ -4595,7 +4595,7 @@
 or neither do.
 \end{itemize}
 If this condition is not met
-solely due to the comparison of two \grammarterm{lambda-expression}s  %JMB: In P2900 lambda-expressions was not in grammar font
+solely due to the comparison of two \grammarterm{lambda-expression}s
 that are contained within $P_1$ and $P_2$,
 no diagnostic is required.
 
@@ -4640,13 +4640,13 @@
 a non-reference parameter of \placeholder{f},
 that parameter
 and the corresponding parameter on all declarations of \placeholder{f}
-shall have const type.  %JMB: const was in code font in 2900
+shall have \keyword{const} type.
 \begin{note}
 This requirement applies
 even to declarations that do not specify the \grammarterm{postcondition-specifier}.
 Parameters with array or function type
-will decay to non-const types  %JMB: const was in code font in 2900
-even if a \tcode{const} qualifier is present.
+will decay to non-\keyword{const} types
+even if a \keyword{const} qualifier is present.
 \begin{example}
 \begin{codeblock}
 int f(const int i[10])
@@ -4726,7 +4726,7 @@
 appertains to the result binding so introduced.
 \begin{note}
 An \grammarterm{id-expression}
-that names a result binding is a const lvalue\iref{expr.prim.id.unqual}.  %JMB: This const was code font in P2900
+that names a result binding is a \keyword{const} lvalue\iref{expr.prim.id.unqual}.
 \end{note}
 
 \begin{example}
@@ -7152,7 +7152,7 @@
 
 \pnum
 A coroutine behaves as if
-the top-level cv-qualifiers in all  %JMB: P2900 used math font for cv here
+the top-level cv-qualifiers in all
 \grammarterm{parameter-declaration}s in the declarator
 of its \grammarterm{function-definition}
 were removed and
@@ -7272,7 +7272,7 @@
 argument list. The first argument is the amount of space requested, and
 is a prvalue of type \tcode{std::size_t}.
 The lvalues $\tcode{p}_1 \dotsc \tcode{p}_n$
-with their original types (including cv-qualifiers) %JMB: P2900 used math font for cv here
+with their original types (including cv-qualifiers)
 are the successive arguments.
 If no viable function is found\iref{over.match.viable},
 overload resolution is performed again
@@ -9875,7 +9875,7 @@
 \grammarterm{typedef-name},
 variable (including a structured binding declaration),
 structured binding,
-result binding\iref{dcl.contract.res}, %JMB: In P2900 the comma was in the wrong place
+result binding\iref{dcl.contract.res},
 non-static data member,
 function,
 enumeration, or

source/expressions.tex

@@ -1286,7 +1286,7 @@
 and including in the bodies of nested \grammarterm{lambda-expression}s), %JMB: I think this is hard to parse, and lori suggested removing the second comma.  It's "If (X including Y) and Z then A" but we have "If X and Y, and Z, then A".   Should we make this "If X (including Y) and Z, A"
 and the current class
 encloses the contract assertion,
-\tcode{const} is combined with the \grammarterm{cv-qualifier-seq}
+\keyword{const} is combined with the \grammarterm{cv-qualifier-seq}
 used to generate the resulting type (see below).
 
 \pnum
@@ -1619,7 +1619,7 @@
 \item
 a variable
 declared outside of $C$
-of object type \tcode{T}, %JMB: I removed an or that was here in P2900
+of object type \tcode{T},
 \item
 a variable or template parameter
 declared outside of $C$
@@ -1630,7 +1630,7 @@
 whose corresponding variable
 is declared outside of $C$,
 \end{itemize}
-then the type of the expression is \tcode{const}~\tcode{T}.
+then the type of the expression is \keyword{const}~\tcode{T}.
 
 \pnum
 \begin{example}
@@ -1903,7 +1903,7 @@
 \item
 a variable
 declared outside of $C$
-of object type \tcode{T}, %JMB: I removed an or that was here in P2900
+of object type \tcode{T},
 \item
 a variable
 declared outside of $C$
@@ -1913,7 +1913,7 @@
 whose corresponding variable
 is declared outside of $C$,
 \end{itemize}
-then the type of the expression is \tcode{const}~\tcode{T}.
+then the type of the expression is \keyword{const}~\tcode{T}.
 
 
 \pnum