Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
4977bd9
Adding changes for MathQuill to develop
drdrew42 Jan 21, 2019
9b0e637
Reconciled files from the MathQuill commit
mgage Feb 1, 2019
9bcf725
updated css with distinguishing black-on-white color scheme
drdrew42 Jan 21, 2019
433a40e
customized mathquill.js for webwork output
drdrew42 Feb 1, 2019
b950b83
restore black-on-white color scheme
drdrew42 Feb 1, 2019
c51d381
update: inf union oldanswer->currentrender improvements
drdrew42 Feb 8, 2019
01fa941
text-mode edit handler resolved; mismatched brackets resolved;
drdrew42 Feb 13, 2019
8a494ec
Build on the work of Andrew Parker and add in my changes to the
glennricster Feb 14, 2019
9cc701b
Touch up a few details I missed in my initial commit. The math quill
drgrice1 Feb 14, 2019
7c57caf
Make the mathquill answer boxes work in gateway quizzes also.
drgrice1 Feb 14, 2019
494edd4
Move the code to add the mathquill responses and latex inputs into a
drgrice1 Feb 14, 2019
1f355aa
Add some of Andrew's changes back in to the MathQuill code. Most
drgrice1 Feb 16, 2019
ddeff29
Implement a way that pg problems can set options for the mathquill
drgrice1 Feb 16, 2019
063fea1
prevent extra MathQuill answer fields from being stored in _past_answer
drdrew42 Feb 16, 2019
d97b493
Merge branch 'develop_mathquill-drgrice1' of https://github.com/drgri…
drdrew42 Feb 16, 2019
c68c7b0
modification to answer string handling: now "sticky" and no LaTeX in …
drdrew42 Feb 16, 2019
3fc3c3f
The most important change here is that if a non "text" input is
drgrice1 Feb 17, 2019
d7ce4ba
Remove a console.log that was accidentally left in the last commit.
drgrice1 Feb 17, 2019
6e2b163
Make the default behavior of the MathQuill answer boxes to be that roots
drgrice1 Feb 18, 2019
d1c0699
fix sidebar functionality in text-mode (also add abs and vert)
drdrew42 Mar 11, 2019
3251a2d
Fix the absolute value toolbar button so it actually works.
drgrice1 Mar 11, 2019
1d25c00
Modify the mathquill code to handle backslashes in text blocks better.
drgrice1 Mar 11, 2019
15e47aa
Don't strip backslashes from the text output of a TextBlock. Instead
drgrice1 Mar 12, 2019
baaf5ae
adding 'abs' command
drdrew42 Mar 13, 2019
4600549
re-fixing earlier typo /facepalm
drdrew42 Mar 13, 2019
501ec19
course config MQ/MV/WIRIS collected into single dropdown
drdrew42 Mar 13, 2019
5fde83d
mathquill single character exponent adjustment
drdrew42 Mar 13, 2019
68d74c8
Add Polyfill for IE @drgrice1
drdrew42 Jun 3, 2019
b957748
Indentation
drdrew42 Jul 31, 2019
87f0e0b
Spacing
drdrew42 Jul 31, 2019
ceff797
Spacing
drdrew42 Jul 31, 2019
e9154de
Merge branch 'develop' into develop_mathquill
drdrew42 Jul 31, 2019
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
31 changes: 19 additions & 12 deletions conf/defaults.config
Original file line number Diff line number Diff line change
Expand Up @@ -945,6 +945,9 @@ $options{PGCodeMirror} = 1;
$options{PGMathView} = 0;
# This sets if WirisEditor is available on the PG editor for use as a minimal latex equation editor
$options{PGWirisEditor}= 0;
# This sets if MathQuill is available on the PG editor for use as a minimal latex equation editor
$options{PGMathQuill}= 0;


###########################################################################################
#### Default settings for the PG translator
Expand All @@ -970,6 +973,10 @@ $pg{options}{mathViewLocale} = "mv_locale_us.js";
# Default for showing the WirisEditor preview system. To completely disable WirisEditor you need to change the PG special environment variable.
$pg{options}{useWirisEditor} = 1;


# Default for showing the MathQuill preview system. To completely disable MathQuill you need to change the PG special environment variable.
$pg{options}{useMathQuill} = 1;

# Show correct answers (when allowed) by default?
$pg{options}{showCorrectAnswers} = 0; # this is a backup value use when nothing else has been set. I can think of no case where it should anything but zero.

Expand Down Expand Up @@ -1390,10 +1397,12 @@ $webservices = {
###############################################################################

# DragMath is disabled by default; can enable it in course.conf file
# is DragMath even a thing any more?
$pg{specialPGEnvironmentVars}{DragMath} = 0;
$pg{specialPGEnvironmentVars}{entryAssist} = 'None';
$pg{specialPGEnvironmentVars}{MathView} = 0;
$pg{specialPGEnvironmentVars}{WirisEditor} = 0;

$pg{specialPGEnvironmentVars}{MathQuill} = 0;
###############################################################################
# default Homework Config settings
###############################################################################
Expand Down Expand Up @@ -1677,17 +1686,15 @@ $ConfigValues = [
values => [qw(MathJax images plainText)],
type => 'popuplist'
},
{ var => 'pg{specialPGEnvironmentVars}{MathView}',
doc => 'Use MathView editor for answer entry',
doc2 => 'Set to true to display MathView equation editor icon next to each answer box',
type => 'boolean'
},
{ var => 'pg{specialPGEnvironmentVars}{WirisEditor}',
doc => 'Use WirisEditor editor for answer entry (proof of concept)',
doc2 => 'WIRIS EDITOR is a commercial software. Using it in WebWork requires a valid license. Please contact sales@wiris.com for further information or visit www.wiris.com/solutions/webwork. Visual math editor (WYSIWYG) that allows inserting mathematical and chemistry equations. Based on JavaScript technology. It runs on any browser, including the ones in tablet PCs.
You can use a large collection of icons nicely organized in thematic tabs in order to create formulas. Handwriting input also available for touchable devices. Fully featured equation editor including accessibility features.',
type => 'boolean'
},

{ var => 'pg{specialPGEnvironmentVars}{entryAssist}',
doc => 'Assist with the student answer entry process.',
doc2 => 'MathQuill renders students answers in real-time as they type on the keyboard. <BR><BR> MathView allows students to choose from a variety of common math structures (such as fractions and square roots) as they attempt to input their answers. <BR><BR> WIRIS provides a separate workspace for students to construct their response in a WYSIWYG environment.',
min => 1,
values => [qw(None MathQuill MathView WIRIS)],
type => 'popuplist'
},

{ var => 'pg{options}{showEvaluatedAnswers}',
doc => 'Display the evaluated student answer',
doc2 => 'Set to true to display the "Entered" column which automatically shows the evaluated student answer, e.g. 1 if student input is sin(pi/2). If this is set to false, e.g. to save space in the response area, the student can still see their evaluated answer by hovering the mouse pointer over the typeset version of their answer.',
Expand Down
1 change: 1 addition & 0 deletions conf/localOverrides.conf.dist
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,7 @@ $options{PGCodeMirror} = 1;
# This sets if mathview is available on the PG editor for use as a minimal latex equation editor
$options{PGMathView} = 0;
$options{PGWirisEditor} = 0;
$options{PGMathQuill} = 0;

################################################################################
# PG subsystem options
Expand Down
Binary file added htdocs/js/apps/MathQuill/fonts/Symbola-basic.eot
Binary file not shown.
Binary file added htdocs/js/apps/MathQuill/fonts/Symbola-basic.ttf
Binary file not shown.
Binary file added htdocs/js/apps/MathQuill/fonts/Symbola-basic.woff
Binary file not shown.
Binary file not shown.
Binary file added htdocs/js/apps/MathQuill/fonts/Symbola.eot
Binary file not shown.
2,025 changes: 2,025 additions & 0 deletions htdocs/js/apps/MathQuill/fonts/Symbola.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added htdocs/js/apps/MathQuill/fonts/Symbola.ttf
Binary file not shown.
Binary file added htdocs/js/apps/MathQuill/fonts/Symbola.woff
Binary file not shown.
Binary file added htdocs/js/apps/MathQuill/fonts/Symbola.woff2
Binary file not shown.
Loading