Skip to content
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.

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

Edition #147

Merged
merged 374 commits into from
Feb 14, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
374 commits
Select commit Hold shift + click to select a range
04bd4ef
add back sets and functions
oscarlevin Dec 26, 2023
b3a1e38
remove edition; revert doc-id
oscarlevin Dec 27, 2023
d27e10d
add investigate
oscarlevin Jan 2, 2024
4e3077d
tweak checkpoint
oscarlevin Jan 2, 2024
6cee5a3
tweak style; add generated assets
oscarlevin Jan 2, 2024
f884e14
pull out quantifiers section
oscarlevin Jan 2, 2024
ff803ee
pull out quantifiers section
oscarlevin Jan 2, 2024
fc16c98
update css
oscarlevin Jan 2, 2024
f059921
update section and format it.
oscarlevin Jan 6, 2024
ee19f82
fix typos
oscarlevin Jan 6, 2024
4942453
fix typos
oscarlevin Jan 6, 2024
42d05eb
fix vars
oscarlevin Jan 6, 2024
be381e7
another try at fitb
oscarlevin Jan 6, 2024
00dc2c0
actually fix it
oscarlevin Jan 6, 2024
ce6c396
actually fix it
oscarlevin Jan 6, 2024
e7b2f12
add introduction to statements section
oscarlevin Jan 8, 2024
2b18c40
Merge branch 'main' of https://github.com/oscarlevin/DMOI4 into edition
oscarlevin Jan 8, 2024
567f1d1
move quantifiers section out
oscarlevin Jan 8, 2024
c8151a9
finish 1.1
oscarlevin Jan 9, 2024
18f637e
add ip and labels
oscarlevin Jan 10, 2024
ad7fb5d
update introduction
oscarlevin Jan 13, 2024
f73e8e2
revise homework and section
oscarlevin Jan 17, 2024
c1dd2af
minor fix; show hints
oscarlevin Jan 17, 2024
406bb34
fix exercise
oscarlevin Jan 17, 2024
1f01419
improve 1.3
oscarlevin Jan 19, 2024
c50c896
add questions to 1.3
oscarlevin Jan 20, 2024
4117eb9
polish 1.4 intro
oscarlevin Jan 23, 2024
f9e24e9
fix typo
oscarlevin Jan 23, 2024
1b9455e
fix typo
oscarlevin Jan 23, 2024
3cc9153
polish 1.4, start 1.5
oscarlevin Jan 24, 2024
1f3f455
fix image, improve exercise statements
oscarlevin Jan 26, 2024
e552cf5
add subsection
oscarlevin Jan 30, 2024
4a233ea
add subsection
oscarlevin Jan 31, 2024
df36842
add subsection
oscarlevin Jan 31, 2024
dab0c6e
set up practice for ch 2
oscarlevin Feb 7, 2024
fbd3dcd
set up practice for ch 2
oscarlevin Feb 7, 2024
e66ae6c
add reading questions
oscarlevin Feb 9, 2024
1d17870
fix typo
oscarlevin Feb 14, 2024
4e6bdf2
start section on recurrence relations
oscarlevin Feb 23, 2024
298676a
finish draft of section
oscarlevin Feb 23, 2024
3744e1c
add exercises
oscarlevin Feb 23, 2024
7599eb0
fix errors
oscarlevin Feb 23, 2024
54616cc
fix ww
oscarlevin Feb 23, 2024
aaf7f08
fix typo
oscarlevin Feb 23, 2024
934736f
reorganize exercises
oscarlevin Mar 7, 2024
92682a5
minor improvements
oscarlevin Mar 18, 2024
b85ac35
rearrange
oscarlevin Mar 19, 2024
bf84a56
expand section
oscarlevin Mar 19, 2024
7fdb0dd
switch to sticks and stones
oscarlevin Mar 19, 2024
26596c4
fix notation
oscarlevin Mar 20, 2024
7c5fa49
reword reading questions
oscarlevin Mar 20, 2024
4897f8d
format
oscarlevin Mar 25, 2024
b1fc984
add activity
oscarlevin Mar 25, 2024
6f060e2
add worksheet
oscarlevin Mar 25, 2024
c7d72e2
add label, fix typo
oscarlevin Mar 25, 2024
4cd6993
add probability section start
oscarlevin Apr 7, 2024
859fd19
improve section
oscarlevin Apr 8, 2024
8b8652f
rebuild
oscarlevin Apr 8, 2024
b38e096
relabel exercises
oscarlevin Apr 8, 2024
bd82eb4
regenerate webwork
oscarlevin Apr 8, 2024
15f1885
update exercises
oscarlevin Apr 10, 2024
e281cfe
add tech demo
oscarlevin Apr 12, 2024
d19d9b1
switch to python3 language to get numpy to work
oscarlevin Apr 12, 2024
caa4079
fix type
oscarlevin May 27, 2024
7802b89
start work rearranging 3.1
oscarlevin May 29, 2024
ebdfd34
fix typo
oscarlevin Jun 17, 2024
b93713b
update section
oscarlevin Jun 27, 2024
ec8b6e8
update section
oscarlevin Jun 27, 2024
0593174
finish section
oscarlevin Jun 27, 2024
10e1e4e
add exercises
oscarlevin Jun 28, 2024
3419e2e
reorganize, start section
oscarlevin Jun 29, 2024
fac5eed
update section
oscarlevin Jul 1, 2024
2355516
reorganize
oscarlevin Jul 1, 2024
04e9613
update section
oscarlevin Jul 2, 2024
8070703
Merge branch 'edition' of https://github.com/oscarlevin/discrete-book…
oscarlevin Jul 2, 2024
98efb8c
finish section
oscarlevin Jul 3, 2024
d73ef92
continue section
oscarlevin Jul 4, 2024
74284ba
finish narrative
oscarlevin Jul 5, 2024
ec14152
add reading questions, start on section
oscarlevin Jul 5, 2024
747ea75
add to section
oscarlevin Jul 6, 2024
5b9f304
add to section
oscarlevin Jul 7, 2024
c16dbaa
finish narrative
oscarlevin Jul 8, 2024
60e0fa3
start rearranging sections
oscarlevin Jul 8, 2024
098f9fc
organize
oscarlevin Jul 9, 2024
87518b3
finish narrative
oscarlevin Jul 14, 2024
60240a0
finish section
oscarlevin Jul 21, 2024
2a11d65
update files
oscarlevin Jul 22, 2024
7b3969c
update image
oscarlevin Jul 22, 2024
429c297
start adding sudoku
oscarlevin Jul 24, 2024
382ab4c
add sudokus
oscarlevin Jul 24, 2024
38cf61f
add examples
oscarlevin Jul 25, 2024
06e30eb
add more
oscarlevin Jul 25, 2024
f244199
finish section
oscarlevin Jul 26, 2024
aec3efa
update induction
oscarlevin Jul 27, 2024
c4b7356
rebuild
oscarlevin Jul 27, 2024
51a66b4
finish section
oscarlevin Jul 27, 2024
c6b19c4
finish merge
oscarlevin Jul 27, 2024
6a832c1
rebuild assets
oscarlevin Jul 27, 2024
936ba16
start reorganizing
oscarlevin Jul 28, 2024
0e29303
rearrange
oscarlevin Jul 29, 2024
7222919
clean up
oscarlevin Jul 29, 2024
1e6f1f3
move exercises around
oscarlevin Jul 29, 2024
460bfa1
rearrange trees
oscarlevin Jul 29, 2024
63410d3
rebuild
oscarlevin Jul 29, 2024
c941ac6
clean up, move around exercises
oscarlevin Jul 30, 2024
db8f8f1
more fixes
oscarlevin Jul 30, 2024
836876d
add zipped target
oscarlevin Aug 1, 2024
0d03f81
A few small updates
oscarlevin Aug 1, 2024
c216455
rebuild
oscarlevin Aug 1, 2024
ac4b22d
try moving objectives up
oscarlevin Aug 2, 2024
5c74e53
add exercises
oscarlevin Aug 2, 2024
53b2444
add question
oscarlevin Aug 2, 2024
db2fc33
add exercises
oscarlevin Aug 3, 2024
20c4ec1
organize
oscarlevin Aug 3, 2024
b5075ab
improve previews
oscarlevin Aug 3, 2024
da07675
work on previews
oscarlevin Aug 3, 2024
e4e22de
expand section
oscarlevin Aug 4, 2024
ed37d84
finish section
oscarlevin Aug 4, 2024
e93e9a1
structure sections
oscarlevin Aug 4, 2024
0c28179
update section
oscarlevin Aug 5, 2024
6636353
finish structure
oscarlevin Aug 5, 2024
4c87c1a
add content
oscarlevin Aug 5, 2024
c1ff7b0
add worksheet
oscarlevin Aug 6, 2024
0fb4e85
update worksheet
oscarlevin Aug 7, 2024
df6c8a3
rebuild assets
oscarlevin Aug 7, 2024
86752b8
work on worksheets
oscarlevin Aug 8, 2024
d7b5c13
add worksheet
oscarlevin Aug 8, 2024
2a94b02
fix ww
oscarlevin Aug 8, 2024
17c6e4f
add content
oscarlevin Aug 8, 2024
8dbdf25
add preview
oscarlevin Aug 9, 2024
ebf535f
fix wording
oscarlevin Aug 9, 2024
bf183db
start adding ww
oscarlevin Aug 9, 2024
d9484e6
update
oscarlevin Aug 9, 2024
727c147
more questions
oscarlevin Aug 10, 2024
7b9e616
more questions
oscarlevin Aug 10, 2024
5eb16a5
finish worksheet
oscarlevin Aug 10, 2024
bd9448d
update content
oscarlevin Aug 11, 2024
d10e698
lots of tiny fixes
oscarlevin Aug 12, 2024
9d79406
start adding preview
oscarlevin Aug 12, 2024
05a48aa
add activity
oscarlevin Aug 12, 2024
475b2f2
work on previews
oscarlevin Aug 12, 2024
759e43d
fix ww
oscarlevin Aug 12, 2024
5bfdc23
finish worksheet
oscarlevin Aug 13, 2024
b775d97
work on worksheet
oscarlevin Aug 13, 2024
d3c892e
finish worksheet
oscarlevin Aug 13, 2024
c6dca9b
improve section
oscarlevin Aug 13, 2024
a7fd2e6
make webwork
oscarlevin Aug 13, 2024
00bfae0
add webwork
oscarlevin Aug 13, 2024
876ac4e
update activity
oscarlevin Aug 13, 2024
76cf64e
fix last preview activity
oscarlevin Aug 14, 2024
9f27867
rearrange exercises in ch1
oscarlevin Aug 14, 2024
ea51a8e
Merge branch 'edition' of https://github.com/oscarlevin/discrete-book…
oscarlevin Aug 14, 2024
1f3ad4d
move exercises around
oscarlevin Aug 14, 2024
c2928b4
add exercises
oscarlevin Aug 14, 2024
2a6c5a0
add exercises
oscarlevin Aug 14, 2024
d4f3aca
add lots of exercises
oscarlevin Aug 15, 2024
448c0cb
add exercises
oscarlevin Aug 15, 2024
83f4d51
final additions
oscarlevin Aug 15, 2024
03e9a49
fix errors
oscarlevin Aug 15, 2024
26f454c
rebuild runestone
oscarlevin Aug 15, 2024
4a30436
add missing labels, fix other errors
oscarlevin Aug 16, 2024
a24fc1f
regenerate runestone
oscarlevin Aug 16, 2024
2dee252
rebuild web
oscarlevin Aug 16, 2024
783d321
upgrade to v2 manifest
oscarlevin Aug 16, 2024
59cac78
try to build print
oscarlevin Aug 16, 2024
ad1e9cc
update latex xsl
oscarlevin Aug 16, 2024
0d4def8
work on print
oscarlevin Aug 16, 2024
5f05a72
get crop-marks working
oscarlevin Aug 17, 2024
0282246
work on style
oscarlevin Aug 18, 2024
b1ec7b4
fix a few typos
oscarlevin Aug 18, 2024
3191731
update webwork to avoid print errors
oscarlevin Aug 18, 2024
e9d5bd4
fix ww
oscarlevin Aug 19, 2024
10ffef3
fix ww
oscarlevin Aug 19, 2024
128d916
fix typo
oscarlevin Aug 19, 2024
cd87861
fix font
oscarlevin Aug 19, 2024
9071bc7
fix font
oscarlevin Aug 19, 2024
3ae9563
rebuild
oscarlevin Aug 19, 2024
4259305
fix typos
oscarlevin Aug 19, 2024
ff2e499
fix title
oscarlevin Aug 19, 2024
697e5ce
work on print formatting
oscarlevin Aug 19, 2024
28c371b
work on style
oscarlevin Aug 20, 2024
b83908a
more styling
oscarlevin Aug 20, 2024
db7f7f7
more styling
oscarlevin Aug 20, 2024
2734cc1
troubleshoot
oscarlevin Aug 20, 2024
2377b95
more styling
oscarlevin Aug 20, 2024
f98842b
update styles
oscarlevin Aug 21, 2024
51c8b03
print fixes
oscarlevin Aug 21, 2024
87af1a9
rebuild for rs
oscarlevin Aug 22, 2024
c7fedd2
fix up exercises in ch 1
oscarlevin Aug 22, 2024
204c31e
fix up exercises
oscarlevin Aug 22, 2024
253ecc8
update build
oscarlevin Aug 22, 2024
64f862b
rebuild
oscarlevin Aug 22, 2024
f6edd56
update
oscarlevin Aug 22, 2024
66a49dd
more fixes
oscarlevin Aug 22, 2024
07b0271
make static versions for relations
oscarlevin Aug 23, 2024
d7261ca
finish static exercises for 2.6
oscarlevin Aug 23, 2024
a9d6c04
improve exercises
oscarlevin Aug 22, 2024
7da396a
finish last exercise
oscarlevin Aug 23, 2024
7e9d39c
improve static exercises
oscarlevin Aug 23, 2024
8c77028
few tweaks
oscarlevin Aug 23, 2024
fc0cae0
build pdf
oscarlevin Aug 23, 2024
894f91b
proof reading
oscarlevin Aug 23, 2024
3c547fe
rebuild runestone
oscarlevin Aug 24, 2024
fa4c7da
fix typos
oscarlevin Aug 26, 2024
ff0556a
fix lots of errors
oscarlevin Aug 26, 2024
cdd3876
tweak publication options
oscarlevin Aug 26, 2024
8a40eb9
rebuild
oscarlevin Aug 26, 2024
cec8ca6
fix typos
oscarlevin Aug 26, 2024
ee5428c
fix typos
oscarlevin Aug 26, 2024
9c2a806
more typos
oscarlevin Aug 27, 2024
96bf1ee
fix typos
oscarlevin Aug 27, 2024
77fd7c3
more typo fixes
oscarlevin Aug 27, 2024
23eeb6e
typos
oscarlevin Aug 27, 2024
747be5f
typos
oscarlevin Aug 27, 2024
9ce4fb5
typos
oscarlevin Aug 27, 2024
d0e7990
typos
oscarlevin Aug 27, 2024
e90a831
final touchups
oscarlevin Aug 28, 2024
244574b
rebuild
oscarlevin Aug 28, 2024
b3b7d74
webwork
oscarlevin Aug 28, 2024
460e209
save ww gzip
oscarlevin Sep 3, 2024
3c34d2e
fix runestone exercises
oscarlevin Sep 12, 2024
18c819d
add feedback to reading question
oscarlevin Oct 2, 2024
8499273
fix typo
oscarlevin Oct 2, 2024
3048fac
fix webwork
oscarlevin Nov 7, 2024
16600df
fix ww issues
oscarlevin Nov 8, 2024
e28d981
fix typos
oscarlevin Nov 11, 2024
b6917ad
more typos
oscarlevin Nov 12, 2024
9959cd2
Exercise typos
oscarlevin Nov 13, 2024
bdfc747
finish ch1 corrections
oscarlevin Nov 14, 2024
2db8fc3
fix typos
oscarlevin Nov 15, 2024
c56b85e
fix exercise
oscarlevin Nov 17, 2024
0d07aa9
fix typos
oscarlevin Nov 18, 2024
06d2452
fix typos
oscarlevin Nov 18, 2024
2198185
fix typos in ch3
oscarlevin Nov 25, 2024
aa9f0de
fix ch4 typos
oscarlevin Nov 25, 2024
32e4dea
fix typos
oscarlevin Nov 27, 2024
6dc8c88
finish typo corrections
oscarlevin Nov 27, 2024
e354dae
fix ww issues
oscarlevin Dec 5, 2024
bcae492
fix ww
oscarlevin Dec 5, 2024
b8387f9
update theme
oscarlevin Jan 6, 2025
cd7a400
rebuild runestone
oscarlevin Jan 6, 2025
4af6f1f
rebuild runestone
oscarlevin Jan 7, 2025
f5e68bc
Merge branch 'edition' of https://github.com/oscarlevin/discrete-book…
oscarlevin Jan 11, 2025
7b81a68
fix ww issue; rebuild for runestone
oscarlevin Jan 31, 2025
378b543
rebuild web
oscarlevin Jan 31, 2025
f35d9fe
update runestone
oscarlevin Jan 31, 2025
adf4640
update requirements
oscarlevin Feb 1, 2025
568200a
fix wide hbox
oscarlevin Feb 13, 2025
024d290
fix typos
oscarlevin Feb 13, 2025
ccb6872
Merge branch 'main' into edition
oscarlevin Feb 14, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
15 changes: 14 additions & 1 deletion .github/workflows/pretext-cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,21 @@ jobs:
- name: install deps
run: pip install -r requirements.txt

- name: install local ptx files
run: pretext --version

- name: build deploy targets
run: pretext build --deploys
run: |
version="$(pretext --version)"
major="$(echo $version | cut -d '.' -f 1)"
minor="$(echo $version | cut -d '.' -f 2)"
if [ "$major" -ge 2 -a "$minor" -ge 5 ]; then
echo "PreTeXt version is 2.5 or greater; using new build command"
pretext build --deploys
else
echo "PreTeXt version is less than 2.5, using old build command"
pretext build
fi
- name: stage deployment
run: pretext deploy --stage-only

Expand Down
8 changes: 6 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,14 @@ html/images/*.svg
latex/*.pdf
localbuild/
Makefile.paths

.vscode/
output/
generated-assets/
cover/

codechat_config.yaml
published/
published/

*.code-workspace

.cache/
1,396 changes: 1,396 additions & 0 deletions Discrete_Mathematics.pl

Large diffs are not rendered by default.

7 changes: 0 additions & 7 deletions Ideas.md

This file was deleted.

349 changes: 0 additions & 349 deletions Makefile

This file was deleted.

Loading
Loading