Fix the ijk() method to honor the texStrings/normalStrings value, and…

… also accept a 'string' or 'TeX' value as a parameter
mgage · Oct 7, 2013 · fd53923 · fd53923
1 parent fe26f29
commit fd53923
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/lib/Parser.pm b/lib/Parser.pm
@@ -797,7 +797,7 @@ sub unsetValues {
 #
 sub ijk {
   my $self = shift;
-  $self->{tree}->ijk;
+  $self->{tree}->ijk(@_);
 }
 
 #########################################################################

diff --git a/lib/Parser/List/Vector.pm b/lib/Parser/List/Vector.pm
@@ -25,16 +25,17 @@ sub _check {
 }
 
 sub ijk {
-  my $self = shift; my $method = shift || 'string';
+  my $self = shift; my $context = $self->context;
+  my $method = shift || ($context->flag("StringifyAsTeX") ? 'TeX': 'string');
   my @coords = @{$self->{coords}};
   $self->Error("Method 'ijk' can only be used on vectors in three-space")
     unless (scalar(@coords) <= 3);
-  my @ijk = (); my $constants = $self->context->{constants};
+  my @ijk = (); my $constants = $context->{constants};
   foreach my $x ('i','j','k','_0') {
     my $v = (split(//,$x))[-1];
     push(@ijk,($constants->{$x}||{string=>$v,TeX=>"\\boldsymbol{$v}"})->{$method});
   }
-  my $prec = $self->{equation}{context}->operators->get('*')->{precedence};
+  my $prec = $context->operators->get('*')->{precedence};
   my $string = ''; my $n; my $term;
   foreach $n (0..scalar(@coords)-1) {
     $term = $coords[$n]->$method($prec);

diff --git a/lib/Value/Vector.pm b/lib/Value/Vector.pm
@@ -272,7 +272,7 @@ sub TeX {
 }
 
 sub ijk {
-  my $self = shift; my $type = shift || "string";
+  my $self = shift; my $type = shift || ($self->context->flag("StringifyAsTeX") ? "TeX" : "string");
   my @coords = @{$self->data};
   Value::Error("Method 'ijk' can only be used on Vectors in 3-space")
     unless (scalar(@coords) <= 3);