--- trunk/webwork/system/courseScripts/PGbasicmacros.pl	2001/06/20 19:04:08	35
+++ trunk/webwork/system/courseScripts/PGbasicmacros.pl	2001/06/20 20:01:26	36
@@ -23,33 +23,8 @@
 BEGIN{
 	be_strict;
 }
-sub _PGbasicmacros_export {
-	my @EXPORT = ( '&NAMED_ANS_RULE', '&NAMED_ANS_RULE_OPTION',
-		'&NAMED_ANS_RULE_EXTENSION', '&ANS_RULE', '&NAMED_ANS_BOX', '&ANS_BOX',
-		'&NAMED_ANS_RADIO', '&NAMED_ANS_RADIO_OPTION',
-		'&NAMED_ANS_RADIO_BUTTONS', '&ANS_RADIO', '&ANS_RADIO_OPTION',
-		'&ANS_RADIO_BUTTONS', '&NAMED_ANS_CHECKBOX',
-		'&NAMED_ANS_CHECKBOX_OPTION', '&NAMED_ANS_CHECKBOX_BUTTONS',
-		'&ANS_CHECKBOX', '&ANS_CHECKBOX_OPTION', '&ANS_CHECKBOX_BUTTONS',
-		'&ans_rule', '&ans_rule_extension', '&ans_radio_buttons',
-		'&ans_checkbox', '&tex_ans_rule', '&tex_ans_rule_extension', '&ans_box',
-		'&checkbox', '&NAMED_POP_UP_LIST', '&pop_up_list', '&solution',
-		'&SOLUTION', '&hint', '&HINT', '&random', '&non_zero_random', '&SRAND',
-		'&TEX', '&M3', '&MODES', '&_PGbasicmacros_export',
-		'&_PGbasicmacros_initialize', '&ALPHABET', '&PAR', '&BR', '&LQ', '&RQ',
-		'&BM', '&EM', '&BDM', '&EDM', '&LTS', '&GTS', '&LTE', '&GTE',
-		'&BEGIN_ONE_COLUMN', '&END_ONE_COLUMN', '&SOLUTION_HEADING',
-		'&HINT_HEADING', '&US', '&SPACE', '&BBOLD', '&EBOLD', '&HR', '&LBRACE',
-		'&RBRACE', '&LB', '&RB', '&DOLLAR', '&PERCENT', '&CARET', '&PI', '&E',
-		'&ev_substring', '&safe_ev', '&old_safe_ev', '&FEQ', '&math_ev3',
-		'&display_math_ev3', '&EV2', '&EV3', '&beginproblem',
-		'&protect_underbar', '&OL', '&htmlLink', '&appletLink', '&spf', '&sspf',
-		'&lex_sort', '&num_sort', '&begintable', '&endtable', '&row', '&image',
-		'&images', '&caption', '&captions', '&imageRow', '&display_options2', 
-		'&_PGbasicmacros_init','&test'
-	);
-	@EXPORT;
-}
+
+
 my $displayMode=$main::displayMode;
 
 my ($PAR,
@@ -84,9 +59,9 @@
 	$E,
 	@ALPHABET,
 	);
-#_PGbasicmacros_init();
+
 sub _PGbasicmacros_init {
-    PG_restricted_eval( <<'EOF');
+    $displayMode    =$main::displayMode;
 	$main::PAR				= PAR();
 	$main::BR				= BR();
 	$main::LQ				= LQ();
@@ -151,14 +126,9 @@
 	$E				= E();
 	@ALPHABET			= ('A'..'ZZ');
 	
-	$displayMode    =$main::displayMode;
-EOF
+	
 
 }
-sub test {
-	"PI is $PI $BR displayMode is $displayMode";
-}
-#_PGbasicmacros_init();  # initialize constants
 
 =head2  Answer blank macros:
 
@@ -709,7 +679,7 @@
 sub solution {
 	my @in = @_;
 	my $out = '';
-	PG_restricted_eval('$main::solutionExists =1');
+	$main::solutionExists =1;
 	if ($envir{'inputs_ref'}->{'ShowSol'}) {
 		my %inlist;
 		grep($inlist{$_}++,@{ $envir{'PRINT_FILE_NAMES_FOR'} });