Use \libconcept

...in or instead of \tcode

Author: opensdh

source/iterators.tex

@@ -1389,11 +1389,13 @@
 
 \pnum
 A type \tcode{I} is \defn{integer-like}
-if it models \tcode{integral<I>} or if it is an integer-class type.
+if it models \tcode{\libconcept{integral}<I>} or
+if it is an integer-class type.
 A type \tcode{I} is \defn{signed-integer-like}
-if it models \tcode{signed_integral<I>} or if it is a signed-integer-class type.
+if it models \tcode{\libconcept{signed_integral}<I>} or
+if it is a signed-integer-class type.
 A type \tcode{I} is \defn{unsigned-integer-like}
-if it models \tcode{unsigned_integral<I>} or
+if it models \tcode{\libconcept{unsigned_integral}<I>} or
 if it is an unsigned-integer-class type.
 
 \pnum
@@ -1405,7 +1407,7 @@
 \pnum
 Let \tcode{i} be an object of type \tcode{I}. When \tcode{i} is in the domain of
 both pre- and post-increment, \tcode{i} is said to be \term{incrementable}.
-\tcode{I} models \tcode{weakly_incrementable<I>} only if
+\tcode{I} models \tcode{\libconcept{weakly_incrementable}<I>} only if
 
 \begin{itemize}
 \item The expressions \tcode{++i} and \tcode{i++} have the same domain.

source/ranges.tex

@@ -317,11 +317,13 @@
 \item
   Otherwise, if \tcode{E} is an lvalue,
   \tcode{\placeholdernc{decay-copy}(E.begin())}
-  if it is a valid expression and its type \tcode{I} models \tcode{input_or_output_iterator}.
+  if it is a valid expression and its type \tcode{I} models
+  \libconcept{input_or_output_iterator}.
 
 \item
   Otherwise, \tcode{\placeholdernc{decay-copy}(begin(E))} if it is a
-  valid expression and its type \tcode{I} models \tcode{input_or_output_iterator} with overload
+  valid expression and its type \tcode{I} models
+  \libconcept{input_or_output_iterator} with overload
   resolution performed in a context that includes the declarations:
   \begin{codeblock}
   template<class T> void begin(T&&) = delete;
@@ -409,7 +411,7 @@
 \pnum
 \begin{note}
 Whenever \tcode{ranges::cbegin(E)} is a valid expression, its type models
-\tcode{input_or_output_iterator}.
+\libconcept{input_or_output_iterator}.
 \end{note}
 
 \rSec2[range.access.cend]{\tcode{ranges::cend}}
@@ -442,11 +444,13 @@
 \begin{itemize}
 \item
   If \tcode{E} is an lvalue, \tcode{\placeholdernc{decay-copy}(E.rbegin())}
-  if it is a valid expression and its type \tcode{I} models \tcode{input_or_output_iterator}.
+  if it is a valid expression and its type \tcode{I} models
+  \libconcept{input_or_output_iterator}.
 
 \item
   Otherwise, \tcode{\placeholdernc{decay-copy}(rbegin(E))} if it is a valid
-  expression and its type \tcode{I} models \tcode{input_or_output_iterator} with overload
+  expression and its type \tcode{I} models
+  \libconcept{input_or_output_iterator} with overload
   resolution performed in a context that includes the declaration:
   \begin{codeblock}
   template<class T> void rbegin(T&&) = delete;
@@ -471,7 +475,7 @@
 \pnum
 \begin{note}
 Whenever \tcode{ranges::rbegin(E)} is a valid expression, its type models
-\tcode{input_or_output_iterator}.
+\libconcept{input_or_output_iterator}.
 \end{note}
 
 \rSec2[range.access.rend]{\tcode{ranges::rend}}
@@ -540,7 +544,7 @@
 \pnum
 \begin{note}
 Whenever \tcode{ranges::crbegin(E)} is a valid expression, its
-type models \tcode{input_or_output_iterator}.
+type models \libconcept{input_or_output_iterator}.
 \end{note}
 
 \rSec2[range.access.crend]{\tcode{ranges::crend}}
@@ -670,7 +674,7 @@
 
 \item
   Otherwise, if \tcode{ranges::begin(E)} is a valid expression whose type models
-  \tcode{contiguous_iterator},
+  \libconcept{contiguous_iterator},
   \tcode{to_address(ranges::begin(E))}.
 
 \item
@@ -2820,10 +2824,12 @@
 \item Let \tcode{C} denote the type
 \tcode{iterator_traits<iterator_t<V>>::iterator_category}.
 
-\item If \tcode{C} models \tcode{derived_from<bidirectional_iterator_tag>},
+\item If \tcode{C} models
+\tcode{\libconcept{derived_from}<bidirectional_iterator_tag>},
 then \tcode{iterator_category} denotes \tcode{bi\-directional_iterator_tag}.
 
-\item Otherwise, if  \tcode{C} models \tcode{derived_from<forward_iterator_tag>},
+\item Otherwise, if  \tcode{C} models
+\tcode{\libconcept{derived_from}<forward_iterator_tag>},
 then \tcode{iterator_category} denotes \tcode{forward_iterator_tag}.
 
 \item Otherwise, \tcode{iterator_category} denotes \tcode{input_iterator_tag}.
@@ -5593,7 +5599,7 @@
 \rSec3[range.istream.overview]{Overview}
 
 \pnum
-\tcode{basic_istream_view} models \tcode{input_range} and
+\tcode{basic_istream_view} models \libconcept{input_range} and
 reads (using \tcode{operator>>}) successive elements
 from its corresponding input stream.
 

source/support.tex

@@ -4021,7 +4021,7 @@
   template<class... Ts>
     using common_comparison_category_t = typename common_comparison_category<Ts...>::type;
 
-  // \ref{cmp.concept}, concept \tcode{three_way_comparable}
+  // \ref{cmp.concept}, concept \libconcept{three_way_comparable}
   template<class T, class Cat = partial_ordering>
     concept three_way_comparable = @\seebelow@;
   template<class T, class U, class Cat = partial_ordering>

source/utilities.tex

@@ -20232,7 +20232,7 @@
 
 \pnum
 \expects
-\tcode{Out} models \tcode{output_iterator<const charT\&>}.
+\tcode{Out} models \tcode{\libconcept{output_iterator}<const charT\&>}.
 
 \pnum
 \effects
@@ -20285,11 +20285,11 @@
 
 \pnum
 \constraints
-\tcode{Out} satisfies \tcode{output_iterator<const charT\&>}.
+\tcode{Out} satisfies \tcode{\libconcept{output_iterator}<const charT\&>}.
 
 \pnum
 \expects
-\tcode{Out} models \tcode{output_iterator<const charT\&>}, and
+\tcode{Out} models \tcode{\libconcept{output_iterator}<const charT\&>}, and
 \tcode{formatter<}$\tcode{T}_i$\tcode{, charT>}
 meets the \newoldconcept{Formatter} requirements\iref{formatter.requirements}
 for each $\tcode{T}_i$ in \tcode{Args}.
@@ -20733,7 +20733,7 @@
 consisting of the formatting arguments and the output iterator.
 
 \pnum
-\tcode{Out} shall model \tcode{output_iterator<const charT\&>}.
+\tcode{Out} shall model \tcode{\libconcept{output_iterator}<const charT\&>}.
 
 \pnum
 \indexlibrary{\idxcode{format_context}}%