Skip to content

Commit e842cac

Browse files
authored
Merge branch 'main' into io-fix-equals
2 parents a1d2aae + 0749811 commit e842cac

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+77033
-38342
lines changed

.github/workflows/check.yml

+15-16
Original file line numberDiff line numberDiff line change
@@ -17,58 +17,57 @@ jobs:
1717
strategy:
1818
matrix:
1919
cfg:
20-
- { name: 'Linux', os: 'ubuntu-22.04' }
21-
- { name: 'MacOS', os: 'macos-13' }
20+
- { name: 'Linux', os: 'ubuntu-24.04' }
21+
- { name: 'MacOS', os: 'macos-15' }
2222

2323
steps:
2424
- name: checkout
25-
uses: actions/checkout@v3
25+
uses: actions/checkout@v4
2626

2727
- name: install GNU tools
28-
if: matrix.cfg.os == 'macos-13'
28+
if: matrix.cfg.os == 'macos-15'
2929
run: |
3030
brew install gnu-sed
31-
echo "/usr/local/opt/gnu-sed/libexec/gnubin" >> ${GITHUB_PATH}
31+
echo "/opt/homebrew/opt/gnu-sed/libexec/gnubin" >> ${GITHUB_PATH}
3232
3333
- name: check-source.sh
3434
run: ../tools/check-source.sh
3535

3636
- name: update brew
37-
if: matrix.cfg.os == 'macos-13'
38-
run: |
39-
brew update
37+
if: matrix.cfg.os == 'macos-15'
38+
run: brew update
4039

4140
- name: update-apt-cache
42-
if: matrix.cfg.os == 'ubuntu-22.04'
41+
if: matrix.cfg.os == 'ubuntu-24.04'
4342
run: sudo apt-get update
4443

4544
- name: install (Linux)
46-
if: matrix.cfg.os == 'ubuntu-22.04'
45+
if: matrix.cfg.os == 'ubuntu-24.04'
4746
run: sudo apt-get install latexmk texlive-latex-recommended texlive-latex-extra texlive-fonts-recommended lmodern
4847

4948
- name: install (MacOS)
50-
if: matrix.cfg.os == 'macos-13'
49+
if: matrix.cfg.os == 'macos-15'
5150
run: |
5251
brew install basictex
5352
eval "$(/usr/libexec/path_helper)"
5453
echo "PATH=${PATH}" >> ${GITHUB_ENV}
5554
sudo tlmgr update --self
56-
sudo tlmgr install latexmk isodate substr relsize ulem fixme rsfs extract layouts enumitem l3packages l3kernel imakeidx splitindex xstring
55+
sudo tlmgr install latexmk isodate substr relsize ulem fixme rsfs environ layouts enumitem l3packages l3kernel imakeidx splitindex xstring
5756
5857
- name: make (Linux)
59-
if: matrix.cfg.os == 'ubuntu-22.04'
58+
if: matrix.cfg.os == 'ubuntu-24.04'
6059
run: make quiet
6160

6261
- name: make (MacOS)
63-
if: matrix.cfg.os == 'macos-13'
62+
if: matrix.cfg.os == 'macos-15'
6463
run: make full
6564

6665
- name: check-output.sh
6766
run: ../tools/check-output.sh
6867

6968
- name: upload PDF
70-
if: matrix.cfg.os == 'ubuntu-22.04'
71-
uses: actions/upload-artifact@v3
69+
if: matrix.cfg.os == 'ubuntu-24.04'
70+
uses: actions/upload-artifact@v4
7271
with:
7372
name: draft-snapshot
7473
path: source/std.pdf

.gitorder

+7-4
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ source/macros.tex
55
source/tables.tex
66
source/cover-*.tex
77
source/front.tex
8+
source/preface.tex
89
source/intro.tex
910
source/lex.tex
1011
source/basic.tex
@@ -21,22 +22,24 @@ source/lib-intro.tex
2122
source/support.tex
2223
source/concepts.tex
2324
source/diagnostics.tex
25+
source/memory.tex
26+
source/meta.tex
2427
source/utilities.tex
25-
source/strings.tex
2628
source/containers.tex
2729
source/iterators.tex
2830
source/ranges.tex
2931
source/algorithms.tex
32+
source/strings.tex
33+
source/text.tex
3034
source/numerics.tex
3135
source/time.tex
32-
source/locales.tex
3336
source/iostreams.tex
34-
source/regex.tex
35-
source/atomics.tex
3637
source/threads.tex
38+
source/exec.tex
3739
source/grammar.tex
3840
source/limits.tex
3941
source/compatibility.tex
4042
source/future.tex
43+
source/uax31.tex
4144
source/back.tex
4245
source/xrefdelta.tex

0 commit comments

Comments
 (0)