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

PG 2.16 Release #589

Merged
merged 280 commits into from
Jul 14, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
280 commits
Select commit Hold shift + click to select a range
67967c8
General code clean up. Mainly indentation.
drgrice1 Apr 8, 2020
fcec546
Fix the perldoc in this file. There is no '=head5'.
drgrice1 Apr 8, 2020
720bfe4
Explanation essays
Alex-Jordan Apr 14, 2020
105ab7c
Merge pull request #465 from Alex-Jordan/explanation-essays
mgage Apr 17, 2020
29251ff
encode string (with possible utf8 characters) as octets before passin…
mgage Apr 18, 2020
6dda353
remove importation of unnecessary subroutines
mgage Apr 18, 2020
330d4cf
Restrict encoding only to those $tex strings that satisfy is_utf8.
mgage Apr 18, 2020
d335543
reverting to no using the is_utf8 check.
mgage Apr 19, 2020
63f0b73
Merge pull request #466 from mgage/develop+md5_fix
mgage Apr 19, 2020
079aa08
Switch from © to © in all pg macro files. These can cause
drgrice1 May 12, 2020
c37afda
Rewrite lcm() and gcf() to handle more than two arguments
Alex-Jordan May 17, 2020
43610ee
Remove old tracking commentary
Alex-Jordan May 17, 2020
ab3d2ef
Merge pull request #469 from drgrice1/fix-malformed-utf8-copyright
mgage May 17, 2020
c527759
Fix sub createRandomPoints so that when test_at points are included, …
taniwallach May 18, 2020
d5733cc
Merge pull request #474 from taniwallach/fix_num_points_for_use_with_…
drgrice1 May 18, 2020
e1a9127
edit code style
Alex-Jordan May 18, 2020
2737bc9
Merge pull request #464 from drgrice1/parser-radio-buttons-extended-fix
mgage May 19, 2020
2533700
Merge pull request #458 from drgrice1/image-regeneration-fix
mgage May 19, 2020
00403f4
Update answerHints to not produce hints in Preview mode, unless speci…
dpvc May 19, 2020
4ee7e34
Fix typo in documentation
dpvc May 19, 2020
cbd6a6c
Made changed suggested by @drgrice1 to avoid dependency on unionUtils.pl
taniwallach May 19, 2020
156005c
lcm/gcf code commentary and cleanup
Alex-Jordan May 19, 2020
6d44320
Add context flag multiplyRightToLeft
paultpearson Jun 8, 2020
51cde24
Fix problem with RTL multiplication, and make it apply to numbers on …
dpvc Jun 9, 2020
a7ea081
Merge pull request #2 from dpvc/permutation-rtl
paultpearson Jun 9, 2020
4379c54
Merge pull request #481 from paultpearson/paultpearson-permutation-co…
mgage Jun 13, 2020
96f3b14
Add a new macro for adding interactive javascript graphs to problems.
drgrice1 Sep 27, 2019
7f1b354
Switch to a method of inserting the student graph that will work even if
drgrice1 Oct 5, 2019
dc07e92
Switch to a method for injecting the correct answer into the results
drgrice1 Dec 30, 2019
b9a76fa
Implement a slightly better way of injecting the graph answers into the
drgrice1 Jan 6, 2020
a3fd71f
Switch to using a TikZ image for the hardcopy graph images rather than
drgrice1 Feb 16, 2020
94f50a3
Make the graphtool macro shade the correct side of a parabola that has a
drgrice1 Feb 24, 2020
4f58bfe
Make the print border box the same color as the javascript border box.
drgrice1 Feb 25, 2020
0885630
pass all gcd() arguments to gcf(), not just first two
Alex-Jordan Jun 17, 2020
bc0b2da
Merge pull request #471 from Alex-Jordan/coprime-random
drgrice1 Jun 17, 2020
1cff121
Condense the graphTool parameters into a single JSON argument. This
drgrice1 Jun 22, 2020
1657842
Add an option to the parserGraphTool.pl macro that allows a problem
drgrice1 Jun 23, 2020
3b2c33c
Correct aria label
Alex-Jordan Jun 30, 2020
27410ce
Make function parenPrecedence greater than unary negative, postive
Alex-Jordan Jun 30, 2020
8b45613
Make the GraphTool extendable with custom graph objects and tools. The
drgrice1 Jul 3, 2020
64efdf1
tighten up regex for query_sage_server response
drdrew42 Jul 17, 2020
a785b9b
Add typecheck to union answer checking
dpvc Jul 19, 2020
b3b39fa
include the Bn string in a radio buttons answer hash
Alex-Jordan Jul 28, 2020
3c6acd2
Adds handling for a new setting "message_for_blank_answer" which can
taniwallach Aug 18, 2020
c1a22d1
Add bypass_equivalence_test switch to disable setting the message "Th…
taniwallach Aug 18, 2020
30523d8
fix parserMultiAnswer.pl to resolve issue which caused memory/CPU iss…
taniwallach Aug 24, 2020
3209aba
Merge pull request #411 from taniwallach/add_weightedGrader
Alex-Jordan Aug 24, 2020
d823060
Merge pull request #486 from Alex-Jordan/ariaradio
taniwallach Aug 25, 2020
87f82b7
Merge pull request #492 from dpvc/fix-union-typecheck
taniwallach Aug 25, 2020
a9df6fc
Changes needed in PGML.pl and parserMultiPart.pl due to prior changes…
taniwallach Aug 25, 2020
48e1f18
Drop irrelevant and incorrect CVSHeader from 2 files which referred t…
taniwallach Aug 25, 2020
450b476
Add methods to access radio button labels/choices from answer string
mikeshulman Sep 5, 2020
6382e2b
random_coprime and random_pairwise_coprime macros
Alex-Jordan May 18, 2020
2c32bb4
reflow random_coprime subroutines
Alex-Jordan Jun 20, 2020
d2faa07
random_coprime: handle zeros
Alex-Jordan Jun 24, 2020
61a7ec0
speed up gcd() subroutine
Alex-Jordan Jun 25, 2020
55ef176
improve efficiency of random_coprime()
Alex-Jordan Jun 25, 2020
dce5c4f
random_coprime() warning about reseource usage
Alex-Jordan Jun 25, 2020
135c6e7
code cleanup
Alex-Jordan Sep 5, 2020
bcba5ea
Merge pull request #491 from drdrew42/develop
drgrice1 Sep 6, 2020
bdbb02c
Remove the erroneous CVS line in the parserGraphTool.pl file, and put
drgrice1 Sep 11, 2020
7e498fe
Merge pull request #484 from drgrice1/graphtool-macro
Alex-Jordan Sep 28, 2020
d2eb7fa
Merge pull request #501 from taniwallach/fix-multi-answer-reload-bug
drgrice1 Oct 29, 2020
91d00c8
Merge pull request #476 from dpvc/answerHints-preview
taniwallach Oct 29, 2020
a0da682
Merge pull request #494 from Alex-Jordan/radio-choice
drgrice1 Oct 30, 2020
03236a9
replace romberg approximation with faster function
doombot-exe Dec 5, 2020
9f2ca68
Properly add parentheses to Fraction::Value objects based on precedence.
dpvc Dec 9, 2020
dbb671d
fix if-else logic & handle infinities
doombot-exe Dec 11, 2020
438d97c
Merge pull request #512 from dpvc/fix-fraction-parens
Alex-Jordan Dec 16, 2020
4fe1028
Merge branch 'develop' into rbans
Alex-Jordan Dec 17, 2020
4589fee
Merge pull request #502 from mikeshulman/rbans
Alex-Jordan Dec 17, 2020
50d66a1
Merge pull request #497 from taniwallach/bypass-equivalence-message
Alex-Jordan Dec 17, 2020
240659c
Merge pull request #496 from taniwallach/message-for-blank-input
Alex-Jordan Dec 17, 2020
1b88217
bare 'null' and %bullet warnings from PGML
drdrew42 Sep 22, 2020
b33f3af
Subroutine TEX redefined
drdrew42 Sep 22, 2020
0a95027
all TeX calls should return string
drdrew42 Sep 22, 2020
3cac8b7
undef replaces 'null bareword'
drdrew42 Dec 18, 2020
9adf5c7
remove duplicate TEX macro + deprecation comment
drdrew42 Dec 18, 2020
ce346b3
break circular reference in PGresource
drdrew42 Dec 18, 2020
acd69d7
roll back overzealous code removal
drdrew42 Dec 18, 2020
74ca762
standardize TeX() and string() outputs
drdrew42 Dec 18, 2020
06a1c70
regex for infinity inputs
doombot-exe Dec 23, 2020
ddd0b99
Report errors when infinity is used improperly in intequalities.
dpvc Jan 3, 2021
64838bc
Fix comparison between inequalities and plain sets and unions
dpvc Jan 3, 2021
01181fe
add pg/macros/draggableProof which gets it's javascript for nestable…
mgage Jan 3, 2021
64f8f94
Clean up remnant references to PGnumericalmacros.pl
Alex-Jordan Jan 8, 2021
15ce46c
Allow aliases for additional context classes (operators, variables, p…
dpvc Jan 12, 2021
5c5b412
Add ability to set alternative tokens for any parser object (allows f…
dpvc Jan 13, 2021
1877feb
Add configuration for parsing alternative tokens
dpvc Jan 13, 2021
33bfe1c
Allow for converting Full Width characters to their ASCII equivalents
dpvc Jan 13, 2021
dc51937
Add Unicode equivalents for the default context definitions
dpvc Jan 13, 2021
f83b1e3
Merge pull request #4 from Alex-Jordan/patch-1
doombot-exe Jan 15, 2021
7b04895
Merge pull request #511 from rederly/dev/de-romberg-statistics-macro
Alex-Jordan Jan 15, 2021
df8fef4
Add comments, per review request
dpvc Jan 20, 2021
362ebfb
Fix typo found during code review
dpvc Jan 20, 2021
c43b1cd
Merge pull request #518 from dpvc/parse-unicode
Alex-Jordan Jan 27, 2021
2b839bb
Update WeBWorK to use MathJax version 3.
drgrice1 Nov 26, 2019
96aff74
Switch from opening a new window to opening a dialog when an image is
drgrice1 Sep 14, 2019
0bb7db7
Use the correct close string (resolves issues reported by Alex)
dpvc Jan 30, 2021
01d8bb1
Merge pull request #521 from dpvc/parse-unicode
drgrice1 Jan 31, 2021
6ec8b7d
Fix the sage.pl macro.
drgrice1 Feb 2, 2021
271e031
singleResult should score even with messages
drdrew42 Feb 6, 2021
4a30d16
Add a patternPrecedence property to context items that allows individ…
dpvc Feb 16, 2021
2088ac6
Fix typo in comment
dpvc Feb 16, 2021
1ed89f8
Merge pull request #526 from dpvc/fix-decimal
mgage Feb 16, 2021
be8b0bf
Merge pull request #524 from drdrew42/multianswer-score-fix
drgrice1 Feb 17, 2021
bc21462
Merge pull request #513 from drdrew42/clean-dev-pg-warnings
drgrice1 Feb 19, 2021
5976489
set pg version info in %ENV and PGcore obj+package
drdrew42 Feb 24, 2021
5c30506
Merge pull request #531 from drdrew42/PGcore-add-pg-version
drdrew42 Feb 24, 2021
06498b9
Fix the student and correct answer display in the attempts table for the
drgrice1 Feb 24, 2021
851410c
Remove the mathjax configuration that is injected into the page by
drgrice1 Feb 25, 2021
b019b44
Merge pull request #514 from dpvc/inequality-infinity
Alex-Jordan Feb 25, 2021
6f0726c
Merge pull request #515 from dpvc/inequality-compare
taniwallach Feb 25, 2021
97789fe
Merge pull request #516 from mgage/develop
drgrice1 Feb 25, 2021
b776b75
Follow alias chain, not just first alias (needed for case-insensitive…
dpvc Feb 26, 2021
00068be
General code clean up of lib/Applet.pm and macros/AppletObjects.pl in
drgrice1 Jul 10, 2020
99ef043
Make it possible for applet problems to work in gateway quizzes.
drgrice1 Jul 15, 2020
13b67cf
Handle aliased strings better (fixes problem with mixed case infinity).
dpvc Feb 26, 2021
35c47f2
Make test for upper-case version work properly for case-sensitive str…
dpvc Feb 27, 2021
03e592b
Simplify condition for string checking slightly (not need to set it w…
dpvc Feb 27, 2021
f313c9c
Add the `non_tex_preview` flag to the cmp options for the
drgrice1 Feb 27, 2021
fd6ddc8
Do a typecheck before comparing functions (which checks that their re…
dpvc Mar 1, 2021
42e8142
Use the function's cmp_compare() method, in case it has been overridd…
dpvc Mar 1, 2021
825c2fa
Make [.,.] form Lists, and {.,.} form sets, and make list compare use…
dpvc Mar 1, 2021
6c7a4aa
Correct typo in context property. (#536)
dpvc Mar 1, 2021
bf0470c
Merge pull request #540 from dpvc/issue536
drgrice1 Mar 1, 2021
973bdc1
Merge pull request #538 from dpvc/bug-4559
Alex-Jordan Mar 3, 2021
74a7cee
Merge pull request #537 from dpvc/issue518
Alex-Jordan Mar 3, 2021
d7540b1
Merge pull request #532 from drgrice1/update-mathjax
Alex-Jordan Mar 3, 2021
ea06770
Add options to add TeX libraries and add to the TeX preamble in the
drgrice1 Jan 11, 2021
d0f7b25
PreTeXt: remove sidebyside
Alex-Jordan Mar 4, 2021
08fde7e
Merge remote-tracking branch 'origin/develop' into image-view-dialog
drgrice1 Mar 5, 2021
ed0ca5b
Merge pull request #542 from Alex-Jordan/PTX-naked-tables-and-images
drgrice1 Mar 5, 2021
6465c10
Merge pull request #529 from drgrice1/image-view-dialog
Alex-Jordan Mar 6, 2021
06073e6
Merge remote-tracking branch 'origin/develop' into fix-applets-in-gat…
drgrice1 Mar 6, 2021
236a947
Merge pull request #489 from drgrice1/fix-applets-in-gateway
Alex-Jordan Mar 6, 2021
2309e0b
Move the PGML `preamble` into the TeX template files and restructure
drgrice1 Mar 6, 2021
606ca9e
Merge pull request #475 from Alex-Jordan/random_coprime
taniwallach Mar 8, 2021
365220d
Merge pull request #522 from drgrice1/fix-sage-macro
taniwallach Mar 8, 2021
c7692ec
Merge pull request #541 from drgrice1/pgtikz-improvements
taniwallach Mar 10, 2021
006e412
Merge remote-tracking branch 'origin/develop' into hardcopy-improvements
drgrice1 Mar 12, 2021
20f4e8b
Merge pull request #487 from Alex-Jordan/parenprecedence
taniwallach Mar 13, 2021
5f5a42b
Don't show unwanted parentheses; e.g., x = (-3)
dpvc Mar 13, 2021
ff8d5e3
Use parens again if negative is factored out. (#455)
dpvc Mar 14, 2021
269bb6c
Merge pull request #539 from dpvc/issue535
Alex-Jordan Mar 15, 2021
e50e0d7
'digits' tolType
Alex-Jordan Nov 30, 2019
d766ae0
clean up digits tolType code
Alex-Jordan Nov 30, 2019
bdffb63
simplify digits tolType code
Alex-Jordan Nov 30, 2019
9abd605
Use comparison operator when needed with 'digits' tolType
Alex-Jordan Feb 27, 2020
d4f20fc
Use string equality comparison with 'digits' tolType
Alex-Jordan Feb 27, 2020
d8d0604
Update Real.pm
Alex-Jordan Dec 17, 2020
e254741
account for zeroLevel
Alex-Jordan Jan 26, 2021
c687aff
remove redundant variable declaration
Alex-Jordan Mar 4, 2021
d0ef9aa
Add digits-2 alternative implementation (but leave digits so they can…
dpvc Mar 8, 2021
3cde7db
move tolDigits to tolExtraDigits
Alex-Jordan Mar 15, 2021
860a2b2
Merge pull request #545 from dpvc/fix-assignment
Alex-Jordan Mar 15, 2021
e860e04
Merge pull request #546 from dpvc/issue455
Alex-Jordan Mar 15, 2021
487e531
Move the problem header out of the beginproblem method and out of PG and
drgrice1 Mar 16, 2021
e44db36
Change the definition of `PAR` for the TeX display mode from `\\par ` to
drgrice1 Mar 16, 2021
c27c3d3
Remove a prefix from the parserGraphTool.pl macro that was from part of
drgrice1 Mar 17, 2021
a1a9ee9
Merge pull request #441 from Alex-Jordan/digits
drgrice1 Mar 17, 2021
2333435
Merge pull request #547 from drgrice1/graphtool-ansprefix-fix
Alex-Jordan Mar 17, 2021
02c400c
Update the ADD_JS_FILE calls in the AppletObjects.pl macro.
drgrice1 Mar 17, 2021
aed59af
Merge pull request #544 from drgrice1/hardcopy-improvements
Alex-Jordan Mar 18, 2021
efadce0
updated version
pstaabp Mar 21, 2021
62fff11
The ADD_CSS_FILE and ADD_JS_FILE usage is now consistent. Both methods
drgrice1 Mar 21, 2021
4eed4b7
Merge pull request #549 from drgrice1/fix-applet-add-js-file
pstaabp Mar 22, 2021
2aab8e8
stop random_coprime from producing error messages in apache2 log
Alex-Jordan Mar 23, 2021
64a0603
account for PTX output from GraphTool
Alex-Jordan Mar 23, 2021
2112b44
Merge pull request #552 from Alex-Jordan/fix-random_coprime
drgrice1 Mar 23, 2021
88e9bfa
Merge pull request #553 from Alex-Jordan/graphtoolPTX
drgrice1 Mar 23, 2021
98efe91
Synchronize the PG-2.16 release candidate branch with the master branch.
drgrice1 Mar 25, 2021
54d6e2a
Fix POD generation errors.
drgrice1 Apr 1, 2021
1afc9b5
Fix a couple of link issues.
drgrice1 Apr 2, 2021
b9e8919
reduce extra digit checking in digits toltype
Alex-Jordan Apr 3, 2021
6c8c24d
alt option for image()
Alex-Jordan Apr 6, 2021
688f63a
use encode_pg_and_html and drop ternary operator
Alex-Jordan Apr 6, 2021
f897f52
update image() POD and code commentary
Alex-Jordan Apr 7, 2021
1bad7b3
let image() have array ref for alt, and return a joined string in str…
Alex-Jordan Apr 8, 2021
6a58442
Improve the generated POD output from PGbasicmacros.pl.
drgrice1 Apr 10, 2021
b5c9ee4
The stringify_answers method of Translator.pm now JSON encodes the
drgrice1 Mar 25, 2021
89177ed
Convert all hash or array references to JSON encoded strings when
drgrice1 Mar 31, 2021
cad324e
Merge pull request #555 from drgrice1/mq-opts-change
Alex-Jordan Apr 13, 2021
6082581
Merge pull request #2 from drgrice1/image-pod-improve
Alex-Jordan Apr 13, 2021
b0d5af8
Merge pull request #559 from Alex-Jordan/pgimagealttext
drgrice1 Apr 13, 2021
681d67b
direct use of WWPlot or TikZImage objects in image()
Alex-Jordan Apr 7, 2021
f8dc618
move WWPlot and TikZImage handling to support an array argument of su…
Alex-Jordan Apr 7, 2021
74d4ba3
code cleanup
Alex-Jordan Apr 7, 2021
78c9d7a
update POD
Alex-Jordan Apr 13, 2021
ecf3654
Merge pull request #558 from Alex-Jordan/loosendigits
drgrice1 Apr 14, 2021
ae38c3d
Wrap math content in `<script type="math/tex"></script" tags for
drgrice1 Apr 14, 2021
aea842b
Implement a better method for generating svg images with TikZImage.pm.
drgrice1 Apr 1, 2021
9beee10
Add a BEGIN_TIKZ/END_TIKZ construct that works like BEGIN_TEXT/END_TEXT
drgrice1 Apr 4, 2021
b99e74d
Make it easier to change the image extension without concern of breaking
drgrice1 Apr 4, 2021
b61b87b
Make the PGtikz.pl macro use a special setting to determine its default
drgrice1 Apr 14, 2021
33e038f
Switch PGtikz.pl and TikZImage.pm to using pdf2svg to generate svg
drgrice1 Apr 15, 2021
3835089
Remove the now un-needed span around math content script tags.
drgrice1 Apr 15, 2021
fdc3568
Merge pull request #564 from drgrice1/mathjax-fix
pstaabp Apr 15, 2021
16f20d6
Merge pull request #561 from Alex-Jordan/image-insertGraph
pstaabp Apr 15, 2021
d0ab4cc
Merge pull request #556 from drgrice1/pod-fixes
pstaabp Apr 16, 2021
a56a0d2
Add special handling of the latex `xcolor` package so that the options
drgrice1 Apr 19, 2021
54c0e60
This is an attempt to fix the odd permissions issue @pstaab is
drgrice1 Apr 19, 2021
7261d19
Merge remote-tracking branch 'origin/PG-2.16' into tikz-to-svg
drgrice1 Apr 20, 2021
d143e55
Add the new PGtikz (sub-package of TikZImage) to the list of objects
drgrice1 Apr 20, 2021
40eb877
Change from hash to an array for the texPackages option of the TikZImage
drgrice1 Apr 20, 2021
42e32b2
Merge pull request #550 from pstaabp/update-version
drgrice1 Apr 21, 2021
93f121c
Merge pull request #557 from drgrice1/tikz-to-svg
pstaabp Apr 21, 2021
8096d0b
options for using ImageMagick convert on PGtikz images
Alex-Jordan Apr 19, 2021
b003d94
resolve conflict: tikzPackages is an array reference
Alex-Jordan Apr 21, 2021
4eae83f
change options structure
Alex-Jordan Apr 20, 2021
51fce2c
POD for convertOptions
Alex-Jordan Apr 20, 2021
04189e1
Merge pull request #566 from Alex-Jordan/convert-options
drgrice1 Apr 27, 2021
5c70675
update the POD for PGauxiliaryFunctions.pl
pstaabp Apr 27, 2021
67d94e6
Updated some formatting and added other examples.
pstaabp Apr 27, 2021
1e37cbf
typos and other fixes.
pstaabp Apr 27, 2021
50dd470
tikz image package for PreTeXt output
Alex-Jordan Apr 28, 2021
0878341
Merge pull request #571 from pstaabp/update-pod-for-pgaux
drgrice1 Apr 28, 2021
8b6e4b3
issues reported in PR#572
Alex-Jordan Apr 28, 2021
cb441d5
fix dvisvgm output
Alex-Jordan Apr 29, 2021
b5e0523
only call externalCommands when they are needed
Alex-Jordan Apr 30, 2021
e630e0b
restructure warnLaTeXOutput
Alex-Jordan Apr 30, 2021
3c5c959
restructure use_svgMethod and use_convert
Alex-Jordan Apr 30, 2021
558d574
use externalCommand('mv')
Alex-Jordan Apr 30, 2021
ca4d686
bring back chmod on tex files
Alex-Jordan Apr 30, 2021
fedb0bc
refactor pdf-based portion of tikz image production
Alex-Jordan Apr 30, 2021
78312ca
warn if tgz file not created
Alex-Jordan Apr 30, 2021
9585e53
stringify file path
Alex-Jordan Apr 30, 2021
c0f0a6d
Use the same context flags for same-formula check as for main cmp check
dpvc Apr 25, 2021
77c45ea
Fix parameters for string() and TeX() methods.
dpvc Apr 25, 2021
bb47189
Merge pull request #569 from dpvc/issue567
drdrew42 May 5, 2021
3b6cf2d
Merge pull request #572 from Alex-Jordan/pretext-tikz
pstaabp May 11, 2021
bc121ac
Switch from using a jquery-ui accordion to using a bootstrap accordion
drgrice1 May 12, 2021
8adee5e
Merge pull request #573 from drgrice1/bootstrap-scaffold
pstaabp May 20, 2021
f5600d8
Add a third optional argument to ADD_JS_FILES. This argument is a hash
drgrice1 Apr 1, 2021
1d52b6a
Fix a bug in the ADD_CSS_FILE method that prevented the optional
drgrice1 May 21, 2021
43e78e1
Fix a typo.
drgrice1 May 26, 2021
5ae626b
Merge pull request #576 from drgrice1/add_js_attribs_and_gt_defer
pstaabp May 27, 2021
d39a2b3
scaffold section numbering
Alex-Jordan May 28, 2021
2f6272b
scaffold hardcopy indent by 15pt for each nesting level
Alex-Jordan May 30, 2021
25855c4
Change PTX 'stage' output to 'task'
Alex-Jordan May 30, 2021
8cbf4fb
simplify scaffold enumeration code, only support up to 99
Alex-Jordan Jun 9, 2021
d79cfef
Properly handle negative constants and variables.
dpvc Jun 6, 2021
0a358ff
Merge pull request #580 from dpvc/fix-limited-polynomials
drgrice1 Jun 10, 2021
adc156b
The web.geogebra.org/4.4/web/web.nocache.js link is no longer valid.
drgrice1 Jun 15, 2021
ad5a792
Merge pull request #582 from drgrice1/update-geogebra-js-url
drdrew42 Jun 16, 2021
27a6553
Merge pull request #579 from Alex-Jordan/scaffold-numbering
pstaabp Jun 16, 2021
97ccca6
adjust newlines in PTX output
Alex-Jordan Jun 25, 2021
c033e77
Merge pull request #586 from Alex-Jordan/ptx-scaffold
taniwallach Jun 30, 2021
86e3c81
Make PTX multiple choice answers show their name. (#587)
Alex-Jordan Jul 1, 2021
76cf444
put a data-type attribute on knowl links, for example to identify whe…
Alex-Jordan Jul 7, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README_maketext
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
##### README


Currently (version 1.25) Maketext has a "use strict" line as part of its string parser. This "use strict" interacts badly with WWSafe and fails. Unfortunately the use strict cannot be turned off in Maketext. This means that you can use maketex in PG, but you cannot use any of its features, including simple ones like maketext('Hello [_1] World','Cruel');
Currently (version 1.25) Maketext has a "use strict" line as part of its string parser. This "use strict" interacts badly with WWSafe and fails. Unfortunately the use strict cannot be turned off in Maketext. This means that you can use maketext in PG, but you cannot use any of its features, including simple ones like maketext('Hello [_1] World','Cruel');

If it becomes necessary to use the more advance versions of maketext in PG we will need to fork Maketext.




4 changes: 2 additions & 2 deletions VERSION
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
$PG_VERSION ='2.15';
$PG_COPYRIGHT_YEARS = '1996-2019';
$PG_VERSION ='2.16';
$PG_COPYRIGHT_YEARS = '1996-2021';

1;
2 changes: 2 additions & 0 deletions doc/MathObjects/README.pod
Original file line number Diff line number Diff line change
Expand Up @@ -184,3 +184,5 @@ sin 2x return sin(2x) rather than (sin(2))x.

Shows how to switch contexts (in this case, to complex and to vector
contexts), and how this affects the parsing.

=back
28 changes: 20 additions & 8 deletions lib/AnswerHash.pm
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ BEGIN {
package AnswerHash;
use Exporter;
use PGUtil qw(not_null pretty_print);
use JSON;

# initialization fields
my %fields = ( 'score' => undef,
Expand Down Expand Up @@ -247,19 +248,27 @@ sub score {

=head4 stringify_hash

Usage: $rh_ans->stringify_hash;
Usage: $rh_ans->stringify_hash;

Turns all values in the hash into strings (so they won't cause trouble outside
the safe compartment).
Turns all values in the hash into strings (so they won't cause trouble outside
the safe compartment).

Hashes and arrays are converted into a JSON string.

=cut

sub stringify_hash {
my $self = shift;
Parser::Context->current(undef,$self->{correct_value}->context) if $self->{correct_value};
foreach my $key (keys %$self) {
$self->{$key} = "$self->{$key}" if ref($self->{$key});
}
my $self = shift;
Parser::Context->current(undef,$self->{correct_value}->context) if $self->{correct_value};
foreach my $key (keys %$self) {
my $ref = ref($self->{$key});
next if !$ref;
if ($ref eq "HASH" or $ref eq "ARRAY") {
$self->{$key} = JSON->new->utf8->allow_unknown->allow_blessed->encode($self->{$key});
} else {
$self->{$key} = "$self->{$key}";
}
}
}

# error methods
Expand Down Expand Up @@ -879,6 +888,9 @@ sub blank_postfilter {
return($rh_ans) unless defined($rh_ans->{error_flag}) and $rh_ans->{error_flag} eq 'BLANK';
$rh_ans->{error_flag} = undef;
$rh_ans->{error_message} = '';
if ( defined($rh_ans->{message_for_blank_answer} ) ) {
$rh_ans->{ans_message} = $rh_ans->{message_for_blank_answer};
}
$rh_ans->{done} =1; # no further checking is needed.
$rh_ans;
};
Expand Down
Loading