Skip to content

Commit 8e4ab9c

Browse files
zygoloidzygoloid
committed
[c.strings] Move descriptions of individual headers to the section for
the respective header.
1 parent 1f22f42 commit 8e4ab9c

1 file changed

Lines changed: 21 additions & 136 deletions

File tree

‎source/strings.tex‎

Lines changed: 21 additions & 136 deletions
Original file line numberDiff line numberDiff line change
@@ -5481,27 +5481,6 @@
54815481

54825482
\rSec1[c.strings]{Null-terminated sequence utilities}
54835483

5484-
\pnum
5485-
The contents of the headers
5486-
\tcode{<cctype>},
5487-
\tcode{<cwctype>},
5488-
\tcode{<cwchar>},
5489-
and
5490-
\tcode{<cuchar>} shall be the same as the C standard library headers
5491-
\tcode{<ctype.h>},
5492-
\tcode{<wctype.h>},
5493-
\tcode{<wchar.h>},
5494-
and \tcode{<uchar.h>},
5495-
respectively, with the following modifications:
5496-
5497-
\pnum
5498-
\indextext{\idxcode{wchar_t}}%
5499-
The headers shall not define the types
5500-
\tcode{char16_t}, \tcode{char32_t}, and
5501-
\tcode{wchar_t}~(\ref{lex.key}).
5502-
5503-
\xref ISO C~7.4, 7.22.8, 7.24, 7.28, 7.29, and 7.30.
5504-
55055484
\rSec2[cctype.syn]{Header \tcode{<cctype>} synopsis}
55065485

55075486
\begin{codeblock}
@@ -5523,6 +5502,13 @@
55235502
}
55245503
\end{codeblock}
55255504

5505+
\pnum
5506+
\indextext{\idxhdr{ctype.h}}%
5507+
The contents and meaning of the header \tcode{<cctype>}
5508+
are the same as the C standard library header \tcode{<ctype.h>}.
5509+
5510+
\xref ISO C 7.4
5511+
55265512
\rSec2[cwctype.syn]{Header \tcode{<cwctype>} synopsis}
55275513

55285514
\begin{codeblock}
@@ -5555,8 +5541,11 @@
55555541
\end{codeblock}
55565542

55575543
\pnum
5558-
The meaning of the contents of this header is the same as the C
5559-
standard library header \tcode{<wctype.h>}.
5544+
\indextext{\idxhdr{wctype.h}}%
5545+
The contents and meaning of the header \tcode{<cwctype>}
5546+
are the same as the C standard library header \tcode{<wctype.h>}.
5547+
5548+
\xref ISO C 7.30
55605549

55615550
\rSec2[cstring.syn]{Header \tcode{<cstring>} synopsis}
55625551

@@ -5713,6 +5702,8 @@
57135702
but they have the same behavior as in the C standard library~(\ref{library.c}).
57145703
\end{note}
57155704

5705+
\xref ISO C 7.29
5706+
57165707
\rSec2[cuchar.syn]{Header \tcode{<cuchar>} synopsis}
57175708

57185709
\begin{codeblock}
@@ -5728,8 +5719,13 @@
57285719
\end{codeblock}
57295720

57305721
\pnum
5731-
The meaning of the contents of this header is the same as the C
5732-
standard library header \tcode{<uchar.h>}.
5722+
\indextext{\idxhdr{uchar.h}}%
5723+
The contents and meaning of the header \tcode{<cuchar>}
5724+
are the same as the C standard library header
5725+
\tcode{<uchar.h>}, except that it does not declare types \tcode{char16_t} nor
5726+
\tcode{char32_t}.
5727+
5728+
\xref ISO C 7.28
57335729

57345730
\rSec2[c.mb.wcs]{Multibyte / wide string and character conversion functions}
57355731

@@ -5810,114 +5806,3 @@
58105806
\end{itemdescr}
58115807

58125808
\xref ISO C 7.29.6.3
5813-
5814-
5815-
%% \begin{libsyntabf5}{cwchar}{tab:strings.hdr.cwchar}
5816-
%% \macros &
5817-
%% \tcode{NULL} &
5818-
%% \tcode{WCHAR_MAX} &
5819-
%% \tcode{WCHAR_MIN} &
5820-
%% \tcode{WEOF} \\ \rowsep
5821-
%% \types &
5822-
%% \tcode{mbstate_t} &
5823-
%% \tcode{wint_t} &
5824-
%% \tcode{size_t} &
5825-
%% \tcode{tm} \\ \rowsep
5826-
%% \cspan{\functions} \\
5827-
5828-
%% \tcode{btowc} &
5829-
%% \tcode{mbsinit} &
5830-
%% \tcode{vwscanf} &
5831-
%% \tcode{wcsncpy} &
5832-
%% \tcode{wcstoull} \\
5833-
5834-
%% \tcode{fgetwc} &
5835-
%% \tcode{mbsrtowcs} &
5836-
%% \tcode{wcrtomb} &
5837-
%% \tcode{wcspbrk} &
5838-
%% \tcode{wcstoul} \\
5839-
5840-
%% \tcode{fgetws} &
5841-
%% \tcode{putwchar} &
5842-
%% \tcode{wcscat} &
5843-
%% \tcode{wcsrchr} &
5844-
%% \tcode{wcsxfrm} \\
5845-
5846-
%% \tcode{fputwc} &
5847-
%% \tcode{putwc} &
5848-
%% \tcode{wcschr} &
5849-
%% \tcode{wcsrtombs} &
5850-
%% \tcode{wctob} \\
5851-
5852-
%% \tcode{fputws} &
5853-
%% \tcode{swprintf} &
5854-
%% \tcode{wcscmp} &
5855-
%% \tcode{wcsspn} &
5856-
%% \tcode{wmemchr} \\
5857-
5858-
%% \tcode{fwide} &
5859-
%% \tcode{swscanf} &
5860-
%% \tcode{wcscoll} &
5861-
%% \tcode{wcsstr} &
5862-
%% \tcode{wmemcmp} \\
5863-
5864-
%% \tcode{fwprintf} &
5865-
%% \tcode{ungetwc} &
5866-
%% \tcode{wcscpy} &
5867-
%% \tcode{wcstod} &
5868-
%% \tcode{wmemcpy} \\
5869-
5870-
%% \tcode{fwscanf} &
5871-
%% \tcode{vfwprintf} &
5872-
%% \tcode{wcscspn} &
5873-
%% \tcode{wcstof} &
5874-
%% \tcode{wmemmove} \\
5875-
5876-
%% \tcode{getwchar} &
5877-
%% \tcode{vfwscanf} &
5878-
%% \tcode{wcsftime} &
5879-
%% \tcode{wcstok} &
5880-
%% \tcode{wmemset} \\
5881-
5882-
%% \tcode{getwc} &
5883-
%% \tcode{vswprintf} &
5884-
%% \tcode{wcslen} &
5885-
%% \tcode{wcstold} &
5886-
%% \tcode{wprintf} \\
5887-
5888-
%% \tcode{mbrlen} &
5889-
%% \tcode{vswscanf} &
5890-
%% \tcode{wcsncat} &
5891-
%% \tcode{wcstoll} &
5892-
%% \tcode{wscanf} \\
5893-
5894-
%% \tcode{mbrtowc} &
5895-
%% \tcode{vwprintf} &
5896-
%% \tcode{wcsncmp} &
5897-
%% \tcode{wcstol} & \\
5898-
5899-
%% \end{libsyntabf5}
5900-
5901-
%% \begin{libsyntabf4}{cstdlib}{tab:strings.hdr.cstdlib}
5902-
%% \macros &
5903-
%% \tcode{MB_CUR_MAX} &
5904-
%% &
5905-
%% \\ \rowsep
5906-
%% \cspan{\functions} \\
5907-
%% \tcode{atof} & \tcode{mblen} & \tcode{strtof} & \tcode{strtoul} \\
5908-
%% \tcode{atoi} & \tcode{mbtowc} & \tcode{strtol} & \tcode{strtoull}\\
5909-
%% \tcode{atol} & \tcode{mbstowcs}& \tcode{strtold} & \tcode{wctomb}\\
5910-
%% \tcode{atoll} & \tcode{strtod} & \tcode{strtoll} & \tcode{wcstombs}\\
5911-
%% \end{libsyntabf4}
5912-
5913-
%% \begin{libsyntabf3}{cuchar}{tab:strings.hdr.cuchar}
5914-
%% \macros &
5915-
%% \mbox{\tcode{__STDC_UTF_16__}} & \\
5916-
%% & \mbox{\tcode{__STDC_UTF_32__}} & \\ \rowsep
5917-
%% \functions &
5918-
%% \tcode{mbrtoc16} &
5919-
%% \tcode{c16rtomb} \\
5920-
%% &
5921-
%% \tcode{mbrtoc32} &
5922-
%% \tcode{c32rtomb} \\
5923-
%% \end{libsyntabf3}

0 commit comments

Comments
 (0)