[lib] Harmonize italics correction after \placeholder

source/atomics.tex

@@ -1344,7 +1344,7 @@
 
 \begin{itemdescr}
 \effects Equivalent to:
-\tcode{return fetch_\placeholder{key}(operand) \placeholdernc{op} operand;}
+\tcode{return fetch_\placeholdernc{key}(operand) \placeholdernc{op} operand;}
 \end{itemdescr}
 
 \rSec2[atomics.ref.pointer]{Partial specialization for pointers}
@@ -1444,7 +1444,7 @@
 \begin{itemdescr}
 \pnum
 \effects Equivalent to:
-\tcode{return fetch_\placeholder{key}(operand) \placeholdernc{op} operand;}
+\tcode{return fetch_\placeholdernc{key}(operand) \placeholdernc{op} operand;}
 \end{itemdescr}
 
 \rSec2[atomics.ref.memop]{Member operators
@@ -2213,7 +2213,7 @@
 
 \begin{itemdescr}
 \pnum
-\effects Equivalent to: \tcode{return fetch_\placeholder{key}(operand) \placeholder{op} operand;}
+\effects Equivalent to: \tcode{return fetch_\placeholdernc{key}(operand) \placeholder{op} operand;}
 \end{itemdescr}
 
 \rSec2[atomics.types.float]{Specializations for floating-point types}
@@ -2358,7 +2358,7 @@
 \begin{itemdescr}
 \pnum
 \effects
-Equivalent to: \tcode{return fetch_\placeholder{key}(operand) \placeholder{op} operand;}
+Equivalent to: \tcode{return fetch_\placeholdernc{key}(operand) \placeholder{op} operand;}
 
 \pnum
 \remarks
@@ -2510,7 +2510,7 @@
 
 \begin{itemdescr}
 \pnum
-\effects Equivalent to: \tcode{return fetch_\placeholder{key}(operand) \placeholder{op} operand;}
+\effects Equivalent to: \tcode{return fetch_\placeholdernc{key}(operand) \placeholder{op} operand;}
 \end{itemdescr}
 
 \rSec2[atomics.types.memop]{Member operators common to integers and pointers to objects}

source/concepts.tex

@@ -279,7 +279,7 @@
   concept @\placeholdernc{same-as-impl}@ = is_same_v<T, U>;       // \expos
 
 template<class T, class U>
-  concept same_as = @\placeholdernc{same-as-impl}@<T, U> && @\placeholdernc{same-as-impl}@<U, T>;
+  concept same_as = @\placeholder{same-as-impl}@<T, U> && @\placeholder{same-as-impl}@<U, T>;
 \end{itemdecl}
 
 \begin{itemdescr}

source/config.tex

@@ -1,7 +1,7 @@
 %!TEX root = std.tex
 %%--------------------------------------------------
 %% Version numbers
-\newcommand{\docno}{Dxxxx}
+\newcommand{\docno}{N4828}
 \newcommand{\prevdocno}{N4820}
 \newcommand{\cppver}{201703L}
 

source/containers.tex

@@ -6251,7 +6251,7 @@
     using reverse_iterator       = std::reverse_iterator<iterator>;
     using const_reverse_iterator = std::reverse_iterator<const_iterator>;
     using node_type              = @\unspec@;
-    using insert_return_type     = @\placeholdernc{insert-return-type}@<iterator, node_type>;
+    using insert_return_type     = @\placeholder{insert-return-type}@<iterator, node_type>;
 
     class value_compare {
       friend class map;
@@ -7116,7 +7116,7 @@
     using reverse_iterator       = std::reverse_iterator<iterator>;
     using const_reverse_iterator = std::reverse_iterator<const_iterator>;
     using node_type              = @\unspec@;
-    using insert_return_type     = @\placeholdernc{insert-return-type}@<iterator, node_type>;
+    using insert_return_type     = @\placeholder{insert-return-type}@<iterator, node_type>;
 
     // \ref{set.cons}, construct/copy/destroy
     set() : set(Compare()) { }
@@ -7802,7 +7802,7 @@
     using local_iterator       = @\impdefx{type of \tcode{unordered_map::local_iterator}}@; // see \ref{container.requirements}
     using const_local_iterator = @\impdefx{type of \tcode{unordered_map::const_local_iterator}}@; // see \ref{container.requirements}
     using node_type            = @\unspec@;
-    using insert_return_type   = @\placeholdernc{insert-return-type}@<iterator, node_type>;
+    using insert_return_type   = @\placeholder{insert-return-type}@<iterator, node_type>;
 
     // \ref{unord.map.cnstr}, construct/copy/destroy
     unordered_map();
@@ -8754,7 +8754,7 @@
     using local_iterator       = @\impdefx{type of \tcode{unordered_set::local_iterator}}@; // see \ref{container.requirements}
     using const_local_iterator = @\impdefx{type of \tcode{unordered_set::const_local_iterator}}@; // see \ref{container.requirements}
     using node_type            = @\unspec@;
-    using insert_return_type   = @\placeholdernc{insert-return-type}@<iterator, node_type>;
+    using insert_return_type   = @\placeholder{insert-return-type}@<iterator, node_type>;
 
     // \ref{unord.set.cnstr}, construct/copy/destroy
     unordered_set();

source/iterators.tex

@@ -38,7 +38,7 @@
 namespace std {
   template<class T> using @\placeholder{with-reference}@ = T&;  // \expos
   template<class T> concept @\placeholder{can-reference}@       // \expos
-    = requires { typename @\placeholdernc{with-reference}@<T>; };
+    = requires { typename @\placeholder{with-reference}@<T>; };
   template<class T> concept @\placeholder{dereferenceable}@     // \expos
     = requires(T& t) {
       { *t } -> @\placeholder{can-reference}@;  // not required to be equality-preserving
@@ -1293,7 +1293,7 @@
     default_constructible<I> && movable<I> &&
     requires(I i) {
       typename iter_difference_t<I>;
-      requires @\placeholdernc{is-signed-integer-like}@<iter_difference_t<I>>;
+      requires @\placeholder{is-signed-integer-like}@<iter_difference_t<I>>;
       { ++i } -> same_as<I&>;   // not required to be equality-preserving
       i++;                      // not required to be equality-preserving
     };
@@ -1397,9 +1397,9 @@
 if it is an unsigned-integer-class type.
 
 \pnum
-\tcode{\placeholdernc{is-integer-like}<I>} is \tcode{true}
+\tcode{\placeholder{is-integer-like}<I>} is \tcode{true}
 if and only if \tcode{I} is an integer-like type.
-\tcode{\placeholdernc{is-signed-integer-like}<I>} is \tcode{true}
+\tcode{\placeholder{is-signed-integer-like}<I>} is \tcode{true}
 if and only if I is a signed-integer-like type.
 
 \pnum
@@ -4869,12 +4869,12 @@
 
 \item
 Otherwise, equivalent to:
-\tcode{return \placeholder{proxy}(*get<I>(v_));} where
+\tcode{return \placeholdernc{proxy}(*get<I>(v_));} where
 \tcode{\placeholder{proxy}} is the exposition-only class:
 \begin{codeblock}
 class @\placeholder{proxy}@ {
   iter_value_t<I> keep_;
-  @\placeholder{proxy}@(iter_reference_t<I>&& x)
+  @\placeholdernc{proxy}@(iter_reference_t<I>&& x)
     : keep_(std::move(x)) {}
 public:
   const iter_value_t<I>* operator->() const {
@@ -6035,7 +6035,7 @@
   class istreambuf_iterator<charT, traits>::@\placeholder{proxy}@ { // \expos
     charT keep_;
     basic_streambuf<charT,traits>* sbuf_;
-    @\placeholder{proxy}@(charT c, basic_streambuf<charT,traits>* sbuf)
+    @\placeholdernc{proxy}@(charT c, basic_streambuf<charT,traits>* sbuf)
       : keep_(c), sbuf_(sbuf) { }
   public:
     charT operator*() { return keep_; }
@@ -6138,7 +6138,7 @@
 \begin{itemdescr}
 \pnum
 \returns
-\tcode{\placeholder{proxy}(sbuf_->sbumpc(), sbuf_)}.
+\tcode{\placeholdernc{proxy}(sbuf_->sbumpc(), sbuf_)}.
 \end{itemdescr}
 
 \indexlibrarymember{equal}{istreambuf_iterator}%

source/lex.tex

@@ -1844,7 +1844,7 @@
 the form
 
 \begin{codeblock}
-operator "" @\placeholder{X}@(@\placeholder{n}@ULL)
+operator "" @\placeholdernc{X}@(@\placeholder{n}@ULL)
 \end{codeblock}
 
 Otherwise, \placeholder{S} shall contain a raw literal operator
@@ -1853,7 +1853,7 @@
 the literal \placeholder{L} is treated as a call of the form
 
 \begin{codeblock}
-operator "" @\placeholder{X}@(@"\placeholder{n}{"}@)
+operator "" @\placeholdernc{X}@(@"\placeholder{n}{"}@)
 \end{codeblock}
 
 Otherwise (\placeholder{S} contains a numeric literal operator template),
@@ -1874,7 +1874,7 @@
 the form
 
 \begin{codeblock}
-operator "" @\placeholder{X}@(@\placeholder{f}@L)
+operator "" @\placeholdernc{X}@(@\placeholder{f}@L)
 \end{codeblock}
 
 Otherwise, \placeholder{S} shall contain a raw literal operator
@@ -1883,7 +1883,7 @@
 the \grammarterm{literal} \placeholder{L} is treated as a call of the form
 
 \begin{codeblock}
-operator "" @\placeholder{X}@(@"\placeholder{f}{"}@)
+operator "" @\placeholdernc{X}@(@"\placeholder{f}{"}@)
 \end{codeblock}
 
 Otherwise (\placeholder{S} contains a numeric literal operator template),
@@ -1914,7 +1914,7 @@
 Otherwise, the literal \placeholder{L} is treated as a call of the form
 
 \begin{codeblock}
-operator "" @\placeholder{X}@(@\placeholder{str}{}@, @\placeholder{len}{}@)
+operator "" @\placeholdernc{X}@(@\placeholder{str}{}@, @\placeholder{len}{}@)
 \end{codeblock}
 
 \pnum
@@ -1926,7 +1926,7 @@
 of the form
 
 \begin{codeblock}
-operator "" @\placeholder{X}@(@\placeholder{ch}{}@)
+operator "" @\placeholdernc{X}@(@\placeholder{ch}{}@)
 \end{codeblock}
 
 \pnum

source/locales.tex

@@ -4712,7 +4712,7 @@
 Each of these functions \tcode{\placeholder{F}}
 returns the result of calling the corresponding
 virtual member function
-\tcode{do_\placeholder{F}()}.
+\tcode{do_\placeholdernc{F}()}.
 
 \rSec4[locale.moneypunct.virtuals]{Virtual functions}
 

source/numerics.tex

@@ -9626,12 +9626,12 @@
 \item If \tcode{isfinite(t) \&\& a == b}, then \tcode{r == a}.
 \item If \tcode{isfinite(t) || !isnan(t) \&\& b-a != 0}, then \tcode{!isnan(r)}.
 \end{itemize}
-Let \tcode{\placeholder{CMP}(x,y)} be \tcode{1} if \tcode{x > y},
+Let \tcode{\placeholdernc{CMP}(x,y)} be \tcode{1} if \tcode{x > y},
 \tcode{-1} if \tcode{x < y}, and \tcode{0} otherwise.
 For any \tcode{t1} and \tcode{t2}, the product of
-\tcode{\placeholder{CMP}(lerp(a, b, t2), lerp(a, b, t1))},
-\tcode{\placeholder{CMP}(t2, t1)}, and
-\tcode{\placeholder{CMP}(b, a)}
+\tcode{\placeholdernc{CMP}(lerp(a, b, t2), lerp(a, b, t1))},
+\tcode{\placeholdernc{CMP}(t2, t1)}, and
+\tcode{\placeholdernc{CMP}(b, a)}
 is non-negative.
 \end{itemdescr}