From: dpvc v. a. <we...@ma...> - 2009-01-20 19:04:16
|
Log Message: ----------- Fixed incorrect parentheses being added when $showparens eq "same" Modified Files: -------------- pg/lib/Parser: Function.pm Revision Data ------------- Index: Function.pm =================================================================== RCS file: /webwork/cvs/system/pg/lib/Parser/Function.pm,v retrieving revision 1.26 retrieving revision 1.27 diff -Llib/Parser/Function.pm -Llib/Parser/Function.pm -u -r1.26 -r1.27 --- lib/Parser/Function.pm +++ lib/Parser/Function.pm @@ -256,7 +256,9 @@ foreach my $x (@{$self->{params}}) {push(@pstr,$x->string)} $string = ($self->{def}{string} || $self->{name})."$power".'('.join(',',@pstr).')'; $string = $self->addParens($string) - if (defined($precedence) and $precedence > $fn_precedence) || $showparens; + if $showparens eq 'all' or $showparens eq 'extra' or + (defined($precedence) and $precedence > $fn_precedence) or + (defined($precedence) and $precedence == $fn_precedence and $showparens eq 'same'); return $string; } @@ -275,7 +277,9 @@ if ($fn->{braceTeX}) {$TeX = $name.'{'.join(',',@pstr).'}'} else {$TeX = $name."$power".'\!\left('.join(',',@pstr).'\right)'} $TeX = '\left('.$TeX.'\right)' - if (defined($precedence) and $precedence > $fn_precedence) or $showparens; + if $showparens eq 'all' or $showparens eq 'extra' or + (defined($precedence) and $precedence > $fn_precedence) or + (defined($precedence) and $precedence == $fn_precedence and $showparens eq 'same'); return $TeX; } |