Skip to content

Commit 73356d1

Browse files
authored
Merge branch 'master' into PG-2.13
2 parents 734dfca + f10279a commit 73356d1

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

lib/Value/AnswerChecker.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1690,7 +1690,7 @@ sub cmp {
16901690
Parser::Context->current(undef,$context);
16911691
$context->variables->add('C0' => 'Parameter');
16921692
my $f = $self->Package("Formula")->new('C0')+$self;
1693-
for ('limits','test_points','test_values','num_points','granularity','resolution',
1693+
for ('limits','test_points','test_values','test_at','num_points','granularity','resolution',
16941694
'checkUndefinedPoints','max_undefined')
16951695
{$f->{$_} = $self->{$_} if defined($self->{$_})}
16961696
$cmp->ans_hash(correct_value => $f);

macros/niceTables.pl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -575,7 +575,9 @@ sub DataTable {
575575
{
576576
if ($rowcolor[$i] ne '') {$textable .= '\rowcolor'.$rowcolor[$i];};
577577
for my $j (0..$numcols[$i])
578+
578579
{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}};
580+
579581
if (${$dataref->[$i][$j]}{multicolumn} ne '') {$textable .= ${$dataref->[$i][$j]}{multicolumn}};
580582
$textable .= ${$dataref->[$i][$j]}{texpre}.' '.${$dataref->[$i][$j]}{tex}.' '.${$dataref->[$i][$j]}{data}.' '.${$dataref->[$i][$j]}{texpost};
581583
if (${$dataref->[$i][$j]}{multicolumn} ne '') {$textable .= '}'};

0 commit comments

Comments
 (0)