diff --git a/macros/PG.pl b/macros/PG.pl index a72b7ea6c6..e68ee81131 100644 --- a/macros/PG.pl +++ b/macros/PG.pl @@ -149,6 +149,8 @@ sub DOCUMENT { load_css(); load_js(); + + loadMacros('PGbasicmacros.pl', 'PGauxiliaryFunctions.pl'); } $main::displayMode = $PG->{displayMode}; diff --git a/tutorial/sample-problems/Algebra/AlgebraicFractionAnswer.pg b/tutorial/sample-problems/Algebra/AlgebraicFractionAnswer.pg index ccba8797e6..69eed61016 100644 --- a/tutorial/sample-problems/Algebra/AlgebraicFractionAnswer.pg +++ b/tutorial/sample-problems/Algebra/AlgebraicFractionAnswer.pg @@ -23,7 +23,7 @@ #: automatically loaded by the `PGML.pl` macro. DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'parserMultiAnswer.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'parserMultiAnswer.pl', 'PGcourse.pl'); #:% section = setup #: Define MathObject formulas `$num` and `$den` which are the correct numerator diff --git a/tutorial/sample-problems/Algebra/AnswerBlankInExponent.pg b/tutorial/sample-problems/Algebra/AnswerBlankInExponent.pg index 723cf0bda8..8ae1c78893 100644 --- a/tutorial/sample-problems/Algebra/AnswerBlankInExponent.pg +++ b/tutorial/sample-problems/Algebra/AnswerBlankInExponent.pg @@ -19,7 +19,7 @@ #:% section = preamble DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'PGcourse.pl'); #:% section = setup #: Set the context to allow only the variables `a` and `b` and choose a random diff --git a/tutorial/sample-problems/Algebra/AnswerUpToMultiple.pg b/tutorial/sample-problems/Algebra/AnswerUpToMultiple.pg index abb00d4437..0f5c782210 100644 --- a/tutorial/sample-problems/Algebra/AnswerUpToMultiple.pg +++ b/tutorial/sample-problems/Algebra/AnswerUpToMultiple.pg @@ -19,7 +19,7 @@ #:% section = preamble DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'PGcourse.pl'); #:% section = setup #: The answer checker uses a local context with an adaptive parameter to check diff --git a/tutorial/sample-problems/Algebra/DomainRange.pg b/tutorial/sample-problems/Algebra/DomainRange.pg index e6814ab60b..855cd9854a 100644 --- a/tutorial/sample-problems/Algebra/DomainRange.pg +++ b/tutorial/sample-problems/Algebra/DomainRange.pg @@ -20,7 +20,7 @@ #: The PODLINK('contextInequalities.pl') macro is used for inequality answers. DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'contextInequalities.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'contextInequalities.pl', 'PGcourse.pl'); #:% section = setup #: In addition to showing how to use the PODLINK('contextInequalities.pl') diff --git a/tutorial/sample-problems/Algebra/DynamicGraph.pg b/tutorial/sample-problems/Algebra/DynamicGraph.pg index 9245446dab..cd4dc652c0 100644 --- a/tutorial/sample-problems/Algebra/DynamicGraph.pg +++ b/tutorial/sample-problems/Algebra/DynamicGraph.pg @@ -20,7 +20,7 @@ #: The dynamic graph is generated with `PGtikz.pl`, so this is needed. DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'PGtikz.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'PGtikz.pl', 'PGcourse.pl'); #:% section = setup #: The code between `$graph->BEGIN_TIKZ` and `END_TIKZ` are TikZ commands. diff --git a/tutorial/sample-problems/Algebra/EquationDefiningFunction.pg b/tutorial/sample-problems/Algebra/EquationDefiningFunction.pg index b37d88f1ba..186bd0240f 100644 --- a/tutorial/sample-problems/Algebra/EquationDefiningFunction.pg +++ b/tutorial/sample-problems/Algebra/EquationDefiningFunction.pg @@ -21,7 +21,7 @@ #: The macro file PODLINK('parserAssignment.pl') needs to be included. DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'parserAssignment.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'parserAssignment.pl', 'PGcourse.pl'); #:% section = setup #: To allow assignments in the current context call `parser::Assignment->Allow`. diff --git a/tutorial/sample-problems/Algebra/EquationImplicitFunction.pg b/tutorial/sample-problems/Algebra/EquationImplicitFunction.pg index a2c0d3ba49..b2aa865ca5 100644 --- a/tutorial/sample-problems/Algebra/EquationImplicitFunction.pg +++ b/tutorial/sample-problems/Algebra/EquationImplicitFunction.pg @@ -20,10 +20,7 @@ #: The macro PODLINK('parserImplicitEquation.pl') allows the entry of equations. DOCUMENT(); -loadMacros( - 'PGstandard.pl', 'PGML.pl', - 'parserImplicitEquation.pl', 'PGcourse.pl' -); +loadMacros('PGML.pl', 'parserImplicitEquation.pl', 'PGcourse.pl'); #:% section = setup #: Some error messages are prevented by redefining them to be a blank string ' ' diff --git a/tutorial/sample-problems/Algebra/ExpandedPolynomial.pg b/tutorial/sample-problems/Algebra/ExpandedPolynomial.pg index 512c385b50..526f3f2aa6 100644 --- a/tutorial/sample-problems/Algebra/ExpandedPolynomial.pg +++ b/tutorial/sample-problems/Algebra/ExpandedPolynomial.pg @@ -22,10 +22,7 @@ #: Load the PODLINK('contextLimitedPolynomial.pl') macro. DOCUMENT(); -loadMacros( - 'PGstandard.pl', 'PGML.pl', - 'contextLimitedPolynomial.pl', 'PGcourse.pl' -); +loadMacros('PGML.pl', 'contextLimitedPolynomial.pl', 'PGcourse.pl'); #:% section = setup #: The PODLINK('contextLimitedPolynomial.pl') macro provides two contexts: diff --git a/tutorial/sample-problems/Algebra/FactoredPolynomial.pg b/tutorial/sample-problems/Algebra/FactoredPolynomial.pg index 49718f614f..100beea684 100644 --- a/tutorial/sample-problems/Algebra/FactoredPolynomial.pg +++ b/tutorial/sample-problems/Algebra/FactoredPolynomial.pg @@ -23,9 +23,8 @@ DOCUMENT(); loadMacros( - 'PGstandard.pl', 'PGML.pl', - 'contextPolynomialFactors.pl', 'contextLimitedPowers.pl', - 'PGcourse.pl' + 'PGML.pl', 'contextPolynomialFactors.pl', + 'contextLimitedPowers.pl', 'PGcourse.pl' ); #:% section = setup diff --git a/tutorial/sample-problems/Algebra/FractionAnswer.pg b/tutorial/sample-problems/Algebra/FractionAnswer.pg index 94c94aea3a..e34ffa0d5a 100644 --- a/tutorial/sample-problems/Algebra/FractionAnswer.pg +++ b/tutorial/sample-problems/Algebra/FractionAnswer.pg @@ -20,7 +20,7 @@ #: The macro `contextFraction.pl` must be loaded. DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'contextFraction.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'contextFraction.pl', 'PGcourse.pl'); #:% section = setup #: The PODLINK('contextFraction.pl') macro provides four contexts: diff --git a/tutorial/sample-problems/Algebra/FunctionDecomposition.pg b/tutorial/sample-problems/Algebra/FunctionDecomposition.pg index 2b1accffb3..c3297c9655 100644 --- a/tutorial/sample-problems/Algebra/FunctionDecomposition.pg +++ b/tutorial/sample-problems/Algebra/FunctionDecomposition.pg @@ -24,7 +24,7 @@ #: is allowed to be the identity function. DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'answerComposition.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'answerComposition.pl', 'PGcourse.pl'); #:% section = setup #: This problem asks the students for functions `y = f(u)` and `u = g(x)` such diff --git a/tutorial/sample-problems/Algebra/FunctionPlot.pg b/tutorial/sample-problems/Algebra/FunctionPlot.pg index 219c2cfc05..9930c93d6a 100644 --- a/tutorial/sample-problems/Algebra/FunctionPlot.pg +++ b/tutorial/sample-problems/Algebra/FunctionPlot.pg @@ -19,7 +19,7 @@ #:% section = preamble DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'plots.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'plots.pl', 'PGcourse.pl'); #:% section = setup #: For this problem, a plot of $y = ax^2$ for a random value of $a$ is diff --git a/tutorial/sample-problems/Algebra/GraphToolCircle.pg b/tutorial/sample-problems/Algebra/GraphToolCircle.pg index e7b1ba10a5..2a73ae1853 100644 --- a/tutorial/sample-problems/Algebra/GraphToolCircle.pg +++ b/tutorial/sample-problems/Algebra/GraphToolCircle.pg @@ -21,7 +21,7 @@ #: macro for this. DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'parserGraphTool.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'parserGraphTool.pl', 'PGcourse.pl'); #:% section = setup #: The variables `$h`, `$k` and `$r` randomly pick a center and radius of the diff --git a/tutorial/sample-problems/Algebra/GraphToolCubic.pg b/tutorial/sample-problems/Algebra/GraphToolCubic.pg index e46d42966c..476110f686 100644 --- a/tutorial/sample-problems/Algebra/GraphToolCubic.pg +++ b/tutorial/sample-problems/Algebra/GraphToolCubic.pg @@ -21,11 +21,8 @@ #: macro for this. DOCUMENT(); -loadMacros( - 'PGstandard.pl', 'PGML.pl', - 'parserGraphTool.pl', 'contextFraction.pl', - 'PGcourse.pl' -); +loadMacros('PGML.pl', 'parserGraphTool.pl', 'contextFraction.pl', + 'PGcourse.pl'); #:% section = setup #: A cubic is created with 3 random zeros and a random y-intercept. diff --git a/tutorial/sample-problems/Algebra/GraphToolCustomChecker.pg b/tutorial/sample-problems/Algebra/GraphToolCustomChecker.pg index 23050bbb24..0f861eedbc 100644 --- a/tutorial/sample-problems/Algebra/GraphToolCustomChecker.pg +++ b/tutorial/sample-problems/Algebra/GraphToolCustomChecker.pg @@ -21,7 +21,7 @@ #: checker. Load the PODLINK('parserGraphTool.pl') macro for this. DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'parserGraphTool.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'parserGraphTool.pl', 'PGcourse.pl'); #:% section = setup #: The variables `$h`, `$k` and `$r` randomly pick a center and radius of the diff --git a/tutorial/sample-problems/Algebra/GraphToolLine.pg b/tutorial/sample-problems/Algebra/GraphToolLine.pg index bf5154a39d..2d4d7481e7 100644 --- a/tutorial/sample-problems/Algebra/GraphToolLine.pg +++ b/tutorial/sample-problems/Algebra/GraphToolLine.pg @@ -21,7 +21,7 @@ #: macro for this. DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'parserGraphTool.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'parserGraphTool.pl', 'PGcourse.pl'); #:% section = setup #: A cubic is created with 3 random zeros and a random y-intercept. diff --git a/tutorial/sample-problems/Algebra/GraphToolNumberLine.pg b/tutorial/sample-problems/Algebra/GraphToolNumberLine.pg index d9b3d2177e..71e585e9f4 100644 --- a/tutorial/sample-problems/Algebra/GraphToolNumberLine.pg +++ b/tutorial/sample-problems/Algebra/GraphToolNumberLine.pg @@ -21,7 +21,7 @@ #: macro for this. DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'parserGraphTool.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'parserGraphTool.pl', 'PGcourse.pl'); #:% section = setup #: Two intervals are created with random endpoints. The first diff --git a/tutorial/sample-problems/Algebra/GraphToolPoints.pg b/tutorial/sample-problems/Algebra/GraphToolPoints.pg index e57505c86d..9a3ac8fdb7 100644 --- a/tutorial/sample-problems/Algebra/GraphToolPoints.pg +++ b/tutorial/sample-problems/Algebra/GraphToolPoints.pg @@ -22,7 +22,7 @@ #: macro for this. DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'parserGraphTool.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'parserGraphTool.pl', 'PGcourse.pl'); #:% section = setup #: Two points are created at random. diff --git a/tutorial/sample-problems/Algebra/InequalityAnswer.pg b/tutorial/sample-problems/Algebra/InequalityAnswer.pg index 1115aab912..5d6ad439dc 100644 --- a/tutorial/sample-problems/Algebra/InequalityAnswer.pg +++ b/tutorial/sample-problems/Algebra/InequalityAnswer.pg @@ -20,7 +20,7 @@ #: The PODLINK('contextInequalities.pl') macro must be loaded DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'contextInequalities.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'contextInequalities.pl', 'PGcourse.pl'); #:% section = setup #: Require students to use inequalities by using `Context('Inequalities-Only')`. diff --git a/tutorial/sample-problems/Algebra/LinearInequality.pg b/tutorial/sample-problems/Algebra/LinearInequality.pg index 4ce11b8d73..9f6ded509a 100644 --- a/tutorial/sample-problems/Algebra/LinearInequality.pg +++ b/tutorial/sample-problems/Algebra/LinearInequality.pg @@ -21,8 +21,7 @@ #: to use the LinearRelation object. DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'parserLinearRelation.pl', - 'PGcourse.pl'); +loadMacros('PGML.pl', 'parserLinearRelation.pl', 'PGcourse.pl'); #:% section = setup Context("LinearRelation"); diff --git a/tutorial/sample-problems/Algebra/Logarithms.pg b/tutorial/sample-problems/Algebra/Logarithms.pg index c94c7b311f..e9535d10bc 100644 --- a/tutorial/sample-problems/Algebra/Logarithms.pg +++ b/tutorial/sample-problems/Algebra/Logarithms.pg @@ -19,7 +19,7 @@ #:% section = preamble DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'PGcourse.pl'); #:% section = setup #: Add the variables `x`, `y`, and `z` to the context and set their limits to be diff --git a/tutorial/sample-problems/Algebra/NoSolution.pg b/tutorial/sample-problems/Algebra/NoSolution.pg index 1f170b7ee0..1a138845c2 100644 --- a/tutorial/sample-problems/Algebra/NoSolution.pg +++ b/tutorial/sample-problems/Algebra/NoSolution.pg @@ -20,10 +20,7 @@ #: macros. DOCUMENT(); -loadMacros( - 'PGstandard.pl', 'PGML.pl', - 'parserRadioMultiAnswer.pl', 'PGcourse.pl' -); +loadMacros('PGML.pl', 'parserRadioMultiAnswer.pl', 'PGcourse.pl'); #:% section = setup #: A `RadioMultiAnswer` produces a set of radio buttons for each of the given diff --git a/tutorial/sample-problems/Algebra/PointAnswers.pg b/tutorial/sample-problems/Algebra/PointAnswers.pg index c543ca72c3..db71c0bf46 100644 --- a/tutorial/sample-problems/Algebra/PointAnswers.pg +++ b/tutorial/sample-problems/Algebra/PointAnswers.pg @@ -20,7 +20,7 @@ #: Load PODLINK('contextLimitedPoint.pl') to prevent operations between points. DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'contextLimitedPoint.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'contextLimitedPoint.pl', 'PGcourse.pl'); #:% section = setup #: `Context('Point')` could be used instead, which would allow mathematical diff --git a/tutorial/sample-problems/Algebra/ScalingTranslating.pg b/tutorial/sample-problems/Algebra/ScalingTranslating.pg index 59d8d7b311..be9b22b055 100644 --- a/tutorial/sample-problems/Algebra/ScalingTranslating.pg +++ b/tutorial/sample-problems/Algebra/ScalingTranslating.pg @@ -21,7 +21,7 @@ #: the context. DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'parserFunction.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'parserFunction.pl', 'PGcourse.pl'); #:% section = setup #: The `parserFunction` method allows the addition of a named function to the diff --git a/tutorial/sample-problems/Algebra/SimpleFactoring.pg b/tutorial/sample-problems/Algebra/SimpleFactoring.pg index ee70cc3bff..d15dc77751 100644 --- a/tutorial/sample-problems/Algebra/SimpleFactoring.pg +++ b/tutorial/sample-problems/Algebra/SimpleFactoring.pg @@ -21,7 +21,7 @@ #:% section = preamble DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'PGcourse.pl'); #:% section = setup #: First, create two random roots and then create the factors. Note that calling #: `->reduce` will simplify `x-(-3)` to `x+3`. In addition, create the expanded diff --git a/tutorial/sample-problems/Algebra/SolutionForEquation.pg b/tutorial/sample-problems/Algebra/SolutionForEquation.pg index bbda387238..64788a0668 100644 --- a/tutorial/sample-problems/Algebra/SolutionForEquation.pg +++ b/tutorial/sample-problems/Algebra/SolutionForEquation.pg @@ -20,7 +20,7 @@ #: Load the macro PODLINK('parserSolutionFor.pl') for the `SolutionFor` method. DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'parserSolutionFor.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'parserSolutionFor.pl', 'PGcourse.pl'); #:% section = setup #: `SolutionFor(equation, point)` is used to define the MathObject answer. For diff --git a/tutorial/sample-problems/Algebra/StringOrOtherType.pg b/tutorial/sample-problems/Algebra/StringOrOtherType.pg index cfeb428dfb..3e713c3c49 100644 --- a/tutorial/sample-problems/Algebra/StringOrOtherType.pg +++ b/tutorial/sample-problems/Algebra/StringOrOtherType.pg @@ -20,7 +20,7 @@ #:% section = preamble DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'PGcourse.pl'); #:% section = setup #: There are several predefined strings, such as `NONE`, `DNE`, `INF`, and diff --git a/tutorial/sample-problems/Algebra/TableOfValues.pg b/tutorial/sample-problems/Algebra/TableOfValues.pg index eadaa2fb31..c179ffa21f 100644 --- a/tutorial/sample-problems/Algebra/TableOfValues.pg +++ b/tutorial/sample-problems/Algebra/TableOfValues.pg @@ -21,7 +21,7 @@ #: automatically loaded by the `PGML.pl` macro. DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'PGcourse.pl'); #:% section = setup #: Create the array `@answer` filled with values via a map. diff --git a/tutorial/sample-problems/Algebra/UnorderedAnswers.pg b/tutorial/sample-problems/Algebra/UnorderedAnswers.pg index 5fbdc96b32..21e0e36e13 100644 --- a/tutorial/sample-problems/Algebra/UnorderedAnswers.pg +++ b/tutorial/sample-problems/Algebra/UnorderedAnswers.pg @@ -20,7 +20,7 @@ #: The macro PODLINK('unorderedAnswer.pl') must be loaded. DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'unorderedAnswer.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'unorderedAnswer.pl', 'PGcourse.pl'); #:% section = setup #: The answers use the variables `x`, `y`, and `z`. The variable `x` is already diff --git a/tutorial/sample-problems/Arithmetic/UnitConversion.pg b/tutorial/sample-problems/Arithmetic/UnitConversion.pg index e2f319d313..04a8974ff1 100644 --- a/tutorial/sample-problems/Arithmetic/UnitConversion.pg +++ b/tutorial/sample-problems/Arithmetic/UnitConversion.pg @@ -23,7 +23,7 @@ #: We load `contextUnits.pl` in order to use the Units context. DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'contextUnits.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'contextUnits.pl', 'PGcourse.pl'); #:% section = setup #: The Units context is from the PODLINK('contextUnits.pl') macro. diff --git a/tutorial/sample-problems/Complex/ComplexOperations.pg b/tutorial/sample-problems/Complex/ComplexOperations.pg index 64f25162a5..29db027906 100644 --- a/tutorial/sample-problems/Complex/ComplexOperations.pg +++ b/tutorial/sample-problems/Complex/ComplexOperations.pg @@ -19,7 +19,7 @@ #:% section = preamble DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'PGcourse.pl'); #:% section = setup #: To use complex numbers, switch to the `Complex` context with diff --git a/tutorial/sample-problems/Complex/LimitedComplex.pg b/tutorial/sample-problems/Complex/LimitedComplex.pg index a68bcf02f3..0659676e20 100644 --- a/tutorial/sample-problems/Complex/LimitedComplex.pg +++ b/tutorial/sample-problems/Complex/LimitedComplex.pg @@ -21,10 +21,7 @@ #: PODLINK('contextLimitedComplex.pl') macro, so it must be loaded. DOCUMENT(); -loadMacros( - 'PGstandard.pl', 'PGML.pl', - 'contextLimitedComplex.pl', 'PGcourse.pl' -); +loadMacros('PGML.pl', 'contextLimitedComplex.pl', 'PGcourse.pl'); #:% section = setup #: Often when students are asked to perform operations with complex numbers, diff --git a/tutorial/sample-problems/Complex/OtherOperations.pg b/tutorial/sample-problems/Complex/OtherOperations.pg index 180de8da92..6f69936d42 100644 --- a/tutorial/sample-problems/Complex/OtherOperations.pg +++ b/tutorial/sample-problems/Complex/OtherOperations.pg @@ -20,7 +20,7 @@ #:% section = preamble DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'PGcourse.pl'); #:% section = setup #: To use complex numbers, switch to the `Complex` context with diff --git a/tutorial/sample-problems/DiffCalc/AnswerWithUnits.pg b/tutorial/sample-problems/DiffCalc/AnswerWithUnits.pg index 5e86170c5b..7df6ddfa6d 100644 --- a/tutorial/sample-problems/DiffCalc/AnswerWithUnits.pg +++ b/tutorial/sample-problems/DiffCalc/AnswerWithUnits.pg @@ -22,7 +22,7 @@ #: PODLINK('parserFormulaWithUnits.pl') macros. DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'contextUnits.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'contextUnits.pl', 'PGcourse.pl'); #:% section = setup #: First select the "Units" context, allow units for "length" and "time" in the diff --git a/tutorial/sample-problems/DiffCalc/DifferenceQuotient.pg b/tutorial/sample-problems/DiffCalc/DifferenceQuotient.pg index 9af9ff780a..3ee8759808 100644 --- a/tutorial/sample-problems/DiffCalc/DifferenceQuotient.pg +++ b/tutorial/sample-problems/DiffCalc/DifferenceQuotient.pg @@ -21,10 +21,7 @@ #: Include the macro file PODLINK('parserDifferenceQuotient.pl'). DOCUMENT(); -loadMacros( - 'PGstandard.pl', 'PGML.pl', - 'parserDifferenceQuotient.pl', 'PGcourse.pl' -); +loadMacros('PGML.pl', 'parserDifferenceQuotient.pl', 'PGcourse.pl'); #:% section = setup #: The `DifferenceQuotient` method takes a simplified function for its first diff --git a/tutorial/sample-problems/DiffCalc/DifferentiateFunction.pg b/tutorial/sample-problems/DiffCalc/DifferentiateFunction.pg index 502d1db2a3..b8c73a7994 100644 --- a/tutorial/sample-problems/DiffCalc/DifferentiateFunction.pg +++ b/tutorial/sample-problems/DiffCalc/DifferentiateFunction.pg @@ -19,7 +19,7 @@ #:% section = preamble DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'PGcourse.pl'); #:% section = setup #: The differentiation operator is `->D('x')`. diff --git a/tutorial/sample-problems/DiffCalc/LinearApprox.pg b/tutorial/sample-problems/DiffCalc/LinearApprox.pg index 8177d59be6..a07111fdbd 100644 --- a/tutorial/sample-problems/DiffCalc/LinearApprox.pg +++ b/tutorial/sample-problems/DiffCalc/LinearApprox.pg @@ -23,11 +23,7 @@ #: slope of the line instead of the equation of the line. DOCUMENT(); -loadMacros( - 'PGstandard.pl', 'PGML.pl', - 'answerHints.pl', 'parserAssignment.pl', - 'PGcourse.pl' -); +loadMacros('PGML.pl', 'answerHints.pl', 'parserAssignment.pl', 'PGcourse.pl'); #:% section = setup #: Allow assignments in the context by calling `parser::Assignment->Allow`. diff --git a/tutorial/sample-problems/DiffCalcMV/ContourPlot.pg b/tutorial/sample-problems/DiffCalcMV/ContourPlot.pg index dbb9346657..58a783f2bf 100644 --- a/tutorial/sample-problems/DiffCalcMV/ContourPlot.pg +++ b/tutorial/sample-problems/DiffCalcMV/ContourPlot.pg @@ -21,10 +21,7 @@ #: PODLINK('parserPopUp.pl') macro is used for a drop down menu answer. DOCUMENT(); -loadMacros( - 'PGstandard.pl', 'PGML.pl', 'parserPopUp.pl', 'PGtikz.pl', - 'PGcourse.pl' -); +loadMacros('PGML.pl', 'parserPopUp.pl', 'PGtikz.pl', 'PGcourse.pl'); $showPartialCorrectAnswers = 0; @@ -72,7 +69,7 @@ Determine if the following statement is true or false. [_]{$popup} This could be a contour plot for [`f(x, y) = x^2 - y^2`]. ->> [@ image($graph, width => 300, height => 300, tex_size => 450) @]* << +>>[!contour plot!]{$graph}{300}{300}{ { tex_size => 450 } }<< END_PGML #:% section = solution diff --git a/tutorial/sample-problems/DiffCalcMV/ImplicitPlane.pg b/tutorial/sample-problems/DiffCalcMV/ImplicitPlane.pg index ac44c9bebf..984e365574 100644 --- a/tutorial/sample-problems/DiffCalcMV/ImplicitPlane.pg +++ b/tutorial/sample-problems/DiffCalcMV/ImplicitPlane.pg @@ -25,9 +25,8 @@ DOCUMENT(); loadMacros( - 'PGstandard.pl', 'PGML.pl', - 'parserImplicitPlane.pl', 'parserVectorUtils.pl', - 'PGcourse.pl' + 'PGML.pl', 'parserImplicitPlane.pl', + 'parserVectorUtils.pl', 'PGcourse.pl' ); #:% section = setup diff --git a/tutorial/sample-problems/DiffCalcMV/VectorFieldPlot.pg b/tutorial/sample-problems/DiffCalcMV/VectorFieldPlot.pg index c0c9976c6b..e7a4626b92 100644 --- a/tutorial/sample-problems/DiffCalcMV/VectorFieldPlot.pg +++ b/tutorial/sample-problems/DiffCalcMV/VectorFieldPlot.pg @@ -20,7 +20,7 @@ #: The macro PODLINK('plots.pl') is used to create the plot. DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'plots.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'plots.pl', 'PGcourse.pl'); #:% section = setup #: This problem generates the vector field . First, create a diff --git a/tutorial/sample-problems/DiffEq/GeneralSolutionODE.pg b/tutorial/sample-problems/DiffEq/GeneralSolutionODE.pg index 23a812d89f..f7e34acec6 100644 --- a/tutorial/sample-problems/DiffEq/GeneralSolutionODE.pg +++ b/tutorial/sample-problems/DiffEq/GeneralSolutionODE.pg @@ -22,7 +22,7 @@ #: form `y = ...`. DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'parserAssignment.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'parserAssignment.pl', 'PGcourse.pl'); #:% section = setup #: Add the arbitrary constants `c1`, `c2`, and `c3` to the context as variables diff --git a/tutorial/sample-problems/DiffEq/HeavisideStep.pg b/tutorial/sample-problems/DiffEq/HeavisideStep.pg index fe69f522ea..62946325ec 100644 --- a/tutorial/sample-problems/DiffEq/HeavisideStep.pg +++ b/tutorial/sample-problems/DiffEq/HeavisideStep.pg @@ -20,7 +20,7 @@ #: Load PODLINK('parserFunction.pl') for adding a named function to the context. DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'parserFunction.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'parserFunction.pl', 'PGcourse.pl'); #:% section = setup #: Add the step function to the context with the name `step`. The function diff --git a/tutorial/sample-problems/DiffEq/PrimesInFormulas.pg b/tutorial/sample-problems/DiffEq/PrimesInFormulas.pg index 0f16d51e69..56b30c20f1 100644 --- a/tutorial/sample-problems/DiffEq/PrimesInFormulas.pg +++ b/tutorial/sample-problems/DiffEq/PrimesInFormulas.pg @@ -22,10 +22,7 @@ #: implicit. So the macro PODLINK('parserImplicitEquation.pl') is used. DOCUMENT(); -loadMacros( - 'PGstandard.pl', 'PGML.pl', - 'parserImplicitEquation.pl', 'PGcourse.pl' -); +loadMacros('PGML.pl', 'parserImplicitEquation.pl', 'PGcourse.pl'); #:% section = setup #: Switch to the `ImplicitEquation` context and then include the variables `y`, diff --git a/tutorial/sample-problems/Geometry/LineSegmentGraphTool.pg b/tutorial/sample-problems/Geometry/LineSegmentGraphTool.pg index 97670090ed..245dd038b7 100644 --- a/tutorial/sample-problems/Geometry/LineSegmentGraphTool.pg +++ b/tutorial/sample-problems/Geometry/LineSegmentGraphTool.pg @@ -21,7 +21,7 @@ #: Load the PODLINK('parserGraphTool.pl') macro to be able to use the GraphTool. DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'parserGraphTool.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'parserGraphTool.pl', 'PGcourse.pl'); #:% section = setup #: The graph tool is created with the correct answer diff --git a/tutorial/sample-problems/Geometry/QuadrilateralGraphTool.pg b/tutorial/sample-problems/Geometry/QuadrilateralGraphTool.pg index 09e2dc188b..2c2c8d52bc 100644 --- a/tutorial/sample-problems/Geometry/QuadrilateralGraphTool.pg +++ b/tutorial/sample-problems/Geometry/QuadrilateralGraphTool.pg @@ -20,7 +20,7 @@ #: Load the PODLINK('parserGraphTool.pl') macro to be able to use the GraphTool. DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'parserGraphTool.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'parserGraphTool.pl', 'PGcourse.pl'); #:% section = setup #: This finds four unique random points and sets up the GraphTool. The line diff --git a/tutorial/sample-problems/Geometry/TriangleGraphTool.pg b/tutorial/sample-problems/Geometry/TriangleGraphTool.pg index 9dabc89d29..ea9c83e7c3 100644 --- a/tutorial/sample-problems/Geometry/TriangleGraphTool.pg +++ b/tutorial/sample-problems/Geometry/TriangleGraphTool.pg @@ -20,7 +20,7 @@ #: Load the PODLINK('parserGraphTool.pl') macro to be able to use the GraphTool. DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'parserGraphTool.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'parserGraphTool.pl', 'PGcourse.pl'); #:% section = setup #: This finds three unique random points and sets up the GraphTool. The line diff --git a/tutorial/sample-problems/IntegralCalc/DoubleIntegral.pg b/tutorial/sample-problems/IntegralCalc/DoubleIntegral.pg index 6173c6dd33..7664e46e6f 100644 --- a/tutorial/sample-problems/IntegralCalc/DoubleIntegral.pg +++ b/tutorial/sample-problems/IntegralCalc/DoubleIntegral.pg @@ -21,7 +21,7 @@ #: PODLINK('parserMultiAnswer.pl') macro is used. DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'parserMultiAnswer.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'parserMultiAnswer.pl', 'PGcourse.pl'); #:% section = setup #: There are two separate cases: integrating with respect to `dx dy` (case 0) or diff --git a/tutorial/sample-problems/IntegralCalc/GraphShading.pg b/tutorial/sample-problems/IntegralCalc/GraphShading.pg index e0c4a0242a..c8a2c875d4 100644 --- a/tutorial/sample-problems/IntegralCalc/GraphShading.pg +++ b/tutorial/sample-problems/IntegralCalc/GraphShading.pg @@ -20,7 +20,7 @@ #: The macro PODLINK('PGtikz.pl') is used to create the plot. DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'PGtikz.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'PGtikz.pl', 'PGcourse.pl'); #:% section = setup #: A randomly transformed version of `sqrt(x)` is created as the function with a diff --git a/tutorial/sample-problems/IntegralCalc/GraphShadingPlot.pg b/tutorial/sample-problems/IntegralCalc/GraphShadingPlot.pg index b0d42277c6..64109851be 100644 --- a/tutorial/sample-problems/IntegralCalc/GraphShadingPlot.pg +++ b/tutorial/sample-problems/IntegralCalc/GraphShadingPlot.pg @@ -20,7 +20,7 @@ #: The macro PODLINK('plots.pl') is used to create the plot. DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'plots.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'plots.pl', 'PGcourse.pl'); #:% section = setup #: A randomly transformed version of `sqrt(x)` is created as the function with a diff --git a/tutorial/sample-problems/IntegralCalc/IndefiniteIntegrals.pg b/tutorial/sample-problems/IntegralCalc/IndefiniteIntegrals.pg index 9a158bf19b..a808722028 100644 --- a/tutorial/sample-problems/IntegralCalc/IndefiniteIntegrals.pg +++ b/tutorial/sample-problems/IntegralCalc/IndefiniteIntegrals.pg @@ -21,10 +21,7 @@ #: formula with a general constant like the antiderivative. DOCUMENT(); -loadMacros( - 'PGstandard.pl', 'PGML.pl', - 'parserFormulaUpToConstant.pl', 'PGcourse.pl' -); +loadMacros('PGML.pl', 'parserFormulaUpToConstant.pl', 'PGcourse.pl'); #:% section = setup #: The specific antiderivative is an ordinary formula. When the `cmp` method is diff --git a/tutorial/sample-problems/IntegralCalc/LimitsOfIntegration.pg b/tutorial/sample-problems/IntegralCalc/LimitsOfIntegration.pg index 30649550c1..d7cac5466d 100644 --- a/tutorial/sample-problems/IntegralCalc/LimitsOfIntegration.pg +++ b/tutorial/sample-problems/IntegralCalc/LimitsOfIntegration.pg @@ -22,10 +22,7 @@ #: macro is used to help guide students toward the correct answer. DOCUMENT(); -loadMacros( - 'PGstandard.pl', 'PGML.pl', 'niceTables.pl', 'answerHints.pl', - 'PGcourse.pl' -); +loadMacros('PGML.pl', 'niceTables.pl', 'answerHints.pl', 'PGcourse.pl'); #:% section = setup #: The variables `x`, `t`, `dx`, and `dt` are added to the context. Note that diff --git a/tutorial/sample-problems/IntegralCalc/RiemannSumPlot.pg b/tutorial/sample-problems/IntegralCalc/RiemannSumPlot.pg index 5e4b813333..cb44e43935 100644 --- a/tutorial/sample-problems/IntegralCalc/RiemannSumPlot.pg +++ b/tutorial/sample-problems/IntegralCalc/RiemannSumPlot.pg @@ -20,7 +20,7 @@ #: Make sure that PODLINK('plots.pl') is loaded. DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'plots.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'plots.pl', 'PGcourse.pl'); #:% section = setup #: For this problem, we make a Riemann Sum plot by plotting the function $y=x^3+3$ @@ -60,7 +60,7 @@ $plot->add_function( ); $dx = 0.5; -for $i (0 .. 7) { +for my $i (0 .. 7) { my $x0 = $i * $dx; my $x1 = $x0 + $dx; my $y = $f->eval(x => $x0 + $dx / 2); @@ -76,8 +76,6 @@ for $i (0 .. 7) { ); } -$image = image($plot); - #:% section = statement #: The `[! !]{}{}` is a PGML format for inserting an image. BEGIN_PGML @@ -85,7 +83,6 @@ The following is a graph of the function [`y=[$f]`] and the midpoint Riemann sum rectangles. >>[! Plot of y=x^2+3 and the Reimann sums !]{$plot}{500} << - END_PGML #:% section = solution diff --git a/tutorial/sample-problems/IntegralCalc/RiemannSums.pg b/tutorial/sample-problems/IntegralCalc/RiemannSums.pg index 08e4174653..2b6cb07de2 100644 --- a/tutorial/sample-problems/IntegralCalc/RiemannSums.pg +++ b/tutorial/sample-problems/IntegralCalc/RiemannSums.pg @@ -21,10 +21,7 @@ #: the PODLINK('PGtikz.pl') macro is used to produce the graphs. DOCUMENT(); -loadMacros( - 'PGstandard.pl', 'PGML.pl', 'parserPopUp.pl', 'PGtikz.pl', - 'PGcourse.pl' -); +loadMacros('PGML.pl', 'parserPopUp.pl', 'PGtikz.pl', 'PGcourse.pl'); #:% section = setup #: First generate a random constant for the function and the interval endpoints. diff --git a/tutorial/sample-problems/IntegralCalc/VolumeOfRevolution.pg b/tutorial/sample-problems/IntegralCalc/VolumeOfRevolution.pg index c6e0faea53..7615dd2811 100644 --- a/tutorial/sample-problems/IntegralCalc/VolumeOfRevolution.pg +++ b/tutorial/sample-problems/IntegralCalc/VolumeOfRevolution.pg @@ -24,7 +24,7 @@ #: bottom of the integral symbol. DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'answerHints.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'answerHints.pl', 'PGcourse.pl'); #:% section = setup #: First, the variables `x`, `dx`, `y`, and `dy` are added to the context. diff --git a/tutorial/sample-problems/LinearAlgebra/MatrixAnswer1.pg b/tutorial/sample-problems/LinearAlgebra/MatrixAnswer1.pg index d381b8a6fa..d910ecfce5 100644 --- a/tutorial/sample-problems/LinearAlgebra/MatrixAnswer1.pg +++ b/tutorial/sample-problems/LinearAlgebra/MatrixAnswer1.pg @@ -19,7 +19,7 @@ #:% section = preamble DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'PGcourse.pl'); #:% section = setup #: Call `Context('Matrix')` to switch to the `Matrix` context. MathObject diff --git a/tutorial/sample-problems/LinearAlgebra/MatrixAnswer2.pg b/tutorial/sample-problems/LinearAlgebra/MatrixAnswer2.pg index 1c90646e38..15a5de599b 100644 --- a/tutorial/sample-problems/LinearAlgebra/MatrixAnswer2.pg +++ b/tutorial/sample-problems/LinearAlgebra/MatrixAnswer2.pg @@ -20,7 +20,7 @@ #:% section = preamble DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'PGcourse.pl'); #:% section = setup #: Switch to the `Matrix` context by calling `Context('Matrix')`. diff --git a/tutorial/sample-problems/LinearAlgebra/MatrixCustomAnswerChecker.pg b/tutorial/sample-problems/LinearAlgebra/MatrixCustomAnswerChecker.pg index 0fe858b31e..892d36e4b1 100644 --- a/tutorial/sample-problems/LinearAlgebra/MatrixCustomAnswerChecker.pg +++ b/tutorial/sample-problems/LinearAlgebra/MatrixCustomAnswerChecker.pg @@ -21,7 +21,7 @@ #: PODLINK('parserMultiAnswer.pl') macro must be loaded. DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'parserMultiAnswer.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'parserMultiAnswer.pl', 'PGcourse.pl'); $showPartialCorrectAnswers = 0; diff --git a/tutorial/sample-problems/LinearAlgebra/MatrixOperations.pg b/tutorial/sample-problems/LinearAlgebra/MatrixOperations.pg index 6c575811a0..1f7c2917bf 100644 --- a/tutorial/sample-problems/LinearAlgebra/MatrixOperations.pg +++ b/tutorial/sample-problems/LinearAlgebra/MatrixOperations.pg @@ -20,10 +20,7 @@ #: This uses PODLINK('parserRadioMultiAnswer.pl'), so it needs to be loaded. DOCUMENT(); -loadMacros( - 'PGstandard.pl', 'PGML.pl', - 'parserRadioMultiAnswer.pl', 'PGcourse.pl' -); +loadMacros('PGML.pl', 'parserRadioMultiAnswer.pl', 'PGcourse.pl'); #:% section = setup #: First, the two matrices are defined. diff --git a/tutorial/sample-problems/LinearAlgebra/RowOperations.pg b/tutorial/sample-problems/LinearAlgebra/RowOperations.pg index ed6a5ae0f9..b336b82130 100644 --- a/tutorial/sample-problems/LinearAlgebra/RowOperations.pg +++ b/tutorial/sample-problems/LinearAlgebra/RowOperations.pg @@ -18,7 +18,7 @@ DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'PGcourse.pl'); #:% section = setup #: Construct a matrix with three distinct rows. Create a string `$op` of Tex diff --git a/tutorial/sample-problems/Misc/ChemicalReaction.pg b/tutorial/sample-problems/Misc/ChemicalReaction.pg index 19c8e14c3b..93ec39d38a 100644 --- a/tutorial/sample-problems/Misc/ChemicalReaction.pg +++ b/tutorial/sample-problems/Misc/ChemicalReaction.pg @@ -21,7 +21,7 @@ #: equations in a `Compute` call. DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'contextReaction.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'contextReaction.pl', 'PGcourse.pl'); #:% section = setup #: Create two arrays, `@reactants` and `@products`, and fill them with examples diff --git a/tutorial/sample-problems/Misc/DraggableProof.pg b/tutorial/sample-problems/Misc/DraggableProof.pg index 463451bdd8..aedef8337d 100644 --- a/tutorial/sample-problems/Misc/DraggableProof.pg +++ b/tutorial/sample-problems/Misc/DraggableProof.pg @@ -21,7 +21,7 @@ #: that the student can drag statements to and from. DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'draggableProof.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'draggableProof.pl', 'PGcourse.pl'); #:% section = setup #: The `DraggableProof` function takes an array reference of correct statements diff --git a/tutorial/sample-problems/Misc/DynamicGraphPolygon.pg b/tutorial/sample-problems/Misc/DynamicGraphPolygon.pg index 004e0328e5..34de9d0800 100644 --- a/tutorial/sample-problems/Misc/DynamicGraphPolygon.pg +++ b/tutorial/sample-problems/Misc/DynamicGraphPolygon.pg @@ -21,7 +21,7 @@ #: macro. DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'PGtikz.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'PGtikz.pl', 'PGcourse.pl'); #:% section = setup #: See PROBLINK('DynamicGraph.pg') for the basics of using TikZ. diff --git a/tutorial/sample-problems/Misc/EssayAnswer.pg b/tutorial/sample-problems/Misc/EssayAnswer.pg index 0e00701c65..d112e9faec 100644 --- a/tutorial/sample-problems/Misc/EssayAnswer.pg +++ b/tutorial/sample-problems/Misc/EssayAnswer.pg @@ -20,11 +20,7 @@ #: PODLINK('parserPopUp.pl') for multiple choice drop down menus. DOCUMENT(); -loadMacros( - 'PGstandard.pl', 'PGML.pl', - 'parserPopUp.pl', 'PGessaymacros.pl', - 'PGcourse.pl' -); +loadMacros('PGML.pl', 'parserPopUp.pl', 'PGessaymacros.pl', 'PGcourse.pl'); #:% section = setup $popup = PopUp( diff --git a/tutorial/sample-problems/Misc/FormulaAnswer.pg b/tutorial/sample-problems/Misc/FormulaAnswer.pg index 2db15bee57..2e54eb8d7d 100644 --- a/tutorial/sample-problems/Misc/FormulaAnswer.pg +++ b/tutorial/sample-problems/Misc/FormulaAnswer.pg @@ -19,7 +19,7 @@ #:% section = preamble DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl'); +loadMacros('PGML.pl', 'PGcourse.pl'); #:% section = setup #: Use `do { $b = random(2, 9) } until $b != $a` to generate distinct random diff --git a/tutorial/sample-problems/Misc/FormulaDomain.pg b/tutorial/sample-problems/Misc/FormulaDomain.pg index c000d6aae5..855b09f4cb 100644 --- a/tutorial/sample-problems/Misc/FormulaDomain.pg +++ b/tutorial/sample-problems/Misc/FormulaDomain.pg @@ -20,7 +20,7 @@ #:% section = preamble DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'PGcourse.pl'); #:% section = setup #: Restrict the domain of function evaluation using diff --git a/tutorial/sample-problems/Misc/FormulaTestPoints.pg b/tutorial/sample-problems/Misc/FormulaTestPoints.pg index 345437da4a..0cb7149fff 100644 --- a/tutorial/sample-problems/Misc/FormulaTestPoints.pg +++ b/tutorial/sample-problems/Misc/FormulaTestPoints.pg @@ -18,7 +18,7 @@ #:% section = preamble DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'PGcourse.pl'); #:% section = setup #: The first line sets the limits of evaluation for the variable `x` and for any diff --git a/tutorial/sample-problems/Misc/IframeEmbedding.pg b/tutorial/sample-problems/Misc/IframeEmbedding.pg index 474a185e91..bef3dccf16 100644 --- a/tutorial/sample-problems/Misc/IframeEmbedding.pg +++ b/tutorial/sample-problems/Misc/IframeEmbedding.pg @@ -18,7 +18,7 @@ #:% section = preamble DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'PGcourse.pl'); #:% section = setup #: Create a mode dependent variable `$slideshow` that displays a Google diff --git a/tutorial/sample-problems/Misc/ManyMultipleChoice.pg b/tutorial/sample-problems/Misc/ManyMultipleChoice.pg index ded0c6671d..0e84f128d7 100644 --- a/tutorial/sample-problems/Misc/ManyMultipleChoice.pg +++ b/tutorial/sample-problems/Misc/ManyMultipleChoice.pg @@ -21,10 +21,7 @@ #: PODLINK('PGgraders.pl') is used for incremental grading. DOCUMENT(); -loadMacros( - 'PGstandard.pl', 'PGML.pl', 'parserPopUp.pl', 'PGgraders.pl', - 'PGcourse.pl' -); +loadMacros('PGML.pl', 'parserPopUp.pl', 'PGgraders.pl', 'PGcourse.pl'); #:% section = setup #: Withhold feedback when answers are submitted by setting diff --git a/tutorial/sample-problems/Misc/Matching.pg b/tutorial/sample-problems/Misc/Matching.pg index 94c6a01e94..e754cc1cca 100644 --- a/tutorial/sample-problems/Misc/Matching.pg +++ b/tutorial/sample-problems/Misc/Matching.pg @@ -22,9 +22,9 @@ DOCUMENT(); loadMacros( - 'PGstandard.pl', 'PGML.pl', + 'PGanswermacros.pl', 'PGML.pl', 'PGchoicemacros.pl', 'PGgraders.pl', - 'unionTables.pl', 'PGcourse.pl' + 'PGcourse.pl' ); #:% section = setup @@ -104,12 +104,16 @@ $ml->choose_extra(2); $ml->makeLast('None of the above'); #:% section = statement -#: The `ColumnMatchTable` method is provided by the macro file -#: PODLINK('unionTables.pl'). +#: Insert the questions and answers into the problem using a +#: PODLINK('NiceTables.pl') layout table via its PGML syntax. See +#: PROBLINK('LayoutTables.pg') for more details on how that works. BEGIN_PGML Match each question with its answer. -[@ ColumnMatchTable($ml) @]*** +[# + [.[@ $ml->print_q @]*.] + [.[@ $ml->print_a @]*.] +#]*{ align => 'll', padding => [ 0, 2 ], valign => 'middle' } END_PGML #:% section = answer diff --git a/tutorial/sample-problems/Misc/MatchingAlt.pg b/tutorial/sample-problems/Misc/MatchingAlt.pg index b1a5692309..04045ccf7d 100644 --- a/tutorial/sample-problems/Misc/MatchingAlt.pg +++ b/tutorial/sample-problems/Misc/MatchingAlt.pg @@ -20,10 +20,7 @@ #: used for incremental grading. DOCUMENT(); -loadMacros( - 'PGstandard.pl', 'PGML.pl', 'parserPopUp.pl', 'PGgraders.pl', - 'PGcourse.pl' -); +loadMacros('PGML.pl', 'parserPopUp.pl', 'PGgraders.pl', 'PGcourse.pl'); #:% section = setup #: Withhold feedback when answers are submitted by setting diff --git a/tutorial/sample-problems/Misc/MatchingGraphs.pg b/tutorial/sample-problems/Misc/MatchingGraphs.pg index 8bbe0e8351..21639dabb4 100644 --- a/tutorial/sample-problems/Misc/MatchingGraphs.pg +++ b/tutorial/sample-problems/Misc/MatchingGraphs.pg @@ -23,10 +23,7 @@ #: is loaded by the `PGML.pl` macro. DOCUMENT(); -loadMacros( - 'PGstandard.pl', 'PGML.pl', 'PGtikz.pl', 'parserPopUp.pl', - 'PGcourse.pl' -); +loadMacros('PGML.pl', 'PGtikz.pl', 'parserPopUp.pl', 'PGcourse.pl'); #:% section = setup #: The array `@all_plots` contains the display form `f` of the function, diff --git a/tutorial/sample-problems/Misc/MultipleChoiceCheckbox.pg b/tutorial/sample-problems/Misc/MultipleChoiceCheckbox.pg index 8fe1167f08..0c8c4cb1c7 100644 --- a/tutorial/sample-problems/Misc/MultipleChoiceCheckbox.pg +++ b/tutorial/sample-problems/Misc/MultipleChoiceCheckbox.pg @@ -20,7 +20,7 @@ #: The PODLINK('parserCheckboxList.pl') is used for check box answers. DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'parserCheckboxList.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'parserCheckboxList.pl', 'PGcourse.pl'); #:% section = setup #: First, call `CheckboxList` to create a check box list answer object. The diff --git a/tutorial/sample-problems/Misc/MultipleChoicePopup.pg b/tutorial/sample-problems/Misc/MultipleChoicePopup.pg index 0669f27467..6906b401f9 100644 --- a/tutorial/sample-problems/Misc/MultipleChoicePopup.pg +++ b/tutorial/sample-problems/Misc/MultipleChoicePopup.pg @@ -21,7 +21,7 @@ #: The macro PODLINK('parserPopUp.pl') is used for pop up (or drop down) menus. DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'parserPopUp.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'parserPopUp.pl', 'PGcourse.pl'); #:% section = setup #: Call `PopUp` or `DropDown` to create a pop up answer object. The format is diff --git a/tutorial/sample-problems/Misc/MultipleChoiceRadio.pg b/tutorial/sample-problems/Misc/MultipleChoiceRadio.pg index 040aeca9e6..1e70a97bf3 100644 --- a/tutorial/sample-problems/Misc/MultipleChoiceRadio.pg +++ b/tutorial/sample-problems/Misc/MultipleChoiceRadio.pg @@ -20,7 +20,7 @@ #: The macro PODLINK('parserRadioButtons.pl') is used for radio button answers. DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'parserRadioButtons.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'parserRadioButtons.pl', 'PGcourse.pl'); #:% section = setup #: Call `RadioButtons` to create a radio button answer object. The format is diff --git a/tutorial/sample-problems/Misc/RandomPerson.pg b/tutorial/sample-problems/Misc/RandomPerson.pg index f20e04da63..7ae59cc155 100644 --- a/tutorial/sample-problems/Misc/RandomPerson.pg +++ b/tutorial/sample-problems/Misc/RandomPerson.pg @@ -18,7 +18,7 @@ #: We need to load `randomPerson.pl` macro DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'randomPerson.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'randomPerson.pl', 'PGcourse.pl'); #:% section = setup #: The macro PODLINK('randomPerson.pl') provides functionality to diff --git a/tutorial/sample-problems/Misc/Scaffolding.pg b/tutorial/sample-problems/Misc/Scaffolding.pg index 546a3d7cbb..c70729a281 100644 --- a/tutorial/sample-problems/Misc/Scaffolding.pg +++ b/tutorial/sample-problems/Misc/Scaffolding.pg @@ -19,7 +19,7 @@ #: Load the PODLINK('scaffold.pl') macro to use scaffolding. DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'scaffold.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'scaffold.pl', 'PGcourse.pl'); #:% section = statement #: Call `Scaffold::Begin()` to start scaffolding, and `Scaffold::End()` to end diff --git a/tutorial/sample-problems/Parametric/ParametricEquationAnswers.pg b/tutorial/sample-problems/Parametric/ParametricEquationAnswers.pg index c628d49e3c..877351ad50 100644 --- a/tutorial/sample-problems/Parametric/ParametricEquationAnswers.pg +++ b/tutorial/sample-problems/Parametric/ParametricEquationAnswers.pg @@ -22,7 +22,7 @@ #: equations and end points together. DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'parserMultiAnswer.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'parserMultiAnswer.pl', 'PGcourse.pl'); #:% section = setup #: A `MultiAnswer` is used to verify that the student answers satisfy the diff --git a/tutorial/sample-problems/Parametric/ParametricPlot.pg b/tutorial/sample-problems/Parametric/ParametricPlot.pg index 5faaa021db..9c6967cca2 100644 --- a/tutorial/sample-problems/Parametric/ParametricPlot.pg +++ b/tutorial/sample-problems/Parametric/ParametricPlot.pg @@ -20,7 +20,7 @@ #: The PODLINK('PGtikz.pl') macro is used to generate the graph. DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'PGtikz.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'PGtikz.pl', 'PGcourse.pl'); #:% section = setup #: The PODLINK('PGtikz.pl') macro is used to produce the curve. The basics of diff --git a/tutorial/sample-problems/Parametric/ParametricPlotAlt.pg b/tutorial/sample-problems/Parametric/ParametricPlotAlt.pg index 5950b50eb5..80f4871179 100644 --- a/tutorial/sample-problems/Parametric/ParametricPlotAlt.pg +++ b/tutorial/sample-problems/Parametric/ParametricPlotAlt.pg @@ -20,7 +20,7 @@ #: The PODLINK('plots.pl') macro is used to generate the graph. DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'plots.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'plots.pl', 'PGcourse.pl'); #:% section = setup #: This problem asks the student to find the equation of a tangent line to a diff --git a/tutorial/sample-problems/Parametric/PolarGraph.pg b/tutorial/sample-problems/Parametric/PolarGraph.pg index d55e62d386..43d33a843c 100644 --- a/tutorial/sample-problems/Parametric/PolarGraph.pg +++ b/tutorial/sample-problems/Parametric/PolarGraph.pg @@ -20,7 +20,7 @@ #: The PODLINK('PGtikz.pl') macro is used to generate the graph. DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'PGtikz.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'PGtikz.pl', 'PGcourse.pl'); #:% section = setup #: The polar curve is plotted parametrically. diff --git a/tutorial/sample-problems/Parametric/PolarGraphPlot.pg b/tutorial/sample-problems/Parametric/PolarGraphPlot.pg index a65b9777ea..2636e41fd6 100644 --- a/tutorial/sample-problems/Parametric/PolarGraphPlot.pg +++ b/tutorial/sample-problems/Parametric/PolarGraphPlot.pg @@ -20,7 +20,7 @@ #: The PODLINK('plots.pl') macro is used to generate the graph. DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'plots.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'plots.pl', 'PGcourse.pl'); #:% section = setup #: The plot is set up with the `Plot` object and the plotting window. diff --git a/tutorial/sample-problems/Parametric/SpaceCurveGraph.pg b/tutorial/sample-problems/Parametric/SpaceCurveGraph.pg index 2b669f9d0f..22edf3f5b0 100644 --- a/tutorial/sample-problems/Parametric/SpaceCurveGraph.pg +++ b/tutorial/sample-problems/Parametric/SpaceCurveGraph.pg @@ -20,7 +20,7 @@ #: The macro PODLINK('plotly3D.pl') is used to produce the graph. DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'plotly3D.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'plotly3D.pl', 'PGcourse.pl'); #:% section = setup #: A `plotly3D` graph is created with the `Graph3D` function. There are many diff --git a/tutorial/sample-problems/Parametric/Spacecurve.pg b/tutorial/sample-problems/Parametric/Spacecurve.pg index 28e50b9ba3..37c5658a96 100644 --- a/tutorial/sample-problems/Parametric/Spacecurve.pg +++ b/tutorial/sample-problems/Parametric/Spacecurve.pg @@ -18,7 +18,7 @@ #:% section = preamble DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'parserMultiAnswer.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'parserMultiAnswer.pl', 'PGcourse.pl'); $showPartialCorrectAnswers = 0; diff --git a/tutorial/sample-problems/Parametric/SurfaceGraph.pg b/tutorial/sample-problems/Parametric/SurfaceGraph.pg index 6da4bec911..b2a6310b8b 100644 --- a/tutorial/sample-problems/Parametric/SurfaceGraph.pg +++ b/tutorial/sample-problems/Parametric/SurfaceGraph.pg @@ -20,7 +20,7 @@ #: The macro PODLINK('plotly3D.pl') is used to produce the graph. DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'plotly3D.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'plotly3D.pl', 'PGcourse.pl'); #:% section = setup #: A `plotly3D` graph is created with the `Graph3D` function. There are many diff --git a/tutorial/sample-problems/Parametric/VectorParametricDerivative.pg b/tutorial/sample-problems/Parametric/VectorParametricDerivative.pg index 968c3900d8..d8bb526743 100644 --- a/tutorial/sample-problems/Parametric/VectorParametricDerivative.pg +++ b/tutorial/sample-problems/Parametric/VectorParametricDerivative.pg @@ -22,7 +22,7 @@ #: useful for vector problems. DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'parserVectorUtils.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'parserVectorUtils.pl', 'PGcourse.pl'); #:% section = setup #: The context flag `ijk => 0` disables the display of correct answer vectors diff --git a/tutorial/sample-problems/Parametric/VectorParametricFunction.pg b/tutorial/sample-problems/Parametric/VectorParametricFunction.pg index 53847356a9..b8a0a5f360 100644 --- a/tutorial/sample-problems/Parametric/VectorParametricFunction.pg +++ b/tutorial/sample-problems/Parametric/VectorParametricFunction.pg @@ -25,9 +25,8 @@ #: upon each other. DOCUMENT(); loadMacros( - 'PGstandard.pl', 'PGML.pl', - 'parserVectorUtils.pl', 'parserMultiAnswer.pl', - 'PGcourse.pl' + 'PGML.pl', 'parserVectorUtils.pl', + 'parserMultiAnswer.pl', 'PGcourse.pl' ); #:% section = setup diff --git a/tutorial/sample-problems/Parametric/VectorParametricLines.pg b/tutorial/sample-problems/Parametric/VectorParametricLines.pg index b83835cc27..31f7fd0231 100644 --- a/tutorial/sample-problems/Parametric/VectorParametricLines.pg +++ b/tutorial/sample-problems/Parametric/VectorParametricLines.pg @@ -24,9 +24,8 @@ DOCUMENT(); loadMacros( - 'PGstandard.pl', 'PGML.pl', - 'parserVectorUtils.pl', 'parserParametricLine.pl', - 'PGcourse.pl' + 'PGML.pl', 'parserVectorUtils.pl', + 'parserParametricLine.pl', 'PGcourse.pl' ); #:% section = setup diff --git a/tutorial/sample-problems/ProblemTechniques/AdaptiveParameters.pg b/tutorial/sample-problems/ProblemTechniques/AdaptiveParameters.pg index 65f7918e0e..94081332fb 100644 --- a/tutorial/sample-problems/ProblemTechniques/AdaptiveParameters.pg +++ b/tutorial/sample-problems/ProblemTechniques/AdaptiveParameters.pg @@ -18,7 +18,7 @@ #:% section = preamble DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'PGcourse.pl'); #:% section = setup #: This problem utilizes adaptive parameters in the custom answer checker. diff --git a/tutorial/sample-problems/ProblemTechniques/AnswerHints.pg b/tutorial/sample-problems/ProblemTechniques/AnswerHints.pg index 5a854944a0..23e4cff99a 100644 --- a/tutorial/sample-problems/ProblemTechniques/AnswerHints.pg +++ b/tutorial/sample-problems/ProblemTechniques/AnswerHints.pg @@ -18,7 +18,7 @@ #: Make sure the `answerHints.pl` macro is loaded. DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'answerHints.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'answerHints.pl', 'PGcourse.pl'); #:% section = setup #: To generate specific, customized answer hints for particular answers, use diff --git a/tutorial/sample-problems/ProblemTechniques/AnswerInExponent.pg b/tutorial/sample-problems/ProblemTechniques/AnswerInExponent.pg index 40888dba6e..8cfbcda6d8 100644 --- a/tutorial/sample-problems/ProblemTechniques/AnswerInExponent.pg +++ b/tutorial/sample-problems/ProblemTechniques/AnswerInExponent.pg @@ -20,7 +20,7 @@ #:% section = preamble DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'PGcourse.pl'); #:% section = setup #: The `Context()->variables->are` sets the variables for the context. diff --git a/tutorial/sample-problems/ProblemTechniques/AnswerIsSolutionToEquation.pg b/tutorial/sample-problems/ProblemTechniques/AnswerIsSolutionToEquation.pg index bc831909c5..f16f749c51 100644 --- a/tutorial/sample-problems/ProblemTechniques/AnswerIsSolutionToEquation.pg +++ b/tutorial/sample-problems/ProblemTechniques/AnswerIsSolutionToEquation.pg @@ -19,7 +19,7 @@ #: Include the macro PODLINK('parserSolutionFor.pl'). DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'parserSolutionFor.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'parserSolutionFor.pl', 'PGcourse.pl'); #:% section = setup #: The function `SolutionFor(equation, point, options)` takes an equation, a diff --git a/tutorial/sample-problems/ProblemTechniques/AnyAnswerMarkedCorrect.pg b/tutorial/sample-problems/ProblemTechniques/AnyAnswerMarkedCorrect.pg index 1a51b8faf4..07fbaed8d3 100644 --- a/tutorial/sample-problems/ProblemTechniques/AnyAnswerMarkedCorrect.pg +++ b/tutorial/sample-problems/ProblemTechniques/AnyAnswerMarkedCorrect.pg @@ -18,7 +18,7 @@ #:% section = preamble DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'PGcourse.pl'); #:% section = setup #: Wrap the random command with `Compute` to make `$a` a MathObject. diff --git a/tutorial/sample-problems/ProblemTechniques/AskSage.pg b/tutorial/sample-problems/ProblemTechniques/AskSage.pg index 43c2f6bf52..767480c541 100644 --- a/tutorial/sample-problems/ProblemTechniques/AskSage.pg +++ b/tutorial/sample-problems/ProblemTechniques/AskSage.pg @@ -17,7 +17,7 @@ #:% section = preamble DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'PGcourse.pl'); #:% section = setup #: Determine a random number of rows, columns, and rank for the random matrix diff --git a/tutorial/sample-problems/ProblemTechniques/CalculatingWithPoints.pg b/tutorial/sample-problems/ProblemTechniques/CalculatingWithPoints.pg index 6b636a5bba..0d2d2e862a 100644 --- a/tutorial/sample-problems/ProblemTechniques/CalculatingWithPoints.pg +++ b/tutorial/sample-problems/ProblemTechniques/CalculatingWithPoints.pg @@ -17,7 +17,7 @@ #:% section = preamble DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'PGcourse.pl'); #:% section = setup #: Switch to the `Point` context, and generate two points with random diff --git a/tutorial/sample-problems/ProblemTechniques/ComposingFunctions.pg b/tutorial/sample-problems/ProblemTechniques/ComposingFunctions.pg index 534eb12b27..3af06e4f72 100644 --- a/tutorial/sample-problems/ProblemTechniques/ComposingFunctions.pg +++ b/tutorial/sample-problems/ProblemTechniques/ComposingFunctions.pg @@ -18,7 +18,7 @@ #:% section = preamble #: Include the macro PODLINK('answerComposition.pl'). DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'answerComposition.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'answerComposition.pl', 'PGcourse.pl'); #:% section = setup Context()->variables->are(x => 'Real', y => 'Real', u => 'Real'); diff --git a/tutorial/sample-problems/ProblemTechniques/ConstantsInProblems.pg b/tutorial/sample-problems/ProblemTechniques/ConstantsInProblems.pg index 77b3d2b59d..2bf1650c95 100644 --- a/tutorial/sample-problems/ProblemTechniques/ConstantsInProblems.pg +++ b/tutorial/sample-problems/ProblemTechniques/ConstantsInProblems.pg @@ -17,7 +17,7 @@ #:% section = preamble DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'PGcourse.pl'); #:% section = setup #: Add the constant `k` with value `0.023431412` to the context. Choose a value diff --git a/tutorial/sample-problems/ProblemTechniques/CustomAnswerCheckers.pg b/tutorial/sample-problems/ProblemTechniques/CustomAnswerCheckers.pg index b20340aef2..08b116edaf 100644 --- a/tutorial/sample-problems/ProblemTechniques/CustomAnswerCheckers.pg +++ b/tutorial/sample-problems/ProblemTechniques/CustomAnswerCheckers.pg @@ -17,7 +17,7 @@ #:% section = preamble DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'PGcourse.pl'); #:% section = setup #: This problem asks the student to enter a value of `x` such that diff --git a/tutorial/sample-problems/ProblemTechniques/CustomAnswerListChecker.pg b/tutorial/sample-problems/ProblemTechniques/CustomAnswerListChecker.pg index 1f514e66c7..314d1d39cb 100644 --- a/tutorial/sample-problems/ProblemTechniques/CustomAnswerListChecker.pg +++ b/tutorial/sample-problems/ProblemTechniques/CustomAnswerListChecker.pg @@ -17,7 +17,7 @@ #:% section = preamble DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'PGcourse.pl'); #:% section = setup #: The answer to this problem will be a list of points, so select the 'Point' diff --git a/tutorial/sample-problems/ProblemTechniques/DataTables.pg b/tutorial/sample-problems/ProblemTechniques/DataTables.pg index 95056fe83f..100add789b 100644 --- a/tutorial/sample-problems/ProblemTechniques/DataTables.pg +++ b/tutorial/sample-problems/ProblemTechniques/DataTables.pg @@ -20,7 +20,7 @@ #: Note that the PODLINK('niceTables.pl') macro is automatically loaded by #: `PGML.pl`, so it is not necessary to load it explicitly. DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'PGcourse.pl'); #:% section = setup #: A `DataTable` is meant to display data in a table. It is not meant to be used diff --git a/tutorial/sample-problems/ProblemTechniques/DefiningFunctions.pg b/tutorial/sample-problems/ProblemTechniques/DefiningFunctions.pg index 10984b80e6..d7d78db9ca 100644 --- a/tutorial/sample-problems/ProblemTechniques/DefiningFunctions.pg +++ b/tutorial/sample-problems/ProblemTechniques/DefiningFunctions.pg @@ -20,7 +20,7 @@ #: function to the context. DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'parserFunction.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'parserFunction.pl', 'PGcourse.pl'); #:% section = setup #: Define a function `f(x,y)`. The actual function doesn't matter but shouldn't diff --git a/tutorial/sample-problems/ProblemTechniques/DifferentiatingFormulas.pg b/tutorial/sample-problems/ProblemTechniques/DifferentiatingFormulas.pg index 898621b725..c12ef7e332 100644 --- a/tutorial/sample-problems/ProblemTechniques/DifferentiatingFormulas.pg +++ b/tutorial/sample-problems/ProblemTechniques/DifferentiatingFormulas.pg @@ -17,7 +17,7 @@ #:% section = preamble DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'PGcourse.pl'); #:% section = setup #: The `Numeric` context includes the variable `x` by default, but the variable diff --git a/tutorial/sample-problems/ProblemTechniques/DigitsTolType.pg b/tutorial/sample-problems/ProblemTechniques/DigitsTolType.pg index 343d5c7756..76b13bef2a 100644 --- a/tutorial/sample-problems/ProblemTechniques/DigitsTolType.pg +++ b/tutorial/sample-problems/ProblemTechniques/DigitsTolType.pg @@ -19,7 +19,7 @@ #:% section = preamble DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'PGcourse.pl'); #:% section = setup #: Several context flags are set for this problem. The meaning of these flags diff --git a/tutorial/sample-problems/ProblemTechniques/DisableFunctions.pg b/tutorial/sample-problems/ProblemTechniques/DisableFunctions.pg index 54ef7f4be0..e413bd9d35 100644 --- a/tutorial/sample-problems/ProblemTechniques/DisableFunctions.pg +++ b/tutorial/sample-problems/ProblemTechniques/DisableFunctions.pg @@ -17,7 +17,7 @@ #:% section = preamble DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'PGcourse.pl'); #:% section = setup #: Specific operations in the context can be disabled with diff --git a/tutorial/sample-problems/ProblemTechniques/DraggableSubsets.pg b/tutorial/sample-problems/ProblemTechniques/DraggableSubsets.pg index 23cecac0d4..4f041b6462 100644 --- a/tutorial/sample-problems/ProblemTechniques/DraggableSubsets.pg +++ b/tutorial/sample-problems/ProblemTechniques/DraggableSubsets.pg @@ -18,7 +18,7 @@ #:% section = preamble #: The `draggableSubsets.pl` macro must be loaded. DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'draggableSubsets.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'draggableSubsets.pl', 'PGcourse.pl'); #:% section = setup #: The `DraggableSubsets` method creates a drag and drop object that when diff --git a/tutorial/sample-problems/ProblemTechniques/EquationEvaluators.pg b/tutorial/sample-problems/ProblemTechniques/EquationEvaluators.pg index d90f38465f..40d1634aa3 100644 --- a/tutorial/sample-problems/ProblemTechniques/EquationEvaluators.pg +++ b/tutorial/sample-problems/ProblemTechniques/EquationEvaluators.pg @@ -18,10 +18,7 @@ #:% section = preamble #: Include the macro PODLINK('parserImplicitEquation.pl'). DOCUMENT(); -loadMacros( - 'PGstandard.pl', 'PGML.pl', - 'parserImplicitEquation.pl', 'PGcourse.pl' -); +loadMacros('PGML.pl', 'parserImplicitEquation.pl', 'PGcourse.pl'); #:% section = setup #: Select the `ImplicitEquation` context, and define the equation for the diff --git a/tutorial/sample-problems/ProblemTechniques/EquationsDefiningFunctions.pg b/tutorial/sample-problems/ProblemTechniques/EquationsDefiningFunctions.pg index 1e48c0cfa0..0aafa420d4 100644 --- a/tutorial/sample-problems/ProblemTechniques/EquationsDefiningFunctions.pg +++ b/tutorial/sample-problems/ProblemTechniques/EquationsDefiningFunctions.pg @@ -21,7 +21,7 @@ #:% section = preamble #: Include the macro PODLINK('parserAssignment.pl'). DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'parserAssignment.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'parserAssignment.pl', 'PGcourse.pl'); #:% section = setup #: Set the variables in the context to be `x` and `y`, enable assignments in the diff --git a/tutorial/sample-problems/ProblemTechniques/ErrorMessageCustomization.pg b/tutorial/sample-problems/ProblemTechniques/ErrorMessageCustomization.pg index 22ba679d4a..813af97528 100644 --- a/tutorial/sample-problems/ProblemTechniques/ErrorMessageCustomization.pg +++ b/tutorial/sample-problems/ProblemTechniques/ErrorMessageCustomization.pg @@ -18,7 +18,7 @@ #:% section = preamble DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'PGcourse.pl'); #:% section = setup #: To change an error message the string in the `Context()->{error}{msg}` hash diff --git a/tutorial/sample-problems/ProblemTechniques/EvalVersusSubstitute.pg b/tutorial/sample-problems/ProblemTechniques/EvalVersusSubstitute.pg index 5045a080ee..d2a112a0a7 100644 --- a/tutorial/sample-problems/ProblemTechniques/EvalVersusSubstitute.pg +++ b/tutorial/sample-problems/ProblemTechniques/EvalVersusSubstitute.pg @@ -17,7 +17,7 @@ #:% section = preamble DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'PGcourse.pl'); #:% section = setup #: First, consider `$f = Compute('sqrt(3x + 1)')` defined in the default context diff --git a/tutorial/sample-problems/ProblemTechniques/ExtractingCoordinatesFromPoint.pg b/tutorial/sample-problems/ProblemTechniques/ExtractingCoordinatesFromPoint.pg index 7cf73cc343..20bfeae6c7 100644 --- a/tutorial/sample-problems/ProblemTechniques/ExtractingCoordinatesFromPoint.pg +++ b/tutorial/sample-problems/ProblemTechniques/ExtractingCoordinatesFromPoint.pg @@ -17,7 +17,7 @@ #:% section = preamble DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'PGcourse.pl'); #:% section = setup #: Defined two `Point`s with randomly generated coordinates. diff --git a/tutorial/sample-problems/ProblemTechniques/FactoringAndExpanding.pg b/tutorial/sample-problems/ProblemTechniques/FactoringAndExpanding.pg index f9869a719c..f43f19b6b4 100644 --- a/tutorial/sample-problems/ProblemTechniques/FactoringAndExpanding.pg +++ b/tutorial/sample-problems/ProblemTechniques/FactoringAndExpanding.pg @@ -22,9 +22,9 @@ #: PODLINK('contextLimitedPowers.pl') are needed for this example. DOCUMENT(); loadMacros( - 'PGstandard.pl', 'PGML.pl', - 'contextLimitedPolynomial.pl', 'contextPolynomialFactors.pl', - 'contextLimitedPowers.pl', 'PGcourse.pl' + 'PGML.pl', 'contextLimitedPolynomial.pl', + 'contextPolynomialFactors.pl', 'contextLimitedPowers.pl', + 'PGcourse.pl' ); #:% section = setup diff --git a/tutorial/sample-problems/ProblemTechniques/FormattingDecimals.pg b/tutorial/sample-problems/ProblemTechniques/FormattingDecimals.pg index 21b585e9a0..98d4b0f994 100644 --- a/tutorial/sample-problems/ProblemTechniques/FormattingDecimals.pg +++ b/tutorial/sample-problems/ProblemTechniques/FormattingDecimals.pg @@ -17,7 +17,7 @@ #:% section = preamble DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'PGcourse.pl'); #:% section = setup #: Since the domain of a logarithmic function is all positive real numbers, the @@ -31,9 +31,9 @@ loadMacros('PGstandard.pl', 'PGML.pl', 'PGcourse.pl'); #: `100.25` (this is because the binary representation of `100.255` actually #: rounds to `100.254999999999995` accurate to 15 decimal places). So this #: example now uses `Round` from PODLINK('PGauxiliaryFunctions.pl') (which is -#: loaded by PODLINK('PGstandard.pl')) for more reliable rounding. The format -#: for calling `Round` is `Round(number, number of decimal places)`. Be aware -#: that if further calculations are performed with a number that has been +#: loaded internally in the `DOCUMENT` call) for more reliable rounding. The +#: format for calling `Round` is `Round(number, number of decimal places)`. Be +#: aware that if further calculations are performed with a number that has been #: rounded, numerical error may still be an issue. #: #: So in short, do not use `sprintf` for rounding in problems as was previously diff --git a/tutorial/sample-problems/ProblemTechniques/FormulasToConstants.pg b/tutorial/sample-problems/ProblemTechniques/FormulasToConstants.pg index 69ec646be6..67940ea858 100644 --- a/tutorial/sample-problems/ProblemTechniques/FormulasToConstants.pg +++ b/tutorial/sample-problems/ProblemTechniques/FormulasToConstants.pg @@ -28,10 +28,7 @@ #: not needed. DOCUMENT(); -loadMacros( - 'PGstandard.pl', 'PGML.pl', - 'parserFormulaUpToConstant.pl', 'PGcourse.pl' -); +loadMacros('PGML.pl', 'parserFormulaUpToConstant.pl', 'PGcourse.pl'); #:% section = setup #: Define a particular antiderivative `$func` and all antiderivatives `$gfunc`. diff --git a/tutorial/sample-problems/ProblemTechniques/GraphsInTables.pg b/tutorial/sample-problems/ProblemTechniques/GraphsInTables.pg index 909dc2e972..07b1319fe5 100644 --- a/tutorial/sample-problems/ProblemTechniques/GraphsInTables.pg +++ b/tutorial/sample-problems/ProblemTechniques/GraphsInTables.pg @@ -24,9 +24,9 @@ DOCUMENT(); loadMacros( - 'PGstandard.pl', 'PGML.pl', - 'PGtikz.pl', 'parserPopUp.pl', - 'PGchoicemacros.pl', 'PGcourse.pl' + 'PGML.pl', 'PGtikz.pl', + 'parserPopUp.pl', 'PGchoicemacros.pl', + 'PGcourse.pl' ); #:% section = setup diff --git a/tutorial/sample-problems/ProblemTechniques/HtmlLinks.pg b/tutorial/sample-problems/ProblemTechniques/HtmlLinks.pg index 75d6de8a8e..6124ddf5c5 100644 --- a/tutorial/sample-problems/ProblemTechniques/HtmlLinks.pg +++ b/tutorial/sample-problems/ProblemTechniques/HtmlLinks.pg @@ -19,10 +19,7 @@ #: An example below uses units, so the PODLINK('parserNumberWithUnits.pl') is #: loaded. DOCUMENT(); -loadMacros( - 'PGstandard.pl', 'PGML.pl', - 'parserNumberWithUnits.pl', 'PGcourse.pl' -); +loadMacros('PGML.pl', 'parserNumberWithUnits.pl', 'PGcourse.pl'); #:% section = setup $ans = NumberWithUnits('4', 'ft'); diff --git a/tutorial/sample-problems/ProblemTechniques/Images.pg b/tutorial/sample-problems/ProblemTechniques/Images.pg index b8675fad1a..2a93f7ef96 100644 --- a/tutorial/sample-problems/ProblemTechniques/Images.pg +++ b/tutorial/sample-problems/ProblemTechniques/Images.pg @@ -22,10 +22,9 @@ DOCUMENT(); loadMacros( - 'PGstandard.pl', 'PGML.pl', - 'PGgraphmacros.pl', 'PGtikz.pl', - 'PGlateximage.pl', 'parserGraphTool.pl', - 'PGcourse.pl' + 'PGML.pl', 'PGgraphmacros.pl', + 'PGtikz.pl', 'PGlateximage.pl', + 'parserGraphTool.pl', 'PGcourse.pl' ); #:% section = setup diff --git a/tutorial/sample-problems/ProblemTechniques/InequalityEvaluators.pg b/tutorial/sample-problems/ProblemTechniques/InequalityEvaluators.pg index 9237bce8dd..e0abebf334 100644 --- a/tutorial/sample-problems/ProblemTechniques/InequalityEvaluators.pg +++ b/tutorial/sample-problems/ProblemTechniques/InequalityEvaluators.pg @@ -20,7 +20,7 @@ #:% section = preamble #: Load the PODLINK('contextInequalities.pl') macro. DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'contextInequalities.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'contextInequalities.pl', 'PGcourse.pl'); #:% section = setup #: Select the `Inequalities-Only` context. In this context, an inequality such diff --git a/tutorial/sample-problems/ProblemTechniques/IntervalEvaluators.pg b/tutorial/sample-problems/ProblemTechniques/IntervalEvaluators.pg index 67124b7a12..be43ec15a1 100644 --- a/tutorial/sample-problems/ProblemTechniques/IntervalEvaluators.pg +++ b/tutorial/sample-problems/ProblemTechniques/IntervalEvaluators.pg @@ -19,7 +19,7 @@ #:% section = preamble DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'PGcourse.pl'); #:% section = setup #: Select the `Interval` context. diff --git a/tutorial/sample-problems/ProblemTechniques/Knowls.pg b/tutorial/sample-problems/ProblemTechniques/Knowls.pg index 71565c869f..77b8708f3d 100644 --- a/tutorial/sample-problems/ProblemTechniques/Knowls.pg +++ b/tutorial/sample-problems/ProblemTechniques/Knowls.pg @@ -11,14 +11,13 @@ ## MO(1) ## KEYWORDS('interval') - #:% name = Knowls #:% type = [technique, snippet] #:% categories = [knowls] #:% section = preamble DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'PGcourse.pl'); #:% section = statement #: Knowls can be added to a text section of the problem file. diff --git a/tutorial/sample-problems/ProblemTechniques/LayoutTable.pg b/tutorial/sample-problems/ProblemTechniques/LayoutTable.pg index 7830309c1f..69d2b538fa 100644 --- a/tutorial/sample-problems/ProblemTechniques/LayoutTable.pg +++ b/tutorial/sample-problems/ProblemTechniques/LayoutTable.pg @@ -24,7 +24,7 @@ #: The PODLINK('PGtikz.pl') macro is also used in this example to demonstrate #: inserting a dynamically generated image into a table. DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'PGtikz.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'PGtikz.pl', 'PGcourse.pl'); #:% section = setup #: A `LayoutTable` is meant to be used for layout, i.e., to organize various diff --git a/tutorial/sample-problems/ProblemTechniques/Multianswer.pg b/tutorial/sample-problems/ProblemTechniques/Multianswer.pg index 89d770da17..4e3239a3e4 100644 --- a/tutorial/sample-problems/ProblemTechniques/Multianswer.pg +++ b/tutorial/sample-problems/ProblemTechniques/Multianswer.pg @@ -20,7 +20,7 @@ #: Load the PODLINK('parserMultiAnswer.pl') which provides the `MultiAnswer` #: method. DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'parserMultiAnswer.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'parserMultiAnswer.pl', 'PGcourse.pl'); #:% section = setup #: This problem is shown as an example of using PODLINK('parserMultiAnswer.pl'). diff --git a/tutorial/sample-problems/ProblemTechniques/NamedAnswerRules.pg b/tutorial/sample-problems/ProblemTechniques/NamedAnswerRules.pg index 16b56f8dfb..7a018af484 100644 --- a/tutorial/sample-problems/ProblemTechniques/NamedAnswerRules.pg +++ b/tutorial/sample-problems/ProblemTechniques/NamedAnswerRules.pg @@ -20,10 +20,7 @@ #: Load the PODLINK('parserLinearInequality.pl') macro so that a linear #: inequality answer can be used. DOCUMENT(); -loadMacros( - 'PGstandard.pl', 'PGML.pl', - 'parserLinearInequality.pl', 'PGcourse.pl' -); +loadMacros('PGML.pl', 'parserLinearInequality.pl', 'PGcourse.pl'); #:% section = setup #: Generate random variables `$a`, `$b`, and `$c` to use for coefficients in the diff --git a/tutorial/sample-problems/ProblemTechniques/NumericalTolerance.pg b/tutorial/sample-problems/ProblemTechniques/NumericalTolerance.pg index 7a3aa5ec92..457d8064f3 100644 --- a/tutorial/sample-problems/ProblemTechniques/NumericalTolerance.pg +++ b/tutorial/sample-problems/ProblemTechniques/NumericalTolerance.pg @@ -18,7 +18,7 @@ #:% section = preamble DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'PGcourse.pl'); #:% section = setup #: This shows three different ways of setting the `toltype` and `tolerance` of diff --git a/tutorial/sample-problems/ProblemTechniques/OtherVariables.pg b/tutorial/sample-problems/ProblemTechniques/OtherVariables.pg index 7c2b5a39f1..94fe831618 100644 --- a/tutorial/sample-problems/ProblemTechniques/OtherVariables.pg +++ b/tutorial/sample-problems/ProblemTechniques/OtherVariables.pg @@ -18,7 +18,7 @@ #:% section = preamble DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'PGcourse.pl'); #:% section = setup #: Typically the variables for the answers in the problem are set at the diff --git a/tutorial/sample-problems/ProblemTechniques/Percent.pg b/tutorial/sample-problems/ProblemTechniques/Percent.pg index 9a1edc54ce..0ae3516a1a 100644 --- a/tutorial/sample-problems/ProblemTechniques/Percent.pg +++ b/tutorial/sample-problems/ProblemTechniques/Percent.pg @@ -18,7 +18,7 @@ #:% section = preamble #: The PODLINK('contextPercent.pl') macro must be loaded. DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'contextPercent.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'contextPercent.pl', 'PGcourse.pl'); #:% section = setup #: Select the `Percent` context, generate a random percentage, and `Compute` the diff --git a/tutorial/sample-problems/ProblemTechniques/RandomFunction.pg b/tutorial/sample-problems/ProblemTechniques/RandomFunction.pg index 1f114807d0..98d0116f68 100644 --- a/tutorial/sample-problems/ProblemTechniques/RandomFunction.pg +++ b/tutorial/sample-problems/ProblemTechniques/RandomFunction.pg @@ -17,7 +17,7 @@ #:% section = preamble DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'PGcourse.pl'); #:% section = setup #: First, generate the random numbers needed as well as an array of functions diff --git a/tutorial/sample-problems/ProblemTechniques/RestrictAnswerToFraction.pg b/tutorial/sample-problems/ProblemTechniques/RestrictAnswerToFraction.pg index 6288348a3e..890ea1a526 100644 --- a/tutorial/sample-problems/ProblemTechniques/RestrictAnswerToFraction.pg +++ b/tutorial/sample-problems/ProblemTechniques/RestrictAnswerToFraction.pg @@ -22,7 +22,7 @@ #: provides. DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'contextFraction.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'contextFraction.pl', 'PGcourse.pl'); #:% section = setup #: The `Fractions-NoDecimals` context is selected which requires that answers diff --git a/tutorial/sample-problems/ProblemTechniques/RestrictingFunctions.pg b/tutorial/sample-problems/ProblemTechniques/RestrictingFunctions.pg index 4d5c373acf..d5669ebe8e 100644 --- a/tutorial/sample-problems/ProblemTechniques/RestrictingFunctions.pg +++ b/tutorial/sample-problems/ProblemTechniques/RestrictingFunctions.pg @@ -20,7 +20,7 @@ #:% section = preamble DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'PGcourse.pl'); #:% section = setup #: Pass the `showTypeWarnings => 0` option to the `cmp` method to turn off type diff --git a/tutorial/sample-problems/ProblemTechniques/SimplePopUp.pg b/tutorial/sample-problems/ProblemTechniques/SimplePopUp.pg index 9f1b69317b..cae6e48c3c 100644 --- a/tutorial/sample-problems/ProblemTechniques/SimplePopUp.pg +++ b/tutorial/sample-problems/ProblemTechniques/SimplePopUp.pg @@ -19,7 +19,7 @@ #: Load PODLINK('parserPopUp.pl') for pop up (or drop down) menu answers. DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'parserPopUp.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'parserPopUp.pl', 'PGcourse.pl'); #:% section = setup #: This shows a number of ways to use either `PopUp` (the legacy version) or diff --git a/tutorial/sample-problems/ProblemTechniques/StaticImages.pg b/tutorial/sample-problems/ProblemTechniques/StaticImages.pg index f0572ff0ed..292f8a13b7 100644 --- a/tutorial/sample-problems/ProblemTechniques/StaticImages.pg +++ b/tutorial/sample-problems/ProblemTechniques/StaticImages.pg @@ -17,7 +17,7 @@ #:% section = preamble DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'PGcourse.pl'); #:% section = statement #: Use the `PGML` image syntax to include static images. For accessibility you diff --git a/tutorial/sample-problems/ProblemTechniques/StringsInContext.pg b/tutorial/sample-problems/ProblemTechniques/StringsInContext.pg index a325b9956c..342d96d78c 100644 --- a/tutorial/sample-problems/ProblemTechniques/StringsInContext.pg +++ b/tutorial/sample-problems/ProblemTechniques/StringsInContext.pg @@ -19,7 +19,7 @@ #:% section = preamble DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'PGcourse.pl'); #:% section = setup #: Note that this example is only here to demonstrate how to add strings to a diff --git a/tutorial/sample-problems/ProblemTechniques/TikZImages.pg b/tutorial/sample-problems/ProblemTechniques/TikZImages.pg index c0150c3d35..977b1e2d80 100644 --- a/tutorial/sample-problems/ProblemTechniques/TikZImages.pg +++ b/tutorial/sample-problems/ProblemTechniques/TikZImages.pg @@ -20,7 +20,7 @@ #: PODLINK('PGtikz.pl') is used to generate the graph, DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'PGtikz.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'PGtikz.pl', 'PGcourse.pl'); #:% section = setup #: The `createTikZImage` function creates an image to be built using TikZ. diff --git a/tutorial/sample-problems/ProblemTechniques/WeightedGrader.pg b/tutorial/sample-problems/ProblemTechniques/WeightedGrader.pg index 07a687a473..2de0b6710a 100644 --- a/tutorial/sample-problems/ProblemTechniques/WeightedGrader.pg +++ b/tutorial/sample-problems/ProblemTechniques/WeightedGrader.pg @@ -19,7 +19,7 @@ #:% section = preamble DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'PGcourse.pl'); #:% section = setup diff --git a/tutorial/sample-problems/README.md b/tutorial/sample-problems/README.md index 3d2cbd2ed7..43789fe31e 100644 --- a/tutorial/sample-problems/README.md +++ b/tutorial/sample-problems/README.md @@ -9,21 +9,21 @@ not exist in the OPL, so were generated to make runnable PG problems. ## Metadata for a Sample Problem All metadata and documentation are embedded in a problem within comments that -start with `#:%` or `#:`. Metadata for a problem can appear anywhere but -the standard location is just above the `DOCUMENT();` command. The following +start with `#:%` or `#:`. Metadata for a problem can appear anywhere but +the standard location is just above the `DOCUMENT();` command. The following metadata is currently supported. - **name**: the name of the problem as will appear in the documentation listings. - **type**: the type of the problem can be one or more of the following - - _sample_: a sample problem that would appear in some course. - - _technique_: a problem from the _Problem Techniques_ on the wiki which may - demonstrate something of interest, but may not be relevant as a sample problem. - - _snippet_: part of a problem that is useful if embedded in another problem. + - _sample_: a sample problem that would appear in some course. + - _technique_: a problem from the _Problem Techniques_ on the wiki which may + demonstrate something of interest, but may not be relevant as a sample problem. + - _snippet_: part of a problem that is useful if embedded in another problem. -- **subject**: A subject area that a sample problem belongs to. This may be more -than one. +- **subject**: A subject area that a sample problem belongs to. This may be more + than one. - **see_also**: A listing of other problems (by the filename) that will appear -in the documentation as a reference. + in the documentation as a reference. - **category**: A listing of any categories that the problem would belong to. In many of these, if more than one is desired, place the list in brackets [ ]. @@ -51,7 +51,7 @@ comments in the PGML files. The format for these have the form #: This is the documentation comments for the preamble DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'PGcourse.pl'); #:% section = setup #: We use `do { $b = random(2,9,1); } until ( $b != $a );` to generate distinct @@ -76,25 +76,25 @@ All lines following the documentation lines are considered code until the next ` The documentation is generated with the `parse-problem-doc.pl` script in the `bin` directory of pg. There are the following options (and many are required): -- `problem-dir` or `d`: The directory where the sample problems are. This defaults to -`PG_ROOT/tutorial/sample-problems` if not passed in. +- `problem-dir` or `d`: The directory where the sample problems are. This defaults to + `PG_ROOT/tutorial/sample-problems` if not passed in. - `out-dir` or `o`: The directory where the resulting documentation files (HTML) -will be located. -- `pod-base-url` or `p`: The URL where the POD is located. This is needed to -correctly link POD from the sample problems. -- `sample-problem-base-url` or `s`: The URL of the directory for `out-dir`. This is needed -for correct linking. + will be located. +- `pod-base-url` or `p`: The URL where the POD is located. This is needed to + correctly link POD from the sample problems. +- `sample-problem-base-url` or `s`: The URL of the directory for `out-dir`. This is needed + for correct linking. - `verbose` or `v`: verbose mode. After running, the following is created - the indexes `categories.html`, `techniques.html`, `macros.html` and `subjects.html` which -produce four different ways of categorizing the problems. + produce four different ways of categorizing the problems. - For each sample problem, the problem will be parsed and - - an html file with the documented PG file - - a pg file with the documentation removed. There is a link to this in the html file. + - an html file with the documented PG file + - a pg file with the documentation removed. There is a link to this in the html file. The script `parse-problem-doc.pl` parses each pg file and uses the `problem-template.mt` template file to generate the -html. This template is processed using the `Mojo::Template` Perl module. See the +html. This template is processed using the `Mojo::Template` Perl module. See the [Mojo::Template documentation](https://docs.mojolicious.org/Mojo/Template) for more information. diff --git a/tutorial/sample-problems/Sequences/AnswerOrderedList.pg b/tutorial/sample-problems/Sequences/AnswerOrderedList.pg index 2e4bfe69a2..2599dca870 100644 --- a/tutorial/sample-problems/Sequences/AnswerOrderedList.pg +++ b/tutorial/sample-problems/Sequences/AnswerOrderedList.pg @@ -19,7 +19,7 @@ #:% section = preamble DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'PGcourse.pl'); #:% section = setup #: Create an array `@seq` with the first two elements of the sequence that will diff --git a/tutorial/sample-problems/Sequences/ExplicitSequence.pg b/tutorial/sample-problems/Sequences/ExplicitSequence.pg index 2d18161cef..cd8b149bf4 100644 --- a/tutorial/sample-problems/Sequences/ExplicitSequence.pg +++ b/tutorial/sample-problems/Sequences/ExplicitSequence.pg @@ -20,7 +20,7 @@ #:% section = preamble DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'PGcourse.pl'); #:% section = setup #: The answer is a formula involving factorials that are only defined for diff --git a/tutorial/sample-problems/Sequences/RecursiveSequence.pg b/tutorial/sample-problems/Sequences/RecursiveSequence.pg index c967ab954e..6192340f15 100644 --- a/tutorial/sample-problems/Sequences/RecursiveSequence.pg +++ b/tutorial/sample-problems/Sequences/RecursiveSequence.pg @@ -22,7 +22,7 @@ #: done using PODLINK('parserFunction.pl'). DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'parserFunction.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'parserFunction.pl', 'PGcourse.pl'); #:% section = setup #: Define a new named function `f` as something the student is unlikely to diff --git a/tutorial/sample-problems/Sequences/SeriesTest.pg b/tutorial/sample-problems/Sequences/SeriesTest.pg index 575e9bdc5f..746c35f433 100644 --- a/tutorial/sample-problems/Sequences/SeriesTest.pg +++ b/tutorial/sample-problems/Sequences/SeriesTest.pg @@ -33,10 +33,9 @@ DOCUMENT(); loadMacros( - 'PGstandard.pl', 'PGML.pl', - 'parserPopUp.pl', 'PGgraders.pl', - 'parserMultiAnswer.pl', 'parserRadioMultiAnswer.pl', - 'PGcourse.pl' + 'PGML.pl', 'parserPopUp.pl', + 'PGgraders.pl', 'parserMultiAnswer.pl', + 'parserRadioMultiAnswer.pl', 'PGcourse.pl' ); #:% section = setup diff --git a/tutorial/sample-problems/Snippets/CommentsForInstructors.pg b/tutorial/sample-problems/Snippets/CommentsForInstructors.pg index 64c4442053..73f133d38f 100644 --- a/tutorial/sample-problems/Snippets/CommentsForInstructors.pg +++ b/tutorial/sample-problems/Snippets/CommentsForInstructors.pg @@ -20,7 +20,7 @@ #:% section = preamble DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'PGcourse.pl'); #:% section = statement #: Call `COMMENT` to add a comment that is visible when the PG file is viewed in diff --git a/tutorial/sample-problems/Statistics/BarGraph.pg b/tutorial/sample-problems/Statistics/BarGraph.pg index 6d4a42eb60..e6f160ba24 100644 --- a/tutorial/sample-problems/Statistics/BarGraph.pg +++ b/tutorial/sample-problems/Statistics/BarGraph.pg @@ -20,11 +20,7 @@ #: Percent context. DOCUMENT(); -loadMacros( - "PGstandard.pl", "PGML.pl", - 'PGtikz.pl', 'contextPercent.pl', - "PGcourse.pl" -); +loadMacros('PGML.pl', 'PGtikz.pl', 'contextPercent.pl', 'PGcourse.pl'); #:% section = setup #: The 'Percent' context allow students to enter percents. diff --git a/tutorial/sample-problems/Statistics/BarGraphStatPlot.pg b/tutorial/sample-problems/Statistics/BarGraphStatPlot.pg index 63a926b3c0..5ec4f21ed5 100644 --- a/tutorial/sample-problems/Statistics/BarGraphStatPlot.pg +++ b/tutorial/sample-problems/Statistics/BarGraphStatPlot.pg @@ -21,11 +21,8 @@ #: PODLINK('contextPercent.pl') to provide the Percent context. DOCUMENT(); -loadMacros( - 'PGstandard.pl', 'PGML.pl', - 'StatisticalPlots.pl', 'contextPercent.pl', - 'PGcourse.pl' -); +loadMacros('PGML.pl', 'StatisticalPlots.pl', 'contextPercent.pl', + 'PGcourse.pl'); #:% section = setup #: The 'Percent' context allow students to enter percents. diff --git a/tutorial/sample-problems/Statistics/BoxPlot.pg b/tutorial/sample-problems/Statistics/BoxPlot.pg index 0b8460b003..524362a3ac 100644 --- a/tutorial/sample-problems/Statistics/BoxPlot.pg +++ b/tutorial/sample-problems/Statistics/BoxPlot.pg @@ -21,9 +21,8 @@ DOCUMENT(); loadMacros( - 'PGstandard.pl', 'PGML.pl', - 'StatisticalPlots.pl', 'PGstatisticsmacros.pl', - 'PGcourse.pl' + 'PGML.pl', 'StatisticalPlots.pl', + 'PGstatisticsmacros.pl', 'PGcourse.pl' ); #:% section = setup diff --git a/tutorial/sample-problems/Statistics/DonutPlot.pg b/tutorial/sample-problems/Statistics/DonutPlot.pg index 00903ebcb9..997066ec78 100644 --- a/tutorial/sample-problems/Statistics/DonutPlot.pg +++ b/tutorial/sample-problems/Statistics/DonutPlot.pg @@ -21,7 +21,7 @@ #: A pie chart version of this is available at PROBLINK('PieChart.pg'). DOCUMENT(); -loadMacros("PGstandard.pl", 'PGML.pl', 'StatisticalPlots.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'StatisticalPlots.pl', 'PGcourse.pl'); #:% section = setup #: In this example, the size of each wedge in the donut plot is given as an diff --git a/tutorial/sample-problems/Statistics/Histogram.pg b/tutorial/sample-problems/Statistics/Histogram.pg index 07e0457571..75b8bd94af 100644 --- a/tutorial/sample-problems/Statistics/Histogram.pg +++ b/tutorial/sample-problems/Statistics/Histogram.pg @@ -22,9 +22,8 @@ DOCUMENT(); loadMacros( - "PGstandard.pl", "PGML.pl", - 'StatisticalPlots.pl', 'PGstatisticsmacros.pl', - "PGcourse.pl" + 'PGML.pl', 'StatisticalPlots.pl', + 'PGstatisticsmacros.pl', 'PGcourse.pl' ); #:% section = setup diff --git a/tutorial/sample-problems/Statistics/LinearRegression.pg b/tutorial/sample-problems/Statistics/LinearRegression.pg index 7e95e8f14e..a6f898def2 100644 --- a/tutorial/sample-problems/Statistics/LinearRegression.pg +++ b/tutorial/sample-problems/Statistics/LinearRegression.pg @@ -18,7 +18,7 @@ #: and `linear_regression` methods. DOCUMENT(); -loadMacros("PGstandard.pl", "PGML.pl", 'PGstatisticsmacros.pl', "PGcourse.pl"); +loadMacros('PGML.pl', 'PGstatisticsmacros.pl', 'PGcourse.pl'); #:% section = setup #: Generate random numbers, and then use the `sample_correlation` and diff --git a/tutorial/sample-problems/Statistics/MeanStdDev.pg b/tutorial/sample-problems/Statistics/MeanStdDev.pg index c824a271b4..8735fc2eae 100644 --- a/tutorial/sample-problems/Statistics/MeanStdDev.pg +++ b/tutorial/sample-problems/Statistics/MeanStdDev.pg @@ -18,7 +18,7 @@ #: `stats_sd`, and `stats_SX_SXX` methods. DOCUMENT(); -loadMacros("PGstandard.pl", "PGML.pl", 'PGstatisticsmacros.pl', "PGcourse.pl"); +loadMacros('PGML.pl', 'PGstatisticsmacros.pl', 'PGcourse.pl'); #:% section = setup #: Generate random numbers and then calculate the mean and standard deviation diff --git a/tutorial/sample-problems/Statistics/MultiBoxPlot.pg b/tutorial/sample-problems/Statistics/MultiBoxPlot.pg index 47bad79ad7..2d91dd88ca 100644 --- a/tutorial/sample-problems/Statistics/MultiBoxPlot.pg +++ b/tutorial/sample-problems/Statistics/MultiBoxPlot.pg @@ -19,7 +19,7 @@ #: convenience methods for creating Statistical plots. DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'StatisticalPlots.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'StatisticalPlots.pl', 'PGcourse.pl'); #:% section = setup #: To create a graph, start with a `StatPlot`. The `min` and `max` options in diff --git a/tutorial/sample-problems/Statistics/PieChart.pg b/tutorial/sample-problems/Statistics/PieChart.pg index 7c3e85e322..eecc0244ad 100644 --- a/tutorial/sample-problems/Statistics/PieChart.pg +++ b/tutorial/sample-problems/Statistics/PieChart.pg @@ -20,7 +20,7 @@ #: macro. A donut plot version of this is available at PROBLINK('DonutPlot.pg'). DOCUMENT(); -loadMacros("PGstandard.pl", 'PGML.pl', 'StatisticalPlots.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'StatisticalPlots.pl', 'PGcourse.pl'); #:% section = setup #: In this example, the size of each wedge in the pie chart is given as an diff --git a/tutorial/sample-problems/Statistics/ScatterPlot.pg b/tutorial/sample-problems/Statistics/ScatterPlot.pg index bce5bfaaa9..1c37ed6b62 100644 --- a/tutorial/sample-problems/Statistics/ScatterPlot.pg +++ b/tutorial/sample-problems/Statistics/ScatterPlot.pg @@ -23,11 +23,7 @@ #: PROBLINK('ScatterPlotStatPlot.pg'). DOCUMENT(); -loadMacros( - 'PGstandard.pl', 'PGML.pl', - 'plots.pl', 'PGstatisticsmacros.pl', - 'PGcourse.pl' -); +loadMacros('PGML.pl', 'plots.pl', 'PGstatisticsmacros.pl', 'PGcourse.pl'); #:% section = setup #: For this problem, we have a data set stored as an array of array diff --git a/tutorial/sample-problems/Statistics/ScatterPlotStatPlot.pg b/tutorial/sample-problems/Statistics/ScatterPlotStatPlot.pg index a245356500..8c04c8c920 100644 --- a/tutorial/sample-problems/Statistics/ScatterPlotStatPlot.pg +++ b/tutorial/sample-problems/Statistics/ScatterPlotStatPlot.pg @@ -23,9 +23,8 @@ DOCUMENT(); loadMacros( - 'PGstandard.pl', 'PGML.pl', - 'StatisticalPlots.pl', 'PGstatisticsmacros.pl', - 'PGcourse.pl' + 'PGML.pl', 'StatisticalPlots.pl', + 'PGstatisticsmacros.pl', 'PGcourse.pl' ); #:% section = setup diff --git a/tutorial/sample-problems/Trig/DisableFunctionsTrig.pg b/tutorial/sample-problems/Trig/DisableFunctionsTrig.pg index 9cbeb2d6fe..2131f1947c 100644 --- a/tutorial/sample-problems/Trig/DisableFunctionsTrig.pg +++ b/tutorial/sample-problems/Trig/DisableFunctionsTrig.pg @@ -21,7 +21,7 @@ #: context. DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'contextFraction.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'contextFraction.pl', 'PGcourse.pl'); #:% section = setup #: Select the `Fraction-NoDecimals` context which requires fractions as answers diff --git a/tutorial/sample-problems/Trig/DraggableIdentity.pg b/tutorial/sample-problems/Trig/DraggableIdentity.pg index 693aa92a5f..5fe8196278 100644 --- a/tutorial/sample-problems/Trig/DraggableIdentity.pg +++ b/tutorial/sample-problems/Trig/DraggableIdentity.pg @@ -21,7 +21,7 @@ #: that the student can drag statements to and from. DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'draggableProof.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'draggableProof.pl', 'PGcourse.pl'); #:% section = setup #: The `DraggableProof` function takes a reference to an array of correct diff --git a/tutorial/sample-problems/Trig/PeriodicAnswers.pg b/tutorial/sample-problems/Trig/PeriodicAnswers.pg index 469c28359c..2e725dfc56 100644 --- a/tutorial/sample-problems/Trig/PeriodicAnswers.pg +++ b/tutorial/sample-problems/Trig/PeriodicAnswers.pg @@ -19,7 +19,7 @@ #:% section = preamble DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'PGcourse.pl'); #:% section = setup #: This allows any answer of the form `pi / 2 + n pi` where `n` is a particular diff --git a/tutorial/sample-problems/Trig/ProvingTrigIdentities.pg b/tutorial/sample-problems/Trig/ProvingTrigIdentities.pg index 4b286ec4c4..234f067c2c 100644 --- a/tutorial/sample-problems/Trig/ProvingTrigIdentities.pg +++ b/tutorial/sample-problems/Trig/ProvingTrigIdentities.pg @@ -21,7 +21,7 @@ #: This is a scaffolded problem, so load PODLINK('scaffold.pl'). DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'scaffold.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'scaffold.pl', 'PGcourse.pl'); #:% section = setup #: The sine function is cleverly redefined so that when the student enters diff --git a/tutorial/sample-problems/Trig/SpecialTrigValues.pg b/tutorial/sample-problems/Trig/SpecialTrigValues.pg index a7c2bbd9ad..73ef3790d9 100644 --- a/tutorial/sample-problems/Trig/SpecialTrigValues.pg +++ b/tutorial/sample-problems/Trig/SpecialTrigValues.pg @@ -21,7 +21,7 @@ #: `specialAngle` methods. DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'specialTrigValues.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'specialTrigValues.pl', 'PGcourse.pl'); #:% section = setup #: The `random_coprime` function selects two random numbers that are coprime diff --git a/tutorial/sample-problems/Trig/TrigDegrees.pg b/tutorial/sample-problems/Trig/TrigDegrees.pg index 659fd6e300..bc7bf2b545 100644 --- a/tutorial/sample-problems/Trig/TrigDegrees.pg +++ b/tutorial/sample-problems/Trig/TrigDegrees.pg @@ -22,11 +22,8 @@ #: answer has units of degrees. DOCUMENT(); -loadMacros( - 'PGstandard.pl', 'PGML.pl', - 'contextTrigDegrees.pl', 'contextUnits.pl', - 'PGcourse.pl' -); +loadMacros('PGML.pl', 'contextTrigDegrees.pl', 'contextUnits.pl', + 'PGcourse.pl'); #:% section = setup #: Select the `TrigDegrees` context to which evaluates trig functions in diff --git a/tutorial/sample-problems/Trig/TrigIdentities.pg b/tutorial/sample-problems/Trig/TrigIdentities.pg index 24609c5eb0..da0024e417 100644 --- a/tutorial/sample-problems/Trig/TrigIdentities.pg +++ b/tutorial/sample-problems/Trig/TrigIdentities.pg @@ -19,7 +19,7 @@ #:% section = preamble DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'PGcourse.pl'); #:% section = setup #: To prevent the student from just entering the given expression, a custom diff --git a/tutorial/sample-problems/VectorCalc/CylindricalGraph3D.pg b/tutorial/sample-problems/VectorCalc/CylindricalGraph3D.pg index 31d7a2973e..f21e56c9fb 100644 --- a/tutorial/sample-problems/VectorCalc/CylindricalGraph3D.pg +++ b/tutorial/sample-problems/VectorCalc/CylindricalGraph3D.pg @@ -21,7 +21,7 @@ #: The dynamic graph is generated with PODLINK('plotly3D.pl'). DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'plotly3D.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'plotly3D.pl', 'PGcourse.pl'); #:% section = setup #: To add a plotly graph to a problem, first create a `Graph3D` object by diff --git a/tutorial/sample-problems/VectorCalc/DirectionField.pg b/tutorial/sample-problems/VectorCalc/DirectionField.pg index 9f329000e7..9e7ace940e 100644 --- a/tutorial/sample-problems/VectorCalc/DirectionField.pg +++ b/tutorial/sample-problems/VectorCalc/DirectionField.pg @@ -20,7 +20,7 @@ #:% section = preamble #: The macro PODLINK('PGtikz.pl') is used to produced the direction field graph. DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'PGtikz.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'PGtikz.pl', 'PGcourse.pl'); #:% section = setup #: A direction field is a vector field where the length of the vectors are diff --git a/tutorial/sample-problems/VectorCalc/GraphToolVectors.pg b/tutorial/sample-problems/VectorCalc/GraphToolVectors.pg index 3268fca3e0..51f532161d 100644 --- a/tutorial/sample-problems/VectorCalc/GraphToolVectors.pg +++ b/tutorial/sample-problems/VectorCalc/GraphToolVectors.pg @@ -20,7 +20,7 @@ #: Load the PODLINK('parserGraphTool.pl') macro to be able to use the GraphTool. DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'parserGraphTool.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'parserGraphTool.pl', 'PGcourse.pl'); #:% section = setup #: This problem asks the student to graph the random vector <$vx1, $vy1>. Set diff --git a/tutorial/sample-problems/VectorCalc/RectangularGraph3D.pg b/tutorial/sample-problems/VectorCalc/RectangularGraph3D.pg index 0b9e7415d4..f23a82cc8c 100644 --- a/tutorial/sample-problems/VectorCalc/RectangularGraph3D.pg +++ b/tutorial/sample-problems/VectorCalc/RectangularGraph3D.pg @@ -21,7 +21,7 @@ #: The dynamic graph is generated with PODLINK('plotly3D.pl'). DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'plotly3D.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'plotly3D.pl', 'PGcourse.pl'); #:% section = setup #: Generate the plot parametrically for the function `z = x^2 + y^2` with the diff --git a/tutorial/sample-problems/VectorCalc/VectorFieldGraph2D.pg b/tutorial/sample-problems/VectorCalc/VectorFieldGraph2D.pg index bbd1837968..1bff1305cd 100644 --- a/tutorial/sample-problems/VectorCalc/VectorFieldGraph2D.pg +++ b/tutorial/sample-problems/VectorCalc/VectorFieldGraph2D.pg @@ -20,7 +20,7 @@ #:% section = preamble #: The macro PODLINK('PGtikz.pl') is used to produced the vector field graph. DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'PGtikz.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'PGtikz.pl', 'PGcourse.pl'); #:% section = setup #: The graph of the vector field is created. The vector field is diff --git a/tutorial/sample-problems/VectorCalc/VectorFieldGraph3D/VectorFieldGraph3D1.pg b/tutorial/sample-problems/VectorCalc/VectorFieldGraph3D/VectorFieldGraph3D1.pg index 458c69a7f2..820ad78bc8 100644 --- a/tutorial/sample-problems/VectorCalc/VectorFieldGraph3D/VectorFieldGraph3D1.pg +++ b/tutorial/sample-problems/VectorCalc/VectorFieldGraph3D/VectorFieldGraph3D1.pg @@ -21,10 +21,7 @@ #: PODLINK('LiveGraphics3D.pl') macro is loaded by that macro and provides the #: `Live3Ddata` method. DOCUMENT(); -loadMacros( - 'PGstandard.pl', 'PGML.pl', - 'LiveGraphicsVectorField3D.pl', 'PGcourse.pl' -); +loadMacros('PGML.pl', 'LiveGraphicsVectorField3D.pl', 'PGcourse.pl'); #:% section = setup #: The `VectorField3D` method returns a string of plot data suitable for use diff --git a/tutorial/sample-problems/VectorCalc/VectorLineSegment1.pg b/tutorial/sample-problems/VectorCalc/VectorLineSegment1.pg index 859328293e..0cfc1448c1 100644 --- a/tutorial/sample-problems/VectorCalc/VectorLineSegment1.pg +++ b/tutorial/sample-problems/VectorCalc/VectorLineSegment1.pg @@ -26,9 +26,8 @@ #: interdependent. DOCUMENT(); loadMacros( - 'PGstandard.pl', 'PGML.pl', - 'parserParametricLine.pl', 'parserMultiAnswer.pl', - 'PGcourse.pl' + 'PGML.pl', 'parserParametricLine.pl', + 'parserMultiAnswer.pl', 'PGcourse.pl' ); #:% section = setup diff --git a/tutorial/sample-problems/VectorCalc/VectorLineSegment2.pg b/tutorial/sample-problems/VectorCalc/VectorLineSegment2.pg index 15a2d8330f..30e896c59c 100644 --- a/tutorial/sample-problems/VectorCalc/VectorLineSegment2.pg +++ b/tutorial/sample-problems/VectorCalc/VectorLineSegment2.pg @@ -23,7 +23,7 @@ #: The PODLINK('parserVectorUtils.pl') macro is loaded for the #: `non_zero_point3D` and `non_zero_vector3D` methods. DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'parserVectorUtils.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'parserVectorUtils.pl', 'PGcourse.pl'); #:% section = setup #: A random point is generated with the `non_zero_point3D` method, a random diff --git a/tutorial/sample-problems/VectorCalc/VectorOperations.pg b/tutorial/sample-problems/VectorCalc/VectorOperations.pg index c9aef2f6c1..8da0bfa74f 100644 --- a/tutorial/sample-problems/VectorCalc/VectorOperations.pg +++ b/tutorial/sample-problems/VectorCalc/VectorOperations.pg @@ -20,7 +20,7 @@ #: Load PODLINK('parserVectorUtils.pl') for the `non_zero_vector3D` method. DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'parserVectorUtils.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'parserVectorUtils.pl', 'PGcourse.pl'); #:% section = setup #: Use `non_zero_vector3D(low, high, increment)` to randomly generate two diff --git a/tutorial/sample-problems/VectorCalc/VectorParametricLine.pg b/tutorial/sample-problems/VectorCalc/VectorParametricLine.pg index 983b415116..43b4ce0be0 100644 --- a/tutorial/sample-problems/VectorCalc/VectorParametricLine.pg +++ b/tutorial/sample-problems/VectorCalc/VectorParametricLine.pg @@ -25,9 +25,8 @@ #: provides the `ParametricLine` function used for the answer. DOCUMENT(); loadMacros( - 'PGstandard.pl', 'PGML.pl', - 'parserVectorUtils.pl', 'parserParametricLine.pl', - 'PGcourse.pl' + 'PGML.pl', 'parserVectorUtils.pl', + 'parserParametricLine.pl', 'PGcourse.pl' ); #:% section = setup diff --git a/tutorial/sample-problems/VectorCalc/Vectors.pg b/tutorial/sample-problems/VectorCalc/Vectors.pg index 498022c208..e33c7eb2e0 100644 --- a/tutorial/sample-problems/VectorCalc/Vectors.pg +++ b/tutorial/sample-problems/VectorCalc/Vectors.pg @@ -18,7 +18,7 @@ #:% section = preamble DOCUMENT(); -loadMacros('PGstandard.pl', 'PGML.pl', 'PGcourse.pl'); +loadMacros('PGML.pl', 'PGcourse.pl'); #:% section = setup #: Select the `Vector` context to work with vectors.