fixup: formatting

Author: jensmaurer

source/ranges.tex

@@ -438,7 +438,7 @@
   namespace views { inline constexpr @\unspec@ chunk_by = @\unspec@; }
 
   // \ref{range.stride}, stride view
-  template<input_range V>
+  template<@\libconcept{input_range}@ V>
     requires @\libconcept{view}@<V>
   class stride_view;
 
@@ -12898,7 +12898,7 @@
 \rSec3[range.stride.overview]{Overview}
 
 \pnum
-\tcode{stride_view} presents a view of an underlying sequence,
+\tcode{stride_view} presents a \libconcept{view} of an underlying sequence,
 advancing over $n$ elements at a time,
 as opposed to the usual single-step succession.
 
@@ -12927,6 +12927,7 @@
   class stride_view : public view_interface<stride_view<V>> {
     V @\exposid{base_}@;                                    // \expos
     range_difference_t<V> @\exposid{stride_}@;              // \expos
+    // \ref{range.stride.iterator}, class template \tcode{stride_view::\exposid{iterator}}
     template<bool> class @\exposid{iterator}@;              // \expos
   public:
     constexpr explicit stride_view(V base, range_difference_t<V> stride);
@@ -12940,34 +12941,34 @@
       return @\exposid{iterator}@<false>(this, ranges::begin(@\exposid{base_}@));
     }
 
-    constexpr auto begin() const requires range<const V> {
+    constexpr auto begin() const requires @\libconcept{range}@<const V> {
       return @\exposid{iterator}@<true>(this, ranges::begin(@\exposid{base_}@));
     }
 
     constexpr auto end() requires (!@\exposconcept{simple-view}@<V>) {
-      if constexpr (common_range<V> && sized_range<V> && forward_range<V>) {
+      if constexpr (@\libconcept{common_range}@<V> && @\libconcept{sized_range}@<V> && @\libconcept{forward_range}@<V>) {
         auto missing = (@\exposid{stride_}@ - ranges::distance(@\exposid{base_}@) % @\exposid{stride_}@) % @\exposid{stride_}@;
         return @\exposid{iterator}@<false>(this, ranges::end(@\exposid{base_}@), missing);
-      } else if constexpr (common_range<V> && !bidirectional_range<V>) {
+      } else if constexpr (@\libconcept{common_range}@<V> && !@\libconcept{bidirectional_range}@<V>) {
         return @\exposid{iterator}@<false>(this, ranges::end(@\exposid{base_}@));
       } else {
         return default_sentinel;
       }
     }
 
-    constexpr auto end() const requires range<const V> {
-      if constexpr (common_range<const V> && sized_range<const V> && forward_range<const V>) {
+    constexpr auto end() const requires @\libconcept{range}@<const V> {
+      if constexpr (@\libconcept{common_range}@<const V> && @\libconcept{sized_range}@<const V> && @\libconcept{forward_range}@<const V>) {
         auto missing = (@\exposid{stride_}@ - ranges::distance(@\exposid{base_}@) % @\exposid{stride_}@) % @\exposid{stride_}@;
         return @\exposid{iterator}@<true>(this, ranges::end(@\exposid{base_}@), missing);
-      } else if constexpr (common_range<const V> && !bidirectional_range<const V>) {
+      } else if constexpr (@\libconcept{common_range}@<const V> && !@\libconcept{bidirectional_range}@<const V>) {
         return @\exposid{iterator}@<true>(this, ranges::end(@\exposid{base_}@));
       } else {
         return default_sentinel;
       }
     }
 
-    constexpr auto size() requires sized_range<V>;
-    constexpr auto size() const requires sized_range<const V>;
+    constexpr auto size() requires @\libconcept{sized_range}@<V>;
+    constexpr auto size() const requires @\libconcept{sized_range}@<const V>;
   };
 
   template<class R>
@@ -13002,10 +13003,10 @@
 \exposid{stride_}.
 \end{itemdescr}
 
-\indexlibrarymember{stride}{stride_view}%
+\indexlibrarymember{size}{stride_view}%
 \begin{itemdecl}
-constexpr auto size() requires sized_range<V>;
-constexpr auto size() const requires sized_range<const V>;
+constexpr auto size() requires @\libconcept{sized_range}@<V>;
+constexpr auto size() const requires @\libconcept{sized_range}@<const V>;
 \end{itemdecl}
 
 \begin{itemdescr}
@@ -13041,11 +13042,11 @@
     using iterator_concept = @\seebelow@;
     using iterator_category = @\seebelow@;    // not always present
 
-    iterator() requires default_initializable<iterator_t<@\exposid{Base}@>> = default;
+    iterator() requires @\libconcept{default_initializable}@<iterator_t<@\exposid{Base}@>> = default;
 
     constexpr @\exposid{iterator}@(@\exposid{iterator}@<!Const> other)
-      requires Const && convertible_to<iterator_t<V>, iterator_t<@\exposid{Base}@>>
-                     && convertible_to<sentinel_t<V>, sentinel_t<@\exposid{Base}@>>;
+      requires Const && @\libconcept{convertible_to}@<iterator_t<V>, iterator_t<@\exposid{Base}@>>
+                     && @\libconcept{convertible_to}@<sentinel_t<V>, sentinel_t<@\exposid{Base}@>>;
 
     constexpr iterator_t<@\exposid{Base}@> base() &&;
     constexpr const iterator_t<@\exposid{Base}@>& base() const & noexcept;
@@ -13069,7 +13070,7 @@
     friend constexpr bool operator==(const @\exposid{iterator}@& x, default_sentinel_t);
 
     friend constexpr bool operator==(const @\exposid{iterator}@& x, const @\exposid{iterator}@& y)
-      requires equality_comparable<iterator_t<@\exposid{Base}@>>;
+      requires @\libconcept{equality_comparable}@<iterator_t<@\exposid{Base}@>>;
 
     friend constexpr bool operator<(const @\exposid{iterator}@& x, const @\exposid{iterator}@& y)
       requires @\libconcept{random_access_range}@<@\exposid{Base}@>;
@@ -13145,7 +13146,7 @@
 
 \indexlibraryctor{stride_view::iterator}%
 \begin{itemdecl}
-constexpr @\exposid{iterator}@(Parent* parent, iterator_t<@\exposid{Base}@> current,
+constexpr @\exposid{iterator}@(@\exposid{Parent}@* parent, iterator_t<@\exposid{Base}@> current,
                    range_difference_t<@\exposid{Base}@> missing = 0);
 \end{itemdecl}
 
@@ -13204,7 +13205,7 @@
 \begin{itemdescr}
 \pnum
 \expects
-\exposid{current_} != \exposid{end_} is \tcode{true}.
+\tcode{\exposid{current_} != \exposid{end_}} is \tcode{true}.
 
 \pnum
 \effects
@@ -13252,8 +13253,8 @@
 \effects
 Equivalent to:
 \begin{codeblock}
-ranges::advance(current_, missing_ - stride_);
-missing_ = 0;
+ranges::advance(@\exposid{current_}@, @\exposid{missing_}@ - @\exposid{stride_}@);
+@\exposid{missing_}@ = 0;
 return *this;
 \end{codeblock}
 \end{itemdescr}
@@ -13286,7 +13287,7 @@
 \tcode{ranges::distance(\exposid{current_}, \exposid{end_}) > \exposid{stride_} * (n - 1)}
 is \tcode{true}.
 \begin{note}
-If \tcode{n} is negative, the \effects paragraph implies a precondition.
+If \tcode{n} is negative, the \Fundescx{Effects} paragraph implies a precondition.
 \end{note}
 
 \pnum
@@ -13395,7 +13396,7 @@
 \begin{itemdescr}
 \pnum
 \returns
-\tcode{x.current_ <=> y.current_}.
+\tcode{x.\exposid{current_} <=> y.\exposid{current_}}.
 \end{itemdescr}
 
 \indexlibrarymember{operator+}{stride_view::iterator}%
@@ -13443,7 +13444,7 @@
 \begin{itemdescr}
 \pnum
 \returns
-Let \tcode{N} be \tcode{x.\exposid{current_} - y.\exposid{current_}}.
+Let \tcode{N} be \tcode{(x.\exposid{current_} - y.\exposid{current_})}.
 \begin{itemize}
 \item
 If \exposid{Base} models \libconcept{forward_range},