Merge pull request #1030 from drgrice1/tikz-image

Implement TikZ images for problems
openwebwork · Dec 28, 2019 · cc87cca · cc87cca
2 parents 4efbef7 + e45183e
commit cc87cca
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/conf/defaults.config b/conf/defaults.config
@@ -1238,6 +1238,7 @@ ${pg}{modules} = [
 	[qw(GD)],
 	[qw(AlgParser AlgParserWithImplicitExpand Expr ExprWithImplicitExpand utf8)],
 	[qw(AnswerHash AnswerEvaluator)],
+	[qw(TikZImage)],
 	[qw(WWPlot)], # required by Circle (and others)
 	[qw(Circle)],
 	[qw(Class::Accessor)],

diff --git a/conf/site.conf.dist b/conf/site.conf.dist
@@ -112,6 +112,11 @@ $externalPrograms{pdflatex} ="/usr/bin/pdflatex --shell-escape";
 
 $externalPrograms{dvipng}   ="/usr/bin/dvipng";
 
+# In order to use imagemagick convert you need to change the rights for PDF files from
+# "none" to "read" in the policy file /etc/ImageMagick-6/policy.xml.  This has possible
+# security implications for the server.
+$externalPrograms{convert}  ="/usr/bin/convert";
+
 ####################################################
 # NetPBM - basic image manipulation utilities
 # Most sites only need to configure $netpbm_prefix.
@@ -128,7 +133,7 @@ $externalPrograms{pngtopnm} = "$netpbm_prefix/pngtopnm";
 ####################################################
 # set timeout time (-t 40 sec) to be less than timeout for problem (usually 60 seconds)
 $externalPrograms{checkurl}     = "/usr/bin/lwp-request -d -t 40 -mHEAD "; # or "/usr/local/bin/w3c -head "
-$externalPrograms{curlCommand}  = "/usr/bin/curl";
+$externalPrograms{curl}  = "/usr/bin/curl";
 
 ####################################################
 # image conversions utiltiies

diff --git a/lib/WeBWorK/PG.pm b/lib/WeBWorK/PG.pm
@@ -208,7 +208,7 @@ sub defineProblemEnvir {
 	$envir{externalPng2EpsPath}  = $ce->{externalPrograms}->{png2eps};
 	$envir{externalGif2PngPath}  = $ce->{externalPrograms}->{gif2png};
 	$envir{externalCheckUrl}     = $ce->{externalPrograms}->{checkurl};
-	$envir{externalCurlCommand}  = $ce->{externalPrograms}->{curlCommand};
+	#$envir{externalCurlCommand}  = $ce->{externalPrograms}->{curl};
 	# Directories and URLs
 	# REMOVED: courseName
 	# ADDED: dvipngTempDir