Merge branch 'master' into PG-2.13

openwebwork · Jul 25, 2017 · 73356d1 · 73356d1
2 parents 734dfca + f10279a
commit 73356d1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/lib/Value/AnswerChecker.pm b/lib/Value/AnswerChecker.pm
@@ -1690,7 +1690,7 @@ sub cmp {
     Parser::Context->current(undef,$context);
     $context->variables->add('C0' => 'Parameter');
     my $f = $self->Package("Formula")->new('C0')+$self;
-    for ('limits','test_points','test_values','num_points','granularity','resolution',
+    for ('limits','test_points','test_values','test_at','num_points','granularity','resolution',
 	 'checkUndefinedPoints','max_undefined')
       {$f->{$_} = $self->{$_} if defined($self->{$_})}
     $cmp->ans_hash(correct_value => $f);

diff --git a/macros/niceTables.pl b/macros/niceTables.pl
@@ -575,7 +575,9 @@ sub DataTable {
       {
        if ($rowcolor[$i] ne '') {$textable .= '\rowcolor'.$rowcolor[$i];};
        for my $j (0..$numcols[$i])
+
         {if (grep { uc(${$dataref->[$i][$j]}{header}) eq $_ } ('TH','CH','COLUMN','COL','RH','ROW') or ($headerrow[$i] == 1) and !(uc(${$dataref->[$i][$j]}{header}) eq 'TD')) {${$dataref->[$i][$j]}{tex} = '\bfseries '.${$dataref->[$i][$j]}{tex}};
+
         if (${$dataref->[$i][$j]}{multicolumn} ne '') {$textable .= ${$dataref->[$i][$j]}{multicolumn}};
         $textable .= ${$dataref->[$i][$j]}{texpre}.' '.${$dataref->[$i][$j]}{tex}.' '.${$dataref->[$i][$j]}{data}.' '.${$dataref->[$i][$j]}{texpost};
         if (${$dataref->[$i][$j]}{multicolumn} ne '') {$textable .= '}'};