--- trunk/webwork2/conf/global.conf.dist	2004/05/16 23:33:00	2119
+++ trunk/webwork2/conf/global.conf.dist	2004/06/06 02:49:11	2261
@@ -2,7 +2,7 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
 # Copyright © 2000-2003 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader: webwork-modperl/conf/global.conf.dist,v 1.61 2004/05/14 18:31:12 toenail Exp $
+# $CVSHeader: webwork-modperl/conf/global.conf.dist,v 1.71 2004/05/24 21:28:42 jj Exp $
 # 
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the
@@ -40,18 +40,18 @@
 	htdocs        => "$webworkRoot/htdocs",
 	htdocs_temp   => "$webworkRoot/htdocs/tmp",
 	equationCache => "$webworkRoot/htdocs/tmp/equations",
+	local_help    => "$webworkRoot/htdocs/helpFiles",
 	lib           => "$webworkRoot/lib",
 	logs          => "$webworkRoot/logs",
 	macros        => "$pgRoot/macros",
 	tmp           => "$webworkRoot/tmp",
-	libraryRoot   => "", # set to the top of the problem library, if its installed
 );
 
 %webworkFiles = (
 	environment        => "$webworkDirs{conf}/global.conf",
 	hardcopySnippets   => {
 		preamble       => "$webworkDirs{conf}/snippets/hardcopyPreamble.tex",
-		setHeader      => "$webworkDirs{conf}/snippets/hardcopySetHeader.pg",
+		setHeader      => "$webworkDirs{conf}/snippets/setHeader.pg",  # hardcopySetHeader.pg",
 		problemDivider => "$webworkDirs{conf}/snippets/hardcopyProblemDivider.tex",
 		setFooter      => "$webworkDirs{conf}/snippets/hardcopySetFooter.pg",
 		setDivider     => "$webworkDirs{conf}/snippets/hardcopySetDivider.tex",
@@ -59,7 +59,7 @@
 		postamble      => "$webworkDirs{conf}/snippets/hardcopyPostamble.tex",
 	},
 	screenSnippets => {
-		setHeader => "$webworkDirs{conf}/snippets/setHeader.pg",
+		setHeader => "$webworkDirs{conf}/snippets/setHeader.pg",       # screenSetHeader.pg",
 	},
 	logs => {
 		timing         => "$webworkDirs{logs}/timing.log",
@@ -74,7 +74,10 @@
 	htdocs_temp   => "/webwork2_files/tmp",
 	equationCache => "/webwork2_files/tmp/equations",
 	docs          => "http://webhost.math.rochester.edu/webworkdocs/docs",
+	local_help    => "/webwork2_files/helpFiles",
 	oldProf       => "/webwork1/profLogin.pl",
+	jsMath        => "/webwork2_files/jsMath/jsMath.js",
+	asciimath     => "/webwork2_files/ASCIIMathML/ASCIIMathML.js",
 );
 
 ################################################################################
@@ -206,6 +209,17 @@
 *dbLayout = $dbLayouts{$dbLayoutName};
 
 ################################################################################
+# Problem library options
+################################################################################
+
+%problemLibrary = (
+	root => "", # set to the top of the problem library, if its installed
+	sourceSQL   => "ProblemLibrary",
+	userSQL     => "webworkRead",
+	passwordSQL => "",
+);
+
+################################################################################
 # Authorization system
 ################################################################################
 
@@ -258,6 +272,20 @@
 ################################################################################
 
 %pg = (
+	# available display modes
+	displayModes => [ qw(plainText formattedText images jsMath asciimath) ],
+	# pg options
+	options => {
+		# default translation options
+		displayMode        => "images",
+		showOldAnswers     => 1,
+		showCorrectAnswers => 0,
+		showHints          => 0,
+		showSolutions      => 0,
+		catchWarnings      => 0, # there's a global warning catcher now
+		# default grader
+		grader => "avg_problem_grader",
+	},
 	# options for various renderers
 	renderers => {
 		"WeBWorK::PG::Remote" => {
@@ -274,24 +302,14 @@
 		lib    => "$pgRoot/lib",
 		macros => "$pgRoot/macros",
 	},
-	options => {
-		# default translation options
-		displayMode        => "images",
-		showOldAnswers     => 1,
-		showCorrectAnswers => 0,
-		showHints          => 0,
-		showSolutions      => 0,
-		catchWarnings      => 0, # there's a global warning catcher now
-		# default grader
-		grader => "avg_problem_grader",
-	},
-	# this will be customized in the course.conf file
+	# this can be customized in the course.conf file
 	specialPGEnvironmentVars => {
 		PRINT_FILE_NAMES_FOR   => [ qw(professor) ],
 		CAPA_Tools             => "$courseDirs{macros}/CAPA_Tools/", 
 		CAPA_MCTools           => "$courseDirs{macros}/CAPA_MCTools/",  
 		CAPA_Graphics_URL      => "$courseURLs{html}/CAPA_Graphics/",   
 		CAPA_GraphicsDirectory => "$courseDirs{html}/CAPA_Graphics/", 
+		onTheFlyImageSize  => 400,
 	},
 	# modules lists module names and the packages each contains
 	modules => [