From 7a5b0a5ac81664c924b6e03206b67158cac9e3f4 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Fri, 4 Sep 2026 21:33:22 -0500 Subject: [PATCH 1/2] Always load `PGbasicmacros.pl` and `PGauxiliaryFunctions.pl`. This is done at the end of the `DOCUMENT` method in `PG.pl`. This means that problems no longer need to load `PGstandard.pl`. The basic functionality that is needed is always there. This does NOT load `PGanswermacros.pl`. That is because that is entirely deprecated functionality. Problems that use it already load what is needed, and must continue to do so. Newly written problems should not use it. This could also load `customizeLaTeX.pl`, but I held off on that. That is an antiquated approach to customization of notation that the rest of PG never followed up on. --- macros/PG.pl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/macros/PG.pl b/macros/PG.pl index a72b7ea6c..e68ee8113 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}; From d0a8c60d887d6eb5e69eaa8e4a44a0fe1a5cffb9 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Wed, 16 Sep 2026 07:08:32 -0500 Subject: [PATCH 2/2] Remove `PGstandard.pl` from the `loadMacros` calls in most sample problems. There is one problem in which `PGstandard.pl` was replaced with `PGanswermacros.pl` for now. That is the problem `Misc/Matching.pg`. The problem was using `unionTables.pl` to layout the multiple choice questions and answers. That was replaced with a `niceTables.pl` layout table via its PGML syntax. However, it uses the `PGchoicemacros.pl` match list which is the one case that we still have not created a modern equivalent of. That needs the `str_cmp` method. --- .../Algebra/AlgebraicFractionAnswer.pg | 2 +- .../Algebra/AnswerBlankInExponent.pg | 2 +- .../Algebra/AnswerUpToMultiple.pg | 2 +- .../sample-problems/Algebra/DomainRange.pg | 2 +- .../sample-problems/Algebra/DynamicGraph.pg | 2 +- .../Algebra/EquationDefiningFunction.pg | 2 +- .../Algebra/EquationImplicitFunction.pg | 5 +-- .../Algebra/ExpandedPolynomial.pg | 5 +-- .../Algebra/FactoredPolynomial.pg | 5 +-- .../sample-problems/Algebra/FractionAnswer.pg | 2 +- .../Algebra/FunctionDecomposition.pg | 2 +- .../sample-problems/Algebra/FunctionPlot.pg | 2 +- .../Algebra/GraphToolCircle.pg | 2 +- .../sample-problems/Algebra/GraphToolCubic.pg | 7 +--- .../Algebra/GraphToolCustomChecker.pg | 2 +- .../sample-problems/Algebra/GraphToolLine.pg | 2 +- .../Algebra/GraphToolNumberLine.pg | 2 +- .../Algebra/GraphToolPoints.pg | 2 +- .../Algebra/InequalityAnswer.pg | 2 +- .../Algebra/LinearInequality.pg | 3 +- .../sample-problems/Algebra/Logarithms.pg | 2 +- .../sample-problems/Algebra/NoSolution.pg | 5 +-- .../sample-problems/Algebra/PointAnswers.pg | 2 +- .../Algebra/ScalingTranslating.pg | 2 +- .../Algebra/SimpleFactoring.pg | 2 +- .../Algebra/SolutionForEquation.pg | 2 +- .../Algebra/StringOrOtherType.pg | 2 +- .../sample-problems/Algebra/TableOfValues.pg | 2 +- .../Algebra/UnorderedAnswers.pg | 2 +- .../Arithmetic/UnitConversion.pg | 2 +- .../Complex/ComplexOperations.pg | 2 +- .../sample-problems/Complex/LimitedComplex.pg | 5 +-- .../Complex/OtherOperations.pg | 2 +- .../DiffCalc/AnswerWithUnits.pg | 2 +- .../DiffCalc/DifferenceQuotient.pg | 5 +-- .../DiffCalc/DifferentiateFunction.pg | 2 +- .../sample-problems/DiffCalc/LinearApprox.pg | 6 +-- .../sample-problems/DiffCalcMV/ContourPlot.pg | 7 +--- .../DiffCalcMV/ImplicitPlane.pg | 5 +-- .../DiffCalcMV/VectorFieldPlot.pg | 2 +- .../DiffEq/GeneralSolutionODE.pg | 2 +- .../sample-problems/DiffEq/HeavisideStep.pg | 2 +- .../DiffEq/PrimesInFormulas.pg | 5 +-- .../Geometry/LineSegmentGraphTool.pg | 2 +- .../Geometry/QuadrilateralGraphTool.pg | 2 +- .../Geometry/TriangleGraphTool.pg | 2 +- .../IntegralCalc/DoubleIntegral.pg | 2 +- .../IntegralCalc/GraphShading.pg | 2 +- .../IntegralCalc/GraphShadingPlot.pg | 2 +- .../IntegralCalc/IndefiniteIntegrals.pg | 5 +-- .../IntegralCalc/LimitsOfIntegration.pg | 5 +-- .../IntegralCalc/RiemannSumPlot.pg | 7 +--- .../IntegralCalc/RiemannSums.pg | 5 +-- .../IntegralCalc/VolumeOfRevolution.pg | 2 +- .../LinearAlgebra/MatrixAnswer1.pg | 2 +- .../LinearAlgebra/MatrixAnswer2.pg | 2 +- .../MatrixCustomAnswerChecker.pg | 2 +- .../LinearAlgebra/MatrixOperations.pg | 5 +-- .../LinearAlgebra/RowOperations.pg | 2 +- .../sample-problems/Misc/ChemicalReaction.pg | 2 +- .../sample-problems/Misc/DraggableProof.pg | 2 +- .../Misc/DynamicGraphPolygon.pg | 2 +- tutorial/sample-problems/Misc/EssayAnswer.pg | 6 +-- .../sample-problems/Misc/FormulaAnswer.pg | 2 +- .../sample-problems/Misc/FormulaDomain.pg | 2 +- .../sample-problems/Misc/FormulaTestPoints.pg | 2 +- .../sample-problems/Misc/IframeEmbedding.pg | 2 +- .../Misc/ManyMultipleChoice.pg | 5 +-- tutorial/sample-problems/Misc/Matching.pg | 14 ++++--- tutorial/sample-problems/Misc/MatchingAlt.pg | 5 +-- .../sample-problems/Misc/MatchingGraphs.pg | 5 +-- .../Misc/MultipleChoiceCheckbox.pg | 2 +- .../Misc/MultipleChoicePopup.pg | 2 +- .../Misc/MultipleChoiceRadio.pg | 2 +- tutorial/sample-problems/Misc/RandomPerson.pg | 2 +- tutorial/sample-problems/Misc/Scaffolding.pg | 2 +- .../Parametric/ParametricEquationAnswers.pg | 2 +- .../Parametric/ParametricPlot.pg | 2 +- .../Parametric/ParametricPlotAlt.pg | 2 +- .../sample-problems/Parametric/PolarGraph.pg | 2 +- .../Parametric/PolarGraphPlot.pg | 2 +- .../Parametric/SpaceCurveGraph.pg | 2 +- .../sample-problems/Parametric/Spacecurve.pg | 2 +- .../Parametric/SurfaceGraph.pg | 2 +- .../Parametric/VectorParametricDerivative.pg | 2 +- .../Parametric/VectorParametricFunction.pg | 5 +-- .../Parametric/VectorParametricLines.pg | 5 +-- .../ProblemTechniques/AdaptiveParameters.pg | 2 +- .../ProblemTechniques/AnswerHints.pg | 2 +- .../ProblemTechniques/AnswerInExponent.pg | 2 +- .../AnswerIsSolutionToEquation.pg | 2 +- .../AnyAnswerMarkedCorrect.pg | 2 +- .../ProblemTechniques/AskSage.pg | 2 +- .../CalculatingWithPoints.pg | 2 +- .../ProblemTechniques/ComposingFunctions.pg | 2 +- .../ProblemTechniques/ConstantsInProblems.pg | 2 +- .../ProblemTechniques/CustomAnswerCheckers.pg | 2 +- .../CustomAnswerListChecker.pg | 2 +- .../ProblemTechniques/DataTables.pg | 2 +- .../ProblemTechniques/DefiningFunctions.pg | 2 +- .../DifferentiatingFormulas.pg | 2 +- .../ProblemTechniques/DigitsTolType.pg | 2 +- .../ProblemTechniques/DisableFunctions.pg | 2 +- .../ProblemTechniques/DraggableSubsets.pg | 2 +- .../ProblemTechniques/EquationEvaluators.pg | 5 +-- .../EquationsDefiningFunctions.pg | 2 +- .../ErrorMessageCustomization.pg | 2 +- .../ProblemTechniques/EvalVersusSubstitute.pg | 2 +- .../ExtractingCoordinatesFromPoint.pg | 2 +- .../FactoringAndExpanding.pg | 6 +-- .../ProblemTechniques/FormattingDecimals.pg | 8 ++-- .../ProblemTechniques/FormulasToConstants.pg | 5 +-- .../ProblemTechniques/GraphsInTables.pg | 6 +-- .../ProblemTechniques/HtmlLinks.pg | 5 +-- .../ProblemTechniques/Images.pg | 7 ++-- .../ProblemTechniques/InequalityEvaluators.pg | 2 +- .../ProblemTechniques/IntervalEvaluators.pg | 2 +- .../ProblemTechniques/Knowls.pg | 3 +- .../ProblemTechniques/LayoutTable.pg | 2 +- .../ProblemTechniques/Multianswer.pg | 2 +- .../ProblemTechniques/NamedAnswerRules.pg | 5 +-- .../ProblemTechniques/NumericalTolerance.pg | 2 +- .../ProblemTechniques/OtherVariables.pg | 2 +- .../ProblemTechniques/Percent.pg | 2 +- .../ProblemTechniques/RandomFunction.pg | 2 +- .../RestrictAnswerToFraction.pg | 2 +- .../ProblemTechniques/RestrictingFunctions.pg | 2 +- .../ProblemTechniques/SimplePopUp.pg | 2 +- .../ProblemTechniques/StaticImages.pg | 2 +- .../ProblemTechniques/StringsInContext.pg | 2 +- .../ProblemTechniques/TikZImages.pg | 2 +- .../ProblemTechniques/WeightedGrader.pg | 2 +- tutorial/sample-problems/README.md | 42 +++++++++---------- .../Sequences/AnswerOrderedList.pg | 2 +- .../Sequences/ExplicitSequence.pg | 2 +- .../Sequences/RecursiveSequence.pg | 2 +- .../sample-problems/Sequences/SeriesTest.pg | 7 ++-- .../Snippets/CommentsForInstructors.pg | 2 +- .../sample-problems/Statistics/BarGraph.pg | 6 +-- .../Statistics/BarGraphStatPlot.pg | 7 +--- .../sample-problems/Statistics/BoxPlot.pg | 5 +-- .../sample-problems/Statistics/DonutPlot.pg | 2 +- .../sample-problems/Statistics/Histogram.pg | 5 +-- .../Statistics/LinearRegression.pg | 2 +- .../sample-problems/Statistics/MeanStdDev.pg | 2 +- .../Statistics/MultiBoxPlot.pg | 2 +- .../sample-problems/Statistics/PieChart.pg | 2 +- .../sample-problems/Statistics/ScatterPlot.pg | 6 +-- .../Statistics/ScatterPlotStatPlot.pg | 5 +-- .../Trig/DisableFunctionsTrig.pg | 2 +- .../sample-problems/Trig/DraggableIdentity.pg | 2 +- .../sample-problems/Trig/PeriodicAnswers.pg | 2 +- .../Trig/ProvingTrigIdentities.pg | 2 +- .../sample-problems/Trig/SpecialTrigValues.pg | 2 +- tutorial/sample-problems/Trig/TrigDegrees.pg | 7 +--- .../sample-problems/Trig/TrigIdentities.pg | 2 +- .../VectorCalc/CylindricalGraph3D.pg | 2 +- .../VectorCalc/DirectionField.pg | 2 +- .../VectorCalc/GraphToolVectors.pg | 2 +- .../VectorCalc/RectangularGraph3D.pg | 2 +- .../VectorCalc/VectorFieldGraph2D.pg | 2 +- .../VectorFieldGraph3D/VectorFieldGraph3D1.pg | 5 +-- .../VectorCalc/VectorLineSegment1.pg | 5 +-- .../VectorCalc/VectorLineSegment2.pg | 2 +- .../VectorCalc/VectorOperations.pg | 2 +- .../VectorCalc/VectorParametricLine.pg | 5 +-- .../sample-problems/VectorCalc/Vectors.pg | 2 +- 167 files changed, 220 insertions(+), 314 deletions(-) diff --git a/tutorial/sample-problems/Algebra/AlgebraicFractionAnswer.pg b/tutorial/sample-problems/Algebra/AlgebraicFractionAnswer.pg index ccba8797e..69eed6101 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 723cf0bda..8ae1c7889 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 abb00d443..0f5c78221 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 e6814ab60..855cd9854 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 9245446da..cd4dc652c 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 b37d88f1b..186bd0240 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 a2c0d3ba4..b2aa865ca 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 512c385b5..526f3f2aa 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 49718f614..100beea68 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 94c94aea3..e34ffa0d5 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 2b1accffb..c3297c965 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 219c2cfc0..9930c93d6 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 e7b1ba10a..2a73ae185 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 e46d42966..476110f68 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 23050bbb2..0f861eedb 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 bf5154a39..2d4d7481e 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 d9b3d2177..71e585e9f 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 e57505c86..9a3ac8fdb 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 1115aab91..5d6ad439d 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 4ce11b8d7..9f6ded509 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 c94c7b311..e9535d10b 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 1f170b7ee..1a138845c 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 c543ca72c..db71c0bf4 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 59d8d7b31..be9b22b05 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 ee70cc3bf..d15dc7775 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 bbda38723..64788a066 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 cfeb428df..3e713c3c4 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 eadaa2fb3..c179ffa21 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 5fbdc96b3..21e0e36e1 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 e2f319d31..04a8974ff 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 64f25162a..29db02790 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 a68bcf02f..0659676e2 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 180de8da9..6f69936d4 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 5e86170c5..7df6ddfa6 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 9af9ff780..3ee875980 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 502d1db2a..b8c73a799 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 8177d59be..a07111fdb 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 dbb934665..58a783f2b 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 ac44c9beb..984e36557 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 c0c9976c6..e7a4626b9 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 23a812d89..f7e34acec 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 fe69f522e..62946325e 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 0f16d51e6..56b30c20f 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 97670090e..245dd038b 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 09e2dc188..2c2c8d52b 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 9dabc89d2..ea9c83e7c 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 6173c6dd3..7664e46e6 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 e0c4a0242..c8a2c875d 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 b0d42277c..64109851b 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 9a158bf19..a80872202 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 30649550c..d7cac5466 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 5e4b81333..cb44e4393 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 08e417465..2b6cb07de 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 c6e0faea5..7615dd281 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 d381b8a6f..d910ecfce 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 1c90646e3..15a5de599 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 0fe858b31..892d36e4b 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 6c575811a..1f7c2917b 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 ed6a5ae0f..b336b8213 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 19c8e14c3..93ec39d38 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 463451bdd..aedef8337 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 004e0328e..34de9d080 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 0e00701c6..d112e9fae 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 2db15bee5..2e54eb8d7 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 c000d6aae..855b09f4c 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 345437da4..0cb7149ff 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 474a185e9..bef3dccf1 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 ded0c6671..0e84f128d 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 94c6a01e9..e754cc1cc 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 b1a569230..04045ccf7 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 8bbe0e835..21639dabb 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 8fe1167f0..0c8c4cb1c 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 0669f2746..6906b401f 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 040aeca9e..1e70a97bf 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 f20e04da6..7ae59cc15 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 546a3d7cb..c70729a28 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 c628d49e3..877351ad5 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 5faaa021d..9c6967cca 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 5950b50eb..80f487117 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 d55e62d38..43d33a843 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 a65b9777e..2636e41fd 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 2b669f9d0..22edf3f5b 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 28e50b9ba..37c5658a9 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 6da4bec91..b2a6310b8 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 968c3900d..d8bb52674 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 53847356a..b8a0a5f36 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 b83835cc2..31f7fd023 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 65f7918e0..94081332f 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 5a854944a..23e4cff99 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 40888dba6..8cfbcda6d 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 bc831909c..f16f749c5 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 1a51b8faf..07fbaed8d 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 43c2f6bf5..767480c54 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 6b636a5bb..0d2d2e862 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 534eb12b2..3af06e4f7 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 77b3d2b59..2bf1650c9 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 b20340aef..08b116eda 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 1f514e66c..314d1d39c 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 95056fe83..100add789 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 10984b80e..d7d78db9c 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 898621b72..c12ef7e33 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 343d5c775..76b13bef2 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 54ef7f4be..e413bd9d3 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 23cecac0d..4f041b646 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 d90f38465..40d1634aa 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 1e48c0cfa..0aafa420d 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 22ba679d4..813af9752 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 5045a080e..d2a112a0a 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 7cf73cc34..20bfeae6c 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 f9869a719..f43f19b6b 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 21b585e9a..98d4b0f99 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 69ec646be..67940ea85 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 909dc2e97..07b1319fe 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 75d6de8a8..6124ddf5c 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 b8675fad1..2a93f7ef9 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 9237bce8d..e0abebf33 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 67124b7a1..be43ec15a 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 71565c869..77b8708f3 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 7830309c1..69d2b538f 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 89d770da1..4e3239a3e 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 16b56f8df..7a018af48 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 7a3aa5ec9..457d8064f 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 7c2b5a39f..94fe83161 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 9a1edc54c..0ae3516a1 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 1f114807d..98d0116f6 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 6288348a3..890ea1a52 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 4d5c373ac..d5669ebe8 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 9f1b69317..cae6e48c3 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 f0572ff0e..292f8a13b 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 a325b9956..342d96d78 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 c0150c3d3..977b1e2d8 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 07a687a47..2de0b6710 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 3d2cbd2ed..43789fe31 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 2e4bfe69a..2599dca87 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 2d18161ce..cd8b149bf 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 c967ab954..6192340f1 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 575e9bdc5..746c35f43 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 64c444205..73f133d38 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 6d4a42eb6..e6f160ba2 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 63a926b3c..5ec4f21ed 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 0b8460b00..524362a3a 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 00903ebcb..997066ec7 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 07e045757..75b8bd94a 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 7e95e8f14..a6f898def 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 c824a271b..8735fc2ea 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 47bad79ad..2d91dd88c 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 7c3e85e32..eecc0244a 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 bce5bfaaa..1c37ed6b6 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 a24535650..8c04c8c92 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 9cbeb2d6f..2131f1947 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 693aa92a5..5fe819627 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 469c28359..2e725dfc5 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 4b286ec4c..234f067c2 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 a7c2bbd9a..73ef3790d 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 659fd6e30..bc7bf2b54 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 24609c5eb..da0024e41 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 31d7a2973..f21e56c9f 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 9f329000e..9e7ace940 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 3268fca3e..51f532161 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 0b9e7415d..f23a82cc8 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 bbd183796..1bff1305c 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 458c69a7f..820ad78bc 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 859328293..0cfc1448c 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 15a2d8330..30e896c59 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 c9aef2f6c..8da0bfa74 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 983b41511..43b4ce0be 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 498022c20..e33c7eb2e 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.