Skip to content

Commit 3bbe9ea

Browse files
bnmnetpbnmnetp
authored
Merge pull request #259 from StevenClontz/update-ptx
update pretext version and refresh some files
2 parents 6a9daf8 + 459b900 commit 3bbe9ea

94 files changed

Lines changed: 1404 additions & 1279 deletions

File tree

Some content is hidden

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

‎.devcontainer/devcontainer.json‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
{
2+
"name": "PreTeXt-Codespaces",
3+
4+
// This Docker image includes some LaTeX support, but is still not to large. Note that if you keep your codespace running, it will use up your GitHub free storage quota. Additional options are listed below.
5+
// "image": "oscarlevin/pretext:small",
6+
// If you need to generate more complicated assets (such as sageplots) or use additional fonts when building to PDF, comment out the above line and uncomment the following line.
7+
"image": "oscarlevin/pretext:full",
8+
// If you only intend to build for web and don't have any latex-image generated assets, you can use a smaller image:
9+
// "image": "oscarlevin/pretext:lite",
10+
11+
12+
13+
// The following was the previous version of this file, which used the Codespaces base image. It is still available for reference, but is not recommended.
14+
// "image": "mcr.microsoft.com/devcontainers/python:3",
15+
// "features": {
16+
// "ghcr.io/devcontainers/features/node:1": {},
17+
// "ghcr.io/rocker-org/devcontainer-features/pandoc:1": {}
18+
// },
19+
// "forwardPorts": [
20+
// 27377,
21+
// 27378
22+
// ],
23+
// "portsAttributes": {
24+
// "27378": {
25+
// "label": "CodeChat",
26+
// "onAutoForward": "openPreview",
27+
// "requireLocalPort": true,
28+
// "elevateIfNeeded": true,
29+
// "protocol": "https"
30+
// }
31+
// },
32+
// "onCreateCommand": "pip install pretext",
33+
// // Use 'postCreateCommand' to run commands after the container is created.
34+
// "postCreateCommand": "sudo bash ./.devcontainer/postCreateCommand.sh",
35+
36+
// Configure tool-specific properties.
37+
"customizations": {
38+
"codespaces": {
39+
"openFiles": [
40+
"source/main.ptx"
41+
]
42+
},
43+
"vscode": {
44+
"settings": {
45+
"editor.quickSuggestions": {
46+
"other": "off"
47+
},
48+
"editor.snippetSuggestions": "top",
49+
"xml.validation.enabled": false
50+
},
51+
"extensions": ["ms-vscode.live-server", "oscarlevin.pretext-tools"]
52+
}
53+
}
54+
55+
// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
56+
// "remoteUser": "root"
57+
}

‎.gitignore‎

Lines changed: 90 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,91 @@
1-
__pycache__/
2-
build_info
3-
build
4-
published
5-
.idea
6-
.idea/*
7-
pavement.pyc
8-
# for builds on Mac:
9-
**/.DS_Store
10-
.vscode
11-
*~
12-
*.bak
13-
*.orig
14-
\#*\#
15-
sphinx-enki-info.txt
16-
sphinx_settings.json
17-
output.log
18-
beta
1+
# Boilerplate list of files in a PreTeXt project for git to ignore
2+
# ensure this file is tracked
3+
!.gitignore
4+
5+
# don't track unpublished builds
196
output
20-
published
21-
pdf
22-
GenFigs
23-
cli.log
7+
8+
# don't track assets generated from source
9+
generated-assets
10+
11+
# don't track node packages
12+
node_modules
13+
14+
# don't track error logs
15+
.error_schema.log
16+
cli.log
17+
18+
# don't track OS related files (windows/macos/linux)
19+
.DS_Store
20+
.DS_Store?
21+
._*
22+
.AppleDouble
23+
.LSOverride
24+
.Spotlight-V100
25+
.Trashes
26+
Icon
27+
.AppleDB
28+
.AppleDesktop
29+
Network Trash Folder
30+
Temporary Items
31+
.apdisk
32+
Thumbs.db
33+
Thumbs.db:encryptable
34+
ehthumbs.db
35+
ehthumbs_vista.db
36+
*.stackdump
37+
*.lnk
38+
*.cab
39+
*.msi
40+
*.msix
41+
*.msm
42+
*.msp
43+
[Dd]esktop.ini
44+
.directory
45+
.fuse_hidden*
46+
.Trash-*
47+
.nfs*
48+
49+
# Don't include VSCode generated files
50+
.vscode
51+
*.code-workspace
52+
53+
# Don't inlucde SublimeText files
54+
# Cache files for Sublime Text
55+
*.tmlanguage.cache
56+
*.tmPreferences.cache
57+
*.stTheme.cache
58+
59+
# Workspace files are user-specific
60+
*.sublime-workspace
61+
62+
# Project files should be checked into the repository, unless a significant
63+
# proportion of contributors will probably not be using Sublime Text
64+
*.sublime-project
65+
66+
# SFTP configuration file
67+
sftp-config.json
68+
sftp-config-alt*.json
69+
70+
# Package control specific files
71+
Package Control.last-run
72+
Package Control.ca-list
73+
Package Control.ca-bundle
74+
Package Control.system-ca-bundle
75+
Package Control.cache/
76+
Package Control.ca-certs/
77+
Package Control.merged-ca-bundle
78+
Package Control.user-ca-bundle
79+
oscrypto-ca-bundle.crt
80+
bh_unicode_properties.cache
81+
82+
# Sublime-github package stores a github token in this file
83+
# https://packagecontrol.io/packages/sublime-github
84+
GitHub.sublime-settings
85+
86+
87+
# Don't include Dropbox settings and caches
88+
.dropbox
89+
.dropbox.attr
90+
.dropbox.cache
91+

‎pretext/ClassesBasics/UserDefinedClasses.ptx‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -166,33 +166,33 @@ print(x, y)
166166
<statement>
167167
<p>True True</p>
168168
</statement>
169-
<feedback>
169+
<feedback><p>
170170
Look closely at how the objects are instantiated.
171-
</feedback>
171+
</p></feedback>
172172
</choice>
173173
<choice>
174174
<statement>
175175
<p>True False</p>
176176
</statement>
177-
<feedback>
177+
<feedback><p>
178178
Look closely at how the objects are instantiated and the types of the objects.
179-
</feedback>
179+
</p></feedback>
180180
</choice>
181181
<choice correct="yes">
182182
<statement>
183183
<p>False True</p>
184184
</statement>
185-
<feedback>
185+
<feedback><p>
186186
Correct, the BMW object is not the Tesla object but they are of the same type.
187-
</feedback>
187+
</p></feedback>
188188
</choice>
189189
<choice>
190190
<statement>
191191
<p>False False</p>
192192
</statement>
193-
<feedback>
193+
<feedback><p>
194194
Look closer at types of the objects.
195-
</feedback>
195+
</p></feedback>
196196
</choice>
197197
</choices>
198198
</exercise>

‎pretext/Debugging/HowtoAvoidDebugging.ptx‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,25 +75,25 @@ print(final_time)
7575
<statement>
7676
<p>Python is stupid and does not know how to add properly.</p>
7777
</statement>
78-
<feedback>
78+
<feedback><p>
7979
No, Python is probabaly not broken.
80-
</feedback>
80+
</p></feedback>
8181
</choice>
8282
<choice>
8383
<statement>
8484
<p>There is nothing wrong here.</p>
8585
</statement>
86-
<feedback>
86+
<feedback><p>
8787
No, try adding the two numbers together yourself, you will definitely get a different result.
88-
</feedback>
88+
</p></feedback>
8989
</choice>
9090
<choice correct="yes">
9191
<statement>
9292
<p>Python is doing string concatenation, not integer addition.</p>
9393
</statement>
94-
<feedback>
94+
<feedback><p>
9595
Yes! Remember that input returns a string. Now we will need to convert the string to an integer
96-
</feedback>
96+
</p></feedback>
9797
</choice>
9898
</choices>
9999
</exercise>

‎pretext/Debugging/KnowyourerrorMessages.ptx‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,25 +44,25 @@ print(final_time_int)
4444
<statement>
4545
<p>You cannot use a variable on both the left and right hand sides of an assignment statement.</p>
4646
</statement>
47-
<feedback>
47+
<feedback><p>
4848
No, You can, as long as all the variables on the right hand side already have values.
49-
</feedback>
49+
</p></feedback>
5050
</choice>
5151
<choice correct="yes">
5252
<statement>
5353
<p>wait_time_int does not have a value so it cannot be used on the right hand side.</p>
5454
</statement>
55-
<feedback>
55+
<feedback><p>
5656
Yes. Variables must already have values in order to be used on the right hand side.
57-
</feedback>
57+
</p></feedback>
5858
</choice>
5959
<choice>
6060
<statement>
6161
<p>This is not really an error, Python is broken.</p>
6262
</statement>
63-
<feedback>
63+
<feedback><p>
6464
No, No, No!
65-
</feedback>
65+
</p></feedback>
6666
</choice>
6767
</choices>
6868
</exercise>

‎pretext/Dictionaries/Aliasingandcopying.ptx‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,33 +45,33 @@ print(mydict["elephant"])
4545
<statement>
4646
<p>23</p>
4747
</statement>
48-
<feedback>
48+
<feedback><p>
4949
mydict and yourdict are both names for the same dictionary.
50-
</feedback>
50+
</p></feedback>
5151
</choice>
5252
<choice>
5353
<statement>
5454
<p>None</p>
5555
</statement>
56-
<feedback>
56+
<feedback><p>
5757
The dictionary is mutable so changes can be made to the keys and values.
58-
</feedback>
58+
</p></feedback>
5959
</choice>
6060
<choice correct="yes">
6161
<statement>
6262
<p>999</p>
6363
</statement>
64-
<feedback>
64+
<feedback><p>
6565
Yes, since yourdict is an alias for mydict, the value for the key elephant has been changed.
66-
</feedback>
66+
</p></feedback>
6767
</choice>
6868
<choice>
6969
<statement>
7070
<p>Error, there are two different keys named elephant.</p>
7171
</statement>
72-
<feedback>
72+
<feedback><p>
7373
There is only one dictionary with only one key named elephant. The dictionary has two different names, mydict and yourdict.
74-
</feedback>
74+
</p></feedback>
7575
</choice>
7676
</choices>
7777
</exercise>

0 commit comments

Comments
 (0)