Skip to content

Fix calls to Parser::Value::TeX & too many (cooks) #608

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
drgrice1 merged 4 commits into from
Dec 2, 2021
Merged

Fix calls to Parser::Value::TeX & too many (cooks) #608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
76d11db
fix calls to Parser::Value::TeX & too many (cooks)
drdrew42 Oct 15, 2021
3edee91
forgot to include explicit parens
drdrew42 Oct 15, 2021
c4a26ee
don't declare outermost parens
drdrew42 Oct 16, 2021
7d0d3e4
Update macros/contextFraction.pl
drdrew42 Oct 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/Parser.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,8 +401,8 @@ sub Close {
($top->type eq 'Comma') ? $top->entryType : $top->typeRef,
($type ne 'start') ? ($open,$paren->{close}) : () )};
} else {
$top->{value}{hadParens} = 1;
}
$top->{value}{hadParens} = 1 unless $open eq 'start';
}
$self->pop; $self->push($top);
$self->CloseFn() if ($paren->{function} && $self->prev->{type} eq 'fn');
} elsif ($paren->{formInterval} eq $type && $self->top->{value}->length == 2) {
Expand Down
13 changes: 7 additions & 6 deletions macros/contextFraction.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -618,7 +618,7 @@ sub reduce {
#
sub string {
my $self = shift;
my $string = $self->SUPER::string($self, @_);
my $string = $self->SUPER::string(@_);
return $string unless $self->{value}->classMatch('Fraction');
my $precedence = shift;
my $frac = $self->context->operators->get('/')->{precedence};
Expand All @@ -627,15 +627,18 @@ sub string {
}

#
# Add parentheses if they are needed by precedence
# Add parentheses if they were there originally, or
# are needed by precedence and we asked for exxxtra parens
#
sub TeX {
my $self = shift;
my $string = $self->SUPER::TeX($self, @_);
my $string = $self->SUPER::TeX(@_);
return $string unless $self->{value}->classMatch('Fraction');
my $precedence = shift;
my $frac = $self->context->operators->get('/')->{precedence};
$string = '\left(' . $string . '\right)' if defined $precedence && $precedence > $frac;
my $noparens = shift;
$string = '\left(' . $string . '\right)' if $self->{hadParens} ||
(defined $precedence && $precedence > $frac && !$noparens);
return $string;
}

Expand Down Expand Up @@ -898,7 +901,6 @@ sub string {
if ($self->getFlagWithAlias("showMixedNumbers","showProperFractions") && CORE::abs($a) > $b)
{$n = int($a/$b); $a = CORE::abs($a) % $b; $n .= " " unless $a == 0}
$n .= "$a/$b" unless $a == 0 && $n ne '';
$n = "($n)" if defined $prec && $prec >= 1;
return "$n";
}

Expand All @@ -911,7 +913,6 @@ sub TeX {
my $s = ""; ($a,$s) = (-$a,"-") if $a < 0;
$n .= ($self->{isHorizontal} ? "$s$a/$b" : "${s}{\\textstyle\\frac{$a}{$b}}")
unless $a == 0 && $n ne '';
$n = "\\left($n\\right)" if defined $prec && $prec >= 1;
return "$n";
}

Expand Down