Merge pull request #6765 from pretendWhale/v2.3.2

V2.3.2

Changelog.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## [v2.3.2]
+- Allow MathJAX to process environments (e.g., align) (#6762)
+
 ## [v2.3.1]
 - Add filter for empty/non-empty submissions in submissions table (#6711)
 - Fix bug where autotest settings would not appear if there were no assignment criteria (#6718)

app/MARKUS_VERSION

@@ -1 +1 @@
-VERSION=v2.3.1,PATCH_LEVEL=DEV
+VERSION=v2.3.2,PATCH_LEVEL=DEV

app/views/layouts/_mathjax_config.html.erb

@@ -8,7 +8,7 @@
     tex2jax: {
       inlineMath: [['$', '$'], ['\\(', '\\)']],
       preview: 'none',
-      processEnvironments: false,
+      processEnvironments: true,
       processRefs: false,
     },
     jax: ["input/TeX", "input/MathML", "input/AsciiMath", "output/CommonHTML"],

app/views/layouts/notebook.html.erb

@@ -22,7 +22,7 @@
           tex2jax: {
             inlineMath: [['$', '$'], ['\\(', '\\)']],
             preview: 'none',
-            processEnvironments: false,
+            processEnvironments: true,
             processRefs: false,
           },
           jax: ["input/TeX", "input/MathML", "input/AsciiMath", "output/CommonHTML"],

config/initializers/python.rb

@@ -17,6 +17,7 @@
   def process_requirements(requirements_file)
     File.open(requirements_file).each_line.filter_map do |line|
       line.strip!
+      line.tr!('-_', '')
       line.start_with?('#') || line.length.zero? ? nil : line
     end
   end
@@ -31,9 +32,11 @@ def process_requirements(requirements_file)
 
     if status.success?
       installed = installed.lines.map(&:chomp)
+      installed.each { |p| p.tr!('-_', '') }
 
       jupyter_requirements = process_requirements(Rails.root.join('requirements-jupyter.txt'))
       scanner_requirements = process_requirements(Rails.root.join('requirements-scanner.txt'))
+      qr_requirements = process_requirements(Rails.root.join('requirements-qr.txt'))
 
       if (jupyter_requirements - installed).empty?
         Rails.application.config.nbconvert_enabled = true
@@ -42,12 +45,18 @@ def process_requirements(requirements_file)
              'Jupyter notebook rendering will be disabled. ' \
              "To enable notebook rendering run: #{pip} install -r #{Rails.root.join('requirements-jupyter.txt')}"
       end
+      unless (qr_requirements - installed).empty?
+        warn 'MARKUS WARNING: not all packages required to process scanned exams ' \
+             'are installed. Exam scanning will not be enabled. ' \
+             'To enable exam scanning run: ' \
+             "#{pip} install -r #{Rails.root.join('requirements-qr.txt')}"
+      end
       if (scanner_requirements - installed).empty?
         Rails.application.config.scanner_enabled = true
       else
         warn 'MARKUS WARNING: not all packages required to automatically match students for scanned exams ' \
              'are installed. Automatic student matching will be disabled. ' \
-             'To enable automatic student matching  run: ' \
+             'To enable automatic student matching run: ' \
              "#{pip} install -r #{Rails.root.join('requirements-scanner.txt')}"
       end
     else