diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 925ac7e8fe..7e85430aa9 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -53,7 +53,7 @@ jobs: eval "$(/usr/libexec/path_helper)" echo "PATH=${PATH}" >> ${GITHUB_ENV} sudo tlmgr update --self - sudo tlmgr install latexmk isodate substr relsize ulem fixme rsfs extract layouts enumitem l3packages l3kernel imakeidx splitindex xstring + sudo tlmgr install latexmk isodate substr relsize ulem fixme rsfs extract layouts enumitem l3packages l3kernel imakeidx splitindex xstring collection-latexextra - name: make (Linux) if: matrix.cfg.os == 'ubuntu-22.04' diff --git a/README.rst b/README.rst index 4ab1c20b2d..bb0e6b18f7 100644 --- a/README.rst +++ b/README.rst @@ -24,7 +24,7 @@ Install the `MacTeX distribution `_. If you are on a slow network, you'll want to get the `BasicTeX package `_ instead, then run the following command to install the other packages that the draft requires: - sudo tlmgr install latexmk isodate substr relsize ulem fixme rsfs extract layouts enumitem l3packages l3kernel imakeidx splitindex xstring + sudo tlmgr install latexmk isodate substr relsize ulem fixme rsfs extract layouts enumitem l3packages l3kernel imakeidx splitindex xstring collection-latexextra --------------------------------------- Getting Started on Debian-based Systems diff --git a/source/lex.tex b/source/lex.tex index b4b81cf407..45705bbec8 100644 --- a/source/lex.tex +++ b/source/lex.tex @@ -1470,13 +1470,9 @@ none & \defnx{ordinary character literal}{literal!character!ordinary} & \keyword{char} & -ordinary literal & +\multirow{2}{7em}{\!\!$\left.\vphantom{\parbox{1em}{a\\b}}\right\}$ \parbox{6em}{ordinary lit-\\eral encoding}} & \tcode{'v'} \\ \cline{2-3}\cline{5-5} - & -multicharacter literal & -\keyword{int} & -encoding & -\tcode{'abcd'} \\ \hline + & multicharacter literal & \keyword{int} & & \tcode{'abcd'} \\ \hline \tcode{L} & \defnx{wide character literal}{literal!character!wide} & \keyword{wchar_t} & diff --git a/source/std.tex b/source/std.tex index f179e402e8..9901e9344b 100644 --- a/source/std.tex +++ b/source/std.tex @@ -26,6 +26,7 @@ \usepackage[final]{microtype} \usepackage[splitindex,original]{imakeidx} \usepackage{multicol} +\usepackage{multirow} \usepackage{lmodern} \usepackage{xcolor} \usepackage[T1]{fontenc}