[WWcvs] pg: Combined TeX and string into a common routine since the two were nearly identical.

[dpvc v. a. <we...@ma...>]

Log Message:
-----------
Combined TeX and string into a common routine since the two were
nearly identical.

Modified Files:
--------------
    pg/macros:
        contextInequalities.pl

Revision Data
-------------
Index: contextInequalities.pl
===================================================================
RCS file: /webwork/cvs/system/pg/macros/contextInequalities.pl,v
retrieving revision 1.19
retrieving revision 1.20
diff -Lmacros/contextInequalities.pl -Lmacros/contextInequalities.pl -u -r1.19 -r1.20
--- macros/contextInequalities.pl
+++ macros/contextInequalities.pl
@@ -619,86 +619,60 @@
 sub string {
   my $self = shift;
   my $equation = shift; shift; shift; my $prec = shift;
-  my $context = ($equation->{context} || $self->context);
-  my $X = $self->{varName} || ($context->variables->names)[0];
-  $X = $context->{variables}{$X}{string} if defined $context->{variables}{$X}{string};
-  my $op = $context->{operators}{'or'};
-  my $showNE = $self->getFlag("showNotEquals",1);
-  my @intervals = (); my @points = (); my $interval;
-  foreach my $x (@{$self->data}) {
-    $x->{format} = $self->{format} if defined $self->{format};
-    if ($x->type eq 'Interval' && $showNE) {
-      if (defined($interval)) {
-	if ($interval->{data}[1] == $x->{data}[0]) {
-	  push(@points,$X . ' != ' . $x->{data}[0]->string);
-	  $interval = $interval->with(isCopy=>1, data=>[$interval->value]) unless $interval->{isCopy};
-	  $interval->{data}[1] = $x->{data}[1];
-	  $interval->{rightInfinite} = 1 if $x->{rightInfinite};
-	  next;
-	}
-	push(@intervals,$self->stringAnd($interval,$equation,@points));
-      }
-      $interval = $x; @points = (); next;
-    }
-    if (defined($interval)) {
-      push(@intervals,$self->stringAnd($interval,$equation,@points));
-      $interval = undef; @points = ();
-    }
-    push(@intervals,$x->string($equation));
-  }
-  push(@intervals,$self->stringAnd($interval,$equation,@points)) if defined($interval);
-  my $string = join($op->{string} || ' or ',@intervals);
-  $string = '('.$string.')' if defined($prec) && $prec > ($op->{precedence} || 1.5);
-  return $string;
-}
-
-sub stringAnd {
-  my $self = shift; my $interval = shift; my $equation = shift;
-  unshift(@_,$interval->string($equation)) unless $interval->{leftInfinite} && $interval->{rightInfinite};
-  return join(" and ", @_);
+  return $self->display("string",$equation,$prec);
 }
 
 sub TeX {
   my $self = shift;
   my $equation = shift; shift; shift; my $prec = shift;
-  my $context = $equation->{context} || $self->context;
+  return $self->display("TeX",$equation,$prec);
+}
+
+sub display {
+  my $self = shift; my $method = shift; my $equation = shift; my $prec = shift;
+  my $context = ($equation->{context} || $self->context);
   my $X = $self->{varName} || ($context->variables->names)[0];
-  $X = $context->{variables}{$X}{TeX} if defined $context->{variables}{$X}{TeX};
-  $X =~ s/^([^_]+)_?(\d+)$/$1_{$2}/;
-  my $op = ($equation->{context} || $self->context)->{operators}{'or'};
+  $X = $context->{variables}{$X}{$method} if defined $context->{variables}{$X}{$method};
+  $X =~ s/^([^_]+)_?(\d+)$/$1_{$2}/ if $method eq 'TeX';
+  my $op = $context->{operators}{'or'};
+  my ($and,$or,$le,$ge,$ne,$open,$close) = @{{
+    string => [' and ',$op->{string} || ' or ',' <= ',' >= ',' != ','(',')'],
+    TeX =>    ['\hbox{ and }',$op->{TeX} || $op->{string} || '\hbox{ or }',
+               ' \le ',' \ge ',' \ne ','\left(','\right)'],
+  }->{$method}};
   my $showNE = $self->getFlag("showNotEquals",1);
-  my @intervals = (); my $interval; my @points = ();
+  my @intervals = (); my @points = (); my $interval;
   foreach my $x (@{$self->data}) {
     $x->{format} = $self->{format} if defined $self->{format};
     if ($x->type eq 'Interval' && $showNE) {
       if (defined($interval)) {
 	if ($interval->{data}[1] == $x->{data}[0]) {
-	  push(@points,$X . ' \ne ' . $x->{data}[0]->TeX);
+	  push(@points,$X.$ne.$x->{data}[0]->$method($equation));
 	  $interval = $interval->with(isCopy=>1, data=>[$interval->value]) unless $interval->{isCopy};
 	  $interval->{data}[1] = $x->{data}[1];
 	  $interval->{rightInfinite} = 1 if $x->{rightInfinite};
 	  next;
 	}
-	push(@intervals,$self->TeXAnd($interval,$equation,@points));
+	push(@intervals,$self->joinAnd($interval,$method,$and,$equation,@points));
       }
       $interval = $x; @points = (); next;
     }
     if (defined($interval)) {
-      push(@intervals,$self->TeXAnd($interval,$equation,@points));
+      push(@intervals,$self->joinAnd($interval,$method,$and,$equation,@points));
       $interval = undef; @points = ();
     }
-    push(@intervals,$x->TeX($equation));
+    push(@intervals,$x->$method($equation));
   }
-  push(@intervals,$self->TeXAnd($interval,$equation,@points)) if defined($interval);
-  my $TeX = join($op->{TeX} || $op->{string} || '\hbox{ or }',@intervals);
-  $TeX = '\left('.$TeX.'\right)' if defined($prec) && $prec > ($op->{precedence} || 1.5);
-  return $TeX;
+  push(@intervals,$self->joinAnd($interval,$method,$and,$equation,@points)) if defined($interval);
+  my $string = join($or,@intervals);
+  $string = $open.$string.$close if defined($prec) && $prec > ($op->{precedence} || 1.5);
+  return $string;
 }
 
-sub TeXAnd {
-  my $self = shift; my $interval = shift; my $equation = shift;
-  unshift(@_,$interval->TeX($equation)) unless $interval->{leftInfinite} && $interval->{rightInfinite};
-  return join('\hbox{ and }', @_);
+sub joinAnd {
+  my $self = shift; $interval = shift; $method = shift, my $and = shift; my $equation = shift;
+  unshift(@_,$interval->$method($equation)) unless $interval->{leftInfinite} && $interval->{rightInfinite};
+  return join($and, @_);
 }
 
 ##################################################