Log Message:
-----------
Fixed errors in implementing BEGIN_HINT and BEGIN_SOLUTION
-- Hints and solutions are still not working right
-- but I believe this has been an on-going bug not a new one.
-- still working
Tags:
----
rel-2-4-patches
Modified Files:
--------------
pg/lib/WeBWorK/PG:
Translator.pm
Revision Data
-------------
Index: Translator.pm
===================================================================
RCS file: /webwork/cvs/system/pg/lib/WeBWorK/PG/Translator.pm,v
retrieving revision 1.18.2.2.2.1
retrieving revision 1.18.2.2.2.2
diff -Llib/WeBWorK/PG/Translator.pm -Llib/WeBWorK/PG/Translator.pm -u -r1.18.2.2.2.1 -r1.18.2.2.2.2
--- lib/WeBWorK/PG/Translator.pm
+++ lib/WeBWorK/PG/Translator.pm
@@ -1636,11 +1636,11 @@
my $evalString = shift;
# BEGIN_TEXT and END_TEXT must occur on a line by themselves.
$evalString =~ s/\n\s*END_TEXT[\s;]*\n/\nEND_TEXT\n/g;
- $evalString =~ s/\n\s*END_SOLUTION[\s;]*\n/\nEND_TEXT\n/g;
- $evalString =~ s/\n\s*END_HINT[\s;]*\n/\nEND_TEXT\n/g;
+ $evalString =~ s/\n\s*END_SOLUTION[\s;]*\n/\nEND_SOLUTION\n/g;
+ $evalString =~ s/\n\s*END_HINT[\s;]*\n/\nEND_HINT\n/g;
$evalString =~ s/\n\s*BEGIN_TEXT[\s;]*\n/\nTEXT\(EV3\(<<'END_TEXT'\)\);\n/g;
- $evalString =~ s/\n\s*BEGIN_SOLUTION[\s;]*\n/\nTEXT\(EV3\(<<'END_SOLUTION'\)\);\n/g;
- $evalString =~ s/\n\s*BEGIN_HINT[\s;]*\n/\nTEXT\(EV3\(<<'END_HINT'\)\);\n/g;
+ $evalString =~ s/\n\s*BEGIN_SOLUTION[\s;]*\n/\nSOLUTION\(EV3\(<<'END_SOLUTION'\)\);\n/g;
+ $evalString =~ s/\n\s*BEGIN_HINT[\s;]*\n/\nHINT\(EV3\(<<'END_HINT'\)\);\n/g;
$evalString =~ s/ENDDOCUMENT.*/ENDDOCUMENT();/s; # remove text after ENDDOCUMENT
$evalString =~ s/\\/\\\\/g; # \ can't be used for escapes because of TeX conflict
|
