Skip to content

Fix table formatting #6988

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 9, 2024
Merged

Fix table formatting #6988

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
63ff3a7
[lex.literal] Properly format table headings
jensmaurer May 13, 2024
57810e6
[basic.fundamental] Center second column of "integer width" table
jensmaurer May 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion source/basic.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions source/lex.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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} &
Expand Down Expand Up @@ -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} &
Expand Down
12 changes: 6 additions & 6 deletions source/locales.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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{+} \\
Expand Down