Merge pull request #918 from brittnilorton/master

display fixes

Author: drdrew42

Contrib/CCCS/CollegeAlgebra/3.2/RRCC_CCCS_Openstax_AlgTrig_AT-1-001-AS_3_2_43.pg

@@ -23,6 +23,13 @@ loadMacros(
 "PGauxiliaryFunctions.pl",
 "PGgraphmacros.pl",
 "PGnumericalmacros.pl",
+"PGstandard.pl",
+"MathObjects.pl",
+"PGunion.pl",
+"answerHints.pl",
+"PGML.pl",
+"PGcourse.pl",
+"niceTables.pl"
 );
 
 do {$x1 = random(-5,-3,1) ;
@@ -36,7 +43,6 @@ $y3 = random(-5,5,1);
 $slope1 = ($y2- $y1)/($x2 - $x1);
 $slope2 = ($y3- $y2)/($x3 - $x2);
 
-#TEXT($BEGIN_ONE_COLUMN);
 TEXT(beginproblem());
 $showPartialCorrectAnswers = 1;
 
@@ -47,35 +53,33 @@ add_functions($graph, "$slope1*(x-$x1)+$y1 for x in <$x1,$x2>".
 add_functions($graph, "$slope2*(x-$x2)+$y2 for x in <$x2,$x3>". 
   " using color:blue and weight:3");
 $graph->stamps(open_circle($x1,$y1,'blue'), open_circle($x2,$y2,'blue'), open_circle($x3, $y3,'blue')  );
-$in=time();
-$graph->gifName($graph->gifName()."$in");
+
+$piecewise =
+       BeginTable().
+         Row(["\(\displaystyle f(x) = \Bigg\{ \; \)",ans_rule(1).$BR.$BR.ans_rule(1),'\(\displaystyle for \)'.$BR.$BR.'\(\displaystyle for \)',ans_rule(1).$BR.$BR.ans_rule(1), '\( < x < \)'.$BR.$BR. '\( < x < \)', ans_rule(1).$BR.$BR.ans_rule(1)],separation=>1).
+       EndTable();
+       
 BEGIN_TEXT
 $BCENTER
 \{ image(insertGraph($graph),tex_size => 400, width=>400, height=>400) \}
 $ECENTER
 $BR
 $BR
-Fill in the blanks to describe the given piecewise graph. Hint: In each row, the first blank should be the function, the second blank should be the lower bound for x, and the third blank should be the upper bound for x.
+Fill in the blanks to describe the given piecewise graph. (Note: Enter your answers with the function in the left blank and the `x` intervals for the second two blanks. Be sure the first line is the function with the smallest `x` values and the second line is the function with the largest `x` values.)
 $BR
 $BR
 END_TEXT
 
-TEXT(
-begintable(3),
-row( '', ans_rule(20), EV2(" \{ans_rule(3)\} < x < \{ans_rule(3) \} ")),
-row(EV2("\(f(x) = \)"), '',''),
-row( '', ans_rule(20), EV2(" \{ans_rule(3)\} < x <  \{ans_rule(3) \} ")  ),
-endtable()
-);
+BEGIN_PGML
+[$piecewise]*
+END_PGML
+
 $slope1 = ($y2- $y1)/($x2 - $x1);
 $slope2 = ($y3- $y2)/($x3 - $x2);
 $ans1 = FEQ( EV2(" $slope1*(x - $x1)  + $y1 ") );
 $ans2 = FEQ( EV2(" $slope2*(x - $x2)  + $y2 ") );
 
+ANS(fun_cmp($ans1),fun_cmp($ans2),num_cmp([$x1,$x2,$x2,$x3]), );
 
-ANS(fun_cmp($ans1), num_cmp([$x1,$x2]),fun_cmp($ans2),num_cmp([$x2,$x3]), );
-
-ANS(@answers);
-#TEXT($END_ONE_COLUMN);
 ENDDOCUMENT();        # This should be the last executable line in the problem.
 

Contrib/CCCS/PreCalculus/08.3/CCD_CCCS_Openstax_AlgTrig_AT-1-001-AS_8_3_25.pg

@@ -42,7 +42,7 @@ Context()->functions->enable("sqrt");
 $n=random(0,7,1);
 
 # Array of 8 angles 
-@latexfraction=("11pi/6", "pi/3" ,"pi/4" ,"pi/6", "(2pi)/3" , "(3pi)/4", "(5pi)/6", "pi");
+@latexfraction=("(11pi)/6", "pi/3" ,"pi/4" ,"pi/6", "(2pi)/3" , "(3pi)/4", "(5pi)/6", "pi");
 
 # Selecting angle for PGML
 $a = $latexfraction[$n] ;

Contrib/CCCS/PreCalculus/08.3/CCD_CCCS_Openstax_AlgTrig_AT-1-001-AS_8_3_30.pg

@@ -42,7 +42,7 @@ Context()->functions->enable("sqrt");
 $n=random(0,7,1);
 
 # Array of 8 angles 
-@latexfraction=("11pi/6", "pi/3" ,"pi/4" ,"pi/6", "(2pi)/3" , "(3pi)/4", "(5pi)/6", "pi");
+@latexfraction=("(11pi)/6", "pi/3" ,"pi/4" ,"pi/6", "(2pi)/3" , "(3pi)/4", "(5pi)/6", "pi");
 
 # Selecting angle for PGML
 $a = $latexfraction[$n] ;

Contrib/CCCS/PreCalculus/3.2/RRCC_CCCS_Openstax_AlgTrig_AT-1-001-AS_3_2_43.pg

@@ -9,7 +9,7 @@
 ## DBsection(Piecewise functions)
 ## Date(06/06/2017)
 ## Institution(Red Rocks Community College, Colorado Community College System)
-## Author(Craig Faulhaber)
+## Author(Craig Faulhaber, Updated Brittni Lorton February 2022)
 ## MO(1)
 ## KEYWORDS('college algebra')
 
@@ -23,6 +23,12 @@ loadMacros(
 "PGauxiliaryFunctions.pl",
 "PGgraphmacros.pl",
 "PGnumericalmacros.pl",
+"PGstandard.pl",
+"PGunion.pl",
+"MathObjects.pl",
+"PGML.pl",
+"PGcourse.pl",
+"niceTables.pl"
 );
 
 do {$x1 = random(-5,-3,1) ;
@@ -33,41 +39,47 @@ $x3 = random(3,5,1);
 $y3 = random(-5,5,1);
 } until (abs($y1-$y2)<4 && $y1!=$y2 && ($y3- $y2)/($x3 - $x2)<2 && ($y3- $y2)/($x3 - $x2)!=($y2- $y1)/($x2 - $x1));
 
+$slope1 = ($y2- $y1)/($x2 - $x1);
+$slope2 = ($y3- $y2)/($x3 - $x2);
+
 #TEXT($BEGIN_ONE_COLUMN);
 TEXT(beginproblem());
 $showPartialCorrectAnswers = 1;
 
 $graph = init_graph(-6,-6,6,6,grid =>[12,12], axes => [0,0]);
-$f1 = new Fun( plot_list([$x1, $x2, $x3],[ $y1,$y2,$y3]),  $graph);
+#$f1 = new Fun( plot_list([$x1, $x2, $x3],[ $y1,$y2,$y3]),  $graph);
+add_functions($graph, "$slope1*(x-$x1)+$y1 for x in <$x1,$x2>". 
+  " using color:blue and weight:3");
+add_functions($graph, "$slope2*(x-$x2)+$y2 for x in <$x2,$x3>". 
+  " using color:blue and weight:3");
 $graph->stamps(open_circle($x1,$y1,'blue'), open_circle($x2,$y2,'blue'), open_circle($x3, $y3,'blue')  );
 
+$piecewise =
+       BeginTable().
+         Row(["\(\displaystyle f(x) = \Bigg\{ \; \)",ans_rule(1).$BR.$BR.ans_rule(1),'\(\displaystyle for \)'.$BR.$BR.'\(\displaystyle for \)',ans_rule(1).$BR.$BR.ans_rule(1), '\( < x < \)'.$BR.$BR. '\( < x < \)', ans_rule(1).$BR.$BR.ans_rule(1)],separation=>1).
+       EndTable();
+
 BEGIN_TEXT
 $BCENTER
 \{ image(insertGraph($graph),tex_size => 400, width=>400, height=>400) \}
 $ECENTER
 $BR
 $BR
-Fill in the blanks to describe the given piecewise graph. Hint: In each row, the first blank should be the function, the second blank should be the lower bound for x, and the third blank should be the upper bound for x.
-$BR
+Fill in the blanks to describe the given piecewise graph. (Note: Enter your answers with the function in the left blank and the `x` intervals for the second two blanks. Be sure the first line is the function with the smallest `x` values and the second line is the function with the largest `x` values.)
 $BR
 END_TEXT
 
-TEXT(
-begintable(3),
-row( '', ans_rule(20), EV2(" \{ans_rule(3)\} < x < \{ans_rule(3) \} ")),
-row(EV2("\(f(x) = \)"), '',''),
-row( '', ans_rule(20), EV2(" \{ans_rule(3)\} < x <  \{ans_rule(3) \} ")  ),
-endtable()
-);
+BEGIN_PGML
+[$piecewise]*
+END_PGML
+
 $slope1 = ($y2- $y1)/($x2 - $x1);
 $slope2 = ($y3- $y2)/($x3 - $x2);
 $ans1 = FEQ( EV2(" $slope1*(x - $x1)  + $y1 ") );
 $ans2 = FEQ( EV2(" $slope2*(x - $x2)  + $y2 ") );
 
+ANS(fun_cmp($ans1),fun_cmp($ans2),num_cmp([$x1,$x2,$x2,$x3]), );
 
-ANS(fun_cmp($ans1), num_cmp([$x1,$x2]),fun_cmp($ans2),num_cmp([$x2,$x3]), );
 
-ANS(@answers);
-#TEXT($END_ONE_COLUMN);
 ENDDOCUMENT();        # This should be the last executable line in the problem.
 

Contrib/CCCS/Trigonometry/08.3/CCD_CCCS_Openstax_AlgTrig_AT-1-001-AS_8_3_25.pg

@@ -42,7 +42,7 @@ Context()->functions->enable("sqrt");
 $n=random(0,7,1);
 
 # Array of 8 angles 
-@latexfraction=("11pi/6", "pi/3" ,"pi/4" ,"pi/6", "(2pi)/3" , "(3pi)/4", "(5pi)/6", "pi");
+@latexfraction=("(11pi)/6", "pi/3" ,"pi/4" ,"pi/6", "(2pi)/3" , "(3pi)/4", "(5pi)/6", "pi");
 
 # Selecting angle for PGML
 $a = $latexfraction[$n] ;