From 63ff3a747a9dee8a66f794eab1809f587c7f7c43 Mon Sep 17 00:00:00 2001
From: Jens Maurer <Jens.Maurer@gmx.net>
Date: Mon, 13 May 2024 23:39:13 +0200
Subject: [PATCH 1/2] [lex.literal] Properly format table headings

Fixes ISO/CS comment (C++23 proof)
---
 source/lex.tex     | 10 +++++-----
 source/locales.tex | 12 ++++++------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/source/lex.tex b/source/lex.tex
index 03d086d26a..9656489b70 100644
--- a/source/lex.tex
+++ b/source/lex.tex
@@ -1466,8 +1466,8 @@
 \begin{floattable}{Character literals}{lex.ccon.literal}
 {l|l|l|l|l}
 \topline
-Encoding & Kind & Type & Associated char- & Example \\
-prefix & & & acter encoding & \\
+\lhdr{Encoding} & \chdr{Kind} & \chdr{Type} & \chdr{Associated char-} & \rhdr{Example} \\
+\lhdr{prefix} & \chdr{} & \chdr{} & \chdr{acter encoding} & \\
 \capsep
 none &
 \defnx{ordinary character literal}{literal!character!ordinary} &
@@ -1805,9 +1805,9 @@
 \begin{floattable}{String literals}{lex.string.literal}
 {llp{2.6cm}p{2.3cm}p{4.7cm}}
 \topline
-Encoding & Kind & Type & Associated & Examples \\
-prefix   &      &      & character  & \\
-         &      &      & encoding   & \\
+\lhdr{Enco-} & \chdr{Kind} & \chdr{Type} & \chdr{Associated} & \rhdr{Examples} \\
+\lhdr{ding}   & \chdr{} & \chdr{} & \chdr{character}  & \rhdr{} \\
+\lhdr{prefix}         & \chdr{} & \chdr{} & \chdr{encoding}   & \rhdr{} \\
 \capsep
 none &
 \defnx{ordinary string literal}{literal!string!ordinary} &
diff --git a/source/locales.tex b/source/locales.tex
index 26ea841200..084af2b930 100644
--- a/source/locales.tex
+++ b/source/locales.tex
@@ -2250,7 +2250,7 @@
 \begin{floattable}{Integer conversions}{facet.num.get.int}
 {lc}
 \topline
-\lhdr{State}                    &   \tcode{stdio} equivalent   \\ \capsep
+\lhdr{State}                    &   \rhdr{\tcode{stdio} equivalent} \\ \capsep
 \tcode{basefield == oct}        &   \tcode{\%o}                 \\ \rowsep
 \tcode{basefield == hex}        &   \tcode{\%X}                 \\ \rowsep
 \tcode{basefield == 0}          &   \tcode{\%i}                 \\ \capsep
@@ -2268,7 +2268,7 @@
 \begin{floattable}{Length modifier}{facet.num.get.length}
 {lc}
 \topline
-\lhdr{Type}                 &   Length modifier \\ \capsep
+\lhdr{Type}                 &   \rhdr{Length modifier} \\ \capsep
 \tcode{short}               &   \tcode{h}       \\ \rowsep
 \tcode{unsigned short}      &   \tcode{h}       \\ \rowsep
 \tcode{long}                &   \tcode{l}       \\ \rowsep
@@ -2599,7 +2599,7 @@
 \begin{floattable}{Integer conversions}{facet.num.put.int}
 {lc}
 \topline
-\lhdr{State}                        &   \tcode{stdio} equivalent       \\ \capsep
+\lhdr{State}                        &  \rhdr{\tcode{stdio} equivalent} \\ \capsep
 \tcode{basefield == ios_base::oct}                      &   \tcode{\%o} \\ \rowsep
 \tcode{(basefield == ios_base::hex) \&\& !uppercase}    &   \tcode{\%x} \\ \rowsep
 \tcode{(basefield == ios_base::hex)}                    &   \tcode{\%X} \\ \rowsep
@@ -2614,7 +2614,7 @@
 \begin{floattable}{Floating-point conversions}{facet.num.put.fp}
 {lc}
 \topline
-\lhdr{State}            &   \tcode{stdio} equivalent                       \\ \capsep
+\lhdr{State}            & \rhdr{\tcode{stdio} equivalent}  \\ \capsep
 \tcode{floatfield == ios_base::fixed}                       &   \tcode{\%f} \\ \rowsep
 \tcode{floatfield == ios_base::scientific \&\& !uppercase}  &   \tcode{\%e} \\ \rowsep
 \tcode{floatfield == ios_base::scientific}                  &   \tcode{\%E} \\ \rowsep
@@ -2631,7 +2631,7 @@
 \begin{floattable}{Length modifier}{facet.num.put.length}
 {lc}
 \topline
-\lhdr{Type}                 &   Length modifier \\ \capsep
+\lhdr{Type}                 &   \rhdr{Length modifier} \\ \capsep
 \tcode{long}                &   \tcode{l}       \\ \rowsep
 \tcode{long long}           &   \tcode{ll}      \\ \rowsep
 \tcode{unsigned long}       &   \tcode{l}       \\ \rowsep
@@ -2646,7 +2646,7 @@
 \begin{floattable}{Numeric conversions}{facet.num.put.conv}
 {llc}
 \topline
-\lhdr{Type(s)}                  &   \chdr{State}       &   \tcode{stdio} equivalent   \\ \capsep
+\lhdr{Type(s)}                  &   \chdr{State}       &   \rhdr{\tcode{stdio} equivalent} \\ \capsep
 an integral type                &   \tcode{showpos}    &   \tcode{+}                   \\
                                 &   \tcode{showbase}   &   \tcode{\#}                  \\ \rowsep
 a floating-point type           &   \tcode{showpos}    &   \tcode{+}                   \\

From 57810e6b5edeaed5a295449a6babaaa85f6a3f38 Mon Sep 17 00:00:00 2001
From: Jens Maurer <Jens.Maurer@gmx.net>
Date: Mon, 13 May 2024 23:47:55 +0200
Subject: [PATCH 2/2] [basic.fundamental] Center second column of "integer
 width" table

Fixes ISO/CS comment (C++23 proof)
---
 source/basic.tex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/basic.tex b/source/basic.tex
index f33d0dc648..831b55343c 100644
--- a/source/basic.tex
+++ b/source/basic.tex
@@ -5051,7 +5051,7 @@
 the largest value of the corresponding unsigned type.
 \end{example}
 
-\begin{floattable}{Minimum width}{basic.fundamental.width}{ll}
+\begin{floattable}{Minimum width}{basic.fundamental.width}{lc}
 \topline
 \lhdr{Type} & \rhdr{Minimum width $N$} \\
 \capsep