[core] Use \keyword to introduce 'template'.

Author: jensmaurer

source/basic.tex

@@ -310,7 +310,7 @@
 an array operand, the set contains the potential results of that operand.
 \item If $E$ is a class member access
 expression\iref{expr.ref} of the form
-$E_1$ \tcode{.} \opt{\tcode{template}} $E_2$
+$E_1$ \tcode{.} \opt{\keyword{template}} $E_2$
 naming a non-static data member,
 the set contains the potential results of $E_1$.
 \item If $E$ is a class member access expression

source/expressions.tex

@@ -1434,7 +1434,7 @@
 
 \pnum
 A \grammarterm{nested-name-specifier} that denotes a class, optionally
-followed by the keyword \tcode{template}\iref{temp.names}, and then
+followed by the keyword \keyword{template}\iref{temp.names}, and then
 followed by the name of a member of either that class\iref{class.mem}
 or one of its base classes\iref{class.derived}, is a
 \indextext{id!qualified}%
@@ -1459,7 +1459,7 @@
 The \grammarterm{nested-name-specifier} \tcode{::} names the global namespace.
 A \grammarterm{nested-name-specifier} that names a
 namespace\iref{basic.namespace}, optionally followed by the keyword
-\tcode{template}\iref{temp.names}, and then followed by the name of a member
+\keyword{template}\iref{temp.names}, and then followed by the name of a member
 of that namespace (or the name of a member of a namespace made visible by a
 \grammarterm{using-directive}), is a
 \indextext{id!qualified}%
@@ -3211,7 +3211,7 @@
 \indextext{arrow operator|see{operator, class member access}}%
 A postfix expression followed by a dot \tcode{.} or an arrow \tcode{->},
 optionally followed by the keyword
-\tcode{template}\iref{temp.names}, and then followed by an
+\keyword{template}\iref{temp.names}, and then followed by an
 \grammarterm{id-expression}, is a postfix expression. The postfix
 expression before the dot or arrow is evaluated;\footnote{If the class member
 access expression is evaluated, the subexpression evaluation happens even if the

source/grammar.tex

@@ -22,7 +22,7 @@
 \tcode{typedef}\iref{dcl.typedef},
 \tcode{namespace}\iref{namespace.def},
 class\iref{class}, enumeration\iref{dcl.enum}, and
-\tcode{template}\iref{temp}
+\keyword{template}\iref{temp}
 declarations.
 
 \begin{ncbnf}

source/templates.tex

@@ -319,11 +319,11 @@
 to be a
 \grammarterm{typedef-name}
 (if declared without
-\tcode{template})
+\keyword{template})
 or
 \grammarterm{template-name}
 (if declared with
-\tcode{template})
+\keyword{template})
 in the scope of the template declaration.
 \begin{note}
 A template argument may be a class template or alias template.
@@ -764,25 +764,25 @@
 \end{example}
 
 \pnum
-The keyword \tcode{template} is said to appear at the top level in
+The keyword \keyword{template} is said to appear at the top level in
 a \grammarterm{qualified-id}
 if it appears outside of a \grammarterm{template-argument-list} or
 \grammarterm{decltype-specifier}.
 In a \grammarterm{qualified-id} of a \grammarterm{declarator-id} or
 in a \grammarterm{qualified-id} formed by a \grammarterm{class-head-name}\iref{class.pre} or
 \grammarterm{enum-head-name}\iref{dcl.enum},
-the keyword \tcode{template} shall not appear at the top level.
+the keyword \keyword{template} shall not appear at the top level.
 In a \grammarterm{qualified-id} used as the name in a
 \grammarterm{typename-specifier}\iref{temp.res},
 \grammarterm{elaborated-type-specifier}\iref{dcl.type.elab},
 \grammarterm{using-declaration}\iref{namespace.udecl}, or
 \grammarterm{class-or-decltype}\iref{class.derived},
-an optional keyword \tcode{template} appearing at the top level is ignored.
+an optional keyword \keyword{template} appearing at the top level is ignored.
 In these contexts, a \tcode{<} token is always assumed to introduce a
 \grammarterm{template-argument-list}.
 In all other contexts, when naming a template specialization of
 a member of an unknown specialization\iref{temp.dep.type},
-the member template name shall be prefixed by the keyword \tcode{template}.
+the member template name shall be prefixed by the keyword \keyword{template}.
 \begin{example}
 \begin{codeblock}
 struct X {
@@ -800,19 +800,19 @@
 
 \pnum
 A name prefixed by the keyword
-\tcode{template}
+\keyword{template}
 shall be a \grammarterm{template-id} or
 the name shall refer to a class template or an alias template.
 \begin{note}
 The keyword
-\tcode{template}
+\keyword{template}
 may not be applied to non-template members of class templates.
 \end{note}
 \begin{note}
 As is the case with the
 \tcode{typename}
 prefix, the
-\tcode{template}
+\keyword{template}
 prefix is allowed in cases where it is not strictly
 necessary; i.e., when the \grammarterm{nested-name-specifier} or
 the expression on the left of
@@ -2245,7 +2245,7 @@
   T& elem(int i) { return v[i]; }
 };
 \end{codeblock}
-The prefix \tcode{template<class T>}
+The prefix \tcode{\keyword{template}<class T>}
 specifies that a template is being declared and that a
 \grammarterm{type-name}
 \tcode{T}
@@ -3255,7 +3255,7 @@
 \pnum
 The template parameters are specified in the angle bracket enclosed list
 that immediately follows the keyword
-\tcode{template}.
+\keyword{template}.
 For partial specializations, the template argument list is explicitly
 written immediately following the class template name.
 For primary templates, this list is implicitly described by the
@@ -5991,7 +5991,7 @@
 a variable template, a class template, a member of a class template, or
 a member template.
 An explicit specialization declaration is introduced by
-\tcode{template<>}.
+\tcode{\keyword{template}<>}.
 In an explicit specialization declaration for
 a variable template, a class template,
 a member of a class template or a class member template,
@@ -6839,7 +6839,7 @@
 member function template of a class or class template
 \end{itemize}
 can be declared by a declaration introduced by
-\tcode{template<>};
+\tcode{\keyword{template}<>};
 that is:
 \indextext{\idxgram{explicit-specialization}}%
 
@@ -6935,9 +6935,9 @@
 specialization.
 Members of an explicitly specialized
 class template are defined in the same manner as members of normal classes, and
-not using the \tcode{template<>} syntax.
+not using the \tcode{\keyword{template}<>} syntax.
 The same is true when defining a member of an explicitly specialized member
-class. However, \tcode{template<>} is used in defining a member of an explicitly
+class. However, \tcode{\keyword{template}<>} is used in defining a member of an explicitly
 specialized member class template that is specialized as a class template.
 \begin{example}
 \begin{codeblock}
@@ -6955,32 +6955,32 @@
   a.f(16);          // \tcode{A<int>::f} must be defined somewhere
 }
 
-// \tcode{template<>} not used for a member of an explicitly specialized class template
+// \tcode{\keyword{template}<>} not used for a member of an explicitly specialized class template
 void A<int>::f(int) { @\commentellip@ }
 
 template<> struct A<char>::B {
   void f();
 };
-// \tcode{template<>} also not used when defining a member of an explicitly specialized member class
+// \tcode{\keyword{template}<>} also not used when defining a member of an explicitly specialized member class
 void A<char>::B::f() { @\commentellip@ }
 
 template<> template<class U> struct A<char>::C {
   void f();
 };
-// \tcode{template<>} is used when defining a member of an explicitly specialized member class template
+// \tcode{\keyword{template}<>} is used when defining a member of an explicitly specialized member class template
 // specialized as a class template
 template<>
 template<class U> void A<char>::C<U>::f() { @\commentellip@ }
 
 template<> struct A<short>::B {
   void f();
 };
-template<> void A<short>::B::f() { @\commentellip@ }              // error: \tcode{template<>} not permitted
+template<> void A<short>::B::f() { @\commentellip@ }              // error: \tcode{\keyword{template}<>} not permitted
 
 template<> template<class U> struct A<short>::C {
   void f();
 };
-template<class U> void A<short>::C<U>::f() { @\commentellip@ }    // error: \tcode{template<>} required
+template<class U> void A<short>::C<U>::f() { @\commentellip@ }    // error: \tcode{\keyword{template}<>} required
 \end{codeblock}
 \end{example}
 
@@ -7185,7 +7185,7 @@
 templates.
 In an explicit specialization for such a member,
 the member declaration shall be preceded by a
-\tcode{template<>}
+\tcode{\keyword{template}<>}
 for each enclosing class template that is explicitly specialized.
 \begin{example}
 \begin{codeblock}
@@ -7208,11 +7208,11 @@
 template if its enclosing class templates are not explicitly specialized
 as well.
 In such an explicit specialization declaration, the keyword
-\tcode{template}
+\keyword{template}
 followed by a
 \grammarterm{template-parameter-list}
 shall be provided instead of the
-\tcode{template<>}
+\tcode{\keyword{template}<>}
 preceding the explicit specialization declaration of the member.
 The types of the
 \grammarterm{template-parameter}{s}

source/utilities.tex

@@ -2230,7 +2230,7 @@
 non-member function is that if this functionality had been
 provided as a member function, code where the type
 depended on a template parameter would have required using
-the \tcode{template} keyword.
+the \keyword{template} keyword.
 \end{note}
 
 \rSec2[tuple.rel]{Relational operators}